From e09772eb7b14cebd8d7089cd427c1a30eb4f2c01 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 13 Sep 2020 15:36:11 +0200
Subject: [PATCH 0001/1433] Back to snapshots for further development

---
 .../docs/asciidoc/release-notes/index.adoc    |  10 +-
 .../release-notes/release-notes-5.6.0.adoc    |  22 --
 .../release-notes/release-notes-5.6.1.adoc    |  36 ----
 .../release-notes/release-notes-5.6.2.adoc    |  39 ----
 .../release-notes/release-notes-5.7.0.adoc    | 196 +-----------------
 .../release-notes/release-notes-5.8.0-M1.adoc |  58 ++++++
 gradle.properties                             |   6 +-
 7 files changed, 66 insertions(+), 301 deletions(-)
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.6.0.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.6.1.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.6.2.adoc
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 82817f7d5100..85932bdfc78f 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -8,7 +8,7 @@ Stefan Bechtold; Sam Brannen; Johannes Link; Matthias Merdes; Marc Philipp; Juli
 :numbered!:
 //
 
-This document contains the _change log_ for all JUnit 5 releases since 5.6 GA.
+This document contains the _change log_ for all JUnit 5 releases since 5.7 GA.
 
 Please refer to the <<../user-guide/index.adoc#user-guide,User Guide>> for comprehensive
 reference documentation for programmers writing tests, extension authors, and engine
@@ -16,10 +16,6 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
-include::{basedir}/release-notes-5.7.0.adoc[]
-
-include::{basedir}/release-notes-5.6.2.adoc[]
+include::{basedir}/release-notes-5.8.0-M1.adoc[]
 
-include::{basedir}/release-notes-5.6.1.adoc[]
-
-include::{basedir}/release-notes-5.6.0.adoc[]
+include::{basedir}/release-notes-5.7.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.0.adoc
deleted file mode 100644
index 472f6baa708d..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.0.adoc
+++ /dev/null
@@ -1,22 +0,0 @@
-[[release-notes-5.6.0]]
-== 5.6.0
-
-*Date of Release:* January 20, 2020
-
-*Scope:*
-
-* New `@EnabledForJreRange` and `@DisabledForJreRange` execution conditions
-* `@Order` allows to specify relative order
-* Parameter names are included in default display names of parameterized test invocations
-* Improvements to `@CsvSource` and `@CsvFileSource`
-* New `TestInstancePreDestroyCallback` extension API
-* Performance improvements and bug fixes for the Vintage engine
-* Improved error reporting for failures during test discovery and execution
-* Support for using `any()` and `none()` in tag expressions
-* `org.junit.platform.console` now provides a `java.util.spi.ToolProvider`
-* `DiscoverySelectors` for tests in inherited nested classes
-* OSGi metadata
-* Minor bug fixes and improvements
-
-For complete details consult the
-https://junit.org/junit5/docs/5.6.0/release-notes/index.html[5.6.0 Release Notes] online.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.1.adoc
deleted file mode 100644
index ba7fd3266eb3..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.1.adoc
+++ /dev/null
@@ -1,36 +0,0 @@
-[[release-notes-5.6.1]]
-== 5.6.1
-
-*Date of Release:* March 22, 2020
-
-*Scope:* Bug fixes since 5.6.0
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/47?closed=1+[5.6.1] milestone page in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.6.1-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* In order to avoid file locking issues on Microsoft Windows, URLs are no longer cached
-  when loading `junit-platform.properties` files.
-* The presence of multiple `junit-platform.properties` files on the classpath now only
-  results in a warning if the files have different URLs.
-
-
-[[release-notes-5.6.1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* `TestInstancePreDestroyCallback` extensions are now invoked in reverse registration
-  order when `PER_CLASS` test instance lifecycle semantics have been configured.
-
-
-[[release-notes-5.6.1-junit-vintage]]
-=== JUnit Vintage
-
-No changes.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.2.adoc
deleted file mode 100644
index 0da105d0ef82..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.6.2.adoc
+++ /dev/null
@@ -1,39 +0,0 @@
-[[release-notes-5.6.2]]
-== 5.6.2
-
-*Date of Release:* April 10, 2020
-
-*Scope:* Bug fixes since 5.6.1
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/48?closed=1+[5.6.2] milestone page in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.6.2-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* `ReflectionSupport.findNestedClasses()` no longer detects inner class cycles for classes
-  that do not match the supplied `Predicate`. For example, JUnit Jupiter no longer throws
-  an exception if an inner class cycle is detected in a nested class hierarchy whose inner
-  classes are not annotated with `@Nested`.
-
-
-[[release-notes-5.6.2-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* Test discovery no longer halts with an exception for inner class hierarchies that form a
-  cycle if such inner classes are not annotated with `@Nested`.
-
-
-[[release-notes-5.6.2-junit-vintage]]
-=== JUnit Vintage
-
-==== Bug Fixes
-
-* Generating display names from JUnit 4 `Descriptions` now falls back to `getDisplayName`
-  if `getMethodName` returns a blank `String` instead of throwing an exception.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0.adoc
index 972739531da1..80cf3cc235ab 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0.adoc
@@ -14,197 +14,5 @@
 * Improvements to `assertTimeoutPreemptively()`
 * Improvements to `@CsvFileSource` and `@CsvSource`
 
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/44?closed=1+[5.7 M1],
-link:{junit5-repo}+/milestone/49?closed=1+[5.7 RC1], and
-link:{junit5-repo}+/milestone/50?closed=1+[5.7 GA] milestone pages in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.7.0-RC1-overall-improvements]]
-=== Overall Improvements
-
-* Javadoc JARs now contain `package-list` in addition to `element-list` for compatibility
-  with tools like NetBeans 11.
-
-
-[[release-notes-5.7.0-junit-platform]]
-=== JUnit Platform
-
-==== Promoted Features
-
-The following APIs have been promoted from "experimental" status:
-
-* `LauncherConstants` is now _stable_
-* `LauncherConfig` (except for methods introduced in 5.7) is now _stable_
-* `LegacyXmlReportGeneratingListener` is now _stable_
-* `org.junit.platform.testkit.engine` is now _maintained_
-
-==== Bug Fixes
-
-* In XML reports generated by the `ConsoleLauncher` or
-  `LegacyXmlReportGeneratingListener`, characters in exception messages and other
-  user-supplied values that are not allowed in XML are now replaced with their character
-  reference – for example, `\0` becomes `&#0;`.
-* The `Launcher` now throws an exception when a previously executed `TestPlan` is
-  attempted to be executed again.
-
-==== Deprecations and Breaking Changes
-
-* In the `EngineTestKit` API, the `all()`, `containers()`, and `tests()` methods in
-  `EngineExecutionResults` that were deprecated in JUnit Platform 1.6.0 have been removed
-  in favor of `allEvents()`, `containerEvents()`, and `testEvents()`, respectively.
-* The following methods in `EngineTestKit` are now deprecated with replacements:
-  - `execute(String, EngineDiscoveryRequest)` → `execute(String, LauncherDiscoveryRequest)`
-  - `execute(TestEngine, EngineDiscoveryRequest)` → `execute(TestEngine, LauncherDiscoveryRequest)`
-  - `Builder.filters(DiscoveryFilter...)` → `Builder.filters(Filter...)`
-* `EngineTestKit` no longer takes into account implicit configuration parameters (i.e.
-  system properties and the `junit-platform.properties` classpath resource) by default.
-  This change makes tests executed via `EngineTestKit` independent of the environment they
-  are executed in.
-
-==== New Features and Improvements
-
-* The number of containers and tests excluded by post discovery filters based on their tags
-  is now logged, along with the exclusion reasons.
-* New `junit.platform.execution.listeners.deactivate` configuration parameter that allows
-  one to specify a comma-separated list of patterns for deactivating
-  `TestExecutionListener` implementations registered via the `ServiceLoader` mechanism.
-* The `@Testable` annotation may now be applied _directly_ to fields.
-* New `Node.DynamicTestExecutor#execute(TestDescriptor, EngineExecutionListener)` method
-  for engines that wish to provide a custom `EngineExecutionListener` and cancel or wait
-  for the execution of a submitted test via the returned `Future`.
-* New `EngineExecutionListener.NOOP` `EngineExecutionListener` implementation.
-* All declared methods in the `EngineExecutionListener` API now have empty `default`
-  implementations.
-* The `EngineTestKit` now reuses the same test discovery and execution logic as the
-  `Launcher`. Thus, it's now possible to test an engine's behavior in the presence of
-  post-discovery filters (e.g. tag filters) and with regard to pruning.
-* The `EngineTestKit` now supports matching conditions with events loosely, i.e. an
-  incomplete match with or without a fixed order.
-* The `@Testable` annotation may now target any element type, including fields, methods,
-  classes, packages, and modules.
-* When using the `ConsoleLauncher`, classes selected explicitly via `--select-class` and
-  `--select-method` are now always executed regardless of class name patterns provided
-  via `--include-classname` or the default class name pattern.
-* The `ConsoleLauncher` now honors the `--disable-ansi-colors` option when printing usage
-  help.
-* New `FilePosition` support in `FileSelector` and `ClasspathResourceSelector`.
-* New `getJavaClass()` and `getJavaMethod()` methods in
-  `org.junit.platform.engine.support.descriptor.MethodSource`.
-* Custom `PostDiscoveryFilter` implementations can now be registered via Java’s
-  `ServiceLoader` mechanism.
-* New `org.junit.platform.jfr` module. When running on Java 11 or later, it provides and
-  registers a `TestExecutionListener` that generates Java Flight Recorder events.
-* The `ExecutionRecorder` in `junit-platform-testkit` is now public for fine-grained
-  testing of classes that use `EngineExecutionListener`.
-* `ForkJoinPoolHierarchicalTestExecutorService` can now be constructed by supplying a
-  `ParallelExecutionConfiguration`.
-* `HierarchicalTestEngine` now supports a global resource lock.
-
-
-[[release-notes-5.7.0-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Promoted Features
-
-The following APIs have been promoted from _experimental_ to _stable_:
-
-* `junit-jupiter-migrationsupport`
-* `junit-jupiter-params` (i.e. `@ParameterizedTest` etc.)
-* `@TestMethodOrder`, `MethodOrderer`, and its pre-5.7 implementations
-* `@DisplayNameGeneration`, `DisplayNameGenerator`, and its pre-5.7 implementations
-* `@Timeout`
-* `TestInstanceFactory`
-* `TestInstancePreDestroyCallback`
-* `TestInstances` and corresponding `ExtensionContext` methods
-* `TestWatcher`
-* Kotlin-specific assertions that were introduced in 5.1
-
-==== Bug Fixes
-
-* `@TempDir` is now able to clean up files in read-only directories.
-* The Jupiter engine now ignores `MethodSelectors` for methods in non-Jupiter test
-  classes instead of failing for missing methods in such cases.
-* `CloseableResource` instances stored in `ExtensionContext.Store` are now closed in the
-  reverse order they were added in. Previously, the order was undefined and unstable.
-* Inherited `@BeforeEach` methods are now executed on correct instances for `@Nested`
-  classes.
-* Registered `TestInstancePreDestroyCallback` extensions are now always called if an
-  instance of a test class was created, regardless whether any registered
-  `TestInstancePostProcessor` extension threw an exception.
-* Disabled `@TestTemplate` methods (e.g. `@ParameterizedTest` and `@RepeatedTest` methods)
-  are now reported to registered `TestWatcher` extensions.
-
-==== Deprecations and Breaking Changes
-
-* `MethodOrderer.Alphanumeric` has been deprecated in favor of `MethodOrderer.MethodName`
-  which provides the exact same functionality but has a more descriptive name.
-
-==== New Features and Improvements
-
-* New `@EnabledIf` and `@DisabledIf` annotations can be used to enable or disable a test
-  or container based on condition methods.
-* New `MethodOrderer` named `DisplayName` that sorts test methods alphanumerically based
-  on their display names.
-* New `DisplayNameGenerator` named `Simple` (based on `Standard`) that removes trailing
-  parentheses for methods with no parameters.
-* `assertThrows()` for Kotlin can now be used with suspending functions and other lambda
-  contexts that require inlining.
-* The `JRE` enum now provides a static `currentVersion()` method that returns the enum
-  constant for the currently executing JRE, e.g. for use in custom execution conditions
-  and other extensions.
-* The `name` attribute of `@ParameterizedTest` is now clearly documented to be a
-  `MessageFormat` pattern.
-* Synthetic constructors are now ignored when instantiating a test class.
-* The Javadoc for the `provideTestTemplateInvocationContexts()` method in
-  `TestTemplateInvocationContextProvider` has been aligned with the actual implementation.
-  Providers are now officially allowed to return an empty stream, and the error message
-  when all provided streams are empty is now more helpful.
-* New `getDisplayName()` method in `MethodDescriptor` for use in `MethodOrderer`
-  implementations.
-* New `assertLinesMatch()` method overloads in `Assertions` that accept two
-  `Stream<String>` instances for comparison.
-* `assertTimeoutPreemptively()` in `Assertions` now reports the stack trace of the timed
-  out thread in the cause of the `AssertionFailedError`.
-* `assertTimeoutPreemptively()` now uses threads with a specific name, conveying their use
-  by the framework, to facilitate debugging and stack trace analysis.
-* All `@Enabled*`/`@Disabled*` annotations now have an optional `disabledReason` attribute
-  that can be used to provide an additional explanation as to why a test or container
-  might be disabled.
-* `JAVA_16` has been added to the `JRE` enum for use with JRE-based execution conditions.
-* New `MethodOrderer.MethodName` to replace `MethodOrderer.Alphanumeric` with the exact
-  same functionality but a more descriptive name.
-* New `junit.jupiter.testmethod.order.default` configuration parameter to set the default
-  `MethodOrderer` that will be used unless `@TestMethodOrder` is present.
-* New `DynamicTest.stream()` factory method that accepts a `Stream` instead of an
-  `Iterator` for the input source.
-* `@CsvFileSource` now allows one to specify file paths as an alternative to classpath
-  resources.
-* `@CsvFileSource` and `@CsvSource` now provide a `maxCharsPerColumn` attribute for
-  configuring the maximum number of characters per column.
-* Arguments in display names of parameterized test invocations are now truncated if they
-  exceed a configurable maximum length (defaults to 512 characters).
-* New `@Isolated` annotation allows to run test classes in isolation of other test classes
-  when using parallel test execution.
-* New `TypedArgumentConverter` for converting one specific type to another, therefore
-  reducing boilerplate type checks compared to implementing `ArgumentConverter` directly.
-* New `ExtensionContext.getConfigurationParameter(String, Function<String, T>)`
-  convenience method for reading transformed configuration parameters from extensions.
-
-
-[[release-notes-5.7.0-junit-vintage]]
-=== JUnit Vintage
-
-==== Bug Fixes
-
-* The Vintage engine no longer fails when resolving a `MethodSelector` for methods of test
-  classes that cannot be found via reflection. This allows selecting Spock feature methods
-  by their source code name even though they have a generated method name in the bytecode.
-
-==== New Features and Improvements
-
-* The internal `JUnit4VersionCheck` class -- which verifies that a supported version of
-  JUnit 4 is on the classpath -- now implements a lenient version ID parsing algorithm in
-  order to support custom version ID formats such as `4.12.0`, `4.12-patch_1`, etc.
+For complete details consult the
+https://junit.org/junit5/docs/5.7.0/release-notes/index.html[5.7.0 Release Notes] online.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
new file mode 100644
index 000000000000..b281c6fc672c
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.8.0-M1]]
+== 5.8.0-M1
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult
+the link:{junit5-repo}+/milestone/51?closed=1+[5.8 M1] milestone page in the JUnit repository
+on GitHub.
+
+
+[[release-notes-5.8.0-M1-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.8.0-M1-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.8.0-M1-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
diff --git a/gradle.properties b/gradle.properties
index 30e3b4488249..02f0edf292b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.7.0
+version         = 5.8.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.7.0
+platformVersion = 1.8.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.7.0
+vintageVersion  = 5.8.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From 5d8384323fd77c21e9a29078807f453a1b7eaf61 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 13 Sep 2020 15:55:39 +0200
Subject: [PATCH 0002/1433] Disable VintageMavenIntegrationTests for now

Follow-up: #2402
---
 .../tooling/support/tests/VintageMavenIntegrationTests.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index d396beaaf5b8..11d93dc0643d 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -18,6 +18,7 @@
 
 import de.sormuras.bartholdy.Result;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -26,6 +27,7 @@
 import platform.tooling.support.Helper;
 import platform.tooling.support.Request;
 
+@Disabled("needs to consume maven.repo system property instead of downloading from Sonatype snapshot repo or Maven local repo")
 class VintageMavenIntegrationTests {
 
 	@Test

From 7aebb420d594c6b62a780420878595ca46279c62 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Mon, 14 Sep 2020 17:39:59 +0200
Subject: [PATCH 0003/1433] Add JUnit Platform JFR in Dependency Metadata and
 Diagram

This commit also removes the dependency metadata
from the README.md file and replaces it with a link
to the user guide instead.

Closes #2403
---
 README.md                                     | 50 +++----------------
 .../docs/asciidoc/user-guide/appendix.adoc    |  5 ++
 2 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 8b6a8761c39d..5439f0bf54c0 100644
--- a/README.md
+++ b/README.md
@@ -78,60 +78,22 @@ consumption in other projects via the following command.
 
 ## Dependency Metadata
 
-The following sections list the dependency metadata for the JUnit Platform, JUnit
-Jupiter, and JUnit Vintage.
+Consult the [Dependency Metadata] section of the [User Guide] for a list of all artifacts
+of the JUnit Platform, JUnit Jupiter, and JUnit Vintage.
 
-See also <https://repo1.maven.org/maven2/org/junit/> for releases and <https://oss.sonatype.org/content/repositories/snapshots/org/junit/> for snapshots.
-
-### JUnit Platform
-
-- **Group ID**: `org.junit.platform`
-- **Version**: `1.7.0` or `1.8.0-SNAPSHOT`
-- **Artifact IDs** and Java **module** name:
-  - `junit-platform-commons` (`org.junit.platform.commons`)
-  - `junit-platform-console` (`org.junit.platform.console`)
-  - `junit-platform-console-standalone` (*N/A*)
-  - `junit-platform-engine` (`org.junit.platform.engine`)
-  - `junit-platform-jfr` (`org.junit.platform.jfr`)
-  - `junit-platform-launcher` (`org.junit.platform.launcher`)
-  - `junit-platform-reporting` (`org.junit.platform.reporting`)
-  - `junit-platform-runner` (`org.junit.platform.runner`)
-  - `junit-platform-suite-api` (`org.junit.platform.suite.api`)
-  - `junit-platform-testkit` (`org.junit.platform.testkit`)
-
-### JUnit Jupiter
-
-- **Group ID**: `org.junit.jupiter`
-- **Version**: `5.7.0` or `5.8.0-SNAPSHOT`
-- **Artifact IDs** and Java **module** name:
-  - `junit-jupiter` (`org.junit.jupiter`)
-  - `junit-jupiter-api` (`org.junit.jupiter.api`)
-  - `junit-jupiter-engine` (`org.junit.jupiter.engine`)
-  - `junit-jupiter-migrationsupport` (`org.junit.jupiter.migrationsupport`)
-  - `junit-jupiter-params` (`org.junit.jupiter.params`)
-
-### JUnit Vintage
-
-- **Group ID**: `org.junit.vintage`
-- **Version**: `5.7.0` or `5.8.0-SNAPSHOT`
-- **Artifact ID** and Java **module** name:
-  - `junit-vintage-engine` (`org.junit.vintage.engine`)
-
-### Bill of Materials (BOM)
-
-- **Group ID**: `org.junit`
-- **Artifact ID** `junit-bom`
-- **Version**: `5.7.0` or `5.8.0-SNAPSHOT`
+See also <https://repo1.maven.org/maven2/org/junit/> for releases and
+<https://oss.sonatype.org/content/repositories/snapshots/org/junit/> for snapshots.
 
 
 [Codecov]: https://codecov.io/gh/junit-team/junit5
 [CONTRIBUTING.md]: https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md
+[Dependency Metadata]: https://junit.org/junit5/docs/current/user-guide/#dependency-metadata
 [Gitter]: https://gitter.im/junit-team/junit5
 [Gradle Wrapper]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:using_wrapper
 [JaCoCo]: https://www.eclemma.org/jacoco/
 [Javadoc]: https://junit.org/junit5/docs/current/api/
 [JDK 11]: https://jdk.java.net/11/
 [Release Notes]: https://junit.org/junit5/docs/current/release-notes/
+[Samples]: https://github.com/junit-team/junit5-samples
 [StackOverflow]: https://stackoverflow.com/questions/tagged/junit5
 [User Guide]: https://junit.org/junit5/docs/current/user-guide/
-[Samples]: https://github.com/junit-team/junit5-samples
diff --git a/documentation/src/docs/asciidoc/user-guide/appendix.adoc b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
index 2551c36ba692..ab0164d15321 100644
--- a/documentation/src/docs/asciidoc/user-guide/appendix.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
@@ -39,6 +39,8 @@ artifacts are deployed to Sonatype's {snapshot-repo}[snapshots repository] under
     directory. See <<running-tests-console-launcher>> for details.
   `junit-platform-engine`::
     Public API for test engines. See <<launcher-api-engines-custom>> for details.
+  `junit-platform-jfr`::
+    Provides a `TestExecutionListener` for Java Flight Recorder events on the JUnit Platform. See <<running-tests-flight-recorder>> for details.
   `junit-platform-launcher`::
     Public API for configuring and launching test plans -- typically used by IDEs and
     build tools. See <<launcher-api>> for details.
@@ -142,6 +144,7 @@ package org.junit.platform {
     [junit-platform-commons] as commons
     [junit-platform-console] as console
     [junit-platform-engine] as engine
+    [junit-platform-jfr] as jfr
     [junit-platform-launcher] as launcher
     [junit-platform-reporting] as reporting
     [junit-platform-runner] as runner
@@ -185,6 +188,8 @@ console ..> reporting
 
 launcher ..> engine
 
+jfr ..> launcher
+
 engine ..> opentest4j
 engine ..> commons
 

From 6bed033234a656b9145367382b1167172c3d889e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Sep 2020 12:36:20 +0200
Subject: [PATCH 0004/1433] Avoid deprecation warning in OrderedMethodTests

---
 .../org/junit/jupiter/engine/extension/OrderedMethodTests.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
index 16d98f8c3eea..e9ff3b2032da 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
@@ -35,7 +35,6 @@
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.MethodDescriptor;
 import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.MethodOrderer.Alphanumeric;
 import org.junit.jupiter.api.MethodOrderer.MethodName;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.MethodOrderer.Random;
@@ -409,7 +408,7 @@ void zzz() {
 	}
 
 	@SuppressWarnings("deprecation")
-	@TestMethodOrder(Alphanumeric.class)
+	@TestMethodOrder(org.junit.jupiter.api.MethodOrderer.Alphanumeric.class)
 	static class AlphanumericTestCase extends BaseTestCase {
 
 		@BeforeEach

From ad8dde1c6ff29dabca46e359242855360322777d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Sep 2020 12:37:03 +0200
Subject: [PATCH 0005/1433] Ensure OrderedMethodTests.alphanumeric() tests
 correct SUT

---
 .../junit/jupiter/engine/extension/OrderedMethodTests.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
index e9ff3b2032da..af550d36be60 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
@@ -85,7 +85,7 @@ void alphanumeric() {
 		// on the class names.
 		assertThat(testClass.getSuperclass().getName()).isGreaterThan(testClass.getName());
 
-		var tests = executeTestsInParallel(MethodNameTestCase.class);
+		var tests = executeTestsInParallel(testClass);
 
 		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
@@ -107,7 +107,7 @@ void methodName() {
 		// on the class names.
 		assertThat(testClass.getSuperclass().getName()).isLessThan(testClass.getName());
 
-		var tests = executeTestsInParallel(MethodNameTestCase.class);
+		var tests = executeTestsInParallel(testClass);
 
 		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 

From ca2087677e649623bf3ec6cb886329bf238a9c46 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Sep 2020 12:40:23 +0200
Subject: [PATCH 0006/1433] Remove unused variable in
 CsvFileArgumentsProviderTests

---
 .../jupiter/params/provider/CsvFileArgumentsProviderTests.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index 49b60a764b11..92eab62aa0a4 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -425,8 +425,6 @@ void throwsExceptionForExceedsMaxCharsFileWithDefaultConfig(@TempDir Path tempDi
 				.files(csvFile.toAbsolutePath().toString())//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
-
 		CsvParsingException exception = assertThrows(CsvParsingException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 

From d7cf3627a3f7add64869dd5a3d5e1727fe0c4b9d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Sep 2020 12:45:52 +0200
Subject: [PATCH 0007/1433] Polish release notes and template

---
 .../docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc | 4 ++--
 .../docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index b281c6fc672c..052f5cf75d23 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -5,8 +5,8 @@
 
 *Scope:* ❓
 
-For a complete list of all _closed_ issues and pull requests for this release, consult
-the link:{junit5-repo}+/milestone/51?closed=1+[5.8 M1] milestone page in the JUnit repository
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/51?closed=1+[5.8 M1] milestone page in the JUnit repository
 on GitHub.
 
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
index 2952e59175fe..17790483e124 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
@@ -7,9 +7,9 @@
 
 *Scope:* ❓
 
-For a complete list of all _closed_ issues and pull requests for this release, consult
-the link:{junit5-repo}+/milestone/⚠️?closed=1+[⚠️] milestone page in the JUnit repository
-on GitHub.
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/⚠️?closed=1+[⚠️] milestone page in the JUnit repository on
+GitHub.
 
 
 [[release-notes-⚠️-junit-platform]]

From da043adee5fad859de9fc9fff1707108bebfb9bf Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Sep 2020 12:56:03 +0200
Subject: [PATCH 0008/1433] Return "null" from StringUtils.nullSafeToString if
 toString() returns null

Prior to this commit, the implementation of StringUtils.nullSafeToString
did not align with the Javadoc. Specifically, the documentation states
that nullSafeToString() never returns null; however, if the invocation
of toString() on the supplied object returned null, nullSafeToString()
simply returned that null value.

This commit fixes this by ensuring that nullSafeToString() returns "null"
if the invocation of toString() returns null.

Closes #2410
---
 .../release-notes/release-notes-5.8.0-M1.adoc       |  4 +++-
 .../junit/platform/commons/util/StringUtils.java    |  8 +++++---
 .../platform/commons/util/StringUtilsTests.java     | 13 +++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 052f5cf75d23..c902f9d1c403 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -15,7 +15,9 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* `StringUtils.nullSafeToString()` now returns `"null"` if the invocation of `toString()`
+  on the supplied object returns `null`. Although this is an internal utility, the effect
+  of this change may be witnessed by end users and test engine or extension authors.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
index f7780004cb63..a704d935e403 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
@@ -142,8 +142,9 @@ public static boolean doesNotContainIsoControlCharacter(String str) {
 	 * {@code Arrays#toString(...)} variant will be used to convert it to a String.</li>
 	 * <li>If the supplied object is an object array, {@code Arrays#deepToString(Object[])}
 	 * will be used to convert it to a String.</li>
-	 * <li>Otherwise, the result of invoking {@code toString()} on the object
-	 * will be returned.</li>
+	 * <li>Otherwise, {@code toString()} will be invoked on the object. If the
+	 * result is non-null, that result will be returned. If the result is
+	 * {@code null}, {@code "null"} will be returned.</li>
 	 * <li>If any of the above results in an exception, this method delegates to
 	 * {@link #defaultToString(Object)}</li>
 	 * </ul>
@@ -190,7 +191,8 @@ public static String nullSafeToString(Object obj) {
 			}
 
 			// else
-			return obj.toString();
+			String result = obj.toString();
+			return result != null ? result : "null";
 		}
 		catch (Throwable throwable) {
 			UnrecoverableExceptions.rethrowIfUnrecoverable(throwable);
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
index 750edf844824..bbf2cbc4b2c5 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
@@ -138,6 +138,11 @@ void nullSafeToStringChecks() {
 		assertEquals("[[2, 4], [3, 9]]", nullSafeToString(new Integer[][] { { 2, 4 }, { 3, 9 } }));
 	}
 
+	@Test
+	void nullSafeToStringForObjectWhoseToStringImplementationReturnsNull() {
+		assertEquals("null", nullSafeToString(new ToStringReturnsNull()));
+	}
+
 	@Test
 	void nullSafeToStringForObjectWhoseToStringImplementationThrowsAnException() {
 		assertThat(nullSafeToString(new ToStringThrowsException()))//
@@ -168,6 +173,14 @@ private void shouldNotContainIsoControlCharacter(String str) {
 			() -> String.format("'%s' should not contain ISO control character", str));
 	}
 
+	private static class ToStringReturnsNull {
+
+		@Override
+		public String toString() {
+			return null;
+		}
+	}
+
 	private static class ToStringThrowsException {
 
 		@Override

From 84ffb8c38e9a52f3dbb2c0acec232b2883854032 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano.cordio@gmail.com>
Date: Tue, 15 Sep 2020 08:47:48 +0200
Subject: [PATCH 0009/1433] Evaluate argument length only when argument is not
 null

JUnit Jupiter 5.7.0 introduced a regression in conjunction with the
work performed to address #2358. Specifically, an attempt to truncate
an argument to a parameterized test results in a NullPointerException
if the toString() implementation of the given argument returns null.

This regression has already been addressed indirectly in #2410;
however, we would like to keep the additional non-null check in
ParameterizedTestNameFormatter. In addition, we want to keep the test
introduced in PR #2408 as a regression test.

Closes #2408
Fixes #2405
---
 .../ParameterizedTestNameFormatter.java       |  2 +-
 .../ParameterizedTestNameFormatterTests.java  | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
index 559fc08ceb76..937e91f60103 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
@@ -103,7 +103,7 @@ private Object[] makeReadable(MessageFormat format, Object[] arguments) {
 	}
 
 	private String truncateIfExceedsMaxLength(String argument) {
-		if (argument.length() > argumentMaxLength) {
+		if (argument != null && argument.length() > argumentMaxLength) {
 			return argument.substring(0, argumentMaxLength - 1) + ELLIPSIS;
 		}
 		return argument;
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
index e092bc0178c0..78d0fe09c647 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
@@ -45,7 +45,7 @@
  */
 class ParameterizedTestNameFormatterTests {
 
-	private Locale originalLocale = Locale.getDefault();
+	private final Locale originalLocale = Locale.getDefault();
 
 	@AfterEach
 	void restoreLocale() {
@@ -159,11 +159,20 @@ void throwsReadableExceptionForInvalidPattern() {
 		assertEquals(IllegalArgumentException.class, exception.getCause().getClass());
 	}
 
+	@Test
+	void formattingDoesNotFailIfArgumentToStringImplementationReturnsNull() {
+		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
+
+		String formattedName = formatter.format(1, new ToStringReturnsNull(), "foo");
+
+		assertThat(formattedName).isEqualTo("null, foo");
+	}
+
 	@Test
 	void formattingDoesNotFailIfArgumentToStringImplementationThrowsAnException() {
 		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
 
-		String formattedName = formatter.format(1, new Object[] { new ToStringThrowsException(), "foo" });
+		String formattedName = formatter.format(1, new ToStringThrowsException(), "foo");
 
 		assertThat(formattedName).startsWith(ToStringThrowsException.class.getName() + "@");
 		assertThat(formattedName).endsWith("foo");
@@ -239,6 +248,14 @@ private static ParameterizedTestNameFormatter formatter(String pattern, String d
 
 	// -------------------------------------------------------------------
 
+	private static class ToStringReturnsNull {
+
+		@Override
+		public String toString() {
+			return null;
+		}
+	}
+
 	private static class ToStringThrowsException {
 
 		@Override

From 7955bc4c8d95aaf4b0e18b6007ea0c695acf40b3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Sep 2020 13:30:07 +0200
Subject: [PATCH 0010/1433] Document regression fix in release notes

See #2408
---
 .../docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index c902f9d1c403..baeae7979485 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -33,7 +33,10 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* If the `toString()` implementation of an argument passed to a `@ParameterizedTest`
+  method returns `null`, the display name formatter for the parameterized test now treats
+  the name of the corresponding argument as `"null"` instead of throwing an exception.
+  This fixes a regression introduced in JUnit Jupiter 5.7.0.
 
 ==== Deprecations and Breaking Changes
 

From fd6dc3eb82df2ce4317350b5078c48eb891d6a6c Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nelson@osacky.com>
Date: Tue, 22 Sep 2020 17:11:52 +0200
Subject: [PATCH 0011/1433] Update Gradle Enterprise Plugin (#2418)

This updates the Gradle Enterprise Gradle plugin to the latest version.
This also fixes the usage of an internal api that was moved packages.
---
 gradle.properties   | 2 +-
 settings.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 02f0edf292b1..6495ec07d862 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -46,7 +46,7 @@ surefire.version=2.22.2
 bnd.version=5.1.2
 
 # Plugins
-gradle.enterprise.plugin.version=3.3.1
+gradle.enterprise.plugin.version=3.4.1
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.29.0
 spotless.plugin.version=5.1.1
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cb7e633fa944..0d548d7b34ff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,4 @@
-import com.gradle.scan.plugin.internal.api.BuildScanExtensionWithHiddenFeatures
+import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
 
 pluginManagement {
 	plugins {

From ae2a336fe4b371d398da386e8b336cc06329da7d Mon Sep 17 00:00:00 2001
From: Jonathan Leitschuh <jonathan.leitschuh@gmail.com>
Date: Sat, 3 Oct 2020 08:16:49 -0400
Subject: [PATCH 0012/1433] Enable GitHub Code Scanning Feature (#2436)

---
 .github/workflows/codeql-analysis.yml | 77 +++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000000..5247cf51f210
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,77 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+  push:
+    branches: [main, releases/**]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [main, releases/**]
+  schedule:
+    - cron: '0 19 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['java', 'javascript']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+      # Install and setup JDK 11
+    - name: Setup JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

From 126c5041f0266cb69d0bf4962f9c42b8ce284e63 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 4 Oct 2020 10:03:14 +0200
Subject: [PATCH 0013/1433] Upgradle to 6.7-rc-3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4a1a99959e8b..6e888e8ac8fa 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionSha256Sum=f4a236ffc777d6a4c25cdf7b1c45fe7024910afc65c88a9c9027aab9a765d295
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 54ab3dd59a784427773f11521d70a0d449c1fd75 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 4 Oct 2020 14:14:27 +0200
Subject: [PATCH 0014/1433] Consume artifacts from temp repo

Fixes #2402.
---
 .../projects/vintage/pom.xml                           | 10 ++++++++++
 .../support/tests/VintageMavenIntegrationTests.java    |  2 --
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/platform-tooling-support-tests/projects/vintage/pom.xml b/platform-tooling-support-tests/projects/vintage/pom.xml
index 3390f68d5f55..5cea432f7701 100644
--- a/platform-tooling-support-tests/projects/vintage/pom.xml
+++ b/platform-tooling-support-tests/projects/vintage/pom.xml
@@ -50,6 +50,16 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>local-temp</id>
+            <url>file://${maven.repo}</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
         <repository>
             <id>sonatype-snapshots</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index 11d93dc0643d..d396beaaf5b8 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -18,7 +18,6 @@
 
 import de.sormuras.bartholdy.Result;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -27,7 +26,6 @@
 import platform.tooling.support.Helper;
 import platform.tooling.support.Request;
 
-@Disabled("needs to consume maven.repo system property instead of downloading from Sonatype snapshot repo or Maven local repo")
 class VintageMavenIntegrationTests {
 
 	@Test

From 4dd6981ece3a5d5275844ba6d9b4fa7ab60bf0af Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 4 Oct 2020 11:33:04 +0200
Subject: [PATCH 0015/1433] =?UTF-8?q?Use=20Gradle=E2=80=99s=20new=20toolch?=
 =?UTF-8?q?ain=20feature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cross-version.yml           |  2 +-
 build.gradle.kts                              |  6 ---
 .../main/kotlin/custom-java-home.gradle.kts   | 48 -------------------
 .../java-library-conventions.gradle.kts       |  2 +-
 .../java-toolchain-conventions.gradle.kts     | 18 +++++++
 junit-bom/junit-bom.gradle.kts                |  2 +-
 6 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 100644 buildSrc/src/main/kotlin/custom-java-home.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 05e5a3d5c08e..9a1560ef20d2 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -46,4 +46,4 @@ jobs:
       - name: Test
         run: |
           ./gradlew --version
-          ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -PjavaHome=$ADDITIONAL_JDK build "-Dscan.tag.JDK_${{ matrix.jdk }}"
+          ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=ADDITIONAL_JDK -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
diff --git a/build.gradle.kts b/build.gradle.kts
index 41cba6dc5c6b..21721cdfe334 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,12 +12,6 @@ plugins {
 
 apply(from = "gradle/build-scan-user-data.gradle")
 
-buildScan {
-	if (project.hasProperty("javaHome")) {
-		value("Custom Java home", project.property("javaHome") as String)
-	}
-}
-
 val buildTimeAndDate by extra {
 
 	// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against
diff --git a/buildSrc/src/main/kotlin/custom-java-home.gradle.kts b/buildSrc/src/main/kotlin/custom-java-home.gradle.kts
deleted file mode 100644
index 8533c5f949fd..000000000000
--- a/buildSrc/src/main/kotlin/custom-java-home.gradle.kts
+++ /dev/null
@@ -1,48 +0,0 @@
-import org.gradle.internal.os.OperatingSystem
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
-
-if (project.hasProperty("javaHome")) {
-
-	val javaHome: String by project
-	require(file(javaHome).isDirectory) {
-		"Java home directory set via `javaHome` project property is invalid: $javaHome"
-	}
-
-	fun javaHomeExecutable(execName: String): String {
-		val extension = if (OperatingSystem.current().isWindows) ".exe" else ""
-		val executable = File(File(javaHome, "bin"), "$execName$extension")
-		require(executable.exists()) {
-			"File does not exist: $executable"
-		}
-		return executable.canonicalPath
-	}
-
-	tasks {
-		withType<JavaCompile>().configureEach {
-			options.isFork = true
-			options.forkOptions.javaHome = file(javaHome)
-			doFirst {
-				// Avoid compiler warnings for non-existing path entries
-				classpath = classpath.filter { it.exists() }
-			}
-		}
-		withType<GroovyCompile>().configureEach {
-			options.isFork = true
-			options.forkOptions.javaHome = file(javaHome)
-		}
-		withType<KotlinJvmCompile>().configureEach {
-			kotlinOptions {
-				jdkHome = javaHome
-			}
-		}
-		withType<Javadoc>().configureEach {
-			executable = javaHomeExecutable("javadoc")
-		}
-		withType<Test>().configureEach {
-			executable = javaHomeExecutable("java")
-		}
-		withType<JavaExec>().configureEach {
-			setExecutable(javaHomeExecutable("java"))
-		}
-	}
-}
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 6ebed2f22a2e..12fb79884da3 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 	eclipse
 	idea
 	checkstyle
-	id("custom-java-home")
+	id("java-toolchain-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
new file mode 100644
index 000000000000..b8acf3f7cc9c
--- /dev/null
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -0,0 +1,18 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
+
+val javaToolchainVersion: String? by project
+
+project.pluginManager.withPlugin("java") {
+	val extension = the<JavaPluginExtension>()
+	val javaLanguageVersion = JavaLanguageVersion.of(javaToolchainVersion?.toInt() ?: 11)
+	extension.toolchain {
+		languageVersion.set(javaLanguageVersion)
+	}
+	val service = the<JavaToolchainService>()
+	val javaHome = service.compilerFor(extension.toolchain).get().metadata.installationPath.asFile.absolutePath
+	tasks.withType<KotlinJvmCompile>().configureEach {
+		kotlinOptions {
+			jdkHome = javaHome
+		}
+	}
+}
diff --git a/junit-bom/junit-bom.gradle.kts b/junit-bom/junit-bom.gradle.kts
index 6d50be082030..4a7a327a1789 100644
--- a/junit-bom/junit-bom.gradle.kts
+++ b/junit-bom/junit-bom.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 	`java-platform`
+	`java-toolchain-conventions`
 	`publishing-conventions`
-	`custom-java-home`
 }
 
 description = "${rootProject.description} (Bill of Materials)"

From 2d42030bf87effac2216865b273026801ab71bbc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 4 Oct 2020 13:58:52 +0200
Subject: [PATCH 0016/1433] Configure Java release for test fixtures

---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 12fb79884da3..da74eb53f918 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -286,7 +286,10 @@ tasks {
 }
 
 pluginManager.withPlugin("java-test-fixtures") {
-	tasks.named<Checkstyle>("checkstyleTestFixtures").configure {
+	tasks.named<Checkstyle>("checkstyleTestFixtures") {
 		configFile = rootProject.file("src/checkstyle/checkstyleTest.xml")
 	}
+	tasks.named<JavaCompile>("compileTestFixturesJava") {
+		options.release.set(extension.testJavaVersion.majorVersion.toInt())
+	}
 }

From 0592102bf1a3fcec9e0f1f6eb13d6d81196fa15f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Oct 2020 20:57:40 +0200
Subject: [PATCH 0017/1433] Let Gradle find Java 8 toolchain

---
 .github/workflows/cross-version.yml           |  2 +-
 .../platform-tooling-support-tests.gradle.kts | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 9a1560ef20d2..beb9521299bc 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -46,4 +46,4 @@ jobs:
       - name: Test
         run: |
           ./gradlew --version
-          ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=ADDITIONAL_JDK -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
+          ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,ADDITIONAL_JDK -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index fc5cc895609a..9a6bd0585fd8 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -56,23 +56,15 @@ tasks.test {
 		(mavenizedProjects + project(":junit-bom"))
 				.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") }
 				.forEach { dependsOn(it) }
-		// Pass "java.home.N" system properties from sources like "~/.gradle/gradle.properties".
-		// Values will be picked up by: platform.tooling.support.Helper::getJavaHome
-		for (N in 8..99) {
-			val home = project.properties["java.home.$N"] ?: System.getenv("JDK$N")
-			if (home != null) systemProperty("java.home.$N", home)
-		}
-		// TODO Enabling parallel execution fails due to Gradle's listener not being thread-safe:
-		//   Received a completed event for test with unknown id "10.5".
-		//   Registered test ids: "[:platform-tooling-support-tests:test, 10.1]"
-		// systemProperty("junit.jupiter.execution.parallel.enabled", "true")
 
 		// Pass version constants (declared in Versions.kt) to tests as system properties
 		systemProperty("Versions.apiGuardian", versions.apiguardian)
 		systemProperty("Versions.assertJ", versions.assertj)
 		systemProperty("Versions.junit4", versions.junit4)
 		systemProperty("Versions.ota4j", versions.opentest4j)
+
 		jvmArgumentProviders += MavenRepo(tempRepoDir)
+		jvmArgumentProviders += JavaHomeDir(project, 8)
 	}
 
 	filter {
@@ -90,3 +82,17 @@ tasks.test {
 class MavenRepo(@get:InputDirectory @get:PathSensitive(PathSensitivity.RELATIVE) val repoDir: File) : CommandLineArgumentProvider {
 	override fun asArguments() = listOf("-Dmaven.repo=$repoDir")
 }
+
+class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgumentProvider {
+	@Internal
+	val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
+			.value(project.the<JavaToolchainService>().launcherFor {
+				languageVersion.set(JavaLanguageVersion.of(version))
+			})
+
+	override fun asArguments(): List<String> {
+		val metadata = javaLauncher.map { it.metadata }
+		val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
+		return javaHome?.let { listOf("-Djava.home.$version=$it") } ?: emptyList()
+	}
+}

From 1ca7b514f8a09769dd88d3c0b9ee036a5ffac70e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Oct 2020 21:11:25 +0200
Subject: [PATCH 0018/1433] Don't resolve toolchain at configuration time

---
 .../main/kotlin/java-toolchain-conventions.gradle.kts  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index b8acf3f7cc9c..e174a3660d1b 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -4,15 +4,13 @@ val javaToolchainVersion: String? by project
 
 project.pluginManager.withPlugin("java") {
 	val extension = the<JavaPluginExtension>()
-	val javaLanguageVersion = JavaLanguageVersion.of(javaToolchainVersion?.toInt() ?: 11)
+	val javaToolchainService = the<JavaToolchainService>()
 	extension.toolchain {
-		languageVersion.set(javaLanguageVersion)
+		languageVersion.set(JavaLanguageVersion.of(javaToolchainVersion?.toInt() ?: 11))
 	}
-	val service = the<JavaToolchainService>()
-	val javaHome = service.compilerFor(extension.toolchain).get().metadata.installationPath.asFile.absolutePath
 	tasks.withType<KotlinJvmCompile>().configureEach {
-		kotlinOptions {
-			jdkHome = javaHome
+		doFirst {
+			kotlinOptions.jdkHome = javaToolchainService.compilerFor(extension.toolchain).get().metadata.installationPath.asFile.absolutePath
 		}
 	}
 }

From 1b8fdd0a7cc61a639cabcb1b4a0bd7735a72686b Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Tue, 6 Oct 2020 08:53:28 +0200
Subject: [PATCH 0019/1433] Upgrade JaCoCo to 0.8.6

https://www.jacoco.org/jacoco/trunk/doc/changes.html
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6495ec07d862..6dedcd348422 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -39,7 +39,7 @@ spock.version=1.3-groovy-2.5
 
 # Tools
 checkstyle.version=8.31
-jacoco.version=0.8.5
+jacoco.version=0.8.6
 jmh.version=1.25
 ktlint.version=0.35.0
 surefire.version=2.22.2

From 7ca3c6f0934a5535a2868960557ca9190178c644 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Tue, 6 Oct 2020 09:21:53 +0200
Subject: [PATCH 0020/1433] Upgrade CheckStyle to 8.36.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6dedcd348422..b0055eabb331 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,7 +38,7 @@ slf4j.version=1.7.30
 spock.version=1.3-groovy-2.5
 
 # Tools
-checkstyle.version=8.31
+checkstyle.version=8.36.1
 jacoco.version=0.8.6
 jmh.version=1.25
 ktlint.version=0.35.0

From 134e04b9a1b644fa52165b6f7dc690cde63a1018 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Tue, 6 Oct 2020 09:49:45 +0200
Subject: [PATCH 0021/1433] Upgrade Spotless Plugin to 5.5.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b0055eabb331..7c31715ba09b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,7 +49,7 @@ bnd.version=5.1.2
 gradle.enterprise.plugin.version=3.4.1
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.29.0
-spotless.plugin.version=5.1.1
+spotless.plugin.version=5.5.1
 git-publish.plugin.version=2.1.3
 kotlin.plugin.version=1.4.0
 asciidoctor-pdf.version=1.5.3

From 34b99ffaf4a75c6782c21757244c928d75716714 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 6 Oct 2020 12:40:32 +0200
Subject: [PATCH 0022/1433] Enable info logging to debug Toolchain flakiness

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2a4b5da0d7e0..9cd82aafb49e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -79,7 +79,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true build
+        ./gradlew --info --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true build
         ./gradlew --stop
   mac:
     name: 'Mac OS'

From 5d89d5f4147268a008e0473419eb215a200e1961 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Tue, 6 Oct 2020 15:16:14 +0200
Subject: [PATCH 0023/1433] Upgrade CheckStyle to 8.36.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7c31715ba09b..407cb5025b07 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,7 +38,7 @@ slf4j.version=1.7.30
 spock.version=1.3-groovy-2.5
 
 # Tools
-checkstyle.version=8.36.1
+checkstyle.version=8.36.2
 jacoco.version=0.8.6
 jmh.version=1.25
 ktlint.version=0.35.0

From c74bba43710decdabd51f9b6d10bd5d3e8393d71 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 10 Oct 2020 11:18:51 +0200
Subject: [PATCH 0024/1433] Upgrade to Shadow 6.1.0

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index fd74ea278a13..679ce910df40 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,6 +11,6 @@ dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0")
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2")
-	implementation("com.github.jengelman.gradle.plugins:shadow:6.0.0")
+	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.1.8")
 }

From cabaf221dad03392e764cb38c7bf2d057f8e7397 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 10 Oct 2020 16:57:49 +0200
Subject: [PATCH 0025/1433] Upgradle to 6.7-rc-4

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6e888e8ac8fa..af6df179e1ab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f4a236ffc777d6a4c25cdf7b1c45fe7024910afc65c88a9c9027aab9a765d295
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-3-bin.zip
+distributionSha256Sum=01b4f3804b6c3f15ff3eb39e56efae55e265b6007c9fa3bd58b83b2dc4697dc4
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From c0a6ca5c178a1a2a0a9a3be3c6abb22f5cf1c3b7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 6 Oct 2020 18:51:22 +0200
Subject: [PATCH 0026/1433] Remove custom env vars for toolchains

Since Gradle supports SDKMAN out of the box.
---
 .github/workflows/cross-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index beb9521299bc..ca3d0ccd12c1 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -46,4 +46,4 @@ jobs:
       - name: Test
         run: |
           ./gradlew --version
-          ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,ADDITIONAL_JDK -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
+          ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"

From 08153b7165196d5e6abb0480b544199dee7ba7a7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Oct 2020 11:15:14 +0200
Subject: [PATCH 0027/1433] Disable auto-download of toolchains

---
 .github/workflows/cross-version.yml      | 1 +
 .github/workflows/main.yml               | 5 +++--
 .github/workflows/reproducible-build.yml | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index ca3d0ccd12c1..6b1774a247d2 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -12,6 +12,7 @@ on:
 env:
   ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
   ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
+  ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
 
 jobs:
   openjdk:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9cd82aafb49e..af945e84538e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,6 +12,7 @@ on:
 env:
   ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
   ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
+  ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
 
 jobs:
   linux:
@@ -23,7 +24,7 @@ jobs:
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
-        path: | 
+        path: |
           /root/.gradle/caches/
           /root/.gradle/wrapper/dists
         key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
@@ -53,7 +54,7 @@ jobs:
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
-        path: | 
+        path: |
           ~/.gradle/caches/
           ~/.gradle/wrapper/dists
         key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index e48b0c5ff1b2..7df4ae9e9610 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -9,6 +9,9 @@ on:
     branches:
     - '*'
 
+env:
+  ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
+
 jobs:
   check_build_reproducibility:
     name: 'Check build reproducibility'

From 1c04a4c78c7465be12ee6d8cfbdfefccc4b39f9f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Oct 2020 21:18:54 +0200
Subject: [PATCH 0028/1433] Remove trailing whitespace

---
 .github/workflows/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index af945e84538e..8e600859e501 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -90,7 +90,7 @@ jobs:
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
-        path: | 
+        path: |
           ~/.gradle/caches/
           ~/.gradle/wrapper/dists
         key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
@@ -126,7 +126,7 @@ jobs:
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
-        path: | 
+        path: |
           /root/.gradle/caches/
           /root/.gradle/wrapper/dists
         key: coverage-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
@@ -169,7 +169,7 @@ jobs:
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
-        path: | 
+        path: |
           ~/.gradle/caches/
           ~/.gradle/wrapper/dists
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
@@ -196,7 +196,7 @@ jobs:
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
-        path: | 
+        path: |
           ~/.gradle/caches/
           ~/.gradle/wrapper/dists
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}

From 8f4de76b2654d99fb13c2ca841c73143a6dce375 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 8 Oct 2020 07:31:56 +0200
Subject: [PATCH 0029/1433] Add JDK 8 to Windows builds

---
 .github/workflows/main.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e600859e501..1a40670e33d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,6 +67,13 @@ jobs:
         key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           test-${{ runner.os }}-maven-
+    - name: 'Set up JDK 8'
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: 'Prepare JDK8 env var'
+      shell: bash
+      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
     - name: 'Set up JDK 11'
       uses: actions/setup-java@v1
       with:
@@ -80,7 +87,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --info --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true build
+        ./gradlew --info --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
         ./gradlew --stop
   mac:
     name: 'Mac OS'

From 38d54ea84c18592d0d8812e33efd2eee61db191b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 8 Oct 2020 07:48:51 +0200
Subject: [PATCH 0030/1433] Make Java 8 toolchain optional

---
 .../platform-tooling-support-tests.gradle.kts        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 9a6bd0585fd8..1f45aa624309 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.jvm.toolchain.internal.NoToolchainAvailableException
+
 plugins {
 	`java-library-conventions`
 	`testing-conventions`
@@ -86,8 +88,14 @@ class MavenRepo(@get:InputDirectory @get:PathSensitive(PathSensitivity.RELATIVE)
 class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgumentProvider {
 	@Internal
 	val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
-			.value(project.the<JavaToolchainService>().launcherFor {
-				languageVersion.set(JavaLanguageVersion.of(version))
+			.value(project.provider {
+				try {
+					project.the<JavaToolchainService>().launcherFor {
+						languageVersion.set(JavaLanguageVersion.of(version))
+					}.get()
+				} catch (e: NoToolchainAvailableException) {
+					null
+				}
 			})
 
 	override fun asArguments(): List<String> {

From 9b61cebecbe25063ad6abefdbca92fa4a7141a19 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 8 Oct 2020 07:52:53 +0200
Subject: [PATCH 0031/1433] Remove info logging again

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1a40670e33d8..1fe43d5043d2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,7 +87,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --info --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
+        ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
         ./gradlew --stop
   mac:
     name: 'Mac OS'

From 5565b1c7dfd74fdfaa01d43db60ee0763c18e6f7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 8 Oct 2020 08:47:25 +0200
Subject: [PATCH 0032/1433] Remove unused Maven toolchain lookup

---
 .../java/platform/tooling/support/Helper.java | 48 ++++---------------
 .../platform/tooling/support/HelperTests.java |  8 ++--
 2 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 2075a8a9477b..2e26c94b6491 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -24,16 +24,12 @@
 import java.util.Properties;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPathFactory;
-
 /**
  * @since 1.3
  */
@@ -117,43 +113,15 @@ public static List<JarFile> loadJarFiles() {
 
 	public static Optional<Path> getJavaHome(String version) {
 		// First, try various system sources...
-		List<Supplier<String>> sources = List.of( //
-			() -> System.getProperty("java.home." + version), //
-			() -> System.getProperty("java." + version), //
-			() -> System.getProperty("jdk.home." + version), //
-			() -> System.getProperty("jdk." + version), //
-			() -> System.getenv("JAVA_HOME_" + version), //
-			() -> System.getenv("JAVA_" + version) //
+		Stream<String> sources = Stream.of( //
+			System.getProperty("java.home." + version), //
+			System.getProperty("java." + version), //
+			System.getProperty("jdk.home." + version), //
+			System.getProperty("jdk." + version), //
+			System.getenv("JAVA_HOME_" + version), //
+			System.getenv("JAVA_" + version) //
 		);
-		var home = sources.stream().map(Supplier::get).filter(Objects::nonNull).findFirst();
-		// If no java home set then inspect Maven Toolchains configuration file...
-		return home.map(h -> Path.of(h)).or(() -> getJdkHomeFromMavenToolchains(version));
-	}
-
-	// https://maven.apache.org/guides/mini/guide-using-toolchains.html
-	static Optional<Path> getJdkHomeFromMavenToolchains(String version) {
-		var mavenToolChains = Path.of(System.getProperty("user.home"), ".m2", "toolchains.xml");
-		if (!Files.isRegularFile(mavenToolChains)) {
-			return Optional.empty();
-		}
-		try {
-			var builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			var document = builder.parse(mavenToolChains.toFile());
-			var xpath = XPathFactory.newInstance().newXPath();
-			var jdkHome = xpath.evaluate("//toolchains" //
-					+ "/toolchain[descendant::type[text()='jdk']]" //
-					+ "/provides[descendant::version[text()='" + version + "']]" //
-					+ "/.." //
-					+ "/configuration/jdkHome",
-				document);
-			if (!jdkHome.isBlank()) {
-				return Optional.of(Path.of(jdkHome));
-			}
-		}
-		catch (Exception e) {
-			// ignore
-		}
-		return Optional.empty();
+		return sources.filter(Objects::nonNull).findFirst().map(Path::of);
 	}
 
 	/** Load, here copy, modular jar files to the given target directory. */
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
index 95f5d819fade..681f184d3391 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
@@ -56,13 +56,13 @@ void version() {
 
 	@Test
 	void nonExistingJdkVersionYieldsAnEmptyOptional() {
-		assertEquals(Optional.empty(), Helper.getJdkHomeFromMavenToolchains("does not exist"));
+		assertEquals(Optional.empty(), Helper.getJavaHome("does not exist"));
 	}
 
 	@ParameterizedTest
-	@ValueSource(ints = { 8, 9, 10, 11, 12, 13 })
-	void checkMavenToolchainsPointingValidJdkInstallations(int version) {
-		var home = Helper.getJdkHomeFromMavenToolchains("" + version);
+	@ValueSource(ints = 8)
+	void checkJavaHome(int version) {
+		var home = Helper.getJavaHome(String.valueOf(version));
 		assumeTrue(home.isPresent(), "No 'jdk' element found in Maven toolchain for: " + version);
 		assertTrue(Files.isDirectory(home.get()));
 	}

From 8c1ddc5106c224d3c8372bd13f6146aa142fb826 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 10 Oct 2020 18:05:47 +0200
Subject: [PATCH 0033/1433] Upgrade Spotless

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 407cb5025b07..8942b741e170 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,7 +49,7 @@ bnd.version=5.1.2
 gradle.enterprise.plugin.version=3.4.1
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.29.0
-spotless.plugin.version=5.5.1
+spotless.plugin.version=5.6.1
 git-publish.plugin.version=2.1.3
 kotlin.plugin.version=1.4.0
 asciidoctor-pdf.version=1.5.3

From 0225bdacad82c4c6b438c27dd89f41b3e3740352 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 09:25:00 +0200
Subject: [PATCH 0034/1433] Build test code with Java 15 (#2446)

Test code is now compiled with Java 15 language level. Thus, the default
toolchain has been changed to Java 15. The build can be run with an
older version of Java, though, as Gradle will discover/downloads
matching toolchains automatically. LGTM is dropped as part of this PR
because it doesn't support running on Java 15. The CodeQL analysis
build now only compiles main classes.

Co-authored-by: Christian Stein <sormuras@gmail.com>
---
 .github/workflows/codeql-analysis.yml         | 14 ++++----
 .github/workflows/cross-version.yml           |  2 +-
 .github/workflows/main.yml                    | 22 ++++++-------
 .github/workflows/reproducible-build.yml      |  4 +--
 .lgtm.yml                                     |  4 ---
 README.md                                     |  4 +--
 build.gradle.kts                              |  5 ++-
 .../src/main/kotlin/JavaLibraryExtension.kt   |  2 +-
 .../java-toolchain-conventions.gradle.kts     | 15 ++++++---
 .../api/AssertLinesMatchAssertionsTests.java  | 32 +++++++++++++++----
 settings.gradle.kts                           |  4 +--
 11 files changed, 67 insertions(+), 41 deletions(-)
 delete mode 100644 .lgtm.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5247cf51f210..89f58eef355c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}
 
-      # Install and setup JDK 11
+      # Install and setup JDK
     - name: Setup JDK 11
       uses: actions/setup-java@v1
       with:
@@ -59,8 +59,8 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,10 +68,10 @@ jobs:
     # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
+    - name: Build
+      run: |
+        ./gradlew --version
+        ./gradlew allMainClasses -PjavaToolchainVersion=11
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 6b1774a247d2..f25ce85cba03 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -18,7 +18,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [14, 15, 16]
+        jdk: [16]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     container: "junitteam/build:${{ matrix.jdk }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1fe43d5043d2..6cb9abaf282b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
   linux:
     name: 'Linux'
     runs-on: ubuntu-latest
-    container: junitteam/build:latest
+    container: junitteam/build:15
     steps:
     - uses: actions/checkout@v2
     - name: Cache Gradle wrapper and dependencies
@@ -74,10 +74,10 @@ jobs:
     - name: 'Prepare JDK8 env var'
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: 'Set up JDK 11'
+    - name: 'Set up JDK 15'
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 15
     - name: Prepare Gradle Enterprise credentials
       shell: bash
       run: |
@@ -110,10 +110,10 @@ jobs:
         key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           test-${{ runner.os }}-maven-
-    - name: 'Set up JDK 11'
+    - name: 'Set up JDK 15'
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 15
     - name: Prepare Gradle Enterprise credentials
       run: |
         mkdir -p $HOME/.gradle/enterprise/
@@ -146,10 +146,10 @@ jobs:
         key: coverage-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           coverage-${{ runner.os }}-maven-
-    - name: 'Set up JDK 11'
+    - name: 'Set up JDK 15'
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 15
     - name: Prepare Gradle Enterprise credentials
       run: |
         mkdir -p /root/.gradle/enterprise/
@@ -182,10 +182,10 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: 'Set up JDK 11'
+    - name: 'Set up JDK 15'
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 15
     - name: 'Publish'
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
@@ -209,10 +209,10 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: 'Set up JDK 11'
+    - name: 'Set up JDK 15'
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 15
     - name: 'Upload Documentation'
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 7df4ae9e9610..c50b8a0baf47 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -27,10 +27,10 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: 'Set up JDK 11'
+    - name: 'Set up JDK 15'
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 15
     - name: Prepare Gradle Enterprise credentials
       shell: bash
       run: |
diff --git a/.lgtm.yml b/.lgtm.yml
deleted file mode 100644
index eb5f4c9b7a25..000000000000
--- a/.lgtm.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-extraction:
-  java:
-    index:
-      java_version: 11
diff --git a/README.md b/README.md
index 5439f0bf54c0..014d1b8f6c32 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ so that local builds can reuse task outputs from previous CI builds.
 
 ## Building from Source
 
-You need [JDK 11] to build JUnit 5.
+You need [JDK 15] to build JUnit 5.
 
 All modules can be _built_ with the [Gradle Wrapper] using the following command.
 
@@ -92,7 +92,7 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 [Gradle Wrapper]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:using_wrapper
 [JaCoCo]: https://www.eclemma.org/jacoco/
 [Javadoc]: https://junit.org/junit5/docs/current/api/
-[JDK 11]: https://jdk.java.net/11/
+[JDK 11]: https://jdk.java.net/15/
 [Release Notes]: https://junit.org/junit5/docs/current/release-notes/
 [Samples]: https://github.com/junit-team/junit5-samples
 [StackOverflow]: https://stackoverflow.com/questions/tagged/junit5
diff --git a/build.gradle.kts b/build.gradle.kts
index 21721cdfe334..e3bfa95a1c9b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -140,7 +140,10 @@ subprojects {
 				licenseHeaderFile(headerFile, "(package|import|open|module) ")
 				importOrderFile(importOrderConfigFile)
 				eclipse().configFile(javaFormatterConfigFile)
-				removeUnusedImports()
+				if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_15)) {
+					// Doesn't work with Java 15 text blocks, see https://github.com/diffplug/spotless/issues/713
+					removeUnusedImports()
+				}
 				trimTrailingWhitespace()
 				endWithNewline()
 			}
diff --git a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
index 7c020478d6c3..86da500d0a5f 100644
--- a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
+++ b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
@@ -3,5 +3,5 @@ import org.gradle.api.JavaVersion
 @Suppress("UnstableApiUsage")
 open class JavaLibraryExtension {
     var mainJavaVersion: JavaVersion = Versions.jvmTarget
-    var testJavaVersion: JavaVersion = JavaVersion.VERSION_11
+    var testJavaVersion: JavaVersion = JavaVersion.VERSION_15
 }
diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index e174a3660d1b..7fcb690a3f0f 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -1,16 +1,23 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 
 val javaToolchainVersion: String? by project
+val defaultLanguageVersion = JavaLanguageVersion.of(15)!!
+val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: defaultLanguageVersion
 
 project.pluginManager.withPlugin("java") {
 	val extension = the<JavaPluginExtension>()
 	val javaToolchainService = the<JavaToolchainService>()
-	extension.toolchain {
-		languageVersion.set(JavaLanguageVersion.of(javaToolchainVersion?.toInt() ?: 11))
-	}
+	extension.toolchain.languageVersion.set(javaLanguageVersion)
+	val compiler = javaToolchainService.compilerFor(extension.toolchain)
 	tasks.withType<KotlinJvmCompile>().configureEach {
 		doFirst {
-			kotlinOptions.jdkHome = javaToolchainService.compilerFor(extension.toolchain).get().metadata.installationPath.asFile.absolutePath
+			kotlinOptions.jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
 		}
 	}
+	tasks.withType<JavaCompile>().configureEach {
+		javaCompiler.set(compiler)
+	}
+	tasks.withType<JavaExec>().configureEach {
+		javaLauncher.set(javaToolchainService.launcherFor(extension.toolchain))
+	}
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
index 775c46372572..521f07585d6d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
@@ -285,16 +285,36 @@ void assertLinesMatchSameListInstance() {
 
 		@Test
 		void assertLinesMatchPlainEqualLists() {
-			List<String> expected = List.of("first line", "second line", "third line", "last line");
-			List<String> actual = List.of("first line", "second line", "third line", "last line");
-			assertLinesMatch(expected, actual);
+			var expected = """
+					first line
+					second line
+					third line
+					last line
+					""";
+			var actual = """
+					first line
+					second line
+					third line
+					last line
+					""";
+			assertLinesMatch(expected.lines(), actual.lines());
 		}
 
 		@Test
 		void assertLinesMatchUsingRegexPatterns() {
-			List<String> expected = List.of("^first.+line", "second\\s*line", "th.rd l.ne", "last line$");
-			List<String> actual = List.of("first line", "second line", "third line", "last line");
-			assertLinesMatch(expected, actual);
+			var expected = """
+					^first.+line
+					second\\s*line
+					th.rd l.ne
+					last line$
+					""";
+			var actual = """
+					first line
+					second line
+					third line
+					last line
+					""";
+			assertLinesMatch(expected.lines(), actual.lines());
 		}
 	}
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0d548d7b34ff..cb92e1578417 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -58,8 +58,8 @@ buildCache {
 }
 
 val javaVersion = JavaVersion.current()
-require(javaVersion.isJava11Compatible) {
-	"The JUnit 5 build requires Java 11 or higher. Currently executing with Java ${javaVersion.majorVersion}."
+require(javaVersion.isJava9Compatible) {
+	"The JUnit 5 build requires Java 9 or higher. Currently executing with Java ${javaVersion.majorVersion}."
 }
 
 rootProject.name = "junit5"

From 4955990214f966e8564d6da65afb72f3d2cb2fc3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 09:32:17 +0200
Subject: [PATCH 0035/1433] Fix link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 014d1b8f6c32..7751939d85d3 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 [Gradle Wrapper]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:using_wrapper
 [JaCoCo]: https://www.eclemma.org/jacoco/
 [Javadoc]: https://junit.org/junit5/docs/current/api/
-[JDK 11]: https://jdk.java.net/15/
+[JDK 15]: https://jdk.java.net/15/
 [Release Notes]: https://junit.org/junit5/docs/current/release-notes/
 [Samples]: https://github.com/junit-team/junit5-samples
 [StackOverflow]: https://stackoverflow.com/questions/tagged/junit5

From c01da2de56cfc4d6745ea43c74f00a4ce11f6ac8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 11:16:50 +0200
Subject: [PATCH 0036/1433] Remove unnecessary empty array arguments

---
 .../java/org/junit/platform/commons/util/ClassUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ReflectionUtilsTests.java   | 1 -
 .../org/junit/platform/launcher/core/DefaultLauncherTests.java  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
index 601edf728f1a..5aa80642e595 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
@@ -34,7 +34,7 @@ void nullSafeToStringWithDefaultMapper() {
 	@Test
 	void nullSafeToStringWithCustomMapper() {
 		assertEquals("", nullSafeToString(Class::getSimpleName, (Class<?>[]) null));
-		assertEquals("", nullSafeToString(Class::getSimpleName, new Class<?>[0]));
+		assertEquals("", nullSafeToString(Class::getSimpleName));
 		assertEquals("String", nullSafeToString(Class::getSimpleName, String.class));
 		assertEquals("String, Integer", nullSafeToString(Class::getSimpleName, String.class, Integer.class));
 		assertEquals("String, null, Integer",
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 64e9bdddc4df..dbcc8e6b94ec 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -192,7 +192,6 @@ void newInstance() {
 		// @formatter:off
 		assertThat(ReflectionUtils.newInstance(C.class, "one", "two")).isNotNull();
 		assertThat(ReflectionUtils.newInstance(C.class)).isNotNull();
-		assertThat(ReflectionUtils.newInstance(C.class, new Object[0])).isNotNull();
 
 		assertThrows(PreconditionViolationException.class, () -> ReflectionUtils.newInstance(C.class, "one", null));
 		assertThrows(PreconditionViolationException.class, () -> ReflectionUtils.newInstance(C.class, null, "two"));
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 415294ae4627..f0cd69a98c11 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -115,7 +115,7 @@ void registerTestExecutionListenersWithEmptyArray() {
 		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"));
 
 		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> launcher.registerTestExecutionListeners(new TestExecutionListener[0]));
+			() -> launcher.registerTestExecutionListeners());
 
 		assertThat(exception).hasMessageContaining("listeners array must not be null or empty");
 	}

From 61a5e0f84a2056f26b4d4d3c6a90f0a6f15c7dad Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 11:17:15 +0200
Subject: [PATCH 0037/1433] Remove unnecessary explicit type conversion

---
 .../src/test/java/org/junit/platform/engine/UniqueIdTests.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
index 6c545f374ede..c3cf0b56b22b 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
@@ -153,7 +153,7 @@ void ensureDefaultUniqueIdFormatDecodingEncodesSegmentParts() {
 		@Test
 		void ensureDefaultUniqueIdFormatCanHandleAllCharacters() {
 			for (char c = 0; c < Character.MAX_VALUE; c++) {
-				String value = "foo " + String.valueOf(c) + " bar";
+				String value = "foo " + c + " bar";
 				UniqueId uniqueId = UniqueId.parse(UniqueId.root("type", value).toString());
 				Segment segment = uniqueId.getSegments().get(0);
 				assertEquals(value, segment.getValue());

From 8ee7d9aa4f560eea6c1d30f16bf5b71c8ed168f8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 11:17:23 +0200
Subject: [PATCH 0038/1433] Remove unnecessary cast

---
 .../platform/commons/support/AnnotationSupportTests.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
index 560d6c71444b..810654073da5 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
@@ -227,7 +227,7 @@ void findAnnotatedFieldValuesPreconditions() {
 			() -> AnnotationSupport.findAnnotatedFieldValues(this, null));
 
 		assertPreconditionViolationException("Class",
-			() -> AnnotationSupport.findAnnotatedFieldValues((Class<?>) null, FieldMarker.class));
+			() -> AnnotationSupport.findAnnotatedFieldValues(null, FieldMarker.class));
 		assertPreconditionViolationException("annotationType",
 			() -> AnnotationSupport.findAnnotatedFieldValues(Probe.class, null));
 
@@ -239,7 +239,7 @@ void findAnnotatedFieldValuesPreconditions() {
 			() -> AnnotationSupport.findAnnotatedFieldValues(this, FieldMarker.class, null));
 
 		assertPreconditionViolationException("Class",
-			() -> AnnotationSupport.findAnnotatedFieldValues((Class<?>) null, FieldMarker.class, Number.class));
+			() -> AnnotationSupport.findAnnotatedFieldValues(null, FieldMarker.class, Number.class));
 		assertPreconditionViolationException("annotationType",
 			() -> AnnotationSupport.findAnnotatedFieldValues(Probe.class, null, Number.class));
 		assertPreconditionViolationException("fieldType",

From 0bcf3afcd1b0de71a4f9b27cbb151cdef6ce4b49 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 11:20:07 +0200
Subject: [PATCH 0039/1433] Use lambda

---
 .../junit/platform/commons/util/CollectionUtilsTests.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index eeb9404d20e7..ba2656d8dd3a 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -165,13 +165,7 @@ public Stream<String> stream() {
 	@SuppressWarnings("unchecked")
 	void toStreamWithIterable() {
 
-		Iterable<String> input = new Iterable<>() {
-
-			@Override
-			public Iterator<String> iterator() {
-				return asList("foo", "bar").iterator();
-			}
-		};
+		Iterable<String> input = () -> asList("foo", "bar").iterator();
 
 		Stream<String> result = (Stream<String>) CollectionUtils.toStream(input);
 

From 85b3c2690902d7c1019468e4c30fe7ee845d2c51 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 11:21:02 +0200
Subject: [PATCH 0040/1433] Use method references

---
 .../junit/platform/commons/util/ReflectionUtilsTests.java    | 2 +-
 .../platform/engine/support/descriptor/ClassSourceTests.java | 2 +-
 .../junit/platform/launcher/core/DefaultLauncherTests.java   | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index dbcc8e6b94ec..4b259be2152b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -752,7 +752,7 @@ void findNestedClassesWithInvalidNestedClassFile(LogRecordListener listener) thr
 
 			assertEquals(fqcn, classWithInvalidNestedClassFile.getName());
 			NoClassDefFoundError noClassDefFoundError = assertThrows(NoClassDefFoundError.class,
-				() -> classWithInvalidNestedClassFile.getDeclaredClasses());
+				classWithInvalidNestedClassFile::getDeclaredClasses);
 			assertEquals("tests/NestedInterfaceGroovyTests$NestedInterface$1", noClassDefFoundError.getMessage());
 
 			assertThat(findNestedClasses(classWithInvalidNestedClassFile)).isEmpty();
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
index 2f2f7e30097d..c9ef68082966 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
@@ -54,7 +54,7 @@ void classSourceFromName() {
 		assertThat(source.getClassName()).isEqualTo(testClassName);
 		assertThat(source.getPosition()).isEmpty();
 
-		var exception = assertThrows(PreconditionViolationException.class, () -> source.getJavaClass());
+		var exception = assertThrows(PreconditionViolationException.class, source::getJavaClass);
 		assertThat(exception).hasMessage("Could not load class with name: " + testClassName);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index f0cd69a98c11..5a1f49960103 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -86,7 +86,8 @@ class DefaultLauncherTests {
 
 	@Test
 	void constructLauncherWithoutAnyEngines() {
-		Throwable exception = assertThrows(PreconditionViolationException.class, () -> createLauncher());
+		Throwable exception = assertThrows(PreconditionViolationException.class,
+			LauncherFactoryForTestingPurposesOnly::createLauncher);
 
 		assertThat(exception).hasMessageContaining("Cannot create Launcher without at least one TestEngine");
 	}
@@ -115,7 +116,7 @@ void registerTestExecutionListenersWithEmptyArray() {
 		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"));
 
 		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> launcher.registerTestExecutionListeners());
+			launcher::registerTestExecutionListeners);
 
 		assertThat(exception).hasMessageContaining("listeners array must not be null or empty");
 	}

From f0279c5676852c8fd4a0c2391f913b52c7a1a418 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 11:22:38 +0200
Subject: [PATCH 0041/1433] Use expression lambdas

---
 .../commons/util/CollectionUtilsTests.java         | 14 +++++---------
 .../platform/commons/util/FunctionUtilsTests.java  |  8 ++------
 .../commons/util/ToStringBuilderTests.java         |  8 ++------
 .../AbstractLauncherDiscoveryListenerTests.java    | 14 ++++++--------
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index ba2656d8dd3a..ce0671e2aac9 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -47,17 +47,14 @@ class CollectionUtilsTests {
 
 	@Test
 	void getOnlyElementWithNullCollection() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			CollectionUtils.getOnlyElement(null);
-		});
+		var exception = assertThrows(PreconditionViolationException.class, () -> CollectionUtils.getOnlyElement(null));
 		assertEquals("collection must not be null", exception.getMessage());
 	}
 
 	@Test
 	void getOnlyElementWithEmptyCollection() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			CollectionUtils.getOnlyElement(emptySet());
-		});
+		var exception = assertThrows(PreconditionViolationException.class,
+			() -> CollectionUtils.getOnlyElement(emptySet()));
 		assertEquals("collection must contain exactly one element: []", exception.getMessage());
 	}
 
@@ -70,9 +67,8 @@ void getOnlyElementWithSingleElementCollection() {
 
 	@Test
 	void getOnlyElementWithMultiElementCollection() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			CollectionUtils.getOnlyElement(asList("foo", "bar"));
-		});
+		var exception = assertThrows(PreconditionViolationException.class,
+			() -> CollectionUtils.getOnlyElement(asList("foo", "bar")));
 		assertEquals("collection must contain exactly one element: [foo, bar]", exception.getMessage());
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
index 60f4f5a7250f..d76472b95553 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
@@ -30,17 +30,13 @@ class FunctionUtilsTests {
 
 	@Test
 	void whereWithNullFunction() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			FunctionUtils.where(null, o -> true);
-		});
+		var exception = assertThrows(PreconditionViolationException.class, () -> FunctionUtils.where(null, o -> true));
 		assertEquals("function must not be null", exception.getMessage());
 	}
 
 	@Test
 	void whereWithNullPredicate() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			FunctionUtils.where(o -> o, null);
-		});
+		var exception = assertThrows(PreconditionViolationException.class, () -> FunctionUtils.where(o -> o, null));
 		assertEquals("predicate must not be null", exception.getMessage());
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
index 98b3716c6bc6..9ce48ce795ab 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
@@ -28,16 +28,12 @@ class ToStringBuilderTests {
 
 	@Test
 	void withNullObject() {
-		assertThrows(PreconditionViolationException.class, () -> {
-			new ToStringBuilder((Object) null);
-		});
+		assertThrows(PreconditionViolationException.class, () -> new ToStringBuilder((Object) null));
 	}
 
 	@Test
 	void withNullClass() {
-		assertThrows(PreconditionViolationException.class, () -> {
-			new ToStringBuilder((Class<?>) null);
-		});
+		assertThrows(PreconditionViolationException.class, () -> new ToStringBuilder((Class<?>) null));
 	}
 
 	@Test
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
index 9c9f88f140e2..f102928d4c9e 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
@@ -24,10 +24,9 @@ protected TestEngineStub createEngineThatCannotResolveAnything(String engineId)
 		return new TestEngineStub(engineId) {
 			@Override
 			public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
-				discoveryRequest.getSelectorsByType(DiscoverySelector.class).forEach(selector -> {
-					discoveryRequest.getDiscoveryListener().selectorProcessed(uniqueId, selector,
-						SelectorResolutionResult.unresolved());
-				});
+				discoveryRequest.getSelectorsByType(DiscoverySelector.class) //
+						.forEach(selector -> discoveryRequest.getDiscoveryListener().selectorProcessed(uniqueId,
+							selector, SelectorResolutionResult.unresolved()));
 				return new EngineDescriptor(uniqueId, "Some Engine");
 			}
 		};
@@ -37,10 +36,9 @@ protected TestEngineStub createEngineThatFailsToResolveAnything(String engineId,
 		return new TestEngineStub(engineId) {
 			@Override
 			public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
-				discoveryRequest.getSelectorsByType(DiscoverySelector.class).forEach(selector -> {
-					discoveryRequest.getDiscoveryListener().selectorProcessed(uniqueId, selector,
-						SelectorResolutionResult.failed(rootCause));
-				});
+				discoveryRequest.getSelectorsByType(DiscoverySelector.class) //
+						.forEach(selector -> discoveryRequest.getDiscoveryListener().selectorProcessed(uniqueId,
+							selector, SelectorResolutionResult.failed(rootCause)));
 				return new EngineDescriptor(uniqueId, "Some Engine");
 			}
 		};

From 869f5b45647867227c97b6fb4e840f49df639227 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 11:29:35 +0200
Subject: [PATCH 0042/1433] Use var

---
 .../junit/jupiter/extensions/Heavyweight.java |   7 +-
 .../platform/commons/function/TryTests.java   |  64 ++---
 .../support/AnnotationSupportTests.java       |  19 +-
 .../support/PreconditionAssertions.java       |   4 +-
 .../support/ReflectionSupportTests.java       |  23 +-
 .../commons/util/AnnotationUtilsTests.java    |  88 ++++---
 .../commons/util/ClassLoaderUtilsTests.java   |   9 +-
 .../ClassNamePatternFilterUtilsTests.java     |   4 +-
 .../commons/util/ClasspathScannerTests.java   |  77 +++----
 .../commons/util/CollectionUtilsTests.java    |  42 ++--
 .../commons/util/FunctionUtilsTests.java      |   4 +-
 .../commons/util/PackageUtilsTests.java       |  12 +-
 .../commons/util/PreconditionsTests.java      |  97 ++++----
 .../commons/util/ReflectionUtilsTests.java    | 122 +++++-----
 ...nUtilsWithGenericTypeHierarchiesTests.java |  10 +-
 .../commons/util/SerializationUtils.java      |   8 +-
 .../platform/console/ConsoleDetailsTests.java |  51 ++--
 .../ConsoleLauncherExecutionResultTests.java  |  10 +-
 .../ConsoleLauncherIntegrationTests.java      |   4 +-
 .../console/ConsoleLauncherTests.java         |  36 +--
 .../console/ConsoleLauncherWrapper.java       |  12 +-
 .../PicocliCommandLineOptionsParserTests.java |  22 +-
 .../tasks/ConsoleTestExecutorTests.java       |  36 +--
 ...CustomContextClassLoaderExecutorTests.java |  13 +-
 .../tasks/DiscoveryRequestCreatorTests.java   |  79 +++----
 .../tasks/FlatPrintingListenerTests.java      |  14 +-
 .../platform/console/tasks/TreeNodeTests.java |   8 +-
 .../console/tasks/TreePrinterTests.java       |   6 +-
 .../tasks/VerboseTreeListenerTests.java       |  18 +-
 .../engine/FilterCompositionTests.java        |   8 +-
 .../junit/platform/engine/TestTagTests.java   |   3 +-
 .../platform/engine/UniqueIdFormatTests.java  |   8 +-
 .../junit/platform/engine/UniqueIdTests.java  |  78 +++----
 .../discovery/ClassNameFilterTests.java       |  20 +-
 .../engine/discovery/ClassSelectorTests.java  |   4 +-
 .../discovery/DiscoverySelectorsTests.java    | 218 +++++++++---------
 .../engine/discovery/FilePositionTests.java   |  21 +-
 .../engine/discovery/MethodSelectorTests.java |   4 +-
 .../discovery/PackageNameFilterTests.java     |  12 +-
 .../PrefixedConfigurationParametersTests.java |   8 +-
 .../AbstractTestDescriptorTests.java          |  19 +-
 .../descriptor/AbstractTestSourceTests.java   |  12 +-
 .../ClasspathResourceSourceTests.java         |  24 +-
 .../descriptor/CompositeTestSourceTests.java  |  10 +-
 .../descriptor/DefaultUriSourceTests.java     |  10 +-
 .../descriptor/DemoClassTestDescriptor.java   |   2 +-
 .../descriptor/DemoMethodTestDescriptor.java  |   2 +-
 .../support/descriptor/FilePositionTests.java |  21 +-
 .../descriptor/FileSystemSourceTests.java     |  32 +--
 .../support/descriptor/MethodSourceTests.java |  57 +++--
 .../descriptor/PackageSourceTests.java        |  12 +-
 .../hierarchical/CompositeLockTests.java      |  27 ++-
 ...elExecutionConfigurationStrategyTests.java |  14 +-
 .../HierarchicalTestExecutorTests.java        | 178 +++++++-------
 .../hierarchical/LockManagerTests.java        |  16 +-
 .../NodeTreeWalkerIntegrationTests.java       |  36 ++-
 .../ParallelExecutionIntegrationTests.java    |  51 ++--
 .../support/hierarchical/SingleLockTests.java |   4 +-
 .../hierarchical/SingleTestExecutorTests.java |  11 +-
 .../hierarchical/ThrowableCollectorTests.java |  17 +-
 .../platform/launcher/TagFilterTests.java     |  28 ++-
 .../launcher/TestIdentifierTests.java         |   6 +-
 .../platform/launcher/TestPlanTests.java      |   6 +-
 .../launcher/TestPostDiscoveryTagFilter.java  |   2 +-
 .../launcher/core/DefaultLauncherTests.java   | 153 ++++++------
 .../EngineDiscoveryResultValidatorTests.java  |  10 +-
 .../core/ExecutionListenerAdapterTests.java   |  19 +-
 .../launcher/core/LauncherConfigTests.java    |  16 +-
 .../LauncherConfigurationParametersTests.java |   9 +-
 .../LauncherDiscoveryRequestBuilderTests.java |  77 +++----
 .../launcher/core/LauncherFactoryTests.java   |  76 +++---
 ...TestExecutionListenerIntegrationTests.java |  30 ++-
 .../launcher/core/StreamInterceptorTests.java |  16 +-
 .../TestExecutionListenerRegistryTests.java   |  31 ++-
 .../listeners/SummaryGenerationTests.java     |  77 +++----
 .../tagexpression/ParserErrorTests.java       |   2 +-
 .../tagexpression/TagExpressionsTests.java    |   2 +-
 .../launcher/tagexpression/TokenTests.java    |  10 +-
 .../legacy/LegacyReportingUtilsTests.java     |  20 +-
 ...egacyXmlReportGeneratingListenerTests.java |  90 ++++----
 .../legacy/xml/XmlReportAssertions.java       |   7 +-
 .../legacy/xml/XmlReportDataTests.java        |  28 ++-
 .../legacy/xml/XmlReportWriterTests.java      |  80 +++----
 .../runner/JUnitPlatformRunnerTests.java      | 217 +++++++++--------
 .../platform/testkit/engine/EventsTests.java  |  22 +-
 .../engine/ExecutionsIntegrationTests.java    |  12 +-
 .../NestedContainerEventConditionTests.java   |  11 +-
 87 files changed, 1392 insertions(+), 1503 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
index 201ba12a292b..fce622ec973e 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
@@ -18,7 +18,6 @@
 
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
@@ -37,9 +36,9 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 
 	@Override
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext context) {
-		ExtensionContext engineContext = context.getRoot();
-		Store store = engineContext.getStore(ExtensionContext.Namespace.GLOBAL);
-		ResourceValue resource = store.getOrComputeIfAbsent(ResourceValue.class);
+		var engineContext = context.getRoot();
+		var store = engineContext.getStore(ExtensionContext.Namespace.GLOBAL);
+		var resource = store.getOrComputeIfAbsent(ResourceValue.class);
 		resource.usages.incrementAndGet();
 		return resource;
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
index ba7e32d29f25..3521213e8c09 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
@@ -24,73 +24,73 @@ public class TryTests {
 
 	@Test
 	void successfulTriesCanBeTransformed() throws Exception {
-		Try<String> t = Try.success("foo");
+		var success = Try.success("foo");
 
-		assertThat(t.get()).isEqualTo("foo");
-		assertThat(t.getOrThrow(RuntimeException::new)).isEqualTo("foo");
-		assertThat(t.toOptional()).contains("foo");
+		assertThat(success.get()).isEqualTo("foo");
+		assertThat(success.getOrThrow(RuntimeException::new)).isEqualTo("foo");
+		assertThat(success.toOptional()).contains("foo");
 
-		assertThat(t.andThen(v -> {
+		assertThat(success.andThen(v -> {
 			assertThat(v).isEqualTo("foo");
 			return Try.success("bar");
 		}).get()).isEqualTo("bar");
-		assertThat(t.andThenTry(v -> {
+		assertThat(success.andThenTry(v -> {
 			assertThat(v).isEqualTo("foo");
 			return "bar";
 		}).get()).isEqualTo("bar");
 
-		assertThat(t.orElse(() -> fail("should not be called"))).isSameAs(t);
-		assertThat(t.orElseTry(() -> fail("should not be called"))).isSameAs(t);
+		assertThat(success.orElse(() -> fail("should not be called"))).isSameAs(success);
+		assertThat(success.orElseTry(() -> fail("should not be called"))).isSameAs(success);
 
-		AtomicReference<String> value = new AtomicReference<>();
-		assertThat(t.ifSuccess(value::set)).isSameAs(t);
+		var value = new AtomicReference<String>();
+		assertThat(success.ifSuccess(value::set)).isSameAs(success);
 		assertThat(value.get()).isEqualTo("foo");
-		assertThat(t.ifFailure(cause -> fail("should not be called"))).isSameAs(t);
+		assertThat(success.ifFailure(cause -> fail("should not be called"))).isSameAs(success);
 	}
 
 	@Test
 	void failedTriesCanBeTransformed() throws Exception {
-		JUnitException cause = new JUnitException("foo");
-		Try<String> t = Try.failure(cause);
+		var cause = new JUnitException("foo");
+		var failure = Try.failure(cause);
 
-		assertThat(assertThrows(JUnitException.class, t::get)).isSameAs(cause);
-		assertThat(assertThrows(RuntimeException.class, () -> t.getOrThrow(RuntimeException::new))).isInstanceOf(
+		assertThat(assertThrows(JUnitException.class, failure::get)).isSameAs(cause);
+		assertThat(assertThrows(RuntimeException.class, () -> failure.getOrThrow(RuntimeException::new))).isInstanceOf(
 			RuntimeException.class).hasCause(cause);
-		assertThat(t.toOptional()).isEmpty();
+		assertThat(failure.toOptional()).isEmpty();
 
-		assertThat(t.andThen(v -> fail("should not be called"))).isSameAs(t);
-		assertThat(t.andThenTry(v -> fail("should not be called"))).isSameAs(t);
+		assertThat(failure.andThen(v -> fail("should not be called"))).isSameAs(failure);
+		assertThat(failure.andThenTry(v -> fail("should not be called"))).isSameAs(failure);
 
-		assertThat(t.orElse(() -> Try.success("bar")).get()).isEqualTo("bar");
-		assertThat(t.orElseTry(() -> "bar").get()).isEqualTo("bar");
+		assertThat(failure.orElse(() -> Try.success("bar")).get()).isEqualTo("bar");
+		assertThat(failure.orElseTry(() -> "bar").get()).isEqualTo("bar");
 
-		assertThat(t.ifSuccess(v -> fail("should not be called"))).isSameAs(t);
-		AtomicReference<Exception> exception = new AtomicReference<>();
-		assertThat(t.ifFailure(exception::set)).isSameAs(t);
+		assertThat(failure.ifSuccess(v -> fail("should not be called"))).isSameAs(failure);
+		var exception = new AtomicReference<Exception>();
+		assertThat(failure.ifFailure(exception::set)).isSameAs(failure);
 		assertThat(exception.get()).isSameAs(cause);
 	}
 
 	@Test
 	void successfulTriesCanStoreNull() throws Exception {
-		Try<String> t = Try.success(null);
-		assertThat(t.get()).isNull();
-		assertThat(t.getOrThrow(RuntimeException::new)).isNull();
-		assertThat(t.toOptional()).isEmpty();
+		var success = Try.success(null);
+		assertThat(success.get()).isNull();
+		assertThat(success.getOrThrow(RuntimeException::new)).isNull();
+		assertThat(success.toOptional()).isEmpty();
 	}
 
 	@Test
 	void triesWithSameContentAreEqual() {
-		Exception cause = new Exception();
+		var cause = new Exception();
 		Callable<Object> failingCallable = () -> {
 			throw cause;
 		};
 
-		Try<String> success = Try.call(() -> "foo");
+		var success = Try.call(() -> "foo");
 		assertThat(success).isEqualTo(success).hasSameHashCodeAs(success);
 		assertThat(success).isEqualTo(Try.success("foo"));
 		assertThat(success).isNotEqualTo(Try.failure(cause));
 
-		Try<Object> failure = Try.call(failingCallable);
+		var failure = Try.call(failingCallable);
 		assertThat(failure).isEqualTo(failure).hasSameHashCodeAs(failure);
 		assertThat(failure).isNotEqualTo(Try.success("foo"));
 		assertThat(failure).isEqualTo(Try.failure(cause));
@@ -100,12 +100,12 @@ void triesWithSameContentAreEqual() {
 	void methodPreconditionsAreChecked() {
 		assertThrows(JUnitException.class, () -> Try.call(null));
 
-		Try<String> success = Try.success("foo");
+		var success = Try.success("foo");
 		assertThrows(JUnitException.class, () -> success.andThen(null));
 		assertThrows(JUnitException.class, () -> success.andThenTry(null));
 		assertThrows(JUnitException.class, () -> success.ifSuccess(null));
 
-		Try<String> failure = Try.failure(new Exception());
+		var failure = Try.failure(new Exception());
 		assertThrows(JUnitException.class, () -> failure.orElse(null));
 		assertThrows(JUnitException.class, () -> failure.orElseTry(null));
 		assertThrows(JUnitException.class, () -> failure.ifFailure(null));
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
index 810654073da5..42d46cc57c26 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
@@ -20,7 +20,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.reflect.Method;
 import java.util.Optional;
 
 import org.junit.jupiter.api.Tag;
@@ -36,15 +35,15 @@ class AnnotationSupportTests {
 
 	@Test
 	void isAnnotatedPreconditions() {
-		Optional<Class<Probe>> optional = Optional.of(Probe.class);
+		var optional = Optional.of(Probe.class);
 		assertPreconditionViolationException("annotationType", () -> AnnotationSupport.isAnnotated(optional, null));
 		assertPreconditionViolationException("annotationType", () -> AnnotationSupport.isAnnotated(Probe.class, null));
 	}
 
 	@Test
 	void isAnnotatedDelegates() {
-		Class<Probe> element = Probe.class;
-		Optional<Class<Probe>> optional = Optional.of(element);
+		var element = Probe.class;
+		var optional = Optional.of(element);
 
 		assertEquals(AnnotationUtils.isAnnotated(optional, Tag.class),
 			AnnotationSupport.isAnnotated(optional, Tag.class));
@@ -59,7 +58,7 @@ void isAnnotatedDelegates() {
 
 	@Test
 	void findAnnotationPreconditions() {
-		Optional<Class<Probe>> optional = Optional.of(Probe.class);
+		var optional = Optional.of(Probe.class);
 		assertPreconditionViolationException("annotationType", () -> AnnotationSupport.findAnnotation(optional, null));
 		assertPreconditionViolationException("annotationType",
 			() -> AnnotationSupport.findAnnotation(Probe.class, null));
@@ -67,8 +66,8 @@ void findAnnotationPreconditions() {
 
 	@Test
 	void findAnnotationDelegates() {
-		Class<Probe> element = Probe.class;
-		Optional<Class<Probe>> optional = Optional.of(element);
+		var element = Probe.class;
+		var optional = Optional.of(element);
 
 		assertEquals(AnnotationUtils.findAnnotation(optional, Tag.class),
 			AnnotationSupport.findAnnotation(optional, Tag.class));
@@ -132,7 +131,7 @@ void findAnnotatedMethodsDelegates() {
 
 	@Test
 	void findRepeatableAnnotationsDelegates() throws Throwable {
-		Method bMethod = Probe.class.getDeclaredMethod("bMethod");
+		var bMethod = Probe.class.getDeclaredMethod("bMethod");
 		assertEquals(AnnotationUtils.findRepeatableAnnotations(bMethod, Tag.class),
 			AnnotationSupport.findRepeatableAnnotations(bMethod, Tag.class));
 		Object expected = assertThrows(PreconditionViolationException.class,
@@ -185,7 +184,7 @@ void findAnnotatedFieldsPreconditions() {
 
 	@Test
 	void findAnnotatedFieldValuesForNonStaticFields() {
-		Fields instance = new Fields();
+		var instance = new Fields();
 
 		assertThat(AnnotationSupport.findAnnotatedFieldValues(instance, Tag.class)).isEmpty();
 
@@ -203,7 +202,7 @@ void findAnnotatedFieldValuesForStaticFields() {
 
 	@Test
 	void findAnnotatedFieldValuesForNonStaticFieldsByType() {
-		Fields instance = new Fields();
+		var instance = new Fields();
 
 		assertThat(AnnotationSupport.findAnnotatedFieldValues(instance, FieldMarker.class, Number.class)).isEmpty();
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java b/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
index dde5d1bb4c2e..bb51916cd308 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
@@ -22,12 +22,12 @@
 class PreconditionAssertions {
 
 	static void assertPreconditionViolationException(String name, Executable executable) {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, executable);
+		var exception = assertThrows(PreconditionViolationException.class, executable);
 		assertEquals(name + " must not be null", exception.getMessage());
 	}
 
 	static void assertPreconditionViolationExceptionForString(String name, Executable executable) {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, executable);
+		var exception = assertThrows(PreconditionViolationException.class, executable);
 		assertEquals(name + " must not be null or blank", exception.getMessage());
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index d62f0d566e4d..2938b258f553 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -19,7 +19,6 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.net.URI;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,9 +79,9 @@ List<DynamicTest> findAllClassesInClasspathRootDelegates() throws Throwable {
 		List<Path> paths = new ArrayList<>();
 		paths.add(Path.of(".").toRealPath());
 		paths.addAll(ReflectionUtils.getAllClasspathRootDirectories());
-		for (Path path : paths) {
-			URI root = path.toUri();
-			String displayName = root.getPath();
+		for (var path : paths) {
+			var root = path.toUri();
+			var displayName = root.getPath();
 			if (displayName.length() > 42) {
 				displayName = "..." + displayName.substring(displayName.length() - 42);
 			}
@@ -95,7 +94,7 @@ List<DynamicTest> findAllClassesInClasspathRootDelegates() throws Throwable {
 
 	@Test
 	void findAllClassesInClasspathRootPreconditions() {
-		URI path = Path.of(".").toUri();
+		var path = Path.of(".").toUri();
 		assertPreconditionViolationException("root",
 			() -> ReflectionSupport.findAllClassesInClasspathRoot(null, allTypes, allNames));
 		assertPreconditionViolationException("class predicate",
@@ -133,7 +132,7 @@ void findAllClassesInModuleDelegates() {
 
 	@Test
 	void findAllClassesInModulePreconditions() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> ReflectionSupport.findAllClassesInModule(null, allTypes, allNames));
 		assertEquals("Module name must not be null or empty", exception.getMessage());
 		assertPreconditionViolationException("class predicate",
@@ -159,7 +158,7 @@ void newInstancePreconditions() {
 
 	@Test
 	void invokeMethodDelegates() throws Exception {
-		Method method = Boolean.class.getMethod("valueOf", String.class);
+		var method = Boolean.class.getMethod("valueOf", String.class);
 		assertEquals(ReflectionUtils.invokeMethod(method, null, "true"),
 			ReflectionSupport.invokeMethod(method, null, "true"));
 	}
@@ -168,8 +167,8 @@ void invokeMethodDelegates() throws Exception {
 	void invokeMethodPreconditions() throws Exception {
 		assertPreconditionViolationException("Method", () -> ReflectionSupport.invokeMethod(null, null, "true"));
 
-		Method method = Boolean.class.getMethod("toString");
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var method = Boolean.class.getMethod("toString");
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> ReflectionSupport.invokeMethod(method, null));
 		assertEquals("Cannot invoke non-static method [" + method.toGenericString() + "] on a null target.",
 			exception.getMessage());
@@ -203,11 +202,11 @@ void findFieldsPreconditions() {
 
 	@Test
 	void tryToReadFieldValueDelegates() throws Exception {
-		Field staticField = getClass().getDeclaredField("staticField");
+		var staticField = getClass().getDeclaredField("staticField");
 		assertEquals(ReflectionUtils.tryToReadFieldValue(staticField, null),
 			ReflectionSupport.tryToReadFieldValue(staticField, null));
 
-		Field instanceField = getClass().getDeclaredField("instanceField");
+		var instanceField = getClass().getDeclaredField("instanceField");
 		assertEquals(ReflectionUtils.tryToReadFieldValue(instanceField, this),
 			ReflectionSupport.tryToReadFieldValue(instanceField, this));
 	}
@@ -216,7 +215,7 @@ void tryToReadFieldValueDelegates() throws Exception {
 	void tryToReadFieldValuePreconditions() throws Exception {
 		assertPreconditionViolationException("Field", () -> ReflectionSupport.tryToReadFieldValue(null, this));
 
-		Field instanceField = getClass().getDeclaredField("instanceField");
+		var instanceField = getClass().getDeclaredField("instanceField");
 		Exception exception = assertThrows(PreconditionViolationException.class,
 			() -> ReflectionSupport.tryToReadFieldValue(instanceField, null));
 		assertThat(exception)//
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
index 5d52fe42e79b..319b15eb26d4 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
@@ -37,7 +37,6 @@
 import java.lang.annotation.Target;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
@@ -129,19 +128,19 @@ void findAnnotationMetaPresentOnImplementedInterface() {
 
 	@Test
 	void findAnnotationDirectlyPresentOnMethod() throws Exception {
-		Method method = Annotation2Class.class.getDeclaredMethod("method");
+		var method = Annotation2Class.class.getDeclaredMethod("method");
 		assertThat(findAnnotation(method, Annotation1.class)).isPresent();
 	}
 
 	@Test
 	void findAnnotationMetaPresentOnMethod() throws Exception {
-		Method method = ComposedAnnotationClass.class.getDeclaredMethod("method");
+		var method = ComposedAnnotationClass.class.getDeclaredMethod("method");
 		assertThat(findAnnotation(method, Annotation1.class)).isPresent();
 	}
 
 	@Test
 	void findAnnotationMetaPresentOnOptionalMethod() throws Exception {
-		Method method = ComposedAnnotationClass.class.getDeclaredMethod("method");
+		var method = ComposedAnnotationClass.class.getDeclaredMethod("method");
 		assertThat(findAnnotation(Optional.of(method), Annotation1.class)).isPresent();
 	}
 
@@ -177,7 +176,7 @@ void isAnnotatedWhenMetaPresentOnMethod() throws Exception {
 
 	@Test
 	void findRepeatableAnnotationsForNotRepeatableAnnotation() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> findRepeatableAnnotations(getClass(), Inherited.class));
 
 		assertThat(exception.getMessage()).isEqualTo(Inherited.class.getName() + " must be @Repeatable");
@@ -322,21 +321,21 @@ void findAnnotatedMethodsForAnnotationThatIsNotPresent() {
 
 	@Test
 	void findAnnotatedMethodsForAnnotationOnMethodsInClassUsingHierarchyDownMode() throws Exception {
-		Method method2 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method2");
-		Method method3 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method3");
+		var method2 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method2");
+		var method3 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method3");
 
-		List<Method> methods = findAnnotatedMethods(ClassWithAnnotatedMethods.class, Annotation2.class, TOP_DOWN);
+		var methods = findAnnotatedMethods(ClassWithAnnotatedMethods.class, Annotation2.class, TOP_DOWN);
 
 		assertThat(methods).containsOnly(method2, method3);
 	}
 
 	@Test
 	void findAnnotatedMethodsForAnnotationOnMethodsInClassHierarchyUsingHierarchyUpMode() throws Exception {
-		Method method1 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method1");
-		Method method3 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method3");
-		Method superMethod = SuperclassWithAnnotatedMethod.class.getDeclaredMethod("superMethod");
+		var method1 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method1");
+		var method3 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method3");
+		var superMethod = SuperclassWithAnnotatedMethod.class.getDeclaredMethod("superMethod");
 
-		List<Method> methods = findAnnotatedMethods(ClassWithAnnotatedMethods.class, Annotation1.class, BOTTOM_UP);
+		var methods = findAnnotatedMethods(ClassWithAnnotatedMethods.class, Annotation1.class, BOTTOM_UP);
 
 		assertEquals(3, methods.size());
 		assertThat(methods.subList(0, 2)).containsOnly(method1, method3);
@@ -345,11 +344,11 @@ void findAnnotatedMethodsForAnnotationOnMethodsInClassHierarchyUsingHierarchyUpM
 
 	@Test
 	void findAnnotatedMethodsForAnnotationUsedInClassAndSuperclassHierarchyDown() throws Exception {
-		Method method1 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method1");
-		Method method3 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method3");
-		Method superMethod = SuperclassWithAnnotatedMethod.class.getDeclaredMethod("superMethod");
+		var method1 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method1");
+		var method3 = ClassWithAnnotatedMethods.class.getDeclaredMethod("method3");
+		var superMethod = SuperclassWithAnnotatedMethod.class.getDeclaredMethod("superMethod");
 
-		List<Method> methods = findAnnotatedMethods(ClassWithAnnotatedMethods.class, Annotation1.class, TOP_DOWN);
+		var methods = findAnnotatedMethods(ClassWithAnnotatedMethods.class, Annotation1.class, TOP_DOWN);
 
 		assertEquals(3, methods.size());
 		assertEquals(superMethod, methods.get(0));
@@ -358,9 +357,9 @@ void findAnnotatedMethodsForAnnotationUsedInClassAndSuperclassHierarchyDown() th
 
 	@Test
 	void findAnnotatedMethodsForAnnotationUsedInInterface() throws Exception {
-		Method interfaceMethod = InterfaceWithAnnotatedDefaultMethod.class.getDeclaredMethod("interfaceMethod");
+		var interfaceMethod = InterfaceWithAnnotatedDefaultMethod.class.getDeclaredMethod("interfaceMethod");
 
-		List<Method> methods = findAnnotatedMethods(ClassWithAnnotatedMethods.class, Annotation3.class, BOTTOM_UP);
+		var methods = findAnnotatedMethods(ClassWithAnnotatedMethods.class, Annotation3.class, BOTTOM_UP);
 
 		assertThat(methods).containsExactly(interfaceMethod);
 	}
@@ -392,23 +391,21 @@ void findAnnotatedFieldsForAnnotationThatIsNotPresent() {
 
 	@Test
 	void findAnnotatedFieldsForAnnotationOnFieldsInClassUsingHierarchyDownMode() throws Exception {
-		Field field2 = ClassWithAnnotatedFields.class.getDeclaredField("field2");
-		Field field3 = ClassWithAnnotatedFields.class.getDeclaredField("field3");
+		var field2 = ClassWithAnnotatedFields.class.getDeclaredField("field2");
+		var field3 = ClassWithAnnotatedFields.class.getDeclaredField("field3");
 
-		List<Field> fields = findAnnotatedFields(ClassWithAnnotatedFields.class, Annotation2.class, isStringField,
-			TOP_DOWN);
+		var fields = findAnnotatedFields(ClassWithAnnotatedFields.class, Annotation2.class, isStringField, TOP_DOWN);
 
 		assertThat(fields).containsOnly(field2, field3);
 	}
 
 	@Test
 	void findAnnotatedFieldsForAnnotationOnFieldsInClassHierarchyUsingHierarchyUpMode() throws Exception {
-		Field field1 = ClassWithAnnotatedFields.class.getDeclaredField("field1");
-		Field field3 = ClassWithAnnotatedFields.class.getDeclaredField("field3");
-		Field superField = SuperclassWithAnnotatedField.class.getDeclaredField("superField");
+		var field1 = ClassWithAnnotatedFields.class.getDeclaredField("field1");
+		var field3 = ClassWithAnnotatedFields.class.getDeclaredField("field3");
+		var superField = SuperclassWithAnnotatedField.class.getDeclaredField("superField");
 
-		List<Field> fields = findAnnotatedFields(ClassWithAnnotatedFields.class, Annotation1.class, isStringField,
-			BOTTOM_UP);
+		var fields = findAnnotatedFields(ClassWithAnnotatedFields.class, Annotation1.class, isStringField, BOTTOM_UP);
 
 		assertEquals(3, fields.size());
 		assertThat(fields.subList(0, 2)).containsOnly(field1, field3);
@@ -417,12 +414,11 @@ void findAnnotatedFieldsForAnnotationOnFieldsInClassHierarchyUsingHierarchyUpMod
 
 	@Test
 	void findAnnotatedFieldsForAnnotationUsedInClassAndSuperclassHierarchyDown() throws Exception {
-		Field field1 = ClassWithAnnotatedFields.class.getDeclaredField("field1");
-		Field field3 = ClassWithAnnotatedFields.class.getDeclaredField("field3");
-		Field superField = SuperclassWithAnnotatedField.class.getDeclaredField("superField");
+		var field1 = ClassWithAnnotatedFields.class.getDeclaredField("field1");
+		var field3 = ClassWithAnnotatedFields.class.getDeclaredField("field3");
+		var superField = SuperclassWithAnnotatedField.class.getDeclaredField("superField");
 
-		List<Field> fields = findAnnotatedFields(ClassWithAnnotatedFields.class, Annotation1.class, isStringField,
-			TOP_DOWN);
+		var fields = findAnnotatedFields(ClassWithAnnotatedFields.class, Annotation1.class, isStringField, TOP_DOWN);
 
 		assertEquals(3, fields.size());
 		assertEquals(superField, fields.get(0));
@@ -431,10 +427,9 @@ void findAnnotatedFieldsForAnnotationUsedInClassAndSuperclassHierarchyDown() thr
 
 	@Test
 	void findAnnotatedFieldsForAnnotationUsedInInterface() throws Exception {
-		Field interfaceField = InterfaceWithAnnotatedField.class.getDeclaredField("interfaceField");
+		var interfaceField = InterfaceWithAnnotatedField.class.getDeclaredField("interfaceField");
 
-		List<Field> fields = findAnnotatedFields(ClassWithAnnotatedFields.class, Annotation3.class, isStringField,
-			BOTTOM_UP);
+		var fields = findAnnotatedFields(ClassWithAnnotatedFields.class, Annotation3.class, isStringField, BOTTOM_UP);
 
 		assertThat(fields).containsExactly(interfaceField);
 	}
@@ -442,11 +437,11 @@ void findAnnotatedFieldsForAnnotationUsedInInterface() throws Exception {
 	@Test
 	void findAnnotatedFieldsForShadowedFields() throws Exception {
 		Class<?> clazz = ClassWithShadowedAnnotatedFields.class;
-		Field interfaceField = clazz.getDeclaredField("interfaceField");
-		Field superField = clazz.getDeclaredField("superField");
-		Field field1 = clazz.getDeclaredField("field1");
-		Field field2 = clazz.getDeclaredField("field2");
-		Field field3 = clazz.getDeclaredField("field3");
+		var interfaceField = clazz.getDeclaredField("interfaceField");
+		var superField = clazz.getDeclaredField("superField");
+		var field1 = clazz.getDeclaredField("field1");
+		var field2 = clazz.getDeclaredField("field2");
+		var field3 = clazz.getDeclaredField("field3");
 
 		assertThat(findShadowingAnnotatedFields(Annotation1.class)).containsExactly(superField, field1, field3);
 		assertThat(findShadowingAnnotatedFields(Annotation2.class)).containsExactly(field2, field3);
@@ -479,28 +474,28 @@ void findPublicAnnotatedFieldsForNullAnnotationType() {
 
 	@Test
 	void findPublicAnnotatedFieldsForPrivateField() {
-		List<Field> fields = findPublicAnnotatedFields(getClass(), Boolean.class, Annotation1.class);
+		var fields = findPublicAnnotatedFields(getClass(), Boolean.class, Annotation1.class);
 		assertNotNull(fields);
 		assertEquals(0, fields.size());
 	}
 
 	@Test
 	void findPublicAnnotatedFieldsForDirectlyAnnotatedFieldOfWrongFieldType() {
-		List<Field> fields = findPublicAnnotatedFields(getClass(), BigDecimal.class, Annotation1.class);
+		var fields = findPublicAnnotatedFields(getClass(), BigDecimal.class, Annotation1.class);
 		assertNotNull(fields);
 		assertEquals(0, fields.size());
 	}
 
 	@Test
 	void findPublicAnnotatedFieldsForDirectlyAnnotatedField() {
-		List<Field> fields = findPublicAnnotatedFields(getClass(), String.class, Annotation1.class);
+		var fields = findPublicAnnotatedFields(getClass(), String.class, Annotation1.class);
 		assertNotNull(fields);
 		assertIterableEquals(asList("directlyAnnotatedField"), asNames(fields));
 	}
 
 	@Test
 	void findPublicAnnotatedFieldsForMetaAnnotatedField() {
-		List<Field> fields = findPublicAnnotatedFields(getClass(), Number.class, Annotation1.class);
+		var fields = findPublicAnnotatedFields(getClass(), Number.class, Annotation1.class);
 		assertNotNull(fields);
 		assertEquals(1, fields.size());
 		assertIterableEquals(asList("metaAnnotatedField"), asNames(fields));
@@ -508,15 +503,14 @@ void findPublicAnnotatedFieldsForMetaAnnotatedField() {
 
 	@Test
 	void findPublicAnnotatedFieldsForDirectlyAnnotatedFieldInInterface() {
-		List<Field> fields = findPublicAnnotatedFields(InterfaceWithAnnotatedFields.class, String.class,
-			Annotation1.class);
+		var fields = findPublicAnnotatedFields(InterfaceWithAnnotatedFields.class, String.class, Annotation1.class);
 		assertNotNull(fields);
 		assertIterableEquals(asList("foo"), asNames(fields));
 	}
 
 	@Test
 	void findPublicAnnotatedFieldsForDirectlyAnnotatedFieldsInClassAndInterface() {
-		List<Field> fields = findPublicAnnotatedFields(ClassWithPublicAnnotatedFieldsFromInterface.class, String.class,
+		var fields = findPublicAnnotatedFields(ClassWithPublicAnnotatedFieldsFromInterface.class, String.class,
 			Annotation1.class);
 		assertNotNull(fields);
 		assertThat(asNames(fields)).containsExactlyInAnyOrder("foo", "bar");
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
index 2f775c2f1870..13e296cfb8f1 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
@@ -28,8 +28,8 @@ class ClassLoaderUtilsTests {
 
 	@Test
 	void getDefaultClassLoaderWithExplicitContextClassLoader() {
-		ClassLoader original = Thread.currentThread().getContextClassLoader();
-		ClassLoader mock = mock(ClassLoader.class);
+		var original = Thread.currentThread().getContextClassLoader();
+		var mock = mock(ClassLoader.class);
 		Thread.currentThread().setContextClassLoader(mock);
 		try {
 			assertSame(mock, ClassLoaderUtils.getDefaultClassLoader());
@@ -41,7 +41,7 @@ void getDefaultClassLoaderWithExplicitContextClassLoader() {
 
 	@Test
 	void getDefaultClassLoaderWithNullContextClassLoader() {
-		ClassLoader original = Thread.currentThread().getContextClassLoader();
+		var original = Thread.currentThread().getContextClassLoader();
 		Thread.currentThread().setContextClassLoader(null);
 		try {
 			assertSame(ClassLoader.getSystemClassLoader(), ClassLoaderUtils.getDefaultClassLoader());
@@ -53,8 +53,7 @@ void getDefaultClassLoaderWithNullContextClassLoader() {
 
 	@Test
 	void getLocationFromNullFails() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> ClassLoaderUtils.getLocation(null));
+		var exception = assertThrows(PreconditionViolationException.class, () -> ClassLoaderUtils.getLocation(null));
 		assertEquals("object must not be null", exception.getMessage());
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
index 41d68968c48b..b240c08618d0 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
@@ -115,7 +115,7 @@ void alwaysDisabledListeners(String pattern) {
 	//@formatter:on
 	@ParameterizedTest
 	void alwaysEnabledClass(String pattern) {
-		List<Object> executionConditions = asList(new AVanillaEmpty(), new BVanillaEmpty());
+		var executionConditions = asList(new AVanillaEmpty(), new BVanillaEmpty());
 		assertThat(executionConditions).filteredOn(
 			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isNotEmpty();
 	}
@@ -131,7 +131,7 @@ void alwaysEnabledClass(String pattern) {
 	//@formatter:on
 	@ParameterizedTest
 	void alwaysDisabledClass(String pattern) {
-		List<Object> executionConditions = asList(new AVanillaEmpty(), new BVanillaEmpty());
+		var executionConditions = asList(new AVanillaEmpty(), new BVanillaEmpty());
 		assertThat(executionConditions).filteredOn(
 			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isEmpty();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
index 11b8f50bd12a..38f9c0304da3 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
@@ -115,9 +115,8 @@ void scanForClassesInClasspathRootWhenGenericRuntimeExceptionOccurs(LogRecordLis
 	}
 
 	private void assertClassesScannedWhenExceptionIsThrown(Predicate<Class<?>> filter) throws Exception {
-		ClassFilter classFilter = ClassFilter.of(filter);
-		List<Class<?>> classes = this.classpathScanner.scanForClassesInClasspathRoot(getTestClasspathRoot(),
-			classFilter);
+		var classFilter = ClassFilter.of(filter);
+		var classes = this.classpathScanner.scanForClassesInClasspathRoot(getTestClasspathRoot(), classFilter);
 		assertThat(classes.size()).isGreaterThanOrEqualTo(150);
 	}
 
@@ -138,7 +137,7 @@ void scanForClassesInClasspathRootWhenOutOfMemoryErrorOccurs() {
 			}
 			return true;
 		};
-		ClassFilter classFilter = ClassFilter.of(outOfMemoryErrorSimulationFilter);
+		var classFilter = ClassFilter.of(outOfMemoryErrorSimulationFilter);
 
 		assertThrows(OutOfMemoryError.class,
 			() -> this.classpathScanner.scanForClassesInClasspathRoot(getTestClasspathRoot(), classFilter));
@@ -155,14 +154,13 @@ void scanForClassesInClasspathRootWithinJarWithSpacesInPath() throws Exception {
 	}
 
 	private void scanForClassesInClasspathRootWithinJarFile(String resourceName) throws Exception {
-		URL jarfile = getClass().getResource(resourceName);
+		var jarfile = getClass().getResource(resourceName);
 
-		try (URLClassLoader classLoader = new URLClassLoader(new URL[] { jarfile })) {
-			ClasspathScanner classpathScanner = new ClasspathScanner(() -> classLoader,
-				ReflectionUtils::tryToLoadClass);
+		try (var classLoader = new URLClassLoader(new URL[] { jarfile })) {
+			var classpathScanner = new ClasspathScanner(() -> classLoader, ReflectionUtils::tryToLoadClass);
 
-			List<Class<?>> classes = classpathScanner.scanForClassesInClasspathRoot(jarfile.toURI(), allClasses);
-			List<String> classNames = classes.stream().map(Class::getName).collect(Collectors.toList());
+			var classes = classpathScanner.scanForClassesInClasspathRoot(jarfile.toURI(), allClasses);
+			var classNames = classes.stream().map(Class::getName).collect(Collectors.toList());
 			assertThat(classNames).hasSize(3) //
 					.contains("org.junit.platform.jartest.notincluded.NotIncluded",
 						"org.junit.platform.jartest.included.recursive.RecursivelyIncluded",
@@ -172,7 +170,7 @@ private void scanForClassesInClasspathRootWithinJarFile(String resourceName) thr
 
 	@Test
 	void scanForClassesInPackage() {
-		List<Class<?>> classes = classpathScanner.scanForClassesInPackage("org.junit.platform.commons", allClasses);
+		var classes = classpathScanner.scanForClassesInPackage("org.junit.platform.commons", allClasses);
 		assertThat(classes.size()).isGreaterThanOrEqualTo(20);
 		assertTrue(classes.contains(NestedClassToBeFound.class));
 		assertTrue(classes.contains(MemberClassToBeFound.class));
@@ -180,16 +178,14 @@ void scanForClassesInPackage() {
 
 	@Test
 	void findAllClassesInPackageWithinJarFile() throws Exception {
-		URL jarfile = getClass().getResource("/jartest.jar");
+		var jarfile = getClass().getResource("/jartest.jar");
 
-		try (URLClassLoader classLoader = new URLClassLoader(new URL[] { jarfile })) {
-			ClasspathScanner classpathScanner = new ClasspathScanner(() -> classLoader,
-				ReflectionUtils::tryToLoadClass);
+		try (var classLoader = new URLClassLoader(new URL[] { jarfile })) {
+			var classpathScanner = new ClasspathScanner(() -> classLoader, ReflectionUtils::tryToLoadClass);
 
-			List<Class<?>> classes = classpathScanner.scanForClassesInPackage("org.junit.platform.jartest.included",
-				allClasses);
+			var classes = classpathScanner.scanForClassesInPackage("org.junit.platform.jartest.included", allClasses);
 			assertThat(classes).hasSize(2);
-			List<String> classNames = classes.stream().map(Class::getSimpleName).collect(Collectors.toList());
+			var classNames = classes.stream().map(Class::getSimpleName).collect(Collectors.toList());
 			assertTrue(classNames.contains("Included"));
 			assertTrue(classNames.contains("RecursivelyIncluded"));
 		}
@@ -197,8 +193,8 @@ void findAllClassesInPackageWithinJarFile() throws Exception {
 
 	@Test
 	void scanForClassesInDefaultPackage() {
-		ClassFilter classFilter = ClassFilter.of(this::inDefaultPackage);
-		List<Class<?>> classes = classpathScanner.scanForClassesInPackage("", classFilter);
+		var classFilter = ClassFilter.of(this::inDefaultPackage);
+		var classes = classpathScanner.scanForClassesInPackage("", classFilter);
 
 		assertThat(classes.size()).as("number of classes found in default package").isGreaterThanOrEqualTo(1);
 		assertTrue(classes.stream().allMatch(this::inDefaultPackage));
@@ -207,8 +203,8 @@ void scanForClassesInDefaultPackage() {
 
 	@Test
 	void scanForClassesInPackageWithFilter() {
-		ClassFilter thisClassOnly = ClassFilter.of(clazz -> clazz == ClasspathScannerTests.class);
-		List<Class<?>> classes = classpathScanner.scanForClassesInPackage("org.junit.platform.commons", thisClassOnly);
+		var thisClassOnly = ClassFilter.of(clazz -> clazz == ClasspathScannerTests.class);
+		var classes = classpathScanner.scanForClassesInPackage("org.junit.platform.commons", thisClassOnly);
 		assertSame(ClasspathScannerTests.class, classes.get(0));
 	}
 
@@ -232,15 +228,15 @@ void scanForClassesInPackageForNullClassFilter() {
 
 	@Test
 	void scanForClassesInPackageWhenIOExceptionOccurs() {
-		ClasspathScanner scanner = new ClasspathScanner(ThrowingClassLoader::new, ReflectionUtils::tryToLoadClass);
-		List<Class<?>> classes = scanner.scanForClassesInPackage("org.junit.platform.commons", allClasses);
+		var scanner = new ClasspathScanner(ThrowingClassLoader::new, ReflectionUtils::tryToLoadClass);
+		var classes = scanner.scanForClassesInPackage("org.junit.platform.commons", allClasses);
 		assertThat(classes).isEmpty();
 	}
 
 	@Test
 	void scanForClassesInPackageOnlyLoadsClassesThatAreIncludedByTheClassNameFilter() {
 		Predicate<String> classNameFilter = name -> ClasspathScannerTests.class.getName().equals(name);
-		ClassFilter classFilter = ClassFilter.of(classNameFilter, type -> true);
+		var classFilter = ClassFilter.of(classNameFilter, type -> true);
 
 		classpathScanner.scanForClassesInPackage("org.junit.platform.commons", classFilter);
 
@@ -249,19 +245,19 @@ void scanForClassesInPackageOnlyLoadsClassesThatAreIncludedByTheClassNameFilter(
 
 	@Test
 	void findAllClassesInClasspathRoot() throws Exception {
-		ClassFilter thisClassOnly = ClassFilter.of(clazz -> clazz == ClasspathScannerTests.class);
-		URI root = getTestClasspathRoot();
-		List<Class<?>> classes = classpathScanner.scanForClassesInClasspathRoot(root, thisClassOnly);
+		var thisClassOnly = ClassFilter.of(clazz -> clazz == ClasspathScannerTests.class);
+		var root = getTestClasspathRoot();
+		var classes = classpathScanner.scanForClassesInClasspathRoot(root, thisClassOnly);
 		assertSame(ClasspathScannerTests.class, classes.get(0));
 	}
 
 	@Test
 	void findAllClassesInDefaultPackageInClasspathRoot() throws Exception {
-		ClassFilter classFilter = ClassFilter.of(this::inDefaultPackage);
-		List<Class<?>> classes = classpathScanner.scanForClassesInClasspathRoot(getTestClasspathRoot(), classFilter);
+		var classFilter = ClassFilter.of(this::inDefaultPackage);
+		var classes = classpathScanner.scanForClassesInClasspathRoot(getTestClasspathRoot(), classFilter);
 
 		assertEquals(1, classes.size(), "number of classes found in default package");
-		Class<?> testClass = classes.get(0);
+		var testClass = classes.get(0);
 		assertTrue(inDefaultPackage(testClass));
 		assertEquals("DefaultPackageTestCase", testClass.getName());
 	}
@@ -272,25 +268,25 @@ void doesNotLoopInfinitelyWithCircularSymlinks(@TempDir Path tempDir) throws Exc
 		// Abort if running on Microsoft Windows since we are testing symbolic links
 		assumeFalse(System.getProperty("os.name").toLowerCase().contains("win"));
 
-		Path directory = Files.createDirectory(tempDir.resolve("directory"));
-		Path symlink1 = Files.createSymbolicLink(tempDir.resolve("symlink1"), directory);
+		var directory = Files.createDirectory(tempDir.resolve("directory"));
+		var symlink1 = Files.createSymbolicLink(tempDir.resolve("symlink1"), directory);
 		Files.createSymbolicLink(directory.resolve("symlink2"), symlink1);
 
-		List<Class<?>> classes = classpathScanner.scanForClassesInClasspathRoot(symlink1.toUri(), allClasses);
+		var classes = classpathScanner.scanForClassesInClasspathRoot(symlink1.toUri(), allClasses);
 
 		assertThat(classes).isEmpty();
 	}
 
 	private boolean inDefaultPackage(Class<?> clazz) {
 		// OpenJDK returns NULL for the default package.
-		Package pkg = clazz.getPackage();
+		var pkg = clazz.getPackage();
 		return pkg == null || "".equals(clazz.getPackage().getName());
 	}
 
 	@Test
 	void findAllClassesInClasspathRootWithFilter() throws Exception {
-		URI root = getTestClasspathRoot();
-		List<Class<?>> classes = classpathScanner.scanForClassesInClasspathRoot(root, allClasses);
+		var root = getTestClasspathRoot();
+		var classes = classpathScanner.scanForClassesInClasspathRoot(root, allClasses);
 
 		assertThat(classes.size()).isGreaterThanOrEqualTo(20);
 		assertTrue(classes.contains(ClasspathScannerTests.class));
@@ -316,9 +312,8 @@ void findAllClassesInClasspathRootForNullClassFilter() {
 
 	@Test
 	void onlyLoadsClassesInClasspathRootThatAreIncludedByTheClassNameFilter() throws Exception {
-		ClassFilter classFilter = ClassFilter.of(name -> ClasspathScannerTests.class.getName().equals(name),
-			type -> true);
-		URI root = getTestClasspathRoot();
+		var classFilter = ClassFilter.of(name -> ClasspathScannerTests.class.getName().equals(name), type -> true);
+		var root = getTestClasspathRoot();
 
 		classpathScanner.scanForClassesInClasspathRoot(root, classFilter);
 
@@ -326,7 +321,7 @@ void onlyLoadsClassesInClasspathRootThatAreIncludedByTheClassNameFilter() throws
 	}
 
 	private URI getTestClasspathRoot() throws Exception {
-		URL location = getClass().getProtectionDomain().getCodeSource().getLocation();
+		var location = getClass().getProtectionDomain().getCodeSource().getLocation();
 		return location.toURI();
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index ce0671e2aac9..cf4e2572acab 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -25,8 +25,6 @@
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
@@ -60,8 +58,8 @@ void getOnlyElementWithEmptyCollection() {
 
 	@Test
 	void getOnlyElementWithSingleElementCollection() {
-		Object expected = new Object();
-		Object actual = CollectionUtils.getOnlyElement(singleton(expected));
+		var expected = new Object();
+		var actual = CollectionUtils.getOnlyElement(singleton(expected));
 		assertSame(expected, actual);
 	}
 
@@ -74,7 +72,7 @@ void getOnlyElementWithMultiElementCollection() {
 
 	@Test
 	void toUnmodifiableListThrowsOnMutation() {
-		List<Integer> numbers = Stream.of(1).collect(toUnmodifiableList());
+		var numbers = Stream.of(1).collect(toUnmodifiableList());
 		assertThrows(UnsupportedOperationException.class, numbers::clear);
 	}
 
@@ -95,9 +93,9 @@ void toStreamWithUnsupportedObjectType() {
 
 	@Test
 	void toStreamWithExistingStream() {
-		Stream<String> input = Stream.of("foo");
+		var input = Stream.of("foo");
 
-		Stream<?> result = CollectionUtils.toStream(input);
+		var result = CollectionUtils.toStream(input);
 
 		assertThat(result).isSameAs(input);
 	}
@@ -105,9 +103,9 @@ void toStreamWithExistingStream() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void toStreamWithDoubleStream() {
-		DoubleStream input = DoubleStream.of(42.23);
+		var input = DoubleStream.of(42.23);
 
-		Stream<Double> result = (Stream<Double>) CollectionUtils.toStream(input);
+		var result = (Stream<Double>) CollectionUtils.toStream(input);
 
 		assertThat(result).containsExactly(42.23);
 	}
@@ -115,9 +113,9 @@ void toStreamWithDoubleStream() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void toStreamWithIntStream() {
-		IntStream input = IntStream.of(23, 42);
+		var input = IntStream.of(23, 42);
 
-		Stream<Integer> result = (Stream<Integer>) CollectionUtils.toStream(input);
+		var result = (Stream<Integer>) CollectionUtils.toStream(input);
 
 		assertThat(result).containsExactly(23, 42);
 	}
@@ -125,9 +123,9 @@ void toStreamWithIntStream() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void toStreamWithLongStream() {
-		LongStream input = LongStream.of(23L, 42L);
+		var input = LongStream.of(23L, 42L);
 
-		Stream<Long> result = (Stream<Long>) CollectionUtils.toStream(input);
+		var result = (Stream<Long>) CollectionUtils.toStream(input);
 
 		assertThat(result).containsExactly(23L, 42L);
 	}
@@ -135,7 +133,7 @@ void toStreamWithLongStream() {
 	@Test
 	@SuppressWarnings({ "unchecked", "serial" })
 	void toStreamWithCollection() {
-		AtomicBoolean collectionStreamClosed = new AtomicBoolean(false);
+		var collectionStreamClosed = new AtomicBoolean(false);
 		Collection<String> input = new ArrayList<>() {
 
 			{
@@ -149,8 +147,8 @@ public Stream<String> stream() {
 			}
 		};
 
-		try (Stream<String> stream = (Stream<String>) CollectionUtils.toStream(input)) {
-			List<String> result = stream.collect(toList());
+		try (var stream = (Stream<String>) CollectionUtils.toStream(input)) {
+			var result = stream.collect(toList());
 			assertThat(result).containsExactly("foo", "bar");
 		}
 
@@ -163,7 +161,7 @@ void toStreamWithIterable() {
 
 		Iterable<String> input = () -> asList("foo", "bar").iterator();
 
-		Stream<String> result = (Stream<String>) CollectionUtils.toStream(input);
+		var result = (Stream<String>) CollectionUtils.toStream(input);
 
 		assertThat(result).containsExactly("foo", "bar");
 	}
@@ -171,9 +169,9 @@ void toStreamWithIterable() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void toStreamWithIterator() {
-		Iterator<String> input = asList("foo", "bar").iterator();
+		var input = asList("foo", "bar").iterator();
 
-		Stream<String> result = (Stream<String>) CollectionUtils.toStream(input);
+		var result = (Stream<String>) CollectionUtils.toStream(input);
 
 		assertThat(result).containsExactly("foo", "bar");
 	}
@@ -181,7 +179,7 @@ void toStreamWithIterator() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void toStreamWithArray() {
-		Stream<String> result = (Stream<String>) CollectionUtils.toStream(new String[] { "foo", "bar" });
+		var result = (Stream<String>) CollectionUtils.toStream(new String[] { "foo", "bar" });
 
 		assertThat(result).containsExactly("foo", "bar");
 	}
@@ -213,8 +211,8 @@ Stream<DynamicTest> toStreamWithPrimitiveArrays() {
 	private void toStreamWithPrimitiveArray(Object primitiveArray) {
 		assertTrue(primitiveArray.getClass().isArray());
 		assertTrue(primitiveArray.getClass().getComponentType().isPrimitive());
-		Object[] result = CollectionUtils.toStream(primitiveArray).toArray();
-		for (int i = 0; i < result.length; i++) {
+		var result = CollectionUtils.toStream(primitiveArray).toArray();
+		for (var i = 0; i < result.length; i++) {
 			assertEquals(Array.get(primitiveArray, i), result[i]);
 		}
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
index d76472b95553..2d4f03a75262 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
@@ -16,8 +16,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.function.Predicate;
-
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
 
@@ -42,7 +40,7 @@ void whereWithNullPredicate() {
 
 	@Test
 	void whereWithChecksPredicateAgainstResultOfFunction() {
-		Predicate<String> combinedPredicate = FunctionUtils.where(String::length, isEqual(3));
+		var combinedPredicate = FunctionUtils.where(String::length, isEqual(3));
 		assertFalse(combinedPredicate.test("fo"));
 		assertTrue(combinedPredicate.test("foo"));
 		assertFalse(combinedPredicate.test("fooo"));
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
index 8a9e9b2d94e6..224e946ec771 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
@@ -66,14 +66,14 @@ void assertPackageNameIsValidForInvalidPackageNames() {
 
 	@Test
 	void getAttributeWithNullType() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> PackageUtils.getAttribute(null, p -> "any"));
 		assertEquals("type must not be null", exception.getMessage());
 	}
 
 	@Test
 	void getAttributeWithNullFunction() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> PackageUtils.getAttribute(getClass(), (Function<Package, String>) null));
 		assertEquals("function must not be null", exception.getMessage());
 	}
@@ -85,7 +85,7 @@ void getAttributeWithFunctionReturningNullIsEmpty() {
 
 	@Test
 	void getAttributeFromDefaultPackageMemberIsEmpty() throws Exception {
-		Class<?> classInDefaultPackage = ReflectionUtils.tryToLoadClass("DefaultPackageTestCase").get();
+		var classInDefaultPackage = ReflectionUtils.tryToLoadClass("DefaultPackageTestCase").get();
 		assertFalse(PackageUtils.getAttribute(classInDefaultPackage, Package::getSpecificationTitle).isPresent());
 	}
 
@@ -106,21 +106,21 @@ private Executable isPresent(Function<Package, String> function) {
 
 	@Test
 	void getAttributeWithNullTypeAndName() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> PackageUtils.getAttribute(null, "foo"));
 		assertEquals("type must not be null", exception.getMessage());
 	}
 
 	@Test
 	void getAttributeWithNullName() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> PackageUtils.getAttribute(getClass(), (String) null));
 		assertEquals("name must not be blank", exception.getMessage());
 	}
 
 	@Test
 	void getAttributeWithEmptyName() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> PackageUtils.getAttribute(getClass(), ""));
 		assertEquals("name must not be blank", exception.getMessage());
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
index c554ebf5f444..e49b9a362d9f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
@@ -37,43 +37,41 @@ class PreconditionsTests {
 
 	@Test
 	void notNullPassesForNonNullObject() {
-		Object object = new Object();
-		Object nonNullObject = notNull(object, "message");
+		var object = new Object();
+		var nonNullObject = notNull(object, "message");
 		assertSame(object, nonNullObject);
 	}
 
 	@Test
 	void notNullThrowsForNullObject() {
-		String message = "argument is null";
+		var message = "argument is null";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notNull(null, message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notNull(null, message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notNullThrowsForNullObjectAndMessageSupplier() {
-		String message = "argument is null";
+		var message = "argument is null";
 		Object object = null;
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notNull(object, () -> message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notNull(object, () -> message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notEmptyPassesForNonEmptyArray() {
-		String[] array = new String[] { "a", "b", "c" };
-		String[] nonEmptyArray = notEmpty(array, () -> "should not fail");
+		var array = new String[] { "a", "b", "c" };
+		var nonEmptyArray = notEmpty(array, () -> "should not fail");
 		assertSame(array, nonEmptyArray);
 	}
 
 	@Test
 	void notEmptyPassesForNonEmptyCollection() {
 		Collection<String> collection = Arrays.asList("a", "b", "c");
-		Collection<String> nonEmptyCollection = notEmpty(collection, () -> "should not fail");
+		var nonEmptyCollection = notEmpty(collection, () -> "should not fail");
 		assertSame(collection, nonEmptyCollection);
 	}
 
@@ -89,19 +87,18 @@ void notEmptyPassesForCollectionWithNullElements() {
 
 	@Test
 	void notEmptyThrowsForNullArray() {
-		String message = "array is empty";
+		var message = "array is empty";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notEmpty((Object[]) null, message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notEmpty((Object[]) null, message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notEmptyThrowsForNullCollection() {
-		String message = "collection is empty";
+		var message = "collection is empty";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> notEmpty((Collection<?>) null, message));
 
 		assertEquals(message, exception.getMessage());
@@ -109,20 +106,18 @@ void notEmptyThrowsForNullCollection() {
 
 	@Test
 	void notEmptyThrowsForEmptyArray() {
-		String message = "array is empty";
+		var message = "array is empty";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notEmpty(new Object[0], message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notEmpty(new Object[0], message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notEmptyThrowsForEmptyCollection() {
-		String message = "collection is empty";
+		var message = "collection is empty";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notEmpty(emptyList(), message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notEmpty(emptyList(), message));
 
 		assertEquals(message, exception.getMessage());
 	}
@@ -147,15 +142,15 @@ void containsNoNullElementsPassesForCollectionThatIsNullOrEmpty() {
 
 	@Test
 	void containsNoNullElementsPassesForArrayContainingNonNullElements() {
-		String[] input = new String[] { "a", "b", "c" };
-		String[] output = containsNoNullElements(input, "message");
+		var input = new String[] { "a", "b", "c" };
+		var output = containsNoNullElements(input, "message");
 		assertSame(input, output);
 	}
 
 	@Test
 	void containsNoNullElementsPassesForCollectionContainingNonNullElements() {
 		Collection<String> input = Arrays.asList("a", "b", "c");
-		Collection<String> output = containsNoNullElements(input, "message");
+		var output = containsNoNullElements(input, "message");
 		assertSame(input, output);
 
 		output = containsNoNullElements(input, () -> "message");
@@ -164,10 +159,10 @@ void containsNoNullElementsPassesForCollectionContainingNonNullElements() {
 
 	@Test
 	void containsNoNullElementsThrowsForArrayContainingNullElements() {
-		String message = "array contains null elements";
+		var message = "array contains null elements";
 		Object[] array = { new Object(), null, new Object() };
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> containsNoNullElements(array, message));
 
 		assertEquals(message, exception.getMessage());
@@ -175,9 +170,9 @@ void containsNoNullElementsThrowsForArrayContainingNullElements() {
 
 	@Test
 	void containsNoNullElementsThrowsForCollectionContainingNullElements() {
-		String message = "collection contains null elements";
+		var message = "collection contains null elements";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> containsNoNullElements(singletonList(null), message));
 
 		assertEquals(message, exception.getMessage());
@@ -185,67 +180,61 @@ void containsNoNullElementsThrowsForCollectionContainingNullElements() {
 
 	@Test
 	void notBlankPassesForNonBlankString() {
-		String string = "abc";
-		String nonBlankString = notBlank(string, "message");
+		var string = "abc";
+		var nonBlankString = notBlank(string, "message");
 		assertSame(string, nonBlankString);
 	}
 
 	@Test
 	void notBlankThrowsForNullString() {
-		String message = "string shouldn't be blank";
+		var message = "string shouldn't be blank";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notBlank(null, message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notBlank(null, message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notBlankThrowsForNullStringWithMessageSupplier() {
-		String message = "string shouldn't be blank";
+		var message = "string shouldn't be blank";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notBlank(null, () -> message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notBlank(null, () -> message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notBlankThrowsForEmptyString() {
-		String message = "string shouldn't be blank";
+		var message = "string shouldn't be blank";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notBlank("", message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notBlank("", message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notBlankThrowsForEmptyStringWithMessageSupplier() {
-		String message = "string shouldn't be blank";
+		var message = "string shouldn't be blank";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notBlank("", () -> message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notBlank("", () -> message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notBlankThrowsForBlankString() {
-		String message = "string shouldn't be blank";
+		var message = "string shouldn't be blank";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notBlank("          ", message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notBlank("          ", message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void notBlankThrowsForBlankStringWithMessageSupplier() {
-		String message = "string shouldn't be blank";
+		var message = "string shouldn't be blank";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> notBlank("          ", () -> message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notBlank("          ", () -> message));
 
 		assertEquals(message, exception.getMessage());
 	}
@@ -262,20 +251,18 @@ void conditionPassesForTruePredicateWithMessageSupplier() {
 
 	@Test
 	void conditionThrowsForFalsePredicate() {
-		String message = "condition does not hold";
+		var message = "condition does not hold";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> condition(false, message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> condition(false, message));
 
 		assertEquals(message, exception.getMessage());
 	}
 
 	@Test
 	void conditionThrowsForFalsePredicateWithMessageSupplier() {
-		String message = "condition does not hold";
+		var message = "condition does not hold";
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> condition(false, () -> message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> condition(false, () -> message));
 
 		assertEquals(message, exception.getMessage());
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 4b259be2152b..d1ae36e6df88 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -42,8 +42,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -181,7 +179,7 @@ void getAllAssignmentCompatibleClassesWithNullClass() {
 
 	@Test
 	void getAllAssignmentCompatibleClasses() {
-		Set<Class<?>> superclasses = ReflectionUtils.getAllAssignmentCompatibleClasses(B.class);
+		var superclasses = ReflectionUtils.getAllAssignmentCompatibleClasses(B.class);
 		assertThat(superclasses).containsExactly(B.class, InterfaceC.class, InterfaceA.class, InterfaceB.class, A.class,
 			InterfaceD.class, Object.class);
 		assertTrue(superclasses.stream().allMatch(clazz -> clazz.isAssignableFrom(B.class)));
@@ -198,7 +196,7 @@ void newInstance() {
 		assertThrows(PreconditionViolationException.class, () -> ReflectionUtils.newInstance(C.class, null, null));
 		assertThrows(PreconditionViolationException.class, () -> ReflectionUtils.newInstance(C.class, ((Object[]) null)));
 
-		RuntimeException exception = assertThrows(RuntimeException.class, () -> ReflectionUtils.newInstance(Exploder.class));
+		var exception = assertThrows(RuntimeException.class, () -> ReflectionUtils.newInstance(Exploder.class));
 		assertThat(exception).hasMessage("boom");
 		// @formatter:on
 	}
@@ -237,7 +235,7 @@ void tryToReadFieldValueOfNonexistentInstanceField() {
 	void readFieldValueOfExistingStaticField() throws Exception {
 		assertThat(readFieldValue(MyClass.class, "staticField", null)).contains(42);
 
-		Field field = MyClass.class.getDeclaredField("staticField");
+		var field = MyClass.class.getDeclaredField("staticField");
 		assertThat(readFieldValue(field)).contains(42);
 		assertThat(readFieldValue(field, null)).contains(42);
 	}
@@ -246,7 +244,7 @@ void readFieldValueOfExistingStaticField() throws Exception {
 	void tryToReadFieldValueOfExistingStaticField() throws Exception {
 		assertThat(tryToReadFieldValue(MyClass.class, "staticField", null).get()).isEqualTo(42);
 
-		Field field = MyClass.class.getDeclaredField("staticField");
+		var field = MyClass.class.getDeclaredField("staticField");
 		assertThat(tryToReadFieldValue(field).get()).isEqualTo(42);
 		assertThat(tryToReadFieldValue(field, null).get()).isEqualTo(42);
 	}
@@ -254,17 +252,17 @@ void tryToReadFieldValueOfExistingStaticField() throws Exception {
 	@Test
 	@SuppressWarnings("deprecation")
 	void readFieldValueOfExistingInstanceField() throws Exception {
-		MyClass instance = new MyClass(42);
+		var instance = new MyClass(42);
 		assertThat(readFieldValue(MyClass.class, "instanceField", instance)).contains(42);
 
-		Field field = MyClass.class.getDeclaredField("instanceField");
+		var field = MyClass.class.getDeclaredField("instanceField");
 		assertThat(readFieldValue(field, instance)).contains(42);
 	}
 
 	@Test
 	@SuppressWarnings("deprecation")
 	void attemptToReadFieldValueOfExistingInstanceFieldAsStaticField() throws Exception {
-		Field field = MyClass.class.getDeclaredField("instanceField");
+		var field = MyClass.class.getDeclaredField("instanceField");
 		Exception exception = assertThrows(PreconditionViolationException.class, () -> readFieldValue(field, null));
 		assertThat(exception)//
 				.hasMessageStartingWith("Cannot read non-static field")//
@@ -273,10 +271,10 @@ void attemptToReadFieldValueOfExistingInstanceFieldAsStaticField() throws Except
 
 	@Test
 	void tryToReadFieldValueOfExistingInstanceField() throws Exception {
-		MyClass instance = new MyClass(42);
+		var instance = new MyClass(42);
 		assertThat(tryToReadFieldValue(MyClass.class, "instanceField", instance).get()).isEqualTo(42);
 
-		Field field = MyClass.class.getDeclaredField("instanceField");
+		var field = MyClass.class.getDeclaredField("instanceField");
 		assertThat(tryToReadFieldValue(field, instance).get()).isEqualTo(42);
 		assertThrows(PreconditionViolationException.class, () -> tryToReadFieldValue(field, null).get());
 	}
@@ -417,14 +415,14 @@ void invokeMethodPreconditions() {
 
 	@Test
 	void invokePublicMethod() throws Exception {
-		InvocationTracker tracker = new InvocationTracker();
+		var tracker = new InvocationTracker();
 		invokeMethod(InvocationTracker.class.getDeclaredMethod("publicMethod"), tracker);
 		assertTrue(tracker.publicMethodInvoked);
 	}
 
 	@Test
 	void invokePrivateMethod() throws Exception {
-		InvocationTracker tracker = new InvocationTracker();
+		var tracker = new InvocationTracker();
 		invokeMethod(InvocationTracker.class.getDeclaredMethod("privateMethod"), tracker);
 		assertTrue(tracker.privateMethodInvoked);
 	}
@@ -467,7 +465,7 @@ void tryToLoadClassWhenClassNotFoundException() {
 	@Test
 	@SuppressWarnings("deprecation")
 	void loadClass() {
-		Optional<Class<?>> optional = ReflectionUtils.loadClass(Integer.class.getName());
+		var optional = ReflectionUtils.loadClass(Integer.class.getName());
 		assertThat(optional).contains(Integer.class);
 	}
 
@@ -622,9 +620,9 @@ void getOutermostInstancePreconditions() {
 	@Test
 	@SuppressWarnings("deprecation")
 	void getOutermostInstance() {
-		FirstClass firstClass = new FirstClass();
-		FirstClass.SecondClass secondClass = firstClass.new SecondClass();
-		FirstClass.SecondClass.ThirdClass thirdClass = secondClass.new ThirdClass();
+		var firstClass = new FirstClass();
+		var secondClass = firstClass.new SecondClass();
+		var thirdClass = secondClass.new ThirdClass();
 
 		assertThat(ReflectionUtils.getOutermostInstance(thirdClass, FirstClass.SecondClass.ThirdClass.class))//
 				.contains(thirdClass);
@@ -636,11 +634,11 @@ void getOutermostInstance() {
 
 	@Test
 	void getAllClasspathRootDirectories(@TempDir Path tempDirectory) throws Exception {
-		Path root1 = tempDirectory.resolve("root1").toAbsolutePath();
-		Path root2 = tempDirectory.resolve("root2").toAbsolutePath();
-		String testClassPath = root1 + File.pathSeparator + root2;
+		var root1 = tempDirectory.resolve("root1").toAbsolutePath();
+		var root2 = tempDirectory.resolve("root2").toAbsolutePath();
+		var testClassPath = root1 + File.pathSeparator + root2;
 
-		String originalClassPath = System.setProperty("java.class.path", testClassPath);
+		var originalClassPath = System.setProperty("java.class.path", testClassPath);
 		try {
 			createDirectories(root1, root2);
 
@@ -744,20 +742,20 @@ private void assertNestedCycle(Class<?> start, Class<?> from, Class<?> to) {
 	@Test
 	@TrackLogRecords
 	void findNestedClassesWithInvalidNestedClassFile(LogRecordListener listener) throws Exception {
-		URL jarUrl = getClass().getResource("/gh-1436-invalid-nested-class-file.jar");
+		var jarUrl = getClass().getResource("/gh-1436-invalid-nested-class-file.jar");
 
-		try (URLClassLoader classLoader = new URLClassLoader(new URL[] { jarUrl })) {
-			String fqcn = "tests.NestedInterfaceGroovyTests";
-			Class<?> classWithInvalidNestedClassFile = classLoader.loadClass(fqcn);
+		try (var classLoader = new URLClassLoader(new URL[] { jarUrl })) {
+			var fqcn = "tests.NestedInterfaceGroovyTests";
+			var classWithInvalidNestedClassFile = classLoader.loadClass(fqcn);
 
 			assertEquals(fqcn, classWithInvalidNestedClassFile.getName());
-			NoClassDefFoundError noClassDefFoundError = assertThrows(NoClassDefFoundError.class,
+			var noClassDefFoundError = assertThrows(NoClassDefFoundError.class,
 				classWithInvalidNestedClassFile::getDeclaredClasses);
 			assertEquals("tests/NestedInterfaceGroovyTests$NestedInterface$1", noClassDefFoundError.getMessage());
 
 			assertThat(findNestedClasses(classWithInvalidNestedClassFile)).isEmpty();
 			// @formatter:off
-			String logMessage = listener.stream(ReflectionUtils.class, Level.FINE)
+			var logMessage = listener.stream(ReflectionUtils.class, Level.FINE)
 					.findFirst()
 					.map(LogRecord::getMessage)
 					.orElse("didn't find log record");
@@ -864,7 +862,7 @@ void findMethodByParameterTypes() throws Exception {
 	@Test
 	void findMethodByParameterTypesInGenericInterface() {
 		Class<?> ifc = InterfaceWithGenericDefaultMethod.class;
-		Optional<Method> method = findMethod(ifc, "foo", Number.class);
+		var method = findMethod(ifc, "foo", Number.class);
 		assertThat(method).isNotEmpty();
 		assertThat(method.get().getName()).isEqualTo("foo");
 	}
@@ -875,7 +873,7 @@ void findMethodByParameterTypesInGenericInterface() {
 	@Test
 	void findMethodByParameterTypesInGenericInterfaceViaParameterizedSubclass() {
 		Class<?> clazz = InterfaceWithGenericDefaultMethodImpl.class;
-		Optional<Method> method = findMethod(clazz, "foo", Long.class);
+		var method = findMethod(clazz, "foo", Long.class);
 		assertThat(method).isNotEmpty();
 		assertThat(method.get().getName()).isEqualTo("foo");
 
@@ -898,7 +896,7 @@ void findMethodByParameterTypesInGenericInterfaceViaParameterizedSubclass() {
 	void findMethodByParameterTypesWithOverloadedMethodNextToGenericDefaultMethod() {
 		Class<?> clazz = InterfaceWithGenericDefaultMethodImpl.class;
 		Class<?> parameterType = Double.class;
-		Optional<Method> method = findMethod(clazz, "foo", parameterType);
+		var method = findMethod(clazz, "foo", parameterType);
 		assertThat(method).isNotEmpty();
 		assertThat(method.get().getName()).isEqualTo("foo");
 		assertThat(method.get().getParameterTypes()[0]).isEqualTo(parameterType);
@@ -931,15 +929,15 @@ void findMethodByParameterNamesWithMultidimensionalObjectArrayParameter() throws
 
 	@Test
 	void findMethodByParameterNamesWithParameterizedMapParameter() throws Exception {
-		String methodName = "methodWithParameterizedMap";
+		var methodName = "methodWithParameterizedMap";
 
 		// standard, supported use case
 		assertFindMethodByParameterNames(methodName, Map.class);
 
 		// generic type info in parameter list
-		Method method = getClass().getDeclaredMethod(methodName, Map.class);
-		String genericParameterTypeName = method.getGenericParameterTypes()[0].getTypeName();
-		JUnitException exception = assertThrows(JUnitException.class,
+		var method = getClass().getDeclaredMethod(methodName, Map.class);
+		var genericParameterTypeName = method.getGenericParameterTypes()[0].getTypeName();
+		var exception = assertThrows(JUnitException.class,
 			() -> findMethod(getClass(), methodName, genericParameterTypeName));
 
 		assertThat(exception).hasMessageStartingWith("Failed to load parameter type [java.util.Map<java.lang.String");
@@ -948,8 +946,8 @@ void findMethodByParameterNamesWithParameterizedMapParameter() throws Exception
 	private void assertFindMethodByParameterNames(String methodName, Class<?> parameterType)
 			throws NoSuchMethodException {
 
-		Method method = getClass().getDeclaredMethod(methodName, parameterType);
-		Optional<Method> optional = findMethod(getClass(), methodName, parameterType.getName());
+		var method = getClass().getDeclaredMethod(methodName, parameterType);
+		var optional = findMethod(getClass(), methodName, parameterType.getName());
 		assertThat(optional).contains(method);
 	}
 
@@ -982,7 +980,7 @@ private static void assertOneFooMethodIn(Class<?> clazz) {
 
 	@Test
 	void findMethodsInObject() {
-		List<Method> methods = findMethods(Object.class, method -> true);
+		var methods = findMethods(Object.class, method -> true);
 		assertNotNull(methods);
 		assertTrue(methods.size() > 10);
 	}
@@ -1009,7 +1007,7 @@ void findMethodsIgnoresSyntheticMethods() {
 		assertTrue(stream(ClassWithSyntheticMethod.class.getDeclaredMethods()).anyMatch(Method::isSynthetic),
 			"ClassWithSyntheticMethod must actually contain at least one synthetic method.");
 
-		List<Method> methods = findMethods(ClassWithSyntheticMethod.class, method -> true);
+		var methods = findMethods(ClassWithSyntheticMethod.class, method -> true);
 		assertThat(methods).isEmpty();
 	}
 
@@ -1070,7 +1068,7 @@ void findMethodsWithShadowingUsingHierarchyUpMode() throws Exception {
 				.containsExactly(MethodShadowingChild.class.getMethod("method5", Long.class),
 					MethodShadowingParent.class.getMethod("method5", String.class));
 
-		List<Method> methods = findMethods(MethodShadowingChild.class, method -> true, BOTTOM_UP);
+		var methods = findMethods(MethodShadowingChild.class, method -> true, BOTTOM_UP);
 		assertEquals(6, methods.size());
 		assertThat(methods.subList(0, 3)).containsOnly(MethodShadowingChild.class.getMethod("method4", boolean.class),
 			MethodShadowingChild.class.getMethod("method1", String.class),
@@ -1097,7 +1095,7 @@ void findMethodsWithShadowingUsingHierarchyDownMode() throws Exception {
 				.containsExactly(MethodShadowingParent.class.getMethod("method5", String.class),
 					MethodShadowingChild.class.getMethod("method5", Long.class));
 
-		List<Method> methods = findMethods(MethodShadowingChild.class, method -> true, TOP_DOWN);
+		var methods = findMethods(MethodShadowingChild.class, method -> true, TOP_DOWN);
 		assertEquals(6, methods.size());
 		assertEquals(MethodShadowingInterface.class.getMethod("method2", int.class, int.class), methods.get(0));
 		assertThat(methods.subList(1, 3)).containsOnly(
@@ -1114,19 +1112,19 @@ void findMethodsWithStaticHidingUsingHierarchyUpMode() throws Exception {
 		Class<?> parent = StaticMethodHidingParent.class;
 		Class<?> child = StaticMethodHidingChild.class;
 
-		Method ifcMethod2 = ifc.getDeclaredMethod("method2", int.class, int.class);
-		Method childMethod1 = child.getDeclaredMethod("method1", String.class);
-		Method childMethod4 = child.getDeclaredMethod("method4", boolean.class);
-		Method childMethod5 = child.getDeclaredMethod("method5", Long.class);
-		Method parentMethod2 = parent.getDeclaredMethod("method2", int.class, int.class, int.class);
-		Method parentMethod5 = parent.getDeclaredMethod("method5", String.class);
+		var ifcMethod2 = ifc.getDeclaredMethod("method2", int.class, int.class);
+		var childMethod1 = child.getDeclaredMethod("method1", String.class);
+		var childMethod4 = child.getDeclaredMethod("method4", boolean.class);
+		var childMethod5 = child.getDeclaredMethod("method5", Long.class);
+		var parentMethod2 = parent.getDeclaredMethod("method2", int.class, int.class, int.class);
+		var parentMethod5 = parent.getDeclaredMethod("method5", String.class);
 
 		assertThat(findMethods(child, methodContains1, BOTTOM_UP)).containsExactly(childMethod1);
 		assertThat(findMethods(child, methodContains2, BOTTOM_UP)).containsExactly(parentMethod2, ifcMethod2);
 		assertThat(findMethods(child, methodContains4, BOTTOM_UP)).containsExactly(childMethod4);
 		assertThat(findMethods(child, methodContains5, BOTTOM_UP)).containsExactly(childMethod5, parentMethod5);
 
-		List<Method> methods = findMethods(child, method -> true, BOTTOM_UP);
+		var methods = findMethods(child, method -> true, BOTTOM_UP);
 		assertEquals(6, methods.size());
 		assertThat(methods.subList(0, 3)).containsOnly(childMethod1, childMethod4, childMethod5);
 		assertThat(methods.subList(3, 5)).containsOnly(parentMethod2, parentMethod5);
@@ -1139,19 +1137,19 @@ void findMethodsWithStaticHidingUsingHierarchyDownMode() throws Exception {
 		Class<?> parent = StaticMethodHidingParent.class;
 		Class<?> child = StaticMethodHidingChild.class;
 
-		Method ifcMethod2 = ifc.getDeclaredMethod("method2", int.class, int.class);
-		Method childMethod1 = child.getDeclaredMethod("method1", String.class);
-		Method childMethod4 = child.getDeclaredMethod("method4", boolean.class);
-		Method childMethod5 = child.getDeclaredMethod("method5", Long.class);
-		Method parentMethod2 = parent.getDeclaredMethod("method2", int.class, int.class, int.class);
-		Method parentMethod5 = parent.getDeclaredMethod("method5", String.class);
+		var ifcMethod2 = ifc.getDeclaredMethod("method2", int.class, int.class);
+		var childMethod1 = child.getDeclaredMethod("method1", String.class);
+		var childMethod4 = child.getDeclaredMethod("method4", boolean.class);
+		var childMethod5 = child.getDeclaredMethod("method5", Long.class);
+		var parentMethod2 = parent.getDeclaredMethod("method2", int.class, int.class, int.class);
+		var parentMethod5 = parent.getDeclaredMethod("method5", String.class);
 
 		assertThat(findMethods(child, methodContains1, TOP_DOWN)).containsExactly(childMethod1);
 		assertThat(findMethods(child, methodContains2, TOP_DOWN)).containsExactly(ifcMethod2, parentMethod2);
 		assertThat(findMethods(child, methodContains4, TOP_DOWN)).containsExactly(childMethod4);
 		assertThat(findMethods(child, methodContains5, TOP_DOWN)).containsExactly(parentMethod5, childMethod5);
 
-		List<Method> methods = findMethods(child, method -> true, TOP_DOWN);
+		var methods = findMethods(child, method -> true, TOP_DOWN);
 		assertEquals(6, methods.size());
 		assertEquals(ifcMethod2, methods.get(0));
 		assertThat(methods.subList(1, 3)).containsOnly(parentMethod2, parentMethod5);
@@ -1163,7 +1161,7 @@ void findMethodsReturnsAllOverloadedMethodsThatAreNotShadowed() {
 		Class<?> clazz = InterfaceWithGenericDefaultMethodImpl.class;
 
 		// Search for all foo(*) methods.
-		List<Method> methods = findMethods(clazz, isFooMethod);
+		var methods = findMethods(clazz, isFooMethod);
 
 		// One might expect or desire that the signature for the generic foo(N)
 		// default method would be "foo(java.lang.Long)" when looked up via the
@@ -1177,8 +1175,8 @@ void findMethodsDoesNotReturnOverriddenDefaultMethods() {
 		Class<?> clazz = InterfaceWithOverriddenGenericDefaultMethodImpl.class;
 
 		// Search for all foo(*) methods.
-		List<Method> methods = findMethods(clazz, isFooMethod);
-		List<String> signatures = signaturesOf(methods);
+		var methods = findMethods(clazz, isFooMethod);
+		var signatures = signaturesOf(methods);
 
 		// Although the subsequent assertion covers this case as well, this
 		// assertion is in place to provide a more informative failure message.
@@ -1202,18 +1200,18 @@ void findMethodsIgnoresBridgeMethods() throws Exception {
 		assertTrue(PublicChildClass.class.getDeclaredMethod("method1").isBridge());
 		assertTrue(PublicChildClass.class.getDeclaredMethod("method3").isBridge());
 
-		List<Method> methods = findMethods(PublicChildClass.class, method -> true);
-		List<String> signatures = signaturesOf(methods);
+		var methods = findMethods(PublicChildClass.class, method -> true);
+		var signatures = signaturesOf(methods);
 		assertThat(signatures).containsOnly("method1()", "method2()", "method3()", "otherMethod1()", "otherMethod2()");
 		assertEquals(0, methods.stream().filter(Method::isBridge).count());
 	}
 
 	@Test
 	void isGeneric() {
-		for (Method method : Generic.class.getMethods()) {
+		for (var method : Generic.class.getMethods()) {
 			assertTrue(ReflectionUtils.isGeneric(method));
 		}
-		for (Method method : PublicClass.class.getMethods()) {
+		for (var method : PublicClass.class.getMethods()) {
 			assertFalse(ReflectionUtils.isGeneric(method));
 		}
 	}
@@ -1305,7 +1303,7 @@ private Predicate<Field> isA(Class<?> type) {
 	}
 
 	private static void createDirectories(Path... paths) throws IOException {
-		for (Path path : paths) {
+		for (var path : paths) {
 			Files.createDirectory(path);
 		}
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
index 496a925b92a0..d68b48a36ea4 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
@@ -44,7 +44,7 @@ public void foo(Long parameter) {
 			}
 		}
 
-		Method foo = findMethod(A.class, "foo", Long.class).orElseThrow();
+		var foo = findMethod(A.class, "foo", Long.class).orElseThrow();
 
 		assertEquals(A.class, foo.getDeclaringClass());
 	}
@@ -58,7 +58,7 @@ public void foo(Number parameter) {
 			}
 		}
 
-		Method foo = findMethod(A.class, "foo", Long.class).orElseThrow();
+		var foo = findMethod(A.class, "foo", Long.class).orElseThrow();
 
 		assertEquals(A.class, foo.getDeclaringClass());
 	}
@@ -79,7 +79,7 @@ public void foo(Number parameter) {
 			}
 		}
 
-		Method foo = findMethod(A.class, "foo", Long.class).orElseThrow();
+		var foo = findMethod(A.class, "foo", Long.class).orElseThrow();
 
 		assertEquals(A.class, foo.getDeclaringClass());
 	}
@@ -96,7 +96,7 @@ public void foo(@SuppressWarnings("unused") Number parameter) {
 		class A extends AParent implements InterfaceGenericNumber<Number> {
 		}
 
-		Method foo = findMethod(A.class, "foo", Long.class).orElseThrow();
+		var foo = findMethod(A.class, "foo", Long.class).orElseThrow();
 
 		// ????????
 		assertEquals(A.class, foo.getDeclaringClass());
@@ -124,7 +124,7 @@ public void findMethodWithMostSpecificParameterTypeInHierarchy() {
 
 	private void assertSpecificFooMethodFound(Class<?> classToSearchIn, Class<?> classWithMostSpecificMethod,
 			Class<?> parameterType) {
-		Method foo = findMethod(classToSearchIn, "foo", parameterType).orElseThrow();
+		var foo = findMethod(classToSearchIn, "foo", parameterType).orElseThrow();
 		assertDeclaringClass(foo, classWithMostSpecificMethod);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
index a9d64dfdb054..04bd5cb509b9 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
@@ -20,19 +20,19 @@ public class SerializationUtils {
 
 	@SuppressWarnings("unchecked")
 	public static <T extends Serializable> T serializeAndDeserialize(T object) throws Exception {
-		byte[] bytes = serialize(object);
+		var bytes = serialize(object);
 		return (T) deserialize(bytes);
 	}
 
 	private static Object deserialize(byte[] bytes) throws Exception {
-		try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
+		try (var in = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
 			return in.readObject();
 		}
 	}
 
 	private static byte[] serialize(Object object) throws Exception {
-		try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-				ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream)) {
+		try (var byteArrayOutputStream = new ByteArrayOutputStream();
+				var objectOutputStream = new ObjectOutputStream(byteArrayOutputStream)) {
 			objectOutputStream.writeObject(object);
 			objectOutputStream.flush();
 			return byteArrayOutputStream.toByteArray();
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
index 581265ea70e6..07a1b474cb98 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
@@ -22,12 +22,9 @@
 import static org.junit.platform.commons.util.ReflectionUtils.getFullyQualifiedMethodName;
 
 import java.io.File;
-import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.EnumMap;
@@ -77,17 +74,17 @@ List<DynamicNode> reports() {
 	}
 
 	private List<DynamicNode> scanContainerClassAndCreateDynamicTests(Class<?> containerClass) {
-		String containerName = containerClass.getSimpleName().replace("TestCase", "");
+		var containerName = containerClass.getSimpleName().replace("TestCase", "");
 		// String containerName = containerClass.getSimpleName();
 		List<DynamicNode> nodes = new ArrayList<>();
 		Map<Details, List<DynamicTest>> map = new EnumMap<>(Details.class);
-		for (Method method : findMethods(containerClass, m -> m.isAnnotationPresent(Test.class))) {
-			String methodName = method.getName();
-			Class<?>[] types = method.getParameterTypes();
-			for (Details details : Details.values()) {
-				List<DynamicTest> tests = map.computeIfAbsent(details, key -> new ArrayList<>());
-				for (Theme theme : Theme.values()) {
-					String caption = containerName + "-" + methodName + "-" + details + "-" + theme;
+		for (var method : findMethods(containerClass, m -> m.isAnnotationPresent(Test.class))) {
+			var methodName = method.getName();
+			var types = method.getParameterTypes();
+			for (var details : Details.values()) {
+				var tests = map.computeIfAbsent(details, key -> new ArrayList<>());
+				for (var theme : Theme.values()) {
+					var caption = containerName + "-" + methodName + "-" + details + "-" + theme;
 					String[] args = { //
 							"--include-engine", "junit-jupiter", //
 							"--details", details.name(), //
@@ -97,16 +94,16 @@ private List<DynamicNode> scanContainerClassAndCreateDynamicTests(Class<?> conta
 							"--include-classname", containerClass.getCanonicalName(), //
 							"--select-method", getFullyQualifiedMethodName(containerClass, methodName, types) //
 					};
-					String displayName = methodName + "() " + theme.name();
-					String dirName = "console/details/" + containerName.toLowerCase();
-					String outName = caption + ".out.txt";
-					Runner runner = new Runner(dirName, outName, args);
-					URI source = toUri(dirName, outName).orElse(null);
+					var displayName = methodName + "() " + theme.name();
+					var dirName = "console/details/" + containerName.toLowerCase();
+					var outName = caption + ".out.txt";
+					var runner = new Runner(dirName, outName, args);
+					var source = toUri(dirName, outName).orElse(null);
 					tests.add(dynamicTest(displayName, source, runner));
 				}
 			}
 		}
-		URI source = new File("src/test/resources/console/details").toURI();
+		var source = new File("src/test/resources/console/details").toURI();
 		map.forEach((details, tests) -> nodes.add(dynamicContainer(details.name(), source, tests.stream())));
 		return nodes;
 	}
@@ -210,36 +207,36 @@ private Runner(String dirName, String outName, String... args) {
 
 		@Override
 		public void execute() throws Throwable {
-			ConsoleLauncherWrapper wrapper = new ConsoleLauncherWrapper();
-			ConsoleLauncherWrapperResult result = wrapper.execute(Optional.empty(), args);
+			var wrapper = new ConsoleLauncherWrapper();
+			var result = wrapper.execute(Optional.empty(), args);
 
-			Optional<URI> optionalUri = toUri(dirName, outName);
+			var optionalUri = toUri(dirName, outName);
 			if (!optionalUri.isPresent()) {
 				if (Boolean.getBoolean("org.junit.platform.console.ConsoleDetailsTests.writeResultOut")) {
 					// do not use Files.createTempDirectory(prefix) as we want one folder for one container
-					Path temp = Paths.get(System.getProperty("java.io.tmpdir"), dirName.replace('/', '-'));
+					var temp = Paths.get(System.getProperty("java.io.tmpdir"), dirName.replace('/', '-'));
 					Files.createDirectories(temp);
-					Path path = Files.write(temp.resolve(outName), result.out.getBytes(UTF_8));
+					var path = Files.write(temp.resolve(outName), result.out.getBytes(UTF_8));
 					assumeTrue(false,
 						format("resource `%s` not found\nwrote console stdout to: %s/%s", dirName, outName, path));
 				}
 				fail("could not load resource named `" + dirName + "/" + outName + "`");
 			}
 
-			Path path = Paths.get(optionalUri.get());
+			var path = Paths.get(optionalUri.get());
 			assumeTrue(Files.exists(path), "path does not exist: " + path);
 			assumeTrue(Files.isReadable(path), "can not read: " + path);
 
-			List<String> expectedLines = Files.readAllLines(path, UTF_8);
-			List<String> actualLines = asList(result.out.split("\\R"));
+			var expectedLines = Files.readAllLines(path, UTF_8);
+			var actualLines = asList(result.out.split("\\R"));
 
 			assertLinesMatch(expectedLines, actualLines);
 		}
 	}
 
 	static Optional<URI> toUri(String dirName, String outName) {
-		String resourceName = dirName + "/" + outName;
-		URL url = ConsoleDetailsTests.class.getClassLoader().getResource(resourceName);
+		var resourceName = dirName + "/" + outName;
+		var url = ConsoleDetailsTests.class.getClassLoader().getResource(resourceName);
 		if (url == null) {
 			return Optional.empty();
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
index 83a2610445aa..bf37a87b39af 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
@@ -30,7 +30,7 @@ class ConsoleLauncherExecutionResultTests {
 	void hasStatusCode0ForNoTotalFailures() {
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -39,7 +39,7 @@ void hasStatusCode0ForNoTotalFailures() {
 	void hasStatusCode1ForForAnyFailure() {
 		when(summary.getTotalFailureCount()).thenReturn(1L);
 
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -52,7 +52,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() {
 		options.setFailIfNoTests(true);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(2);
 	}
@@ -66,7 +66,7 @@ void hasStatusCode0ForTestsAndHasOptionFailIfNoTestsFound() {
 		when(summary.getTestsFoundCount()).thenReturn(1L);
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -79,7 +79,7 @@ void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() {
 		options.setFailIfNoTests(false);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
index 415dff814abe..073bb1c63360 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
@@ -25,7 +25,7 @@ class ConsoleLauncherIntegrationTests {
 
 	@Test
 	void executeWithoutArgumentsFailsAndPrintsHelpInformation() {
-		ConsoleLauncherWrapperResult result = new ConsoleLauncherWrapper().execute(-1);
+		var result = new ConsoleLauncherWrapper().execute(-1);
 		assertAll("empty args array results in display of help information and an exception stacktrace", //
 			() -> assertTrue(result.out.contains("help information")), //
 			() -> assertTrue(result.err.contains("No arguments were supplied to the ConsoleLauncher")) //
@@ -42,7 +42,7 @@ void executeWithoutExcludeClassnameOptionDoesNotExcludeClassesAndMustIncludeAllC
 	void executeWithExcludeClassnameOptionExcludesClasses() {
 		String[] args = { "-e", "junit-jupiter", "-p", "org.junit.platform.console.subpackage", "--exclude-classname",
 				"^org\\.junit\\.platform\\.console\\.subpackage\\..*" };
-		ConsoleLauncherWrapperResult result = new ConsoleLauncherWrapper().execute(args);
+		var result = new ConsoleLauncherWrapper().execute(args);
 		assertAll("all subpackage test classes are excluded by the class name filter", //
 			() -> assertArrayEquals(args, result.args), //
 			() -> assertEquals(0, result.code), //
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index 3f658049fdb0..363197658cd1 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -36,14 +36,14 @@ class ConsoleLauncherTests {
 
 	@Test
 	void displayHelp() {
-		CommandLineOptions options = new CommandLineOptions();
+		var options = new CommandLineOptions();
 		options.setDisplayHelp(true);
 
-		CommandLineOptionsParser commandLineOptionsParser = mock(CommandLineOptionsParser.class);
+		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
 		when(commandLineOptionsParser.parse(any())).thenReturn(options);
 
-		ConsoleLauncher consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		int exitCode = consoleLauncher.execute("--help").getExitCode();
+		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
+		var exitCode = consoleLauncher.execute("--help").getExitCode();
 
 		assertEquals(0, exitCode);
 		verify(commandLineOptionsParser).parse("--help");
@@ -51,15 +51,15 @@ void displayHelp() {
 
 	@Test
 	void displayBanner() {
-		CommandLineOptions options = new CommandLineOptions();
+		var options = new CommandLineOptions();
 		options.setBannerDisabled(false);
 		options.setDisplayHelp(true);
 
-		CommandLineOptionsParser commandLineOptionsParser = mock(CommandLineOptionsParser.class);
+		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
 		when(commandLineOptionsParser.parse(any())).thenReturn(options);
 
-		ConsoleLauncher consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		int exitCode = consoleLauncher.execute("--help").getExitCode();
+		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
+		var exitCode = consoleLauncher.execute("--help").getExitCode();
 
 		assertEquals(0, exitCode);
 		assertLinesMatch(
@@ -69,15 +69,15 @@ void displayBanner() {
 
 	@Test
 	void disableBanner() {
-		CommandLineOptions options = new CommandLineOptions();
+		var options = new CommandLineOptions();
 		options.setBannerDisabled(true);
 		options.setDisplayHelp(true);
 
-		CommandLineOptionsParser commandLineOptionsParser = mock(CommandLineOptionsParser.class);
+		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
 		when(commandLineOptionsParser.parse(any())).thenReturn(options);
 
-		ConsoleLauncher consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		int exitCode = consoleLauncher.execute("--help", "--disable-banner").getExitCode();
+		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
+		var exitCode = consoleLauncher.execute("--help", "--disable-banner").getExitCode();
 
 		assertEquals(0, exitCode);
 		assertLinesMatch(List.of(), stringWriter.toString().lines().collect(Collectors.toList()));
@@ -85,11 +85,11 @@ void disableBanner() {
 
 	@Test
 	void executeWithUnknownCommandLineOption() {
-		CommandLineOptionsParser commandLineOptionsParser = mock(CommandLineOptionsParser.class);
+		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
 		when(commandLineOptionsParser.parse(any())).thenReturn(new CommandLineOptions());
 
-		ConsoleLauncher consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		int exitCode = consoleLauncher.execute("--all").getExitCode();
+		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
+		var exitCode = consoleLauncher.execute("--all").getExitCode();
 
 		assertEquals(-1, exitCode);
 		verify(commandLineOptionsParser).parse("--all");
@@ -97,11 +97,11 @@ void executeWithUnknownCommandLineOption() {
 
 	@Test
 	void executeWithSupportedCommandLineOption() {
-		CommandLineOptionsParser commandLineOptionsParser = mock(CommandLineOptionsParser.class);
+		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
 		when(commandLineOptionsParser.parse(any())).thenReturn(new CommandLineOptions());
 
-		ConsoleLauncher consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		int exitCode = consoleLauncher.execute("--scan-classpath").getExitCode();
+		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
+		var exitCode = consoleLauncher.execute("--scan-classpath").getExitCode();
 
 		assertEquals(-1, exitCode);
 		verify(commandLineOptionsParser).parse("--scan-classpath");
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
index 7f004b08903e..e010155592c8 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
@@ -37,8 +37,8 @@ class ConsoleLauncherWrapper {
 	}
 
 	private ConsoleLauncherWrapper(CommandLineOptionsParser parser) {
-		PrintWriter outWriter = new PrintWriter(out, false);
-		PrintWriter errWriter = new PrintWriter(err, false);
+		var outWriter = new PrintWriter(out, false);
+		var errWriter = new PrintWriter(err, false);
 		this.consoleLauncher = new ConsoleLauncher(parser, outWriter, errWriter);
 
 	}
@@ -52,10 +52,10 @@ public ConsoleLauncherWrapperResult execute(int expectedExitCode, String... args
 	}
 
 	public ConsoleLauncherWrapperResult execute(Optional<Integer> expectedCode, String... args) {
-		ConsoleLauncherExecutionResult result = consoleLauncher.execute(args);
-		int code = result.getExitCode();
-		String outText = out.toString();
-		String errText = err.toString();
+		var result = consoleLauncher.execute(args);
+		var code = result.getExitCode();
+		var outText = out.toString();
+		var errText = err.toString();
 		if (expectedCode.isPresent()) {
 			int expectedValue = expectedCode.get();
 			assertAll("wrapped execution failed:\n" + outText + "\n", //
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index 38b3edd9c2ca..ceb39694e10c 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -31,10 +31,8 @@
 import java.io.Writer;
 import java.net.URI;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
 
@@ -51,7 +49,7 @@ class PicocliCommandLineOptionsParserTests {
 	@Test
 	void parseNoArguments() {
 		String[] noArguments = {};
-		CommandLineOptions options = createParser().parse(noArguments);
+		var options = createParser().parse(noArguments);
 
 		// @formatter:off
 		assertAll(
@@ -272,7 +270,7 @@ void parseInvalidExcludedEngines() {
 	@ParameterizedTest
 	@EnumSource
 	void parseValidAdditionalClasspathEntries(ArgsType type) {
-		Path dir = Paths.get(".");
+		var dir = Paths.get(".");
 		// @formatter:off
 		assertAll(
 			() -> assertEquals(singletonList(dir), type.parseArgLine("-cp .").getAdditionalClasspathEntries()),
@@ -297,7 +295,7 @@ void parseInvalidAdditionalClasspathEntries() {
 	@ParameterizedTest
 	@EnumSource
 	void parseValidXmlReportsDirs(ArgsType type) {
-		Path dir = Paths.get("build", "test-results");
+		var dir = Paths.get("build", "test-results");
 		// @formatter:off
 		assertAll(
 			() -> assertEquals(Optional.of(dir), type.parseArgLine("--reports-dir build/test-results").getReportsDir()),
@@ -483,7 +481,7 @@ void parseInvalidClasspathResourceSelectors() {
 	@ParameterizedTest
 	@EnumSource
 	void parseClasspathScanningEntries(ArgsType type) {
-		Path dir = Paths.get(".");
+		var dir = Paths.get(".");
 		// @formatter:off
 		assertAll(
 			() -> assertTrue(type.parseArgLine("--scan-class-path").isScanClasspath()),
@@ -537,7 +535,7 @@ void parseInvalidConfigurationParametersWithDuplicateKey(ArgsType type) {
 
 	@Test
 	void printHelpOutputsHelpOption() {
-		StringWriter writer = new StringWriter();
+		var writer = new StringWriter();
 
 		createParser().printHelp(writer, true);
 
@@ -546,7 +544,7 @@ void printHelpOutputsHelpOption() {
 
 	@Test
 	void printHelpPreservesOriginalIOException() {
-		Writer writer = new Writer() {
+		var writer = new Writer() {
 
 			@Override
 			public void write(char[] cbuf, int off, int len) throws IOException {
@@ -562,8 +560,8 @@ public void close() {
 			}
 		};
 
-		CommandLineOptionsParser parser = createParser();
-		RuntimeException exception = assertThrows(RuntimeException.class, () -> parser.printHelp(writer, true));
+		var parser = createParser();
+		var exception = assertThrows(RuntimeException.class, () -> parser.printHelp(writer, true));
 
 		assertThat(exception).hasCauseInstanceOf(IOException.class);
 		assertThat(exception.getCause()).hasMessage("Something went wrong");
@@ -595,9 +593,9 @@ CommandLineOptions parseArgLine(String argLine) {
 		},
 		atFile {
 			CommandLineOptions parseArgLine(String argLine) throws IOException {
-				Path atFile = Files.createTempFile("junit-launcher-args", ".txt");
+				var atFile = Files.createTempFile("junit-launcher-args", ".txt");
 				try {
-					List<String> lines = Arrays.asList(split(argLine));
+					var lines = Arrays.asList(split(argLine));
 					Files.write(atFile, lines);
 					return createParser().parse("@" + atFile);
 				}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index 0cda0b7c2b53..df1ab72617a5 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -51,7 +51,7 @@ void printsSummary() throws Exception {
 		dummyTestEngine.addTest("succeedingTest", SUCCEEDING_TEST);
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter));
 
 		assertThat(stringWriter.toString()).contains("Test run finished after", "2 tests found", "0 tests skipped",
@@ -64,7 +64,7 @@ void printsDetailsIfTheyAreNotHidden() throws Exception {
 
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter));
 
 		assertThat(stringWriter.toString()).contains("Test execution started.");
@@ -76,7 +76,7 @@ void printsNoDetailsIfTheyAreHidden() throws Exception {
 
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter));
 
 		assertThat(stringWriter.toString()).doesNotContain("Test execution started.");
@@ -89,7 +89,7 @@ void printsFailuresEvenIfDetailsAreHidden() throws Exception {
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 		dummyTestEngine.addContainer("failingContainer", FAILING_BLOCK);
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter));
 
 		assertThat(stringWriter.toString()).contains("Failures (2)", "failingTest", "failingContainer");
@@ -99,8 +99,8 @@ void printsFailuresEvenIfDetailsAreHidden() throws Exception {
 	void hasStatusCode0ForSucceedingTest() throws Exception {
 		dummyTestEngine.addTest("succeedingTest", SUCCEEDING_TEST);
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -109,8 +109,8 @@ void hasStatusCode0ForSucceedingTest() throws Exception {
 	void hasStatusCode1ForFailingTest() throws Exception {
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -119,8 +119,8 @@ void hasStatusCode1ForFailingTest() throws Exception {
 	void hasStatusCode1ForFailingContainer() throws Exception {
 		dummyTestEngine.addContainer("failingContainer", FAILING_BLOCK);
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -132,8 +132,8 @@ void hasStatusCode1ForFailingContainer() throws Exception {
 	void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
 		options.setFailIfNoTests(true);
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(2);
 	}
@@ -143,8 +143,8 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
 	 */
 	@Test
 	void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() throws Exception {
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		int exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -153,11 +153,11 @@ void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() throws Exception {
 	void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() throws Exception {
 		options.setAdditionalClasspathEntries(singletonList(Paths.get(".")));
 
-		ClassLoader oldClassLoader = getDefaultClassLoader();
+		var oldClassLoader = getDefaultClassLoader();
 		dummyTestEngine.addTest("failingTest",
 			() -> assertSame(oldClassLoader, getDefaultClassLoader(), "should fail"));
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter));
 
 		assertThat(stringWriter.toString()).contains("failingTest", "should fail", "1 tests failed");
@@ -167,11 +167,11 @@ void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() throws Except
 	void usesSameClassLoaderIfNoAdditionalClassPathEntriesArePresent() throws Exception {
 		options.setAdditionalClasspathEntries(emptyList());
 
-		ClassLoader oldClassLoader = getDefaultClassLoader();
+		var oldClassLoader = getDefaultClassLoader();
 		dummyTestEngine.addTest("failingTest",
 			() -> assertNotSame(oldClassLoader, getDefaultClassLoader(), "should fail"));
 
-		ConsoleTestExecutor task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter));
 
 		assertThat(stringWriter.toString()).contains("failingTest", "should fail", "1 tests failed");
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
index 00f9ad804e67..058d20c5f971 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
@@ -29,8 +29,8 @@ class CustomContextClassLoaderExecutorTests {
 
 	@Test
 	void invokeWithoutCustomClassLoaderDoesNotSetClassLoader() throws Exception {
-		ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
-		CustomContextClassLoaderExecutor executor = new CustomContextClassLoaderExecutor(Optional.empty());
+		var originalClassLoader = Thread.currentThread().getContextClassLoader();
+		var executor = new CustomContextClassLoaderExecutor(Optional.empty());
 
 		int result = executor.invoke(() -> {
 			assertSame(originalClassLoader, Thread.currentThread().getContextClassLoader());
@@ -43,10 +43,9 @@ void invokeWithoutCustomClassLoaderDoesNotSetClassLoader() throws Exception {
 
 	@Test
 	void invokeWithCustomClassLoaderSetsCustomAndResetsToOriginal() throws Exception {
-		ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
+		var originalClassLoader = Thread.currentThread().getContextClassLoader();
 		ClassLoader customClassLoader = URLClassLoader.newInstance(new URL[0]);
-		CustomContextClassLoaderExecutor executor = new CustomContextClassLoaderExecutor(
-			Optional.of(customClassLoader));
+		var executor = new CustomContextClassLoaderExecutor(Optional.of(customClassLoader));
 
 		int result = executor.invoke(() -> {
 			assertSame(customClassLoader, Thread.currentThread().getContextClassLoader());
@@ -59,7 +58,7 @@ void invokeWithCustomClassLoaderSetsCustomAndResetsToOriginal() throws Exception
 
 	@Test
 	void invokeWithCustomClassLoaderAndEnsureItIsClosedAfterUsage() throws Exception {
-		AtomicBoolean closed = new AtomicBoolean(false);
+		var closed = new AtomicBoolean(false);
 		ClassLoader localClassLoader = new URLClassLoader(new URL[0]) {
 			@Override
 			public void close() throws IOException {
@@ -67,7 +66,7 @@ public void close() throws IOException {
 				super.close();
 			}
 		};
-		CustomContextClassLoaderExecutor executor = new CustomContextClassLoaderExecutor(Optional.of(localClassLoader));
+		var executor = new CustomContextClassLoaderExecutor(Optional.of(localClassLoader));
 
 		int result = executor.invoke(() -> 4711);
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index 1435efe61475..cf7dc7a23d12 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -21,7 +21,6 @@
 import java.io.File;
 import java.net.URI;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Stream;
@@ -29,7 +28,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.console.options.CommandLineOptions;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.Filter;
 import org.junit.platform.engine.discovery.ClassNameFilter;
 import org.junit.platform.engine.discovery.ClassSelector;
@@ -41,9 +39,7 @@
 import org.junit.platform.engine.discovery.PackageNameFilter;
 import org.junit.platform.engine.discovery.PackageSelector;
 import org.junit.platform.engine.discovery.UriSelector;
-import org.junit.platform.launcher.EngineFilter;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
-import org.junit.platform.launcher.PostDiscoveryFilter;
 
 /**
  * @since 1.0
@@ -56,9 +52,9 @@ class DiscoveryRequestCreatorTests {
 	void convertsScanClasspathOptionWithoutExplicitRootDirectories() {
 		options.setScanClasspath(true);
 
-		LauncherDiscoveryRequest request = convert();
+		var request = convert();
 
-		List<ClasspathRootSelector> classpathRootSelectors = request.getSelectorsByType(ClasspathRootSelector.class);
+		var classpathRootSelectors = request.getSelectorsByType(ClasspathRootSelector.class);
 		// @formatter:off
 		assertThat(classpathRootSelectors).extracting(ClasspathRootSelector::getClasspathRoot)
 				.hasAtLeastOneElementOfType(URI.class)
@@ -71,9 +67,9 @@ void convertsScanClasspathOptionWithExplicitRootDirectories() {
 		options.setScanClasspath(true);
 		options.setSelectedClasspathEntries(asList(Paths.get("."), Paths.get("..")));
 
-		LauncherDiscoveryRequest request = convert();
+		var request = convert();
 
-		List<ClasspathRootSelector> classpathRootSelectors = request.getSelectorsByType(ClasspathRootSelector.class);
+		var classpathRootSelectors = request.getSelectorsByType(ClasspathRootSelector.class);
 		// @formatter:off
 		assertThat(classpathRootSelectors).extracting(ClasspathRootSelector::getClasspathRoot)
 				.containsExactly(new File(".").toURI(), new File("..").toURI());
@@ -85,9 +81,9 @@ void convertsScanClasspathOptionWithAdditionalClasspathEntries() {
 		options.setScanClasspath(true);
 		options.setAdditionalClasspathEntries(asList(Paths.get("."), Paths.get("..")));
 
-		LauncherDiscoveryRequest request = convert();
+		var request = convert();
 
-		List<ClasspathRootSelector> classpathRootSelectors = request.getSelectorsByType(ClasspathRootSelector.class);
+		var classpathRootSelectors = request.getSelectorsByType(ClasspathRootSelector.class);
 		// @formatter:off
 		assertThat(classpathRootSelectors).extracting(ClasspathRootSelector::getClasspathRoot)
 			.contains(new File(".").toURI(), new File("..").toURI());
@@ -108,9 +104,9 @@ void doesNotSupportScanClasspathAndExplicitSelectors() {
 	void convertsDefaultIncludeClassNamePatternOption() {
 		options.setScanClasspath(true);
 
-		LauncherDiscoveryRequest request = convert();
+		var request = convert();
 
-		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+		var filters = request.getFiltersByType(ClassNameFilter.class);
 		assertThat(filters).hasSize(1);
 		assertExcludes(filters.get(0), STANDARD_INCLUDE_PATTERN);
 	}
@@ -120,9 +116,9 @@ void convertsExplicitIncludeClassNamePatternOption() {
 		options.setScanClasspath(true);
 		options.setIncludedClassNamePatterns(asList("Foo.*Bar", "Bar.*Foo"));
 
-		LauncherDiscoveryRequest request = convert();
+		var request = convert();
 
-		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+		var filters = request.getFiltersByType(ClassNameFilter.class);
 		assertThat(filters).hasSize(1);
 		assertIncludes(filters.get(0), "Foo.*Bar");
 		assertIncludes(filters.get(0), "Bar.*Foo");
@@ -134,9 +130,9 @@ void includeSelectedClassesAndMethodsRegardlessOfClassNamePatterns() {
 		options.setSelectedMethods(asList("com.acme.Foo#m()"));
 		options.setIncludedClassNamePatterns(asList("Foo.*Bar"));
 
-		LauncherDiscoveryRequest request = convert();
+		var request = convert();
 
-		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+		var filters = request.getFiltersByType(ClassNameFilter.class);
 		assertThat(filters).hasSize(1);
 		assertIncludes(filters.get(0), "SomeTest");
 		assertIncludes(filters.get(0), "com.acme.Foo");
@@ -148,9 +144,9 @@ void convertsExcludeClassNamePatternOption() {
 		options.setScanClasspath(true);
 		options.setExcludedClassNamePatterns(asList("Foo.*Bar", "Bar.*Foo"));
 
-		LauncherDiscoveryRequest request = convert();
+		var request = convert();
 
-		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+		var filters = request.getFiltersByType(ClassNameFilter.class);
 		assertThat(filters).hasSize(2);
 		assertExcludes(filters.get(1), "Foo.*Bar");
 		assertExcludes(filters.get(1), "Bar.*Foo");
@@ -162,8 +158,8 @@ void convertsPackageOptions() {
 		options.setIncludedPackages(asList("org.junit.included1", "org.junit.included2", "org.junit.included3"));
 		options.setExcludedPackages(asList("org.junit.excluded1"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<PackageNameFilter> packageNameFilters = request.getFiltersByType(PackageNameFilter.class);
+		var request = convert();
+		var packageNameFilters = request.getFiltersByType(PackageNameFilter.class);
 
 		assertThat(packageNameFilters).hasSize(2);
 		assertIncludes(packageNameFilters.get(0), "org.junit.included1");
@@ -178,8 +174,8 @@ void convertsTagOptions() {
 		options.setIncludedTagExpressions(asList("fast", "medium", "slow"));
 		options.setExcludedTagExpressions(asList("slow"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<PostDiscoveryFilter> postDiscoveryFilters = request.getPostDiscoveryFilters();
+		var request = convert();
+		var postDiscoveryFilters = request.getPostDiscoveryFilters();
 
 		assertThat(postDiscoveryFilters).hasSize(2);
 		assertThat(postDiscoveryFilters.get(0).toString()).contains("TagFilter");
@@ -192,8 +188,8 @@ void convertsEngineOptions() {
 		options.setIncludedEngines(asList("engine1", "engine2", "engine3"));
 		options.setExcludedEngines(singletonList("engine2"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<EngineFilter> engineFilters = request.getEngineFilters();
+		var request = convert();
+		var engineFilters = request.getEngineFilters();
 
 		assertThat(engineFilters).hasSize(2);
 		assertThat(engineFilters.get(0).toString()).contains("includes", "[engine1, engine2, engine3]");
@@ -204,8 +200,8 @@ void convertsEngineOptions() {
 	void convertsUriSelectors() {
 		options.setSelectedUris(asList(URI.create("a"), URI.create("b")));
 
-		LauncherDiscoveryRequest request = convert();
-		List<UriSelector> uriSelectors = request.getSelectorsByType(UriSelector.class);
+		var request = convert();
+		var uriSelectors = request.getSelectorsByType(UriSelector.class);
 
 		assertThat(uriSelectors).extracting(UriSelector::getUri).containsExactly(URI.create("a"), URI.create("b"));
 	}
@@ -214,8 +210,8 @@ void convertsUriSelectors() {
 	void convertsFileSelectors() {
 		options.setSelectedFiles(asList("foo.txt", "bar.csv"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<FileSelector> fileSelectors = request.getSelectorsByType(FileSelector.class);
+		var request = convert();
+		var fileSelectors = request.getSelectorsByType(FileSelector.class);
 
 		assertThat(fileSelectors).extracting(FileSelector::getRawPath).containsExactly("foo.txt", "bar.csv");
 	}
@@ -224,8 +220,8 @@ void convertsFileSelectors() {
 	void convertsDirectorySelectors() {
 		options.setSelectedDirectories(asList("foo/bar", "bar/qux"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<DirectorySelector> directorySelectors = request.getSelectorsByType(DirectorySelector.class);
+		var request = convert();
+		var directorySelectors = request.getSelectorsByType(DirectorySelector.class);
 
 		assertThat(directorySelectors).extracting(DirectorySelector::getRawPath).containsExactly("foo/bar", "bar/qux");
 	}
@@ -234,8 +230,8 @@ void convertsDirectorySelectors() {
 	void convertsPackageSelectors() {
 		options.setSelectedPackages(asList("com.acme.foo", "com.example.bar"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<PackageSelector> packageSelectors = request.getSelectorsByType(PackageSelector.class);
+		var request = convert();
+		var packageSelectors = request.getSelectorsByType(PackageSelector.class);
 
 		assertThat(packageSelectors).extracting(PackageSelector::getPackageName).containsExactly("com.acme.foo",
 			"com.example.bar");
@@ -245,8 +241,8 @@ void convertsPackageSelectors() {
 	void convertsClassSelectors() {
 		options.setSelectedClasses(asList("com.acme.Foo", "com.example.Bar"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<ClassSelector> classSelectors = request.getSelectorsByType(ClassSelector.class);
+		var request = convert();
+		var classSelectors = request.getSelectorsByType(ClassSelector.class);
 
 		assertThat(classSelectors).extracting(ClassSelector::getClassName).containsExactly("com.acme.Foo",
 			"com.example.Bar");
@@ -256,8 +252,8 @@ void convertsClassSelectors() {
 	void convertsMethodSelectors() {
 		options.setSelectedMethods(asList("com.acme.Foo#m()", "com.example.Bar#method(java.lang.Object)"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<MethodSelector> methodSelectors = request.getSelectorsByType(MethodSelector.class);
+		var request = convert();
+		var methodSelectors = request.getSelectorsByType(MethodSelector.class);
 
 		assertThat(methodSelectors).hasSize(2);
 		assertThat(methodSelectors.get(0).getClassName()).isEqualTo("com.acme.Foo");
@@ -272,9 +268,8 @@ void convertsMethodSelectors() {
 	void convertsClasspathResourceSelectors() {
 		options.setSelectedClasspathResources(asList("foo.csv", "com/example/bar.json"));
 
-		LauncherDiscoveryRequest request = convert();
-		List<ClasspathResourceSelector> classpathResourceSelectors = request.getSelectorsByType(
-			ClasspathResourceSelector.class);
+		var request = convert();
+		var classpathResourceSelectors = request.getSelectorsByType(ClasspathResourceSelector.class);
 
 		assertThat(classpathResourceSelectors).extracting(
 			ClasspathResourceSelector::getClasspathResourceName).containsExactly("foo.csv", "com/example/bar.json");
@@ -285,8 +280,8 @@ void convertsConfigurationParameters() {
 		options.setScanClasspath(true);
 		options.setConfigurationParameters(mapOf(entry("foo", "bar"), entry("baz", "true")));
 
-		LauncherDiscoveryRequest request = convert();
-		ConfigurationParameters configurationParameters = request.getConfigurationParameters();
+		var request = convert();
+		var configurationParameters = request.getConfigurationParameters();
 
 		assertThat(configurationParameters.size()).isEqualTo(2);
 		assertThat(configurationParameters.get("foo")).contains("bar");
@@ -294,7 +289,7 @@ void convertsConfigurationParameters() {
 	}
 
 	private LauncherDiscoveryRequest convert() {
-		DiscoveryRequestCreator creator = new DiscoveryRequestCreator();
+		var creator = new DiscoveryRequestCreator();
 		return creator.toDiscoveryRequest(options);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
index db741ff6253c..d745ad2ad638 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
@@ -34,9 +34,9 @@ class FlatPrintingListenerTests {
 
 	@Test
 	void executionSkipped() {
-		StringWriter stringWriter = new StringWriter();
+		var stringWriter = new StringWriter();
 		listener(stringWriter).executionSkipped(newTestIdentifier(), "Test" + EOL + "disabled");
-		String[] lines = lines(stringWriter);
+		var lines = lines(stringWriter);
 
 		assertEquals(3, lines.length);
 		assertAll("lines in the output", //
@@ -47,9 +47,9 @@ void executionSkipped() {
 
 	@Test
 	void reportingEntryPublished() {
-		StringWriter stringWriter = new StringWriter();
+		var stringWriter = new StringWriter();
 		listener(stringWriter).reportingEntryPublished(newTestIdentifier(), ReportEntry.from("foo", "bar"));
-		String[] lines = lines(stringWriter);
+		var lines = lines(stringWriter);
 
 		assertEquals(2, lines.length);
 		assertAll("lines in the output", //
@@ -60,9 +60,9 @@ void reportingEntryPublished() {
 
 	@Test
 	void executionFinishedWithFailure() {
-		StringWriter stringWriter = new StringWriter();
+		var stringWriter = new StringWriter();
 		listener(stringWriter).executionFinished(newTestIdentifier(), failed(new AssertionError("Boom!")));
-		String[] lines = lines(stringWriter);
+		var lines = lines(stringWriter);
 
 		assertAll("lines in the output", //
 			() -> assertEquals("Finished:    demo-test ([engine:demo-engine])", lines[0]), //
@@ -74,7 +74,7 @@ private FlatPrintingListener listener(StringWriter stringWriter) {
 	}
 
 	private static TestIdentifier newTestIdentifier() {
-		TestDescriptorStub testDescriptor = new TestDescriptorStub(UniqueId.forEngine("demo-engine"), "demo-test");
+		var testDescriptor = new TestDescriptorStub(UniqueId.forEngine("demo-engine"), "demo-test");
 		return TestIdentifier.from(testDescriptor);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
index b9e79a62efb7..de7a1f3a00ff 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
@@ -43,7 +43,7 @@ void caption() {
 
 	@Test
 	void childrenCanBeAddedConcurrently() throws Exception {
-		TreeNode treeNode = new TreeNode("root");
+		var treeNode = new TreeNode("root");
 
 		runConcurrently(() -> {
 			for (long i = 0; i < ITEMS_PER_THREAD; i++) {
@@ -56,7 +56,7 @@ void childrenCanBeAddedConcurrently() throws Exception {
 
 	@Test
 	void reportEntriesCanBeAddedConcurrently() throws Exception {
-		TreeNode treeNode = new TreeNode("root");
+		var treeNode = new TreeNode("root");
 
 		runConcurrently(() -> {
 			for (long i = 0; i < ITEMS_PER_THREAD; i++) {
@@ -71,7 +71,7 @@ private void runConcurrently(Runnable action) throws InterruptedException {
 		ExecutorService executor = new ThreadPoolExecutor(NUM_THREADS, NUM_THREADS, 10, SECONDS,
 			new ArrayBlockingQueue<>(NUM_THREADS));
 		try {
-			CyclicBarrier barrier = new CyclicBarrier(NUM_THREADS);
+			var barrier = new CyclicBarrier(NUM_THREADS);
 			for (long i = 0; i < NUM_THREADS; i++) {
 				executor.submit(() -> {
 					await(barrier);
@@ -81,7 +81,7 @@ private void runConcurrently(Runnable action) throws InterruptedException {
 		}
 		finally {
 			executor.shutdown();
-			boolean terminated = executor.awaitTermination(10, SECONDS);
+			var terminated = executor.awaitTermination(10, SECONDS);
 			assertTrue(terminated, "Executor was not terminated");
 		}
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
index 96dd503c99c4..d4fa5dea23a5 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
@@ -58,7 +58,7 @@ void emptyTree() {
 
 	@Test
 	void emptyEngines() {
-		TreeNode root = new TreeNode("<root>");
+		var root = new TreeNode("<root>");
 		root.addChild(new TreeNode(identifier("e-0", "engine zero"), "none"));
 		root.addChild(new TreeNode(identifier("e-1", "engine one")).setResult(successful()));
 		root.addChild(new TreeNode(identifier("e-2", "engine two")).setResult(failed(null)));
@@ -77,8 +77,8 @@ void emptyEngines() {
 	@Test
 	// https://github.com/junit-team/junit5/issues/786
 	void printNodeHandlesNullMessageThrowableGracefully() {
-		TestExecutionResult result = TestExecutionResult.failed(new NullPointerException());
-		TreeNode node = new TreeNode(identifier("NPE", "test()")).setResult(result);
+		var result = TestExecutionResult.failed(new NullPointerException());
+		var node = new TreeNode(identifier("NPE", "test()")).setResult(result);
 		new TreePrinter(out, Theme.ASCII, true).print(node);
 		assertLinesMatch(Arrays.asList(".", "+-- test() [X] java.lang.NullPointerException"), actual());
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
index f4fdcabd901f..a69451ee122a 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
@@ -33,9 +33,9 @@ class VerboseTreeListenerTests {
 
 	@Test
 	void executionSkipped() {
-		StringWriter stringWriter = new StringWriter();
+		var stringWriter = new StringWriter();
 		listener(stringWriter).executionSkipped(newTestIdentifier(), "Test" + EOL + "disabled");
-		String[] lines = lines(stringWriter);
+		var lines = lines(stringWriter);
 
 		assertLinesMatch(List.of( //
 			"+-- %c ool test", //
@@ -49,18 +49,18 @@ void executionSkipped() {
 
 	@Test
 	void reportingEntryPublished() {
-		StringWriter stringWriter = new StringWriter();
+		var stringWriter = new StringWriter();
 		listener(stringWriter).reportingEntryPublished(newTestIdentifier(), ReportEntry.from("foo", "bar"));
-		String[] lines = lines(stringWriter);
+		var lines = lines(stringWriter);
 
 		assertLinesMatch(List.of("  reports: ReportEntry \\[timestamp = .+, foo = 'bar'\\]"), List.of(lines));
 	}
 
 	@Test
 	void executionFinishedWithFailure() {
-		StringWriter stringWriter = new StringWriter();
+		var stringWriter = new StringWriter();
 		listener(stringWriter).executionFinished(newTestIdentifier(), failed(new AssertionError("Boom!")));
-		String[] lines = lines(stringWriter);
+		var lines = lines(stringWriter);
 
 		assertLinesMatch(List.of("   caught: java.lang.AssertionError: Boom!", //
 			">> STACKTRACE >>", //
@@ -70,9 +70,9 @@ void executionFinishedWithFailure() {
 
 	@Test
 	void failureMessageWithFormatSpecifier() {
-		StringWriter stringWriter = new StringWriter();
+		var stringWriter = new StringWriter();
 		listener(stringWriter).executionFinished(newTestIdentifier(), failed(new AssertionError("%crash")));
-		String[] lines = lines(stringWriter);
+		var lines = lines(stringWriter);
 
 		assertLinesMatch(List.of("   caught: java.lang.AssertionError: %crash", //
 			">> STACKTRACE >>", //
@@ -85,7 +85,7 @@ private VerboseTreePrintingListener listener(StringWriter stringWriter) {
 	}
 
 	private static TestIdentifier newTestIdentifier() {
-		TestDescriptorStub testDescriptor = new TestDescriptorStub(UniqueId.forEngine("demo-engine"), "%c ool test");
+		var testDescriptor = new TestDescriptorStub(UniqueId.forEngine("demo-engine"), "%c ool test");
 		return TestIdentifier.from(testDescriptor);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
index 47cb0a887184..b3728eb20426 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
@@ -32,7 +32,7 @@ class FilterCompositionTests {
 
 	@Test
 	void composingNoFiltersCreatesFilterThatIncludesEverything() {
-		Filter<Object> composedFilter = Filter.composeFilters();
+		var composedFilter = Filter.composeFilters();
 
 		assertTrue(composedFilter.apply(String.class).included());
 		assertTrue(composedFilter.toPredicate().test(String.class));
@@ -43,7 +43,7 @@ void composingNoFiltersCreatesFilterThatIncludesEverything() {
 	@Test
 	void composingSingleFilterWillReturnTheOriginalOne() {
 		Filter<?> singleFilter = ClassNameFilter.includeClassNamePatterns(".*ring.*");
-		Filter<?> composed = Filter.composeFilters(singleFilter);
+		var composed = Filter.composeFilters(singleFilter);
 		assertSame(singleFilter, composed);
 	}
 
@@ -52,7 +52,7 @@ void composingMultipleFiltersIsAConjunctionOfFilters() {
 		Filter<String> firstFilter = ClassNameFilter.includeClassNamePatterns(".*ring.*");
 		Filter<String> secondFilter = ClassNameFilter.includeClassNamePatterns(".*Join.*");
 
-		Filter<String> composed = Filter.composeFilters(firstFilter, secondFilter);
+		var composed = Filter.composeFilters(firstFilter, secondFilter);
 
 		assertFalse(composed.apply("java.lang.String").included());
 		assertFalse(composed.toPredicate().test("java.lang.String"));
@@ -65,7 +65,7 @@ void aFilterComposedOfMultipleFiltersHasReadableDescription() {
 		Filter<Object> firstFilter = new FilterStub<>(o -> excluded("wrong"), () -> "1st");
 		Filter<Object> secondFilter = new FilterStub<>(o -> included("right"), () -> "2nd");
 
-		Filter<Object> composed = Filter.composeFilters(firstFilter, secondFilter);
+		var composed = Filter.composeFilters(firstFilter, secondFilter);
 
 		assertFalse(composed.apply(String.class).included());
 		assertEquals("(1st) and (2nd)", composed.toString());
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
index 076d9588f127..2352bf19381d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
@@ -97,8 +97,7 @@ private static void nope(String tag) {
 	}
 
 	private void assertSyntaxViolation(String tag) {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> TestTag.create(tag));
+		var exception = assertThrows(PreconditionViolationException.class, () -> TestTag.create(tag));
 		assertThat(exception).hasMessageStartingWith("Tag name");
 		assertThat(exception).hasMessageEndingWith("must be syntactically valid");
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
index faa213b44915..851990fbdef0 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
@@ -39,14 +39,14 @@ void engineIdOnly() {
 
 		@Test
 		void withTwoSegments() {
-			UniqueId classId = engineId.append("class", "org.junit.MyClass");
+			var classId = engineId.append("class", "org.junit.MyClass");
 			assertEquals("[engine:junit-jupiter]/[class:org.junit.MyClass]", classId.toString());
 			assertEquals(format.format(classId), classId.toString());
 		}
 
 		@Test
 		void withManySegments() {
-			UniqueId uniqueId = engineId.append("t1", "v1").append("t2", "v2").append("t3", "v3");
+			var uniqueId = engineId.append("t1", "v1").append("t2", "v2").append("t3", "v3");
 			assertEquals("[engine:junit-jupiter]/[t1:v1]/[t2:v2]/[t3:v3]", uniqueId.toString());
 			assertEquals(format.format(uniqueId), uniqueId.toString());
 		}
@@ -120,7 +120,7 @@ default void parseMalformedUid() {
 
 		@Test
 		default void parseEngineUid() {
-			UniqueId parsedId = getFormat().parse(getEngineUid());
+			var parsedId = getFormat().parse(getEngineUid());
 			assertSegment(parsedId.getSegments().get(0), "engine", "junit-jupiter");
 			assertEquals(getEngineUid(), getFormat().format(parsedId));
 			assertEquals(getEngineUid(), parsedId.toString());
@@ -128,7 +128,7 @@ default void parseEngineUid() {
 
 		@Test
 		default void parseMethodUid() {
-			UniqueId parsedId = getFormat().parse(getMethodUid());
+			var parsedId = getFormat().parse(getMethodUid());
 			assertSegment(parsedId.getSegments().get(0), "engine", "junit-jupiter");
 			assertSegment(parsedId.getSegments().get(1), "class", "MyClass");
 			assertSegment(parsedId.getSegments().get(2), "method", "myMethod");
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
index c3cf0b56b22b..ae9bb0850d7c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
@@ -41,7 +41,7 @@ class Creation {
 
 		@Test
 		void uniqueIdCanBeCreatedFromEngineId() {
-			UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID);
+			var uniqueId = UniqueId.forEngine(ENGINE_ID);
 
 			assertEquals("[engine:junit-jupiter]", uniqueId.toString());
 			assertSegment(uniqueId.getSegments().get(0), "engine", "junit-jupiter");
@@ -49,16 +49,16 @@ void uniqueIdCanBeCreatedFromEngineId() {
 
 		@Test
 		void retrievingOptionalEngineId() {
-			UniqueId uniqueIdWithEngine = UniqueId.forEngine(ENGINE_ID);
+			var uniqueIdWithEngine = UniqueId.forEngine(ENGINE_ID);
 			assertThat(uniqueIdWithEngine.getEngineId()).contains("junit-jupiter");
 
-			UniqueId uniqueIdWithoutEngine = UniqueId.root("root", "avalue");
+			var uniqueIdWithoutEngine = UniqueId.root("root", "avalue");
 			assertEquals(Optional.empty(), uniqueIdWithoutEngine.getEngineId());
 		}
 
 		@Test
 		void uniqueIdCanBeCreatedFromTypeAndValue() {
-			UniqueId uniqueId = UniqueId.root("aType", "aValue");
+			var uniqueId = UniqueId.root("aType", "aValue");
 
 			assertEquals("[aType:aValue]", uniqueId.toString());
 			assertSegment(uniqueId.getSegments().get(0), "aType", "aValue");
@@ -66,15 +66,15 @@ void uniqueIdCanBeCreatedFromTypeAndValue() {
 
 		@Test
 		void rootSegmentCanBeRetrieved() {
-			UniqueId uniqueId = UniqueId.root("aType", "aValue");
+			var uniqueId = UniqueId.root("aType", "aValue");
 
 			assertThat(uniqueId.getRoot()).contains(new Segment("aType", "aValue"));
 		}
 
 		@Test
 		void appendingOneSegment() {
-			UniqueId engineId = UniqueId.root("engine", ENGINE_ID);
-			UniqueId classId = engineId.append("class", "org.junit.MyClass");
+			var engineId = UniqueId.root("engine", ENGINE_ID);
+			var classId = engineId.append("class", "org.junit.MyClass");
 
 			assertThat(classId.getSegments()).hasSize(2);
 			assertSegment(classId.getSegments().get(0), "engine", ENGINE_ID);
@@ -83,7 +83,7 @@ void appendingOneSegment() {
 
 		@Test
 		void appendingSegmentLeavesOriginalUnchanged() {
-			UniqueId uniqueId = UniqueId.root("engine", ENGINE_ID);
+			var uniqueId = UniqueId.root("engine", ENGINE_ID);
 			uniqueId.append("class", "org.junit.MyClass");
 
 			assertThat(uniqueId.getSegments()).hasSize(1);
@@ -92,8 +92,8 @@ void appendingSegmentLeavesOriginalUnchanged() {
 
 		@Test
 		void appendingSeveralSegments() {
-			UniqueId engineId = UniqueId.root("engine", ENGINE_ID);
-			UniqueId uniqueId = engineId.append("t1", "v1").append("t2", "v2").append("t3", "v3");
+			var engineId = UniqueId.root("engine", ENGINE_ID);
+			var uniqueId = engineId.append("t1", "v1").append("t2", "v2").append("t3", "v3");
 
 			assertThat(uniqueId.getSegments()).hasSize(4);
 			assertSegment(uniqueId.getSegments().get(0), "engine", ENGINE_ID);
@@ -104,7 +104,7 @@ void appendingSeveralSegments() {
 
 		@Test
 		void appendingSegmentInstance() {
-			UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID).append("t1", "v1");
+			var uniqueId = UniqueId.forEngine(ENGINE_ID).append("t1", "v1");
 
 			uniqueId = uniqueId.append(new Segment("t2", "v2"));
 
@@ -116,7 +116,7 @@ void appendingSegmentInstance() {
 
 		@Test
 		void appendingNullIsNotAllowed() {
-			UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID);
+			var uniqueId = UniqueId.forEngine(ENGINE_ID);
 
 			assertThrows(PreconditionViolationException.class, () -> uniqueId.append(null));
 			assertThrows(PreconditionViolationException.class, () -> uniqueId.append(null, "foo"));
@@ -132,20 +132,20 @@ class ParsingAndFormatting {
 
 		@Test
 		void ensureDefaultUniqueIdFormatIsUsedForParsing() {
-			UniqueId parsedDirectly = UniqueId.parse(uniqueIdString);
-			UniqueId parsedViaFormat = UniqueIdFormat.getDefault().parse(uniqueIdString);
+			var parsedDirectly = UniqueId.parse(uniqueIdString);
+			var parsedViaFormat = UniqueIdFormat.getDefault().parse(uniqueIdString);
 			assertEquals(parsedViaFormat, parsedDirectly);
 		}
 
 		@Test
 		void ensureDefaultUniqueIdFormatIsUsedForFormatting() {
-			UniqueId parsedDirectly = UniqueId.parse("[engine:junit-jupiter]/[class:MyClass]/[method:myMethod]");
+			var parsedDirectly = UniqueId.parse("[engine:junit-jupiter]/[class:MyClass]/[method:myMethod]");
 			assertEquals("[engine:junit-jupiter]/[class:MyClass]/[method:myMethod]", parsedDirectly.toString());
 		}
 
 		@Test
 		void ensureDefaultUniqueIdFormatDecodingEncodesSegmentParts() {
-			UniqueId.Segment segment = UniqueId.parse("[%5B+%25+%5D):(%3A+%2B+%2F]").getSegments().get(0);
+			var segment = UniqueId.parse("[%5B+%25+%5D):(%3A+%2B+%2F]").getSegments().get(0);
 			assertEquals("[ % ])", segment.getType());
 			assertEquals("(: + /", segment.getValue());
 		}
@@ -153,9 +153,9 @@ void ensureDefaultUniqueIdFormatDecodingEncodesSegmentParts() {
 		@Test
 		void ensureDefaultUniqueIdFormatCanHandleAllCharacters() {
 			for (char c = 0; c < Character.MAX_VALUE; c++) {
-				String value = "foo " + c + " bar";
-				UniqueId uniqueId = UniqueId.parse(UniqueId.root("type", value).toString());
-				Segment segment = uniqueId.getSegments().get(0);
+				var value = "foo " + c + " bar";
+				var uniqueId = UniqueId.parse(UniqueId.root("type", value).toString());
+				var segment = uniqueId.getSegments().get(0);
 				assertEquals(value, segment.getValue());
 			}
 		}
@@ -172,8 +172,8 @@ class EqualsContract {
 
 		@Test
 		void sameEnginesAreEqual() {
-			UniqueId id1 = UniqueId.root("engine", "junit-jupiter");
-			UniqueId id2 = UniqueId.root("engine", "junit-jupiter");
+			var id1 = UniqueId.root("engine", "junit-jupiter");
+			var id2 = UniqueId.root("engine", "junit-jupiter");
 
 			assertTrue(id1.equals(id2));
 			assertTrue(id2.equals(id1));
@@ -182,8 +182,8 @@ void sameEnginesAreEqual() {
 
 		@Test
 		void differentEnginesAreNotEqual() {
-			UniqueId id1 = UniqueId.root("engine", "junit-vintage");
-			UniqueId id2 = UniqueId.root("engine", "junit-jupiter");
+			var id1 = UniqueId.root("engine", "junit-vintage");
+			var id2 = UniqueId.root("engine", "junit-jupiter");
 
 			assertFalse(id1.equals(id2));
 			assertFalse(id2.equals(id1));
@@ -191,8 +191,8 @@ void differentEnginesAreNotEqual() {
 
 		@Test
 		void uniqueIdWithSameSegmentsAreEqual() {
-			UniqueId id1 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
-			UniqueId id2 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
+			var id1 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
+			var id2 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
 
 			assertTrue(id1.equals(id2));
 			assertTrue(id2.equals(id1));
@@ -201,8 +201,8 @@ void uniqueIdWithSameSegmentsAreEqual() {
 
 		@Test
 		void differentOrderOfSegmentsAreNotEqual() {
-			UniqueId id1 = UniqueId.root("engine", "junit-jupiter").append("t2", "v2").append("t1", "v1");
-			UniqueId id2 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
+			var id1 = UniqueId.root("engine", "junit-jupiter").append("t2", "v2").append("t1", "v1");
+			var id2 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
 
 			assertFalse(id1.equals(id2));
 			assertFalse(id2.equals(id1));
@@ -210,8 +210,8 @@ void differentOrderOfSegmentsAreNotEqual() {
 
 		@Test
 		void additionalSegmentMakesItNotEqual() {
-			UniqueId id1 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1");
-			UniqueId id2 = id1.append("t2", "v2");
+			var id1 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1");
+			var id2 = id1.append("t2", "v2");
 
 			assertFalse(id1.equals(id2));
 			assertFalse(id2.equals(id1));
@@ -223,23 +223,23 @@ class Prefixing {
 
 		@Test
 		void nullIsNotAPrefix() {
-			UniqueId id = UniqueId.forEngine(ENGINE_ID);
+			var id = UniqueId.forEngine(ENGINE_ID);
 
 			assertThrows(PreconditionViolationException.class, () -> id.hasPrefix(null));
 		}
 
 		@Test
 		void uniqueIdIsPrefixForItself() {
-			UniqueId id = UniqueId.forEngine(ENGINE_ID).append("t1", "v1").append("t2", "v2");
+			var id = UniqueId.forEngine(ENGINE_ID).append("t1", "v1").append("t2", "v2");
 
 			assertTrue(id.hasPrefix(id));
 		}
 
 		@Test
 		void uniqueIdIsPrefixForUniqueIdWithAdditionalSegments() {
-			UniqueId id1 = UniqueId.forEngine(ENGINE_ID);
-			UniqueId id2 = id1.append("t1", "v1");
-			UniqueId id3 = id2.append("t2", "v2");
+			var id1 = UniqueId.forEngine(ENGINE_ID);
+			var id2 = id1.append("t1", "v1");
+			var id3 = id2.append("t2", "v2");
 
 			assertFalse(id1.hasPrefix(id2));
 			assertFalse(id1.hasPrefix(id3));
@@ -251,8 +251,8 @@ void uniqueIdIsPrefixForUniqueIdWithAdditionalSegments() {
 
 		@Test
 		void completelyUnrelatedUniqueIdsAreNotPrefixesForEachOther() {
-			UniqueId id1 = UniqueId.forEngine("foo");
-			UniqueId id2 = UniqueId.forEngine("bar");
+			var id1 = UniqueId.forEngine("foo");
+			var id2 = UniqueId.forEngine("bar");
 
 			assertFalse(id1.hasPrefix(id2));
 			assertFalse(id2.hasPrefix(id1));
@@ -265,7 +265,7 @@ class LastSegment {
 
 		@Test
 		void returnsLastSegment() {
-			UniqueId uniqueId = UniqueId.forEngine("foo");
+			var uniqueId = UniqueId.forEngine("foo");
 			assertSame(uniqueId.getSegments().get(0), uniqueId.getLastSegment());
 
 			uniqueId = UniqueId.forEngine("foo").append("type", "bar");
@@ -274,10 +274,10 @@ void returnsLastSegment() {
 
 		@Test
 		void removesLastSegment() {
-			UniqueId uniqueId = UniqueId.forEngine("foo");
+			var uniqueId = UniqueId.forEngine("foo");
 			assertThrows(PreconditionViolationException.class, uniqueId::removeLastSegment);
 
-			UniqueId newUniqueId = uniqueId.append("type", "bar").removeLastSegment();
+			var newUniqueId = uniqueId.append("type", "bar").removeLastSegment();
 			assertEquals(uniqueId, newUniqueId);
 		}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
index e9895dfe8f00..82ca3a17fb4d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
@@ -38,9 +38,9 @@ void includeClassNamePatternsChecksPreconditions() {
 
 	@Test
 	void includeClassNamePatternsWithSinglePattern() {
-		String regex = "^java\\.lang\\..*";
+		var regex = "^java\\.lang\\..*";
 
-		ClassNameFilter filter = ClassNameFilter.includeClassNamePatterns(regex);
+		var filter = ClassNameFilter.includeClassNamePatterns(regex);
 
 		assertThat(filter).hasToString(
 			"IncludeClassNameFilter that includes class names that match one of the following regular expressions: '"
@@ -59,10 +59,10 @@ void includeClassNamePatternsWithSinglePattern() {
 
 	@Test
 	void includeClassNamePatternsWithMultiplePatterns() {
-		String firstRegex = "^java\\.lang\\..*";
-		String secondRegex = "^java\\.util\\..*";
+		var firstRegex = "^java\\.lang\\..*";
+		var secondRegex = "^java\\.util\\..*";
 
-		ClassNameFilter filter = ClassNameFilter.includeClassNamePatterns(firstRegex, secondRegex);
+		var filter = ClassNameFilter.includeClassNamePatterns(firstRegex, secondRegex);
 
 		assertThat(filter).hasToString(
 			"IncludeClassNameFilter that includes class names that match one of the following regular expressions: '"
@@ -100,9 +100,9 @@ void excludeClassNamePatternsChecksPreconditions() {
 
 	@Test
 	void excludeClassNamePatternsWithSinglePattern() {
-		String regex = "^java\\.lang\\..*";
+		var regex = "^java\\.lang\\..*";
 
-		ClassNameFilter filter = ClassNameFilter.excludeClassNamePatterns(regex);
+		var filter = ClassNameFilter.excludeClassNamePatterns(regex);
 
 		assertThat(filter).hasToString(
 			"ExcludeClassNameFilter that excludes class names that match one of the following regular expressions: '"
@@ -122,10 +122,10 @@ void excludeClassNamePatternsWithSinglePattern() {
 
 	@Test
 	void excludeClassNamePatternsWithMultiplePatterns() {
-		String firstRegex = "^java\\.lang\\..*";
-		String secondRegex = "^java\\.util\\..*";
+		var firstRegex = "^java\\.lang\\..*";
+		var secondRegex = "^java\\.util\\..*";
 
-		ClassNameFilter filter = ClassNameFilter.excludeClassNamePatterns(firstRegex, secondRegex);
+		var filter = ClassNameFilter.excludeClassNamePatterns(firstRegex, secondRegex);
 
 		assertThat(filter).hasToString(
 			"ExcludeClassNameFilter that excludes class names that match one of the following regular expressions: '"
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
index 1f182c100c3a..d4bc907069df 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -36,9 +36,9 @@ void equalsAndHashCode() {
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadClass() {
-		ClassSelector selector = new ClassSelector("org.example.TestClass");
+		var selector = new ClassSelector("org.example.TestClass");
 
-		PreconditionViolationException e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
+		var e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
 
 		assertThat(e).hasMessage("Could not load class with name: org.example.TestClass").hasCauseInstanceOf(
 			ClassNotFoundException.class);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index 153cd6014990..cd3d1705410a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -64,9 +64,9 @@ void selectUriByName() {
 		assertViolatesPrecondition(() -> selectUri("   "));
 		assertViolatesPrecondition(() -> selectUri("foo:"));
 
-		String uri = "https://junit.org";
+		var uri = "https://junit.org";
 
-		UriSelector selector = selectUri(uri);
+		var selector = selectUri(uri);
 		assertEquals(uri, selector.getUri().toString());
 	}
 
@@ -75,9 +75,9 @@ void selectUriByURI() throws Exception {
 		assertViolatesPrecondition(() -> selectUri((URI) null));
 		assertViolatesPrecondition(() -> selectUri("   "));
 
-		URI uri = new URI("https://junit.org");
+		var uri = new URI("https://junit.org");
 
-		UriSelector selector = selectUri(uri);
+		var selector = selectUri(uri);
 		assertEquals(uri, selector.getUri());
 	}
 
@@ -86,9 +86,9 @@ void selectFileByName() {
 		assertViolatesPrecondition(() -> selectFile((String) null));
 		assertViolatesPrecondition(() -> selectFile("   "));
 
-		String path = "src/test/resources/do_not_delete_me.txt";
+		var path = "src/test/resources/do_not_delete_me.txt";
 
-		FileSelector selector = selectFile(path);
+		var selector = selectFile(path);
 		assertEquals(path, selector.getRawPath());
 		assertEquals(new File(path), selector.getFile());
 		assertEquals(Paths.get(path), selector.getPath());
@@ -96,13 +96,13 @@ void selectFileByName() {
 
 	@Test
 	void selectFileByNameAndPosition() {
-		FilePosition filePosition = FilePosition.from(12, 34);
+		var filePosition = FilePosition.from(12, 34);
 		assertViolatesPrecondition(() -> selectFile((String) null, filePosition));
 		assertViolatesPrecondition(() -> selectFile("   ", filePosition));
 
-		String path = "src/test/resources/do_not_delete_me.txt";
+		var path = "src/test/resources/do_not_delete_me.txt";
 
-		FileSelector selector = selectFile(path, filePosition);
+		var selector = selectFile(path, filePosition);
 		assertEquals(path, selector.getRawPath());
 		assertEquals(new File(path), selector.getFile());
 		assertEquals(Paths.get(path), selector.getPath());
@@ -114,12 +114,12 @@ void selectFileByFileReference() throws Exception {
 		assertViolatesPrecondition(() -> selectFile((File) null));
 		assertViolatesPrecondition(() -> selectFile(new File("bogus/nonexistent.txt")));
 
-		File currentDir = new File(".").getCanonicalFile();
-		File relativeDir = new File("..", currentDir.getName());
-		File file = new File(relativeDir, "src/test/resources/do_not_delete_me.txt");
-		String path = file.getCanonicalFile().getPath();
+		var currentDir = new File(".").getCanonicalFile();
+		var relativeDir = new File("..", currentDir.getName());
+		var file = new File(relativeDir, "src/test/resources/do_not_delete_me.txt");
+		var path = file.getCanonicalFile().getPath();
 
-		FileSelector selector = selectFile(file);
+		var selector = selectFile(file);
 		assertEquals(path, selector.getRawPath());
 		assertEquals(file.getCanonicalFile(), selector.getFile());
 		assertEquals(Paths.get(path), selector.getPath());
@@ -127,16 +127,16 @@ void selectFileByFileReference() throws Exception {
 
 	@Test
 	void selectFileByFileReferenceAndPosition() throws Exception {
-		FilePosition filePosition = FilePosition.from(12, 34);
+		var filePosition = FilePosition.from(12, 34);
 		assertViolatesPrecondition(() -> selectFile((File) null, filePosition));
 		assertViolatesPrecondition(() -> selectFile(new File("bogus/nonexistent.txt"), filePosition));
 
-		File currentDir = new File(".").getCanonicalFile();
-		File relativeDir = new File("..", currentDir.getName());
-		File file = new File(relativeDir, "src/test/resources/do_not_delete_me.txt");
-		String path = file.getCanonicalFile().getPath();
+		var currentDir = new File(".").getCanonicalFile();
+		var relativeDir = new File("..", currentDir.getName());
+		var file = new File(relativeDir, "src/test/resources/do_not_delete_me.txt");
+		var path = file.getCanonicalFile().getPath();
 
-		FileSelector selector = selectFile(file, filePosition);
+		var selector = selectFile(file, filePosition);
 		assertEquals(path, selector.getRawPath());
 		assertEquals(file.getCanonicalFile(), selector.getFile());
 		assertEquals(Paths.get(path), selector.getPath());
@@ -148,9 +148,9 @@ void selectDirectoryByName() {
 		assertViolatesPrecondition(() -> selectDirectory((String) null));
 		assertViolatesPrecondition(() -> selectDirectory("   "));
 
-		String path = "src/test/resources";
+		var path = "src/test/resources";
 
-		DirectorySelector selector = selectDirectory(path);
+		var selector = selectDirectory(path);
 		assertEquals(path, selector.getRawPath());
 		assertEquals(new File(path), selector.getDirectory());
 		assertEquals(Paths.get(path), selector.getPath());
@@ -161,12 +161,12 @@ void selectDirectoryByFileReference() throws Exception {
 		assertViolatesPrecondition(() -> selectDirectory((File) null));
 		assertViolatesPrecondition(() -> selectDirectory(new File("bogus/nonexistent")));
 
-		File currentDir = new File(".").getCanonicalFile();
-		File relativeDir = new File("..", currentDir.getName());
-		File directory = new File(relativeDir, "src/test/resources");
-		String path = directory.getCanonicalFile().getPath();
+		var currentDir = new File(".").getCanonicalFile();
+		var relativeDir = new File("..", currentDir.getName());
+		var directory = new File(relativeDir, "src/test/resources");
+		var path = directory.getCanonicalFile().getPath();
 
-		DirectorySelector selector = selectDirectory(directory);
+		var selector = selectDirectory(directory);
 		assertEquals(path, selector.getRawPath());
 		assertEquals(directory.getCanonicalFile(), selector.getDirectory());
 		assertEquals(Paths.get(path), selector.getPath());
@@ -180,7 +180,7 @@ void selectClasspathResources() {
 		assertViolatesPrecondition(() -> selectClasspathResource("\t"));
 
 		// with unnecessary "/" prefix
-		ClasspathResourceSelector selector = selectClasspathResource("/foo/bar/spec.xml");
+		var selector = selectClasspathResource("/foo/bar/spec.xml");
 		assertEquals("foo/bar/spec.xml", selector.getClasspathResourceName());
 
 		// standard use case
@@ -190,14 +190,14 @@ void selectClasspathResources() {
 
 	@Test
 	void selectClasspathResourcesWithFilePosition() {
-		FilePosition filePosition = FilePosition.from(12, 34);
+		var filePosition = FilePosition.from(12, 34);
 		assertViolatesPrecondition(() -> selectClasspathResource(null, filePosition));
 		assertViolatesPrecondition(() -> selectClasspathResource("", filePosition));
 		assertViolatesPrecondition(() -> selectClasspathResource("    ", filePosition));
 		assertViolatesPrecondition(() -> selectClasspathResource("\t", filePosition));
 
 		// with unnecessary "/" prefix
-		ClasspathResourceSelector selector = selectClasspathResource("/foo/bar/spec.xml", filePosition);
+		var selector = selectClasspathResource("/foo/bar/spec.xml", filePosition);
 		assertEquals("foo/bar/spec.xml", selector.getClasspathResourceName());
 		assertEquals(FilePosition.from(12, 34), selector.getPosition().get());
 
@@ -209,7 +209,7 @@ void selectClasspathResourcesWithFilePosition() {
 
 	@Test
 	void selectModuleByName() {
-		ModuleSelector selector = selectModule("java.base");
+		var selector = selectModule("java.base");
 		assertEquals("java.base", selector.getModuleName());
 	}
 
@@ -222,8 +222,8 @@ void selectModuleByNamePreconditions() {
 
 	@Test
 	void selectModulesByNames() {
-		List<ModuleSelector> selectors = selectModules(new HashSet<>(Arrays.asList("a", "b")));
-		List<String> names = selectors.stream().map(ModuleSelector::getModuleName).collect(Collectors.toList());
+		var selectors = selectModules(new HashSet<>(Arrays.asList("a", "b")));
+		var names = selectors.stream().map(ModuleSelector::getModuleName).collect(Collectors.toList());
 		assertThat(names).containsExactlyInAnyOrder("b", "a");
 	}
 
@@ -235,13 +235,13 @@ void selectModulesByNamesPreconditions() {
 
 	@Test
 	void selectPackageByName() {
-		PackageSelector selector = selectPackage(getClass().getPackage().getName());
+		var selector = selectPackage(getClass().getPackage().getName());
 		assertEquals(getClass().getPackage().getName(), selector.getPackageName());
 	}
 
 	@Test
 	void selectClassByName() {
-		ClassSelector selector = selectClass(getClass().getName());
+		var selector = selectClass(getClass().getName());
 		assertEquals(getClass(), selector.getJavaClass());
 	}
 
@@ -287,7 +287,7 @@ void selectMethodByClassMethodNameAndMethodParameterTypesPreconditions() {
 
 	@Test
 	void selectMethodByClassAndMethodPreconditions() {
-		Method method = getClass().getDeclaredMethods()[0];
+		var method = getClass().getDeclaredMethods()[0];
 		assertViolatesPrecondition(() -> selectMethod(null, method));
 		assertViolatesPrecondition(() -> selectMethod(getClass(), (Method) null));
 	}
@@ -319,94 +319,94 @@ static Stream<Arguments> invalidFullyQualifiedMethodNames() {
 	@Test
 	void selectMethodByFullyQualifiedName() throws Exception {
 		Class<?> clazz = getClass();
-		Method method = clazz.getDeclaredMethod("myTest");
+		var method = clazz.getDeclaredMethod("myTest");
 		assertSelectMethodByFullyQualifiedName(clazz, method);
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameForDefaultMethodInInterface() throws Exception {
 		Class<?> clazz = TestCaseWithDefaultMethod.class;
-		Method method = clazz.getMethod("myTest");
+		var method = clazz.getMethod("myTest");
 		assertSelectMethodByFullyQualifiedName(clazz, method);
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithPrimitiveParameter() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", int.class);
+		var method = getClass().getDeclaredMethod("myTest", int.class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, int.class, "int");
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithPrimitiveParameterUsingSourceCodeSyntax() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", int.class);
+		var method = getClass().getDeclaredMethod("myTest", int.class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, "int", "int");
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithObjectParameter() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", String.class);
+		var method = getClass().getDeclaredMethod("myTest", String.class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, String.class, String.class.getName());
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithObjectParameterUsingSourceCodeSyntax() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", String.class);
+		var method = getClass().getDeclaredMethod("myTest", String.class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, "java.lang.String", String.class.getName());
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithPrimitiveArrayParameter() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", int[].class);
+		var method = getClass().getDeclaredMethod("myTest", int[].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, int[].class, int[].class.getName());
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithPrimitiveArrayParameterUsingSourceCodeSyntax() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", int[].class);
+		var method = getClass().getDeclaredMethod("myTest", int[].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, "int[]", "int[]");
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithObjectArrayParameter() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", String[].class);
+		var method = getClass().getDeclaredMethod("myTest", String[].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, String[].class, String[].class.getName());
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithObjectArrayParameterUsingSourceCodeSyntax() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", String[].class);
+		var method = getClass().getDeclaredMethod("myTest", String[].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, "java.lang.String[]", "java.lang.String[]");
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithTwoDimensionalPrimitiveArrayParameter() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", int[][].class);
+		var method = getClass().getDeclaredMethod("myTest", int[][].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, int[][].class, int[][].class.getName());
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithTwoDimensionalPrimitiveArrayParameterUsingSourceCodeSyntax()
 			throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", int[][].class);
+		var method = getClass().getDeclaredMethod("myTest", int[][].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, "int[][]", "int[][]");
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithTwoDimensionalObjectArrayParameter() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", String[][].class);
+		var method = getClass().getDeclaredMethod("myTest", String[][].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, String[][].class, String[][].class.getName());
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithTwoDimensionalObjectArrayParameterUsingSourceCodeSyntax()
 			throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", String[][].class);
+		var method = getClass().getDeclaredMethod("myTest", String[][].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, "java.lang.String[][]", "java.lang.String[][]");
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithMultidimensionalPrimitiveArrayParameter() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", int[][][][][].class);
+		var method = getClass().getDeclaredMethod("myTest", int[][][][][].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, int[][][][][].class, int[][][][][].class.getName());
 	}
 
@@ -414,13 +414,13 @@ void selectMethodByFullyQualifiedNameWithMultidimensionalPrimitiveArrayParameter
 	void selectMethodByFullyQualifiedNameWithMultidimensionalPrimitiveArrayParameterUsingSourceCodeSyntax()
 			throws Exception {
 
-		Method method = getClass().getDeclaredMethod("myTest", int[][][][][].class);
+		var method = getClass().getDeclaredMethod("myTest", int[][][][][].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, "int[][][][][]", "int[][][][][]");
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameWithMultidimensionalObjectArrayParameter() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", Double[][][][][].class);
+		var method = getClass().getDeclaredMethod("myTest", Double[][][][][].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, Double[][][][][].class,
 			Double[][][][][].class.getName());
 	}
@@ -429,21 +429,21 @@ void selectMethodByFullyQualifiedNameWithMultidimensionalObjectArrayParameter()
 	void selectMethodByFullyQualifiedNameWithMultidimensionalObjectArrayParameterUsingSourceCodeSyntax()
 			throws Exception {
 
-		Method method = getClass().getDeclaredMethod("myTest", Double[][][][][].class);
+		var method = getClass().getDeclaredMethod("myTest", Double[][][][][].class);
 		assertSelectMethodByFullyQualifiedName(getClass(), method, "java.lang.Double[][][][][]",
 			"java.lang.Double[][][][][]");
 	}
 
 	@Test
 	void selectMethodByFullyQualifiedNameEndingInOpeningParenthesis() {
-		String className = "org.example.MyClass";
+		var className = "org.example.MyClass";
 		// The following bizarre method name is not permissible in Java source
 		// code; however, it's permitted by the JVM -- for example, in Groovy
 		// or Kotlin source code using back ticks.
-		String methodName = ")--(";
-		String fqmn = className + "#" + methodName;
+		var methodName = ")--(";
+		var fqmn = className + "#" + methodName;
 
-		MethodSelector selector = selectMethod(fqmn);
+		var selector = selectMethod(fqmn);
 		assertEquals(className, selector.getClassName());
 		assertEquals(methodName, selector.getMethodName());
 		assertEquals("", selector.getMethodParameterTypes());
@@ -454,11 +454,11 @@ void selectMethodByFullyQualifiedNameEndingInOpeningParenthesis() {
 	 */
 	@Test
 	void selectMethodByFullyQualifiedNameContainingHashtags() {
-		String className = "org.example.CalculatorSpec";
-		String methodName = "#a plus #b equals #c";
-		String fqmn = className + "#" + methodName;
+		var className = "org.example.CalculatorSpec";
+		var methodName = "#a plus #b equals #c";
+		var fqmn = className + "#" + methodName;
 
-		MethodSelector selector = selectMethod(fqmn);
+		var selector = selectMethod(fqmn);
 		assertEquals(className, selector.getClassName());
 		assertEquals(methodName, selector.getMethodName());
 		assertEquals("", selector.getMethodParameterTypes());
@@ -469,12 +469,12 @@ void selectMethodByFullyQualifiedNameContainingHashtags() {
 	 */
 	@Test
 	void selectMethodByFullyQualifiedNameContainingHashtagsAndWithParameterList() {
-		String className = "org.example.CalculatorSpec";
-		String methodName = "#a plus #b equals #c";
-		String methodParameters = "int, int, int";
-		String fqmn = String.format("%s#%s(%s)", className, methodName, methodParameters);
+		var className = "org.example.CalculatorSpec";
+		var methodName = "#a plus #b equals #c";
+		var methodParameters = "int, int, int";
+		var fqmn = String.format("%s#%s(%s)", className, methodName, methodParameters);
 
-		MethodSelector selector = selectMethod(fqmn);
+		var selector = selectMethod(fqmn);
 		assertEquals(className, selector.getClassName());
 		assertEquals(methodName, selector.getMethodName());
 		assertEquals(methodParameters, selector.getMethodParameterTypes());
@@ -485,11 +485,11 @@ void selectMethodByFullyQualifiedNameContainingHashtagsAndWithParameterList() {
 	 */
 	@Test
 	void selectMethodByFullyQualifiedNameContainingParentheses() {
-		String className = "org.example.KotlinTestCase";
-		String methodName = "🦆 ~|~test with a really, (really) terrible name & that needs to be changed!~|~";
-		String fqmn = className + "#" + methodName;
+		var className = "org.example.KotlinTestCase";
+		var methodName = "🦆 ~|~test with a really, (really) terrible name & that needs to be changed!~|~";
+		var fqmn = className + "#" + methodName;
 
-		MethodSelector selector = selectMethod(fqmn);
+		var selector = selectMethod(fqmn);
 
 		assertEquals(className, selector.getClassName());
 		assertEquals(methodName, selector.getMethodName());
@@ -501,11 +501,11 @@ void selectMethodByFullyQualifiedNameContainingParentheses() {
 	 */
 	@Test
 	void selectMethodByFullyQualifiedNameEndingWithParentheses() {
-		String className = "org.example.KotlinTestCase";
-		String methodName = "test name ends with parentheses()";
-		String fqmn = className + "#" + methodName + "()";
+		var className = "org.example.KotlinTestCase";
+		var methodName = "test name ends with parentheses()";
+		var fqmn = className + "#" + methodName + "()";
 
-		MethodSelector selector = selectMethod(fqmn);
+		var selector = selectMethod(fqmn);
 
 		assertEquals(className, selector.getClassName());
 		assertEquals(methodName, selector.getMethodName());
@@ -517,12 +517,12 @@ void selectMethodByFullyQualifiedNameEndingWithParentheses() {
 	 */
 	@Test
 	void selectMethodByFullyQualifiedNameEndingWithParenthesesAndWithParameterList() {
-		String className = "org.example.KotlinTestCase";
-		String methodName = "test name ends with parentheses()";
-		String methodParameters = "int, int, int";
-		String fqmn = String.format("%s#%s(%s)", className, methodName, methodParameters);
+		var className = "org.example.KotlinTestCase";
+		var methodName = "test name ends with parentheses()";
+		var methodParameters = "int, int, int";
+		var fqmn = String.format("%s#%s(%s)", className, methodName, methodParameters);
 
-		MethodSelector selector = selectMethod(fqmn);
+		var selector = selectMethod(fqmn);
 
 		assertEquals(className, selector.getClassName());
 		assertEquals(methodName, selector.getMethodName());
@@ -530,7 +530,7 @@ void selectMethodByFullyQualifiedNameEndingWithParenthesesAndWithParameterList()
 	}
 
 	private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method) {
-		MethodSelector selector = selectMethod(fqmn(clazz, method.getName()));
+		var selector = selectMethod(fqmn(clazz, method.getName()));
 		assertEquals(method, selector.getJavaMethod());
 		assertEquals(clazz, selector.getJavaClass());
 		assertEquals(clazz.getName(), selector.getClassName());
@@ -541,7 +541,7 @@ private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method metho
 	private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method, Class<?> parameterType,
 			String expectedParameterTypes) {
 
-		MethodSelector selector = selectMethod(fqmn(parameterType));
+		var selector = selectMethod(fqmn(parameterType));
 		assertEquals(method, selector.getJavaMethod());
 		assertEquals(clazz, selector.getJavaClass());
 		assertEquals(clazz.getName(), selector.getClassName());
@@ -552,7 +552,7 @@ private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method metho
 	private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method, String parameterName,
 			String expectedParameterTypes) {
 
-		MethodSelector selector = selectMethod(fqmnWithParamNames(parameterName));
+		var selector = selectMethod(fqmnWithParamNames(parameterName));
 		assertEquals(method, selector.getJavaMethod());
 		assertEquals(clazz, selector.getJavaClass());
 		assertEquals(clazz.getName(), selector.getClassName());
@@ -562,9 +562,9 @@ private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method metho
 
 	@Test
 	void selectMethodByClassAndMethodName() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest");
+		var method = getClass().getDeclaredMethod("myTest");
 
-		MethodSelector selector = selectMethod(getClass(), "myTest");
+		var selector = selectMethod(getClass(), "myTest");
 		assertEquals(getClass(), selector.getJavaClass());
 		assertEquals(getClass().getName(), selector.getClassName());
 		assertEquals(method, selector.getJavaMethod());
@@ -574,9 +574,9 @@ void selectMethodByClassAndMethodName() throws Exception {
 
 	@Test
 	void selectMethodByClassAndMethodNameWithParameterTypes() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", String.class);
+		var method = getClass().getDeclaredMethod("myTest", String.class);
 
-		MethodSelector selector = selectMethod(getClass(), "myTest", String.class.getName());
+		var selector = selectMethod(getClass(), "myTest", String.class.getName());
 		assertEquals(getClass(), selector.getJavaClass());
 		assertEquals(getClass().getName(), selector.getClassName());
 		assertEquals(method, selector.getJavaMethod());
@@ -586,9 +586,9 @@ void selectMethodByClassAndMethodNameWithParameterTypes() throws Exception {
 
 	@Test
 	void selectMethodWithParametersByMethodReference() throws Exception {
-		Method method = getClass().getDeclaredMethod("myTest", String.class);
+		var method = getClass().getDeclaredMethod("myTest", String.class);
 
-		MethodSelector selector = selectMethod(getClass(), method);
+		var selector = selectMethod(getClass(), method);
 		assertEquals(method, selector.getJavaMethod());
 		assertEquals(getClass(), selector.getJavaClass());
 		assertEquals(getClass().getName(), selector.getClassName());
@@ -598,17 +598,17 @@ void selectMethodWithParametersByMethodReference() throws Exception {
 
 	@Test
 	void selectClassByNameForSpockSpec() {
-		String className = "org.example.CalculatorSpec";
-		ClassSelector selector = selectClass(className);
+		var className = "org.example.CalculatorSpec";
+		var selector = selectClass(className);
 		assertEquals(className, selector.getClassName());
 	}
 
 	@Test
 	void selectMethodByClassAndNameForSpockSpec() {
-		String className = "org.example.CalculatorSpec";
-		String methodName = "#a plus #b equals #c";
+		var className = "org.example.CalculatorSpec";
+		var methodName = "#a plus #b equals #c";
 
-		MethodSelector selector = selectMethod(className, methodName);
+		var selector = selectMethod(className, methodName);
 		assertEquals(className, selector.getClassName());
 		assertEquals(methodName, selector.getMethodName());
 		assertEquals("", selector.getMethodParameterTypes());
@@ -616,31 +616,31 @@ void selectMethodByClassAndNameForSpockSpec() {
 
 	@Test
 	void selectClasspathRootsWithNonExistingDirectory() {
-		List<ClasspathRootSelector> selectors = selectClasspathRoots(singleton(Paths.get("some", "local", "path")));
+		var selectors = selectClasspathRoots(singleton(Paths.get("some", "local", "path")));
 
 		assertThat(selectors).isEmpty();
 	}
 
 	@Test
 	void selectClasspathRootsWithNonExistingJarFile() {
-		List<ClasspathRootSelector> selectors = selectClasspathRoots(singleton(Paths.get("some.jar")));
+		var selectors = selectClasspathRoots(singleton(Paths.get("some.jar")));
 
 		assertThat(selectors).isEmpty();
 	}
 
 	@Test
 	void selectClasspathRootsWithExistingDirectory(@TempDir Path tempDir) {
-		List<ClasspathRootSelector> selectors = selectClasspathRoots(singleton(tempDir));
+		var selectors = selectClasspathRoots(singleton(tempDir));
 
 		assertThat(selectors).extracting(ClasspathRootSelector::getClasspathRoot).containsExactly(tempDir.toUri());
 	}
 
 	@Test
 	void selectClasspathRootsWithExistingJarFile() throws Exception {
-		URI jarUri = getClass().getResource("/jartest.jar").toURI();
-		Path jarFile = Paths.get(jarUri);
+		var jarUri = getClass().getResource("/jartest.jar").toURI();
+		var jarFile = Paths.get(jarUri);
 
-		List<ClasspathRootSelector> selectors = selectClasspathRoots(singleton(jarFile));
+		var selectors = selectClasspathRoots(singleton(jarFile));
 
 		assertThat(selectors).extracting(ClasspathRootSelector::getClasspathRoot).containsExactly(jarUri);
 	}
@@ -655,7 +655,7 @@ class NestedClassAndMethodSelectors {
 
 		@Test
 		void selectNestedClassByClassNames() {
-			NestedClassSelector selector = selectNestedClass(List.of(enclosingClassName), nestedClassName);
+			var selector = selectNestedClass(List.of(enclosingClassName), nestedClassName);
 
 			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
 			assertThat(selector.getNestedClass()).isEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
@@ -666,8 +666,7 @@ void selectNestedClassByClassNames() {
 
 		@Test
 		void selectDoubleNestedClassByClassNames() {
-			NestedClassSelector selector = selectNestedClass(List.of(enclosingClassName, nestedClassName),
-				doubleNestedClassName);
+			var selector = selectNestedClass(List.of(enclosingClassName, nestedClassName), doubleNestedClassName);
 
 			assertThat(selector.getEnclosingClasses()).containsExactly(ClassWithNestedInnerClass.class,
 				AbstractClassWithNestedInnerClass.NestedClass.class);
@@ -689,8 +688,7 @@ void selectNestedClassPreconditions() {
 
 		@Test
 		void selectNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
-			NestedMethodSelector selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName,
-				methodName);
+			var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName);
 
 			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
 			assertThat(selector.getNestedClass()).isEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
@@ -703,7 +701,7 @@ void selectNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
 
 		@Test
 		void selectNestedMethodByEnclosingClassesAndMethodName() throws Exception {
-			NestedMethodSelector selector = selectNestedMethod(List.of(ClassWithNestedInnerClass.class),
+			var selector = selectNestedMethod(List.of(ClassWithNestedInnerClass.class),
 				AbstractClassWithNestedInnerClass.NestedClass.class, methodName);
 
 			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
@@ -717,7 +715,7 @@ void selectNestedMethodByEnclosingClassesAndMethodName() throws Exception {
 
 		@Test
 		void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypes() throws Exception {
-			NestedMethodSelector selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
+			var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
 				String.class.getName());
 
 			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
@@ -732,9 +730,9 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypes() th
 
 		@Test
 		void selectDoubleNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
-			String doubleNestedMethodName = "doubleNestedTest";
-			NestedMethodSelector selector = selectNestedMethod(List.of(enclosingClassName, nestedClassName),
-				doubleNestedClassName, doubleNestedMethodName);
+			var doubleNestedMethodName = "doubleNestedTest";
+			var selector = selectNestedMethod(List.of(enclosingClassName, nestedClassName), doubleNestedClassName,
+				doubleNestedMethodName);
 
 			assertThat(selector.getEnclosingClasses()).containsExactly(ClassWithNestedInnerClass.class,
 				AbstractClassWithNestedInnerClass.NestedClass.class);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
index 71bcafb3ff39..63fcaca67e50 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
@@ -15,7 +15,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.DisplayName;
@@ -44,7 +43,7 @@ void preconditions() {
 	@Test
 	@DisplayName("create FilePosition from factory method with line number")
 	void filePositionFromLine() {
-		FilePosition filePosition = FilePosition.from(42);
+		var filePosition = FilePosition.from(42);
 
 		assertThat(filePosition.getLine()).isEqualTo(42);
 		assertThat(filePosition.getColumn()).isEmpty();
@@ -53,7 +52,7 @@ void filePositionFromLine() {
 	@Test
 	@DisplayName("create FilePosition from factory method with line number and column number")
 	void filePositionFromLineAndColumn() {
-		FilePosition filePosition = FilePosition.from(42, 99);
+		var filePosition = FilePosition.from(42, 99);
 
 		assertThat(filePosition.getLine()).isEqualTo(42);
 		assertThat(filePosition.getColumn()).contains(99);
@@ -65,10 +64,10 @@ void filePositionFromLineAndColumn() {
 	@ParameterizedTest
 	@MethodSource
 	void filePositionFromQuery(String query, int expectedLine, int expectedColumn) {
-		Optional<FilePosition> optionalFilePosition = FilePosition.fromQuery(query);
+		var optionalFilePosition = FilePosition.fromQuery(query);
 
 		if (optionalFilePosition.isPresent()) {
-			FilePosition filePosition = optionalFilePosition.get();
+			var filePosition = optionalFilePosition.get();
 
 			assertThat(filePosition.getLine()).isEqualTo(expectedLine);
 			assertThat(filePosition.getColumn().orElse(-1)).isEqualTo(expectedColumn);
@@ -99,9 +98,9 @@ static Stream<Arguments> filePositionFromQuery() {
 	@Test
 	@DisplayName("equals() and hashCode() with column number cached by Integer.valueOf()")
 	void equalsAndHashCode() {
-		FilePosition same = FilePosition.from(42, 99);
-		FilePosition sameSame = FilePosition.from(42, 99);
-		FilePosition different = FilePosition.from(1, 2);
+		var same = FilePosition.from(42, 99);
+		var sameSame = FilePosition.from(42, 99);
+		var different = FilePosition.from(1, 2);
 
 		assertEqualsAndHashCode(same, sameSame, different);
 	}
@@ -109,9 +108,9 @@ void equalsAndHashCode() {
 	@Test
 	@DisplayName("equals() and hashCode() with column number not cached by Integer.valueOf()")
 	void equalsAndHashCodeWithColumnNumberNotCachedByJavaLangIntegerDotValueOf() {
-		FilePosition same = FilePosition.from(42, 99999);
-		FilePosition sameSame = FilePosition.from(42, 99999);
-		FilePosition different = FilePosition.from(1, 2);
+		var same = FilePosition.from(42, 99999);
+		var sameSame = FilePosition.from(42, 99999);
+		var different = FilePosition.from(1, 2);
 
 		assertEqualsAndHashCode(same, sameSame, different);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 65ee7f1766b2..9729b108232a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -40,9 +40,9 @@ void equalsAndHashCode() {
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadClass() {
-		MethodSelector selector = new MethodSelector("TestClass", "method", "int, boolean");
+		var selector = new MethodSelector("TestClass", "method", "int, boolean");
 
-		PreconditionViolationException e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
+		var e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
 
 		assertThat(e).hasMessage("Could not load class with name: TestClass").hasCauseInstanceOf(
 			ClassNotFoundException.class);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
index 80fec35f8ebc..ef672c456ac7 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
@@ -38,9 +38,9 @@ void includePackageChecksPreconditions() {
 
 	@Test
 	void includePackageWithMultiplePackages() {
-		String includedPackage1 = "java.lang";
-		String includedPackage2 = "java.util";
-		PackageNameFilter filter = PackageNameFilter.includePackageNames(includedPackage1, includedPackage2);
+		var includedPackage1 = "java.lang";
+		var includedPackage2 = "java.util";
+		var filter = PackageNameFilter.includePackageNames(includedPackage1, includedPackage2);
 
 		assertThat(filter).hasToString(
 			"IncludePackageNameFilter that includes packages whose names are either equal to or start with one of the following: '"
@@ -89,9 +89,9 @@ void excludePackageChecksPreconditions() {
 
 	@Test
 	void excludePackageWithMultiplePackages() {
-		String excludedPackage1 = "java.lang";
-		String excludedPackage2 = "java.util";
-		PackageNameFilter filter = PackageNameFilter.excludePackageNames(excludedPackage1, excludedPackage2);
+		var excludedPackage1 = "java.lang";
+		var excludedPackage2 = "java.util";
+		var filter = PackageNameFilter.excludePackageNames(excludedPackage1, excludedPackage2);
 
 		assertThat(filter).hasToString(
 			"ExcludePackageNameFilter that excludes packages whose names are either equal to or start with one of the following: '"
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
index 63ef574c6f08..21941cb49a16 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
@@ -48,7 +48,7 @@ void preconditions() {
 	@Test
 	void delegatesGetCalls() {
 		when(delegate.get(any())).thenReturn(Optional.of("result"));
-		PrefixedConfigurationParameters parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
+		var parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
 
 		assertThat(parameters.get("qux")).contains("result");
 
@@ -58,7 +58,7 @@ void delegatesGetCalls() {
 	@Test
 	void delegatesGetBooleanCalls() {
 		when(delegate.getBoolean(any())).thenReturn(Optional.of(true));
-		PrefixedConfigurationParameters parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
+		var parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
 
 		assertThat(parameters.getBoolean("qux")).contains(true);
 
@@ -68,7 +68,7 @@ void delegatesGetBooleanCalls() {
 	@Test
 	void delegatesGetWithTransformerCalls() {
 		when(delegate.get(any(), any())).thenReturn(Optional.of("QUX"));
-		PrefixedConfigurationParameters parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
+		var parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
 
 		Function<String, String> transformer = String::toUpperCase;
 		assertThat(parameters.get("qux", transformer)).contains("QUX");
@@ -79,7 +79,7 @@ void delegatesGetWithTransformerCalls() {
 	@Test
 	void delegatesSizeCalls() {
 		when(delegate.size()).thenReturn(42);
-		PrefixedConfigurationParameters parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
+		var parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
 
 		assertThat(parameters.size()).isEqualTo(42);
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
index 477f1bceb419..522e08115b11 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -39,11 +38,11 @@ class AbstractTestDescriptorTests {
 	@BeforeEach
 	void initTree() {
 		engineDescriptor = new EngineDescriptor(UniqueId.forEngine("testEngine"), "testEngine");
-		GroupDescriptor group1 = new GroupDescriptor(UniqueId.root("group", "group1"));
+		var group1 = new GroupDescriptor(UniqueId.root("group", "group1"));
 		engineDescriptor.addChild(group1);
-		GroupDescriptor group2 = new GroupDescriptor(UniqueId.root("group", "group2"));
+		var group2 = new GroupDescriptor(UniqueId.root("group", "group2"));
 		engineDescriptor.addChild(group2);
-		GroupDescriptor group11 = new GroupDescriptor(UniqueId.root("group", "group1-1"));
+		var group11 = new GroupDescriptor(UniqueId.root("group", "group1-1"));
 		group1.addChild(group11);
 
 		group1.addChild(new LeafDescriptor(UniqueId.root("leaf", "leaf1-1")));
@@ -56,17 +55,17 @@ void initTree() {
 
 	@Test
 	void removeRootFromHierarchyFails() {
-		JUnitException e = assertThrows(JUnitException.class, () -> engineDescriptor.removeFromHierarchy());
+		var e = assertThrows(JUnitException.class, () -> engineDescriptor.removeFromHierarchy());
 		assertTrue(e.toString().contains("cannot remove the root of a hierarchy"));
 	}
 
 	@Test
 	void removeFromHierarchyClearsParentFromAllChildren() {
-		TestDescriptor group = engineDescriptor.getChildren().iterator().next();
+		var group = engineDescriptor.getChildren().iterator().next();
 		assertSame(engineDescriptor, group.getParent().orElseThrow(Error::new));
 		assertTrue(group.getChildren().stream().allMatch(d -> d.getParent().orElseThrow(Error::new) == group));
 
-		Set<? extends TestDescriptor> formerChildren = group.getChildren();
+		var formerChildren = group.getChildren();
 		group.removeFromHierarchy();
 
 		assertFalse(group.getParent().isPresent());
@@ -77,7 +76,7 @@ void removeFromHierarchyClearsParentFromAllChildren() {
 	@Test
 	void setParentToOtherInstance() {
 		TestDescriptor newEngine = new EngineDescriptor(UniqueId.forEngine("newEngine"), "newEngine");
-		TestDescriptor group = engineDescriptor.getChildren().iterator().next();
+		var group = engineDescriptor.getChildren().iterator().next();
 		assertSame(engineDescriptor, group.getParent().orElseThrow(Error::new));
 		group.setParent(newEngine);
 		assertSame(newEngine, group.getParent().orElseThrow(Error::new));
@@ -85,7 +84,7 @@ void setParentToOtherInstance() {
 
 	@Test
 	void setParentToNull() {
-		TestDescriptor group = engineDescriptor.getChildren().iterator().next();
+		var group = engineDescriptor.getChildren().iterator().next();
 		assertTrue(group.getParent().isPresent());
 		group.setParent(null);
 		assertFalse(group.getParent().isPresent());
@@ -117,7 +116,7 @@ void pruneLeaf() {
 
 	@Test
 	void pruneGroup() {
-		final AtomicInteger countVisited = new AtomicInteger();
+		final var countVisited = new AtomicInteger();
 		TestDescriptor.Visitor visitor = descriptor -> {
 			if (descriptor.getUniqueId().equals(UniqueId.root("group", "group1")))
 				descriptor.removeFromHierarchy();
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
index b9e6fea58ced..3ebb2a2105e5 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
@@ -58,8 +58,8 @@ Stream<DynamicTest> assertSerializable() throws Exception {
 	private <T extends Serializable> void assertSerializable(T instance) {
 		try {
 			Class<?> type = instance.getClass();
-			byte[] serialized = serialize(instance);
-			Object deserialized = deserialize(serialized);
+			var serialized = serialize(instance);
+			var deserialized = deserialize(serialized);
 
 			assertTrue(type.isAssignableFrom(deserialized.getClass()));
 			assertEquals(instance, deserialized);
@@ -70,15 +70,15 @@ private <T extends Serializable> void assertSerializable(T instance) {
 	}
 
 	private byte[] serialize(Object obj) throws Exception {
-		ByteArrayOutputStream b = new ByteArrayOutputStream();
-		ObjectOutputStream o = new ObjectOutputStream(b);
+		var b = new ByteArrayOutputStream();
+		var o = new ObjectOutputStream(b);
 		o.writeObject(obj);
 		return b.toByteArray();
 	}
 
 	private Object deserialize(byte[] bytes) throws Exception {
-		ByteArrayInputStream b = new ByteArrayInputStream(bytes);
-		ObjectInputStream o = new ObjectInputStream(b);
+		var b = new ByteArrayInputStream(bytes);
+		var o = new ObjectInputStream(b);
 		return o.readObject();
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
index 303baa1b1080..7d65a66ea152 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
@@ -50,7 +50,7 @@ void preconditions() {
 
 	@Test
 	void resourceWithoutPosition() {
-		ClasspathResourceSource source = ClasspathResourceSource.from(FOO_RESOURCE);
+		var source = ClasspathResourceSource.from(FOO_RESOURCE);
 
 		assertThat(source).isNotNull();
 		assertThat(source.getClasspathResourceName()).isEqualTo(FOO_RESOURCE);
@@ -59,7 +59,7 @@ void resourceWithoutPosition() {
 
 	@Test
 	void resourceWithLeadingSlashWithoutPosition() {
-		ClasspathResourceSource source = ClasspathResourceSource.from("/" + FOO_RESOURCE);
+		var source = ClasspathResourceSource.from("/" + FOO_RESOURCE);
 
 		assertThat(source).isNotNull();
 		assertThat(source.getClasspathResourceName()).isEqualTo(FOO_RESOURCE);
@@ -68,8 +68,8 @@ void resourceWithLeadingSlashWithoutPosition() {
 
 	@Test
 	void resourceWithPosition() {
-		FilePosition position = FilePosition.from(42, 23);
-		ClasspathResourceSource source = ClasspathResourceSource.from(FOO_RESOURCE, position);
+		var position = FilePosition.from(42, 23);
+		var source = ClasspathResourceSource.from(FOO_RESOURCE, position);
 
 		assertThat(source).isNotNull();
 		assertThat(source.getClasspathResourceName()).isEqualTo(FOO_RESOURCE);
@@ -78,7 +78,7 @@ void resourceWithPosition() {
 
 	@Test
 	void resourcefromUriWithoutPosition() {
-		ClasspathResourceSource source = ClasspathResourceSource.from(FOO_RESOURCE_URI);
+		var source = ClasspathResourceSource.from(FOO_RESOURCE_URI);
 
 		assertThat(source).isNotNull();
 		assertThat(source.getClasspathResourceName()).isEqualTo(FOO_RESOURCE);
@@ -87,9 +87,9 @@ void resourcefromUriWithoutPosition() {
 
 	@Test
 	void resourceFromUriWithLineNumber() {
-		FilePosition position = FilePosition.from(42);
-		URI uri = URI.create(FOO_RESOURCE_URI + "?line=42");
-		ClasspathResourceSource source = ClasspathResourceSource.from(uri);
+		var position = FilePosition.from(42);
+		var uri = URI.create(FOO_RESOURCE_URI + "?line=42");
+		var source = ClasspathResourceSource.from(uri);
 
 		assertThat(source).isNotNull();
 		assertThat(source.getClasspathResourceName()).isEqualTo(FOO_RESOURCE);
@@ -98,9 +98,9 @@ void resourceFromUriWithLineNumber() {
 
 	@Test
 	void resourceFromUriWithLineAndColumnNumbers() {
-		FilePosition position = FilePosition.from(42, 23);
-		URI uri = URI.create(FOO_RESOURCE_URI + "?line=42&foo=bar&column=23");
-		ClasspathResourceSource source = ClasspathResourceSource.from(uri);
+		var position = FilePosition.from(42, 23);
+		var uri = URI.create(FOO_RESOURCE_URI + "?line=42&foo=bar&column=23");
+		var source = ClasspathResourceSource.from(uri);
 
 		assertThat(source).isNotNull();
 		assertThat(source.getClasspathResourceName()).isEqualTo(FOO_RESOURCE);
@@ -112,7 +112,7 @@ void equalsAndHashCode() {
 		assertEqualsAndHashCode(ClasspathResourceSource.from(FOO_RESOURCE), ClasspathResourceSource.from(FOO_RESOURCE),
 			ClasspathResourceSource.from(BAR_RESOURCE));
 
-		FilePosition position = FilePosition.from(42, 23);
+		var position = FilePosition.from(42, 23);
 		assertEqualsAndHashCode(ClasspathResourceSource.from(FOO_RESOURCE, position),
 			ClasspathResourceSource.from(FOO_RESOURCE, position), ClasspathResourceSource.from(BAR_RESOURCE, position));
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
index 27e6c870eb03..526386711d3b 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
@@ -33,8 +33,8 @@ class CompositeTestSourceTests extends AbstractTestSourceTests {
 
 	@Override
 	Stream<CompositeTestSource> createSerializableInstances() {
-		FileSource fileSource = FileSource.from(new File("sample.instance"));
-		ClassSource classSource = ClassSource.from(getClass());
+		var fileSource = FileSource.from(new File("sample.instance"));
+		var classSource = ClassSource.from(getClass());
 		List<TestSource> sources = new ArrayList<>(Arrays.asList(fileSource, classSource));
 		return Stream.of(CompositeTestSource.from(sources));
 	}
@@ -51,10 +51,10 @@ void createCompositeTestSourceFromEmptyList() {
 
 	@Test
 	void createCompositeTestSourceFromClassAndFileSources() {
-		FileSource fileSource = FileSource.from(new File("example.test"));
-		ClassSource classSource = ClassSource.from(getClass());
+		var fileSource = FileSource.from(new File("example.test"));
+		var classSource = ClassSource.from(getClass());
 		List<TestSource> sources = new ArrayList<>(Arrays.asList(fileSource, classSource));
-		CompositeTestSource compositeTestSource = CompositeTestSource.from(sources);
+		var compositeTestSource = CompositeTestSource.from(sources);
 
 		assertThat(compositeTestSource.getSources().size()).isEqualTo(2);
 		assertThat(compositeTestSource.getSources()).contains(fileSource, classSource);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
index 0727a794cae4..11ba87897b92 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
@@ -39,21 +39,21 @@ void nullSourceUriYieldsException() {
 
 	@Test
 	void getterReturnsSameUriInstanceAsSuppliedToTheConstructor() throws Exception {
-		URI expected = new URI("foo.txt");
-		URI actual = new DefaultUriSource(expected).getUri();
+		var expected = new URI("foo.txt");
+		var actual = new DefaultUriSource(expected).getUri();
 		assertSame(expected, actual);
 	}
 
 	@Test
 	void equalsAndHashCode() throws Exception {
-		URI uri1 = new URI("foo.txt");
-		URI uri2 = new URI("bar.txt");
+		var uri1 = new URI("foo.txt");
+		var uri2 = new URI("bar.txt");
 		assertEqualsAndHashCode(new DefaultUriSource(uri1), new DefaultUriSource(uri1), new DefaultUriSource(uri2));
 	}
 
 	@Test
 	void testToString() {
-		String actual = new DefaultUriSource(URI.create("foo.txt")).toString();
+		var actual = new DefaultUriSource(URI.create("foo.txt")).toString();
 		assertEquals("DefaultUriSource [uri = foo.txt]", actual);
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
index beb5b6e92e8f..01307356383c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
@@ -45,7 +45,7 @@ public Set<TestTag> getTags() {
 		return findRepeatableAnnotations(this.testClass, Tag.class).stream()
 				.map(Tag::value)
 				.filter(tag -> {
-					boolean isValid = TestTag.isValid(tag);
+					var isValid = TestTag.isValid(tag);
 					if (!isValid) {
 						// TODO [#242] Replace logging with precondition check once we have a proper mechanism for
 						// handling validation exceptions during the TestEngine discovery phase.
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
index b262a6e6612b..1401d34997a8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
@@ -52,7 +52,7 @@ public Set<TestTag> getTags() {
 		Set<TestTag> methodTags = findRepeatableAnnotations(this.testMethod, Tag.class).stream()
 				.map(Tag::value)
 				.filter(tag -> {
-					boolean isValid = TestTag.isValid(tag);
+					var isValid = TestTag.isValid(tag);
 					if (!isValid) {
 						// TODO [#242] Replace logging with precondition check once we have a proper mechanism for
 						// handling validation exceptions during the TestEngine discovery phase.
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
index dff01fc599d4..c93dc0cf98c5 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
@@ -15,7 +15,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.DisplayName;
@@ -48,7 +47,7 @@ void preconditions() {
 	@Test
 	@DisplayName("create FilePosition from factory method with line number")
 	void filePositionFromLine() {
-		FilePosition filePosition = FilePosition.from(42);
+		var filePosition = FilePosition.from(42);
 
 		assertThat(filePosition.getLine()).isEqualTo(42);
 		assertThat(filePosition.getColumn()).isEmpty();
@@ -57,7 +56,7 @@ void filePositionFromLine() {
 	@Test
 	@DisplayName("create FilePosition from factory method with line number and column number")
 	void filePositionFromLineAndColumn() {
-		FilePosition filePosition = FilePosition.from(42, 99);
+		var filePosition = FilePosition.from(42, 99);
 
 		assertThat(filePosition.getLine()).isEqualTo(42);
 		assertThat(filePosition.getColumn()).contains(99);
@@ -69,10 +68,10 @@ void filePositionFromLineAndColumn() {
 	@ParameterizedTest
 	@MethodSource
 	void filePositionFromQuery(String query, int expectedLine, int expectedColumn) {
-		Optional<FilePosition> optionalFilePosition = FilePosition.fromQuery(query);
+		var optionalFilePosition = FilePosition.fromQuery(query);
 
 		if (optionalFilePosition.isPresent()) {
-			FilePosition filePosition = optionalFilePosition.get();
+			var filePosition = optionalFilePosition.get();
 
 			assertThat(filePosition.getLine()).isEqualTo(expectedLine);
 			assertThat(filePosition.getColumn().orElse(-1)).isEqualTo(expectedColumn);
@@ -103,9 +102,9 @@ static Stream<Arguments> filePositionFromQuery() {
 	@Test
 	@DisplayName("equals() and hashCode() with column number cached by Integer.valueOf()")
 	void equalsAndHashCode() {
-		FilePosition same = FilePosition.from(42, 99);
-		FilePosition sameSame = FilePosition.from(42, 99);
-		FilePosition different = FilePosition.from(1, 2);
+		var same = FilePosition.from(42, 99);
+		var sameSame = FilePosition.from(42, 99);
+		var different = FilePosition.from(1, 2);
 
 		assertEqualsAndHashCode(same, sameSame, different);
 	}
@@ -113,9 +112,9 @@ void equalsAndHashCode() {
 	@Test
 	@DisplayName("equals() and hashCode() with column number not cached by Integer.valueOf()")
 	void equalsAndHashCodeWithColumnNumberNotCachedByJavaLangIntegerDotValueOf() {
-		FilePosition same = FilePosition.from(42, 99999);
-		FilePosition sameSame = FilePosition.from(42, 99999);
-		FilePosition different = FilePosition.from(1, 2);
+		var same = FilePosition.from(42, 99999);
+		var sameSame = FilePosition.from(42, 99999);
+		var different = FilePosition.from(1, 2);
 
 		assertEqualsAndHashCode(same, sameSame, different);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
index fc9d30a44b09..41debcde238f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
@@ -40,10 +40,10 @@ void nullSourceFileOrDirectoryYieldsException() {
 
 	@Test
 	void directory() throws Exception {
-		File canonicalDir = new File(".").getCanonicalFile();
-		File relativeDir = new File("..", canonicalDir.getName());
+		var canonicalDir = new File(".").getCanonicalFile();
+		var relativeDir = new File("..", canonicalDir.getName());
 
-		DirectorySource source = DirectorySource.from(relativeDir);
+		var source = DirectorySource.from(relativeDir);
 
 		assertThat(source.getUri()).isEqualTo(canonicalDir.toURI());
 		assertThat(source.getFile()).isEqualTo(canonicalDir);
@@ -51,12 +51,12 @@ void directory() throws Exception {
 
 	@Test
 	void fileWithoutPosition() throws Exception {
-		File canonicalDir = new File(".").getCanonicalFile();
-		File relativeDir = new File("..", canonicalDir.getName());
-		File relativeFile = new File(relativeDir, "test.txt");
-		File canonicalFile = relativeFile.getCanonicalFile();
+		var canonicalDir = new File(".").getCanonicalFile();
+		var relativeDir = new File("..", canonicalDir.getName());
+		var relativeFile = new File(relativeDir, "test.txt");
+		var canonicalFile = relativeFile.getCanonicalFile();
 
-		FileSource source = FileSource.from(relativeFile);
+		var source = FileSource.from(relativeFile);
 
 		assertThat(source.getUri()).isEqualTo(canonicalFile.toURI());
 		assertThat(source.getFile()).isEqualTo(canonicalFile);
@@ -65,9 +65,9 @@ void fileWithoutPosition() throws Exception {
 
 	@Test
 	void fileWithPosition() {
-		File file = new File("test.txt");
-		FilePosition position = FilePosition.from(42, 23);
-		FileSource source = FileSource.from(file, position);
+		var file = new File("test.txt");
+		var position = FilePosition.from(42, 23);
+		var source = FileSource.from(file, position);
 
 		assertThat(source.getUri()).isEqualTo(file.getAbsoluteFile().toURI());
 		assertThat(source.getFile()).isEqualTo(file.getAbsoluteFile());
@@ -76,19 +76,19 @@ void fileWithPosition() {
 
 	@Test
 	void equalsAndHashCodeForFileSource() {
-		File file1 = new File("foo.txt");
-		File file2 = new File("bar.txt");
+		var file1 = new File("foo.txt");
+		var file2 = new File("bar.txt");
 		assertEqualsAndHashCode(FileSource.from(file1), FileSource.from(file1), FileSource.from(file2));
 
-		FilePosition position = FilePosition.from(42, 23);
+		var position = FilePosition.from(42, 23);
 		assertEqualsAndHashCode(FileSource.from(file1, position), FileSource.from(file1, position),
 			FileSource.from(file2, position));
 	}
 
 	@Test
 	void equalsAndHashCodeForDirectorySource() {
-		File dir1 = new File(".");
-		File dir2 = new File("..");
+		var dir1 = new File(".");
+		var dir2 = new File("..");
 		assertEqualsAndHashCode(DirectorySource.from(dir1), DirectorySource.from(dir1), DirectorySource.from(dir2));
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
index e44d570a2957..78248a31e21b 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
@@ -39,8 +39,8 @@ Stream<Serializable> createSerializableInstances() throws Exception {
 
 	@Test
 	void methodSource() throws Exception {
-		Method testMethod = getMethod("method1");
-		MethodSource source = MethodSource.from(testMethod);
+		var testMethod = getMethod("method1");
+		var source = MethodSource.from(testMethod);
 
 		assertThat(source.getClassName()).isEqualTo(getClass().getName());
 		assertThat(source.getMethodName()).isEqualTo(testMethod.getName());
@@ -51,8 +51,8 @@ void methodSource() throws Exception {
 
 	@Test
 	void equalsAndHashCodeForMethodSource() throws Exception {
-		Method method1 = getMethod("method1");
-		Method method2 = getMethod("method2");
+		var method1 = getMethod("method1");
+		var method2 = getMethod("method2");
 		assertEqualsAndHashCode(MethodSource.from(method1), MethodSource.from(method1), MethodSource.from(method2));
 	}
 
@@ -88,7 +88,7 @@ void instantiationWithNullClassOrMethodShouldThrowPreconditionViolationException
 
 	@Test
 	void instantiationWithClassAndMethodShouldResultInACorrectObject() throws Exception {
-		MethodSource source = MethodSource.from(String.class,
+		var source = MethodSource.from(String.class,
 			String.class.getDeclaredMethod("lastIndexOf", String.class, int.class));
 		assertEquals(String.class.getName(), source.getClassName());
 		assertEquals("lastIndexOf", source.getMethodName());
@@ -97,7 +97,7 @@ void instantiationWithClassAndMethodShouldResultInACorrectObject() throws Except
 
 	@Test
 	void instantiationWithClassAndMethodAsStringAndParamsAsClassVarargsShouldResultInACorrectObject() {
-		MethodSource source = MethodSource.from(String.class.getName(), "lastIndexOf", String.class, int.class);
+		var source = MethodSource.from(String.class.getName(), "lastIndexOf", String.class, int.class);
 		assertEquals(String.class.getName(), source.getClassName());
 		assertEquals("lastIndexOf", source.getMethodName());
 		assertEquals("java.lang.String, int", source.getMethodParameterTypes());
@@ -156,113 +156,112 @@ void twoEqualMethodsWithUnequalParametersShouldHaveUnequalMethodSourceHashCodes(
 
 	@Test
 	void aReflectedMethodsClassNameShouldBeConsistent() throws Exception {
-		Method m = String.class.getDeclaredMethod("valueOf", int.class);
+		var m = String.class.getDeclaredMethod("valueOf", int.class);
 
 		assertEquals("java.lang.String", MethodSource.from(m).getClassName());
 	}
 
 	@Test
 	void aReflectedMethodsMethodNameShouldBeConsistent() throws Exception {
-		Method m = String.class.getDeclaredMethod("valueOf", int.class);
+		var m = String.class.getDeclaredMethod("valueOf", int.class);
 
 		assertEquals("valueOf", MethodSource.from(m).getMethodName());
 	}
 
 	@Test
 	void aReflectedMethodsParameterTypesShouldBeConsistent() throws Exception {
-		Method m = String.class.getDeclaredMethod("valueOf", float.class);
+		var m = String.class.getDeclaredMethod("valueOf", float.class);
 
 		assertEquals("float", MethodSource.from(m).getMethodParameterTypes());
 	}
 
 	@Test
 	void twoEqualReflectedMethodsShouldHaveEqualMethodSourceObjects() throws Exception {
-		Method m1 = String.class.getDeclaredMethod("valueOf", int.class);
-		Method m2 = String.class.getDeclaredMethod("valueOf", int.class);
+		var m1 = String.class.getDeclaredMethod("valueOf", int.class);
+		var m2 = String.class.getDeclaredMethod("valueOf", int.class);
 
 		assertEquals(MethodSource.from(m1), MethodSource.from(m2));
 	}
 
 	@Test
 	void twoEqualReflectedMethodsShouldHaveEqualMethodSourceHashCodes() throws Exception {
-		Method m1 = String.class.getDeclaredMethod("valueOf", int.class);
-		Method m2 = String.class.getDeclaredMethod("valueOf", int.class);
+		var m1 = String.class.getDeclaredMethod("valueOf", int.class);
+		var m2 = String.class.getDeclaredMethod("valueOf", int.class);
 
 		assertEquals(MethodSource.from(m1).hashCode(), MethodSource.from(m2).hashCode());
 	}
 
 	@Test
 	void twoUnequalReflectedMethodsShouldNotHaveEqualMethodSourceObjects() throws Exception {
-		Method m1 = String.class.getDeclaredMethod("valueOf", int.class);
-		Method m2 = Byte.class.getDeclaredMethod("byteValue");
+		var m1 = String.class.getDeclaredMethod("valueOf", int.class);
+		var m2 = Byte.class.getDeclaredMethod("byteValue");
 
 		assertNotEquals(MethodSource.from(m1), MethodSource.from(m2));
 	}
 
 	@Test
 	void twoUnequalReflectedMethodsShouldNotHaveEqualMethodSourceHashCodes() throws Exception {
-		Method m1 = String.class.getDeclaredMethod("valueOf", int.class);
-		Method m2 = Byte.class.getDeclaredMethod("byteValue");
+		var m1 = String.class.getDeclaredMethod("valueOf", int.class);
+		var m2 = Byte.class.getDeclaredMethod("byteValue");
 
 		assertNotEquals(MethodSource.from(m1).hashCode(), MethodSource.from(m2).hashCode());
 	}
 
 	@Test
 	void getJavaClassFromString() {
-		MethodSource source = MethodSource.from(getClass().getName(), "method1");
+		var source = MethodSource.from(getClass().getName(), "method1");
 
 		assertThat(source.getJavaClass()).isEqualTo(getClass());
 	}
 
 	@Test
 	void getJavaClassShouldThrowExceptionIfClassNotFound() {
-		MethodSource source = MethodSource.from(getClass().getName() + "X", "method1");
+		var source = MethodSource.from(getClass().getName() + "X", "method1");
 
 		assertThrows(PreconditionViolationException.class, source::getJavaClass);
 	}
 
 	@Test
 	void getJavaMethodShouldReturnGivenMethodIfOverloadExists() throws Exception {
-		Method testMethod = getMethod("method3");
-		MethodSource source = MethodSource.from(testMethod);
+		var testMethod = getMethod("method3");
+		var source = MethodSource.from(testMethod);
 
 		assertThat(source.getJavaMethod()).isEqualTo(testMethod);
 	}
 
 	@Test
 	void getJavaMethodFromStringShouldFindVoidMethod() throws Exception {
-		Method testMethod = getClass().getDeclaredMethod("methodVoid");
-		MethodSource source = MethodSource.from(getClass().getName(), testMethod.getName());
+		var testMethod = getClass().getDeclaredMethod("methodVoid");
+		var source = MethodSource.from(getClass().getName(), testMethod.getName());
 
 		assertThat(source.getJavaMethod()).isEqualTo(testMethod);
 	}
 
 	@Test
 	void getJavaMethodFromStringShouldFindMethodWithParameter() throws Exception {
-		Method testMethod = getClass().getDeclaredMethod("method3", Integer.TYPE);
-		MethodSource source = MethodSource.from(getClass().getName(), testMethod.getName(),
-			testMethod.getParameterTypes());
+		var testMethod = getClass().getDeclaredMethod("method3", Integer.TYPE);
+		var source = MethodSource.from(getClass().getName(), testMethod.getName(), testMethod.getParameterTypes());
 
 		assertThat(source.getJavaMethod()).isEqualTo(testMethod);
 	}
 
 	@Test
 	void getJavaMethodFromStringShouldThrowExceptionIfParameterTypesAreNotSupplied() {
-		MethodSource source = MethodSource.from(getClass().getName(), "method3");
+		var source = MethodSource.from(getClass().getName(), "method3");
 
 		assertThrows(PreconditionViolationException.class, source::getJavaMethod);
 	}
 
 	@Test
 	void getJavaMethodFromStringShouldThrowExceptionIfParameterTypesDoNotMatch() {
-		MethodSource source = MethodSource.from(getClass().getName(), "method3", Double.TYPE);
+		var source = MethodSource.from(getClass().getName(), "method3", Double.TYPE);
 
 		assertThrows(PreconditionViolationException.class, source::getJavaMethod);
 	}
 
 	@Test
 	void getJavaMethodFromStringShouldThrowExceptionIfMethodDoesNotExist() {
-		MethodSource source = MethodSource.from(getClass().getName(), "methodX");
+		var source = MethodSource.from(getClass().getName(), "methodX");
 
 		assertThrows(PreconditionViolationException.class, source::getJavaMethod);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
index f5c2a064e3eb..0ef5b8ab69cd 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
@@ -48,24 +48,24 @@ void packageSourceFromNullPackageReference() {
 
 	@Test
 	void packageSourceFromPackageName() {
-		String testPackage = getClass().getPackage().getName();
-		PackageSource source = PackageSource.from(testPackage);
+		var testPackage = getClass().getPackage().getName();
+		var source = PackageSource.from(testPackage);
 
 		assertThat(source.getPackageName()).isEqualTo(testPackage);
 	}
 
 	@Test
 	void packageSourceFromPackageReference() {
-		Package testPackage = getClass().getPackage();
-		PackageSource source = PackageSource.from(testPackage);
+		var testPackage = getClass().getPackage();
+		var source = PackageSource.from(testPackage);
 
 		assertThat(source.getPackageName()).isEqualTo(testPackage.getName());
 	}
 
 	@Test
 	void equalsAndHashCodeForPackageSource() {
-		Package pkg1 = getClass().getPackage();
-		Package pkg2 = String.class.getPackage();
+		var pkg1 = getClass().getPackage();
+		var pkg2 = String.class.getPackage();
 		assertEqualsAndHashCode(PackageSource.from(pkg1), PackageSource.from(pkg1), PackageSource.from(pkg2));
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
index 69809502ec2a..ba253affcf6a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
@@ -22,7 +22,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
-import org.mockito.InOrder;
 
 /**
  * @since 1.3
@@ -32,12 +31,12 @@ class CompositeLockTests {
 	@Test
 	@SuppressWarnings("resource")
 	void acquiresAllLocksInOrder() throws Exception {
-		Lock lock1 = mock(Lock.class);
-		Lock lock2 = mock(Lock.class);
+		var lock1 = mock(Lock.class);
+		var lock2 = mock(Lock.class);
 
 		new CompositeLock(asList(lock1, lock2)).acquire();
 
-		InOrder inOrder = inOrder(lock1, lock2);
+		var inOrder = inOrder(lock1, lock2);
 		inOrder.verify(lock1).lockInterruptibly();
 		inOrder.verify(lock2).lockInterruptibly();
 	}
@@ -45,12 +44,12 @@ void acquiresAllLocksInOrder() throws Exception {
 	@Test
 	@SuppressWarnings("resource")
 	void releasesAllLocksInReverseOrder() throws Exception {
-		Lock lock1 = mock(Lock.class);
-		Lock lock2 = mock(Lock.class);
+		var lock1 = mock(Lock.class);
+		var lock2 = mock(Lock.class);
 
 		new CompositeLock(asList(lock1, lock2)).acquire().close();
 
-		InOrder inOrder = inOrder(lock1, lock2);
+		var inOrder = inOrder(lock1, lock2);
 		inOrder.verify(lock2).unlock();
 		inOrder.verify(lock1).unlock();
 	}
@@ -58,12 +57,12 @@ void releasesAllLocksInReverseOrder() throws Exception {
 	@Test
 	@SuppressWarnings("resource")
 	void releasesLocksInReverseOrderWhenInterruptedDuringAcquire() throws Exception {
-		CountDownLatch firstTwoLocksWereLocked = new CountDownLatch(2);
-		Lock firstLock = mockLock("firstLock", firstTwoLocksWereLocked::countDown);
-		Lock secondLock = mockLock("secondLock", firstTwoLocksWereLocked::countDown);
-		Lock unavailableLock = mockLock("unavailableLock", new CountDownLatch(1)::await);
+		var firstTwoLocksWereLocked = new CountDownLatch(2);
+		var firstLock = mockLock("firstLock", firstTwoLocksWereLocked::countDown);
+		var secondLock = mockLock("secondLock", firstTwoLocksWereLocked::countDown);
+		var unavailableLock = mockLock("unavailableLock", new CountDownLatch(1)::await);
 
-		Thread thread = new Thread(() -> {
+		var thread = new Thread(() -> {
 			try {
 				new CompositeLock(asList(firstLock, secondLock, unavailableLock)).acquire();
 			}
@@ -76,14 +75,14 @@ void releasesLocksInReverseOrderWhenInterruptedDuringAcquire() throws Exception
 		thread.interrupt();
 		thread.join();
 
-		InOrder inOrder = inOrder(firstLock, secondLock);
+		var inOrder = inOrder(firstLock, secondLock);
 		inOrder.verify(secondLock).unlock();
 		inOrder.verify(firstLock).unlock();
 		verify(unavailableLock, never()).unlock();
 	}
 
 	private Lock mockLock(String name, Executable lockAction) throws InterruptedException {
-		Lock lock = mock(Lock.class, name);
+		var lock = mock(Lock.class, name);
 		doAnswer(invocation -> {
 			lockAction.execute();
 			return null;
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
index 010e8ae12b4f..c8db3d759403 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
@@ -42,7 +42,7 @@ void fixedStrategyCreatesValidConfiguration() {
 		when(configParams.get("fixed.parallelism")).thenReturn(Optional.of("42"));
 
 		ParallelExecutionConfigurationStrategy strategy = DefaultParallelExecutionConfigurationStrategy.FIXED;
-		ParallelExecutionConfiguration configuration = strategy.createConfiguration(configParams);
+		var configuration = strategy.createConfiguration(configParams);
 
 		assertThat(configuration.getParallelism()).isEqualTo(42);
 		assertThat(configuration.getCorePoolSize()).isEqualTo(42);
@@ -56,9 +56,9 @@ void dynamicStrategyCreatesValidConfiguration() {
 		when(configParams.get("dynamic.factor")).thenReturn(Optional.of("2.0"));
 
 		ParallelExecutionConfigurationStrategy strategy = DefaultParallelExecutionConfigurationStrategy.DYNAMIC;
-		ParallelExecutionConfiguration configuration = strategy.createConfiguration(configParams);
+		var configuration = strategy.createConfiguration(configParams);
 
-		int availableProcessors = Runtime.getRuntime().availableProcessors();
+		var availableProcessors = Runtime.getRuntime().availableProcessors();
 		assertThat(configuration.getParallelism()).isEqualTo(availableProcessors * 2);
 		assertThat(configuration.getCorePoolSize()).isEqualTo(availableProcessors * 2);
 		assertThat(configuration.getMinimumRunnable()).isEqualTo(availableProcessors * 2);
@@ -72,7 +72,7 @@ void customStrategyCreatesValidConfiguration() {
 			Optional.of(CustomParallelExecutionConfigurationStrategy.class.getName()));
 
 		ParallelExecutionConfigurationStrategy strategy = DefaultParallelExecutionConfigurationStrategy.CUSTOM;
-		ParallelExecutionConfiguration configuration = strategy.createConfiguration(configParams);
+		var configuration = strategy.createConfiguration(configParams);
 
 		assertThat(configuration.getParallelism()).isEqualTo(1);
 		assertThat(configuration.getCorePoolSize()).isEqualTo(4);
@@ -110,9 +110,9 @@ void dynamicStrategyUsesDefaultWhenPropertyIsNotPresent() {
 		when(configParams.get("dynamic.factor")).thenReturn(Optional.empty());
 
 		ParallelExecutionConfigurationStrategy strategy = DefaultParallelExecutionConfigurationStrategy.DYNAMIC;
-		ParallelExecutionConfiguration configuration = strategy.createConfiguration(configParams);
+		var configuration = strategy.createConfiguration(configParams);
 
-		int availableProcessors = Runtime.getRuntime().availableProcessors();
+		var availableProcessors = Runtime.getRuntime().availableProcessors();
 		assertThat(configuration.getParallelism()).isEqualTo(availableProcessors);
 		assertThat(configuration.getCorePoolSize()).isEqualTo(availableProcessors);
 		assertThat(configuration.getMinimumRunnable()).isEqualTo(availableProcessors);
@@ -149,7 +149,7 @@ void dynamicStrategyUsesAtLeastParallelismOfOneWhenPropertyIsTooSmall() {
 		when(configParams.get("dynamic.factor")).thenReturn(Optional.of("0.00000000001"));
 
 		ParallelExecutionConfigurationStrategy strategy = DefaultParallelExecutionConfigurationStrategy.DYNAMIC;
-		ParallelExecutionConfiguration configuration = strategy.createConfiguration(configParams);
+		var configuration = strategy.createConfiguration(configParams);
 
 		assertThat(configuration.getParallelism()).isEqualTo(1);
 		assertThat(configuration.getCorePoolSize()).isEqualTo(1);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
index 8e7031f5a612..aeac3287abad 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
@@ -32,13 +32,11 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.function.ThrowingConsumer;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.ExecutionRequest;
 import org.junit.platform.engine.TestDescriptor;
@@ -49,7 +47,6 @@
 import org.junit.platform.engine.support.hierarchical.Node.DynamicTestExecutor;
 import org.junit.platform.launcher.core.ConfigurationParametersFactoryForTests;
 import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -80,7 +77,7 @@ void init() {
 
 	private HierarchicalTestExecutor<MyEngineExecutionContext> createExecutor(
 			HierarchicalTestExecutorService executorService) {
-		ExecutionRequest request = new ExecutionRequest(root, listener, null);
+		var request = new ExecutionRequest(root, listener, null);
 		return new HierarchicalTestExecutor<>(request, rootContext, executorService,
 			OpenTest4JAwareThrowableCollector::new);
 	}
@@ -88,11 +85,11 @@ private HierarchicalTestExecutor<MyEngineExecutionContext> createExecutor(
 	@Test
 	void emptyRootDescriptor() throws Exception {
 
-		InOrder inOrder = inOrder(listener, root);
+		var inOrder = inOrder(listener, root);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(root).prepare(rootContext);
 		inOrder.verify(root).shouldBeSkipped(rootContext);
 		inOrder.verify(listener).executionStarted(root);
@@ -106,14 +103,14 @@ void emptyRootDescriptor() throws Exception {
 	@Test
 	void rootDescriptorWithOneChildContainer() throws Exception {
 
-		MyContainer child = spy(new MyContainer(UniqueId.root("container", "child container")));
+		var child = spy(new MyContainer(UniqueId.root("container", "child container")));
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(listener).executionStarted(root);
 		inOrder.verify(child).prepare(rootContext);
 		inOrder.verify(child).shouldBeSkipped(rootContext);
@@ -129,14 +126,14 @@ void rootDescriptorWithOneChildContainer() throws Exception {
 	@Test
 	void rootDescriptorWithOneChildLeaf() throws Exception {
 
-		MyLeaf child = spy(new MyLeaf(UniqueId.root("leaf", "child leaf")));
+		var child = spy(new MyLeaf(UniqueId.root("leaf", "child leaf")));
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> aTestExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var aTestExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(listener).executionStarted(root);
 		inOrder.verify(child).prepare(rootContext);
 		inOrder.verify(child).shouldBeSkipped(rootContext);
@@ -151,11 +148,11 @@ void rootDescriptorWithOneChildLeaf() throws Exception {
 	@Test
 	void skippingAContainer() throws Exception {
 
-		MyContainer child = spy(new MyContainer(UniqueId.root("container", "child container")));
+		var child = spy(new MyContainer(UniqueId.root("container", "child container")));
 		when(child.shouldBeSkipped(rootContext)).thenReturn(Node.SkipResult.skip("in test"));
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
@@ -173,11 +170,11 @@ void skippingAContainer() throws Exception {
 	@Test
 	void skippingALeaf() throws Exception {
 
-		MyLeaf child = spy(new MyLeaf(UniqueId.root("leaf", "child leaf")));
+		var child = spy(new MyLeaf(UniqueId.root("leaf", "child leaf")));
 		when(child.shouldBeSkipped(rootContext)).thenReturn(Node.SkipResult.skip("in test"));
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
@@ -195,16 +192,16 @@ void skippingALeaf() throws Exception {
 	@Test
 	void exceptionInShouldBeSkipped() throws Exception {
 
-		MyContainer child = spy(new MyContainer(UniqueId.root("container", "child container")));
-		RuntimeException anException = new RuntimeException("in skip");
+		var child = spy(new MyContainer(UniqueId.root("container", "child container")));
+		var anException = new RuntimeException("in skip");
 		when(child.shouldBeSkipped(rootContext)).thenThrow(anException);
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, child);
+		var inOrder = inOrder(listener, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(listener).executionStarted(root);
 		inOrder.verify(child).prepare(rootContext);
 		inOrder.verify(child).shouldBeSkipped(rootContext);
@@ -222,16 +219,16 @@ void exceptionInShouldBeSkipped() throws Exception {
 	@Test
 	void exceptionInContainerBeforeAll() throws Exception {
 
-		MyContainer child = spy(new MyContainer(UniqueId.root("container", "child container")));
+		var child = spy(new MyContainer(UniqueId.root("container", "child container")));
 		root.addChild(child);
-		RuntimeException anException = new RuntimeException("in test");
+		var anException = new RuntimeException("in test");
 		when(root.before(rootContext)).thenThrow(anException);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(root).prepare(rootContext);
 		inOrder.verify(root).shouldBeSkipped(rootContext);
 		inOrder.verify(listener).executionStarted(root);
@@ -248,17 +245,17 @@ void exceptionInContainerBeforeAll() throws Exception {
 	@Test
 	void exceptionInContainerAfterAllAndCleanUp() throws Exception {
 
-		MyLeaf child = spy(new MyLeaf(UniqueId.root("leaf", "child container")));
+		var child = spy(new MyLeaf(UniqueId.root("leaf", "child container")));
 		root.addChild(child);
-		RuntimeException afterException = new RuntimeException("in after()");
+		var afterException = new RuntimeException("in after()");
 		doThrow(afterException).when(root).after(rootContext);
-		RuntimeException cleanUpException = new RuntimeException("in cleanUp()");
+		var cleanUpException = new RuntimeException("in cleanUp()");
 		doThrow(cleanUpException).when(root).cleanUp(rootContext);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
-		InOrder inOrder = inOrder(listener, root, child);
+		var rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var inOrder = inOrder(listener, root, child);
 		inOrder.verify(root).prepare(rootContext);
 		inOrder.verify(root).shouldBeSkipped(rootContext);
 		inOrder.verify(listener).executionStarted(root);
@@ -278,13 +275,13 @@ void exceptionInContainerAfterAllAndCleanUp() throws Exception {
 
 	@Test
 	void exceptionInPrepare() throws Exception {
-		RuntimeException prepareException = new RuntimeException("in prepare()");
+		var prepareException = new RuntimeException("in prepare()");
 		doThrow(prepareException).when(root).prepare(rootContext);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
-		InOrder inOrder = inOrder(listener, root);
+		var rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var inOrder = inOrder(listener, root);
 		inOrder.verify(root).prepare(rootContext);
 		inOrder.verify(listener).executionStarted(root);
 		inOrder.verify(listener).executionFinished(eq(root), rootExecutionResult.capture());
@@ -297,13 +294,13 @@ void exceptionInPrepare() throws Exception {
 
 	@Test
 	void exceptionInCleanUp() throws Exception {
-		RuntimeException cleanUpException = new RuntimeException("in cleanUp()");
+		var cleanUpException = new RuntimeException("in cleanUp()");
 		doThrow(cleanUpException).when(root).cleanUp(rootContext);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
-		InOrder inOrder = inOrder(listener, root);
+		var rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var inOrder = inOrder(listener, root);
 		inOrder.verify(root).prepare(rootContext);
 		inOrder.verify(root).shouldBeSkipped(rootContext);
 		inOrder.verify(listener).executionStarted(root);
@@ -320,15 +317,15 @@ void exceptionInCleanUp() throws Exception {
 
 	@Test
 	void exceptionInShouldBeSkippedAndCleanUp() throws Exception {
-		RuntimeException shouldBeSkippedException = new RuntimeException("in prepare()");
+		var shouldBeSkippedException = new RuntimeException("in prepare()");
 		doThrow(shouldBeSkippedException).when(root).shouldBeSkipped(rootContext);
-		RuntimeException cleanUpException = new RuntimeException("in cleanUp()");
+		var cleanUpException = new RuntimeException("in cleanUp()");
 		doThrow(cleanUpException).when(root).cleanUp(rootContext);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
-		InOrder inOrder = inOrder(listener, root);
+		var rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var inOrder = inOrder(listener, root);
 		inOrder.verify(root).prepare(rootContext);
 		inOrder.verify(root).shouldBeSkipped(rootContext);
 		inOrder.verify(root).cleanUp(rootContext);
@@ -344,16 +341,16 @@ void exceptionInShouldBeSkippedAndCleanUp() throws Exception {
 	@Test
 	void exceptionInLeafExecute() throws Exception {
 
-		MyLeaf child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
-		RuntimeException anException = new RuntimeException("in test");
+		var child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
+		var anException = new RuntimeException("in test");
 		when(child.execute(eq(rootContext), any())).thenThrow(anException);
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(listener).executionStarted(root);
 		inOrder.verify(root).before(rootContext);
 		inOrder.verify(listener).executionStarted(child);
@@ -369,16 +366,16 @@ void exceptionInLeafExecute() throws Exception {
 	@Test
 	void abortInRootBeforeAll() throws Exception {
 
-		MyContainer child = spy(new MyContainer(UniqueId.root("container", "child container")));
+		var child = spy(new MyContainer(UniqueId.root("container", "child container")));
 		root.addChild(child);
-		TestAbortedException anAbortedException = new TestAbortedException("in BeforeAll");
+		var anAbortedException = new TestAbortedException("in BeforeAll");
 		when(root.before(rootContext)).thenThrow(anAbortedException);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var rootExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(root).prepare(rootContext);
 		inOrder.verify(root).shouldBeSkipped(rootContext);
 		inOrder.verify(listener).executionStarted(root);
@@ -395,16 +392,16 @@ void abortInRootBeforeAll() throws Exception {
 	@Test
 	void abortInChildContainerBeforeAll() throws Exception {
 
-		MyContainer child = spy(new MyContainer(UniqueId.root("container", "child container")));
+		var child = spy(new MyContainer(UniqueId.root("container", "child container")));
 		root.addChild(child);
-		TestAbortedException anAbortedException = new TestAbortedException("in BeforeAll");
+		var anAbortedException = new TestAbortedException("in BeforeAll");
 		when(child.before(rootContext)).thenThrow(anAbortedException);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 
 		inOrder.verify(root).prepare(rootContext);
 		inOrder.verify(root).shouldBeSkipped(rootContext);
@@ -425,16 +422,16 @@ void abortInChildContainerBeforeAll() throws Exception {
 	@Test
 	void abortInLeafExecute() throws Exception {
 
-		MyLeaf child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
-		TestAbortedException anAbortedException = new TestAbortedException("in test");
+		var child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
+		var anAbortedException = new TestAbortedException("in test");
 		when(child.execute(eq(rootContext), any())).thenThrow(anAbortedException);
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, root, child);
+		var inOrder = inOrder(listener, root, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(listener).executionStarted(root);
 		inOrder.verify(root).before(rootContext);
 		inOrder.verify(listener).executionStarted(child);
@@ -450,18 +447,18 @@ void abortInLeafExecute() throws Exception {
 	@Test
 	void executesDynamicTestDescriptors() throws Exception {
 
-		UniqueId leafUniqueId = UniqueId.root("leaf", "child leaf");
-		MyLeaf child = spy(new MyLeaf(leafUniqueId));
-		MyLeaf dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
+		var leafUniqueId = UniqueId.root("leaf", "child leaf");
+		var child = spy(new MyLeaf(leafUniqueId));
+		var dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
 
 		when(child.execute(any(), any())).thenAnswer(execute(dynamicTestDescriptor));
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, root, child, dynamicTestDescriptor);
+		var inOrder = inOrder(listener, root, child, dynamicTestDescriptor);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> aTestExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var aTestExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(listener).executionStarted(root);
 		inOrder.verify(child).prepare(rootContext);
 		inOrder.verify(child).shouldBeSkipped(rootContext);
@@ -483,11 +480,10 @@ void executesDynamicTestDescriptors() throws Exception {
 	@Test
 	void executesDynamicTestDescriptorsUsingContainerAndTestType() throws Exception {
 
-		MyContainerAndTestTestCase child = spy(
-			new MyContainerAndTestTestCase(root.getUniqueId().append("c&t", "child")));
-		MyContainerAndTestTestCase dynamicContainerAndTest = spy(
+		var child = spy(new MyContainerAndTestTestCase(root.getUniqueId().append("c&t", "child")));
+		var dynamicContainerAndTest = spy(
 			new MyContainerAndTestTestCase(child.getUniqueId().append("c&t", "dynamicContainerAndTest")));
-		MyLeaf dynamicLeaf = spy(new MyLeaf(dynamicContainerAndTest.getUniqueId().append("test", "dynamicLeaf")));
+		var dynamicLeaf = spy(new MyLeaf(dynamicContainerAndTest.getUniqueId().append("test", "dynamicLeaf")));
 
 		root.addChild(child);
 		when(child.execute(any(), any())).thenAnswer(execute(dynamicContainerAndTest));
@@ -496,11 +492,11 @@ void executesDynamicTestDescriptorsUsingContainerAndTestType() throws Exception
 			throw new AssertionError("test fails");
 		});
 
-		InOrder inOrder = inOrder(listener, root, child, dynamicContainerAndTest, dynamicLeaf);
+		var inOrder = inOrder(listener, root, child, dynamicContainerAndTest, dynamicLeaf);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> aTestExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var aTestExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(listener).executionStarted(root);
 
 		inOrder.verify(child).prepare(rootContext);
@@ -532,18 +528,18 @@ void executesDynamicTestDescriptorsUsingContainerAndTestType() throws Exception
 	@Test
 	void executesDynamicTestDescriptorsWithCustomListener() {
 
-		UniqueId leafUniqueId = UniqueId.root("leaf", "child leaf");
-		MyLeaf child = spy(new MyLeaf(leafUniqueId));
-		MyLeaf dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
+		var leafUniqueId = UniqueId.root("leaf", "child leaf");
+		var child = spy(new MyLeaf(leafUniqueId));
+		var dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
 		root.addChild(child);
 
-		EngineExecutionListener anotherListener = mock(EngineExecutionListener.class);
+		var anotherListener = mock(EngineExecutionListener.class);
 		when(child.execute(any(), any())).thenAnswer(
 			useDynamicTestExecutor(executor -> executor.execute(dynamicTestDescriptor, anotherListener)));
 
 		executor.execute();
 
-		InOrder inOrder = inOrder(listener, anotherListener, root, child, dynamicTestDescriptor);
+		var inOrder = inOrder(listener, anotherListener, root, child, dynamicTestDescriptor);
 		inOrder.verify(anotherListener).dynamicTestRegistered(dynamicTestDescriptor);
 		inOrder.verify(anotherListener).executionStarted(dynamicTestDescriptor);
 		inOrder.verify(dynamicTestDescriptor).execute(eq(rootContext), any());
@@ -554,16 +550,16 @@ void executesDynamicTestDescriptorsWithCustomListener() {
 	@Test
 	void canAbortExecutionOfDynamicChild() throws Exception {
 
-		UniqueId leafUniqueId = UniqueId.root("leaf", "child leaf");
-		MyLeaf child = spy(new MyLeaf(leafUniqueId));
-		MyLeaf dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
+		var leafUniqueId = UniqueId.root("leaf", "child leaf");
+		var child = spy(new MyLeaf(leafUniqueId));
+		var dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
 		root.addChild(child);
 
 		var startedLatch = new CountDownLatch(1);
 		var interrupted = new CompletableFuture<Boolean>();
 
 		when(child.execute(any(), any())).thenAnswer(useDynamicTestExecutor(executor -> {
-			Future<?> future = executor.execute(dynamicTestDescriptor, EngineExecutionListener.NOOP);
+			var future = executor.execute(dynamicTestDescriptor, EngineExecutionListener.NOOP);
 			startedLatch.await();
 			future.cancel(true);
 			executor.awaitFinished();
@@ -581,7 +577,7 @@ void canAbortExecutionOfDynamicChild() throws Exception {
 			}
 		});
 
-		ConfigurationParameters parameters = ConfigurationParametersFactoryForTests.create(Map.of(//
+		var parameters = ConfigurationParametersFactoryForTests.create(Map.of(//
 			DefaultParallelExecutionConfigurationStrategy.CONFIG_STRATEGY_PROPERTY_NAME, "fixed", //
 			DefaultParallelExecutionConfigurationStrategy.CONFIG_FIXED_PARALLELISM_PROPERTY_NAME, "2"));
 
@@ -610,8 +606,8 @@ private Answer<Object> useDynamicTestExecutor(ThrowingConsumer<DynamicTestExecut
 	 */
 	@Test
 	void outOfMemoryErrorInShouldBeSkipped() throws Exception {
-		MyContainer child = spy(new MyContainer(UniqueId.root("container", "child container")));
-		OutOfMemoryError outOfMemoryError = new OutOfMemoryError("in skip");
+		var child = spy(new MyContainer(UniqueId.root("container", "child container")));
+		var outOfMemoryError = new OutOfMemoryError("in skip");
 		when(child.shouldBeSkipped(rootContext)).thenThrow(outOfMemoryError);
 		root.addChild(child);
 
@@ -624,8 +620,8 @@ void outOfMemoryErrorInShouldBeSkipped() throws Exception {
 	 */
 	@Test
 	void outOfMemoryErrorInLeafExecution() {
-		MyLeaf child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
-		OutOfMemoryError outOfMemoryError = new OutOfMemoryError("in test");
+		var child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
+		var outOfMemoryError = new OutOfMemoryError("in test");
 		when(child.execute(eq(rootContext), any())).thenThrow(outOfMemoryError);
 		root.addChild(child);
 
@@ -636,18 +632,18 @@ void outOfMemoryErrorInLeafExecution() {
 	@Test
 	void exceptionInAfterDoesNotHideEarlierException() throws Exception {
 
-		MyLeaf child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
+		var child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
 		Exception exceptionInExecute = new RuntimeException("execute");
 		Exception exceptionInAfter = new RuntimeException("after");
 		doThrow(exceptionInExecute).when(child).execute(eq(rootContext), any());
 		doThrow(exceptionInAfter).when(child).after(eq(rootContext));
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, child);
+		var inOrder = inOrder(listener, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(child).execute(eq(rootContext), any());
 		inOrder.verify(child).after(eq(rootContext));
 		inOrder.verify(listener).executionFinished(eq(child), childExecutionResult.capture());
@@ -660,9 +656,9 @@ void exceptionInAfterDoesNotHideEarlierException() throws Exception {
 	@Test
 	void dynamicTestDescriptorsMustNotDeclareExclusiveResources() {
 
-		UniqueId leafUniqueId = UniqueId.root("leaf", "child leaf");
-		MyLeaf child = spy(new MyLeaf(leafUniqueId));
-		MyLeaf dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
+		var leafUniqueId = UniqueId.root("leaf", "child leaf");
+		var child = spy(new MyLeaf(leafUniqueId));
+		var dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
 		when(dynamicTestDescriptor.getExclusiveResources()).thenReturn(
 			singleton(new ExclusiveResource("foo", LockMode.READ)));
 
@@ -671,11 +667,11 @@ void dynamicTestDescriptorsMustNotDeclareExclusiveResources() {
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> aTestExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var aTestExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		verify(listener).executionStarted(dynamicTestDescriptor);
 		verify(listener).executionFinished(eq(dynamicTestDescriptor), aTestExecutionResult.capture());
 
-		TestExecutionResult executionResult = aTestExecutionResult.getValue();
+		var executionResult = aTestExecutionResult.getValue();
 		assertThat(executionResult.getStatus()).isEqualTo(FAILED);
 		assertThat(executionResult.getThrowable()).isPresent();
 		assertThat(executionResult.getThrowable().get()).hasMessageContaining(
@@ -685,18 +681,18 @@ void dynamicTestDescriptorsMustNotDeclareExclusiveResources() {
 	@Test
 	void exceptionInAfterIsReportedInsteadOfEarlierTestAbortedException() throws Exception {
 
-		MyLeaf child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
+		var child = spy(new MyLeaf(UniqueId.root("leaf", "leaf")));
 		Exception exceptionInExecute = new TestAbortedException("execute");
 		Exception exceptionInAfter = new RuntimeException("after");
 		doThrow(exceptionInExecute).when(child).execute(eq(rootContext), any());
 		doThrow(exceptionInAfter).when(child).after(eq(rootContext));
 		root.addChild(child);
 
-		InOrder inOrder = inOrder(listener, child);
+		var inOrder = inOrder(listener, child);
 
 		executor.execute();
 
-		ArgumentCaptor<TestExecutionResult> childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
+		var childExecutionResult = ArgumentCaptor.forClass(TestExecutionResult.class);
 		inOrder.verify(child).execute(eq(rootContext), any());
 		inOrder.verify(child).after(eq(rootContext));
 		inOrder.verify(listener).executionFinished(eq(child), childExecutionResult.capture());
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
index 061a3945a072..25e359e2ed0d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
@@ -40,7 +40,7 @@ class LockManagerTests {
 	void returnsNopLockWithoutExclusiveResources() {
 		Collection<ExclusiveResource> resources = emptySet();
 
-		List<Lock> locks = getLocks(resources, NopLock.class);
+		var locks = getLocks(resources, NopLock.class);
 
 		assertThat(locks).isEmpty();
 	}
@@ -49,7 +49,7 @@ void returnsNopLockWithoutExclusiveResources() {
 	void returnsSingleLockForSingleExclusiveResource() {
 		Collection<ExclusiveResource> resources = singleton(new ExclusiveResource("foo", READ));
 
-		List<Lock> locks = getLocks(resources, SingleLock.class);
+		var locks = getLocks(resources, SingleLock.class);
 
 		assertThat(locks).hasSize(1);
 		assertThat(locks.get(0)).isInstanceOf(ReadLock.class);
@@ -61,7 +61,7 @@ void returnsCompositeLockForMultipleDifferentExclusiveResources() {
 			new ExclusiveResource("a", READ), //
 			new ExclusiveResource("b", READ_WRITE));
 
-		List<Lock> locks = getLocks(resources, CompositeLock.class);
+		var locks = getLocks(resources, CompositeLock.class);
 
 		assertThat(locks).hasSize(2);
 		assertThat(locks.get(0)).isInstanceOf(ReadLock.class);
@@ -72,8 +72,8 @@ void returnsCompositeLockForMultipleDifferentExclusiveResources() {
 	void reusesSameLockForExclusiveResourceWithSameKey() {
 		Collection<ExclusiveResource> resources = singleton(new ExclusiveResource("foo", READ));
 
-		List<Lock> locks1 = getLocks(resources, SingleLock.class);
-		List<Lock> locks2 = getLocks(resources, SingleLock.class);
+		var locks1 = getLocks(resources, SingleLock.class);
+		var locks2 = getLocks(resources, SingleLock.class);
 
 		assertThat(locks1).hasSize(1);
 		assertThat(locks2).hasSize(1);
@@ -88,7 +88,7 @@ void returnsWriteLockForExclusiveResourceWithBothLockModes() {
 			new ExclusiveResource("foo", READ_WRITE), //
 			new ExclusiveResource("bar", READ_WRITE));
 
-		List<Lock> locks = getLocks(resources, CompositeLock.class);
+		var locks = getLocks(resources, CompositeLock.class);
 
 		assertThat(locks).hasSize(2);
 		assertThat(locks.get(0)).isInstanceOf(WriteLock.class);
@@ -104,7 +104,7 @@ void globalLockComesFirst(LockMode globalLockMode) {
 			new ExclusiveResource(GLOBAL_KEY, globalLockMode), //
 			new ExclusiveResource("bar", READ_WRITE));
 
-		List<Lock> locks = getLocks(resources, CompositeLock.class);
+		var locks = getLocks(resources, CompositeLock.class);
 
 		assertThat(locks).hasSize(4);
 		assertThat(locks.get(0)).isEqualTo(getSingleLock(GLOBAL_KEY, globalLockMode));
@@ -118,7 +118,7 @@ private Lock getSingleLock(String globalResourceLockKey, LockMode read) {
 	}
 
 	private List<Lock> getLocks(Collection<ExclusiveResource> resources, Class<? extends ResourceLock> type) {
-		ResourceLock lock = lockManager.getLockForResources(resources);
+		var lock = lockManager.getLockForResources(resources);
 		assertThat(lock).isInstanceOf(type);
 		return ResourceLockSupport.getLocks(lock);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
index 0b89ce795271..63ad8e7a60aa 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
@@ -20,7 +20,6 @@
 import static org.junit.platform.engine.support.hierarchical.Node.ExecutionMode.SAME_THREAD;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.function.Function;
@@ -31,7 +30,6 @@
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
-import org.junit.platform.launcher.LauncherDiscoveryRequest;
 
 /**
  * @since 1.3
@@ -43,65 +41,65 @@ class NodeTreeWalkerIntegrationTests {
 
 	@Test
 	void pullUpExclusiveChildResourcesToTestClass() {
-		TestDescriptor engineDescriptor = discover(TestCaseWithResourceLock.class);
+		var engineDescriptor = discover(TestCaseWithResourceLock.class);
 
-		NodeExecutionAdvisor advisor = nodeTreeWalker.walk(engineDescriptor);
+		var advisor = nodeTreeWalker.walk(engineDescriptor);
 
-		TestDescriptor testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
 				.isEqualTo(List.of(getReadWriteLock("a"), getReadWriteLock("b")));
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()).isEqualTo(emptyList());
 		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).contains(SAME_THREAD);
 	}
 
 	@Test
 	void leavesResourceLockOnTestMethodWhenClassDoesNotUseResource() {
-		TestDescriptor engineDescriptor = discover(TestCaseWithoutResourceLock.class);
+		var engineDescriptor = discover(TestCaseWithoutResourceLock.class);
 
-		NodeExecutionAdvisor advisor = nodeTreeWalker.walk(engineDescriptor);
+		var advisor = nodeTreeWalker.walk(engineDescriptor);
 
-		TestDescriptor testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
 				.isEqualTo(List.of(getLock(GLOBAL_READ)));
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
 		assertThat(testClassDescriptor.getChildren()).hasSize(2);
-		Iterator<? extends TestDescriptor> children = testClassDescriptor.getChildren().iterator();
-		TestDescriptor testMethodDescriptor = children.next();
+		var children = testClassDescriptor.getChildren().iterator();
+		var testMethodDescriptor = children.next();
 		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()) //
 				.isEqualTo(List.of(getReadWriteLock("a")));
 		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).isEmpty();
 
-		TestDescriptor nestedTestClassDescriptor = children.next();
+		var nestedTestClassDescriptor = children.next();
 		assertThat(advisor.getResourceLock(nestedTestClassDescriptor)).extracting(allLocks()) //
 				.isEqualTo(List.of(getReadWriteLock("b"), getReadWriteLock("c")));
 		assertThat(advisor.getForcedExecutionMode(nestedTestClassDescriptor)).isEmpty();
 
-		TestDescriptor nestedTestMethodDescriptor = getOnlyElement(nestedTestClassDescriptor.getChildren());
+		var nestedTestMethodDescriptor = getOnlyElement(nestedTestClassDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(nestedTestMethodDescriptor)).extracting(allLocks()).isEqualTo(emptyList());
 		assertThat(advisor.getForcedExecutionMode(nestedTestMethodDescriptor)).contains(SAME_THREAD);
 	}
 
 	@Test
 	void coarsensGlobalLockToEngineDescriptorChild() {
-		TestDescriptor engineDescriptor = discover(TestCaseWithGlobalLockRequiringChild.class);
+		var engineDescriptor = discover(TestCaseWithGlobalLockRequiringChild.class);
 
-		NodeExecutionAdvisor advisor = nodeTreeWalker.walk(engineDescriptor);
+		var advisor = nodeTreeWalker.walk(engineDescriptor);
 
-		TestDescriptor testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
 				.isEqualTo(List.of(getLock(GLOBAL_READ_WRITE)));
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
-		TestDescriptor nestedTestClassDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		var nestedTestClassDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(nestedTestClassDescriptor)).extracting(allLocks()) //
 				.isEqualTo(List.of(getLock(GLOBAL_READ)));
 		assertThat(advisor.getForcedExecutionMode(nestedTestClassDescriptor)).contains(SAME_THREAD);
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(nestedTestClassDescriptor.getChildren());
+		var testMethodDescriptor = getOnlyElement(nestedTestClassDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()) //
 				.isEqualTo(List.of(getLock(GLOBAL_READ_WRITE)));
 		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).contains(SAME_THREAD);
@@ -120,7 +118,7 @@ private Lock getLock(ExclusiveResource exclusiveResource) {
 	}
 
 	private TestDescriptor discover(Class<?> testClass) {
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(selectClass(testClass)).build();
+		var discoveryRequest = request().selectors(selectClass(testClass)).build();
 		return new JupiterTestEngine().discover(discoveryRequest, UniqueId.forEngine("junit-jupiter"));
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
index bbc550c649f5..c32d73105ee1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
@@ -67,7 +67,6 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.engine.reporting.ReportEntry;
-import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.junit.platform.testkit.engine.Event;
@@ -79,10 +78,10 @@ class ParallelExecutionIntegrationTests {
 
 	@Test
 	void successfulParallelTest(TestReporter reporter) {
-		List<Event> events = executeConcurrently(3, SuccessfulParallelTestCase.class);
+		var events = executeConcurrently(3, SuccessfulParallelTestCase.class);
 
-		List<Instant> startedTimestamps = getTimestampsFor(events, event(test(), started()));
-		List<Instant> finishedTimestamps = getTimestampsFor(events, event(test(), finishedSuccessfully()));
+		var startedTimestamps = getTimestampsFor(events, event(test(), started()));
+		var finishedTimestamps = getTimestampsFor(events, event(test(), finishedSuccessfully()));
 		reporter.publishEntry("startedTimestamps", startedTimestamps.toString());
 		reporter.publishEntry("finishedTimestamps", finishedTimestamps.toString());
 
@@ -95,13 +94,13 @@ void successfulParallelTest(TestReporter reporter) {
 
 	@Test
 	void failingTestWithoutLock() {
-		List<Event> events = executeConcurrently(3, FailingWithoutLockTestCase.class);
+		var events = executeConcurrently(3, FailingWithoutLockTestCase.class);
 		assertThat(events.stream().filter(event(test(), finishedWithFailure())::matches)).hasSize(2);
 	}
 
 	@Test
 	void successfulTestWithMethodLock() {
-		List<Event> events = executeConcurrently(3, SuccessfulWithMethodLockTestCase.class);
+		var events = executeConcurrently(3, SuccessfulWithMethodLockTestCase.class);
 
 		assertThat(events.stream().filter(event(test(), finishedSuccessfully())::matches)).hasSize(3);
 		assertThat(ThreadReporter.getThreadNames(events)).hasSize(3);
@@ -109,7 +108,7 @@ void successfulTestWithMethodLock() {
 
 	@Test
 	void successfulTestWithClassLock() {
-		List<Event> events = executeConcurrently(3, SuccessfulWithClassLockTestCase.class);
+		var events = executeConcurrently(3, SuccessfulWithClassLockTestCase.class);
 
 		assertThat(events.stream().filter(event(test(), finishedSuccessfully())::matches)).hasSize(3);
 		assertThat(ThreadReporter.getThreadNames(events)).hasSize(1);
@@ -117,7 +116,7 @@ void successfulTestWithClassLock() {
 
 	@Test
 	void testCaseWithFactory() {
-		List<Event> events = executeConcurrently(3, TestCaseWithTestFactory.class);
+		var events = executeConcurrently(3, TestCaseWithTestFactory.class);
 
 		assertThat(events.stream().filter(event(test(), finishedSuccessfully())::matches)).hasSize(3);
 		assertThat(ThreadReporter.getThreadNames(events)).hasSize(1);
@@ -143,7 +142,7 @@ void customContextClassLoader() {
 
 	@RepeatedTest(10)
 	void mixingClassAndMethodLevelLocks() {
-		List<Event> events = executeConcurrently(4, TestCaseWithSortedLocks.class, TestCaseWithUnsortedLocks.class);
+		var events = executeConcurrently(4, TestCaseWithSortedLocks.class, TestCaseWithUnsortedLocks.class);
 
 		assertThat(events.stream().filter(event(test(), finishedSuccessfully())::matches)).hasSize(6);
 		assertThat(ThreadReporter.getThreadNames(events).count()).isLessThanOrEqualTo(2);
@@ -151,7 +150,7 @@ void mixingClassAndMethodLevelLocks() {
 
 	@RepeatedTest(10)
 	void locksOnNestedTests() {
-		List<Event> events = executeConcurrently(3, TestCaseWithNestedLocks.class);
+		var events = executeConcurrently(3, TestCaseWithNestedLocks.class);
 
 		assertThat(events.stream().filter(event(test(), finishedSuccessfully())::matches)).hasSize(6);
 		assertThat(ThreadReporter.getThreadNames(events)).hasSize(1);
@@ -159,10 +158,10 @@ void locksOnNestedTests() {
 
 	@Test
 	void afterHooksAreCalledAfterConcurrentDynamicTestsAreFinished() {
-		List<Event> events = executeConcurrently(3, ConcurrentDynamicTestCase.class);
+		var events = executeConcurrently(3, ConcurrentDynamicTestCase.class);
 
 		assertThat(events.stream().filter(event(test(), finishedSuccessfully())::matches)).hasSize(1);
-		Map<String, Instant> timestampedEvents = ConcurrentDynamicTestCase.events;
+		var timestampedEvents = ConcurrentDynamicTestCase.events;
 		assertThat(timestampedEvents.get("afterEach")).isAfterOrEqualTo(timestampedEvents.get("dynamicTestFinished"));
 	}
 
@@ -172,14 +171,14 @@ void afterHooksAreCalledAfterConcurrentDynamicTestsAreFinished() {
 	 */
 	@Test
 	void threadInterruptedByUserCode() {
-		List<Event> events = executeConcurrently(3, InterruptedThreadTestCase.class);
+		var events = executeConcurrently(3, InterruptedThreadTestCase.class);
 
 		assertThat(events.stream().filter(event(test(), finishedSuccessfully())::matches)).hasSize(4);
 	}
 
 	@Test
 	void executesTestTemplatesWithResourceLocksInSameThread() {
-		List<Event> events = executeConcurrently(2, ConcurrentTemplateTestCase.class);
+		var events = executeConcurrently(2, ConcurrentTemplateTestCase.class);
 
 		assertThat(events.stream().filter(event(test(), finishedSuccessfully())::matches)).hasSize(10);
 		assertThat(ThreadReporter.getThreadNames(events)).hasSize(1);
@@ -195,11 +194,11 @@ void executesClassesInParallelIfEnabledViaConfigurationParameter() {
 
 		results.testEvents().assertStatistics(stats -> stats.succeeded(9));
 		assertThat(ThreadReporter.getThreadNames(results.allEvents().list())).hasSize(3);
-		TestDescriptor testClassA = findFirstTestDescriptor(results, container(ParallelClassesTestCaseA.class));
+		var testClassA = findFirstTestDescriptor(results, container(ParallelClassesTestCaseA.class));
 		assertThat(ThreadReporter.getThreadNames(getEventsOfChildren(results, testClassA))).hasSize(1);
-		TestDescriptor testClassB = findFirstTestDescriptor(results, container(ParallelClassesTestCaseB.class));
+		var testClassB = findFirstTestDescriptor(results, container(ParallelClassesTestCaseB.class));
 		assertThat(ThreadReporter.getThreadNames(getEventsOfChildren(results, testClassB))).hasSize(1);
-		TestDescriptor testClassC = findFirstTestDescriptor(results, container(ParallelClassesTestCaseC.class));
+		var testClassC = findFirstTestDescriptor(results, container(ParallelClassesTestCaseC.class));
 		assertThat(ThreadReporter.getThreadNames(getEventsOfChildren(results, testClassC))).hasSize(1);
 	}
 
@@ -215,11 +214,11 @@ void executesMethodsInParallelIfEnabledViaConfigurationParameter() {
 
 		results.testEvents().assertStatistics(stats -> stats.succeeded(9));
 		assertThat(ThreadReporter.getThreadNames(results.allEvents().list())).hasSizeGreaterThanOrEqualTo(3);
-		TestDescriptor testClassA = findFirstTestDescriptor(results, container(ParallelMethodsTestCaseA.class));
+		var testClassA = findFirstTestDescriptor(results, container(ParallelMethodsTestCaseA.class));
 		assertThat(ThreadReporter.getThreadNames(getEventsOfChildren(results, testClassA))).hasSize(3);
-		TestDescriptor testClassB = findFirstTestDescriptor(results, container(ParallelMethodsTestCaseB.class));
+		var testClassB = findFirstTestDescriptor(results, container(ParallelMethodsTestCaseB.class));
 		assertThat(ThreadReporter.getThreadNames(getEventsOfChildren(results, testClassB))).hasSize(3);
-		TestDescriptor testClassC = findFirstTestDescriptor(results, container(ParallelMethodsTestCaseC.class));
+		var testClassC = findFirstTestDescriptor(results, container(ParallelMethodsTestCaseC.class));
 		assertThat(ThreadReporter.getThreadNames(getEventsOfChildren(results, testClassC))).hasSize(3);
 	}
 
@@ -372,7 +371,7 @@ private List<Event> executeConcurrently(int parallelism, Class<?>... testClasses
 	private EngineExecutionResults executeWithFixedParallelism(int parallelism, Map<String, String> configParams,
 			Class<?>... testClasses) {
 		// @formatter:off
-		LauncherDiscoveryRequest discoveryRequest = request()
+		var discoveryRequest = request()
 				.selectors(Arrays.stream(testClasses).map(DiscoverySelectors::selectClass).collect(toList()))
 				.configurationParameter(PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, String.valueOf(true))
 				.configurationParameter(PARALLEL_CONFIG_STRATEGY_PROPERTY_NAME, "fixed")
@@ -505,8 +504,8 @@ static class TestCaseWithTestFactory {
 		@TestFactory
 		@Execution(SAME_THREAD)
 		Stream<DynamicTest> testFactory(TestReporter testReporter) {
-			AtomicInteger sharedResource = new AtomicInteger(0);
-			CountDownLatch countDownLatch = new CountDownLatch(3);
+			var sharedResource = new AtomicInteger(0);
+			var countDownLatch = new CountDownLatch(3);
 			return IntStream.range(0, 3).mapToObj(i -> dynamicTest("test " + i, () -> {
 				incrementBlockAndCheck(sharedResource, countDownLatch);
 				testReporter.publishEntry("thread", Thread.currentThread().getName());
@@ -759,13 +758,13 @@ static class ParallelMethodsTestCaseC extends ParallelMethodsTestCase {
 
 	private static void incrementBlockAndCheck(AtomicInteger sharedResource, CountDownLatch countDownLatch)
 			throws InterruptedException {
-		int value = incrementAndBlock(sharedResource, countDownLatch);
+		var value = incrementAndBlock(sharedResource, countDownLatch);
 		assertEquals(value, sharedResource.get());
 	}
 
 	private static int incrementAndBlock(AtomicInteger sharedResource, CountDownLatch countDownLatch)
 			throws InterruptedException {
-		int value = sharedResource.incrementAndGet();
+		var value = sharedResource.incrementAndGet();
 		countDownLatch.countDown();
 		countDownLatch.await(100, MILLISECONDS);
 		return value;
@@ -773,7 +772,7 @@ private static int incrementAndBlock(AtomicInteger sharedResource, CountDownLatc
 
 	private static void storeAndBlockAndCheck(AtomicInteger sharedResource, CountDownLatch countDownLatch)
 			throws InterruptedException {
-		int value = sharedResource.get();
+		var value = sharedResource.get();
 		countDownLatch.countDown();
 		countDownLatch.await(100, MILLISECONDS);
 		assertEquals(value, sharedResource.get());
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
index 9db0402d8b8e..c0fa0b930cd3 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
@@ -25,7 +25,7 @@ class SingleLockTests {
 	@Test
 	@SuppressWarnings("resource")
 	void acquire() throws Exception {
-		ReentrantLock lock = new ReentrantLock();
+		var lock = new ReentrantLock();
 
 		new SingleLock(lock).acquire();
 
@@ -35,7 +35,7 @@ void acquire() throws Exception {
 	@Test
 	@SuppressWarnings("resource")
 	void release() throws Exception {
-		ReentrantLock lock = new ReentrantLock();
+		var lock = new ReentrantLock();
 
 		new SingleLock(lock).acquire().close();
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
index 5b83a311a426..6b9daa061f18 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
@@ -19,7 +19,6 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.engine.TestExecutionResult;
 import org.opentest4j.TestAbortedException;
 
 /**
@@ -30,7 +29,7 @@ class SingleTestExecutorTests {
 
 	@Test
 	void executeSafelySuccessful() {
-		TestExecutionResult result = new SingleTestExecutor().executeSafely(() -> {
+		var result = new SingleTestExecutor().executeSafely(() -> {
 		});
 
 		assertEquals(SUCCESSFUL, result.getStatus());
@@ -39,9 +38,9 @@ void executeSafelySuccessful() {
 
 	@Test
 	void executeSafelyAborted() {
-		TestAbortedException testAbortedException = new TestAbortedException("assumption violated");
+		var testAbortedException = new TestAbortedException("assumption violated");
 
-		TestExecutionResult result = new SingleTestExecutor().executeSafely(() -> {
+		var result = new SingleTestExecutor().executeSafely(() -> {
 			throw testAbortedException;
 		});
 
@@ -51,9 +50,9 @@ void executeSafelyAborted() {
 
 	@Test
 	void executeSafelyFailed() {
-		AssertionError assertionError = new AssertionError("assumption violated");
+		var assertionError = new AssertionError("assumption violated");
 
-		TestExecutionResult result = new SingleTestExecutor().executeSafely(() -> {
+		var result = new SingleTestExecutor().executeSafely(() -> {
 			throw assertionError;
 		});
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
index 7f80d6c5e004..a7b9e34c4b3c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
@@ -19,7 +19,6 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.engine.TestExecutionResult;
 
 /**
  * @since 1.6
@@ -28,10 +27,10 @@ class ThrowableCollectorTests {
 
 	@Test
 	void successfulExecution() {
-		ThrowableCollector collector = new ThrowableCollector(x -> true);
+		var collector = new ThrowableCollector(x -> true);
 		collector.execute(() -> {
 		});
-		TestExecutionResult result = collector.toTestExecutionResult();
+		var result = collector.toTestExecutionResult();
 
 		assertEquals(SUCCESSFUL, result.getStatus());
 		assertEquals(Optional.empty(), result.getThrowable());
@@ -39,13 +38,13 @@ void successfulExecution() {
 
 	@Test
 	void abortedExecution() {
-		CustomAbort customAbort = new CustomAbort();
+		var customAbort = new CustomAbort();
 
-		ThrowableCollector collector = new ThrowableCollector(CustomAbort.class::isInstance);
+		var collector = new ThrowableCollector(CustomAbort.class::isInstance);
 		collector.execute(() -> {
 			throw customAbort;
 		});
-		TestExecutionResult result = collector.toTestExecutionResult();
+		var result = collector.toTestExecutionResult();
 
 		assertEquals(ABORTED, result.getStatus());
 		assertSame(customAbort, result.getThrowable().get());
@@ -53,13 +52,13 @@ void abortedExecution() {
 
 	@Test
 	void failedExecution() {
-		AssertionError assertionError = new AssertionError("assertion violated");
+		var assertionError = new AssertionError("assertion violated");
 
-		ThrowableCollector collector = new ThrowableCollector(CustomAbort.class::isInstance);
+		var collector = new ThrowableCollector(CustomAbort.class::isInstance);
 		collector.execute(() -> {
 			throw assertionError;
 		});
-		TestExecutionResult result = collector.toTestExecutionResult();
+		var result = collector.toTestExecutionResult();
 
 		assertEquals(FAILED, result.getStatus());
 		assertSame(assertionError, result.getThrowable().get());
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
index 66fe9ebdc2a2..1880936bbe20 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
@@ -61,8 +61,7 @@ void includeTagsWithInvalidSyntax() {
 	}
 
 	private void assertSyntaxViolationForIncludes(String tag) {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> includeTags(tag));
+		var exception = assertThrows(PreconditionViolationException.class, () -> includeTags(tag));
 		assertThat(exception).hasMessageStartingWith("Unable to parse tag expression");
 	}
 
@@ -79,8 +78,7 @@ void excludeTagsWithInvalidSyntax() {
 	}
 
 	private void assertSyntaxViolationForExcludes(String tag) {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> excludeTags(tag));
+		var exception = assertThrows(PreconditionViolationException.class, () -> excludeTags(tag));
 		assertThat(exception).hasMessageStartingWith("Unable to parse tag expression");
 	}
 
@@ -96,7 +94,7 @@ void includeSingleTagAndWhitespace() {
 
 	@Test
 	void includeMultipleTags() {
-		PostDiscoveryFilter filter = includeTags("tag1", "  tag2  ");
+		var filter = includeTags("tag1", "  tag2  ");
 
 		assertTrue(filter.apply(classWithBothTags).included());
 		assertTrue(filter.apply(classWithTag1).included());
@@ -119,22 +117,22 @@ void excludeSingleTagAndWhitespace() {
 
 	@Test
 	void excludeMultipleTags() {
-		PostDiscoveryFilter filter = excludeTags("tag1", "  tag2  ");
+		var filter = excludeTags("tag1", "  tag2  ");
 
-		String exclusionReason = "excluded because tags match tag expression(s): [tag1,tag2]";
+		var exclusionReason = "excluded because tags match tag expression(s): [tag1,tag2]";
 		assertExcluded(filter.apply(classWithTag1), exclusionReason);
 		assertExcluded(filter.apply(classWithTag1AndSurroundingWhitespace), exclusionReason);
 		assertExcluded(filter.apply(classWithBothTags), exclusionReason);
 		assertExcluded(filter.apply(classWithTag2), exclusionReason);
 
-		String inclusionReason = "included because tags do not match expression(s): [tag1,tag2]";
+		var inclusionReason = "included because tags do not match expression(s): [tag1,tag2]";
 		assertIncluded(filter.apply(classWithDifferentTags), inclusionReason);
 		assertIncluded(filter.apply(classWithNoTags), inclusionReason);
 	}
 
 	@Test
 	void rejectSingleUnparsableTagExpressions() {
-		String brokenTagExpression = "tag & ";
+		var brokenTagExpression = "tag & ";
 		RuntimeException expected = assertThrows(PreconditionViolationException.class,
 			() -> TagFilter.includeTags(brokenTagExpression));
 		assertThat(expected).hasMessageStartingWith("Unable to parse tag expression \"" + brokenTagExpression + "\"");
@@ -142,31 +140,31 @@ void rejectSingleUnparsableTagExpressions() {
 
 	@Test
 	void rejectUnparsableTagExpressionFromArray() {
-		String brokenTagExpression = "tag & ";
+		var brokenTagExpression = "tag & ";
 		RuntimeException expected = assertThrows(PreconditionViolationException.class,
 			() -> TagFilter.excludeTags(brokenTagExpression, "foo", "bar"));
 		assertThat(expected).hasMessageStartingWith("Unable to parse tag expression \"" + brokenTagExpression + "\"");
 	}
 
 	private void includeSingleTag(PostDiscoveryFilter filter) {
-		String inclusionReason = "included because tags match expression(s): [tag1]";
+		var inclusionReason = "included because tags match expression(s): [tag1]";
 		assertIncluded(filter.apply(classWithTag1), inclusionReason);
 		assertIncluded(filter.apply(classWithTag1AndSurroundingWhitespace), inclusionReason);
 		assertIncluded(filter.apply(classWithBothTags), inclusionReason);
 
-		String exclusionReason = "excluded because tags do not match tag expression(s): [tag1]";
+		var exclusionReason = "excluded because tags do not match tag expression(s): [tag1]";
 		assertExcluded(filter.apply(classWithTag2), exclusionReason);
 		assertExcluded(filter.apply(classWithDifferentTags), exclusionReason);
 		assertExcluded(filter.apply(classWithNoTags), exclusionReason);
 	}
 
 	private void excludeSingleTag(PostDiscoveryFilter filter) {
-		String exclusionReason = "excluded because tags match tag expression(s): [tag1]";
+		var exclusionReason = "excluded because tags match tag expression(s): [tag1]";
 		assertExcluded(filter.apply(classWithTag1), exclusionReason);
 		assertExcluded(filter.apply(classWithTag1AndSurroundingWhitespace), exclusionReason);
 		assertExcluded(filter.apply(classWithBothTags), exclusionReason);
 
-		String inclusionReason = "included because tags do not match expression(s): [tag1]";
+		var inclusionReason = "included because tags do not match expression(s): [tag1]";
 		assertIncluded(filter.apply(classWithTag2), inclusionReason);
 		assertIncluded(filter.apply(classWithDifferentTags), inclusionReason);
 		assertIncluded(filter.apply(classWithNoTags), inclusionReason);
@@ -221,7 +219,7 @@ private static class ClassWithNoTags {
 	}
 
 	private static TestDescriptor classTestDescriptor(String uniqueId, Class<?> testClass) {
-		UniqueId rootUniqueId = UniqueId.root("class", uniqueId);
+		var rootUniqueId = UniqueId.root("class", uniqueId);
 		return new DemoClassTestDescriptor(rootUniqueId, testClass);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
index c2f94557452a..8eacd6eecf57 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
@@ -32,7 +32,7 @@ class TestIdentifierTests {
 	@Test
 	void inheritsIdAndNamesFromDescriptor() {
 		TestDescriptor testDescriptor = new TestDescriptorStub(UniqueId.root("aType", "uniqueId"), "displayName");
-		TestIdentifier testIdentifier = TestIdentifier.from(testDescriptor);
+		var testIdentifier = TestIdentifier.from(testDescriptor);
 
 		assertEquals("[aType:uniqueId]", testIdentifier.getUniqueId());
 		assertEquals("displayName", testIdentifier.getDisplayName());
@@ -41,7 +41,7 @@ void inheritsIdAndNamesFromDescriptor() {
 	@Test
 	void inheritsTypeFromDescriptor() {
 		TestDescriptor descriptor = new TestDescriptorStub(UniqueId.root("aType", "uniqueId"), "displayName");
-		TestIdentifier identifier = TestIdentifier.from(descriptor);
+		var identifier = TestIdentifier.from(descriptor);
 		assertEquals(TestDescriptor.Type.TEST, identifier.getType());
 		assertTrue(identifier.isTest());
 		assertFalse(identifier.isContainer());
@@ -55,7 +55,7 @@ void inheritsTypeFromDescriptor() {
 
 	@Test
 	void serialization() throws Exception {
-		TestIdentifier identifier = serializeAndDeserialize(//
+		var identifier = serializeAndDeserialize(//
 			new TestIdentifier("uniqueId", "displayName", ClassSource.from(TestIdentifierTests.class),
 				singleton(TestTag.create("aTag")), TestDescriptor.Type.TEST, "parentId", "reportingName"));
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
index 0284ee93ccd6..33844ba6ceb0 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
@@ -32,7 +32,7 @@ public Type getType() {
 				}
 			});
 
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
 		assertThat(testPlan.containsTests()).as("contains tests").isFalse();
 	}
@@ -47,7 +47,7 @@ public Type getType() {
 				}
 			});
 
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
 		assertThat(testPlan.containsTests()).as("contains tests").isTrue();
 	}
@@ -67,7 +67,7 @@ public boolean mayRegisterTests() {
 				}
 			});
 
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
 		assertThat(testPlan.containsTests()).as("contains tests").isTrue();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
index 8730fce6b667..c2941901e504 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
@@ -17,7 +17,7 @@
 public class TestPostDiscoveryTagFilter implements PostDiscoveryFilter {
 	@Override
 	public FilterResult apply(final TestDescriptor object) {
-		boolean include = object.getTags().stream().map(TestTag::getName).anyMatch("test-post-discovery"::equals);
+		var include = object.getTags().stream().map(TestTag::getName).anyMatch("test-post-discovery"::equals);
 		return FilterResult.includedIf(include);
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 5a1f49960103..282faaa595a9 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -33,8 +33,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.lang.reflect.Constructor;
-import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
@@ -46,9 +44,7 @@
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.logging.LogRecordListener;
 import org.junit.platform.commons.util.ExceptionUtils;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.EngineDiscoveryRequest;
-import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.ExecutionRequest;
 import org.junit.platform.engine.FilterResult;
 import org.junit.platform.engine.TestDescriptor;
@@ -56,13 +52,11 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
-import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestDescriptor;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 import org.junit.platform.fakes.TestDescriptorStub;
 import org.junit.platform.fakes.TestEngineSpy;
 import org.junit.platform.fakes.TestEngineStub;
 import org.junit.platform.launcher.EngineDiscoveryResult;
-import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.PostDiscoveryFilterStub;
@@ -71,7 +65,6 @@
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
 import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
 
 /**
  * @since 1.0
@@ -94,7 +87,7 @@ void constructLauncherWithoutAnyEngines() {
 
 	@Test
 	void constructLauncherWithMultipleTestEnginesWithDuplicateIds() {
-		JUnitException exception = assertThrows(JUnitException.class,
+		var exception = assertThrows(JUnitException.class,
 			() -> createLauncher(new DemoHierarchicalTestEngine("dummy id"),
 				new DemoHierarchicalTestEngine("dummy id")));
 
@@ -105,7 +98,7 @@ void constructLauncherWithMultipleTestEnginesWithDuplicateIds() {
 	void registerTestExecutionListenersWithNullArray() {
 		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"));
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> launcher.registerTestExecutionListeners((TestExecutionListener[]) null));
 
 		assertThat(exception).hasMessageContaining("listeners array must not be null or empty");
@@ -115,8 +108,7 @@ void registerTestExecutionListenersWithNullArray() {
 	void registerTestExecutionListenersWithEmptyArray() {
 		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"));
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			launcher::registerTestExecutionListeners);
+		var exception = assertThrows(PreconditionViolationException.class, launcher::registerTestExecutionListeners);
 
 		assertThat(exception).hasMessageContaining("listeners array must not be null or empty");
 	}
@@ -125,7 +117,7 @@ void registerTestExecutionListenersWithEmptyArray() {
 	void registerTestExecutionListenersWithArrayContainingNullElements() {
 		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"));
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> launcher.registerTestExecutionListeners(new TestExecutionListener[] { null }));
 
 		assertThat(exception).hasMessageContaining("individual listeners must not be null");
@@ -133,9 +125,9 @@ void registerTestExecutionListenersWithArrayContainingNullElements() {
 
 	@Test
 	void discoverEmptyTestPlanWithEngineWithoutAnyTests() {
-		Launcher launcher = createLauncher(new DemoHierarchicalTestEngine());
+		var launcher = createLauncher(new DemoHierarchicalTestEngine());
 
-		TestPlan testPlan = launcher.discover(request().build());
+		var testPlan = launcher.discover(request().build());
 
 		assertThat(testPlan.getRoots()).hasSize(1);
 	}
@@ -167,7 +159,7 @@ void discoverErrorTestDescriptorForEngineThatThrowsInDiscoveryPhase(Class<? exte
 			@Override
 			public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
 				try {
-					Constructor<? extends Throwable> constructor = throwableClass.getDeclaredConstructor(String.class);
+					var constructor = throwableClass.getDeclaredConstructor(String.class);
 					throw ExceptionUtils.throwAsUncheckedException(constructor.newInstance("ignored"));
 				}
 				catch (Exception ignored) {
@@ -201,7 +193,7 @@ public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId
 
 	private void assertDiscoveryFailed(TestEngine testEngine, LauncherDiscoveryListener discoveryListener) {
 		var engineId = testEngine.getId();
-		ArgumentCaptor<EngineDiscoveryResult> failureCaptor = ArgumentCaptor.forClass(EngineDiscoveryResult.class);
+		var failureCaptor = ArgumentCaptor.forClass(EngineDiscoveryResult.class);
 		verify(discoveryListener).engineDiscoveryFinished(eq(UniqueId.forEngine(engineId)), failureCaptor.capture());
 		var result = failureCaptor.getValue();
 		assertThat(result.getStatus()).isEqualTo(EngineDiscoveryResult.Status.FAILED);
@@ -373,30 +365,30 @@ public void execute(ExecutionRequest request) {
 
 	@Test
 	void discoverTestPlanForSingleEngine() {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("myEngine");
+		var engine = new DemoHierarchicalTestEngine("myEngine");
 		engine.addTest("test1", noOp);
 		engine.addTest("test2", noOp);
 
 		var launcher = createLauncher(engine);
 
-		TestPlan testPlan = launcher.discover(request().selectors(selectPackage("any")).build());
+		var testPlan = launcher.discover(request().selectors(selectPackage("any")).build());
 
 		assertThat(testPlan.getRoots()).hasSize(1);
-		TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next();
+		var rootIdentifier = testPlan.getRoots().iterator().next();
 		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(2);
 		assertThat(testPlan.getChildren("[engine:myEngine]")).hasSize(2);
 	}
 
 	@Test
 	void discoverTestPlanForMultipleEngines() {
-		DemoHierarchicalTestEngine firstEngine = new DemoHierarchicalTestEngine("engine1");
+		var firstEngine = new DemoHierarchicalTestEngine("engine1");
 		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		DemoHierarchicalTestEngine secondEngine = new DemoHierarchicalTestEngine("engine2");
+		var secondEngine = new DemoHierarchicalTestEngine("engine2");
 		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
 
 		var launcher = createLauncher(firstEngine, secondEngine);
 
-		TestPlan testPlan = launcher.discover(
+		var testPlan = launcher.discover(
 			request().selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId())).build());
 
 		assertThat(testPlan.getRoots()).hasSize(2);
@@ -406,15 +398,15 @@ void discoverTestPlanForMultipleEngines() {
 
 	@Test
 	void launcherWillNotExecuteEnginesIfNotIncludedByAnEngineFilter() {
-		DemoHierarchicalTestEngine firstEngine = new DemoHierarchicalTestEngine("first");
+		var firstEngine = new DemoHierarchicalTestEngine("first");
 		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		DemoHierarchicalTestEngine secondEngine = new DemoHierarchicalTestEngine("second");
+		var secondEngine = new DemoHierarchicalTestEngine("second");
 		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
 
 		var launcher = createLauncher(firstEngine, secondEngine);
 
 		// @formatter:off
-		TestPlan testPlan = launcher.discover(
+		var testPlan = launcher.discover(
 			request()
 				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
 				.filters(includeEngines("first"))
@@ -422,22 +414,22 @@ void launcherWillNotExecuteEnginesIfNotIncludedByAnEngineFilter() {
 		// @formatter:on
 
 		assertThat(testPlan.getRoots()).hasSize(1);
-		TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next();
+		var rootIdentifier = testPlan.getRoots().iterator().next();
 		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
 		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
 	}
 
 	@Test
 	void launcherWillExecuteAllEnginesExplicitlyIncludedViaSingleEngineFilter() {
-		DemoHierarchicalTestEngine firstEngine = new DemoHierarchicalTestEngine("first");
+		var firstEngine = new DemoHierarchicalTestEngine("first");
 		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		DemoHierarchicalTestEngine secondEngine = new DemoHierarchicalTestEngine("second");
+		var secondEngine = new DemoHierarchicalTestEngine("second");
 		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
 
 		var launcher = createLauncher(firstEngine, secondEngine);
 
 		// @formatter:off
-		TestPlan testPlan = launcher.discover(
+		var testPlan = launcher.discover(
 			request()
 				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
 				.filters(includeEngines("first", "second"))
@@ -449,15 +441,15 @@ void launcherWillExecuteAllEnginesExplicitlyIncludedViaSingleEngineFilter() {
 
 	@Test
 	void launcherWillNotExecuteEnginesExplicitlyIncludedViaMultipleCompetingEngineFilters() {
-		DemoHierarchicalTestEngine firstEngine = new DemoHierarchicalTestEngine("first");
+		var firstEngine = new DemoHierarchicalTestEngine("first");
 		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		DemoHierarchicalTestEngine secondEngine = new DemoHierarchicalTestEngine("second");
+		var secondEngine = new DemoHierarchicalTestEngine("second");
 		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
 
 		var launcher = createLauncher(firstEngine, secondEngine);
 
 		// @formatter:off
-		TestPlan testPlan = launcher.discover(
+		var testPlan = launcher.discover(
 			request()
 				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
 				.filters(includeEngines("first"), includeEngines("second"))
@@ -469,15 +461,15 @@ void launcherWillNotExecuteEnginesExplicitlyIncludedViaMultipleCompetingEngineFi
 
 	@Test
 	void launcherWillNotExecuteEnginesExplicitlyExcludedByAnEngineFilter() {
-		DemoHierarchicalTestEngine firstEngine = new DemoHierarchicalTestEngine("first");
+		var firstEngine = new DemoHierarchicalTestEngine("first");
 		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		DemoHierarchicalTestEngine secondEngine = new DemoHierarchicalTestEngine("second");
+		var secondEngine = new DemoHierarchicalTestEngine("second");
 		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
 
 		var launcher = createLauncher(firstEngine, secondEngine);
 
 		// @formatter:off
-		TestPlan testPlan = launcher.discover(
+		var testPlan = launcher.discover(
 			request()
 				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
 				.filters(excludeEngines("second"))
@@ -485,24 +477,24 @@ void launcherWillNotExecuteEnginesExplicitlyExcludedByAnEngineFilter() {
 		// @formatter:on
 
 		assertThat(testPlan.getRoots()).hasSize(1);
-		TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next();
+		var rootIdentifier = testPlan.getRoots().iterator().next();
 		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
 		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
 	}
 
 	@Test
 	void launcherWillExecuteEnginesHonoringBothIncludeAndExcludeEngineFilters() {
-		DemoHierarchicalTestEngine firstEngine = new DemoHierarchicalTestEngine("first");
+		var firstEngine = new DemoHierarchicalTestEngine("first");
 		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		DemoHierarchicalTestEngine secondEngine = new DemoHierarchicalTestEngine("second");
+		var secondEngine = new DemoHierarchicalTestEngine("second");
 		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
-		DemoHierarchicalTestEngine thirdEngine = new DemoHierarchicalTestEngine("third");
+		var thirdEngine = new DemoHierarchicalTestEngine("third");
 		TestDescriptor test3 = thirdEngine.addTest("test3", noOp);
 
 		var launcher = createLauncher(firstEngine, secondEngine, thirdEngine);
 
 		// @formatter:off
-		TestPlan testPlan = launcher.discover(
+		var testPlan = launcher.discover(
 			request()
 				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()), selectUniqueId(test3.getUniqueId()))
 				.filters(includeEngines("first", "second"), excludeEngines("second"))
@@ -510,15 +502,15 @@ void launcherWillExecuteEnginesHonoringBothIncludeAndExcludeEngineFilters() {
 		// @formatter:on
 
 		assertThat(testPlan.getRoots()).hasSize(1);
-		TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next();
+		var rootIdentifier = testPlan.getRoots().iterator().next();
 		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
 		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
 	}
 
 	@Test
 	void launcherAppliesPostDiscoveryFilters() {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("myEngine");
-		DemoHierarchicalTestDescriptor test1 = engine.addTest("test1", noOp);
+		var engine = new DemoHierarchicalTestEngine("myEngine");
+		var test1 = engine.addTest("test1", noOp);
 		engine.addTest("test2", noOp);
 
 		var launcher = createLauncher(engine);
@@ -529,7 +521,7 @@ void launcherAppliesPostDiscoveryFilters() {
 		PostDiscoveryFilter includeWithUniqueIdContains1 = new PostDiscoveryFilterStub(
 			descriptor -> FilterResult.includedIf(descriptor.getUniqueId().toString().contains("1")), () -> "filter2");
 
-		TestPlan testPlan = launcher.discover( //
+		var testPlan = launcher.discover( //
 			request() //
 					.selectors(selectPackage("any")) //
 					.filters(includeWithUniqueIdContainsTest, includeWithUniqueIdContains1) //
@@ -541,24 +533,24 @@ void launcherAppliesPostDiscoveryFilters() {
 
 	@Test
 	void withoutConfigurationParameters_LauncherPassesEmptyConfigurationParametersIntoTheExecutionRequest() {
-		TestEngineSpy engine = new TestEngineSpy();
+		var engine = new TestEngineSpy();
 
 		var launcher = createLauncher(engine);
 		launcher.execute(request().build());
 
-		ConfigurationParameters configurationParameters = engine.requestForExecution.getConfigurationParameters();
+		var configurationParameters = engine.requestForExecution.getConfigurationParameters();
 		assertThat(configurationParameters.get("key").isPresent()).isFalse();
 		assertThat(configurationParameters.size()).isEqualTo(0);
 	}
 
 	@Test
 	void withConfigurationParameters_LauncherPassesPopulatedConfigurationParametersIntoTheExecutionRequest() {
-		TestEngineSpy engine = new TestEngineSpy();
+		var engine = new TestEngineSpy();
 
 		var launcher = createLauncher(engine);
 		launcher.execute(request().configurationParameter("key", "value").build());
 
-		ConfigurationParameters configurationParameters = engine.requestForExecution.getConfigurationParameters();
+		var configurationParameters = engine.requestForExecution.getConfigurationParameters();
 		assertThat(configurationParameters.size()).isEqualTo(1);
 		assertThat(configurationParameters.get("key").isPresent()).isTrue();
 		assertThat(configurationParameters.get("key").get()).isEqualTo("value");
@@ -569,14 +561,14 @@ void withoutConfigurationParameters_LookupFallsBackToSystemProperty() {
 		System.setProperty(FOO, BAR);
 
 		try {
-			TestEngineSpy engine = new TestEngineSpy();
+			var engine = new TestEngineSpy();
 
 			var launcher = createLauncher(engine);
 			launcher.execute(request().build());
 
-			ConfigurationParameters configurationParameters = engine.requestForExecution.getConfigurationParameters();
+			var configurationParameters = engine.requestForExecution.getConfigurationParameters();
 			assertThat(configurationParameters.size()).isEqualTo(0);
-			Optional<String> optionalFoo = configurationParameters.get(FOO);
+			var optionalFoo = configurationParameters.get(FOO);
 			assertTrue(optionalFoo.isPresent(), "foo should have been picked up via system property");
 			assertEquals(BAR, optionalFoo.get(), "foo property");
 		}
@@ -587,8 +579,8 @@ void withoutConfigurationParameters_LookupFallsBackToSystemProperty() {
 
 	@Test
 	void withAdditionalListener() {
-		TestEngineSpy engine = new TestEngineSpy();
-		SummaryGeneratingListener listener = new SummaryGeneratingListener();
+		var engine = new TestEngineSpy();
+		var listener = new SummaryGeneratingListener();
 
 		var launcher = createLauncher(engine);
 		launcher.execute(request().build(), listener);
@@ -600,14 +592,13 @@ void withAdditionalListener() {
 
 	@Test
 	void prunesTestDescriptorsAfterApplyingPostDiscoveryFilters() {
-		TestEngineSpy engine = new TestEngineSpy() {
+		var engine = new TestEngineSpy() {
 
 			@Override
 			public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
 				super.discover(discoveryRequest, uniqueId);
-				TestDescriptorStub engineDescriptor = new TestDescriptorStub(uniqueId, uniqueId.toString());
-				TestDescriptorStub containerDescriptor = new TestDescriptorStub(uniqueId.append("container", "a"),
-					"container") {
+				var engineDescriptor = new TestDescriptorStub(uniqueId, uniqueId.toString());
+				var containerDescriptor = new TestDescriptorStub(uniqueId.append("container", "a"), "container") {
 
 					@Override
 					public Type getType() {
@@ -622,26 +613,26 @@ public Type getType() {
 		};
 
 		var launcher = createLauncher(engine);
-		TestPlan testPlan = launcher.discover(request().filters(
+		var testPlan = launcher.discover(request().filters(
 			(PostDiscoveryFilter) testDescriptor -> FilterResult.includedIf(testDescriptor.isContainer())).build());
 
 		assertThat(testPlan.getRoots()).hasSize(1);
-		TestIdentifier engineIdentifier = getOnlyElement(testPlan.getRoots());
+		var engineIdentifier = getOnlyElement(testPlan.getRoots());
 		assertThat(testPlan.getChildren(engineIdentifier)).isEmpty();
 	}
 
 	@Test
 	void reportsDynamicTestDescriptorsCorrectly() {
-		UniqueId engineId = UniqueId.forEngine(TestEngineSpy.ID);
-		UniqueId containerAndTestId = engineId.append("c&t", "c&t");
-		UniqueId dynamicTestId = containerAndTestId.append("test", "test");
+		var engineId = UniqueId.forEngine(TestEngineSpy.ID);
+		var containerAndTestId = engineId.append("c&t", "c&t");
+		var dynamicTestId = containerAndTestId.append("test", "test");
 
-		TestEngineSpy engine = new TestEngineSpy() {
+		var engine = new TestEngineSpy() {
 
 			@Override
 			public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
 				super.discover(discoveryRequest, uniqueId);
-				TestDescriptorStub engineDescriptor = new TestDescriptorStub(uniqueId, uniqueId.toString());
+				var engineDescriptor = new TestDescriptorStub(uniqueId, uniqueId.toString());
 				engineDescriptor.addChild(new TestDescriptorStub(containerAndTestId, "c&t") {
 
 					@Override
@@ -655,13 +646,13 @@ public Type getType() {
 			@Override
 			public void execute(ExecutionRequest request) {
 				super.execute(request);
-				EngineExecutionListener listener = request.getEngineExecutionListener();
+				var listener = request.getEngineExecutionListener();
 
 				listener.executionStarted(request.getRootTestDescriptor());
-				TestDescriptor containerAndTest = getOnlyElement(request.getRootTestDescriptor().getChildren());
+				var containerAndTest = getOnlyElement(request.getRootTestDescriptor().getChildren());
 				listener.executionStarted(containerAndTest);
 
-				TestDescriptorStub dynamicTest = new TestDescriptorStub(dynamicTestId, "test");
+				var dynamicTest = new TestDescriptorStub(dynamicTestId, "test");
 				dynamicTest.setParent(containerAndTest);
 				listener.dynamicTestRegistered(dynamicTest);
 				listener.executionStarted(dynamicTest);
@@ -673,17 +664,17 @@ public void execute(ExecutionRequest request) {
 		};
 
 		var launcher = createLauncher(engine);
-		TestExecutionListener listener = mock(TestExecutionListener.class);
+		var listener = mock(TestExecutionListener.class);
 		launcher.execute(request().build(), listener);
 
-		InOrder inOrder = inOrder(listener);
-		ArgumentCaptor<TestPlan> testPlanArgumentCaptor = ArgumentCaptor.forClass(TestPlan.class);
+		var inOrder = inOrder(listener);
+		var testPlanArgumentCaptor = ArgumentCaptor.forClass(TestPlan.class);
 		inOrder.verify(listener).testPlanExecutionStarted(testPlanArgumentCaptor.capture());
 
-		TestPlan testPlan = testPlanArgumentCaptor.getValue();
-		TestIdentifier engineTestIdentifier = testPlan.getTestIdentifier(engineId.toString());
-		TestIdentifier containerAndTestIdentifier = testPlan.getTestIdentifier(containerAndTestId.toString());
-		TestIdentifier dynamicTestIdentifier = testPlan.getTestIdentifier(dynamicTestId.toString());
+		var testPlan = testPlanArgumentCaptor.getValue();
+		var engineTestIdentifier = testPlan.getTestIdentifier(engineId.toString());
+		var containerAndTestIdentifier = testPlan.getTestIdentifier(containerAndTestId.toString());
+		var dynamicTestIdentifier = testPlan.getTestIdentifier(dynamicTestId.toString());
 		assertThat(engineTestIdentifier.getParentId()).isEmpty();
 		assertThat(containerAndTestIdentifier.getParentId()).contains(engineId.toString());
 		assertThat(dynamicTestIdentifier.getParentId()).contains(containerAndTestId.toString());
@@ -700,7 +691,7 @@ public void execute(ExecutionRequest request) {
 
 	@Test
 	void launcherCanExecuteTestPlanExactlyOnce() {
-		TestEngine engine = mock(TestEngine.class);
+		var engine = mock(TestEngine.class);
 		when(engine.getId()).thenReturn("some-engine");
 		when(engine.discover(any(), any())).thenAnswer(invocation -> {
 			UniqueId uniqueId = invocation.getArgument(1);
@@ -708,7 +699,7 @@ void launcherCanExecuteTestPlanExactlyOnce() {
 		});
 
 		var launcher = createLauncher(engine);
-		TestPlan testPlan = launcher.discover(request().build());
+		var testPlan = launcher.discover(request().build());
 		verify(engine, times(1)).discover(any(), any());
 
 		launcher.execute(testPlan);
@@ -724,12 +715,12 @@ void launcherCanExecuteTestPlanExactlyOnce() {
 	void testPlanWarnsWhenModified(LogRecordListener listener) {
 		TestEngine engine = new TestEngineSpy();
 		var launcher = createLauncher(engine);
-		TestPlan testPlan = launcher.discover(request().build());
-		TestIdentifier engineIdentifier = getOnlyElement(testPlan.getRoots());
-		UniqueId engineUniqueId = UniqueId.parse(engineIdentifier.getUniqueId());
+		var testPlan = launcher.discover(request().build());
+		var engineIdentifier = getOnlyElement(testPlan.getRoots());
+		var engineUniqueId = UniqueId.parse(engineIdentifier.getUniqueId());
 		assertThat(testPlan.getChildren(engineIdentifier)).hasSize(1);
 
-		TestIdentifier addedIdentifier = TestIdentifier.from(
+		var addedIdentifier = TestIdentifier.from(
 			new TestDescriptorStub(engineUniqueId.append("test", "test2"), "test2"));
 		testPlan.add(addedIdentifier);
 		testPlan.add(addedIdentifier);
@@ -744,7 +735,7 @@ void testPlanWarnsWhenModified(LogRecordListener listener) {
 	@Test
 	@TrackLogRecords
 	void thirdPartyEngineUsingReservedEngineIdPrefixEmitsWarning(LogRecordListener listener) {
-		String id = "junit-using-reserved-prefix";
+		var id = "junit-using-reserved-prefix";
 		createLauncher(new TestEngineStub(id));
 		assertThat(listener.stream(EngineIdValidator.class, Level.WARNING).map(LogRecord::getMessage)) //
 				.containsExactly(
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
index 54a96f538680..9b6e453d3cef 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
@@ -27,7 +27,7 @@ class EngineDiscoveryResultValidatorTests {
 
 	@Test
 	void detectCycleWithDoubleRoot() {
-		TestDescriptorStub root = new TestDescriptorStub(UniqueId.forEngine("root"), "root");
+		var root = new TestDescriptorStub(UniqueId.forEngine("root"), "root");
 		assertTrue(validator.isAcyclic(root));
 
 		root.addChild(root);
@@ -36,8 +36,8 @@ void detectCycleWithDoubleRoot() {
 
 	@Test
 	void detectCycleWithDoubleGroup() {
-		UniqueId rootId = UniqueId.forEngine("root");
-		TestDescriptorStub root = new TestDescriptorStub(rootId, "root");
+		var rootId = UniqueId.forEngine("root");
+		var root = new TestDescriptorStub(rootId, "root");
 		TestDescriptor group1 = new TestDescriptorStub(rootId.append("group", "1"), "1");
 		TestDescriptor group2 = new TestDescriptorStub(rootId.append("group", "2"), "2");
 		root.addChild(group1);
@@ -50,8 +50,8 @@ void detectCycleWithDoubleGroup() {
 
 	@Test
 	void detectCycleWithDoubleTest() {
-		UniqueId rootId = UniqueId.forEngine("root");
-		TestDescriptorStub root = new TestDescriptorStub(rootId, "root");
+		var rootId = UniqueId.forEngine("root");
+		var root = new TestDescriptorStub(rootId, "root");
 		TestDescriptor group1 = new TestDescriptorStub(rootId.append("group", "1"), "1");
 		TestDescriptor group2 = new TestDescriptorStub(rootId.append("group", "2"), "2");
 		root.addChild(group1);
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
index a505c3d7f99f..a1e7eddc2d9a 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
@@ -13,7 +13,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import java.lang.reflect.Method;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
@@ -34,19 +33,17 @@ class ExecutionListenerAdapterTests {
 
 	@Test
 	void testReportingEntryPublished() {
-		TestDescriptor testDescriptor = getSampleMethodTestDescriptor();
+		var testDescriptor = getSampleMethodTestDescriptor();
 
-		LauncherDiscoveryResult discoveryResult = new LauncherDiscoveryResult(
-			Map.of(mock(TestEngine.class), testDescriptor), null);
-		InternalTestPlan testPlan = InternalTestPlan.from(discoveryResult);
-		TestIdentifier testIdentifier = testPlan.getTestIdentifier(testDescriptor.getUniqueId().toString());
+		var discoveryResult = new LauncherDiscoveryResult(Map.of(mock(TestEngine.class), testDescriptor), null);
+		var testPlan = InternalTestPlan.from(discoveryResult);
+		var testIdentifier = testPlan.getTestIdentifier(testDescriptor.getUniqueId().toString());
 
 		//not yet spyable with mockito? -> https://github.com/mockito/mockito/issues/146
-		MockTestExecutionListener testExecutionListener = new MockTestExecutionListener();
-		ExecutionListenerAdapter executionListenerAdapter = new ExecutionListenerAdapter(testPlan,
-			testExecutionListener);
+		var testExecutionListener = new MockTestExecutionListener();
+		var executionListenerAdapter = new ExecutionListenerAdapter(testPlan, testExecutionListener);
 
-		ReportEntry entry = ReportEntry.from("one", "two");
+		var entry = ReportEntry.from("one", "two");
 		executionListenerAdapter.reportingEntryPublished(testDescriptor, entry);
 
 		assertThat(testExecutionListener.entry).isEqualTo(entry);
@@ -54,7 +51,7 @@ void testReportingEntryPublished() {
 	}
 
 	private TestDescriptor getSampleMethodTestDescriptor() {
-		Method localMethodNamedNothing = ReflectionUtils.findMethod(this.getClass(), "nothing", new Class<?>[0]).get();
+		var localMethodNamedNothing = ReflectionUtils.findMethod(this.getClass(), "nothing", new Class<?>[0]).get();
 		return new DemoMethodTestDescriptor(UniqueId.root("method", "unique_id"), this.getClass(),
 			localMethodNamedNothing);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
index d378ca86dac0..cd9e2a0e5b48 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
@@ -36,7 +36,7 @@ void preconditions() {
 			() -> LauncherConfig.builder().addTestExecutionListeners((TestExecutionListener[]) null));
 
 		TestEngine engine = new TestEngineStub();
-		TestExecutionListener listener = new TestExecutionListener() {
+		var listener = new TestExecutionListener() {
 		};
 		assertThrows(PreconditionViolationException.class,
 			() -> LauncherConfig.builder().addTestEngines(engine, engine, null));
@@ -46,7 +46,7 @@ void preconditions() {
 
 	@Test
 	void defaultConfig() {
-		LauncherConfig config = LauncherConfig.builder().build();
+		var config = LauncherConfig.builder().build();
 
 		assertTrue(config.isTestEngineAutoRegistrationEnabled(),
 			"Test engine auto-registration should be enabled by default");
@@ -60,14 +60,14 @@ void defaultConfig() {
 
 	@Test
 	void disableTestEngineAutoRegistration() {
-		LauncherConfig config = LauncherConfig.builder().enableTestEngineAutoRegistration(false).build();
+		var config = LauncherConfig.builder().enableTestEngineAutoRegistration(false).build();
 
 		assertFalse(config.isTestEngineAutoRegistrationEnabled());
 	}
 
 	@Test
 	void disableTestExecutionListenerAutoRegistration() {
-		LauncherConfig config = LauncherConfig.builder().enableTestExecutionListenerAutoRegistration(false).build();
+		var config = LauncherConfig.builder().enableTestExecutionListenerAutoRegistration(false).build();
 
 		assertFalse(config.isTestExecutionListenerAutoRegistrationEnabled());
 	}
@@ -77,19 +77,19 @@ void addTestEngines() {
 		TestEngine first = new TestEngineStub();
 		TestEngine second = new TestEngineStub();
 
-		LauncherConfig config = LauncherConfig.builder().addTestEngines(first, second).build();
+		var config = LauncherConfig.builder().addTestEngines(first, second).build();
 
 		assertThat(config.getAdditionalTestEngines()).containsOnly(first, second);
 	}
 
 	@Test
 	void addTestExecutionListeners() {
-		TestExecutionListener first = new TestExecutionListener() {
+		var first = new TestExecutionListener() {
 		};
-		TestExecutionListener second = new TestExecutionListener() {
+		var second = new TestExecutionListener() {
 		};
 
-		LauncherConfig config = LauncherConfig.builder().addTestExecutionListeners(first, second).build();
+		var config = LauncherConfig.builder().addTestExecutionListeners(first, second).build();
 
 		assertThat(config.getAdditionalTestExecutionListeners()).containsOnly(first, second);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
index dab8362882ec..29f144b96b2b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
@@ -28,7 +28,6 @@
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
-import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
 
 /**
@@ -121,10 +120,10 @@ void systemPropertyOverridesConfigFile() {
 
 	@Test
 	void getValueInExtensionContext() {
-		LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request() //
+		var request = LauncherDiscoveryRequestBuilder.request() //
 				.configurationParameter("thing", "one else!") //
 				.selectors(DiscoverySelectors.selectClass(Something.class)).build();
-		SummaryGeneratingListener summary = new SummaryGeneratingListener();
+		var summary = new SummaryGeneratingListener();
 		LauncherFactory.create().execute(request, summary);
 		assertEquals(0, summary.getSummary().getTestsFailedCount());
 	}
@@ -138,7 +137,7 @@ void getWithSuccessfulTransformer() {
 	@Test
 	void getWithErroneousTransformer() {
 		ConfigurationParameters configParams = fromMap(singletonMap(KEY, "42"));
-		JUnitException exception = assertThrows(JUnitException.class, () -> configParams.get(KEY, input -> {
+		var exception = assertThrows(JUnitException.class, () -> configParams.get(KEY, input -> {
 			throw new RuntimeException("foo");
 		}));
 		assertThat(exception).hasMessageContaining(
@@ -168,7 +167,7 @@ private static LauncherConfigurationParameters fromMapAndFile(Map<String, String
 	private static class Mutator implements TestInstancePostProcessor {
 		@Override
 		public void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception {
-			String value = context.getConfigurationParameter("thing").orElse("thing");
+			var value = context.getConfigurationParameter("thing").orElse("thing");
 			Something.class.getField("thing").set(testInstance, value);
 		}
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
index 4e15d70ff4f8..0b7634f48d39 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
@@ -35,7 +35,6 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.DiscoveryFilter;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.UniqueId;
@@ -46,8 +45,6 @@
 import org.junit.platform.engine.discovery.UniqueIdSelector;
 import org.junit.platform.fakes.TestEngineStub;
 import org.junit.platform.launcher.DiscoveryFilterStub;
-import org.junit.platform.launcher.EngineFilter;
-import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.PostDiscoveryFilterStub;
 
 /**
@@ -61,13 +58,13 @@ class DiscoverySelectionTests {
 		@Test
 		void modulesAreStoredInDiscoveryRequest() {
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.selectors(
 							selectModule("java.base")
 					).build();
 			// @formatter:on
 
-			List<String> packageSelectors = discoveryRequest.getSelectorsByType(ModuleSelector.class).stream().map(
+			var packageSelectors = discoveryRequest.getSelectorsByType(ModuleSelector.class).stream().map(
 				ModuleSelector::getModuleName).collect(toList());
 			assertThat(packageSelectors).contains("java.base");
 		}
@@ -75,13 +72,13 @@ void modulesAreStoredInDiscoveryRequest() {
 		@Test
 		void packagesAreStoredInDiscoveryRequest() {
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.selectors(
 							selectPackage("org.junit.platform.engine")
 					).build();
 			// @formatter:on
 
-			List<String> packageSelectors = discoveryRequest.getSelectorsByType(PackageSelector.class).stream().map(
+			var packageSelectors = discoveryRequest.getSelectorsByType(PackageSelector.class).stream().map(
 				PackageSelector::getPackageName).collect(toList());
 			assertThat(packageSelectors).contains("org.junit.platform.engine");
 		}
@@ -89,7 +86,7 @@ void packagesAreStoredInDiscoveryRequest() {
 		@Test
 		void classesAreStoredInDiscoveryRequest() {
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.selectors(
 							selectClass(LauncherDiscoveryRequestBuilderTests.class.getName()),
 							selectClass(SampleTestClass.class)
@@ -105,15 +102,15 @@ void classesAreStoredInDiscoveryRequest() {
 		@Test
 		void methodsByFullyQualifiedNameAreStoredInDiscoveryRequest() {
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.selectors(selectMethod(fullyQualifiedMethodName()))
 					.build();
 			// @formatter:on
 
-			List<MethodSelector> methodSelectors = discoveryRequest.getSelectorsByType(MethodSelector.class);
+			var methodSelectors = discoveryRequest.getSelectorsByType(MethodSelector.class);
 			assertThat(methodSelectors).hasSize(1);
 
-			MethodSelector methodSelector = methodSelectors.get(0);
+			var methodSelector = methodSelectors.get(0);
 			assertThat(methodSelector.getJavaClass()).isEqualTo(LauncherDiscoveryRequestBuilderTests.class);
 			assertThat(methodSelector.getJavaMethod()).isEqualTo(fullyQualifiedMethod());
 		}
@@ -121,18 +118,18 @@ void methodsByFullyQualifiedNameAreStoredInDiscoveryRequest() {
 		@Test
 		void methodsByNameAreStoredInDiscoveryRequest() throws Exception {
 			Class<?> testClass = SampleTestClass.class;
-			Method testMethod = testClass.getDeclaredMethod("test");
+			var testMethod = testClass.getDeclaredMethod("test");
 
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.selectors(selectMethod(SampleTestClass.class.getName(), "test"))
 					.build();
 			// @formatter:on
 
-			List<MethodSelector> methodSelectors = discoveryRequest.getSelectorsByType(MethodSelector.class);
+			var methodSelectors = discoveryRequest.getSelectorsByType(MethodSelector.class);
 			assertThat(methodSelectors).hasSize(1);
 
-			MethodSelector methodSelector = methodSelectors.get(0);
+			var methodSelector = methodSelectors.get(0);
 			assertThat(methodSelector.getJavaClass()).isEqualTo(testClass);
 			assertThat(methodSelector.getJavaMethod()).isEqualTo(testMethod);
 		}
@@ -140,37 +137,37 @@ void methodsByNameAreStoredInDiscoveryRequest() throws Exception {
 		@Test
 		void methodsByClassAreStoredInDiscoveryRequest() throws Exception {
 			Class<?> testClass = SampleTestClass.class;
-			Method testMethod = testClass.getDeclaredMethod("test");
+			var testMethod = testClass.getDeclaredMethod("test");
 
 			// @formatter:off
-			DefaultDiscoveryRequest discoveryRequest = (DefaultDiscoveryRequest) request()
+			var discoveryRequest = (DefaultDiscoveryRequest) request()
 					.selectors(
 							selectMethod(testClass, "test")
 					).build();
 			// @formatter:on
 
-			List<MethodSelector> methodSelectors = discoveryRequest.getSelectorsByType(MethodSelector.class);
+			var methodSelectors = discoveryRequest.getSelectorsByType(MethodSelector.class);
 			assertThat(methodSelectors).hasSize(1);
 
-			MethodSelector methodSelector = methodSelectors.get(0);
+			var methodSelector = methodSelectors.get(0);
 			assertThat(methodSelector.getJavaClass()).isEqualTo(testClass);
 			assertThat(methodSelector.getJavaMethod()).isEqualTo(testMethod);
 		}
 
 		@Test
 		void uniqueIdsAreStoredInDiscoveryRequest() {
-			UniqueId id1 = UniqueId.forEngine("engine").append("foo", "id1");
-			UniqueId id2 = UniqueId.forEngine("engine").append("foo", "id2");
+			var id1 = UniqueId.forEngine("engine").append("foo", "id1");
+			var id2 = UniqueId.forEngine("engine").append("foo", "id2");
 
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.selectors(
 							selectUniqueId(id1),
 							selectUniqueId(id2)
 					).build();
 			// @formatter:on
 
-			List<String> uniqueIds = discoveryRequest.getSelectorsByType(UniqueIdSelector.class).stream().map(
+			var uniqueIds = discoveryRequest.getSelectorsByType(UniqueIdSelector.class).stream().map(
 				UniqueIdSelector::getUniqueId).map(Object::toString).collect(toList());
 
 			assertThat(uniqueIds).contains(id1.toString(), id2.toString());
@@ -187,14 +184,14 @@ void engineFiltersAreStoredInDiscoveryRequest() {
 			TestEngine engine3 = new TestEngineStub("engine3");
 
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.filters(includeEngines(engine1.getId(), engine2.getId()))
 					.build();
 			// @formatter:on
 
-			List<EngineFilter> filters = discoveryRequest.getEngineFilters();
+			var filters = discoveryRequest.getEngineFilters();
 			assertThat(filters).hasSize(1);
-			EngineFilter engineFilter = filters.get(0);
+			var engineFilter = filters.get(0);
 			assertTrue(engineFilter.apply(engine1).included());
 			assertTrue(engineFilter.apply(engine2).included());
 			assertTrue(engineFilter.apply(engine3).excluded());
@@ -205,7 +202,7 @@ void discoveryFiltersAreStoredInDiscoveryRequest() {
 			var filter1 = new DiscoveryFilterStub<>("filter1");
 			var filter2 = new DiscoveryFilterStub<>("filter2");
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.filters(filter1, filter2)
 					.build();
 			// @formatter:on
@@ -219,7 +216,7 @@ void postDiscoveryFiltersAreStoredInDiscoveryRequest() {
 			var postFilter1 = new PostDiscoveryFilterStub("postFilter1");
 			var postFilter2 = new PostDiscoveryFilterStub("postFilter2");
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.filters(postFilter1, postFilter2)
 					.build();
 			// @formatter:on
@@ -244,47 +241,47 @@ class DiscoveryConfigurationParameterTests {
 
 		@Test
 		void withoutConfigurationParametersSet_NoConfigurationParametersAreStoredInDiscoveryRequest() {
-			LauncherDiscoveryRequest discoveryRequest = request().build();
+			var discoveryRequest = request().build();
 
-			ConfigurationParameters configParams = discoveryRequest.getConfigurationParameters();
+			var configParams = discoveryRequest.getConfigurationParameters();
 			assertThat(configParams.get("key")).isNotPresent();
 		}
 
 		@Test
 		void configurationParameterAddedDirectly_isStoredInDiscoveryRequest() {
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.configurationParameter("key", "value")
 					.build();
 			// @formatter:on
 
-			ConfigurationParameters configParams = discoveryRequest.getConfigurationParameters();
+			var configParams = discoveryRequest.getConfigurationParameters();
 			assertThat(configParams.get("key")).contains("value");
 		}
 
 		@Test
 		void configurationParameterAddedDirectlyTwice_overridesPreviousValueInDiscoveryRequest() {
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.configurationParameter("key", "value")
 					.configurationParameter("key", "value-new")
 					.build();
 			// @formatter:on
 
-			ConfigurationParameters configParams = discoveryRequest.getConfigurationParameters();
+			var configParams = discoveryRequest.getConfigurationParameters();
 			assertThat(configParams.get("key")).contains("value-new");
 		}
 
 		@Test
 		void multipleConfigurationParametersAddedDirectly_areStoredInDiscoveryRequest() {
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.configurationParameter("key1", "value1")
 					.configurationParameter("key2", "value2")
 					.build();
 			// @formatter:on
 
-			ConfigurationParameters configParams = discoveryRequest.getConfigurationParameters();
+			var configParams = discoveryRequest.getConfigurationParameters();
 			assertThat(configParams.get("key1")).contains("value1");
 			assertThat(configParams.get("key2")).contains("value2");
 		}
@@ -292,12 +289,12 @@ void multipleConfigurationParametersAddedDirectly_areStoredInDiscoveryRequest()
 		@Test
 		void configurationParameterAddedByMap_isStoredInDiscoveryRequest() {
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.configurationParameters(singletonMap("key", "value"))
 					.build();
 			// @formatter:on
 
-			ConfigurationParameters configParams = discoveryRequest.getConfigurationParameters();
+			var configParams = discoveryRequest.getConfigurationParameters();
 			assertThat(configParams.get("key")).contains("value");
 		}
 
@@ -308,12 +305,12 @@ void multipleConfigurationParametersAddedByMap_areStoredInDiscoveryRequest() {
 			configurationParams.put("key2", "value2");
 
 			// @formatter:off
-			LauncherDiscoveryRequest discoveryRequest = request()
+			var discoveryRequest = request()
 					.configurationParameters(configurationParams)
 					.build();
 			// @formatter:on
 
-			ConfigurationParameters configParams = discoveryRequest.getConfigurationParameters();
+			var configParams = discoveryRequest.getConfigurationParameters();
 			assertThat(configParams.get("key1")).contains("value1");
 			assertThat(configParams.get("key2")).contains("value2");
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 961b393b1016..a0b4f7f75445 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -18,9 +18,6 @@
 
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -28,9 +25,7 @@
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.TagFilter;
-import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
-import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.listeners.AnotherUnusedTestExecutionListener;
 import org.junit.platform.launcher.listeners.NoopTestExecutionListener;
 import org.junit.platform.launcher.listeners.UnusedTestExecutionListener;
@@ -47,17 +42,16 @@ void preconditions() {
 
 	@Test
 	void noopTestExecutionListenerIsLoadedViaServiceApi() {
-		DefaultLauncher launcher = (DefaultLauncher) LauncherFactory.create();
-		List<TestExecutionListener> listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
-		Optional<TestExecutionListener> listener = listeners.stream().filter(
-			NoopTestExecutionListener.class::isInstance).findFirst();
+		var launcher = (DefaultLauncher) LauncherFactory.create();
+		var listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
+		var listener = listeners.stream().filter(NoopTestExecutionListener.class::isInstance).findFirst();
 		assertThat(listener).isPresent();
 	}
 
 	@Test
 	void unusedTestExecutionListenerIsNotLoadedViaServiceApi() {
-		DefaultLauncher launcher = (DefaultLauncher) LauncherFactory.create();
-		List<TestExecutionListener> listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
+		var launcher = (DefaultLauncher) LauncherFactory.create();
+		var listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
 
 		assertThat(listeners).filteredOn(AnotherUnusedTestExecutionListener.class::isInstance).isEmpty();
 		assertThat(listeners).filteredOn(UnusedTestExecutionListener.class::isInstance).isEmpty();
@@ -66,14 +60,14 @@ void unusedTestExecutionListenerIsNotLoadedViaServiceApi() {
 
 	@Test
 	void create() {
-		LauncherDiscoveryRequest discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
+		var discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
 
-		TestPlan testPlan = LauncherFactory.create().discover(discoveryRequest);
-		Set<TestIdentifier> roots = testPlan.getRoots();
+		var testPlan = LauncherFactory.create().discover(discoveryRequest);
+		var roots = testPlan.getRoots();
 		assertThat(roots).hasSize(2);
 
 		// @formatter:off
-		List<String> ids = roots.stream()
+		var ids = roots.stream()
 				.map(TestIdentifier::getUniqueId)
 				.collect(toList());
 		// @formatter:on
@@ -83,19 +77,19 @@ void create() {
 
 	@Test
 	void createWithConfig() {
-		LauncherDiscoveryRequest discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
+		var discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
 
-		LauncherConfig config = LauncherConfig.builder()//
+		var config = LauncherConfig.builder()//
 				.enableTestEngineAutoRegistration(false)//
 				.addTestEngines(new JupiterTestEngine())//
 				.build();
 
-		TestPlan testPlan = LauncherFactory.create(config).discover(discoveryRequest);
-		Set<TestIdentifier> roots = testPlan.getRoots();
+		var testPlan = LauncherFactory.create(config).discover(discoveryRequest);
+		var roots = testPlan.getRoots();
 		assertThat(roots).hasSize(1);
 
 		// @formatter:off
-		List<String> ids = roots.stream()
+		var ids = roots.stream()
 				.map(TestIdentifier::getUniqueId)
 				.collect(toList());
 		// @formatter:on
@@ -105,37 +99,37 @@ void createWithConfig() {
 
 	@Test
 	void createWithPostDiscoveryFilters() {
-		LauncherDiscoveryRequest discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
+		var discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
 
-		LauncherConfig config = LauncherConfig.builder()//
+		var config = LauncherConfig.builder()//
 				.addPostDiscoveryFilters(TagFilter.includeTags("test-post-discovery")).build();
 
-		TestPlan testPlan = LauncherFactory.create(config).discover(discoveryRequest);
-		final Set<TestIdentifier> vintage = testPlan.getChildren("[engine:junit-vintage]");
+		var testPlan = LauncherFactory.create(config).discover(discoveryRequest);
+		final var vintage = testPlan.getChildren("[engine:junit-vintage]");
 		assertThat(vintage).isEmpty();
 
-		final Set<TestIdentifier> jupiter = testPlan.getChildren("[engine:junit-jupiter]");
+		final var jupiter = testPlan.getChildren("[engine:junit-jupiter]");
 		assertThat(jupiter).hasSize(1);
 	}
 
 	@Test
 	void applyPostDiscoveryFiltersViaServiceApi() {
-		final ClassLoader current = Thread.currentThread().getContextClassLoader();
+		final var current = Thread.currentThread().getContextClassLoader();
 		try {
-			URL url = getClass().getClassLoader().getResource("testservices/");
-			URLClassLoader classLoader = new URLClassLoader(new URL[] { url }, current);
+			var url = getClass().getClassLoader().getResource("testservices/");
+			var classLoader = new URLClassLoader(new URL[] { url }, current);
 			Thread.currentThread().setContextClassLoader(classLoader);
 
-			LauncherDiscoveryRequest discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
+			var discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
 
-			LauncherConfig config = LauncherConfig.builder()//
+			var config = LauncherConfig.builder()//
 					.build();
 
-			TestPlan testPlan = LauncherFactory.create(config).discover(discoveryRequest);
-			final Set<TestIdentifier> vintage = testPlan.getChildren("[engine:junit-vintage]");
+			var testPlan = LauncherFactory.create(config).discover(discoveryRequest);
+			final var vintage = testPlan.getChildren("[engine:junit-vintage]");
 			assertThat(vintage).isEmpty();
 
-			final Set<TestIdentifier> jupiter = testPlan.getChildren("[engine:junit-jupiter]");
+			final var jupiter = testPlan.getChildren("[engine:junit-jupiter]");
 			assertThat(jupiter).hasSize(1);
 		}
 		finally {
@@ -145,22 +139,22 @@ void applyPostDiscoveryFiltersViaServiceApi() {
 
 	@Test
 	void notApplyIfDisabledPostDiscoveryFiltersViaServiceApi() {
-		final ClassLoader current = Thread.currentThread().getContextClassLoader();
+		final var current = Thread.currentThread().getContextClassLoader();
 		try {
-			URL url = getClass().getClassLoader().getResource("testservices/");
-			URLClassLoader classLoader = new URLClassLoader(new URL[] { url }, current);
+			var url = getClass().getClassLoader().getResource("testservices/");
+			var classLoader = new URLClassLoader(new URL[] { url }, current);
 			Thread.currentThread().setContextClassLoader(classLoader);
 
-			LauncherDiscoveryRequest discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
+			var discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
 
-			LauncherConfig config = LauncherConfig.builder()//
+			var config = LauncherConfig.builder()//
 					.enablePostDiscoveryFilterAutoRegistration(false).build();
 
-			TestPlan testPlan = LauncherFactory.create(config).discover(discoveryRequest);
-			final Set<TestIdentifier> vintage = testPlan.getChildren("[engine:junit-vintage]");
+			var testPlan = LauncherFactory.create(config).discover(discoveryRequest);
+			final var vintage = testPlan.getChildren("[engine:junit-vintage]");
 			assertThat(vintage).hasSize(1);
 
-			final Set<TestIdentifier> jupiter = testPlan.getChildren("[engine:junit-jupiter]");
+			final var jupiter = testPlan.getChildren("[engine:junit-jupiter]");
 			assertThat(jupiter).hasSize(1);
 		}
 		finally {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
index 8f4a358cfc0b..9c2e2cd99c33 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
@@ -46,12 +46,10 @@
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 import org.junit.platform.launcher.LauncherConstants;
-import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
 
 /**
  * @since 1.3
@@ -62,9 +60,9 @@ class StreamInterceptingTestExecutionListenerIntegrationTests {
 	@MethodSource("systemStreams")
 	@ExtendWith(HiddenSystemOutAndErr.class)
 	void interceptsStream(String configParam, Supplier<PrintStream> printStreamSupplier, String reportKey) {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("engine");
+		var engine = new DemoHierarchicalTestEngine("engine");
 		TestDescriptor test = engine.addTest("test", () -> printStreamSupplier.get().print("4567890"));
-		TestExecutionListener listener = mock(TestExecutionListener.class);
+		var listener = mock(TestExecutionListener.class);
 		doAnswer(invocation -> {
 			TestIdentifier testIdentifier = invocation.getArgument(0);
 			if (testIdentifier.getUniqueId().equals(test.getUniqueId().toString())) {
@@ -74,23 +72,23 @@ void interceptsStream(String configParam, Supplier<PrintStream> printStreamSuppl
 		}).when(listener).executionStarted(any());
 
 		var launcher = createLauncher(engine);
-		LauncherDiscoveryRequest discoveryRequest = request()//
+		var discoveryRequest = request()//
 				.selectors(selectUniqueId(test.getUniqueId()))//
 				.configurationParameter(configParam, String.valueOf(true))//
 				.configurationParameter(LauncherConstants.CAPTURE_MAX_BUFFER_PROPERTY_NAME, String.valueOf(5))//
 				.build();
 		launcher.execute(discoveryRequest, listener);
 
-		ArgumentCaptor<TestPlan> testPlanArgumentCaptor = ArgumentCaptor.forClass(TestPlan.class);
-		InOrder inOrder = inOrder(listener);
+		var testPlanArgumentCaptor = ArgumentCaptor.forClass(TestPlan.class);
+		var inOrder = inOrder(listener);
 		inOrder.verify(listener).testPlanExecutionStarted(testPlanArgumentCaptor.capture());
-		TestPlan testPlan = testPlanArgumentCaptor.getValue();
-		TestIdentifier testIdentifier = testPlan.getTestIdentifier(test.getUniqueId().toString());
+		var testPlan = testPlanArgumentCaptor.getValue();
+		var testIdentifier = testPlan.getTestIdentifier(test.getUniqueId().toString());
 
-		ArgumentCaptor<ReportEntry> reportEntryArgumentCaptor = ArgumentCaptor.forClass(ReportEntry.class);
+		var reportEntryArgumentCaptor = ArgumentCaptor.forClass(ReportEntry.class);
 		inOrder.verify(listener).reportingEntryPublished(same(testIdentifier), reportEntryArgumentCaptor.capture());
 		inOrder.verify(listener).executionFinished(testIdentifier, successful());
-		ReportEntry reportEntry = reportEntryArgumentCaptor.getValue();
+		var reportEntry = reportEntryArgumentCaptor.getValue();
 
 		assertThat(reportEntry.getKeyValuePairs()).containsExactly(entry(reportKey, "12345"));
 	}
@@ -100,18 +98,18 @@ void interceptsStream(String configParam, Supplier<PrintStream> printStreamSuppl
 	@ExtendWith(HiddenSystemOutAndErr.class)
 	void doesNotInterceptStreamWhenAlreadyBeingIntercepted(String configParam,
 			Supplier<PrintStream> printStreamSupplier) {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("engine");
+		var engine = new DemoHierarchicalTestEngine("engine");
 		TestDescriptor test = engine.addTest("test", () -> printStreamSupplier.get().print("1234567890"));
 
 		assertThat(StreamInterceptor.registerStdout(1)).isPresent();
 		assertThat(StreamInterceptor.registerStderr(1)).isPresent();
 
 		var launcher = createLauncher(engine);
-		LauncherDiscoveryRequest discoveryRequest = request()//
+		var discoveryRequest = request()//
 				.selectors(selectUniqueId(test.getUniqueId()))//
 				.configurationParameter(configParam, String.valueOf(true))//
 				.build();
-		TestExecutionListener listener = mock(TestExecutionListener.class);
+		var listener = mock(TestExecutionListener.class);
 		launcher.execute(discoveryRequest, listener);
 
 		verify(listener, never()).reportingEntryPublished(any(), any());
@@ -135,7 +133,7 @@ static class HiddenSystemOutAndErr implements BeforeTestExecutionCallback, After
 
 		@Override
 		public void beforeTestExecution(ExtensionContext context) {
-			ExtensionContext.Store store = context.getStore(NAMESPACE);
+			var store = context.getStore(NAMESPACE);
 			store.put("out", System.out);
 			store.put("err", System.err);
 			System.setOut(new PrintStream(new ByteArrayOutputStream()));
@@ -144,7 +142,7 @@ public void beforeTestExecution(ExtensionContext context) {
 
 		@Override
 		public void afterTestExecution(ExtensionContext context) {
-			ExtensionContext.Store store = context.getStore(NAMESPACE);
+			var store = context.getStore(NAMESPACE);
 			System.setOut(store.get("out", PrintStream.class));
 			System.setErr(store.get("err", PrintStream.class));
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
index 7351b718570f..3c9e9ee18aff 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
@@ -32,8 +32,8 @@ class StreamInterceptorTests {
 
 	@Test
 	void interceptsWriteOperationsToStreamPerThread() {
-		StreamInterceptor streamInterceptor = StreamInterceptor.register(targetStream,
-			newStream -> this.targetStream = newStream, 3).orElseThrow(RuntimeException::new);
+		var streamInterceptor = StreamInterceptor.register(targetStream, newStream -> this.targetStream = newStream,
+			3).orElseThrow(RuntimeException::new);
 		// @formatter:off
 		IntStream.range(0, 1000)
 				.parallel()
@@ -47,10 +47,10 @@ void interceptsWriteOperationsToStreamPerThread() {
 
 	@Test
 	void unregisterRestoresOriginalStream() {
-		PrintStream originalStream = targetStream;
+		var originalStream = targetStream;
 
-		StreamInterceptor streamInterceptor = StreamInterceptor.register(targetStream,
-			newStream -> this.targetStream = newStream, 3).orElseThrow(RuntimeException::new);
+		var streamInterceptor = StreamInterceptor.register(targetStream, newStream -> this.targetStream = newStream,
+			3).orElseThrow(RuntimeException::new);
 		assertSame(streamInterceptor, targetStream);
 
 		streamInterceptor.unregister();
@@ -59,7 +59,7 @@ void unregisterRestoresOriginalStream() {
 
 	@Test
 	void writeForwardsOperationsToOriginalStream() throws IOException {
-		PrintStream originalStream = targetStream;
+		var originalStream = targetStream;
 
 		StreamInterceptor.register(targetStream, newStream -> this.targetStream = newStream, 2).orElseThrow(
 			RuntimeException::new);
@@ -73,8 +73,8 @@ void writeForwardsOperationsToOriginalStream() throws IOException {
 
 	@Test
 	void handlesNestedCaptures() {
-		StreamInterceptor streamInterceptor = StreamInterceptor.register(targetStream,
-			newStream -> this.targetStream = newStream, 100).orElseThrow(RuntimeException::new);
+		var streamInterceptor = StreamInterceptor.register(targetStream, newStream -> this.targetStream = newStream,
+			100).orElseThrow(RuntimeException::new);
 
 		String outermost, inner, innermost;
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java
index 658a97496192..43fa30e1d431 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java
@@ -14,7 +14,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 
-import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -46,7 +45,7 @@ void setUp() {
 
 	@Test
 	void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(LogRecordListener logRecordListener) {
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 
 		compositeTestExecutionListener.dynamicTestRegistered(testIdentifier);
 
@@ -56,7 +55,7 @@ void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(Log
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionStartedListenerMethodFails(LogRecordListener logRecordListener) {
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 
 		compositeTestExecutionListener.executionStarted(testIdentifier);
 
@@ -65,7 +64,7 @@ void shouldNotThrowExceptionButLogIfExecutionStartedListenerMethodFails(LogRecor
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionSkippedListenerMethodFails(LogRecordListener logRecordListener) {
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 
 		compositeTestExecutionListener.executionSkipped(testIdentifier, "deliberately skipped container");
 
@@ -74,7 +73,7 @@ void shouldNotThrowExceptionButLogIfExecutionSkippedListenerMethodFails(LogRecor
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionFinishedListenerMethodFails(LogRecordListener logRecordListener) {
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 
 		compositeTestExecutionListener.executionFinished(testIdentifier, mock(TestExecutionResult.class));
 
@@ -84,7 +83,7 @@ void shouldNotThrowExceptionButLogIfExecutionFinishedListenerMethodFails(LogReco
 	@Test
 	void shouldNotThrowExceptionButLogIfReportingEntryPublishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 
 		compositeTestExecutionListener.reportingEntryPublished(testIdentifier, ReportEntry.from("one", "two"));
 
@@ -95,7 +94,7 @@ void shouldNotThrowExceptionButLogIfReportingEntryPublishedListenerMethodFails(
 	@Test
 	void shouldNotThrowExceptionButLogIfTesPlanExecutionStartedListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		DemoMethodTestDescriptor testDescriptor = getDemoMethodTestDescriptor();
+		var testDescriptor = getDemoMethodTestDescriptor();
 
 		compositeTestExecutionListener.testPlanExecutionStarted(TestPlan.from(Collections.singleton(testDescriptor)));
 
@@ -106,7 +105,7 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionStartedListenerMethodFails(
 	@Test
 	void shouldNotThrowExceptionButLogIfTesPlanExecutionFinishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		DemoMethodTestDescriptor testDescriptor = getDemoMethodTestDescriptor();
+		var testDescriptor = getDemoMethodTestDescriptor();
 
 		compositeTestExecutionListener.testPlanExecutionFinished(TestPlan.from(Collections.singleton(testDescriptor)));
 
@@ -119,7 +118,7 @@ void shouldNotThrowExceptionButLogIfExecutionJustStartedEagerTestListenerMethodF
 			LogRecordListener logRecordListener) {
 		registry.registerListeners(new ThrowingEagerTestExecutionListener());
 
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 		compositeTestExecutionListener.executionStarted(testIdentifier);
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEagerTestExecutionListener.class,
@@ -131,7 +130,7 @@ void shouldNotThrowExceptionButLogIfExecutionJustFinishedEagerTestListenerMethod
 			LogRecordListener logRecordListener) {
 		registry.registerListeners(new ThrowingEagerTestExecutionListener());
 
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 		compositeTestExecutionListener.executionFinished(testIdentifier, mock(TestExecutionResult.class));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEagerTestExecutionListener.class,
@@ -140,14 +139,14 @@ void shouldNotThrowExceptionButLogIfExecutionJustFinishedEagerTestListenerMethod
 
 	@Test
 	void shouldThrowOutOfMemoryExceptionAndStopListenerWithoutLog(LogRecordListener logRecordListener) {
-		TestExecutionListenerRegistry registry = new TestExecutionListenerRegistry();
+		var registry = new TestExecutionListenerRegistry();
 		registry.registerListeners(new TestExecutionListener() {
 			@Override
 			public void executionStarted(TestIdentifier testIdentifier) {
 				throw new OutOfMemoryError();
 			}
 		});
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 		assertThatThrownBy(
 			() -> registry.getCompositeTestExecutionListener().executionStarted(testIdentifier)).isInstanceOf(
 				OutOfMemoryError.class);
@@ -157,14 +156,14 @@ public void executionStarted(TestIdentifier testIdentifier) {
 
 	@Test
 	void shouldThrowOutOfMemoryExceptionAndStopEagerListenerWithoutLog(LogRecordListener logRecordListener) {
-		TestExecutionListenerRegistry registry = new TestExecutionListenerRegistry();
+		var registry = new TestExecutionListenerRegistry();
 		registry.registerListeners(new TestExecutionListenerRegistry.EagerTestExecutionListener() {
 			@Override
 			public void executionJustStarted(TestIdentifier testIdentifier) {
 				throw new OutOfMemoryError();
 			}
 		});
-		TestIdentifier testIdentifier = getSampleMethodTestIdentifier();
+		var testIdentifier = getSampleMethodTestIdentifier();
 		assertThatThrownBy(
 			() -> registry.getCompositeTestExecutionListener().executionStarted(testIdentifier)).isInstanceOf(
 				OutOfMemoryError.class);
@@ -182,7 +181,7 @@ private void assertNotLogs(LogRecordListener logRecordListener) throws Assertion
 	}
 
 	private TestIdentifier getSampleMethodTestIdentifier() {
-		DemoMethodTestDescriptor demoMethodTestDescriptor = getDemoMethodTestDescriptor();
+		var demoMethodTestDescriptor = getDemoMethodTestDescriptor();
 		return TestIdentifier.from(demoMethodTestDescriptor);
 	}
 
@@ -193,7 +192,7 @@ private void assertThatTestListenerErrorLogged(LogRecordListener logRecordListen
 	}
 
 	private DemoMethodTestDescriptor getDemoMethodTestDescriptor() {
-		Method method = ReflectionUtils.findMethod(this.getClass(), "getDemoMethodTestDescriptor",
+		var method = ReflectionUtils.findMethod(this.getClass(), "getDemoMethodTestDescriptor",
 			new Class<?>[0]).orElseThrow();
 		return new DemoMethodTestDescriptor(UniqueId.root("method", "unique_id"), this.getClass(), method);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index 76b98ab6e661..e3e088e352fc 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -19,7 +19,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
@@ -46,7 +45,7 @@ void emptyReport() {
 
 		assertEquals(0, listener.getSummary().getTestsFailedCount());
 
-		String summaryString = summaryAsString();
+		var summaryString = summaryAsString();
 		assertAll("summary", //
 			() -> assertTrue(summaryString.contains("Test run finished after"), "test run"), //
 
@@ -70,15 +69,15 @@ void emptyReport() {
 
 	@Test
 	void reportingCorrectCounts() {
-		TestIdentifier successfulContainer = createContainerIdentifier("c1");
-		TestIdentifier failedContainer = createContainerIdentifier("c2");
-		TestIdentifier abortedContainer = createContainerIdentifier("c3");
-		TestIdentifier skippedContainer = createContainerIdentifier("c4");
+		var successfulContainer = createContainerIdentifier("c1");
+		var failedContainer = createContainerIdentifier("c2");
+		var abortedContainer = createContainerIdentifier("c3");
+		var skippedContainer = createContainerIdentifier("c4");
 
-		TestIdentifier successfulTest = createTestIdentifier("t1");
-		TestIdentifier failedTest = createTestIdentifier("t2");
-		TestIdentifier abortedTest = createTestIdentifier("t3");
-		TestIdentifier skippedTest = createTestIdentifier("t4");
+		var successfulTest = createTestIdentifier("t1");
+		var failedTest = createTestIdentifier("t2");
+		var abortedTest = createTestIdentifier("t3");
+		var skippedTest = createTestIdentifier("t4");
 
 		listener.testPlanExecutionStarted(testPlan);
 
@@ -105,7 +104,7 @@ void reportingCorrectCounts() {
 
 		listener.testPlanExecutionFinished(testPlan);
 
-		String summaryString = summaryAsString();
+		var summaryString = summaryAsString();
 		try {
 			assertAll("summary", //
 				() -> assertTrue(summaryString.contains("4 containers found"), "containers found"), //
@@ -131,20 +130,20 @@ void reportingCorrectCounts() {
 
 	@Test
 	void canGetListOfFailures() {
-		RuntimeException failedException = new RuntimeException("Pow!");
-		TestDescriptorStub testDescriptor = new TestDescriptorStub(UniqueId.root("root", "1"), "failingTest") {
+		var failedException = new RuntimeException("Pow!");
+		var testDescriptor = new TestDescriptorStub(UniqueId.root("root", "1"), "failingTest") {
 
 			@Override
 			public Optional<TestSource> getSource() {
 				return Optional.of(ClassSource.from(Object.class));
 			}
 		};
-		TestIdentifier failingTest = TestIdentifier.from(testDescriptor);
+		var failingTest = TestIdentifier.from(testDescriptor);
 		listener.testPlanExecutionStarted(testPlan);
 		listener.executionStarted(failingTest);
 		listener.executionFinished(failingTest, TestExecutionResult.failed(failedException));
 		listener.testPlanExecutionFinished(testPlan);
-		final List<TestExecutionSummary.Failure> failures = listener.getSummary().getFailures();
+		final var failures = listener.getSummary().getFailures();
 		assertThat(failures).hasSize(1);
 		assertThat(failures.get(0).getException()).isEqualTo(failedException);
 		assertThat(failures.get(0).getTestIdentifier()).isEqualTo(failingTest);
@@ -152,20 +151,20 @@ public Optional<TestSource> getSource() {
 
 	@Test
 	void reportingCorrectFailures() {
-		IllegalArgumentException iaeCausedBy = new IllegalArgumentException("Illegal Argument Exception");
-		RuntimeException failedException = new RuntimeException("Runtime Exception", iaeCausedBy);
-		NullPointerException npeSuppressed = new NullPointerException("Null Pointer Exception");
+		var iaeCausedBy = new IllegalArgumentException("Illegal Argument Exception");
+		var failedException = new RuntimeException("Runtime Exception", iaeCausedBy);
+		var npeSuppressed = new NullPointerException("Null Pointer Exception");
 		failedException.addSuppressed(npeSuppressed);
 
-		TestDescriptorStub testDescriptor = new TestDescriptorStub(UniqueId.root("root", "2"), "failingTest") {
+		var testDescriptor = new TestDescriptorStub(UniqueId.root("root", "2"), "failingTest") {
 
 			@Override
 			public Optional<TestSource> getSource() {
 				return Optional.of(ClassSource.from(Object.class));
 			}
 		};
-		TestIdentifier failed = TestIdentifier.from(testDescriptor);
-		TestIdentifier aborted = TestIdentifier.from(new TestDescriptorStub(UniqueId.root("root", "3"), "abortedTest"));
+		var failed = TestIdentifier.from(testDescriptor);
+		var aborted = TestIdentifier.from(new TestDescriptorStub(UniqueId.root("root", "3"), "abortedTest"));
 
 		listener.testPlanExecutionStarted(testPlan);
 		listener.executionStarted(failed);
@@ -177,7 +176,7 @@ public Optional<TestSource> getSource() {
 		// An aborted test is not a failure
 		assertEquals(1, listener.getSummary().getTestsFailedCount());
 
-		String failuresString = failuresAsString();
+		var failuresString = failuresAsString();
 		assertAll("failures", //
 			() -> assertTrue(failuresString.contains("Failures (1)"), "test failures"), //
 			() -> assertTrue(failuresString.contains(Object.class.getName()), "source"), //
@@ -190,20 +189,20 @@ public Optional<TestSource> getSource() {
 
 	@Test
 	public void reportingCircularFailure() {
-		IllegalArgumentException iaeCausedBy = new IllegalArgumentException("Illegal Argument Exception");
-		RuntimeException failedException = new RuntimeException("Runtime Exception", iaeCausedBy);
-		NullPointerException npeSuppressed = new NullPointerException("Null Pointer Exception");
+		var iaeCausedBy = new IllegalArgumentException("Illegal Argument Exception");
+		var failedException = new RuntimeException("Runtime Exception", iaeCausedBy);
+		var npeSuppressed = new NullPointerException("Null Pointer Exception");
 		failedException.addSuppressed(npeSuppressed);
 		npeSuppressed.addSuppressed(iaeCausedBy);
 
-		TestDescriptorStub testDescriptor = new TestDescriptorStub(UniqueId.root("root", "2"), "failingTest") {
+		var testDescriptor = new TestDescriptorStub(UniqueId.root("root", "2"), "failingTest") {
 
 			@Override
 			public Optional<TestSource> getSource() {
 				return Optional.of(ClassSource.from(Object.class));
 			}
 		};
-		TestIdentifier failed = TestIdentifier.from(testDescriptor);
+		var failed = TestIdentifier.from(testDescriptor);
 
 		listener.testPlanExecutionStarted(testPlan);
 		listener.executionStarted(failed);
@@ -212,7 +211,7 @@ public Optional<TestSource> getSource() {
 
 		assertEquals(1, listener.getSummary().getTestsFailedCount());
 
-		String failuresString = failuresAsString();
+		var failuresString = failuresAsString();
 		assertAll("failures", //
 			() -> assertTrue(failuresString.contains("Suppressed: " + npeSuppressed), "Suppressed exception"), //
 			() -> assertTrue(failuresString.contains("Circular reference: " + iaeCausedBy), "Circular reference"), //
@@ -223,34 +222,32 @@ public Optional<TestSource> getSource() {
 
 	@SuppressWarnings("deprecation")
 	private TestIdentifier createTestIdentifier(String uniqueId) {
-		TestIdentifier identifier = TestIdentifier.from(
-			new TestDescriptorStub(UniqueId.root("test", uniqueId), uniqueId));
+		var identifier = TestIdentifier.from(new TestDescriptorStub(UniqueId.root("test", uniqueId), uniqueId));
 		testPlan.add(identifier);
 		return identifier;
 	}
 
 	@SuppressWarnings("deprecation")
 	private TestIdentifier createContainerIdentifier(String uniqueId) {
-		TestIdentifier identifier = TestIdentifier.from(
-			new TestDescriptorStub(UniqueId.root("container", uniqueId), uniqueId) {
-
-				@Override
-				public Type getType() {
-					return Type.CONTAINER;
-				}
-			});
+		var identifier = TestIdentifier.from(new TestDescriptorStub(UniqueId.root("container", uniqueId), uniqueId) {
+
+			@Override
+			public Type getType() {
+				return Type.CONTAINER;
+			}
+		});
 		testPlan.add(identifier);
 		return identifier;
 	}
 
 	private String summaryAsString() {
-		StringWriter summaryWriter = new StringWriter();
+		var summaryWriter = new StringWriter();
 		listener.getSummary().printTo(new PrintWriter(summaryWriter));
 		return summaryWriter.toString();
 	}
 
 	private String failuresAsString() {
-		StringWriter failuresWriter = new StringWriter();
+		var failuresWriter = new StringWriter();
 		listener.getSummary().printFailuresTo(new PrintWriter(failuresWriter));
 		return failuresWriter.toString();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
index 5a2817934103..c26431e30fe4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
@@ -96,7 +96,7 @@ private static Stream<Arguments> data() {
 
 	private String parseErrorFromParsing(String tagExpression) {
 		try {
-			ParseResult parseResult = parser.parse(tagExpression);
+			var parseResult = parser.parse(tagExpression);
 			parseResult.tagExpressionOrThrow(RuntimeException::new);
 			return null;
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
index 5d0d229494fa..76317c319023 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
@@ -47,7 +47,7 @@ void rejectInvalidTestTags() {
 
 	@Test
 	void tagEvaluation() {
-		TagExpression tagExpression = tag("foo");
+		var tagExpression = tag("foo");
 
 		assertThat(tagExpression.evaluate(singleton(create("foo")))).isTrue();
 		assertThat(tagExpression.evaluate(singleton(create("not_foo")))).isFalse();
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
index 7ca3c5265f55..5bacfc948009 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
@@ -12,8 +12,6 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-import java.util.List;
-
 import org.junit.jupiter.api.Test;
 
 class TokenTests {
@@ -41,10 +39,10 @@ void lastCharacterIndex() {
 
 	@Test
 	void concatenateTwoTokens() {
-		List<Token> tokens = new Tokenizer().tokenize(" ! foo");
-		Token one = tokens.get(0);
-		Token two = tokens.get(1);
-		Token joined = one.concatenate(two);
+		var tokens = new Tokenizer().tokenize(" ! foo");
+		var one = tokens.get(0);
+		var two = tokens.get(1);
+		var joined = one.concatenate(two);
 		assertThat(joined.rawString).isEqualTo(" ! foo");
 		assertThat(joined.startIndex).isEqualTo(0);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
index 26b54d071fe1..18dfc914de42 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
@@ -31,8 +31,8 @@ class LegacyReportingUtilsTests {
 
 	@Test
 	void legacyReportingClassNameForTestIdentifierWithoutClassSourceIsParentLegacyReportingName() {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("child", "bar");
-		TestDescriptor testDescriptor = createTestDescriptor(uniqueId, "Bar", null);
+		var uniqueId = engineDescriptor.getUniqueId().append("child", "bar");
+		var testDescriptor = createTestDescriptor(uniqueId, "Bar", null);
 		engineDescriptor.addChild(testDescriptor);
 
 		assertThat(getClassName(engineDescriptor.getUniqueId())).isEqualTo("<unrooted>");
@@ -44,17 +44,17 @@ void legacyReportingClassNameForTestIdentifierWithoutClassSourceIsParentLegacyRe
 
 	@Test
 	void legacyReportingClassNameForDescendantOfTestIdentifierWithClassSourceIsClassName() {
-		UniqueId classUniqueId = engineDescriptor.getUniqueId().append("class", "class");
-		TestDescriptor classDescriptor = createTestDescriptor(classUniqueId, "Class",
+		var classUniqueId = engineDescriptor.getUniqueId().append("class", "class");
+		var classDescriptor = createTestDescriptor(classUniqueId, "Class",
 			ClassSource.from(LegacyReportingUtilsTests.class));
 		engineDescriptor.addChild(classDescriptor);
 
-		UniqueId subUniqueId = classUniqueId.append("sub", "baz");
-		TestDescriptor subDescriptor = createTestDescriptor(subUniqueId, "Baz", null);
+		var subUniqueId = classUniqueId.append("sub", "baz");
+		var subDescriptor = createTestDescriptor(subUniqueId, "Baz", null);
 		classDescriptor.addChild(subDescriptor);
 
-		UniqueId subSubUniqueId = subUniqueId.append("subsub", "qux");
-		TestDescriptor subSubDescriptor = createTestDescriptor(subSubUniqueId, "Qux", null);
+		var subSubUniqueId = subUniqueId.append("subsub", "qux");
+		var subSubDescriptor = createTestDescriptor(subSubUniqueId, "Qux", null);
 		subDescriptor.addChild(subSubDescriptor);
 
 		assertThat(getClassName(engineDescriptor.getUniqueId())).isEqualTo("<unrooted>");
@@ -69,13 +69,13 @@ void legacyReportingClassNameForDescendantOfTestIdentifierWithClassSourceIsClass
 	}
 
 	private String getClassName(UniqueId uniqueId) {
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 		return LegacyReportingUtils.getClassName(testPlan, testPlan.getTestIdentifier(uniqueId.toString()));
 	}
 
 	@SuppressWarnings("deprecation")
 	private String getClassNameFromOldLocation(UniqueId uniqueId) {
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 		return org.junit.platform.launcher.listeners.LegacyReportingUtils.getClassName(testPlan,
 			testPlan.getTestIdentifier(uniqueId.toString()));
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 24e9d280e9e6..1ec5f63218c0 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -46,10 +46,8 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
-import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestDescriptor;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 import org.junit.platform.fakes.TestDescriptorStub;
-import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 import org.opentest4j.AssertionFailedError;
@@ -63,13 +61,13 @@ class LegacyXmlReportGeneratingListenerTests {
 
 	@Test
 	void writesFileForSingleSucceedingTest(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("succeedingTest", "display<-->Name 😎", () -> {
 		});
 
 		executeTests(engine, tempDirectory);
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -96,12 +94,12 @@ void writesFileForSingleSucceedingTest(@TempDir Path tempDirectory) throws Excep
 
 	@Test
 	void writesFileForSingleFailingTest(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("failingTest", () -> fail("expected to <b>fail</b>"));
 
 		executeTests(engine, tempDirectory);
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -121,14 +119,14 @@ void writesFileForSingleFailingTest(@TempDir Path tempDirectory) throws Exceptio
 
 	@Test
 	void writesFileForSingleErroneousTest(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("failingTest", () -> {
 			throw new RuntimeException("error occurred");
 		});
 
 		executeTests(engine, tempDirectory);
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -148,13 +146,13 @@ void writesFileForSingleErroneousTest(@TempDir Path tempDirectory) throws Except
 
 	@Test
 	void writesFileForSingleSkippedTest(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
-		DemoHierarchicalTestDescriptor testDescriptor = engine.addTest("skippedTest", () -> fail("never called"));
+		var engine = new DemoHierarchicalTestEngine("dummy");
+		var testDescriptor = engine.addTest("skippedTest", () -> fail("never called"));
 		testDescriptor.markSkipped("should be skipped");
 
 		executeTests(engine, tempDirectory);
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -173,12 +171,12 @@ void writesFileForSingleSkippedTest(@TempDir Path tempDirectory) throws Exceptio
 
 	@Test
 	void writesFileForSingleAbortedTest(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("abortedTest", () -> assumeFalse(true, "deliberately aborted"));
 
 		executeTests(engine, tempDirectory);
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -199,7 +197,7 @@ void writesFileForSingleAbortedTest(@TempDir Path tempDirectory) throws Exceptio
 
 	@Test
 	void measuresTimesInSeconds(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("firstTest", () -> {
 		});
 		engine.addTest("secondTest", () -> {
@@ -207,7 +205,7 @@ void measuresTimesInSeconds(@TempDir Path tempDirectory) throws Exception {
 
 		executeTests(engine, tempDirectory, new IncrementingClock(0, Duration.ofMillis(333)));
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		//               start        end
@@ -225,13 +223,13 @@ void measuresTimesInSeconds(@TempDir Path tempDirectory) throws Exception {
 
 	@Test
 	void testWithImmeasurableTimeIsOutputCorrectly(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> {
 		});
 
 		executeTests(engine, tempDirectory, Clock.fixed(Instant.EPOCH, ZoneId.systemDefault()));
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -243,13 +241,13 @@ void testWithImmeasurableTimeIsOutputCorrectly(@TempDir Path tempDirectory) thro
 
 	@Test
 	void writesFileForSkippedContainer(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> fail("never called"));
 		engine.getEngineDescriptor().markSkipped("should be skipped");
 
 		executeTests(engine, tempDirectory);
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -266,13 +264,13 @@ void writesFileForSkippedContainer(@TempDir Path tempDirectory) throws Exception
 
 	@Test
 	void writesFileForFailingContainer(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> fail("never called"));
 		engine.getEngineDescriptor().setBeforeAllBehavior(() -> fail("failure before all tests"));
 
 		executeTests(engine, tempDirectory);
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -290,13 +288,13 @@ void writesFileForFailingContainer(@TempDir Path tempDirectory) throws Exception
 
 	@Test
 	void writesSystemProperties(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> {
 		});
 
 		executeTests(engine, tempDirectory);
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -313,16 +311,16 @@ void writesSystemProperties(@TempDir Path tempDirectory) throws Exception {
 
 	@Test
 	void writesHostNameAndTimestamp(@TempDir Path tempDirectory) throws Exception {
-		DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> {
 		});
 
-		LocalDateTime now = LocalDateTime.parse("2016-01-28T14:02:59.123");
-		ZoneId zone = ZoneId.systemDefault();
+		var now = LocalDateTime.parse("2016-01-28T14:02:59.123");
+		var zone = ZoneId.systemDefault();
 
 		executeTests(engine, tempDirectory, Clock.fixed(ZonedDateTime.of(now, zone).toInstant(), zone));
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
 		// @formatter:off
 		assertThat(content)
@@ -337,12 +335,11 @@ void writesHostNameAndTimestamp(@TempDir Path tempDirectory) throws Exception {
 
 	@Test
 	void printsExceptionWhenReportsDirCannotBeCreated(@TempDir Path tempDirectory) throws Exception {
-		Path reportsDir = tempDirectory.resolve("dummy.txt");
+		var reportsDir = tempDirectory.resolve("dummy.txt");
 		Files.write(reportsDir, singleton("content"));
 
-		StringWriter out = new StringWriter();
-		LegacyXmlReportGeneratingListener listener = new LegacyXmlReportGeneratingListener(reportsDir,
-			new PrintWriter(out));
+		var out = new StringWriter();
+		var listener = new LegacyXmlReportGeneratingListener(reportsDir, new PrintWriter(out));
 
 		listener.testPlanExecutionStarted(TestPlan.from(emptySet()));
 
@@ -352,14 +349,13 @@ void printsExceptionWhenReportsDirCannotBeCreated(@TempDir Path tempDirectory) t
 
 	@Test
 	void printsExceptionWhenReportCouldNotBeWritten(@TempDir Path tempDirectory) throws Exception {
-		EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
+		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 
-		Path xmlFile = tempDirectory.resolve("TEST-engine.xml");
+		var xmlFile = tempDirectory.resolve("TEST-engine.xml");
 		Files.createDirectories(xmlFile);
 
-		StringWriter out = new StringWriter();
-		LegacyXmlReportGeneratingListener listener = new LegacyXmlReportGeneratingListener(tempDirectory,
-			new PrintWriter(out));
+		var out = new StringWriter();
+		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
 
 		listener.testPlanExecutionStarted(TestPlan.from(singleton(engineDescriptor)));
 		listener.executionFinished(TestIdentifier.from(engineDescriptor), successful());
@@ -370,16 +366,15 @@ void printsExceptionWhenReportCouldNotBeWritten(@TempDir Path tempDirectory) thr
 	@Test
 	void writesReportEntriesToSystemOutElement(@TempDir Path tempDirectory, TestReporter testReporter)
 			throws Exception {
-		EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
+		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		StringWriter out = new StringWriter();
-		LegacyXmlReportGeneratingListener listener = new LegacyXmlReportGeneratingListener(tempDirectory,
-			new PrintWriter(out));
+		var out = new StringWriter();
+		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
 
 		listener.testPlanExecutionStarted(testPlan);
-		TestIdentifier testIdentifier = testPlan.getTestIdentifier("[child:test]");
+		var testIdentifier = testPlan.getTestIdentifier("[child:test]");
 		listener.executionStarted(testIdentifier);
 		listener.reportingEntryPublished(testIdentifier, ReportEntry.from("foo", "bar"));
 		Map<String, String> map = new LinkedHashMap<>();
@@ -389,7 +384,7 @@ void writesReportEntriesToSystemOutElement(@TempDir Path tempDirectory, TestRepo
 		listener.executionFinished(testIdentifier, successful());
 		listener.executionFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());
 
-		String content = readValidXmlFile(tempDirectory.resolve("TEST-engine.xml"));
+		var content = readValidXmlFile(tempDirectory.resolve("TEST-engine.xml"));
 		//testReporter.publishEntry("xml", content);
 
 		// @formatter:off
@@ -414,17 +409,16 @@ private void executeTests(TestEngine engine, Path tempDirectory) {
 	}
 
 	private void executeTests(TestEngine engine, Path tempDirectory, Clock clock) {
-		PrintWriter out = new PrintWriter(new StringWriter());
-		LegacyXmlReportGeneratingListener reportListener = new LegacyXmlReportGeneratingListener(
-			tempDirectory.toString(), out, clock);
-		Launcher launcher = createLauncher(engine);
+		var out = new PrintWriter(new StringWriter());
+		var reportListener = new LegacyXmlReportGeneratingListener(tempDirectory.toString(), out, clock);
+		var launcher = createLauncher(engine);
 		launcher.registerTestExecutionListeners(reportListener);
 		launcher.execute(request().selectors(selectUniqueId(UniqueId.forEngine(engine.getId()))).build());
 	}
 
 	private String readValidXmlFile(Path xmlFile) throws Exception {
 		assertTrue(Files.exists(xmlFile), () -> "File does not exist: " + xmlFile);
-		String content = new String(Files.readAllBytes(xmlFile), UTF_8);
+		var content = new String(Files.readAllBytes(xmlFile), UTF_8);
 		assertValidAccordingToJenkinsSchema(content);
 		return content;
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
index 3cb96bdd35f7..f9428edf52ac 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
@@ -13,7 +13,6 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.StringReader;
-import java.net.URL;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.stream.StreamSource;
@@ -31,7 +30,7 @@ class XmlReportAssertions {
 	static void assertValidAccordingToJenkinsSchema(String content) throws Exception {
 		try {
 			// Schema is thread-safe, Validator is not
-			Validator validator = CachedSchema.JENKINS.newValidator();
+			var validator = CachedSchema.JENKINS.newValidator();
 			validator.validate(new StreamSource(new StringReader(content)));
 		}
 		catch (SAXException e) {
@@ -46,8 +45,8 @@ private enum CachedSchema {
 		private final Schema schema;
 
 		CachedSchema(String resourcePath) {
-			URL schemaFile = LegacyXmlReportGeneratingListener.class.getResource(resourcePath);
-			SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+			var schemaFile = LegacyXmlReportGeneratingListener.class.getResource(resourcePath);
+			var schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
 			try {
 				this.schema = schemaFactory.newSchema(schemaFile);
 			}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index 2d3a530027da..b23157d56dc6 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -16,10 +16,8 @@
 import static org.junit.platform.engine.TestExecutionResult.successful;
 
 import java.time.Clock;
-import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 import org.junit.platform.fakes.TestDescriptorStub;
@@ -32,41 +30,41 @@ class XmlReportDataTests {
 
 	@Test
 	void resultOfTestIdentifierWithoutAnyReportedEventsIsEmpty() {
-		EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
+		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
 
 		assertThat(result).isEmpty();
 	}
 
 	@Test
 	void resultOfTestIdentifierWithoutReportedEventsIsFailureOfAncestor() {
-		EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
+		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		TestExecutionResult failureOfAncestor = failed(new RuntimeException("failed!"));
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var failureOfAncestor = failed(new RuntimeException("failed!"));
 		reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), failureOfAncestor);
 
-		Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
+		var result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
 
 		assertThat(result).contains(failureOfAncestor);
 	}
 
 	@Test
 	void resultOfTestIdentifierWithoutReportedEventsIsEmptyWhenAncestorWasSuccessful() {
-		EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
+		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());
 
-		Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
+		var result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
 
 		assertThat(result).isEmpty();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index 3064734df1d1..bf0b797a958b 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -48,11 +48,11 @@ class XmlReportWriterTests {
 
 	@Test
 	void writesTestsuiteElementsWithoutTestcaseElementsWithoutAnyTests() throws Exception {
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 
-		String content = writeXmlReport(testPlan, reportData);
+		var content = writeXmlReport(testPlan, reportData);
 
 		assertValidAccordingToJenkinsSchema(content);
 		//@formatter:off
@@ -66,16 +66,16 @@ void writesTestsuiteElementsWithoutTestcaseElementsWithoutAnyTests() throws Exce
 
 	@Test
 	void writesReportEntry() throws Exception {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", "test");
-		TestDescriptorStub testDescriptor = new TestDescriptorStub(uniqueId, "successfulTest");
+		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
+		var testDescriptor = new TestDescriptorStub(uniqueId, "successfulTest");
 		engineDescriptor.addChild(testDescriptor);
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), ReportEntry.from("myKey", "myValue"));
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), successful());
 
-		String content = writeXmlReport(testPlan, reportData);
+		var content = writeXmlReport(testPlan, reportData);
 
 		assertValidAccordingToJenkinsSchema(content);
 		//@formatter:off
@@ -90,13 +90,13 @@ void writesReportEntry() throws Exception {
 
 	@Test
 	void writesCapturedOutput() throws Exception {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", "test");
-		TestDescriptorStub testDescriptor = new TestDescriptorStub(uniqueId, "successfulTest");
+		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
+		var testDescriptor = new TestDescriptorStub(uniqueId, "successfulTest");
 		engineDescriptor.addChild(testDescriptor);
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		ReportEntry reportEntry = ReportEntry.from(Map.of( //
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var reportEntry = ReportEntry.from(Map.of( //
 			STDOUT_REPORT_ENTRY_KEY, "normal output", //
 			STDERR_REPORT_ENTRY_KEY, "error output", //
 			"foo", "bar"));
@@ -104,7 +104,7 @@ void writesCapturedOutput() throws Exception {
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), ReportEntry.from(Map.of("baz", "qux")));
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), successful());
 
-		String content = writeXmlReport(testPlan, reportData);
+		var content = writeXmlReport(testPlan, reportData);
 
 		assertValidAccordingToJenkinsSchema(content);
 		//@formatter:off
@@ -132,14 +132,14 @@ void writesCapturedOutput() throws Exception {
 
 	@Test
 	void writesEmptySkippedElementForSkippedTestWithoutReason() throws Exception {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", "test");
+		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "skippedTest"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markSkipped(testPlan.getTestIdentifier(uniqueId.toString()), null);
 
-		String content = writeXmlReport(testPlan, reportData);
+		var content = writeXmlReport(testPlan, reportData);
 
 		assertValidAccordingToJenkinsSchema(content);
 		//@formatter:off
@@ -159,19 +159,19 @@ public String getLegacyReportingName() {
 				return "myEngine";
 			}
 		};
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", "test");
+		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "some fancy name") {
 			@Override
 			public String getLegacyReportingName() {
 				return "failedTest";
 			}
 		});
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(null));
 
-		String content = writeXmlReport(testPlan, reportData);
+		var content = writeXmlReport(testPlan, reportData);
 
 		assertValidAccordingToJenkinsSchema(content);
 		//@formatter:off
@@ -185,14 +185,14 @@ public String getLegacyReportingName() {
 
 	@Test
 	void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exception {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", "test");
+		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "failedTest"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(new NullPointerException()));
 
-		String content = writeXmlReport(testPlan, reportData);
+		var content = writeXmlReport(testPlan, reportData);
 
 		assertValidAccordingToJenkinsSchema(content);
 		//@formatter:off
@@ -206,15 +206,15 @@ void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exce
 
 	@Test
 	void writesValidXmlEvenIfExceptionMessageContainsCData() throws Exception {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", "test");
+		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		AssertionError assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
 
-		String content = writeXmlReport(testPlan, reportData);
+		var content = writeXmlReport(testPlan, reportData);
 
 		assertValidAccordingToJenkinsSchema(content);
 		//@formatter:off
@@ -229,12 +229,12 @@ void writesValidXmlEvenIfExceptionMessageContainsCData() throws Exception {
 
 	@Test
 	void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages(TestInfo testInfo) throws Exception {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", "test");
+		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		AssertionError assertionError = new AssertionError("expected: <A> but was: <B\0>");
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var assertionError = new AssertionError("expected: <A> but was: <B\0>");
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
 
 		System.setProperty("foo.bar", "\1");
@@ -255,12 +255,12 @@ void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages(TestInfo tes
 
 	@Test
 	void doesNotReopenCDataWithinCDataContent() throws Exception {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", "test");
+		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(singleton(engineDescriptor));
 
-		XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		AssertionError assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
+		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
+		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
 		Writer assertingWriter = new StringWriter() {
 
@@ -294,7 +294,7 @@ static Stream<Arguments> stringPairs() {
 	}
 
 	private String writeXmlReport(TestPlan testPlan, XmlReportData reportData) throws Exception {
-		StringWriter out = new StringWriter();
+		var out = new StringWriter();
 		writeXmlReport(testPlan, reportData, out);
 		return out.toString();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index 32d5cb8b5be8..bbde830b43c5 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -38,17 +38,14 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.EngineDiscoveryRequest;
-import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.ExecutionRequest;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestEngine;
@@ -64,15 +61,12 @@
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 import org.junit.platform.engine.support.descriptor.MethodSource;
-import org.junit.platform.engine.support.hierarchical.DemoHierarchicalContainerDescriptor;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestDescriptor;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 import org.junit.platform.fakes.TestDescriptorStub;
 import org.junit.platform.fakes.TestEngineStub;
-import org.junit.platform.launcher.EngineFilter;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
-import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.suite.api.ExcludeClassNamePatterns;
 import org.junit.platform.suite.api.ExcludeEngines;
@@ -91,7 +85,6 @@
 import org.junit.runner.notification.RunListener;
 import org.junit.runner.notification.RunNotifier;
 import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
 
 /**
  * Tests for the {@link JUnitPlatform} runner.
@@ -110,11 +103,11 @@ void requestsClassSelectorForAnnotatedClassWhenNoAdditionalAnnotationsArePresent
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassSelector> selectors = request.getSelectorsByType(ClassSelector.class);
+			var selectors = request.getSelectorsByType(ClassSelector.class);
 			assertThat(selectors).hasSize(1);
-			ClassSelector classSelector = getOnlyElement(selectors);
+			var classSelector = getOnlyElement(selectors);
 			assertEquals(TestCase.class, classSelector.getJavaClass());
 		}
 
@@ -125,9 +118,9 @@ void requestsClassSelectorsWhenSelectClassesAnnotationIsPresent() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassSelector> selectors = request.getSelectorsByType(ClassSelector.class);
+			var selectors = request.getSelectorsByType(ClassSelector.class);
 			assertThat(selectors).hasSize(2);
 			assertEquals(Short.class, selectors.get(0).getJavaClass());
 			assertEquals(Byte.class, selectors.get(1).getJavaClass());
@@ -140,9 +133,9 @@ void requestsPackageSelectorsWhenPackagesAnnotationIsPresent() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<PackageSelector> selectors = request.getSelectorsByType(PackageSelector.class);
+			var selectors = request.getSelectorsByType(PackageSelector.class);
 			assertThat(selectors).hasSize(2);
 			assertEquals("foo", selectors.get(0).getPackageName());
 			assertEquals("bar", selectors.get(1).getPackageName());
@@ -155,12 +148,12 @@ void addsPackageFiltersToRequestWhenIncludePackageAnnotationIsPresent() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<PackageNameFilter> filters = request.getFiltersByType(PackageNameFilter.class);
+			var filters = request.getFiltersByType(PackageNameFilter.class);
 			assertThat(filters).hasSize(1);
 
-			PackageNameFilter filter = filters.get(0);
+			var filter = filters.get(0);
 			assertTrue(filter.apply("includedpackage1.TestClass").included());
 			assertTrue(filter.apply("includedpackage2.TestClass").included());
 			assertTrue(filter.apply("excludedpackage1.TestClass").excluded());
@@ -173,12 +166,12 @@ void addsPackageFiltersToRequestWhenExcludePackageAnnotationIsPresent() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<PackageNameFilter> filters = request.getFiltersByType(PackageNameFilter.class);
+			var filters = request.getFiltersByType(PackageNameFilter.class);
 			assertThat(filters).hasSize(1);
 
-			PackageNameFilter filter = filters.get(0);
+			var filter = filters.get(0);
 			assertTrue(filter.apply("includedpackage1.TestClass").included());
 			assertTrue(filter.apply("excludedpackage1.TestClass").excluded());
 			assertTrue(filter.apply("excludedpackage2.TestClass").excluded());
@@ -191,12 +184,12 @@ void addsTagFilterToRequestWhenIncludeTagsAnnotationIsPresent() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<PostDiscoveryFilter> filters = request.getPostDiscoveryFilters();
+			var filters = request.getPostDiscoveryFilters();
 			assertThat(filters).hasSize(1);
 
-			PostDiscoveryFilter filter = filters.get(0);
+			var filter = filters.get(0);
 			assertTrue(filter.apply(testDescriptorWithTags("foo")).included());
 			assertTrue(filter.apply(testDescriptorWithTags("bar")).included());
 			assertTrue(filter.apply(testDescriptorWithTags("baz")).excluded());
@@ -209,12 +202,12 @@ void addsTagFilterToRequestWhenExcludeTagsAnnotationIsPresent() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<PostDiscoveryFilter> filters = request.getPostDiscoveryFilters();
+			var filters = request.getPostDiscoveryFilters();
 			assertThat(filters).hasSize(1);
 
-			PostDiscoveryFilter filter = filters.get(0);
+			var filter = filters.get(0);
 			assertTrue(filter.apply(testDescriptorWithTags("foo")).excluded());
 			assertTrue(filter.apply(testDescriptorWithTags("bar")).excluded());
 			assertTrue(filter.apply(testDescriptorWithTags("baz")).included());
@@ -227,12 +220,12 @@ void includeTagsAcceptsTagExpressions() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<PostDiscoveryFilter> filters = request.getPostDiscoveryFilters();
+			var filters = request.getPostDiscoveryFilters();
 			assertThat(filters).hasSize(1);
 
-			PostDiscoveryFilter filter = filters.get(0);
+			var filter = filters.get(0);
 			assertTrue(filter.apply(testDescriptorWithTags("foo")).included());
 			assertTrue(filter.apply(testDescriptorWithTags("foo", "any_other_tag")).included());
 			assertTrue(filter.apply(testDescriptorWithTags("foo", "bar")).excluded());
@@ -247,12 +240,12 @@ void excludeTagsAcceptsTagExpressions() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<PostDiscoveryFilter> filters = request.getPostDiscoveryFilters();
+			var filters = request.getPostDiscoveryFilters();
 			assertThat(filters).hasSize(1);
 
-			PostDiscoveryFilter filter = filters.get(0);
+			var filter = filters.get(0);
 			assertTrue(filter.apply(testDescriptorWithTags("foo")).excluded());
 			assertTrue(filter.apply(testDescriptorWithTags("foo", "any_other_tag")).excluded());
 			assertTrue(filter.apply(testDescriptorWithTags("foo", "bar")).included());
@@ -273,18 +266,18 @@ class TestCase {
 			TestEngine bazEngine = new TestEngineStub("baz");
 			TestEngine quuxEngine = new TestEngineStub("quux");
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<EngineFilter> filters = request.getEngineFilters();
+			var filters = request.getEngineFilters();
 			assertThat(filters).hasSize(2);
 
-			EngineFilter includeFilter = filters.get(0);
+			var includeFilter = filters.get(0);
 			assertTrue(includeFilter.apply(fooEngine).included());
 			assertTrue(includeFilter.apply(barEngine).included());
 			assertTrue(includeFilter.apply(bazEngine).included());
 			assertTrue(includeFilter.apply(quuxEngine).excluded());
 
-			EngineFilter excludeFilter = filters.get(1);
+			var excludeFilter = filters.get(1);
 			assertTrue(excludeFilter.apply(fooEngine).included());
 			assertTrue(excludeFilter.apply(barEngine).excluded());
 			assertTrue(excludeFilter.apply(bazEngine).included());
@@ -298,9 +291,9 @@ void addsDefaultClassNameFilterToRequestWhenFilterClassNameAnnotationIsNotPresen
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(getOnlyElement(filters).toString()).contains(STANDARD_INCLUDE_PATTERN);
 		}
 
@@ -310,9 +303,9 @@ void addsDefaultClassNameFilterToRequestWhenFilterClassNameAnnotationIsNotPresen
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(filters).isEmpty();
 		}
 
@@ -323,9 +316,9 @@ void addsSingleExplicitClassNameFilterToRequestWhenIncludeClassNamePatternsAnnot
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(getOnlyElement(filters).toString()).contains(".*Foo");
 		}
 
@@ -336,9 +329,9 @@ void addsSingleClassNameFilterToRequestWhenExcludeClassNamePatternsAnnotationIsP
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(getOnlyElement(filters).toString()).contains(".*Foo");
 		}
 
@@ -349,9 +342,9 @@ void addsMultipleExplicitClassNameFilterToRequestWhenIncludeClassNamePatternsAnn
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(getOnlyElement(filters).toString()).contains(".*Foo", "Bar.*");
 		}
 
@@ -362,9 +355,9 @@ void addsMultipleClassNameFilterToRequestWhenExcludeClassNamePatternsAnnotationI
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(getOnlyElement(filters).toString()).contains(".*Foo", "Bar.*");
 		}
 
@@ -375,9 +368,9 @@ void usesStandardIncludePatternWhenIncludeClassNamePatternsAnnotationIsPresentWi
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(getOnlyElement(filters).toString()).contains(STANDARD_INCLUDE_PATTERN);
 		}
 
@@ -388,9 +381,9 @@ void doesNotAddClassNameFilterWhenIncludeClassNamePatternsAnnotationIsPresentWit
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(filters).isEmpty();
 		}
 
@@ -401,9 +394,9 @@ void doesNotAddClassNameFilterWhenExcludeClassNamePatternsAnnotationIsPresentWit
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(filters).isEmpty();
 		}
 
@@ -414,9 +407,9 @@ void trimsArgumentsOfIncludeClassNamePatternsAnnotation() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(getOnlyElement(filters).toString()).contains("'foo'", "'bar'");
 		}
 
@@ -427,9 +420,9 @@ void trimsArgumentsOfExcludeClassNamePatternsAnnotation() {
 			class TestCase {
 			}
 
-			LauncherDiscoveryRequest request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
 
-			List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+			var filters = request.getFiltersByType(ClassNameFilter.class);
 			assertThat(getOnlyElement(filters).toString()).contains("'foo'", "'bar'");
 		}
 
@@ -441,14 +434,14 @@ void convertsTestIdentifiersIntoDescriptions() {
 			TestDescriptor container2 = new TestDescriptorStub(UniqueId.root("root", "container2"), "container2");
 			container2.addChild(new TestDescriptorStub(UniqueId.root("root", "test2a"), "test2a"));
 			container2.addChild(new TestDescriptorStub(UniqueId.root("root", "test2b"), "test2b"));
-			TestPlan testPlan = TestPlan.from(asList(container1, container2));
+			var testPlan = TestPlan.from(asList(container1, container2));
 
-			Launcher launcher = mock(Launcher.class);
+			var launcher = mock(Launcher.class);
 			when(launcher.discover(any())).thenReturn(testPlan);
 
-			JUnitPlatform runner = new JUnitPlatform(TestClass.class, launcher);
+			var runner = new JUnitPlatform(TestClass.class, launcher);
 
-			Description runnerDescription = runner.getDescription();
+			var runnerDescription = runner.getDescription();
 			assertEquals(createSuiteDescription(TestClass.class), runnerDescription);
 
 			List<Description> containerDescriptions = runnerDescription.getChildren();
@@ -478,38 +471,38 @@ void appliesFilter() throws Exception {
 			TestDescriptor originalParent2 = new TestDescriptorStub(UniqueId.root("root", "parent2"), "parent2");
 			originalParent2.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2a"), "leaf2a"));
 			originalParent2.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2b"), "leaf2b"));
-			TestPlan fullTestPlan = TestPlan.from(asList(originalParent1, originalParent2));
+			var fullTestPlan = TestPlan.from(asList(originalParent1, originalParent2));
 
 			TestDescriptor filteredParent = new TestDescriptorStub(UniqueId.root("root", "parent2"), "parent2");
 			filteredParent.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2b"), "leaf2b"));
-			TestPlan filteredTestPlan = TestPlan.from(singleton(filteredParent));
+			var filteredTestPlan = TestPlan.from(singleton(filteredParent));
 
-			Launcher launcher = mock(Launcher.class);
-			ArgumentCaptor<LauncherDiscoveryRequest> captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
+			var launcher = mock(Launcher.class);
+			var captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
 			when(launcher.discover(captor.capture())).thenReturn(fullTestPlan).thenReturn(filteredTestPlan);
 
-			JUnitPlatform runner = new JUnitPlatform(TestClass.class, launcher);
+			var runner = new JUnitPlatform(TestClass.class, launcher);
 			runner.filter(matchMethodDescription(testDescription("[root:leaf2b]")));
 
-			LauncherDiscoveryRequest lastDiscoveryRequest = captor.getValue();
-			List<UniqueIdSelector> uniqueIdSelectors = lastDiscoveryRequest.getSelectorsByType(UniqueIdSelector.class);
+			var lastDiscoveryRequest = captor.getValue();
+			var uniqueIdSelectors = lastDiscoveryRequest.getSelectorsByType(UniqueIdSelector.class);
 			assertEquals("[root:leaf2b]", getOnlyElement(uniqueIdSelectors).getUniqueId().toString());
 
-			Description parentDescription = getOnlyElement(runner.getDescription().getChildren());
+			var parentDescription = getOnlyElement(runner.getDescription().getChildren());
 			assertEquals(suiteDescription("[root:parent2]"), parentDescription);
 
-			Description testDescription = getOnlyElement(parentDescription.getChildren());
+			var testDescription = getOnlyElement(parentDescription.getChildren());
 			assertEquals(testDescription("[root:leaf2b]"), testDescription);
 		}
 
 		@Test
 		void throwsNoTestsRemainExceptionWhenNoTestIdentifierMatchesFilter() {
-			TestPlan testPlan = TestPlan.from(singleton(new TestDescriptorStub(UniqueId.root("root", "test"), "test")));
+			var testPlan = TestPlan.from(singleton(new TestDescriptorStub(UniqueId.root("root", "test"), "test")));
 
-			Launcher launcher = mock(Launcher.class);
+			var launcher = mock(Launcher.class);
 			when(launcher.discover(any())).thenReturn(testPlan);
 
-			JUnitPlatform runner = new JUnitPlatform(TestClass.class, launcher);
+			var runner = new JUnitPlatform(TestClass.class, launcher);
 
 			assertThrows(NoTestsRemainException.class,
 				() -> runner.filter(matchMethodDescription(suiteDescription("[root:doesNotExist]"))));
@@ -522,20 +515,20 @@ class Execution {
 
 		@Test
 		void notifiesRunListenerOfTestExecution() throws Exception {
-			DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
+			var engine = new DemoHierarchicalTestEngine("dummy");
 			engine.addTest("failingTest", () -> fail("expected to fail"));
 			engine.addTest("succeedingTest", () -> {
 			});
 			engine.addTest("abortedTest", () -> assumeFalse(true));
 			engine.addTest("skippedTest", () -> fail("never called")).markSkipped("should be skipped");
 
-			RunListener runListener = mock(RunListener.class);
+			var runListener = mock(RunListener.class);
 
-			RunNotifier notifier = new RunNotifier();
+			var notifier = new RunNotifier();
 			notifier.addListener(runListener);
 			new JUnitPlatform(TestClass.class, createLauncher(engine)).run(notifier);
 
-			InOrder inOrder = inOrder(runListener);
+			var inOrder = inOrder(runListener);
 
 			inOrder.verify(runListener).testStarted(testDescription("[engine:dummy]/[test:failingTest]"));
 			inOrder.verify(runListener).testFailure(any());
@@ -555,13 +548,13 @@ void notifiesRunListenerOfTestExecution() throws Exception {
 
 		@Test
 		void supportsDynamicTestRegistration() throws Exception {
-			RunListener runListener = mock(RunListener.class);
-			RunNotifier notifier = new RunNotifier();
+			var runListener = mock(RunListener.class);
+			var notifier = new RunNotifier();
 			// notifier.addListener(new LoggingRunListener());
 			notifier.addListener(runListener);
 			new JUnitPlatform(TestClass.class, createLauncher(new DynamicTestEngine())).run(notifier);
 
-			InOrder inOrder = inOrder(runListener);
+			var inOrder = inOrder(runListener);
 
 			inOrder.verify(runListener).testStarted(testDescription("[engine:dynamic]/[container:1]/[test:1]"));
 			inOrder.verify(runListener).testFinished(testDescription("[engine:dynamic]/[container:1]/[test:1]"));
@@ -582,27 +575,27 @@ void supportsDynamicTestRegistration() throws Exception {
 
 		@Test
 		void reportsIgnoredEventsForLeavesWhenContainerIsSkipped() throws Exception {
-			UniqueId uniqueEngineId = UniqueId.forEngine("engine");
+			var uniqueEngineId = UniqueId.forEngine("engine");
 			TestDescriptor engineDescriptor = new EngineDescriptor(uniqueEngineId, "engine");
 			TestDescriptor container = new TestDescriptorStub(UniqueId.root("root", "container"), "container");
 			container.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf"), "leaf"));
 			engineDescriptor.addChild(container);
 
-			TestEngine engine = mock(TestEngine.class);
+			var engine = mock(TestEngine.class);
 			when(engine.getId()).thenReturn("engine");
 			when(engine.discover(any(), eq(uniqueEngineId))).thenReturn(engineDescriptor);
 			doAnswer(invocation -> {
 				ExecutionRequest request = invocation.getArgument(0);
-				EngineExecutionListener listener = request.getEngineExecutionListener();
+				var listener = request.getEngineExecutionListener();
 				listener.executionStarted(engineDescriptor);
 				listener.executionSkipped(container, "deliberately skipped container");
 				listener.executionFinished(engineDescriptor, successful());
 				return null;
 			}).when(engine).execute(any());
 
-			RunListener runListener = mock(RunListener.class);
+			var runListener = mock(RunListener.class);
 
-			RunNotifier notifier = new RunNotifier();
+			var notifier = new RunNotifier();
 			notifier.addListener(runListener);
 			new JUnitPlatform(TestClass.class, createLauncher(engine)).run(notifier);
 
@@ -619,7 +612,7 @@ class Descriptions {
 		@DisplayName("Suite with default display name")
 		void descriptionForTestSuiteWithDefaultDisplayName() {
 			Class<?> testClass = TestSuiteWithDefaultDisplayName.class;
-			JUnitPlatform platformRunner = new JUnitPlatform(testClass,
+			var platformRunner = new JUnitPlatform(testClass,
 				createLauncher(new DemoHierarchicalTestEngine("suite names")));
 
 			assertEquals(testClass.getName(), platformRunner.getDescription().getDisplayName());
@@ -628,7 +621,7 @@ void descriptionForTestSuiteWithDefaultDisplayName() {
 		@Test
 		@DisplayName("Suite with @SuiteDisplayName")
 		void descriptionForTestSuiteWithCustomDisplayName() {
-			JUnitPlatform platformRunner = new JUnitPlatform(TestSuiteWithCustomDisplayName.class,
+			var platformRunner = new JUnitPlatform(TestSuiteWithCustomDisplayName.class,
 				createLauncher(new DemoHierarchicalTestEngine("suite names")));
 
 			assertEquals("Sweeeeeeet Name!", platformRunner.getDescription().getDisplayName());
@@ -638,7 +631,7 @@ void descriptionForTestSuiteWithCustomDisplayName() {
 		@DisplayName("Suite with @SuiteDisplayName and @UseTechnicalNames")
 		void descriptionForTestSuiteWithCustomDisplayNameAndTechnicalNames() {
 			Class<?> testClass = TestSuiteWithCustomDisplayNameAndTechnicalNames.class;
-			JUnitPlatform platformRunner = new JUnitPlatform(testClass,
+			var platformRunner = new JUnitPlatform(testClass,
 				createLauncher(new DemoHierarchicalTestEngine("suite names")));
 
 			assertEquals(testClass.getName(), platformRunner.getDescription().getDisplayName());
@@ -646,24 +639,24 @@ void descriptionForTestSuiteWithCustomDisplayNameAndTechnicalNames() {
 
 		@Test
 		void descriptionForJavaMethodAndClassSources() throws Exception {
-			DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
-			Method failingTest = getClass().getDeclaredMethod("failingTest");
-			DemoHierarchicalContainerDescriptor containerDescriptor = engine.addContainer("uniqueContainerName",
-				"containerDisplayName", ClassSource.from(getClass()));
+			var engine = new DemoHierarchicalTestEngine("dummy");
+			var failingTest = getClass().getDeclaredMethod("failingTest");
+			var containerDescriptor = engine.addContainer("uniqueContainerName", "containerDisplayName",
+				ClassSource.from(getClass()));
 			containerDescriptor.addChild(
 				new DemoHierarchicalTestDescriptor(containerDescriptor.getUniqueId().append("test", "failingTest"),
 					"testDisplayName", MethodSource.from(failingTest), () -> {
 					}));
 
-			JUnitPlatform platformRunner = new JUnitPlatform(TestClass.class, createLauncher(engine));
+			var platformRunner = new JUnitPlatform(TestClass.class, createLauncher(engine));
 
 			List<Description> children = platformRunner.getDescription().getChildren();
 			assertEquals(1, children.size());
-			Description engineDescription = children.get(0);
+			var engineDescription = children.get(0);
 			assertEquals("dummy", engineDescription.getDisplayName());
 
-			Description containerDescription = getOnlyElement(engineDescription.getChildren());
-			Description testDescription = getOnlyElement(containerDescription.getChildren());
+			var containerDescription = getOnlyElement(engineDescription.getChildren());
+			var testDescription = getOnlyElement(containerDescription.getChildren());
 
 			// @formatter:off
 			assertAll(
@@ -682,24 +675,24 @@ void descriptionForJavaMethodAndClassSources() throws Exception {
 
 		@Test
 		void descriptionForJavaMethodAndClassSourcesUsingTechnicalNames() throws Exception {
-			DemoHierarchicalTestEngine engine = new DemoHierarchicalTestEngine("dummy");
-			Method failingTest = getClass().getDeclaredMethod("failingTest");
-			DemoHierarchicalContainerDescriptor containerDescriptor = engine.addContainer("uniqueContainerName",
-				"containerDisplayName", ClassSource.from(getClass()));
+			var engine = new DemoHierarchicalTestEngine("dummy");
+			var failingTest = getClass().getDeclaredMethod("failingTest");
+			var containerDescriptor = engine.addContainer("uniqueContainerName", "containerDisplayName",
+				ClassSource.from(getClass()));
 			containerDescriptor.addChild(
 				new DemoHierarchicalTestDescriptor(containerDescriptor.getUniqueId().append("test", "failingTest"),
 					"testDisplayName", MethodSource.from(failingTest), () -> {
 					}));
 
-			JUnitPlatform platformRunner = new JUnitPlatform(TestClassWithTechnicalNames.class, createLauncher(engine));
+			var platformRunner = new JUnitPlatform(TestClassWithTechnicalNames.class, createLauncher(engine));
 
 			List<Description> children = platformRunner.getDescription().getChildren();
 			assertEquals(1, children.size());
-			Description engineDescription = children.get(0);
+			var engineDescription = children.get(0);
 			assertEquals("dummy", engineDescription.getDisplayName());
 
-			Description containerDescription = getOnlyElement(engineDescription.getChildren());
-			Description testDescription = getOnlyElement(containerDescription.getChildren());
+			var containerDescription = getOnlyElement(engineDescription.getChildren());
+			var testDescription = getOnlyElement(containerDescription.getChildren());
 
 			// @formatter:off
 			assertAll(
@@ -733,15 +726,15 @@ private static Description testDescription(String uniqueId) {
 	}
 
 	private TestDescriptor testDescriptorWithTags(String... tag) {
-		TestDescriptor testDescriptor = mock(TestDescriptor.class);
-		Set<TestTag> tags = Arrays.stream(tag).map(TestTag::create).collect(toSet());
+		var testDescriptor = mock(TestDescriptor.class);
+		var tags = Arrays.stream(tag).map(TestTag::create).collect(toSet());
 		when(testDescriptor.getTags()).thenReturn(tags);
 		return testDescriptor;
 	}
 
 	private LauncherDiscoveryRequest instantiateRunnerAndCaptureGeneratedRequest(Class<?> testClass) {
-		Launcher launcher = mock(Launcher.class);
-		ArgumentCaptor<LauncherDiscoveryRequest> captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
+		var launcher = mock(Launcher.class);
+		var captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
 		when(launcher.discover(captor.capture())).thenReturn(TestPlan.from(emptySet()));
 
 		new JUnitPlatform(testClass, launcher);
@@ -782,8 +775,8 @@ public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId
 
 		@Override
 		public void execute(ExecutionRequest request) {
-			EngineExecutionListener engineExecutionListener = request.getEngineExecutionListener();
-			TestDescriptor root = request.getRootTestDescriptor();
+			var engineExecutionListener = request.getEngineExecutionListener();
+			var root = request.getRootTestDescriptor();
 
 			TestDescriptor container = new DemoContainerTestDescriptor(root.getUniqueId().append("container", "1"),
 				"container #1");
@@ -792,7 +785,7 @@ public void execute(ExecutionRequest request) {
 			engineExecutionListener.dynamicTestRegistered(container);
 			engineExecutionListener.executionStarted(container);
 
-			UniqueId containerUid = container.getUniqueId();
+			var containerUid = container.getUniqueId();
 
 			TestDescriptor dynamicTest1 = new DemoTestTestDescriptor(containerUid.append("test", "1"),
 				"dynamic test #1");
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
index e2cba9100c9b..cca1ddc6eddb 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
@@ -126,9 +126,9 @@ void assertEventsMatchLooselyWithBadConditionsOnlyFails() {
 			event(engine(), skippedWithReason("other")) //
 		);
 
-		AssertJMultipleFailuresError error = assertThrows(AssertJMultipleFailuresError.class, willFail);
+		var error = assertThrows(AssertJMultipleFailuresError.class, willFail);
 
-		List<Throwable> failures = error.getFailures();
+		var failures = error.getFailures();
 		assertEquals(2, failures.size());
 		assertEquals(AssertionError.class, failures.get(0).getClass());
 		assertEquals(AssertionError.class, failures.get(1).getClass());
@@ -142,9 +142,9 @@ void assertEventsMatchLooselyWithOneMatchingAndOneBadConditionFailsPartly() {
 			event(engine(), finishedWithFailure()) //
 		);
 
-		AssertJMultipleFailuresError error = assertThrows(AssertJMultipleFailuresError.class, willFail);
+		var error = assertThrows(AssertJMultipleFailuresError.class, willFail);
 
-		List<Throwable> failures = error.getFailures();
+		var failures = error.getFailures();
 		assertEquals(1, failures.size());
 		assertEquals(AssertionError.class, failures.get(0).getClass());
 	}
@@ -170,7 +170,7 @@ void assertEventsMatchLooselyInOrderWithAllEventsInWrongOrderFails() {
 			event(engine(), started()) //
 		);
 
-		AssertionFailedError error = assertThrows(AssertionFailedError.class, willFail);
+		var error = assertThrows(AssertionFailedError.class, willFail);
 		assertTrue(error.getMessage().contains("Conditions are not in the correct order."));
 	}
 
@@ -200,7 +200,7 @@ void assertEventsMatchLooselyInOrderWithASubsetInWrongOrderFails() {
 			event(engine(), started()) //
 		);
 
-		AssertionFailedError error = assertThrows(AssertionFailedError.class, willFail);
+		var error = assertThrows(AssertionFailedError.class, willFail);
 		assertTrue(error.getMessage().contains("Conditions are not in the correct order."));
 	}
 
@@ -228,9 +228,9 @@ void assertEventsMatchLooselyInOrderWithBadConditionsOnlyFails() {
 			event(engine(), skippedWithReason("other")) //
 		);
 
-		AssertJMultipleFailuresError error = assertThrows(AssertJMultipleFailuresError.class, willFail);
+		var error = assertThrows(AssertJMultipleFailuresError.class, willFail);
 
-		List<Throwable> failures = error.getFailures();
+		var failures = error.getFailures();
 		assertEquals(2, failures.size());
 		assertEquals(AssertionError.class, failures.get(0).getClass());
 		assertEquals(AssertionError.class, failures.get(1).getClass());
@@ -244,7 +244,7 @@ void assertEventsMatchLooselyInOrderWithOneMatchingAndOneBadConditionFailsPartly
 			event(engine(), finishedWithFailure()) //
 		);
 
-		AssertJMultipleFailuresError error = assertThrows(AssertJMultipleFailuresError.class, willFail);
+		var error = assertThrows(AssertJMultipleFailuresError.class, willFail);
 		assertEquals(1, error.getFailures().size());
 	}
 
@@ -265,7 +265,7 @@ void assertEventsMatchLooselyInOrderWithSecondAndLastEventInBadOrderFails() {
 			event(engine(), skippedWithReason("reason1")) //
 		);
 
-		AssertionFailedError error = assertThrows(AssertionFailedError.class, willFail);
+		var error = assertThrows(AssertionFailedError.class, willFail);
 		assertTrue(error.getMessage().contains("Conditions are not in the correct order."));
 	}
 
@@ -280,7 +280,7 @@ void assertEventsMatchLooselyInOrderWithTooManyEventsFails() {
 			event(engine(), finishedSuccessfully()), //
 			event(engine(), finishedSuccessfully()));
 
-		AssertionError error = assertThrows(AssertionError.class, willFail);
+		var error = assertThrows(AssertionError.class, willFail);
 		assertTrue(error.getMessage().endsWith("to be less than or equal to 4 but was 6"));
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
index 86a68cd75fa3..89fbca886766 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
@@ -27,7 +27,7 @@ class ExecutionsIntegrationTests {
 
 	@Test
 	void executionsFromSkippedTestEvents() {
-		Events testEvents = getTestEvents();
+		var testEvents = getTestEvents();
 
 		// We expect 1 for both of the following cases, since an Execution can
 		// be created for a "skipped event even if "started" and "finished" events
@@ -38,7 +38,7 @@ void executionsFromSkippedTestEvents() {
 
 	@Test
 	void executionsFromStartedTestEvents() {
-		Events testEvents = getTestEvents();
+		var testEvents = getTestEvents();
 
 		// We expect 3 if the executions are created BEFORE filtering out "finished" events.
 		assertThat(testEvents.executions().started().count()).isEqualTo(3);
@@ -48,7 +48,7 @@ void executionsFromStartedTestEvents() {
 
 	@Test
 	void executionsFromFinishedTestEvents() {
-		Events testEvents = getTestEvents();
+		var testEvents = getTestEvents();
 
 		// We expect 3 if the executions are created BEFORE filtering out "started" events.
 		assertThat(testEvents.executions().finished().count()).isEqualTo(3);
@@ -58,7 +58,7 @@ void executionsFromFinishedTestEvents() {
 
 	@Test
 	void executionsFromSucceededTestEvents() {
-		Events testEvents = getTestEvents();
+		var testEvents = getTestEvents();
 
 		// We expect 1 if the executions are created BEFORE filtering out "finished" events.
 		assertThat(testEvents.executions().succeeded().count()).isEqualTo(1);
@@ -68,7 +68,7 @@ void executionsFromSucceededTestEvents() {
 
 	@Test
 	void executionsFromAbortedTestEvents() {
-		Events testEvents = getTestEvents();
+		var testEvents = getTestEvents();
 
 		// We expect 1 if the executions are created BEFORE filtering out "started" events.
 		assertThat(testEvents.executions().aborted().count()).isEqualTo(1);
@@ -78,7 +78,7 @@ void executionsFromAbortedTestEvents() {
 
 	@Test
 	void executionsFromFailedTestEvents() {
-		Events testEvents = getTestEvents();
+		var testEvents = getTestEvents();
 
 		// We expect 1 if the executions are created BEFORE filtering out "started" events.
 		assertThat(testEvents.executions().failed().count()).isEqualTo(1);
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
index 3bb5fb4e2e31..bced3458a194 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
@@ -26,7 +26,6 @@
 
 import java.util.HashMap;
 
-import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -53,13 +52,13 @@ void preconditions() {
 
 	@Test
 	void nestedContainerChecksSuppliedClassAndAllEnclosingClasses() {
-		UniqueId uniqueId = UniqueId.root("top-level", getClass().getName())//
+		var uniqueId = UniqueId.root("top-level", getClass().getName())//
 				.append("nested", ATestCase.class.getSimpleName())//
 				.append("nested", BTestCase.class.getSimpleName())//
 				.append("nested", CTestCase.class.getSimpleName());
-		Event event = createEvent(uniqueId);
+		var event = createEvent(uniqueId);
 
-		Condition<Event> condition = nestedContainer(HashMap.Entry.class);
+		var condition = nestedContainer(HashMap.Entry.class);
 		assertThat(condition.matches(event)).isFalse();
 		assertThat(condition.toString()).contains(//
 			"is a container", "with uniqueId substring 'Map'", "with uniqueId substring 'Entry'");
@@ -73,11 +72,11 @@ void nestedContainerChecksSuppliedClassAndAllEnclosingClasses() {
 	}
 
 	private Event createEvent(UniqueId uniqueId) {
-		TestDescriptor testDescriptor = mock(TestDescriptor.class);
+		var testDescriptor = mock(TestDescriptor.class);
 		when(testDescriptor.isContainer()).thenReturn(true);
 		when(testDescriptor.getUniqueId()).thenReturn(uniqueId);
 
-		Event event = mock(Event.class);
+		var event = mock(Event.class);
 		when(event.getTestDescriptor()).thenReturn(testDescriptor);
 		return event;
 	}

From 3bac39a38e26d42071dbd6f40994ca022be2ec9d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 13:04:56 +0200
Subject: [PATCH 0043/1433] Use Java 11 Files APIs

---
 .../org/junit/platform/console/ConsoleDetailsTests.java    | 7 ++++---
 .../legacy/xml/LegacyXmlReportGeneratingListenerTests.java | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
index 07a1b474cb98..bef06659d8ce 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
@@ -43,6 +43,7 @@
 import org.junit.jupiter.api.function.Executable;
 import org.junit.platform.console.options.Details;
 import org.junit.platform.console.options.Theme;
+import org.opentest4j.TestAbortedException;
 
 /**
  * @since 1.0
@@ -211,13 +212,13 @@ public void execute() throws Throwable {
 			var result = wrapper.execute(Optional.empty(), args);
 
 			var optionalUri = toUri(dirName, outName);
-			if (!optionalUri.isPresent()) {
+			if (optionalUri.isEmpty()) {
 				if (Boolean.getBoolean("org.junit.platform.console.ConsoleDetailsTests.writeResultOut")) {
 					// do not use Files.createTempDirectory(prefix) as we want one folder for one container
 					var temp = Paths.get(System.getProperty("java.io.tmpdir"), dirName.replace('/', '-'));
 					Files.createDirectories(temp);
-					var path = Files.write(temp.resolve(outName), result.out.getBytes(UTF_8));
-					assumeTrue(false,
+					var path = Files.writeString(temp.resolve(outName), result.out);
+					throw new TestAbortedException(
 						format("resource `%s` not found\nwrote console stdout to: %s/%s", dirName, outName, path));
 				}
 				fail("could not load resource named `" + dirName + "/" + outName + "`");
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 1ec5f63218c0..6b2927a09584 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.reporting.legacy.xml;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -418,7 +417,7 @@ private void executeTests(TestEngine engine, Path tempDirectory, Clock clock) {
 
 	private String readValidXmlFile(Path xmlFile) throws Exception {
 		assertTrue(Files.exists(xmlFile), () -> "File does not exist: " + xmlFile);
-		var content = new String(Files.readAllBytes(xmlFile), UTF_8);
+		var content = Files.readString(xmlFile);
 		assertValidAccordingToJenkinsSchema(content);
 		return content;
 	}

From e14b3ec0c8073bfc55a0d9cce18ca1a556091e88 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 13:06:28 +0200
Subject: [PATCH 0044/1433] Convert field to local variable

---
 .../src/test/java/org/junit/platform/engine/UniqueIdTests.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
index ae9bb0850d7c..a8f8a3baed10 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
@@ -128,10 +128,9 @@ void appendingNullIsNotAllowed() {
 	@Nested
 	class ParsingAndFormatting {
 
-		private final String uniqueIdString = "[engine:junit-jupiter]/[class:MyClass]/[method:myMethod]";
-
 		@Test
 		void ensureDefaultUniqueIdFormatIsUsedForParsing() {
+			var uniqueIdString = "[engine:junit-jupiter]/[class:MyClass]/[method:myMethod]";
 			var parsedDirectly = UniqueId.parse(uniqueIdString);
 			var parsedViaFormat = UniqueIdFormat.getDefault().parse(uniqueIdString);
 			assertEquals(parsedViaFormat, parsedDirectly);

From 56fca8c8b250046338eec3e04a09f8b3c02c4673 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 13:08:25 +0200
Subject: [PATCH 0045/1433] Fix assertion

---
 .../platform/engine/support/descriptor/MethodSourceTests.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
index 78248a31e21b..001cfd77dfe7 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
@@ -151,7 +151,7 @@ void twoEqualMethodsWithEqualParametersShouldHaveEqualMethodSourceHashCodes() {
 	@Test
 	void twoEqualMethodsWithUnequalParametersShouldHaveUnequalMethodSourceHashCodes() {
 		assertNotEquals(MethodSource.from("TestClass1", "testMethod1", "int, String").hashCode(),
-			MethodSource.from("TestClass1", "testMethod1", "float, int, String"));
+			MethodSource.from("TestClass1", "testMethod1", "float, int, String").hashCode());
 	}
 
 	@Test

From cb5f5adc33caae5a20c352b513d18613ff53fc06 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 13:09:48 +0200
Subject: [PATCH 0046/1433] Simplify assertions

---
 .../junit/platform/engine/UniqueIdTests.java  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
index a8f8a3baed10..bbaf6b15d107 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -174,8 +175,8 @@ void sameEnginesAreEqual() {
 			var id1 = UniqueId.root("engine", "junit-jupiter");
 			var id2 = UniqueId.root("engine", "junit-jupiter");
 
-			assertTrue(id1.equals(id2));
-			assertTrue(id2.equals(id1));
+			assertEquals(id2, id1);
+			assertEquals(id1, id2);
 			assertEquals(id1.hashCode(), id2.hashCode());
 		}
 
@@ -184,8 +185,8 @@ void differentEnginesAreNotEqual() {
 			var id1 = UniqueId.root("engine", "junit-vintage");
 			var id2 = UniqueId.root("engine", "junit-jupiter");
 
-			assertFalse(id1.equals(id2));
-			assertFalse(id2.equals(id1));
+			assertNotEquals(id2, id1);
+			assertNotEquals(id1, id2);
 		}
 
 		@Test
@@ -193,8 +194,8 @@ void uniqueIdWithSameSegmentsAreEqual() {
 			var id1 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
 			var id2 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
 
-			assertTrue(id1.equals(id2));
-			assertTrue(id2.equals(id1));
+			assertEquals(id2, id1);
+			assertEquals(id1, id2);
 			assertEquals(id1.hashCode(), id2.hashCode());
 		}
 
@@ -203,8 +204,8 @@ void differentOrderOfSegmentsAreNotEqual() {
 			var id1 = UniqueId.root("engine", "junit-jupiter").append("t2", "v2").append("t1", "v1");
 			var id2 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1").append("t2", "v2");
 
-			assertFalse(id1.equals(id2));
-			assertFalse(id2.equals(id1));
+			assertNotEquals(id2, id1);
+			assertNotEquals(id1, id2);
 		}
 
 		@Test
@@ -212,8 +213,8 @@ void additionalSegmentMakesItNotEqual() {
 			var id1 = UniqueId.root("engine", "junit-jupiter").append("t1", "v1");
 			var id2 = id1.append("t2", "v2");
 
-			assertFalse(id1.equals(id2));
-			assertFalse(id2.equals(id1));
+			assertNotEquals(id2, id1);
+			assertNotEquals(id1, id2);
 		}
 	}
 

From 67c524b1546c779e1e2cf3ddf17a528593795862 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 13:12:01 +0200
Subject: [PATCH 0047/1433] Remove unnecessary throws clause

---
 .../platform/commons/support/ReflectionSupportTests.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index 2938b258f553..8262a31b7a07 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -224,7 +224,7 @@ void tryToReadFieldValuePreconditions() throws Exception {
 	}
 
 	@Test
-	void findMethodDelegates() throws Exception {
+	void findMethodDelegates() {
 		assertEquals(ReflectionUtils.findMethod(Boolean.class, "valueOf", String.class.getName()),
 			ReflectionSupport.findMethod(Boolean.class, "valueOf", String.class.getName()));
 
@@ -233,7 +233,7 @@ void findMethodDelegates() throws Exception {
 	}
 
 	@Test
-	void findMethodPreconditions() throws Exception {
+	void findMethodPreconditions() {
 		assertPreconditionViolationException("Class",
 			() -> ReflectionSupport.findMethod(null, "valueOf", String.class.getName()));
 		assertPreconditionViolationExceptionForString("Method name",
@@ -280,13 +280,13 @@ void findMethodsPreconditions() {
 	}
 
 	@Test
-	void findNestedClassesDelegates() throws Exception {
+	void findNestedClassesDelegates() {
 		assertEquals(ReflectionUtils.findNestedClasses(ClassWithNestedClasses.class, ReflectionUtils::isStatic),
 			ReflectionSupport.findNestedClasses(ClassWithNestedClasses.class, ReflectionUtils::isStatic));
 	}
 
 	@Test
-	void findNestedClassesPreconditions() throws Exception {
+	void findNestedClassesPreconditions() {
 		assertPreconditionViolationException("Class",
 			() -> ReflectionSupport.findNestedClasses(null, ReflectionUtils::isStatic));
 		assertPreconditionViolationException("Predicate",

From 45ae93109754e733224376b0137b306042d2629b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 13:16:05 +0200
Subject: [PATCH 0048/1433] Fix typos

---
 .../engine/support/descriptor/ClasspathResourceSourceTests.java | 2 +-
 .../org/junit/platform/launcher/core/DefaultLauncherTests.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
index 7d65a66ea152..82eca17f5c7d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
@@ -77,7 +77,7 @@ void resourceWithPosition() {
 	}
 
 	@Test
-	void resourcefromUriWithoutPosition() {
+	void resourceFromUriWithoutPosition() {
 		var source = ClasspathResourceSource.from(FOO_RESOURCE_URI);
 
 		assertThat(source).isNotNull();
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 282faaa595a9..08468c284c9e 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -273,7 +273,7 @@ public void execute(ExecutionRequest request) {
 	}
 
 	@Test
-	void reportsEngineExecutionFailuresForSucessfullyFinishedEngine() {
+	void reportsEngineExecutionFailuresForSuccessfullyFinishedEngine() {
 		var rootCause = new RuntimeException("something went horribly wrong");
 		var engine = new TestEngineStub() {
 			@Override

From 5fc06c3b07765503b3fd34d507b6c4fed57cf5cb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 18:04:22 +0200
Subject: [PATCH 0049/1433] Use Java 9 collection factory methods

---
 .../commons/util/AnnotationUtilsTests.java    |  11 +-
 .../ClassNamePatternFilterUtilsTests.java     |  13 +-
 .../commons/util/CollectionUtilsTests.java    |  15 +-
 .../commons/util/PackageUtilsTests.java       |   7 +-
 .../commons/util/PreconditionsTests.java      |  12 +-
 .../platform/console/ConsoleDetailsTests.java |   3 +-
 .../PicocliCommandLineOptionsParserTests.java | 249 +++++++++---------
 .../tasks/ConsoleTestExecutorTests.java       |   7 +-
 .../tasks/DiscoveryRequestCreatorTests.java   |  45 ++--
 .../console/tasks/TreePrinterTests.java       |  10 +-
 .../discovery/DiscoverySelectorsTests.java    |  23 +-
 .../descriptor/CompositeTestSourceTests.java  |  13 +-
 .../hierarchical/CompositeLockTests.java      |   8 +-
 .../HierarchicalTestExecutorTests.java        |   4 +-
 .../hierarchical/LockManagerTests.java        |  18 +-
 .../NodeTreeWalkerIntegrationTests.java       |   5 +-
 .../launcher/TestIdentifierTests.java         |   7 +-
 .../platform/launcher/TestPlanTests.java      |   9 +-
 .../LauncherConfigurationParametersTests.java |  28 +-
 .../LauncherDiscoveryRequestBuilderTests.java |   3 +-
 .../TestExecutionListenerRegistryTests.java   |   6 +-
 .../listeners/SummaryGenerationTests.java     |   4 +-
 .../tagexpression/TagExpressionsTests.java    |  29 +-
 .../legacy/LegacyReportingUtilsTests.java     |   7 +-
 ...egacyXmlReportGeneratingListenerTests.java |  11 +-
 .../legacy/xml/XmlReportDataTests.java        |   8 +-
 .../legacy/xml/XmlReportWriterTests.java      |  20 +-
 .../runner/JUnitPlatformRunnerTests.java      |  14 +-
 28 files changed, 279 insertions(+), 310 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
index 319b15eb26d4..76d9c9fd9862 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.commons.util;
 
-import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -239,7 +238,7 @@ void findRepeatableAnnotationsWithComposedTagBeforeContainer() {
 	}
 
 	private void assertTagsFound(Class<?> clazz, String... tags) {
-		assertEquals(asList(tags),
+		assertEquals(List.of(tags),
 			findRepeatableAnnotations(clazz, Tag.class).stream().map(Tag::value).collect(toList()),
 			() -> "Tags found for class " + clazz.getName());
 	}
@@ -297,7 +296,7 @@ void findInheritedRepeatableAnnotationsWithMultipleComposedAnnotationsOnSupercla
 	}
 
 	private void assertExtensionsFound(Class<?> clazz, String... tags) {
-		assertEquals(asList(tags),
+		assertEquals(List.of(tags),
 			findRepeatableAnnotations(clazz, ExtendWith.class).stream().map(ExtendWith::value).collect(toList()),
 			() -> "Extensions found for class " + clazz.getName());
 	}
@@ -490,7 +489,7 @@ void findPublicAnnotatedFieldsForDirectlyAnnotatedFieldOfWrongFieldType() {
 	void findPublicAnnotatedFieldsForDirectlyAnnotatedField() {
 		var fields = findPublicAnnotatedFields(getClass(), String.class, Annotation1.class);
 		assertNotNull(fields);
-		assertIterableEquals(asList("directlyAnnotatedField"), asNames(fields));
+		assertIterableEquals(List.of("directlyAnnotatedField"), asNames(fields));
 	}
 
 	@Test
@@ -498,14 +497,14 @@ void findPublicAnnotatedFieldsForMetaAnnotatedField() {
 		var fields = findPublicAnnotatedFields(getClass(), Number.class, Annotation1.class);
 		assertNotNull(fields);
 		assertEquals(1, fields.size());
-		assertIterableEquals(asList("metaAnnotatedField"), asNames(fields));
+		assertIterableEquals(List.of("metaAnnotatedField"), asNames(fields));
 	}
 
 	@Test
 	void findPublicAnnotatedFieldsForDirectlyAnnotatedFieldInInterface() {
 		var fields = findPublicAnnotatedFields(InterfaceWithAnnotatedFields.class, String.class, Annotation1.class);
 		assertNotNull(fields);
-		assertIterableEquals(asList("foo"), asNames(fields));
+		assertIterableEquals(List.of("foo"), asNames(fields));
 	}
 
 	@Test
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
index b240c08618d0..0567ae3eaeea 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.commons.util;
 
-import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
@@ -47,7 +46,7 @@ class ClassNamePatternFilterUtilsTests {
 	//@formatter:on
 	@ParameterizedTest
 	void alwaysEnabledConditions(String pattern) {
-		List<? extends ExecutionCondition> executionConditions = asList(new AExecutionConditionClass(),
+		List<? extends ExecutionCondition> executionConditions = List.of(new AExecutionConditionClass(),
 			new BExecutionConditionClass());
 		assertThat(executionConditions).filteredOn(
 			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isNotEmpty();
@@ -64,7 +63,7 @@ void alwaysEnabledConditions(String pattern) {
 	//@formatter:on
 	@ParameterizedTest
 	void alwaysDisabledConditions(String pattern) {
-		List<? extends ExecutionCondition> executionConditions = asList(new AExecutionConditionClass(),
+		List<? extends ExecutionCondition> executionConditions = List.of(new AExecutionConditionClass(),
 			new BExecutionConditionClass());
 		assertThat(executionConditions).filteredOn(
 			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isEmpty();
@@ -81,7 +80,7 @@ void alwaysDisabledConditions(String pattern) {
 	//@formatter:on
 	@ParameterizedTest
 	void alwaysEnabledListeners(String pattern) {
-		List<? extends TestExecutionListener> executionConditions = asList(new ATestExecutionListenerClass(),
+		List<? extends TestExecutionListener> executionConditions = List.of(new ATestExecutionListenerClass(),
 			new BTestExecutionListenerClass());
 		assertThat(executionConditions).filteredOn(
 			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isNotEmpty();
@@ -98,7 +97,7 @@ void alwaysEnabledListeners(String pattern) {
 	//@formatter:on
 	@ParameterizedTest
 	void alwaysDisabledListeners(String pattern) {
-		List<? extends TestExecutionListener> executionConditions = asList(new ATestExecutionListenerClass(),
+		List<? extends TestExecutionListener> executionConditions = List.of(new ATestExecutionListenerClass(),
 			new BTestExecutionListenerClass());
 		assertThat(executionConditions).filteredOn(
 			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isEmpty();
@@ -115,7 +114,7 @@ void alwaysDisabledListeners(String pattern) {
 	//@formatter:on
 	@ParameterizedTest
 	void alwaysEnabledClass(String pattern) {
-		var executionConditions = asList(new AVanillaEmpty(), new BVanillaEmpty());
+		var executionConditions = List.of(new AVanillaEmpty(), new BVanillaEmpty());
 		assertThat(executionConditions).filteredOn(
 			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isNotEmpty();
 	}
@@ -131,7 +130,7 @@ void alwaysEnabledClass(String pattern) {
 	//@formatter:on
 	@ParameterizedTest
 	void alwaysDisabledClass(String pattern) {
-		var executionConditions = asList(new AVanillaEmpty(), new BVanillaEmpty());
+		var executionConditions = List.of(new AVanillaEmpty(), new BVanillaEmpty());
 		assertThat(executionConditions).filteredOn(
 			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isEmpty();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index cf4e2572acab..d836fdf7bc52 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -10,9 +10,6 @@
 
 package org.junit.platform.commons.util;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singleton;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,6 +22,8 @@
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
@@ -52,21 +51,21 @@ void getOnlyElementWithNullCollection() {
 	@Test
 	void getOnlyElementWithEmptyCollection() {
 		var exception = assertThrows(PreconditionViolationException.class,
-			() -> CollectionUtils.getOnlyElement(emptySet()));
+			() -> CollectionUtils.getOnlyElement(Set.of()));
 		assertEquals("collection must contain exactly one element: []", exception.getMessage());
 	}
 
 	@Test
 	void getOnlyElementWithSingleElementCollection() {
 		var expected = new Object();
-		var actual = CollectionUtils.getOnlyElement(singleton(expected));
+		var actual = CollectionUtils.getOnlyElement(Set.of(expected));
 		assertSame(expected, actual);
 	}
 
 	@Test
 	void getOnlyElementWithMultiElementCollection() {
 		var exception = assertThrows(PreconditionViolationException.class,
-			() -> CollectionUtils.getOnlyElement(asList("foo", "bar")));
+			() -> CollectionUtils.getOnlyElement(List.of("foo", "bar")));
 		assertEquals("collection must contain exactly one element: [foo, bar]", exception.getMessage());
 	}
 
@@ -159,7 +158,7 @@ public Stream<String> stream() {
 	@SuppressWarnings("unchecked")
 	void toStreamWithIterable() {
 
-		Iterable<String> input = () -> asList("foo", "bar").iterator();
+		Iterable<String> input = () -> List.of("foo", "bar").iterator();
 
 		var result = (Stream<String>) CollectionUtils.toStream(input);
 
@@ -169,7 +168,7 @@ void toStreamWithIterable() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void toStreamWithIterator() {
-		var input = asList("foo", "bar").iterator();
+		var input = List.of("foo", "bar").iterator();
 
 		var result = (Stream<String>) CollectionUtils.toStream(input);
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
index 224e946ec771..cc30ab49ee16 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
@@ -16,7 +16,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
 
@@ -91,13 +90,15 @@ void getAttributeFromDefaultPackageMemberIsEmpty() throws Exception {
 
 	@TestFactory
 	List<DynamicTest> attributesFromValueWrapperClassArePresent() {
-		return Arrays.asList(dynamicTest("getName", isPresent(Package::getName)),
+		return List.of( //
+			dynamicTest("getName", isPresent(Package::getName)),
 			dynamicTest("getImplementationTitle", isPresent(Package::getImplementationTitle)),
 			dynamicTest("getImplementationVendor", isPresent(Package::getImplementationVendor)),
 			dynamicTest("getImplementationVersion", isPresent(Package::getImplementationVersion)),
 			dynamicTest("getSpecificationTitle", isPresent(Package::getSpecificationTitle)),
 			dynamicTest("getSpecificationVendor", isPresent(Package::getSpecificationVendor)),
-			dynamicTest("getSpecificationVersion", isPresent(Package::getSpecificationVersion)));
+			dynamicTest("getSpecificationVersion", isPresent(Package::getSpecificationVersion)) //
+		);
 	}
 
 	private Executable isPresent(Function<Package, String> function) {
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
index e49b9a362d9f..edfedaec8a90 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.commons.util;
 
-import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -21,7 +20,6 @@
 import static org.junit.platform.commons.util.Preconditions.notEmpty;
 import static org.junit.platform.commons.util.Preconditions.notNull;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -70,7 +68,7 @@ void notEmptyPassesForNonEmptyArray() {
 
 	@Test
 	void notEmptyPassesForNonEmptyCollection() {
-		Collection<String> collection = Arrays.asList("a", "b", "c");
+		Collection<String> collection = List.of("a", "b", "c");
 		var nonEmptyCollection = notEmpty(collection, () -> "should not fail");
 		assertSame(collection, nonEmptyCollection);
 	}
@@ -117,7 +115,7 @@ void notEmptyThrowsForEmptyArray() {
 	void notEmptyThrowsForEmptyCollection() {
 		var message = "collection is empty";
 
-		var exception = assertThrows(PreconditionViolationException.class, () -> notEmpty(emptyList(), message));
+		var exception = assertThrows(PreconditionViolationException.class, () -> notEmpty(List.of(), message));
 
 		assertEquals(message, exception.getMessage());
 	}
@@ -134,10 +132,10 @@ void containsNoNullElementsPassesForArrayThatIsNullOrEmpty() {
 	@Test
 	void containsNoNullElementsPassesForCollectionThatIsNullOrEmpty() {
 		containsNoNullElements((List<?>) null, "collection is null");
-		containsNoNullElements(emptyList(), "collection is empty");
+		containsNoNullElements(List.of(), "collection is empty");
 
 		containsNoNullElements((List<?>) null, () -> "collection is null");
-		containsNoNullElements(emptyList(), () -> "collection is empty");
+		containsNoNullElements(List.of(), () -> "collection is empty");
 	}
 
 	@Test
@@ -149,7 +147,7 @@ void containsNoNullElementsPassesForArrayContainingNonNullElements() {
 
 	@Test
 	void containsNoNullElementsPassesForCollectionContainingNonNullElements() {
-		Collection<String> input = Arrays.asList("a", "b", "c");
+		var input = List.of("a", "b", "c");
 		var output = containsNoNullElements(input, "message");
 		assertSame(input, output);
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
index bef06659d8ce..4e39a4a3a802 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
@@ -12,7 +12,6 @@
 
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -229,7 +228,7 @@ public void execute() throws Throwable {
 			assumeTrue(Files.isReadable(path), "can not read: " + path);
 
 			var expectedLines = Files.readAllLines(path, UTF_8);
-			var actualLines = asList(result.out.split("\\R"));
+			var actualLines = List.of(result.out.split("\\R"));
 
 			assertLinesMatch(expectedLines, actualLines);
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index ceb39694e10c..a4a61fb4a0d3 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -10,11 +10,6 @@
 
 package org.junit.platform.console.options;
 
-import static java.util.Arrays.asList;
-import static java.util.Arrays.stream;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.junit.jupiter.api.Assertions.assertAll;
@@ -32,9 +27,11 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -57,22 +54,22 @@ void parseNoArguments() {
 			() -> assertFalse(options.isDisplayHelp()),
 			() -> assertEquals(CommandLineOptions.DEFAULT_DETAILS, options.getDetails()),
 			() -> assertFalse(options.isScanClasspath()),
-			() -> assertEquals(singletonList(STANDARD_INCLUDE_PATTERN), options.getIncludedClassNamePatterns()),
-			() -> assertEquals(emptyList(), options.getExcludedClassNamePatterns()),
-			() -> assertEquals(emptyList(), options.getIncludedPackages()),
-			() -> assertEquals(emptyList(), options.getExcludedPackages()),
-			() -> assertEquals(emptyList(), options.getIncludedTagExpressions()),
-			() -> assertEquals(emptyList(), options.getExcludedTagExpressions()),
-			() -> assertEquals(emptyList(), options.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(STANDARD_INCLUDE_PATTERN), options.getIncludedClassNamePatterns()),
+			() -> assertEquals(List.of(), options.getExcludedClassNamePatterns()),
+			() -> assertEquals(List.of(), options.getIncludedPackages()),
+			() -> assertEquals(List.of(), options.getExcludedPackages()),
+			() -> assertEquals(List.of(), options.getIncludedTagExpressions()),
+			() -> assertEquals(List.of(), options.getExcludedTagExpressions()),
+			() -> assertEquals(List.of(), options.getAdditionalClasspathEntries()),
 			() -> assertEquals(Optional.empty(), options.getReportsDir()),
-			() -> assertEquals(emptyList(), options.getSelectedUris()),
-			() -> assertEquals(emptyList(), options.getSelectedFiles()),
-			() -> assertEquals(emptyList(), options.getSelectedDirectories()),
-			() -> assertEquals(emptyList(), options.getSelectedModules()),
-			() -> assertEquals(emptyList(), options.getSelectedPackages()),
-			() -> assertEquals(emptyList(), options.getSelectedMethods()),
-			() -> assertEquals(emptyList(), options.getSelectedClasspathEntries()),
-			() -> assertEquals(emptyMap(), options.getConfigurationParameters())
+			() -> assertEquals(List.of(), options.getSelectedUris()),
+			() -> assertEquals(List.of(), options.getSelectedFiles()),
+			() -> assertEquals(List.of(), options.getSelectedDirectories()),
+			() -> assertEquals(List.of(), options.getSelectedModules()),
+			() -> assertEquals(List.of(), options.getSelectedPackages()),
+			() -> assertEquals(List.of(), options.getSelectedMethods()),
+			() -> assertEquals(List.of(), options.getSelectedClasspathEntries()),
+			() -> assertEquals(Map.of(), options.getConfigurationParameters())
 		);
 		// @formatter:on
 	}
@@ -132,9 +129,9 @@ void parseInvalidDetailsTheme() {
 	void parseValidIncludeClassNamePatterns(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(singletonList(".*Test"), type.parseArgLine("-n .*Test").getIncludedClassNamePatterns()),
-			() -> assertEquals(asList(".*Test", ".*Tests"), type.parseArgLine("--include-classname .*Test --include-classname .*Tests").getIncludedClassNamePatterns()),
-			() -> assertEquals(singletonList(".*Test"), type.parseArgLine("--include-classname=.*Test").getIncludedClassNamePatterns())
+			() -> assertEquals(List.of(".*Test"), type.parseArgLine("-n .*Test").getIncludedClassNamePatterns()),
+			() -> assertEquals(List.of(".*Test", ".*Tests"), type.parseArgLine("--include-classname .*Test --include-classname .*Tests").getIncludedClassNamePatterns()),
+			() -> assertEquals(List.of(".*Test"), type.parseArgLine("--include-classname=.*Test").getIncludedClassNamePatterns())
 		);
 		// @formatter:on
 	}
@@ -144,17 +141,16 @@ void parseValidIncludeClassNamePatterns(ArgsType type) {
 	void parseValidExcludeClassNamePatterns(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(singletonList(".*Test"), type.parseArgLine("-N .*Test").getExcludedClassNamePatterns()),
-			() -> assertEquals(asList(".*Test", ".*Tests"), type.parseArgLine("--exclude-classname .*Test --exclude-classname .*Tests").getExcludedClassNamePatterns()),
-			() -> assertEquals(singletonList(".*Test"), type.parseArgLine("--exclude-classname=.*Test").getExcludedClassNamePatterns())
+			() -> assertEquals(List.of(".*Test"), type.parseArgLine("-N .*Test").getExcludedClassNamePatterns()),
+			() -> assertEquals(List.of(".*Test", ".*Tests"), type.parseArgLine("--exclude-classname .*Test --exclude-classname .*Tests").getExcludedClassNamePatterns()),
+			() -> assertEquals(List.of(".*Test"), type.parseArgLine("--exclude-classname=.*Test").getExcludedClassNamePatterns())
 		);
 		// @formatter:on
 	}
 
 	@Test
 	void usesDefaultClassNamePatternWithoutExplicitArgument() throws Exception {
-		assertEquals(singletonList(STANDARD_INCLUDE_PATTERN),
-			ArgsType.args.parseArgLine("").getIncludedClassNamePatterns());
+		assertEquals(List.of(STANDARD_INCLUDE_PATTERN), ArgsType.args.parseArgLine("").getIncludedClassNamePatterns());
 	}
 
 	@Test
@@ -172,11 +168,11 @@ void parseInvalidExcludeClassNamePatterns() {
 	void parseValidIncludedPackages(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(asList("org.junit.included"),
+				() -> assertEquals(List.of("org.junit.included"),
 						type.parseArgLine("--include-package org.junit.included").getIncludedPackages()),
-				() -> assertEquals(asList("org.junit.included"),
+				() -> assertEquals(List.of("org.junit.included"),
 						type.parseArgLine("--include-package=org.junit.included").getIncludedPackages()),
-				() -> assertEquals(asList("org.junit.included1", "org.junit.included2"),
+				() -> assertEquals(List.of("org.junit.included1", "org.junit.included2"),
 						type.parseArgLine("--include-package org.junit.included1 --include-package org.junit.included2").getIncludedPackages())
 		);
 		// @formatter:on
@@ -187,11 +183,11 @@ void parseValidIncludedPackages(ArgsType type) {
 	void parseValidExcludedPackages(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(asList("org.junit.excluded"),
+				() -> assertEquals(List.of("org.junit.excluded"),
 						type.parseArgLine("--exclude-package org.junit.excluded").getExcludedPackages()),
-				() -> assertEquals(asList("org.junit.excluded"),
+				() -> assertEquals(List.of("org.junit.excluded"),
 						type.parseArgLine("--exclude-package=org.junit.excluded").getExcludedPackages()),
-				() -> assertEquals(asList("org.junit.excluded1", "org.junit.excluded2"),
+				() -> assertEquals(List.of("org.junit.excluded1", "org.junit.excluded2"),
 						type.parseArgLine("--exclude-package org.junit.excluded1 --exclude-package org.junit.excluded2").getExcludedPackages())
 		);
 		// @formatter:on
@@ -202,10 +198,10 @@ void parseValidExcludedPackages(ArgsType type) {
 	void parseValidIncludedTags(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(asList("fast"), type.parseArgLine("-t fast").getIncludedTagExpressions()),
-			() -> assertEquals(asList("fast"), type.parseArgLine("--include-tag fast").getIncludedTagExpressions()),
-			() -> assertEquals(asList("fast"), type.parseArgLine("--include-tag=fast").getIncludedTagExpressions()),
-			() -> assertEquals(asList("fast", "slow"), type.parseArgLine("-t fast -t slow").getIncludedTagExpressions())
+			() -> assertEquals(List.of("fast"), type.parseArgLine("-t fast").getIncludedTagExpressions()),
+			() -> assertEquals(List.of("fast"), type.parseArgLine("--include-tag fast").getIncludedTagExpressions()),
+			() -> assertEquals(List.of("fast"), type.parseArgLine("--include-tag=fast").getIncludedTagExpressions()),
+			() -> assertEquals(List.of("fast", "slow"), type.parseArgLine("-t fast -t slow").getIncludedTagExpressions())
 		);
 		// @formatter:on
 	}
@@ -220,10 +216,10 @@ void parseInvalidIncludedTags() {
 	void parseValidExcludedTags(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(asList("fast"), type.parseArgLine("-T fast").getExcludedTagExpressions()),
-			() -> assertEquals(asList("fast"), type.parseArgLine("--exclude-tag fast").getExcludedTagExpressions()),
-			() -> assertEquals(asList("fast"), type.parseArgLine("--exclude-tag=fast").getExcludedTagExpressions()),
-			() -> assertEquals(asList("fast", "slow"), type.parseArgLine("-T fast -T slow").getExcludedTagExpressions())
+			() -> assertEquals(List.of("fast"), type.parseArgLine("-T fast").getExcludedTagExpressions()),
+			() -> assertEquals(List.of("fast"), type.parseArgLine("--exclude-tag fast").getExcludedTagExpressions()),
+			() -> assertEquals(List.of("fast"), type.parseArgLine("--exclude-tag=fast").getExcludedTagExpressions()),
+			() -> assertEquals(List.of("fast", "slow"), type.parseArgLine("-T fast -T slow").getExcludedTagExpressions())
 		);
 		// @formatter:on
 	}
@@ -238,9 +234,9 @@ void parseInvalidExcludedTags() {
 	void parseValidIncludedEngines(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(asList("junit-jupiter"), type.parseArgLine("-e junit-jupiter").getIncludedEngines()),
-			() -> assertEquals(asList("junit-vintage"), type.parseArgLine("--include-engine junit-vintage").getIncludedEngines()),
-			() -> assertEquals(emptyList(), type.parseArgLine("").getIncludedEngines())
+			() -> assertEquals(List.of("junit-jupiter"), type.parseArgLine("-e junit-jupiter").getIncludedEngines()),
+			() -> assertEquals(List.of("junit-vintage"), type.parseArgLine("--include-engine junit-vintage").getIncludedEngines()),
+			() -> assertEquals(List.of(), type.parseArgLine("").getIncludedEngines())
 		);
 		// @formatter:on
 	}
@@ -255,9 +251,9 @@ void parseInvalidIncludedEngines() {
 	void parseValidExcludedEngines(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(asList("junit-jupiter"), type.parseArgLine("-E junit-jupiter").getExcludedEngines()),
-			() -> assertEquals(asList("junit-vintage"), type.parseArgLine("--exclude-engine junit-vintage").getExcludedEngines()),
-			() -> assertEquals(emptyList(), type.parseArgLine("").getExcludedEngines())
+			() -> assertEquals(List.of("junit-jupiter"), type.parseArgLine("-E junit-jupiter").getExcludedEngines()),
+			() -> assertEquals(List.of("junit-vintage"), type.parseArgLine("--exclude-engine junit-vintage").getExcludedEngines()),
+			() -> assertEquals(List.of(), type.parseArgLine("").getExcludedEngines())
 		);
 		// @formatter:on
 	}
@@ -273,16 +269,16 @@ void parseValidAdditionalClasspathEntries(ArgsType type) {
 		var dir = Paths.get(".");
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(singletonList(dir), type.parseArgLine("-cp .").getAdditionalClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("--cp .").getAdditionalClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("-classpath .").getAdditionalClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("-classpath=.").getAdditionalClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("--classpath .").getAdditionalClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("--classpath=.").getAdditionalClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("--class-path .").getAdditionalClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("--class-path=.").getAdditionalClasspathEntries()),
-			() -> assertEquals(asList(dir, Paths.get("src", "test", "java")), type.parseArgLine("-cp . -cp src/test/java").getAdditionalClasspathEntries()),
-			() -> assertEquals(asList(dir, Paths.get("src", "test", "java")), type.parseArgLine("-cp ." + File.pathSeparator + "src/test/java").getAdditionalClasspathEntries())
+			() -> assertEquals(List.of(dir), type.parseArgLine("-cp .").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--cp .").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("-classpath .").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("-classpath=.").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--classpath .").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--classpath=.").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path .").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path=.").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir, Paths.get("src", "test", "java")), type.parseArgLine("-cp . -cp src/test/java").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir, Paths.get("src", "test", "java")), type.parseArgLine("-cp ." + File.pathSeparator + "src/test/java").getAdditionalClasspathEntries())
 		);
 		// @formatter:on
 	}
@@ -314,13 +310,13 @@ void parseInvalidXmlReportsDirs() {
 	void parseValidUriSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(singletonList(new URI("file:///foo.txt")), type.parseArgLine("-u file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(singletonList(new URI("file:///foo.txt")), type.parseArgLine("--u file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(singletonList(new URI("file:///foo.txt")), type.parseArgLine("-select-uri file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(singletonList(new URI("file:///foo.txt")), type.parseArgLine("-select-uri=file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(singletonList(new URI("file:///foo.txt")), type.parseArgLine("--select-uri file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(singletonList(new URI("file:///foo.txt")), type.parseArgLine("--select-uri=file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(asList(new URI("file:///foo.txt"), new URI("https://example")), type.parseArgLine("-u file:///foo.txt -u https://example").getSelectedUris())
+				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("-u file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("--u file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("-select-uri file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("-select-uri=file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("--select-uri file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("--select-uri=file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(new URI("file:///foo.txt"), new URI("https://example")), type.parseArgLine("-u file:///foo.txt -u https://example").getSelectedUris())
 		);
 		// @formatter:on
 	}
@@ -335,13 +331,13 @@ void parseInvalidUriSelectors() {
 	void parseValidFileSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(singletonList("foo.txt"), type.parseArgLine("-f foo.txt").getSelectedFiles()),
-				() -> assertEquals(singletonList("foo.txt"), type.parseArgLine("--f foo.txt").getSelectedFiles()),
-				() -> assertEquals(singletonList("foo.txt"), type.parseArgLine("-select-file foo.txt").getSelectedFiles()),
-				() -> assertEquals(singletonList("foo.txt"), type.parseArgLine("-select-file=foo.txt").getSelectedFiles()),
-				() -> assertEquals(singletonList("foo.txt"), type.parseArgLine("--select-file foo.txt").getSelectedFiles()),
-				() -> assertEquals(singletonList("foo.txt"), type.parseArgLine("--select-file=foo.txt").getSelectedFiles()),
-				() -> assertEquals(asList("foo.txt", "bar.csv"), type.parseArgLine("-f foo.txt -f bar.csv").getSelectedFiles())
+				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("-f foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("--f foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("-select-file foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("-select-file=foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("--select-file foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("--select-file=foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of("foo.txt", "bar.csv"), type.parseArgLine("-f foo.txt -f bar.csv").getSelectedFiles())
 		);
 		// @formatter:on
 	}
@@ -356,13 +352,13 @@ void parseInvalidFileSelectors() {
 	void parseValidDirectorySelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(singletonList("foo/bar"), type.parseArgLine("-d foo/bar").getSelectedDirectories()),
-				() -> assertEquals(singletonList("foo/bar"), type.parseArgLine("--d foo/bar").getSelectedDirectories()),
-				() -> assertEquals(singletonList("foo/bar"), type.parseArgLine("-select-directory foo/bar").getSelectedDirectories()),
-				() -> assertEquals(singletonList("foo/bar"), type.parseArgLine("-select-directory=foo/bar").getSelectedDirectories()),
-				() -> assertEquals(singletonList("foo/bar"), type.parseArgLine("--select-directory foo/bar").getSelectedDirectories()),
-				() -> assertEquals(singletonList("foo/bar"), type.parseArgLine("--select-directory=foo/bar").getSelectedDirectories()),
-				() -> assertEquals(asList("foo/bar", "bar/qux"), type.parseArgLine("-d foo/bar -d bar/qux").getSelectedDirectories())
+				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("-d foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("--d foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("-select-directory foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("-select-directory=foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("--select-directory foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("--select-directory=foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of("foo/bar", "bar/qux"), type.parseArgLine("-d foo/bar -d bar/qux").getSelectedDirectories())
 		);
 		// @formatter:on
 	}
@@ -377,13 +373,13 @@ void parseInvalidDirectorySelectors() {
 	void parseValidModuleSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("-o com.acme.foo").getSelectedModules()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("--o com.acme.foo").getSelectedModules()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("-select-module com.acme.foo").getSelectedModules()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("-select-module=com.acme.foo").getSelectedModules()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("--select-module com.acme.foo").getSelectedModules()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("--select-module=com.acme.foo").getSelectedModules()),
-				() -> assertEquals(asList("com.acme.foo", "com.example.bar"), type.parseArgLine("-o com.acme.foo -o com.example.bar").getSelectedModules())
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-o com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--o com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-select-module com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-select-module=com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--select-module com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--select-module=com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of("com.acme.foo", "com.example.bar"), type.parseArgLine("-o com.acme.foo -o com.example.bar").getSelectedModules())
 		);
 		// @formatter:on
 	}
@@ -398,13 +394,13 @@ void parseInvalidModuleSelectors() {
 	void parseValidPackageSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("-p com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("--p com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("-select-package com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("-select-package=com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("--select-package com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(singletonList("com.acme.foo"), type.parseArgLine("--select-package=com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(asList("com.acme.foo", "com.example.bar"), type.parseArgLine("-p com.acme.foo -p com.example.bar").getSelectedPackages())
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-p com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--p com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-select-package com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-select-package=com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--select-package com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--select-package=com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of("com.acme.foo", "com.example.bar"), type.parseArgLine("-p com.acme.foo -p com.example.bar").getSelectedPackages())
 		);
 		// @formatter:on
 	}
@@ -419,13 +415,13 @@ void parseInvalidPackageSelectors() {
 	void parseValidClassSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(singletonList("com.acme.Foo"), type.parseArgLine("-c com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(singletonList("com.acme.Foo"), type.parseArgLine("--c com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(singletonList("com.acme.Foo"), type.parseArgLine("-select-class com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(singletonList("com.acme.Foo"), type.parseArgLine("-select-class=com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(singletonList("com.acme.Foo"), type.parseArgLine("--select-class com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(singletonList("com.acme.Foo"), type.parseArgLine("--select-class=com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(asList("com.acme.Foo", "com.example.Bar"), type.parseArgLine("-c com.acme.Foo -c com.example.Bar").getSelectedClasses())
+				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("-c com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("--c com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("-select-class com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("-select-class=com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("--select-class com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("--select-class=com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of("com.acme.Foo", "com.example.Bar"), type.parseArgLine("-c com.acme.Foo -c com.example.Bar").getSelectedClasses())
 		);
 		// @formatter:on
 	}
@@ -440,13 +436,13 @@ void parseInvalidClassSelectors() {
 	void parseValidMethodSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(singletonList("com.acme.Foo#m()"), type.parseArgLine("-m com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(singletonList("com.acme.Foo#m()"), type.parseArgLine("--m com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(singletonList("com.acme.Foo#m()"), type.parseArgLine("-select-method com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(singletonList("com.acme.Foo#m()"), type.parseArgLine("-select-method=com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(singletonList("com.acme.Foo#m()"), type.parseArgLine("--select-method com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(singletonList("com.acme.Foo#m()"), type.parseArgLine("--select-method=com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(asList("com.acme.Foo#m()", "com.example.Bar#method(java.lang.Object)"),
+				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("-m com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("--m com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("-select-method com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("-select-method=com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("--select-method com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("--select-method=com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of("com.acme.Foo#m()", "com.example.Bar#method(java.lang.Object)"),
 						type.parseArgLine("-m com.acme.Foo#m() -m com.example.Bar#method(java.lang.Object)").getSelectedMethods())
 		);
 		// @formatter:on
@@ -462,13 +458,13 @@ void parseInvalidMethodSelectors() {
 	void parseValidClasspathResourceSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(singletonList("/foo.csv"), type.parseArgLine("-r /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(singletonList("/foo.csv"), type.parseArgLine("--r /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(singletonList("/foo.csv"), type.parseArgLine("-select-resource /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(singletonList("/foo.csv"), type.parseArgLine("-select-resource=/foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(singletonList("/foo.csv"), type.parseArgLine("--select-resource /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(singletonList("/foo.csv"), type.parseArgLine("--select-resource=/foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(asList("/foo.csv", "bar.json"), type.parseArgLine("-r /foo.csv -r bar.json").getSelectedClasspathResources())
+				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("-r /foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("--r /foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("-select-resource /foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("-select-resource=/foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("--select-resource /foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("--select-resource=/foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of("/foo.csv", "bar.json"), type.parseArgLine("-r /foo.csv -r bar.json").getSelectedClasspathResources())
 		);
 		// @formatter:on
 	}
@@ -485,16 +481,16 @@ void parseClasspathScanningEntries(ArgsType type) {
 		// @formatter:off
 		assertAll(
 			() -> assertTrue(type.parseArgLine("--scan-class-path").isScanClasspath()),
-			() -> assertEquals(emptyList(), type.parseArgLine("--scan-class-path").getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(), type.parseArgLine("--scan-class-path").getSelectedClasspathEntries()),
 			() -> assertTrue(type.parseArgLine("--scan-classpath").isScanClasspath()),
-			() -> assertEquals(emptyList(), type.parseArgLine("--scan-classpath").getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(), type.parseArgLine("--scan-classpath").getSelectedClasspathEntries()),
 			() -> assertTrue(type.parseArgLine("--scan-class-path .").isScanClasspath()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("--scan-class-path .").getSelectedClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("--scan-class-path=.").getSelectedClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("-scan-class-path .").getSelectedClasspathEntries()),
-			() -> assertEquals(singletonList(dir), type.parseArgLine("-scan-class-path=.").getSelectedClasspathEntries()),
-			() -> assertEquals(asList(dir, Paths.get("src/test/java")), type.parseArgLine("--scan-class-path . --scan-class-path src/test/java").getSelectedClasspathEntries()),
-			() -> assertEquals(asList(dir, Paths.get("src/test/java")), type.parseArgLine("--scan-class-path ." + File.pathSeparator + "src/test/java").getSelectedClasspathEntries())
+			() -> assertEquals(List.of(dir), type.parseArgLine("--scan-class-path .").getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--scan-class-path=.").getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("-scan-class-path .").getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("-scan-class-path=.").getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir, Paths.get("src/test/java")), type.parseArgLine("--scan-class-path . --scan-class-path src/test/java").getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir, Paths.get("src/test/java")), type.parseArgLine("--scan-class-path ." + File.pathSeparator + "src/test/java").getSelectedClasspathEntries())
 		);
 		// @formatter:on
 	}
@@ -568,12 +564,12 @@ public void close() {
 	}
 
 	private void assertOptionWithMissingRequiredArgumentThrowsException(String... options) {
-		assertAll(stream(options).map(
+		assertAll(Stream.of(options).map(
 			opt -> () -> assertThrows(JUnitException.class, () -> ArgsType.args.parseArgLine(opt))));
 	}
 
 	private void assertParses(String name, Predicate<CommandLineOptions> property, String... argLines) {
-		stream(argLines).forEach(argLine -> {
+		Stream.of(argLines).forEach(argLine -> {
 			CommandLineOptions options = null;
 			try {
 				options = ArgsType.args.parseArgLine(argLine);
@@ -595,8 +591,7 @@ CommandLineOptions parseArgLine(String argLine) {
 			CommandLineOptions parseArgLine(String argLine) throws IOException {
 				var atFile = Files.createTempFile("junit-launcher-args", ".txt");
 				try {
-					var lines = Arrays.asList(split(argLine));
-					Files.write(atFile, lines);
+					Files.write(atFile, List.of(split(argLine)));
 					return createParser().parse("@" + atFile);
 				}
 				finally {
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index df1ab72617a5..b78479d7a3aa 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -10,8 +10,6 @@
 
 package org.junit.platform.console.tasks;
 
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -22,6 +20,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.file.Paths;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.console.ConsoleLauncherExecutionResult;
@@ -151,7 +150,7 @@ void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() throws Exception {
 
 	@Test
 	void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() throws Exception {
-		options.setAdditionalClasspathEntries(singletonList(Paths.get(".")));
+		options.setAdditionalClasspathEntries(List.of(Paths.get(".")));
 
 		var oldClassLoader = getDefaultClassLoader();
 		dummyTestEngine.addTest("failingTest",
@@ -165,7 +164,7 @@ void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() throws Except
 
 	@Test
 	void usesSameClassLoaderIfNoAdditionalClassPathEntriesArePresent() throws Exception {
-		options.setAdditionalClasspathEntries(emptyList());
+		options.setAdditionalClasspathEntries(List.of());
 
 		var oldClassLoader = getDefaultClassLoader();
 		dummyTestEngine.addTest("failingTest",
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index cf7dc7a23d12..7543298649e7 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -10,8 +10,6 @@
 
 package org.junit.platform.console.tasks;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
@@ -21,6 +19,7 @@
 import java.io.File;
 import java.net.URI;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Stream;
@@ -65,7 +64,7 @@ void convertsScanClasspathOptionWithoutExplicitRootDirectories() {
 	@Test
 	void convertsScanClasspathOptionWithExplicitRootDirectories() {
 		options.setScanClasspath(true);
-		options.setSelectedClasspathEntries(asList(Paths.get("."), Paths.get("..")));
+		options.setSelectedClasspathEntries(List.of(Paths.get("."), Paths.get("..")));
 
 		var request = convert();
 
@@ -79,7 +78,7 @@ void convertsScanClasspathOptionWithExplicitRootDirectories() {
 	@Test
 	void convertsScanClasspathOptionWithAdditionalClasspathEntries() {
 		options.setScanClasspath(true);
-		options.setAdditionalClasspathEntries(asList(Paths.get("."), Paths.get("..")));
+		options.setAdditionalClasspathEntries(List.of(Paths.get("."), Paths.get("..")));
 
 		var request = convert();
 
@@ -93,7 +92,7 @@ void convertsScanClasspathOptionWithAdditionalClasspathEntries() {
 	@Test
 	void doesNotSupportScanClasspathAndExplicitSelectors() {
 		options.setScanClasspath(true);
-		options.setSelectedClasses(singletonList("SomeTest"));
+		options.setSelectedClasses(List.of("SomeTest"));
 
 		Throwable cause = assertThrows(PreconditionViolationException.class, this::convert);
 
@@ -114,7 +113,7 @@ void convertsDefaultIncludeClassNamePatternOption() {
 	@Test
 	void convertsExplicitIncludeClassNamePatternOption() {
 		options.setScanClasspath(true);
-		options.setIncludedClassNamePatterns(asList("Foo.*Bar", "Bar.*Foo"));
+		options.setIncludedClassNamePatterns(List.of("Foo.*Bar", "Bar.*Foo"));
 
 		var request = convert();
 
@@ -126,9 +125,9 @@ void convertsExplicitIncludeClassNamePatternOption() {
 
 	@Test
 	void includeSelectedClassesAndMethodsRegardlessOfClassNamePatterns() {
-		options.setSelectedClasses(singletonList("SomeTest"));
-		options.setSelectedMethods(asList("com.acme.Foo#m()"));
-		options.setIncludedClassNamePatterns(asList("Foo.*Bar"));
+		options.setSelectedClasses(List.of("SomeTest"));
+		options.setSelectedMethods(List.of("com.acme.Foo#m()"));
+		options.setIncludedClassNamePatterns(List.of("Foo.*Bar"));
 
 		var request = convert();
 
@@ -142,7 +141,7 @@ void includeSelectedClassesAndMethodsRegardlessOfClassNamePatterns() {
 	@Test
 	void convertsExcludeClassNamePatternOption() {
 		options.setScanClasspath(true);
-		options.setExcludedClassNamePatterns(asList("Foo.*Bar", "Bar.*Foo"));
+		options.setExcludedClassNamePatterns(List.of("Foo.*Bar", "Bar.*Foo"));
 
 		var request = convert();
 
@@ -155,8 +154,8 @@ void convertsExcludeClassNamePatternOption() {
 	@Test
 	void convertsPackageOptions() {
 		options.setScanClasspath(true);
-		options.setIncludedPackages(asList("org.junit.included1", "org.junit.included2", "org.junit.included3"));
-		options.setExcludedPackages(asList("org.junit.excluded1"));
+		options.setIncludedPackages(List.of("org.junit.included1", "org.junit.included2", "org.junit.included3"));
+		options.setExcludedPackages(List.of("org.junit.excluded1"));
 
 		var request = convert();
 		var packageNameFilters = request.getFiltersByType(PackageNameFilter.class);
@@ -171,8 +170,8 @@ void convertsPackageOptions() {
 	@Test
 	void convertsTagOptions() {
 		options.setScanClasspath(true);
-		options.setIncludedTagExpressions(asList("fast", "medium", "slow"));
-		options.setExcludedTagExpressions(asList("slow"));
+		options.setIncludedTagExpressions(List.of("fast", "medium", "slow"));
+		options.setExcludedTagExpressions(List.of("slow"));
 
 		var request = convert();
 		var postDiscoveryFilters = request.getPostDiscoveryFilters();
@@ -185,8 +184,8 @@ void convertsTagOptions() {
 	@Test
 	void convertsEngineOptions() {
 		options.setScanClasspath(true);
-		options.setIncludedEngines(asList("engine1", "engine2", "engine3"));
-		options.setExcludedEngines(singletonList("engine2"));
+		options.setIncludedEngines(List.of("engine1", "engine2", "engine3"));
+		options.setExcludedEngines(List.of("engine2"));
 
 		var request = convert();
 		var engineFilters = request.getEngineFilters();
@@ -198,7 +197,7 @@ void convertsEngineOptions() {
 
 	@Test
 	void convertsUriSelectors() {
-		options.setSelectedUris(asList(URI.create("a"), URI.create("b")));
+		options.setSelectedUris(List.of(URI.create("a"), URI.create("b")));
 
 		var request = convert();
 		var uriSelectors = request.getSelectorsByType(UriSelector.class);
@@ -208,7 +207,7 @@ void convertsUriSelectors() {
 
 	@Test
 	void convertsFileSelectors() {
-		options.setSelectedFiles(asList("foo.txt", "bar.csv"));
+		options.setSelectedFiles(List.of("foo.txt", "bar.csv"));
 
 		var request = convert();
 		var fileSelectors = request.getSelectorsByType(FileSelector.class);
@@ -218,7 +217,7 @@ void convertsFileSelectors() {
 
 	@Test
 	void convertsDirectorySelectors() {
-		options.setSelectedDirectories(asList("foo/bar", "bar/qux"));
+		options.setSelectedDirectories(List.of("foo/bar", "bar/qux"));
 
 		var request = convert();
 		var directorySelectors = request.getSelectorsByType(DirectorySelector.class);
@@ -228,7 +227,7 @@ void convertsDirectorySelectors() {
 
 	@Test
 	void convertsPackageSelectors() {
-		options.setSelectedPackages(asList("com.acme.foo", "com.example.bar"));
+		options.setSelectedPackages(List.of("com.acme.foo", "com.example.bar"));
 
 		var request = convert();
 		var packageSelectors = request.getSelectorsByType(PackageSelector.class);
@@ -239,7 +238,7 @@ void convertsPackageSelectors() {
 
 	@Test
 	void convertsClassSelectors() {
-		options.setSelectedClasses(asList("com.acme.Foo", "com.example.Bar"));
+		options.setSelectedClasses(List.of("com.acme.Foo", "com.example.Bar"));
 
 		var request = convert();
 		var classSelectors = request.getSelectorsByType(ClassSelector.class);
@@ -250,7 +249,7 @@ void convertsClassSelectors() {
 
 	@Test
 	void convertsMethodSelectors() {
-		options.setSelectedMethods(asList("com.acme.Foo#m()", "com.example.Bar#method(java.lang.Object)"));
+		options.setSelectedMethods(List.of("com.acme.Foo#m()", "com.example.Bar#method(java.lang.Object)"));
 
 		var request = convert();
 		var methodSelectors = request.getSelectorsByType(MethodSelector.class);
@@ -266,7 +265,7 @@ void convertsMethodSelectors() {
 
 	@Test
 	void convertsClasspathResourceSelectors() {
-		options.setSelectedClasspathResources(asList("foo.csv", "com/example/bar.json"));
+		options.setSelectedClasspathResources(List.of("foo.csv", "com/example/bar.json"));
 
 		var request = convert();
 		var classpathResourceSelectors = request.getSelectorsByType(ClasspathResourceSelector.class);
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
index d4fa5dea23a5..e7487fb9a994 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
@@ -22,8 +22,6 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
@@ -43,7 +41,7 @@ class TreePrinterTests {
 	private List<String> actual() {
 		try {
 			out.flush();
-			return Arrays.asList(stream.toString(charset.name()).split("\\R"));
+			return List.of(stream.toString(charset.name()).split("\\R"));
 		}
 		catch (UnsupportedEncodingException e) {
 			throw new AssertionError(charset.name() + " is an unsupported encoding?!", e);
@@ -53,7 +51,7 @@ private List<String> actual() {
 	@Test
 	void emptyTree() {
 		new TreePrinter(out, Theme.UNICODE, true).print(new TreeNode("<root>"));
-		assertIterableEquals(Collections.singletonList("╷"), actual());
+		assertIterableEquals(List.of("╷"), actual());
 	}
 
 	@Test
@@ -65,7 +63,7 @@ void emptyEngines() {
 		root.addChild(new TreeNode(identifier("e-3", "engine three")).setResult(aborted(null)));
 		new TreePrinter(out, Theme.UNICODE, true).print(root);
 		assertIterableEquals( //
-			Arrays.asList( //
+			List.of( //
 				"╷", //
 				"├─ engine zero ↷ none", //
 				"├─ engine one ✔", //
@@ -80,7 +78,7 @@ void printNodeHandlesNullMessageThrowableGracefully() {
 		var result = TestExecutionResult.failed(new NullPointerException());
 		var node = new TreeNode(identifier("NPE", "test()")).setResult(result);
 		new TreePrinter(out, Theme.ASCII, true).print(node);
-		assertLinesMatch(Arrays.asList(".", "+-- test() [X] java.lang.NullPointerException"), actual());
+		assertLinesMatch(List.of(".", "+-- test() [X] java.lang.NullPointerException"), actual());
 	}
 
 	@Test
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index cd3d1705410a..c66a17059cf0 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -11,8 +11,6 @@
 package org.junit.platform.engine.discovery;
 
 import static java.lang.String.join;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -35,9 +33,8 @@
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -222,7 +219,7 @@ void selectModuleByNamePreconditions() {
 
 	@Test
 	void selectModulesByNames() {
-		var selectors = selectModules(new HashSet<>(Arrays.asList("a", "b")));
+		var selectors = selectModules(Set.of("a", "b"));
 		var names = selectors.stream().map(ModuleSelector::getModuleName).collect(Collectors.toList());
 		assertThat(names).containsExactlyInAnyOrder("b", "a");
 	}
@@ -230,7 +227,7 @@ void selectModulesByNames() {
 	@Test
 	void selectModulesByNamesPreconditions() {
 		assertViolatesPrecondition(() -> selectModules(null));
-		assertViolatesPrecondition(() -> selectModules(new HashSet<>(Arrays.asList("a", " "))));
+		assertViolatesPrecondition(() -> selectModules(Set.of("a", " ")));
 	}
 
 	@Test
@@ -616,21 +613,21 @@ void selectMethodByClassAndNameForSpockSpec() {
 
 	@Test
 	void selectClasspathRootsWithNonExistingDirectory() {
-		var selectors = selectClasspathRoots(singleton(Paths.get("some", "local", "path")));
+		var selectors = selectClasspathRoots(Set.of(Paths.get("some", "local", "path")));
 
 		assertThat(selectors).isEmpty();
 	}
 
 	@Test
 	void selectClasspathRootsWithNonExistingJarFile() {
-		var selectors = selectClasspathRoots(singleton(Paths.get("some.jar")));
+		var selectors = selectClasspathRoots(Set.of(Paths.get("some.jar")));
 
 		assertThat(selectors).isEmpty();
 	}
 
 	@Test
 	void selectClasspathRootsWithExistingDirectory(@TempDir Path tempDir) {
-		var selectors = selectClasspathRoots(singleton(tempDir));
+		var selectors = selectClasspathRoots(Set.of(tempDir));
 
 		assertThat(selectors).extracting(ClasspathRootSelector::getClasspathRoot).containsExactly(tempDir.toUri());
 	}
@@ -640,7 +637,7 @@ void selectClasspathRootsWithExistingJarFile() throws Exception {
 		var jarUri = getClass().getResource("/jartest.jar").toURI();
 		var jarFile = Paths.get(jarUri);
 
-		var selectors = selectClasspathRoots(singleton(jarFile));
+		var selectors = selectClasspathRoots(Set.of(jarFile));
 
 		assertThat(selectors).extracting(ClasspathRootSelector::getClasspathRoot).containsExactly(jarUri);
 	}
@@ -680,7 +677,7 @@ void selectDoubleNestedClassByClassNames() {
 		@Test
 		void selectNestedClassPreconditions() {
 			assertViolatesPrecondition(() -> selectNestedClass(null, "ClassName"));
-			assertViolatesPrecondition(() -> selectNestedClass(emptyList(), "ClassName"));
+			assertViolatesPrecondition(() -> selectNestedClass(List.of(), "ClassName"));
 			assertViolatesPrecondition(() -> selectNestedClass(List.of("ClassName"), null));
 			assertViolatesPrecondition(() -> selectNestedClass(List.of("ClassName"), ""));
 			assertViolatesPrecondition(() -> selectNestedClass(List.of("ClassName"), " "));
@@ -750,8 +747,8 @@ void selectDoubleNestedMethodByEnclosingClassNamesAndMethodName() throws Excepti
 		void selectNestedMethodPreconditions() {
 			assertViolatesPrecondition(() -> selectNestedMethod(null, "ClassName", "methodName"));
 			assertViolatesPrecondition(() -> selectNestedMethod(null, "ClassName", "methodName", "int"));
-			assertViolatesPrecondition(() -> selectNestedMethod(emptyList(), "ClassName", "methodName"));
-			assertViolatesPrecondition(() -> selectNestedMethod(emptyList(), "ClassName", "methodName", "int"));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of(), "ClassName", "methodName"));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of(), "ClassName", "methodName", "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), null, "methodName"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), null, "methodName", "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), " ", "methodName"));
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
index 526386711d3b..059fc277bfec 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
@@ -15,14 +15,11 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
-import org.junit.platform.engine.TestSource;
 
 /**
  * Unit tests for {@link CompositeTestSource}.
@@ -35,7 +32,7 @@ class CompositeTestSourceTests extends AbstractTestSourceTests {
 	Stream<CompositeTestSource> createSerializableInstances() {
 		var fileSource = FileSource.from(new File("sample.instance"));
 		var classSource = ClassSource.from(getClass());
-		List<TestSource> sources = new ArrayList<>(Arrays.asList(fileSource, classSource));
+		var sources = List.of(fileSource, classSource);
 		return Stream.of(CompositeTestSource.from(sources));
 	}
 
@@ -46,14 +43,14 @@ void createCompositeTestSourceFromNullList() {
 
 	@Test
 	void createCompositeTestSourceFromEmptyList() {
-		assertThrows(PreconditionViolationException.class, () -> CompositeTestSource.from(Collections.emptyList()));
+		assertThrows(PreconditionViolationException.class, () -> CompositeTestSource.from(List.of()));
 	}
 
 	@Test
 	void createCompositeTestSourceFromClassAndFileSources() {
 		var fileSource = FileSource.from(new File("example.test"));
 		var classSource = ClassSource.from(getClass());
-		List<TestSource> sources = new ArrayList<>(Arrays.asList(fileSource, classSource));
+		var sources = new ArrayList<>(List.of(fileSource, classSource));
 		var compositeTestSource = CompositeTestSource.from(sources);
 
 		assertThat(compositeTestSource.getSources().size()).isEqualTo(2);
@@ -69,8 +66,8 @@ void createCompositeTestSourceFromClassAndFileSources() {
 
 	@Test
 	void equalsAndHashCode() {
-		List<TestSource> sources1 = Collections.singletonList(ClassSource.from(Number.class));
-		List<TestSource> sources2 = Collections.singletonList(ClassSource.from(String.class));
+		var sources1 = List.of(ClassSource.from(Number.class));
+		var sources2 = List.of(ClassSource.from(String.class));
 		assertEqualsAndHashCode(CompositeTestSource.from(sources1), CompositeTestSource.from(sources1),
 			CompositeTestSource.from(sources2));
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
index ba253affcf6a..0ae2ec0aedcb 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
@@ -10,13 +10,13 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static java.util.Arrays.asList;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.locks.Lock;
 
@@ -34,7 +34,7 @@ void acquiresAllLocksInOrder() throws Exception {
 		var lock1 = mock(Lock.class);
 		var lock2 = mock(Lock.class);
 
-		new CompositeLock(asList(lock1, lock2)).acquire();
+		new CompositeLock(List.of(lock1, lock2)).acquire();
 
 		var inOrder = inOrder(lock1, lock2);
 		inOrder.verify(lock1).lockInterruptibly();
@@ -47,7 +47,7 @@ void releasesAllLocksInReverseOrder() throws Exception {
 		var lock1 = mock(Lock.class);
 		var lock2 = mock(Lock.class);
 
-		new CompositeLock(asList(lock1, lock2)).acquire().close();
+		new CompositeLock(List.of(lock1, lock2)).acquire().close();
 
 		var inOrder = inOrder(lock1, lock2);
 		inOrder.verify(lock2).unlock();
@@ -64,7 +64,7 @@ void releasesLocksInReverseOrderWhenInterruptedDuringAcquire() throws Exception
 
 		var thread = new Thread(() -> {
 			try {
-				new CompositeLock(asList(firstLock, secondLock, unavailableLock)).acquire();
+				new CompositeLock(List.of(firstLock, secondLock, unavailableLock)).acquire();
 			}
 			catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
index aeac3287abad..20167699afeb 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -30,6 +29,7 @@
 import static org.mockito.Mockito.when;
 
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 
@@ -660,7 +660,7 @@ void dynamicTestDescriptorsMustNotDeclareExclusiveResources() {
 		var child = spy(new MyLeaf(leafUniqueId));
 		var dynamicTestDescriptor = spy(new MyLeaf(leafUniqueId.append("dynamic", "child")));
 		when(dynamicTestDescriptor.getExclusiveResources()).thenReturn(
-			singleton(new ExclusiveResource("foo", LockMode.READ)));
+			Set.of(new ExclusiveResource("foo", LockMode.READ)));
 
 		when(child.execute(any(), any())).thenAnswer(execute(dynamicTestDescriptor));
 		root.addChild(child);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
index 25e359e2ed0d..dac88f8367ff 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
@@ -10,9 +10,6 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_KEY;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.LockMode.READ;
@@ -20,6 +17,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -38,7 +36,7 @@ class LockManagerTests {
 
 	@Test
 	void returnsNopLockWithoutExclusiveResources() {
-		Collection<ExclusiveResource> resources = emptySet();
+		Collection<ExclusiveResource> resources = Set.of();
 
 		var locks = getLocks(resources, NopLock.class);
 
@@ -47,7 +45,7 @@ void returnsNopLockWithoutExclusiveResources() {
 
 	@Test
 	void returnsSingleLockForSingleExclusiveResource() {
-		Collection<ExclusiveResource> resources = singleton(new ExclusiveResource("foo", READ));
+		Collection<ExclusiveResource> resources = Set.of(new ExclusiveResource("foo", READ));
 
 		var locks = getLocks(resources, SingleLock.class);
 
@@ -57,7 +55,7 @@ void returnsSingleLockForSingleExclusiveResource() {
 
 	@Test
 	void returnsCompositeLockForMultipleDifferentExclusiveResources() {
-		Collection<ExclusiveResource> resources = asList( //
+		Collection<ExclusiveResource> resources = List.of( //
 			new ExclusiveResource("a", READ), //
 			new ExclusiveResource("b", READ_WRITE));
 
@@ -70,7 +68,7 @@ void returnsCompositeLockForMultipleDifferentExclusiveResources() {
 
 	@Test
 	void reusesSameLockForExclusiveResourceWithSameKey() {
-		Collection<ExclusiveResource> resources = singleton(new ExclusiveResource("foo", READ));
+		Collection<ExclusiveResource> resources = Set.of(new ExclusiveResource("foo", READ));
 
 		var locks1 = getLocks(resources, SingleLock.class);
 		var locks2 = getLocks(resources, SingleLock.class);
@@ -82,7 +80,7 @@ void reusesSameLockForExclusiveResourceWithSameKey() {
 
 	@Test
 	void returnsWriteLockForExclusiveResourceWithBothLockModes() {
-		Collection<ExclusiveResource> resources = asList( //
+		Collection<ExclusiveResource> resources = List.of( //
 			new ExclusiveResource("bar", READ), //
 			new ExclusiveResource("foo", READ), //
 			new ExclusiveResource("foo", READ_WRITE), //
@@ -98,7 +96,7 @@ void returnsWriteLockForExclusiveResourceWithBothLockModes() {
 	@ParameterizedTest
 	@EnumSource
 	void globalLockComesFirst(LockMode globalLockMode) {
-		Collection<ExclusiveResource> resources = asList( //
+		Collection<ExclusiveResource> resources = List.of( //
 			new ExclusiveResource("___foo", READ), //
 			new ExclusiveResource("foo", READ_WRITE), //
 			new ExclusiveResource(GLOBAL_KEY, globalLockMode), //
@@ -114,7 +112,7 @@ void globalLockComesFirst(LockMode globalLockMode) {
 	}
 
 	private Lock getSingleLock(String globalResourceLockKey, LockMode read) {
-		return getLocks(singleton(new ExclusiveResource(globalResourceLockKey, read)), SingleLock.class).get(0);
+		return getLocks(Set.of(new ExclusiveResource(globalResourceLockKey, read)), SingleLock.class).get(0);
 	}
 
 	private List<Lock> getLocks(Collection<ExclusiveResource> resources, Class<? extends ResourceLock> type) {
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
index 63ad8e7a60aa..88c397b59e1c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
@@ -51,7 +50,7 @@ void pullUpExclusiveChildResourcesToTestClass() {
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
 		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
-		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()).isEqualTo(emptyList());
+		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()).isEqualTo(List.of());
 		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).contains(SAME_THREAD);
 	}
 
@@ -79,7 +78,7 @@ void leavesResourceLockOnTestMethodWhenClassDoesNotUseResource() {
 		assertThat(advisor.getForcedExecutionMode(nestedTestClassDescriptor)).isEmpty();
 
 		var nestedTestMethodDescriptor = getOnlyElement(nestedTestClassDescriptor.getChildren());
-		assertThat(advisor.getResourceLock(nestedTestMethodDescriptor)).extracting(allLocks()).isEqualTo(emptyList());
+		assertThat(advisor.getResourceLock(nestedTestMethodDescriptor)).extracting(allLocks()).isEqualTo(List.of());
 		assertThat(advisor.getForcedExecutionMode(nestedTestMethodDescriptor)).contains(SAME_THREAD);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
index 8eacd6eecf57..9d4ca7878b0c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
@@ -10,13 +10,14 @@
 
 package org.junit.platform.launcher;
 
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.platform.commons.util.SerializationUtils.serializeAndDeserialize;
 
+import java.util.Set;
+
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestTag;
@@ -57,13 +58,13 @@ void inheritsTypeFromDescriptor() {
 	void serialization() throws Exception {
 		var identifier = serializeAndDeserialize(//
 			new TestIdentifier("uniqueId", "displayName", ClassSource.from(TestIdentifierTests.class),
-				singleton(TestTag.create("aTag")), TestDescriptor.Type.TEST, "parentId", "reportingName"));
+				Set.of(TestTag.create("aTag")), TestDescriptor.Type.TEST, "parentId", "reportingName"));
 
 		assertEquals("uniqueId", identifier.getUniqueId());
 		assertEquals("displayName", identifier.getDisplayName());
 		assertEquals("reportingName", identifier.getLegacyReportingName());
 		assertThat(identifier.getSource()).contains(ClassSource.from(TestIdentifierTests.class));
-		assertEquals(singleton(TestTag.create("aTag")), identifier.getTags());
+		assertEquals(Set.of(TestTag.create("aTag")), identifier.getTags());
 		assertEquals(TestDescriptor.Type.TEST, identifier.getType());
 		assertTrue(identifier.isTest());
 		assertFalse(identifier.isContainer());
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
index 33844ba6ceb0..f7f77f4e017a 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
@@ -10,9 +10,10 @@
 
 package org.junit.platform.launcher;
 
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Set;
+
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
@@ -32,7 +33,7 @@ public Type getType() {
 				}
 			});
 
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		assertThat(testPlan.containsTests()).as("contains tests").isFalse();
 	}
@@ -47,7 +48,7 @@ public Type getType() {
 				}
 			});
 
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		assertThat(testPlan.containsTests()).as("contains tests").isTrue();
 	}
@@ -67,7 +68,7 @@ public boolean mayRegisterTests() {
 				}
 			});
 
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		assertThat(testPlan.containsTests()).as("contains tests").isTrue();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
index 29f144b96b2b..217a3705b006 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
@@ -10,8 +10,6 @@
 
 package org.junit.platform.launcher.core;
 
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -52,14 +50,14 @@ void reset() {
 	@Test
 	void constructorPreconditions() {
 		assertThrows(PreconditionViolationException.class, () -> fromMap(null));
-		assertThrows(PreconditionViolationException.class, () -> fromMapAndFile(emptyMap(), null));
-		assertThrows(PreconditionViolationException.class, () -> fromMapAndFile(emptyMap(), ""));
-		assertThrows(PreconditionViolationException.class, () -> fromMapAndFile(emptyMap(), "  "));
+		assertThrows(PreconditionViolationException.class, () -> fromMapAndFile(Map.of(), null));
+		assertThrows(PreconditionViolationException.class, () -> fromMapAndFile(Map.of(), ""));
+		assertThrows(PreconditionViolationException.class, () -> fromMapAndFile(Map.of(), "  "));
 	}
 
 	@Test
 	void getPreconditions() {
-		ConfigurationParameters configParams = fromMap(emptyMap());
+		ConfigurationParameters configParams = fromMap(Map.of());
 		assertThrows(PreconditionViolationException.class, () -> configParams.get(null));
 		assertThrows(PreconditionViolationException.class, () -> configParams.get(""));
 		assertThrows(PreconditionViolationException.class, () -> configParams.get("  "));
@@ -67,7 +65,7 @@ void getPreconditions() {
 
 	@Test
 	void noConfigParams() {
-		ConfigurationParameters configParams = fromMap(emptyMap());
+		ConfigurationParameters configParams = fromMap(Map.of());
 		assertThat(configParams.size()).isEqualTo(0);
 		assertThat(configParams.get(KEY)).isEmpty();
 		assertThat(configParams.toString()).doesNotContain(KEY);
@@ -75,7 +73,7 @@ void noConfigParams() {
 
 	@Test
 	void explicitConfigParam() {
-		ConfigurationParameters configParams = fromMap(singletonMap(KEY, CONFIG_PARAM));
+		ConfigurationParameters configParams = fromMap(Map.of(KEY, CONFIG_PARAM));
 		assertThat(configParams.get(KEY)).contains(CONFIG_PARAM);
 		assertThat(configParams.toString()).contains(CONFIG_PARAM);
 	}
@@ -83,14 +81,14 @@ void explicitConfigParam() {
 	@Test
 	void systemProperty() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
-		ConfigurationParameters configParams = fromMap(emptyMap());
+		ConfigurationParameters configParams = fromMap(Map.of());
 		assertThat(configParams.get(KEY)).contains(SYSTEM_PROPERTY);
 		assertThat(configParams.toString()).doesNotContain(KEY);
 	}
 
 	@Test
 	void configFile() {
-		ConfigurationParameters configParams = fromMapAndFile(emptyMap(), CONFIG_FILE_NAME);
+		ConfigurationParameters configParams = fromMapAndFile(Map.of(), CONFIG_FILE_NAME);
 		assertThat(configParams.get(KEY)).contains(CONFIG_FILE);
 		assertThat(configParams.toString()).contains(CONFIG_FILE);
 	}
@@ -98,14 +96,14 @@ void configFile() {
 	@Test
 	void explicitConfigParamOverridesSystemProperty() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
-		ConfigurationParameters configParams = fromMap(singletonMap(KEY, CONFIG_PARAM));
+		ConfigurationParameters configParams = fromMap(Map.of(KEY, CONFIG_PARAM));
 		assertThat(configParams.get(KEY)).contains(CONFIG_PARAM);
 		assertThat(configParams.toString()).contains(CONFIG_PARAM);
 	}
 
 	@Test
 	void explicitConfigParamOverridesConfigFile() {
-		ConfigurationParameters configParams = fromMapAndFile(singletonMap(KEY, CONFIG_PARAM), CONFIG_FILE_NAME);
+		ConfigurationParameters configParams = fromMapAndFile(Map.of(KEY, CONFIG_PARAM), CONFIG_FILE_NAME);
 		assertThat(configParams.get(KEY)).contains(CONFIG_PARAM);
 		assertThat(configParams.toString()).contains(CONFIG_PARAM);
 	}
@@ -113,7 +111,7 @@ void explicitConfigParamOverridesConfigFile() {
 	@Test
 	void systemPropertyOverridesConfigFile() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
-		ConfigurationParameters configParams = fromMapAndFile(emptyMap(), CONFIG_FILE_NAME);
+		ConfigurationParameters configParams = fromMapAndFile(Map.of(), CONFIG_FILE_NAME);
 		assertThat(configParams.get(KEY)).contains(SYSTEM_PROPERTY);
 		assertThat(configParams.toString()).contains(CONFIG_FILE);
 	}
@@ -130,13 +128,13 @@ void getValueInExtensionContext() {
 
 	@Test
 	void getWithSuccessfulTransformer() {
-		ConfigurationParameters configParams = fromMap(singletonMap(KEY, "42"));
+		ConfigurationParameters configParams = fromMap(Map.of(KEY, "42"));
 		assertThat(configParams.get(KEY, Integer::valueOf)).contains(42);
 	}
 
 	@Test
 	void getWithErroneousTransformer() {
-		ConfigurationParameters configParams = fromMap(singletonMap(KEY, "42"));
+		ConfigurationParameters configParams = fromMap(Map.of(KEY, "42"));
 		var exception = assertThrows(JUnitException.class, () -> configParams.get(KEY, input -> {
 			throw new RuntimeException("foo");
 		}));
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
index 0b7634f48d39..a3d6833987c4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.launcher.core;
 
-import static java.util.Collections.singletonMap;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -290,7 +289,7 @@ void multipleConfigurationParametersAddedDirectly_areStoredInDiscoveryRequest()
 		void configurationParameterAddedByMap_isStoredInDiscoveryRequest() {
 			// @formatter:off
 			var discoveryRequest = request()
-					.configurationParameters(singletonMap("key", "value"))
+					.configurationParameters(Map.of("key", "value"))
 					.build();
 			// @formatter:on
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java
index 43fa30e1d431..35d999c0ba4f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java
@@ -14,7 +14,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 
-import java.util.Collections;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
@@ -96,7 +96,7 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionStartedListenerMethodFails(
 			LogRecordListener logRecordListener) {
 		var testDescriptor = getDemoMethodTestDescriptor();
 
-		compositeTestExecutionListener.testPlanExecutionStarted(TestPlan.from(Collections.singleton(testDescriptor)));
+		compositeTestExecutionListener.testPlanExecutionStarted(TestPlan.from(Set.of(testDescriptor)));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"testPlanExecutionStarted");
@@ -107,7 +107,7 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionFinishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
 		var testDescriptor = getDemoMethodTestDescriptor();
 
-		compositeTestExecutionListener.testPlanExecutionFinished(TestPlan.from(Collections.singleton(testDescriptor)));
+		compositeTestExecutionListener.testPlanExecutionFinished(TestPlan.from(Set.of(testDescriptor)));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"testPlanExecutionFinished");
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index e3e088e352fc..56fda7ca14d8 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -18,7 +18,7 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
@@ -36,7 +36,7 @@
 class SummaryGenerationTests {
 
 	private final SummaryGeneratingListener listener = new SummaryGeneratingListener();
-	private final TestPlan testPlan = TestPlan.from(Collections.emptyList());
+	private final TestPlan testPlan = TestPlan.from(List.of());
 
 	@Test
 	void emptyReport() {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
index 76317c319023..64c68a997519 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.launcher.tagexpression;
 
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.platform.engine.TestTag.create;
@@ -21,7 +20,6 @@
 import static org.junit.platform.launcher.tagexpression.TagExpressions.or;
 import static org.junit.platform.launcher.tagexpression.TagExpressions.tag;
 
-import java.util.Collections;
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
@@ -49,8 +47,8 @@ void rejectInvalidTestTags() {
 	void tagEvaluation() {
 		var tagExpression = tag("foo");
 
-		assertThat(tagExpression.evaluate(singleton(create("foo")))).isTrue();
-		assertThat(tagExpression.evaluate(singleton(create("not_foo")))).isFalse();
+		assertThat(tagExpression.evaluate(Set.of(create("foo")))).isTrue();
+		assertThat(tagExpression.evaluate(Set.of(create("not_foo")))).isFalse();
 	}
 
 	@Test
@@ -62,8 +60,8 @@ void justConcatenateNot() {
 
 	@Test
 	void notEvaluation() {
-		assertThat(not(True).evaluate(emptyTestTags())).isFalse();
-		assertThat(not(False).evaluate(emptyTestTags())).isTrue();
+		assertThat(not(True).evaluate(Set.of())).isFalse();
+		assertThat(not(False).evaluate(Set.of())).isTrue();
 	}
 
 	@Test
@@ -73,9 +71,9 @@ void encloseAndWithParenthesis() {
 
 	@Test
 	void andEvaluation() {
-		assertThat(and(True, True).evaluate(emptyTestTags())).isTrue();
-		assertThat(and(True, False).evaluate(emptyTestTags())).isFalse();
-		assertThat(and(False, onEvaluateThrow()).evaluate(emptyTestTags())).isFalse();
+		assertThat(and(True, True).evaluate(Set.of())).isTrue();
+		assertThat(and(True, False).evaluate(Set.of())).isFalse();
+		assertThat(and(False, onEvaluateThrow()).evaluate(Set.of())).isFalse();
 	}
 
 	@Test
@@ -85,20 +83,20 @@ void encloseOrWithParenthesis() {
 
 	@Test
 	void orEvaluation() {
-		assertThat(or(False, False).evaluate(emptyTestTags())).isFalse();
-		assertThat(or(True, onEvaluateThrow()).evaluate(emptyTestTags())).isTrue();
-		assertThat(or(False, True).evaluate(emptyTestTags())).isTrue();
+		assertThat(or(False, False).evaluate(Set.of())).isFalse();
+		assertThat(or(True, onEvaluateThrow()).evaluate(Set.of())).isTrue();
+		assertThat(or(False, True).evaluate(Set.of())).isTrue();
 	}
 
 	@Test
 	void anyEvaluation() {
-		assertThat(any().evaluate(emptyTestTags())).isFalse();
+		assertThat(any().evaluate(Set.of())).isFalse();
 		assertThat(any().evaluate(Set.of(TestTag.create("foo")))).isTrue();
 	}
 
 	@Test
 	void noneEvaluation() {
-		assertThat(none().evaluate(emptyTestTags())).isTrue();
+		assertThat(none().evaluate(Set.of())).isTrue();
 		assertThat(none().evaluate(Set.of(TestTag.create("foo")))).isFalse();
 	}
 
@@ -108,7 +106,4 @@ private TagExpression onEvaluateThrow() {
 		};
 	}
 
-	private static Set<TestTag> emptyTestTags() {
-		return Collections.emptySet();
-	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
index 18dfc914de42..1f9343c58a96 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
@@ -10,9 +10,10 @@
 
 package org.junit.platform.reporting.legacy;
 
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.Set;
+
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestSource;
@@ -69,13 +70,13 @@ void legacyReportingClassNameForDescendantOfTestIdentifierWithClassSourceIsClass
 	}
 
 	private String getClassName(UniqueId uniqueId) {
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 		return LegacyReportingUtils.getClassName(testPlan, testPlan.getTestIdentifier(uniqueId.toString()));
 	}
 
 	@SuppressWarnings("deprecation")
 	private String getClassNameFromOldLocation(UniqueId uniqueId) {
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 		return org.junit.platform.launcher.listeners.LegacyReportingUtils.getClassName(testPlan,
 			testPlan.getTestIdentifier(uniqueId.toString()));
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 6b2927a09584..bf834c0ed939 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -10,8 +10,6 @@
 
 package org.junit.platform.reporting.legacy.xml;
 
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -37,6 +35,7 @@
 import java.time.ZonedDateTime;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestReporter;
@@ -335,12 +334,12 @@ void writesHostNameAndTimestamp(@TempDir Path tempDirectory) throws Exception {
 	@Test
 	void printsExceptionWhenReportsDirCannotBeCreated(@TempDir Path tempDirectory) throws Exception {
 		var reportsDir = tempDirectory.resolve("dummy.txt");
-		Files.write(reportsDir, singleton("content"));
+		Files.write(reportsDir, Set.of("content"));
 
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(reportsDir, new PrintWriter(out));
 
-		listener.testPlanExecutionStarted(TestPlan.from(emptySet()));
+		listener.testPlanExecutionStarted(TestPlan.from(Set.of()));
 
 		assertThat(out.toString()).containsSubsequence("Could not create reports directory",
 			"FileAlreadyExistsException", "at ");
@@ -356,7 +355,7 @@ void printsExceptionWhenReportCouldNotBeWritten(@TempDir Path tempDirectory) thr
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
 
-		listener.testPlanExecutionStarted(TestPlan.from(singleton(engineDescriptor)));
+		listener.testPlanExecutionStarted(TestPlan.from(Set.of(engineDescriptor)));
 		listener.executionFinished(TestIdentifier.from(engineDescriptor), successful());
 
 		assertThat(out.toString()).containsSubsequence("Could not write XML report", "Exception", "at ");
@@ -367,7 +366,7 @@ void writesReportEntriesToSystemOutElement(@TempDir Path tempDirectory, TestRepo
 			throws Exception {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index b23157d56dc6..ca13a6782cb9 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -10,12 +10,12 @@
 
 package org.junit.platform.reporting.legacy.xml;
 
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.platform.engine.TestExecutionResult.failed;
 import static org.junit.platform.engine.TestExecutionResult.successful;
 
 import java.time.Clock;
+import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.UniqueId;
@@ -32,7 +32,7 @@ class XmlReportDataTests {
 	void resultOfTestIdentifierWithoutAnyReportedEventsIsEmpty() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
@@ -44,7 +44,7 @@ void resultOfTestIdentifierWithoutAnyReportedEventsIsEmpty() {
 	void resultOfTestIdentifierWithoutReportedEventsIsFailureOfAncestor() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var failureOfAncestor = failed(new RuntimeException("failed!"));
@@ -59,7 +59,7 @@ void resultOfTestIdentifierWithoutReportedEventsIsFailureOfAncestor() {
 	void resultOfTestIdentifierWithoutReportedEventsIsEmptyWhenAncestorWasSuccessful() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index bf0b797a958b..c47dae5d1239 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.reporting.legacy.xml;
 
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
@@ -25,6 +24,7 @@
 import java.io.Writer;
 import java.time.Clock;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
@@ -48,7 +48,7 @@ class XmlReportWriterTests {
 
 	@Test
 	void writesTestsuiteElementsWithoutTestcaseElementsWithoutAnyTests() throws Exception {
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 
@@ -69,7 +69,7 @@ void writesReportEntry() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		var testDescriptor = new TestDescriptorStub(uniqueId, "successfulTest");
 		engineDescriptor.addChild(testDescriptor);
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), ReportEntry.from("myKey", "myValue"));
@@ -93,7 +93,7 @@ void writesCapturedOutput() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		var testDescriptor = new TestDescriptorStub(uniqueId, "successfulTest");
 		engineDescriptor.addChild(testDescriptor);
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var reportEntry = ReportEntry.from(Map.of( //
@@ -134,7 +134,7 @@ void writesCapturedOutput() throws Exception {
 	void writesEmptySkippedElementForSkippedTestWithoutReason() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "skippedTest"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markSkipped(testPlan.getTestIdentifier(uniqueId.toString()), null);
@@ -166,7 +166,7 @@ public String getLegacyReportingName() {
 				return "failedTest";
 			}
 		});
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(null));
@@ -187,7 +187,7 @@ public String getLegacyReportingName() {
 	void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "failedTest"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(new NullPointerException()));
@@ -208,7 +208,7 @@ void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exce
 	void writesValidXmlEvenIfExceptionMessageContainsCData() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
@@ -231,7 +231,7 @@ void writesValidXmlEvenIfExceptionMessageContainsCData() throws Exception {
 	void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages(TestInfo testInfo) throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("expected: <A> but was: <B\0>");
@@ -257,7 +257,7 @@ void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages(TestInfo tes
 	void doesNotReopenCDataWithinCDataContent() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		var testPlan = TestPlan.from(singleton(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index bbde830b43c5..2f9b6075a8ea 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -10,9 +10,6 @@
 
 package org.junit.platform.runner;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singleton;
 import static java.util.stream.Collectors.toSet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -40,6 +37,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -434,7 +432,7 @@ void convertsTestIdentifiersIntoDescriptions() {
 			TestDescriptor container2 = new TestDescriptorStub(UniqueId.root("root", "container2"), "container2");
 			container2.addChild(new TestDescriptorStub(UniqueId.root("root", "test2a"), "test2a"));
 			container2.addChild(new TestDescriptorStub(UniqueId.root("root", "test2b"), "test2b"));
-			var testPlan = TestPlan.from(asList(container1, container2));
+			var testPlan = TestPlan.from(List.of(container1, container2));
 
 			var launcher = mock(Launcher.class);
 			when(launcher.discover(any())).thenReturn(testPlan);
@@ -471,11 +469,11 @@ void appliesFilter() throws Exception {
 			TestDescriptor originalParent2 = new TestDescriptorStub(UniqueId.root("root", "parent2"), "parent2");
 			originalParent2.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2a"), "leaf2a"));
 			originalParent2.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2b"), "leaf2b"));
-			var fullTestPlan = TestPlan.from(asList(originalParent1, originalParent2));
+			var fullTestPlan = TestPlan.from(List.of(originalParent1, originalParent2));
 
 			TestDescriptor filteredParent = new TestDescriptorStub(UniqueId.root("root", "parent2"), "parent2");
 			filteredParent.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2b"), "leaf2b"));
-			var filteredTestPlan = TestPlan.from(singleton(filteredParent));
+			var filteredTestPlan = TestPlan.from(Set.of(filteredParent));
 
 			var launcher = mock(Launcher.class);
 			var captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
@@ -497,7 +495,7 @@ void appliesFilter() throws Exception {
 
 		@Test
 		void throwsNoTestsRemainExceptionWhenNoTestIdentifierMatchesFilter() {
-			var testPlan = TestPlan.from(singleton(new TestDescriptorStub(UniqueId.root("root", "test"), "test")));
+			var testPlan = TestPlan.from(Set.of(new TestDescriptorStub(UniqueId.root("root", "test"), "test")));
 
 			var launcher = mock(Launcher.class);
 			when(launcher.discover(any())).thenReturn(testPlan);
@@ -735,7 +733,7 @@ private TestDescriptor testDescriptorWithTags(String... tag) {
 	private LauncherDiscoveryRequest instantiateRunnerAndCaptureGeneratedRequest(Class<?> testClass) {
 		var launcher = mock(Launcher.class);
 		var captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
-		when(launcher.discover(captor.capture())).thenReturn(TestPlan.from(emptySet()));
+		when(launcher.discover(captor.capture())).thenReturn(TestPlan.from(Set.of()));
 
 		new JUnitPlatform(testClass, launcher);
 

From 8622b6d75d65c60cdd97a9b99bea2be3d79e5828 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Oct 2020 18:08:55 +0200
Subject: [PATCH 0050/1433] Upgrade to JUnit 4.13.1

---
 gradle.properties                                               | 2 +-
 .../java/org/junit/vintage/engine/JUnit4VersionCheckTests.java  | 1 +
 .../platform/tooling/support/tests/ModularUserGuideTests.java   | 2 +-
 .../tooling/support/tests/VintageGradleIntegrationTests.java    | 2 +-
 .../tooling/support/tests/VintageMavenIntegrationTests.java     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8942b741e170..014e0f3ad274 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ org.gradle.parallel=true
 # Dependencies
 apiguardian.version=1.1.0
 assertj.version=3.16.1
-junit4.version=4.13
+junit4.version=4.13.1
 junit4Min.version=4.12
 opentest4j.version=1.2.0
 picocli.version=4.5.0
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
index 128873f1d85f..71cbb385bd53 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
@@ -31,6 +31,7 @@ class JUnit4VersionCheckTests {
 	void handlesParsingSupportedVersionIdWithStandardVersionFormat() {
 		assertDoesNotThrow(() -> JUnit4VersionCheck.checkSupported(() -> "4.12"));
 		assertDoesNotThrow(() -> JUnit4VersionCheck.checkSupported(() -> "4.13"));
+		assertDoesNotThrow(() -> JUnit4VersionCheck.checkSupported(() -> "4.13.1"));
 	}
 
 	/**
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index 248b72755035..ed63c9c080d4 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -69,7 +69,7 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
 		args.add(temp.resolve("destination").toString());
 
 		var lib = Files.createDirectories(temp.resolve("lib"));
-		Helper.load(lib, "junit", "junit", Helper.version("junit4", "4.13"));
+		Helper.load(lib, "junit", "junit", Helper.version("junit4", "4.13.1"));
 		Helper.load(lib, "org.assertj", "assertj-core", Helper.version("assertJ", "3.14.0"));
 		Helper.load(lib, "org.apiguardian", "apiguardian-api", Helper.version("apiGuardian", "1.1.0"));
 		Helper.load(lib, "org.hamcrest", "hamcrest", Helper.version("hamcrest", "2.2"));
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index 56c6bcf195f6..8a8b0c538480 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -41,7 +41,7 @@ void unsupportedVersion() {
 	}
 
 	@ParameterizedTest(name = "{0}")
-	@ValueSource(strings = { "4.12", "4.13" })
+	@ValueSource(strings = { "4.12", "4.13.1" })
 	void supportedVersions(String version) {
 		Result result = run(version);
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index d396beaaf5b8..6f50e1b217ce 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -38,7 +38,7 @@ void unsupportedVersion() {
 	}
 
 	@ParameterizedTest(name = "{0}")
-	@ValueSource(strings = { "4.12", "4.13" })
+	@ValueSource(strings = { "4.12", "4.13.1" })
 	void supportedVersions(String version) {
 		Result result = run(version);
 

From f41ea210992253ce22e26e8177ed7099c1e13b07 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 13 Oct 2020 08:50:11 +0200
Subject: [PATCH 0051/1433] Upgradle to 6.7-rc-5

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index af6df179e1ab..90a0f2638a62 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=01b4f3804b6c3f15ff3eb39e56efae55e265b6007c9fa3bd58b83b2dc4697dc4
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-4-bin.zip
+distributionSha256Sum=c7c33aa33d32e4bd68df71deb5c6d00f2c4675d88b8a14748661196a717dfe2c
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 23ab692cb129e0980a40efe4fe76a808d6230fa1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 13 Oct 2020 21:55:14 +0200
Subject: [PATCH 0052/1433] Use Docker images from GitHub Container Registry

---
 .github/workflows/cross-version.yml | 2 +-
 .github/workflows/main.yml          | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index f25ce85cba03..bd50c289812d 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -21,7 +21,7 @@ jobs:
         jdk: [16]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
-    container: "junitteam/build:${{ matrix.jdk }}"
+    container: "ghcr.io/junit-team/build:${{ matrix.jdk }}"
     steps:
       - uses: actions/checkout@v2
       - name: Cache Gradle wrapper and dependencies
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6cb9abaf282b..b1a983b3bfe2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
   linux:
     name: 'Linux'
     runs-on: ubuntu-latest
-    container: junitteam/build:15
+    container: ghcr.io/junit-team/build
     steps:
     - uses: actions/checkout@v2
     - name: Cache Gradle wrapper and dependencies
@@ -127,7 +127,7 @@ jobs:
     name: 'Coverage'
     needs: linux
     runs-on: ubuntu-latest
-    container: junitteam/build:latest
+    container: ghcr.io/junit-team/build
     steps:
     - uses: actions/checkout@v2
     - name: Cache Gradle wrapper and dependencies
@@ -146,10 +146,6 @@ jobs:
         key: coverage-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           coverage-${{ runner.os }}-maven-
-    - name: 'Set up JDK 15'
-      uses: actions/setup-java@v1
-      with:
-        java-version: 15
     - name: Prepare Gradle Enterprise credentials
       run: |
         mkdir -p /root/.gradle/enterprise/

From 0f1bf5ecb86c50d420eaa85c1be01a8e812e3df4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 13 Oct 2020 22:09:33 +0200
Subject: [PATCH 0053/1433] Disable test on 16-ea for now

/cc @sormuras
---
 .../platform/tooling/support/tests/JarDescribeModuleTests.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
index d58fe161e9a2..b555166f6464 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
@@ -25,6 +25,8 @@
 
 import de.sormuras.bartholdy.jdk.Jar;
 
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -38,6 +40,7 @@ class JarDescribeModuleTests {
 
 	@ParameterizedTest
 	@MethodSource("platform.tooling.support.Helper#loadModuleDirectoryNames")
+	@DisabledOnJre(JRE.JAVA_16)
 	void describeModule(String module) throws Exception {
 		var modulePath = createJarPath(module);
 		var result = Request.builder() //

From 0a60a6ae93685f3e2888a407fbbbe9c3b3d3967f Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Wed, 14 Oct 2020 05:17:43 +0200
Subject: [PATCH 0054/1433] Enable "jar --decscribe-module ..." test on 16-ea

Relax the expected text pattern to also match the fixed URI syntax
printed by jar tool since version 16-ea+19.

https://github.com/openjdk/jdk/pull/393
---
 .../jar-describe-module/junit-jupiter-api.expected.txt         | 2 +-
 .../jar-describe-module/junit-jupiter-engine.expected.txt      | 2 +-
 .../junit-jupiter-migrationsupport.expected.txt                | 2 +-
 .../jar-describe-module/junit-jupiter-params.expected.txt      | 2 +-
 .../projects/jar-describe-module/junit-jupiter.expected.txt    | 2 +-
 .../jar-describe-module/junit-platform-commons.expected.txt    | 2 +-
 .../jar-describe-module/junit-platform-console.expected.txt    | 2 +-
 .../jar-describe-module/junit-platform-engine.expected.txt     | 2 +-
 .../jar-describe-module/junit-platform-jfr.expected.txt        | 2 +-
 .../jar-describe-module/junit-platform-launcher.expected.txt   | 2 +-
 .../jar-describe-module/junit-platform-reporting.expected.txt  | 2 +-
 .../jar-describe-module/junit-platform-runner.expected.txt     | 2 +-
 .../jar-describe-module/junit-platform-suite-api.expected.txt  | 2 +-
 .../jar-describe-module/junit-platform-testkit.expected.txt    | 2 +-
 .../jar-describe-module/junit-vintage-engine.expected.txt      | 2 +-
 .../platform/tooling/support/tests/JarDescribeModuleTests.java | 3 ---
 16 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
index 1d69c6dfb326..3e136ea8a241 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.api@${jupiterVersion} jar:file:.+junit-jupiter-api/build/libs/junit-jupiter-api-${jupiterVersion}.jar/!module-info.class
+org.junit.jupiter.api@${jupiterVersion} jar:file:.+junit-jupiter-api/build/libs/junit-jupiter-api-${jupiterVersion}.jar..module-info.class
 exports org.junit.jupiter.api
 exports org.junit.jupiter.api.condition
 exports org.junit.jupiter.api.extension
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
index bfd4d84428c7..40eef7f332f5 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.engine@${jupiterVersion} jar:file:.+junit-jupiter-engine/build/libs/junit-jupiter-engine-${jupiterVersion}.jar/!module-info.class
+org.junit.jupiter.engine@${jupiterVersion} jar:file:.+junit-jupiter-engine/build/libs/junit-jupiter-engine-${jupiterVersion}.jar..module-info.class
 requires java.base mandated
 requires org.apiguardian.api
 requires org.junit.jupiter.api
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
index 5f94a311ca68..60f2be783d11 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.migrationsupport@${jupiterVersion} jar:file:.+junit-jupiter-migrationsupport/build/libs/junit-jupiter-migrationsupport-${jupiterVersion}.jar/!module-info.class
+org.junit.jupiter.migrationsupport@${jupiterVersion} jar:file:.+junit-jupiter-migrationsupport/build/libs/junit-jupiter-migrationsupport-${jupiterVersion}.jar..module-info.class
 exports org.junit.jupiter.migrationsupport
 exports org.junit.jupiter.migrationsupport.conditions
 exports org.junit.jupiter.migrationsupport.rules
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
index cb4dcfe4c10a..079a57db8655 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.params@${jupiterVersion} jar:file:.+junit-jupiter-params/build/libs/junit-jupiter-params-${jupiterVersion}-all.jar/!module-info.class
+org.junit.jupiter.params@${jupiterVersion} jar:file:.+junit-jupiter-params/build/libs/junit-jupiter-params-${jupiterVersion}-all.jar..module-info.class
 exports org.junit.jupiter.params
 exports org.junit.jupiter.params.aggregator
 exports org.junit.jupiter.params.converter
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter.expected.txt
index 2ed77d69f52a..007d3af432ba 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter@${jupiterVersion} jar:file:.+junit-jupiter/build/libs/junit-jupiter-${jupiterVersion}.jar/!module-info.class
+org.junit.jupiter@${jupiterVersion} jar:file:.+junit-jupiter/build/libs/junit-jupiter-${jupiterVersion}.jar..module-info.class
 requires java.base mandated
 requires org.junit.jupiter.api transitive
 requires org.junit.jupiter.engine transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
index e157f1dc7ebf..6633c600100d 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.commons@${platformVersion} jar:file:.+junit-platform-commons/build/libs/junit-platform-commons-${platformVersion}.jar/!module-info.class
+org.junit.platform.commons@${platformVersion} jar:file:.+junit-platform-commons/build/libs/junit-platform-commons-${platformVersion}.jar..module-info.class
 exports org.junit.platform.commons
 exports org.junit.platform.commons.annotation
 exports org.junit.platform.commons.function
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
index 026c47a79320..51cff827ef0e 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.console@${platformVersion} jar:file:.+junit-platform-console/build/libs/junit-platform-console-${platformVersion}-all.jar/!module-info.class
+org.junit.platform.console@${platformVersion} jar:file:.+junit-platform-console/build/libs/junit-platform-console-${platformVersion}-all.jar..module-info.class
 requires java.base mandated
 requires org.apiguardian.api
 requires org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
index d2bf9ff6e70e..dc319ccacac0 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.engine@${platformVersion} jar:file:.+junit-platform-engine/build/libs/junit-platform-engine-${platformVersion}.jar/!module-info.class
+org.junit.platform.engine@${platformVersion} jar:file:.+junit-platform-engine/build/libs/junit-platform-engine-${platformVersion}.jar..module-info.class
 exports org.junit.platform.engine
 exports org.junit.platform.engine.discovery
 exports org.junit.platform.engine.reporting
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
index 71f374b320c8..7c18391a5ad1 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.jfr@${platformVersion} jar:file:.+junit-platform-jfr/build/libs/junit-platform-jfr-${platformVersion}.jar/!module-info.class
+org.junit.platform.jfr@${platformVersion} jar:file:.+junit-platform-jfr/build/libs/junit-platform-jfr-${platformVersion}.jar..module-info.class
 requires java.base mandated
 requires jdk.jfr
 requires org.apiguardian.api
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
index 186aa08ec7e3..a142504cdcf0 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.launcher@${platformVersion} jar:file:.+junit-platform-launcher/build/libs/junit-platform-launcher-${platformVersion}.jar/!module-info.class
+org.junit.platform.launcher@${platformVersion} jar:file:.+junit-platform-launcher/build/libs/junit-platform-launcher-${platformVersion}.jar..module-info.class
 exports org.junit.platform.launcher
 exports org.junit.platform.launcher.core
 exports org.junit.platform.launcher.listeners
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
index 2ce919449b3d..27b0aa74b7bf 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.reporting@${platformVersion} jar:file:.+junit-platform-reporting/build/libs/junit-platform-reporting-${platformVersion}.jar/!module-info.class
+org.junit.platform.reporting@${platformVersion} jar:file:.+junit-platform-reporting/build/libs/junit-platform-reporting-${platformVersion}.jar..module-info.class
 exports org.junit.platform.reporting.legacy
 exports org.junit.platform.reporting.legacy.xml
 requires java.base mandated
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
index 300adea5a44d..8ebeee20a3dd 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.runner@${platformVersion} jar:file:.+junit-platform-runner/build/libs/junit-platform-runner-${platformVersion}.jar/!module-info.class
+org.junit.platform.runner@${platformVersion} jar:file:.+junit-platform-runner/build/libs/junit-platform-runner-${platformVersion}.jar..module-info.class
 exports org.junit.platform.runner
 requires java.base mandated
 requires junit transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
index 5f8d01e71cb0..cf4f7fdcad33 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.suite.api@${platformVersion} jar:file:.+junit-platform-suite-api/build/libs/junit-platform-suite-api-${platformVersion}.jar/!module-info.class
+org.junit.platform.suite.api@${platformVersion} jar:file:.+junit-platform-suite-api/build/libs/junit-platform-suite-api-${platformVersion}.jar..module-info.class
 exports org.junit.platform.suite.api
 requires java.base mandated
 requires org.apiguardian.api transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
index e98e7d5c913f..247d82ecccfe 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.testkit@${platformVersion} jar:file:.+junit-platform-testkit/build/libs/junit-platform-testkit-${platformVersion}.jar/!module-info.class
+org.junit.platform.testkit@${platformVersion} jar:file:.+junit-platform-testkit/build/libs/junit-platform-testkit-${platformVersion}.jar..module-info.class
 exports org.junit.platform.testkit.engine
 requires java.base mandated
 requires org.apiguardian.api transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
index 2f60914ad23a..84259d0cb197 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
@@ -1,4 +1,4 @@
-org.junit.vintage.engine@${vintageVersion} jar:file:.+junit-vintage-engine/build/libs/junit-vintage-engine-${jupiterVersion}.jar/!module-info.class
+org.junit.vintage.engine@${vintageVersion} jar:file:.+junit-vintage-engine/build/libs/junit-vintage-engine-${jupiterVersion}.jar..module-info.class
 requires java.base mandated
 requires junit
 requires org.apiguardian.api
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
index b555166f6464..d58fe161e9a2 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
@@ -25,8 +25,6 @@
 
 import de.sormuras.bartholdy.jdk.Jar;
 
-import org.junit.jupiter.api.condition.DisabledOnJre;
-import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -40,7 +38,6 @@ class JarDescribeModuleTests {
 
 	@ParameterizedTest
 	@MethodSource("platform.tooling.support.Helper#loadModuleDirectoryNames")
-	@DisabledOnJre(JRE.JAVA_16)
 	void describeModule(String module) throws Exception {
 		var modulePath = createJarPath(module);
 		var result = Request.builder() //

From 92b96e2a542015c83950c6efb9d1fea020f191b0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 14 Oct 2020 20:02:14 +0200
Subject: [PATCH 0055/1433] Upgradle to 6.7

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 90a0f2638a62..58739421a910 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c7c33aa33d32e4bd68df71deb5c6d00f2c4675d88b8a14748661196a717dfe2c
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-5-bin.zip
+distributionSha256Sum=8ad57759019a9233dc7dc4d1a530cefe109dc122000d57f7e623f8cf4ba9dfc4
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From dc9942fd7f6678b98d513c62edcbb950f2a81ec4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 14 Oct 2020 20:26:30 +0200
Subject: [PATCH 0056/1433] Remove fixed version of JUnit 4

Closes #2447.
---
 platform-tooling-support-tests/projects/vintage/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platform-tooling-support-tests/projects/vintage/pom.xml b/platform-tooling-support-tests/projects/vintage/pom.xml
index 5cea432f7701..32c537838847 100644
--- a/platform-tooling-support-tests/projects/vintage/pom.xml
+++ b/platform-tooling-support-tests/projects/vintage/pom.xml
@@ -12,7 +12,6 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <vintageVersion>${env.JUNIT_VINTAGE_VERSION}</vintageVersion>
-        <junit4Version>4.12</junit4Version>
     </properties>
 
     <dependencies>

From 45e3c8964a79a496a237338382d7f6112dbf6636 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 14 Oct 2020 20:37:28 +0200
Subject: [PATCH 0057/1433] Clean up test code in
 platform-tooling-support-tests

---
 .../main/java/platform/tooling/support/Helper.java  | 10 +++++-----
 .../main/java/platform/tooling/support/Request.java |  3 +--
 .../support/tests/GradleMissingEngineTests.java     |  6 +++---
 .../tooling/support/tests/JavacModulesTests.java    |  2 +-
 .../tooling/support/tests/ManifestTests.java        | 13 +++++--------
 .../support/tests/ModularUserGuideTests.java        |  3 +--
 .../tests/VintageGradleIntegrationTests.java        |  9 ++++-----
 .../support/tests/VintageMavenIntegrationTests.java |  9 ++++-----
 8 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 2e26c94b6491..0cf68a0d3381 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -75,8 +75,8 @@ public static String replaceVersionPlaceholders(String line) {
 	}
 
 	public static List<String> loadModuleDirectoryNames() {
-		Pattern moduleLinePattern = Pattern.compile("include\\(\"(.+)\"\\)");
-		try (Stream<String> stream = Files.lines(SETTINGS_GRADLE) //
+		var moduleLinePattern = Pattern.compile("include\\(\"(.+)\"\\)");
+		try (var stream = Files.lines(SETTINGS_GRADLE) //
 				.map(moduleLinePattern::matcher) //
 				.filter(Matcher::matches) //
 				.map(matcher -> matcher.group(1)) //
@@ -92,8 +92,8 @@ public static List<String> loadModuleDirectoryNames() {
 
 	public static Path createJarPath(String module) {
 		var parent = Paths.get("..", module, "build", "libs");
-		Path jar = parent.resolve(module + '-' + version(module) + ".jar");
-		Path shadowJar = parent.resolve(module + '-' + version(module) + "-all.jar");
+		var jar = parent.resolve(module + '-' + version(module) + ".jar");
+		var shadowJar = parent.resolve(module + '-' + version(module) + "-all.jar");
 		return Files.exists(jar) ? jar : shadowJar;
 	}
 
@@ -113,7 +113,7 @@ public static List<JarFile> loadJarFiles() {
 
 	public static Optional<Path> getJavaHome(String version) {
 		// First, try various system sources...
-		Stream<String> sources = Stream.of( //
+		var sources = Stream.of( //
 			System.getProperty("java.home." + version), //
 			System.getProperty("java." + version), //
 			System.getProperty("jdk.home." + version), //
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
index ffba69b819bd..f19c07e3e010 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
@@ -149,8 +149,7 @@ public Builder setTool(Tool tool) {
 		}
 
 		public Builder setJavaHome(Path javaHome) {
-			putEnvironment("JAVA_HOME", javaHome.normalize().toAbsolutePath().toString());
-			return this;
+			return putEnvironment("JAVA_HOME", javaHome.normalize().toAbsolutePath().toString());
 		}
 
 		public Builder setProject(String project) {
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
index 34f62958645c..99f3f1362f82 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -33,14 +33,14 @@ class GradleMissingEngineTests {
 
 	@Test
 	void gradle_wrapper() {
-		test(new GradleWrapper(Paths.get("..")), "wrapper");
+		test(new GradleWrapper(Paths.get("..")));
 	}
 
-	private void test(Tool gradle, String version) {
+	private void test(Tool gradle) {
 		var project = "gradle-missing-engine";
 		var result = Request.builder() //
 				.setProject(project) //
-				.setWorkspace(project + '-' + version) //
+				.setWorkspace(project + "-wrapper") //
 				.setTool(gradle) //
 				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
 				.addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
index 011f8bdeb7bf..8caf2081a3f6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
@@ -67,7 +67,7 @@ private static class Project {
 		private Stream<Path> getMainOutputDirs() {
 			try {
 				return Files.list(javaClassesDir) //
-						.filter(file -> Files.isDirectory(file)) //
+						.filter(Files::isDirectory) //
 						.filter(dir -> dir.getFileName().toString().startsWith("main"));
 			}
 			catch (IOException e) {
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
index 630b8db83841..c66fee5b3258 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
@@ -58,21 +58,18 @@ void manifestEntriesAdhereToConventions(String module) throws Exception {
 			assertValue(attributes, "Bundle-Version",
 				MavenVersion.parseMavenString(version).getOSGiVersion().toString());
 			switch (module) {
-				case "junit-platform-commons":
-					assertValue(attributes, "Multi-Release", "true");
-					break;
-				case "junit-platform-console":
-					assertValue(attributes, "Main-Class", "org.junit.platform.console.ConsoleLauncher");
-					break;
+				case "junit-platform-commons" -> assertValue(attributes, "Multi-Release", "true");
+				case "junit-platform-console" -> assertValue(attributes, "Main-Class",
+					"org.junit.platform.console.ConsoleLauncher");
 			}
 			var domain = Domain.domain(manifest);
 			domain.getExportPackage().forEach((pkg, attrs) -> {
-				final String stringVersion = attrs.get(VERSION_ATTRIBUTE);
+				final var stringVersion = attrs.get(VERSION_ATTRIBUTE);
 				assertNotNull(stringVersion);
 				assertDoesNotThrow(() -> new Version(stringVersion));
 			});
 			domain.getImportPackage().forEach((pkg, attrs) -> {
-				final String stringVersionRange = attrs.get(VERSION_ATTRIBUTE);
+				final var stringVersionRange = attrs.get(VERSION_ATTRIBUTE);
 				if (stringVersionRange == null) {
 					return;
 				}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index ed63c9c080d4..c0291d095776 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -103,7 +103,7 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
 		return args;
 	}
 
-	private static List<String> junit(Path temp, Writer out, Writer err) throws Exception {
+	private static void junit(Path temp, Writer out, Writer err) throws Exception {
 		var command = new ArrayList<String>();
 		var projectDir = Path.of("../documentation");
 		command.add(Path.of(System.getProperty("java.home"), "bin", "java").toString());
@@ -154,7 +154,6 @@ private static List<String> junit(Path temp, Writer out, Writer err) throws Exce
 			System.err.println(err);
 			fail("Unexpected exit code: " + code);
 		}
-		return command;
 	}
 
 	@Test
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index 8a8b0c538480..140c515ec276 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -13,7 +13,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Duration;
 
@@ -32,7 +31,7 @@ class VintageGradleIntegrationTests {
 
 	@Test
 	void unsupportedVersion() {
-		Result result = run("4.11");
+		var result = run("4.11");
 
 		assertThat(result.getExitCode()).isGreaterThan(0);
 		assertThat(result.getOutput("out")) //
@@ -43,19 +42,19 @@ void unsupportedVersion() {
 	@ParameterizedTest(name = "{0}")
 	@ValueSource(strings = { "4.12", "4.13.1" })
 	void supportedVersions(String version) {
-		Result result = run(version);
+		var result = run(version);
 
 		assertThat(result.getExitCode()).isGreaterThan(0);
 		assertThat(result.getOutput("out")) //
 				.contains("VintageTest > success PASSED") //
 				.contains("VintageTest > failure FAILED");
 
-		Path testResultsDir = Request.WORKSPACE.resolve("vintage-gradle-" + version).resolve("build/test-results/test");
+		var testResultsDir = Request.WORKSPACE.resolve("vintage-gradle-" + version).resolve("build/test-results/test");
 		assertThat(testResultsDir.resolve("TEST-com.example.vintage.VintageTest.xml")).isRegularFile();
 	}
 
 	private Result run(String version) {
-		Result result = Request.builder() //
+		var result = Request.builder() //
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.setProject("vintage") //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index 6f50e1b217ce..4916f5761490 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -13,7 +13,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
-import java.nio.file.Path;
 import java.time.Duration;
 
 import de.sormuras.bartholdy.Result;
@@ -30,7 +29,7 @@ class VintageMavenIntegrationTests {
 
 	@Test
 	void unsupportedVersion() {
-		Result result = run("4.11");
+		var result = run("4.11");
 
 		assertThat(result.getExitCode()).isEqualTo(0);
 		assertThat(result.getOutput("out")) //
@@ -40,7 +39,7 @@ void unsupportedVersion() {
 	@ParameterizedTest(name = "{0}")
 	@ValueSource(strings = { "4.12", "4.13.1" })
 	void supportedVersions(String version) {
-		Result result = run(version);
+		var result = run(version);
 
 		assertThat(result.getExitCode()).isGreaterThan(0);
 		assertThat(result.getOutput("out")) //
@@ -48,14 +47,14 @@ void supportedVersions(String version) {
 				.contains("VintageTest.failure:") //
 				.contains("Tests run: 2, Failures: 1, Errors: 0, Skipped: 0");
 
-		Path surefireReportsDir = Request.WORKSPACE.resolve("vintage-maven-" + version).resolve(
+		var surefireReportsDir = Request.WORKSPACE.resolve("vintage-maven-" + version).resolve(
 			"target/surefire-reports");
 		assertThat(surefireReportsDir.resolve("com.example.vintage.VintageTest.txt")).isRegularFile();
 		assertThat(surefireReportsDir.resolve("TEST-com.example.vintage.VintageTest.xml")).isRegularFile();
 	}
 
 	private Result run(String version) {
-		Result result = Request.builder() //
+		var result = Request.builder() //
 				.setTool(Request.maven()) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.setProject("vintage") //

From a56cd81c499b5da7bdbaf6a68069b2d444ed78e3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 14 Oct 2020 20:49:55 +0200
Subject: [PATCH 0058/1433] Clean up test code in junit-vintage-engine

---
 .../engine/JUnit4ParameterizedTests.java      |   6 +-
 .../engine/JUnit4VersionCheckTests.java       |   9 +-
 .../VintageLauncherIntegrationTests.java      |  73 +++--
 .../VintageTestEngineDiscoveryTests.java      | 280 +++++++++---------
 .../VintageTestEngineExecutionTests.java      |  15 +-
 .../engine/VintageUniqueIdBuilder.java        |   6 +-
 .../engine/descriptor/OrFilterTests.java      |  26 +-
 .../descriptor/TestSourceProviderTests.java   |   7 +-
 .../VintageTestDescriptorTests.java           |  14 +-
 .../IsPotentialJUnit4TestClassTests.java      |   9 +-
 ...unnerTestDescriptorPostProcessorTests.java |   6 +-
 .../discovery/VintageDiscovererTests.java     |  13 +-
 .../engine/execution/TestRunTests.java        |  29 +-
 .../engine/support/UniqueIdReaderTests.java   |  14 +-
 .../support/UniqueIdStringifierTests.java     |  16 +-
 .../JUnit3ParallelSuiteWithSubsuites.java     |   4 +-
 ...ingleTestCaseWithSingleTestWhichFails.java |   2 +-
 .../junit3/JUnit3SuiteWithSubsuites.java      |   6 +-
 .../samples/junit4/ConfigurableRunner.java    |   4 +-
 .../junit4/IgnoredParameterizedTestCase.java  |   4 +-
 ...seWithDistinguishableOverloadedMethod.java |   1 +
 ...ithDuplicateChangingChildDescriptions.java |   4 +-
 .../junit4/MalformedJUnit4TestCase.java       |   2 +-
 .../samples/junit4/ParameterizedTestCase.java |   5 +-
 .../junit4/RunnerThatOnlyReportsFailures.java |   3 +-
 ...nerWithCustomUniqueIdsAndDisplayNames.java |   8 +-
 26 files changed, 266 insertions(+), 300 deletions(-)

diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
index 4b549bafe41c..cde4f8cc4c17 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.vintage.engine;
 
-import static java.util.Collections.singletonMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.platform.engine.TestExecutionResult.Status.FAILED;
 import static org.junit.platform.engine.TestExecutionResult.Status.SUCCESSFUL;
@@ -25,7 +24,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.engine.TestExecutionResult;
-import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.core.LauncherFactory;
@@ -53,11 +51,11 @@ void selectingWholeParameterizedClassRunsTestsWithAllValues() {
 	void selectingOneTestFromParameterizedClassRunsWithAllValues() {
 		executeTests(selectMethod(JUnit4ParameterizedTestCase.class, "test1"));
 
-		assertEquals(singletonMap(FAILED, 3), callCounts);
+		assertEquals(Map.of(FAILED, 3), callCounts);
 	}
 
 	private void executeTests(DiscoverySelector selector) {
-		Launcher launcher = LauncherFactory.create();
+		var launcher = LauncherFactory.create();
 		launcher.registerTestExecutionListeners(new StatusTrackingListener());
 
 		// @formatter:off
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
index 71cbb385bd53..ce1198e63833 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
@@ -47,8 +47,7 @@ void handlesParsingSupportedVersionIdWithCustomizedVersionFormat() {
 
 	@Test
 	void throwsExceptionForUnsupportedVersion() {
-		JUnitException exception = assertThrows(JUnitException.class,
-			() -> JUnit4VersionCheck.checkSupported(() -> "4.11"));
+		var exception = assertThrows(JUnitException.class, () -> JUnit4VersionCheck.checkSupported(() -> "4.11"));
 
 		assertEquals("Unsupported version of junit:junit: 4.11. Please upgrade to version 4.12 or later.",
 			exception.getMessage());
@@ -58,7 +57,7 @@ void throwsExceptionForUnsupportedVersion() {
 	void handlesErrorsReadingVersion() {
 		Error error = new NoClassDefFoundError();
 
-		JUnitException exception = assertThrows(JUnitException.class, () -> JUnit4VersionCheck.checkSupported(() -> {
+		var exception = assertThrows(JUnitException.class, () -> JUnit4VersionCheck.checkSupported(() -> {
 			throw error;
 		}));
 
@@ -68,7 +67,7 @@ void handlesErrorsReadingVersion() {
 
 	@Test
 	void handlesErrorsParsingVersion() {
-		JUnitException exception = assertThrows(JUnitException.class,
+		var exception = assertThrows(JUnitException.class,
 			() -> JUnit4VersionCheck.checkSupported(() -> "not a version"));
 
 		assertEquals("Failed to parse version of junit:junit: not a version", exception.getMessage());
@@ -77,7 +76,7 @@ void handlesErrorsParsingVersion() {
 	@Test
 	@Tag("missing-junit4")
 	void handlesMissingJUnit() {
-		JUnitException exception = assertThrows(JUnitException.class, JUnit4VersionCheck::checkSupported);
+		var exception = assertThrows(JUnitException.class, JUnit4VersionCheck::checkSupported);
 
 		assertEquals("Invalid class/module path: junit-vintage-engine is present but junit:junit is not. "
 				+ "Please either remove junit-vintage-engine or add junit:junit, or alternatively use "
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
index 7a6412d8cba2..c33f757ffd0d 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.platform.commons.logging.LogRecordListener;
 import org.junit.platform.engine.TestExecutionResult;
-import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -58,14 +57,14 @@ class VintageLauncherIntegrationTests {
 	@Test
 	void executesOnlyTaggedMethodOfRegularTestClass() {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters(includeTags(Categories.Failing.class.getName()));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).hasSize(2);
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactlyInAnyOrder("JUnit Vintage", testClass.getSimpleName(), "failingTest");
 	}
@@ -74,14 +73,14 @@ void executesOnlyTaggedMethodOfRegularTestClass() {
 	void executesIncludedTaggedMethodOfNestedTestClass() {
 		Class<?> testClass = EnclosedJUnit4TestCase.class;
 		Class<?> nestedTestClass = EnclosedJUnit4TestCase.NestedClass.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters(includeTags(Categories.Failing.class.getName()));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).hasSize(3);
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactlyInAnyOrder("JUnit Vintage", testClass.getSimpleName(), nestedTestClass.getName(),
 					"failingTest");
@@ -91,14 +90,14 @@ void executesIncludedTaggedMethodOfNestedTestClass() {
 	void executesOnlyNotExcludedTaggedMethodOfNestedTestClass() {
 		Class<?> testClass = EnclosedJUnit4TestCase.class;
 		Class<?> nestedTestClass = EnclosedJUnit4TestCase.NestedClass.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters(excludeTags(Categories.Failing.class.getName()));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).hasSize(3);
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactlyInAnyOrder("JUnit Vintage", testClass.getSimpleName(), nestedTestClass.getName(),
 					"successfulTest");
@@ -107,14 +106,14 @@ void executesOnlyNotExcludedTaggedMethodOfNestedTestClass() {
 	@Test
 	void removesWholeSubtree() {
 		Class<?> testClass = EnclosedJUnit4TestCase.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters(excludeTags(Categories.Plain.class.getName()));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).isEmpty();
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactlyInAnyOrder("JUnit Vintage");
 	}
@@ -122,14 +121,14 @@ void removesWholeSubtree() {
 	@Test
 	void removesCompleteClassIfNoMethodHasMatchingTags() {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters(includeTags("wrong-tag"));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).isEmpty();
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactly("JUnit Vintage");
 	}
@@ -137,14 +136,14 @@ void removesCompleteClassIfNoMethodHasMatchingTags() {
 	@Test
 	void removesCompleteClassIfItHasExcludedTag() {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters(excludeTags(Categories.Plain.class.getName()));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).isEmpty();
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactly("JUnit Vintage");
 	}
@@ -153,15 +152,15 @@ void removesCompleteClassIfItHasExcludedTag() {
 	@Test
 	void executesAllTestsForNotFilterableRunner(LogRecordListener logRecordListener) {
 		Class<?> testClass = JUnit4TestCaseWithNotFilterableRunner.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters((PostDiscoveryFilter) descriptor -> includedIf(descriptor.getDisplayName().contains("#1")));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		logRecordListener.clear();
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).hasSize(3);
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactlyInAnyOrder("JUnit Vintage", testClass.getSimpleName(), "Test #0", "Test #1");
 		assertThat(logRecordListener.stream(RunnerTestDescriptor.class, Level.WARNING).map(LogRecord::getMessage)) //
@@ -175,15 +174,15 @@ void executesAllTestsForNotFilterableRunner(LogRecordListener logRecordListener)
 	void executesAllTestsForNotFilterableChildRunnerOfSuite(LogRecordListener logRecordListener) {
 		Class<?> suiteClass = JUnit4SuiteOfSuiteWithFilterableChildRunner.class;
 		Class<?> testClass = JUnit4TestCaseWithNotFilterableRunner.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(suiteClass)) //
 				.filters((PostDiscoveryFilter) descriptor -> includedIf(descriptor.getDisplayName().contains("#1")));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		logRecordListener.clear();
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).hasSize(4);
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactlyInAnyOrder("JUnit Vintage", suiteClass.getSimpleName(), testClass.getName(), "Test #0",
 					"Test #1");
@@ -196,14 +195,14 @@ void executesAllTestsForNotFilterableChildRunnerOfSuite(LogRecordListener logRec
 	void executesOnlyTaggedMethodsForSuite() {
 		Class<?> suiteClass = JUnit4SuiteWithTwoTestCases.class;
 		Class<?> testClass = PlainJUnit4TestCaseWithTwoTestMethods.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(suiteClass)) //
 				.filters(includeTags(Categories.Successful.class.getName()));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).hasSize(3);
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactlyInAnyOrder("JUnit Vintage", suiteClass.getSimpleName(), testClass.getName(),
 					"successfulTest");
@@ -212,14 +211,14 @@ void executesOnlyTaggedMethodsForSuite() {
 	@Test
 	void removesCompleteClassWithNotFilterableRunnerIfItHasExcludedTag() {
 		Class<?> testClass = JUnit4TestCaseWithNotFilterableRunner.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters(excludeTags(Categories.Successful.class.getName()));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).isEmpty();
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactly("JUnit Vintage");
 	}
@@ -227,27 +226,27 @@ void removesCompleteClassWithNotFilterableRunnerIfItHasExcludedTag() {
 	@Test
 	void filtersOutAllDescendantsOfParameterizedTestCase() {
 		Class<?> testClass = ParameterizedTestCase.class;
-		LauncherDiscoveryRequestBuilder request = request() //
+		var request = request() //
 				.selectors(selectClass(testClass)) //
 				.filters((PostDiscoveryFilter) descriptor -> excluded("excluded"));
 
-		TestPlan testPlan = discover(request);
+		var testPlan = discover(request);
 		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).isEmpty();
 
-		Map<TestIdentifier, TestExecutionResult> results = execute(request);
+		var results = execute(request);
 		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
 				.containsExactly("JUnit Vintage");
 	}
 
 	private TestPlan discover(LauncherDiscoveryRequestBuilder requestBuilder) {
-		Launcher launcher = LauncherFactory.create();
+		var launcher = LauncherFactory.create();
 		return launcher.discover(toRequest(requestBuilder));
 	}
 
 	private Map<TestIdentifier, TestExecutionResult> execute(LauncherDiscoveryRequestBuilder requestBuilder) {
 		Map<TestIdentifier, TestExecutionResult> results = new LinkedHashMap<>();
-		LauncherDiscoveryRequest request = toRequest(requestBuilder);
-		Launcher launcher = LauncherFactory.create();
+		var request = toRequest(requestBuilder);
+		var launcher = LauncherFactory.create();
 		launcher.execute(request, new TestExecutionListener() {
 			@Override
 			public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
index 5c52f4a48931..e15ed6ace3f6 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
@@ -11,7 +11,6 @@
 package org.junit.vintage.engine;
 
 import static java.text.MessageFormat.format;
-import static java.util.Collections.singleton;
 import static java.util.function.Predicate.isEqual;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -83,14 +82,14 @@ class VintageTestEngineDiscoveryTests {
 	@Test
 	void resolvesSimpleJUnit4TestClass() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichFails.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertTestMethodDescriptor(childDescriptor, testClass, "failingTest",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 	}
@@ -98,11 +97,11 @@ void resolvesSimpleJUnit4TestClass() throws Exception {
 	@Test
 	void resolvesIgnoredJUnit4TestClass() throws Exception {
 		Class<?> testClass = IgnoredJUnit4TestCase.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
 		assertThat(runnerDescriptor.getChildren()).hasSize(2);
@@ -116,11 +115,11 @@ void resolvesIgnoredJUnit4TestClass() throws Exception {
 	@Test
 	void resolvesEmptyIgnoredTestClass() {
 		Class<?> testClass = EmptyIgnoredTestCase.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertFalse(runnerDescriptor.isContainer());
 		assertTrue(runnerDescriptor.isTest());
 		assertEquals(testClass.getSimpleName(), runnerDescriptor.getDisplayName());
@@ -131,14 +130,14 @@ void resolvesEmptyIgnoredTestClass() {
 	@Test
 	void resolvesJUnit4TestClassWithCustomRunner() throws Exception {
 		Class<?> testClass = SingleFailingTheoryTestCase.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertTestMethodDescriptor(childDescriptor, testClass, "theory",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 	}
@@ -146,14 +145,14 @@ void resolvesJUnit4TestClassWithCustomRunner() throws Exception {
 	@Test
 	void resolvesJUnit3TestCase() throws Exception {
 		Class<?> testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertTestMethodDescriptor(childDescriptor, testClass, "test",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 	}
@@ -162,17 +161,17 @@ void resolvesJUnit3TestCase() throws Exception {
 	void resolvesJUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails() throws Exception {
 		Class<?> suiteClass = JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.class;
 		Class<?> testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(suiteClass);
+		var discoveryRequest = discoveryRequestForClass(suiteClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
 
-		TestDescriptor testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
+		var testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
 		assertContainerTestDescriptor(testClassDescriptor, suiteClass, testClass);
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		assertTestMethodDescriptor(testMethodDescriptor, testClass, "test",
 			VintageUniqueIdBuilder.uniqueIdForClasses(suiteClass, testClass));
 	}
@@ -181,17 +180,17 @@ void resolvesJUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails() throws Exce
 	void resolvesJUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored() throws Exception {
 		Class<?> suiteClass = JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.class;
 		Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(suiteClass);
+		var discoveryRequest = discoveryRequestForClass(suiteClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
 
-		TestDescriptor testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
+		var testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
 		assertContainerTestDescriptor(testClassDescriptor, suiteClass, testClass);
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		assertTestMethodDescriptor(testMethodDescriptor, testClass, "ignoredTest",
 			VintageUniqueIdBuilder.uniqueIdForClasses(suiteClass, testClass));
 	}
@@ -199,17 +198,17 @@ void resolvesJUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored() th
 	@Test
 	void resolvesJUnit4TestCaseWithIndistinguishableOverloadedMethod() {
 		Class<?> testClass = JUnit4TestCaseWithIndistinguishableOverloadedMethod.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
 		List<TestDescriptor> testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren());
 		assertThat(testMethodDescriptors).hasSize(2);
 
-		TestDescriptor testMethodDescriptor = testMethodDescriptors.get(0);
+		var testMethodDescriptor = testMethodDescriptors.get(0);
 		assertEquals("theory", testMethodDescriptor.getDisplayName());
 		assertEquals(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "theory", "0"),
 			testMethodDescriptor.getUniqueId());
@@ -225,16 +224,16 @@ void resolvesJUnit4TestCaseWithIndistinguishableOverloadedMethod() {
 	@Test
 	void resolvesJUnit4TestCaseWithDistinguishableOverloadedMethod() throws Exception {
 		Class<?> testClass = JUnit4TestCaseWithDistinguishableOverloadedMethod.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
 		List<TestDescriptor> testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren());
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(testMethodDescriptors);
+		var testMethodDescriptor = getOnlyElement(testMethodDescriptors);
 		assertEquals("test", testMethodDescriptor.getDisplayName());
 		assertEquals(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "test"), testMethodDescriptor.getUniqueId());
 		assertMethodSource(testClass.getMethod("test"), testMethodDescriptor);
@@ -252,9 +251,9 @@ void doesNotResolveClassRunWithJUnitPlatform() {
 
 	@Test
 	void resolvesClasspathSelector() throws Exception {
-		Path root = getClasspathRoot(PlainJUnit4TestCaseWithSingleTestWhichFails.class);
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(selectClasspathRoots(singleton(root))).build();
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var root = getClasspathRoot(PlainJUnit4TestCaseWithSingleTestWhichFails.class);
+		var discoveryRequest = request().selectors(selectClasspathRoots(Set.of(root))).build();
+		var engineDescriptor = discoverTests(discoveryRequest);
 
 		// @formatter:off
 		assertThat(engineDescriptor.getChildren())
@@ -267,16 +266,15 @@ void resolvesClasspathSelector() throws Exception {
 
 	@Test
 	void resolvesClasspathSelectorForJarFile() throws Exception {
-		URL jarUrl = getClass().getResource("/vintage-testjar.jar");
-		Path jarFile = Paths.get(jarUrl.toURI());
+		var jarUrl = getClass().getResource("/vintage-testjar.jar");
+		var jarFile = Paths.get(jarUrl.toURI());
 
-		ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
-		try (URLClassLoader classLoader = new URLClassLoader(new URL[] { jarUrl })) {
+		var originalClassLoader = Thread.currentThread().getContextClassLoader();
+		try (var classLoader = new URLClassLoader(new URL[] { jarUrl })) {
 			Thread.currentThread().setContextClassLoader(classLoader);
 
-			LauncherDiscoveryRequest discoveryRequest = request().selectors(
-				selectClasspathRoots(singleton(jarFile))).build();
-			TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+			var discoveryRequest = request().selectors(selectClasspathRoots(Set.of(jarFile))).build();
+			var engineDescriptor = discoverTests(discoveryRequest);
 
 			// @formatter:off
 			assertThat(engineDescriptor.getChildren())
@@ -291,12 +289,12 @@ void resolvesClasspathSelectorForJarFile() throws Exception {
 
 	@Test
 	void resolvesApplyingClassNameFilters() throws Exception {
-		Path root = getClasspathRoot(PlainJUnit4TestCaseWithSingleTestWhichFails.class);
+		var root = getClasspathRoot(PlainJUnit4TestCaseWithSingleTestWhichFails.class);
 
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(selectClasspathRoots(singleton(root))).filters(
+		var discoveryRequest = request().selectors(selectClasspathRoots(Set.of(root))).filters(
 			includeClassNamePatterns(".*JUnit4.*"), includeClassNamePatterns(".*Plain.*")).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
 		// @formatter:off
 		assertThat(engineDescriptor.getChildren())
@@ -309,12 +307,12 @@ void resolvesApplyingClassNameFilters() throws Exception {
 
 	@Test
 	void resolvesApplyingPackageNameFilters() throws Exception {
-		Path root = getClasspathRoot(PlainJUnit4TestCaseWithSingleTestWhichFails.class);
+		var root = getClasspathRoot(PlainJUnit4TestCaseWithSingleTestWhichFails.class);
 
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(selectClasspathRoots(singleton(root))).filters(
+		var discoveryRequest = request().selectors(selectClasspathRoots(Set.of(root))).filters(
 			includePackageNames("org"), includePackageNames("org.junit")).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
 		// @formatter:off
 		assertThat(engineDescriptor.getChildren())
@@ -327,10 +325,9 @@ void resolvesApplyingPackageNameFilters() throws Exception {
 	void resolvesPackageSelectorForJUnit4SamplesPackage() {
 		Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichFails.class;
 
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
-			selectPackage(testClass.getPackage().getName())).build();
+		var discoveryRequest = request().selectors(selectPackage(testClass.getPackage().getName())).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
 		// @formatter:off
 		assertThat(engineDescriptor.getChildren())
@@ -344,10 +341,9 @@ void resolvesPackageSelectorForJUnit4SamplesPackage() {
 	void resolvesPackageSelectorForJUnit3SamplesPackage() {
 		Class<?> testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class;
 
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
-			selectPackage(testClass.getPackage().getName())).build();
+		var discoveryRequest = request().selectors(selectPackage(testClass.getPackage().getName())).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
 		// @formatter:off
 		assertThat(engineDescriptor.getChildren())
@@ -361,15 +357,15 @@ void resolvesPackageSelectorForJUnit3SamplesPackage() {
 	void resolvesClassesWithInheritedMethods() throws Exception {
 		Class<?> superclass = PlainJUnit4TestCaseWithSingleTestWhichFails.class;
 		Class<?> testClass = PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertEquals(testClass.getSimpleName(), runnerDescriptor.getDisplayName());
 		assertClassSource(testClass, runnerDescriptor);
 
-		TestDescriptor testDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var testDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertEquals("failingTest", testDescriptor.getDisplayName());
 		assertMethodSource(testClass, superclass.getMethod("failingTest"), testDescriptor);
 	}
@@ -377,24 +373,24 @@ void resolvesClassesWithInheritedMethods() throws Exception {
 	@Test
 	void resolvesCategoriesIntoTags() {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = discoveryRequestForClass(testClass);
+		var discoveryRequest = discoveryRequestForClass(testClass);
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(runnerDescriptor.getTags()).containsOnly(TestTag.create(Plain.class.getName()));
 
-		TestDescriptor failingTest = findChildByDisplayName(runnerDescriptor, "failingTest");
+		var failingTest = findChildByDisplayName(runnerDescriptor, "failingTest");
 		assertThat(failingTest.getTags()).containsOnly(//
 			TestTag.create(Plain.class.getName()), //
 			TestTag.create(Failing.class.getName()));
 
-		TestDescriptor ignoredWithoutReason = findChildByDisplayName(runnerDescriptor, "ignoredTest1_withoutReason");
+		var ignoredWithoutReason = findChildByDisplayName(runnerDescriptor, "ignoredTest1_withoutReason");
 		assertThat(ignoredWithoutReason.getTags()).containsOnly(//
 			TestTag.create(Plain.class.getName()), //
 			TestTag.create(Skipped.class.getName()));
 
-		TestDescriptor ignoredWithReason = findChildByDisplayName(runnerDescriptor, "ignoredTest2_withReason");
+		var ignoredWithReason = findChildByDisplayName(runnerDescriptor, "ignoredTest2_withReason");
 		assertThat(ignoredWithReason.getTags()).containsOnly(//
 			TestTag.create(Plain.class.getName()), //
 			TestTag.create(Skipped.class.getName()), //
@@ -404,15 +400,14 @@ void resolvesCategoriesIntoTags() {
 	@Test
 	void resolvesMethodSelectorForSingleMethod() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
-			selectMethod(testClass, testClass.getMethod("failingTest"))).build();
+		var discoveryRequest = request().selectors(selectMethod(testClass, testClass.getMethod("failingTest"))).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertTestMethodDescriptor(childDescriptor, testClass, "failingTest",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 	}
@@ -420,15 +415,14 @@ void resolvesMethodSelectorForSingleMethod() throws Exception {
 	@Test
 	void resolvesMethodOfIgnoredJUnit4TestClass() throws Exception {
 		Class<?> testClass = IgnoredJUnit4TestCase.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
-			selectMethod(testClass, testClass.getMethod("failingTest"))).build();
+		var discoveryRequest = request().selectors(selectMethod(testClass, testClass.getMethod("failingTest"))).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertTestMethodDescriptor(childDescriptor, testClass, "failingTest",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 	}
@@ -436,23 +430,22 @@ void resolvesMethodOfIgnoredJUnit4TestClass() throws Exception {
 	@Test
 	void resolvesMethodSelectorForTwoMethodsOfSameClass() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
-			selectMethod(testClass, testClass.getMethod("failingTest")),
+		var discoveryRequest = request().selectors(selectMethod(testClass, testClass.getMethod("failingTest")),
 			selectMethod(testClass, testClass.getMethod("successfulTest"))).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
 		List<TestDescriptor> testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren());
 		assertThat(testMethodDescriptors).hasSize(2);
 
-		TestDescriptor failingTest = testMethodDescriptors.get(0);
+		var failingTest = testMethodDescriptors.get(0);
 		assertTestMethodDescriptor(failingTest, testClass, "failingTest",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 
-		TestDescriptor successfulTest = testMethodDescriptors.get(1);
+		var successfulTest = testMethodDescriptors.get(1);
 		assertTestMethodDescriptor(successfulTest, testClass, "successfulTest",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 	}
@@ -460,15 +453,15 @@ void resolvesMethodSelectorForTwoMethodsOfSameClass() throws Exception {
 	@Test
 	void resolvesUniqueIdSelectorForSingleMethod() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
+		var discoveryRequest = request().selectors(
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "failingTest"))).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var childDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertTestMethodDescriptor(childDescriptor, testClass, "failingTest",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 	}
@@ -476,12 +469,12 @@ void resolvesUniqueIdSelectorForSingleMethod() throws Exception {
 	@Test
 	void resolvesUniqueIdSelectorForSingleClass() {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
+		var discoveryRequest = request().selectors(
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForClass(testClass))).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
 		assertThat(runnerDescriptor.getChildren()).hasSize(5);
@@ -491,18 +484,18 @@ void resolvesUniqueIdSelectorForSingleClass() {
 	void resolvesUniqueIdSelectorOfSingleClassWithinSuite() throws Exception {
 		Class<?> suiteClass = JUnit4SuiteWithTwoTestCases.class;
 		Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichFails.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
+		var discoveryRequest = request().selectors(
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForClasses(suiteClass, testClass))).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
 
-		TestDescriptor testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
+		var testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
 		assertContainerTestDescriptor(testClassDescriptor, suiteClass, testClass);
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		assertTestMethodDescriptor(testMethodDescriptor, testClass, "failingTest",
 			VintageUniqueIdBuilder.uniqueIdForClasses(suiteClass, testClass));
 	}
@@ -511,19 +504,18 @@ void resolvesUniqueIdSelectorOfSingleClassWithinSuite() throws Exception {
 	void resolvesUniqueIdSelectorOfSingleMethodWithinSuite() throws Exception {
 		Class<?> suiteClass = JUnit4SuiteWithTwoTestCases.class;
 		Class<?> testClass = PlainJUnit4TestCaseWithTwoTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(selectUniqueId(
-			VintageUniqueIdBuilder.uniqueIdForMethod(VintageUniqueIdBuilder.uniqueIdForClasses(suiteClass, testClass),
-				testClass, "successfulTest"))).build();
+		var discoveryRequest = request().selectors(selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(
+			VintageUniqueIdBuilder.uniqueIdForClasses(suiteClass, testClass), testClass, "successfulTest"))).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
 
-		TestDescriptor testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
+		var testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
 		assertContainerTestDescriptor(testClassDescriptor, suiteClass, testClass);
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		assertTestMethodDescriptor(testMethodDescriptor, testClass, "successfulTest",
 			VintageUniqueIdBuilder.uniqueIdForClasses(suiteClass, testClass));
 	}
@@ -531,13 +523,13 @@ void resolvesUniqueIdSelectorOfSingleMethodWithinSuite() throws Exception {
 	@Test
 	void resolvesMultipleUniqueIdSelectorsForMethodsOfSameClass() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithTwoTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
+		var discoveryRequest = request().selectors(
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "successfulTest")),
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "failingTest"))).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
 		List<TestDescriptor> testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren());
@@ -551,29 +543,29 @@ void resolvesMultipleUniqueIdSelectorsForMethodsOfSameClass() throws Exception {
 	@Test
 	void doesNotResolveMissingUniqueIdSelectorForSingleClass() {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors(
+		var discoveryRequest = request().selectors(
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForClass(testClass) + "/[test:doesNotExist]")).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor testDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var testDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertInitializationError(testDescriptor, Filter.class, testClass);
 	}
 
 	@Test
 	void ignoresMoreFineGrainedSelectorsWhenClassIsSelectedAsWell() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors( //
+		var discoveryRequest = request().selectors( //
 			selectMethod(testClass, testClass.getMethod("failingTest")), //
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "abortedTest")), selectClass(testClass) //
 		).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
 		assertThat(runnerDescriptor.getChildren()).hasSize(5);
@@ -582,14 +574,14 @@ void ignoresMoreFineGrainedSelectorsWhenClassIsSelectedAsWell() throws Exception
 	@Test
 	void resolvesCombinationOfMethodAndUniqueIdSelector() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors( //
+		var discoveryRequest = request().selectors( //
 			selectMethod(testClass, testClass.getMethod("failingTest")), //
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "abortedTest") //
 			)).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
 		List<TestDescriptor> testMethodDescriptors = new ArrayList<>(runnerDescriptor.getChildren());
@@ -603,17 +595,17 @@ void resolvesCombinationOfMethodAndUniqueIdSelector() throws Exception {
 	@Test
 	void ignoresRedundantSelector() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
-		LauncherDiscoveryRequest discoveryRequest = request().selectors( //
+		var discoveryRequest = request().selectors( //
 			selectMethod(testClass, testClass.getMethod("failingTest")), //
 			selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "failingTest") //
 			)).build();
 
-		TestDescriptor engineDescriptor = discoverTests(discoveryRequest);
+		var engineDescriptor = discoverTests(discoveryRequest);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var testMethodDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertTestMethodDescriptor(testMethodDescriptor, testClass, "failingTest",
 			VintageUniqueIdBuilder.uniqueIdForClass(testClass));
 	}
@@ -622,7 +614,7 @@ void ignoresRedundantSelector() throws Exception {
 	void doesNotResolveMethodOfClassNotAcceptedByClassNameFilter() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
 		// @formatter:off
-		LauncherDiscoveryRequest request = request()
+		var request = request()
 				.selectors(selectMethod(testClass, testClass.getMethod("failingTest")))
 				.filters(includeClassNamePatterns("Foo"))
 				.build();
@@ -635,7 +627,7 @@ void doesNotResolveMethodOfClassNotAcceptedByClassNameFilter() throws Exception
 	void doesNotResolveMethodOfClassNotAcceptedByPackageNameFilter() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithFiveTestMethods.class;
 		// @formatter:off
-		LauncherDiscoveryRequest request = request()
+		var request = request()
 				.selectors(selectMethod(testClass, testClass.getMethod("failingTest")))
 				.filters(includePackageNames("com.acme"))
 				.build();
@@ -648,14 +640,14 @@ void doesNotResolveMethodOfClassNotAcceptedByPackageNameFilter() throws Exceptio
 	void resolvesClassForMethodSelectorForClassWithNonFilterableRunner() {
 		Class<?> testClass = JUnit4TestCaseWithNotFilterableRunner.class;
 		// @formatter:off
-		LauncherDiscoveryRequest request = request()
+		var request = request()
 				.selectors(selectUniqueId(VintageUniqueIdBuilder.uniqueIdForMethod(testClass, "Test #0")))
 				.build();
 		// @formatter:on
 
-		TestDescriptor engineDescriptor = discoverTests(request);
+		var engineDescriptor = discoverTests(request);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertEquals(testClass.getSimpleName(), runnerDescriptor.getDisplayName());
 		assertEquals(VintageUniqueIdBuilder.uniqueIdForClass(testClass), runnerDescriptor.getUniqueId());
 		assertThat(runnerDescriptor.getChildren()).isNotEmpty();
@@ -664,23 +656,23 @@ void resolvesClassForMethodSelectorForClassWithNonFilterableRunner() {
 	@Test
 	void usesCustomUniqueIdsAndDisplayNamesWhenPresent() {
 		Class<?> suiteClass = JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.class;
-		LauncherDiscoveryRequest request = request().selectors(selectClass(suiteClass)).build();
+		var request = request().selectors(selectClass(suiteClass)).build();
 
-		TestDescriptor engineDescriptor = discoverTests(request);
+		var engineDescriptor = discoverTests(request);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, suiteClass);
 
-		TestDescriptor testClassDescriptor = getOnlyElement(runnerDescriptor.getChildren());
+		var testClassDescriptor = getOnlyElement(runnerDescriptor.getChildren());
 		assertEquals("(TestClass)", testClassDescriptor.getDisplayName());
 
-		TestDescriptor childDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		var childDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 
-		UniqueId prefix = VintageUniqueIdBuilder.uniqueIdForClass(suiteClass);
+		var prefix = VintageUniqueIdBuilder.uniqueIdForClass(suiteClass);
 		assertThat(childDescriptor.getUniqueId().toString()).startsWith(prefix.toString());
 		assertEquals("(TestMethod)", childDescriptor.getDisplayName());
 
-		String customUniqueIdValue = childDescriptor.getUniqueId().getSegments().get(2).getType();
+		var customUniqueIdValue = childDescriptor.getUniqueId().getSegments().get(2).getType();
 		assertNotNull(Base64.getDecoder().decode(customUniqueIdValue.getBytes(StandardCharsets.UTF_8)),
 			"is a valid Base64 encoding scheme");
 	}
@@ -688,19 +680,19 @@ void usesCustomUniqueIdsAndDisplayNamesWhenPresent() {
 	@Test
 	void resolvesTestSourceForParameterizedTests() throws Exception {
 		Class<?> testClass = ParameterizedTestCase.class;
-		LauncherDiscoveryRequest request = request().selectors(selectClass(testClass)).build();
+		var request = request().selectors(selectClass(testClass)).build();
 
-		TestDescriptor engineDescriptor = discoverTests(request);
+		var engineDescriptor = discoverTests(request);
 
-		TestDescriptor runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		var runnerDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(runnerDescriptor, testClass);
 
-		TestDescriptor fooParentDescriptor = findChildByDisplayName(runnerDescriptor, "[foo]");
+		var fooParentDescriptor = findChildByDisplayName(runnerDescriptor, "[foo]");
 		assertTrue(fooParentDescriptor.isContainer());
 		assertFalse(fooParentDescriptor.isTest());
 		assertThat(fooParentDescriptor.getSource()).isEmpty();
 
-		TestDescriptor testMethodDescriptor = getOnlyElement(fooParentDescriptor.getChildren());
+		var testMethodDescriptor = getOnlyElement(fooParentDescriptor.getChildren());
 		assertEquals("test[foo]", testMethodDescriptor.getDisplayName());
 		assertTrue(testMethodDescriptor.isTest());
 		assertFalse(testMethodDescriptor.isContainer());
@@ -709,7 +701,7 @@ void resolvesTestSourceForParameterizedTests() throws Exception {
 
 	private TestDescriptor findChildByDisplayName(TestDescriptor runnerDescriptor, String displayName) {
 		// @formatter:off
-		Set<? extends TestDescriptor> children = runnerDescriptor.getChildren();
+		var children = runnerDescriptor.getChildren();
 		return children
 				.stream()
 				.filter(where(TestDescriptor::getDisplayName, isEqual(displayName)))
@@ -724,18 +716,18 @@ private TestDescriptor discoverTests(LauncherDiscoveryRequest discoveryRequest)
 	}
 
 	private Path getClasspathRoot(Class<?> testClass) throws Exception {
-		URL location = testClass.getProtectionDomain().getCodeSource().getLocation();
+		var location = testClass.getProtectionDomain().getCodeSource().getLocation();
 		return Paths.get(location.toURI());
 	}
 
 	private void assertYieldsNoDescriptors(Class<?> testClass) {
-		LauncherDiscoveryRequest request = discoveryRequestForClass(testClass);
+		var request = discoveryRequestForClass(testClass);
 
 		assertYieldsNoDescriptors(request);
 	}
 
 	private void assertYieldsNoDescriptors(LauncherDiscoveryRequest request) {
-		TestDescriptor engineDescriptor = discoverTests(request);
+		var engineDescriptor = discoverTests(request);
 
 		assertThat(engineDescriptor.getChildren()).isEmpty();
 	}
@@ -782,7 +774,7 @@ private static void assertInitializationError(TestDescriptor testDescriptor, Cla
 
 	private static void assertClassSource(Class<?> expectedClass, TestDescriptor testDescriptor) {
 		assertThat(testDescriptor.getSource()).containsInstanceOf(ClassSource.class);
-		ClassSource classSource = (ClassSource) testDescriptor.getSource().get();
+		var classSource = (ClassSource) testDescriptor.getSource().get();
 		assertThat(classSource.getJavaClass()).isEqualTo(expectedClass);
 	}
 
@@ -793,7 +785,7 @@ private static void assertMethodSource(Method expectedMethod, TestDescriptor tes
 	private static void assertMethodSource(Class<?> expectedClass, Method expectedMethod,
 			TestDescriptor testDescriptor) {
 		assertThat(testDescriptor.getSource()).containsInstanceOf(MethodSource.class);
-		MethodSource methodSource = (MethodSource) testDescriptor.getSource().get();
+		var methodSource = (MethodSource) testDescriptor.getSource().get();
 		assertThat(methodSource.getClassName()).isEqualTo(expectedClass.getName());
 		assertThat(methodSource.getMethodName()).isEqualTo(expectedMethod.getName());
 		assertThat(methodSource.getMethodParameterTypes()).isEqualTo(
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
index 80aad2c08476..d7c5f851d17a 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
@@ -333,7 +333,7 @@ void reportsExecutionEventsAroundLifecycleMethods() {
 		Class<?> testClass = PlainJUnit4TestCaseWithLifecycleMethods.class;
 		PlainJUnit4TestCaseWithLifecycleMethods.EVENTS.clear();
 
-		EngineExecutionListener listener = new EngineExecutionListener() {
+		var listener = new EngineExecutionListener() {
 
 			@Override
 			public void executionStarted(TestDescriptor testDescriptor) {
@@ -492,7 +492,7 @@ public Description getDescription() {
 
 		@Override
 		public void run(RunNotifier notifier) {
-			Description dynamicDescription = createTestDescription(testClass, "dynamicTest");
+			var dynamicDescription = createTestDescription(testClass, "dynamicTest");
 			notifier.fireTestStarted(dynamicDescription);
 			notifier.fireTestFinished(dynamicDescription);
 		}
@@ -527,17 +527,17 @@ public DynamicAndStaticChildrenRunner(Class<?> testClass) {
 
 		@Override
 		public Description getDescription() {
-			Description suiteDescription = createSuiteDescription(testClass);
+			var suiteDescription = createSuiteDescription(testClass);
 			suiteDescription.addChild(createTestDescription(testClass, "staticTest"));
 			return suiteDescription;
 		}
 
 		@Override
 		public void run(RunNotifier notifier) {
-			Description staticDescription = getDescription().getChildren().get(0);
+			var staticDescription = getDescription().getChildren().get(0);
 			notifier.fireTestStarted(staticDescription);
 			notifier.fireTestFinished(staticDescription);
-			Description dynamicDescription = createTestDescription(testClass, "dynamicTest");
+			var dynamicDescription = createTestDescription(testClass, "dynamicTest");
 			notifier.fireTestStarted(dynamicDescription);
 			notifier.fireTestFinished(dynamicDescription);
 		}
@@ -792,9 +792,8 @@ private static EngineExecutionResults execute(LauncherDiscoveryRequest request)
 
 	private static void execute(Class<?> testClass, EngineExecutionListener listener) {
 		TestEngine testEngine = new VintageTestEngine();
-		LauncherDiscoveryRequest discoveryRequest = request(testClass);
-		TestDescriptor engineTestDescriptor = testEngine.discover(discoveryRequest,
-			UniqueId.forEngine(testEngine.getId()));
+		var discoveryRequest = request(testClass);
+		var engineTestDescriptor = testEngine.discover(discoveryRequest, UniqueId.forEngine(testEngine.getId()));
 		testEngine.execute(
 			new ExecutionRequest(engineTestDescriptor, listener, discoveryRequest.getConfigurationParameters()));
 	}
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
index 7648d9a3dd61..3d61ccce9b01 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
@@ -32,15 +32,15 @@ public static UniqueId uniqueIdForClass(Class<?> clazz) {
 	}
 
 	public static UniqueId uniqueIdForClasses(Class<?> clazz, Class<?>... clazzes) {
-		UniqueId uniqueId = uniqueIdForClass(clazz.getName());
-		for (Class<?> each : clazzes) {
+		var uniqueId = uniqueIdForClass(clazz.getName());
+		for (var each : clazzes) {
 			uniqueId = uniqueId.append(VintageTestDescriptor.SEGMENT_TYPE_TEST, each.getName());
 		}
 		return uniqueId;
 	}
 
 	public static UniqueId uniqueIdForClass(String fullyQualifiedClassName) {
-		UniqueId containerId = engineId();
+		var containerId = engineId();
 		return containerId.append(VintageTestDescriptor.SEGMENT_TYPE_RUNNER, fullyQualifiedClassName);
 	}
 
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
index 9db5dac2e986..1baaad2091c9 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
@@ -10,9 +10,6 @@
 
 package org.junit.vintage.engine.descriptor;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singleton;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -22,6 +19,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.List;
+import java.util.Set;
+
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.runner.Description;
@@ -34,21 +34,19 @@ class OrFilterTests {
 
 	@Test
 	void exceptionWithoutAnyFilters() {
-		PreconditionViolationException actual = assertThrows(PreconditionViolationException.class, () -> {
-			new OrFilter(emptyList());
-		});
+		var actual = assertThrows(PreconditionViolationException.class, () -> new OrFilter(Set.of()));
 		assertEquals("filters must not be empty", actual.getMessage());
 	}
 
 	@Test
 	void evaluatesSingleFilter() {
-		Filter filter = mockFilter("foo", true);
+		var filter = mockFilter("foo", true);
 
-		OrFilter orFilter = new OrFilter(singleton(filter));
+		var orFilter = new OrFilter(Set.of(filter));
 
 		assertEquals("foo", orFilter.describe());
 
-		Description description = Description.createTestDescription(getClass(), "evaluatesSingleFilter");
+		var description = Description.createTestDescription(getClass(), "evaluatesSingleFilter");
 		assertTrue(orFilter.shouldRun(description));
 
 		verify(filter).shouldRun(same(description));
@@ -56,14 +54,14 @@ void evaluatesSingleFilter() {
 
 	@Test
 	void evaluatesMultipleFilters() {
-		Filter filter1 = mockFilter("foo", false);
-		Filter filter2 = mockFilter("bar", true);
+		var filter1 = mockFilter("foo", false);
+		var filter2 = mockFilter("bar", true);
 
-		OrFilter orFilter = new OrFilter(asList(filter1, filter2));
+		var orFilter = new OrFilter(List.of(filter1, filter2));
 
 		assertEquals("foo OR bar", orFilter.describe());
 
-		Description description = Description.createTestDescription(getClass(), "evaluatesMultipleFilters");
+		var description = Description.createTestDescription(getClass(), "evaluatesMultipleFilters");
 		assertTrue(orFilter.shouldRun(description));
 
 		verify(filter1).shouldRun(same(description));
@@ -71,7 +69,7 @@ void evaluatesMultipleFilters() {
 	}
 
 	private Filter mockFilter(String description, boolean result) {
-		Filter filter = mock(Filter.class);
+		var filter = mock(Filter.class);
 		when(filter.describe()).thenReturn(description);
 		when(filter.shouldRun(any())).thenReturn(result);
 		return filter;
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
index f3a3dac469dd..857f68e37bd5 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
@@ -14,7 +14,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.junit.runner.Description;
 import org.junit.vintage.engine.samples.junit4.ConcreteJUnit4TestCase;
@@ -26,12 +25,12 @@ class TestSourceProviderTests {
 
 	@Test
 	void findsInheritedMethod() {
-		Description description = Description.createTestDescription(ConcreteJUnit4TestCase.class, "theTest");
+		var description = Description.createTestDescription(ConcreteJUnit4TestCase.class, "theTest");
 
-		TestSource source = new TestSourceProvider().findTestSource(description);
+		var source = new TestSourceProvider().findTestSource(description);
 		assertThat(source).isInstanceOf(MethodSource.class);
 
-		MethodSource methodSource = (MethodSource) source;
+		var methodSource = (MethodSource) source;
 		assertEquals(ConcreteJUnit4TestCase.class.getName(), methodSource.getClassName());
 		assertEquals("theTest", methodSource.getMethodName());
 	}
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
index 00310fbc6a75..f8fe68433350 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
@@ -23,8 +23,8 @@ class VintageTestDescriptorTests {
 
 	@Test
 	void legacyReportingNameUsesClassName() {
-		Description description = Description.createSuiteDescription(ConcreteJUnit4TestCase.class);
-		VintageTestDescriptor testDescriptor = new VintageTestDescriptor(uniqueId, description, null);
+		var description = Description.createSuiteDescription(ConcreteJUnit4TestCase.class);
+		var testDescriptor = new VintageTestDescriptor(uniqueId, description, null);
 
 		assertEquals("org.junit.vintage.engine.samples.junit4.ConcreteJUnit4TestCase",
 			testDescriptor.getLegacyReportingName());
@@ -32,17 +32,17 @@ void legacyReportingNameUsesClassName() {
 
 	@Test
 	void legacyReportingNameUsesMethodName() {
-		Description description = Description.createTestDescription(ConcreteJUnit4TestCase.class, "legacyTest");
-		VintageTestDescriptor testDescriptor = new VintageTestDescriptor(uniqueId, description, null);
+		var description = Description.createTestDescription(ConcreteJUnit4TestCase.class, "legacyTest");
+		var testDescriptor = new VintageTestDescriptor(uniqueId, description, null);
 
 		assertEquals("legacyTest", testDescriptor.getLegacyReportingName());
 	}
 
 	@Test
 	void legacyReportingNameFallbackToDisplayName() {
-		String suiteName = "Legacy Suite";
-		Description description = Description.createSuiteDescription(suiteName);
-		VintageTestDescriptor testDescriptor = new VintageTestDescriptor(uniqueId, description, null);
+		var suiteName = "Legacy Suite";
+		var description = Description.createSuiteDescription(suiteName);
+		var testDescriptor = new VintageTestDescriptor(uniqueId, description, null);
 
 		assertEquals(testDescriptor.getDisplayName(), testDescriptor.getLegacyReportingName());
 		assertEquals(suiteName, testDescriptor.getLegacyReportingName());
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
index 2a18ec83bee7..db7e02b4eb34 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
@@ -17,7 +17,7 @@
 
 class IsPotentialJUnit4TestClassTests {
 
-	private IsPotentialJUnit4TestClass isPotentialJUnit4TestClass = new IsPotentialJUnit4TestClass();
+	private final IsPotentialJUnit4TestClass isPotentialJUnit4TestClass = new IsPotentialJUnit4TestClass();
 
 	@Test
 	void staticMemberClass() {
@@ -25,7 +25,6 @@ void staticMemberClass() {
 	}
 
 	public static class Foo {
-
 	}
 
 	@Test
@@ -34,7 +33,6 @@ void nonPublicClass() {
 	}
 
 	static class Bar {
-
 	}
 
 	@Test
@@ -43,20 +41,17 @@ void abstractClass() {
 	}
 
 	public static abstract class Baz {
-
 	}
 
 	@Test
 	void anonymousClass() {
-		Foo foo = new Foo() {
-
+		var foo = new Foo() {
 		};
 
 		assertFalse(isPotentialJUnit4TestClass.test(foo.getClass()));
 	}
 
 	public class FooBaz {
-
 	}
 
 	@Test
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
index 0e9dab85b26b..1abeff30b9cc 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
@@ -25,7 +25,6 @@
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
-import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.vintage.engine.VintageUniqueIdBuilder;
 import org.junit.vintage.engine.descriptor.RunnerTestDescriptor;
@@ -72,11 +71,10 @@ void logsWarningOnNonFilterableRunner(LogRecordListener listener) {
 	}
 
 	private void resolve(DiscoverySelector selector) {
-		LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request().selectors(selector).listeners(
+		var request = LauncherDiscoveryRequestBuilder.request().selectors(selector).listeners(
 			mock(LauncherDiscoveryListener.class)).build();
 		TestDescriptor engineDescriptor = new VintageDiscoverer().discover(request, VintageUniqueIdBuilder.engineId());
-		RunnerTestDescriptor runnerTestDescriptor = (RunnerTestDescriptor) getOnlyElement(
-			engineDescriptor.getChildren());
+		var runnerTestDescriptor = (RunnerTestDescriptor) getOnlyElement(engineDescriptor.getChildren());
 		new RunnerTestDescriptorPostProcessor(new TestSourceProvider()).applyFiltersAndCreateDescendants(
 			runnerTestDescriptor);
 	}
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
index 2d12f8d3a5af..b50aa69cb4b1 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
@@ -34,7 +34,6 @@
 import org.junit.platform.engine.discovery.ClassNameFilter;
 import org.junit.platform.engine.discovery.PackageNameFilter;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
-import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.vintage.engine.VintageUniqueIdBuilder;
 import org.junit.vintage.engine.samples.junit3.AbstractJUnit3TestCase;
 import org.junit.vintage.engine.samples.junit4.AbstractJunit4TestCaseWithConstructorParameter;
@@ -56,7 +55,7 @@ void classNameFilterExcludesClass() {
 				.build();
 		// @formatter:on
 
-		TestDescriptor testDescriptor = discover(request);
+		var testDescriptor = discover(request);
 
 		assertThat(testDescriptor.getChildren()).hasSize(1);
 		assertThat(getOnlyElement(testDescriptor.getChildren()).getUniqueId().toString()).contains(Foo.class.getName());
@@ -71,7 +70,7 @@ void packageNameFilterExcludesClasses() {
 				.build();
 		// @formatter:on
 
-		TestDescriptor testDescriptor = discover(request);
+		var testDescriptor = discover(request);
 
 		assertThat(testDescriptor.getChildren()).isEmpty();
 	}
@@ -88,7 +87,7 @@ void doesNotResolveAbstractJUnit4Classes() {
 
 	@Test
 	void failsToResolveUnloadableTestClass() {
-		UniqueId uniqueId = VintageUniqueIdBuilder.uniqueIdForClass("foo.bar.UnknownClass");
+		var uniqueId = VintageUniqueIdBuilder.uniqueIdForClass("foo.bar.UnknownClass");
 
 		doesNotResolve(selectUniqueId(uniqueId), result -> {
 			assertThat(result.getStatus()).isEqualTo(FAILED);
@@ -107,16 +106,16 @@ private void doesNotResolve(DiscoverySelector selector) {
 
 	private void doesNotResolve(DiscoverySelector selector, Consumer<SelectorResolutionResult> resultCheck) {
 		var discoveryListener = mock(LauncherDiscoveryListener.class);
-		LauncherDiscoveryRequest request = request() //
+		var request = request() //
 				.selectors(selector) //
 				.listeners(discoveryListener) //
 				.configurationParameter(DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME, "logging") //
 				.build();
 
-		TestDescriptor testDescriptor = discover(request);
+		var testDescriptor = discover(request);
 
 		assertThat(testDescriptor.getChildren()).isEmpty();
-		ArgumentCaptor<SelectorResolutionResult> resultCaptor = ArgumentCaptor.forClass(SelectorResolutionResult.class);
+		var resultCaptor = ArgumentCaptor.forClass(SelectorResolutionResult.class);
 		verify(discoveryListener).selectorProcessed(eq(UniqueId.forEngine("junit-vintage")), eq(selector),
 			resultCaptor.capture());
 		resultCheck.accept(resultCaptor.getValue());
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
index 40b24a40bf31..802f69d5abe3 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
@@ -17,11 +17,7 @@
 import static org.junit.vintage.engine.descriptor.VintageTestDescriptor.SEGMENT_TYPE_DYNAMIC;
 import static org.junit.vintage.engine.descriptor.VintageTestDescriptor.SEGMENT_TYPE_RUNNER;
 
-import java.util.Optional;
-
 import org.junit.jupiter.api.Test;
-import org.junit.platform.engine.UniqueId;
-import org.junit.runner.Description;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.vintage.engine.descriptor.RunnerTestDescriptor;
 import org.junit.vintage.engine.descriptor.VintageTestDescriptor;
@@ -35,13 +31,12 @@ class TestRunTests {
 	@Test
 	void returnsEmptyOptionalForUnknownDescriptions() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichFails.class;
-		UniqueId runnerId = engineId().append(SEGMENT_TYPE_RUNNER, testClass.getName());
-		RunnerTestDescriptor runnerTestDescriptor = new RunnerTestDescriptor(runnerId, testClass,
-			new BlockJUnit4ClassRunner(testClass));
-		Description unknownDescription = createTestDescription(testClass, "dynamicTest");
+		var runnerId = engineId().append(SEGMENT_TYPE_RUNNER, testClass.getName());
+		var runnerTestDescriptor = new RunnerTestDescriptor(runnerId, testClass, new BlockJUnit4ClassRunner(testClass));
+		var unknownDescription = createTestDescription(testClass, "dynamicTest");
 
-		TestRun testRun = new TestRun(runnerTestDescriptor);
-		Optional<VintageTestDescriptor> testDescriptor = testRun.lookupNextTestDescriptor(unknownDescription);
+		var testRun = new TestRun(runnerTestDescriptor);
+		var testDescriptor = testRun.lookupNextTestDescriptor(unknownDescription);
 
 		assertThat(testDescriptor).isEmpty();
 	}
@@ -49,15 +44,13 @@ void returnsEmptyOptionalForUnknownDescriptions() throws Exception {
 	@Test
 	void registersDynamicTestDescriptors() throws Exception {
 		Class<?> testClass = PlainJUnit4TestCaseWithSingleTestWhichFails.class;
-		UniqueId runnerId = engineId().append(SEGMENT_TYPE_RUNNER, testClass.getName());
-		RunnerTestDescriptor runnerTestDescriptor = new RunnerTestDescriptor(runnerId, testClass,
-			new BlockJUnit4ClassRunner(testClass));
-		UniqueId dynamicTestId = runnerId.append(SEGMENT_TYPE_DYNAMIC, "dynamicTest");
-		Description dynamicDescription = createTestDescription(testClass, "dynamicTest");
-		VintageTestDescriptor dynamicTestDescriptor = new VintageTestDescriptor(dynamicTestId, dynamicDescription,
-			null);
+		var runnerId = engineId().append(SEGMENT_TYPE_RUNNER, testClass.getName());
+		var runnerTestDescriptor = new RunnerTestDescriptor(runnerId, testClass, new BlockJUnit4ClassRunner(testClass));
+		var dynamicTestId = runnerId.append(SEGMENT_TYPE_DYNAMIC, "dynamicTest");
+		var dynamicDescription = createTestDescription(testClass, "dynamicTest");
+		var dynamicTestDescriptor = new VintageTestDescriptor(dynamicTestId, dynamicDescription, null);
 
-		TestRun testRun = new TestRun(runnerTestDescriptor);
+		var testRun = new TestRun(runnerTestDescriptor);
 		testRun.registerDynamicTest(dynamicTestDescriptor);
 
 		assertThat(testRun.lookupNextTestDescriptor(dynamicDescription)).contains(dynamicTestDescriptor);
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
index 42fa28f19155..a062bfe2678d 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
@@ -14,15 +14,11 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.runner.Description.createTestDescription;
 
-import java.io.Serializable;
-import java.util.Optional;
 import java.util.logging.Level;
-import java.util.logging.LogRecord;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.platform.commons.logging.LogRecordListener;
-import org.junit.runner.Description;
 
 /**
  * Tests for {@link UniqueIdReader}.
@@ -34,9 +30,9 @@ class UniqueIdReaderTests {
 
 	@Test
 	void readsUniqueId(LogRecordListener listener) {
-		Description description = createTestDescription("ClassName", "methodName", "uniqueId");
+		var description = createTestDescription("ClassName", "methodName", "uniqueId");
 
-		Serializable uniqueId = new UniqueIdReader().apply(description);
+		var uniqueId = new UniqueIdReader().apply(description);
 
 		assertEquals("uniqueId", uniqueId);
 		assertThat(listener.stream(UniqueIdReader.class)).isEmpty();
@@ -44,14 +40,14 @@ void readsUniqueId(LogRecordListener listener) {
 
 	@Test
 	void returnsDisplayNameWhenUniqueIdCannotBeRead(LogRecordListener listener) {
-		Description description = createTestDescription("ClassName", "methodName", "uniqueId");
+		var description = createTestDescription("ClassName", "methodName", "uniqueId");
 		assertEquals("methodName(ClassName)", description.getDisplayName());
 
-		Serializable uniqueId = new UniqueIdReader("wrongFieldName").apply(description);
+		var uniqueId = new UniqueIdReader("wrongFieldName").apply(description);
 
 		assertEquals(description.getDisplayName(), uniqueId);
 
-		Optional<LogRecord> logRecord = listener.stream(UniqueIdReader.class, Level.WARNING).findFirst();
+		var logRecord = listener.stream(UniqueIdReader.class, Level.WARNING).findFirst();
 		assertThat(logRecord).isPresent();
 		assertThat(logRecord.get().getMessage()).isEqualTo(
 			"Could not read unique ID for Description; using display name instead: " + description.getDisplayName());
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
index a89e425efd9a..8e6bfa4822e9 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
@@ -29,7 +29,7 @@ class UniqueIdStringifierTests {
 
 	@Test
 	void returnsReadableStringForKnownTypes() {
-		UniqueIdStringifier stringifier = new UniqueIdStringifier();
+		var stringifier = new UniqueIdStringifier();
 
 		assertEquals("foo", stringifier.apply("foo"));
 		assertEquals("42", stringifier.apply(42));
@@ -39,21 +39,21 @@ void returnsReadableStringForKnownTypes() {
 
 	@Test
 	void serializesUnknownTypes() throws Exception {
-		UniqueIdStringifier stringifier = new UniqueIdStringifier();
+		var stringifier = new UniqueIdStringifier();
 
-		String serialized = stringifier.apply(new MyCustomId(42));
+		var serialized = stringifier.apply(new MyCustomId(42));
 
-		Object deserializedObject = deserialize(decodeBase64(serialized));
+		var deserializedObject = deserialize(decodeBase64(serialized));
 		assertThat(deserializedObject).isInstanceOf(MyCustomId.class);
 		assertEquals(42, ((MyCustomId) deserializedObject).getValue());
 	}
 
 	@Test
 	void usesToStringWhenSerializationFails() {
-		UniqueIdStringifier stringifier = new UniqueIdStringifier();
-		String serialized = stringifier.apply(new ClassWithErroneousSerialization());
+		var stringifier = new UniqueIdStringifier();
+		var serialized = stringifier.apply(new ClassWithErroneousSerialization());
 
-		String deserializedString = new String(decodeBase64(serialized), UniqueIdStringifier.CHARSET);
+		var deserializedString = new String(decodeBase64(serialized), UniqueIdStringifier.CHARSET);
 
 		assertEquals("value from toString()", deserializedString);
 	}
@@ -63,7 +63,7 @@ private byte[] decodeBase64(String value) {
 	}
 
 	private Object deserialize(byte[] bytes) throws Exception {
-		try (ObjectInputStream inputStream = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
+		try (var inputStream = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
 			return inputStream.readObject();
 		}
 	}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
index fbc957dee0b5..4242bafd94c6 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
@@ -28,10 +28,10 @@ public void hello() {
 
 	public static TestSuite suite() {
 		TestSuite root = new ActiveTestSuite("allTests");
-		TestSuite case1 = new TestSuite("Case1");
+		var case1 = new TestSuite("Case1");
 		case1.addTest(new JUnit3ParallelSuiteWithSubsuites("hello", "world"));
 		root.addTest(case1);
-		TestSuite case2 = new TestSuite("Case2");
+		var case2 = new TestSuite("Case2");
 		case2.addTest(new JUnit3ParallelSuiteWithSubsuites("hello", "WORLD"));
 		root.addTest(case2);
 		return root;
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
index 91651e71b433..3bced3afad82 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
@@ -19,7 +19,7 @@
 public class JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails extends TestCase {
 
 	public static junit.framework.Test suite() {
-		TestSuite suite = new TestSuite();
+		var suite = new TestSuite();
 		suite.addTestSuite(PlainJUnit3TestCaseWithSingleTestWhichFails.class);
 		return suite;
 	}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
index 45d2c30884eb..6656b467c913 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
@@ -26,11 +26,11 @@ public void hello() {
 	}
 
 	public static TestSuite suite() {
-		TestSuite root = new TestSuite("allTests");
-		TestSuite case1 = new TestSuite("Case1");
+		var root = new TestSuite("allTests");
+		var case1 = new TestSuite("Case1");
 		case1.addTest(new JUnit3SuiteWithSubsuites("hello", "world"));
 		root.addTest(case1);
-		TestSuite case2 = new TestSuite("Case2");
+		var case2 = new TestSuite("Case2");
 		case2.addTest(new JUnit3SuiteWithSubsuites("hello", "WORLD"));
 		root.addTest(case2);
 		return root;
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
index c93df0850e47..00ee9c6cda24 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
@@ -42,7 +42,7 @@ abstract class ConfigurableRunner extends Runner {
 
 	ConfigurableRunner(Class<?> testClass) {
 		this.testClass = testClass;
-		ChildCount childCountAnnotation = testClass.getAnnotation(ChildCount.class);
+		var childCountAnnotation = testClass.getAnnotation(ChildCount.class);
 		int childCount = Optional.ofNullable(childCountAnnotation).map(ChildCount::value).orElse(0);
 		// @formatter:off
 		range(0, childCount)
@@ -53,7 +53,7 @@ abstract class ConfigurableRunner extends Runner {
 
 	@Override
 	public Description getDescription() {
-		Description suiteDescription = Description.createSuiteDescription(testClass);
+		var suiteDescription = Description.createSuiteDescription(testClass);
 		filteredChildren.forEach(suiteDescription::addChild);
 		return suiteDescription;
 	}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
index 565a53a15b09..ee35d42b54a5 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
@@ -10,7 +10,7 @@
 
 package org.junit.vintage.engine.samples.junit4;
 
-import static java.util.Arrays.asList;
+import java.util.List;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -27,7 +27,7 @@ public class IgnoredParameterizedTestCase {
 
 	@Parameters(name = "{0}")
 	public static Iterable<String> parameters() {
-		return asList("foo", "bar");
+		return List.of("foo", "bar");
 	}
 
 	@Parameter
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
index bc930c4ae4ee..b1f777662a8c 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
@@ -27,6 +27,7 @@ public void test() {
 		test("foo");
 	}
 
+	@SuppressWarnings("SameParameterValue")
 	private void test(String message) {
 		fail(message);
 	}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
index 440328f20ad4..3951efd1a568 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
@@ -18,7 +18,7 @@
 public class JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions {
 	public static class Runner extends org.junit.runner.Runner {
 
-		private Class<?> testClass;
+		private final Class<?> testClass;
 
 		public Runner(Class<?> testClass) {
 			this.testClass = testClass;
@@ -45,7 +45,7 @@ private Description getLeafDescription() {
 
 		@Override
 		public void run(RunNotifier notifier) {
-			for (int i = 0; i < 2; i++) {
+			for (var i = 0; i < 2; i++) {
 				notifier.fireTestIgnored(getLeafDescription());
 				notifier.fireTestStarted(getLeafDescription());
 				notifier.fireTestFinished(getLeafDescription());
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
index f20f0145fc75..b397cba754a4 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
@@ -20,7 +20,7 @@
 public class MalformedJUnit4TestCase {
 
 	@Test
-	/* intentionally not public */
+	@SuppressWarnings("TestMethodWithIncorrectSignature") // intentionally not public
 	void nonPublicTest() {
 		fail("this should never be called");
 	}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
index 000c793c489f..54c05a3f7235 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
@@ -10,9 +10,10 @@
 
 package org.junit.vintage.engine.samples.junit4;
 
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 
+import java.util.List;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -27,7 +28,7 @@ public class ParameterizedTestCase {
 
 	@Parameters(name = "{0}")
 	public static Iterable<String> primes() {
-		return asList("foo", "bar");
+		return List.of("foo", "bar");
 	}
 
 	@Parameter
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
index b3f0f238d796..5fe2f0e3efe7 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
@@ -15,7 +15,6 @@
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
 
 public class RunnerThatOnlyReportsFailures extends BlockJUnit4ClassRunner {
 	public RunnerThatOnlyReportsFailures(Class<?> klass) throws InitializationError {
@@ -24,7 +23,7 @@ public RunnerThatOnlyReportsFailures(Class<?> klass) throws InitializationError
 
 	@Override
 	protected void runChild(FrameworkMethod method, RunNotifier notifier) {
-		Statement statement = methodBlock(method);
+		var statement = methodBlock(method);
 		try {
 			statement.evaluate();
 		}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
index 46a17b3e93b0..0763719d7b0b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -32,18 +32,18 @@ public RunnerWithCustomUniqueIdsAndDisplayNames(Class<?> klass) throws Initializ
 
 	@Override
 	protected String getName() {
-		DisplayName displayName = getTestClass().getAnnotation(DisplayName.class);
+		var displayName = getTestClass().getAnnotation(DisplayName.class);
 		return displayName == null ? super.getName() : displayName.value();
 	}
 
 	@Override
 	protected Description describeChild(FrameworkMethod method) {
-		String testName = getTestName(method);
+		var testName = getTestName(method);
 		return createTestDescription(getTestClass().getJavaClass().getName(), testName, new CustomUniqueId(testName));
 	}
 
 	private String getTestName(FrameworkMethod method) {
-		DisplayName displayName = method.getAnnotation(DisplayName.class);
+		var displayName = method.getAnnotation(DisplayName.class);
 		return displayName == null ? testName(method) : displayName.value();
 	}
 
@@ -60,7 +60,7 @@ public CustomUniqueId(String testName) {
 		@Override
 		public boolean equals(Object obj) {
 			if (obj instanceof CustomUniqueId) {
-				CustomUniqueId that = (CustomUniqueId) obj;
+				var that = (CustomUniqueId) obj;
 				return Objects.equals(this.testName, that.testName);
 			}
 			return false;

From 76e7f012f1ec878ded4f9bed9af942da5076a2fc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 14 Oct 2020 20:49:55 +0200
Subject: [PATCH 0059/1433] Clean up test code in junit-platform-engine

---
 .../DemoHierarchicalContainerDescriptor.java  | 14 +------------
 .../DemoHierarchicalEngineDescriptor.java     |  2 +-
 .../DemoHierarchicalTestEngine.java           | 21 ++++---------------
 .../junit/platform/fakes/TestEngineSpy.java   | 11 +++-------
 4 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
index ecd5f1612f80..9b51c75c7b57 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
@@ -11,7 +11,6 @@
 package org.junit.platform.engine.support.hierarchical;
 
 import static org.junit.platform.engine.support.hierarchical.Node.SkipResult.doNotSkip;
-import static org.junit.platform.engine.support.hierarchical.Node.SkipResult.skip;
 
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
@@ -24,12 +23,6 @@ public class DemoHierarchicalContainerDescriptor extends AbstractTestDescriptor
 		implements Node<DemoEngineExecutionContext> {
 
 	private final Runnable beforeBlock;
-	private String skippedReason;
-	private boolean skipped;
-
-	DemoHierarchicalContainerDescriptor(UniqueId uniqueId, String displayName, Runnable executeBlock) {
-		this(uniqueId, displayName, null, executeBlock);
-	}
 
 	public DemoHierarchicalContainerDescriptor(UniqueId uniqueId, String displayName, TestSource source,
 			Runnable beforeBlock) {
@@ -47,14 +40,9 @@ public boolean mayRegisterTests() {
 		return true;
 	}
 
-	public void markSkipped(String reason) {
-		this.skipped = true;
-		this.skippedReason = reason;
-	}
-
 	@Override
 	public SkipResult shouldBeSkipped(DemoEngineExecutionContext context) {
-		return this.skipped ? skip(this.skippedReason) : doNotSkip();
+		return doNotSkip();
 	}
 
 	@Override
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
index 640086baffbf..e10efb55eaad 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
@@ -27,7 +27,7 @@ public class DemoHierarchicalEngineDescriptor extends EngineDescriptor implement
 	};
 
 	public DemoHierarchicalEngineDescriptor(UniqueId uniqueId) {
-		super(uniqueId, uniqueId.getEngineId().get());
+		super(uniqueId, uniqueId.getEngineId().orElseThrow());
 	}
 
 	public void markSkipped(String reason) {
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
index a2db3afaeeab..9780098afd09 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
@@ -10,14 +10,11 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import java.lang.reflect.Method;
-
 import org.junit.platform.engine.EngineDiscoveryRequest;
 import org.junit.platform.engine.ExecutionRequest;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
-import org.junit.platform.engine.support.descriptor.MethodSource;
 
 /**
  * @since 1.0
@@ -49,18 +46,9 @@ public DemoHierarchicalTestDescriptor addTest(String uniqueName, Runnable execut
 		return addTest(uniqueName, uniqueName, executeBlock);
 	}
 
-	public DemoHierarchicalTestDescriptor addTest(Method testMethod, Runnable executeBlock) {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", testMethod.getName());
-		MethodSource source = MethodSource.from(testMethod);
-		DemoHierarchicalTestDescriptor child = new DemoHierarchicalTestDescriptor(uniqueId, testMethod.getName(),
-			source, executeBlock);
-		engineDescriptor.addChild(child);
-		return child;
-	}
-
 	public DemoHierarchicalTestDescriptor addTest(String uniqueName, String displayName, Runnable executeBlock) {
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("test", uniqueName);
-		DemoHierarchicalTestDescriptor child = new DemoHierarchicalTestDescriptor(uniqueId, displayName, executeBlock);
+		var uniqueId = engineDescriptor.getUniqueId().append("test", uniqueName);
+		var child = new DemoHierarchicalTestDescriptor(uniqueId, displayName, executeBlock);
 		engineDescriptor.addChild(child);
 		return child;
 	}
@@ -76,9 +64,8 @@ public DemoHierarchicalContainerDescriptor addContainer(String uniqueName, Runna
 	public DemoHierarchicalContainerDescriptor addContainer(String uniqueName, String displayName, TestSource source,
 			Runnable beforeBlock) {
 
-		UniqueId uniqueId = engineDescriptor.getUniqueId().append("container", uniqueName);
-		DemoHierarchicalContainerDescriptor container = new DemoHierarchicalContainerDescriptor(uniqueId, displayName,
-			source, beforeBlock);
+		var uniqueId = engineDescriptor.getUniqueId().append("container", uniqueName);
+		var container = new DemoHierarchicalContainerDescriptor(uniqueId, displayName, source, beforeBlock);
 		engineDescriptor.addChild(container);
 		return container;
 	}
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
index 093f678e7d0c..8856d50e11de 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
@@ -23,8 +23,6 @@ public class TestEngineSpy implements TestEngine {
 
 	public static final String ID = TestEngineSpy.class.getSimpleName();
 
-	public EngineDiscoveryRequest discoveryRequestForDiscovery;
-	public UniqueId uniqueIdForDiscovery;
 	public ExecutionRequest requestForExecution;
 
 	@Override
@@ -34,12 +32,9 @@ public String getId() {
 
 	@Override
 	public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
-		this.discoveryRequestForDiscovery = discoveryRequest;
-		this.uniqueIdForDiscovery = uniqueId;
-
-		UniqueId engineUniqueId = UniqueId.forEngine(ID);
-		TestDescriptorStub engineDescriptor = new TestDescriptorStub(engineUniqueId, ID);
-		TestDescriptorStub testDescriptor = new TestDescriptorStub(engineUniqueId.append("test", "test"), "test");
+		var engineUniqueId = UniqueId.forEngine(ID);
+		var engineDescriptor = new TestDescriptorStub(engineUniqueId, ID);
+		var testDescriptor = new TestDescriptorStub(engineUniqueId.append("test", "test"), "test");
 		engineDescriptor.addChild(testDescriptor);
 		return engineDescriptor;
 	}

From a37f726bc3f5241cdffd7491e16b0266002e0eb9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 14 Oct 2020 21:13:16 +0200
Subject: [PATCH 0060/1433] Clean up test code in junit-jupiter-params

---
 .../ParameterizedTestExtensionTests.java      |  44 +++---
 .../ParameterizedTestIntegrationTests.java    |  10 +-
 .../ParameterizedTestMethodContextTests.java  |   5 +-
 .../ParameterizedTestNameFormatterTests.java  |  71 +++++----
 .../AggregatorIntegrationTests.java           |  20 +--
 .../DefaultArgumentsAccessorTests.java        |   9 +-
 .../DefaultArgumentConverterTests.java        |   9 +-
 .../FallbackStringToObjectConverterTests.java |  14 +-
 .../JavaTimeArgumentConverterTests.java       |   7 +-
 .../converter/TypedArgumentConverterTest.java |   2 +-
 .../params/provider/ArgumentsTests.java       |   8 +-
 .../provider/CsvArgumentsProviderTests.java   |  84 +++++------
 .../CsvFileArgumentsProviderTests.java        | 136 +++++++++---------
 .../provider/EnumArgumentsProviderTests.java  |  12 +-
 .../params/provider/EnumSourceTests.java      |  59 ++++----
 .../MethodArgumentsProviderTests.java         |   4 +-
 .../provider/MockCsvAnnotationBuilder.java    |   4 +-
 .../provider/ValueArgumentsProviderTests.java |  36 ++---
 18 files changed, 262 insertions(+), 272 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index cd1106b77f59..6ad6e471fd10 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
-import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
 import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 import org.junit.jupiter.params.provider.Arguments;
@@ -52,35 +51,33 @@ class ParameterizedTestExtensionTests {
 
 	@Test
 	void supportsReturnsFalseForMissingTestMethod() {
-		ExtensionContext extensionContextWithoutTestMethod = getExtensionContextReturningSingleMethod(
-			new TestCaseWithoutMethod());
+		var extensionContextWithoutTestMethod = getExtensionContextReturningSingleMethod(new TestCaseWithoutMethod());
 		assertFalse(this.parameterizedTestExtension.supportsTestTemplate(extensionContextWithoutTestMethod));
 	}
 
 	@Test
 	void supportsReturnsFalseForTestMethodWithoutParameterizedTestAnnotation() {
-		ExtensionContext extensionContextWithUnAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
+		var extensionContextWithUnAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
 			new TestCaseWithMethod());
 		assertFalse(this.parameterizedTestExtension.supportsTestTemplate(extensionContextWithUnAnnotatedTestMethod));
 	}
 
 	@Test
 	void supportsReturnsTrueForTestMethodWithParameterizedTestAnnotation() {
-		ExtensionContext extensionContextWithAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
+		var extensionContextWithAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
 			new TestCaseWithAnnotatedMethod());
 		assertTrue(this.parameterizedTestExtension.supportsTestTemplate(extensionContextWithAnnotatedTestMethod));
 	}
 
 	@Test
 	void streamsReturnedByProvidersAreClosedWhenCallingProvide() {
-		ExtensionContext extensionContext = getExtensionContextReturningSingleMethod(
+		var extensionContext = getExtensionContextReturningSingleMethod(
 			new ArgumentsProviderWithCloseHandlerTestCase());
 		// we need to call supportsTestTemplate() first, because it creates and
 		// puts the ParameterizedTestMethodContext into the Store
 		this.parameterizedTestExtension.supportsTestTemplate(extensionContext);
 
-		Stream<TestTemplateInvocationContext> stream = this.parameterizedTestExtension.provideTestTemplateInvocationContexts(
-			extensionContext);
+		var stream = this.parameterizedTestExtension.provideTestTemplateInvocationContexts(extensionContext);
 
 		assertFalse(streamWasClosed);
 		// cause the stream to be evaluated
@@ -94,21 +91,20 @@ void argumentsRethrowsOriginalExceptionFromProviderAsUncheckedException() {
 			throw new FileNotFoundException("a message");
 		};
 
-		FileNotFoundException exception = assertThrows(FileNotFoundException.class,
-			() -> arguments(failingProvider, null));
+		var exception = assertThrows(FileNotFoundException.class, () -> arguments(failingProvider, null));
 		assertEquals("a message", exception.getMessage());
 	}
 
 	@Test
 	void throwsExceptionWhenParameterizedTestIsNotInvokedAtLeastOnce() {
-		ExtensionContext extensionContextWithAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
+		var extensionContextWithAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
 			new TestCaseWithAnnotatedMethod());
 
-		Stream<TestTemplateInvocationContext> stream = this.parameterizedTestExtension.provideTestTemplateInvocationContexts(
+		var stream = this.parameterizedTestExtension.provideTestTemplateInvocationContexts(
 			extensionContextWithAnnotatedTestMethod);
 		// cause the stream to be evaluated
 		stream.toArray();
-		JUnitException exception = assertThrows(JUnitException.class, stream::close);
+		var exception = assertThrows(JUnitException.class, stream::close);
 
 		assertThat(exception).hasMessage(
 			"Configuration error: You must configure at least one set of arguments for this @ParameterizedTest");
@@ -116,26 +112,26 @@ void throwsExceptionWhenParameterizedTestIsNotInvokedAtLeastOnce() {
 
 	@Test
 	void throwsExceptionWhenArgumentsProviderIsNotStatic() {
-		ExtensionContext extensionContextWithAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
+		var extensionContextWithAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
 			new NonStaticArgumentsProviderTestCase());
 
-		Stream<TestTemplateInvocationContext> stream = this.parameterizedTestExtension.provideTestTemplateInvocationContexts(
+		var stream = this.parameterizedTestExtension.provideTestTemplateInvocationContexts(
 			extensionContextWithAnnotatedTestMethod);
 
-		JUnitException exception = assertThrows(JUnitException.class, stream::toArray);
+		var exception = assertThrows(JUnitException.class, stream::toArray);
 
 		assertArgumentsProviderInstantiationException(exception, NonStaticArgumentsProvider.class);
 	}
 
 	@Test
 	void throwsExceptionWhenArgumentsProviderDoesNotContainNoArgumentConstructor() {
-		ExtensionContext extensionContextWithAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
+		var extensionContextWithAnnotatedTestMethod = getExtensionContextReturningSingleMethod(
 			new MissingNoArgumentsConstructorArgumentsProviderTestCase());
 
-		Stream<TestTemplateInvocationContext> stream = this.parameterizedTestExtension.provideTestTemplateInvocationContexts(
+		var stream = this.parameterizedTestExtension.provideTestTemplateInvocationContexts(
 			extensionContextWithAnnotatedTestMethod);
 
-		JUnitException exception = assertThrows(JUnitException.class, stream::toArray);
+		var exception = assertThrows(JUnitException.class, stream::toArray);
 
 		assertArgumentsProviderInstantiationException(exception, MissingNoArgumentsConstructorArgumentsProvider.class);
 	}
@@ -151,7 +147,7 @@ private <T> void assertArgumentsProviderInstantiationException(JUnitException ex
 	private ExtensionContext getExtensionContextReturningSingleMethod(Object testCase) {
 
 		// @formatter:off
-		Optional<Method> optional = Arrays.stream(testCase.getClass().getDeclaredMethods())
+		var optional = Arrays.stream(testCase.getClass().getDeclaredMethods())
 				.filter(method -> method.getName().equals("method"))
 				.findFirst();
 		// @formatter:on
@@ -167,7 +163,7 @@ public Optional<Method> getTestMethod() {
 
 			@Override
 			public Optional<ExtensionContext> getParent() {
-				return null;
+				return Optional.empty();
 			}
 
 			@Override
@@ -192,12 +188,12 @@ public Set<String> getTags() {
 
 			@Override
 			public Optional<AnnotatedElement> getElement() {
-				return null;
+				return Optional.empty();
 			}
 
 			@Override
 			public Optional<Class<?>> getTestClass() {
-				return null;
+				return Optional.empty();
 			}
 
 			@Override
@@ -269,7 +265,7 @@ static class ArgumentsProviderWithCloseHandler implements ArgumentsProvider {
 
 		@Override
 		public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-			Stream<Arguments> argumentsStream = Stream.of("foo", "bar").map(Arguments::of);
+			var argumentsStream = Stream.of("foo", "bar").map(Arguments::of);
 			return argumentsStream.onClose(() -> streamWasClosed = true);
 		}
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 39bcdfe61e65..fb106aa2faf3 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -137,7 +137,7 @@ void legacyReportingNames() {
 		var results = execute("testWithCustomName", String.class, int.class);
 
 		// @formatter:off
-		Stream<String> legacyReportingNames = results.testEvents().dynamicallyRegistered()
+		var legacyReportingNames = results.testEvents().dynamicallyRegistered()
 				.map(Event::getTestDescriptor)
 				.map(TestDescriptor::getLegacyReportingName);
 		// @formatter:on
@@ -272,7 +272,7 @@ void executesWithNullSourceForNumber() {
 
 		@Test
 		void failsWithNullSourceWithZeroFormalParameters() {
-			String methodName = "testWithNullSourceWithZeroFormalParameters";
+			var methodName = "testWithNullSourceWithZeroFormalParameters";
 			execute(methodName).containerEvents().failed().assertEventsMatchExactly(//
 				event(container(methodName), //
 					finishedWithFailure(//
@@ -358,7 +358,7 @@ void executesWithEmptySourceForTwoDimensionalStringArray() {
 
 		@Test
 		void failsWithEmptySourceWithZeroFormalParameters() {
-			String methodName = "testWithEmptySourceWithZeroFormalParameters";
+			var methodName = "testWithEmptySourceWithZeroFormalParameters";
 			execute(methodName).containerEvents().failed().assertEventsMatchExactly(//
 				event(container(methodName), //
 					finishedWithFailure(//
@@ -381,7 +381,7 @@ void failsWithEmptySourceForUnsupportedType(String methodName, Class<?> paramete
 					finishedWithFailure(//
 						instanceOf(PreconditionViolationException.class), //
 						message(msg -> msg.matches("@EmptySource cannot provide an empty argument to method .+: \\["
-								+ parameterType.getName() + "\\] is not a supported type."))//
+								+ parameterType.getName() + "] is not a supported type."))//
 					)));
 		}
 
@@ -1093,7 +1093,7 @@ void test2(String argument, TestInfo testInfo) {
 		}
 
 		private void performTest(String argument, TestInfo testInfo) {
-			String testMethod = testInfo.getTestMethod().get().getName();
+			var testMethod = testInfo.getTestMethod().orElseThrow().getName();
 			testMethods.add(testMethod);
 			lifecycleEvents.add(testMethod + ":" + testInfo.getDisplayName());
 			fail(argument);
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
index 347f9e95b52d..82614506ff29 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
@@ -43,7 +43,10 @@ void invalidSignatures(String name) {
 	}
 
 	private Method method(String name) {
-		return Arrays.stream(getClass().getDeclaredMethods()).filter(m -> m.getName().equals(name)).findFirst().get();
+		return Arrays.stream(getClass().getDeclaredMethods()) //
+				.filter(m -> m.getName().equals(name)) //
+				.findFirst() //
+				.orElseThrow();
 	}
 
 	// --- VALID ---------------------------------------------------------------
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
index 78d0fe09c647..dd97bfc4ec51 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
@@ -54,7 +54,7 @@ void restoreLocale() {
 
 	@Test
 	void formatsDisplayName() {
-		ParameterizedTestNameFormatter formatter = formatter(DISPLAY_NAME_PLACEHOLDER, "enigma");
+		var formatter = formatter(DISPLAY_NAME_PLACEHOLDER, "enigma");
 
 		assertEquals("enigma", formatter.format(1));
 		assertEquals("enigma", formatter.format(2));
@@ -62,7 +62,7 @@ void formatsDisplayName() {
 
 	@Test
 	void formatsInvocationIndex() {
-		ParameterizedTestNameFormatter formatter = formatter(INDEX_PLACEHOLDER, "enigma");
+		var formatter = formatter(INDEX_PLACEHOLDER, "enigma");
 
 		assertEquals("1", formatter.format(1));
 		assertEquals("2", formatter.format(2));
@@ -70,19 +70,19 @@ void formatsInvocationIndex() {
 
 	@Test
 	void formatsIndividualArguments() {
-		ParameterizedTestNameFormatter formatter = formatter("{0} -> {1}", "enigma");
+		var formatter = formatter("{0} -> {1}", "enigma");
 
 		assertEquals("foo -> 42", formatter.format(1, "foo", 42));
 	}
 
 	@Test
 	void formatsCompleteArgumentsList() {
-		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
+		var formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
 
 		// @formatter:off
 		assertEquals("42, 99, enigma, null, [1, 2, 3], [foo, bar], [[2, 4], [3, 9]]",
 			formatter.format(1,
-				Integer.valueOf(42),
+				42,
 				99,
 				"enigma",
 				null,
@@ -95,27 +95,25 @@ void formatsCompleteArgumentsList() {
 
 	@Test
 	void formatsCompleteArgumentsListWithNames() {
-		Method testMethod = ParameterizedTestCases.getMethod("parameterizedTest", int.class, String.class,
-			Object[].class);
-		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_WITH_NAMES_PLACEHOLDER, "enigma", testMethod);
+		var testMethod = ParameterizedTestCases.getMethod("parameterizedTest", int.class, String.class, Object[].class);
+		var formatter = formatter(ARGUMENTS_WITH_NAMES_PLACEHOLDER, "enigma", testMethod);
 
-		String formattedName = formatter.format(1, 42, "enigma", new Object[] { "foo", 1 });
+		var formattedName = formatter.format(1, 42, "enigma", new Object[] { "foo", 1 });
 		assertEquals("someNumber=42, someString=enigma, someArray=[foo, 1]", formattedName);
 	}
 
 	@Test
 	void formatsCompleteArgumentsListWithoutNamesForAggregators() {
-		Method testMethod = ParameterizedTestCases.getMethod("parameterizedTestWithAggregator", int.class,
-			String.class);
-		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_WITH_NAMES_PLACEHOLDER, "enigma", testMethod);
+		var testMethod = ParameterizedTestCases.getMethod("parameterizedTestWithAggregator", int.class, String.class);
+		var formatter = formatter(ARGUMENTS_WITH_NAMES_PLACEHOLDER, "enigma", testMethod);
 
-		String formattedName = formatter.format(1, 42, "foo", "bar");
+		var formattedName = formatter.format(1, 42, "foo", "bar");
 		assertEquals("someNumber=42, foo, bar", formattedName);
 	}
 
 	@Test
 	void formatsCompleteArgumentsListWithArrays() {
-		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
+		var formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
 
 		// Explicit test for https://github.com/junit-team/junit5/issues/814
 		assertEquals("[foo, bar]", formatter.format(1, (Object) new String[] { "foo", "bar" }));
@@ -125,9 +123,8 @@ void formatsCompleteArgumentsListWithArrays() {
 
 	@Test
 	void formatsEverythingUsingCustomPattern() {
-		String pattern = DISPLAY_NAME_PLACEHOLDER + " " + INDEX_PLACEHOLDER + " :: " + ARGUMENTS_PLACEHOLDER
-				+ " :: {1}";
-		ParameterizedTestNameFormatter formatter = formatter(pattern, "enigma");
+		var pattern = DISPLAY_NAME_PLACEHOLDER + " " + INDEX_PLACEHOLDER + " :: " + ARGUMENTS_PLACEHOLDER + " :: {1}";
+		var formatter = formatter(pattern, "enigma");
 
 		assertEquals("enigma 1 :: foo, bar :: bar", formatter.format(1, "foo", "bar"));
 		assertEquals("enigma 2 :: foo, 42 :: 42", formatter.format(2, "foo", 42));
@@ -135,16 +132,16 @@ void formatsEverythingUsingCustomPattern() {
 
 	@Test
 	void formatDoesNotAlterArgumentsArray() {
-		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
+		var formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
 		Object[] actual = { 1, "two", Byte.valueOf("-128"), new Integer[][] { { 2, 4 }, { 3, 9 } } };
-		Object[] expected = Arrays.copyOf(actual, actual.length);
+		var expected = Arrays.copyOf(actual, actual.length);
 		assertEquals("1, two, -128, [[2, 4], [3, 9]]", formatter.format(1, actual));
 		assertArrayEquals(expected, actual);
 	}
 
 	@Test
 	void formatDoesNotRaiseAnArrayStoreException() {
-		ParameterizedTestNameFormatter formatter = formatter("{0} -> {1}", "enigma");
+		var formatter = formatter("{0} -> {1}", "enigma");
 
 		Object[] arguments = new Number[] { 1, 2 };
 		assertEquals("1 -> 2", formatter.format(1, arguments));
@@ -152,27 +149,27 @@ void formatDoesNotRaiseAnArrayStoreException() {
 
 	@Test
 	void throwsReadableExceptionForInvalidPattern() {
-		ParameterizedTestNameFormatter formatter = formatter("{index", "enigma");
+		var formatter = formatter("{index", "enigma");
 
-		JUnitException exception = assertThrows(JUnitException.class, () -> formatter.format(1));
+		var exception = assertThrows(JUnitException.class, () -> formatter.format(1));
 		assertNotNull(exception.getCause());
 		assertEquals(IllegalArgumentException.class, exception.getCause().getClass());
 	}
 
 	@Test
 	void formattingDoesNotFailIfArgumentToStringImplementationReturnsNull() {
-		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
+		var formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
 
-		String formattedName = formatter.format(1, new ToStringReturnsNull(), "foo");
+		var formattedName = formatter.format(1, new ToStringReturnsNull(), "foo");
 
 		assertThat(formattedName).isEqualTo("null, foo");
 	}
 
 	@Test
 	void formattingDoesNotFailIfArgumentToStringImplementationThrowsAnException() {
-		ParameterizedTestNameFormatter formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
+		var formatter = formatter(ARGUMENTS_PLACEHOLDER, "enigma");
 
-		String formattedName = formatter.format(1, new ToStringThrowsException(), "foo");
+		var formattedName = formatter.format(1, new ToStringThrowsException(), "foo");
 
 		assertThat(formattedName).startsWith(ToStringThrowsException.class.getName() + "@");
 		assertThat(formattedName).endsWith("foo");
@@ -183,13 +180,13 @@ void formattingDoesNotFailIfArgumentToStringImplementationThrowsAnException() {
 			"DE | 42,23 is positive on 13.01.2019 at 12:34:56" })
 	void customFormattingExpressionsAreSupported(Locale locale, String expectedValue) {
 		var pattern = "[{index}] {1,number,#.##} is {1,choice,0<positive} on {0,date} at {0,time} even though {2}";
-		ParameterizedTestNameFormatter formatter = formatter(pattern, "enigma");
+		var formatter = formatter(pattern, "enigma");
 		Locale.setDefault(Locale.US);
 
 		var date = Date.from(
 			LocalDate.of(2019, 1, 13).atTime(LocalTime.of(12, 34, 56)).atZone(ZoneId.systemDefault()).toInstant());
 		Locale.setDefault(locale);
-		String formattedName = formatter.format(1, date, new BigDecimal("42.23"), new ToStringThrowsException());
+		var formattedName = formatter.format(1, date, new BigDecimal("42.23"), new ToStringThrowsException());
 
 		assertThat(formattedName).startsWith(
 			"[1] " + expectedValue + " even though " + ToStringThrowsException.class.getName() + "@");
@@ -197,36 +194,36 @@ void customFormattingExpressionsAreSupported(Locale locale, String expectedValue
 
 	@Test
 	void ignoresExcessPlaceholders() {
-		ParameterizedTestNameFormatter formatter = formatter("{0}, {1}", "enigma");
+		var formatter = formatter("{0}, {1}", "enigma");
 
-		String formattedName = formatter.format(1, "foo");
+		var formattedName = formatter.format(1, "foo");
 
 		assertThat(formattedName).isEqualTo("foo, {1}");
 	}
 
 	@Test
 	void placeholdersCanBeOmitted() {
-		ParameterizedTestNameFormatter formatter = formatter("{0}", "enigma");
+		var formatter = formatter("{0}", "enigma");
 
-		String formattedName = formatter.format(1, "foo", "bar");
+		var formattedName = formatter.format(1, "foo", "bar");
 
 		assertThat(formattedName).isEqualTo("foo");
 	}
 
 	@Test
 	void placeholdersCanBeSkipped() {
-		ParameterizedTestNameFormatter formatter = formatter("{0}, {2}", "enigma");
+		var formatter = formatter("{0}, {2}", "enigma");
 
-		String formattedName = formatter.format(1, "foo", "bar", "baz");
+		var formattedName = formatter.format(1, "foo", "bar", "baz");
 
 		assertThat(formattedName).isEqualTo("foo, baz");
 	}
 
 	@Test
 	void truncatesArgumentsThatExceedMaxLength() {
-		ParameterizedTestNameFormatter formatter = formatter("{arguments}", 3);
+		var formatter = formatter("{arguments}", 3);
 
-		String formattedName = formatter.format(1, "fo", "foo", "fooo");
+		var formattedName = formatter.format(1, "fo", "foo", "fooo");
 
 		assertThat(formattedName).isEqualTo("fo, foo, fo…");
 	}
@@ -267,7 +264,7 @@ public String toString() {
 	private static class ParameterizedTestCases {
 
 		static Method getMethod(String methodName, Class<?>... parameterTypes) {
-			return ReflectionUtils.findMethod(ParameterizedTestCases.class, methodName, parameterTypes).get();
+			return ReflectionUtils.findMethod(ParameterizedTestCases.class, methodName, parameterTypes).orElseThrow();
 		}
 
 		@SuppressWarnings("unused")
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
index 3f6797b40835..34e8738758df 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
@@ -83,7 +83,7 @@ void personAggregatorRegisteredViaCustomAnnotation(@CsvToPerson Person person) {
 			"99 Peachtree Road, Atlanta, 30318"//
 	})
 	void addressAggregator(@CsvToAddress Address address) {
-		testAddressAggegator(address);
+		testAddressAggregator(address);
 	}
 
 	@ParameterizedTest
@@ -95,7 +95,7 @@ void personAggregatorAndAddressAggregator(@CsvToPerson Person person,
 			@CsvToAddress @StartIndex(4) Address address) {
 
 		testPersonAggregator(person);
-		testAddressAggegator(address);
+		testAddressAggregator(address);
 	}
 
 	@ParameterizedTest(name = "Mixed Mode #1: {arguments}")
@@ -108,7 +108,7 @@ void mixedMode(String issueNumber, @CsvToPerson @StartIndex(1) Person person,
 
 		assertThat(issueNumber).startsWith("gh-");
 		testPersonAggregator(person);
-		testAddressAggegator(address);
+		testAddressAggregator(address);
 		assertThat(testInfo.getDisplayName()).startsWith("Mixed Mode #1");
 	}
 
@@ -121,7 +121,7 @@ void mapAggregator(@AggregateWith(MapAggregator.class) Map<String, Integer> map)
 	@ParameterizedTest
 	@CsvSource({ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10" })
 	void argumentsAccessor(ArgumentsAccessor arguments) {
-		assertEquals(55, IntStream.range(0, arguments.size()).map(i -> arguments.getInteger(i)).sum());
+		assertEquals(55, IntStream.range(0, arguments.size()).map(arguments::getInteger).sum());
 	}
 
 	@ParameterizedTest(name = "2 ArgumentsAccessors: {arguments}")
@@ -133,7 +133,7 @@ void argumentsAccessors(ArgumentsAccessor arguments1, ArgumentsAccessor argument
 	@ParameterizedTest(name = "ArgumentsAccessor and TestInfo: {arguments}")
 	@CsvSource({ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10" })
 	void argumentsAccessorAndTestInfo(ArgumentsAccessor arguments, TestInfo testInfo) {
-		assertEquals(55, IntStream.range(0, arguments.size()).map(i -> arguments.getInteger(i)).sum());
+		assertEquals(55, IntStream.range(0, arguments.size()).map(arguments::getInteger).sum());
 		assertThat(testInfo.getDisplayName()).startsWith("ArgumentsAccessor and TestInfo");
 	}
 
@@ -142,7 +142,7 @@ void argumentsAccessorAndTestInfo(ArgumentsAccessor arguments, TestInfo testInfo
 	void indexedArgumentsAndArgumentsAccessor(int num1, int num2, ArgumentsAccessor arguments) {
 		assertEquals(1, num1);
 		assertEquals(2, num2);
-		assertEquals(55, IntStream.range(0, arguments.size()).map(i -> arguments.getInteger(i)).sum());
+		assertEquals(55, IntStream.range(0, arguments.size()).map(arguments::getInteger).sum());
 	}
 
 	@ParameterizedTest(name = "Indexed Arguments, ArgumentsAccessor, and TestInfo: {arguments}")
@@ -152,7 +152,7 @@ void indexedArgumentsArgumentsAccessorAndTestInfo(int num1, int num2, ArgumentsA
 
 		assertEquals(1, num1);
 		assertEquals(2, num2);
-		assertEquals(55, IntStream.range(0, arguments.size()).map(i -> arguments.getInteger(i)).sum());
+		assertEquals(55, IntStream.range(0, arguments.size()).map(arguments::getInteger).sum());
 		assertThat(testInfo.getDisplayName()).startsWith("Indexed Arguments, ArgumentsAccessor, and TestInfo");
 	}
 
@@ -164,7 +164,7 @@ void indexedArgumentsArgumentsAccessorsAndTestInfo(int num1, int num2, Arguments
 		assertEquals(1, num1);
 		assertEquals(2, num2);
 		assertArrayEquals(arguments1.toArray(), arguments2.toArray());
-		assertEquals(55, IntStream.range(0, arguments1.size()).map(i -> arguments1.getInteger(i)).sum());
+		assertEquals(55, IntStream.range(0, arguments1.size()).map(arguments1::getInteger).sum());
 		assertThat(testInfo.getDisplayName()).startsWith("Indexed Arguments, 2 ArgumentsAccessors, and TestInfo");
 	}
 
@@ -198,7 +198,7 @@ private void testPersonAggregator(Person person) {
 		}
 	}
 
-	private void testAddressAggegator(Address address) {
+	private void testAddressAggregator(Address address) {
 		assertThat(address.street).contains("Peachtree");
 		assertEquals("Atlanta", address.city);
 		assertEquals(30318, address.zipCode);
@@ -306,7 +306,7 @@ static class MapAggregator implements ArgumentsAggregator {
 		public Map<String, Integer> aggregateArguments(ArgumentsAccessor arguments, ParameterContext context) {
 			// @formatter:off
 			return IntStream.range(0, arguments.size())
-					.mapToObj(i -> arguments.getString(i))
+					.mapToObj(arguments::getString)
 					.collect(toMap(s -> s, String::length));
 			// @formatter:on
 		}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
index 08e88f2f6d26..eaf4d22f2ddd 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
@@ -18,7 +18,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Arrays;
-import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -138,8 +137,8 @@ void getString() {
 
 	@Test
 	void toArray() {
-		DefaultArgumentsAccessor arguments = new DefaultArgumentsAccessor("foo", "bar");
-		Object[] copy = arguments.toArray();
+		var arguments = new DefaultArgumentsAccessor("foo", "bar");
+		var copy = arguments.toArray();
 		assertArrayEquals(new String[] { "foo", "bar" }, copy);
 
 		// Modify local copy:
@@ -149,8 +148,8 @@ void toArray() {
 
 	@Test
 	void toList() {
-		DefaultArgumentsAccessor arguments = new DefaultArgumentsAccessor("foo", "bar");
-		List<Object> copy = arguments.toList();
+		var arguments = new DefaultArgumentsAccessor("foo", "bar");
+		var copy = arguments.toList();
 		assertIterableEquals(Arrays.asList("foo", "bar"), copy);
 
 		// Modify local copy:
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 813dcdbf9764..2dc8ab22a812 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -19,6 +19,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Duration;
@@ -124,8 +125,8 @@ void convertsStringsToEnumConstants() {
 
 	@Test
 	void convertsStringToCharset() {
-		assertConverts("ISO-8859-1", Charset.class, Charset.forName("ISO-8859-1"));
-		assertConverts("UTF-8", Charset.class, Charset.forName("UTF-8"));
+		assertConverts("ISO-8859-1", Charset.class, StandardCharsets.ISO_8859_1);
+		assertConverts("UTF-8", Charset.class, StandardCharsets.UTF_8);
 	}
 
 	@Test
@@ -218,14 +219,14 @@ void convertsStringToLocale() {
 
 	@Test
 	void convertsStringToUUID() {
-		String uuid = "d043e930-7b3b-48e3-bdbe-5a3ccfb833db";
+		var uuid = "d043e930-7b3b-48e3-bdbe-5a3ccfb833db";
 		assertConverts(uuid, UUID.class, UUID.fromString(uuid));
 	}
 
 	// -------------------------------------------------------------------------
 
 	private void assertConverts(Object input, Class<?> targetClass, Object expectedOutput) {
-		Object result = DefaultArgumentConverter.INSTANCE.convert(input, targetClass);
+		var result = DefaultArgumentConverter.INSTANCE.convert(input, targetClass);
 
 		assertThat(result) //
 				.describedAs(input + " --(" + targetClass.getName() + ")--> " + expectedOutput) //
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
index d0173b115d1e..687482cc4504 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
@@ -108,21 +108,21 @@ private static Method bookMethod(String methodName) {
 	}
 
 	private static Method bookMethod(String methodName, Class<?> parameterType) {
-		return findMethod(Book.class, methodName, parameterType).get();
+		return findMethod(Book.class, methodName, parameterType).orElseThrow();
 	}
 
 	private static Method newspaperMethod(String methodName) {
-		return findMethod(Newspaper.class, methodName, String.class).get();
+		return findMethod(Newspaper.class, methodName, String.class).orElseThrow();
 	}
 
 	private static Method magazineMethod(String methodName) {
-		return findMethod(Magazine.class, methodName, String.class).get();
+		return findMethod(Magazine.class, methodName, String.class).orElseThrow();
 	}
 
 	private static void assertConverts(String input, Class<?> targetType, Object expectedOutput) throws Exception {
 		assertThat(converter.canConvert(targetType)).isTrue();
 
-		Object result = converter.convert(input, targetType);
+		var result = converter.convert(input, targetType);
 
 		assertThat(result) //
 				.describedAs(input + " --(" + targetType.getName() + ")--> " + expectedOutput) //
@@ -164,7 +164,7 @@ public boolean equals(Object obj) {
 			if (!(obj instanceof Book)) {
 				return false;
 			}
-			Book that = (Book) obj;
+			var that = (Book) obj;
 			return Objects.equals(this.title, that.title);
 		}
 
@@ -186,7 +186,7 @@ public boolean equals(Object obj) {
 			if (!(obj instanceof Journal)) {
 				return false;
 			}
-			Journal that = (Journal) obj;
+			var that = (Journal) obj;
 			return Objects.equals(this.title, that.title);
 		}
 
@@ -216,7 +216,7 @@ public boolean equals(Object obj) {
 			if (!(obj instanceof Newspaper)) {
 				return false;
 			}
-			Newspaper that = (Newspaper) obj;
+			var that = (Newspaper) obj;
 			return Objects.equals(this.title, that.title);
 		}
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
index 40bda73dfc60..06efb164c17d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
@@ -105,15 +105,14 @@ void convertsStringToZonedDateTime() {
 
 	@Test
 	void throwsExceptionOnInvalidTargetType() {
-		ArgumentConversionException exception = assertThrows(ArgumentConversionException.class,
-			() -> convert("2017", "yyyy", Integer.class));
+		var exception = assertThrows(ArgumentConversionException.class, () -> convert("2017", "yyyy", Integer.class));
 
 		assertThat(exception).hasMessage("Cannot convert to java.lang.Integer: 2017");
 	}
 
 	private Object convert(Object input, String pattern, Class<?> targetClass) {
-		JavaTimeArgumentConverter converter = new JavaTimeArgumentConverter();
-		JavaTimeConversionPattern annotation = mock(JavaTimeConversionPattern.class);
+		var converter = new JavaTimeArgumentConverter();
+		var annotation = mock(JavaTimeConversionPattern.class);
 		when(annotation.value()).thenReturn(pattern);
 		converter.accept(annotation);
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java
index 57f98ccaf462..57b78f8e3312 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java
@@ -28,7 +28,7 @@ void convertsSourceToTarget() {
 	}
 
 	private void assertConverts(String input, Integer expectedOutput) {
-		Integer result = new StringLengthArgumentConverter().convert(input);
+		var result = new StringLengthArgumentConverter().convert(input);
 		assertThat(result).isEqualTo(expectedOutput);
 	}
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
index 206a6216cfbf..d8f0b7e564bf 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
@@ -26,14 +26,14 @@ class ArgumentsTests {
 
 	@Test
 	void ofSupportsVarargs() {
-		Arguments arguments = of(1, "2", 3.0);
+		var arguments = of(1, "2", 3.0);
 
 		assertArrayEquals(new Object[] { 1, "2", 3.0 }, arguments.get());
 	}
 
 	@Test
 	void argumentsSupportsVarargs() {
-		Arguments arguments = arguments(1, "2", 3.0);
+		var arguments = arguments(1, "2", 3.0);
 
 		assertArrayEquals(new Object[] { 1, "2", 3.0 }, arguments.get());
 	}
@@ -42,7 +42,7 @@ void argumentsSupportsVarargs() {
 	void ofReturnsSameArrayUsedForCreating() {
 		Object[] input = { 1, "2", 3.0 };
 
-		Arguments arguments = of(input);
+		var arguments = of(input);
 
 		assertThat(arguments.get()).isSameAs(input);
 	}
@@ -51,7 +51,7 @@ void ofReturnsSameArrayUsedForCreating() {
 	void argumentsReturnsSameArrayUsedForCreating() {
 		Object[] input = { 1, "2", 3.0 };
 
-		Arguments arguments = arguments(input);
+		var arguments = arguments(input);
 
 		assertThat(arguments.get()).isSameAs(input);
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 88e45e338a88..8279869a0f9d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -27,7 +27,7 @@ class CsvArgumentsProviderTests {
 
 	@Test
 	void throwsExceptionOnInvalidCsv() {
-		CsvSource annotation = csvSource("foo", "bar", "");
+		var annotation = csvSource("foo", "bar", "");
 
 		assertThatExceptionOfType(JUnitException.class)//
 				.isThrownBy(() -> provideArguments(annotation).toArray())//
@@ -36,97 +36,97 @@ void throwsExceptionOnInvalidCsv() {
 
 	@Test
 	void providesSingleArgument() {
-		CsvSource annotation = csvSource("foo");
+		var annotation = csvSource("foo");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("foo"));
 	}
 
 	@Test
 	void providesMultipleArguments() {
-		CsvSource annotation = csvSource("foo", "bar");
+		var annotation = csvSource("foo", "bar");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"));
 	}
 
 	@Test
 	void splitsAndTrimsArguments() {
-		CsvSource annotation = csvSource(" foo , bar ");
+		var annotation = csvSource(" foo , bar ");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("foo", "bar"));
 	}
 
 	@Test
 	void trimsLeadingSpaces() {
-		CsvSource annotation = csvSource("'', 1", " '', 2", "'' , 3", " '' , 4");
+		var annotation = csvSource("'', 1", " '', 2", "'' , 3", " '' , 4");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(new Object[][] { { "", "1" }, { "", "2" }, { "", "3" }, { "", "4" } });
 	}
 
 	@Test
 	void trimsTrailingSpaces() {
-		CsvSource annotation = csvSource("1,''", "2, ''", "3,'' ", "4, '' ");
+		var annotation = csvSource("1,''", "2, ''", "3,'' ", "4, '' ");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(new Object[][] { { "1", "" }, { "2", "" }, { "3", "" }, { "4", "" } });
 	}
 
 	@Test
 	void understandsQuotes() {
-		CsvSource annotation = csvSource("'foo, bar'");
+		var annotation = csvSource("'foo, bar'");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("foo, bar"));
 	}
 
 	@Test
 	void understandsEscapeCharacters() {
-		CsvSource annotation = csvSource("'foo or ''bar''', baz");
+		var annotation = csvSource("'foo or ''bar''', baz");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("foo or 'bar'", "baz"));
 	}
 
 	@Test
 	void doesNotTrimSpacesInsideQuotes() {
-		CsvSource annotation = csvSource("''", "'   '", "'blank '", "' not blank   '");
+		var annotation = csvSource("''", "'   '", "'blank '", "' not blank   '");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array(""), array("   "), array("blank "), array(" not blank   "));
 	}
 
 	@Test
 	void providesArgumentsWithCharacterDelimiter() {
-		CsvSource annotation = csvSource().delimiter('|').lines("foo|bar", "bar|foo").build();
+		var annotation = csvSource().delimiter('|').lines("foo|bar", "bar|foo").build();
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("foo", "bar"), array("bar", "foo"));
 	}
 
 	@Test
 	void providesArgumentsWithStringDelimiter() {
-		CsvSource annotation = csvSource().delimiterString("~~~").lines("foo~~~ bar", "bar~~~ foo").build();
+		var annotation = csvSource().delimiterString("~~~").lines("foo~~~ bar", "bar~~~ foo").build();
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("foo", "bar"), array("bar", "foo"));
 	}
 
 	@Test
 	void throwsExceptionIfBothDelimitersAreSimultaneouslySet() {
-		CsvSource annotation = csvSource().delimiter('|').delimiterString("~~~").build();
+		var annotation = csvSource().delimiter('|').delimiterString("~~~").build();
 
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(() -> provideArguments(annotation))//
@@ -136,85 +136,85 @@ void throwsExceptionIfBothDelimitersAreSimultaneouslySet() {
 
 	@Test
 	void defaultEmptyValueAndDefaultNullValue() {
-		CsvSource annotation = csvSource("'', null, , apple");
+		var annotation = csvSource("'', null, , apple");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("", "null", null, "apple"));
 	}
 
 	@Test
 	void customEmptyValueAndDefaultNullValue() {
-		CsvSource annotation = csvSource().emptyValue("EMPTY").lines("'', null, , apple").build();
+		var annotation = csvSource().emptyValue("EMPTY").lines("'', null, , apple").build();
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("EMPTY", "null", null, "apple"));
 	}
 
 	@Test
 	void customNullValues() {
-		CsvSource annotation = csvSource().nullValues("N/A", "NIL").lines("apple, , NIL, '', N/A, banana").build();
+		var annotation = csvSource().nullValues("N/A", "NIL").lines("apple, , NIL, '', N/A, banana").build();
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(array("apple", null, null, "", null, "banana"));
 	}
 
 	@Test
 	void convertsEmptyValuesToNullInLinesAfterFirstLine() {
-		CsvSource annotation = csvSource("'', ''", " , ");
+		var annotation = csvSource("'', ''", " , ");
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments).containsExactly(new Object[][] { { "", "" }, { null, null } });
 	}
 
 	@Test
 	void throwsExceptionIfSourceExceedsMaxCharsPerColumnConfig() {
-		CsvSource annotation = csvSource().lines("413").maxCharsPerColumn(2).build();
+		var annotation = csvSource().lines("413").maxCharsPerColumn(2).build();
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThatExceptionOfType(CsvParsingException.class)//
-				.isThrownBy(() -> arguments.toArray())//
+				.isThrownBy(arguments::toArray)//
 				.withMessageStartingWith("Failed to parse CSV input configured via Mock for CsvSource")//
 				.withRootCauseInstanceOf(ArrayIndexOutOfBoundsException.class);
 	}
 
 	@Test
 	void providesArgumentWithDefaultMaxCharsPerColumnConfig() {
-		CsvSource annotation = csvSource().lines("0".repeat(4096)).delimiter(';').build();
+		var annotation = csvSource().lines("0".repeat(4096)).delimiter(';').build();
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments.toArray()).hasSize(1);
 	}
 
 	@Test
 	void throwsExceptionWhenSourceExceedsDefaultMaxCharsPerColumnConfig() {
-		CsvSource annotation = csvSource().lines("0".repeat(4097)).delimiter(';').build();
+		var annotation = csvSource().lines("0".repeat(4097)).delimiter(';').build();
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThatExceptionOfType(CsvParsingException.class)//
-				.isThrownBy(() -> arguments.toArray())//
+				.isThrownBy(arguments::toArray)//
 				.withMessageStartingWith("Failed to parse CSV input configured via Mock for CsvSource")//
 				.withRootCauseInstanceOf(ArrayIndexOutOfBoundsException.class);
 	}
 
 	@Test
 	void providesArgumentsForExceedsSourceWithCustomMaxCharsPerColumnConfig() {
-		CsvSource annotation = csvSource().lines("0".repeat(4097)).delimiter(';').maxCharsPerColumn(4097).build();
+		var annotation = csvSource().lines("0".repeat(4097)).delimiter(';').maxCharsPerColumn(4097).build();
 
-		Stream<Object[]> arguments = provideArguments(annotation);
+		var arguments = provideArguments(annotation);
 
 		assertThat(arguments.toArray()).hasSize(1);
 	}
 
 	@Test
 	void throwsExceptionWhenMaxCharsPerColumnIsNotPositiveNumber() {
-		CsvSource annotation = csvSource().lines("41").delimiter(';').maxCharsPerColumn(-1).build();
+		var annotation = csvSource().lines("41").delimiter(';').maxCharsPerColumn(-1).build();
 
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(() -> provideArguments(annotation))//
@@ -222,7 +222,7 @@ void throwsExceptionWhenMaxCharsPerColumnIsNotPositiveNumber() {
 	}
 
 	private Stream<Object[]> provideArguments(CsvSource annotation) {
-		CsvArgumentsProvider provider = new CsvArgumentsProvider();
+		var provider = new CsvArgumentsProvider();
 		provider.accept(annotation);
 		return provider.provideArguments(null).map(Arguments::get);
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index 92eab62aa0a4..8db64501a74d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -41,52 +41,51 @@ class CsvFileArgumentsProviderTests {
 
 	@Test
 	void providesArgumentsForNewlineAndComma() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("test.csv")//
 				.lineSeparator("\n")//
 				.delimiter(',')//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(annotation, "foo, bar \n baz, qux \n");
+		var arguments = provideArguments(annotation, "foo, bar \n baz, qux \n");
 
 		assertThat(arguments).containsExactly(array("foo", "bar"), array("baz", "qux"));
 	}
 
 	@Test
 	void providesArgumentsForCarriageReturnAndSemicolon() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("test.csv")//
 				.lineSeparator("\r")//
 				.delimiter(';')//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(annotation, "foo; bar \r baz; qux");
+		var arguments = provideArguments(annotation, "foo; bar \r baz; qux");
 
 		assertThat(arguments).containsExactly(array("foo", "bar"), array("baz", "qux"));
 	}
 
 	@Test
 	void providesArgumentsWithStringDelimiter() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("test.csv")//
 				.delimiterString(",")//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(annotation, "foo, bar \n baz, qux \n");
+		var arguments = provideArguments(annotation, "foo, bar \n baz, qux \n");
 
 		assertThat(arguments).containsExactly(array("foo", "bar"), array("baz", "qux"));
 	}
 
 	@Test
 	void throwsExceptionIfBothDelimitersAreSimultaneouslySet() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("test.csv")//
 				.delimiter(',')//
 				.delimiterString(";")//
 				.build();
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> provideArguments(annotation, "foo"));
+		var exception = assertThrows(PreconditionViolationException.class, () -> provideArguments(annotation, "foo"));
 
 		assertThat(exception)//
 				.hasMessageStartingWith("The delimiter and delimiterString attributes cannot be set simultaneously in")//
@@ -95,19 +94,19 @@ void throwsExceptionIfBothDelimitersAreSimultaneouslySet() {
 
 	@Test
 	void ignoresCommentedOutEntries() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("test.csv")//
 				.delimiter(',')//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(annotation, "foo, bar \n#baz, qux");
+		var arguments = provideArguments(annotation, "foo, bar \n#baz, qux");
 
 		assertThat(arguments).containsExactly(array("foo", "bar"));
 	}
 
 	@Test
 	void closesInputStreamForClasspathResource() {
-		AtomicBoolean closed = new AtomicBoolean(false);
+		var closed = new AtomicBoolean(false);
 		InputStream inputStream = new ByteArrayInputStream("foo".getBytes()) {
 
 			@Override
@@ -115,9 +114,9 @@ public void close() {
 				closed.set(true);
 			}
 		};
-		CsvFileSource annotation = csvFileSource().resources("test.csv").build();
+		var annotation = csvFileSource().resources("test.csv").build();
 
-		Stream<Object[]> arguments = provideArguments(inputStream, annotation);
+		var arguments = provideArguments(inputStream, annotation);
 
 		assertThat(arguments.count()).isEqualTo(1);
 		assertThat(closed.get()).describedAs("closed").isTrue();
@@ -125,7 +124,7 @@ public void close() {
 
 	@Test
 	void closesInputStreamForFile(@TempDir Path tempDir) {
-		AtomicBoolean closed = new AtomicBoolean(false);
+		var closed = new AtomicBoolean(false);
 		InputStream inputStream = new ByteArrayInputStream("foo".getBytes()) {
 
 			@Override
@@ -133,10 +132,9 @@ public void close() {
 				closed.set(true);
 			}
 		};
-		CsvFileSource annotation = csvFileSource().files(
-			tempDir.resolve("test.csv").toAbsolutePath().toString()).build();
+		var annotation = csvFileSource().files(tempDir.resolve("test.csv").toAbsolutePath().toString()).build();
 
-		Stream<Object[]> arguments = provideArguments(inputStream, annotation);
+		var arguments = provideArguments(inputStream, annotation);
 
 		assertThat(arguments.count()).isEqualTo(1);
 		assertThat(closed.get()).describedAs("closed").isTrue();
@@ -144,53 +142,53 @@ public void close() {
 
 	@Test
 	void readsFromSingleClasspathResource() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/single-column.csv")//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"), array("baz"), array("qux"), array(""));
 	}
 
 	@Test
 	void readsFromSingleFileWithAbsolutePath(@TempDir Path tempDir) throws Exception {
-		Path csvFile = writeClasspathResourceToFile("/single-column.csv", tempDir.resolve("single-column.csv"));
-		CsvFileSource annotation = csvFileSource()//
+		var csvFile = writeClasspathResourceToFile("/single-column.csv", tempDir.resolve("single-column.csv"));
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.files(csvFile.toAbsolutePath().toString())//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"), array("baz"), array("qux"), array(""));
 	}
 
 	@Test
 	void readsFromClasspathResourcesAndFiles(@TempDir Path tempDir) throws Exception {
-		Path csvFile = writeClasspathResourceToFile("/single-column.csv", tempDir.resolve("single-column.csv"));
-		CsvFileSource annotation = csvFileSource()//
+		var csvFile = writeClasspathResourceToFile("/single-column.csv", tempDir.resolve("single-column.csv"));
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/single-column.csv")//
 				.files(csvFile.toAbsolutePath().toString())//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).hasSize(2 * 5);
 	}
 
 	@Test
 	void readsFromSingleFileWithRelativePath() throws Exception {
-		Path csvFile = writeClasspathResourceToFile("/single-column.csv", Path.of("single-column.csv"));
+		var csvFile = writeClasspathResourceToFile("/single-column.csv", Path.of("single-column.csv"));
 		try {
-			CsvFileSource annotation = csvFileSource()//
+			var annotation = csvFileSource()//
 					.encoding("ISO-8859-1")//
 					.files(csvFile.getFileName().toString())//
 					.build();
 
-			Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+			var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 			assertThat(arguments).containsExactly(array("foo"), array("bar"), array("baz"), array("qux"), array(""));
 		}
@@ -201,64 +199,64 @@ void readsFromSingleFileWithRelativePath() throws Exception {
 
 	@Test
 	void readsFromSingleClasspathResourceWithCustomEmptyValue() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/single-column.csv")//
 				.emptyValue("EMPTY")//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"), array("baz"), array("qux"), array("EMPTY"));
 	}
 
 	@Test
 	void readsFromMultipleClasspathResources() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/single-column.csv", "/single-column.csv")//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).hasSize(10);
 	}
 
 	@Test
 	void readsFromSingleClasspathResourceWithHeaders() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/single-column.csv")//
 				.numLinesToSkip(1)//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).containsExactly(array("bar"), array("baz"), array("qux"), array(""));
 	}
 
 	@Test
 	void readsFromSingleClasspathResourceWithMoreHeadersThanLines() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/single-column.csv")//
 				.numLinesToSkip(10)//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).isEmpty();
 	}
 
 	@Test
 	void readsFromMultipleClasspathResourcesWithHeaders() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/single-column.csv", "/single-column.csv")//
 				.numLinesToSkip(1)//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).containsExactly(array("bar"), array("baz"), array("qux"), array(""), array("bar"),
 			array("baz"), array("qux"), array(""));
@@ -266,11 +264,11 @@ void readsFromMultipleClasspathResourcesWithHeaders() {
 
 	@Test
 	void throwsExceptionForMissingClasspathResource() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("/does-not-exist.csv")//
 				.build();
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 
 		assertThat(exception).hasMessageContaining("Classpath resource [/does-not-exist.csv] does not exist");
@@ -278,11 +276,11 @@ void throwsExceptionForMissingClasspathResource() {
 
 	@Test
 	void throwsExceptionForBlankClasspathResource() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("    ")//
 				.build();
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 
 		assertThat(exception).hasMessageContaining("Classpath resource [    ] must not be null or blank");
@@ -290,11 +288,11 @@ void throwsExceptionForBlankClasspathResource() {
 
 	@Test
 	void throwsExceptionForMissingFile() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.files("does-not-exist.csv")//
 				.build();
 
-		JUnitException exception = assertThrows(JUnitException.class,
+		var exception = assertThrows(JUnitException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 
 		assertThat(exception).hasMessageContaining("File [does-not-exist.csv] could not be read");
@@ -302,11 +300,11 @@ void throwsExceptionForMissingFile() {
 
 	@Test
 	void throwsExceptionForBlankFile() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.files("    ")//
 				.build();
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 
 		assertThat(exception).hasMessageContaining("File [    ] must not be null or blank");
@@ -314,12 +312,12 @@ void throwsExceptionForBlankFile() {
 
 	@Test
 	void throwsExceptionIfResourcesAndFilesAreEmpty() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources()//
 				.files()//
 				.build();
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 
 		assertThat(exception).hasMessageContaining("Resources or files must not be empty");
@@ -327,12 +325,12 @@ void throwsExceptionIfResourcesAndFilesAreEmpty() {
 
 	@Test
 	void throwsExceptionForInvalidCharset() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("Bogus-Charset")//
 				.resources("/bogus-charset.csv")//
 				.build();
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 
 		assertThat(exception)//
@@ -342,11 +340,11 @@ void throwsExceptionForInvalidCharset() {
 
 	@Test
 	void throwsExceptionForInvalidCsvFormat() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("/broken.csv")//
 				.build();
 
-		CsvParsingException exception = assertThrows(CsvParsingException.class,
+		var exception = assertThrows(CsvParsingException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 
 		assertThat(exception)//
@@ -356,59 +354,59 @@ void throwsExceptionForInvalidCsvFormat() {
 
 	@Test
 	void emptyValueIsAnEmptyWithCustomNullValueString() {
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.resources("test.csv")//
 				.lineSeparator("\n")//
 				.delimiter(',')//
 				.nullValues("NIL")//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(annotation, "apple, , NIL, ''\nNIL, NIL, foo, bar");
+		var arguments = provideArguments(annotation, "apple, , NIL, ''\nNIL, NIL, foo, bar");
 
 		assertThat(arguments).containsExactly(array("apple", null, null, "''"), array(null, null, "foo", "bar"));
 	}
 
 	@Test
 	void readsLineFromDefaultMaxCharsFileWithDefaultConfig(@TempDir Path tempDir) throws Exception {
-		Path csvFile = writeClasspathResourceToFile("/default-max-chars.csv", tempDir.resolve("default-max-chars.csv"));
-		CsvFileSource annotation = csvFileSource()//
+		var csvFile = writeClasspathResourceToFile("/default-max-chars.csv", tempDir.resolve("default-max-chars.csv"));
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/default-max-chars.csv")//
 				.files(csvFile.toAbsolutePath().toString())//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).hasSize(2);
 	}
 
 	@Test
 	void readsLineFromExceedsMaxCharsFileWithCustomConfig(@TempDir Path tempDir) throws java.io.IOException {
-		Path csvFile = writeClasspathResourceToFile("/exceeds-default-max-chars.csv",
+		var csvFile = writeClasspathResourceToFile("/exceeds-default-max-chars.csv",
 			tempDir.resolve("exceeds-default-max-chars.csv"));
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/exceeds-default-max-chars.csv")//
 				.maxCharsPerColumn(4097)//
 				.files(csvFile.toAbsolutePath().toString())//
 				.build();
 
-		Stream<Object[]> arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
 
 		assertThat(arguments).hasSize(2);
 	}
 
 	@Test
 	void throwsExceptionWhenMaxCharsPerColumnIsNotPositiveNumber(@TempDir Path tempDir) throws java.io.IOException {
-		Path csvFile = writeClasspathResourceToFile("/exceeds-default-max-chars.csv",
+		var csvFile = writeClasspathResourceToFile("/exceeds-default-max-chars.csv",
 			tempDir.resolve("exceeds-default-max-chars.csv"));
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/exceeds-default-max-chars.csv")//
 				.maxCharsPerColumn(-1).files(csvFile.toAbsolutePath().toString())//
 				.build();
 
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, //
+		var exception = assertThrows(PreconditionViolationException.class, //
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation));
 
 		assertThat(exception)//
@@ -417,15 +415,15 @@ void throwsExceptionWhenMaxCharsPerColumnIsNotPositiveNumber(@TempDir Path tempD
 
 	@Test
 	void throwsExceptionForExceedsMaxCharsFileWithDefaultConfig(@TempDir Path tempDir) throws java.io.IOException {
-		Path csvFile = writeClasspathResourceToFile("/exceeds-default-max-chars.csv",
+		var csvFile = writeClasspathResourceToFile("/exceeds-default-max-chars.csv",
 			tempDir.resolve("exceeds-default-max-chars.csv"));
-		CsvFileSource annotation = csvFileSource()//
+		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
 				.resources("/exceeds-default-max-chars.csv")//
 				.files(csvFile.toAbsolutePath().toString())//
 				.build();
 
-		CsvParsingException exception = assertThrows(CsvParsingException.class,
+		var exception = assertThrows(CsvParsingException.class,
 			() -> provideArguments(new CsvFileArgumentsProvider(), annotation).toArray());
 
 		assertThat(exception)//
@@ -438,7 +436,7 @@ private Stream<Object[]> provideArguments(CsvFileSource annotation, String conte
 	}
 
 	private Stream<Object[]> provideArguments(InputStream inputStream, CsvFileSource annotation) {
-		CsvFileArgumentsProvider provider = new CsvFileArgumentsProvider(new InputStreamProvider() {
+		var provider = new CsvFileArgumentsProvider(new InputStreamProvider() {
 			@Override
 			public InputStream openClasspathResource(Class<?> baseClass, String path) {
 				assertThat(path).isEqualTo(annotation.resources()[0]);
@@ -456,7 +454,7 @@ public InputStream openFile(String path) {
 
 	private Stream<Object[]> provideArguments(CsvFileArgumentsProvider provider, CsvFileSource annotation) {
 		provider.accept(annotation);
-		ExtensionContext context = mock(ExtensionContext.class);
+		var context = mock(ExtensionContext.class);
 		when(context.getTestClass()).thenReturn(Optional.of(CsvFileArgumentsProviderTests.class));
 		doCallRealMethod().when(context).getRequiredTestClass();
 		return provider.provideArguments(context).map(Arguments::get);
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
index 25518e08f5b5..67759795e218 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
@@ -35,21 +35,21 @@ class EnumArgumentsProviderTests {
 
 	@Test
 	void providesAllEnumConstants() {
-		Stream<Object[]> arguments = provideArguments(EnumWithTwoConstants.class);
+		var arguments = provideArguments(EnumWithTwoConstants.class);
 
 		assertThat(arguments).containsExactly(new Object[] { FOO }, new Object[] { BAR });
 	}
 
 	@Test
 	void provideSingleEnumConstant() {
-		Stream<Object[]> arguments = provideArguments(EnumWithTwoConstants.class, "FOO");
+		var arguments = provideArguments(EnumWithTwoConstants.class, "FOO");
 
 		assertThat(arguments).containsExactly(new Object[] { FOO });
 	}
 
 	@Test
 	void provideAllEnumConstantsWithNamingAll() {
-		Stream<Object[]> arguments = provideArguments(EnumWithTwoConstants.class, "FOO", "BAR");
+		var arguments = provideArguments(EnumWithTwoConstants.class, "FOO", "BAR");
 
 		assertThat(arguments).containsExactly(new Object[] { FOO }, new Object[] { BAR });
 	}
@@ -80,7 +80,7 @@ void providesEnumConstantsBasedOnTestMethod() throws Exception {
 		when(extensionContext.getRequiredTestMethod()).thenReturn(
 			TestCase.class.getDeclaredMethod("methodWithCorrectParameter", EnumWithTwoConstants.class));
 
-		Stream<Object[]> arguments = provideArguments(NullEnum.class);
+		var arguments = provideArguments(NullEnum.class);
 
 		assertThat(arguments).containsExactly(new Object[] { FOO }, new Object[] { BAR });
 	}
@@ -125,14 +125,14 @@ private <E extends Enum<E>> Stream<Object[]> provideArguments(Class<E> enumClass
 	}
 
 	private <E extends Enum<E>> Stream<Object[]> provideArguments(Class<E> enumClass, Mode mode, String... names) {
-		EnumSource annotation = mock(EnumSource.class);
+		var annotation = mock(EnumSource.class);
 		when(annotation.value()).thenAnswer(invocation -> enumClass);
 		when(annotation.mode()).thenAnswer(invocation -> mode);
 		when(annotation.names()).thenAnswer(invocation -> names);
 		when(annotation.toString()).thenReturn(String.format("@EnumSource(value=%s.class, mode=%s, names=%s)",
 			enumClass.getSimpleName(), mode, Arrays.toString(names)));
 
-		EnumArgumentsProvider provider = new EnumArgumentsProvider();
+		var provider = new EnumArgumentsProvider();
 		provider.accept(annotation);
 		return provider.provideArguments(extensionContext).map(Arguments::get);
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
index 91d74e036df4..48e4c559f8e4 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
@@ -22,10 +22,7 @@
 import static org.junit.jupiter.params.provider.EnumSourceTests.EnumWithThreeConstants.BAZ;
 import static org.junit.jupiter.params.provider.EnumSourceTests.EnumWithThreeConstants.FOO;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Function;
 
@@ -41,66 +38,66 @@ void includeNamesWithAll() {
 		assertAll("include names with all", //
 			() -> assertTrue(INCLUDE.select(FOO, allOf(EnumWithThreeConstants::name))),
 			() -> assertTrue(INCLUDE.select(BAR, allOf(EnumWithThreeConstants::name))),
-			() -> assertTrue(INCLUDE.select(BAZ, allOf(EnumWithThreeConstants::name))));
+			() -> assertTrue(INCLUDE.select(BAZ, allOf(EnumWithThreeConstants::name))) //
+		);
 	}
 
 	@Test
 	void includeNamesWithSingleton() {
 		assertAll("include names with singleton", //
-			() -> assertTrue(INCLUDE.select(FOO, FOO.singleton())),
-			() -> assertTrue(INCLUDE.select(BAR, BAR.singleton())),
-			() -> assertTrue(INCLUDE.select(BAZ, BAZ.singleton())));
+			() -> assertTrue(INCLUDE.select(FOO, Set.of(FOO.name()))),
+			() -> assertTrue(INCLUDE.select(BAR, Set.of(BAR.name()))),
+			() -> assertTrue(INCLUDE.select(BAZ, Set.of(BAZ.name()))) //
+		);
 		assertAll("include names with singleton complement", //
-			() -> assertFalse(INCLUDE.select(BAR, FOO.singleton())),
-			() -> assertFalse(INCLUDE.select(BAZ, FOO.singleton())));
+			() -> assertFalse(INCLUDE.select(BAR, Set.of(FOO.name()))),
+			() -> assertFalse(INCLUDE.select(BAZ, Set.of(FOO.name()))) //
+		);
 	}
 
 	@Test
 	void excludeNames() {
 		assertAll("exclude name with none excluded", //
-			() -> assertTrue(EXCLUDE.select(FOO, Collections.emptySet())),
-			() -> assertTrue(EXCLUDE.select(BAR, Collections.emptySet())),
-			() -> assertTrue(EXCLUDE.select(BAZ, Collections.emptySet())));
+			() -> assertTrue(EXCLUDE.select(FOO, Set.of())), //
+			() -> assertTrue(EXCLUDE.select(BAR, Set.of())), //
+			() -> assertTrue(EXCLUDE.select(BAZ, Set.of())) //
+		);
 		assertAll("exclude name with FOO excluded", //
-			() -> assertFalse(EXCLUDE.select(FOO, FOO.singleton())),
-			() -> assertTrue(EXCLUDE.select(BAR, FOO.singleton())),
-			() -> assertTrue(EXCLUDE.select(BAZ, FOO.singleton())));
+			() -> assertFalse(EXCLUDE.select(FOO, Set.of(FOO.name()))),
+			() -> assertTrue(EXCLUDE.select(BAR, Set.of(FOO.name()))),
+			() -> assertTrue(EXCLUDE.select(BAZ, Set.of(FOO.name()))) //
+		);
 	}
 
 	@Test
 	void matchesAll() {
 		assertAll("matches all", //
-			() -> assertTrue(MATCH_ALL.select(FOO, Collections.singleton("F.."))),
-			() -> assertTrue(MATCH_ALL.select(BAR, Collections.singleton("B.."))),
-			() -> assertTrue(MATCH_ALL.select(BAZ, Collections.singleton("B.."))));
+			() -> assertTrue(MATCH_ALL.select(FOO, Set.of("F.."))),
+			() -> assertTrue(MATCH_ALL.select(BAR, Set.of("B.."))),
+			() -> assertTrue(MATCH_ALL.select(BAZ, Set.of("B.."))) //
+		);
 		assertAll("matches all fails if not all match", //
-			() -> assertFalse(MATCH_ALL.select(FOO, set("F..", "."))),
-			() -> assertFalse(MATCH_ALL.select(BAR, set("B..", "."))),
-			() -> assertFalse(MATCH_ALL.select(BAZ, set("B..", "."))));
+			() -> assertFalse(MATCH_ALL.select(FOO, Set.of("F..", "."))),
+			() -> assertFalse(MATCH_ALL.select(BAR, Set.of("B..", "."))),
+			() -> assertFalse(MATCH_ALL.select(BAZ, Set.of("B..", "."))) //
+		);
 	}
 
 	@Test
 	void matchesAny() {
 		assertAll("matches any", //
-			() -> assertTrue(MATCH_ANY.select(FOO, set("B..", "^F.*"))),
-			() -> assertTrue(MATCH_ANY.select(BAR, set("B", "B.", "B.."))),
-			() -> assertTrue(MATCH_ANY.select(BAZ, set("^.+[zZ]$"))));
+			() -> assertTrue(MATCH_ANY.select(FOO, Set.of("B..", "^F.*"))),
+			() -> assertTrue(MATCH_ANY.select(BAR, Set.of("B", "B.", "B.."))),
+			() -> assertTrue(MATCH_ANY.select(BAZ, Set.of("^.+[zZ]$"))));
 	}
 
 	enum EnumWithThreeConstants {
 		FOO, BAR, BAZ;
 
-		Set<String> singleton() {
-			return Collections.singleton(name());
-		}
 	}
 
 	static Set<String> allOf(Function<EnumWithThreeConstants, String> mapper) {
 		return EnumSet.allOf(EnumWithThreeConstants.class).stream().map(mapper).collect(toSet());
 	}
 
-	static Set<String> set(String... strings) {
-		return new HashSet<>(Arrays.asList(strings));
-	}
-
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 39e1b68c457a..c254fbb8f440 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -84,8 +84,8 @@ void providesArgumentsUsingStreamOfIntArrays() {
 		var arguments = provideArguments("intArrayStreamProvider");
 
 		assertThat(arguments).containsExactly( //
-			array(new int[] { 1, 2 }), //
-			array(new int[] { 3, 4 }) //
+			new Object[] { new int[] { 1, 2 } }, //
+			new Object[] { new int[] { 3, 4 } } //
 		);
 	}
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index f9bb7412c3a7..c17dd52462ea 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -90,7 +90,7 @@ MockCsvSourceBuilder lines(String... lines) {
 
 		@Override
 		CsvSource build() {
-			CsvSource annotation = mock(CsvSource.class);
+			var annotation = mock(CsvSource.class);
 
 			// Common
 			when(annotation.delimiter()).thenReturn(super.delimiter);
@@ -147,7 +147,7 @@ MockCsvFileSourceBuilder numLinesToSkip(int numLinesToSkip) {
 
 		@Override
 		CsvFileSource build() {
-			CsvFileSource annotation = mock(CsvFileSource.class);
+			var annotation = mock(CsvFileSource.class);
 
 			// Common
 			when(annotation.delimiter()).thenReturn(super.delimiter);
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
index 3c22826e6e13..cf9c789f2a94 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
@@ -27,7 +27,7 @@ class ValueArgumentsProviderTests {
 
 	@Test
 	void multipleInputsAreNotAllowed() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(new short[1], new byte[0], new int[1], new long[0], new float[0], new double[0],
 				new char[0], new boolean[0], new String[0], new Class<?>[0]));
 
@@ -37,7 +37,7 @@ void multipleInputsAreNotAllowed() {
 
 	@Test
 	void onlyEmptyInputsAreNotAllowed() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0], new double[0],
 				new char[0], new boolean[0], new String[0], new Class<?>[0]));
 
@@ -50,8 +50,8 @@ void onlyEmptyInputsAreNotAllowed() {
 	 */
 	@Test
 	void providesShorts() {
-		Stream<Object[]> arguments = provideArguments(new short[] { 23, 42 }, new byte[0], new int[0], new long[0],
-			new float[0], new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
+		var arguments = provideArguments(new short[] { 23, 42 }, new byte[0], new int[0], new long[0], new float[0],
+			new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array((short) 23), array((short) 42));
 	}
@@ -61,24 +61,24 @@ void providesShorts() {
 	 */
 	@Test
 	void providesBytes() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[] { 23, 42 }, new int[0], new long[0],
-			new float[0], new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
+		var arguments = provideArguments(new short[0], new byte[] { 23, 42 }, new int[0], new long[0], new float[0],
+			new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array((byte) 23), array((byte) 42));
 	}
 
 	@Test
 	void providesInts() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[0], new int[] { 23, 42 }, new long[0],
-			new float[0], new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
+		var arguments = provideArguments(new short[0], new byte[0], new int[] { 23, 42 }, new long[0], new float[0],
+			new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array(23), array(42));
 	}
 
 	@Test
 	void providesLongs() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[0], new int[0], new long[] { 23, 42 },
-			new float[0], new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
+		var arguments = provideArguments(new short[0], new byte[0], new int[0], new long[] { 23, 42 }, new float[0],
+			new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array(23L), array(42L));
 	}
@@ -88,7 +88,7 @@ void providesLongs() {
 	 */
 	@Test
 	void providesFloats() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0],
+		var arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0],
 			new float[] { 23.32F, 42.24F }, new double[0], new char[0], new boolean[0], new String[0], new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array(23.32F), array(42.24F));
@@ -96,7 +96,7 @@ void providesFloats() {
 
 	@Test
 	void providesDoubles() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
+		var arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
 			new double[] { 23.32, 42.24 }, new char[0], new boolean[0], new String[0], new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array(23.32), array(42.24));
@@ -107,7 +107,7 @@ void providesDoubles() {
 	 */
 	@Test
 	void providesChars() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
+		var arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
 			new double[0], new char[] { 'a', 'b', 'c' }, new boolean[0], new String[0], new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array('a'), array('b'), array('c'));
@@ -118,7 +118,7 @@ void providesChars() {
 	 */
 	@Test
 	void providesBooleans() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
+		var arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
 			new double[0], new char[0], new boolean[] { true, false }, new String[0], new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array(true), array(false));
@@ -126,7 +126,7 @@ void providesBooleans() {
 
 	@Test
 	void providesStrings() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
+		var arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
 			new double[0], new char[0], new boolean[0], new String[] { "foo", "bar" }, new Class<?>[0]);
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"));
@@ -137,7 +137,7 @@ void providesStrings() {
 	 */
 	@Test
 	void providesClasses() {
-		Stream<Object[]> arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
+		var arguments = provideArguments(new short[0], new byte[0], new int[0], new long[0], new float[0],
 			new double[0], new char[0], new boolean[0], new String[0], new Class<?>[] { Integer.class, getClass() });
 
 		assertThat(arguments).containsExactly(array(Integer.class), array(getClass()));
@@ -146,7 +146,7 @@ void providesClasses() {
 	private static Stream<Object[]> provideArguments(short[] shorts, byte[] bytes, int[] ints, long[] longs,
 			float[] floats, double[] doubles, char[] chars, boolean[] booleans, String[] strings, Class<?>[] classes) {
 
-		ValueSource annotation = mock(ValueSource.class);
+		var annotation = mock(ValueSource.class);
 		when(annotation.shorts()).thenReturn(shorts);
 		when(annotation.bytes()).thenReturn(bytes);
 		when(annotation.ints()).thenReturn(ints);
@@ -158,7 +158,7 @@ private static Stream<Object[]> provideArguments(short[] shorts, byte[] bytes, i
 		when(annotation.strings()).thenReturn(strings);
 		when(annotation.classes()).thenReturn(classes);
 
-		ValueArgumentsProvider provider = new ValueArgumentsProvider();
+		var provider = new ValueArgumentsProvider();
 		provider.accept(annotation);
 		return provider.provideArguments(null).map(Arguments::get);
 	}

From 1c8da0d21ee5a70c1766c5b9c00985d5e64b8ad5 Mon Sep 17 00:00:00 2001
From: Julian Sedding <julian.sedding@code-distillery.net>
Date: Sun, 25 Oct 2020 06:07:22 +0100
Subject: [PATCH 0061/1433] Ensure MANIFEST.MF is the first JAR entry

Prior to this commit, due to repacking JAR files in order to
support reproducible builds, the `MANIFEST.MF` file entry
sorted alphabetically causing issues with tools using
`JarInputStream` to read the contents of the repackaged
JAR files.

This commit always sort `META-INF/` and `META-INF/MANIFEST.MF`
entries first.

Resolves #2438
---
 .../kotlin/java-repackage-jars.gradle.kts     | 15 +++++--
 .../tests/JarContainsManifestFirstTests.java  | 43 +++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java

diff --git a/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts b/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts
index e36bea40b0fa..507255835218 100644
--- a/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts
@@ -1,5 +1,3 @@
-import java.util.Calendar
-import java.util.GregorianCalendar
 import java.util.jar.JarEntry
 import java.util.jar.JarFile
 import java.util.jar.JarOutputStream
@@ -19,10 +17,21 @@ afterEvaluate {
 			val newJarStream = JarOutputStream(os)
 			val oldJar = JarFile(originalOutput)
 
+			fun sortAlwaysFirst(name: String): Comparator<JarEntry> =
+				Comparator { a, b ->
+					when {
+						a.name == name -> -1
+						b.name == name -> 1
+						else -> 0
+					}
+				}
+
 			oldJar.entries()
 					.toList()
 					.distinctBy { it.name }
-					.sortedBy { it.name }
+					.sortedWith(sortAlwaysFirst("META-INF/")
+							.then(sortAlwaysFirst("META-INF/MANIFEST.MF"))
+							.thenBy { it.name })
 					.forEach { entry ->
 						val jarEntry = JarEntry(entry.name)
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
new file mode 100644
index 000000000000..dc481de1630a
--- /dev/null
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package platform.tooling.support.tests;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static platform.tooling.support.Helper.createJarPath;
+
+import java.io.FileInputStream;
+import java.nio.file.Files;
+import java.util.jar.JarInputStream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * @since 1.8
+ */
+class JarContainsManifestFirstTests {
+
+	@ParameterizedTest
+	@MethodSource("platform.tooling.support.Helper#loadModuleDirectoryNames")
+	void manifestFirst(String module) throws Exception {
+		var modulePath = createJarPath(module);
+
+		if (Files.notExists(modulePath)) {
+			fail("No such file: " + modulePath);
+		}
+
+		// JarInputStream expects the META-INF/MANIFEST.MF to be at the start of the JAR archive
+		try (final JarInputStream jarInputStream = new JarInputStream(new FileInputStream(modulePath.toFile()))) {
+			assertNotNull(jarInputStream.getManifest(), "MANIFEST.MF should be available via JarInputStream");
+		}
+	}
+}

From 575f36dae7f04ffc524c20c1cedbb2ea844b92e2 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Sun, 25 Oct 2020 08:47:53 +0100
Subject: [PATCH 0062/1433] Upgrade JitPack configuration to JDK 15

---
 .jitpack.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.jitpack.yml b/.jitpack.yml
index 72eb09e6aa7f..39c04bae497c 100644
--- a/.jitpack.yml
+++ b/.jitpack.yml
@@ -1,5 +1,5 @@
 install:
-  - wget https://github.com/sormuras/bach/raw/HEAD/install-jdk.sh
-  - source ./install-jdk.sh --feature 11
+  - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
+  - source ./install-jdk.sh --feature 15
   - ./gradlew --version
   - ./gradlew publishToMavenLocal -x test

From f4cba4cd8dc722c9d643b752a742df53e8da2b20 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 25 Oct 2020 13:47:07 +0100
Subject: [PATCH 0063/1433] Add 5.7.1 release notes

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.7.1.adoc    | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 85932bdfc78f..1cd60e14ee5a 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -18,4 +18,6 @@ include::{includedir}/link-attributes.adoc[]
 
 include::{basedir}/release-notes-5.8.0-M1.adoc[]
 
+include::{basedir}/release-notes-5.7.1.adoc[]
+
 include::{basedir}/release-notes-5.7.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
new file mode 100644
index 000000000000..d95bd1ba792f
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.7.1]]
+== 5.7.1
+
+*Date of Release:* ❓
+
+*Scope:* Bug fixes since 5.7.0
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/52?closed=1+[5.7.1] milestone page in the JUnit repository on
+GitHub.
+
+
+[[release-notes-5.7.1-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.7.1-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.7.1-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From 9c9085033bf45caf704c7653bfe5d1903f072455 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 25 Oct 2020 13:44:48 +0100
Subject: [PATCH 0064/1433] Only call creators that throw exceptions once

Prior to this commit, creator functions passed to ExtensionContext.Store
were called repeatedly if the first invocation threw an exception. Now,
they are only called once and the exception will be rethrown whenever
the value stored for that key is read. However, the exception will not
be rethrown when closing the store because only successfully created
`CloseableResources` can be closed.

Resolves #2455.
---
 .../release-notes/release-notes-5.7.1.adoc    |  3 +-
 .../execution/ExtensionValuesStore.java       | 48 +++++++++++++++----
 .../execution/ExtensionContextStoreTests.java | 19 ++++++++
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index d95bd1ba792f..23325f5342a4 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -31,7 +31,8 @@ GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Creator functions passed to `ExtensionContext.Store.getOrComputeIfAbsent()` are now only
+  called once even if they throw an exception.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
index b7df116a62f4..cc1c1d899b77 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
@@ -62,7 +62,7 @@ public ExtensionValuesStore(ExtensionValuesStore parentStore) {
 	public void closeAllStoredCloseableValues() {
 		ThrowableCollector throwableCollector = createThrowableCollector();
 		storedValues.values().stream() //
-				.filter(storedValue -> storedValue.evaluate() instanceof CloseableResource) //
+				.filter(storedValue -> storedValue.evaluateSafely() instanceof CloseableResource) //
 				.sorted(REVERSE_INSERT_ORDER) //
 				.map(storedValue -> (CloseableResource) storedValue.evaluate()) //
 				.forEach(resource -> throwableCollector.execute(resource::close));
@@ -178,6 +178,15 @@ public StoredValue(int order, Supplier<Object> supplier) {
 			this.supplier = supplier;
 		}
 
+		private Object evaluateSafely() {
+			try {
+				return evaluate();
+			}
+			catch (RuntimeException e) {
+				return null;
+			}
+		}
+
 		private Object evaluate() {
 			return supplier.get();
 		}
@@ -199,19 +208,38 @@ private MemoizingSupplier(Supplier<Object> delegate) {
 		@Override
 		public Object get() {
 			if (value == NO_VALUE_SET) {
-				lock.lock();
-				try {
-					if (value == NO_VALUE_SET) {
-						value = delegate.get();
-					}
-				}
-				finally {
-					lock.unlock();
-				}
+				computeValue();
+			}
+			if (value instanceof Failure) {
+				throw ((Failure) value).exception;
 			}
 			return value;
 		}
 
+		private void computeValue() {
+			lock.lock();
+			try {
+				if (value == NO_VALUE_SET) {
+					value = delegate.get();
+				}
+			}
+			catch (RuntimeException e) {
+				value = new Failure(e);
+			}
+			finally {
+				lock.unlock();
+			}
+		}
+
+		private static class Failure {
+
+			private final RuntimeException exception;
+
+			public Failure(RuntimeException exception) {
+				this.exception = exception;
+			}
+		}
+
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
index a848b4039650..b0bb8299e402 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
@@ -11,8 +11,12 @@
 package org.junit.jupiter.engine.execution;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
@@ -68,4 +72,19 @@ void getOrDefaultWithValueInParentStore() {
 		assertThat(store.getOrDefault(KEY, String.class, VALUE)).isEqualTo(VALUE);
 	}
 
+	@Test
+	void getOrComputeIfAbsentWithFailingCreator() {
+		var invocations = new AtomicInteger();
+
+		var e1 = assertThrows(RuntimeException.class, () -> store.getOrComputeIfAbsent(KEY, __ -> {
+			invocations.incrementAndGet();
+			throw new RuntimeException();
+		}));
+		var e2 = assertThrows(RuntimeException.class, () -> store.get(KEY));
+		assertSame(e1, e2);
+
+		assertDoesNotThrow(localStore::closeAllStoredCloseableValues);
+		assertThat(invocations).hasValue(1);
+	}
+
 }

From 2666f74aa5e2ec1305235ed0c8b17d2bd4aa7347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= <loikeseke@gmail.com>
Date: Sun, 25 Oct 2020 17:22:43 +0100
Subject: [PATCH 0065/1433] Expose DynamicTest executable to
 InvocationInterceptors (#2445)

Allow dynamic test invocation interceptors to access the dynamic test
executable.

Resolves #2399.
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  4 +-
 .../DynamicTestInvocationContext.java         | 41 +++++++++++++++++++
 .../api/extension/InvocationInterceptor.java  | 21 ++++++++++
 .../descriptor/DynamicTestTestDescriptor.java |  6 ++-
 .../ExtensionComposabilityTests.java          |  1 +
 .../extension/InvocationInterceptorTests.java |  6 ++-
 6 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index baeae7979485..39f7d951b9c8 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -21,7 +21,9 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , ExtensionContext)` has been deprecated in favor of
+  `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , DynamicTestInvocationContext, ExtensionContext)` that
+  allows to access the dynamic test executable via `DynamicTestInvocationContext.getExecutable()`.
 
 ==== New Features and Improvements
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
new file mode 100644
index 000000000000..99f6bb1b4568
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.extension;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+import org.junit.jupiter.api.function.Executable;
+
+/**
+ * {@code DynamicTestInvocationContext} represents the <em>context</em> of a
+ * single invocation of a {@linkplain org.junit.jupiter.api.DynamicTest test}.
+ *
+ * @since 5.8
+ * @see org.junit.jupiter.api.DynamicTest
+ */
+@API(status = EXPERIMENTAL, since = "5.8")
+public class DynamicTestInvocationContext {
+	private Executable executable;
+
+	public DynamicTestInvocationContext(Executable executable) {
+		this.executable = executable;
+	}
+
+	/**
+	 * Get the {@linkplain Executable} of this dynamic test invocation.
+	 *
+	 * @return the executable of the dynamic test invocation, never null.
+	 */
+	public Executable getExecutable() {
+		return executable;
+	}
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
index d98131bed6d4..64f771368701 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api.extension;
 
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
 import java.lang.reflect.Constructor;
@@ -156,11 +157,31 @@ default void interceptTestTemplateMethod(Invocation<Void> invocation,
 	 * {@code null}
 	 * @param extensionContext the current extension context; never {@code null}
 	 * @throws Throwable in case of failures
+	 * @deprecated use {@link #interceptDynamicTest(Invocation, DynamicTestInvocationContext, ExtensionContext)} instead
 	 */
+	@Deprecated
+	@API(status = DEPRECATED, since = "5.8")
 	default void interceptDynamicTest(Invocation<Void> invocation, ExtensionContext extensionContext) throws Throwable {
 		invocation.proceed();
 	}
 
+	/**
+	 * Intercept the invocation of a {@link DynamicTest}.
+	 *
+	 * @param invocation the invocation that is being intercepted; never
+	 * {@code null}
+	 * @param invocationContext the context of the invocation that is being
+	 * intercepted; never {@code null}
+	 * @param extensionContext the current extension context; never {@code null}
+	 * @throws Throwable in case of failures
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	default void interceptDynamicTest(Invocation<Void> invocation, DynamicTestInvocationContext invocationContext,
+			ExtensionContext extensionContext) throws Throwable {
+		// by default call the old interceptDynamicTest(Invocation, ExtensionContext) method so that existing extensions still work
+		interceptDynamicTest(invocation, extensionContext);
+	}
+
 	/**
 	 * Intercept the invocation of an {@link AfterEach @AfterEach} method.
 	 *
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
index b31219c92abe..a0d785d90d93 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.engine.descriptor;
 
 import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.extension.DynamicTestInvocationContext;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.function.Executable;
@@ -52,10 +53,13 @@ public JupiterEngineExecutionContext execute(JupiterEngineExecutionContext conte
 			dynamicTest.getExecutable().execute();
 			return null;
 		};
+		DynamicTestInvocationContext dynamicTestInvocationContext = new DynamicTestInvocationContext(
+			dynamicTest.getExecutable());
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ExtensionRegistry extensionRegistry = context.getExtensionRegistry();
 		interceptorChain.invoke(invocation, extensionRegistry, InterceptorCall.ofVoid(
-			(interceptor, wrappedInvocation) -> interceptor.interceptDynamicTest(wrappedInvocation, extensionContext)));
+			(interceptor, wrappedInvocation) -> interceptor.interceptDynamicTest(wrappedInvocation,
+				dynamicTestInvocationContext, extensionContext)));
 		return context;
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
index d9751a29b903..2ef8886f4816 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
@@ -60,6 +60,7 @@ void ensureJupiterExtensionApisAreComposable() {
 
 		List<String> expectedMethodNames = expectedMethods.stream()
 				.map(Method::getName)
+				.distinct()
 				.sorted()
 				.collect(toList());
 		// @formatter:on
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
index 974ece32ad63..880681c4bcae 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
@@ -35,6 +35,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.TestReporter;
+import org.junit.jupiter.api.extension.DynamicTestInvocationContext;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -287,8 +288,9 @@ public <T> T interceptTestFactoryMethod(Invocation<T> invocation,
 		}
 
 		@Override
-		public void interceptDynamicTest(Invocation<Void> invocation, ExtensionContext extensionContext)
-				throws Throwable {
+		public void interceptDynamicTest(Invocation<Void> invocation, DynamicTestInvocationContext invocationContext,
+				ExtensionContext extensionContext) throws Throwable {
+			assertThat(invocationContext.getExecutable()).isNotNull();
 			assertThat(extensionContext.getUniqueId()).isNotBlank();
 			assertThat(extensionContext.getElement()).isEmpty();
 			assertThat(extensionContext.getParent().flatMap(ExtensionContext::getTestMethod)).contains(

From 6525e176bc53ddc9d6f8471376b5faf1569e3192 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 26 Oct 2020 07:52:57 +0100
Subject: [PATCH 0066/1433] Improve Javadoc of interceptTestFactoryMethod

Mention RepeatedTest and ParameterizedTest as examples of TestTemplate
methods.

Related issue: #2338
---
 .../junit/jupiter/api/extension/InvocationInterceptor.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
index 64f771368701..31ac35535705 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
@@ -119,7 +119,9 @@ default void interceptTestMethod(Invocation<Void> invocation, ReflectiveInvocati
 	}
 
 	/**
-	 * Intercept the invocation of a {@link TestFactory @TestFactory} method.
+	 * Intercept the invocation of a {@link TestFactory @TestFactory} method,
+	 * such as a {@link org.junit.jupiter.api.RepeatedTest @RepeatedTest} or
+	 * {@code @ParameterizedTest} method.
 	 *
 	 * @param invocation the invocation that is being intercepted; never
 	 * {@code null}

From a5e0c2bc7d46da10e31b58fb888d0aa026bdd7e9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 25 Oct 2020 10:26:15 +0100
Subject: [PATCH 0067/1433] Upgrade to bnd 5.2.0

---
 buildSrc/build.gradle.kts | 2 +-
 gradle.properties         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 679ce910df40..264c69ea5c3d 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0")
-	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2")
+	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0")
 	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.1.8")
 }
diff --git a/gradle.properties b/gradle.properties
index 014e0f3ad274..87b2b6f5241a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -43,7 +43,7 @@ jacoco.version=0.8.6
 jmh.version=1.25
 ktlint.version=0.35.0
 surefire.version=2.22.2
-bnd.version=5.1.2
+bnd.version=5.2.0
 
 # Plugins
 gradle.enterprise.plugin.version=3.4.1

From 66d08f373e54e83f64337e35ef251c318a4dd4bd Mon Sep 17 00:00:00 2001
From: BJ Hargrave <bj@bjhargrave.com>
Date: Mon, 26 Oct 2020 09:52:02 -0400
Subject: [PATCH 0068/1433] osgi: Explicitly set the Bundle-SymbolicName for
 artifacts

Bnd 5.2.0 changed to use the task's archiveClassifier property, if set,
in the default value for Bundle-SymbolicName. The current build can use
an "all" classifier which results in an incorrect Bundle-SymbolicName.
So we must set the desired Bundle-SymbolicName rather than rely on the
default.

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
---
 buildSrc/src/main/kotlin/osgi-conventions.gradle.kts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index 8b8f1705dc7f..1d2e815d63fe 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -18,6 +18,11 @@ tasks.withType<Jar>().matching {
 	// We've generalized these so that they are widely applicable limiting
 	// module configurations to special cases.
 	btc.setBnd("""
+			# Set the Bundle-SymbolicName to the archiveBaseName.
+			# We don't use the archiveClassifier which Bnd will use
+			# in the default Bundle-SymbolicName value.
+			Bundle-SymbolicName: ${'$'}{task.archiveBaseName}
+
 			# These are the general rules for package imports.
 			Import-Package: \
 				!org.apiguardian.api,\

From cd19957e4791f3e4b4ea33b6070a9b0e9f223474 Mon Sep 17 00:00:00 2001
From: BJ Hargrave <bj@bjhargrave.com>
Date: Mon, 26 Oct 2020 09:48:52 -0400
Subject: [PATCH 0069/1433] osgi: Use jar task's archiveVersion for the package
 exports

We change to late-bind the export package version to use the jar task's
archiveVersion property instead of early binding to the project's
version property. This is more correct and allows the task control
over the version.

We also elide any SNAPSHOT qualifier from the version.

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
---
 buildSrc/src/main/kotlin/osgi-conventions.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index 1d2e815d63fe..da7000dd5989 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -52,7 +52,7 @@ tasks.withType<Jar>().matching {
 
 			# Instruct the APIGuardianAnnotations how to operate.
 			# See https://bnd.bndtools.org/instructions/export-apiguardian.html
-			-export-apiguardian: *;version=${project.version}
+			-export-apiguardian: *;version=${'$'}{versionmask;===;${'$'}{version_cleanup;${'$'}{task.archiveVersion}}}
 		""")
 
 	// Add the convention to the jar task

From a6115d835127c71288dd0989d7d9f896f8f08395 Mon Sep 17 00:00:00 2001
From: BJ Hargrave <bj@bjhargrave.com>
Date: Mon, 26 Oct 2020 17:47:25 -0400
Subject: [PATCH 0070/1433] osgi: Use Bnd macro processing to avoid gradle
 afterEvaluate

We use late-binding to get the project description via Bnd's macro
support instead of having to use afterEvaluate to early-bind to the
project description in the gradle script.

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
---
 buildSrc/src/main/kotlin/osgi-conventions.gradle.kts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index da7000dd5989..00570e03379b 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -23,6 +23,9 @@ tasks.withType<Jar>().matching {
 			# in the default Bundle-SymbolicName value.
 			Bundle-SymbolicName: ${'$'}{task.archiveBaseName}
 
+			# Set the Bundle-Name from the project description
+			Bundle-Name: ${'$'}{project.description}
+
 			# These are the general rules for package imports.
 			Import-Package: \
 				!org.apiguardian.api,\
@@ -106,12 +109,3 @@ val verifyOSGi by tasks.registering(Resolve::class) {
 tasks.check {
 	dependsOn(verifyOSGi)
 }
-
-// The ${project.description}, for some odd reason, is only available
-// after evaluation.
-afterEvaluate {
-	tasks.withType<Jar>().configureEach {
-		convention.findPlugin(BundleTaskConvention::class.java)
-				?.bnd("Bundle-Name: ${project.description}")
-	}
-}

From 296dec012c94758c864fdba21f58fa7169b26add Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 29 Oct 2020 09:28:48 +0100
Subject: [PATCH 0071/1433] Upgrade Gradle Enterprise plugin to 3.5

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 87b2b6f5241a..c2503f2e7e58 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -46,7 +46,7 @@ surefire.version=2.22.2
 bnd.version=5.2.0
 
 # Plugins
-gradle.enterprise.plugin.version=3.4.1
+gradle.enterprise.plugin.version=3.5
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.29.0
 spotless.plugin.version=5.6.1

From fa6b8fe8805a13b905ada9598e6ff0157d0ebc06 Mon Sep 17 00:00:00 2001
From: Yuri Orlov <yuri.n.orlov@gmail.com>
Date: Sun, 1 Nov 2020 00:19:59 +0300
Subject: [PATCH 0072/1433] Use built-in comparator (#2466)

---
 .../org/junit/jupiter/engine/descriptor/ExtensionUtils.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 1ea9a59c280e..838a432da5be 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -119,7 +119,7 @@ static void registerExtensionsFromFields(ExtensionRegistrar registrar, Class<?>
 	 * @since 5.4
 	 */
 	private static final Comparator<Field> orderComparator = //
-		(field1, field2) -> Integer.compare(getOrder(field1), getOrder(field2));
+		Comparator.comparingInt(ExtensionUtils::getOrder);
 
 	/**
 	 * @since 5.4

From 25d727a186a3151c6cf22619c989082cad39b543 Mon Sep 17 00:00:00 2001
From: Yuri Orlov <yuri.n.orlov@gmail.com>
Date: Sun, 1 Nov 2020 00:21:04 +0300
Subject: [PATCH 0073/1433] use Math.min instead of manual calculation (#2465)

---
 .../launcher/listeners/MutableTestExecutionSummary.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
index 6339da8dbe6a..24287fcf129b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
@@ -250,7 +250,7 @@ private void printStackTrace(PrintWriter writer, StackTraceElement[] parentTrace
 		}
 		int duplicates = numberOfCommonFrames(trace, parentTrace);
 		int numDistinctFrames = trace.length - duplicates;
-		int numDisplayLines = (numDistinctFrames > max) ? max : numDistinctFrames;
+		int numDisplayLines = Math.min(numDistinctFrames, max);
 		for (int i = 0; i < numDisplayLines; i++) {
 			writer.printf("%s%s%s%n", indentation, TAB, trace[i]);
 		}

From 3107c3e1706e99284ea28b7fe8b7c6504f6d6a1e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Nov 2020 15:30:09 +0100
Subject: [PATCH 0074/1433] Move entries to 5.7.1 release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.7.1.adoc | 8 +++++++-
 .../asciidoc/release-notes/release-notes-5.8.0-M1.adoc   | 9 ++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index 23325f5342a4..afc292a80213 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -15,7 +15,9 @@ GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* `StringUtils.nullSafeToString()` now returns `"null"` if the invocation of `toString()`
+  on the supplied object returns `null`. Although this is an internal utility, the effect
+  of this change may be witnessed by end users and test engine or extension authors.
 
 ==== Deprecations and Breaking Changes
 
@@ -31,6 +33,10 @@ GitHub.
 
 ==== Bug Fixes
 
+* If the `toString()` implementation of an argument passed to a `@ParameterizedTest`
+  method returns `null`, the display name formatter for the parameterized test now treats
+  the name of the corresponding argument as `"null"` instead of throwing an exception.
+  This fixes a regression introduced in JUnit Jupiter 5.7.0.
 * Creator functions passed to `ExtensionContext.Store.getOrComputeIfAbsent()` are now only
   called once even if they throw an exception.
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 39f7d951b9c8..75f23328837c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -15,9 +15,7 @@ on GitHub.
 
 ==== Bug Fixes
 
-* `StringUtils.nullSafeToString()` now returns `"null"` if the invocation of `toString()`
-  on the supplied object returns `null`. Although this is an internal utility, the effect
-  of this change may be witnessed by end users and test engine or extension authors.
+* ❓
 
 ==== Deprecations and Breaking Changes
 
@@ -35,10 +33,7 @@ on GitHub.
 
 ==== Bug Fixes
 
-* If the `toString()` implementation of an argument passed to a `@ParameterizedTest`
-  method returns `null`, the display name formatter for the parameterized test now treats
-  the name of the corresponding argument as `"null"` instead of throwing an exception.
-  This fixes a regression introduced in JUnit Jupiter 5.7.0.
+* ❓
 
 ==== Deprecations and Breaking Changes
 

From 36542987a00371ec29374445e0487e51ac3d19e9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Nov 2020 15:35:06 +0100
Subject: [PATCH 0075/1433] Document #2438 in release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.7.1.adoc   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index afc292a80213..3caad020f745 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -10,6 +10,13 @@ link:{junit5-repo}+/milestone/52?closed=1+[5.7.1] milestone page in the JUnit re
 GitHub.
 
 
+[[release-notes-5.7.1-general-bug-fixes]]
+=== General bug fixes
+
+* For compatibility with `JarInputStream`, all JARs now contain `META-INF/` and
+  `META-INF/MANIFEST.MF` as their first entries again.
+
+
 [[release-notes-5.7.1-junit-platform]]
 === JUnit Platform
 

From 7547bb8a06d0af8d15d396b89ab888f655a7a5d9 Mon Sep 17 00:00:00 2001
From: Matthias Merdes <mmerdes@users.noreply.github.com>
Date: Sun, 15 Nov 2020 15:37:33 +0100
Subject: [PATCH 0076/1433] Improve user guide for nested tests (#2474)

* add image of ide execution, avoid 'family' wording
* explain nesting and the role of lifecycle methods in more detail
* document the change in the release notes

Resolves #2451.
---
 .../release-notes/release-notes-5.7.1.adoc    |   2 +-
 .../images/writing-tests_nested_test_ide.png  | Bin 0 -> 230224 bytes
 .../asciidoc/user-guide/writing-tests.adoc    |  29 +++++++++++++-----
 3 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 documentation/src/docs/asciidoc/user-guide/images/writing-tests_nested_test_ide.png

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index 3caad020f745..cfde0aa9a0f9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -53,7 +53,7 @@ GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* The user guide now explains Nested Tests in more detail.
 
 
 [[release-notes-5.7.1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/images/writing-tests_nested_test_ide.png b/documentation/src/docs/asciidoc/user-guide/images/writing-tests_nested_test_ide.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a5dd0a1d1587bdeceb95ba49d5daee71f1df8ed
GIT binary patch
literal 230224
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

literal 0
HcmV?d00001

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 3c6a686f3038..963dafe0341e 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -642,7 +642,9 @@ configuration file instead of via a JVM system property.
 === Nested Tests
 
 `@Nested` tests give the test writer more capabilities to express the relationship among
-several groups of tests. Here's an elaborate example.
+several groups of tests. Such nested tests make use of Java's nested classes and
+facilitate hierarchical thinking about the test structure.
+Here's an elaborate example, both as source code and as an IDE execution screenshot.
 
 [source,java,indent=0]
 .Nested test suite for testing a stack
@@ -650,13 +652,26 @@ several groups of tests. Here's an elaborate example.
 include::{testDir}/example/TestingAStackDemo.java[tags=user_guide]
 ----
 
+When executing this example in an IDE, the test execution tree in the GUI will look
+similar to the following image.
+
+image::writing-tests_nested_test_ide.png[caption='',title='Executing a nested test in an IDE']
+
+In this example preconditions from outer tests are used in inner tests by defining
+hierarchical lifecycle methods for the setup code. E.g., the method `createNewStack()`
+annotated as a lifecycle method with `@BeforeEach` is such a setup method which is used
+at all level below in the nesting tree.
+
+The fact that setup code from outer tests is run before inner tests are executed gives
+you the ability to run all tests independently. You can even run inner tests alone
+without outer tests, because the setup code from the outer tests is always executed.
+
 NOTE: _Only non-static nested classes_ (i.e. _inner classes_) can serve as `@Nested` test
-classes. Nesting can be arbitrarily deep, and those inner classes are considered to be
-full members of the test class family with one exception: `@BeforeAll` and `@AfterAll`
-methods do not work _by default_. The reason is that Java does not allow `static` members
-in inner classes. However, this restriction can be circumvented by annotating a `@Nested`
-test class with `@TestInstance(Lifecycle.PER_CLASS)` (see
-<<writing-tests-test-instance-lifecycle>>).
+classes. Nesting can be arbitrarily deep, and those inner classes are subject to full
+lifecycle support with one exception:`@BeforeAll` and `@AfterAll` methods do not work
+_by default_. The reason is that Java does not allow `static` members in inner classes.
+However, this restriction can be circumvented by annotating a `@Nested` test class with
+`@TestInstance(Lifecycle.PER_CLASS)` (see <<writing-tests-test-instance-lifecycle>>).
 
 [[writing-tests-dependency-injection]]
 === Dependency Injection for Constructors and Methods

From bbfc66b2bfd7f840a132a22d9e26c393eddaa5b3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 16 Nov 2020 20:48:43 +0100
Subject: [PATCH 0077/1433] Upgradle to 6.7.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 58739421a910..8174453a1aa1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8ad57759019a9233dc7dc4d1a530cefe109dc122000d57f7e623f8cf4ba9dfc4
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From e31e58d9c3d3ce9b74ede13f6f60c588abecea98 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 20 Nov 2020 13:57:46 +0100
Subject: [PATCH 0078/1433] Polishing

---
 .../asciidoc/user-guide/writing-tests.adoc    | 20 +++++++++----------
 .../DynamicTestInvocationContext.java         | 13 +++++++-----
 .../execution/ConstructorInvocation.java      |  9 +++++----
 .../engine/execution/MethodInvocation.java    | 16 +++++++--------
 .../testkit/engine/EngineTestKitTests.java    |  2 +-
 5 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 963dafe0341e..e6967618c75b 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -643,8 +643,8 @@ configuration file instead of via a JVM system property.
 
 `@Nested` tests give the test writer more capabilities to express the relationship among
 several groups of tests. Such nested tests make use of Java's nested classes and
-facilitate hierarchical thinking about the test structure.
-Here's an elaborate example, both as source code and as an IDE execution screenshot.
+facilitate hierarchical thinking about the test structure. Here's an elaborate example,
+both as source code and as a screenshot of the execution within an IDE.
 
 [source,java,indent=0]
 .Nested test suite for testing a stack
@@ -657,18 +657,18 @@ similar to the following image.
 
 image::writing-tests_nested_test_ide.png[caption='',title='Executing a nested test in an IDE']
 
-In this example preconditions from outer tests are used in inner tests by defining
-hierarchical lifecycle methods for the setup code. E.g., the method `createNewStack()`
-annotated as a lifecycle method with `@BeforeEach` is such a setup method which is used
-at all level below in the nesting tree.
+In this example, preconditions from outer tests are used in inner tests by defining
+hierarchical lifecycle methods for the setup code. For example, `createNewStack()` is a
+`@BeforeEach` lifecycle method that is used in the test class in which it is defined and
+in all levels in the nesting tree below the class in which it is defined.
 
-The fact that setup code from outer tests is run before inner tests are executed gives
-you the ability to run all tests independently. You can even run inner tests alone
-without outer tests, because the setup code from the outer tests is always executed.
+The fact that setup code from outer tests is run before inner tests are executed gives you
+the ability to run all tests independently. You can even run inner tests alone without
+running the outer tests, because the setup code from the outer tests is always executed.
 
 NOTE: _Only non-static nested classes_ (i.e. _inner classes_) can serve as `@Nested` test
 classes. Nesting can be arbitrarily deep, and those inner classes are subject to full
-lifecycle support with one exception:`@BeforeAll` and `@AfterAll` methods do not work
+lifecycle support with one exception: `@BeforeAll` and `@AfterAll` methods do not work
 _by default_. The reason is that Java does not allow `static` members in inner classes.
 However, this restriction can be circumvented by annotating a `@Nested` test class with
 `@TestInstance(Lifecycle.PER_CLASS)` (see <<writing-tests-test-instance-lifecycle>>).
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
index 99f6bb1b4568..8476d7f99d37 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
@@ -17,25 +17,28 @@
 
 /**
  * {@code DynamicTestInvocationContext} represents the <em>context</em> of a
- * single invocation of a {@linkplain org.junit.jupiter.api.DynamicTest test}.
+ * single invocation of a {@linkplain org.junit.jupiter.api.DynamicTest
+ * dynamic test}.
  *
  * @since 5.8
  * @see org.junit.jupiter.api.DynamicTest
  */
 @API(status = EXPERIMENTAL, since = "5.8")
 public class DynamicTestInvocationContext {
-	private Executable executable;
+
+	private final Executable executable;
 
 	public DynamicTestInvocationContext(Executable executable) {
 		this.executable = executable;
 	}
 
 	/**
-	 * Get the {@linkplain Executable} of this dynamic test invocation.
+	 * Get the {@linkplain Executable} of this dynamic test invocation context.
 	 *
-	 * @return the executable of the dynamic test invocation, never null.
+	 * @return the executable of the dynamic test invocation, never {@code null}
 	 */
 	public Executable getExecutable() {
-		return executable;
+		return this.executable;
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
index bebeb487131b..7f83e24d8a7c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
@@ -33,17 +33,17 @@ class ConstructorInvocation<T> implements Invocation<T>, ReflectiveInvocationCon
 
 	@Override
 	public Class<?> getTargetClass() {
-		return constructor.getDeclaringClass();
+		return this.constructor.getDeclaringClass();
 	}
 
 	@Override
 	public Constructor<T> getExecutable() {
-		return constructor;
+		return this.constructor;
 	}
 
 	@Override
 	public List<Object> getArguments() {
-		return unmodifiableList(Arrays.asList(arguments));
+		return unmodifiableList(Arrays.asList(this.arguments));
 	}
 
 	@Override
@@ -53,6 +53,7 @@ public Optional<Object> getTarget() {
 
 	@Override
 	public T proceed() {
-		return ReflectionUtils.newInstance(constructor, arguments);
+		return ReflectionUtils.newInstance(this.constructor, this.arguments);
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
index 1f29960a2014..d444c818f65c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
@@ -23,9 +23,9 @@
 
 class MethodInvocation<T> implements Invocation<T>, ReflectiveInvocationContext<Method> {
 
-	protected final Method method;
-	protected final Optional<Object> target;
-	protected final Object[] arguments;
+	private final Method method;
+	private final Optional<Object> target;
+	private final Object[] arguments;
 
 	MethodInvocation(Method method, Optional<Object> target, Object[] arguments) {
 		this.method = method;
@@ -35,29 +35,29 @@ class MethodInvocation<T> implements Invocation<T>, ReflectiveInvocationContext<
 
 	@Override
 	public Class<?> getTargetClass() {
-		return target.<Class<?>> map(Object::getClass).orElseGet(method::getDeclaringClass);
+		return this.target.<Class<?>> map(Object::getClass).orElseGet(this.method::getDeclaringClass);
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public Optional<Object> getTarget() {
-		return target;
+		return this.target;
 	}
 
 	@Override
 	public Method getExecutable() {
-		return method;
+		return this.method;
 	}
 
 	@Override
 	public List<Object> getArguments() {
-		return unmodifiableList(Arrays.asList(arguments));
+		return unmodifiableList(Arrays.asList(this.arguments));
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public T proceed() {
-		return (T) ReflectionUtils.invokeMethod(method, target.orElse(null), arguments);
+		return (T) ReflectionUtils.invokeMethod(this.method, this.target.orElse(null), this.arguments);
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
index cdf0e97ad705..a3f386fa9b03 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
@@ -25,7 +25,7 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.platform.engine.reporting.ReportEntry;
 
-public class EngineTestKitTests {
+class EngineTestKitTests {
 
 	private static final String KEY = EngineTestKitTests.class.getName();
 

From ab61708bde98bd295ddd9560faf6f6c6142bc406 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 20 Nov 2020 14:07:28 +0100
Subject: [PATCH 0079/1433] Convert DynamicTestInvocationContext to an
 interface

See #2399
---
 .../DynamicTestInvocationContext.java         | 14 ++------
 .../DefaultDynamicTestInvocationContext.java  | 34 +++++++++++++++++++
 .../descriptor/DynamicTestTestDescriptor.java |  2 +-
 3 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
index 8476d7f99d37..39ad238cf64e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
@@ -24,21 +24,13 @@
  * @see org.junit.jupiter.api.DynamicTest
  */
 @API(status = EXPERIMENTAL, since = "5.8")
-public class DynamicTestInvocationContext {
-
-	private final Executable executable;
-
-	public DynamicTestInvocationContext(Executable executable) {
-		this.executable = executable;
-	}
+public interface DynamicTestInvocationContext {
 
 	/**
-	 * Get the {@linkplain Executable} of this dynamic test invocation context.
+	 * Get the {@code Executable} of this dynamic test invocation context.
 	 *
 	 * @return the executable of the dynamic test invocation, never {@code null}
 	 */
-	public Executable getExecutable() {
-		return this.executable;
-	}
+	Executable getExecutable();
 
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
new file mode 100644
index 000000000000..4b6cb2b34dd7
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.descriptor;
+
+import org.junit.jupiter.api.extension.DynamicTestInvocationContext;
+import org.junit.jupiter.api.function.Executable;
+
+/**
+ * Default implementation of the {@link DynamicTestInvocationContext} API.
+ *
+ * @since 5.8
+ */
+class DefaultDynamicTestInvocationContext implements DynamicTestInvocationContext {
+
+	private final Executable executable;
+
+	DefaultDynamicTestInvocationContext(Executable executable) {
+		this.executable = executable;
+	}
+
+	@Override
+	public Executable getExecutable() {
+		return this.executable;
+	}
+
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
index a0d785d90d93..e35293fa4754 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
@@ -53,7 +53,7 @@ public JupiterEngineExecutionContext execute(JupiterEngineExecutionContext conte
 			dynamicTest.getExecutable().execute();
 			return null;
 		};
-		DynamicTestInvocationContext dynamicTestInvocationContext = new DynamicTestInvocationContext(
+		DynamicTestInvocationContext dynamicTestInvocationContext = new DefaultDynamicTestInvocationContext(
 			dynamicTest.getExecutable());
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ExtensionRegistry extensionRegistry = context.getExtensionRegistry();

From a3cd0f911d8ee9d9b4e50b46523c388200649d03 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 20 Nov 2020 16:35:34 +0100
Subject: [PATCH 0080/1433] Add test(Condition) &
 nestedContainer(Class,Condition) in Test Kit

This commit introduces new `test(Condition<Event>)` and
`nestedContainer(Class<?>, Condition<Event>)` methods in
`EventConditions` that allow you to provide conditions for matching
against test and nested container events when using the
`EngineTestKit`.

For example, `test(displayName("my test"))` can be used to match
against a test whose display name is `my test`.

Closes #2473
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  6 ++-
 .../testkit/engine/EventConditions.java       | 47 ++++++++++++++++++-
 .../NestedContainerEventConditionTests.java   |  7 ++-
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 75f23328837c..b253ab9af374 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -25,7 +25,11 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* New `test(Condition<Event>)` and `nestedContainer(Class<?>, Condition<Event>)` methods
+  in `EventConditions` that allow you to provide conditions for matching against test and
+  nested container events when using the `EngineTestKit`. For example,
+  `test(displayName("my test"))` can be used to match against a test whose display name is
+  `my test`.
 
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
index 55fafae055ad..c99e8875bae1 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
@@ -88,7 +88,7 @@ public static Condition<Event> engine() {
 	 * @see #uniqueIdSubstring(String)
 	 */
 	public static Condition<Event> test(String uniqueIdSubstring) {
-		return allOf(test(), uniqueIdSubstring(uniqueIdSubstring));
+		return test(uniqueIdSubstring(uniqueIdSubstring));
 	}
 
 	/**
@@ -100,6 +100,7 @@ public static Condition<Event> test(String uniqueIdSubstring) {
 	 * display name} equals the supplied {@link String}.
 	 *
 	 * @see #test()
+	 * @see #test(Condition)
 	 * @see #uniqueIdSubstring(String)
 	 * @see #displayName(String)
 	 */
@@ -107,6 +108,25 @@ public static Condition<Event> test(String uniqueIdSubstring, String displayName
 		return allOf(test(), uniqueIdSubstring(uniqueIdSubstring), displayName(displayName));
 	}
 
+	/**
+	 * Create a new {@link Condition} that matches if and only if an
+	 * {@link Event} matches the supplied {@code Condition} and its
+	 * {@linkplain Event#getTestDescriptor() test descriptor} is a
+	 * {@linkplain TestDescriptor#isTest() test}.
+	 *
+	 * <p>For example, {@code test(displayName("my display name"))} can be used
+	 * to match against a test with the given display name.
+	 *
+	 * @since 1.8
+	 * @see #test(String)
+	 * @see #test(String, String)
+	 * @see #displayName(String)
+	 */
+	@API(status = MAINTAINED, since = "1.8")
+	public static Condition<Event> test(Condition<Event> condition) {
+		return allOf(test(), condition);
+	}
+
 	/**
 	 * Create a new {@link Condition} that matches if and only if an
 	 * {@link Event}'s {@linkplain Event#getTestDescriptor() test descriptor} is
@@ -158,6 +178,29 @@ public static Condition<Event> container() {
 		return new Condition<>(byTestDescriptor(TestDescriptor::isContainer), "is a container");
 	}
 
+	/**
+	 * Create a new {@link Condition} that matches if and only if an
+	 * {@link Event} matches the supplied {@code Condition}, its
+	 * {@linkplain Event#getTestDescriptor() test descriptor} is
+	 * a {@linkplain TestDescriptor#isContainer() container}, and its
+	 * {@linkplain TestDescriptor#getUniqueId() unique id} contains the
+	 * simple names of the supplied {@link Class} and all of its
+	 * {@linkplain Class#getEnclosingClass() enclosing classes}.
+	 *
+	 * <p>For example, {@code nestedContainer(MyNestedTests.class, displayName("my display name"))}
+	 * can be used to match against a nested container with the given display name.
+	 *
+	 * <p>Please note that this method does not differentiate between static
+	 * nested classes and non-static member classes (e.g., inner classes).
+	 *
+	 * @since 1.8
+	 * @see #nestedContainer(Class)
+	 */
+	@API(status = MAINTAINED, since = "1.8")
+	public static Condition<Event> nestedContainer(Class<?> clazz, Condition<Event> condition) {
+		return allOf(nestedContainer(clazz), condition);
+	}
+
 	/**
 	 * Create a new {@link Condition} that matches if and only if an
 	 * {@link Event}'s {@linkplain Event#getTestDescriptor() test descriptor} is
@@ -168,6 +211,8 @@ public static Condition<Event> container() {
 	 *
 	 * <p>Please note that this method does not differentiate between static
 	 * nested classes and non-static member classes (e.g., inner classes).
+	 *
+	 * @see #nestedContainer(Class, Condition)
 	 */
 	public static Condition<Event> nestedContainer(Class<?> clazz) {
 		Preconditions.notNull(clazz, "Class must not be null");
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
index bced3458a194..3d0ffad4d147 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.testkit.engine.EventConditions.container;
+import static org.junit.platform.testkit.engine.EventConditions.displayName;
 import static org.junit.platform.testkit.engine.EventConditions.engine;
 import static org.junit.platform.testkit.engine.EventConditions.event;
 import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
@@ -26,6 +27,7 @@
 
 import java.util.HashMap;
 
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -107,14 +109,14 @@ void eventConditionsForMultipleLevelsOfNestedClasses() {
 					event(container(ATestCase.class), started()),
 						event(test("test_a"), started()),
 						event(test("test_a"), finishedSuccessfully()),
-						event(nestedContainer(ATestCase.BTestCase.class), started()),
+						event(nestedContainer(ATestCase.BTestCase.class, displayName("Test case B")), started()),
 							event(test("test_b"), started()),
 							event(test("test_b"), finishedSuccessfully()),
 							event(nestedContainer(ATestCase.BTestCase.CTestCase.class), started()),
 								event(test("test_c"), started()),
 								event(test("test_c"), finishedSuccessfully()),
 							event(nestedContainer(ATestCase.BTestCase.CTestCase.class), finishedSuccessfully()),
-						event(nestedContainer(ATestCase.BTestCase.class), finishedSuccessfully()),
+						event(nestedContainer(ATestCase.BTestCase.class, displayName("Test case B")), finishedSuccessfully()),
 					event(container(ATestCase.class), finishedSuccessfully()),
 				event(engine(), finishedSuccessfully())
 			);
@@ -128,6 +130,7 @@ void test_a() {
 		}
 
 		@Nested
+		@DisplayName("Test case B")
 		class BTestCase {
 			@Test
 			void test_b() {

From 7da75de5e4ea59de6185328140d0e890940c94c5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 24 Nov 2020 14:16:30 +0100
Subject: [PATCH 0081/1433] Delete unused statements in Kotlin-based tests

---
 .../jupiter/api/KotlinAssertTimeoutAssertionsTests.kt     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
index 505121efa7e5..3366d1e70b5f 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
@@ -100,7 +100,6 @@ internal class KotlinAssertTimeoutAssertionsTests {
         val exception = assertThrows<RuntimeException> {
             assertTimeout(ofMillis(500)) {
                 ExceptionUtils.throwAsUncheckedException(RuntimeException("not this time"))
-                "Tempus Fugit"
             }
         }
         assertMessageEquals(exception, "not this time")
@@ -121,7 +120,6 @@ internal class KotlinAssertTimeoutAssertionsTests {
         val error = assertThrows<AssertionFailedError> {
             assertTimeout(ofMillis(10)) {
                 nap()
-                "Tempus Fugit"
             }
         }
         assertMessageStartsWith(error, "execution exceeded timeout of 10 ms by")
@@ -132,7 +130,6 @@ internal class KotlinAssertTimeoutAssertionsTests {
         val error = assertThrows<AssertionFailedError> {
             assertTimeout(ofMillis(10), "Tempus Fugit") {
                 nap()
-                "Tempus Fugit"
             }
         }
         assertMessageStartsWith(error, "Tempus Fugit ==> execution exceeded timeout of 10 ms by")
@@ -143,7 +140,6 @@ internal class KotlinAssertTimeoutAssertionsTests {
         val error = assertThrows<AssertionFailedError> {
             assertTimeout(ofMillis(10), { "Tempus" + " " + "Fugit" }) {
                 nap()
-                "Tempus Fugit"
             }
         }
         assertMessageStartsWith(error, "Tempus Fugit ==> execution exceeded timeout of 10 ms by")
@@ -225,7 +221,6 @@ internal class KotlinAssertTimeoutAssertionsTests {
         val exception = assertThrows<RuntimeException> {
             assertTimeoutPreemptively(ofMillis(500)) {
                 ExceptionUtils.throwAsUncheckedException(RuntimeException("not this time"))
-                "Tempus Fugit"
             }
         }
         assertMessageEquals(exception, "not this time")
@@ -246,7 +241,6 @@ internal class KotlinAssertTimeoutAssertionsTests {
         val error = assertThrows<AssertionFailedError> {
             assertTimeoutPreemptively(ofMillis(10)) {
                 waitForInterrupt()
-                "Tempus Fugit"
             }
         }
         assertMessageEquals(error, "execution timed out after 10 ms")
@@ -257,7 +251,6 @@ internal class KotlinAssertTimeoutAssertionsTests {
         val error = assertThrows<AssertionFailedError> {
             assertTimeoutPreemptively(ofMillis(10), "Tempus Fugit") {
                 waitForInterrupt()
-                "Tempus Fugit"
             }
         }
         assertMessageEquals(error, "Tempus Fugit ==> execution timed out after 10 ms")
@@ -268,7 +261,6 @@ internal class KotlinAssertTimeoutAssertionsTests {
         val error = assertThrows<AssertionFailedError> {
             assertTimeoutPreemptively(ofMillis(10), { "Tempus" + " " + "Fugit" }) {
                 waitForInterrupt()
-                "Tempus Fugit"
             }
         }
         assertMessageEquals(error, "Tempus Fugit ==> execution timed out after 10 ms")

From fdac06b72901f83da28691019cfc305e1163d7a0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 26 Nov 2020 11:35:04 +0100
Subject: [PATCH 0082/1433] Upgrade test-retry plugin to 1.2.0

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 264c69ea5c3d..e73569dac287 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,5 +12,5 @@ dependencies {
 	implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0")
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0")
 	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
-	implementation("org.gradle:test-retry-gradle-plugin:1.1.8")
+	implementation("org.gradle:test-retry-gradle-plugin:1.2.0")
 }

From 072b480061d955cec889d4c62f7de8e2b87059df Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 27 Nov 2020 15:28:14 +0100
Subject: [PATCH 0083/1433] Upgradle to 6.8-rc-1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8174453a1aa1..33de58d960ab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionSha256Sum=155bafc3a46f81b7af481ad7dba391a3b9c12818f27da8684178ffeaa40e6d7e
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From d54bb96ebd55a84b756ebb1792d702d33a038b20 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 27 Nov 2020 15:56:13 +0100
Subject: [PATCH 0084/1433] Upgrade Groovy for JDK 16 support

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c2503f2e7e58..2c7505dc7b08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ bartholdy.version=0.2.3
 classgraph.version=4.8.87
 commons-io.version=2.7
 kotlinx-coroutines-core.version=1.3.9
-groovy.version=3.0.5
+groovy.version=3.0.6
 log4j.version=2.13.3
 mockito.version=3.5.0
 slf4j.version=1.7.30

From 047f739852d4d29b21f329c9ef9b6325df88a626 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 27 Nov 2020 16:22:47 +0100
Subject: [PATCH 0085/1433] Pin Groovy compilation to use JDK 15 for now

---
 .../src/main/kotlin/java-toolchain-conventions.gradle.kts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index 7fcb690a3f0f..e87c039a0fc5 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 
 val javaToolchainVersion: String? by project
-val defaultLanguageVersion = JavaLanguageVersion.of(15)!!
+val defaultLanguageVersion = JavaLanguageVersion.of(15)
 val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: defaultLanguageVersion
 
 project.pluginManager.withPlugin("java") {
@@ -17,6 +17,12 @@ project.pluginManager.withPlugin("java") {
 	tasks.withType<JavaCompile>().configureEach {
 		javaCompiler.set(compiler)
 	}
+	tasks.withType<GroovyCompile>().configureEach {
+		javaLauncher.set(javaToolchainService.launcherFor {
+			// Groovy does not yet support JDK 16, see https://issues.apache.org/jira/browse/GROOVY-9752
+			languageVersion.set(defaultLanguageVersion)
+		})
+	}
 	tasks.withType<JavaExec>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor(extension.toolchain))
 	}

From f35ec81e2dfaaa7d4ba3373e0966d8070c17693e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 27 Nov 2020 17:30:50 +0100
Subject: [PATCH 0086/1433] Enable build scans and build cache for CodeQL
 builds

---
 .github/workflows/codeql-analysis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 89f58eef355c..edff8a72224e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,6 +14,11 @@ on:
   schedule:
     - cron: '0 19 * * 3'
 
+env:
+  ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
+  ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
+  ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
+
 jobs:
   analyze:
     name: Analyze
@@ -68,6 +73,10 @@ jobs:
     # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
+    - name: Prepare Gradle Enterprise credentials
+      run: |
+        mkdir -p $HOME/.gradle/enterprise/
+        echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > $HOME/.gradle/enterprise/keys.properties
     - name: Build
       run: |
         ./gradlew --version

From d1234f1c23eef133c68283faa58ccac048cdfcd5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 27 Nov 2020 17:47:31 +0100
Subject: [PATCH 0087/1433] Use javaLanguageVersion if its less than 15

---
 buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index e87c039a0fc5..d50db99d8856 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -20,7 +20,7 @@ project.pluginManager.withPlugin("java") {
 	tasks.withType<GroovyCompile>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor {
 			// Groovy does not yet support JDK 16, see https://issues.apache.org/jira/browse/GROOVY-9752
-			languageVersion.set(defaultLanguageVersion)
+			languageVersion.set(minOf(javaLanguageVersion, defaultLanguageVersion))
 		})
 	}
 	tasks.withType<JavaExec>().configureEach {

From 3bda349ece20004adb1cc49df1000dfa596d6ed5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Nov 2020 16:51:06 +0100
Subject: [PATCH 0088/1433] Disable build cache for CodeQL build again

---
 .github/workflows/codeql-analysis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index edff8a72224e..0721acc252b7 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -15,8 +15,6 @@ on:
     - cron: '0 19 * * 3'
 
 env:
-  ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
-  ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
   ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
 
 jobs:

From 177d808f886355fac552aee9495212a4041c0316 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Nov 2020 17:01:00 +0100
Subject: [PATCH 0089/1433] Disable reading from the remote build cache for the
 CodeQL build

---
 .github/workflows/codeql-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0721acc252b7..de13166399f7 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -78,7 +78,7 @@ jobs:
     - name: Build
       run: |
         ./gradlew --version
-        ./gradlew allMainClasses -PjavaToolchainVersion=11
+        ./gradlew --no-build-cache allMainClasses -PjavaToolchainVersion=11
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1

From c797e6fd9d55445292e3212b9ba91151d846de28 Mon Sep 17 00:00:00 2001
From: Yuri Orlov <yorlov@stiltsoft.com>
Date: Mon, 7 Dec 2020 21:03:11 +0300
Subject: [PATCH 0090/1433] More straightforward usage of Optional (#2467)

---
 .../engine/extension/DisabledCondition.java   | 18 ++++++++----------
 .../conditions/IgnoreCondition.java           | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
index 1b0a2b264ad4..7c08d520209c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
@@ -13,7 +13,6 @@
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 
 import java.lang.reflect.AnnotatedElement;
-import java.util.Optional;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
@@ -39,15 +38,14 @@ class DisabledCondition implements ExecutionCondition {
 	 */
 	@Override
 	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
-		Optional<AnnotatedElement> element = context.getElement();
-		Optional<Disabled> disabled = findAnnotation(element, Disabled.class);
-		if (disabled.isPresent()) {
-			String reason = disabled.map(Disabled::value).filter(StringUtils::isNotBlank).orElseGet(
-				() -> element.get() + " is @Disabled");
-			return ConditionEvaluationResult.disabled(reason);
-		}
-
-		return ENABLED;
+		AnnotatedElement element = context.getElement().orElse(null);
+		return findAnnotation(element, Disabled.class).map(annotation -> toResult(element, annotation)).orElse(ENABLED);
+	}
+
+	private ConditionEvaluationResult toResult(AnnotatedElement element, Disabled annotation) {
+		String value = annotation.value();
+		String reason = StringUtils.isNotBlank(value) ? value : element + " is @Disabled";
+		return ConditionEvaluationResult.disabled(reason);
 	}
 
 }
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
index 2c9c7ed6750e..c56ae0b5ef0b 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
@@ -14,7 +14,6 @@
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 
 import java.lang.reflect.AnnotatedElement;
-import java.util.Optional;
 
 import org.apiguardian.api.API;
 import org.junit.Ignore;
@@ -45,16 +44,14 @@ public class IgnoreCondition implements ExecutionCondition {
 	 */
 	@Override
 	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
-		Optional<AnnotatedElement> element = context.getElement();
-		Optional<Ignore> ignoreAnnotation = findAnnotation(element, Ignore.class);
-		if (ignoreAnnotation.isPresent()) {
-			String reason = ignoreAnnotation.map(Ignore::value) //
-					.filter(StringUtils::isNotBlank) //
-					.orElseGet(() -> element.get() + " is disabled via @org.junit.Ignore");
-			return ConditionEvaluationResult.disabled(reason);
-		}
-
-		return ENABLED;
+		AnnotatedElement element = context.getElement().orElse(null);
+		return findAnnotation(element, Ignore.class).map(annotation -> toResult(element, annotation)).orElse(ENABLED);
+	}
+
+	private ConditionEvaluationResult toResult(AnnotatedElement element, Ignore annotation) {
+		String value = annotation.value();
+		String reason = StringUtils.isNotBlank(value) ? value : element + " is disabled via @org.junit.Ignore";
+		return ConditionEvaluationResult.disabled(reason);
 	}
 
 }

From f407ee7166ee5622bf2c121d66fd0854b7ddb0ac Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Mon, 7 Dec 2020 19:10:38 +0100
Subject: [PATCH 0091/1433] Format code introduced in #2467

---
 .../org/junit/jupiter/engine/extension/DisabledCondition.java | 4 +++-
 .../jupiter/migrationsupport/conditions/IgnoreCondition.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
index 7c08d520209c..1dcaa184b829 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
@@ -39,7 +39,9 @@ class DisabledCondition implements ExecutionCondition {
 	@Override
 	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
 		AnnotatedElement element = context.getElement().orElse(null);
-		return findAnnotation(element, Disabled.class).map(annotation -> toResult(element, annotation)).orElse(ENABLED);
+		return findAnnotation(element, Disabled.class) //
+				.map(annotation -> toResult(element, annotation)) //
+				.orElse(ENABLED);
 	}
 
 	private ConditionEvaluationResult toResult(AnnotatedElement element, Disabled annotation) {
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
index c56ae0b5ef0b..f99562fd0f0a 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
@@ -45,7 +45,9 @@ public class IgnoreCondition implements ExecutionCondition {
 	@Override
 	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
 		AnnotatedElement element = context.getElement().orElse(null);
-		return findAnnotation(element, Ignore.class).map(annotation -> toResult(element, annotation)).orElse(ENABLED);
+		return findAnnotation(element, Ignore.class) //
+				.map(annotation -> toResult(element, annotation)) //
+				.orElse(ENABLED);
 	}
 
 	private ConditionEvaluationResult toResult(AnnotatedElement element, Ignore annotation) {

From f1fb1b1b15f64e927343817214922491432896a0 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Wed, 9 Dec 2020 12:19:41 +0100
Subject: [PATCH 0092/1433] Check only non-static methods in extension
 composability tests

See https://bugs.openjdk.java.net/browse/JDK-8159746 for details
---
 .../jupiter/api/extension/ExtensionComposabilityTests.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
index 2ef8886f4816..e76933bc0c0e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
@@ -67,12 +67,13 @@ void ensureJupiterExtensionApisAreComposable() {
 
 		// 3) Dynamically implement all Extension APIs
 		Object dynamicKitchenSinkExtension = Proxy.newProxyInstance(getClass().getClassLoader(),
-			extensionApis.toArray(new Class<?>[extensionApis.size()]), (proxy, method, args) -> null);
+			extensionApis.toArray(Class[]::new), (proxy, method, args) -> null);
 
 		// 4) Determine what ended up in the kitchen sink...
 
 		// @formatter:off
 		List<Method> actualMethods = Arrays.stream(dynamicKitchenSinkExtension.getClass().getDeclaredMethods())
+				.filter(ReflectionUtils::isNotStatic)
 				.collect(toList());
 
 		List<String> actualMethodSignatures = actualMethods.stream()

From 7f5e22536b26a99b310f565de7df9d8a0518b079 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 11 Dec 2020 13:24:16 +0100
Subject: [PATCH 0093/1433] Ensure consistent top-level test class legacy
 reporting names

Prior to this commit, legacy reporting names of JUnit 3 suites were not
the fully-qualified test class name but rather some textual description
of the test suite (e.g. "TestSuite with 42 tests [example: ...]"). Now,
the legacy reporting name of top-level test classes reported by the
Vintage engine is always the fully-qualified test class name.
---
 .../docs/asciidoc/release-notes/release-notes-5.7.1.adoc   | 3 ++-
 .../vintage/engine/descriptor/RunnerTestDescriptor.java    | 7 +++++++
 .../vintage/engine/VintageTestEngineDiscoveryTests.java    | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index cfde0aa9a0f9..ffd50079431c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -61,7 +61,8 @@ GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* The legacy reporting name of top-level test classes is now always their fully-qualified
+  class name. Previously, a textual description was returned for JUnit 3 suites.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
index b5a03cc5560f..efd386a04df0 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
@@ -21,6 +21,7 @@
 import java.util.function.Consumer;
 
 import org.apiguardian.api.API;
+import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.engine.UniqueId;
@@ -50,6 +51,12 @@ public RunnerTestDescriptor(UniqueId uniqueId, Class<?> testClass, Runner runner
 		this.runner = runner;
 	}
 
+	@Override
+	public String getLegacyReportingName() {
+		return getSource().map(source -> ((ClassSource) source).getClassName()) //
+				.orElseThrow(() -> new JUnitException("source should have been present"));
+	}
+
 	public Request toRequest() {
 		return new RunnerRequest(this.runner);
 	}
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
index e15ed6ace3f6..ef40db7b40af 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
@@ -167,6 +167,10 @@ void resolvesJUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails() throws Exce
 
 		var suiteDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertRunnerTestDescriptor(suiteDescriptor, suiteClass);
+		assertThat(suiteDescriptor.getDisplayName()).describedAs("display name") //
+				.startsWith(suiteClass.getSimpleName());
+		assertThat(suiteDescriptor.getLegacyReportingName()).describedAs("legacy reporting name") //
+				.isEqualTo(suiteClass.getName());
 
 		var testClassDescriptor = getOnlyElement(suiteDescriptor.getChildren());
 		assertContainerTestDescriptor(testClassDescriptor, suiteClass, testClass);

From 4afd0fcb3cd1a3345361ca05dfe414231c1e8040 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 12 Dec 2020 11:11:00 +0100
Subject: [PATCH 0094/1433] Use fine-grained normalization for jar manifests

Instead of ignoring the entire manifest including OSGi metadata and
other attributes that may potentiallt influence the tests' outcome, we
now only include specific, inconsequential attributes such as timestamps
and the commit checksum.
---
 .../kotlin/java-library-conventions.gradle.kts     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index da74eb53f918..cd3b0b40b179 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -129,10 +129,16 @@ if (project in mavenizedProjects) {
 
 normalization {
 	runtimeClasspath {
-		// Ignore the JAR manifest when checking whether runtime classpath have changed
-		// because it contains timestamps and the commit checksum. This is used when
-		// checking whether a test task is up-to-date or can be loaded from the build cache.
-		ignore("/META-INF/MANIFEST.MF")
+		metaInf {
+			// Ignore inconsequential JAR manifest attributes such as timestamps and the commit checksum.
+			// This is used when checking whether runtime classpaths, e.g. of test tasks, have changed and
+			// improves cacheability of such tasks.
+			ignoreAttribute("Built-By")
+			ignoreAttribute("Build-Date")
+			ignoreAttribute("Build-Time")
+			ignoreAttribute("Build-Revision")
+			ignoreAttribute("Created-By")
+		}
 	}
 }
 

From 05e9fb569202b00972b07029778a2e8fbe390bdd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 13 Dec 2020 14:30:01 +0100
Subject: [PATCH 0095/1433] Introduce utility method for processing all
 destroyed test instances

The new utility method helps to ensure all test instances are processed
by a `TestInstancePreDestroyCallback` when used in conjunction with
`@Nested` tests.

Resolves #2430.
---
 .../release-notes/release-notes-5.7.1.adoc    |   2 +
 .../TestInstancePreDestroyCallback.java       |  67 ++++++++++-
 .../ExtensionComposabilityTests.java          |   3 +
 .../engine/TestInstanceLifecycleTests.java    |   1 +
 ...ePreDestroyCallbackUtilityMethodTests.java | 111 ++++++++++++++++++
 5 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index ffd50079431c..f64441794e82 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -54,6 +54,8 @@ GitHub.
 ==== New Features and Improvements
 
 * The user guide now explains Nested Tests in more detail.
+* New utility method in `TestInstancePreDestroyCallback` helps to ensure all test
+  instances are processed when used in conjunction with `@Nested` tests.
 
 
 [[release-notes-5.7.1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
index d64b4bee0807..815d89cedc3f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
@@ -10,9 +10,18 @@
 
 package org.junit.jupiter.api.extension;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
 
 /**
  * {@code TestInstancePreDestroyCallback} defines the API for {@link Extension
@@ -24,9 +33,9 @@
  *
  * <p>Extensions that implement {@code TestInstancePreDestroyCallback} must be
  * registered at the class level if the test class is configured with
- * {@link org.junit.jupiter.api.TestInstance.Lifecycle @TestInstance(Lifecycle.PER_CLASS)}
+ * {@link Lifecycle @TestInstance(Lifecycle.PER_CLASS)}
  * semantics. If the test class is configured with
- * {@link org.junit.jupiter.api.TestInstance.Lifecycle @TestInstance(Lifecycle.PER_METHOD)}
+ * {@link Lifecycle @TestInstance(Lifecycle.PER_METHOD)}
  * semantics, {@code TestInstancePreDestroyCallback} extensions may be registered
  * at the class level or at the method level. In the latter case, the
  * {@code TestInstancePreDestroyCallback} extension will only be applied to the
@@ -48,12 +57,64 @@
 public interface TestInstancePreDestroyCallback extends Extension {
 
 	/**
-	 * Callback for processing a test instance before it is destroyed.
+	 * Callback for processing test instances before they are destroyed.
+	 *
+	 * <p>Contrary to {@link TestInstancePostProcessor#postProcessTestInstance}
+	 * this method is only called once for each {@link ExtensionContext} even if
+	 * there are multiple test instances about to be destroyed in case of
+	 * {@link Nested @Nested} tests. Please use the provided
+	 * {@link #preDestroyTestInstances(ExtensionContext, Consumer)} utility
+	 * method to ensure that all test instances are handled.
 	 *
 	 * @param context the current extension context; never {@code null}
 	 * @see ExtensionContext#getTestInstance()
 	 * @see ExtensionContext#getRequiredTestInstance()
+	 * @see ExtensionContext#getTestInstances()
+	 * @see ExtensionContext#getRequiredTestInstances()
+	 * @see #preDestroyTestInstances(ExtensionContext, Consumer)
 	 */
 	void preDestroyTestInstance(ExtensionContext context) throws Exception;
 
+	/**
+	 * Utility method for processing <em>all</em> test instances of an
+	 * {@link ExtensionContext} that are not present in any of its parent
+	 * contexts.
+	 *
+	 * <p>This method should be called in order to implement this interface
+	 * correctly since it ensures that the right test instances are processed
+	 * regardless of the used {@linkplain Lifecycle lifecycle}. The supplied
+	 * callback is called once per test instance that is about to be destroyed
+	 * starting with the innermost one.
+	 *
+	 * <p>This method is intended to be called from an implementation of
+	 * {@link #preDestroyTestInstance(ExtensionContext)} like this:
+	 *
+	 * <pre>{@code
+	 * class MyExtension implements TestInstancePreDestroyCallback {
+	 *     @Override
+	 *     public void preDestroyTestInstance(ExtensionContext context) {
+	 *         TestInstancePreDestroyCallback.preDestroyTestInstances(context, testInstance -> {
+	 *             // custom logic that processes testInstance
+	 *         });
+	 *     }
+	 * }
+	 * }</pre>
+	 *
+	 * @param context the current extension context; never {@code null}
+	 * @param callback the callback to be invoked for every test instance of the
+	 * current extension context that is about to be destroyed; never
+	 * {@code null}
+	 * @since 5.7.1
+	 */
+	@API(status = EXPERIMENTAL, since = "5.7.1")
+	static void preDestroyTestInstances(ExtensionContext context, Consumer<Object> callback) {
+		List<Object> destroyedInstances = new ArrayList<>(context.getRequiredTestInstances().getAllInstances());
+		for (Optional<ExtensionContext> current = context.getParent(); current.isPresent(); current = current.get().getParent()) {
+			current.get().getTestInstances().map(TestInstances::getAllInstances).ifPresent(
+				destroyedInstances::removeAll);
+		}
+		Collections.reverse(destroyedInstances);
+		destroyedInstances.forEach(callback);
+	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
index e76933bc0c0e..254cd4e25095 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
@@ -14,8 +14,10 @@
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.platform.commons.util.FunctionUtils.where;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.List;
@@ -51,6 +53,7 @@ void ensureJupiterExtensionApisAreComposable() {
 				.map(Class::getDeclaredMethods)
 				.flatMap(Arrays::stream)
 				.filter(not(Method::isSynthetic))
+				.filter(not(where(Method::getModifiers, Modifier::isStatic)))
 				.collect(toList());
 
 		List<String> expectedMethodSignatures = expectedMethods.stream()
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
index b9f53f743602..fd160212ff55 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
@@ -455,6 +455,7 @@ void instancePerClassWithNestedTestClass() {
 		assertSame(nestedInstance, instanceMap.get(nestedPreDestroyCallbackTestInstanceKey).getInnermostInstance());
 
 		Object outerInstance = instanceMap.get(nestedExecutionConditionKey1).findInstance(testClass).get();
+		assertSame(outerInstance, instance);
 		assertSame(outerInstance, instanceMap.get(postProcessTestInstanceKey).getInnermostInstance());
 		assertSame(outerInstance, instanceMap.get(preDestroyCallbackTestInstanceKey).getInnermostInstance());
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
new file mode 100644
index 000000000000..f6f5c3908239
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.platform.testkit.engine.EventConditions.event;
+import static org.junit.platform.testkit.engine.EventConditions.reportEntry;
+import static org.junit.platform.testkit.engine.EventConditions.started;
+import static org.junit.platform.testkit.engine.EventConditions.test;
+
+import java.util.Map;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
+import org.junit.jupiter.api.extension.TestInstancePreDestroyCallback;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+
+public class TestInstancePreDestroyCallbackUtilityMethodTests extends AbstractJupiterTestEngineTests {
+
+	@TestFactory
+	Stream<DynamicTest> destroysWhatWasPostProcessed() {
+		var testClasses = Stream.of(PerMethodLifecycleOnAllLevels.class, PerMethodWithinPerClassLifecycle.class,
+			PerClassWithinPerMethodLifecycle.class, PerClassLifecycleOnAllLevels.class);
+		return testClasses.map(testClass -> dynamicTest( //
+			testClass.getSimpleName(), //
+			() -> executeTestsForClass(testClass).allEvents().debug() //
+					.assertStatistics(stats -> stats.reportingEntryPublished(4)) //
+					.assertEventsMatchLooselyInOrder( //
+						reportEntry(Map.of("post-process", testClass.getSimpleName())),
+						reportEntry(Map.of("post-process", "Inner")), //
+						event(test(), started()), //
+						reportEntry(Map.of("pre-destroy", "Inner")), //
+						reportEntry(Map.of("pre-destroy", testClass.getSimpleName())) //
+					)));
+	}
+
+	@ExtendWith(TestInstanceLifecycleExtension.class)
+	static class PerMethodLifecycleOnAllLevels {
+		@Nested
+		class Inner {
+			@Test
+			void test() {
+			}
+		}
+	}
+
+	@ExtendWith(TestInstanceLifecycleExtension.class)
+	@TestInstance(PER_CLASS)
+	static class PerMethodWithinPerClassLifecycle {
+		@Nested
+		class Inner {
+			@Test
+			void test() {
+			}
+		}
+	}
+
+	@ExtendWith(TestInstanceLifecycleExtension.class)
+	static class PerClassWithinPerMethodLifecycle {
+		@Nested
+		@TestInstance(PER_CLASS)
+		class Inner {
+			@Test
+			void test() {
+			}
+		}
+	}
+
+	@ExtendWith(TestInstanceLifecycleExtension.class)
+	@TestInstance(PER_CLASS)
+	static class PerClassLifecycleOnAllLevels {
+		@Nested
+		@TestInstance(PER_CLASS)
+		class Inner {
+			@Test
+			void test() {
+			}
+		}
+	}
+
+	private static class TestInstanceLifecycleExtension
+			implements TestInstancePostProcessor, TestInstancePreDestroyCallback {
+
+		@Override
+		public void postProcessTestInstance(Object testInstance, ExtensionContext context) {
+			context.publishReportEntry("post-process", testInstance.getClass().getSimpleName());
+		}
+
+		@Override
+		public void preDestroyTestInstance(ExtensionContext context) {
+			TestInstancePreDestroyCallback.preDestroyTestInstances(context,
+				testInstance -> context.publishReportEntry("pre-destroy", testInstance.getClass().getSimpleName()));
+		}
+	}
+}

From 40102f747192cd4a15456c92141dfefce9f87c47 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 13 Dec 2020 15:15:33 +0100
Subject: [PATCH 0096/1433] Improve Javadoc formatting

---
 .../TestInstancePreDestroyCallback.java        | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
index 815d89cedc3f..f9509fdcee7a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
@@ -89,16 +89,14 @@ public interface TestInstancePreDestroyCallback extends Extension {
 	 * <p>This method is intended to be called from an implementation of
 	 * {@link #preDestroyTestInstance(ExtensionContext)} like this:
 	 *
-	 * <pre>{@code
-	 * class MyExtension implements TestInstancePreDestroyCallback {
-	 *     @Override
-	 *     public void preDestroyTestInstance(ExtensionContext context) {
-	 *         TestInstancePreDestroyCallback.preDestroyTestInstances(context, testInstance -> {
-	 *             // custom logic that processes testInstance
-	 *         });
-	 *     }
-	 * }
-	 * }</pre>
+	 * <pre>{@code class MyExtension implements TestInstancePreDestroyCallback {
+	 *    @Override
+	 *    public void preDestroyTestInstance(ExtensionContext context) {
+	 *        TestInstancePreDestroyCallback.preDestroyTestInstances(context, testInstance -> {
+	 *            // custom logic that processes testInstance
+	 *        });
+	 *    }
+	 *}}</pre>
 	 *
 	 * @param context the current extension context; never {@code null}
 	 * @param callback the callback to be invoked for every test instance of the

From 999c3abc782981a6d1564c4681ef6559a30b6a28 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 15 Dec 2020 20:12:13 +0100
Subject: [PATCH 0097/1433] Add JDK 17 build

---
 .github/workflows/cross-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index bd50c289812d..f6094e86692e 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -18,7 +18,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [16]
+        jdk: [16, 17]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     container: "ghcr.io/junit-team/build:${{ matrix.jdk }}"

From 69c9f12402b7102f6fba5a77eff7f867da2c3b07 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 15 Dec 2020 20:37:54 +0100
Subject: [PATCH 0098/1433] Add temporary workaround for JavaCompile tasks

---
 buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index d50db99d8856..7d97f10b2479 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -16,6 +16,8 @@ project.pluginManager.withPlugin("java") {
 	}
 	tasks.withType<JavaCompile>().configureEach {
 		javaCompiler.set(compiler)
+		// Temporary workaround for https://github.com/gradle/gradle/issues/15538
+		options.forkOptions.jvmArgs!!.addAll(listOf("--add-opens", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"))
 	}
 	tasks.withType<GroovyCompile>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor {

From 24612eda66861c71d8a230c74de38f03ebd8f551 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 15 Dec 2020 20:42:27 +0100
Subject: [PATCH 0099/1433] Add JRE.JAVA_17

---
 .../release-notes/release-notes-5.7.1.adoc        |  1 +
 .../java/org/junit/jupiter/api/condition/JRE.java | 14 ++++++++++++--
 .../DisabledForJreRangeConditionTests.java        |  3 ++-
 .../DisabledForJreRangeIntegrationTests.java      |  3 ++-
 .../condition/DisabledOnJreConditionTests.java    | 12 +++++++++++-
 .../condition/DisabledOnJreIntegrationTests.java  | 12 ++++++++++--
 .../EnabledForJreRangeConditionTests.java         |  3 ++-
 .../EnabledForJreRangeIntegrationTests.java       |  6 ++++--
 .../api/condition/EnabledOnJreConditionTests.java | 12 +++++++++++-
 .../condition/EnabledOnJreIntegrationTests.java   | 15 +++++++++++++--
 10 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index f64441794e82..4b776d75d361 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -56,6 +56,7 @@ GitHub.
 * The user guide now explains Nested Tests in more detail.
 * New utility method in `TestInstancePreDestroyCallback` helps to ensure all test
   instances are processed when used in conjunction with `@Nested` tests.
+* `JAVA_17` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-5.7.1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index f72a69a2068f..97dea28c3bc8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -106,11 +106,19 @@ public enum JRE {
 	@API(status = STABLE, since = "5.7")
 	JAVA_16,
 
+	/**
+	 * Java 17.
+	 *
+	 * @since 5.7.1
+	 */
+	@API(status = STABLE, since = "5.7.1")
+	JAVA_17,
+
 	/**
 	 * A JRE version other than {@link #JAVA_8}, {@link #JAVA_9},
 	 * {@link #JAVA_10}, {@link #JAVA_11}, {@link #JAVA_12},
-	 * {@link #JAVA_13}, {@link #JAVA_14}, {@link #JAVA_15}, or
-	 * {@link #JAVA_16}.
+	 * {@link #JAVA_13}, {@link #JAVA_14}, {@link #JAVA_15},
+	 * {@link #JAVA_16}, or {@link #JAVA_17}.
 	 */
 	OTHER;
 
@@ -156,6 +164,8 @@ private static JRE determineCurrentVersion() {
 					return JAVA_15;
 				case 16:
 					return JAVA_16;
+				case 17:
+					return JAVA_17;
 				default:
 					return OTHER;
 			}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index 12e8f810689e..d4ac17ad137e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -18,6 +18,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -118,7 +119,7 @@ void javaMin10() {
 	void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16()));
+				|| onJava14() || onJava15() || onJava16() || onJava17()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index a3e7ff1b744e..e6433a92deb1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -85,7 +86,7 @@ void javaMin10() {
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16());
+				|| onJava15() || onJava16() || onJava17());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index e009330c952f..459a95adaf57 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -156,6 +157,15 @@ void java16() {
 		assertDisabledOnCurrentJreIf(onJava16());
 	}
 
+	/**
+	 * @see DisabledOnJreIntegrationTests#java17()
+	 */
+	@Test
+	void java17() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(onJava17());
+	}
+
 	/**
 	 * @see DisabledOnJreIntegrationTests#other()
 	 */
@@ -163,7 +173,7 @@ void java16() {
 	void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16()));
+				|| onJava14() || onJava15() || onJava16() || onJava17()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 8fd050cc6166..16bd2d922e53 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -29,6 +30,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_14;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 import static org.junit.jupiter.api.condition.JRE.JAVA_16;
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -55,7 +57,7 @@ void missingJreDeclaration() {
 	}
 
 	@Test
-	@DisabledOnJre(value = { JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16,
+	@DisabledOnJre(value = { JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17,
 			OTHER }, disabledReason = "Disabled on every JRE")
 	void disabledOnAllJavaVersions() {
 		fail("should be disabled");
@@ -115,11 +117,17 @@ void java16() {
 		assertFalse(onJava16());
 	}
 
+	@Test
+	@DisabledOnJre(JAVA_17)
+	void java17() {
+		assertFalse(onJava17());
+	}
+
 	@Test
 	@DisabledOnJre(OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16());
+				|| onJava15() || onJava16() || onJava17());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 0206555fd256..135e7a47f92e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -18,6 +18,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -118,7 +119,7 @@ void javaMin10() {
 	void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16()));
+				|| onJava14() || onJava15() || onJava16() || onJava17()));
 	}
 
 	private void assertEnabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index 218b4a236d33..8aacf053e46a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -81,7 +82,8 @@ void javaMax12() {
 	@Test
 	@EnabledForJreRange(min = JAVA_10)
 	void javaMin10() {
-		assertTrue(onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15() || onJava16());
+		assertTrue(onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15() || onJava16()
+				|| onJava17());
 		assertFalse(onJava9());
 	}
 
@@ -89,7 +91,7 @@ void javaMin10() {
 	@EnabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16());
+				|| onJava15() || onJava16() || onJava17());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index bb3111d6d96a..fbda32fcd4c5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -155,6 +156,15 @@ void java16() {
 		assertEnabledOnCurrentJreIf(onJava16());
 	}
 
+	/**
+	 * @see EnabledOnJreIntegrationTests#java17()
+	 */
+	@Test
+	void java17() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(onJava17());
+	}
+
 	/**
 	 * @see EnabledOnJreIntegrationTests#other()
 	 */
@@ -162,7 +172,7 @@ void java16() {
 	void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16()));
+				|| onJava14() || onJava15() || onJava16() || onJava17()));
 		assertCustomDisabledReasonIs("Disabled on almost every JRE");
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index 9299b994e78d..8fb9d0902ca6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_14;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 import static org.junit.jupiter.api.condition.JRE.JAVA_16;
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -47,7 +48,7 @@ void missingJreDeclaration() {
 	}
 
 	@Test
-	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, OTHER })
+	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17, OTHER })
 	void enabledOnAllJavaVersions() {
 	}
 
@@ -105,11 +106,17 @@ void java16() {
 		assertTrue(onJava16());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_17)
+	void java17() {
+		assertTrue(onJava17());
+	}
+
 	@Test
 	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16());
+				|| onJava15() || onJava16() || onJava17());
 	}
 
 	static boolean onJava8() {
@@ -148,4 +155,8 @@ static boolean onJava16() {
 		return JAVA_VERSION.startsWith("16");
 	}
 
+	static boolean onJava17() {
+		return JAVA_VERSION.startsWith("17");
+	}
+
 }

From 7726e0e17db94538b788a0e9c91f28ae081b1b82 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 15 Dec 2020 21:49:09 +0100
Subject: [PATCH 0100/1433] Fix Kotlin compiler warnings in buildSrc

---
 buildSrc/build.gradle.kts                            | 12 ++++++++++++
 .../src/main/kotlin/java-repackage-jars.gradle.kts   |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index e73569dac287..4e93d887d722 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
 	`kotlin-dsl`
 }
@@ -14,3 +16,13 @@ dependencies {
 	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.0")
 }
+
+kotlinDslPluginOptions {
+	experimentalWarning.set(false)
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+	kotlinOptions {
+		allWarningsAsErrors = true
+	}
+}
diff --git a/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts b/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts
index 507255835218..a000989b0327 100644
--- a/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts
@@ -2,6 +2,7 @@ import java.util.jar.JarEntry
 import java.util.jar.JarFile
 import java.util.jar.JarOutputStream
 import org.gradle.api.internal.file.archive.ZipCopyAction
+import java.nio.file.Files
 
 // This registers a `doLast` action to rewrite the timestamps of the project's output JAR
 afterEvaluate {
@@ -9,8 +10,8 @@ afterEvaluate {
 
 	jarTask.doLast {
 
-		val newFile = createTempFile("rewrite-timestamp")
-		val originalOutput = jarTask.archiveFile.get().getAsFile()
+		val newFile = Files.createTempFile("rewrite-timestamp", null).toFile()
+		val originalOutput = jarTask.archiveFile.get().asFile
 
 		newFile.outputStream().use { os ->
 

From 591ef5487e5e1c12c1997b4d2959778fb23c1bd5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 15 Dec 2020 21:49:59 +0100
Subject: [PATCH 0101/1433] Add default constructors explicitly

---
 .../kotlin/java-library-conventions.gradle.kts     |  2 +-
 .../junit/jupiter/api/DisplayNameGenerator.java    | 12 ++++++++++++
 .../java/org/junit/jupiter/api/MethodOrderer.java  | 14 ++++++++++++++
 .../engine/config/DefaultJupiterConfiguration.java |  2 +-
 .../engine/descriptor/DisplayNameUtils.java        | 12 ++++++++----
 .../platform/engine/reporting/ReportEntry.java     |  9 +++++++++
 .../hierarchical/HierarchicalTestEngine.java       |  3 +++
 .../SameThreadHierarchicalTestExecutorService.java |  3 +++
 8 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index cd3b0b40b179..137355d7b451 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -155,9 +155,9 @@ val compileModule by tasks.registering(JavaCompile::class) {
 	classpath = files()
 	options.release.set(9)
 	options.compilerArgs.addAll(listOf(
-			// "-verbose",
 			// Suppress warnings for automatic modules: org.apiguardian.api, org.opentest4j
 			"-Xlint:all,-requires-automatic,-requires-transitive-automatic",
+			"-Werror", // Terminates compilation when warnings occur.
 			"--module-version", "${project.version}",
 			"--module-source-path", files(modularProjects.map { "${it.projectDir}/src/module" }).asPath
 	))
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 42bb9821057c..94bba94d3bf1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -92,6 +92,9 @@ class Standard implements DisplayNameGenerator {
 
 		static final DisplayNameGenerator INSTANCE = new Standard();
 
+		public Standard() {
+		}
+
 		@Override
 		public String generateDisplayNameForClass(Class<?> testClass) {
 			String name = testClass.getName();
@@ -122,6 +125,9 @@ class Simple extends Standard {
 
 		static final DisplayNameGenerator INSTANCE = new Simple();
 
+		public Simple() {
+		}
+
 		@Override
 		public String generateDisplayNameForMethod(Class<?> testClass, Method testMethod) {
 			String displayName = testMethod.getName();
@@ -148,6 +154,9 @@ class ReplaceUnderscores extends Simple {
 
 		static final DisplayNameGenerator INSTANCE = new ReplaceUnderscores();
 
+		public ReplaceUnderscores() {
+		}
+
 		@Override
 		public String generateDisplayNameForClass(Class<?> testClass) {
 			return replaceUnderscores(super.generateDisplayNameForClass(testClass));
@@ -185,6 +194,9 @@ class IndicativeSentences implements DisplayNameGenerator {
 
 		static final DisplayNameGenerator INSTANCE = new IndicativeSentences();
 
+		public IndicativeSentences() {
+		}
+
 		@Override
 		public String generateDisplayNameForClass(Class<?> testClass) {
 			return getGeneratorForIndicativeSentence(testClass).generateDisplayNameForClass(testClass);
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 9e57b0b28dcd..59d8f1318034 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -123,6 +123,8 @@ default Optional<ExecutionMode> getDefaultExecutionMode() {
 	@Deprecated
 	class Alphanumeric extends MethodName {
 
+		public Alphanumeric() {
+		}
 	}
 	/**
 	 * {@code MethodOrderer} that sorts methods alphanumerically based on their
@@ -136,6 +138,9 @@ class Alphanumeric extends MethodName {
 	@API(status = EXPERIMENTAL, since = "5.7")
 	class MethodName implements MethodOrderer {
 
+		public MethodName() {
+		}
+
 		/**
 		 * Sort the methods encapsulated in the supplied
 		 * {@link MethodOrdererContext} alphanumerically based on their names
@@ -164,6 +169,9 @@ private static String parameterList(Method method) {
 	@API(status = EXPERIMENTAL, since = "5.7")
 	class DisplayName implements MethodOrderer {
 
+		public DisplayName() {
+		}
+
 		/**
 		 * Sort the methods encapsulated in the supplied
 		 * {@link MethodOrdererContext} alphanumerically based on their display
@@ -195,6 +203,9 @@ public void orderMethods(MethodOrdererContext context) {
 	 */
 	class OrderAnnotation implements MethodOrderer {
 
+		public OrderAnnotation() {
+		}
+
 		/**
 		 * Sort the methods encapsulated in the supplied
 		 * {@link MethodOrdererContext} based on the {@link Order @Order}
@@ -260,6 +271,9 @@ class Random implements MethodOrderer {
 		 */
 		public static final String RANDOM_SEED_PROPERTY_NAME = "junit.jupiter.execution.order.random.seed";
 
+		public Random() {
+		}
+
 		/**
 		 * Order the methods encapsulated in the supplied
 		 * {@link MethodOrdererContext} pseudo-randomly.
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index fe5b65b3acd4..13fdd46218ba 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -100,7 +100,7 @@ public Predicate<ExecutionCondition> getExecutionConditionFilter() {
 	@Override
 	public DisplayNameGenerator getDefaultDisplayNameGenerator() {
 		return displayNameGeneratorConverter.get(configurationParameters, DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME) //
-				.orElseGet(DisplayNameGenerator.Standard::new);
+				.orElseGet(() -> DisplayNameGenerator.getDisplayNameGenerator(DisplayNameGenerator.Standard.class));
 	}
 
 	@Override
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
index eb5cc106ccb8..1d1de39d685f 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -46,22 +46,26 @@ final class DisplayNameUtils {
 	/**
 	 * Pre-defined standard display name generator instance.
 	 */
-	private static final DisplayNameGenerator standardGenerator = new Standard();
+	private static final DisplayNameGenerator standardGenerator = DisplayNameGenerator.getDisplayNameGenerator(
+		Standard.class);
 
 	/**
 	 * Pre-defined simple display name generator instance.
 	 */
-	private static final DisplayNameGenerator simpleGenerator = new Simple();
+	private static final DisplayNameGenerator simpleGenerator = DisplayNameGenerator.getDisplayNameGenerator(
+		Simple.class);
 
 	/**
 	 * Pre-defined display name generator instance replacing underscores.
 	 */
-	private static final DisplayNameGenerator replaceUnderscoresGenerator = new ReplaceUnderscores();
+	private static final DisplayNameGenerator replaceUnderscoresGenerator = DisplayNameGenerator.getDisplayNameGenerator(
+		ReplaceUnderscores.class);
 
 	/**
 	 * Pre-defined display name generator instance producing indicative sentences.
 	 */
-	private static final DisplayNameGenerator indicativeSentencesGenerator = new IndicativeSentences();
+	private static final DisplayNameGenerator indicativeSentencesGenerator = DisplayNameGenerator.getDisplayNameGenerator(
+		IndicativeSentences.class);
 
 	static String determineDisplayName(AnnotatedElement element, Supplier<String> displayNameSupplier) {
 		Preconditions.notNull(element, "Annotated element must not be null");
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
index fa40437d52cb..6eb2ccaed2d9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.reporting;
 
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.time.LocalDateTime;
@@ -35,6 +36,14 @@ public final class ReportEntry {
 	private final LocalDateTime timestamp = LocalDateTime.now();
 	private final Map<String, String> keyValuePairs = new LinkedHashMap<>();
 
+	/**
+	 * @deprecated Use {@link #from(String, String)} or {@link #from(Map)}
+	 */
+	@API(status = DEPRECATED, since = "5.8")
+	@Deprecated
+	public ReportEntry() {
+	}
+
 	/**
 	 * Factory for creating a new {@code ReportEntry} from a map of key-value pairs.
 	 *
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
index 7506965c9f9a..ee8fbe153eb2 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
@@ -29,6 +29,9 @@
 @API(status = MAINTAINED, since = "1.0")
 public abstract class HierarchicalTestEngine<C extends EngineExecutionContext> implements TestEngine {
 
+	public HierarchicalTestEngine() {
+	}
+
 	/**
 	 * Create an {@linkplain #createExecutorService(ExecutionRequest) executor
 	 * service}; create an initial {@linkplain #createExecutionContext execution
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
index 024aa3691360..5a5c3d3b8d68 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
@@ -27,6 +27,9 @@
 @API(status = EXPERIMENTAL, since = "1.3")
 public class SameThreadHierarchicalTestExecutorService implements HierarchicalTestExecutorService {
 
+	public SameThreadHierarchicalTestExecutorService() {
+	}
+
 	@Override
 	public Future<Void> submit(TestTask testTask) {
 		testTask.execute();

From 637a78393194737e77d6f9681ad93e9ddac1f399 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 15 Dec 2020 21:50:17 +0100
Subject: [PATCH 0102/1433] Fix Kotlin compiler warning in test code

---
 buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts   | 1 +
 .../junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index 3342cd189501..9f0d594d327a 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -10,5 +10,6 @@ tasks.withType<KotlinCompile>().configureEach {
 		jvmTarget = Versions.jvmTarget.toString()
 		apiVersion = "1.3"
 		languageVersion = "1.3"
+		allWarningsAsErrors = true
 	}
 }
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
index 9d4d7a9d5e62..a7ba382c5d69 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
@@ -17,6 +17,7 @@ class ArbitraryNamingKotlinTestCase {
         val METHOD_NAME = "\uD83E\uDD86 ~|~test with a really, (really) terrible name & that needs to be changed!~|~"
     }
 
+    @Suppress("DANGEROUS_CHARACTERS")
     @Test
     fun `🦆 ~|~test with a really, (really) terrible name & that needs to be changed!~|~`() { }
 

From 29bd012157992f90d4fcd711f22a1bd659fa7a1c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 17 Dec 2020 20:24:31 +0100
Subject: [PATCH 0103/1433] Upgradle to 6.8-rc-3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 33de58d960ab..4adb35dc8035 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=155bafc3a46f81b7af481ad7dba391a3b9c12818f27da8684178ffeaa40e6d7e
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
+distributionSha256Sum=6c929633a439d248413d3d1bff477195ee662ccadc6fdc31f6f50f8059a2be36
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 4035759b00662f5e545eacec56b5bd7c48f1132b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 17 Dec 2020 20:16:13 +0100
Subject: [PATCH 0104/1433] Upgrade ArchUnit to 0.15.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 2c7505dc7b08..f7bbdb97980a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@ picocli.version=4.5.0
 univocity-parsers.version=2.9.0
 
 # Test Dependencies
-archunit.version=0.14.1
+archunit.version=0.15.0
 bartholdy.version=0.2.3
 classgraph.version=4.8.87
 commons-io.version=2.7

From 1d41adde0c53489f11ac1c16e1799ea76093edee Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 18 Dec 2020 20:38:18 +0100
Subject: [PATCH 0105/1433] Make it easier to dogfood junit-platform-jfr

Then running the build with -PenableJFR we now capture a JFR recording
in the test task's output folder. It's not enabled by default since the
recording may contain potentially sensitive data, e.g. environement
variables or system properties.
---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 9 +++++++++
 platform-tests/platform-tests.gradle.kts                | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 57a97e90247d..eb005c6d05df 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -20,6 +20,14 @@ tasks.withType<Test>().configureEach {
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 	// Required until ASM officially supports the JDK 14
 	systemProperty("net.bytebuddy.experimental", true)
+	if (project.hasProperty("enableJFR")) {
+		jvmArgs(
+			"-XX:+UnlockDiagnosticVMOptions",
+			"-XX:+DebugNonSafepoints",
+			"-XX:StartFlightRecording=filename=${reports.junitXml.destination},dumponexit=true,settings=profile.jfc",
+			"-XX:FlightRecorderOptions=stackdepth=1024"
+		)
+	}
 }
 
 dependencies {
@@ -37,6 +45,7 @@ dependencies {
 	"testImplementation"(testFixtures(project(":junit-jupiter-api")))
 
 	"testRuntimeOnly"(project(":junit-platform-launcher"))
+	"testRuntimeOnly"(project(":junit-platform-jfr"))
 
 	"testRuntimeOnly"("org.apache.logging.log4j:log4j-core")
 	"testRuntimeOnly"("org.apache.logging.log4j:log4j-jul")
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 89662f6ee73d..2d25b3005045 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -53,7 +53,7 @@ tasks {
 		useJUnitPlatform {
 			excludeTags("exclude")
 		}
-		jvmArgs = listOf("-Xmx1g")
+		jvmArgs("-Xmx1g")
 	}
 	test_4_12 {
 		useJUnitPlatform {

From bb6adb89498f15f365b1ecbfb2489bf537539e98 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Dec 2020 12:14:13 +0100
Subject: [PATCH 0106/1433] Make line wrapping more consistent

---
 .../asciidoc/release-notes/release-notes-5.8.0-M1.adoc    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index b253ab9af374..c4fd5e82c249 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -19,9 +19,11 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , ExtensionContext)` has been deprecated in favor of
-  `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , DynamicTestInvocationContext, ExtensionContext)` that
-  allows to access the dynamic test executable via `DynamicTestInvocationContext.getExecutable()`.
+* `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , ExtensionContext)` has
+  been deprecated in favor of
+  `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , DynamicTestInvocationContext, ExtensionContext)`
+  that allows to access the dynamic test executable via
+  `DynamicTestInvocationContext.getExecutable()`.
 
 ==== New Features and Improvements
 

From 84f6ad9a9420c32b52d2479e7acf1663edbb6f36 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Dec 2020 12:19:56 +0100
Subject: [PATCH 0107/1433] Remove "experimental" warning on promoted APIs

---
 .../docs/asciidoc/user-guide/migration-from-junit4.adoc    | 6 ------
 .../src/docs/asciidoc/user-guide/running-tests.adoc        | 4 ----
 documentation/src/docs/asciidoc/user-guide/testkit.adoc    | 4 ----
 .../src/docs/asciidoc/user-guide/writing-tests.adoc        | 7 -------
 4 files changed, 21 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
index b3fb1ded6ed8..9f939692c1cf 100644
--- a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
@@ -98,9 +98,6 @@ all rule migration support extensions: `VerifierSupport`, `ExternalResourceSuppo
 However, if you intend to develop a new extension for JUnit 5 please use the new
 extension model of JUnit Jupiter instead of the rule-based model of JUnit 4.
 
-WARNING: JUnit 4 `Rule` support in JUnit Jupiter is currently an _experimental_ feature.
-Consult the table in <<api-evolution-experimental-apis>> for detail.
-
 
 [[migrating-from-junit4-ignore-annotation-support]]
 === JUnit 4 @Ignore Support
@@ -121,6 +118,3 @@ automatically registers the `IgnoreCondition` along with
 ----
 include::{testDir}/example/IgnoredTestsDemo.java[tags=user_guide]
 ----
-
-WARNING: JUnit 4 `@Ignore` support in JUnit Jupiter is currently an _experimental_
-feature. Consult the table in <<api-evolution-experimental-apis>> for detail.
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 5adb80db0fc7..6f609123b09f 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -825,10 +825,6 @@ because particularly when
 <<writing-tests-parallel-execution, executing tests in parallel>> it would be impossible
 to attribute it to a specific test or container.
 
-WARNING: Capturing output is currently an _experimental_ feature. You're invited to give
-it a try and provide feedback to the JUnit team so they can improve and eventually
-<<api-evolution, promote>> this feature.
-
 [[running-tests-flight-recorder]]
 === Flight Recorder Support
 
diff --git a/documentation/src/docs/asciidoc/user-guide/testkit.adoc b/documentation/src/docs/asciidoc/user-guide/testkit.adoc
index 32658381eaff..665c4daea788 100644
--- a/documentation/src/docs/asciidoc/user-guide/testkit.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/testkit.adoc
@@ -5,10 +5,6 @@ The `junit-platform-testkit` artifact provides support for executing a test plan
 JUnit Platform and then verifying the expected results. As of JUnit Platform 1.4, this
 support is limited to the execution of a single `TestEngine` (see <<testkit-engine>>).
 
-WARNING: Although the Test Kit is currently an <<api-evolution-experimental-apis,
-_experimental_>> feature, the JUnit Team invites you to try it out and provide feedback to
-help improve the Test Kit APIs and eventually <<api-evolution, promote>> this feature.
-
 [[testkit-engine]]
 ==== Engine Test Kit
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index e6967618c75b..4e4500018543 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1010,9 +1010,6 @@ palindromes(String) ✔
 └─ [3] candidate=able was I ere I saw elba ✔
 ....
 
-WARNING: Parameterized tests are currently an _experimental_ feature. Consult the table
-in <<api-evolution-experimental-apis>> for details.
-
 [[writing-tests-parameterized-tests-setup]]
 ==== Required Setup
 
@@ -1739,10 +1736,6 @@ implementations.
 [[writing-tests-declarative-timeouts]]
 === Timeouts
 
-.Declarative timeouts are an experimental feature
-WARNING: You're invited to give it a try and provide feedback to the JUnit team so they
-can improve and eventually <<api-evolution, promote>> this feature.
-
 The `@Timeout` annotation allows one to declare that a test, test factory, test template,
 or lifecycle method should fail if its execution time exceeds a given duration. The time
 unit for the duration defaults to seconds but is configurable.

From a8d08e0164a52266dc38cad2b82a05bfae459127 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Dec 2020 10:41:57 +0100
Subject: [PATCH 0108/1433] Report containers as JFR events

Prior to this commit only tests were reported as JFR events. However,
it's also useful to see events for containers, e.g. test classes, in
particular when they require expensive setup that causes other JFR
events such as garbage collection.

Moreover, this commit adds an integration test using the new JfrUnit
Jupiter extension.
---
 build.gradle.kts                              |  6 +-
 dependencies/dependencies.gradle.kts          |  1 +
 .../release-notes/release-notes-5.8.0-M1.adoc |  2 +
 gradle.properties                             |  1 +
 .../platform/jfr/FlightRecordingListener.java | 20 ++---
 platform-tests/platform-tests.gradle.kts      |  2 +
 ...ightRecordingListenerIntegrationTests.java | 83 +++++++++++++++++++
 7 files changed, 102 insertions(+), 13 deletions(-)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingListenerIntegrationTests.java

diff --git a/build.gradle.kts b/build.gradle.kts
index e3bfa95a1c9b..bd68f106495a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -98,13 +98,17 @@ allprojects {
 	}
 
 	repositories {
-		// mavenLocal()
 		mavenCentral()
 		maven(url = "https://oss.sonatype.org/content/repositories/snapshots") {
 			mavenContent {
 				snapshotsOnly()
 			}
 		}
+		maven(url = "https://jitpack.io") {
+			mavenContent {
+				includeModule("com.github.gunnarmorling", "jfrunit")
+			}
+		}
 	}
 }
 
diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 090ab495abd5..27c846279ade 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -33,5 +33,6 @@ dependencies {
 		api("org.mockito:mockito-junit-jupiter:${versions["mockito"]}")
 		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
 		api("org.spockframework:spock-core:${versions["spock"]}")
+		api("com.github.gunnarmorling:jfrunit:${versions["jfrunit"]}")
 	}
 }
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index c4fd5e82c249..e5d86fe33fbe 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -32,6 +32,8 @@ on GitHub.
   nested container events when using the `EngineTestKit`. For example,
   `test(displayName("my test"))` can be used to match against a test whose display name is
   `my test`.
+* The `junit-platform-jfr` module now also reports events for containers, e.g. test
+  classes.
 
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
diff --git a/gradle.properties b/gradle.properties
index f7bbdb97980a..a0d656aff911 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,6 +36,7 @@ log4j.version=2.13.3
 mockito.version=3.5.0
 slf4j.version=1.7.30
 spock.version=1.3-groovy-2.5
+jfrunit.version=main-SNAPSHOT
 
 # Tools
 checkstyle.version=8.36.2
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingListener.java
index 9b36cd561836..0393f12fa1ad 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingListener.java
@@ -17,7 +17,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -52,7 +51,7 @@ public class FlightRecordingListener implements TestExecutionListener {
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan plan) {
-		TestPlanExecutionEvent event = new TestPlanExecutionEvent();
+		var event = new TestPlanExecutionEvent();
 		event.containsTests = plan.containsTests();
 		event.engineNames = plan.getRoots().stream().map(TestIdentifier::getDisplayName).collect(
 			Collectors.joining(", "));
@@ -62,13 +61,13 @@ public void testPlanExecutionStarted(TestPlan plan) {
 
 	@Override
 	public void testPlanExecutionFinished(TestPlan plan) {
-		TestPlanExecutionEvent event = testPlanExecutionEvent.get();
+		var event = testPlanExecutionEvent.get();
 		event.commit();
 	}
 
 	@Override
 	public void executionSkipped(TestIdentifier test, String reason) {
-		SkippedTestEvent event = new SkippedTestEvent();
+		var event = new SkippedTestEvent();
 		event.initialize(test);
 		event.reason = reason;
 		event.commit();
@@ -76,7 +75,7 @@ public void executionSkipped(TestIdentifier test, String reason) {
 
 	@Override
 	public void executionStarted(TestIdentifier test) {
-		TestExecutionEvent event = new TestExecutionEvent();
+		var event = new TestExecutionEvent();
 		testExecutionEventMap.put(test.getUniqueId(), event);
 		event.initialize(test);
 		event.begin();
@@ -84,11 +83,8 @@ public void executionStarted(TestIdentifier test) {
 
 	@Override
 	public void executionFinished(TestIdentifier test, TestExecutionResult result) {
-		if (test.isContainer() && result.getStatus().equals(TestExecutionResult.Status.SUCCESSFUL)) {
-			return;
-		}
-		Optional<Throwable> throwable = result.getThrowable();
-		TestExecutionEvent event = testExecutionEventMap.get(test.getUniqueId()); // TODO Remove?
+		var throwable = result.getThrowable();
+		var event = testExecutionEventMap.remove(test.getUniqueId());
 		event.end();
 		event.result = result.getStatus().toString();
 		event.exceptionClass = throwable.map(Throwable::getClass).orElse(null);
@@ -98,8 +94,8 @@ public void executionFinished(TestIdentifier test, TestExecutionResult result) {
 
 	@Override
 	public void reportingEntryPublished(TestIdentifier test, ReportEntry reportEntry) {
-		for (Map.Entry<String, String> entry : reportEntry.getKeyValuePairs().entrySet()) {
-			ReportEntryEvent event = new ReportEntryEvent();
+		for (var entry : reportEntry.getKeyValuePairs().entrySet()) {
+			var event = new ReportEntryEvent();
 			event.uniqueId = test.getUniqueId();
 			event.key = entry.getKey();
 			event.value = entry.getValue();
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 2d25b3005045..596b3ef2bd46 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
 	testImplementation(project(":junit-platform-commons"))
 	testImplementation(project(":junit-platform-console"))
 	testImplementation(project(":junit-platform-engine"))
+	testImplementation(project(":junit-platform-jfr"))
 	testImplementation(project(":junit-platform-launcher"))
 
 	// --- Things we are testing with ---------------------------------------------
@@ -21,6 +22,7 @@ dependencies {
 	testImplementation(testFixtures(project(":junit-platform-launcher")))
 	testImplementation(project(":junit-jupiter-engine"))
 	testImplementation("org.apiguardian:apiguardian-api")
+	testImplementation("com.github.gunnarmorling:jfrunit")
 
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(project(":junit-vintage-engine"))
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingListenerIntegrationTests.java
new file mode 100644
index 000000000000..568a58580a50
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingListenerIntegrationTests.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.jfr;
+
+import static dev.morling.jfrunit.ExpectedEvent.event;
+import static dev.morling.jfrunit.JfrEventsAssert.assertThat;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+
+import dev.morling.jfrunit.EnableEvent;
+import dev.morling.jfrunit.JfrEventTest;
+import dev.morling.jfrunit.JfrEvents;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestReporter;
+import org.junit.jupiter.engine.JupiterTestEngine;
+import org.junit.platform.launcher.core.LauncherConfig;
+import org.junit.platform.launcher.core.LauncherFactory;
+
+@JfrEventTest
+public class FlightRecordingListenerIntegrationTests {
+
+	public JfrEvents jfrEvents = new JfrEvents();
+
+	@Test
+	@EnableEvent("org.junit.*")
+	void reportsEvents() {
+		var config = LauncherConfig.builder() //
+				.enableTestExecutionListenerAutoRegistration(false) //
+				.enableTestEngineAutoRegistration(false) //
+				.addTestEngines(new JupiterTestEngine()) //
+				.build();
+		var request = request() //
+				.selectors(selectClass(TestCase.class)) //
+				.build();
+
+		LauncherFactory.create(config).execute(request, new FlightRecordingListener());
+		jfrEvents.awaitEvents();
+
+		assertThat(jfrEvents) //
+				.contains(event("org.junit.TestPlan") //
+						.with("engineNames", "JUnit Jupiter")) //
+				.contains(event("org.junit.TestExecution") //
+						.with("displayName", "JUnit Jupiter") //
+						.with("type", "CONTAINER")) //
+				.contains(event("org.junit.TestExecution") //
+						.with("displayName", FlightRecordingListenerIntegrationTests.class.getSimpleName() + "$"
+								+ TestCase.class.getSimpleName()) //
+						.with("type", "CONTAINER")) //
+				.contains(event("org.junit.TestExecution") //
+						.with("displayName", "test(TestReporter)") //
+						.with("type", "TEST") //
+						.with("result", "SUCCESSFUL")) //
+				.contains(event("org.junit.ReportEntry") //
+						.with("key", "message") //
+						.with("value", "Hello JFR!")) //
+				.contains(event("org.junit.SkippedTest") //
+						.with("displayName", "skipped()") //
+						.with("type", "TEST") //
+						.with("reason", "for demonstration purposes"));
+	}
+
+	static class TestCase {
+		@Test
+		void test(TestReporter reporter) {
+			reporter.publishEntry("message", "Hello JFR!");
+		}
+
+		@Test
+		@Disabled("for demonstration purposes")
+		void skipped() {
+		}
+	}
+}

From 044f71c4c1bf8ae5aad01aae6641e99d833bbf2d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Dec 2020 16:23:17 +0100
Subject: [PATCH 0109/1433] Remove ineffectual configuration

The Kotlin compiler now displays a big warning for these options anyway
but since the `kotlin-dsl` will soon cease using them, we can safely
remove this option now.
---
 buildSrc/build.gradle.kts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 4e93d887d722..d97ba94cbd15 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -17,10 +17,6 @@ dependencies {
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.0")
 }
 
-kotlinDslPluginOptions {
-	experimentalWarning.set(false)
-}
-
 tasks.withType<KotlinCompile>().configureEach {
 	kotlinOptions {
 		allWarningsAsErrors = true

From 86d66459df2827cb5fbc8c7f0d404b1bdeafebf0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Dec 2020 16:24:07 +0100
Subject: [PATCH 0110/1433] Add possibility to configure number of test retries

Useful locally to disable retries of failing integration tests via
-Pretries=0.
---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index eb005c6d05df..137d0d9e67d6 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -15,7 +15,7 @@ tasks.withType<Test>().configureEach {
 		exceptionFormat = FULL
 	}
 	retry {
-		maxRetries.set(2)
+		maxRetries.set(providers.gradleProperty("retries").map(String::toInt).orElse(2))
 	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 	// Required until ASM officially supports the JDK 14

From 8b71ee63e734d1dc46231c8ca0ab28627c56d5d2 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Wed, 21 Oct 2020 20:03:12 +0200
Subject: [PATCH 0111/1433] Add possibility to register discovery listeners via
 SPI

`LauncherDiscoveryListeners` can now be registered via Java's
`ServiceLoader` mechanism in addition to those passed as part of each
`LauncherDiscoveryRequest` and the default one.

Whether discovery listeners are picked up via ServiceLoader is
configurable via `LauncherConfig` (defaults to true).

Closes #2457. Related to #201.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  2 +
 .../asciidoc/user-guide/launcher-api.adoc     | 23 +++++--
 .../launcher/core/DefaultLauncher.java        | 23 +++++--
 .../launcher/core/DefaultLauncherConfig.java  | 14 +++--
 .../core/EngineDiscoveryOrchestrator.java     | 20 +++++-
 .../launcher/core/LauncherConfig.java         | 50 ++++++++++++---
 .../core/LauncherDiscoveryRequestBuilder.java |  3 +-
 .../launcher/core/LauncherFactory.java        | 29 ++++++++-
 ...aderLauncherDiscoveryListenerRegistry.java | 38 ++++++++++++
 .../module-info.java                          |  2 +
 .../testkit/engine/EngineTestKit.java         |  2 +-
 .../TestLauncherDiscoveryListener.java        | 30 +++++++++
 .../launcher/core/LauncherConfigTests.java    | 18 ++++++
 .../launcher/core/LauncherFactoryTests.java   | 62 ++++++++++++++++---
 ...latform.launcher.LauncherDiscoveryListener |  1 +
 ...it.platform.launcher.TestExecutionListener |  0
 .../junit-platform.properties                 |  0
 .../junit-platform-launcher.expected.txt      |  1 +
 .../projects/standalone/expected-err.txt      |  2 +
 19 files changed, 277 insertions(+), 43 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderLauncherDiscoveryListenerRegistry.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
 create mode 100644 platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
 rename platform-tests/src/test/resources/{ => testservices}/META-INF/services/org.junit.platform.launcher.TestExecutionListener (100%)
 rename platform-tests/src/test/resources/{ => testservices}/junit-platform.properties (100%)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index e5d86fe33fbe..45f2961664e3 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -34,6 +34,8 @@ on GitHub.
   `my test`.
 * The `junit-platform-jfr` module now also reports events for containers, e.g. test
   classes.
+* Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
+  `ServiceLoader` mechanism.
 
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index a1964e34e59c..c22b70ef12e2 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -112,24 +112,39 @@ In addition to specifying post-discovery filters as part of a `{LauncherDiscover
 passed to the `{Launcher}` API, by default custom `{PostDiscoveryFilter}` implementations
 will be discovered at runtime via Java's `java.util.ServiceLoader` mechanism and
 automatically applied by the `Launcher` in addition to those that are part of the request.
+
 For example, an `example.CustomTagFilter` class implementing `{PostDiscoveryFilter}` and
 declared within the `/META-INF/services/org.junit.platform.launcher.PostDiscoveryFilter`
 file is loaded and applied automatically.
 
+[[launcher-api-launcher-discovery-listeners-custom]]
+==== Plugging in your own Discovery Listeners
+
+In addition to specifying post-discovery filters as part of a `{LauncherDiscoveryRequest}`
+passed to the `{Launcher}` API, custom `{LauncherDiscoveryListener}` implementations can
+be discovered at runtime via Java's `java.util.ServiceLoader` mechanism and automatically
+automatically registered with the `Launcher` created via the `LauncherFactory`.
+
+For example, an `example.CustomLauncherDiscoveryListener` class implementing
+`{LauncherDiscoveryListener}` and declared within the
+`/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener` file is loaded
+and applied automatically.
+
 [[launcher-api-listeners-custom]]
-==== Plugging in your own Test Execution Listener
+==== Plugging in your own Execution Listener
 
 In addition to the public `{Launcher}` API method for registering test execution
 listeners programmatically, by default custom `{TestExecutionListener}` implementations
 will be discovered at runtime via Java's `java.util.ServiceLoader` mechanism and
-automatically registered with the `Launcher` created via the `LauncherFactory`. For
-example, an `example.TestInfoPrinter` class implementing `{TestExecutionListener}` and
+automatically registered with the `Launcher` created via the `LauncherFactory`.
+
+For example, an `example.TestInfoPrinter` class implementing `{TestExecutionListener}` and
 declared within the
 `/META-INF/services/org.junit.platform.launcher.TestExecutionListener` file is loaded and
 registered automatically.
 
 [[launcher-api-listeners-custom-deactivation]]
-==== Deactivating Test Execution Listeners
+==== Deactivating Execution Listeners
 
 Sometimes it can be useful to run a test suite _without_ certain execution listeners being
 active. For example, you might have custom a `TestExecutionListener` that sends the test
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index 36b1769d38cf..f42d5d9c3a18 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -17,6 +17,7 @@
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -41,17 +42,23 @@ class DefaultLauncher implements Launcher {
 	/**
 	 * Construct a new {@code DefaultLauncher} with the supplied test engines.
 	 *
-	 * @param testEngines the test engines to delegate to; never {@code null} or empty
-	 * @param filters the additional post discovery filters for discovery requests; never {@code null}
+	 * @param testEngines the test engines to delegate to; never {@code null} or
+	 * empty
+	 * @param postDiscoveryFilters the additional post discovery filters for
+	 * discovery requests; never {@code null}
+	 * @param launcherDiscoveryListeners the additional launcher discovery
+	 * listeners for discovery requests; never {@code null}
 	 */
-	DefaultLauncher(Iterable<TestEngine> testEngines, Collection<PostDiscoveryFilter> filters) {
+	DefaultLauncher(Iterable<TestEngine> testEngines, Collection<PostDiscoveryFilter> postDiscoveryFilters,
+			Collection<LauncherDiscoveryListener> launcherDiscoveryListeners) {
 		Preconditions.condition(testEngines != null && testEngines.iterator().hasNext(),
 			() -> "Cannot create Launcher without at least one TestEngine; "
 					+ "consider adding an engine implementation JAR to the classpath");
-		Preconditions.notNull(filters, "PostDiscoveryFilter array must not be null");
-		Preconditions.containsNoNullElements(filters, "PostDiscoveryFilter array must not contain null elements");
+		Preconditions.notNull(postDiscoveryFilters, "PostDiscoveryFilter array must not be null");
+		Preconditions.containsNoNullElements(postDiscoveryFilters,
+			"PostDiscoveryFilter array must not contain null elements");
 		this.discoveryOrchestrator = new EngineDiscoveryOrchestrator(EngineIdValidator.validate(testEngines),
-			unmodifiableCollection(filters));
+			unmodifiableCollection(postDiscoveryFilters), unmodifiableCollection(launcherDiscoveryListeners));
 	}
 
 	@Override
@@ -88,6 +95,10 @@ TestExecutionListenerRegistry getTestExecutionListenerRegistry() {
 		return listenerRegistry;
 	}
 
+	LauncherDiscoveryListener getLauncherDiscoveryListener(LauncherDiscoveryRequest discoveryRequest) {
+		return discoveryOrchestrator.getLauncherDiscoveryListener(discoveryRequest);
+	}
+
 	private LauncherDiscoveryResult discover(LauncherDiscoveryRequest discoveryRequest, String phase) {
 		return discoveryOrchestrator.discover(discoveryRequest, phase);
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
index 41bdfeab6e6b..7ca4875e0544 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
@@ -26,23 +26,20 @@
 class DefaultLauncherConfig implements LauncherConfig {
 
 	private final boolean testEngineAutoRegistrationEnabled;
-
+	private final boolean launcherDiscoveryListenerAutoRegistrationEnabled;
 	private final boolean testExecutionListenerAutoRegistrationEnabled;
-
 	private final boolean postDiscoveryFilterAutoRegistrationEnabled;
-
 	private final Collection<TestEngine> additionalTestEngines;
-
 	private final Collection<TestExecutionListener> additionalTestExecutionListeners;
-
 	private final Collection<PostDiscoveryFilter> additionalPostDiscoveryFilters;
 
 	DefaultLauncherConfig(boolean testEngineAutoRegistrationEnabled,
+			boolean launcherDiscoveryListenerAutoRegistrationEnabled,
 			boolean testExecutionListenerAutoRegistrationEnabled, boolean postDiscoveryFilterAutoRegistrationEnabled,
 			Collection<TestEngine> additionalTestEngines,
 			Collection<TestExecutionListener> additionalTestExecutionListeners,
 			Collection<PostDiscoveryFilter> additionalPostDiscoveryFilters) {
-
+		this.launcherDiscoveryListenerAutoRegistrationEnabled = launcherDiscoveryListenerAutoRegistrationEnabled;
 		this.testExecutionListenerAutoRegistrationEnabled = testExecutionListenerAutoRegistrationEnabled;
 		this.testEngineAutoRegistrationEnabled = testEngineAutoRegistrationEnabled;
 		this.postDiscoveryFilterAutoRegistrationEnabled = postDiscoveryFilterAutoRegistrationEnabled;
@@ -56,6 +53,11 @@ public boolean isTestEngineAutoRegistrationEnabled() {
 		return this.testEngineAutoRegistrationEnabled;
 	}
 
+	@Override
+	public boolean isLauncherDiscoveryListenerAutoRegistrationEnabled() {
+		return launcherDiscoveryListenerAutoRegistrationEnabled;
+	}
+
 	@Override
 	public boolean isTestExecutionListenerAutoRegistrationEnabled() {
 		return this.testExecutionListenerAutoRegistrationEnabled;
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index 6c5fd203597f..002944d84ce5 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -11,6 +11,7 @@
 package org.junit.platform.launcher.core;
 
 import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toList;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.engine.Filter.composeFilters;
 
@@ -20,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
@@ -35,6 +37,7 @@
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.PostDiscoveryFilter;
+import org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners;
 
 /**
  * Orchestrates test discovery using the configured test engines.
@@ -49,11 +52,14 @@ public class EngineDiscoveryOrchestrator {
 	private final EngineDiscoveryResultValidator discoveryResultValidator = new EngineDiscoveryResultValidator();
 	private final Iterable<TestEngine> testEngines;
 	private final Collection<PostDiscoveryFilter> postDiscoveryFilters;
+	private final Collection<LauncherDiscoveryListener> launcherDiscoveryListeners;
 
 	public EngineDiscoveryOrchestrator(Iterable<TestEngine> testEngines,
-			Collection<PostDiscoveryFilter> postDiscoveryFilters) {
+			Collection<PostDiscoveryFilter> postDiscoveryFilters,
+			Collection<LauncherDiscoveryListener> launcherDiscoveryListeners) {
 		this.testEngines = testEngines;
 		this.postDiscoveryFilters = postDiscoveryFilters;
+		this.launcherDiscoveryListeners = launcherDiscoveryListeners;
 	}
 
 	/**
@@ -96,7 +102,7 @@ public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, String
 	}
 
 	private TestDescriptor discoverEngineRoot(TestEngine testEngine, LauncherDiscoveryRequest discoveryRequest) {
-		LauncherDiscoveryListener discoveryListener = discoveryRequest.getDiscoveryListener();
+		LauncherDiscoveryListener discoveryListener = getLauncherDiscoveryListener(discoveryRequest);
 		UniqueId uniqueEngineId = UniqueId.forEngine(testEngine.getId());
 		try {
 			discoveryListener.engineDiscoveryStarted(uniqueEngineId);
@@ -114,6 +120,16 @@ private TestDescriptor discoverEngineRoot(TestEngine testEngine, LauncherDiscove
 		}
 	}
 
+	LauncherDiscoveryListener getLauncherDiscoveryListener(LauncherDiscoveryRequest discoveryRequest) {
+		LauncherDiscoveryListener discoveryListener = discoveryRequest.getDiscoveryListener();
+		if (!launcherDiscoveryListeners.isEmpty()) {
+			List<LauncherDiscoveryListener> allDiscoveryListeners = Stream.concat(Stream.of(discoveryListener),
+				launcherDiscoveryListeners.stream()).collect(toList());
+			discoveryListener = LauncherDiscoveryListeners.composite(allDiscoveryListeners);
+		}
+		return discoveryListener;
+	}
+
 	private void applyPostDiscoveryFilters(Map<TestEngine, TestDescriptor> testEngineDescriptors,
 			List<PostDiscoveryFilter> filters) {
 		Filter<TestDescriptor> postDiscoveryFilter = composeFilters(filters);
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
index afed3e096c8b..f973d8fc4c1f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
@@ -60,6 +60,18 @@ public interface LauncherConfig {
 	 */
 	boolean isTestEngineAutoRegistrationEnabled();
 
+	/**
+	 * Determine if launcher discovery listeners should be discovered at runtime
+	 * using the {@link java.util.ServiceLoader ServiceLoader} mechanism and
+	 * automatically registered.
+	 *
+	 * @return {@code true} if launcher discovery listeners should be
+	 * automatically registered
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	boolean isLauncherDiscoveryListenerAutoRegistrationEnabled();
+
 	/**
 	 * Determine if test execution listeners should be discovered at runtime
 	 * using the {@link java.util.ServiceLoader ServiceLoader} mechanism and
@@ -77,6 +89,7 @@ public interface LauncherConfig {
 	 *
 	 * @return {@code true} if post discovery filters should be automatically
 	 * registered
+	 * @since 1.7
 	 */
 	@API(status = EXPERIMENTAL, since = "1.7")
 	boolean isPostDiscoveryFilterAutoRegistrationEnabled();
@@ -105,6 +118,7 @@ public interface LauncherConfig {
 	 *
 	 * @return the collection of additional post discovery filters; never
 	 * {@code null} but potentially empty
+	 * @since 1.7
 	 */
 	@API(status = EXPERIMENTAL, since = "1.7")
 	Collection<PostDiscoveryFilter> getAdditionalPostDiscoveryFilters();
@@ -123,22 +137,35 @@ static Builder builder() {
 	 */
 	class Builder {
 
-		private boolean listenerAutoRegistrationEnabled = true;
-
 		private boolean engineAutoRegistrationEnabled = true;
-
+		private boolean launcherDiscoveryListenerAutoRegistrationEnabled = true;
+		private boolean testExecutionListenerAutoRegistrationEnabled = true;
 		private boolean postDiscoveryFilterAutoRegistrationEnabled = true;
-
 		private final Collection<TestEngine> engines = new LinkedHashSet<>();
-
 		private final Collection<TestExecutionListener> listeners = new LinkedHashSet<>();
-
 		private final Collection<PostDiscoveryFilter> postDiscoveryFilters = new LinkedHashSet<>();
 
 		private Builder() {
 			/* no-op */
 		}
 
+		/**
+		 * Configure the auto-registration flag for launcher discovery
+		 * listeners.
+		 *
+		 * <p>Defaults to {@code true}.
+		 *
+		 * @param enabled {@code true} if launcher discovery listeners should be
+		 * automatically registered
+		 * @return this builder for method chaining
+		 * @since 1.8
+		 */
+		@API(status = EXPERIMENTAL, since = "1.8")
+		public Builder enableLauncherDiscoveryListenerAutoRegistration(boolean enabled) {
+			this.launcherDiscoveryListenerAutoRegistrationEnabled = enabled;
+			return this;
+		}
+
 		/**
 		 * Configure the auto-registration flag for test execution listeners.
 		 *
@@ -149,7 +176,7 @@ private Builder() {
 		 * @return this builder for method chaining
 		 */
 		public Builder enableTestExecutionListenerAutoRegistration(boolean enabled) {
-			this.listenerAutoRegistrationEnabled = enabled;
+			this.testExecutionListenerAutoRegistrationEnabled = enabled;
 			return this;
 		}
 
@@ -175,6 +202,7 @@ public Builder enableTestEngineAutoRegistration(boolean enabled) {
 		 * @param enabled {@code true} if post discovery filters should be automatically
 		 * registered
 		 * @return this builder for method chaining
+		 * @since 1.7
 		 */
 		@API(status = EXPERIMENTAL, since = "1.7")
 		public Builder enablePostDiscoveryFilterAutoRegistration(boolean enabled) {
@@ -217,6 +245,7 @@ public Builder addTestExecutionListeners(TestExecutionListener... listeners) {
 		 * @param filters additional post discovery filters to register;
 		 * never {@code null} or containing {@code null}
 		 * @return this builder for method chaining
+		 * @since 1.7
 		 */
 		@API(status = EXPERIMENTAL, since = "1.7")
 		public Builder addPostDiscoveryFilters(PostDiscoveryFilter... filters) {
@@ -231,9 +260,10 @@ public Builder addPostDiscoveryFilters(PostDiscoveryFilter... filters) {
 		 * builder.
 		 */
 		public LauncherConfig build() {
-			return new DefaultLauncherConfig(this.engineAutoRegistrationEnabled, this.listenerAutoRegistrationEnabled,
-				this.postDiscoveryFilterAutoRegistrationEnabled, this.engines, this.listeners,
-				this.postDiscoveryFilters);
+			return new DefaultLauncherConfig(this.engineAutoRegistrationEnabled,
+				this.launcherDiscoveryListenerAutoRegistrationEnabled,
+				this.testExecutionListenerAutoRegistrationEnabled, this.postDiscoveryFilterAutoRegistrationEnabled,
+				this.engines, this.listeners, this.postDiscoveryFilters);
 		}
 
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 6de1ed6980c6..272973ad8802 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -274,7 +274,8 @@ private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationPara
 		if (discoveryListeners.contains(defaultDiscoveryListener)) {
 			return LauncherDiscoveryListeners.composite(discoveryListeners);
 		}
-		List<LauncherDiscoveryListener> allDiscoveryListeners = new ArrayList<>(discoveryListeners);
+		List<LauncherDiscoveryListener> allDiscoveryListeners = new ArrayList<>(discoveryListeners.size() + 1);
+		allDiscoveryListeners.addAll(discoveryListeners);
 		allDiscoveryListeners.add(defaultDiscoveryListener);
 		return LauncherDiscoveryListeners.composite(allDiscoveryListeners);
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 739b01baf20f..6b1ee7d93d8c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -28,6 +28,7 @@
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestExecutionListener;
 
@@ -90,26 +91,48 @@ public static Launcher create() throws PreconditionViolationException {
 	public static Launcher create(LauncherConfig config) throws PreconditionViolationException {
 		Preconditions.notNull(config, "LauncherConfig must not be null");
 
+		Set<TestEngine> engines = collectTestEngines(config);
+		List<PostDiscoveryFilter> filters = collectPostDiscoveryFilters(config);
+		List<LauncherDiscoveryListener> discoveryListeners = collectLauncherDiscoveryListeners(config);
+
+		Launcher launcher = new DefaultLauncher(engines, filters, discoveryListeners);
+
+		registerTestExecutionListeners(config, launcher);
+
+		return launcher;
+	}
+
+	private static Set<TestEngine> collectTestEngines(LauncherConfig config) {
 		Set<TestEngine> engines = new LinkedHashSet<>();
 		if (config.isTestEngineAutoRegistrationEnabled()) {
 			new ServiceLoaderTestEngineRegistry().loadTestEngines().forEach(engines::add);
 		}
 		engines.addAll(config.getAdditionalTestEngines());
+		return engines;
+	}
 
+	private static List<PostDiscoveryFilter> collectPostDiscoveryFilters(LauncherConfig config) {
 		List<PostDiscoveryFilter> filters = new ArrayList<>();
 		if (config.isPostDiscoveryFilterAutoRegistrationEnabled()) {
 			new ServiceLoaderPostDiscoveryFilterRegistry().loadPostDiscoveryFilters().forEach(filters::add);
 		}
 		filters.addAll(config.getAdditionalPostDiscoveryFilters());
+		return filters;
+	}
 
-		Launcher launcher = new DefaultLauncher(engines, filters);
+	private static List<LauncherDiscoveryListener> collectLauncherDiscoveryListeners(LauncherConfig config) {
+		List<LauncherDiscoveryListener> discoveryListeners = new ArrayList<>();
+		if (config.isLauncherDiscoveryListenerAutoRegistrationEnabled()) {
+			new ServiceLoaderLauncherDiscoveryListenerRegistry().loadListeners().forEach(discoveryListeners::add);
+		}
+		return discoveryListeners;
+	}
 
+	private static void registerTestExecutionListeners(LauncherConfig config, Launcher launcher) {
 		if (config.isTestExecutionListenerAutoRegistrationEnabled()) {
 			loadAndFilterTestExecutionListeners().forEach(launcher::registerTestExecutionListeners);
 		}
 		config.getAdditionalTestExecutionListeners().forEach(launcher::registerTestExecutionListeners);
-
-		return launcher;
 	}
 
 	private static Stream<TestExecutionListener> loadAndFilterTestExecutionListeners() {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderLauncherDiscoveryListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderLauncherDiscoveryListenerRegistry.java
new file mode 100644
index 000000000000..ca4788adaff5
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderLauncherDiscoveryListenerRegistry.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.StreamSupport.stream;
+
+import java.util.ServiceLoader;
+
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+import org.junit.platform.commons.util.ClassLoaderUtils;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+
+/**
+ * @since 1.8
+ */
+class ServiceLoaderLauncherDiscoveryListenerRegistry {
+
+	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderLauncherDiscoveryListenerRegistry.class);
+
+	Iterable<LauncherDiscoveryListener> loadListeners() {
+		Iterable<LauncherDiscoveryListener> listeners = ServiceLoader.load(LauncherDiscoveryListener.class,
+			ClassLoaderUtils.getDefaultClassLoader());
+		logger.config(() -> "Loaded LauncherDiscoveryListener instances: "
+				+ stream(listeners.spliterator(), false).map(Object::toString).collect(toList()));
+		return listeners;
+	}
+
+}
diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
index f9200fda65f4..9ccde3666d41 100644
--- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
+++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
@@ -15,6 +15,7 @@
  *
  * @since 1.0
  * @uses org.junit.platform.engine.TestEngine
+ * @uses org.junit.platform.launcher.LauncherDiscoveryListener
  * @uses org.junit.platform.launcher.PostDiscoveryFilter
  * @uses org.junit.platform.launcher.TestExecutionListener
  */
@@ -30,6 +31,7 @@
 	exports org.junit.platform.launcher.listeners.discovery;
 
 	uses org.junit.platform.engine.TestEngine;
+	uses org.junit.platform.launcher.LauncherDiscoveryListener;
 	uses org.junit.platform.launcher.PostDiscoveryFilter;
 	uses org.junit.platform.launcher.TestExecutionListener;
 }
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index 8826f87b829d..f1c87fe44a44 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -265,7 +265,7 @@ private static void executeDirectly(TestEngine testEngine, EngineDiscoveryReques
 	private static void executeUsingLauncherOrchestration(TestEngine testEngine,
 			LauncherDiscoveryRequest discoveryRequest, EngineExecutionListener listener) {
 		TestDescriptor engineTestDescriptor;
-		LauncherDiscoveryResult discoveryResult = new EngineDiscoveryOrchestrator(singleton(testEngine),
+		LauncherDiscoveryResult discoveryResult = new EngineDiscoveryOrchestrator(singleton(testEngine), emptySet(),
 			emptySet()).discover(discoveryRequest, "testing");
 		engineTestDescriptor = discoveryResult.getEngineTestDescriptor(testEngine);
 		Preconditions.notNull(engineTestDescriptor, "TestEngine did not yield a TestDescriptor");
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
new file mode 100644
index 000000000000..497b649ae2c0
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+public class TestLauncherDiscoveryListener extends LauncherDiscoveryListener {
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		return getClass() == obj.getClass();
+	}
+
+	@Override
+	public int hashCode() {
+		return 1;
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
index cd9e2a0e5b48..cd233214e13e 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
@@ -50,8 +50,12 @@ void defaultConfig() {
 
 		assertTrue(config.isTestEngineAutoRegistrationEnabled(),
 			"Test engine auto-registration should be enabled by default");
+		assertTrue(config.isLauncherDiscoveryListenerAutoRegistrationEnabled(),
+			"Launcher discovery listener auto-registration should be enabled by default");
 		assertTrue(config.isTestExecutionListenerAutoRegistrationEnabled(),
 			"Test execution listener auto-registration should be enabled by default");
+		assertTrue(config.isPostDiscoveryFilterAutoRegistrationEnabled(),
+			"Post-discovery filter auto-registration should be enabled by default");
 
 		assertThat(config.getAdditionalTestEngines()).isEmpty();
 
@@ -65,6 +69,13 @@ void disableTestEngineAutoRegistration() {
 		assertFalse(config.isTestEngineAutoRegistrationEnabled());
 	}
 
+	@Test
+	void disableLauncherDiscoveryListenerAutoRegistration() {
+		var config = LauncherConfig.builder().enableLauncherDiscoveryListenerAutoRegistration(false).build();
+
+		assertFalse(config.isLauncherDiscoveryListenerAutoRegistrationEnabled());
+	}
+
 	@Test
 	void disableTestExecutionListenerAutoRegistration() {
 		var config = LauncherConfig.builder().enableTestExecutionListenerAutoRegistration(false).build();
@@ -72,6 +83,13 @@ void disableTestExecutionListenerAutoRegistration() {
 		assertFalse(config.isTestExecutionListenerAutoRegistrationEnabled());
 	}
 
+	@Test
+	void disablePostDiscoveryFilterAutoRegistration() {
+		var config = LauncherConfig.builder().enablePostDiscoveryFilterAutoRegistration(false).build();
+
+		assertFalse(config.isPostDiscoveryFilterAutoRegistrationEnabled());
+	}
+
 	@Test
 	void addTestEngines() {
 		TestEngine first = new TestEngineStub();
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index a0b4f7f75445..d510aa3a9c91 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+import static org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners.abortOnFailure;
 
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -26,6 +27,7 @@
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.TagFilter;
 import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestLauncherDiscoveryListener;
 import org.junit.platform.launcher.listeners.AnotherUnusedTestExecutionListener;
 import org.junit.platform.launcher.listeners.NoopTestExecutionListener;
 import org.junit.platform.launcher.listeners.UnusedTestExecutionListener;
@@ -42,20 +44,24 @@ void preconditions() {
 
 	@Test
 	void noopTestExecutionListenerIsLoadedViaServiceApi() {
-		var launcher = (DefaultLauncher) LauncherFactory.create();
-		var listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
-		var listener = listeners.stream().filter(NoopTestExecutionListener.class::isInstance).findFirst();
-		assertThat(listener).isPresent();
+		withTestServices(() -> {
+			var launcher = (DefaultLauncher) LauncherFactory.create();
+			var listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
+			var listener = listeners.stream().filter(NoopTestExecutionListener.class::isInstance).findFirst();
+			assertThat(listener).isPresent();
+		});
 	}
 
 	@Test
 	void unusedTestExecutionListenerIsNotLoadedViaServiceApi() {
-		var launcher = (DefaultLauncher) LauncherFactory.create();
-		var listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
-
-		assertThat(listeners).filteredOn(AnotherUnusedTestExecutionListener.class::isInstance).isEmpty();
-		assertThat(listeners).filteredOn(UnusedTestExecutionListener.class::isInstance).isEmpty();
-		assertThat(listeners).filteredOn(NoopTestExecutionListener.class::isInstance).isNotEmpty();
+		withTestServices(() -> {
+			var launcher = (DefaultLauncher) LauncherFactory.create();
+			var listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
+
+			assertThat(listeners).filteredOn(AnotherUnusedTestExecutionListener.class::isInstance).isEmpty();
+			assertThat(listeners).filteredOn(UnusedTestExecutionListener.class::isInstance).isEmpty();
+			assertThat(listeners).filteredOn(NoopTestExecutionListener.class::isInstance).isNotEmpty();
+		});
 	}
 
 	@Test
@@ -162,6 +168,42 @@ void notApplyIfDisabledPostDiscoveryFiltersViaServiceApi() {
 		}
 	}
 
+	@Test
+	void doesNotDiscoverLauncherDiscoverRequestListenerViaServiceApiWhenDisabled() {
+		withTestServices(() -> {
+			var launcher = (DefaultLauncher) LauncherFactory.create(
+				LauncherConfig.builder().enableLauncherDiscoveryListenerAutoRegistration(false).build());
+			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListener(request().build());
+
+			assertThat(launcherDiscoveryListener).isEqualTo(abortOnFailure());
+		});
+	}
+
+	@Test
+	void discoversLauncherDiscoverRequestListenerViaServiceApiByDefault() {
+		withTestServices(() -> {
+			var launcher = (DefaultLauncher) LauncherFactory.create();
+			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListener(request().build());
+
+			assertThat(launcherDiscoveryListener.getClass().getSimpleName()).startsWith("Composite");
+			assertThat(launcherDiscoveryListener).extracting("listeners").asList() //
+					.containsExactlyInAnyOrder(new TestLauncherDiscoveryListener(), abortOnFailure());
+		});
+	}
+
+	private static void withTestServices(Runnable runnable) {
+		var current = Thread.currentThread().getContextClassLoader();
+		try {
+			var url = LauncherFactoryTests.class.getClassLoader().getResource("testservices/");
+			var classLoader = new URLClassLoader(new URL[] { url }, current);
+			Thread.currentThread().setContextClassLoader(classLoader);
+			runnable.run();
+		}
+		finally {
+			Thread.currentThread().setContextClassLoader(current);
+		}
+	}
+
 	private LauncherDiscoveryRequest createLauncherDiscoveryRequestForBothStandardEngineExampleClasses() {
 		// @formatter:off
 		return request()
diff --git a/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener b/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
new file mode 100644
index 000000000000..3c8c2d5022c4
--- /dev/null
+++ b/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
@@ -0,0 +1 @@
+org.junit.platform.launcher.TestLauncherDiscoveryListener
diff --git a/platform-tests/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.TestExecutionListener
similarity index 100%
rename from platform-tests/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
rename to platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.TestExecutionListener
diff --git a/platform-tests/src/test/resources/junit-platform.properties b/platform-tests/src/test/resources/testservices/junit-platform.properties
similarity index 100%
rename from platform-tests/src/test/resources/junit-platform.properties
rename to platform-tests/src/test/resources/testservices/junit-platform.properties
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
index a142504cdcf0..82f90fef731d 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
@@ -9,5 +9,6 @@ requires org.apiguardian.api transitive
 requires org.junit.platform.commons transitive
 requires org.junit.platform.engine transitive
 uses org.junit.platform.engine.TestEngine
+uses org.junit.platform.launcher.LauncherDiscoveryListener
 uses org.junit.platform.launcher.PostDiscoveryFilter
 uses org.junit.platform.launcher.TestExecutionListener
diff --git a/platform-tooling-support-tests/projects/standalone/expected-err.txt b/platform-tooling-support-tests/projects/standalone/expected-err.txt
index f140d43c746a..27c15985896b 100644
--- a/platform-tooling-support-tests/projects/standalone/expected-err.txt
+++ b/platform-tooling-support-tests/projects/standalone/expected-err.txt
@@ -2,5 +2,7 @@
 .+ Discovered TestEngines with IDs. .junit-jupiter .+ junit-vintage .+
 .+ org.junit.platform.launcher.core.ServiceLoaderPostDiscoveryFilterRegistry loadPostDiscoveryFilters
 .+ Loaded PostDiscoveryFilter instances: ..
+.+ org.junit.platform.launcher.core.ServiceLoaderLauncherDiscoveryListenerRegistry loadListeners
+.+ Loaded LauncherDiscoveryListener instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderTestExecutionListenerRegistry loadListeners
 .+ Loaded TestExecutionListener instances: ..

From b7eddfc1d953282c2e2cf428a425e047a96b6ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Ledoyen?= <ledoyen.loic@gmail.com>
Date: Tue, 22 Dec 2020 09:47:14 +0100
Subject: [PATCH 0112/1433] Support underscores for numeric in CSV sources
 (#2425)

This kind of notation was introduced in Java 1.7
to improve readability of long numbers.

See https://docs.oracle.com/javase/7/docs/technotes/guides/language/underscores-literals.html

Resolves #2335.
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  4 ++-
 .../java/example/ParameterizedTestDemo.java   |  3 ++-
 .../src/test/resources/two-column.csv         |  1 +
 .../converter/DefaultArgumentConverter.java   | 26 ++++++++++++++++---
 .../DefaultArgumentConverterTests.java        |  8 +++++-
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 45f2961664e3..d4e216a0edfe 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -51,7 +51,9 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
+  underscores as in some JVM languages, to improve readability of long numbers like
+  `700_000_000`.
 
 
 [[release-notes-5.8.0-M1-junit-vintage]]
diff --git a/documentation/src/test/java/example/ParameterizedTestDemo.java b/documentation/src/test/java/example/ParameterizedTestDemo.java
index b0f2b76fde99..40f440d305ee 100644
--- a/documentation/src/test/java/example/ParameterizedTestDemo.java
+++ b/documentation/src/test/java/example/ParameterizedTestDemo.java
@@ -210,7 +210,8 @@ static Stream<Arguments> stringIntAndListProvider() {
 	@CsvSource({
 		"apple,         1",
 		"banana,        2",
-		"'lemon, lime', 0xF1"
+		"'lemon, lime', 0xF1",
+		"strawberry,    700_000"
 	})
 	void testWithCsvSource(String fruit, int rank) {
 		assertNotNull(fruit);
diff --git a/documentation/src/test/resources/two-column.csv b/documentation/src/test/resources/two-column.csv
index 2ef0d215adac..917fba3ff5b6 100644
--- a/documentation/src/test/resources/two-column.csv
+++ b/documentation/src/test/resources/two-column.csv
@@ -2,3 +2,4 @@ Country, reference
 Sweden, 1
 Poland, 2
 "United States of America", 3
+France, 700_000
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index dc44195d0d53..72e555f42fe5 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -76,7 +76,8 @@ public class DefaultArgumentConverter extends SimpleArgumentConverter {
 	public static final DefaultArgumentConverter INSTANCE = new DefaultArgumentConverter();
 
 	private static final List<StringToObjectConverter> stringToObjectConverters = unmodifiableList(asList( //
-		new StringToPrimitiveConverter(), //
+		new StringToBooleanAndCharPrimitiveConverter(), //
+		new StringToNumericPrimitiveConverter(), //
 		new StringToEnumConverter(), //
 		new StringToJavaTimeConverter(), //
 		new StringToCommonJavaTypesConverter(), //
@@ -140,7 +141,7 @@ interface StringToObjectConverter {
 
 	}
 
-	private static class StringToPrimitiveConverter implements StringToObjectConverter {
+	private static class StringToBooleanAndCharPrimitiveConverter implements StringToObjectConverter {
 
 		private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
 		static {
@@ -150,6 +151,25 @@ private static class StringToPrimitiveConverter implements StringToObjectConvert
 				Preconditions.condition(source.length() == 1, () -> "String must have length of 1: " + source);
 				return source.charAt(0);
 			});
+			CONVERTERS = unmodifiableMap(converters);
+		}
+
+		@Override
+		public boolean canConvert(Class<?> targetType) {
+			return CONVERTERS.containsKey(targetType);
+		}
+
+		@Override
+		public Object convert(String source, Class<?> targetType) {
+			return CONVERTERS.get(targetType).apply(source);
+		}
+	}
+
+	private static class StringToNumericPrimitiveConverter implements StringToObjectConverter {
+
+		private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
+		static {
+			Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
 			converters.put(Byte.class, Byte::decode);
 			converters.put(Short.class, Short::decode);
 			converters.put(Integer.class, Integer::decode);
@@ -166,7 +186,7 @@ public boolean canConvert(Class<?> targetType) {
 
 		@Override
 		public Object convert(String source, Class<?> targetType) {
-			return CONVERTERS.get(targetType).apply(source);
+			return CONVERTERS.get(targetType).apply(source.replace("_", ""));
 		}
 	}
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 2dc8ab22a812..f9318cacdd2e 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -84,13 +84,19 @@ void isAwareOfWideningConversions() {
 	@Test
 	void convertsStringsToPrimitiveTypes() {
 		assertConverts("true", boolean.class, true);
-		assertConverts("1", byte.class, (byte) 1);
 		assertConverts("o", char.class, 'o');
+		assertConverts("1", byte.class, (byte) 1);
+		assertConverts("1_0", byte.class, (byte) 10);
 		assertConverts("1", short.class, (short) 1);
+		assertConverts("1_2", short.class, (short) 12);
 		assertConverts("42", int.class, 42);
+		assertConverts("700_050_000", int.class, 700_050_000);
 		assertConverts("42", long.class, 42L);
+		assertConverts("4_2", long.class, 42L);
 		assertConverts("42.23", float.class, 42.23f);
+		assertConverts("42.2_3", float.class, 42.23f);
 		assertConverts("42.23", double.class, 42.23);
+		assertConverts("42.2_3", double.class, 42.23);
 	}
 
 	/**

From aa9ea48298902391b61a489b845e7f419ee2b999 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Dec 2020 13:00:41 +0100
Subject: [PATCH 0113/1433] Upgradle to 6.8-rc-4

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4adb35dc8035..37b9a50578f1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=6c929633a439d248413d3d1bff477195ee662ccadc6fdc31f6f50f8059a2be36
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-3-bin.zip
+distributionSha256Sum=6cb03b71767b169eda987338091172cbc84eb0cd53a93c17e6661688411e267e
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 8a48d5ca851a24539ca1bce138a10161426e8a25 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Dec 2020 13:33:48 +0100
Subject: [PATCH 0114/1433] Fix compilation error

---
 .../org/junit/platform/launcher/LauncherDiscoveryListener.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index f7bf7f34a559..65fa3219270a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -46,6 +46,9 @@ public abstract class LauncherDiscoveryListener implements EngineDiscoveryListen
 	public static final LauncherDiscoveryListener NOOP = new LauncherDiscoveryListener() {
 	};
 
+	public LauncherDiscoveryListener() {
+	}
+
 	/**
 	 * Called when test discovery is about to be started for an engine.
 	 *

From f734fd1db06c305ff4b367467911771f09592509 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Dec 2020 16:38:24 +0100
Subject: [PATCH 0115/1433] Upgrade apiguardian to 1.1.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a0d656aff911..87227a7c26c8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ org.gradle.caching=true
 org.gradle.parallel=true
 
 # Dependencies
-apiguardian.version=1.1.0
+apiguardian.version=1.1.1
 assertj.version=3.16.1
 junit4.version=4.13.1
 junit4Min.version=4.12

From 7a8385fc3ab586f580058440f34a64e01b188dcd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Dec 2020 18:06:10 +0100
Subject: [PATCH 0116/1433] Add JFR events for test discovery

Since test discovery can take a considerable amount of time, we now also
report JFR events on the launcher and engine level.
---
 .../release-notes/release-notes-5.8.0-M1.adoc |   6 +-
 .../jfr/FlightRecordingDiscoveryListener.java | 103 ++++++++++++++++++
 ... => FlightRecordingExecutionListener.java} |  48 +++-----
 .../java/org/junit/platform/jfr/UniqueId.java |  28 +++++
 ...latform.launcher.LauncherDiscoveryListener |   1 +
 ...it.platform.launcher.TestExecutionListener |   2 +-
 .../org.junit.platform.jfr/module-info.java   |   4 +-
 .../launcher/LauncherDiscoveryListener.java   |  26 ++++-
 .../launcher/core/DefaultLauncher.java        |   9 +-
 .../core/EngineDiscoveryOrchestrator.java     |  40 +++++--
 .../CompositeLauncherDiscoveryListener.java   |  11 ++
 .../LoggingLauncherDiscoveryListener.java     |  11 ++
 ...LauncherFactoryForTestingPurposesOnly.java |   2 +
 .../testkit/engine/EngineTestKit.java         |   3 +-
 ...dingDiscoveryListenerIntegrationTests.java |  52 +++++++++
 ...ingExecutionListenerIntegrationTests.java} |  19 ++--
 .../launcher/core/DefaultLauncherTests.java   |   7 +-
 .../launcher/core/LauncherFactoryTests.java   |   2 +-
 ...LoggingLauncherDiscoveryListenerTests.java |   4 +-
 .../junit-platform-jfr.expected.txt           |   3 +-
 20 files changed, 312 insertions(+), 69 deletions(-)
 create mode 100644 junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
 rename junit-platform-jfr/src/main/java/org/junit/platform/jfr/{FlightRecordingListener.java => FlightRecordingExecutionListener.java} (79%)
 create mode 100644 junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
 create mode 100644 junit-platform-jfr/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
 create mode 100644 platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
 rename platform-tests/src/test/java/org/junit/platform/jfr/{FlightRecordingListenerIntegrationTests.java => FlightRecordingExecutionListenerIntegrationTests.java} (76%)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index d4e216a0edfe..152f754a5eff 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -32,8 +32,10 @@ on GitHub.
   nested container events when using the `EngineTestKit`. For example,
   `test(displayName("my test"))` can be used to match against a test whose display name is
   `my test`.
-* The `junit-platform-jfr` module now also reports events for containers, e.g. test
-  classes.
+* The `junit-platform-jfr` module now also reports execution events for containers, e.g.
+  test classes.
+* The `junit-platform-jfr` module now also reports test discovery events for the launcher
+  and registered test engines.
 * Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
   `ServiceLoader` mechanism.
 
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
new file mode 100644
index 000000000000..0f0bde40d0ba
--- /dev/null
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.jfr;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jdk.jfr.Category;
+import jdk.jfr.Event;
+import jdk.jfr.Label;
+import jdk.jfr.Name;
+import jdk.jfr.StackTrace;
+
+import org.apiguardian.api.API;
+import org.junit.platform.engine.DiscoveryFilter;
+import org.junit.platform.engine.DiscoverySelector;
+import org.junit.platform.launcher.EngineDiscoveryResult;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+
+/**
+ * A {@link LauncherDiscoveryListener} that generates Java Flight Recorder
+ * events.
+ *
+ * @see <a href="https://openjdk.java.net/jeps/328">JEP 328: Flight Recorder</a>
+ * @since 1.8
+ */
+@API(status = EXPERIMENTAL, since = "1.8")
+public class FlightRecordingDiscoveryListener extends LauncherDiscoveryListener {
+
+	private final AtomicReference<LauncherDiscoveryEvent> launcherDiscoveryEvent = new AtomicReference<>();
+	private final Map<org.junit.platform.engine.UniqueId, EngineDiscoveryEvent> engineDiscoveryEvents = new ConcurrentHashMap<>();
+
+	@Override
+	public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
+		var event = new LauncherDiscoveryEvent();
+		event.selectors = request.getSelectorsByType(DiscoverySelector.class).size();
+		event.filters = request.getFiltersByType(DiscoveryFilter.class).size();
+		event.begin();
+		launcherDiscoveryEvent.set(event);
+	}
+
+	@Override
+	public void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
+		launcherDiscoveryEvent.getAndSet(null).commit();
+	}
+
+	@Override
+	public void engineDiscoveryStarted(org.junit.platform.engine.UniqueId engineId) {
+		var event = new EngineDiscoveryEvent();
+		event.uniqueId = engineId.toString();
+		event.begin();
+		engineDiscoveryEvents.put(engineId, event);
+	}
+
+	@Override
+	public void engineDiscoveryFinished(org.junit.platform.engine.UniqueId engineId, EngineDiscoveryResult result) {
+		var event = engineDiscoveryEvents.remove(engineId);
+		event.result = result.getStatus().toString();
+		event.commit();
+	}
+
+	@Category({ "JUnit", "Discovery" })
+	@StackTrace(false)
+	abstract static class DiscoveryEvent extends Event {
+	}
+
+	@Label("Test Discovery")
+	@Category({ "JUnit", "Discovery" })
+	@Name("org.junit.LauncherDiscovery")
+	static class LauncherDiscoveryEvent extends DiscoveryEvent {
+
+		@Label("Number of selectors")
+		int selectors;
+
+		@Label("Number of filters")
+		int filters;
+	}
+
+	@Label("Engine Discovery")
+	@Category({ "JUnit", "Discovery" })
+	@Name("org.junit.EngineDiscovery")
+	static class EngineDiscoveryEvent extends DiscoveryEvent {
+
+		@UniqueId
+		@Label("Unique Id")
+		String uniqueId;
+
+		@Label("Result")
+		String result;
+	}
+}
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
similarity index 79%
rename from junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingListener.java
rename to junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
index 0393f12fa1ad..c7013a2aacfd 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
@@ -12,10 +12,6 @@
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
@@ -24,9 +20,7 @@
 import jdk.jfr.Category;
 import jdk.jfr.Event;
 import jdk.jfr.Label;
-import jdk.jfr.MetadataDefinition;
 import jdk.jfr.Name;
-import jdk.jfr.Relational;
 import jdk.jfr.StackTrace;
 
 import org.apiguardian.api.API;
@@ -41,13 +35,13 @@
  * events.
  *
  * @see <a href="https://openjdk.java.net/jeps/328">JEP 328: Flight Recorder</a>
- * @since 1.7
+ * @since 1.8
  */
-@API(status = EXPERIMENTAL, since = "1.7")
-public class FlightRecordingListener implements TestExecutionListener {
+@API(status = EXPERIMENTAL, since = "1.8")
+public class FlightRecordingExecutionListener implements TestExecutionListener {
 
 	private final AtomicReference<TestPlanExecutionEvent> testPlanExecutionEvent = new AtomicReference<>();
-	private final Map<String, TestExecutionEvent> testExecutionEventMap = new ConcurrentHashMap<>();
+	private final Map<String, TestExecutionEvent> testExecutionEvents = new ConcurrentHashMap<>();
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan plan) {
@@ -61,8 +55,7 @@ public void testPlanExecutionStarted(TestPlan plan) {
 
 	@Override
 	public void testPlanExecutionFinished(TestPlan plan) {
-		var event = testPlanExecutionEvent.get();
-		event.commit();
+		testPlanExecutionEvent.getAndSet(null).commit();
 	}
 
 	@Override
@@ -76,7 +69,7 @@ public void executionSkipped(TestIdentifier test, String reason) {
 	@Override
 	public void executionStarted(TestIdentifier test) {
 		var event = new TestExecutionEvent();
-		testExecutionEventMap.put(test.getUniqueId(), event);
+		testExecutionEvents.put(test.getUniqueId(), event);
 		event.initialize(test);
 		event.begin();
 	}
@@ -84,7 +77,7 @@ public void executionStarted(TestIdentifier test) {
 	@Override
 	public void executionFinished(TestIdentifier test, TestExecutionResult result) {
 		var throwable = result.getThrowable();
-		var event = testExecutionEventMap.remove(test.getUniqueId());
+		var event = testExecutionEvents.remove(test.getUniqueId());
 		event.end();
 		event.result = result.getStatus().toString();
 		event.exceptionClass = throwable.map(Throwable::getClass).orElse(null);
@@ -103,28 +96,21 @@ public void reportingEntryPublished(TestIdentifier test, ReportEntry reportEntry
 		}
 	}
 
-	@Category("JUnit")
-	@Label("Test Plan")
-	@Name("org.junit.TestPlan")
+	@Category({ "JUnit", "Execution" })
 	@StackTrace(false)
-	static class TestPlanExecutionEvent extends Event {
+	abstract static class ExecutionEvent extends Event {
+	}
+
+	@Label("Test Execution")
+	@Name("org.junit.TestPlanExecution")
+	static class TestPlanExecutionEvent extends ExecutionEvent {
 		@Label("Contains Tests")
 		boolean containsTests;
 		@Label("Engine Names")
 		String engineNames;
 	}
 
-	@MetadataDefinition
-	@Relational
-	@Name("org.junit.UniqueId")
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.FIELD)
-	public @interface UniqueId {
-	}
-
-	@Category("JUnit")
-	@StackTrace(false)
-	abstract static class TestEvent extends Event {
+	abstract static class TestEvent extends ExecutionEvent {
 		@UniqueId
 		@Label("Unique Id")
 		String uniqueId;
@@ -161,11 +147,9 @@ static class TestExecutionEvent extends TestEvent {
 		String exceptionMessage;
 	}
 
-	@Category("JUnit")
 	@Label("Report Entry")
 	@Name("org.junit.ReportEntry")
-	@StackTrace(false)
-	static class ReportEntryEvent extends Event {
+	static class ReportEntryEvent extends ExecutionEvent {
 		@UniqueId
 		@Label("Unique Id")
 		String uniqueId;
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
new file mode 100644
index 000000000000..270d5b5c651b
--- /dev/null
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.jfr;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import jdk.jfr.MetadataDefinition;
+import jdk.jfr.Name;
+import jdk.jfr.Relational;
+
+@MetadataDefinition
+@Relational
+@Name("org.junit.UniqueId")
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@interface UniqueId {
+}
diff --git a/junit-platform-jfr/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener b/junit-platform-jfr/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
new file mode 100644
index 000000000000..de4e472c48e7
--- /dev/null
+++ b/junit-platform-jfr/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener
@@ -0,0 +1 @@
+org.junit.platform.jfr.FlightRecordingDiscoveryListener
diff --git a/junit-platform-jfr/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/junit-platform-jfr/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
index 34c207842512..35571863ed87 100644
--- a/junit-platform-jfr/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
+++ b/junit-platform-jfr/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
@@ -1 +1 @@
-org.junit.platform.jfr.FlightRecordingListener
+org.junit.platform.jfr.FlightRecordingExecutionListener
diff --git a/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java b/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
index c1b5dee50257..4fc851f0fd78 100644
--- a/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
+++ b/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
@@ -23,6 +23,8 @@
 	requires org.junit.platform.engine;
 	requires org.junit.platform.launcher;
 
+	provides org.junit.platform.launcher.LauncherDiscoveryListener
+			with org.junit.platform.jfr.FlightRecordingDiscoveryListener;
 	provides org.junit.platform.launcher.TestExecutionListener
-			with org.junit.platform.jfr.FlightRecordingListener;
+			with org.junit.platform.jfr.FlightRecordingExecutionListener;
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index 65fa3219270a..553b1a829737 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -21,9 +21,9 @@
  * {@link org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder}
  * to be notified of events that occur during test discovery.
  *
- * <p>All methods in this interface have empty <em>default</em> implementations.
- * Concrete implementations may therefore override one or more of these methods
- * to be notified of the selected events.
+ * <p>All methods in this class have empty <em>default</em> implementations.
+ * Subclasses may therefore override one or more of these methods to be notified
+ * of the selected events.
  *
  * <p>JUnit provides default implementations that are created via the factory
  * methods in
@@ -49,6 +49,26 @@ public abstract class LauncherDiscoveryListener implements EngineDiscoveryListen
 	public LauncherDiscoveryListener() {
 	}
 
+	/**
+	 * Called when test discovery is about to be started.
+	 *
+	 * @param request the request for which discovery is being started
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
+	}
+
+	/**
+	 * Called when test discovery has finished.
+	 *
+	 * @param request the request for which discovery has finished
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	public void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
+	}
+
 	/**
 	 * Called when test discovery is about to be started for an engine.
 	 *
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index f42d5d9c3a18..5e1516fe45c1 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -11,6 +11,8 @@
 package org.junit.platform.launcher.core;
 
 import static java.util.Collections.unmodifiableCollection;
+import static org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.Phase.DISCOVERY;
+import static org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.Phase.EXECUTION;
 
 import java.util.Collection;
 
@@ -71,7 +73,7 @@ public void registerTestExecutionListeners(TestExecutionListener... listeners) {
 	@Override
 	public TestPlan discover(LauncherDiscoveryRequest discoveryRequest) {
 		Preconditions.notNull(discoveryRequest, "LauncherDiscoveryRequest must not be null");
-		return InternalTestPlan.from(discover(discoveryRequest, "discovery"));
+		return InternalTestPlan.from(discover(discoveryRequest, DISCOVERY));
 	}
 
 	@Override
@@ -79,7 +81,7 @@ public void execute(LauncherDiscoveryRequest discoveryRequest, TestExecutionList
 		Preconditions.notNull(discoveryRequest, "LauncherDiscoveryRequest must not be null");
 		Preconditions.notNull(listeners, "TestExecutionListener array must not be null");
 		Preconditions.containsNoNullElements(listeners, "individual listeners must not be null");
-		execute(InternalTestPlan.from(discover(discoveryRequest, "execution")), listeners);
+		execute(InternalTestPlan.from(discover(discoveryRequest, EXECUTION)), listeners);
 	}
 
 	@Override
@@ -99,7 +101,8 @@ LauncherDiscoveryListener getLauncherDiscoveryListener(LauncherDiscoveryRequest
 		return discoveryOrchestrator.getLauncherDiscoveryListener(discoveryRequest);
 	}
 
-	private LauncherDiscoveryResult discover(LauncherDiscoveryRequest discoveryRequest, String phase) {
+	private LauncherDiscoveryResult discover(LauncherDiscoveryRequest discoveryRequest,
+			EngineDiscoveryOrchestrator.Phase phase) {
 		return discoveryOrchestrator.discover(discoveryRequest, phase);
 	}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index 002944d84ce5..3b9ea03be8d4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -19,6 +19,7 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -70,7 +71,19 @@ public EngineDiscoveryOrchestrator(Iterable<TestEngine> testEngines,
 	 * filters} and {@linkplain PostDiscoveryFilter post-discovery filters} and
 	 * {@linkplain TestDescriptor#prune() prunes} the resulting test tree.
 	 */
-	public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, String phase) {
+	public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase phase) {
+		LauncherDiscoveryListener listener = getLauncherDiscoveryListener(request);
+		listener.launcherDiscoveryStarted(request);
+		try {
+			return discoverSafely(request, phase, listener);
+		}
+		finally {
+			listener.launcherDiscoveryFinished(request);
+		}
+	}
+
+	private LauncherDiscoveryResult discoverSafely(LauncherDiscoveryRequest request, Phase phase,
+			LauncherDiscoveryListener listener) {
 		Map<TestEngine, TestDescriptor> testEngineDescriptors = new LinkedHashMap<>();
 
 		for (TestEngine testEngine : this.testEngines) {
@@ -80,7 +93,7 @@ public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, String
 
 			if (engineIsExcluded) {
 				logger.debug(() -> String.format(
-					"Test discovery for engine '%s' was skipped due to an EngineFilter in phase '%s'.",
+					"Test discovery for engine '%s' was skipped due to an EngineFilter in %s phase.",
 					testEngine.getId(), phase));
 				continue;
 			}
@@ -88,7 +101,7 @@ public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, String
 			logger.debug(() -> String.format("Discovering tests during Launcher %s phase in engine '%s'.", phase,
 				testEngine.getId()));
 
-			TestDescriptor rootDescriptor = discoverEngineRoot(testEngine, request);
+			TestDescriptor rootDescriptor = discoverEngineRoot(testEngine, request, listener);
 			testEngineDescriptors.put(testEngine, rootDescriptor);
 		}
 
@@ -101,21 +114,21 @@ public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, String
 		return new LauncherDiscoveryResult(testEngineDescriptors, request.getConfigurationParameters());
 	}
 
-	private TestDescriptor discoverEngineRoot(TestEngine testEngine, LauncherDiscoveryRequest discoveryRequest) {
-		LauncherDiscoveryListener discoveryListener = getLauncherDiscoveryListener(discoveryRequest);
+	private TestDescriptor discoverEngineRoot(TestEngine testEngine, LauncherDiscoveryRequest request,
+			LauncherDiscoveryListener listener) {
 		UniqueId uniqueEngineId = UniqueId.forEngine(testEngine.getId());
 		try {
-			discoveryListener.engineDiscoveryStarted(uniqueEngineId);
-			TestDescriptor engineRoot = testEngine.discover(discoveryRequest, uniqueEngineId);
+			listener.engineDiscoveryStarted(uniqueEngineId);
+			TestDescriptor engineRoot = testEngine.discover(request, uniqueEngineId);
 			discoveryResultValidator.validate(testEngine, engineRoot);
-			discoveryListener.engineDiscoveryFinished(uniqueEngineId, EngineDiscoveryResult.successful());
+			listener.engineDiscoveryFinished(uniqueEngineId, EngineDiscoveryResult.successful());
 			return engineRoot;
 		}
 		catch (Throwable throwable) {
 			UnrecoverableExceptions.rethrowIfUnrecoverable(throwable);
 			String message = String.format("TestEngine with ID '%s' failed to discover tests", testEngine.getId());
 			JUnitException cause = new JUnitException(message, throwable);
-			discoveryListener.engineDiscoveryFinished(uniqueEngineId, EngineDiscoveryResult.failed(cause));
+			listener.engineDiscoveryFinished(uniqueEngineId, EngineDiscoveryResult.failed(cause));
 			return new EngineDiscoveryErrorDescriptor(uniqueEngineId, testEngine, cause);
 		}
 	}
@@ -183,4 +196,13 @@ private void acceptInAllTestEngines(Map<TestEngine, TestDescriptor> testEngineDe
 		testEngineDescriptors.values().forEach(descriptor -> descriptor.accept(visitor));
 	}
 
+	public enum Phase {
+		DISCOVERY, EXECUTION;
+
+		@Override
+		public String toString() {
+			return name().toLowerCase(Locale.ENGLISH);
+		}
+	}
+
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
index d50c0920d3e7..efaffcef2c5a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
@@ -19,6 +19,7 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.launcher.EngineDiscoveryResult;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
 
 /**
  * @since 1.6
@@ -32,6 +33,16 @@ class CompositeLauncherDiscoveryListener extends LauncherDiscoveryListener {
 		this.listeners = Collections.unmodifiableList(new ArrayList<>(listeners));
 	}
 
+	@Override
+	public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
+		listeners.forEach(delegate -> delegate.launcherDiscoveryStarted(request));
+	}
+
+	@Override
+	public void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
+		listeners.forEach(delegate -> delegate.launcherDiscoveryFinished(request));
+	}
+
 	@Override
 	public void engineDiscoveryStarted(UniqueId engineId) {
 		listeners.forEach(delegate -> delegate.engineDiscoveryStarted(engineId));
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
index 3fc606cec774..aa651de7a13c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
@@ -24,6 +24,7 @@
 import org.junit.platform.engine.discovery.UniqueIdSelector;
 import org.junit.platform.launcher.EngineDiscoveryResult;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
 
 /**
  * @since 1.6
@@ -33,6 +34,16 @@ class LoggingLauncherDiscoveryListener extends LauncherDiscoveryListener {
 
 	private static final Logger logger = LoggerFactory.getLogger(LoggingLauncherDiscoveryListener.class);
 
+	@Override
+	public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
+		logger.trace(() -> "Test discovery started");
+	}
+
+	@Override
+	public void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
+		logger.trace(() -> "Test discovery finished");
+	}
+
 	@Override
 	public void engineDiscoveryStarted(UniqueId engineId) {
 		logger.trace(() -> "Engine " + engineId + " has started discovering tests");
diff --git a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
index c2dbd3a745d2..e71c334b3869 100644
--- a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
+++ b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
@@ -22,7 +22,9 @@ public static Launcher createLauncher(TestEngine... engines) {
 		return LauncherFactory.create(LauncherConfig.builder() //
 				.enableTestEngineAutoRegistration(false) //
 				.addTestEngines(engines) //
+				.enableLauncherDiscoveryListenerAutoRegistration(false) //
 				.enableTestExecutionListenerAutoRegistration(false) //
+				.enablePostDiscoveryFilterAutoRegistration(false) //
 				.build());
 	}
 
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index f1c87fe44a44..76b7594ccacd 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -18,6 +18,7 @@
 import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
+import static org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.Phase.EXECUTION;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -266,7 +267,7 @@ private static void executeUsingLauncherOrchestration(TestEngine testEngine,
 			LauncherDiscoveryRequest discoveryRequest, EngineExecutionListener listener) {
 		TestDescriptor engineTestDescriptor;
 		LauncherDiscoveryResult discoveryResult = new EngineDiscoveryOrchestrator(singleton(testEngine), emptySet(),
-			emptySet()).discover(discoveryRequest, "testing");
+			emptySet()).discover(discoveryRequest, EXECUTION);
 		engineTestDescriptor = discoveryResult.getEngineTestDescriptor(testEngine);
 		Preconditions.notNull(engineTestDescriptor, "TestEngine did not yield a TestDescriptor");
 		new EngineExecutionOrchestrator().execute(discoveryResult, listener);
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
new file mode 100644
index 000000000000..c70de8452e61
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.jfr;
+
+import static dev.morling.jfrunit.ExpectedEvent.event;
+import static dev.morling.jfrunit.JfrEventsAssert.assertThat;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+
+import dev.morling.jfrunit.EnableEvent;
+import dev.morling.jfrunit.JfrEventTest;
+import dev.morling.jfrunit.JfrEvents;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.engine.JupiterTestEngine;
+import org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly;
+
+@JfrEventTest
+public class FlightRecordingDiscoveryListenerIntegrationTests {
+
+	public JfrEvents jfrEvents = new JfrEvents();
+
+	@Test
+	@EnableEvent("org.junit.*")
+	void reportsEvents() {
+		var launcher = LauncherFactoryForTestingPurposesOnly.createLauncher(new JupiterTestEngine());
+		var request = request() //
+				.selectors(selectClass(FlightRecordingDiscoveryListenerIntegrationTests.class)) //
+				.listeners(new FlightRecordingDiscoveryListener()) //
+				.build();
+
+		launcher.discover(request);
+		jfrEvents.awaitEvents();
+
+		assertThat(jfrEvents) //
+				.contains(event("org.junit.LauncherDiscovery") //
+				// TODO JfrUnit does not yey support checking int values
+				//						.with("selectors", 1) //
+				//						.with("filters", 0) //
+				) //
+				.contains(event("org.junit.EngineDiscovery") //
+						.with("uniqueId", "[engine:junit-jupiter]"));
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
similarity index 76%
rename from platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingListenerIntegrationTests.java
rename to platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
index 568a58580a50..36ff8135f444 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
@@ -23,38 +23,33 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestReporter;
 import org.junit.jupiter.engine.JupiterTestEngine;
-import org.junit.platform.launcher.core.LauncherConfig;
-import org.junit.platform.launcher.core.LauncherFactory;
+import org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly;
 
 @JfrEventTest
-public class FlightRecordingListenerIntegrationTests {
+public class FlightRecordingExecutionListenerIntegrationTests {
 
 	public JfrEvents jfrEvents = new JfrEvents();
 
 	@Test
 	@EnableEvent("org.junit.*")
 	void reportsEvents() {
-		var config = LauncherConfig.builder() //
-				.enableTestExecutionListenerAutoRegistration(false) //
-				.enableTestEngineAutoRegistration(false) //
-				.addTestEngines(new JupiterTestEngine()) //
-				.build();
+		var launcher = LauncherFactoryForTestingPurposesOnly.createLauncher(new JupiterTestEngine());
 		var request = request() //
 				.selectors(selectClass(TestCase.class)) //
 				.build();
 
-		LauncherFactory.create(config).execute(request, new FlightRecordingListener());
+		launcher.execute(request, new FlightRecordingExecutionListener());
 		jfrEvents.awaitEvents();
 
 		assertThat(jfrEvents) //
-				.contains(event("org.junit.TestPlan") //
+				.contains(event("org.junit.TestPlanExecution") //
 						.with("engineNames", "JUnit Jupiter")) //
 				.contains(event("org.junit.TestExecution") //
 						.with("displayName", "JUnit Jupiter") //
 						.with("type", "CONTAINER")) //
 				.contains(event("org.junit.TestExecution") //
-						.with("displayName", FlightRecordingListenerIntegrationTests.class.getSimpleName() + "$"
-								+ TestCase.class.getSimpleName()) //
+						.with("displayName", FlightRecordingExecutionListenerIntegrationTests.class.getSimpleName()
+								+ "$" + TestCase.class.getSimpleName()) //
 						.with("type", "CONTAINER")) //
 				.contains(event("org.junit.TestExecution") //
 						.with("displayName", "test(TestReporter)") //
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 08468c284c9e..8910104380a8 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -170,14 +170,17 @@ public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId
 
 		var launcher = createLauncher(engine);
 		var discoveryListener = mock(LauncherDiscoveryListener.class);
-		var testPlan = launcher.discover(request() //
+		var request = request() //
 				.listeners(discoveryListener) //
 				.configurationParameter(DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME, "logging") //
-				.build());
+				.build();
+		var testPlan = launcher.discover(request);
 
 		assertThat(testPlan.getRoots()).hasSize(1);
 		var engineIdentifier = getOnlyElement(testPlan.getRoots());
 		assertThat(getOnlyElement(testPlan.getRoots()).getDisplayName()).isEqualTo("my-engine-id");
+		verify(discoveryListener).launcherDiscoveryStarted(request);
+		verify(discoveryListener).launcherDiscoveryFinished(request);
 		assertDiscoveryFailed(engine, discoveryListener);
 
 		var listener = mock(TestExecutionListener.class);
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index d510aa3a9c91..13200078408c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -187,7 +187,7 @@ void discoversLauncherDiscoverRequestListenerViaServiceApiByDefault() {
 
 			assertThat(launcherDiscoveryListener.getClass().getSimpleName()).startsWith("Composite");
 			assertThat(launcherDiscoveryListener).extracting("listeners").asList() //
-					.containsExactlyInAnyOrder(new TestLauncherDiscoveryListener(), abortOnFailure());
+					.contains(new TestLauncherDiscoveryListener(), abortOnFailure());
 		});
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
index 285e80b82262..fbac2f47f921 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
@@ -119,8 +119,10 @@ void logsTraceMessageOnStartAndEnd(LogRecordListener log) {
 		assertThat(log.stream(LoggingLauncherDiscoveryListener.class, Level.FINER)) //
 				.extracting(LogRecord::getMessage) //
 				.containsExactly( //
+					"Test discovery started", //
 					"Engine [engine:some-engine] has started discovering tests", //
-					"Engine [engine:some-engine] has finished discovering tests");
+					"Engine [engine:some-engine] has finished discovering tests", //
+					"Test discovery finished");
 	}
 
 }
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
index 7c18391a5ad1..ecee3737775f 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
@@ -4,5 +4,6 @@ requires jdk.jfr
 requires org.apiguardian.api
 requires org.junit.platform.engine
 requires org.junit.platform.launcher
-provides org.junit.platform.launcher.TestExecutionListener with org.junit.platform.jfr.FlightRecordingListener
+provides org.junit.platform.launcher.LauncherDiscoveryListener with org.junit.platform.jfr.FlightRecordingDiscoveryListener
+provides org.junit.platform.launcher.TestExecutionListener with org.junit.platform.jfr.FlightRecordingExecutionListener
 contains org.junit.platform.jfr

From 47d1ee494fde4dc154d3ad3d02a4e7c8b9339d3d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 09:09:27 +0100
Subject: [PATCH 0117/1433] Remove Codecov token

According to their docs, GH Actions workflows don't require a token.
---
 .github/workflows/main.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b1a983b3bfe2..6eb7164f4b17 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -157,8 +157,6 @@ jobs:
         ./gradlew --scan --no-parallel --stacktrace --warning-mode=all -PenableJaCoCo build jacocoRootReport
     - name: Upload to Codecov.io
       shell: bash
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       run: |
         bash <(curl -s https://codecov.io/bash)
 

From 377775325791779ac78920c4c97fa04985621413 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 18:16:15 +0100
Subject: [PATCH 0118/1433] Update codeql-analysis.yml

---
 .github/workflows/codeql-analysis.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index de13166399f7..e5c81b22cb8b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,12 +39,7 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-      # Install and setup JDK
+    # Install and setup JDK
     - name: Setup JDK 11
       uses: actions/setup-java@v1
       with:

From 075e4b62aff65da1c6163c32ee74168e7cfa7905 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 19:21:32 +0100
Subject: [PATCH 0119/1433] Add auto-imported settings from Intellij IDEA
 2020.3

---
 .idea/vcs.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index f77f7d2313e4..cac68bbbeb72 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GithubSharedProjectSettings">
+    <option name="branchProtectionPatterns">
+      <list>
+        <option value="gh-pages" />
+        <option value="releases\/.*" />
+        <option value="proposals" />
+        <option value="main" />
+      </list>
+    </option>
+  </component>
   <component name="IssueNavigationConfiguration">
     <option name="links">
       <list>
@@ -13,4 +23,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
-</project>
+</project>
\ No newline at end of file

From 4747ae5bf3b2a889a83a3ccf6f5abf76ae840ee8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 19:21:55 +0100
Subject: [PATCH 0120/1433] Use official Codecov GH Action

---
 .github/workflows/main.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6eb7164f4b17..03479b427db7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -156,9 +156,7 @@ jobs:
         ./gradlew --version
         ./gradlew --scan --no-parallel --stacktrace --warning-mode=all -PenableJaCoCo build jacocoRootReport
     - name: Upload to Codecov.io
-      shell: bash
-      run: |
-        bash <(curl -s https://codecov.io/bash)
+      uses: codecov/codecov-action@v1
 
   publish_artifacts:
     name: Publish Snapshot Artifacts

From a2eed5ced250d918209dbce517df84a017a1c9d7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 19:27:29 +0100
Subject: [PATCH 0121/1433] Configure fetch-depth in all workflows

---
 .github/workflows/cross-version.yml             |  2 ++
 .github/workflows/gradle-wrapper-validation.yml |  2 ++
 .github/workflows/main.yml                      | 13 +++++++++++++
 .github/workflows/reproducible-build.yml        |  2 ++
 4 files changed, 19 insertions(+)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index f6094e86692e..0ac665a6c27a 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -24,6 +24,8 @@ jobs:
     container: "ghcr.io/junit-team/build:${{ matrix.jdk }}"
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
       - name: Cache Gradle wrapper and dependencies
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 405a2b306592..ba7ceef98a0a 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 03479b427db7..2e0cb83e79c6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,6 +21,8 @@ jobs:
     container: ghcr.io/junit-team/build
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
@@ -51,6 +53,8 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
@@ -94,6 +98,8 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
@@ -130,6 +136,9 @@ jobs:
     container: ghcr.io/junit-team/build
     steps:
     - uses: actions/checkout@v2
+      with:
+        # Codecov needs fetch-depth > 1
+        fetch-depth: 2
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
@@ -165,6 +174,8 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && (startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main')
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
@@ -192,6 +203,8 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index c50b8a0baf47..b53c03ef6d2a 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -18,6 +18,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:

From d4857247ab79c31c3a1df5e5e3d8e7e9e532accc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 19:29:37 +0100
Subject: [PATCH 0122/1433] Remove --warning-mode=all in favor of build scans

---
 .github/workflows/cross-version.yml | 2 +-
 .github/workflows/main.yml          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 0ac665a6c27a..afc53e9d4e6a 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -49,4 +49,4 @@ jobs:
       - name: Test
         run: |
           ./gradlew --version
-          ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
+          ./gradlew --scan --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e0cb83e79c6..2bbeab311873 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,7 +46,7 @@ jobs:
     - name: 'Test'
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true build
+        ./gradlew --scan --no-parallel -Dplatform.tooling.support.tests.enabled=true build
 
   windows:
     name: 'Windows'
@@ -91,7 +91,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
+        ./gradlew --scan --no-parallel -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
         ./gradlew --stop
   mac:
     name: 'Mac OS'
@@ -127,7 +127,7 @@ jobs:
     - name: 'Test'
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel --warning-mode=all -Dplatform.tooling.support.tests.enabled=true build
+        ./gradlew --scan --no-parallel -Dplatform.tooling.support.tests.enabled=true build
 
   coverage:
     name: 'Coverage'
@@ -163,7 +163,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel --stacktrace --warning-mode=all -PenableJaCoCo build jacocoRootReport
+        ./gradlew --scan --no-parallel --stacktrace -PenableJaCoCo build jacocoRootReport
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 

From b30ff5d71206fb11983d9ba9603337f7ad82a501 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 19:34:48 +0100
Subject: [PATCH 0123/1433] Merge coverage with Linux job

---
 .github/workflows/main.yml | 73 ++++++++++----------------------------
 1 file changed, 19 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2bbeab311873..85a3762951da 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ env:
 
 jobs:
   linux:
-    name: 'Linux'
+    name: Linux
     runs-on: ubuntu-latest
     container: ghcr.io/junit-team/build
     steps:
@@ -43,13 +43,15 @@ jobs:
       run: |
         mkdir -p /root/.gradle/enterprise/
         echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > /root/.gradle/enterprise/keys.properties
-    - name: 'Test'
+    - name: Test and Coverage
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel -Dplatform.tooling.support.tests.enabled=true build
+        ./gradlew --scan --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo build jacocoRootReport
+    - name: Upload to Codecov.io
+      uses: codecov/codecov-action@v1
 
   windows:
-    name: 'Windows'
+    name: Windows
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
@@ -71,14 +73,14 @@ jobs:
         key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           test-${{ runner.os }}-maven-
-    - name: 'Set up JDK 8'
+    - name: Set up JDK 8
       uses: actions/setup-java@v1
       with:
         java-version: 8
-    - name: 'Prepare JDK8 env var'
+    - name: Prepare JDK8 env var
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: 'Set up JDK 15'
+    - name: Set up JDK 15
       uses: actions/setup-java@v1
       with:
         java-version: 15
@@ -87,14 +89,15 @@ jobs:
       run: |
         mkdir -p $HOME/.gradle/enterprise/
         echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > $HOME/.gradle/enterprise/keys.properties
-    - name: 'Test'
+    - name: Test
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
+        ./gradlew --scan --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
         ./gradlew --stop
+
   mac:
-    name: 'Mac OS'
+    name: Mac OS
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
@@ -116,7 +119,7 @@ jobs:
         key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           test-${{ runner.os }}-maven-
-    - name: 'Set up JDK 15'
+    - name: Set up JDK 15
       uses: actions/setup-java@v1
       with:
         java-version: 15
@@ -127,45 +130,7 @@ jobs:
     - name: 'Test'
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel -Dplatform.tooling.support.tests.enabled=true build
-
-  coverage:
-    name: 'Coverage'
-    needs: linux
-    runs-on: ubuntu-latest
-    container: ghcr.io/junit-team/build
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        # Codecov needs fetch-depth > 1
-        fetch-depth: 2
-    - name: Cache Gradle wrapper and dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          /root/.gradle/caches/
-          /root/.gradle/wrapper/dists
-        key: coverage-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-        restore-keys: |
-          coverage-${{ runner.os }}-gradle-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: /root/.m2/repository
-        key: coverage-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          coverage-${{ runner.os }}-maven-
-    - name: Prepare Gradle Enterprise credentials
-      run: |
-        mkdir -p /root/.gradle/enterprise/
-        echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > /root/.gradle/enterprise/keys.properties
-    - name: 'Run tests with JaCoCo'
-      shell: bash
-      run: |
-        ./gradlew --version
-        ./gradlew --scan --no-parallel --stacktrace -PenableJaCoCo build jacocoRootReport
-    - name: Upload to Codecov.io
-      uses: codecov/codecov-action@v1
+        ./gradlew --scan --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true build
 
   publish_artifacts:
     name: Publish Snapshot Artifacts
@@ -185,11 +150,11 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: 'Set up JDK 15'
+    - name: Set up JDK 15
       uses: actions/setup-java@v1
       with:
         java-version: 15
-    - name: 'Publish'
+    - name: Publish
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
@@ -214,11 +179,11 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: 'Set up JDK 15'
+    - name: Set up JDK 15
       uses: actions/setup-java@v1
       with:
         java-version: 15
-    - name: 'Upload Documentation'
+    - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

From 52c1beb7d1a8279a44769835530405e7aa6617a9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 21:13:55 +0100
Subject: [PATCH 0124/1433] Increase fetch-depth for Codecov

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 85a3762951da..396911c24813 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
-        fetch-depth: 1
+        # Codecov needs fetch-depth > 1
+        fetch-depth: 2
     - name: Cache Gradle wrapper and dependencies
       uses: actions/cache@v2
       with:

From 49d1308aad3df3972a9dc1137e122d9783820e5c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 28 Dec 2020 21:18:47 +0100
Subject: [PATCH 0125/1433] Add caching step to CodeQL workflow

---
 .github/workflows/codeql-analysis.yml | 43 +++++----------------------
 1 file changed, 8 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e5c81b22cb8b..e91dd4d6a5bb 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,8 +1,3 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
 name: "CodeQL"
 
 on:
@@ -21,51 +16,30 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
         language: ['java', 'javascript']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
+    - name: Cache Gradle wrapper and dependencies
+      uses: actions/cache@v2
       with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # Install and setup JDK
+        path: |
+          /root/.gradle/caches/
+          /root/.gradle/wrapper/dists
+        key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
+        restore-keys: |
+          test-${{ runner.os }}-gradle-
     - name: Setup JDK 11
       uses: actions/setup-java@v1
       with:
         java-version: 11
-
-    # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    #- name: Autobuild
-    #  uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
     - name: Prepare Gradle Enterprise credentials
       run: |
         mkdir -p $HOME/.gradle/enterprise/
@@ -74,6 +48,5 @@ jobs:
       run: |
         ./gradlew --version
         ./gradlew --no-build-cache allMainClasses -PjavaToolchainVersion=11
-
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1

From 3795d71dbfe869235c3a44f239e6bc2096230e7f Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Sat, 2 Jan 2021 20:20:24 +0100
Subject: [PATCH 0126/1433] Document constant value for
 ExclusiveResource.GLOBAL_KEY (#2511)

By documenting the value of `ExclusiveResource.GLOBAL_KEY` test engines that
can not reference constants from a class file may use plain text configuration
to run tests in isolation.

Additionally by documenting the constants used in `Resources` the canonical
resource names are exposed and can be consistently used elsewhere.

Fixes #2508.
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  2 ++
 .../junit/jupiter/api/parallel/Isolated.java  |  2 +-
 .../junit/jupiter/api/parallel/Resources.java | 22 ++++++++++++++-----
 .../hierarchical/ExclusiveResource.java       |  3 ++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 152f754a5eff..9965b080795c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -38,6 +38,7 @@ on GitHub.
   and registered test engines.
 * Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
   `ServiceLoader` mechanism.
+* Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
 
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
@@ -56,6 +57,7 @@ on GitHub.
 * Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
   underscores as in some JVM languages, to improve readability of long numbers like
   `700_000_000`.
+* Documented constant values in `Resources`.
 
 
 [[release-notes-5.8.0-M1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
index 8146166eaead..104e6a44ef62 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
@@ -37,7 +37,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Inherited
-@ResourceLock("org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_KEY")
+@ResourceLock(Resources.GLOBAL)
 public @interface Isolated {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
index 6028eab46f5a..b82569c5b92d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
@@ -24,7 +24,7 @@
 public class Resources {
 
 	/**
-	 * Represents Java's system properties.
+	 * Represents Java's system properties: {@value}
 	 *
 	 * @see System#getProperties()
 	 * @see System#setProperties(java.util.Properties)
@@ -32,7 +32,7 @@ public class Resources {
 	public static final String SYSTEM_PROPERTIES = "java.lang.System.properties";
 
 	/**
-	 * Represents the standard output stream of the current process.
+	 * Represents the standard output stream of the current process: {@value}
 	 *
 	 * @see System#out
 	 * @see System#setOut(java.io.PrintStream)
@@ -40,7 +40,7 @@ public class Resources {
 	public static final String SYSTEM_OUT = "java.lang.System.out";
 
 	/**
-	 * Represents the standard error stream of the current process.
+	 * Represents the standard error stream of the current process: {@value}
 	 *
 	 * @see System#err
 	 * @see System#setErr(java.io.PrintStream)
@@ -48,7 +48,8 @@ public class Resources {
 	public static final String SYSTEM_ERR = "java.lang.System.err";
 
 	/**
-	 * Represents the default locale for the current instance of the JVM.
+	 * Represents the default locale for the current instance of the JVM:
+	 * {@value}
 	 *
 	 * @since 5.4
 	 * @see java.util.Locale#setDefault(java.util.Locale)
@@ -57,7 +58,8 @@ public class Resources {
 	public static final String LOCALE = "java.util.Locale.default";
 
 	/**
-	 * Represents the default time zone for the current instance of the JVM.
+	 * Represents the default time zone for the current instance of the JVM:
+	 * {@value}
 	 *
 	 * @since 5.4
 	 * @see java.util.TimeZone#setDefault(java.util.TimeZone)
@@ -65,6 +67,16 @@ public class Resources {
 	@API(status = EXPERIMENTAL, since = "5.4")
 	public static final String TIME_ZONE = "java.util.TimeZone.default";
 
+	/**
+	 * Represents the global resource lock: {@value}
+	 *
+	 * @since 5.8
+	 * @see Isolated
+	 * @see ExclusiveResource
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	public static final String GLOBAL = "org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_KEY";
+
 	private Resources() {
 		/* no-op */
 	}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
index 72f54c396348..564350ae10ac 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
@@ -32,7 +32,8 @@ public class ExclusiveResource {
 
 	/**
 	 * Key of the global resource lock that all direct children of the engine
-	 * descriptor acquire in {@linkplain LockMode#READ read mode} by default.
+	 * descriptor acquire in {@linkplain LockMode#READ read mode} by default:
+	 * {@value}
 	 *
 	 * <p>If any node {@linkplain Node#getExclusiveResources() requires} an
 	 * exclusive resource with the same key in

From 03a79c13f612099a8fc328aa2bcff23e4f8dcc2c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 3 Jan 2021 11:31:44 +0100
Subject: [PATCH 0127/1433] Deprecate accidentally public constructor

---
 .../core/LauncherDiscoveryRequestBuilder.java     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 272973ad8802..7a27914cad8a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.launcher.core;
 
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.ArrayList;
@@ -107,7 +108,19 @@ public final class LauncherDiscoveryRequestBuilder {
 	 * @return a new builder
 	 */
 	public static LauncherDiscoveryRequestBuilder request() {
-		return new LauncherDiscoveryRequestBuilder();
+		return new LauncherDiscoveryRequestBuilder(null);
+	}
+
+	/**
+	 * @deprecated Use {@link #request()}
+	 */
+	@API(status = DEPRECATED, since = "5.8")
+	@Deprecated
+	public LauncherDiscoveryRequestBuilder() {
+		this(null);
+	}
+
+	private LauncherDiscoveryRequestBuilder(@SuppressWarnings("unused") Object ignored) {
 	}
 
 	/**

From f6353883f23ee3d9a1027224c682e0477782b962 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Jan 2021 14:54:47 +0100
Subject: [PATCH 0128/1433] Fix Javadoc

---
 .../java/org/junit/jupiter/api/parallel/Resources.java    | 2 +-
 .../src/module/org.junit.platform.jfr/module-info.java    | 8 +++++---
 .../platform/launcher/LauncherDiscoveryListener.java      | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
index b82569c5b92d..89a22048319e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
@@ -72,7 +72,7 @@ public class Resources {
 	 *
 	 * @since 5.8
 	 * @see Isolated
-	 * @see ExclusiveResource
+	 * @see org.junit.platform.engine.support.hierarchical.ExclusiveResource
 	 */
 	@API(status = EXPERIMENTAL, since = "5.8")
 	public static final String GLOBAL = "org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_KEY";
diff --git a/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java b/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
index 4fc851f0fd78..0636e4eff966 100644
--- a/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
+++ b/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
@@ -9,10 +9,12 @@
  */
 
 /**
- * Provides the JUnit Platform Flight Recording Listener.
+ * Provides Java Flight Recorder events for the JUnit Platform.
  *
- * <p>The Flight Recording Listener is a {@link TestExecutionListener} that
- * generates Java Flight Recorder events.
+ * <p>The Flight Recording Listener module implements a
+ * {@link org.junit.platform.launcher.LauncherDiscoveryListener} and a
+ * {@link org.junit.platform.launcher.TestExecutionListener} that generate Java
+ * Flight Recorder (JFR) events.
  *
  * @see <a href="https://openjdk.java.net/jeps/328">JEP 328: Flight Recorder</a>
  * @since 1.7
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index 553b1a829737..38ae37af3710 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -17,9 +17,9 @@
 import org.junit.platform.engine.UniqueId;
 
 /**
- * Register a concrete implementation of this interface with a
- * {@link org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder}
- * to be notified of events that occur during test discovery.
+ * Register a concrete implementation of this class with a
+ * {@link org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder} or
+ * {@link Launcher} to be notified of events that occur during test discovery.
  *
  * <p>All methods in this class have empty <em>default</em> implementations.
  * Subclasses may therefore override one or more of these methods to be notified
@@ -35,6 +35,7 @@
  *
  * @see org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners
  * @see LauncherDiscoveryRequest#getDiscoveryListener()
+ * @see org.junit.platform.launcher.core.LauncherConfig.Builder#addLauncherDiscoveryListeners
  * @since 1.6
  */
 @API(status = EXPERIMENTAL, since = "1.6")

From 610614ae917c6d211663798142a2dbbe50a10a04 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Jan 2021 15:00:18 +0100
Subject: [PATCH 0129/1433] Revert premature change

---
 .../junit/platform/launcher/LauncherDiscoveryListener.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index 38ae37af3710..8830e252a8a5 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -18,8 +18,8 @@
 
 /**
  * Register a concrete implementation of this class with a
- * {@link org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder} or
- * {@link Launcher} to be notified of events that occur during test discovery.
+ * {@link org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder}
+ * to be notified of events that occur during test discovery.
  *
  * <p>All methods in this class have empty <em>default</em> implementations.
  * Subclasses may therefore override one or more of these methods to be notified
@@ -35,7 +35,6 @@
  *
  * @see org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners
  * @see LauncherDiscoveryRequest#getDiscoveryListener()
- * @see org.junit.platform.launcher.core.LauncherConfig.Builder#addLauncherDiscoveryListeners
  * @since 1.6
  */
 @API(status = EXPERIMENTAL, since = "1.6")

From a73ac51f72b455a1b9ca93220b944b8d3802a574 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Mon, 4 Jan 2021 19:01:48 +0100
Subject: [PATCH 0130/1433] Introduce test for scanning classes in a modular
 JAR

Addresses #2500
---
 .../commons/util/ClasspathScannerTests.java   |  22 ++++++++++++++++++
 .../src/test/resources/com.greetings@1-ea.jar | Bin 0 -> 1380 bytes
 2 files changed, 22 insertions(+)
 create mode 100644 platform-tests/src/test/resources/com.greetings@1-ea.jar

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
index 38f9c0304da3..a752394aef77 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
@@ -18,6 +18,7 @@
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.io.IOException;
+import java.lang.module.ModuleFinder;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -27,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -176,6 +178,26 @@ void scanForClassesInPackage() {
 		assertTrue(classes.contains(MemberClassToBeFound.class));
 	}
 
+	@Test
+	// #2500
+	void scanForClassesInPackageWithinModuleSharingNames() throws Exception {
+		var jarfile = getClass().getResource("/com.greetings@1-ea.jar");
+
+		var module = "com.greetings";
+		var before = ModuleFinder.of();
+		var finder = ModuleFinder.of(Path.of(jarfile.toURI()));
+		var boot = ModuleLayer.boot();
+		var configuration = boot.configuration().resolveAndBind(before, finder, Set.of(module));
+		var parent = ClassLoader.getPlatformClassLoader();
+		var layer = ModuleLayer.defineModulesWithOneLoader(configuration, List.of(boot), parent).layer();
+
+		var classpathScanner = new ClasspathScanner(() -> layer.findLoader(module), ReflectionUtils::tryToLoadClass);
+
+		var classes = classpathScanner.scanForClassesInPackage("com.greetings", allClasses);
+		var classNames = classes.stream().map(Class::getName).collect(Collectors.toList());
+		assertThat(classNames).hasSize(1).contains("com.greetings.Main");
+	}
+
 	@Test
 	void findAllClassesInPackageWithinJarFile() throws Exception {
 		var jarfile = getClass().getResource("/jartest.jar");
diff --git a/platform-tests/src/test/resources/com.greetings@1-ea.jar b/platform-tests/src/test/resources/com.greetings@1-ea.jar
new file mode 100644
index 0000000000000000000000000000000000000000..38c7b065939520c1cc747b02cbb4e2acacdda028
GIT binary patch
literal 1380
zcmWIWW@Zs#;Nak35ScF@$bbYm8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1g<Oz^PdT
zr~<Cp*U`_@%{4eg&(}@#)Iz=n1%ZZ#=Z;wmm>w{R=$JI~Y~A6>8x?o#*50=_>i_%x
z3#U4D%G@7anr*&$_7<)dg^C+re;!I|>s1IfS$O#_=M!o7wMtXcoLSTIgZ9U$xoGNc
z{_U#0HV))A=Y6ZhqJTEX0Wog32?Awv^HWN5Qgt))((?6^a}tY-eSNL@ngRsogt7?Q
za~zBASh!)6$wp(tk1YN%oLzfb)UVAueTcb2<1w?+uA_BnY3XtAj|(3Vk~_Hbg!9Bt
zIw$)sF$vzWSFq@ut-zyH$@yr`&sixOKP3wE6darN(Zo1^#!okunXIe-{dg#RgJt&@
zu5V5o`P(mWiMQPI6RSM(S|zn<=gKC|!&NuCUg#u+wFL4`dAB-5qm(`B$FxSpQ@eX7
z&I>LnF?W2CeRV<L&Z$A_Nii#T%Y(f9P2Kav7NCb%7$IKfVqgG9(f4_%amfNyk({5a
z4+<3QD)^u((u-14OEUA)i@|CkDFfX!2@JKqiJ5tjaLf(#_CD+&@Nb*%Y&Ey&)z`LP
zb6@y1;XwA0?gi7sTDz3yZF_6xHcKaGTa&#vKUdQ~hWaTMonEzX6VuA%?$;Q9{`Kt(
z(*ftRZfudlZOt;Dc$Q|@9lp!hU-NxOvF@%}iu<Kq8t)~axF(%0#<juc2H&v<e?0Q<
zAB$?4qS_u}a@j|@vBW<_;N`ZkruH~SVV=wFUL3M6bun+XCBw2mM(G*_CTWzXzW5a%
zxczAJ2{*}LwPmtr790wY`FdOagGJhgnuXDu%w;&7)|t;*+`_*;J(=&bnwX4EQfJ~T
z`8bp0_*D~x-{1XZ&eA0$_<qyRYR$OE_diPX)ZSE9I+`ZXxj6BL;HxR+LRoGehYdnr
zO|SnboxbJ7v<u;z$`6V1w~BSC8SnVyc{A5CB(_jM#UO0c<hLx0*&3H#PMXf>-RE93
zv+nc~$(MJoDc_Kl<k437ywaGPd-aMS&q=#Jzg&Cguui}9`4cfIr;oDxY?C*rwp+FJ
zvYVxq<Gfpwj&7L8W`612?DwD)VaQUKSqDrFe!yHB;LXS+!ho8;VVM_{zfl1^!-8@<
zx>n@81<KtBU<+izwIbzpbQ6%1Dku*kz)c_%BS(U?b1`5~t*9<P1N1E<b>r3nO5X_Z
u4ypq=wIf0bl-`j;5tQB$KnfUuAlndn5vf1Go0Scuk_`w8fOgzt2JrxLE2uXB

literal 0
HcmV?d00001


From 41e8a235389044a68c19699d2dae1952cc611483 Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Mon, 4 Jan 2021 21:00:22 +0100
Subject: [PATCH 0131/1433] Add Revved up by Gradle Enterprise Badge to Readme
 (#2512)

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7751939d85d3..b7055b276a18 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,8 @@ in `build/reports/jacoco/jacocoRootReport/html/index.html`.
 
 ## Gradle Build Scans and Build Caching
 
+[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.junit.org/scans)
+
 JUnit 5 utilizes [Gradle Enterprise](https://gradle.com/) for _Build Scans_ and the
 _Remote Build Cache_. An example build scan for JUnit 5 can be viewed
 [here](https://ge.junit.org/s/2vwrn4rn67dky). Currently, only core team members can

From fe29e1d6caa623361f75e327cf472215533c4391 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Jan 2021 21:54:56 +0100
Subject: [PATCH 0132/1433] Improve test for MethodOrderers

---
 .../engine/extension/OrderedMethodTests.java  | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
index af550d36be60..9733f8f97d85 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
@@ -11,7 +11,6 @@
 package org.junit.jupiter.engine.extension;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 import static org.junit.jupiter.api.MethodOrderer.Random.RANDOM_SEED_PROPERTY_NAME;
 import static org.junit.jupiter.api.Order.DEFAULT;
@@ -28,7 +27,6 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -183,27 +181,27 @@ void defaultOrderer() {
 	@Test
 	@TrackLogRecords
 	void randomWithBogusSeedRepeatedly(LogRecordListener listener) {
-		String seed = "explode";
-		String expectedMessagePattern = "Failed to convert configuration parameter \\["
-				+ Pattern.quote(Random.RANDOM_SEED_PROPERTY_NAME) + "\\] with value \\[" + seed
-				+ "\\] to a long\\. Using default seed \\[\\d+\\] as fallback\\.";
+		var seed = "explode";
+		var expectedMessagePattern = Pattern.compile(
+			"Failed to convert configuration parameter \\[" + Pattern.quote(Random.RANDOM_SEED_PROPERTY_NAME)
+					+ "] with value \\[" + seed + "] to a long\\. Using default seed \\[\\d+] as fallback\\.");
 
 		Set<String> uniqueSequences = new HashSet<>();
 
-		for (int i = 0; i < 10; i++) {
+		for (var i = 0; i < 10; i++) {
 			callSequence.clear();
 			listener.clear();
 
-			var tests = executeTestsInParallelWithRandomSeed(RandomTestCase.class, seed);
+			var tests = executeRandomTestCaseInParallelWithRandomSeed(seed);
 
 			tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
-			uniqueSequences.add(callSequence.stream().collect(Collectors.joining(",")));
+			uniqueSequences.add(String.join(",", callSequence));
 
 			// @formatter:off
-			assertTrue(listener.stream(Random.class, Level.WARNING)
-				.map(LogRecord::getMessage)
-				.anyMatch(msg -> msg.matches(expectedMessagePattern)));
+			assertThat(listener.stream(Random.class, Level.WARNING)
+					.map(LogRecord::getMessage))
+					.anyMatch(expectedMessagePattern.asMatchPredicate());
 			// @formatter:on
 		}
 
@@ -215,23 +213,23 @@ void randomWithBogusSeedRepeatedly(LogRecordListener listener) {
 	void randomWithDifferentSeedConsecutively(LogRecordListener listener) {
 		Set<String> uniqueSequences = new HashSet<>();
 
-		for (int i = 0; i < 10; i++) {
-			String seed = String.valueOf(i);
-			String expectedMessage = "Using custom seed for configuration parameter ["
-					+ Random.RANDOM_SEED_PROPERTY_NAME + "] with value [" + seed + "].";
+		for (var i = 0; i < 10; i++) {
+			var seed = String.valueOf(i);
+			var expectedMessage = "Using custom seed for configuration parameter [" + Random.RANDOM_SEED_PROPERTY_NAME
+					+ "] with value [" + seed + "].";
 			callSequence.clear();
 			listener.clear();
 
-			var tests = executeTestsInParallelWithRandomSeed(RandomTestCase.class, seed);
+			var tests = executeRandomTestCaseInParallelWithRandomSeed(seed);
 
 			tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
-			uniqueSequences.add(callSequence.stream().collect(Collectors.joining(",")));
+			uniqueSequences.add(String.join(",", callSequence));
 
 			// @formatter:off
-			assertTrue(listener.stream(Random.class, Level.CONFIG)
-				.map(LogRecord::getMessage)
-				.anyMatch(expectedMessage::equals));
+			assertThat(listener.stream(Random.class, Level.CONFIG)
+					.map(LogRecord::getMessage))
+					.contains(expectedMessage);
 			// @formatter:on
 
 			assertThat(threadNames).hasSize(i + 1);
@@ -244,15 +242,15 @@ void randomWithDifferentSeedConsecutively(LogRecordListener listener) {
 	@Test
 	@TrackLogRecords
 	void randomWithCustomSeed(LogRecordListener listener) {
-		String seed = "42";
-		String expectedMessage = "Using custom seed for configuration parameter [" + Random.RANDOM_SEED_PROPERTY_NAME
+		var seed = "42";
+		var expectedMessage = "Using custom seed for configuration parameter [" + Random.RANDOM_SEED_PROPERTY_NAME
 				+ "] with value [" + seed + "].";
 
-		for (int i = 0; i < 10; i++) {
+		for (var i = 0; i < 10; i++) {
 			callSequence.clear();
 			listener.clear();
 
-			var tests = executeTestsInParallelWithRandomSeed(RandomTestCase.class, seed);
+			var tests = executeRandomTestCaseInParallelWithRandomSeed(seed);
 
 			tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
@@ -260,9 +258,9 @@ void randomWithCustomSeed(LogRecordListener listener) {
 			assertThat(callSequence).containsExactly("test2()", "test3()", "test4()", "repetition 1 of 1", "test1()");
 
 			// @formatter:off
-			assertTrue(listener.stream(Random.class, Level.CONFIG)
-				.map(LogRecord::getMessage)
-				.anyMatch(expectedMessage::equals));
+			assertThat(listener.stream(Random.class, Level.CONFIG)
+					.map(LogRecord::getMessage))
+					.contains(expectedMessage);
 			// @formatter:on
 		}
 
@@ -278,7 +276,7 @@ void misbehavingMethodOrdererThatAddsElements(LogRecordListener listener) {
 
 		assertThat(callSequence).containsExactlyInAnyOrder("test1()", "test2()");
 
-		String expectedMessage = "MethodOrderer [" + MisbehavingByAdding.class.getName()
+		var expectedMessage = "MethodOrderer [" + MisbehavingByAdding.class.getName()
 				+ "] added 2 MethodDescriptor(s) for test class [" + testClass.getName() + "] which will be ignored.";
 
 		assertExpectedLogMessage(listener, expectedMessage);
@@ -293,7 +291,7 @@ void misbehavingMethodOrdererThatRemovesElements(LogRecordListener listener) {
 
 		assertThat(callSequence).containsExactlyInAnyOrder("test1()", "test2()", "test3()");
 
-		String expectedMessage = "MethodOrderer [" + MisbehavingByRemoving.class.getName()
+		var expectedMessage = "MethodOrderer [" + MisbehavingByRemoving.class.getName()
 				+ "] removed 2 MethodDescriptor(s) for test class [" + testClass.getName()
 				+ "] which will be retained with arbitrary ordering.";
 
@@ -302,9 +300,9 @@ void misbehavingMethodOrdererThatRemovesElements(LogRecordListener listener) {
 
 	private void assertExpectedLogMessage(LogRecordListener listener, String expectedMessage) {
 		// @formatter:off
-		assertTrue(listener.stream(Level.WARNING)
-			.map(LogRecord::getMessage)
-			.anyMatch(expectedMessage::equals));
+		assertThat(listener.stream(Level.WARNING)
+				.map(LogRecord::getMessage))
+				.contains(expectedMessage);
 		// @formatter:on
 	}
 
@@ -325,9 +323,10 @@ private Events executeTestsInParallel(Class<?> testClass, Class<? extends Method
 		// @formatter:on
 	}
 
-	private Events executeTestsInParallelWithRandomSeed(Class<?> testClass, String seed) {
+	private Events executeRandomTestCaseInParallelWithRandomSeed(String seed) {
 		var configurationParameters = Map.of(//
 			PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true", //
+			DEFAULT_PARALLEL_EXECUTION_MODE, "concurrent", //
 			RANDOM_SEED_PROPERTY_NAME, seed //
 		);
 
@@ -335,7 +334,7 @@ private Events executeTestsInParallelWithRandomSeed(Class<?> testClass, String s
 		return EngineTestKit
 				.engine("junit-jupiter")
 				.configurationParameters(configurationParameters)
-				.selectors(selectClass(testClass))
+				.selectors(selectClass(RandomTestCase.class))
 				.execute()
 				.testEvents();
 		// @formatter:on
@@ -355,12 +354,13 @@ void c() {
 
 	}
 
+	@SuppressWarnings("unused")
 	@TestMethodOrder(MethodName.class)
 	static class MethodNameTestCase extends BaseTestCase {
 
 		@BeforeEach
 		void trackInvocations(TestInfo testInfo) {
-			var method = testInfo.getTestMethod().get();
+			var method = testInfo.getTestMethod().orElseThrow(AssertionError::new);
 			var signature = String.format("%s(%s)", method.getName(),
 				ClassUtils.nullSafeToString(method.getParameterTypes()));
 
@@ -407,13 +407,13 @@ void zzz() {
 		}
 	}
 
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings({ "deprecation", "unused" })
 	@TestMethodOrder(org.junit.jupiter.api.MethodOrderer.Alphanumeric.class)
 	static class AlphanumericTestCase extends BaseTestCase {
 
 		@BeforeEach
 		void trackInvocations(TestInfo testInfo) {
-			var method = testInfo.getTestMethod().get();
+			var method = testInfo.getTestMethod().orElseThrow(AssertionError::new);
 			var signature = String.format("%s(%s)", method.getName(),
 				ClassUtils.nullSafeToString(method.getParameterTypes()));
 
@@ -697,13 +697,13 @@ static class MisbehavingByAdding implements MethodOrderer {
 
 		@Override
 		public void orderMethods(MethodOrdererContext context) {
-			context.getMethodDescriptors().add(mock(MethodDescriptor.class));
-			context.getMethodDescriptors().add(mock(MethodDescriptor.class));
+			context.getMethodDescriptors().add(mockMethodDescriptor());
+			context.getMethodDescriptors().add(mockMethodDescriptor());
 		}
 
 		@SuppressWarnings("unchecked")
-		static <T> T mock(Class<? super T> type) {
-			return (T) Mockito.mock(type);
+		static <T> T mockMethodDescriptor() {
+			return (T) Mockito.mock((Class<? super T>) MethodDescriptor.class);
 		}
 
 	}

From 81e82d9f7768e49497d0f7631b7908022cd3cca8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Jan 2021 22:01:03 +0100
Subject: [PATCH 0133/1433] Upgradle to 6.8-rc-5

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37b9a50578f1..4f84333d2748 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=6cb03b71767b169eda987338091172cbc84eb0cd53a93c17e6661688411e267e
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-4-bin.zip
+distributionSha256Sum=569bebddc0c174475cc25d708e54af793f25fd37e5a72e53674f8ef628b6ddfd
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 9c59b692fd2d75a1600791a5680bb3a5b22e8f73 Mon Sep 17 00:00:00 2001
From: Jan Bernitt <jaanbernitt@gmail.com>
Date: Tue, 5 Jan 2021 09:52:12 +0100
Subject: [PATCH 0134/1433] Add `assertInstanceOf` to Jupiter's assertions

Closes #2492
---
 .../release-notes/release-notes-5.8.0-M1.adoc |   3 +-
 .../junit/jupiter/api/AssertInstanceOf.java   |  57 +++++++++
 .../org/junit/jupiter/api/Assertions.java     |  47 ++++++++
 .../api/AssertInstanceOfAssertionsTests.java  | 109 ++++++++++++++++++
 4 files changed, 215 insertions(+), 1 deletion(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 9965b080795c..2486425e1a4e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -58,7 +58,8 @@ on GitHub.
   underscores as in some JVM languages, to improve readability of long numbers like
   `700_000_000`.
 * Documented constant values in `Resources`.
-
+* New `assertInstanceOf` methods as a replacement for `assertTrue(obj instanceof X)` which
+  provide better error messages comparable to those of `assertThrows`.
 
 [[release-notes-5.8.0-M1-junit-vintage]]
 === JUnit Vintage
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
new file mode 100644
index 000000000000..44e423a99fb2
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
+import static org.junit.jupiter.api.AssertionUtils.format;
+import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+
+import java.util.function.Supplier;
+
+import org.opentest4j.AssertionFailedError;
+
+/**
+ * {@code AssertInstanceOf} is a collection of utility methods that support
+ * asserting that a value is of a expected instance type -
+ * in other words, if it can be assigned to the expected type.
+ *
+ * @since 5.8
+ */
+class AssertInstanceOf {
+
+	private AssertInstanceOf() {
+		/* no-op */
+	}
+
+	static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue) {
+		return assertInstanceOf(expectedType, actualValue, (Object) null);
+	}
+
+	static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, String message) {
+		return assertInstanceOf(expectedType, actualValue, (Object) message);
+	}
+
+	static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Supplier<String> messageSupplier) {
+		return assertInstanceOf(expectedType, actualValue, (Object) messageSupplier);
+	}
+
+	private static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Object messageOrSupplier) {
+		if (!expectedType.isInstance(actualValue)) {
+			String template = "Unexpected type";
+			if (actualValue == null)
+				template = "Unexpected null value";
+			String message = buildPrefix(nullSafeGet(messageOrSupplier))
+					+ format(expectedType, actualValue == null ? null : actualValue.getClass(), template);
+			throw new AssertionFailedError(message);
+		}
+		return expectedType.cast(actualValue);
+	}
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 59ebdf61f3b0..5d130ddea6d0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.time.Duration;
@@ -3448,4 +3449,50 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 		return AssertTimeout.assertTimeoutPreemptively(timeout, supplier, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that the supplied {@code actualValue} is an instance of the
+	 * {@code expectedType}.
+	 *
+	 * <p>Like the {@code instanceof} operator a {@code null} value is not
+	 * considered to be of the {@code expectedType} and does not pass the assertion.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue) {
+		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue);
+	}
+
+	/**
+	 * <em>Assert</em> that the supplied {@code actualValue} is an instance of the
+	 * {@code expectedType}.
+	 *
+	 * <p>Like the {@code instanceof} operator a {@code null} value is not
+	 * considered to be of the {@code expectedType} and does not pass the assertion.
+	 *
+	 * <p>Fails with the supplied failure {@code message}.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, String message) {
+		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue, message);
+	}
+
+	/**
+	 * <em>Assert</em> that the supplied {@code actualValue} is an instance of the
+	 * {@code expectedType}.
+	 *
+	 * <p>Like the {@code instanceof} operator a {@code null} value is not
+	 * considered to be of the {@code expectedType} and does not pass the assertion.
+	 *
+	 * <p>If necessary, the failure message will be retrieved lazily from the
+	 * supplied {@code messageSupplier}.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Supplier<String> messageSupplier) {
+		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue, messageSupplier);
+	}
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
new file mode 100644
index 000000000000..2acafd1fdff6
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.function.Executable;
+import org.opentest4j.AssertionFailedError;
+
+/**
+ * Unit tests for JUnit Jupiter {@link Assertions#assertInstanceOf(Class, Object)}.
+ *
+ * @since 5.8
+ */
+class AssertInstanceOfAssertionsTests {
+
+	@Test
+	void assertInstanceOfFailsNullValue() {
+		assertInstanceOfFails(String.class, null, "null value");
+	}
+
+	@Test
+	void assertInstanceOfFailsWrongTypeValue() {
+		assertInstanceOfFails(String.class, 1, "type");
+	}
+
+	@Test
+	void assertInstanceOfFailsWrongExceptionValue() {
+		assertInstanceOfFails(RuntimeException.class, new IOException(), "type");
+	}
+
+	@Test
+	void assertInstanceOfFailsSuperTypeExceptionValue() {
+		assertInstanceOfFails(IllegalArgumentException.class, new RuntimeException(), "type");
+	}
+
+	private static class BaseClass {
+	}
+
+	private static class SubClass extends BaseClass {
+
+	}
+
+	@Test
+	void assertInstanceOfFailsSuperTypeValue() {
+		assertInstanceOfFails(SubClass.class, new BaseClass(), "type");
+	}
+
+	@Test
+	void assertInstanceOfSucceedsSameTypeValue() {
+		assertInstanceOfSucceeds(String.class, "indeed a String");
+		assertInstanceOfSucceeds(BaseClass.class, new BaseClass());
+		assertInstanceOfSucceeds(SubClass.class, new SubClass());
+	}
+
+	@Test
+	void assertInstanceOfSucceedsExpectSuperClassOfValue() {
+		assertInstanceOfSucceeds(CharSequence.class, "indeed a CharSequence");
+		assertInstanceOfSucceeds(BaseClass.class, new SubClass());
+	}
+
+	@Test
+	void assertInstanceOfSucceedsSameTypeExceptionValue() {
+		assertInstanceOfSucceeds(UnsupportedOperationException.class, new UnsupportedOperationException());
+	}
+
+	@Test
+	void assertInstanceOfSucceedsExpectSuperClassOfExceptionValue() {
+		assertInstanceOfSucceeds(RuntimeException.class, new IllegalArgumentException("is a RuntimeException"));
+	}
+
+	private <T> void assertInstanceOfSucceeds(Class<T> expectedType, Object actualValue) {
+		T res = assertInstanceOf(expectedType, actualValue);
+		assertSame(res, actualValue);
+		res = assertInstanceOf(expectedType, actualValue, "extra");
+		assertSame(res, actualValue);
+		res = assertInstanceOf(expectedType, actualValue, () -> "extra");
+		assertSame(res, actualValue);
+	}
+
+	private void assertInstanceOfFails(Class<?> expectedType, Object actualValue, String unexpectedSort) {
+		String valueType = actualValue == null ? "null" : actualValue.getClass().getCanonicalName();
+		String expectedMessage = String.format("Unexpected %s ==> expected: <%s> but was: <%s>", unexpectedSort,
+			expectedType.getCanonicalName(), valueType);
+
+		assertThrowsWithMessage(expectedMessage, () -> assertInstanceOf(expectedType, actualValue));
+		assertThrowsWithMessage("extra ==> " + expectedMessage,
+			() -> assertInstanceOf(expectedType, actualValue, "extra"));
+		assertThrowsWithMessage("extra ==> " + expectedMessage,
+			() -> assertInstanceOf(expectedType, actualValue, () -> "extra"));
+	}
+
+	private void assertThrowsWithMessage(String expectedMessage, Executable executable) {
+		assertEquals(expectedMessage, assertThrows(AssertionFailedError.class, executable).getMessage());
+	}
+}

From 74e8de70d9802bb896e21153a7328942e2471dbf Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Jan 2021 18:06:33 +0100
Subject: [PATCH 0135/1433] Upgradle to 6.8

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4f84333d2748..87e87435cbe3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=569bebddc0c174475cc25d708e54af793f25fd37e5a72e53674f8ef628b6ddfd
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-5-bin.zip
+distributionSha256Sum=e2774e6fb77c43657decde25542dea710aafd78c4022d19b196e7e78d79d8c6c
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From e098fcd5567dbe786d02772c357f63ba98e374e3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Jan 2021 20:31:28 +0100
Subject: [PATCH 0136/1433] Make LauncherDiscoveryListener an interface (#2519)

As discussed in today's team call, we're deliberately breaking backwards
compatibility of the experimental abstract `LauncherDiscoveryListener`
class by changing it to be an interface. This makes it more flexible
and consistent with the rest of the codebase, e.g.
`TestExecutionListener`.
---
 .../release-notes/release-notes-5.8.0-M1.adoc | 13 ++++++-----
 .../jfr/FlightRecordingDiscoveryListener.java |  2 +-
 .../launcher/LauncherDiscoveryListener.java   | 23 ++++++++-----------
 ...ortOnFailureLauncherDiscoveryListener.java |  2 +-
 .../CompositeLauncherDiscoveryListener.java   |  2 +-
 .../LoggingLauncherDiscoveryListener.java     |  2 +-
 .../TestLauncherDiscoveryListener.java        |  2 +-
 7 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 2486425e1a4e..952a6bbfa8fc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -19,11 +19,8 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , ExtensionContext)` has
-  been deprecated in favor of
-  `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , DynamicTestInvocationContext, ExtensionContext)`
-  that allows to access the dynamic test executable via
-  `DynamicTestInvocationContext.getExecutable()`.
+* For consistency with the rest of the JUnit Platform, the experimental
+  `LauncherDiscoveryListener` is now an interface instead of an abstract class.
 
 ==== New Features and Improvements
 
@@ -50,7 +47,11 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , ExtensionContext)` has
+  been deprecated in favor of
+  `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , DynamicTestInvocationContext, ExtensionContext)`
+  that allows to access the dynamic test executable via
+  `DynamicTestInvocationContext.getExecutable()`.
 
 ==== New Features and Improvements
 
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
index 0f0bde40d0ba..c3c52445311a 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
@@ -37,7 +37,7 @@
  * @since 1.8
  */
 @API(status = EXPERIMENTAL, since = "1.8")
-public class FlightRecordingDiscoveryListener extends LauncherDiscoveryListener {
+public class FlightRecordingDiscoveryListener implements LauncherDiscoveryListener {
 
 	private final AtomicReference<LauncherDiscoveryEvent> launcherDiscoveryEvent = new AtomicReference<>();
 	private final Map<org.junit.platform.engine.UniqueId, EngineDiscoveryEvent> engineDiscoveryEvents = new ConcurrentHashMap<>();
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index 8830e252a8a5..75498f500607 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -17,13 +17,13 @@
 import org.junit.platform.engine.UniqueId;
 
 /**
- * Register a concrete implementation of this class with a
+ * Register a concrete implementation of this interface with a
  * {@link org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder}
  * to be notified of events that occur during test discovery.
  *
- * <p>All methods in this class have empty <em>default</em> implementations.
- * Subclasses may therefore override one or more of these methods to be notified
- * of the selected events.
+ * <p>All methods in this interface have empty <em>default</em> implementations.
+ * Concrete implementations may therefore override one or more of these methods
+ * to be notified of the selected events.
  *
  * <p>JUnit provides default implementations that are created via the factory
  * methods in
@@ -38,17 +38,14 @@
  * @since 1.6
  */
 @API(status = EXPERIMENTAL, since = "1.6")
-public abstract class LauncherDiscoveryListener implements EngineDiscoveryListener {
+public interface LauncherDiscoveryListener extends EngineDiscoveryListener {
 
 	/**
 	 * No-op implementation of {@code LauncherDiscoveryListener}
 	 */
-	public static final LauncherDiscoveryListener NOOP = new LauncherDiscoveryListener() {
+	LauncherDiscoveryListener NOOP = new LauncherDiscoveryListener() {
 	};
 
-	public LauncherDiscoveryListener() {
-	}
-
 	/**
 	 * Called when test discovery is about to be started.
 	 *
@@ -56,7 +53,7 @@ public LauncherDiscoveryListener() {
 	 * @since 1.8
 	 */
 	@API(status = EXPERIMENTAL, since = "1.8")
-	public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
+	default void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
 	}
 
 	/**
@@ -66,7 +63,7 @@ public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
 	 * @since 1.8
 	 */
 	@API(status = EXPERIMENTAL, since = "1.8")
-	public void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
+	default void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
 	}
 
 	/**
@@ -74,7 +71,7 @@ public void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
 	 *
 	 * @param engineId the unique ID of the engine descriptor
 	 */
-	public void engineDiscoveryStarted(UniqueId engineId) {
+	default void engineDiscoveryStarted(UniqueId engineId) {
 	}
 
 	/**
@@ -87,7 +84,7 @@ public void engineDiscoveryStarted(UniqueId engineId) {
 	 * @param result the discovery result of the supplied engine
 	 * @see EngineDiscoveryResult
 	 */
-	public void engineDiscoveryFinished(UniqueId engineId, EngineDiscoveryResult result) {
+	default void engineDiscoveryFinished(UniqueId engineId, EngineDiscoveryResult result) {
 	}
 
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
index e064d4d2b305..1f115af2ad9f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
@@ -26,7 +26,7 @@
  * @since 1.6
  * @see LauncherDiscoveryListeners#abortOnFailure()
  */
-class AbortOnFailureLauncherDiscoveryListener extends LauncherDiscoveryListener {
+class AbortOnFailureLauncherDiscoveryListener implements LauncherDiscoveryListener {
 
 	@Override
 	public void engineDiscoveryFinished(UniqueId engineId, EngineDiscoveryResult result) {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
index efaffcef2c5a..2a504abe0e0c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
@@ -25,7 +25,7 @@
  * @since 1.6
  * @see LauncherDiscoveryListeners#composite(List)
  */
-class CompositeLauncherDiscoveryListener extends LauncherDiscoveryListener {
+class CompositeLauncherDiscoveryListener implements LauncherDiscoveryListener {
 
 	private final List<LauncherDiscoveryListener> listeners;
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
index aa651de7a13c..edff6d732248 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
@@ -30,7 +30,7 @@
  * @since 1.6
  * @see LauncherDiscoveryListeners#logging()
  */
-class LoggingLauncherDiscoveryListener extends LauncherDiscoveryListener {
+class LoggingLauncherDiscoveryListener implements LauncherDiscoveryListener {
 
 	private static final Logger logger = LoggerFactory.getLogger(LoggingLauncherDiscoveryListener.class);
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
index 497b649ae2c0..c91e9fe3dea0 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.launcher;
 
-public class TestLauncherDiscoveryListener extends LauncherDiscoveryListener {
+public class TestLauncherDiscoveryListener implements LauncherDiscoveryListener {
 
 	@Override
 	public boolean equals(Object obj) {

From df3059a4baf8f621b80a6eaa54c12318c28453be Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Oct 2020 17:49:44 +0200
Subject: [PATCH 0137/1433] Jupiter: Don't retain dynamic TestDescriptors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In order to allow them to be garbage collected, dynamic test descriptors
are no longer added to their parent’s list of children. This is fine
because they were never used in that list.
---
 .../jupiter/engine/descriptor/TestFactoryTestDescriptor.java  | 2 +-
 .../jupiter/engine/descriptor/TestTemplateTestDescriptor.java | 2 +-
 .../org/junit/jupiter/engine/TestTemplateInvocationTests.java | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
index 27585ae612fb..21358b175844 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
@@ -155,7 +155,7 @@ static Optional<JupiterTestDescriptor> createDynamicDescriptor(JupiterTestDescri
 		}
 		if (dynamicDescendantFilter.test(uniqueId)) {
 			JupiterTestDescriptor descriptor = descriptorCreator.get();
-			parent.addChild(descriptor);
+			descriptor.setParent(parent);
 			return Optional.of(descriptor);
 		}
 		return Optional.empty();
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
index e7beae004a32..52bd229b50e1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
@@ -135,7 +135,7 @@ private Optional<TestDescriptor> createInvocationTestDescriptor(TestTemplateInvo
 	}
 
 	private void execute(DynamicTestExecutor dynamicTestExecutor, TestDescriptor testDescriptor) {
-		addChild(testDescriptor);
+		testDescriptor.setParent(this);
 		dynamicTestExecutor.execute(testDescriptor);
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
index f5e966322208..6abe26936542 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
@@ -11,7 +11,6 @@
 package org.junit.jupiter.engine;
 
 import static java.util.Arrays.asList;
-import static java.util.Collections.singleton;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -97,7 +96,7 @@ void templateWithSingleRegisteredExtensionIsInvoked() {
 	}
 
 	@Test
-	void parentChildRelationshipIsEstablished() {
+	void parentRelationshipIsEstablished() {
 		LauncherDiscoveryRequest request = request().selectors(
 			selectMethod(MyTestTemplateTestCase.class, "templateWithSingleRegisteredExtension")).build();
 
@@ -107,7 +106,6 @@ void parentChildRelationshipIsEstablished() {
 			container("templateWithSingleRegisteredExtension"));
 		TestDescriptor invocationDescriptor = findTestDescriptor(executionResults, test("test-template-invocation:#1"));
 		assertThat(invocationDescriptor.getParent()).hasValue(templateMethodDescriptor);
-		assertThat(templateMethodDescriptor.getChildren()).isEqualTo(singleton(invocationDescriptor));
 	}
 
 	@Test

From 3270b9d9f9b2927711b4f5546efa6537f0cff402 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Oct 2020 17:52:02 +0200
Subject: [PATCH 0138/1433] Platform: Don't store String representation of
 unique IDs

This reduces the memory overhead of each `TestIdentifier` and each
`UniqueId`.
---
 .../org/junit/platform/engine/UniqueId.java   |  14 +-
 .../platform/launcher/TestIdentifier.java     | 137 ++++++++++++++++--
 .../org/junit/platform/launcher/TestPlan.java |  25 ++--
 .../commons/util/SerializationUtils.java      |  11 +-
 .../launcher/TestIdentifierTests.java         |  71 +++++++--
 .../test/resources/serialized-test-identifier | Bin 0 -> 1079 bytes
 6 files changed, 206 insertions(+), 52 deletions(-)
 create mode 100644 platform-tests/src/test/resources/serialized-test-identifier

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index 70fb92861d0e..54a9ab1391e1 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -15,6 +15,7 @@
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.io.Serializable;
+import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -85,7 +86,7 @@ public static UniqueId root(String segmentType, String value) {
 	// lazily computed
 	private transient int hashCode;
 	// lazily computed
-	private transient String toString;
+	private transient SoftReference<String> toString;
 
 	private UniqueId(UniqueIdFormat uniqueIdFormat, Segment segment) {
 		this.uniqueIdFormat = uniqueIdFormat;
@@ -250,9 +251,10 @@ public int hashCode() {
 	 */
 	@Override
 	public String toString() {
-		String s = this.toString;
-		if (s == null) {
-			s = this.uniqueIdFormat.format(this);
+		SoftReference<String> s = this.toString;
+		String value = s == null ? null : s.get();
+		if (value == null) {
+			value = this.uniqueIdFormat.format(this);
 			// this is a benign race like String#hash
 			// we potentially read and write values from multiple threads
 			// without a happens-before relationship
@@ -260,9 +262,9 @@ public String toString() {
 			// that were valid at one point, either null or the toString value
 			// so we might end up not seeing a value that a different thread
 			// has computed or multiple threads writing the same value
-			this.toString = s;
+			this.toString = new SoftReference<>(value);
 		}
-		return s;
+		return value;
 	}
 
 	/**
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index c336bb651bae..399dc32928ab 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -14,6 +14,11 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.ObjectStreamField;
 import java.io.Serializable;
 import java.util.LinkedHashSet;
 import java.util.Objects;
@@ -27,6 +32,7 @@
 import org.junit.platform.engine.TestDescriptor.Type;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.TestTag;
+import org.junit.platform.engine.UniqueId;
 
 /**
  * Immutable data transfer object that represents a test or container which is
@@ -39,9 +45,14 @@
 public final class TestIdentifier implements Serializable {
 
 	private static final long serialVersionUID = 1L;
+	private static final ObjectStreamField[] serialPersistentFields = ObjectStreamClass.lookup(
+		SerializedForm.class).getFields();
 
-	private final String uniqueId;
-	private final String parentId;
+	// Only set during deserialization process
+	private SerializedForm serializedForm;
+
+	private final UniqueId uniqueId;
+	private final UniqueId parentId;
 	private final String displayName;
 	private final String legacyReportingName;
 	private final TestSource source;
@@ -54,19 +65,24 @@ public final class TestIdentifier implements Serializable {
 	@API(status = INTERNAL, since = "1.0")
 	public static TestIdentifier from(TestDescriptor testDescriptor) {
 		Preconditions.notNull(testDescriptor, "TestDescriptor must not be null");
-		String uniqueId = testDescriptor.getUniqueId().toString();
+		UniqueId uniqueId = testDescriptor.getUniqueId();
 		String displayName = testDescriptor.getDisplayName();
 		TestSource source = testDescriptor.getSource().orElse(null);
 		Set<TestTag> tags = testDescriptor.getTags();
 		Type type = testDescriptor.getType();
-		String parentId = testDescriptor.getParent().map(
-			parentDescriptor -> parentDescriptor.getUniqueId().toString()).orElse(null);
+		UniqueId parentId = testDescriptor.getParent().map(TestDescriptor::getUniqueId).orElse(null);
 		String legacyReportingName = testDescriptor.getLegacyReportingName();
 		return new TestIdentifier(uniqueId, displayName, source, tags, type, parentId, legacyReportingName);
 	}
 
-	TestIdentifier(String uniqueId, String displayName, TestSource source, Set<TestTag> tags, Type type,
-			String parentId, String legacyReportingName) {
+	private TestIdentifier(SerializedForm serializedForm) {
+		this(UniqueId.parse(serializedForm.uniqueId), serializedForm.displayName, serializedForm.source,
+			serializedForm.tags, serializedForm.type, UniqueId.parse(serializedForm.parentId),
+			serializedForm.legacyReportingName);
+	}
+
+	private TestIdentifier(UniqueId uniqueId, String displayName, TestSource source, Set<TestTag> tags, Type type,
+			UniqueId parentId, String legacyReportingName) {
 		Preconditions.notNull(type, "TestDescriptor.Type must not be null");
 		this.uniqueId = uniqueId;
 		this.parentId = parentId;
@@ -78,7 +94,8 @@ public static TestIdentifier from(TestDescriptor testDescriptor) {
 	}
 
 	/**
-	 * Get the unique ID of the represented test or container.
+	 * Get the unique ID of the represented test or container as a
+	 * {@code String}.
 	 *
 	 * <p>Uniqueness must be guaranteed across an entire
 	 * {@linkplain TestPlan test plan}, regardless of how many engines are used
@@ -87,11 +104,28 @@ public static TestIdentifier from(TestDescriptor testDescriptor) {
 	 * @return the unique ID for this identifier; never {@code null}
 	 */
 	public String getUniqueId() {
+		return this.uniqueId.toString();
+	}
+
+	/**
+	 * Get the unique ID of the represented test or container as a
+	 * {@code UniqueId}.
+	 *
+	 * <p>Uniqueness must be guaranteed across an entire
+	 * {@linkplain TestPlan test plan}, regardless of how many engines are used
+	 * behind the scenes.
+	 *
+	 * @return the unique ID for this identifier; never {@code null}
+	 * @since 5.8
+	 */
+	@API(status = STABLE, since = "5.8")
+	public UniqueId getUniqueIdObject() {
 		return this.uniqueId;
 	}
 
 	/**
-	 * Get the unique ID of this identifier's parent, if available.
+	 * Get the unique ID of this identifier's parent as a {@code String}, if
+	 * available.
 	 *
 	 * <p>An identifier without a parent is called a <em>root</em>.
 	 *
@@ -99,6 +133,21 @@ public String getUniqueId() {
 	 * never {@code null} though potentially <em>empty</em>
 	 */
 	public Optional<String> getParentId() {
+		return getParentIdObject().map(UniqueId::toString);
+	}
+
+	/**
+	 * Get the unique ID of this identifier's parent as a {@code UniqueId}, if
+	 * available.
+	 *
+	 * <p>An identifier without a parent is called a <em>root</em>.
+	 *
+	 * @return a container for the unique ID for this identifier's parent;
+	 * never {@code null} though potentially <em>empty</em>
+	 * @since 5.8
+	 */
+	@API(status = STABLE, since = "5.8")
+	public Optional<UniqueId> getParentIdObject() {
 		return Optional.ofNullable(this.parentId);
 	}
 
@@ -184,7 +233,7 @@ public Optional<TestSource> getSource() {
 	 * @see TestTag
 	 */
 	public Set<TestTag> getTags() {
-		return this.tags;
+		return unmodifiableSet(this.tags);
 	}
 
 	@Override
@@ -216,4 +265,72 @@ public String toString() {
 		// @formatter:on
 	}
 
+	private void writeObject(ObjectOutputStream s) throws IOException {
+		SerializedForm serializedForm = new SerializedForm(this);
+		serializedForm.serialize(s);
+	}
+
+	private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
+		serializedForm = SerializedForm.deserialize(s);
+	}
+
+	private Object readResolve() {
+		return new TestIdentifier(serializedForm);
+	}
+
+	/**
+	 * Represents the serialized output of {@code TestIdentifier}. The fields on this
+	 * class match the fields that {@code TestIdentifier} had prior to 5.8.
+	 */
+	private static class SerializedForm implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		private final String uniqueId;
+		private final String parentId;
+		private final String displayName;
+		private final String legacyReportingName;
+		private final TestSource source;
+		private final Set<TestTag> tags;
+		private final Type type;
+
+		SerializedForm(TestIdentifier testIdentifier) {
+			this.uniqueId = testIdentifier.uniqueId.toString();
+			this.parentId = testIdentifier.parentId.toString();
+			this.displayName = testIdentifier.displayName;
+			this.legacyReportingName = testIdentifier.legacyReportingName;
+			this.source = testIdentifier.source;
+			this.tags = testIdentifier.tags;
+			this.type = testIdentifier.type;
+		}
+
+		@SuppressWarnings("unchecked")
+		private SerializedForm(ObjectInputStream.GetField fields) throws IOException {
+			this.uniqueId = (String) fields.get("uniqueId", null);
+			this.parentId = (String) fields.get("parentId", null);
+			this.displayName = (String) fields.get("displayName", null);
+			this.legacyReportingName = (String) fields.get("legacyReportingName", null);
+			this.source = (TestSource) fields.get("source", null);
+			this.tags = (Set<TestTag>) fields.get("tags", null);
+			this.type = (Type) fields.get("type", null);
+		}
+
+		void serialize(ObjectOutputStream s) throws IOException {
+			ObjectOutputStream.PutField fields = s.putFields();
+			fields.put("uniqueId", uniqueId);
+			fields.put("parentId", parentId);
+			fields.put("displayName", displayName);
+			fields.put("legacyReportingName", legacyReportingName);
+			fields.put("source", source);
+			fields.put("tags", tags);
+			fields.put("type", type);
+			s.writeFields();
+		}
+
+		static SerializedForm deserialize(ObjectInputStream s) throws ClassNotFoundException, IOException {
+			ObjectInputStream.GetField fields = s.readFields();
+			return new SerializedForm(fields);
+		}
+	}
+
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index 81be02db94d4..bc6075d8158e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -11,13 +11,13 @@
 package org.junit.platform.launcher;
 
 import static java.util.Collections.emptySet;
+import static java.util.Collections.synchronizedSet;
 import static java.util.Collections.unmodifiableSet;
 import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Optional;
@@ -30,6 +30,7 @@
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestDescriptor.Visitor;
+import org.junit.platform.engine.UniqueId;
 
 /**
  * {@code TestPlan} describes the tree of tests and containers as discovered
@@ -57,11 +58,11 @@
 @API(status = STABLE, since = "1.0")
 public class TestPlan {
 
-	private final Set<TestIdentifier> roots = Collections.synchronizedSet(new LinkedHashSet<>(4));
+	private final Set<TestIdentifier> roots = synchronizedSet(new LinkedHashSet<>(4));
 
-	private final Map<String, Set<TestIdentifier>> children = new ConcurrentHashMap<>(32);
+	private final Map<UniqueId, Set<TestIdentifier>> children = new ConcurrentHashMap<>(32);
 
-	private final Map<String, TestIdentifier> allIdentifiers = new ConcurrentHashMap<>(32);
+	private final Map<UniqueId, TestIdentifier> allIdentifiers = new ConcurrentHashMap<>(32);
 
 	private final boolean containsTests;
 
@@ -101,11 +102,11 @@ protected TestPlan(boolean containsTests) {
 	@API(status = DEPRECATED, since = "1.4")
 	public void add(TestIdentifier testIdentifier) {
 		Preconditions.notNull(testIdentifier, "testIdentifier must not be null");
-		allIdentifiers.put(testIdentifier.getUniqueId(), testIdentifier);
-		if (testIdentifier.getParentId().isPresent()) {
-			String parentId = testIdentifier.getParentId().get();
+		allIdentifiers.put(testIdentifier.getUniqueIdObject(), testIdentifier);
+		if (testIdentifier.getParentIdObject().isPresent()) {
+			UniqueId parentId = testIdentifier.getParentIdObject().get();
 			Set<TestIdentifier> directChildren = children.computeIfAbsent(parentId,
-				key -> Collections.synchronizedSet(new LinkedHashSet<>(16)));
+				key -> synchronizedSet(new LinkedHashSet<>(16)));
 			directChildren.add(testIdentifier);
 		}
 		else {
@@ -155,7 +156,8 @@ public Set<TestIdentifier> getChildren(TestIdentifier parent) {
 	 */
 	public Set<TestIdentifier> getChildren(String parentId) {
 		Preconditions.notBlank(parentId, "parent ID must not be null or blank");
-		return children.containsKey(parentId) ? unmodifiableSet(children.get(parentId)) : emptySet();
+		UniqueId uniqueId = UniqueId.parse(parentId);
+		return children.containsKey(uniqueId) ? unmodifiableSet(children.get(uniqueId)) : emptySet();
 	}
 
 	/**
@@ -169,9 +171,10 @@ public Set<TestIdentifier> getChildren(String parentId) {
 	 */
 	public TestIdentifier getTestIdentifier(String uniqueId) throws PreconditionViolationException {
 		Preconditions.notBlank(uniqueId, "unique ID must not be null or blank");
-		Preconditions.condition(allIdentifiers.containsKey(uniqueId),
+		UniqueId uniqueIdObject = UniqueId.parse(uniqueId);
+		Preconditions.condition(allIdentifiers.containsKey(uniqueIdObject),
 			() -> "No TestIdentifier with unique ID [" + uniqueId + "] has been added to this TestPlan.");
-		return allIdentifiers.get(uniqueId);
+		return allIdentifiers.get(uniqueIdObject);
 	}
 
 	/**
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
index 04bd5cb509b9..838a8e3d0489 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
@@ -14,23 +14,16 @@
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.Serializable;
 
 public class SerializationUtils {
 
-	@SuppressWarnings("unchecked")
-	public static <T extends Serializable> T serializeAndDeserialize(T object) throws Exception {
-		var bytes = serialize(object);
-		return (T) deserialize(bytes);
-	}
-
-	private static Object deserialize(byte[] bytes) throws Exception {
+	public static Object deserialize(byte[] bytes) throws Exception {
 		try (var in = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
 			return in.readObject();
 		}
 	}
 
-	private static byte[] serialize(Object object) throws Exception {
+	public static byte[] serialize(Object object) throws Exception {
 		try (var byteArrayOutputStream = new ByteArrayOutputStream();
 				var objectOutputStream = new ObjectOutputStream(byteArrayOutputStream)) {
 			objectOutputStream.writeObject(object);
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
index 9d4ca7878b0c..b82c02615a99 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
@@ -10,11 +10,11 @@
 
 package org.junit.platform.launcher;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.platform.commons.util.SerializationUtils.serializeAndDeserialize;
+import static org.junit.platform.commons.util.SerializationUtils.deserialize;
+import static org.junit.platform.commons.util.SerializationUtils.serialize;
 
 import java.util.Set;
 
@@ -22,7 +22,9 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestTag;
 import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
 import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 import org.junit.platform.fakes.TestDescriptorStub;
 
 /**
@@ -55,20 +57,57 @@ void inheritsTypeFromDescriptor() {
 	}
 
 	@Test
-	void serialization() throws Exception {
-		var identifier = serializeAndDeserialize(//
-			new TestIdentifier("uniqueId", "displayName", ClassSource.from(TestIdentifierTests.class),
-				Set.of(TestTag.create("aTag")), TestDescriptor.Type.TEST, "parentId", "reportingName"));
-
-		assertEquals("uniqueId", identifier.getUniqueId());
-		assertEquals("displayName", identifier.getDisplayName());
-		assertEquals("reportingName", identifier.getLegacyReportingName());
-		assertThat(identifier.getSource()).contains(ClassSource.from(TestIdentifierTests.class));
-		assertEquals(Set.of(TestTag.create("aTag")), identifier.getTags());
-		assertEquals(TestDescriptor.Type.TEST, identifier.getType());
-		assertTrue(identifier.isTest());
-		assertFalse(identifier.isContainer());
-		assertThat(identifier.getParentId()).contains("parentId");
+	void currentVersionCanBeSerializedAndDeserialized() throws Exception {
+		var originalIdentifier = createOriginalTestIdentifier();
+		var deserializedIdentifier = (TestIdentifier) deserialize(serialize(originalIdentifier));
+		assertDeepEquals(originalIdentifier, deserializedIdentifier);
+	}
+
+	@Test
+	void initialVersionCanBeDeserialized() throws Exception {
+		try (var inputStream = getClass().getResourceAsStream("/serialized-test-identifier")) {
+			var bytes = inputStream.readAllBytes();
+			var deserializedIdentifier = (TestIdentifier) deserialize(bytes);
+			assertDeepEquals(createOriginalTestIdentifier(), deserializedIdentifier);
+		}
+	}
+
+	private static void assertDeepEquals(TestIdentifier first, TestIdentifier second) {
+		assertEquals(first, second);
+		assertEquals(first.getUniqueId(), second.getUniqueId());
+		assertEquals(first.getUniqueIdObject(), second.getUniqueIdObject());
+		assertEquals(first.getDisplayName(), second.getDisplayName());
+		assertEquals(first.getLegacyReportingName(), second.getLegacyReportingName());
+		assertEquals(first.getSource(), second.getSource());
+		assertEquals(first.getTags(), second.getTags());
+		assertEquals(first.getType(), second.getType());
+		assertEquals(first.getParentId(), second.getParentId());
+		assertEquals(first.getParentIdObject(), second.getParentIdObject());
+	}
+
+	private static TestIdentifier createOriginalTestIdentifier() {
+		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
+		var uniqueId = engineDescriptor.getUniqueId().append("child", "child");
+		var testSource = ClassSource.from(TestIdentifierTests.class);
+		var testDescriptor = new AbstractTestDescriptor(uniqueId, "displayName", testSource) {
+
+			@Override
+			public Type getType() {
+				return Type.TEST;
+			}
+
+			@Override
+			public String getLegacyReportingName() {
+				return "reportingName";
+			}
+
+			@Override
+			public Set<TestTag> getTags() {
+				return Set.of(TestTag.create("aTag"));
+			}
+		};
+		engineDescriptor.addChild(testDescriptor);
+		return TestIdentifier.from(testDescriptor);
 	}
 
 }
diff --git a/platform-tests/src/test/resources/serialized-test-identifier b/platform-tests/src/test/resources/serialized-test-identifier
new file mode 100644
index 0000000000000000000000000000000000000000..614b53bb6557e251e93c145414c5f3efa2dd0f53
GIT binary patch
literal 1079
zcmb7Dv2N5r5S_amkca?DkccRPgcK+u*lj3Kt^kn)5y?V`a~h%`E%u&o!`|B2U5C3S
zx`rAlQfT-EdJw-rMFkC?kUA~1YX@7WBM~lad1vO$dv9hxAHxNsVI|cG+0B)(B$Lc`
zQ{5+$<tplNO+s$$X3UipUBNXJPooK!0=OItg9XFqtj{eh1iNgXQOQ(7J5~#ov;(*<
zdBURMOP;0L;*m?;g9B&;Fr6`tu$yuDf6=75ju7Z>fPARuLr?iot`ea*b!<9555ZfO
zCC0+FqH%78q#bU3V3;8gJqKu=n@Eeyrg}NV0xX<H6ZUdmavEfIOyd<@7lN&~3tp?m
zX9vxEIKj*!N=%+P8%X@OFIkh!m_krx?Nk6Wkqgw^n(Ye7U!+D@ktz%AGo+PmXw`;3
ztrerp88<24+QNKoZ2qY2WYY;M{;?8nBqrO}|6NlGcAr6p&fRgWh#MnWOQqzIlWLZ?
zR6mVz`PduDalE6Y!yg|$jkcOtrQzQBH5Jy)CouZ{`s7yAtzRRuaHF<4RT>(AY!)lz
zK&ZDoe#T4>`~Q+ZUmg8kK@it}zRD`&-`3wBef;|6!IV?=ZWhJOJ$mdkLIY86Pw=(e
z4(DUY5}%66o@7g%-WNBN7Q^`9K*RmBQO5SVM1%#;_^M~@ZYkMNdA}ZXEy9gXXklq=
OujzKw6Ea@)@0~x1PiaX2

literal 0
HcmV?d00001


From dc8bdb413ad23c4b804523bcd08e162360219d14 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 31 Dec 2020 13:30:04 +0100
Subject: [PATCH 0139/1433] Platform: Link to undeprecated LegacyReportingUtils

---
 .../main/java/org/junit/platform/launcher/TestIdentifier.java  | 3 ++-
 .../platform/launcher/listeners/LegacyReportingUtils.java      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index 399dc32928ab..a773cceeb3b3 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -179,8 +179,9 @@ public String getDisplayName() {
 	 *
 	 * @return the legacy reporting name; never {@code null} or blank
 	 * @see org.junit.platform.engine.TestDescriptor#getLegacyReportingName()
-	 * @see org.junit.platform.launcher.listeners.LegacyReportingUtils
+	 * @see org.junit.platform.reporting.legacy.LegacyReportingUtils
 	 */
+	@SuppressWarnings("JavadocReference")
 	public String getLegacyReportingName() {
 		return this.legacyReportingName;
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
index 07f806bbc167..a39514fa57cb 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
@@ -27,6 +27,7 @@
  * instead.
  */
 @Deprecated
+@SuppressWarnings("JavadocReference")
 @API(status = DEPRECATED, since = "1.6")
 public class LegacyReportingUtils {
 

From 1e5e4b6c426e3edd824bafbb9ef113af64000928 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Oct 2020 17:56:50 +0200
Subject: [PATCH 0140/1433] Platform: Avoid large number of empty
 LinkedHashSets

Instead of using a `LinkedHashSet` for empty or single-element sets of
tags, we now use the immutable empty set for the most common case of no
tags and `Collections.singleton` which is more memory efficient for
Single tag sets.
---
 .../junit/platform/launcher/TestIdentifier.java  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index a773cceeb3b3..da698a8307bb 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -10,9 +10,12 @@
 
 package org.junit.platform.launcher;
 
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
 import static java.util.Collections.unmodifiableSet;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
+import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -88,11 +91,22 @@ private TestIdentifier(UniqueId uniqueId, String displayName, TestSource source,
 		this.parentId = parentId;
 		this.displayName = displayName;
 		this.source = source;
-		this.tags = unmodifiableSet(new LinkedHashSet<>(tags));
+		this.tags = copyOf(tags);
 		this.type = type;
 		this.legacyReportingName = legacyReportingName;
 	}
 
+	private Set<TestTag> copyOf(Set<TestTag> tags) {
+		switch (tags.size()) {
+			case 0:
+				return emptySet();
+			case 1:
+				return singleton(getOnlyElement(tags));
+			default:
+				return new LinkedHashSet<>(tags);
+		}
+	}
+
 	/**
 	 * Get the unique ID of the represented test or container as a
 	 * {@code String}.

From d89c532139c859cf55ba13b299125b03e9b8c5de Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Oct 2020 17:54:09 +0200
Subject: [PATCH 0141/1433] Platform: Avoid wasting memory from unnecessarily
 large ArrayLists

The list of segments of a `UniqueId` is immutable. Prior to this commit,
we were using an unsized `ArrayList` to store them which was wasteful
since the backing array was often too large.
---
 .../java/org/junit/platform/engine/UniqueId.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index 54a9ab1391e1..b88926eab24c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -89,8 +89,7 @@ public static UniqueId root(String segmentType, String value) {
 	private transient SoftReference<String> toString;
 
 	private UniqueId(UniqueIdFormat uniqueIdFormat, Segment segment) {
-		this.uniqueIdFormat = uniqueIdFormat;
-		this.segments = singletonList(segment);
+		this(uniqueIdFormat, singletonList(segment));
 	}
 
 	/**
@@ -102,7 +101,7 @@ private UniqueId(UniqueIdFormat uniqueIdFormat, Segment segment) {
 	 */
 	UniqueId(UniqueIdFormat uniqueIdFormat, List<Segment> segments) {
 		this.uniqueIdFormat = uniqueIdFormat;
-		this.segments = unmodifiableList(segments);
+		this.segments = segments;
 	}
 
 	final Optional<Segment> getRoot() {
@@ -123,7 +122,7 @@ public final Optional<String> getEngineId() {
 	 * {@code UniqueId}.
 	 */
 	public final List<Segment> getSegments() {
-		return this.segments;
+		return unmodifiableList(this.segments);
 	}
 
 	/**
@@ -157,7 +156,8 @@ public final UniqueId append(String segmentType, String value) {
 	@API(status = STABLE, since = "1.1")
 	public final UniqueId append(Segment segment) {
 		Preconditions.notNull(segment, "segment must not be null");
-		List<Segment> baseSegments = new ArrayList<>(this.segments);
+		List<Segment> baseSegments = new ArrayList<>(this.segments.size() + 1);
+		baseSegments.addAll(this.segments);
 		baseSegments.add(segment);
 		return new UniqueId(this.uniqueIdFormat, baseSegments);
 	}
@@ -192,7 +192,7 @@ public boolean hasPrefix(UniqueId potentialPrefix) {
 	@API(status = STABLE, since = "1.5")
 	public UniqueId removeLastSegment() {
 		Preconditions.condition(this.segments.size() > 1, "Cannot remove last remaining segment");
-		return new UniqueId(uniqueIdFormat, new ArrayList<>(segments.subList(0, segments.size() - 1)));
+		return new UniqueId(uniqueIdFormat, new ArrayList<>(this.segments.subList(0, this.segments.size() - 1)));
 	}
 
 	/**

From 1134e2856fbcb864b8aee4b20429f4368b8d29c3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Oct 2020 17:55:33 +0200
Subject: [PATCH 0142/1433] Platform: Avoid storing all returned futures

Instead of storing all `Future` instances we now only store those that
Are not yet finished.
---
 .../support/hierarchical/NodeTestTask.java    | 43 ++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
index 5d98dfaaf0b2..a722a3f51328 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
@@ -16,8 +16,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
@@ -29,6 +31,7 @@
 import org.junit.platform.commons.util.UnrecoverableExceptions;
 import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutorService.TestTask;
 import org.junit.platform.engine.support.hierarchical.Node.DynamicTestExecutor;
 import org.junit.platform.engine.support.hierarchical.Node.ExecutionMode;
@@ -40,10 +43,13 @@
 class NodeTestTask<C extends EngineExecutionContext> implements TestTask {
 
 	private static final Logger logger = LoggerFactory.getLogger(NodeTestTask.class);
+	private static final Runnable NOOP = () -> {
+	};
 
 	private final NodeTestTaskContext taskContext;
 	private final TestDescriptor testDescriptor;
 	private final Node<C> node;
+	private final Runnable finalizer;
 
 	private C parentContext;
 	private C context;
@@ -53,9 +59,14 @@ class NodeTestTask<C extends EngineExecutionContext> implements TestTask {
 	private ThrowableCollector throwableCollector;
 
 	NodeTestTask(NodeTestTaskContext taskContext, TestDescriptor testDescriptor) {
+		this(taskContext, testDescriptor, NOOP);
+	}
+
+	NodeTestTask(NodeTestTaskContext taskContext, TestDescriptor testDescriptor, Runnable finalizer) {
 		this.taskContext = taskContext;
 		this.testDescriptor = testDescriptor;
 		this.node = NodeUtils.asNode(testDescriptor);
+		this.finalizer = finalizer;
 	}
 
 	@Override
@@ -100,6 +111,7 @@ public void execute() {
 							+ "why the flag was not cleared by user code.",
 					this.testDescriptor.getDisplayName(), this.testDescriptor.getUniqueId()));
 			}
+			finalizer.run();
 		}
 
 		// Clear reference to context to allow it to be garbage collected.
@@ -185,7 +197,7 @@ private void reportCompletion() {
 	}
 
 	private class DefaultDynamicTestExecutor implements DynamicTestExecutor {
-		private final List<Future<?>> futures = new ArrayList<>();
+		private final Map<UniqueId, DynamicTaskState> unfinishedTasks = new ConcurrentHashMap<>();
 
 		@Override
 		public void execute(TestDescriptor testDescriptor) {
@@ -206,20 +218,22 @@ public Future<?> execute(TestDescriptor testDescriptor, EngineExecutionListener
 				return completedFuture(null);
 			}
 			else {
+				UniqueId uniqueId = testDescriptor.getUniqueId();
 				NodeTestTask<C> nodeTestTask = new NodeTestTask<>(taskContext.withListener(executionListener),
-					testDescriptor);
+					testDescriptor, () -> unfinishedTasks.remove(uniqueId));
 				nodeTestTask.setParentContext(context);
-				Future<?> future = taskContext.getExecutorService().submit(nodeTestTask);
-				futures.add(future);
+				unfinishedTasks.put(uniqueId, DynamicTaskState.unscheduled());
+				Future<Void> future = taskContext.getExecutorService().submit(nodeTestTask);
+				unfinishedTasks.computeIfPresent(uniqueId, (__, state) -> DynamicTaskState.scheduled(future));
 				return future;
 			}
 		}
 
 		@Override
 		public void awaitFinished() throws InterruptedException {
-			for (Future<?> future : futures) {
+			for (DynamicTaskState state : unfinishedTasks.values()) {
 				try {
-					future.get();
+					state.awaitFinished();
 				}
 				catch (CancellationException ignore) {
 					// Futures returned by execute() may have been cancelled
@@ -231,4 +245,21 @@ public void awaitFinished() throws InterruptedException {
 		}
 	}
 
+	@FunctionalInterface
+	private interface DynamicTaskState {
+
+		DynamicTaskState UNSCHEDULED = () -> {
+		};
+
+		static DynamicTaskState unscheduled() {
+			return UNSCHEDULED;
+		}
+
+		static DynamicTaskState scheduled(Future<Void> future) {
+			return future::get;
+		}
+
+		void awaitFinished() throws CancellationException, ExecutionException, InterruptedException;
+	}
+
 }

From 1f7729caa6daab34357188a579ebfc1f24f14803 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 6 Dec 2020 15:31:59 +0100
Subject: [PATCH 0143/1433] Vintage: Avoid evaluating regex if possible

`Description.getMethod()` evaluates a regex every time it is called
which is expensive for large test suites. `DescriptionUtils` now tries
computing it without evaluating a regex first and only falls back on
`Description.getMethod()` if the display name does not look as
expected.
---
 .../engine/descriptor/DescriptionUtils.java   | 37 +++++++++++
 .../engine/descriptor/TestSourceProvider.java |  2 +-
 .../descriptor/VintageTestDescriptor.java     |  4 +-
 .../discovery/IsPotentialJUnit4TestClass.java |  6 +-
 .../discovery/MethodSelectorResolver.java     |  5 +-
 .../descriptor/DescriptionUtilsTests.java     | 61 +++++++++++++++++++
 6 files changed, 110 insertions(+), 5 deletions(-)
 create mode 100644 junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
 create mode 100644 junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java

diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
new file mode 100644
index 000000000000..a4d632b83da3
--- /dev/null
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.vintage.engine.descriptor;
+
+import org.apiguardian.api.API;
+import org.junit.runner.Description;
+
+@API(status = API.Status.INTERNAL, since = "5.8")
+public class DescriptionUtils {
+
+	private DescriptionUtils() {
+	}
+
+	public static String getMethodName(Description description) {
+		String displayName = description.getDisplayName();
+		int i = displayName.indexOf('(');
+		if (i >= 0) {
+			int j = displayName.lastIndexOf('(');
+			if (i == j) {
+				char lastChar = displayName.charAt(displayName.length() - 1);
+				if (lastChar == ')') {
+					return displayName.substring(0, i);
+				}
+			}
+		}
+		return description.getMethodName();
+	}
+
+}
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
index 36e0efa58008..85c664de59a6 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
@@ -40,7 +40,7 @@ public class TestSourceProvider {
 	public TestSource findTestSource(Description description) {
 		Class<?> testClass = description.getTestClass();
 		if (testClass != null) {
-			String methodName = description.getMethodName();
+			String methodName = DescriptionUtils.getMethodName(description);
 			if (methodName != null) {
 				Method method = findMethod(testClass, sanitizeMethodName(methodName));
 				if (method != null) {
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
index 62077d06a304..7953a29b956d 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
@@ -55,7 +55,7 @@ public VintageTestDescriptor(UniqueId uniqueId, Description description, TestSou
 	}
 
 	private static String generateDisplayName(Description description) {
-		String methodName = description.getMethodName();
+		String methodName = DescriptionUtils.getMethodName(description);
 		return isNotBlank(methodName) ? methodName : description.getDisplayName();
 	}
 
@@ -65,7 +65,7 @@ public Description getDescription() {
 
 	@Override
 	public String getLegacyReportingName() {
-		String methodName = description.getMethodName();
+		String methodName = DescriptionUtils.getMethodName(description);
 		if (methodName == null) {
 			String className = description.getClassName();
 			if (isNotBlank(className)) {
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
index 6af3ef53c621..686c80655145 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
@@ -10,16 +10,20 @@
 
 package org.junit.vintage.engine.discovery;
 
+import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.commons.util.ReflectionUtils.isAbstract;
 import static org.junit.platform.commons.util.ReflectionUtils.isInnerClass;
 import static org.junit.platform.commons.util.ReflectionUtils.isPublic;
 
 import java.util.function.Predicate;
 
+import org.apiguardian.api.API;
+
 /**
  * @since 4.12
  */
-class IsPotentialJUnit4TestClass implements Predicate<Class<?>> {
+@API(status = INTERNAL, since = "5.8", consumers = "org.junit.vintage.**")
+public class IsPotentialJUnit4TestClass implements Predicate<Class<?>> {
 
 	@Override
 	public boolean test(Class<?> candidate) {
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
index 74521cf0c979..c725e4bdc097 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
@@ -26,6 +26,7 @@
 import org.junit.platform.engine.support.discovery.SelectorResolver;
 import org.junit.runner.Description;
 import org.junit.runner.manipulation.Filter;
+import org.junit.vintage.engine.descriptor.DescriptionUtils;
 import org.junit.vintage.engine.descriptor.RunnerTestDescriptor;
 
 /**
@@ -87,6 +88,7 @@ private Filter toUniqueIdFilter(RunnerTestDescriptor runnerTestDescriptor, Uniqu
 	 * {@link org.junit.runners.Parameterized} runner.
 	 */
 	private static Filter matchMethodDescription(final Description desiredDescription) {
+		String desiredMethodName = DescriptionUtils.getMethodName(desiredDescription);
 		return new Filter() {
 
 			@Override
@@ -105,7 +107,8 @@ public boolean shouldRun(Description description) {
 			}
 
 			private boolean isParameterizedMethod(Description description) {
-				return description.getMethodName().startsWith(desiredDescription.getMethodName() + "[");
+				String methodName = DescriptionUtils.getMethodName(description);
+				return methodName.startsWith(desiredMethodName + "[");
 			}
 
 			@Override
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
new file mode 100644
index 000000000000..49b9f1c5dd7d
--- /dev/null
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.vintage.engine.descriptor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicContainer.dynamicContainer;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+import java.util.stream.Stream;
+
+import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.platform.commons.util.ClassFilter;
+import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.runner.Description;
+import org.junit.vintage.engine.discovery.IsPotentialJUnit4TestClass;
+
+class DescriptionUtilsTests {
+
+	AllDefaultPossibilitiesBuilder builder = new AllDefaultPossibilitiesBuilder(true);
+
+	@TestFactory
+	Stream<DynamicNode> computedMethodNameCorrectly() {
+		var classFilter = ClassFilter.of(new IsPotentialJUnit4TestClass());
+		var testClasses = ReflectionUtils.findAllClassesInPackage("org.junit.vintage.engine.samples", classFilter);
+		return testClasses.stream().flatMap(this::toDynamicTests);
+	}
+
+	private Stream<DynamicNode> toDynamicTests(Class<?> testClass) {
+		try {
+			var runner = builder.runnerForClass(testClass);
+			return toDynamicTests(Stream.of(runner.getDescription()));
+		}
+		catch (Throwable throwable) {
+			throw new RuntimeException(throwable);
+		}
+	}
+
+	Stream<DynamicNode> toDynamicTests(Stream<Description> children) {
+		return children.map(description -> description.isTest() //
+				? toDynamicTest(description, "child: " + description.toString()) //
+				: dynamicContainer("class: " + description.toString(), Stream.concat( //
+					Stream.of(toDynamicTest(description, "self")), //
+					toDynamicTests(description.getChildren().stream()))));
+	}
+
+	private DynamicTest toDynamicTest(Description description, String displayName) {
+		return dynamicTest(displayName,
+			() -> assertEquals(description.getMethodName(), DescriptionUtils.getMethodName(description)));
+	}
+}

From 5557b81d9e24d47575dab9ab29a2338ea954b9ad Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 6 Dec 2020 15:35:34 +0100
Subject: [PATCH 0144/1433] Vintage: Cache test sources by description

Test sources are now cached by description which avoids the overhead of
creating multiple instances for the same method, e.g. for parameterized
tests or generative test suites that include the same class multiple
times with different configurations.
---
 .../engine/descriptor/TestSourceProvider.java    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
index 85c664de59a6..10976e6b9336 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
@@ -10,6 +10,7 @@
 
 package org.junit.vintage.engine.descriptor;
 
+import static java.util.Collections.synchronizedMap;
 import static java.util.function.Predicate.isEqual;
 import static java.util.stream.Collectors.toList;
 import static org.apiguardian.api.API.Status.INTERNAL;
@@ -17,9 +18,9 @@
 import static org.junit.platform.commons.util.ReflectionUtils.findMethods;
 
 import java.lang.reflect.Method;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.support.ModifierSupport;
@@ -35,9 +36,18 @@
 @API(status = INTERNAL, since = "5.6")
 public class TestSourceProvider {
 
-	private final Map<Class<?>, List<Method>> methodsCache = Collections.synchronizedMap(new LruCache<>(31));
+	private static final TestSource NULL_SOURCE = new TestSource() {
+	};
+
+	private final Map<Description, TestSource> testSourceCache = new ConcurrentHashMap<>();
+	private final Map<Class<?>, List<Method>> methodsCache = synchronizedMap(new LruCache<>(31));
 
 	public TestSource findTestSource(Description description) {
+		TestSource testSource = testSourceCache.computeIfAbsent(description, this::computeTestSource);
+		return testSource == NULL_SOURCE ? null : testSource;
+	}
+
+	private TestSource computeTestSource(Description description) {
 		Class<?> testClass = description.getTestClass();
 		if (testClass != null) {
 			String methodName = DescriptionUtils.getMethodName(description);
@@ -49,7 +59,7 @@ public TestSource findTestSource(Description description) {
 			}
 			return ClassSource.from(testClass);
 		}
-		return null;
+		return NULL_SOURCE;
 	}
 
 	private String sanitizeMethodName(String methodName) {

From 6dc8671339d43883126b87c5cba934205f1659af Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 6 Dec 2020 16:10:26 +0100
Subject: [PATCH 0145/1433] Vintage: Avoid allocation for descriptions without
 children

This eliminates allocation overhead for the most common case where a
`Description` represents a test, i.e. does not have children.
---
 .../engine/discovery/RunnerTestDescriptorPostProcessor.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
index 86f768bf2dca..f1410fd13b2d 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
@@ -47,6 +47,9 @@ void applyFiltersAndCreateDescendants(RunnerTestDescriptor runnerTestDescriptor)
 	}
 
 	private void addChildrenRecursively(VintageTestDescriptor parent) {
+		if (parent.getDescription().isTest()) {
+			return;
+		}
 		List<Description> children = parent.getDescription().getChildren();
 		// Use LinkedHashMap to preserve order, ArrayList for fast access by index
 		Map<String, List<Description>> childrenByUniqueId = children.stream().collect(

From 94e5fb91d84cd5221f4a02dfba025bc7de124abb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 11 Dec 2020 13:03:23 +0100
Subject: [PATCH 0146/1433] Vintage: Allow garbage collecting executed runners

RunnerTestDescriptors can now be garbage collected after they have been
executed because they are now removed from the list of children of the
engine descriptor.
---
 .../vintage/engine/VintageTestEngine.java     | 19 +++++++++----------
 .../descriptor/VintageEngineDescriptor.java   | 12 ++++++------
 .../RunnerTestDescriptorPostProcessor.java    |  6 +-----
 .../engine/discovery/VintageDiscoverer.java   | 16 ++++++----------
 .../engine/execution/RunnerExecutor.java      |  5 ++---
 ...unnerTestDescriptorPostProcessorTests.java |  4 +---
 6 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
index a4d8206ecaec..0b90e0d58ef8 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
@@ -14,6 +14,7 @@
 import static org.junit.platform.engine.TestExecutionResult.successful;
 import static org.junit.vintage.engine.descriptor.VintageTestDescriptor.ENGINE_ID;
 
+import java.util.Iterator;
 import java.util.Optional;
 
 import org.apiguardian.api.API;
@@ -68,19 +69,17 @@ public void execute(ExecutionRequest request) {
 		EngineExecutionListener engineExecutionListener = request.getEngineExecutionListener();
 		VintageEngineDescriptor engineDescriptor = (VintageEngineDescriptor) request.getRootTestDescriptor();
 		engineExecutionListener.executionStarted(engineDescriptor);
-		RunnerExecutor runnerExecutor = new RunnerExecutor(engineExecutionListener,
-			engineDescriptor.getTestSourceProvider());
-		executeAllChildren(runnerExecutor, engineDescriptor);
+		executeAllChildren(engineDescriptor, engineExecutionListener);
 		engineExecutionListener.executionFinished(engineDescriptor, successful());
 	}
 
-	private void executeAllChildren(RunnerExecutor runnerExecutor, TestDescriptor engineDescriptor) {
-		// @formatter:off
-		engineDescriptor.getChildren()
-				.stream()
-				.map(RunnerTestDescriptor.class::cast)
-				.forEach(runnerExecutor::execute);
-		// @formatter:on
+	private void executeAllChildren(VintageEngineDescriptor engineDescriptor,
+			EngineExecutionListener engineExecutionListener) {
+		RunnerExecutor runnerExecutor = new RunnerExecutor(engineExecutionListener);
+		for (Iterator<TestDescriptor> iterator = engineDescriptor.getModifiableChildren().iterator(); iterator.hasNext();) {
+			runnerExecutor.execute((RunnerTestDescriptor) iterator.next());
+			iterator.remove();
+		}
 	}
 
 }
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
index 81b92ab251a5..23f09d7b0b14 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
@@ -12,7 +12,10 @@
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 
+import java.util.Set;
+
 import org.apiguardian.api.API;
+import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 
@@ -22,15 +25,12 @@
 @API(status = INTERNAL, since = "5.6")
 public class VintageEngineDescriptor extends EngineDescriptor {
 
-	private final TestSourceProvider testSourceProvider;
-
-	public VintageEngineDescriptor(UniqueId uniqueId, TestSourceProvider testSourceProvider) {
+	public VintageEngineDescriptor(UniqueId uniqueId) {
 		super(uniqueId, "JUnit Vintage");
-		this.testSourceProvider = testSourceProvider;
 	}
 
-	public TestSourceProvider getTestSourceProvider() {
-		return testSourceProvider;
+	public Set<TestDescriptor> getModifiableChildren() {
+		return children;
 	}
 
 }
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
index f1410fd13b2d..daa518e7f75a 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
@@ -35,11 +35,7 @@ class RunnerTestDescriptorPostProcessor {
 
 	private final UniqueIdReader uniqueIdReader = new UniqueIdReader();
 	private final UniqueIdStringifier uniqueIdStringifier = new UniqueIdStringifier();
-	private final TestSourceProvider testSourceProvider;
-
-	public RunnerTestDescriptorPostProcessor(TestSourceProvider testSourceProvider) {
-		this.testSourceProvider = testSourceProvider;
-	}
+	private final TestSourceProvider testSourceProvider = new TestSourceProvider();
 
 	void applyFiltersAndCreateDescendants(RunnerTestDescriptor runnerTestDescriptor) {
 		addChildrenRecursively(runnerTestDescriptor);
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
index 5aa1136a8475..26422dec3484 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
@@ -19,7 +19,6 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolver;
 import org.junit.vintage.engine.descriptor.RunnerTestDescriptor;
-import org.junit.vintage.engine.descriptor.TestSourceProvider;
 import org.junit.vintage.engine.descriptor.VintageEngineDescriptor;
 
 /**
@@ -39,16 +38,13 @@ public class VintageDiscoverer {
 	// @formatter:on
 
 	public VintageEngineDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
-		TestSourceProvider testSourceProvider = new TestSourceProvider();
-		VintageEngineDescriptor engineDescriptor = new VintageEngineDescriptor(uniqueId, testSourceProvider);
+		VintageEngineDescriptor engineDescriptor = new VintageEngineDescriptor(uniqueId);
 		resolver.resolve(discoveryRequest, engineDescriptor);
-		RunnerTestDescriptorPostProcessor postProcessor = new RunnerTestDescriptorPostProcessor(testSourceProvider);
-		// @formatter:off
-		engineDescriptor.getChildren().stream()
-				.filter(RunnerTestDescriptor.class::isInstance)
-				.map(RunnerTestDescriptor.class::cast)
-				.forEach(postProcessor::applyFiltersAndCreateDescendants);
-		// @formatter:on
+		RunnerTestDescriptorPostProcessor postProcessor = new RunnerTestDescriptorPostProcessor();
+		for (TestDescriptor testDescriptor : engineDescriptor.getChildren()) {
+			RunnerTestDescriptor runnerTestDescriptor = (RunnerTestDescriptor) testDescriptor;
+			postProcessor.applyFiltersAndCreateDescendants(runnerTestDescriptor);
+		}
 		return engineDescriptor;
 	}
 
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
index daa638795f54..871a7f28383a 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
@@ -28,11 +28,10 @@
 public class RunnerExecutor {
 
 	private final EngineExecutionListener engineExecutionListener;
-	private final TestSourceProvider testSourceProvider;
+	private final TestSourceProvider testSourceProvider = new TestSourceProvider();
 
-	public RunnerExecutor(EngineExecutionListener engineExecutionListener, TestSourceProvider testSourceProvider) {
+	public RunnerExecutor(EngineExecutionListener engineExecutionListener) {
 		this.engineExecutionListener = engineExecutionListener;
-		this.testSourceProvider = testSourceProvider;
 	}
 
 	public void execute(RunnerTestDescriptor runnerTestDescriptor) {
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
index 1abeff30b9cc..22e841e6765a 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
@@ -28,7 +28,6 @@
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.vintage.engine.VintageUniqueIdBuilder;
 import org.junit.vintage.engine.descriptor.RunnerTestDescriptor;
-import org.junit.vintage.engine.descriptor.TestSourceProvider;
 import org.junit.vintage.engine.samples.junit4.IgnoredJUnit4TestCase;
 import org.junit.vintage.engine.samples.junit4.IgnoredJUnit4TestCaseWithNotFilterableRunner;
 import org.junit.vintage.engine.samples.junit4.NotFilterableRunner;
@@ -75,8 +74,7 @@ private void resolve(DiscoverySelector selector) {
 			mock(LauncherDiscoveryListener.class)).build();
 		TestDescriptor engineDescriptor = new VintageDiscoverer().discover(request, VintageUniqueIdBuilder.engineId());
 		var runnerTestDescriptor = (RunnerTestDescriptor) getOnlyElement(engineDescriptor.getChildren());
-		new RunnerTestDescriptorPostProcessor(new TestSourceProvider()).applyFiltersAndCreateDescendants(
-			runnerTestDescriptor);
+		new RunnerTestDescriptorPostProcessor().applyFiltersAndCreateDescendants(runnerTestDescriptor);
 	}
 
 }

From ee3f9c36cd58c40085748948b7f01398d0c326f7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 31 Dec 2020 13:23:46 +0100
Subject: [PATCH 0147/1433] Platform: Avoid SerializedForm reference

Prior to this commit each `TestIdentifier` instance required memory for
storing a `null` reference.
---
 .../platform/launcher/TestIdentifier.java     | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index da698a8307bb..8253ccb95938 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -51,16 +51,14 @@ public final class TestIdentifier implements Serializable {
 	private static final ObjectStreamField[] serialPersistentFields = ObjectStreamClass.lookup(
 		SerializedForm.class).getFields();
 
-	// Only set during deserialization process
-	private SerializedForm serializedForm;
-
-	private final UniqueId uniqueId;
-	private final UniqueId parentId;
-	private final String displayName;
-	private final String legacyReportingName;
-	private final TestSource source;
-	private final Set<TestTag> tags;
-	private final Type type;
+	// These are effectively final but not technically due to late initialization when deserializing
+	private /* final */ UniqueId uniqueId;
+	private /* final */ UniqueId parentId;
+	private /* final */ String displayName;
+	private /* final */ String legacyReportingName;
+	private /* final */ TestSource source;
+	private /* final */ Set<TestTag> tags;
+	private /* final */ Type type;
 
 	/**
 	 * Factory for creating a new {@link TestIdentifier} from a {@link TestDescriptor}.
@@ -78,12 +76,6 @@ public static TestIdentifier from(TestDescriptor testDescriptor) {
 		return new TestIdentifier(uniqueId, displayName, source, tags, type, parentId, legacyReportingName);
 	}
 
-	private TestIdentifier(SerializedForm serializedForm) {
-		this(UniqueId.parse(serializedForm.uniqueId), serializedForm.displayName, serializedForm.source,
-			serializedForm.tags, serializedForm.type, UniqueId.parse(serializedForm.parentId),
-			serializedForm.legacyReportingName);
-	}
-
 	private TestIdentifier(UniqueId uniqueId, String displayName, TestSource source, Set<TestTag> tags, Type type,
 			UniqueId parentId, String legacyReportingName) {
 		Preconditions.notNull(type, "TestDescriptor.Type must not be null");
@@ -286,11 +278,14 @@ private void writeObject(ObjectOutputStream s) throws IOException {
 	}
 
 	private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
-		serializedForm = SerializedForm.deserialize(s);
-	}
-
-	private Object readResolve() {
-		return new TestIdentifier(serializedForm);
+		SerializedForm serializedForm = SerializedForm.deserialize(s);
+		uniqueId = UniqueId.parse(serializedForm.uniqueId);
+		displayName = serializedForm.displayName;
+		source = serializedForm.source;
+		tags = serializedForm.tags;
+		type = serializedForm.type;
+		parentId = UniqueId.parse(serializedForm.parentId);
+		legacyReportingName = serializedForm.legacyReportingName;
 	}
 
 	/**

From 0be0e784f6ad227eb323201891760440626d6f51 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Jan 2021 20:27:24 +0100
Subject: [PATCH 0148/1433] Document memory improvements in release notes

---
 .../asciidoc/release-notes/release-notes-5.8.0-M1.adoc     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 952a6bbfa8fc..43601da40a94 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -36,6 +36,8 @@ on GitHub.
 * Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
   `ServiceLoader` mechanism.
 * Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
+* Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
+  longer store `String` representations of unique IDs.
 
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
@@ -61,6 +63,8 @@ on GitHub.
 * Documented constant values in `Resources`.
 * New `assertInstanceOf` methods as a replacement for `assertTrue(obj instanceof X)` which
   provide better error messages comparable to those of `assertThrows`.
+* Dynamic tests now require less memory thanks to a number of improvements to internal
+  data structures.
 
 [[release-notes-5.8.0-M1-junit-vintage]]
 === JUnit Vintage
@@ -75,4 +79,5 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* The JUnit Vintage engine now requires less memory and allows for earlier garbage
+  collection thanks to a number of improvements to internal data structures.

From 5ad0de43d8195fbb935d4483d45e0902f3a6f5da Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Jan 2021 13:54:11 +0100
Subject: [PATCH 0149/1433] Enable dependency verification

---
 buildSrc/build.gradle.kts                     |   2 +-
 .../kotlin/testing-conventions.gradle.kts     |   5 +-
 gradle.properties                             |   2 +
 gradle/verification-metadata.xml              | 665 ++++++++++++++++++
 4 files changed, 669 insertions(+), 5 deletions(-)
 create mode 100644 gradle/verification-metadata.xml

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index d97ba94cbd15..478b0435d680 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 }
 
 repositories {
-	mavenCentral()
 	gradlePluginPortal()
+	mavenCentral()
 }
 
 dependencies {
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 137d0d9e67d6..22c9b30c34da 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -37,10 +37,7 @@ dependencies {
 	}
 
 	if (project.name != "junit-jupiter-engine") {
-		"testImplementation"(project(":junit-jupiter-api"))
-		"testImplementation"(project(":junit-jupiter-params"))
-
-		"testRuntimeOnly"(project(":junit-jupiter-engine"))
+		"testImplementation"(project(":junit-jupiter"))
 	}
 	"testImplementation"(testFixtures(project(":junit-jupiter-api")))
 
diff --git a/gradle.properties b/gradle.properties
index 87227a7c26c8..32d2056a63aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,8 +13,10 @@ defaultBuiltBy  = JUnit Team
 
 # We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
+
 org.gradle.caching=true
 org.gradle.parallel=true
+org.gradle.dependency.verification.console=verbose
 
 # Dependencies
 apiguardian.version=1.1.1
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
new file mode 100644
index 000000000000..f9f82ab54692
--- /dev/null
+++ b/gradle/verification-metadata.xml
@@ -0,0 +1,665 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.0.xsd">
+   <configuration>
+      <verify-metadata>true</verify-metadata>
+      <verify-signatures>true</verify-signatures>
+      <trusted-keys>
+         <trusted-key id="015479e1055341431b4545ab72475fd306b9cab7" group="com.googlecode.javaewah" name="JavaEWAH"/>
+         <trusted-key id="019082bc00e0324e2aef4cf00d3b328562a119a7" group="org.openjdk.jmh"/>
+         <trusted-key id="050a37a2e0577f4baa095b52602ec18d20c4661c" group="com.thoughtworks.xstream"/>
+         <trusted-key id="06d34ed6ff73de368a772a781063fe98bcecb758" group="com.puppycrawl.tools" name="checkstyle"/>
+         <trusted-key id="08f0aab4d0c1a4bdde340765b341ddb020fcb6ab" group="org.bouncycastle"/>
+         <trusted-key id="0cc641c3a62453ab390066c4a41f13c999945293">
+            <trusting group="commons-logging"/>
+            <trusting group="commons-collections"/>
+         </trusted-key>
+         <trusted-key id="0cde80149711eb46dff17ae421a24b3f8b0f594a" group="org.apache" name="apache"/>
+         <trusted-key id="12d16069219c90212a974d119ae296fd02e9f65b" group="org.apache.commons" name="commons-math3"/>
+         <trusted-key id="160a7a9cf46221a56b06ad64461a804f2609fd89" group="com.github.shyiko.klob"/>
+         <trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638" group="org.checkerframework" name="checker-qual"/>
+         <trusted-key id="1aa8cf92d409a73393d0b736bff2ee42c8282e76" group="org.apache.servicemix.bundles"/>
+         <trusted-key id="1abe38b92f812c1f7bf1d647d0d1b9a54efd603d" group="com.univocity" name="univocity-parsers"/>
+         <trusted-key id="1f47744c9b6e14f2049c2857f1f111af65925306" group="io.github.classgraph" name="classgraph"/>
+         <trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch" name="gradle-download-task"/>
+         <trusted-key id="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd">
+            <trusting group="org.sonatype.oss"/>
+            <trusting group="org.codehaus"/>
+         </trusted-key>
+         <trusted-key id="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb" group="commons-io" name="commons-io"/>
+         <trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193" group="org.jetbrains" name="annotations"/>
+         <trusted-key id="2e92113263fc31c74ccbaab20e91c2de43b72bb1" group="org.ec4j.core"/>
+         <trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8" group="com.thoughtworks.qdox" name="qdox"/>
+         <trusted-key id="32d98ffd50617f6ed7e6abd236feecf06c2da10b" group="biz.aQute.bnd"/>
+         <trusted-key id="34d6ff19930adf43ac127792a50569c7ca7fa1f0" group="com.jcraft"/>
+         <trusted-key id="3690c240ce51b4670d30ad1c38ee757d69184620" group="org.tukaani" name="xz"/>
+         <trusted-key id="3909c28792327fad38100eaf04633a577c200941" group="org.vafer" name="jdependency"/>
+         <trusted-key id="3e07544e2175a6b3608c515a5fec689ca7e7b6bd" group="org.eclipse.jdt"/>
+         <trusted-key id="44fbdbbc1a00fe414f1c1873586654072ead6677" group="org.sonatype.oss"/>
+         <trusted-key id="47063e8ba7a6450e4a52e7ae466caed6e0747d50" group="net.java.dev.jna" name="platform"/>
+         <trusted-key id="475f3b8e59e6e63aa78067482c7b12f2a511e325">
+            <trusting group="org.slf4j"/>
+            <trusting group="ch.qos.logback"/>
+         </trusted-key>
+         <trusted-key id="4a720fe790b07a68744e371675bf031b7c94e183" group="net.java.dev.jna"/>
+         <trusted-key id="4d90040f09023a4a74df2f54abaae54f37e6f8e1">
+            <trusting group="^org[.]tmatesoft($|([.].*))" regex="true"/>
+            <trusting group="com.trilead"/>
+            <trusting group="de.regnis.q.sequence"/>
+         </trusted-key>
+         <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
+         <trusted-key id="517b94f8d0a46317a28d8ab30da8a5ec02d11ead" group="net.sf.jopt-simple" name="jopt-simple"/>
+         <trusted-key id="53c935821aa6a755bd337db53595395eb3d8e1ba" group="org.apache.logging.log4j"/>
+         <trusted-key id="55e770230e69cc6de143fb5b62c82e50836eb3ee" group="com.github.gundy" name="semver4j"/>
+         <trusted-key id="5897253bea3046aeea95a067e93671c7272b7b3f" group="org.jdom" name="jdom2"/>
+         <trusted-key id="5b7f3605a8ce471a9ca8db7ec84125c13bf6f2f2" group="^org[.]ajoberstar($|([.].*))" regex="true"/>
+         <trusted-key id="666a4692ce11b7b3f4eb7b3410066a9707090cf9" group="org.javassist" name="javassist"/>
+         <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="com.google.guava"/>
+         <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
+         <trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
+         <trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs" name="jsr305"/>
+         <trusted-key id="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1" group="org.spockframework" name="spock-core"/>
+         <trusted-key id="77993d3295698c46912e83984b2277c6358670ee" group="org.assertj"/>
+         <trusted-key id="7c669810892cbd3148fa92995b05ccde140c2876" group="org.eclipse.jgit"/>
+         <trusted-key id="7faa0f2206de228f0db01ad741321490758aad6f" group="org.codehaus.groovy"/>
+         <trusted-key id="808d78b17a5a2d7c3668e31fbffc9b54721244ad" group="org.apache.commons" name="commons-parent"/>
+         <trusted-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61">
+            <trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
+            <trusting group="^com[.]diffplug($|([.].*))" regex="true"/>
+            <trusting group="info.picocli"/>
+            <trusting group="com.github.javaparser"/>
+            <trusting group="de.sormuras"/>
+         </trusted-key>
+         <trusted-key id="906e5e684729c006267ddd4b105de36038d8c6c5" group="org.codehaus.plexus" name="plexus-utils"/>
+         <trusted-key id="9857c388d7d1d9d031274cd0a5def5a76f94a471" group="com.github.spotbugs"/>
+         <trusted-key id="9e3044071b758ebcb7e45673700e4f39bc05364b" group="org.eclipse.platform"/>
+         <trusted-key id="a2570288e10932263e8326cbaa49c633b4734832">
+            <trusting group="com.pinterest" name="ktlint"/>
+            <trusting group="com.pinterest.ktlint"/>
+         </trusted-key>
+         <trusted-key id="a5bd02b93e7a40482eb1d66a5f69ad087600b22c" group="org.ow2.asm"/>
+         <trusted-key id="a778fde933a96dda827840d8e2b3d84202b812d9" group="org.assertj"/>
+         <trusted-key id="a7892505cf1a58076453e52d7999befba1039e8b" group="net.bytebuddy"/>
+         <trusted-key id="a9789342f598ad5b1175ef357eb97d110dfadd60" group="com.googlecode.concurrent-trees" name="concurrent-trees"/>
+         <trusted-key id="afcc4c7594d09e2182c60e0f7a01b0f236e5430f" group="com.google.code.gson"/>
+         <trusted-key id="b2d1ac7be5a3eeb9773a49fe6eb9de4d7e01b1e1" group="org.antlr"/>
+         <trusted-key id="b6e73d84ea4fcc47166087253faad2cd5ecbb314">
+            <trusting group="org.apache.commons"/>
+            <trusting group="commons-beanutils"/>
+         </trusted-key>
+         <trusted-key id="b801e2f8ef035068ec1139cc29579f18fa8fd93b" group="com.google.j2objc" name="j2objc-annotations"/>
+         <trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2" group="org.reflections" name="reflections"/>
+         <trusted-key id="ba926f64ca647b6d853a38672e2010f8a7ff4a41" group="org.apache" name="apache" version="7"/>
+         <trusted-key id="bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae" group="com.google.guava"/>
+         <trusted-key id="c0822d185fbfd963c33acbfea318a06284d602d5" group="com.tngtech.archunit"/>
+         <trusted-key id="c70b844f002f21f6d2b9c87522e44ac0622b91c3" group="com.beust" name="jcommander"/>
+         <trusted-key id="cc4483cd6a3eb2939b948667a1b4460d8ba7b9af" group="org.mockito"/>
+         <trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0" group="commons-io" name="commons-io"/>
+         <trusted-key id="ce8075a251547bee249bc151a2115ae15f6b8b72">
+            <trusting group="^org[.]apache($|([.].*))" regex="true"/>
+            <trusting group="org.apache.ant"/>
+         </trusted-key>
+         <trusted-key id="d4c89ea4aaf455fd88b22087efe8086f9e93774e" group="junit" name="junit" version="4.12"/>
+         <trusted-key id="d54a395b5cf3f86eb45f6e426b1b008864323b92" group="org.antlr"/>
+         <trusted-key id="d6f1bc78607808ec8e9f69437a8860944fad5f62" group="org.apache.commons" name="commons-parent"/>
+         <trusted-key id="d9aa7402ba75f78720d975211d185615d0a84648" group="net.sf.saxon" name="Saxon-HE"/>
+         <trusted-key id="dcba03381ef6c89096acd985ac5ec74981f9cda6" group="org.testng" name="testng"/>
+         <trusted-key id="e2acb037933cdeaab7bf77d49a2c7a98e457c53d" group="io.spring.nohttp"/>
+         <trusted-key id="e85aed155021af8a6c6b7a4a7c7d8456294423ba" group="org.objenesis"/>
+         <trusted-key id="ea23db1360d9029481e7f2efecdfea3cb4493b94" group="jline" name="jline"/>
+         <trusted-key id="f254b35617dc255d9344bcfa873a8e86b4372146" group="org.apache" name="apache" version="13"/>
+         <trusted-key id="fa77dcfef2ee6eb2debedd2c012579464d01c06a" group="org.apache" name="apache"/>
+         <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51">
+            <trusting group="org.apiguardian"/>
+            <trusting group="org.opentest4j"/>
+            <trusting group="junit"/>
+            <trusting group="org.junit"/>
+         </trusted-key>
+      </trusted-keys>
+   </configuration>
+   <components>
+      <component group="antlr" name="antlr" version="2.7.7">
+         <artifact name="antlr-2.7.7.jar">
+            <sha256 value="88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="antlr-2.7.7.pom">
+            <sha256 value="100f793ba27f8b4e4204edb46171ebf36e54e0f94cfc02527fea07a0bb1fceb7" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="ch.qos.logback" name="logback-classic" version="1.2.3">
+         <artifact name="logback-classic-1.2.3.pom">
+            <sha256 value="a051eb1a2548b93c99abca8eb71d5c75d2ff06976682960348124bc4901a5315" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="ch.qos.logback" name="logback-core" version="1.2.3">
+         <artifact name="logback-core-1.2.3.pom">
+            <sha256 value="df4d7181ec51655baaaab067971180d7681643ddd274139f0c3078dba14e97e0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="ch.qos.logback" name="logback-parent" version="1.2.3">
+         <artifact name="logback-parent-1.2.3.pom">
+            <sha256 value="79cd021dafc7b0255d3cdd3fd70cbaa638df73995749a348ee82c45635eab26a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="5.6.1">
+         <artifact name="com.diffplug.spotless.gradle.plugin-5.6.1.pom">
+            <sha256 value="3ce2939205ddfc1511ff1b6e61efb8f23dd8e424fdb92d582fda17a58e56fa5f" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="5.6.1">
+         <artifact name="spotless-plugin-gradle-5.6.1.pom">
+            <ignored-keys>
+               <ignored-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="205eb20eb194f17d3e0773dced79af4036eb6a550a6236abfde2d222e014c585" origin="Generated by Gradle because PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.29.0">
+         <artifact name="gradle-versions-plugin-0.29.0.jar">
+            <sha256 value="27293128f05288dbc3f4f0a3e7057ee18014694994ae72a0291523d43e9d3a75" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="gradle-versions-plugin-0.29.0.pom">
+            <sha256 value="437f247aeada05610fd449ca0439fb71f5c263bfb6af7b64ba74854671251112" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.ben-manes.versions" name="com.github.ben-manes.versions.gradle.plugin" version="0.29.0">
+         <artifact name="com.github.ben-manes.versions.gradle.plugin-0.29.0.pom">
+            <sha256 value="47472517eac45ba333ec78979ef887bb0b70fd5ff49f88dcc2fca7d315aedbec" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.jengelman.gradle.plugins" name="shadow" version="6.1.0">
+         <artifact name="shadow-6.1.0.jar">
+            <sha256 value="b66cb33a1d204ffaa1ba67393bdddbe9ff517f24f4438d11c341423868759aa3" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="shadow-6.1.0.pom">
+            <sha256 value="d40c29bce31762b6c8539a87d2515324f44db9d7d579a5aa7016a15ce164abb8" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
+         <artifact name="error_prone_annotations-2.3.4.pom">
+            <sha256 value="1326738a4b4f7ccacf607b866a11fb85193ef60f6a59461187ce7265f9be5bed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.3.4">
+         <artifact name="error_prone_parent-2.3.4.pom">
+            <sha256 value="40495b437a60d2398f0fdfc054b89d9c394a82347a274a0721c2e950a4302186" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.gradle" name="gradle-enterprise-gradle-plugin" version="3.5">
+         <artifact name="gradle-enterprise-gradle-plugin-3.5.jar">
+            <pgp value="314fe82e5a4c5377bca2edec5208812e1e4a6db0"/>
+         </artifact>
+         <artifact name="gradle-enterprise-gradle-plugin-3.5.pom">
+            <sha256 value="09653feae7365110fbc542926e56f5046bc63ac489a895366bdf7e5bb2c88848" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.gradle.enterprise" name="com.gradle.enterprise.gradle.plugin" version="3.5">
+         <artifact name="com.gradle.enterprise.gradle.plugin-3.5.pom">
+            <sha256 value="c8d553ac1ba70d8117da6e8536aece57c4cfdda59c8ffb04fee4923af07c35e0" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.jcraft" name="jsch.agentproxy" version="0.0.7">
+         <artifact name="jsch.agentproxy-0.0.7.pom">
+            <sha256 value="4a2170c4ec7de446d643acaec05febb8bc52c0cd0f5fead9f486f7551192d11d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-beanutils" name="commons-beanutils" version="1.9.4">
+         <artifact name="commons-beanutils-1.9.4.pom">
+            <sha256 value="c35cca7b61d4678d9578cbc0b901b8717b539abf9254441da78b8fe60de064d0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-collections" name="commons-collections" version="3.2.2">
+         <artifact name="commons-collections-3.2.2.pom">
+            <sha256 value="d5d81fcc288c0d8c711c302007cada4aa9a226ed1a112d4baa64cb1d6322170b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-io" name="commons-io" version="2.5">
+         <artifact name="commons-io-2.5.pom">
+            <pgp value="6bdaca2c0493cca133b372d09c4f7e9d98b1cc53"/>
+         </artifact>
+      </component>
+      <component group="de.marcphilipp.gradle" name="nexus-publish-plugin" version="0.4.0">
+         <artifact name="nexus-publish-plugin-0.4.0.jar">
+            <sha256 value="b5fed9f29022119b6d5dd87b3073e19991bec6196117e306334608927cd1f620" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="nexus-publish-plugin-0.4.0.pom">
+            <sha256 value="dccd2171f5644d418b2504a317c247b99efde4656b6a483d1a59130501feb08d" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="de.undercouch" name="gradle-download-task" version="4.0.2">
+         <artifact name="gradle-download-task-4.0.2.jar">
+            <pgp value="1fa37fbe4453c1073e7ef61d6449005f96bc97a3"/>
+         </artifact>
+         <artifact name="gradle-download-task-4.0.2.pom">
+            <ignored-keys>
+               <ignored-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="62f29168dc2ffb580c44aa6021f655051a9cb0a48dfd47bc7e4e8ca6f963adb0" origin="Generated by Gradle because PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="gradle.plugin.net.nemerosa" name="versioning" version="2.14.0">
+         <artifact name="versioning-2.14.0.jar">
+            <sha256 value="d7bbaf9640d792c71cfd7471225315ee94a2179c944956c9b87b449c6957f6b0" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="versioning-2.14.0.pom">
+            <sha256 value="6ab012b036e34506a138e2c692c987528c1f4db07b9b929f89f079ae1237d01b" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="io.spring.nohttp" name="io.spring.nohttp.gradle.plugin" version="0.0.5.RELEASE">
+         <artifact name="io.spring.nohttp.gradle.plugin-0.0.5.RELEASE.pom">
+            <sha256 value="c0a501f1bab3e21b8742ff8e60593174b3f517c346f3228a7d98d8bc558c8d56" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="io.spring.nohttp" name="nohttp" version="0.0.5.RELEASE">
+         <artifact name="nohttp-0.0.5.RELEASE.pom">
+            <sha256 value="b00254c9f704f9ab9c3dd7afb5bfd52ee8b0371862b0b0e58482930a2de396c3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.spring.nohttp" name="nohttp-checkstyle" version="0.0.5.RELEASE">
+         <artifact name="nohttp-checkstyle-0.0.5.RELEASE.pom">
+            <sha256 value="50706f3706a5af9db837a565a0abc58a6190476807afc22907fe3771a301c965" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.spring.nohttp" name="nohttp-gradle" version="0.0.5.RELEASE">
+         <artifact name="nohttp-gradle-0.0.5.RELEASE.pom">
+            <ignored-keys>
+               <ignored-key id="e2acb037933cdeaab7bf77d49a2c7a98e457c53d" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="94c5fb5dad9759fdc3ef57059b0624ea7ca5d2d143d3e1e24bf4d65400548ead" origin="Generated by Gradle because PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="me.champeau.gradle" name="jmh-gradle-plugin" version="0.5.0">
+         <artifact name="jmh-gradle-plugin-0.5.0.jar">
+            <sha256 value="526a8ce68163ae470da79603ab22108ffe78553c8446c4b14caf5815901178ea" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="jmh-gradle-plugin-0.5.0.pom">
+            <sha256 value="ddc58e2cc7a1d0f49a26a1392c93ed497ba2d62f94e3bb83e1c611ba6aa7984b" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="me.champeau.gradle.jmh" name="me.champeau.gradle.jmh.gradle.plugin" version="0.5.0">
+         <artifact name="me.champeau.gradle.jmh.gradle.plugin-0.5.0.pom">
+            <sha256 value="532f58f8226dbb210cf419cf94845de2bd05d648b4585db698f9d56ed73443c8" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="net.bytebuddy" name="byte-buddy-parent" version="1.10.13">
+         <artifact name="byte-buddy-parent-1.10.13.pom">
+            <sha256 value="40c2ad5d4368794979183a504dc78211d65389d07fbcb7336d10a7914ef564da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.jcip" name="jcip-annotations" version="1.0">
+         <artifact name="jcip-annotations-1.0.jar">
+            <sha256 value="be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="jcip-annotations-1.0.pom">
+            <sha256 value="5c19e6848cc550a95664fb082304bc5f9fcf7b672faf03af1635f0e93c268177" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="net.nemerosa.versioning" name="net.nemerosa.versioning.gradle.plugin" version="2.14.0">
+         <artifact name="net.nemerosa.versioning.gradle.plugin-2.14.0.pom">
+            <sha256 value="df57b1941998824daead1c6dea1f4c545a08ea00769da2d42f611e4bc3b6708b" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="net.sf.jopt-simple" name="jopt-simple" version="4.6">
+         <artifact name="jopt-simple-4.6.pom">
+            <sha256 value="692744a19473011539ebc1370a264b8af1c056e0ae21f5372aa9dd7d4b4e5a2b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ajoberstar" name="gradle-git-publish" version="2.1.3">
+         <artifact name="gradle-git-publish-2.1.3.pom">
+            <ignored-keys>
+               <ignored-key id="5b7f3605a8ce471a9ca8db7ec84125c13bf6f2f2" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="151e1cb598cc9c34d70d50862075dbe5cfcf891b1faa77168dc3c4262fd3f69e" origin="Generated by Gradle because PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="org.ajoberstar.git-publish" name="org.ajoberstar.git-publish.gradle.plugin" version="2.1.3">
+         <artifact name="org.ajoberstar.git-publish.gradle.plugin-2.1.3.pom">
+            <sha256 value="047303f8afe488f3363a93a4ee1e66a0c347d566104b4a217a5e1cf87bd0cc72" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr4-master" version="4.8-1">
+         <artifact name="antlr4-master-4.8-1.pom">
+            <sha256 value="ad82764672b9fcb42369422574d583b5512e1d7de1d3143951f27c5eb0f4c8e6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr4-runtime" version="4.8-1">
+         <artifact name="antlr4-runtime-4.8-1.pom">
+            <sha256 value="ab60bcd5af00a48e36854ab97769bb5b7bd81ff20efc2abdf6792a66c5803e9d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="13">
+         <artifact name="apache-13.pom">
+            <pgp value="f254b35617dc255d9344bcfa873a8e86b4372146"/>
+            <sha256 value="ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="16">
+         <artifact name="apache-16.pom">
+            <pgp value="0cde80149711eb46dff17ae421a24b3f8b0f594a"/>
+            <sha256 value="9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="18">
+         <artifact name="apache-18.pom">
+            <pgp value="190d5a957ff22273e601f7a7c92c5fec70161c62"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="19">
+         <artifact name="apache-19.pom">
+            <sha256 value="91f7a33096ea69bac2cbaf6d01feb934cac002c48d8c8cfa9c240b40f1ec21df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="21">
+         <artifact name="apache-21.pom">
+            <pgp value="fa77dcfef2ee6eb2debedd2c012579464d01c06a"/>
+            <sha256 value="af10c108da014f17cafac7b52b2b4b5a3a1c18265fa2af97a325d9143537b380" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="7">
+         <artifact name="apache-7.pom">
+            <pgp value="ba926f64ca647b6d853a38672e2010f8a7ff4a41"/>
+            <sha256 value="1397ce1db433adc9f223dbf07496d133681448751f4ae29e58f68e78fb4b6c25" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.ant" name="ant-parent" version="1.10.8">
+         <artifact name="ant-parent-1.10.8.pom">
+            <sha256 value="b24f7456bceefc2b22c20fdeaedd7d264a8006fcfd180257f2c848fdef20e530" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-math3" version="3.2">
+         <artifact name="commons-math3-3.2.pom">
+            <sha256 value="2cd0db7bce370c1404025cc013c11f8fd49f3f3c340a6d2dcf99d363d7948a69" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="28">
+         <artifact name="commons-parent-28.pom">
+            <sha256 value="14733a68e8b120b69de60cd96d222146dcf32f03c1c6cc6a750b1269bafe86c7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="39">
+         <artifact name="commons-parent-39.pom">
+            <pgp value="808d78b17a5a2d7c3668e31fbffc9b54721244ad"/>
+            <sha256 value="87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="47">
+         <artifact name="commons-parent-47.pom">
+            <pgp value="b6e73d84ea4fcc47166087253faad2cd5ecbb314"/>
+            <sha256 value="8a8ecb570553bf9f1ffae211a8d4ca9ee630c17afe59293368fba7bd9b42fcb7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="50">
+         <artifact name="commons-parent-50.pom">
+            <pgp value="bc87a3fd0a54480f0badbebd21939ff0ca2a6567"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j" version="2.13.3">
+         <artifact name="log4j-2.13.3.pom">
+            <sha256 value="674f1fa5165b9d48935f4103d9316fe5b161dff6f9be904a6edb9baa33da4480" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.servicemix" name="servicemix-pom" version="5">
+         <artifact name="servicemix-pom-5.pom">
+            <pgp value="75763c9eab34ecff96444a4314d149f029defb15"/>
+         </artifact>
+      </component>
+      <component group="org.asciidoctor" name="asciidoctor-gradle-base" version="3.2.0">
+         <artifact name="asciidoctor-gradle-base-3.2.0.jar">
+            <sha256 value="865d407e483713212e4ebed7b9c17be332967db81f045c2c9d891a3f10997a34" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="asciidoctor-gradle-base-3.2.0.pom">
+            <sha256 value="3dba4017471358c83784cf76a67ee3da6357956cace5345f85d3762f3949c35f" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.asciidoctor" name="asciidoctor-gradle-jvm" version="3.2.0">
+         <artifact name="asciidoctor-gradle-jvm-3.2.0.jar">
+            <sha256 value="02882d817cc416504828261e1e1f4afc65b62a70c5579c20f35e9800ca91d972" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="asciidoctor-gradle-jvm-3.2.0.pom">
+            <sha256 value="6b9cc51d4b3afca06f6f126a460ee62758c7c0c3f935a3566d9147ef87726506" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.asciidoctor" name="asciidoctor-gradle-jvm-pdf" version="3.2.0">
+         <artifact name="asciidoctor-gradle-jvm-pdf-3.2.0.jar">
+            <sha256 value="e236c8cb5b71de58ca04e4998d1c23fed5b3be18d457680e7f7e903646f6cdcf" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="asciidoctor-gradle-jvm-pdf-3.2.0.pom">
+            <sha256 value="83f789418a1b25ab22b56c9d8657c648a16f3646c02b1c3b5e3aa157799b6fd3" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.asciidoctor.jvm.convert" name="org.asciidoctor.jvm.convert.gradle.plugin" version="3.2.0">
+         <artifact name="org.asciidoctor.jvm.convert.gradle.plugin-3.2.0.pom">
+            <sha256 value="6f595a2218a429f249bb932e727520c901e3ef8ed5936cd99d004efe9dd5ec22" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.asciidoctor.jvm.pdf" name="org.asciidoctor.jvm.pdf.gradle.plugin" version="3.2.0">
+         <artifact name="org.asciidoctor.jvm.pdf.gradle.plugin-3.2.0.pom">
+            <sha256 value="a4f089118fb7727272c3b91852793b02c03cb809c6f86dd24751480b5966f8b9" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="checker-qual" version="2.11.1">
+         <artifact name="checker-qual-2.11.1.pom">
+            <sha256 value="cf2e0c90d8f757455f4a258ea609739053663bd5da6a79d9bd53f935a47de79c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus" name="codehaus-parent" version="4">
+         <artifact name="codehaus-parent-4.pom">
+            <pgp value="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd"/>
+            <sha256 value="6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus" version="4.0">
+         <artifact name="plexus-4.0.pom">
+            <pgp value="c345986f0fd384669c5919e6a5f094fd3961df05"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="5.6.0.201912101111-r">
+         <artifact name="org.eclipse.jgit-parent-5.6.0.201912101111-r.pom">
+            <sha256 value="efcf2ca3cacbcd9d9473696ac0910105e38b37bf7a3e66a94bb7a1343794a604" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.gradle" name="test-retry-gradle-plugin" version="1.2.0">
+         <artifact name="test-retry-gradle-plugin-1.2.0.jar">
+            <pgp value="314fe82e5a4c5377bca2edec5208812e1e4a6db0"/>
+         </artifact>
+         <artifact name="test-retry-gradle-plugin-1.2.0.pom">
+            <sha256 value="2a47c9e35f180fc41f7b720ffefd0b7e4dc5e133cea2e362c17c6a8274a90c1d" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="1.4.9">
+         <artifact name="gradle-kotlin-dsl-plugins-1.4.9.jar">
+            <sha256 value="f4e33bcad51373112211214bc697845a09b18c98a55b809208a111c43cf84518" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="gradle-kotlin-dsl-plugins-1.4.9.pom">
+            <sha256 value="4b4b16e7262fdde7198f56f791093f45730c14690348a7df369e8b97e85b1cdc" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="1.4.9">
+         <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-1.4.9.pom">
+            <sha256 value="65e5554f499ed7febe043f2739aa771bc9b9885cd251528fc48c516fea30d0a0" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-android-extensions" version="1.4.20">
+         <artifact name="kotlin-android-extensions-1.4.20.pom">
+            <sha256 value="b8497814f61cb3c8c59cc1b6bd4102d5a6bacda73d385963c5105d57d1fa5e1e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-annotation-processing-gradle" version="1.4.20">
+         <artifact name="kotlin-annotation-processing-gradle-1.4.20.pom">
+            <sha256 value="50de06f4f6f51312bd039a8cf5b5519320b46e9d04ce8da6162ad6d05f2a51e3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.4.20">
+         <artifact name="kotlin-build-common-1.4.20.pom">
+            <sha256 value="f00f60d91b9255629526af083127524c2940a7eb367ec9cfa16ed7b2f30cfed8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.4.20">
+         <artifact name="kotlin-compiler-embeddable-1.4.20.pom">
+            <sha256 value="9686a28b0b606761581b88bef6a055e22068461dd2bba1ecfb15919967e603c7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.4.20">
+         <artifact name="kotlin-compiler-runner-1.4.20.pom">
+            <sha256 value="763f5326c61079617a8d9d78f38324dd77ed8b328a46d20d6f7a85b3cfe8ccc8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.4.20">
+         <artifact name="kotlin-daemon-client-1.4.20.pom">
+            <sha256 value="928729bee74e69710086b4ff7bd692f7426fa0ecc7eee143622008f29b64420e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.4.20">
+         <artifact name="kotlin-daemon-embeddable-1.4.20.pom">
+            <sha256 value="d266dda8a3484b1a863610db37c74126dc36cc2354404b05474423c67648ccef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="1.4.20">
+         <artifact name="kotlin-gradle-plugin-1.4.20.jar">
+            <ignored-keys>
+               <ignored-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="bfd0ae0418917b8d0f7b300d8eb61e4a68d79e1706a34d4f2e65e9accf67df38" origin="Generated by Gradle because PGP signature verification failed!"/>
+         </artifact>
+         <artifact name="kotlin-gradle-plugin-1.4.20.pom">
+            <ignored-keys>
+               <ignored-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" reason="PGP verification failed"/>
+            </ignored-keys>
+            <sha256 value="f79af7dcff9a5609171a4e5704577ac99403c62f67e5fba358277a8f83bbd38f" origin="Generated by Gradle because PGP signature verification failed!"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="1.4.20">
+         <artifact name="kotlin-gradle-plugin-api-1.4.20.pom">
+            <sha256 value="f1d0d87457160e8ca1961311d5c6504ce14e498908f9d8387c9d244dd0e78fb8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="1.4.20">
+         <artifact name="kotlin-gradle-plugin-model-1.4.20.pom">
+            <sha256 value="aebcf5e1d450da8d38e55ab968da381a7214012e868794823a39ce6d66dd49f1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.4.20">
+         <artifact name="kotlin-reflect-1.4.20.pom">
+            <sha256 value="a5ebcf0f1c72a11d94336796125e2c77d562b528ed4d447c340e7dc8037375b0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-sam-with-receiver" version="1.4.20">
+         <artifact name="kotlin-sam-with-receiver-1.4.20.pom">
+            <sha256 value="0130e48848936f4544d5ddfb9ea090a2e515cb03e2ba2974c49445a98c63b012" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.4.20">
+         <artifact name="kotlin-script-runtime-1.4.20.pom">
+            <sha256 value="3e72202d67ef93ce0aee50ea763ec301e343d5c3cec2f6f12580855835024f57" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="1.4.20">
+         <artifact name="kotlin-scripting-common-1.4.20.pom">
+            <sha256 value="fee4fbef3f113be1ff95efef9c18816b8107dc9b30bed558a582965df3752afb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="1.4.20">
+         <artifact name="kotlin-scripting-compiler-embeddable-1.4.20.pom">
+            <sha256 value="03f793eed92301288df0487d13b9776fa0ee52025230eed96bffe6666d562301" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="1.4.20">
+         <artifact name="kotlin-scripting-compiler-impl-embeddable-1.4.20.pom">
+            <sha256 value="0c9aa6618294893bfa877f54b07056084cf594f117e2c979b5620fe741ab539b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="1.4.20">
+         <artifact name="kotlin-scripting-jvm-1.4.20.pom">
+            <sha256 value="32fe3bb23007b41e0e84f5d86977472048827177e3bc3fa274551fd725f968bc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="1.4.20">
+         <artifact name="kotlin-util-io-1.4.20.pom">
+            <sha256 value="240ba4e6ccfa91a9efa43ac500f3cab6556e338a28f10e83bc608359a0452196" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="1.4.20">
+         <artifact name="kotlin-util-klib-1.4.20.pom">
+            <sha256 value="00dd506c7c806b26cc7bdefc5ec4fce36a7c91e4ac76f1c9353983473cd5fe79" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter" version="5.7.0">
+         <artifact name="junit-jupiter-5.7.0.module">
+            <pgp value="ff6e2c001948c5f2f38b0cc385911f425ec61b51"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter" version="5.8.0-SNAPSHOT">
+         <artifact name="junit-jupiter-5.8.0-SNAPSHOT.jar">
+            <sha256 value="c9084fbf40746a4b097ba4f50dcd65b04b08d10b5d151f4d809a35542f38563b" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="junit-jupiter-5.8.0-SNAPSHOT.module">
+            <sha256 value="31ba26ef34ac0fce48ad5115ddbdab2af7311add78456744eaaa4601906cc504" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jmh" name="jmh-parent" version="1.25">
+         <artifact name="jmh-parent-1.25.pom">
+            <sha256 value="919ba8ed9c61195f164ff729f3547fdfa752a6b6a3e7236a5bf5b61cdf7b5669" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2" name="ow2" version="1.3">
+         <artifact name="ow2-1.3.pom">
+            <pgp value="373d292d931cead14a4dbfdf3d52c2966a51f8f4"/>
+         </artifact>
+      </component>
+      <component group="org.slf4j" name="slf4j-parent" version="1.7.30">
+         <artifact name="slf4j-parent-1.7.30.pom">
+            <sha256 value="11647956e48a0c5bfb3ac33f6da7e83f341002b6857efd335a505b687be34b75" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.forge" name="forge-parent" version="10">
+         <artifact name="forge-parent-10.pom">
+            <pgp value="180683306a9ef844d6cc0080a7eaf75aea98b19f"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="5">
+         <artifact name="oss-parent-5.pom">
+            <pgp value="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd"/>
+            <sha256 value="1678d4120a585d8a630131aeec4c524d928398583b7eab616ee7d5a87f520d3d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="6">
+         <artifact name="oss-parent-6.pom">
+            <sha256 value="b4306d13e8f5392458a1b30866f1cff161b3d2e6999a88d059eea3932c8a8499" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="7">
+         <artifact name="oss-parent-7.pom">
+            <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="9">
+         <artifact name="oss-parent-9.pom">
+            <pgp value="44fbdbbc1a00fe414f1c1873586654072ead6677"/>
+            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ysb33r.gradle" name="grolifant" version="0.16.1">
+         <artifact name="grolifant-0.16.1.jar">
+            <sha256 value="362c450c9738834181fdfac1147fa11cf21cefd59d7a5368756e174f93567a43" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="grolifant-0.16.1.pom">
+            <sha256 value="32671ca0c5a852c4432373c92fb8e8e767496a735cdd21a7194b0bfcea5e6cb5" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="xmlpull" name="xmlpull" version="1.1.3.1">
+         <artifact name="xmlpull-1.1.3.1.jar">
+            <sha256 value="34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="xmlpull-1.1.3.1.pom">
+            <sha256 value="8f10ffd8df0d3e9819c8cc8402709c6b248bc53a954ef6e45470d9ae3a5735fb" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="xpp3" name="xpp3_min" version="1.1.4c">
+         <artifact name="xpp3_min-1.1.4c.jar">
+            <sha256 value="bfc90e9e32d0eab1f397fb974b5f150a815188382ac41f372a7149d5bc178008" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="xpp3_min-1.1.4c.pom">
+            <sha256 value="b5b46ac0c09da41b04dbc753456b48912856a7ffbb1490676910b510c471d13f" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+   </components>
+</verification-metadata>

From ab436ac0137cf2f42b0b3baffc3066d8f0dce3f8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Jan 2021 17:48:34 +0100
Subject: [PATCH 0150/1433] Add missing dependency verification metadata

---
 gradle/verification-metadata.xml | 154 +++++++++++++++++++++++++------
 1 file changed, 126 insertions(+), 28 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index f9f82ab54692..547f0aab7588 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -14,28 +14,64 @@
             <trusting group="commons-collections"/>
          </trusted-key>
          <trusted-key id="0cde80149711eb46dff17ae421a24b3f8b0f594a" group="org.apache" name="apache"/>
-         <trusted-key id="12d16069219c90212a974d119ae296fd02e9f65b" group="org.apache.commons" name="commons-math3"/>
-         <trusted-key id="160a7a9cf46221a56b06ad64461a804f2609fd89" group="com.github.shyiko.klob"/>
+         <trusted-key id="12d16069219c90212a974d119ae296fd02e9f65b">
+            <trusting group="org.apache.commons" name="commons-math3"/>
+            <trusting group="org.apache.commons" name="commons-math3" version="3.2"/>
+         </trusted-key>
+         <trusted-key id="160a7a9cf46221a56b06ad64461a804f2609fd89">
+            <trusting group="com.github.shyiko.klob"/>
+            <trusting group="com.github.shyiko.klob" name="klob" version="0.2.1"/>
+         </trusted-key>
          <trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638" group="org.checkerframework" name="checker-qual"/>
          <trusted-key id="1aa8cf92d409a73393d0b736bff2ee42c8282e76" group="org.apache.servicemix.bundles"/>
-         <trusted-key id="1abe38b92f812c1f7bf1d647d0d1b9a54efd603d" group="com.univocity" name="univocity-parsers"/>
-         <trusted-key id="1f47744c9b6e14f2049c2857f1f111af65925306" group="io.github.classgraph" name="classgraph"/>
+         <trusted-key id="1abe38b92f812c1f7bf1d647d0d1b9a54efd603d">
+            <trusting group="com.univocity" name="univocity-parsers"/>
+            <trusting group="com.univocity" name="univocity-parsers" version="2.9.0"/>
+         </trusted-key>
+         <trusted-key id="1f47744c9b6e14f2049c2857f1f111af65925306">
+            <trusting group="io.github.classgraph" name="classgraph"/>
+            <trusting group="io.github.classgraph" name="classgraph" version="4.8.87"/>
+         </trusted-key>
          <trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch" name="gradle-download-task"/>
          <trusted-key id="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd">
             <trusting group="org.sonatype.oss"/>
             <trusting group="org.codehaus"/>
          </trusted-key>
-         <trusted-key id="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb" group="commons-io" name="commons-io"/>
-         <trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193" group="org.jetbrains" name="annotations"/>
+         <trusted-key id="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb">
+            <trusting group="commons-io" name="commons-io"/>
+            <trusting group="commons-io" name="commons-io" version="2.7"/>
+         </trusted-key>
+         <trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193">
+            <trusting group="org.jetbrains" name="annotations"/>
+            <trusting group="org.jetbrains" name="annotations" version="13.0"/>
+         </trusted-key>
          <trusted-key id="2e92113263fc31c74ccbaab20e91c2de43b72bb1" group="org.ec4j.core"/>
-         <trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8" group="com.thoughtworks.qdox" name="qdox"/>
-         <trusted-key id="32d98ffd50617f6ed7e6abd236feecf06c2da10b" group="biz.aQute.bnd"/>
+         <trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8">
+            <trusting group="com.thoughtworks.qdox" name="qdox"/>
+            <trusting group="com.thoughtworks.qdox" name="qdox" version="1.12.1"/>
+         </trusted-key>
+         <trusted-key id="32d98ffd50617f6ed7e6abd236feecf06c2da10b">
+            <trusting group="biz.aQute.bnd"/>
+            <trusting group="biz.aQute.bnd" name="biz.aQute.bndlib" version="5.2.0"/>
+         </trusted-key>
          <trusted-key id="34d6ff19930adf43ac127792a50569c7ca7fa1f0" group="com.jcraft"/>
-         <trusted-key id="3690c240ce51b4670d30ad1c38ee757d69184620" group="org.tukaani" name="xz"/>
-         <trusted-key id="3909c28792327fad38100eaf04633a577c200941" group="org.vafer" name="jdependency"/>
-         <trusted-key id="3e07544e2175a6b3608c515a5fec689ca7e7b6bd" group="org.eclipse.jdt"/>
+         <trusted-key id="3690c240ce51b4670d30ad1c38ee757d69184620">
+            <trusting group="org.tukaani" name="xz"/>
+            <trusting group="org.tukaani" name="xz" version="1.6"/>
+         </trusted-key>
+         <trusted-key id="3909c28792327fad38100eaf04633a577c200941">
+            <trusting group="org.vafer" name="jdependency"/>
+            <trusting group="org.vafer" name="jdependency" version="2.1.1"/>
+         </trusted-key>
+         <trusted-key id="3e07544e2175a6b3608c515a5fec689ca7e7b6bd">
+            <trusting group="org.eclipse.jdt"/>
+            <trusting group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.22.0"/>
+         </trusted-key>
          <trusted-key id="44fbdbbc1a00fe414f1c1873586654072ead6677" group="org.sonatype.oss"/>
-         <trusted-key id="47063e8ba7a6450e4a52e7ae466caed6e0747d50" group="net.java.dev.jna" name="platform"/>
+         <trusted-key id="47063e8ba7a6450e4a52e7ae466caed6e0747d50">
+            <trusting group="net.java.dev.jna" name="platform"/>
+            <trusting group="net.java.dev.jna" name="platform" version="3.4.0"/>
+         </trusted-key>
          <trusted-key id="475f3b8e59e6e63aa78067482c7b12f2a511e325">
             <trusting group="org.slf4j"/>
             <trusting group="ch.qos.logback"/>
@@ -47,17 +83,36 @@
             <trusting group="de.regnis.q.sequence"/>
          </trusted-key>
          <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
-         <trusted-key id="517b94f8d0a46317a28d8ab30da8a5ec02d11ead" group="net.sf.jopt-simple" name="jopt-simple"/>
+         <trusted-key id="517b94f8d0a46317a28d8ab30da8a5ec02d11ead">
+            <trusting group="net.sf.jopt-simple" name="jopt-simple"/>
+            <trusting group="net.sf.jopt-simple" name="jopt-simple" version="4.6"/>
+         </trusted-key>
          <trusted-key id="53c935821aa6a755bd337db53595395eb3d8e1ba" group="org.apache.logging.log4j"/>
-         <trusted-key id="55e770230e69cc6de143fb5b62c82e50836eb3ee" group="com.github.gundy" name="semver4j"/>
-         <trusted-key id="5897253bea3046aeea95a067e93671c7272b7b3f" group="org.jdom" name="jdom2"/>
+         <trusted-key id="55e770230e69cc6de143fb5b62c82e50836eb3ee">
+            <trusting group="com.github.gundy" name="semver4j"/>
+            <trusting group="com.github.gundy" name="semver4j" version="0.16.4"/>
+         </trusted-key>
+         <trusted-key id="5897253bea3046aeea95a067e93671c7272b7b3f">
+            <trusting group="org.jdom" name="jdom2"/>
+            <trusting group="org.jdom" name="jdom2" version="2.0.6"/>
+         </trusted-key>
          <trusted-key id="5b7f3605a8ce471a9ca8db7ec84125c13bf6f2f2" group="^org[.]ajoberstar($|([.].*))" regex="true"/>
-         <trusted-key id="666a4692ce11b7b3f4eb7b3410066a9707090cf9" group="org.javassist" name="javassist"/>
+         <trusted-key id="5ce325996a35213326ae2c68912d2c0eccda55c0" group="com.google.errorprone"/>
+         <trusted-key id="666a4692ce11b7b3f4eb7b3410066a9707090cf9">
+            <trusting group="org.javassist" name="javassist"/>
+            <trusting group="org.javassist" name="javassist" version="3.26.0-GA"/>
+         </trusted-key>
          <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="com.google.guava"/>
          <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
          <trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
-         <trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs" name="jsr305"/>
-         <trusted-key id="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1" group="org.spockframework" name="spock-core"/>
+         <trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873">
+            <trusting group="com.google.code.findbugs" name="jsr305"/>
+            <trusting group="com.google.code.findbugs" name="jsr305" version="3.0.2"/>
+         </trusted-key>
+         <trusted-key id="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1">
+            <trusting group="org.spockframework" name="spock-core"/>
+            <trusting group="org.spockframework" name="spock-core" version="1.3-groovy-2.5"/>
+         </trusted-key>
          <trusted-key id="77993d3295698c46912e83984b2277c6358670ee" group="org.assertj"/>
          <trusted-key id="7c669810892cbd3148fa92995b05ccde140c2876" group="org.eclipse.jgit"/>
          <trusted-key id="7faa0f2206de228f0db01ad741321490758aad6f" group="org.codehaus.groovy"/>
@@ -69,31 +124,54 @@
             <trusting group="com.github.javaparser"/>
             <trusting group="de.sormuras"/>
          </trusted-key>
-         <trusted-key id="906e5e684729c006267ddd4b105de36038d8c6c5" group="org.codehaus.plexus" name="plexus-utils"/>
-         <trusted-key id="9857c388d7d1d9d031274cd0a5def5a76f94a471" group="com.github.spotbugs"/>
+         <trusted-key id="906e5e684729c006267ddd4b105de36038d8c6c5">
+            <trusting group="org.codehaus.plexus" name="plexus-utils"/>
+            <trusting group="org.codehaus.plexus" name="plexus-utils" version="3.0.24"/>
+         </trusted-key>
+         <trusted-key id="9857c388d7d1d9d031274cd0a5def5a76f94a471">
+            <trusting group="com.github.spotbugs"/>
+            <trusting group="com.github.spotbugs" name="spotbugs-annotations" version="4.0.2"/>
+         </trusted-key>
          <trusted-key id="9e3044071b758ebcb7e45673700e4f39bc05364b" group="org.eclipse.platform"/>
          <trusted-key id="a2570288e10932263e8326cbaa49c633b4734832">
             <trusting group="com.pinterest" name="ktlint"/>
             <trusting group="com.pinterest.ktlint"/>
+            <trusting group="^com[.]pinterest($|([.].*))" regex="true"/>
          </trusted-key>
+         <trusted-key id="a413f67d71beec23add0ce0acb43338e060cf9fa" group="org.jacoco"/>
          <trusted-key id="a5bd02b93e7a40482eb1d66a5f69ad087600b22c" group="org.ow2.asm"/>
          <trusted-key id="a778fde933a96dda827840d8e2b3d84202b812d9" group="org.assertj"/>
          <trusted-key id="a7892505cf1a58076453e52d7999befba1039e8b" group="net.bytebuddy"/>
-         <trusted-key id="a9789342f598ad5b1175ef357eb97d110dfadd60" group="com.googlecode.concurrent-trees" name="concurrent-trees"/>
+         <trusted-key id="a9789342f598ad5b1175ef357eb97d110dfadd60">
+            <trusting group="com.googlecode.concurrent-trees" name="concurrent-trees"/>
+            <trusting group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1"/>
+         </trusted-key>
          <trusted-key id="afcc4c7594d09e2182c60e0f7a01b0f236e5430f" group="com.google.code.gson"/>
          <trusted-key id="b2d1ac7be5a3eeb9773a49fe6eb9de4d7e01b1e1" group="org.antlr"/>
          <trusted-key id="b6e73d84ea4fcc47166087253faad2cd5ecbb314">
             <trusting group="org.apache.commons"/>
             <trusting group="commons-beanutils"/>
          </trusted-key>
-         <trusted-key id="b801e2f8ef035068ec1139cc29579f18fa8fd93b" group="com.google.j2objc" name="j2objc-annotations"/>
-         <trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2" group="org.reflections" name="reflections"/>
+         <trusted-key id="b801e2f8ef035068ec1139cc29579f18fa8fd93b">
+            <trusting group="com.google.j2objc" name="j2objc-annotations"/>
+            <trusting group="com.google.j2objc" name="j2objc-annotations" version="1.3"/>
+         </trusted-key>
+         <trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2">
+            <trusting group="org.reflections" name="reflections"/>
+            <trusting group="org.reflections" name="reflections" version="0.9.12"/>
+         </trusted-key>
          <trusted-key id="ba926f64ca647b6d853a38672e2010f8a7ff4a41" group="org.apache" name="apache" version="7"/>
          <trusted-key id="bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae" group="com.google.guava"/>
          <trusted-key id="c0822d185fbfd963c33acbfea318a06284d602d5" group="com.tngtech.archunit"/>
-         <trusted-key id="c70b844f002f21f6d2b9c87522e44ac0622b91c3" group="com.beust" name="jcommander"/>
+         <trusted-key id="c70b844f002f21f6d2b9c87522e44ac0622b91c3">
+            <trusting group="com.beust" name="jcommander"/>
+            <trusting group="com.beust" name="jcommander" version="1.78"/>
+         </trusted-key>
          <trusted-key id="cc4483cd6a3eb2939b948667a1b4460d8ba7b9af" group="org.mockito"/>
-         <trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0" group="commons-io" name="commons-io"/>
+         <trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0">
+            <trusting group="commons-io" name="commons-io"/>
+            <trusting group="commons-io" name="commons-io" version="2.6"/>
+         </trusted-key>
          <trusted-key id="ce8075a251547bee249bc151a2115ae15f6b8b72">
             <trusting group="^org[.]apache($|([.].*))" regex="true"/>
             <trusting group="org.apache.ant"/>
@@ -102,11 +180,21 @@
          <trusted-key id="d54a395b5cf3f86eb45f6e426b1b008864323b92" group="org.antlr"/>
          <trusted-key id="d6f1bc78607808ec8e9f69437a8860944fad5f62" group="org.apache.commons" name="commons-parent"/>
          <trusted-key id="d9aa7402ba75f78720d975211d185615d0a84648" group="net.sf.saxon" name="Saxon-HE"/>
-         <trusted-key id="dcba03381ef6c89096acd985ac5ec74981f9cda6" group="org.testng" name="testng"/>
+         <trusted-key id="dcba03381ef6c89096acd985ac5ec74981f9cda6">
+            <trusting group="org.testng" name="testng"/>
+            <trusting group="org.testng" name="testng" version="7.3.0"/>
+         </trusted-key>
          <trusted-key id="e2acb037933cdeaab7bf77d49a2c7a98e457c53d" group="io.spring.nohttp"/>
+         <trusted-key id="e77417ac194160a3fabd04969a259c7ee636c5ed" group="com.google.googlejavaformat"/>
          <trusted-key id="e85aed155021af8a6c6b7a4a7c7d8456294423ba" group="org.objenesis"/>
-         <trusted-key id="ea23db1360d9029481e7f2efecdfea3cb4493b94" group="jline" name="jline"/>
-         <trusted-key id="f254b35617dc255d9344bcfa873a8e86b4372146" group="org.apache" name="apache" version="13"/>
+         <trusted-key id="ea23db1360d9029481e7f2efecdfea3cb4493b94">
+            <trusting group="jline" name="jline"/>
+            <trusting group="jline" name="jline" version="2.14.6"/>
+         </trusted-key>
+         <trusted-key id="f254b35617dc255d9344bcfa873a8e86b4372146">
+            <trusting group="org.apache" name="apache" version="13"/>
+            <trusting group="org.codehaus.mojo"/>
+         </trusted-key>
          <trusted-key id="fa77dcfef2ee6eb2debedd2c012579464d01c06a" group="org.apache" name="apache"/>
          <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51">
             <trusting group="org.apiguardian"/>
@@ -447,6 +535,11 @@
             <sha256 value="6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.mojo" name="mojo-parent" version="50">
+         <artifact name="mojo-parent-50.pom">
+            <pgp value="720746177725a89207a7075bfd5dea07fcb690a8"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.plexus" name="plexus" version="4.0">
          <artifact name="plexus-4.0.pom">
             <pgp value="c345986f0fd384669c5919e6a5f094fd3961df05"/>
@@ -605,6 +698,11 @@
             <pgp value="373d292d931cead14a4dbfdf3d52c2966a51f8f4"/>
          </artifact>
       </component>
+      <component group="org.ow2" name="ow2" version="1.5">
+         <artifact name="ow2-1.5.pom">
+            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="org.slf4j" name="slf4j-parent" version="1.7.30">
          <artifact name="slf4j-parent-1.7.30.pom">
             <sha256 value="11647956e48a0c5bfb3ac33f6da7e83f341002b6857efd335a505b687be34b75" origin="Generated by Gradle"/>

From ba60a0f8b5cf5449bba39c19075257d6e8858e08 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Jan 2021 17:52:44 +0100
Subject: [PATCH 0151/1433] Revert "Add missing dependency verification
 metadata"

This reverts commit ab436ac0137cf2f42b0b3baffc3066d8f0dce3f8.
---
 gradle/verification-metadata.xml | 154 ++++++-------------------------
 1 file changed, 28 insertions(+), 126 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 547f0aab7588..f9f82ab54692 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -14,64 +14,28 @@
             <trusting group="commons-collections"/>
          </trusted-key>
          <trusted-key id="0cde80149711eb46dff17ae421a24b3f8b0f594a" group="org.apache" name="apache"/>
-         <trusted-key id="12d16069219c90212a974d119ae296fd02e9f65b">
-            <trusting group="org.apache.commons" name="commons-math3"/>
-            <trusting group="org.apache.commons" name="commons-math3" version="3.2"/>
-         </trusted-key>
-         <trusted-key id="160a7a9cf46221a56b06ad64461a804f2609fd89">
-            <trusting group="com.github.shyiko.klob"/>
-            <trusting group="com.github.shyiko.klob" name="klob" version="0.2.1"/>
-         </trusted-key>
+         <trusted-key id="12d16069219c90212a974d119ae296fd02e9f65b" group="org.apache.commons" name="commons-math3"/>
+         <trusted-key id="160a7a9cf46221a56b06ad64461a804f2609fd89" group="com.github.shyiko.klob"/>
          <trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638" group="org.checkerframework" name="checker-qual"/>
          <trusted-key id="1aa8cf92d409a73393d0b736bff2ee42c8282e76" group="org.apache.servicemix.bundles"/>
-         <trusted-key id="1abe38b92f812c1f7bf1d647d0d1b9a54efd603d">
-            <trusting group="com.univocity" name="univocity-parsers"/>
-            <trusting group="com.univocity" name="univocity-parsers" version="2.9.0"/>
-         </trusted-key>
-         <trusted-key id="1f47744c9b6e14f2049c2857f1f111af65925306">
-            <trusting group="io.github.classgraph" name="classgraph"/>
-            <trusting group="io.github.classgraph" name="classgraph" version="4.8.87"/>
-         </trusted-key>
+         <trusted-key id="1abe38b92f812c1f7bf1d647d0d1b9a54efd603d" group="com.univocity" name="univocity-parsers"/>
+         <trusted-key id="1f47744c9b6e14f2049c2857f1f111af65925306" group="io.github.classgraph" name="classgraph"/>
          <trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch" name="gradle-download-task"/>
          <trusted-key id="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd">
             <trusting group="org.sonatype.oss"/>
             <trusting group="org.codehaus"/>
          </trusted-key>
-         <trusted-key id="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb">
-            <trusting group="commons-io" name="commons-io"/>
-            <trusting group="commons-io" name="commons-io" version="2.7"/>
-         </trusted-key>
-         <trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193">
-            <trusting group="org.jetbrains" name="annotations"/>
-            <trusting group="org.jetbrains" name="annotations" version="13.0"/>
-         </trusted-key>
+         <trusted-key id="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb" group="commons-io" name="commons-io"/>
+         <trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193" group="org.jetbrains" name="annotations"/>
          <trusted-key id="2e92113263fc31c74ccbaab20e91c2de43b72bb1" group="org.ec4j.core"/>
-         <trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8">
-            <trusting group="com.thoughtworks.qdox" name="qdox"/>
-            <trusting group="com.thoughtworks.qdox" name="qdox" version="1.12.1"/>
-         </trusted-key>
-         <trusted-key id="32d98ffd50617f6ed7e6abd236feecf06c2da10b">
-            <trusting group="biz.aQute.bnd"/>
-            <trusting group="biz.aQute.bnd" name="biz.aQute.bndlib" version="5.2.0"/>
-         </trusted-key>
+         <trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8" group="com.thoughtworks.qdox" name="qdox"/>
+         <trusted-key id="32d98ffd50617f6ed7e6abd236feecf06c2da10b" group="biz.aQute.bnd"/>
          <trusted-key id="34d6ff19930adf43ac127792a50569c7ca7fa1f0" group="com.jcraft"/>
-         <trusted-key id="3690c240ce51b4670d30ad1c38ee757d69184620">
-            <trusting group="org.tukaani" name="xz"/>
-            <trusting group="org.tukaani" name="xz" version="1.6"/>
-         </trusted-key>
-         <trusted-key id="3909c28792327fad38100eaf04633a577c200941">
-            <trusting group="org.vafer" name="jdependency"/>
-            <trusting group="org.vafer" name="jdependency" version="2.1.1"/>
-         </trusted-key>
-         <trusted-key id="3e07544e2175a6b3608c515a5fec689ca7e7b6bd">
-            <trusting group="org.eclipse.jdt"/>
-            <trusting group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.22.0"/>
-         </trusted-key>
+         <trusted-key id="3690c240ce51b4670d30ad1c38ee757d69184620" group="org.tukaani" name="xz"/>
+         <trusted-key id="3909c28792327fad38100eaf04633a577c200941" group="org.vafer" name="jdependency"/>
+         <trusted-key id="3e07544e2175a6b3608c515a5fec689ca7e7b6bd" group="org.eclipse.jdt"/>
          <trusted-key id="44fbdbbc1a00fe414f1c1873586654072ead6677" group="org.sonatype.oss"/>
-         <trusted-key id="47063e8ba7a6450e4a52e7ae466caed6e0747d50">
-            <trusting group="net.java.dev.jna" name="platform"/>
-            <trusting group="net.java.dev.jna" name="platform" version="3.4.0"/>
-         </trusted-key>
+         <trusted-key id="47063e8ba7a6450e4a52e7ae466caed6e0747d50" group="net.java.dev.jna" name="platform"/>
          <trusted-key id="475f3b8e59e6e63aa78067482c7b12f2a511e325">
             <trusting group="org.slf4j"/>
             <trusting group="ch.qos.logback"/>
@@ -83,36 +47,17 @@
             <trusting group="de.regnis.q.sequence"/>
          </trusted-key>
          <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
-         <trusted-key id="517b94f8d0a46317a28d8ab30da8a5ec02d11ead">
-            <trusting group="net.sf.jopt-simple" name="jopt-simple"/>
-            <trusting group="net.sf.jopt-simple" name="jopt-simple" version="4.6"/>
-         </trusted-key>
+         <trusted-key id="517b94f8d0a46317a28d8ab30da8a5ec02d11ead" group="net.sf.jopt-simple" name="jopt-simple"/>
          <trusted-key id="53c935821aa6a755bd337db53595395eb3d8e1ba" group="org.apache.logging.log4j"/>
-         <trusted-key id="55e770230e69cc6de143fb5b62c82e50836eb3ee">
-            <trusting group="com.github.gundy" name="semver4j"/>
-            <trusting group="com.github.gundy" name="semver4j" version="0.16.4"/>
-         </trusted-key>
-         <trusted-key id="5897253bea3046aeea95a067e93671c7272b7b3f">
-            <trusting group="org.jdom" name="jdom2"/>
-            <trusting group="org.jdom" name="jdom2" version="2.0.6"/>
-         </trusted-key>
+         <trusted-key id="55e770230e69cc6de143fb5b62c82e50836eb3ee" group="com.github.gundy" name="semver4j"/>
+         <trusted-key id="5897253bea3046aeea95a067e93671c7272b7b3f" group="org.jdom" name="jdom2"/>
          <trusted-key id="5b7f3605a8ce471a9ca8db7ec84125c13bf6f2f2" group="^org[.]ajoberstar($|([.].*))" regex="true"/>
-         <trusted-key id="5ce325996a35213326ae2c68912d2c0eccda55c0" group="com.google.errorprone"/>
-         <trusted-key id="666a4692ce11b7b3f4eb7b3410066a9707090cf9">
-            <trusting group="org.javassist" name="javassist"/>
-            <trusting group="org.javassist" name="javassist" version="3.26.0-GA"/>
-         </trusted-key>
+         <trusted-key id="666a4692ce11b7b3f4eb7b3410066a9707090cf9" group="org.javassist" name="javassist"/>
          <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="com.google.guava"/>
          <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
          <trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
-         <trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873">
-            <trusting group="com.google.code.findbugs" name="jsr305"/>
-            <trusting group="com.google.code.findbugs" name="jsr305" version="3.0.2"/>
-         </trusted-key>
-         <trusted-key id="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1">
-            <trusting group="org.spockframework" name="spock-core"/>
-            <trusting group="org.spockframework" name="spock-core" version="1.3-groovy-2.5"/>
-         </trusted-key>
+         <trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs" name="jsr305"/>
+         <trusted-key id="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1" group="org.spockframework" name="spock-core"/>
          <trusted-key id="77993d3295698c46912e83984b2277c6358670ee" group="org.assertj"/>
          <trusted-key id="7c669810892cbd3148fa92995b05ccde140c2876" group="org.eclipse.jgit"/>
          <trusted-key id="7faa0f2206de228f0db01ad741321490758aad6f" group="org.codehaus.groovy"/>
@@ -124,54 +69,31 @@
             <trusting group="com.github.javaparser"/>
             <trusting group="de.sormuras"/>
          </trusted-key>
-         <trusted-key id="906e5e684729c006267ddd4b105de36038d8c6c5">
-            <trusting group="org.codehaus.plexus" name="plexus-utils"/>
-            <trusting group="org.codehaus.plexus" name="plexus-utils" version="3.0.24"/>
-         </trusted-key>
-         <trusted-key id="9857c388d7d1d9d031274cd0a5def5a76f94a471">
-            <trusting group="com.github.spotbugs"/>
-            <trusting group="com.github.spotbugs" name="spotbugs-annotations" version="4.0.2"/>
-         </trusted-key>
+         <trusted-key id="906e5e684729c006267ddd4b105de36038d8c6c5" group="org.codehaus.plexus" name="plexus-utils"/>
+         <trusted-key id="9857c388d7d1d9d031274cd0a5def5a76f94a471" group="com.github.spotbugs"/>
          <trusted-key id="9e3044071b758ebcb7e45673700e4f39bc05364b" group="org.eclipse.platform"/>
          <trusted-key id="a2570288e10932263e8326cbaa49c633b4734832">
             <trusting group="com.pinterest" name="ktlint"/>
             <trusting group="com.pinterest.ktlint"/>
-            <trusting group="^com[.]pinterest($|([.].*))" regex="true"/>
          </trusted-key>
-         <trusted-key id="a413f67d71beec23add0ce0acb43338e060cf9fa" group="org.jacoco"/>
          <trusted-key id="a5bd02b93e7a40482eb1d66a5f69ad087600b22c" group="org.ow2.asm"/>
          <trusted-key id="a778fde933a96dda827840d8e2b3d84202b812d9" group="org.assertj"/>
          <trusted-key id="a7892505cf1a58076453e52d7999befba1039e8b" group="net.bytebuddy"/>
-         <trusted-key id="a9789342f598ad5b1175ef357eb97d110dfadd60">
-            <trusting group="com.googlecode.concurrent-trees" name="concurrent-trees"/>
-            <trusting group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1"/>
-         </trusted-key>
+         <trusted-key id="a9789342f598ad5b1175ef357eb97d110dfadd60" group="com.googlecode.concurrent-trees" name="concurrent-trees"/>
          <trusted-key id="afcc4c7594d09e2182c60e0f7a01b0f236e5430f" group="com.google.code.gson"/>
          <trusted-key id="b2d1ac7be5a3eeb9773a49fe6eb9de4d7e01b1e1" group="org.antlr"/>
          <trusted-key id="b6e73d84ea4fcc47166087253faad2cd5ecbb314">
             <trusting group="org.apache.commons"/>
             <trusting group="commons-beanutils"/>
          </trusted-key>
-         <trusted-key id="b801e2f8ef035068ec1139cc29579f18fa8fd93b">
-            <trusting group="com.google.j2objc" name="j2objc-annotations"/>
-            <trusting group="com.google.j2objc" name="j2objc-annotations" version="1.3"/>
-         </trusted-key>
-         <trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2">
-            <trusting group="org.reflections" name="reflections"/>
-            <trusting group="org.reflections" name="reflections" version="0.9.12"/>
-         </trusted-key>
+         <trusted-key id="b801e2f8ef035068ec1139cc29579f18fa8fd93b" group="com.google.j2objc" name="j2objc-annotations"/>
+         <trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2" group="org.reflections" name="reflections"/>
          <trusted-key id="ba926f64ca647b6d853a38672e2010f8a7ff4a41" group="org.apache" name="apache" version="7"/>
          <trusted-key id="bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae" group="com.google.guava"/>
          <trusted-key id="c0822d185fbfd963c33acbfea318a06284d602d5" group="com.tngtech.archunit"/>
-         <trusted-key id="c70b844f002f21f6d2b9c87522e44ac0622b91c3">
-            <trusting group="com.beust" name="jcommander"/>
-            <trusting group="com.beust" name="jcommander" version="1.78"/>
-         </trusted-key>
+         <trusted-key id="c70b844f002f21f6d2b9c87522e44ac0622b91c3" group="com.beust" name="jcommander"/>
          <trusted-key id="cc4483cd6a3eb2939b948667a1b4460d8ba7b9af" group="org.mockito"/>
-         <trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0">
-            <trusting group="commons-io" name="commons-io"/>
-            <trusting group="commons-io" name="commons-io" version="2.6"/>
-         </trusted-key>
+         <trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0" group="commons-io" name="commons-io"/>
          <trusted-key id="ce8075a251547bee249bc151a2115ae15f6b8b72">
             <trusting group="^org[.]apache($|([.].*))" regex="true"/>
             <trusting group="org.apache.ant"/>
@@ -180,21 +102,11 @@
          <trusted-key id="d54a395b5cf3f86eb45f6e426b1b008864323b92" group="org.antlr"/>
          <trusted-key id="d6f1bc78607808ec8e9f69437a8860944fad5f62" group="org.apache.commons" name="commons-parent"/>
          <trusted-key id="d9aa7402ba75f78720d975211d185615d0a84648" group="net.sf.saxon" name="Saxon-HE"/>
-         <trusted-key id="dcba03381ef6c89096acd985ac5ec74981f9cda6">
-            <trusting group="org.testng" name="testng"/>
-            <trusting group="org.testng" name="testng" version="7.3.0"/>
-         </trusted-key>
+         <trusted-key id="dcba03381ef6c89096acd985ac5ec74981f9cda6" group="org.testng" name="testng"/>
          <trusted-key id="e2acb037933cdeaab7bf77d49a2c7a98e457c53d" group="io.spring.nohttp"/>
-         <trusted-key id="e77417ac194160a3fabd04969a259c7ee636c5ed" group="com.google.googlejavaformat"/>
          <trusted-key id="e85aed155021af8a6c6b7a4a7c7d8456294423ba" group="org.objenesis"/>
-         <trusted-key id="ea23db1360d9029481e7f2efecdfea3cb4493b94">
-            <trusting group="jline" name="jline"/>
-            <trusting group="jline" name="jline" version="2.14.6"/>
-         </trusted-key>
-         <trusted-key id="f254b35617dc255d9344bcfa873a8e86b4372146">
-            <trusting group="org.apache" name="apache" version="13"/>
-            <trusting group="org.codehaus.mojo"/>
-         </trusted-key>
+         <trusted-key id="ea23db1360d9029481e7f2efecdfea3cb4493b94" group="jline" name="jline"/>
+         <trusted-key id="f254b35617dc255d9344bcfa873a8e86b4372146" group="org.apache" name="apache" version="13"/>
          <trusted-key id="fa77dcfef2ee6eb2debedd2c012579464d01c06a" group="org.apache" name="apache"/>
          <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51">
             <trusting group="org.apiguardian"/>
@@ -535,11 +447,6 @@
             <sha256 value="6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.codehaus.mojo" name="mojo-parent" version="50">
-         <artifact name="mojo-parent-50.pom">
-            <pgp value="720746177725a89207a7075bfd5dea07fcb690a8"/>
-         </artifact>
-      </component>
       <component group="org.codehaus.plexus" name="plexus" version="4.0">
          <artifact name="plexus-4.0.pom">
             <pgp value="c345986f0fd384669c5919e6a5f094fd3961df05"/>
@@ -698,11 +605,6 @@
             <pgp value="373d292d931cead14a4dbfdf3d52c2966a51f8f4"/>
          </artifact>
       </component>
-      <component group="org.ow2" name="ow2" version="1.5">
-         <artifact name="ow2-1.5.pom">
-            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
       <component group="org.slf4j" name="slf4j-parent" version="1.7.30">
          <artifact name="slf4j-parent-1.7.30.pom">
             <sha256 value="11647956e48a0c5bfb3ac33f6da7e83f341002b6857efd335a505b687be34b75" origin="Generated by Gradle"/>

From fe7d2ec6654a2128226d8feea720f1738d988887 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Jan 2021 17:52:50 +0100
Subject: [PATCH 0152/1433] Revert "Enable dependency verification"

This reverts commit 5ad0de43d8195fbb935d4483d45e0902f3a6f5da.
---
 buildSrc/build.gradle.kts                     |   2 +-
 .../kotlin/testing-conventions.gradle.kts     |   5 +-
 gradle.properties                             |   2 -
 gradle/verification-metadata.xml              | 665 ------------------
 4 files changed, 5 insertions(+), 669 deletions(-)
 delete mode 100644 gradle/verification-metadata.xml

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 478b0435d680..d97ba94cbd15 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 }
 
 repositories {
-	gradlePluginPortal()
 	mavenCentral()
+	gradlePluginPortal()
 }
 
 dependencies {
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 22c9b30c34da..137d0d9e67d6 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -37,7 +37,10 @@ dependencies {
 	}
 
 	if (project.name != "junit-jupiter-engine") {
-		"testImplementation"(project(":junit-jupiter"))
+		"testImplementation"(project(":junit-jupiter-api"))
+		"testImplementation"(project(":junit-jupiter-params"))
+
+		"testRuntimeOnly"(project(":junit-jupiter-engine"))
 	}
 	"testImplementation"(testFixtures(project(":junit-jupiter-api")))
 
diff --git a/gradle.properties b/gradle.properties
index 32d2056a63aa..87227a7c26c8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,8 @@ defaultBuiltBy  = JUnit Team
 
 # We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
-
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.dependency.verification.console=verbose
 
 # Dependencies
 apiguardian.version=1.1.1
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
deleted file mode 100644
index f9f82ab54692..000000000000
--- a/gradle/verification-metadata.xml
+++ /dev/null
@@ -1,665 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.0.xsd">
-   <configuration>
-      <verify-metadata>true</verify-metadata>
-      <verify-signatures>true</verify-signatures>
-      <trusted-keys>
-         <trusted-key id="015479e1055341431b4545ab72475fd306b9cab7" group="com.googlecode.javaewah" name="JavaEWAH"/>
-         <trusted-key id="019082bc00e0324e2aef4cf00d3b328562a119a7" group="org.openjdk.jmh"/>
-         <trusted-key id="050a37a2e0577f4baa095b52602ec18d20c4661c" group="com.thoughtworks.xstream"/>
-         <trusted-key id="06d34ed6ff73de368a772a781063fe98bcecb758" group="com.puppycrawl.tools" name="checkstyle"/>
-         <trusted-key id="08f0aab4d0c1a4bdde340765b341ddb020fcb6ab" group="org.bouncycastle"/>
-         <trusted-key id="0cc641c3a62453ab390066c4a41f13c999945293">
-            <trusting group="commons-logging"/>
-            <trusting group="commons-collections"/>
-         </trusted-key>
-         <trusted-key id="0cde80149711eb46dff17ae421a24b3f8b0f594a" group="org.apache" name="apache"/>
-         <trusted-key id="12d16069219c90212a974d119ae296fd02e9f65b" group="org.apache.commons" name="commons-math3"/>
-         <trusted-key id="160a7a9cf46221a56b06ad64461a804f2609fd89" group="com.github.shyiko.klob"/>
-         <trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638" group="org.checkerframework" name="checker-qual"/>
-         <trusted-key id="1aa8cf92d409a73393d0b736bff2ee42c8282e76" group="org.apache.servicemix.bundles"/>
-         <trusted-key id="1abe38b92f812c1f7bf1d647d0d1b9a54efd603d" group="com.univocity" name="univocity-parsers"/>
-         <trusted-key id="1f47744c9b6e14f2049c2857f1f111af65925306" group="io.github.classgraph" name="classgraph"/>
-         <trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch" name="gradle-download-task"/>
-         <trusted-key id="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd">
-            <trusting group="org.sonatype.oss"/>
-            <trusting group="org.codehaus"/>
-         </trusted-key>
-         <trusted-key id="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb" group="commons-io" name="commons-io"/>
-         <trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193" group="org.jetbrains" name="annotations"/>
-         <trusted-key id="2e92113263fc31c74ccbaab20e91c2de43b72bb1" group="org.ec4j.core"/>
-         <trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8" group="com.thoughtworks.qdox" name="qdox"/>
-         <trusted-key id="32d98ffd50617f6ed7e6abd236feecf06c2da10b" group="biz.aQute.bnd"/>
-         <trusted-key id="34d6ff19930adf43ac127792a50569c7ca7fa1f0" group="com.jcraft"/>
-         <trusted-key id="3690c240ce51b4670d30ad1c38ee757d69184620" group="org.tukaani" name="xz"/>
-         <trusted-key id="3909c28792327fad38100eaf04633a577c200941" group="org.vafer" name="jdependency"/>
-         <trusted-key id="3e07544e2175a6b3608c515a5fec689ca7e7b6bd" group="org.eclipse.jdt"/>
-         <trusted-key id="44fbdbbc1a00fe414f1c1873586654072ead6677" group="org.sonatype.oss"/>
-         <trusted-key id="47063e8ba7a6450e4a52e7ae466caed6e0747d50" group="net.java.dev.jna" name="platform"/>
-         <trusted-key id="475f3b8e59e6e63aa78067482c7b12f2a511e325">
-            <trusting group="org.slf4j"/>
-            <trusting group="ch.qos.logback"/>
-         </trusted-key>
-         <trusted-key id="4a720fe790b07a68744e371675bf031b7c94e183" group="net.java.dev.jna"/>
-         <trusted-key id="4d90040f09023a4a74df2f54abaae54f37e6f8e1">
-            <trusting group="^org[.]tmatesoft($|([.].*))" regex="true"/>
-            <trusting group="com.trilead"/>
-            <trusting group="de.regnis.q.sequence"/>
-         </trusted-key>
-         <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
-         <trusted-key id="517b94f8d0a46317a28d8ab30da8a5ec02d11ead" group="net.sf.jopt-simple" name="jopt-simple"/>
-         <trusted-key id="53c935821aa6a755bd337db53595395eb3d8e1ba" group="org.apache.logging.log4j"/>
-         <trusted-key id="55e770230e69cc6de143fb5b62c82e50836eb3ee" group="com.github.gundy" name="semver4j"/>
-         <trusted-key id="5897253bea3046aeea95a067e93671c7272b7b3f" group="org.jdom" name="jdom2"/>
-         <trusted-key id="5b7f3605a8ce471a9ca8db7ec84125c13bf6f2f2" group="^org[.]ajoberstar($|([.].*))" regex="true"/>
-         <trusted-key id="666a4692ce11b7b3f4eb7b3410066a9707090cf9" group="org.javassist" name="javassist"/>
-         <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="com.google.guava"/>
-         <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
-         <trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
-         <trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs" name="jsr305"/>
-         <trusted-key id="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1" group="org.spockframework" name="spock-core"/>
-         <trusted-key id="77993d3295698c46912e83984b2277c6358670ee" group="org.assertj"/>
-         <trusted-key id="7c669810892cbd3148fa92995b05ccde140c2876" group="org.eclipse.jgit"/>
-         <trusted-key id="7faa0f2206de228f0db01ad741321490758aad6f" group="org.codehaus.groovy"/>
-         <trusted-key id="808d78b17a5a2d7c3668e31fbffc9b54721244ad" group="org.apache.commons" name="commons-parent"/>
-         <trusted-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61">
-            <trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
-            <trusting group="^com[.]diffplug($|([.].*))" regex="true"/>
-            <trusting group="info.picocli"/>
-            <trusting group="com.github.javaparser"/>
-            <trusting group="de.sormuras"/>
-         </trusted-key>
-         <trusted-key id="906e5e684729c006267ddd4b105de36038d8c6c5" group="org.codehaus.plexus" name="plexus-utils"/>
-         <trusted-key id="9857c388d7d1d9d031274cd0a5def5a76f94a471" group="com.github.spotbugs"/>
-         <trusted-key id="9e3044071b758ebcb7e45673700e4f39bc05364b" group="org.eclipse.platform"/>
-         <trusted-key id="a2570288e10932263e8326cbaa49c633b4734832">
-            <trusting group="com.pinterest" name="ktlint"/>
-            <trusting group="com.pinterest.ktlint"/>
-         </trusted-key>
-         <trusted-key id="a5bd02b93e7a40482eb1d66a5f69ad087600b22c" group="org.ow2.asm"/>
-         <trusted-key id="a778fde933a96dda827840d8e2b3d84202b812d9" group="org.assertj"/>
-         <trusted-key id="a7892505cf1a58076453e52d7999befba1039e8b" group="net.bytebuddy"/>
-         <trusted-key id="a9789342f598ad5b1175ef357eb97d110dfadd60" group="com.googlecode.concurrent-trees" name="concurrent-trees"/>
-         <trusted-key id="afcc4c7594d09e2182c60e0f7a01b0f236e5430f" group="com.google.code.gson"/>
-         <trusted-key id="b2d1ac7be5a3eeb9773a49fe6eb9de4d7e01b1e1" group="org.antlr"/>
-         <trusted-key id="b6e73d84ea4fcc47166087253faad2cd5ecbb314">
-            <trusting group="org.apache.commons"/>
-            <trusting group="commons-beanutils"/>
-         </trusted-key>
-         <trusted-key id="b801e2f8ef035068ec1139cc29579f18fa8fd93b" group="com.google.j2objc" name="j2objc-annotations"/>
-         <trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2" group="org.reflections" name="reflections"/>
-         <trusted-key id="ba926f64ca647b6d853a38672e2010f8a7ff4a41" group="org.apache" name="apache" version="7"/>
-         <trusted-key id="bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae" group="com.google.guava"/>
-         <trusted-key id="c0822d185fbfd963c33acbfea318a06284d602d5" group="com.tngtech.archunit"/>
-         <trusted-key id="c70b844f002f21f6d2b9c87522e44ac0622b91c3" group="com.beust" name="jcommander"/>
-         <trusted-key id="cc4483cd6a3eb2939b948667a1b4460d8ba7b9af" group="org.mockito"/>
-         <trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0" group="commons-io" name="commons-io"/>
-         <trusted-key id="ce8075a251547bee249bc151a2115ae15f6b8b72">
-            <trusting group="^org[.]apache($|([.].*))" regex="true"/>
-            <trusting group="org.apache.ant"/>
-         </trusted-key>
-         <trusted-key id="d4c89ea4aaf455fd88b22087efe8086f9e93774e" group="junit" name="junit" version="4.12"/>
-         <trusted-key id="d54a395b5cf3f86eb45f6e426b1b008864323b92" group="org.antlr"/>
-         <trusted-key id="d6f1bc78607808ec8e9f69437a8860944fad5f62" group="org.apache.commons" name="commons-parent"/>
-         <trusted-key id="d9aa7402ba75f78720d975211d185615d0a84648" group="net.sf.saxon" name="Saxon-HE"/>
-         <trusted-key id="dcba03381ef6c89096acd985ac5ec74981f9cda6" group="org.testng" name="testng"/>
-         <trusted-key id="e2acb037933cdeaab7bf77d49a2c7a98e457c53d" group="io.spring.nohttp"/>
-         <trusted-key id="e85aed155021af8a6c6b7a4a7c7d8456294423ba" group="org.objenesis"/>
-         <trusted-key id="ea23db1360d9029481e7f2efecdfea3cb4493b94" group="jline" name="jline"/>
-         <trusted-key id="f254b35617dc255d9344bcfa873a8e86b4372146" group="org.apache" name="apache" version="13"/>
-         <trusted-key id="fa77dcfef2ee6eb2debedd2c012579464d01c06a" group="org.apache" name="apache"/>
-         <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51">
-            <trusting group="org.apiguardian"/>
-            <trusting group="org.opentest4j"/>
-            <trusting group="junit"/>
-            <trusting group="org.junit"/>
-         </trusted-key>
-      </trusted-keys>
-   </configuration>
-   <components>
-      <component group="antlr" name="antlr" version="2.7.7">
-         <artifact name="antlr-2.7.7.jar">
-            <sha256 value="88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="antlr-2.7.7.pom">
-            <sha256 value="100f793ba27f8b4e4204edb46171ebf36e54e0f94cfc02527fea07a0bb1fceb7" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="ch.qos.logback" name="logback-classic" version="1.2.3">
-         <artifact name="logback-classic-1.2.3.pom">
-            <sha256 value="a051eb1a2548b93c99abca8eb71d5c75d2ff06976682960348124bc4901a5315" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="ch.qos.logback" name="logback-core" version="1.2.3">
-         <artifact name="logback-core-1.2.3.pom">
-            <sha256 value="df4d7181ec51655baaaab067971180d7681643ddd274139f0c3078dba14e97e0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="ch.qos.logback" name="logback-parent" version="1.2.3">
-         <artifact name="logback-parent-1.2.3.pom">
-            <sha256 value="79cd021dafc7b0255d3cdd3fd70cbaa638df73995749a348ee82c45635eab26a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="5.6.1">
-         <artifact name="com.diffplug.spotless.gradle.plugin-5.6.1.pom">
-            <sha256 value="3ce2939205ddfc1511ff1b6e61efb8f23dd8e424fdb92d582fda17a58e56fa5f" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="5.6.1">
-         <artifact name="spotless-plugin-gradle-5.6.1.pom">
-            <ignored-keys>
-               <ignored-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="205eb20eb194f17d3e0773dced79af4036eb6a550a6236abfde2d222e014c585" origin="Generated by Gradle because PGP signature verification failed!"/>
-         </artifact>
-      </component>
-      <component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.29.0">
-         <artifact name="gradle-versions-plugin-0.29.0.jar">
-            <sha256 value="27293128f05288dbc3f4f0a3e7057ee18014694994ae72a0291523d43e9d3a75" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="gradle-versions-plugin-0.29.0.pom">
-            <sha256 value="437f247aeada05610fd449ca0439fb71f5c263bfb6af7b64ba74854671251112" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="com.github.ben-manes.versions" name="com.github.ben-manes.versions.gradle.plugin" version="0.29.0">
-         <artifact name="com.github.ben-manes.versions.gradle.plugin-0.29.0.pom">
-            <sha256 value="47472517eac45ba333ec78979ef887bb0b70fd5ff49f88dcc2fca7d315aedbec" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="com.github.jengelman.gradle.plugins" name="shadow" version="6.1.0">
-         <artifact name="shadow-6.1.0.jar">
-            <sha256 value="b66cb33a1d204ffaa1ba67393bdddbe9ff517f24f4438d11c341423868759aa3" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="shadow-6.1.0.pom">
-            <sha256 value="d40c29bce31762b6c8539a87d2515324f44db9d7d579a5aa7016a15ce164abb8" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
-         <artifact name="error_prone_annotations-2.3.4.pom">
-            <sha256 value="1326738a4b4f7ccacf607b866a11fb85193ef60f6a59461187ce7265f9be5bed" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.google.errorprone" name="error_prone_parent" version="2.3.4">
-         <artifact name="error_prone_parent-2.3.4.pom">
-            <sha256 value="40495b437a60d2398f0fdfc054b89d9c394a82347a274a0721c2e950a4302186" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradle" name="gradle-enterprise-gradle-plugin" version="3.5">
-         <artifact name="gradle-enterprise-gradle-plugin-3.5.jar">
-            <pgp value="314fe82e5a4c5377bca2edec5208812e1e4a6db0"/>
-         </artifact>
-         <artifact name="gradle-enterprise-gradle-plugin-3.5.pom">
-            <sha256 value="09653feae7365110fbc542926e56f5046bc63ac489a895366bdf7e5bb2c88848" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="com.gradle.enterprise" name="com.gradle.enterprise.gradle.plugin" version="3.5">
-         <artifact name="com.gradle.enterprise.gradle.plugin-3.5.pom">
-            <sha256 value="c8d553ac1ba70d8117da6e8536aece57c4cfdda59c8ffb04fee4923af07c35e0" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="com.jcraft" name="jsch.agentproxy" version="0.0.7">
-         <artifact name="jsch.agentproxy-0.0.7.pom">
-            <sha256 value="4a2170c4ec7de446d643acaec05febb8bc52c0cd0f5fead9f486f7551192d11d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="commons-beanutils" name="commons-beanutils" version="1.9.4">
-         <artifact name="commons-beanutils-1.9.4.pom">
-            <sha256 value="c35cca7b61d4678d9578cbc0b901b8717b539abf9254441da78b8fe60de064d0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="commons-collections" name="commons-collections" version="3.2.2">
-         <artifact name="commons-collections-3.2.2.pom">
-            <sha256 value="d5d81fcc288c0d8c711c302007cada4aa9a226ed1a112d4baa64cb1d6322170b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="commons-io" name="commons-io" version="2.5">
-         <artifact name="commons-io-2.5.pom">
-            <pgp value="6bdaca2c0493cca133b372d09c4f7e9d98b1cc53"/>
-         </artifact>
-      </component>
-      <component group="de.marcphilipp.gradle" name="nexus-publish-plugin" version="0.4.0">
-         <artifact name="nexus-publish-plugin-0.4.0.jar">
-            <sha256 value="b5fed9f29022119b6d5dd87b3073e19991bec6196117e306334608927cd1f620" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="nexus-publish-plugin-0.4.0.pom">
-            <sha256 value="dccd2171f5644d418b2504a317c247b99efde4656b6a483d1a59130501feb08d" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="de.undercouch" name="gradle-download-task" version="4.0.2">
-         <artifact name="gradle-download-task-4.0.2.jar">
-            <pgp value="1fa37fbe4453c1073e7ef61d6449005f96bc97a3"/>
-         </artifact>
-         <artifact name="gradle-download-task-4.0.2.pom">
-            <ignored-keys>
-               <ignored-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="62f29168dc2ffb580c44aa6021f655051a9cb0a48dfd47bc7e4e8ca6f963adb0" origin="Generated by Gradle because PGP signature verification failed!"/>
-         </artifact>
-      </component>
-      <component group="gradle.plugin.net.nemerosa" name="versioning" version="2.14.0">
-         <artifact name="versioning-2.14.0.jar">
-            <sha256 value="d7bbaf9640d792c71cfd7471225315ee94a2179c944956c9b87b449c6957f6b0" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="versioning-2.14.0.pom">
-            <sha256 value="6ab012b036e34506a138e2c692c987528c1f4db07b9b929f89f079ae1237d01b" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="io.spring.nohttp" name="io.spring.nohttp.gradle.plugin" version="0.0.5.RELEASE">
-         <artifact name="io.spring.nohttp.gradle.plugin-0.0.5.RELEASE.pom">
-            <sha256 value="c0a501f1bab3e21b8742ff8e60593174b3f517c346f3228a7d98d8bc558c8d56" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="io.spring.nohttp" name="nohttp" version="0.0.5.RELEASE">
-         <artifact name="nohttp-0.0.5.RELEASE.pom">
-            <sha256 value="b00254c9f704f9ab9c3dd7afb5bfd52ee8b0371862b0b0e58482930a2de396c3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.spring.nohttp" name="nohttp-checkstyle" version="0.0.5.RELEASE">
-         <artifact name="nohttp-checkstyle-0.0.5.RELEASE.pom">
-            <sha256 value="50706f3706a5af9db837a565a0abc58a6190476807afc22907fe3771a301c965" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.spring.nohttp" name="nohttp-gradle" version="0.0.5.RELEASE">
-         <artifact name="nohttp-gradle-0.0.5.RELEASE.pom">
-            <ignored-keys>
-               <ignored-key id="e2acb037933cdeaab7bf77d49a2c7a98e457c53d" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="94c5fb5dad9759fdc3ef57059b0624ea7ca5d2d143d3e1e24bf4d65400548ead" origin="Generated by Gradle because PGP signature verification failed!"/>
-         </artifact>
-      </component>
-      <component group="me.champeau.gradle" name="jmh-gradle-plugin" version="0.5.0">
-         <artifact name="jmh-gradle-plugin-0.5.0.jar">
-            <sha256 value="526a8ce68163ae470da79603ab22108ffe78553c8446c4b14caf5815901178ea" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="jmh-gradle-plugin-0.5.0.pom">
-            <sha256 value="ddc58e2cc7a1d0f49a26a1392c93ed497ba2d62f94e3bb83e1c611ba6aa7984b" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="me.champeau.gradle.jmh" name="me.champeau.gradle.jmh.gradle.plugin" version="0.5.0">
-         <artifact name="me.champeau.gradle.jmh.gradle.plugin-0.5.0.pom">
-            <sha256 value="532f58f8226dbb210cf419cf94845de2bd05d648b4585db698f9d56ed73443c8" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="net.bytebuddy" name="byte-buddy-parent" version="1.10.13">
-         <artifact name="byte-buddy-parent-1.10.13.pom">
-            <sha256 value="40c2ad5d4368794979183a504dc78211d65389d07fbcb7336d10a7914ef564da" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="net.jcip" name="jcip-annotations" version="1.0">
-         <artifact name="jcip-annotations-1.0.jar">
-            <sha256 value="be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="jcip-annotations-1.0.pom">
-            <sha256 value="5c19e6848cc550a95664fb082304bc5f9fcf7b672faf03af1635f0e93c268177" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="net.nemerosa.versioning" name="net.nemerosa.versioning.gradle.plugin" version="2.14.0">
-         <artifact name="net.nemerosa.versioning.gradle.plugin-2.14.0.pom">
-            <sha256 value="df57b1941998824daead1c6dea1f4c545a08ea00769da2d42f611e4bc3b6708b" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="net.sf.jopt-simple" name="jopt-simple" version="4.6">
-         <artifact name="jopt-simple-4.6.pom">
-            <sha256 value="692744a19473011539ebc1370a264b8af1c056e0ae21f5372aa9dd7d4b4e5a2b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.ajoberstar" name="gradle-git-publish" version="2.1.3">
-         <artifact name="gradle-git-publish-2.1.3.pom">
-            <ignored-keys>
-               <ignored-key id="5b7f3605a8ce471a9ca8db7ec84125c13bf6f2f2" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="151e1cb598cc9c34d70d50862075dbe5cfcf891b1faa77168dc3c4262fd3f69e" origin="Generated by Gradle because PGP signature verification failed!"/>
-         </artifact>
-      </component>
-      <component group="org.ajoberstar.git-publish" name="org.ajoberstar.git-publish.gradle.plugin" version="2.1.3">
-         <artifact name="org.ajoberstar.git-publish.gradle.plugin-2.1.3.pom">
-            <sha256 value="047303f8afe488f3363a93a4ee1e66a0c347d566104b4a217a5e1cf87bd0cc72" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.antlr" name="antlr4-master" version="4.8-1">
-         <artifact name="antlr4-master-4.8-1.pom">
-            <sha256 value="ad82764672b9fcb42369422574d583b5512e1d7de1d3143951f27c5eb0f4c8e6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.antlr" name="antlr4-runtime" version="4.8-1">
-         <artifact name="antlr4-runtime-4.8-1.pom">
-            <sha256 value="ab60bcd5af00a48e36854ab97769bb5b7bd81ff20efc2abdf6792a66c5803e9d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="13">
-         <artifact name="apache-13.pom">
-            <pgp value="f254b35617dc255d9344bcfa873a8e86b4372146"/>
-            <sha256 value="ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="16">
-         <artifact name="apache-16.pom">
-            <pgp value="0cde80149711eb46dff17ae421a24b3f8b0f594a"/>
-            <sha256 value="9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="18">
-         <artifact name="apache-18.pom">
-            <pgp value="190d5a957ff22273e601f7a7c92c5fec70161c62"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="19">
-         <artifact name="apache-19.pom">
-            <sha256 value="91f7a33096ea69bac2cbaf6d01feb934cac002c48d8c8cfa9c240b40f1ec21df" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="21">
-         <artifact name="apache-21.pom">
-            <pgp value="fa77dcfef2ee6eb2debedd2c012579464d01c06a"/>
-            <sha256 value="af10c108da014f17cafac7b52b2b4b5a3a1c18265fa2af97a325d9143537b380" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache" name="apache" version="7">
-         <artifact name="apache-7.pom">
-            <pgp value="ba926f64ca647b6d853a38672e2010f8a7ff4a41"/>
-            <sha256 value="1397ce1db433adc9f223dbf07496d133681448751f4ae29e58f68e78fb4b6c25" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.ant" name="ant-parent" version="1.10.8">
-         <artifact name="ant-parent-1.10.8.pom">
-            <sha256 value="b24f7456bceefc2b22c20fdeaedd7d264a8006fcfd180257f2c848fdef20e530" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-math3" version="3.2">
-         <artifact name="commons-math3-3.2.pom">
-            <sha256 value="2cd0db7bce370c1404025cc013c11f8fd49f3f3c340a6d2dcf99d363d7948a69" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="28">
-         <artifact name="commons-parent-28.pom">
-            <sha256 value="14733a68e8b120b69de60cd96d222146dcf32f03c1c6cc6a750b1269bafe86c7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="39">
-         <artifact name="commons-parent-39.pom">
-            <pgp value="808d78b17a5a2d7c3668e31fbffc9b54721244ad"/>
-            <sha256 value="87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="47">
-         <artifact name="commons-parent-47.pom">
-            <pgp value="b6e73d84ea4fcc47166087253faad2cd5ecbb314"/>
-            <sha256 value="8a8ecb570553bf9f1ffae211a8d4ca9ee630c17afe59293368fba7bd9b42fcb7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.commons" name="commons-parent" version="50">
-         <artifact name="commons-parent-50.pom">
-            <pgp value="bc87a3fd0a54480f0badbebd21939ff0ca2a6567"/>
-         </artifact>
-      </component>
-      <component group="org.apache.logging.log4j" name="log4j" version="2.13.3">
-         <artifact name="log4j-2.13.3.pom">
-            <sha256 value="674f1fa5165b9d48935f4103d9316fe5b161dff6f9be904a6edb9baa33da4480" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.apache.servicemix" name="servicemix-pom" version="5">
-         <artifact name="servicemix-pom-5.pom">
-            <pgp value="75763c9eab34ecff96444a4314d149f029defb15"/>
-         </artifact>
-      </component>
-      <component group="org.asciidoctor" name="asciidoctor-gradle-base" version="3.2.0">
-         <artifact name="asciidoctor-gradle-base-3.2.0.jar">
-            <sha256 value="865d407e483713212e4ebed7b9c17be332967db81f045c2c9d891a3f10997a34" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="asciidoctor-gradle-base-3.2.0.pom">
-            <sha256 value="3dba4017471358c83784cf76a67ee3da6357956cace5345f85d3762f3949c35f" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.asciidoctor" name="asciidoctor-gradle-jvm" version="3.2.0">
-         <artifact name="asciidoctor-gradle-jvm-3.2.0.jar">
-            <sha256 value="02882d817cc416504828261e1e1f4afc65b62a70c5579c20f35e9800ca91d972" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="asciidoctor-gradle-jvm-3.2.0.pom">
-            <sha256 value="6b9cc51d4b3afca06f6f126a460ee62758c7c0c3f935a3566d9147ef87726506" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.asciidoctor" name="asciidoctor-gradle-jvm-pdf" version="3.2.0">
-         <artifact name="asciidoctor-gradle-jvm-pdf-3.2.0.jar">
-            <sha256 value="e236c8cb5b71de58ca04e4998d1c23fed5b3be18d457680e7f7e903646f6cdcf" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="asciidoctor-gradle-jvm-pdf-3.2.0.pom">
-            <sha256 value="83f789418a1b25ab22b56c9d8657c648a16f3646c02b1c3b5e3aa157799b6fd3" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.asciidoctor.jvm.convert" name="org.asciidoctor.jvm.convert.gradle.plugin" version="3.2.0">
-         <artifact name="org.asciidoctor.jvm.convert.gradle.plugin-3.2.0.pom">
-            <sha256 value="6f595a2218a429f249bb932e727520c901e3ef8ed5936cd99d004efe9dd5ec22" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.asciidoctor.jvm.pdf" name="org.asciidoctor.jvm.pdf.gradle.plugin" version="3.2.0">
-         <artifact name="org.asciidoctor.jvm.pdf.gradle.plugin-3.2.0.pom">
-            <sha256 value="a4f089118fb7727272c3b91852793b02c03cb809c6f86dd24751480b5966f8b9" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.checkerframework" name="checker-qual" version="2.11.1">
-         <artifact name="checker-qual-2.11.1.pom">
-            <sha256 value="cf2e0c90d8f757455f4a258ea609739053663bd5da6a79d9bd53f935a47de79c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus" name="codehaus-parent" version="4">
-         <artifact name="codehaus-parent-4.pom">
-            <pgp value="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd"/>
-            <sha256 value="6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.codehaus.plexus" name="plexus" version="4.0">
-         <artifact name="plexus-4.0.pom">
-            <pgp value="c345986f0fd384669c5919e6a5f094fd3961df05"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="5.6.0.201912101111-r">
-         <artifact name="org.eclipse.jgit-parent-5.6.0.201912101111-r.pom">
-            <sha256 value="efcf2ca3cacbcd9d9473696ac0910105e38b37bf7a3e66a94bb7a1343794a604" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.gradle" name="test-retry-gradle-plugin" version="1.2.0">
-         <artifact name="test-retry-gradle-plugin-1.2.0.jar">
-            <pgp value="314fe82e5a4c5377bca2edec5208812e1e4a6db0"/>
-         </artifact>
-         <artifact name="test-retry-gradle-plugin-1.2.0.pom">
-            <sha256 value="2a47c9e35f180fc41f7b720ffefd0b7e4dc5e133cea2e362c17c6a8274a90c1d" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="1.4.9">
-         <artifact name="gradle-kotlin-dsl-plugins-1.4.9.jar">
-            <sha256 value="f4e33bcad51373112211214bc697845a09b18c98a55b809208a111c43cf84518" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="gradle-kotlin-dsl-plugins-1.4.9.pom">
-            <sha256 value="4b4b16e7262fdde7198f56f791093f45730c14690348a7df369e8b97e85b1cdc" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="1.4.9">
-         <artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-1.4.9.pom">
-            <sha256 value="65e5554f499ed7febe043f2739aa771bc9b9885cd251528fc48c516fea30d0a0" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-android-extensions" version="1.4.20">
-         <artifact name="kotlin-android-extensions-1.4.20.pom">
-            <sha256 value="b8497814f61cb3c8c59cc1b6bd4102d5a6bacda73d385963c5105d57d1fa5e1e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-annotation-processing-gradle" version="1.4.20">
-         <artifact name="kotlin-annotation-processing-gradle-1.4.20.pom">
-            <sha256 value="50de06f4f6f51312bd039a8cf5b5519320b46e9d04ce8da6162ad6d05f2a51e3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.4.20">
-         <artifact name="kotlin-build-common-1.4.20.pom">
-            <sha256 value="f00f60d91b9255629526af083127524c2940a7eb367ec9cfa16ed7b2f30cfed8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.4.20">
-         <artifact name="kotlin-compiler-embeddable-1.4.20.pom">
-            <sha256 value="9686a28b0b606761581b88bef6a055e22068461dd2bba1ecfb15919967e603c7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.4.20">
-         <artifact name="kotlin-compiler-runner-1.4.20.pom">
-            <sha256 value="763f5326c61079617a8d9d78f38324dd77ed8b328a46d20d6f7a85b3cfe8ccc8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.4.20">
-         <artifact name="kotlin-daemon-client-1.4.20.pom">
-            <sha256 value="928729bee74e69710086b4ff7bd692f7426fa0ecc7eee143622008f29b64420e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.4.20">
-         <artifact name="kotlin-daemon-embeddable-1.4.20.pom">
-            <sha256 value="d266dda8a3484b1a863610db37c74126dc36cc2354404b05474423c67648ccef" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="1.4.20">
-         <artifact name="kotlin-gradle-plugin-1.4.20.jar">
-            <ignored-keys>
-               <ignored-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="bfd0ae0418917b8d0f7b300d8eb61e4a68d79e1706a34d4f2e65e9accf67df38" origin="Generated by Gradle because PGP signature verification failed!"/>
-         </artifact>
-         <artifact name="kotlin-gradle-plugin-1.4.20.pom">
-            <ignored-keys>
-               <ignored-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha256 value="f79af7dcff9a5609171a4e5704577ac99403c62f67e5fba358277a8f83bbd38f" origin="Generated by Gradle because PGP signature verification failed!"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="1.4.20">
-         <artifact name="kotlin-gradle-plugin-api-1.4.20.pom">
-            <sha256 value="f1d0d87457160e8ca1961311d5c6504ce14e498908f9d8387c9d244dd0e78fb8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="1.4.20">
-         <artifact name="kotlin-gradle-plugin-model-1.4.20.pom">
-            <sha256 value="aebcf5e1d450da8d38e55ab968da381a7214012e868794823a39ce6d66dd49f1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.4.20">
-         <artifact name="kotlin-reflect-1.4.20.pom">
-            <sha256 value="a5ebcf0f1c72a11d94336796125e2c77d562b528ed4d447c340e7dc8037375b0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-sam-with-receiver" version="1.4.20">
-         <artifact name="kotlin-sam-with-receiver-1.4.20.pom">
-            <sha256 value="0130e48848936f4544d5ddfb9ea090a2e515cb03e2ba2974c49445a98c63b012" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.4.20">
-         <artifact name="kotlin-script-runtime-1.4.20.pom">
-            <sha256 value="3e72202d67ef93ce0aee50ea763ec301e343d5c3cec2f6f12580855835024f57" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="1.4.20">
-         <artifact name="kotlin-scripting-common-1.4.20.pom">
-            <sha256 value="fee4fbef3f113be1ff95efef9c18816b8107dc9b30bed558a582965df3752afb" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="1.4.20">
-         <artifact name="kotlin-scripting-compiler-embeddable-1.4.20.pom">
-            <sha256 value="03f793eed92301288df0487d13b9776fa0ee52025230eed96bffe6666d562301" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="1.4.20">
-         <artifact name="kotlin-scripting-compiler-impl-embeddable-1.4.20.pom">
-            <sha256 value="0c9aa6618294893bfa877f54b07056084cf594f117e2c979b5620fe741ab539b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="1.4.20">
-         <artifact name="kotlin-scripting-jvm-1.4.20.pom">
-            <sha256 value="32fe3bb23007b41e0e84f5d86977472048827177e3bc3fa274551fd725f968bc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="1.4.20">
-         <artifact name="kotlin-util-io-1.4.20.pom">
-            <sha256 value="240ba4e6ccfa91a9efa43ac500f3cab6556e338a28f10e83bc608359a0452196" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="1.4.20">
-         <artifact name="kotlin-util-klib-1.4.20.pom">
-            <sha256 value="00dd506c7c806b26cc7bdefc5ec4fce36a7c91e4ac76f1c9353983473cd5fe79" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.junit.jupiter" name="junit-jupiter" version="5.7.0">
-         <artifact name="junit-jupiter-5.7.0.module">
-            <pgp value="ff6e2c001948c5f2f38b0cc385911f425ec61b51"/>
-         </artifact>
-      </component>
-      <component group="org.junit.jupiter" name="junit-jupiter" version="5.8.0-SNAPSHOT">
-         <artifact name="junit-jupiter-5.8.0-SNAPSHOT.jar">
-            <sha256 value="c9084fbf40746a4b097ba4f50dcd65b04b08d10b5d151f4d809a35542f38563b" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="junit-jupiter-5.8.0-SNAPSHOT.module">
-            <sha256 value="31ba26ef34ac0fce48ad5115ddbdab2af7311add78456744eaaa4601906cc504" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.openjdk.jmh" name="jmh-parent" version="1.25">
-         <artifact name="jmh-parent-1.25.pom">
-            <sha256 value="919ba8ed9c61195f164ff729f3547fdfa752a6b6a3e7236a5bf5b61cdf7b5669" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.ow2" name="ow2" version="1.3">
-         <artifact name="ow2-1.3.pom">
-            <pgp value="373d292d931cead14a4dbfdf3d52c2966a51f8f4"/>
-         </artifact>
-      </component>
-      <component group="org.slf4j" name="slf4j-parent" version="1.7.30">
-         <artifact name="slf4j-parent-1.7.30.pom">
-            <sha256 value="11647956e48a0c5bfb3ac33f6da7e83f341002b6857efd335a505b687be34b75" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.sonatype.forge" name="forge-parent" version="10">
-         <artifact name="forge-parent-10.pom">
-            <pgp value="180683306a9ef844d6cc0080a7eaf75aea98b19f"/>
-         </artifact>
-      </component>
-      <component group="org.sonatype.oss" name="oss-parent" version="5">
-         <artifact name="oss-parent-5.pom">
-            <pgp value="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd"/>
-            <sha256 value="1678d4120a585d8a630131aeec4c524d928398583b7eab616ee7d5a87f520d3d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.sonatype.oss" name="oss-parent" version="6">
-         <artifact name="oss-parent-6.pom">
-            <sha256 value="b4306d13e8f5392458a1b30866f1cff161b3d2e6999a88d059eea3932c8a8499" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.sonatype.oss" name="oss-parent" version="7">
-         <artifact name="oss-parent-7.pom">
-            <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.sonatype.oss" name="oss-parent" version="9">
-         <artifact name="oss-parent-9.pom">
-            <pgp value="44fbdbbc1a00fe414f1c1873586654072ead6677"/>
-            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.ysb33r.gradle" name="grolifant" version="0.16.1">
-         <artifact name="grolifant-0.16.1.jar">
-            <sha256 value="362c450c9738834181fdfac1147fa11cf21cefd59d7a5368756e174f93567a43" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="grolifant-0.16.1.pom">
-            <sha256 value="32671ca0c5a852c4432373c92fb8e8e767496a735cdd21a7194b0bfcea5e6cb5" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="xmlpull" name="xmlpull" version="1.1.3.1">
-         <artifact name="xmlpull-1.1.3.1.jar">
-            <sha256 value="34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="xmlpull-1.1.3.1.pom">
-            <sha256 value="8f10ffd8df0d3e9819c8cc8402709c6b248bc53a954ef6e45470d9ae3a5735fb" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="xpp3" name="xpp3_min" version="1.1.4c">
-         <artifact name="xpp3_min-1.1.4c.jar">
-            <sha256 value="bfc90e9e32d0eab1f397fb974b5f150a815188382ac41f372a7149d5bc178008" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="xpp3_min-1.1.4c.pom">
-            <sha256 value="b5b46ac0c09da41b04dbc753456b48912856a7ffbb1490676910b510c471d13f" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-   </components>
-</verification-metadata>

From 02a3e1fbb4848cc234cfde44f855f560dcd9ca75 Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Mon, 11 Jan 2021 13:09:05 +0100
Subject: [PATCH 0153/1433] Remove spurious usage of the word simply

The word "simply" is used in roughly two situations:

 * When used in instructional documentation the word simply often conveys a
   value judgement about the complexity of a task. Not only is this
   unnecessary, it makes a number of assumptions about the readers familiarity
   with the concepts involved and can come across as condescending.

 * When used to describe a default implementation, the word simply is used to
   to convey that the description is a complete description of the
   implementation. This should be unnecessary given the context.

As such nearly all usages of the world simply can be removed without a loss of
clarity.

For more context and a longer argument I found the arguments made Jim Fisher in
his talk "Don't Say Simply" at Write the Docs Prague 2018[1] to be quite
compelling.

 1. https://www.youtube.com/watch?v=gsT2BBWBVmM

Closes #2522
---
 .../asciidoc/user-guide/running-tests.adoc    |  6 ++---
 .../testkit/EngineTestKitAllEventsDemo.java   |  2 +-
 .../junit/jupiter/api/AssertLinesMatch.java   |  2 +-
 .../org/junit/jupiter/api/Assertions.java     |  6 ++---
 ...isabledIfEnvironmentVariableCondition.java |  2 +-
 ...EnabledIfEnvironmentVariableCondition.java |  2 +-
 .../api/extension/InvocationInterceptor.java  |  2 +-
 .../extension/TestInstanceFactoryTests.java   |  2 +-
 .../commons/support/AnnotationSupport.java    |  4 ++--
 .../commons/util/ReflectionUtils.java         |  9 ++++---
 .../junit/platform/engine/TestDescriptor.java |  2 +-
 .../org/junit/platform/engine/TestEngine.java |  4 ++--
 .../engine/discovery/MethodSelector.java      |  2 +-
 .../support/discovery/SelectorResolver.java   | 24 +++++++++----------
 .../platform/launcher/TestIdentifier.java     |  2 +-
 .../junit/platform/runner/JUnitPlatform.java  | 12 +++++-----
 16 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 6f609123b09f..9e66659de68f 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -639,14 +639,14 @@ You need the following artifacts and their dependencies on the classpath. See
 ==== Display Names vs. Technical Names
 
 To define a custom _display name_ for the class run via `@RunWith(JUnitPlatform.class)`
-simply annotate the class with `@SuiteDisplayName` and provide a custom value.
+annotate the class with `@SuiteDisplayName` and provide a custom value.
 
 By default, _display names_ will be used for test artifacts; however, when the
 `JUnitPlatform` runner is used to execute tests with a build tool such as Gradle or
 Maven, the generated test report often needs to include the _technical names_ of test
 artifacts — for example, fully qualified class names — instead of shorter display names
 like the simple name of a test class or a custom display name containing special
-characters. To enable technical names for reporting purposes, simply declare the
+characters. To enable technical names for reporting purposes, declare the
 `@UseTechnicalNames` annotation alongside `@RunWith(JUnitPlatform.class)`.
 
 Note that the presence of `@UseTechnicalNames` overrides any custom display name
@@ -808,7 +808,7 @@ expressions can be useful.
 === Capturing Standard Output/Error
 
 Since version 1.3, the JUnit Platform provides opt-in support for capturing output
-printed to `System.out` and `System.err`. To enable it, simply set the
+printed to `System.out` and `System.err`. To enable it, set the
 `junit.platform.output.capture.stdout` and/or `junit.platform.output.capture.stderr`
 <<running-tests-config-params, configuration parameter>> to `true`. In addition, you may
 configure the maximum number of buffered bytes to be used per executed test or container
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
index 21f05d439caf..03f0ffdc62e2 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
@@ -41,7 +41,7 @@ class EngineTestKitAllEventsDemo {
 	void verifyAllJupiterEvents() {
 		Writer writer = // create a java.io.Writer for debug output
 		// end::user_guide[]
-				// For the demo, we are simply swallowing the debug output.
+				// For the demo, we are swallowing the debug output.
 				new StringWriter();
 		// tag::user_guide[]
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
index 2e65d69995a3..138b46e523bd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
@@ -127,7 +127,7 @@ void assertLinesMatchWithFastForward() {
 				}
 
 				String actualLine = actualDeque.peek();
-				// trivial case: take the fast path when they simply match
+				// trivial case: take the fast path when they match
 				if (matches(expectedLine, actualLine)) {
 					actualDeque.pop();
 					continue; // main
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 5d130ddea6d0..bf17b39e0a51 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -3002,7 +3002,7 @@ public static void assertAll(String heading, Stream<Executable> executables) thr
 	 * thrown, this method will fail.
 	 *
 	 * <p>If you do not want to perform additional checks on the exception instance,
-	 * simply ignore the return value.
+	 * ignore the return value.
 	 */
 	public static <T extends Throwable> T assertThrows(Class<T> expectedType, Executable executable) {
 		return AssertThrows.assertThrows(expectedType, executable);
@@ -3016,7 +3016,7 @@ public static <T extends Throwable> T assertThrows(Class<T> expectedType, Execut
 	 * thrown, this method will fail.
 	 *
 	 * <p>If you do not want to perform additional checks on the exception instance,
-	 * simply ignore the return value.
+	 * ignore the return value.
 	 *
 	 * <p>Fails with the supplied failure {@code message}.
 	 */
@@ -3035,7 +3035,7 @@ public static <T extends Throwable> T assertThrows(Class<T> expectedType, Execut
 	 * supplied {@code messageSupplier}.
 	 *
 	 * <p>If you do not want to perform additional checks on the exception instance,
-	 * simply ignore the return value.
+	 * ignore the return value.
 	 */
 	public static <T extends Throwable> T assertThrows(Class<T> expectedType, Executable executable,
 			Supplier<String> messageSupplier) {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
index 68b98de8172c..8bf49646b251 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
@@ -64,7 +64,7 @@ protected ConditionEvaluationResult evaluate(DisabledIfEnvironmentVariable annot
 	/**
 	 * Get the value of the named environment variable.
 	 *
-	 * <p>The default implementation simply delegates to
+	 * <p>The default implementation delegates to
 	 * {@link System#getenv(String)}. Can be overridden in a subclass for
 	 * testing purposes.
 	 */
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
index bbc8cb8065c7..b23fa0315689 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
@@ -63,7 +63,7 @@ protected ConditionEvaluationResult evaluate(EnabledIfEnvironmentVariable annota
 	/**
 	 * Get the value of the named environment variable.
 	 *
-	 * <p>The default implementation simply delegates to
+	 * <p>The default implementation delegates to
 	 * {@link System#getenv(String)}. Can be overridden in a subclass for
 	 * testing purposes.
 	 */
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
index 31ac35535705..a002168fab5d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
@@ -36,7 +36,7 @@
  * Invocation#skip()} exactly once on the supplied invocation. Otherwise, the
  * enclosing test or container will be reported as failed.
  *
- * <p>The default implementation simply calls {@link Invocation#proceed()
+ * <p>The default implementation calls {@link Invocation#proceed()
  * proceed()} on the supplied {@linkplain Invocation invocation}.
  *
  * <h3>Constructor Requirements</h3>
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
index 092473785ba8..2bb66e500f62 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
@@ -642,7 +642,7 @@ public Object createTestInstance(TestInstanceFactoryContext factoryContext, Exte
 	}
 
 	/**
-	 * This does not actually create a proxy. Rather, it simply simulates what
+	 * This does not actually create a proxy. Rather, it simulates what
 	 * a proxy-based implementation might do, by loading the class from a
 	 * different {@link ClassLoader}.
 	 */
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
index 632ee93f9789..4f1a102fb176 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
@@ -177,8 +177,8 @@ public static <A extends Annotation> List<A> findRepeatableAnnotations(Optional<
 	 * discovered within the class hierarchy, this method will additionally
 	 * search on interfaces implemented by each class in the hierarchy.
 	 *
-	 * <p>If the supplied {@code element} is {@code null}, this method simply
-	 * returns an empty list.
+	 * <p>If the supplied {@code element} is {@code null}, this method returns
+	 * an empty list.
 	 *
 	 * <p>As of JUnit Platform 1.5, the search algorithm will also find
 	 * repeatable annotations used as meta-annotations on other repeatable
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 1a084f76415b..1182dd7f649c 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -108,7 +108,7 @@ public enum HierarchyTraversalMode {
 	 * <p>The pattern intentionally captures the last bracket with the
 	 * capital letter so that the combination can be looked up via
 	 * {@link #classNameToTypeMap}. For example, the last matched group
-	 * will contain {@code "[I"} instead of simply {@code "I"}.
+	 * will contain {@code "[I"} instead of {@code "I"}.
 	 *
 	 * @see Class#getName()
 	 */
@@ -891,8 +891,8 @@ else if (methodPart.endsWith(")")) {
 	 * Get the outermost instance of the required type, searching recursively
 	 * through enclosing instances.
 	 *
-	 * <p>If the supplied inner object is of the required type, it will simply
-	 * be returned.
+	 * <p>If the supplied inner object is of the required type, it will be
+	 * returned.
 	 *
 	 * @param inner the inner object from which to begin the search; never {@code null}
 	 * @param requiredType the required type of the outermost instance; never {@code null}
@@ -1705,8 +1705,7 @@ private static boolean isSearchable(Class<?> clazz) {
 	 * {@link InvocationTargetException}, this method will be invoked
 	 * recursively with the underlying
 	 * {@linkplain InvocationTargetException#getTargetException() target
-	 * exception}; otherwise, this method simply returns the supplied
-	 * {@code Throwable}.
+	 * exception}; otherwise, this method returns the supplied {@code Throwable}.
 	 */
 	private static Throwable getUnderlyingCause(Throwable t) {
 		if (t instanceof InvocationTargetException) {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
index 38380848314d..8971c92e1836 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
@@ -60,7 +60,7 @@ public interface TestDescriptor {
 	 * reporting infrastructure &mdash; for example, for reporting systems built
 	 * on the Ant-based XML reporting format for JUnit 4.
 	 *
-	 * <p>The default implementation simply delegates to {@link #getDisplayName()}.
+	 * <p>The default implementation delegates to {@link #getDisplayName()}.
 	 *
 	 * @return the legacy reporting name; never {@code null} or blank
 	 */
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
index 6a838dba4cac..258c4980dc75 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
@@ -91,7 +91,7 @@ public interface TestEngine {
 	 *
 	 * <p>This information is used solely for debugging and reporting purposes.
 	 *
-	 * <p>The default implementation simply returns an empty {@link Optional},
+	 * <p>The default implementation returns an empty {@link Optional},
 	 * signaling that the group ID is unknown.
 	 *
 	 * <p>Concrete test engine implementations may override this method in
@@ -121,7 +121,7 @@ default Optional<String> getGroupId() {
 	 * {@link Package} instance with the attributes from the manifest.
 	 *
 	 * <p>If the implementation title cannot be queried from the package
-	 * attributes, the default implementation simply returns an empty
+	 * attributes, the default implementation returns an empty
 	 * {@link Optional}.
 	 *
 	 * <p>Concrete test engine implementations may override this method in
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 9daa8d65670e..344403360eae 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -32,7 +32,7 @@
  * <p>If a Java {@link Method} is provided, the selector will return that
  * {@linkplain #getJavaMethod() method} and its method name, class name, and
  * parameter types accordingly. If a {@link Class} and method name, a class name
- * and method name, or simply a <em>fully qualified method name</em> is provided,
+ * and method name, or a <em>fully qualified method name</em> is provided,
  * this selector will only attempt to lazily load the {@link Class} and
  * {@link Method} if {@link #getJavaClass()} or {@link #getJavaMethod()} is
  * invoked.
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
index 1ac44600b371..53a10f65b618 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
@@ -74,7 +74,7 @@ public interface SelectorResolver {
 	 * Resolve the supplied {@link ClasspathResourceSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -93,7 +93,7 @@ default Resolution resolve(ClasspathResourceSelector selector, Context context)
 	 * Resolve the supplied {@link ClasspathRootSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -112,7 +112,7 @@ default Resolution resolve(ClasspathRootSelector selector, Context context) {
 	 * Resolve the supplied {@link ClassSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -131,7 +131,7 @@ default Resolution resolve(ClassSelector selector, Context context) {
 	 * Resolve the supplied {@link NestedClassSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -150,7 +150,7 @@ default Resolution resolve(NestedClassSelector selector, Context context) {
 	 * Resolve the supplied {@link DirectorySelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -169,7 +169,7 @@ default Resolution resolve(DirectorySelector selector, Context context) {
 	 * Resolve the supplied {@link FileSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -188,7 +188,7 @@ default Resolution resolve(FileSelector selector, Context context) {
 	 * Resolve the supplied {@link MethodSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -207,7 +207,7 @@ default Resolution resolve(MethodSelector selector, Context context) {
 	 * Resolve the supplied {@link NestedMethodSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -226,7 +226,7 @@ default Resolution resolve(NestedMethodSelector selector, Context context) {
 	 * Resolve the supplied {@link ModuleSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -245,7 +245,7 @@ default Resolution resolve(ModuleSelector selector, Context context) {
 	 * Resolve the supplied {@link PackageSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -264,7 +264,7 @@ default Resolution resolve(PackageSelector selector, Context context) {
 	 * Resolve the supplied {@link UniqueIdSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
@@ -283,7 +283,7 @@ default Resolution resolve(UniqueIdSelector selector, Context context) {
 	 * Resolve the supplied {@link UriSelector} using the supplied
 	 * {@link Context Context}.
 	 *
-	 * <p>The default implementation simply delegates to {@link
+	 * <p>The default implementation delegates to {@link
 	 * #resolve(DiscoverySelector, Context)}.
 	 *
 	 * @param selector the selector to be resolved; never {@code null}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index 8253ccb95938..29681e3048b1 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -181,7 +181,7 @@ public String getDisplayName() {
 	 * reporting infrastructure &mdash; for example, for reporting systems built
 	 * on the Ant-based XML reporting format for JUnit 4.
 	 *
-	 * <p>The default implementation simply delegates to {@link #getDisplayName()}.
+	 * <p>The default implementation delegates to {@link #getDisplayName()}.
 	 *
 	 * @return the legacy reporting name; never {@code null} or blank
 	 * @see org.junit.platform.engine.TestDescriptor#getLegacyReportingName()
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index e9944745158e..29b7e1ef7e84 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -78,11 +78,11 @@
  * package for configuration options.
  *
  * <p>If you do not use any configuration annotations from the
- * {@code org.junit.platform.suite.api} package, you can simply use this runner
- * on a test class whose programming model is supported on the JUnit Platform
- * &mdash; for example, a JUnit Jupiter test class. Note, however, that any test
- * class run with this runner must be {@code public} in order to be picked up by
- * IDEs and build tools.
+ * {@code org.junit.platform.suite.api} package, you can use this runner on a
+ * test class whose programming model is supported on the JUnit Platform &mdash;
+ * for example, a JUnit Jupiter test class. Note, however, that any test class
+ * run with this runner must be {@code public} in order to be picked up by IDEs
+ * and build tools.
  *
  * <p>When used on a class that serves as a test suite and the
  * {@link IncludeClassNamePatterns @IncludeClassNamePatterns} annotation is not
@@ -147,7 +147,7 @@ private JUnitPlatformTestTree generateTestTree(LauncherDiscoveryRequest discover
 	private LauncherDiscoveryRequest createDiscoveryRequest() {
 		List<DiscoverySelector> selectors = getSelectorsFromAnnotations();
 
-		// Allows to simply add @RunWith(JUnitPlatform.class) to any test case
+		// Allows @RunWith(JUnitPlatform.class) to be added to any test case
 		boolean isSuite = !selectors.isEmpty();
 		if (!isSuite) {
 			selectors.add(selectClass(this.testClass));

From a58ef50a8d6eb72f0430ce1f0da8ffccba2af7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonard=20Br=C3=BCnings?= <lord_damokles@gmx.net>
Date: Tue, 12 Jan 2021 12:49:20 +0100
Subject: [PATCH 0154/1433] Allow parallel execution of child nodes if only
 read locks are acquired (#2515)

---
 .../release-notes/release-notes-5.8.0-M1.adoc |   3 +-
 .../support/hierarchical/NodeTreeWalker.java  |  34 ++++--
 .../NodeTreeWalkerIntegrationTests.java       | 100 ++++++++++++++++++
 3 files changed, 128 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 43601da40a94..f40414c2fe2e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -38,7 +38,8 @@ on GitHub.
 * Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
 * Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
   longer store `String` representations of unique IDs.
-
+* Improvement of `ExclusiveResource` handling, if a `Node` has only read locks and no read-write locks,
+  then descendants are not forced into `SAME_THREAD` execution, and can run concurrently.
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
index 3d09201c1c60..01a6ce3faabe 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
@@ -57,21 +57,39 @@ private void walk(TestDescriptor globalLockDescriptor, TestDescriptor testDescri
 		}
 		else {
 			Set<ExclusiveResource> allResources = new HashSet<>(exclusiveResources);
-			advisor.forceDescendantExecutionMode(testDescriptor, SAME_THREAD);
-			doForChildrenRecursively(testDescriptor, child -> {
-				allResources.addAll(getExclusiveResources(child));
-				advisor.forceDescendantExecutionMode(child, SAME_THREAD);
-			});
+			if (isReadOnly(allResources)) {
+				doForChildrenRecursively(testDescriptor, child -> allResources.addAll(getExclusiveResources(child)));
+				if (!isReadOnly(allResources)) {
+					forceDescendantExecutionModeRecursively(advisor, testDescriptor);
+				}
+			}
+			else {
+				advisor.forceDescendantExecutionMode(testDescriptor, SAME_THREAD);
+				doForChildrenRecursively(testDescriptor, child -> {
+					allResources.addAll(getExclusiveResources(child));
+					advisor.forceDescendantExecutionMode(child, SAME_THREAD);
+				});
+			}
 			if (!globalLockDescriptor.equals(testDescriptor) && allResources.contains(GLOBAL_READ_WRITE)) {
-				advisor.forceDescendantExecutionMode(globalLockDescriptor, SAME_THREAD);
-				doForChildrenRecursively(globalLockDescriptor,
-					child -> advisor.forceDescendantExecutionMode(child, SAME_THREAD));
+				forceDescendantExecutionModeRecursively(advisor, globalLockDescriptor);
 				advisor.useResourceLock(globalLockDescriptor, globalReadWriteLock);
 			}
 			advisor.useResourceLock(testDescriptor, lockManager.getLockForResources(allResources));
 		}
 	}
 
+	private void forceDescendantExecutionModeRecursively(NodeExecutionAdvisor advisor,
+			TestDescriptor globalLockDescriptor) {
+		advisor.forceDescendantExecutionMode(globalLockDescriptor, SAME_THREAD);
+		doForChildrenRecursively(globalLockDescriptor,
+			child -> advisor.forceDescendantExecutionMode(child, SAME_THREAD));
+	}
+
+	private boolean isReadOnly(Set<ExclusiveResource> exclusiveResources) {
+		return exclusiveResources.stream().allMatch(
+			exclusiveResource -> exclusiveResource.getLockMode() == ExclusiveResource.LockMode.READ);
+	}
+
 	private Set<ExclusiveResource> getExclusiveResources(TestDescriptor testDescriptor) {
 		return NodeUtils.asNode(testDescriptor).getExclusiveResources();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
index 88c397b59e1c..7cb996d3e2d7 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
@@ -15,6 +15,7 @@
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_READ;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_READ_WRITE;
+import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.LockMode.READ;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.LockMode.READ_WRITE;
 import static org.junit.platform.engine.support.hierarchical.Node.ExecutionMode.SAME_THREAD;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
@@ -25,6 +26,7 @@
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceAccessMode;
 import org.junit.jupiter.api.parallel.ResourceLock;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.engine.TestDescriptor;
@@ -54,6 +56,70 @@ void pullUpExclusiveChildResourcesToTestClass() {
 		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).contains(SAME_THREAD);
 	}
 
+	@Test
+	void setsForceExecutionModeForChildrenWithWriteLocksOnClass() {
+		var engineDescriptor = discover(TestCaseWithResourceWriteLockOnClass.class);
+
+		var advisor = nodeTreeWalker.walk(engineDescriptor);
+
+		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
+				.isEqualTo(List.of(getReadWriteLock("a")));
+		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
+
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()).isEqualTo(List.of());
+		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).contains(SAME_THREAD);
+	}
+
+	@Test
+	void doesntSetForceExecutionModeForChildrenWithReadLocksOnClass() {
+		var engineDescriptor = discover(TestCaseWithResourceReadLockOnClass.class);
+
+		var advisor = nodeTreeWalker.walk(engineDescriptor);
+
+		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
+				.isEqualTo(List.of(getReadLock("a")));
+		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
+
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()).isEqualTo(List.of());
+		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).isEmpty();
+	}
+
+	@Test
+	void setsForceExecutionModeForChildrenWithReadLocksOnClassAndWriteLockOnTest() {
+		var engineDescriptor = discover(TestCaseWithResourceReadLockOnClassAndWriteClockOnTest.class);
+
+		var advisor = nodeTreeWalker.walk(engineDescriptor);
+
+		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
+				.isEqualTo(List.of(getReadWriteLock("a")));
+		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
+
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()).isEqualTo(List.of());
+		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).contains(SAME_THREAD);
+	}
+
+	@Test
+	void doesntSetForceExecutionModeForChildrenWithReadLocksOnClassAndReadLockOnTest() {
+		var engineDescriptor = discover(TestCaseWithResourceReadLockOnClassAndReadClockOnTest.class);
+
+		var advisor = nodeTreeWalker.walk(engineDescriptor);
+
+		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
+		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
+				.isEqualTo(List.of(getReadLock("a"), getReadLock("b")));
+		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
+
+		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
+		assertThat(advisor.getResourceLock(testMethodDescriptor)).extracting(allLocks()).isEqualTo(List.of());
+		assertThat(advisor.getForcedExecutionMode(testMethodDescriptor)).isEmpty();
+	}
+
 	@Test
 	void leavesResourceLockOnTestMethodWhenClassDoesNotUseResource() {
 		var engineDescriptor = discover(TestCaseWithoutResourceLock.class);
@@ -112,6 +178,10 @@ private Lock getReadWriteLock(String key) {
 		return getLock(new ExclusiveResource(key, READ_WRITE));
 	}
 
+	private Lock getReadLock(String key) {
+		return getLock(new ExclusiveResource(key, READ));
+	}
+
 	private Lock getLock(ExclusiveResource exclusiveResource) {
 		return getOnlyElement(ResourceLockSupport.getLocks(lockManager.getLockForResource(exclusiveResource)));
 	}
@@ -154,4 +224,34 @@ void test() {
 			}
 		}
 	}
+
+	@ResourceLock("a")
+	static class TestCaseWithResourceWriteLockOnClass {
+		@Test
+		void test() {
+		}
+	}
+
+	@ResourceLock(value = "a", mode = ResourceAccessMode.READ)
+	static class TestCaseWithResourceReadLockOnClass {
+		@Test
+		void test() {
+		}
+	}
+
+	@ResourceLock(value = "a", mode = ResourceAccessMode.READ)
+	static class TestCaseWithResourceReadLockOnClassAndWriteClockOnTest {
+		@Test
+		@ResourceLock("a")
+		void test() {
+		}
+	}
+
+	@ResourceLock(value = "a", mode = ResourceAccessMode.READ)
+	static class TestCaseWithResourceReadLockOnClassAndReadClockOnTest {
+		@Test
+		@ResourceLock(value = "b", mode = ResourceAccessMode.READ)
+		void test() {
+		}
+	}
 }

From 03db7151f3d8a8b8d0037a01f4db671139c0b36b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 3 Jan 2021 15:12:20 +0100
Subject: [PATCH 0155/1433] Allow registering discovery listeners on Launcher

---
 .../org/junit/platform/launcher/Launcher.java |  10 ++
 .../launcher/LauncherDiscoveryListener.java   |   4 +-
 .../core/CompositeTestExecutionListener.java  | 112 ++++++++++++++
 .../launcher/core/DefaultLauncher.java        |  30 ++--
 .../core/EngineDiscoveryOrchestrator.java     |  25 ++--
 .../core/EngineExecutionOrchestrator.java     |  23 ++-
 .../launcher/core/LauncherFactory.java        |  12 +-
 .../launcher/core/ListenerRegistry.java       |  84 +++++++++++
 ...reamInterceptingTestExecutionListener.java |   2 +-
 .../core/TestExecutionListenerRegistry.java   | 141 ------------------
 .../discovery/LauncherDiscoveryListeners.java |   5 +-
 .../testkit/engine/EngineTestKit.java         |   2 +-
 ... CompositeTestExecutionListenerTests.java} |  64 ++++----
 .../launcher/core/DefaultLauncherTests.java   |  29 ----
 .../launcher/core/LauncherFactoryTests.java   |  14 +-
 .../launcher/core/ListenerRegistryTests.java  |  48 ++++++
 .../src/test/resources/log4j2-test.xml        |   2 +-
 17 files changed, 343 insertions(+), 264 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
 delete mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestExecutionListenerRegistry.java
 rename platform-tests/src/test/java/org/junit/platform/launcher/core/{TestExecutionListenerRegistryTests.java => CompositeTestExecutionListenerTests.java} (76%)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
index e303defbe8b1..3ca1dcd21eed 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.launcher;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
@@ -51,6 +52,15 @@
 @API(status = STABLE, since = "1.0")
 public interface Launcher {
 
+	/**
+	 * Register one or more listeners for test discovery.
+	 *
+	 * @param listeners the listeners to be notified of test discovery events;
+	 * never {@code null} or empty
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners);
+
 	/**
 	 * Register one or more listeners for test execution.
 	 *
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index 75498f500607..dd4b58d72ec3 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -18,8 +18,8 @@
 
 /**
  * Register a concrete implementation of this interface with a
- * {@link org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder}
- * to be notified of events that occur during test discovery.
+ * {@link org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder} or
+ * {@link Launcher} to be notified of events that occur during test discovery.
  *
  * <p>All methods in this interface have empty <em>default</em> implementations.
  * Concrete implementations may therefore override one or more of these methods
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
new file mode 100644
index 000000000000..7fc64521fd29
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+import org.junit.platform.commons.util.UnrecoverableExceptions;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.reporting.ReportEntry;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+class CompositeTestExecutionListener implements TestExecutionListener {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(CompositeTestExecutionListener.class);
+
+	private final List<TestExecutionListener> testExecutionListeners;
+	private final List<EagerTestExecutionListener> eagerTestExecutionListeners;
+
+	CompositeTestExecutionListener(List<TestExecutionListener> testExecutionListeners) {
+		this.testExecutionListeners = new ArrayList<>(testExecutionListeners);
+		this.eagerTestExecutionListeners = this.testExecutionListeners.stream() //
+				.filter(EagerTestExecutionListener.class::isInstance) //
+				.map(EagerTestExecutionListener.class::cast) //
+				.collect(toList());
+	}
+
+	@Override
+	public void dynamicTestRegistered(TestIdentifier testIdentifier) {
+		notifyEach(testExecutionListeners, listener -> listener.dynamicTestRegistered(testIdentifier),
+			() -> "dynamicTestRegistered(" + testIdentifier + ")");
+	}
+
+	@Override
+	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
+		notifyEach(testExecutionListeners, listener -> listener.executionSkipped(testIdentifier, reason),
+			() -> "executionSkipped(" + testIdentifier + ", " + reason + ")");
+	}
+
+	@Override
+	public void executionStarted(TestIdentifier testIdentifier) {
+		notifyEach(eagerTestExecutionListeners, listener -> listener.executionJustStarted(testIdentifier),
+			() -> "executionJustStarted(" + testIdentifier + ")");
+		notifyEach(testExecutionListeners, listener -> listener.executionStarted(testIdentifier),
+			() -> "executionStarted(" + testIdentifier + ")");
+	}
+
+	@Override
+	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+		notifyEach(eagerTestExecutionListeners,
+			listener -> listener.executionJustFinished(testIdentifier, testExecutionResult),
+			() -> "executionJustFinished(" + testIdentifier + ", " + testExecutionResult + ")");
+		notifyEach(testExecutionListeners, listener -> listener.executionFinished(testIdentifier, testExecutionResult),
+			() -> "executionFinished(" + testIdentifier + ", " + testExecutionResult + ")");
+	}
+
+	@Override
+	public void testPlanExecutionStarted(TestPlan testPlan) {
+		notifyEach(testExecutionListeners, listener -> listener.testPlanExecutionStarted(testPlan),
+			() -> "testPlanExecutionStarted(" + testPlan + ")");
+	}
+
+	@Override
+	public void testPlanExecutionFinished(TestPlan testPlan) {
+		notifyEach(testExecutionListeners, listener -> listener.testPlanExecutionFinished(testPlan),
+			() -> "testPlanExecutionFinished(" + testPlan + ")");
+	}
+
+	@Override
+	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
+		notifyEach(testExecutionListeners, listener -> listener.reportingEntryPublished(testIdentifier, entry),
+			() -> "reportingEntryPublished(" + testIdentifier + ", " + entry + ")");
+	}
+
+	private static <T extends TestExecutionListener> void notifyEach(List<T> listeners, Consumer<T> consumer,
+			Supplier<String> description) {
+		listeners.forEach(listener -> {
+			try {
+				consumer.accept(listener);
+			}
+			catch (Throwable throwable) {
+				UnrecoverableExceptions.rethrowIfUnrecoverable(throwable);
+				LOGGER.warn(throwable, () -> String.format("TestExecutionListener [%s] threw exception for method: %s",
+					listener.getClass().getName(), description.get()));
+			}
+		});
+	}
+
+	interface EagerTestExecutionListener extends TestExecutionListener {
+		default void executionJustStarted(TestIdentifier testIdentifier) {
+		}
+
+		default void executionJustFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+		}
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index 5e1516fe45c1..d6fcfbb4bf6b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -37,8 +37,10 @@
  */
 class DefaultLauncher implements Launcher {
 
-	private final TestExecutionListenerRegistry listenerRegistry = new TestExecutionListenerRegistry();
-	private final EngineExecutionOrchestrator executionOrchestrator = new EngineExecutionOrchestrator(listenerRegistry);
+	private final ListenerRegistry<LauncherDiscoveryListener> launcherDiscoveryListenerRegistry = ListenerRegistry.forLauncherDiscoveryListeners();
+	private final ListenerRegistry<TestExecutionListener> testExecutionListenerRegistry = ListenerRegistry.forTestExecutionListeners();
+	private final EngineExecutionOrchestrator executionOrchestrator = new EngineExecutionOrchestrator(
+		testExecutionListenerRegistry);
 	private final EngineDiscoveryOrchestrator discoveryOrchestrator;
 
 	/**
@@ -48,11 +50,8 @@ class DefaultLauncher implements Launcher {
 	 * empty
 	 * @param postDiscoveryFilters the additional post discovery filters for
 	 * discovery requests; never {@code null}
-	 * @param launcherDiscoveryListeners the additional launcher discovery
-	 * listeners for discovery requests; never {@code null}
 	 */
-	DefaultLauncher(Iterable<TestEngine> testEngines, Collection<PostDiscoveryFilter> postDiscoveryFilters,
-			Collection<LauncherDiscoveryListener> launcherDiscoveryListeners) {
+	DefaultLauncher(Iterable<TestEngine> testEngines, Collection<PostDiscoveryFilter> postDiscoveryFilters) {
 		Preconditions.condition(testEngines != null && testEngines.iterator().hasNext(),
 			() -> "Cannot create Launcher without at least one TestEngine; "
 					+ "consider adding an engine implementation JAR to the classpath");
@@ -60,14 +59,17 @@ class DefaultLauncher implements Launcher {
 		Preconditions.containsNoNullElements(postDiscoveryFilters,
 			"PostDiscoveryFilter array must not contain null elements");
 		this.discoveryOrchestrator = new EngineDiscoveryOrchestrator(EngineIdValidator.validate(testEngines),
-			unmodifiableCollection(postDiscoveryFilters), unmodifiableCollection(launcherDiscoveryListeners));
+			unmodifiableCollection(postDiscoveryFilters), launcherDiscoveryListenerRegistry);
+	}
+
+	@Override
+	public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
+		this.launcherDiscoveryListenerRegistry.addAll(listeners);
 	}
 
 	@Override
 	public void registerTestExecutionListeners(TestExecutionListener... listeners) {
-		Preconditions.notEmpty(listeners, "listeners array must not be null or empty");
-		Preconditions.containsNoNullElements(listeners, "individual listeners must not be null");
-		this.listenerRegistry.registerListeners(listeners);
+		this.testExecutionListenerRegistry.addAll(listeners);
 	}
 
 	@Override
@@ -93,12 +95,12 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 		execute((InternalTestPlan) testPlan, listeners);
 	}
 
-	TestExecutionListenerRegistry getTestExecutionListenerRegistry() {
-		return listenerRegistry;
+	ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
+		return testExecutionListenerRegistry;
 	}
 
-	LauncherDiscoveryListener getLauncherDiscoveryListener(LauncherDiscoveryRequest discoveryRequest) {
-		return discoveryOrchestrator.getLauncherDiscoveryListener(discoveryRequest);
+	ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
+		return launcherDiscoveryListenerRegistry;
 	}
 
 	private LauncherDiscoveryResult discover(LauncherDiscoveryRequest discoveryRequest,
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index 3b9ea03be8d4..c0853d311140 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -11,7 +11,6 @@
 package org.junit.platform.launcher.core;
 
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.engine.Filter.composeFilters;
 
@@ -22,7 +21,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
@@ -38,7 +36,6 @@
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.PostDiscoveryFilter;
-import org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners;
 
 /**
  * Orchestrates test discovery using the configured test engines.
@@ -53,14 +50,18 @@ public class EngineDiscoveryOrchestrator {
 	private final EngineDiscoveryResultValidator discoveryResultValidator = new EngineDiscoveryResultValidator();
 	private final Iterable<TestEngine> testEngines;
 	private final Collection<PostDiscoveryFilter> postDiscoveryFilters;
-	private final Collection<LauncherDiscoveryListener> launcherDiscoveryListeners;
+	private final ListenerRegistry<LauncherDiscoveryListener> launcherDiscoveryListenerRegistry;
 
 	public EngineDiscoveryOrchestrator(Iterable<TestEngine> testEngines,
-			Collection<PostDiscoveryFilter> postDiscoveryFilters,
-			Collection<LauncherDiscoveryListener> launcherDiscoveryListeners) {
+			Collection<PostDiscoveryFilter> postDiscoveryFilters) {
+		this(testEngines, postDiscoveryFilters, ListenerRegistry.forLauncherDiscoveryListeners());
+	}
+
+	EngineDiscoveryOrchestrator(Iterable<TestEngine> testEngines, Collection<PostDiscoveryFilter> postDiscoveryFilters,
+			ListenerRegistry<LauncherDiscoveryListener> launcherDiscoveryListenerRegistry) {
 		this.testEngines = testEngines;
 		this.postDiscoveryFilters = postDiscoveryFilters;
-		this.launcherDiscoveryListeners = launcherDiscoveryListeners;
+		this.launcherDiscoveryListenerRegistry = launcherDiscoveryListenerRegistry;
 	}
 
 	/**
@@ -134,13 +135,9 @@ private TestDescriptor discoverEngineRoot(TestEngine testEngine, LauncherDiscove
 	}
 
 	LauncherDiscoveryListener getLauncherDiscoveryListener(LauncherDiscoveryRequest discoveryRequest) {
-		LauncherDiscoveryListener discoveryListener = discoveryRequest.getDiscoveryListener();
-		if (!launcherDiscoveryListeners.isEmpty()) {
-			List<LauncherDiscoveryListener> allDiscoveryListeners = Stream.concat(Stream.of(discoveryListener),
-				launcherDiscoveryListeners.stream()).collect(toList());
-			discoveryListener = LauncherDiscoveryListeners.composite(allDiscoveryListeners);
-		}
-		return discoveryListener;
+		return ListenerRegistry.copyOf(launcherDiscoveryListenerRegistry) //
+				.add(discoveryRequest.getDiscoveryListener()) //
+				.getCompositeListener();
 	}
 
 	private void applyPostDiscoveryFilters(Map<TestEngine, TestDescriptor> testEngineDescriptors,
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index 8d75ccd45b03..68271ea446fb 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -34,13 +34,13 @@
 @API(status = INTERNAL, since = "1.7", consumers = "testkit")
 public class EngineExecutionOrchestrator {
 
-	private final TestExecutionListenerRegistry listenerRegistry;
+	private final ListenerRegistry<TestExecutionListener> listenerRegistry;
 
 	public EngineExecutionOrchestrator() {
-		this(new TestExecutionListenerRegistry());
+		this(ListenerRegistry.forTestExecutionListeners());
 	}
 
-	EngineExecutionOrchestrator(TestExecutionListenerRegistry listenerRegistry) {
+	EngineExecutionOrchestrator(ListenerRegistry<TestExecutionListener> listenerRegistry) {
 		this.listenerRegistry = listenerRegistry;
 	}
 
@@ -48,7 +48,7 @@ void execute(InternalTestPlan internalTestPlan, TestExecutionListener... listene
 		internalTestPlan.markStarted();
 		LauncherDiscoveryResult discoveryResult = internalTestPlan.getDiscoveryResult();
 		ConfigurationParameters configurationParameters = discoveryResult.getConfigurationParameters();
-		TestExecutionListenerRegistry listenerRegistry = buildListenerRegistryForExecution(listeners);
+		ListenerRegistry<TestExecutionListener> listenerRegistry = buildListenerRegistryForExecution(listeners);
 		withInterceptedStreams(configurationParameters, listenerRegistry, testExecutionListener -> {
 			testExecutionListener.testPlanExecutionStarted(internalTestPlan);
 			execute(discoveryResult, new ExecutionListenerAdapter(internalTestPlan, testExecutionListener));
@@ -57,14 +57,14 @@ void execute(InternalTestPlan internalTestPlan, TestExecutionListener... listene
 	}
 
 	private void withInterceptedStreams(ConfigurationParameters configurationParameters,
-			TestExecutionListenerRegistry listenerRegistry, Consumer<TestExecutionListener> action) {
+			ListenerRegistry<TestExecutionListener> listenerRegistry, Consumer<TestExecutionListener> action) {
 
-		TestExecutionListener testExecutionListener = listenerRegistry.getCompositeTestExecutionListener();
+		TestExecutionListener testExecutionListener = listenerRegistry.getCompositeListener();
 		Optional<StreamInterceptingTestExecutionListener> streamInterceptingTestExecutionListener = StreamInterceptingTestExecutionListener.create(
 			configurationParameters, testExecutionListener::reportingEntryPublished);
-		streamInterceptingTestExecutionListener.ifPresent(listenerRegistry::registerListeners);
+		streamInterceptingTestExecutionListener.ifPresent(listenerRegistry::add);
 		try {
-			action.accept(testExecutionListener);
+			action.accept(listenerRegistry.getCompositeListener());
 		}
 		finally {
 			streamInterceptingTestExecutionListener.ifPresent(StreamInterceptingTestExecutionListener::unregister);
@@ -90,13 +90,12 @@ public void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionList
 		}
 	}
 
-	private TestExecutionListenerRegistry buildListenerRegistryForExecution(TestExecutionListener... listeners) {
+	private ListenerRegistry<TestExecutionListener> buildListenerRegistryForExecution(
+			TestExecutionListener... listeners) {
 		if (listeners.length == 0) {
 			return this.listenerRegistry;
 		}
-		TestExecutionListenerRegistry registry = new TestExecutionListenerRegistry(this.listenerRegistry);
-		registry.registerListeners(listeners);
-		return registry;
+		return ListenerRegistry.copyOf(this.listenerRegistry).addAll(listeners);
 	}
 
 	private void execute(TestDescriptor engineDescriptor, EngineExecutionListener listener,
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 6b1ee7d93d8c..d102d987ba11 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -28,7 +28,6 @@
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.launcher.Launcher;
-import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestExecutionListener;
 
@@ -93,10 +92,10 @@ public static Launcher create(LauncherConfig config) throws PreconditionViolatio
 
 		Set<TestEngine> engines = collectTestEngines(config);
 		List<PostDiscoveryFilter> filters = collectPostDiscoveryFilters(config);
-		List<LauncherDiscoveryListener> discoveryListeners = collectLauncherDiscoveryListeners(config);
 
-		Launcher launcher = new DefaultLauncher(engines, filters, discoveryListeners);
+		Launcher launcher = new DefaultLauncher(engines, filters);
 
+		registerLauncherDiscoveryListeners(config, launcher);
 		registerTestExecutionListeners(config, launcher);
 
 		return launcher;
@@ -120,12 +119,11 @@ private static List<PostDiscoveryFilter> collectPostDiscoveryFilters(LauncherCon
 		return filters;
 	}
 
-	private static List<LauncherDiscoveryListener> collectLauncherDiscoveryListeners(LauncherConfig config) {
-		List<LauncherDiscoveryListener> discoveryListeners = new ArrayList<>();
+	private static void registerLauncherDiscoveryListeners(LauncherConfig config, Launcher launcher) {
 		if (config.isLauncherDiscoveryListenerAutoRegistrationEnabled()) {
-			new ServiceLoaderLauncherDiscoveryListenerRegistry().loadListeners().forEach(discoveryListeners::add);
+			new ServiceLoaderLauncherDiscoveryListenerRegistry().loadListeners().forEach(
+				launcher::registerLauncherDiscoveryListeners);
 		}
-		return discoveryListeners;
 	}
 
 	private static void registerTestExecutionListeners(LauncherConfig config, Launcher launcher) {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
new file mode 100644
index 000000000000..b38c38d274d2
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners;
+
+class ListenerRegistry<T> {
+
+	private final Function<List<T>, T> compositeListenerFactory;
+
+	static ListenerRegistry<LauncherDiscoveryListener> forLauncherDiscoveryListeners() {
+		return create(LauncherDiscoveryListeners::composite);
+	}
+
+	static ListenerRegistry<TestExecutionListener> forTestExecutionListeners() {
+		return create(CompositeTestExecutionListener::new);
+	}
+
+	static <T> ListenerRegistry<T> create(Function<List<T>, T> compositeListenerFactory) {
+		return new ListenerRegistry<>(compositeListenerFactory);
+	}
+
+	static <T> ListenerRegistry<T> copyOf(ListenerRegistry<T> source) {
+		ListenerRegistry<T> registry = new ListenerRegistry<>(source.compositeListenerFactory);
+		if (!source.listeners.isEmpty()) {
+			registry.addAll(source.listeners);
+		}
+		return registry;
+	}
+
+	private final ArrayList<T> listeners = new ArrayList<>();
+
+	private ListenerRegistry(Function<List<T>, T> compositeListenerFactory) {
+		this.compositeListenerFactory = compositeListenerFactory;
+	}
+
+	ListenerRegistry<T> add(T listener) {
+		Preconditions.notNull(listener, "listener must not be null");
+		this.listeners.add(listener);
+		return this;
+	}
+
+	@SafeVarargs
+	@SuppressWarnings("varargs")
+	final ListenerRegistry<T> addAll(T... listeners) {
+		Preconditions.notEmpty(listeners, "listeners array must not be null or empty");
+		return addAll(Arrays.asList(listeners));
+	}
+
+	ListenerRegistry<T> addAll(Collection<? extends T> listeners) {
+		Preconditions.notEmpty(listeners, "listeners collection must not be null or empty");
+		Preconditions.containsNoNullElements(listeners, "individual listeners must not be null");
+		this.listeners.addAll(listeners);
+		return this;
+	}
+
+	T getCompositeListener() {
+		this.listeners.trimToSize();
+		return compositeListenerFactory.apply(this.listeners);
+	}
+
+	List<T> getListeners() {
+		return Collections.unmodifiableList(this.listeners);
+	}
+
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
index 9ae8cdf148d2..139b32dc4070 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
@@ -27,7 +27,7 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.launcher.TestIdentifier;
-import org.junit.platform.launcher.core.TestExecutionListenerRegistry.EagerTestExecutionListener;
+import org.junit.platform.launcher.core.CompositeTestExecutionListener.EagerTestExecutionListener;
 
 /**
  * @since 1.3
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestExecutionListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestExecutionListenerRegistry.java
deleted file mode 100644
index a765144a6bf1..000000000000
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestExecutionListenerRegistry.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.launcher.core;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
-import org.junit.platform.commons.util.UnrecoverableExceptions;
-import org.junit.platform.engine.TestExecutionResult;
-import org.junit.platform.engine.reporting.ReportEntry;
-import org.junit.platform.launcher.TestExecutionListener;
-import org.junit.platform.launcher.TestIdentifier;
-import org.junit.platform.launcher.TestPlan;
-
-/**
- * @since 1.0
- */
-class TestExecutionListenerRegistry {
-	private static final Logger logger = LoggerFactory.getLogger(TestExecutionListenerRegistry.class);
-
-	private final List<TestExecutionListener> testExecutionListeners = new ArrayList<>();
-	private final List<EagerTestExecutionListener> eagerTestExecutionListeners = new ArrayList<>();
-
-	TestExecutionListenerRegistry() {
-		this(null);
-	}
-
-	TestExecutionListenerRegistry(TestExecutionListenerRegistry source) {
-		if (source != null) {
-			this.testExecutionListeners.addAll(source.testExecutionListeners);
-			this.eagerTestExecutionListeners.addAll(source.eagerTestExecutionListeners);
-		}
-	}
-
-	List<TestExecutionListener> getTestExecutionListeners() {
-		return testExecutionListeners;
-	}
-
-	void registerListeners(TestExecutionListener... listeners) {
-		Collections.addAll(this.testExecutionListeners, listeners);
-		// @formatter:off
-		Arrays.stream(listeners)
-				.filter(EagerTestExecutionListener.class::isInstance)
-				.map(EagerTestExecutionListener.class::cast)
-				.forEach(this.eagerTestExecutionListeners::add);
-		// @formatter:on
-	}
-
-	private <T extends TestExecutionListener> void notifyEach(List<T> listeners, Consumer<T> consumer,
-			Supplier<String> description) {
-		listeners.forEach(listener -> {
-			try {
-				consumer.accept(listener);
-			}
-			catch (Throwable throwable) {
-				UnrecoverableExceptions.rethrowIfUnrecoverable(throwable);
-				logger.warn(throwable, () -> String.format("TestExecutionListener [%s] threw exception for method: %s",
-					listener.getClass().getName(), description.get()));
-			}
-		});
-	}
-
-	TestExecutionListener getCompositeTestExecutionListener() {
-		return new CompositeTestExecutionListener();
-	}
-
-	private class CompositeTestExecutionListener implements TestExecutionListener {
-
-		@Override
-		public void dynamicTestRegistered(TestIdentifier testIdentifier) {
-			notifyEach(testExecutionListeners, listener -> listener.dynamicTestRegistered(testIdentifier),
-				() -> "dynamicTestRegistered(" + testIdentifier + ")");
-		}
-
-		@Override
-		public void executionSkipped(TestIdentifier testIdentifier, String reason) {
-			notifyEach(testExecutionListeners, listener -> listener.executionSkipped(testIdentifier, reason),
-				() -> "executionSkipped(" + testIdentifier + ", " + reason + ")");
-		}
-
-		@Override
-		public void executionStarted(TestIdentifier testIdentifier) {
-			notifyEach(eagerTestExecutionListeners, listener -> listener.executionJustStarted(testIdentifier),
-				() -> "executionJustStarted(" + testIdentifier + ")");
-			notifyEach(testExecutionListeners, listener -> listener.executionStarted(testIdentifier),
-				() -> "executionStarted(" + testIdentifier + ")");
-		}
-
-		@Override
-		public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-			notifyEach(eagerTestExecutionListeners,
-				listener -> listener.executionJustFinished(testIdentifier, testExecutionResult),
-				() -> "executionJustFinished(" + testIdentifier + ", " + testExecutionResult + ")");
-			notifyEach(testExecutionListeners,
-				listener -> listener.executionFinished(testIdentifier, testExecutionResult),
-				() -> "executionFinished(" + testIdentifier + ", " + testExecutionResult + ")");
-		}
-
-		@Override
-		public void testPlanExecutionStarted(TestPlan testPlan) {
-			notifyEach(testExecutionListeners, listener -> listener.testPlanExecutionStarted(testPlan),
-				() -> "testPlanExecutionStarted(" + testPlan + ")");
-		}
-
-		@Override
-		public void testPlanExecutionFinished(TestPlan testPlan) {
-			notifyEach(testExecutionListeners, listener -> listener.testPlanExecutionFinished(testPlan),
-				() -> "testPlanExecutionFinished(" + testPlan + ")");
-		}
-
-		@Override
-		public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
-			notifyEach(testExecutionListeners, listener -> listener.reportingEntryPublished(testIdentifier, entry),
-				() -> "reportingEntryPublished(" + testIdentifier + ", " + entry + ")");
-		}
-
-	}
-
-	interface EagerTestExecutionListener extends TestExecutionListener {
-		default void executionJustStarted(TestIdentifier testIdentifier) {
-		}
-
-		default void executionJustFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-		}
-	}
-
-}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
index e6d7ba2b277c..b04940c02cce 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
@@ -74,8 +74,11 @@ public static LauncherDiscoveryListener logging() {
 
 	@API(status = INTERNAL, since = "1.6")
 	public static LauncherDiscoveryListener composite(List<LauncherDiscoveryListener> listeners) {
-		Preconditions.notEmpty(listeners, "listeners must not be empty");
+		Preconditions.notNull(listeners, "listeners must not be null");
 		Preconditions.containsNoNullElements(listeners, "listeners must not contain any null elements");
+		if (listeners.isEmpty()) {
+			return LauncherDiscoveryListener.NOOP;
+		}
 		if (listeners.size() == 1) {
 			return listeners.get(0);
 		}
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index 76b7594ccacd..b50c3111bd61 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -266,7 +266,7 @@ private static void executeDirectly(TestEngine testEngine, EngineDiscoveryReques
 	private static void executeUsingLauncherOrchestration(TestEngine testEngine,
 			LauncherDiscoveryRequest discoveryRequest, EngineExecutionListener listener) {
 		TestDescriptor engineTestDescriptor;
-		LauncherDiscoveryResult discoveryResult = new EngineDiscoveryOrchestrator(singleton(testEngine), emptySet(),
+		LauncherDiscoveryResult discoveryResult = new EngineDiscoveryOrchestrator(singleton(testEngine),
 			emptySet()).discover(discoveryRequest, EXECUTION);
 		engineTestDescriptor = discoveryResult.getEngineTestDescriptor(testEngine);
 		Preconditions.notNull(engineTestDescriptor, "TestEngine did not yield a TestDescriptor");
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
similarity index 76%
rename from platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java
rename to platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
index 35d999c0ba4f..9da3af4a23b4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/TestExecutionListenerRegistryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
@@ -14,11 +14,12 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.platform.commons.logging.LogRecordListener;
@@ -30,24 +31,18 @@
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
+import org.junit.platform.launcher.core.CompositeTestExecutionListener.EagerTestExecutionListener;
 
 @TrackLogRecords
-class TestExecutionListenerRegistryTests {
+class CompositeTestExecutionListenerTests {
 
-	private TestExecutionListenerRegistry registry = new TestExecutionListenerRegistry();
-	private TestExecutionListener compositeTestExecutionListener;
-
-	@BeforeEach
-	void setUp() {
-		registry.registerListeners(new ThrowingTestExecutionListener());
-		compositeTestExecutionListener = registry.getCompositeTestExecutionListener();
-	}
+	private final List<TestExecutionListener> listeners = new ArrayList<>(List.of(new ThrowingTestExecutionListener()));
 
 	@Test
 	void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(LogRecordListener logRecordListener) {
 		var testIdentifier = getSampleMethodTestIdentifier();
 
-		compositeTestExecutionListener.dynamicTestRegistered(testIdentifier);
+		compositeTestExecutionListener().dynamicTestRegistered(testIdentifier);
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"dynamicTestRegistered");
@@ -57,7 +52,7 @@ void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(Log
 	void shouldNotThrowExceptionButLogIfExecutionStartedListenerMethodFails(LogRecordListener logRecordListener) {
 		var testIdentifier = getSampleMethodTestIdentifier();
 
-		compositeTestExecutionListener.executionStarted(testIdentifier);
+		compositeTestExecutionListener().executionStarted(testIdentifier);
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class, "executionStarted");
 	}
@@ -66,7 +61,7 @@ void shouldNotThrowExceptionButLogIfExecutionStartedListenerMethodFails(LogRecor
 	void shouldNotThrowExceptionButLogIfExecutionSkippedListenerMethodFails(LogRecordListener logRecordListener) {
 		var testIdentifier = getSampleMethodTestIdentifier();
 
-		compositeTestExecutionListener.executionSkipped(testIdentifier, "deliberately skipped container");
+		compositeTestExecutionListener().executionSkipped(testIdentifier, "deliberately skipped container");
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class, "executionSkipped");
 	}
@@ -75,7 +70,7 @@ void shouldNotThrowExceptionButLogIfExecutionSkippedListenerMethodFails(LogRecor
 	void shouldNotThrowExceptionButLogIfExecutionFinishedListenerMethodFails(LogRecordListener logRecordListener) {
 		var testIdentifier = getSampleMethodTestIdentifier();
 
-		compositeTestExecutionListener.executionFinished(testIdentifier, mock(TestExecutionResult.class));
+		compositeTestExecutionListener().executionFinished(testIdentifier, mock(TestExecutionResult.class));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class, "executionFinished");
 	}
@@ -85,7 +80,7 @@ void shouldNotThrowExceptionButLogIfReportingEntryPublishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
 		var testIdentifier = getSampleMethodTestIdentifier();
 
-		compositeTestExecutionListener.reportingEntryPublished(testIdentifier, ReportEntry.from("one", "two"));
+		compositeTestExecutionListener().reportingEntryPublished(testIdentifier, ReportEntry.from("one", "two"));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"reportingEntryPublished");
@@ -96,7 +91,7 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionStartedListenerMethodFails(
 			LogRecordListener logRecordListener) {
 		var testDescriptor = getDemoMethodTestDescriptor();
 
-		compositeTestExecutionListener.testPlanExecutionStarted(TestPlan.from(Set.of(testDescriptor)));
+		compositeTestExecutionListener().testPlanExecutionStarted(TestPlan.from(Set.of(testDescriptor)));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"testPlanExecutionStarted");
@@ -107,7 +102,7 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionFinishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
 		var testDescriptor = getDemoMethodTestDescriptor();
 
-		compositeTestExecutionListener.testPlanExecutionFinished(TestPlan.from(Set.of(testDescriptor)));
+		compositeTestExecutionListener().testPlanExecutionFinished(TestPlan.from(Set.of(testDescriptor)));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"testPlanExecutionFinished");
@@ -116,10 +111,10 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionFinishedListenerMethodFails(
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionJustStartedEagerTestListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		registry.registerListeners(new ThrowingEagerTestExecutionListener());
+		listeners.add(new ThrowingEagerTestExecutionListener());
 
 		var testIdentifier = getSampleMethodTestIdentifier();
-		compositeTestExecutionListener.executionStarted(testIdentifier);
+		compositeTestExecutionListener().executionStarted(testIdentifier);
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEagerTestExecutionListener.class,
 			"executionJustStarted");
@@ -128,10 +123,10 @@ void shouldNotThrowExceptionButLogIfExecutionJustStartedEagerTestListenerMethodF
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionJustFinishedEagerTestListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		registry.registerListeners(new ThrowingEagerTestExecutionListener());
+		listeners.add(new ThrowingEagerTestExecutionListener());
 
 		var testIdentifier = getSampleMethodTestIdentifier();
-		compositeTestExecutionListener.executionFinished(testIdentifier, mock(TestExecutionResult.class));
+		compositeTestExecutionListener().executionFinished(testIdentifier, mock(TestExecutionResult.class));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEagerTestExecutionListener.class,
 			"executionJustFinished");
@@ -139,45 +134,46 @@ void shouldNotThrowExceptionButLogIfExecutionJustFinishedEagerTestListenerMethod
 
 	@Test
 	void shouldThrowOutOfMemoryExceptionAndStopListenerWithoutLog(LogRecordListener logRecordListener) {
-		var registry = new TestExecutionListenerRegistry();
-		registry.registerListeners(new TestExecutionListener() {
+		listeners.clear();
+		listeners.add(new TestExecutionListener() {
 			@Override
 			public void executionStarted(TestIdentifier testIdentifier) {
 				throw new OutOfMemoryError();
 			}
 		});
 		var testIdentifier = getSampleMethodTestIdentifier();
-		assertThatThrownBy(
-			() -> registry.getCompositeTestExecutionListener().executionStarted(testIdentifier)).isInstanceOf(
-				OutOfMemoryError.class);
+		assertThatThrownBy(() -> compositeTestExecutionListener().executionStarted(testIdentifier)).isInstanceOf(
+			OutOfMemoryError.class);
 
 		assertNotLogs(logRecordListener);
 	}
 
 	@Test
 	void shouldThrowOutOfMemoryExceptionAndStopEagerListenerWithoutLog(LogRecordListener logRecordListener) {
-		var registry = new TestExecutionListenerRegistry();
-		registry.registerListeners(new TestExecutionListenerRegistry.EagerTestExecutionListener() {
+		listeners.add(new EagerTestExecutionListener() {
 			@Override
 			public void executionJustStarted(TestIdentifier testIdentifier) {
 				throw new OutOfMemoryError();
 			}
 		});
 		var testIdentifier = getSampleMethodTestIdentifier();
-		assertThatThrownBy(
-			() -> registry.getCompositeTestExecutionListener().executionStarted(testIdentifier)).isInstanceOf(
-				OutOfMemoryError.class);
+		assertThatThrownBy(() -> compositeTestExecutionListener().executionStarted(testIdentifier)).isInstanceOf(
+			OutOfMemoryError.class);
 
 		assertNotLogs(logRecordListener);
 	}
 
+	private TestExecutionListener compositeTestExecutionListener() {
+		return new CompositeTestExecutionListener(listeners);
+	}
+
 	private LogRecord firstWarnLogRecord(LogRecordListener logRecordListener) throws AssertionError {
-		return logRecordListener.stream(TestExecutionListenerRegistry.class, Level.WARNING).findFirst().orElseThrow(
+		return logRecordListener.stream(CompositeTestExecutionListener.class, Level.WARNING).findFirst().orElseThrow(
 			() -> new AssertionError("Failed to find error log record"));
 	}
 
 	private void assertNotLogs(LogRecordListener logRecordListener) throws AssertionError {
-		assertThat(logRecordListener.stream(TestExecutionListenerRegistry.class, Level.WARNING).count()).isZero();
+		assertThat(logRecordListener.stream(CompositeTestExecutionListener.class, Level.WARNING).count()).isZero();
 	}
 
 	private TestIdentifier getSampleMethodTestIdentifier() {
@@ -198,7 +194,7 @@ private DemoMethodTestDescriptor getDemoMethodTestDescriptor() {
 	}
 
 	private static class ThrowingEagerTestExecutionListener extends ThrowingTestExecutionListener
-			implements TestExecutionListenerRegistry.EagerTestExecutionListener {
+			implements EagerTestExecutionListener {
 		@Override
 		public void executionJustStarted(TestIdentifier testIdentifier) {
 			throw new RuntimeException("failed to invoke listener");
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 8910104380a8..0ff85c43cc1b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -94,35 +94,6 @@ void constructLauncherWithMultipleTestEnginesWithDuplicateIds() {
 		assertThat(exception).hasMessageContaining("multiple engines with the same ID");
 	}
 
-	@Test
-	void registerTestExecutionListenersWithNullArray() {
-		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"));
-
-		var exception = assertThrows(PreconditionViolationException.class,
-			() -> launcher.registerTestExecutionListeners((TestExecutionListener[]) null));
-
-		assertThat(exception).hasMessageContaining("listeners array must not be null or empty");
-	}
-
-	@Test
-	void registerTestExecutionListenersWithEmptyArray() {
-		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"));
-
-		var exception = assertThrows(PreconditionViolationException.class, launcher::registerTestExecutionListeners);
-
-		assertThat(exception).hasMessageContaining("listeners array must not be null or empty");
-	}
-
-	@Test
-	void registerTestExecutionListenersWithArrayContainingNullElements() {
-		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"));
-
-		var exception = assertThrows(PreconditionViolationException.class,
-			() -> launcher.registerTestExecutionListeners(new TestExecutionListener[] { null }));
-
-		assertThat(exception).hasMessageContaining("individual listeners must not be null");
-	}
-
 	@Test
 	void discoverEmptyTestPlanWithEngineWithoutAnyTests() {
 		var launcher = createLauncher(new DemoHierarchicalTestEngine());
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 13200078408c..982cd9b8b5bb 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -15,7 +15,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
-import static org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners.abortOnFailure;
 
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -24,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.TagFilter;
 import org.junit.platform.launcher.TestIdentifier;
@@ -46,7 +46,7 @@ void preconditions() {
 	void noopTestExecutionListenerIsLoadedViaServiceApi() {
 		withTestServices(() -> {
 			var launcher = (DefaultLauncher) LauncherFactory.create();
-			var listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
+			var listeners = launcher.getTestExecutionListenerRegistry().getListeners();
 			var listener = listeners.stream().filter(NoopTestExecutionListener.class::isInstance).findFirst();
 			assertThat(listener).isPresent();
 		});
@@ -56,7 +56,7 @@ void noopTestExecutionListenerIsLoadedViaServiceApi() {
 	void unusedTestExecutionListenerIsNotLoadedViaServiceApi() {
 		withTestServices(() -> {
 			var launcher = (DefaultLauncher) LauncherFactory.create();
-			var listeners = launcher.getTestExecutionListenerRegistry().getTestExecutionListeners();
+			var listeners = launcher.getTestExecutionListenerRegistry().getListeners();
 
 			assertThat(listeners).filteredOn(AnotherUnusedTestExecutionListener.class::isInstance).isEmpty();
 			assertThat(listeners).filteredOn(UnusedTestExecutionListener.class::isInstance).isEmpty();
@@ -173,9 +173,9 @@ void doesNotDiscoverLauncherDiscoverRequestListenerViaServiceApiWhenDisabled() {
 		withTestServices(() -> {
 			var launcher = (DefaultLauncher) LauncherFactory.create(
 				LauncherConfig.builder().enableLauncherDiscoveryListenerAutoRegistration(false).build());
-			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListener(request().build());
+			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListenerRegistry().getCompositeListener();
 
-			assertThat(launcherDiscoveryListener).isEqualTo(abortOnFailure());
+			assertThat(launcherDiscoveryListener).isSameAs(LauncherDiscoveryListener.NOOP);
 		});
 	}
 
@@ -183,11 +183,11 @@ void doesNotDiscoverLauncherDiscoverRequestListenerViaServiceApiWhenDisabled() {
 	void discoversLauncherDiscoverRequestListenerViaServiceApiByDefault() {
 		withTestServices(() -> {
 			var launcher = (DefaultLauncher) LauncherFactory.create();
-			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListener(request().build());
+			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListenerRegistry().getCompositeListener();
 
 			assertThat(launcherDiscoveryListener.getClass().getSimpleName()).startsWith("Composite");
 			assertThat(launcherDiscoveryListener).extracting("listeners").asList() //
-					.contains(new TestLauncherDiscoveryListener(), abortOnFailure());
+					.contains(new TestLauncherDiscoveryListener());
 		});
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
new file mode 100644
index 000000000000..68c7b6b5478f
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.commons.PreconditionViolationException;
+
+public class ListenerRegistryTests {
+
+	@Test
+	void registerWithNullArray() {
+		var registry = ListenerRegistry.create(l -> l.get(0));
+
+		var exception = assertThrows(PreconditionViolationException.class, () -> registry.addAll((Object[]) null));
+
+		assertThat(exception).hasMessageContaining("listeners array must not be null or empty");
+	}
+
+	@Test
+	void registerWithEmptyArray() {
+		var registry = ListenerRegistry.create(l -> l.get(0));
+
+		var exception = assertThrows(PreconditionViolationException.class, registry::addAll);
+
+		assertThat(exception).hasMessageContaining("listeners array must not be null or empty");
+	}
+
+	@Test
+	void registerWithArrayContainingNullElements() {
+		var registry = ListenerRegistry.create(l -> l.get(0));
+
+		var exception = assertThrows(PreconditionViolationException.class,
+			() -> registry.addAll(new Object[] { null }));
+
+		assertThat(exception).hasMessageContaining("individual listeners must not be null");
+	}
+}
diff --git a/platform-tests/src/test/resources/log4j2-test.xml b/platform-tests/src/test/resources/log4j2-test.xml
index 0490911338f5..653e2017872e 100644
--- a/platform-tests/src/test/resources/log4j2-test.xml
+++ b/platform-tests/src/test/resources/log4j2-test.xml
@@ -11,7 +11,7 @@
 		<Logger name="org.junit.platform.engine.support.descriptor.DemoClassTestDescriptor" level="error" />
 		<Logger name="org.junit.platform.launcher.core.EngineIdValidator" level="fatal" />
 		<Logger name="org.junit.platform.launcher.core.InternalTestPlan" level="error" />
-		<Logger name="org.junit.platform.launcher.core.TestExecutionListenerRegistry" level="error" />
+		<Logger name="org.junit.platform.launcher.core.CompositeTestExecutionListener" level="error" />
 		<Logger name="org.junit.platform.launcher.listeners.discovery.LoggingLauncherDiscoveryListener" level="off" />
 		<Logger name="org.junit.ApiReportGenerator" level="error" />
 		<Logger name="org.junit.vintage.engine" level="error" />

From 7be6fdec7c6b0cbed5f1349a8e550f13eaf7834c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Jan 2021 21:43:19 +0100
Subject: [PATCH 0156/1433] Introduce LauncherSession{Listener}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implementations of `TestExecutionListener` and (starting with 5.8)
`LauncherDiscoveryListener` can be registered via ServiceLoader on each
`Launcher` created via `LauncherFactory`. Implementing one of those
listeners, in particular the former, allows to have custom setup or
teardown code executed once for the entire test run across multiple
test engines. Use cases include starting and stopping an external
process, replacing the class loader, initializing some library etc.
However, subsequent calls to `Launcher.execute` currently cause that
setup / teardown code to be executed again which is not desirable,
especially if it’s slow. However, for example the Maven Surefire plugin
attempts to rerun failed tests if `rerunFailingTestsCount` is set or
(when https://issues.apache.org/jira/browse/SUREFIRE-1725 is released)
will even execute every test class in a separate request.

We could make the `Launcher` interface extend `AutoCloseable`. Calling
`close()` would signal that it’s no longer used and any teardown code
should be run. Since we can’t change `Launcher` in that way without
breaking existing usages (which wouldn’t call `close()`), this commit
introduces a new concept: a closeable `LauncherSession`. Tools that
potentially call `Launcher.discover` or `Launcher.execute` multiple
times should first open a session and close it when they’re done.
Instances of `LauncherSessionListener` — which are registered via
ServiceLoader (by default, can be disabled) or explicitly via a
`LauncherConfig` — are called when the session is opened and closed.
Each listener can then get access to the `Launcher` to register
discovery/execution listeners via `LauncherSession.getLauncher`, e.g.
to postpone setup until the first execution.

To ensure `LauncherSessionListener` gets called even by tools that do
not (yet) use sessions, the `Launcher` created via
`LauncherFactory.create` opens and closes a session for each call to
`Launcher.discover` or `Launcher.execute`.
---
 documentation/documentation.gradle.kts        |   6 +-
 .../src/docs/asciidoc/link-attributes.adoc    |   7 +-
 .../release-notes/release-notes-5.8.0-M1.adoc |   7 +-
 .../docs/asciidoc/user-guide/extensions.adoc  |   6 +-
 .../asciidoc/user-guide/launcher-api.adoc     |  62 +++++----
 .../java/example/UsingTheLauncherDemo.java    |  55 ++++++--
 .../launcher/LauncherDiscoveryListener.java   |   1 +
 .../platform/launcher/LauncherSession.java    |  49 +++++++
 .../launcher/LauncherSessionListener.java     |  64 +++++++++
 .../launcher/core/DefaultLauncher.java        |   8 +-
 .../launcher/core/DefaultLauncherConfig.java  |  26 ++++
 .../launcher/core/DefaultLauncherSession.java | 127 ++++++++++++++++++
 .../launcher/core/InternalLauncher.java       |  25 ++++
 .../launcher/core/LauncherConfig.java         | 104 +++++++++++++-
 .../launcher/core/LauncherFactory.java        |  66 +++++++--
 .../launcher/core/ListenerRegistry.java       |   6 +
 ...aderLauncherDiscoveryListenerRegistry.java |  38 ------
 ...viceLoaderPostDiscoveryFilterRegistry.java |  38 ------
 ...gistry.java => ServiceLoaderRegistry.java} |  14 +-
 .../core/SessionPerRequestLauncher.java       |  77 +++++++++++
 .../CompositeLauncherSessionListener.java     |  41 ++++++
 .../session/LauncherSessionListeners.java     |  45 +++++++
 .../listeners/session/package-info.java       |   9 ++
 .../module-info.java                          |   1 +
 ...LauncherFactoryForTestingPurposesOnly.java |  11 +-
 .../launcher/TestLauncherSessionListener.java |  30 +++++
 .../launcher/core/LauncherConfigTests.java    |  28 +++-
 .../launcher/core/LauncherFactoryTests.java   |  29 +++-
 .../launcher/core/LauncherSessionTests.java   | 106 +++++++++++++++
 ....platform.launcher.LauncherSessionListener |   1 +
 .../junit-platform-launcher.expected.txt      |   1 +
 .../projects/standalone/expected-err.txt      |   8 +-
 32 files changed, 942 insertions(+), 154 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
 delete mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderLauncherDiscoveryListenerRegistry.java
 delete mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderPostDiscoveryFilterRegistry.java
 rename junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/{ServiceLoaderTestExecutionListenerRegistry.java => ServiceLoaderRegistry.java} (66%)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/package-info.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
 create mode 100644 platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherSessionListener

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 4cb26b1433ca..f3b6cb564ce5 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -93,6 +93,7 @@ val consoleLauncherOptionsFile = File(generatedAsciiDocPath, "console-launcher-o
 val experimentalApisTableFile = File(generatedAsciiDocPath, "experimental-apis-table.txt")
 val deprecatedApisTableFile = File(generatedAsciiDocPath, "deprecated-apis-table.txt")
 
+val jdkJavadocBaseUrl = "https://docs.oracle.com/en/java/javase/11/docs/api"
 val elementListsDir = file("$buildDir/elementLists")
 val externalModulesWithoutModularJavadoc = mapOf(
 		"org.apiguardian.api" to "https://apiguardian-team.github.io/apiguardian/docs/$apiGuardianDocVersion/api/",
@@ -181,7 +182,8 @@ tasks {
 				"icons" to "font",
 				"sectanchors" to true,
 				"idprefix" to "",
-				"idseparator" to "-"
+				"idseparator" to "-",
+				"jdk-javadoc-base-url" to jdkJavadocBaseUrl
 		))
 
 		sourceSets["test"].apply {
@@ -268,7 +270,7 @@ tasks {
 					"implNote:a:Implementation Note:"
 			)
 
-			links("https://docs.oracle.com/en/java/javase/11/docs/api/")
+			links(jdkJavadocBaseUrl)
 			links("https://junit.org/junit4/javadoc/${versions.junit4}/")
 			externalModulesWithoutModularJavadoc.forEach { (moduleName, baseUrl) ->
 				linksOffline(baseUrl, "$elementListsDir/$moduleName")
diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index a994609b335a..0c0efa94d34c 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -27,11 +27,15 @@ endif::[]
 // Platform Launcher API
 :junit-platform-launcher:                    {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/package-summary.html[junit-platform-launcher]
 :Launcher:                                   {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/Launcher.html[Launcher]
+:LauncherConfig:                             {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/core/LauncherConfig.html[LauncherConfig]
 :LauncherDiscoveryListener:                  {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/LauncherDiscoveryListener.html[LauncherDiscoveryListener]
 :LauncherDiscoveryRequest:                   {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/LauncherDiscoveryRequest.html[LauncherDiscoveryRequest]
-:PostDiscoveryFilter:                   {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/PostDiscoveryFilter.html[PostDiscoveryFilter]
 :LauncherDiscoveryRequestBuilder:            {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.html[LauncherDiscoveryRequestBuilder]
+:LauncherFactory:                            {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/core/LauncherFactory.html[LauncherFactory]
+:LauncherSession:                            {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/LauncherSession.html[LauncherSession]
+:LauncherSessionListener:                    {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/LauncherSessionListener.html[LauncherSessionListener]
 :LoggingListener:                            {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/listeners/LoggingListener.html[LoggingListener]
+:PostDiscoveryFilter:                        {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/PostDiscoveryFilter.html[PostDiscoveryFilter]
 :SummaryGeneratingListener:                  {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/listeners/SummaryGeneratingListener.html[SummaryGeneratingListener]
 :TestExecutionListener:                      {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/TestExecutionListener.html[TestExecutionListener]
 :TestPlan:                                   {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/TestPlan.html[TestPlan]
@@ -163,6 +167,7 @@ endif::[]
 :LogManager:                                 https://docs.oracle.com/javase/8/docs/api/java/util/logging/LogManager.html[LogManager]
 :Maven_Central:                              https://search.maven.org/[Maven Central]
 :MockitoExtension:                           https://github.com/mockito/mockito/blob/release/2.x/subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoExtension.java[MockitoExtension]
+:ServiceLoader:                              {jdk-javadoc-base-url}/java.base/java/util/ServiceLoader.html[ServiceLoader]
 :SpringExtension:                            https://github.com/spring-projects/spring-framework/tree/HEAD/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java[SpringExtension]
 :StackOverflow:                              https://stackoverflow.com/questions/tagged/junit5[Stack Overflow]
 :Truth:                                      https://truth.dev/[Truth]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index f40414c2fe2e..77d5e0c5267c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -34,12 +34,17 @@ on GitHub.
 * The `junit-platform-jfr` module now also reports test discovery events for the launcher
   and registered test engines.
 * Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
-  `ServiceLoader` mechanism.
+  `{ServiceLoader}` mechanism.
 * Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
 * Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
   longer store `String` representations of unique IDs.
 * Improvement of `ExclusiveResource` handling, if a `Node` has only read locks and no read-write locks,
   then descendants are not forced into `SAME_THREAD` execution, and can run concurrently.
+* Tools that make multiple calls to the `Launcher` API should now create a
+  `LauncherSession` instead in order to allow for executing global setup and teardown code
+  exactly once via the new `LauncherSessionListener` interface that can be registered via
+  Java’s `{ServiceLoader}` mechanism.
+
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index 3ad1310f8a26..b31110332c12 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -206,8 +206,8 @@ include::{testDir}/example/registration/DocumentationDemo.java[tags=user_guide]
 In addition to <<extensions-registration-declarative,declarative extension registration>>
 and <<extensions-registration-programmatic,programmatic extension registration>> support
 using annotations, JUnit Jupiter also supports _global extension registration_ via Java's
-`java.util.ServiceLoader` mechanism, allowing third-party extensions to be auto-detected
-and automatically registered based on what is available in the classpath.
+`{ServiceLoader}` mechanism, allowing third-party extensions to be auto-detected and
+automatically registered based on what is available in the classpath.
 
 Specifically, a custom extension can be registered by supplying its fully qualified class
 name in a file named `org.junit.jupiter.api.extension.Extension` within the
@@ -227,7 +227,7 @@ following system property.
 
 `-Djunit.jupiter.extensions.autodetection.enabled=true`
 
-When auto-detection is enabled, extensions discovered via the `ServiceLoader` mechanism
+When auto-detection is enabled, extensions discovered via the `{ServiceLoader}` mechanism
 will be added to the extension registry after JUnit Jupiter's global extensions (e.g.,
 support for `TestInfo`, `TestReporter`, etc.).
 
diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index c22b70ef12e2..441f8f7b8376 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -80,11 +80,10 @@ JUnit currently provides two `{TestEngine}` implementations.
 
 Third parties may also contribute their own `TestEngine` by implementing the interfaces
 in the {junit-platform-engine} module and _registering_ their engine. By default, engine
-registration is supported via Java's `java.util.ServiceLoader` mechanism. For example,
-the `junit-jupiter-engine` module registers its
-`org.junit.jupiter.engine.JupiterTestEngine` in a file named
-`org.junit.platform.engine.TestEngine` within the `/META-INF/services` in the
-`junit-jupiter-engine` JAR.
+registration is supported via Java's `{ServiceLoader}` mechanism. For example, the
+`junit-jupiter-engine` module registers its `org.junit.jupiter.engine.JupiterTestEngine`
+in a file named `org.junit.platform.engine.TestEngine` within the `/META-INF/services` in
+the `junit-jupiter-engine` JAR.
 
 NOTE: `{HierarchicalTestEngine}` is a convenient abstract base implementation (used by
 the `{junit-jupiter-engine}`) that only requires implementors to provide the logic for
@@ -110,36 +109,52 @@ by the JUnit Team may use the `junit-` prefix for their `TestEngine` IDs.
 
 In addition to specifying post-discovery filters as part of a `{LauncherDiscoveryRequest}`
 passed to the `{Launcher}` API, by default custom `{PostDiscoveryFilter}` implementations
-will be discovered at runtime via Java's `java.util.ServiceLoader` mechanism and
-automatically applied by the `Launcher` in addition to those that are part of the request.
+will be discovered at runtime via Java's `{ServiceLoader}` mechanism and automatically
+applied by the `Launcher` in addition to those that are part of the request.
 
 For example, an `example.CustomTagFilter` class implementing `{PostDiscoveryFilter}` and
 declared within the `/META-INF/services/org.junit.platform.launcher.PostDiscoveryFilter`
 file is loaded and applied automatically.
 
+[[launcher-api-launcher-session-listeners-custom]]
+==== Plugging in your own Launcher Sessions Listeners
+
+Registered implementations of `{LauncherSessionListener}` are notified when a
+`{LauncherSession}` is opened, i.e. before a `{Launcher}` first discovers and executes
+tests, and closed, i.e. when no more tests will be discovered or executed. They can be
+registered programmatically on the `{LauncherConfig}` that is passed to
+`{LauncherFactory}` or, unless disabled, will be discovered at runtime via Java's
+`{ServiceLoader}` mechanism and automatically registered with `{LauncherSession}`.
+
+For example, an `example.CustomLauncherSessionListener` class implementing
+`{LauncherSessionListener}` and declared within the
+`/META-INF/services/org.junit.platform.launcher.LauncherSessionListener` file is loaded
+and registered automatically.
+
 [[launcher-api-launcher-discovery-listeners-custom]]
 ==== Plugging in your own Discovery Listeners
 
-In addition to specifying post-discovery filters as part of a `{LauncherDiscoveryRequest}`
-passed to the `{Launcher}` API, custom `{LauncherDiscoveryListener}` implementations can
-be discovered at runtime via Java's `java.util.ServiceLoader` mechanism and automatically
-automatically registered with the `Launcher` created via the `LauncherFactory`.
+In addition to specifying discovery listeners as part of a `{LauncherDiscoveryRequest}`
+or registering them programmatically using the public `{Launcher}` API method,  custom
+`{LauncherDiscoveryListener}` implementations can be discovered at runtime via Java's
+`{ServiceLoader}` mechanism and automatically registered with the `{Launcher}` created via
+the `{LauncherFactory}`.
 
 For example, an `example.CustomLauncherDiscoveryListener` class implementing
 `{LauncherDiscoveryListener}` and declared within the
 `/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener` file is loaded
-and applied automatically.
+and registered automatically.
 
 [[launcher-api-listeners-custom]]
 ==== Plugging in your own Execution Listener
 
 In addition to the public `{Launcher}` API method for registering test execution
 listeners programmatically, by default custom `{TestExecutionListener}` implementations
-will be discovered at runtime via Java's `java.util.ServiceLoader` mechanism and
-automatically registered with the `Launcher` created via the `LauncherFactory`.
+will be discovered at runtime via Java's `{ServiceLoader}` mechanism and automatically
+registered with the `{Launcher}` created via the `{LauncherFactory}`.
 
-For example, an `example.TestInfoPrinter` class implementing `{TestExecutionListener}` and
-declared within the
+For example, an `example.CustomTestExecutionListener` class implementing
+`{TestExecutionListener}` and declared within the
 `/META-INF/services/org.junit.platform.launcher.TestExecutionListener` file is loaded and
 registered automatically.
 
@@ -147,7 +162,7 @@ registered automatically.
 ==== Deactivating Execution Listeners
 
 Sometimes it can be useful to run a test suite _without_ certain execution listeners being
-active. For example, you might have custom a `TestExecutionListener` that sends the test
+active. For example, you might have custom a `{TestExecutionListener}` that sends the test
 results to an external system for reporting purposes, and while debugging you might not
 want these _debug_ results to be reported. To do this, provide a pattern for the
 `junit.platform.execution.listeners.deactivate` _configuration parameter_ to specify which
@@ -155,17 +170,17 @@ execution listeners should be deactivated (i.e. not registered) for the current
 
 [NOTE]
 ====
-Only listeners registered via the `ServiceLoader` mechanism within the
+Only listeners registered via the `{ServiceLoader}` mechanism within the
 `/META-INF/services/org.junit.platform.launcher.TestExecutionListener` file can be
 deactivated. In other words, any `TestExecutionListener` registered explicitly via the
-`LauncherDiscoveryRequest` cannot be deactivated via the
+`{LauncherDiscoveryRequest}` cannot be deactivated via the
 `junit.platform.execution.listeners.deactivate` _configuration parameter_.
 
 In addition, since execution listeners are registered before the test run starts, the
 `junit.platform.execution.listeners.deactivate` _configuration parameter_ can only be
 supplied as a JVM system property or via the JUnit Platform configuration file (see
 <<running-tests-config-params>> for details). This _configuration parameter_ cannot be
-supplied in the `LauncherDiscoveryRequest` that is passed to the `Launcher`.
+supplied in the `{LauncherDiscoveryRequest}` that is passed to the `{Launcher}`.
 ====
 
 [[launcher-api-listeners-custom-deactivation-pattern]]
@@ -195,10 +210,9 @@ implementations that can be used for reporting purposes. See `{LoggingListener}`
 ==== Configuring the Launcher
 
 If you require fine-grained control over automatic detection and registration of test
-engines and test execution listeners, you may create an instance of `LauncherConfig` and
-supply that to the `LauncherFactory.create(LauncherConfig)` method. Typically an instance
-of `LauncherConfig` is created via the built-in fluent _builder_ API, as demonstrated in
-the following example.
+engines and test execution listeners, you may create an instance of `{LauncherConfig}` and
+supply that to the `{LauncherFactory}`. Typically, an instance of `{LauncherConfig}` is
+created via the built-in fluent _builder_ API, as demonstrated in the following example.
 
 [source,java,indent=0]
 ----
diff --git a/documentation/src/test/java/example/UsingTheLauncherDemo.java b/documentation/src/test/java/example/UsingTheLauncherDemo.java
index e7e2dbe001b3..2ecba15089d6 100644
--- a/documentation/src/test/java/example/UsingTheLauncherDemo.java
+++ b/documentation/src/test/java/example/UsingTheLauncherDemo.java
@@ -19,8 +19,14 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import org.junit.platform.engine.FilterResult;
+import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
+import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.core.LauncherConfig;
@@ -51,9 +57,11 @@ void discovery() {
 			)
 			.build();
 
-		Launcher launcher = LauncherFactory.create();
+		try (LauncherSession session = LauncherFactory.openSession()) {
+			TestPlan testPlan = session.getLauncher().discover(request);
 
-		TestPlan testPlan = launcher.discover(request);
+			// ... discover additional test plans or execute tests
+		}
 		// end::discovery[]
 		// @formatter:on
 	}
@@ -73,16 +81,22 @@ void execution() {
 			)
 			.build();
 
-		Launcher launcher = LauncherFactory.create();
-
-		// Register a listener of your choice
 		SummaryGeneratingListener listener = new SummaryGeneratingListener();
-		launcher.registerTestExecutionListeners(listener);
 
-		launcher.execute(request);
+		try (LauncherSession session = LauncherFactory.openSession()) {
+			Launcher launcher = session.getLauncher();
+			// Register a listener of your choice
+			launcher.registerTestExecutionListeners(listener);
+			// Discover tests and build a test plan
+			TestPlan testPlan = launcher.discover(request);
+			// Execute test plan
+			launcher.execute(testPlan);
+			// Alternatively, execute the request directly
+			launcher.execute(request);
+		}
 
 		TestExecutionSummary summary = listener.getSummary();
-		// Do something with the TestExecutionSummary.
+		// Do something with the summary...
 
 		// end::execution[]
 		// @formatter:on
@@ -96,19 +110,25 @@ void launcherConfig() {
 		// tag::launcherConfig[]
 		LauncherConfig launcherConfig = LauncherConfig.builder()
 			.enableTestEngineAutoRegistration(false)
+			.enableLauncherSessionListenerAutoRegistration(false)
+			.enableLauncherDiscoveryListenerAutoRegistration(false)
+			.enablePostDiscoveryFilterAutoRegistration(false)
 			.enableTestExecutionListenerAutoRegistration(false)
 			.addTestEngines(new CustomTestEngine())
+			.addLauncherSessionListeners(new CustomLauncherSessionListener())
+			.addLauncherDiscoveryListeners(new CustomLauncherDiscoveryListener())
+			.addPostDiscoveryFilters(new CustomPostDiscoveryFilter())
 			.addTestExecutionListeners(new LegacyXmlReportGeneratingListener(reportsDir, out))
 			.addTestExecutionListeners(new CustomTestExecutionListener())
 			.build();
 
-		Launcher launcher = LauncherFactory.create(launcherConfig);
-
 		LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
 			.selectors(selectPackage("com.example.mytests"))
 			.build();
 
-		launcher.execute(request);
+		try (LauncherSession session = LauncherFactory.openSession(launcherConfig)) {
+			session.getLauncher().execute(request);
+		}
 		// end::launcherConfig[]
 		// @formatter:on
 	}
@@ -120,3 +140,16 @@ class MyTestClass {
 
 class CustomTestExecutionListener implements TestExecutionListener {
 }
+
+class CustomLauncherSessionListener implements LauncherSessionListener {
+}
+
+class CustomLauncherDiscoveryListener implements LauncherDiscoveryListener {
+}
+
+class CustomPostDiscoveryFilter implements PostDiscoveryFilter {
+	@Override
+	public FilterResult apply(TestDescriptor object) {
+		return FilterResult.included("includes everything");
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index dd4b58d72ec3..2e1dbf99017c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -35,6 +35,7 @@
  *
  * @see org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners
  * @see LauncherDiscoveryRequest#getDiscoveryListener()
+ * @see org.junit.platform.launcher.core.LauncherConfig.Builder#addLauncherDiscoveryListeners
  * @since 1.6
  */
 @API(status = EXPERIMENTAL, since = "1.6")
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
new file mode 100644
index 000000000000..7be37218c5c4
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+import org.junit.platform.launcher.core.LauncherFactory;
+
+/**
+ * The {@code LauncherSession} API is the main entry point for client code that
+ * wishes to repeatedly <em>discover</em> and <em>execute</em> tests using one
+ * or more {@linkplain org.junit.platform.engine.TestEngine test engines}.
+ *
+ * @see Launcher
+ * @see LauncherSessionListener
+ * @see LauncherFactory
+ * @since 1.8
+ */
+@API(status = EXPERIMENTAL, since = "1.8")
+public interface LauncherSession extends AutoCloseable {
+
+	/**
+	 * Get the {@link Launcher} associated with this session.
+	 *
+	 * <p>Any call to the launcher returned by this method after the session has
+	 * been closed, will throw an exception.
+	 */
+	Launcher getLauncher();
+
+	/**
+	 * Close this session and notify all registered
+	 * {@link LauncherSessionListener LauncherSessionListeners}.
+	 *
+	 * @apiNote The behavior of calling this method concurrently with any call
+	 * to the {@link Launcher} returned by {@link #getLauncher()} is currently
+	 * undefined.
+	 */
+	@Override
+	void close();
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
new file mode 100644
index 000000000000..eedc7ff4405a
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+import org.junit.platform.launcher.core.LauncherConfig;
+import org.junit.platform.launcher.core.LauncherFactory;
+
+/**
+ * Register an implementation of this interface with the
+ * {@link LauncherConfig.Builder#addLauncherSessionListeners LauncherConfig}
+ * passed to
+ * {@link LauncherFactory#openSession(LauncherConfig) LauncherFactory} or via
+ * ServiceLoader to be notified when a {@link LauncherSession} is opened and
+ * closed.
+ *
+ * <p>All methods in this class have empty <em>default</em> implementations.
+ * Subclasses may therefore override one or more of these methods to be notified
+ * of the selected events.
+ *
+ * <p>The methods declared in this interface are called by the {@link Launcher}
+ * or {@link LauncherSession} created via the {@link LauncherFactory}.
+ *
+ * @see LauncherSession
+ * @see LauncherConfig.Builder#addLauncherSessionListeners
+ * @see LauncherFactory
+ * @since 1.8
+ */
+@API(status = EXPERIMENTAL, since = "1.8")
+public interface LauncherSessionListener {
+
+	/**
+	 * No-op implementation of {@code LauncherSessionListener}
+	 */
+	LauncherSessionListener NOOP = new LauncherSessionListener() {
+	};
+
+	/**
+	 * Called when a launcher session was opened.
+	 *
+	 * @param session the opened session
+	 */
+	default void launcherSessionOpened(LauncherSession session) {
+	}
+
+	/**
+	 * Called when a launcher session was closed.
+	 *
+	 * @param session the closed session
+	 */
+	default void launcherSessionClosed(LauncherSession session) {
+	}
+
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index d6fcfbb4bf6b..8e2a5c97597c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -35,7 +35,7 @@
  * @see Launcher
  * @see LauncherFactory
  */
-class DefaultLauncher implements Launcher {
+class DefaultLauncher implements InternalLauncher {
 
 	private final ListenerRegistry<LauncherDiscoveryListener> launcherDiscoveryListenerRegistry = ListenerRegistry.forLauncherDiscoveryListeners();
 	private final ListenerRegistry<TestExecutionListener> testExecutionListenerRegistry = ListenerRegistry.forTestExecutionListeners();
@@ -95,11 +95,13 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 		execute((InternalTestPlan) testPlan, listeners);
 	}
 
-	ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
+	@Override
+	public ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
 		return testExecutionListenerRegistry;
 	}
 
-	ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
+	@Override
+	public ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
 		return launcherDiscoveryListenerRegistry;
 	}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
index 7ca4875e0544..be1046cc4bac 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
@@ -15,6 +15,8 @@
 import java.util.Collection;
 
 import org.junit.platform.engine.TestEngine;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestExecutionListener;
 
@@ -26,24 +28,33 @@
 class DefaultLauncherConfig implements LauncherConfig {
 
 	private final boolean testEngineAutoRegistrationEnabled;
+	private final boolean launcherSessionListenerAutoRegistrationEnabled;
 	private final boolean launcherDiscoveryListenerAutoRegistrationEnabled;
 	private final boolean testExecutionListenerAutoRegistrationEnabled;
 	private final boolean postDiscoveryFilterAutoRegistrationEnabled;
 	private final Collection<TestEngine> additionalTestEngines;
+	private final Collection<LauncherSessionListener> additionalLauncherSessionListeners;
+	private final Collection<LauncherDiscoveryListener> additionalLauncherDiscoveryListeners;
 	private final Collection<TestExecutionListener> additionalTestExecutionListeners;
 	private final Collection<PostDiscoveryFilter> additionalPostDiscoveryFilters;
 
 	DefaultLauncherConfig(boolean testEngineAutoRegistrationEnabled,
+			boolean launcherSessionListenerAutoRegistrationEnabled,
 			boolean launcherDiscoveryListenerAutoRegistrationEnabled,
 			boolean testExecutionListenerAutoRegistrationEnabled, boolean postDiscoveryFilterAutoRegistrationEnabled,
 			Collection<TestEngine> additionalTestEngines,
+			Collection<LauncherSessionListener> additionalLauncherSessionListeners,
+			Collection<LauncherDiscoveryListener> additionalLauncherDiscoveryListeners,
 			Collection<TestExecutionListener> additionalTestExecutionListeners,
 			Collection<PostDiscoveryFilter> additionalPostDiscoveryFilters) {
+		this.launcherSessionListenerAutoRegistrationEnabled = launcherSessionListenerAutoRegistrationEnabled;
 		this.launcherDiscoveryListenerAutoRegistrationEnabled = launcherDiscoveryListenerAutoRegistrationEnabled;
 		this.testExecutionListenerAutoRegistrationEnabled = testExecutionListenerAutoRegistrationEnabled;
 		this.testEngineAutoRegistrationEnabled = testEngineAutoRegistrationEnabled;
 		this.postDiscoveryFilterAutoRegistrationEnabled = postDiscoveryFilterAutoRegistrationEnabled;
 		this.additionalTestEngines = unmodifiableCollection(additionalTestEngines);
+		this.additionalLauncherSessionListeners = unmodifiableCollection(additionalLauncherSessionListeners);
+		this.additionalLauncherDiscoveryListeners = unmodifiableCollection(additionalLauncherDiscoveryListeners);
 		this.additionalTestExecutionListeners = unmodifiableCollection(additionalTestExecutionListeners);
 		this.additionalPostDiscoveryFilters = unmodifiableCollection(additionalPostDiscoveryFilters);
 	}
@@ -53,6 +64,11 @@ public boolean isTestEngineAutoRegistrationEnabled() {
 		return this.testEngineAutoRegistrationEnabled;
 	}
 
+	@Override
+	public boolean isLauncherSessionListenerAutoRegistrationEnabled() {
+		return launcherSessionListenerAutoRegistrationEnabled;
+	}
+
 	@Override
 	public boolean isLauncherDiscoveryListenerAutoRegistrationEnabled() {
 		return launcherDiscoveryListenerAutoRegistrationEnabled;
@@ -73,6 +89,16 @@ public Collection<TestEngine> getAdditionalTestEngines() {
 		return this.additionalTestEngines;
 	}
 
+	@Override
+	public Collection<LauncherSessionListener> getAdditionalLauncherSessionListeners() {
+		return additionalLauncherSessionListeners;
+	}
+
+	@Override
+	public Collection<LauncherDiscoveryListener> getAdditionalLauncherDiscoveryListeners() {
+		return additionalLauncherDiscoveryListeners;
+	}
+
 	@Override
 	public Collection<TestExecutionListener> getAdditionalTestExecutionListeners() {
 		return this.additionalTestExecutionListeners;
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
new file mode 100644
index 000000000000..f9e19979a48f
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
+
+/**
+ * @since 1.8
+ */
+class DefaultLauncherSession implements LauncherSession {
+
+	private final DelegatingLauncher launcher;
+	private final LauncherSessionListener listener;
+
+	DefaultLauncherSession(Launcher launcher, LauncherSessionListener listener) {
+		this.launcher = new DelegatingLauncher(launcher);
+		this.listener = listener;
+		listener.launcherSessionOpened(this);
+	}
+
+	@Override
+	public Launcher getLauncher() {
+		return launcher;
+	}
+
+	LauncherSessionListener getListener() {
+		return listener;
+	}
+
+	@Override
+	public void close() {
+		if (launcher.getDelegate() != ClosedLauncher.INSTANCE) {
+			launcher.setDelegate(ClosedLauncher.INSTANCE);
+			listener.launcherSessionClosed(this);
+		}
+	}
+
+	private static class DelegatingLauncher implements Launcher {
+
+		private Launcher delegate;
+
+		DelegatingLauncher(Launcher delegate) {
+			this.delegate = delegate;
+		}
+
+		public Launcher getDelegate() {
+			return delegate;
+		}
+
+		public void setDelegate(Launcher delegate) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
+			delegate.registerLauncherDiscoveryListeners(listeners);
+		}
+
+		@Override
+		public void registerTestExecutionListeners(TestExecutionListener... listeners) {
+			delegate.registerTestExecutionListeners(listeners);
+		}
+
+		@Override
+		public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
+			return delegate.discover(launcherDiscoveryRequest);
+		}
+
+		@Override
+		public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecutionListener... listeners) {
+			delegate.execute(launcherDiscoveryRequest, listeners);
+		}
+
+		@Override
+		public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
+			delegate.execute(testPlan, listeners);
+		}
+	}
+
+	private static class ClosedLauncher implements Launcher {
+
+		static final ClosedLauncher INSTANCE = new ClosedLauncher();
+
+		private ClosedLauncher() {
+		}
+
+		@Override
+		public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
+			throw new PreconditionViolationException("Launcher session has already been closed");
+		}
+
+		@Override
+		public void registerTestExecutionListeners(TestExecutionListener... listeners) {
+			throw new PreconditionViolationException("Launcher session has already been closed");
+		}
+
+		@Override
+		public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
+			throw new PreconditionViolationException("Launcher session has already been closed");
+		}
+
+		@Override
+		public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecutionListener... listeners) {
+			throw new PreconditionViolationException("Launcher session has already been closed");
+		}
+
+		@Override
+		public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
+			throw new PreconditionViolationException("Launcher session has already been closed");
+		}
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
new file mode 100644
index 000000000000..53aba88068e9
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.TestExecutionListener;
+
+/**
+ * @since 1.8
+ */
+interface InternalLauncher extends Launcher {
+
+	ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry();
+
+	ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry();
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
index f973d8fc4c1f..06eb1b6790f5 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
@@ -21,6 +21,8 @@
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestExecutionListener;
 
@@ -51,6 +53,12 @@
 @API(status = STABLE, since = "1.7")
 public interface LauncherConfig {
 
+	/**
+	 * The default {@code LauncherConfig} which uses automatic registration for
+	 * test engines, supported listeners, and post-discovery filters.
+	 */
+	LauncherConfig DEFAULT = builder().build();
+
 	/**
 	 * Determine if test engines should be discovered at runtime using the
 	 * {@link java.util.ServiceLoader ServiceLoader} mechanism and
@@ -60,6 +68,18 @@ public interface LauncherConfig {
 	 */
 	boolean isTestEngineAutoRegistrationEnabled();
 
+	/**
+	 * Determine if launcher session listeners should be discovered at runtime
+	 * using the {@link java.util.ServiceLoader ServiceLoader} mechanism and
+	 * automatically registered.
+	 *
+	 * @return {@code true} if launcher session listeners should be
+	 * automatically registered
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	boolean isLauncherSessionListenerAutoRegistrationEnabled();
+
 	/**
 	 * Determine if launcher discovery listeners should be discovered at runtime
 	 * using the {@link java.util.ServiceLoader ServiceLoader} mechanism and
@@ -103,6 +123,28 @@ public interface LauncherConfig {
 	 */
 	Collection<TestEngine> getAdditionalTestEngines();
 
+	/**
+	 * Get the collection of additional launcher session listeners that should
+	 * be added to the {@link Launcher}.
+	 *
+	 * @return the collection of additional launcher session listeners; never
+	 * {@code null} but potentially empty
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	Collection<LauncherSessionListener> getAdditionalLauncherSessionListeners();
+
+	/**
+	 * Get the collection of additional launcher discovery listeners that should
+	 * be added to the {@link Launcher}.
+	 *
+	 * @return the collection of additional launcher discovery listeners; never
+	 * {@code null} but potentially empty
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	Collection<LauncherDiscoveryListener> getAdditionalLauncherDiscoveryListeners();
+
 	/**
 	 * Get the collection of additional test execution listeners that should be
 	 * added to the {@link Launcher}.
@@ -138,17 +180,37 @@ static Builder builder() {
 	class Builder {
 
 		private boolean engineAutoRegistrationEnabled = true;
+		private boolean launcherSessionListenerAutoRegistrationEnabled = true;
 		private boolean launcherDiscoveryListenerAutoRegistrationEnabled = true;
 		private boolean testExecutionListenerAutoRegistrationEnabled = true;
 		private boolean postDiscoveryFilterAutoRegistrationEnabled = true;
 		private final Collection<TestEngine> engines = new LinkedHashSet<>();
-		private final Collection<TestExecutionListener> listeners = new LinkedHashSet<>();
+		private final Collection<LauncherSessionListener> sessionListeners = new LinkedHashSet<>();
+		private final Collection<LauncherDiscoveryListener> discoveryListeners = new LinkedHashSet<>();
+		private final Collection<TestExecutionListener> executionListeners = new LinkedHashSet<>();
 		private final Collection<PostDiscoveryFilter> postDiscoveryFilters = new LinkedHashSet<>();
 
 		private Builder() {
 			/* no-op */
 		}
 
+		/**
+		 * Configure the auto-registration flag for launcher session
+		 * listeners.
+		 *
+		 * <p>Defaults to {@code true}.
+		 *
+		 * @param enabled {@code true} if launcher session listeners should be
+		 * automatically registered
+		 * @return this builder for method chaining
+		 * @since 1.8
+		 */
+		@API(status = EXPERIMENTAL, since = "1.8")
+		public Builder enableLauncherSessionListenerAutoRegistration(boolean enabled) {
+			this.launcherSessionListenerAutoRegistrationEnabled = enabled;
+			return this;
+		}
+
 		/**
 		 * Configure the auto-registration flag for launcher discovery
 		 * listeners.
@@ -211,7 +273,7 @@ public Builder enablePostDiscoveryFilterAutoRegistration(boolean enabled) {
 		}
 
 		/**
-		 * Add all of the supplied {@code engines} to the configuration.
+		 * Add all of the supplied test engines to the configuration.
 		 *
 		 * @param engines additional test engines to register; never {@code null}
 		 * or containing {@code null}
@@ -225,7 +287,37 @@ public Builder addTestEngines(TestEngine... engines) {
 		}
 
 		/**
-		 * Add all of the supplied {@code listeners} to the configuration.
+		 * Add all of the supplied launcher session listeners to the configuration.
+		 *
+		 * @param listeners additional launcher session listeners to register;
+		 * never {@code null} or containing {@code null}
+		 * @return this builder for method chaining
+		 */
+		public Builder addLauncherSessionListeners(LauncherSessionListener... listeners) {
+			Preconditions.notNull(listeners, "LauncherSessionListener array must not be null");
+			Preconditions.containsNoNullElements(listeners,
+				"LauncherSessionListener array must not contain null elements");
+			Collections.addAll(this.sessionListeners, listeners);
+			return this;
+		}
+
+		/**
+		 * Add all of the supplied launcher discovery listeners to the configuration.
+		 *
+		 * @param listeners additional launcher discovery listeners to register;
+		 * never {@code null} or containing {@code null}
+		 * @return this builder for method chaining
+		 */
+		public Builder addLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
+			Preconditions.notNull(listeners, "LauncherDiscoveryListener array must not be null");
+			Preconditions.containsNoNullElements(listeners,
+				"LauncherDiscoveryListener array must not contain null elements");
+			Collections.addAll(this.discoveryListeners, listeners);
+			return this;
+		}
+
+		/**
+		 * Add all of the supplied test execution listeners to the configuration.
 		 *
 		 * @param listeners additional test execution listeners to register;
 		 * never {@code null} or containing {@code null}
@@ -235,7 +327,7 @@ public Builder addTestExecutionListeners(TestExecutionListener... listeners) {
 			Preconditions.notNull(listeners, "TestExecutionListener array must not be null");
 			Preconditions.containsNoNullElements(listeners,
 				"TestExecutionListener array must not contain null elements");
-			Collections.addAll(this.listeners, listeners);
+			Collections.addAll(this.executionListeners, listeners);
 			return this;
 		}
 
@@ -261,9 +353,11 @@ public Builder addPostDiscoveryFilters(PostDiscoveryFilter... filters) {
 		 */
 		public LauncherConfig build() {
 			return new DefaultLauncherConfig(this.engineAutoRegistrationEnabled,
+				this.launcherSessionListenerAutoRegistrationEnabled,
 				this.launcherDiscoveryListenerAutoRegistrationEnabled,
 				this.testExecutionListenerAutoRegistrationEnabled, this.postDiscoveryFilterAutoRegistrationEnabled,
-				this.engines, this.listeners, this.postDiscoveryFilters);
+				this.engines, this.sessionListeners, this.discoveryListeners, this.executionListeners,
+				this.postDiscoveryFilters);
 		}
 
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index d102d987ba11..4fda66637101 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -28,6 +28,9 @@
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.launcher.TestExecutionListener;
 
@@ -60,19 +63,50 @@
 @API(status = STABLE, since = "1.0")
 public class LauncherFactory {
 
+	private static final ServiceLoaderRegistry SERVICE_LOADER_REGISTRY = new ServiceLoaderRegistry();
+
 	private LauncherFactory() {
 		/* no-op */
 	}
 
 	/**
-	 * Factory method for creating a new {@link Launcher} using automatic
-	 * registration for test engines and test execution listeners.
+	 * Factory method for opening a new {@link LauncherSession} using the
+	 * {@linkplain LauncherConfig#DEFAULT default} {@link LauncherConfig}.
+	 *
+	 * @throws PreconditionViolationException if no test engines are detected
+	 * @see #openSession(LauncherConfig)
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	public static LauncherSession openSession() throws PreconditionViolationException {
+		return openSession(LauncherConfig.DEFAULT);
+	}
+
+	/**
+	 * Factory method for opening a new {@link LauncherSession} using the
+	 * supplied {@link LauncherConfig}.
+	 *
+	 * @param config the configuration for the session and the launcher; never
+	 * {@code null}
+	 * @throws PreconditionViolationException if the supplied configuration is
+	 * {@code null}, or if no test engines are detected or
+	 * @see #openSession()
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	public static LauncherSession openSession(LauncherConfig config) throws PreconditionViolationException {
+		return new DefaultLauncherSession(createDefaultLauncher(config), createLauncherSessionListener(config));
+	}
+
+	/**
+	 * Factory method for creating a new {@link Launcher} using the
+	 * {@linkplain LauncherConfig#DEFAULT default} {@link LauncherConfig}.
 	 *
 	 * @throws PreconditionViolationException if no test engines are detected
 	 * @see #create(LauncherConfig)
 	 */
 	public static Launcher create() throws PreconditionViolationException {
-		return create(LauncherConfig.builder().build());
+		return create(LauncherConfig.DEFAULT);
 	}
 
 	/**
@@ -80,20 +114,24 @@ public static Launcher create() throws PreconditionViolationException {
 	 * {@link LauncherConfig}.
 	 *
 	 * @param config the configuration for the launcher; never {@code null}
-	 * @throws PreconditionViolationException if the supplied launcher
-	 * configuration is {@code null}, or if no test engines are detected or
+	 * @throws PreconditionViolationException if the supplied configuration is
+	 * {@code null}, or if no test engines are detected or
 	 * registered
 	 * @see #create()
 	 * @since 1.3
 	 */
 	@API(status = EXPERIMENTAL, since = "1.3")
 	public static Launcher create(LauncherConfig config) throws PreconditionViolationException {
+		return new SessionPerRequestLauncher(createDefaultLauncher(config), createLauncherSessionListener(config));
+	}
+
+	private static DefaultLauncher createDefaultLauncher(LauncherConfig config) {
 		Preconditions.notNull(config, "LauncherConfig must not be null");
 
 		Set<TestEngine> engines = collectTestEngines(config);
 		List<PostDiscoveryFilter> filters = collectPostDiscoveryFilters(config);
 
-		Launcher launcher = new DefaultLauncher(engines, filters);
+		DefaultLauncher launcher = new DefaultLauncher(engines, filters);
 
 		registerLauncherDiscoveryListeners(config, launcher);
 		registerTestExecutionListeners(config, launcher);
@@ -110,10 +148,19 @@ private static Set<TestEngine> collectTestEngines(LauncherConfig config) {
 		return engines;
 	}
 
+	private static LauncherSessionListener createLauncherSessionListener(LauncherConfig config) {
+		ListenerRegistry<LauncherSessionListener> listenerRegistry = ListenerRegistry.forLauncherSessionListeners();
+		if (config.isLauncherSessionListenerAutoRegistrationEnabled()) {
+			SERVICE_LOADER_REGISTRY.load(LauncherSessionListener.class).forEach(listenerRegistry::add);
+		}
+		config.getAdditionalLauncherSessionListeners().forEach(listenerRegistry::add);
+		return listenerRegistry.getCompositeListener();
+	}
+
 	private static List<PostDiscoveryFilter> collectPostDiscoveryFilters(LauncherConfig config) {
 		List<PostDiscoveryFilter> filters = new ArrayList<>();
 		if (config.isPostDiscoveryFilterAutoRegistrationEnabled()) {
-			new ServiceLoaderPostDiscoveryFilterRegistry().loadPostDiscoveryFilters().forEach(filters::add);
+			SERVICE_LOADER_REGISTRY.load(PostDiscoveryFilter.class).forEach(filters::add);
 		}
 		filters.addAll(config.getAdditionalPostDiscoveryFilters());
 		return filters;
@@ -121,9 +168,10 @@ private static List<PostDiscoveryFilter> collectPostDiscoveryFilters(LauncherCon
 
 	private static void registerLauncherDiscoveryListeners(LauncherConfig config, Launcher launcher) {
 		if (config.isLauncherDiscoveryListenerAutoRegistrationEnabled()) {
-			new ServiceLoaderLauncherDiscoveryListenerRegistry().loadListeners().forEach(
+			SERVICE_LOADER_REGISTRY.load(LauncherDiscoveryListener.class).forEach(
 				launcher::registerLauncherDiscoveryListeners);
 		}
+		config.getAdditionalLauncherDiscoveryListeners().forEach(launcher::registerLauncherDiscoveryListeners);
 	}
 
 	private static void registerTestExecutionListeners(LauncherConfig config, Launcher launcher) {
@@ -134,7 +182,7 @@ private static void registerTestExecutionListeners(LauncherConfig config, Launch
 	}
 
 	private static Stream<TestExecutionListener> loadAndFilterTestExecutionListeners() {
-		Iterable<TestExecutionListener> listeners = new ServiceLoaderTestExecutionListenerRegistry().loadListeners();
+		Iterable<TestExecutionListener> listeners = SERVICE_LOADER_REGISTRY.load(TestExecutionListener.class);
 		ConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
 		String deactivatedListenersPattern = configurationParameters.get(
 			DEACTIVATE_LISTENERS_PATTERN_PROPERTY_NAME).orElse(null);
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
index b38c38d274d2..6946ef2c2a64 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
@@ -19,13 +19,19 @@
 
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners;
+import org.junit.platform.launcher.listeners.session.LauncherSessionListeners;
 
 class ListenerRegistry<T> {
 
 	private final Function<List<T>, T> compositeListenerFactory;
 
+	static ListenerRegistry<LauncherSessionListener> forLauncherSessionListeners() {
+		return create(LauncherSessionListeners::composite);
+	}
+
 	static ListenerRegistry<LauncherDiscoveryListener> forLauncherDiscoveryListeners() {
 		return create(LauncherDiscoveryListeners::composite);
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderLauncherDiscoveryListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderLauncherDiscoveryListenerRegistry.java
deleted file mode 100644
index ca4788adaff5..000000000000
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderLauncherDiscoveryListenerRegistry.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.launcher.core;
-
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.StreamSupport.stream;
-
-import java.util.ServiceLoader;
-
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
-import org.junit.platform.commons.util.ClassLoaderUtils;
-import org.junit.platform.launcher.LauncherDiscoveryListener;
-
-/**
- * @since 1.8
- */
-class ServiceLoaderLauncherDiscoveryListenerRegistry {
-
-	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderLauncherDiscoveryListenerRegistry.class);
-
-	Iterable<LauncherDiscoveryListener> loadListeners() {
-		Iterable<LauncherDiscoveryListener> listeners = ServiceLoader.load(LauncherDiscoveryListener.class,
-			ClassLoaderUtils.getDefaultClassLoader());
-		logger.config(() -> "Loaded LauncherDiscoveryListener instances: "
-				+ stream(listeners.spliterator(), false).map(Object::toString).collect(toList()));
-		return listeners;
-	}
-
-}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderPostDiscoveryFilterRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderPostDiscoveryFilterRegistry.java
deleted file mode 100644
index 9a02c4e9a2ef..000000000000
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderPostDiscoveryFilterRegistry.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2015-2020 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.launcher.core;
-
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.StreamSupport.stream;
-
-import java.util.ServiceLoader;
-
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
-import org.junit.platform.commons.util.ClassLoaderUtils;
-import org.junit.platform.launcher.PostDiscoveryFilter;
-
-/**
- * @since 1.7
- */
-class ServiceLoaderPostDiscoveryFilterRegistry {
-
-	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderPostDiscoveryFilterRegistry.class);
-
-	Iterable<PostDiscoveryFilter> loadPostDiscoveryFilters() {
-		Iterable<PostDiscoveryFilter> filters = ServiceLoader.load(PostDiscoveryFilter.class,
-			ClassLoaderUtils.getDefaultClassLoader());
-		logger.config(() -> "Loaded PostDiscoveryFilter instances: "
-				+ stream(filters.spliterator(), false).map(Object::toString).collect(toList()));
-		return filters;
-	}
-
-}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestExecutionListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
similarity index 66%
rename from junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestExecutionListenerRegistry.java
rename to junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
index 7226f9278f52..9adcd1711e88 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestExecutionListenerRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
@@ -18,19 +18,17 @@
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ClassLoaderUtils;
-import org.junit.platform.launcher.TestExecutionListener;
 
 /**
- * @since 1.0
+ * @since 1.8
  */
-class ServiceLoaderTestExecutionListenerRegistry {
+class ServiceLoaderRegistry {
 
-	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderTestExecutionListenerRegistry.class);
+	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderRegistry.class);
 
-	Iterable<TestExecutionListener> loadListeners() {
-		Iterable<TestExecutionListener> listeners = ServiceLoader.load(TestExecutionListener.class,
-			ClassLoaderUtils.getDefaultClassLoader());
-		logger.config(() -> "Loaded TestExecutionListener instances: "
+	<T> Iterable<T> load(Class<T> serviceProviderClass) {
+		Iterable<T> listeners = ServiceLoader.load(serviceProviderClass, ClassLoaderUtils.getDefaultClassLoader());
+		logger.config(() -> "Loaded " + serviceProviderClass.getSimpleName() + " instances: "
 				+ stream(listeners.spliterator(), false).map(Object::toString).collect(toList()));
 		return listeners;
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
new file mode 100644
index 000000000000..6d54315b86df
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
+
+/**
+ * @since 1.8
+ */
+class SessionPerRequestLauncher implements InternalLauncher {
+
+	private final InternalLauncher delegate;
+	private final LauncherSessionListener sessionListener;
+
+	SessionPerRequestLauncher(InternalLauncher delegate, LauncherSessionListener sessionListener) {
+		this.delegate = delegate;
+		this.sessionListener = sessionListener;
+	}
+
+	@Override
+	public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
+		delegate.registerLauncherDiscoveryListeners(listeners);
+	}
+
+	@Override
+	public void registerTestExecutionListeners(TestExecutionListener... listeners) {
+		delegate.registerTestExecutionListeners(listeners);
+	}
+
+	@Override
+	public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
+		try (LauncherSession session = createSession()) {
+			return session.getLauncher().discover(launcherDiscoveryRequest);
+		}
+	}
+
+	@Override
+	public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecutionListener... listeners) {
+		try (LauncherSession session = createSession()) {
+			session.getLauncher().execute(launcherDiscoveryRequest, listeners);
+		}
+	}
+
+	@Override
+	public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
+		try (LauncherSession session = createSession()) {
+			session.getLauncher().execute(testPlan, listeners);
+		}
+	}
+
+	@Override
+	public ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
+		return delegate.getTestExecutionListenerRegistry();
+	}
+
+	@Override
+	public ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
+		return delegate.getLauncherDiscoveryListenerRegistry();
+	}
+
+	private LauncherSession createSession() {
+		return new DefaultLauncherSession(delegate, sessionListener);
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
new file mode 100644
index 000000000000..8b5ba267214b
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.listeners.session;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
+
+/**
+ * @since 1.8
+ * @see LauncherSessionListeners#composite(List)
+ */
+class CompositeLauncherSessionListener implements LauncherSessionListener {
+
+	private final List<LauncherSessionListener> listeners;
+
+	CompositeLauncherSessionListener(List<LauncherSessionListener> listeners) {
+		this.listeners = Collections.unmodifiableList(new ArrayList<>(listeners));
+	}
+
+	@Override
+	public void launcherSessionOpened(LauncherSession session) {
+		listeners.forEach(delegate -> delegate.launcherSessionOpened(session));
+	}
+
+	@Override
+	public void launcherSessionClosed(LauncherSession session) {
+		listeners.forEach(delegate -> delegate.launcherSessionClosed(session));
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
new file mode 100644
index 000000000000..1aa0428a2ac1
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.listeners.session;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.util.List;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.launcher.LauncherSessionListener;
+
+/**
+ * Collection of {@code static} factory methods for creating
+ * {@link LauncherSessionListener LauncherSessionListeners}.
+ *
+ * @since 1.8
+ */
+@API(status = INTERNAL, since = "1.8")
+public class LauncherSessionListeners {
+
+	private LauncherSessionListeners() {
+	}
+
+	public static LauncherSessionListener composite(List<LauncherSessionListener> listeners) {
+		Preconditions.notNull(listeners, "listeners must not be null");
+		Preconditions.containsNoNullElements(listeners, "listeners must not contain any null elements");
+		if (listeners.isEmpty()) {
+			return LauncherSessionListener.NOOP;
+		}
+		if (listeners.size() == 1) {
+			return listeners.get(0);
+		}
+		return new CompositeLauncherSessionListener(listeners);
+	}
+
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/package-info.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/package-info.java
new file mode 100644
index 000000000000..97541a153cba
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/package-info.java
@@ -0,0 +1,9 @@
+/**
+ * Common {@link org.junit.platform.launcher.LauncherSessionListener}
+ * implementations and factory methods.
+ *
+ * @see org.junit.platform.launcher.listeners.session.LauncherSessionListeners
+ * @since 1.8
+ */
+
+package org.junit.platform.launcher.listeners.session;
diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
index 9ccde3666d41..ee0fc5627728 100644
--- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
+++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
@@ -32,6 +32,7 @@
 
 	uses org.junit.platform.engine.TestEngine;
 	uses org.junit.platform.launcher.LauncherDiscoveryListener;
+	uses org.junit.platform.launcher.LauncherSessionListener;
 	uses org.junit.platform.launcher.PostDiscoveryFilter;
 	uses org.junit.platform.launcher.TestExecutionListener;
 }
diff --git a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
index e71c334b3869..2a9962578abd 100644
--- a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
+++ b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
@@ -19,13 +19,18 @@
 public class LauncherFactoryForTestingPurposesOnly {
 
 	public static Launcher createLauncher(TestEngine... engines) {
-		return LauncherFactory.create(LauncherConfig.builder() //
-				.enableTestEngineAutoRegistration(false) //
+		return LauncherFactory.create(createLauncherConfigBuilderWithDisabledServiceLoading() //
 				.addTestEngines(engines) //
+				.build());
+	}
+
+	public static LauncherConfig.Builder createLauncherConfigBuilderWithDisabledServiceLoading() {
+		return LauncherConfig.builder() //
+				.enableTestEngineAutoRegistration(false) //
 				.enableLauncherDiscoveryListenerAutoRegistration(false) //
 				.enableTestExecutionListenerAutoRegistration(false) //
 				.enablePostDiscoveryFilterAutoRegistration(false) //
-				.build());
+				.enableLauncherSessionListenerAutoRegistration(false);
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
new file mode 100644
index 000000000000..335ba892d693
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+public class TestLauncherSessionListener implements LauncherSessionListener {
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		return getClass() == obj.getClass();
+	}
+
+	@Override
+	public int hashCode() {
+		return 1;
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
index cd233214e13e..5f9712f76d67 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
@@ -19,6 +19,8 @@
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.fakes.TestEngineStub;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TestExecutionListener;
 
 /**
@@ -46,7 +48,7 @@ void preconditions() {
 
 	@Test
 	void defaultConfig() {
-		var config = LauncherConfig.builder().build();
+		var config = LauncherConfig.DEFAULT;
 
 		assertTrue(config.isTestEngineAutoRegistrationEnabled(),
 			"Test engine auto-registration should be enabled by default");
@@ -100,6 +102,30 @@ void addTestEngines() {
 		assertThat(config.getAdditionalTestEngines()).containsOnly(first, second);
 	}
 
+	@Test
+	void addLauncherSessionListeners() {
+		var first = new LauncherSessionListener() {
+		};
+		var second = new LauncherSessionListener() {
+		};
+
+		var config = LauncherConfig.builder().addLauncherSessionListeners(first, second).build();
+
+		assertThat(config.getAdditionalLauncherSessionListeners()).containsOnly(first, second);
+	}
+
+	@Test
+	void addLauncherDiscoveryListeners() {
+		var first = new LauncherDiscoveryListener() {
+		};
+		var second = new LauncherDiscoveryListener() {
+		};
+
+		var config = LauncherConfig.builder().addLauncherDiscoveryListeners(first, second).build();
+
+		assertThat(config.getAdditionalLauncherDiscoveryListeners()).containsOnly(first, second);
+	}
+
 	@Test
 	void addTestExecutionListeners() {
 		var first = new TestExecutionListener() {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 982cd9b8b5bb..5a42197c9ce2 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -25,9 +25,11 @@
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TagFilter;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestLauncherDiscoveryListener;
+import org.junit.platform.launcher.TestLauncherSessionListener;
 import org.junit.platform.launcher.listeners.AnotherUnusedTestExecutionListener;
 import org.junit.platform.launcher.listeners.NoopTestExecutionListener;
 import org.junit.platform.launcher.listeners.UnusedTestExecutionListener;
@@ -45,7 +47,7 @@ void preconditions() {
 	@Test
 	void noopTestExecutionListenerIsLoadedViaServiceApi() {
 		withTestServices(() -> {
-			var launcher = (DefaultLauncher) LauncherFactory.create();
+			var launcher = (InternalLauncher) LauncherFactory.create();
 			var listeners = launcher.getTestExecutionListenerRegistry().getListeners();
 			var listener = listeners.stream().filter(NoopTestExecutionListener.class::isInstance).findFirst();
 			assertThat(listener).isPresent();
@@ -55,7 +57,7 @@ void noopTestExecutionListenerIsLoadedViaServiceApi() {
 	@Test
 	void unusedTestExecutionListenerIsNotLoadedViaServiceApi() {
 		withTestServices(() -> {
-			var launcher = (DefaultLauncher) LauncherFactory.create();
+			var launcher = (InternalLauncher) LauncherFactory.create();
 			var listeners = launcher.getTestExecutionListenerRegistry().getListeners();
 
 			assertThat(listeners).filteredOn(AnotherUnusedTestExecutionListener.class::isInstance).isEmpty();
@@ -171,7 +173,7 @@ void notApplyIfDisabledPostDiscoveryFiltersViaServiceApi() {
 	@Test
 	void doesNotDiscoverLauncherDiscoverRequestListenerViaServiceApiWhenDisabled() {
 		withTestServices(() -> {
-			var launcher = (DefaultLauncher) LauncherFactory.create(
+			var launcher = (InternalLauncher) LauncherFactory.create(
 				LauncherConfig.builder().enableLauncherDiscoveryListenerAutoRegistration(false).build());
 			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListenerRegistry().getCompositeListener();
 
@@ -182,7 +184,7 @@ void doesNotDiscoverLauncherDiscoverRequestListenerViaServiceApiWhenDisabled() {
 	@Test
 	void discoversLauncherDiscoverRequestListenerViaServiceApiByDefault() {
 		withTestServices(() -> {
-			var launcher = (DefaultLauncher) LauncherFactory.create();
+			var launcher = (InternalLauncher) LauncherFactory.create();
 			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListenerRegistry().getCompositeListener();
 
 			assertThat(launcherDiscoveryListener.getClass().getSimpleName()).startsWith("Composite");
@@ -191,6 +193,25 @@ void discoversLauncherDiscoverRequestListenerViaServiceApiByDefault() {
 		});
 	}
 
+	@Test
+	void doesNotDiscoverLauncherSessionListenerViaServiceApiWhenDisabled() {
+		withTestServices(() -> {
+			var session = (DefaultLauncherSession) LauncherFactory.openSession(
+				LauncherConfig.builder().enableLauncherSessionListenerAutoRegistration(false).build());
+
+			assertThat(session.getListener()).isSameAs(LauncherSessionListener.NOOP);
+		});
+	}
+
+	@Test
+	void discoversLauncherSessionListenerViaServiceApiByDefault() {
+		withTestServices(() -> {
+			var session = (DefaultLauncherSession) LauncherFactory.openSession();
+
+			assertThat(session.getListener()).isEqualTo(new TestLauncherSessionListener());
+		});
+	}
+
 	private static void withTestServices(Runnable runnable) {
 		var current = Thread.currentThread().getContextClassLoader();
 		try {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
new file mode 100644
index 000000000000..25488058b727
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly.createLauncherConfigBuilderWithDisabledServiceLoading;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.fakes.TestEngineStub;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
+import org.mockito.ArgumentCaptor;
+
+public class LauncherSessionTests {
+
+	LauncherSessionListener firstSessionListener = mock(LauncherSessionListener.class);
+	LauncherSessionListener secondSessionListener = mock(LauncherSessionListener.class);
+	LauncherConfig launcherConfig = createLauncherConfigBuilderWithDisabledServiceLoading() //
+			.addLauncherSessionListeners(firstSessionListener, secondSessionListener) //
+			.addTestEngines(new TestEngineStub()) //
+			.build();
+	LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request().build();
+
+	@Test
+	void callsRegisteredListenersWhenLauncherIsUsedDirectly() {
+		var launcher = LauncherFactory.create(launcherConfig);
+
+		var testPlan = launcher.discover(request);
+
+		var inOrder = inOrder(firstSessionListener, secondSessionListener);
+		var launcherSession = ArgumentCaptor.forClass(LauncherSession.class);
+		inOrder.verify(firstSessionListener).launcherSessionOpened(launcherSession.capture());
+		inOrder.verify(secondSessionListener).launcherSessionOpened(launcherSession.getValue());
+		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
+		inOrder.verify(secondSessionListener).launcherSessionClosed(launcherSession.getValue());
+
+		launcher.execute(testPlan);
+
+		inOrder.verify(firstSessionListener).launcherSessionOpened(launcherSession.capture());
+		inOrder.verify(secondSessionListener).launcherSessionOpened(launcherSession.getValue());
+		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
+		inOrder.verify(secondSessionListener).launcherSessionClosed(launcherSession.getValue());
+
+		launcher.execute(request);
+
+		inOrder.verify(firstSessionListener).launcherSessionOpened(launcherSession.capture());
+		inOrder.verify(secondSessionListener).launcherSessionOpened(launcherSession.getValue());
+		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
+		inOrder.verify(secondSessionListener).launcherSessionClosed(launcherSession.getValue());
+	}
+
+	@Test
+	void callsRegisteredListenersWhenLauncherIsUsedViaSession() {
+		var session = LauncherFactory.openSession(launcherConfig);
+		var launcher = session.getLauncher();
+
+		var inOrder = inOrder(firstSessionListener, secondSessionListener);
+		inOrder.verify(firstSessionListener).launcherSessionOpened(session);
+		inOrder.verify(secondSessionListener).launcherSessionOpened(session);
+		verifyNoMoreInteractions(firstSessionListener, secondSessionListener);
+
+		var testPlan = launcher.discover(request);
+
+		verifyNoMoreInteractions(firstSessionListener, secondSessionListener);
+
+		launcher.execute(testPlan);
+
+		verifyNoMoreInteractions(firstSessionListener, secondSessionListener);
+
+		launcher.execute(request);
+
+		verifyNoMoreInteractions(firstSessionListener, secondSessionListener);
+
+		session.close();
+
+		inOrder.verify(firstSessionListener).launcherSessionClosed(session);
+		inOrder.verify(secondSessionListener).launcherSessionClosed(session);
+		verifyNoMoreInteractions(firstSessionListener, secondSessionListener);
+	}
+
+	@Test
+	void closedSessionCannotBeUsed() {
+		var session = LauncherFactory.openSession(launcherConfig);
+		var launcher = session.getLauncher();
+		var testPlan = launcher.discover(request);
+
+		session.close();
+
+		assertThrows(PreconditionViolationException.class, () -> launcher.discover(request));
+		assertThrows(PreconditionViolationException.class, () -> launcher.execute(testPlan));
+		assertThrows(PreconditionViolationException.class, () -> launcher.execute(request));
+	}
+}
diff --git a/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 000000000000..a41b4e59ab99
--- /dev/null
+++ b/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.junit.platform.launcher.TestLauncherSessionListener
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
index 82f90fef731d..bd0e934131eb 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
@@ -10,5 +10,6 @@ requires org.junit.platform.commons transitive
 requires org.junit.platform.engine transitive
 uses org.junit.platform.engine.TestEngine
 uses org.junit.platform.launcher.LauncherDiscoveryListener
+uses org.junit.platform.launcher.LauncherSessionListener
 uses org.junit.platform.launcher.PostDiscoveryFilter
 uses org.junit.platform.launcher.TestExecutionListener
diff --git a/platform-tooling-support-tests/projects/standalone/expected-err.txt b/platform-tooling-support-tests/projects/standalone/expected-err.txt
index 27c15985896b..d49887b2d69b 100644
--- a/platform-tooling-support-tests/projects/standalone/expected-err.txt
+++ b/platform-tooling-support-tests/projects/standalone/expected-err.txt
@@ -1,8 +1,10 @@
 .+ org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry loadTestEngines
 .+ Discovered TestEngines with IDs. .junit-jupiter .+ junit-vintage .+
-.+ org.junit.platform.launcher.core.ServiceLoaderPostDiscoveryFilterRegistry loadPostDiscoveryFilters
+.+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded PostDiscoveryFilter instances: ..
-.+ org.junit.platform.launcher.core.ServiceLoaderLauncherDiscoveryListenerRegistry loadListeners
+.+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded LauncherDiscoveryListener instances: ..
-.+ org.junit.platform.launcher.core.ServiceLoaderTestExecutionListenerRegistry loadListeners
+.+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded TestExecutionListener instances: ..
+.+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
+.+ Loaded LauncherSessionListener instances: ..

From 12cc35dd1c98dcb841dfba617d173f93e48c2ee6 Mon Sep 17 00:00:00 2001
From: Ville Saalo <ZeroOne@iki.fi>
Date: Fri, 15 Jan 2021 21:51:10 +0200
Subject: [PATCH 0157/1433] Allow rows in @CsvSource to start with a number
 sign (#) (#2528)

Previously lines starting with # were treated as comments which led to
parameterized tests failing because they had no arguments.
---
 .../release-notes/release-notes-5.8.0-M1.adoc      |  1 +
 .../jupiter/params/provider/CsvParserFactory.java  | 14 +++++++++-----
 .../params/provider/CsvArgumentsProviderTests.java |  9 +++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 77d5e0c5267c..c5fc61e15ac3 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -71,6 +71,7 @@ on GitHub.
   provide better error messages comparable to those of `assertThrows`.
 * Dynamic tests now require less memory thanks to a number of improvements to internal
   data structures.
+* Allow rows in `@CsvSource` to start with a number sign (#)
 
 [[release-notes-5.8.0-M1-junit-vintage]]
 === JUnit Vintage
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index 9711fbd05041..6a4cf1a84809 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -27,17 +27,19 @@ class CsvParserFactory {
 	private static final char SINGLE_QUOTE = '\'';
 	private static final char DOUBLE_QUOTE = '"';
 	private static final char EMPTY_CHAR = '\0';
+	private static final boolean COMMENT_PROCESSING_FOR_CSV_SOURCE = false;
+	private static final boolean COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE = true;
 
 	static CsvParser createParserFor(CsvSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
 		return createParser(delimiter, LINE_SEPARATOR, SINGLE_QUOTE, annotation.emptyValue(),
-			annotation.maxCharsPerColumn());
+			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_SOURCE);
 	}
 
 	static CsvParser createParserFor(CsvFileSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
 		return createParser(delimiter, annotation.lineSeparator(), DOUBLE_QUOTE, annotation.emptyValue(),
-			annotation.maxCharsPerColumn());
+			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE);
 	}
 
 	private static String selectDelimiter(Annotation annotation, char delimiter, String delimiterString) {
@@ -54,12 +56,13 @@ private static String selectDelimiter(Annotation annotation, char delimiter, Str
 	}
 
 	private static CsvParser createParser(String delimiter, String lineSeparator, char quote, String emptyValue,
-			int maxCharsPerColumn) {
-		return new CsvParser(createParserSettings(delimiter, lineSeparator, quote, emptyValue, maxCharsPerColumn));
+			int maxCharsPerColumn, boolean commentProcessingEnabled) {
+		return new CsvParser(createParserSettings(delimiter, lineSeparator, quote, emptyValue, maxCharsPerColumn,
+			commentProcessingEnabled));
 	}
 
 	private static CsvParserSettings createParserSettings(String delimiter, String lineSeparator, char quote,
-			String emptyValue, int maxCharsPerColumn) {
+			String emptyValue, int maxCharsPerColumn, boolean commentProcessingEnabled) {
 
 		CsvParserSettings settings = new CsvParserSettings();
 		settings.getFormat().setDelimiter(delimiter);
@@ -67,6 +70,7 @@ private static CsvParserSettings createParserSettings(String delimiter, String l
 		settings.getFormat().setQuote(quote);
 		settings.getFormat().setQuoteEscape(quote);
 		settings.setEmptyValue(emptyValue);
+		settings.setCommentProcessingEnabled(commentProcessingEnabled);
 		settings.setAutoConfigurationEnabled(false);
 		Preconditions.condition(maxCharsPerColumn > 0,
 			() -> "maxCharsPerColumn must be a positive number: " + maxCharsPerColumn);
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 8279869a0f9d..14944ff3b0db 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -221,6 +221,15 @@ void throwsExceptionWhenMaxCharsPerColumnIsNotPositiveNumber() {
 				.withMessageStartingWith("maxCharsPerColumn must be a positive number: -1");
 	}
 
+	@Test
+	void doesNotMindSoCalledCommentCharacters() {
+		var annotation = csvSource("#foo", "#bar,baz", "baz,#quux");
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("#foo"), array("#bar", "baz"), array("baz", "#quux"));
+	}
+
 	private Stream<Object[]> provideArguments(CsvSource annotation) {
 		var provider = new CsvArgumentsProvider();
 		provider.accept(annotation);

From 179c9ce4fc7ed24bae006142214d62d71e6c7364 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 15 Jan 2021 21:02:23 +0100
Subject: [PATCH 0158/1433] Remove no longer used package from import order

---
 src/eclipse/junit-eclipse.importorder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eclipse/junit-eclipse.importorder b/src/eclipse/junit-eclipse.importorder
index 23c5f8987eff..daded8e1f6af 100644
--- a/src/eclipse/junit-eclipse.importorder
+++ b/src/eclipse/junit-eclipse.importorder
@@ -1,7 +1,7 @@
 #Organize Import Order
 0=java
 1=javax
-2=joptsimple
+2=jdk
 3=com
 4=io
 5=org

From d3afd77152ae16cc109bf0f7d725da296c8b9e6a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 15 Jan 2021 21:15:54 +0100
Subject: [PATCH 0159/1433] Disable automatic fetching of branch protection
 rules in IDEA

Since fetching those rules is enabled by default but seems to require
admin privileges, it caused constant changes to `vcs.xml`.
---
 .idea/vcs.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index cac68bbbeb72..7c23889dd37b 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GitSharedSettings">
+    <option name="synchronizeBranchProtectionRules" value="false" />
+  </component>
   <component name="GithubSharedProjectSettings">
     <option name="branchProtectionPatterns">
       <list>

From 967f5da04f9be97c565911143538d2768122a415 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 15 Jan 2021 21:39:03 +0100
Subject: [PATCH 0160/1433] Use common-custom-user-data-gradle-plugin

---
 build.gradle.kts                   |   2 -
 gradle.properties                  |   1 +
 gradle/build-scan-user-data.gradle | 215 -----------------------------
 settings.gradle.kts                |   2 +
 4 files changed, 3 insertions(+), 217 deletions(-)
 delete mode 100644 gradle/build-scan-user-data.gradle

diff --git a/build.gradle.kts b/build.gradle.kts
index bd68f106495a..6e6a8fa98792 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,8 +10,6 @@ plugins {
 	id("io.spring.nohttp")
 }
 
-apply(from = "gradle/build-scan-user-data.gradle")
-
 val buildTimeAndDate by extra {
 
 	// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against
diff --git a/gradle.properties b/gradle.properties
index 87227a7c26c8..0d38902b743a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -48,6 +48,7 @@ bnd.version=5.2.0
 
 # Plugins
 gradle.enterprise.plugin.version=3.5
+gradle.user-data.plugin.version=1.0.0
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.29.0
 spotless.plugin.version=5.6.1
diff --git a/gradle/build-scan-user-data.gradle b/gradle/build-scan-user-data.gradle
deleted file mode 100644
index 8436692dc512..000000000000
--- a/gradle/build-scan-user-data.gradle
+++ /dev/null
@@ -1,215 +0,0 @@
-// Source: https://github.com/gradle/gradle-build-scan-snippets/blob/master/guided-trials-default-custom-user-data/default-custom-user-data.gradle
-
-tagOs()
-tagIde()
-tagCiOrLocal()
-addCiMetadata()
-addGitMetadata()
-addTestParallelization()
-
-// Add here other scripts, if needed
-//apply from:"${rootProject.projectDir}/<<other-script.gradle>>"
-
-void tagOs() {
-	buildScan.tag System.getProperty('os.name')
-}
-
-void tagIde() {
-	if (project.hasProperty('android.injected.invoked.from.ide')) {
-		buildScan.tag 'Android Studio'
-	} else if (System.getProperty('idea.version')) {
-		buildScan.tag 'IntelliJ IDEA'
-	} else if (System.getProperty('eclipse.buildId')) {
-		buildScan.tag 'Eclipse'
-	} else if (!isCi()) {
-		buildScan.tag 'Cmd Line'
-	}
-}
-
-void tagCiOrLocal() {
-	buildScan.tag(isCi() ? 'CI' : 'LOCAL')
-}
-
-void addCiMetadata() {
-	if (isJenkins()) {
-		if (System.getenv('BUILD_URL')) {
-			buildScan.link 'Jenkins build', System.getenv('BUILD_URL')
-		}
-		if (System.getenv('BUILD_NUMBER')) {
-			buildScan.value 'CI build number', System.getenv('BUILD_NUMBER')
-		}
-		if (System.getenv('NODE_NAME')) {
-			def agentName = System.getenv('NODE_NAME') == 'master' ? 'master-node' : System.getenv('NODE_NAME')
-			buildScan.tag agentName
-			buildScan.value 'CI node name', agentName
-		}
-		if (System.getenv('JOB_NAME')) {
-			def jobNameLabel = 'CI job'
-			def jobName = System.getenv('JOB_NAME')
-			buildScan.value jobNameLabel, jobName
-			addCustomValueSearchLink 'CI job build scans', [(jobNameLabel): jobName]
-		}
-		if (System.getenv('STAGE_NAME')) {
-			def stageNameLabel = 'CI stage'
-			def stageName = System.getenv('STAGE_NAME')
-			buildScan.value stageNameLabel, stageName
-			addCustomValueSearchLink 'CI stage build scans', [(stageNameLabel): stageName]
-		}
-	}
-
-	if (isTeamCity()) {
-		def teamCityConfigurationFileProp = 'teamcity.configuration.properties.file'
-		if (project.hasProperty(teamCityConfigurationFileProp)) {
-			def properties = new Properties()
-			properties.load(new FileInputStream("${project.property(teamCityConfigurationFileProp)}"))
-			def teamCityServerUrl = properties.getProperty("teamcity.serverUrl")
-			if (teamCityServerUrl && project.hasProperty('build.number') && project.hasProperty('teamcity.buildType.id')) {
-				def teamCityBuildNumber = project.property('build.number')
-				def teamCityBuildTypeId = project.property('teamcity.buildType.id')
-				buildScan.link 'TeamCity build', "${appendIfMissing(teamCityServerUrl, '/')}viewLog.html?buildNumber=${teamCityBuildNumber}&buildTypeId=${teamCityBuildTypeId}"
-			}
-		}
-		if (project.hasProperty('build.number')) {
-			buildScan.value 'CI build number', project.property('build.number')
-		}
-		if (project.hasProperty('agent.name')) {
-			def agentName = project.property('agent.name')
-			buildScan.tag agentName
-			buildScan.value 'CI agent name', agentName
-		}
-	}
-
-	if (isCircleCI()) {
-		if (System.getenv('CIRCLE_BUILD_URL')) {
-			buildScan.link 'CircleCI build', System.getenv('CIRCLE_BUILD_URL')
-		}
-		if (System.getenv('CIRCLE_BUILD_NUM')) {
-			buildScan.value 'CI build number', System.getenv('CIRCLE_BUILD_NUM')
-		}
-		if (System.getenv('CIRCLE_JOB')) {
-			def jobLabel = 'CI job'
-			def job = System.getenv('CIRCLE_JOB')
-			buildScan.value jobLabel, job
-			addCustomValueSearchLink 'CI job build scans', [(jobLabel): job]
-		}
-		if (System.getenv('CIRCLE_WORKFLOW_ID')) {
-			def workflowIdLabel = 'CI workflow'
-			def workflowId = System.getenv('CIRCLE_WORKFLOW_ID')
-			buildScan.value workflowIdLabel, workflowId
-			addCustomValueSearchLink 'CI workflow build scans', [(workflowIdLabel): workflowId]
-		}
-	}
-
-	if (isBamboo()) {
-		if (System.getenv('bamboo_resultsUrl')) {
-			buildScan.link 'Bamboo build', System.getenv('bamboo_resultsUrl')
-		}
-		if (System.getenv('bamboo_buildNumber')) {
-			buildScan.value 'CI build number', System.getenv('bamboo_buildNumber')
-		}
-		if (System.getenv('bamboo_planName')) {
-			def planNameLabel = 'CI plan'
-			def planName = System.getenv('bamboo_planName')
-			buildScan.value planNameLabel, planName
-			addCustomValueSearchLink 'CI plan build scans', [(planNameLabel): planName]
-		}
-		if (System.getenv('bamboo_buildPlanName')) {
-			def jobNameLabel = 'CI job'
-			def jobName = System.getenv('bamboo_buildPlanName')
-			buildScan.value jobNameLabel, jobName
-			addCustomValueSearchLink 'CI job build scans', [(jobNameLabel): jobName]
-		}
-		if (System.getenv('bamboo_agentId')) {
-			def agentId = System.getenv('bamboo_agentId')
-			buildScan.tag agentId
-			buildScan.value 'CI agent ID', agentId
-		}
-	}
-
-	if (isGitHubActions()) {
-		def repo = System.getenv('GITHUB_REPOSITORY')
-		def runId = System.getenv('GITHUB_RUN_ID')
-		if (repo && runId) {
-			buildScan.link 'GitHub Actions run', "https://github.com/$repo/actions/runs/$runId"
-		}
-		if (System.getenv('GITHUB_WORKFLOW')) {
-			def ghActionWorkflowLabel = 'GitHub workflow'
-			def ghActionWorkflowName = System.getenv('GITHUB_WORKFLOW')
-			buildScan.value ghActionWorkflowLabel, ghActionWorkflowName
-			addCustomValueSearchLink 'GitHub workflow build scans', [(ghActionWorkflowLabel): ghActionWorkflowName]
-		}
-	}
-}
-
-void addGitMetadata() {
-	buildScan.background {
-		def gitCommitId = versioning.info.commit
-		def gitBranchName = versioning.info.branch
-		def gitDirty = versioning.info.dirty
-
-		if (gitCommitId) {
-			def commitIdLabel = 'Git commit id'
-			value commitIdLabel, gitCommitId
-			addCustomValueSearchLink 'Git commit id build scans', [(commitIdLabel): gitCommitId]
-			link 'Github Source', "https://github.com/junit-team/junit5/tree/" + gitCommitId
-		}
-		if (gitBranchName) {
-			tag gitBranchName
-			value 'Git branch', gitBranchName
-		}
-		if (gitDirty) {
-			tag 'Dirty'
-		}
-	}
-}
-
-void addTestParallelization() {
-	allprojects { p ->
-		p.tasks.withType(Test).configureEach { t -> doFirst { buildScan.value "${t.identityPath}#maxParallelForks", t.maxParallelForks.toString() } }
-	}
-}
-
-static boolean isCi() {
-	isJenkins() || isTeamCity() || isCircleCI() || isBamboo() || isGitHubActions()
-}
-
-static boolean isJenkins() {
-	System.getenv('JENKINS_URL')
-}
-
-static boolean isTeamCity() {
-	System.getenv('TEAMCITY_VERSION')
-}
-
-static boolean isCircleCI() {
-	System.getenv('CIRCLECI')
-}
-
-static boolean isBamboo() {
-	System.getenv('bamboo_resultsUrl')
-}
-
-static boolean isGitHubActions() {
-	System.getenv('GITHUB_ACTIONS')
-}
-
-void addCustomValueSearchLink(String title, Map<String, String> search) {
-	if (buildScan.server) {
-		buildScan.link title, customValueSearchUrl(search)
-	}
-}
-
-String customValueSearchUrl(Map<String, String> search) {
-	def query = search.collect { name, value ->
-		"search.names=${encodeURL(name)}&search.values=${encodeURL(value)}"
-	}.join('&')
-	"${appendIfMissing(buildScan.server, '/')}scans?$query#selection.buildScanB=%7BSCAN_ID%7D"
-}
-
-static String encodeURL(String url) {
-	URLEncoder.encode(url, 'UTF-8')
-}
-
-static String appendIfMissing(String str, String suffix) {
-	str.endsWith(suffix) ? str : str + suffix
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cb92e1578417..94e155dab7e8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,6 +3,7 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 pluginManagement {
 	plugins {
 		id("com.gradle.enterprise") version settings.extra["gradle.enterprise.plugin.version"] as String
+		id("com.gradle.common-custom-user-data-gradle-plugin") version settings.extra["gradle.user-data.plugin.version"] as String
 		id("net.nemerosa.versioning") version settings.extra["versioning.plugin.version"] as String
 		id("com.github.ben-manes.versions") version settings.extra["versions.plugin.version"] as String
 		id("com.diffplug.spotless") version settings.extra["spotless.plugin.version"] as String
@@ -17,6 +18,7 @@ pluginManagement {
 
 plugins {
 	id("com.gradle.enterprise")
+	id("com.gradle.common-custom-user-data-gradle-plugin")
 }
 
 val gradleEnterpriseServer = "https://ge.junit.org"

From 17bff6e734ba84553f3f49293c6e94d580202a44 Mon Sep 17 00:00:00 2001
From: ashasomayajula <somayajulaas@gmail.com>
Date: Fri, 11 Dec 2020 12:16:11 -0600
Subject: [PATCH 0161/1433] Provide mechanism to control whether or not to trim
 whitespace in @CsvSource and @CsvFileSource

This commit introduces a `ignoreTrailingAndLeadingWhitespace` attribute to `@CsvSource` and `@CsvFileSource`. The default value of this attribute is true.

Resolves #2420
Closes #2491
---
 .../params/provider/CsvFileSource.java        | 11 ++++
 .../params/provider/CsvParserFactory.java     | 15 +++--
 .../jupiter/params/provider/CsvSource.java    | 11 ++++
 .../ParameterizedTestIntegrationTests.java    | 52 ++++++++++++++++++
 .../provider/CsvArgumentsProviderTests.java   | 54 ++++++++++++++++++
 .../CsvFileArgumentsProviderTests.java        | 31 +++++++++++
 .../provider/MockCsvAnnotationBuilder.java    | 55 +++++++++++++++++++
 .../resources/trailing-leading-spaces.csv     |  1 +
 8 files changed, 225 insertions(+), 5 deletions(-)
 create mode 100644 junit-jupiter-params/src/test/resources/trailing-leading-spaces.csv

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index c3d38fe174d6..1484a82ee075 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -146,4 +146,15 @@
 	@API(status = EXPERIMENTAL, since = "5.7")
 	int maxCharsPerColumn() default 4096;
 
+	/**
+	 * Identifies whether leading and trailing whitespace characters of unquoted CSV columns should be ignored.
+	 *
+	 * <p>Must be a boolean value.
+	 *
+	 * <p>Defaults to {@code true}.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	boolean ignoreTrailingAndLeadingWhitespace() default true;
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index 6a4cf1a84809..d9961687697e 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -33,13 +33,15 @@ class CsvParserFactory {
 	static CsvParser createParserFor(CsvSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
 		return createParser(delimiter, LINE_SEPARATOR, SINGLE_QUOTE, annotation.emptyValue(),
-			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_SOURCE);
+			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_SOURCE,
+			annotation.ignoreTrailingAndLeadingWhitespace());
 	}
 
 	static CsvParser createParserFor(CsvFileSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
 		return createParser(delimiter, annotation.lineSeparator(), DOUBLE_QUOTE, annotation.emptyValue(),
-			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE);
+			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE,
+			annotation.ignoreTrailingAndLeadingWhitespace());
 	}
 
 	private static String selectDelimiter(Annotation annotation, char delimiter, String delimiterString) {
@@ -56,13 +58,14 @@ private static String selectDelimiter(Annotation annotation, char delimiter, Str
 	}
 
 	private static CsvParser createParser(String delimiter, String lineSeparator, char quote, String emptyValue,
-			int maxCharsPerColumn, boolean commentProcessingEnabled) {
+			int maxCharsPerColumn, boolean commentProcessingEnabled, boolean ignoreTrailingAndLeadingWhitespace) {
 		return new CsvParser(createParserSettings(delimiter, lineSeparator, quote, emptyValue, maxCharsPerColumn,
-			commentProcessingEnabled));
+			commentProcessingEnabled, ignoreTrailingAndLeadingWhitespace));
 	}
 
 	private static CsvParserSettings createParserSettings(String delimiter, String lineSeparator, char quote,
-			String emptyValue, int maxCharsPerColumn, boolean commentProcessingEnabled) {
+			String emptyValue, int maxCharsPerColumn, boolean commentProcessingEnabled,
+			boolean ignoreTrailingAndLeadingWhitespace) {
 
 		CsvParserSettings settings = new CsvParserSettings();
 		settings.getFormat().setDelimiter(delimiter);
@@ -72,6 +75,8 @@ private static CsvParserSettings createParserSettings(String delimiter, String l
 		settings.setEmptyValue(emptyValue);
 		settings.setCommentProcessingEnabled(commentProcessingEnabled);
 		settings.setAutoConfigurationEnabled(false);
+		settings.setIgnoreLeadingWhitespaces(ignoreTrailingAndLeadingWhitespace);
+		settings.setIgnoreTrailingWhitespaces(ignoreTrailingAndLeadingWhitespace);
 		Preconditions.condition(maxCharsPerColumn > 0,
 			() -> "maxCharsPerColumn must be a positive number: " + maxCharsPerColumn);
 		settings.setMaxCharsPerColumn(maxCharsPerColumn);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index 852711d014b1..b65756b9b6da 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -118,4 +118,15 @@
 	@API(status = EXPERIMENTAL, since = "5.7")
 	int maxCharsPerColumn() default 4096;
 
+	/**
+	 * Identifies whether leading and trailing whitespace characters of unquoted CSV columns should be ignored.
+	 *
+	 * <p>Must be a boolean value.
+	 *
+	 * <p>Defaults to {@code true}.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	boolean ignoreTrailingAndLeadingWhitespace() default true;
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index fb106aa2faf3..c58a71523ce8 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -164,6 +164,34 @@ void executesWithAggregator() {
 					event(test(), displayName("[2] ef, gh"), finishedWithFailure(message("concatenation: efgh"))));
 	}
 
+	@Test
+	void executesWithIgnoreTrailingAndLeadingSetToFalseForCsvSource() {
+		var results = execute("testCsvSourceWithIgnoreTrailingAndLeadingWhitespaceSetToFalse", String.class);
+		results.allEvents().assertThatEvents().haveAtLeast(1,
+			event(test(), finishedWithFailure(instanceOf(AssertionError.class))));
+	}
+
+	@Test
+	void executesWithIgnoreTrailingAndLeadingSetToTrueForCsvSource() {
+		var results = execute("testCsvSourceWithIgnoreTrailingAndLeadingWhitespaceSetToTrue", String.class);
+		results.allEvents().assertThatEvents().haveAtLeast(1,
+			event(test(), finishedWithFailure(instanceOf(AssertionError.class))));
+	}
+
+	@Test
+	void executesWithIgnoreTrailingAndLeadingSetToFalseForCsvFileSource() {
+		var results = execute("testCsvFileSourceWithIgnoreTrailingAndLeadingWhitespaceSetToFalse", String.class);
+		results.allEvents().assertThatEvents().haveAtLeast(1,
+			event(test(), finishedWithFailure(instanceOf(AssertionError.class))));
+	}
+
+	@Test
+	void executesWithIgnoreTrailingAndLeadingSetToTrueForCsvFileSource() {
+		var results = execute("testCsvFileSourceWithIgnoreTrailingAndLeadingWhitespaceSetToTrue", String.class);
+		results.allEvents().assertThatEvents().haveAtLeast(1,
+			event(test(), finishedWithFailure(instanceOf(AssertionError.class))));
+	}
+
 	@Test
 	void failsContainerOnEmptyName() {
 		var results = execute("testWithEmptyName", String.class);
@@ -695,6 +723,30 @@ void testWithAggregator(@AggregateWith(StringAggregator.class) String concatenat
 			fail("concatenation: " + concatenation);
 		}
 
+		@ParameterizedTest
+		@CsvSource(value = { " ab,  cd", "ef, gh" }, ignoreTrailingAndLeadingWhitespace = false)
+		void testCsvSourceWithIgnoreTrailingAndLeadingWhitespaceSetToFalse(String argument) {
+			fail("arg:" + argument);
+		}
+
+		@ParameterizedTest
+		@CsvSource(value = { " ab,  cd", "ef, gh" }, ignoreTrailingAndLeadingWhitespace = true)
+		void testCsvSourceWithIgnoreTrailingAndLeadingWhitespaceSetToTrue(String argument) {
+			fail("arg:" + argument);
+		}
+
+		@ParameterizedTest
+		@CsvFileSource(resources = "/trailing-leading-spaces.csv", ignoreTrailingAndLeadingWhitespace = false)
+		void testCsvFileSourceWithIgnoreTrailingAndLeadingWhitespaceSetToFalse(String argument) {
+			fail("arg:" + argument);
+		}
+
+		@ParameterizedTest
+		@CsvFileSource(resources = "/trailing-leading-spaces.csv", ignoreTrailingAndLeadingWhitespace = true)
+		void testCsvFileSourceWithIgnoreTrailingAndLeadingWhitespaceSetToTrue(String argument) {
+			fail("arg:" + argument);
+		}
+
 	}
 
 	static class NullSourceTestCase {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 14944ff3b0db..df2b47bd0165 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -143,6 +143,60 @@ void defaultEmptyValueAndDefaultNullValue() {
 		assertThat(arguments).containsExactly(array("", "null", null, "apple"));
 	}
 
+	@Test
+	void defaultLeadingSpaces() {
+		var annotation = csvSource("   as, null, , apple");
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("as", "null", null, "apple"));
+	}
+
+	@Test
+	void defaultLeadingSpacesWithIgnoredTrailingAndLeadingWhitespace() {
+		var annotation = csvSource(false, "   as, null, , apple");
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("   as", "null", null, "apple"));
+	}
+
+	@Test
+	void defaultTrailingSpaces() {
+		var annotation = csvSource("as      , null, , apple");
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("as", "null", null, "apple"));
+	}
+
+	@Test
+	void defaultTrailingSpacesWithIgnoredTrailingAndLeadingSpaces() {
+		var annotation = csvSource(false, "as      , null, , apple");
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("as      ", "null", null, "apple"));
+	}
+
+	@Test
+	void defaultLeadingAndTrailingSpaces() {
+		var annotation = csvSource("        as      , null, , apple");
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("as", "null", null, "apple"));
+	}
+
+	@Test
+	void defaultLeadingAndTrailingSpacesWithIgnoredTrailingAndLeadingSpaces() {
+		var annotation = csvSource(false, " as ,orange,apple");
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array(" as ", "orange", "apple"));
+	}
+
 	@Test
 	void customEmptyValueAndDefaultNullValue() {
 		var annotation = csvSource().emptyValue("EMPTY").lines("'', null, , apple").build();
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index 8db64501a74d..c6e1f11e5759 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -431,6 +431,37 @@ void throwsExceptionForExceedsMaxCharsFileWithDefaultConfig(@TempDir Path tempDi
 				.hasRootCauseInstanceOf(ArrayIndexOutOfBoundsException.class);
 	}
 
+	@Test
+	void ignoreTrimLeadingAndTrailingSpaces(@TempDir Path tempDir) throws java.io.IOException {
+		var csvFile = writeClasspathResourceToFile("/trailing-leading-spaces.csv",
+			tempDir.resolve("trailing-leading-spaces.csv"));
+		var annotation = csvFileSource()//
+				.encoding("ISO-8859-1")//
+				.resources("/trailing-leading-spaces.csv")//
+				.files(csvFile.toAbsolutePath().toString())//
+				.build(true);
+		System.out.println(annotation.ignoreTrailingAndLeadingWhitespace());
+		var arguments = provideArguments(new ByteArrayInputStream(Files.readAllBytes(csvFile)), annotation);
+
+		assertThat(arguments).containsExactly(array("a", "b", "c"));
+	}
+
+	@Test
+	void notIgnoreTrimLeadingAndTrailingSpaces(@TempDir Path tempDir) throws IOException {
+		var csvFile = writeClasspathResourceToFile("/trailing-leading-spaces.csv",
+			tempDir.resolve("trailing-leading-spaces.csv"));
+		var annotation = csvFileSource()//
+				.encoding("ISO-8859-1")//
+				.resources("/trailing-leading-spaces.csv")//
+				.files(csvFile.toAbsolutePath().toString())//
+				.delimiter(',')//
+				.build(false);
+
+		var arguments = provideArguments(new ByteArrayInputStream(Files.readAllBytes(csvFile)), annotation);
+
+		assertThat(arguments).containsExactly(array("a", "b", "c"));
+	}
+
 	private Stream<Object[]> provideArguments(CsvFileSource annotation, String content) {
 		return provideArguments(new ByteArrayInputStream(content.getBytes(UTF_8)), annotation);
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index c17dd52462ea..c8c1101c2975 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -24,6 +24,10 @@ static CsvSource csvSource(String... lines) {
 		return csvSource().lines(lines).build();
 	}
 
+	static CsvSource csvSource(boolean ignoreTrailingAndLeadingWhitespace, String... lines) {
+		return csvSource().lines(lines).build(ignoreTrailingAndLeadingWhitespace);
+	}
+
 	static MockCsvSourceBuilder csvSource() {
 		return new MockCsvSourceBuilder();
 	}
@@ -39,6 +43,7 @@ static MockCsvFileSourceBuilder csvFileSource() {
 	protected String emptyValue = "";
 	protected String[] nullValues = new String[0];
 	protected int maxCharsPerColumn = 4096;
+	protected boolean ignoreTrailingAndLeadingWhitespace = true;
 
 	private MockCsvAnnotationBuilder() {
 	}
@@ -70,6 +75,11 @@ B maxCharsPerColumn(int maxCharsPerColumn) {
 		return getSelf();
 	}
 
+	B ignoreTrailingAndLeadingWhitespace(boolean ignoreTrailingAndLeadingWhitespace) {
+		this.ignoreTrailingAndLeadingWhitespace = ignoreTrailingAndLeadingWhitespace;
+		return getSelf();
+	}
+
 	abstract A build();
 
 	// -------------------------------------------------------------------------
@@ -98,6 +108,24 @@ CsvSource build() {
 			when(annotation.emptyValue()).thenReturn(super.emptyValue);
 			when(annotation.nullValues()).thenReturn(super.nullValues);
 			when(annotation.maxCharsPerColumn()).thenReturn(super.maxCharsPerColumn);
+			when(annotation.ignoreTrailingAndLeadingWhitespace()).thenReturn(super.ignoreTrailingAndLeadingWhitespace);
+
+			// @CsvSource
+			when(annotation.value()).thenReturn(this.lines);
+
+			return annotation;
+		}
+
+		CsvSource build(boolean ignoreTrailingAndLeadingWhitespace) {
+			var annotation = mock(CsvSource.class);
+
+			// Common
+			when(annotation.delimiter()).thenReturn(super.delimiter);
+			when(annotation.delimiterString()).thenReturn(super.delimiterString);
+			when(annotation.emptyValue()).thenReturn(super.emptyValue);
+			when(annotation.nullValues()).thenReturn(super.nullValues);
+			when(annotation.maxCharsPerColumn()).thenReturn(super.maxCharsPerColumn);
+			when(annotation.ignoreTrailingAndLeadingWhitespace()).thenReturn(ignoreTrailingAndLeadingWhitespace);
 
 			// @CsvSource
 			when(annotation.value()).thenReturn(this.lines);
@@ -114,6 +142,7 @@ static class MockCsvFileSourceBuilder extends MockCsvAnnotationBuilder<CsvFileSo
 		private String encoding = "UTF-8";
 		private String lineSeparator = "\n";
 		private int numLinesToSkip = 0;
+		private boolean ignoreTrailingAndLeadingWhitespace = true;
 
 		@Override
 		protected MockCsvFileSourceBuilder getSelf() {
@@ -145,6 +174,11 @@ MockCsvFileSourceBuilder numLinesToSkip(int numLinesToSkip) {
 			return this;
 		}
 
+		MockCsvFileSourceBuilder ignoreTrailingAndLeadingWhitespace(boolean ignoreTrailingAndLeadingWhitespace) {
+			this.ignoreTrailingAndLeadingWhitespace = ignoreTrailingAndLeadingWhitespace;
+			return this;
+		}
+
 		@Override
 		CsvFileSource build() {
 			var annotation = mock(CsvFileSource.class);
@@ -162,10 +196,31 @@ CsvFileSource build() {
 			when(annotation.encoding()).thenReturn(this.encoding);
 			when(annotation.lineSeparator()).thenReturn(this.lineSeparator);
 			when(annotation.numLinesToSkip()).thenReturn(this.numLinesToSkip);
+			when(annotation.ignoreTrailingAndLeadingWhitespace()).thenReturn(ignoreTrailingAndLeadingWhitespace);
 
 			return annotation;
 		}
 
+		CsvFileSource build(boolean ignoreTrailingAndLeadingWhitespace) {
+			var annotation = mock(CsvFileSource.class);
+
+			// Common
+			when(annotation.delimiter()).thenReturn(super.delimiter);
+			when(annotation.delimiterString()).thenReturn(super.delimiterString);
+			when(annotation.emptyValue()).thenReturn(super.emptyValue);
+			when(annotation.nullValues()).thenReturn(super.nullValues);
+			when(annotation.maxCharsPerColumn()).thenReturn(super.maxCharsPerColumn);
+
+			// @CsvFileSource
+			when(annotation.resources()).thenReturn(this.resources);
+			when(annotation.files()).thenReturn(this.files);
+			when(annotation.encoding()).thenReturn(this.encoding);
+			when(annotation.lineSeparator()).thenReturn(this.lineSeparator);
+			when(annotation.numLinesToSkip()).thenReturn(this.numLinesToSkip);
+			when(annotation.ignoreTrailingAndLeadingWhitespace()).thenReturn(ignoreTrailingAndLeadingWhitespace);
+
+			return annotation;
+		}
 	}
 
 }
diff --git a/junit-jupiter-params/src/test/resources/trailing-leading-spaces.csv b/junit-jupiter-params/src/test/resources/trailing-leading-spaces.csv
new file mode 100644
index 000000000000..cd6e7b7f5dd9
--- /dev/null
+++ b/junit-jupiter-params/src/test/resources/trailing-leading-spaces.csv
@@ -0,0 +1 @@
+a,b,c
\ No newline at end of file

From 50480fd2f79a9891eaf11c3351320cf3e23d47a3 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Sun, 3 Jan 2021 16:19:23 +0100
Subject: [PATCH 0162/1433] Polish changes introduced in #2491

---
 .../params/provider/CsvFileSource.java        |  2 +-
 .../params/provider/CsvParserFactory.java     | 14 ++--
 .../jupiter/params/provider/CsvSource.java    |  2 +-
 .../ParameterizedTestIntegrationTests.java    | 64 ++++++++++--------
 .../provider/CsvArgumentsProviderTests.java   | 65 ++++---------------
 .../CsvFileArgumentsProviderTests.java        | 28 ++++----
 .../provider/MockCsvAnnotationBuilder.java    | 57 ++--------------
 .../resources/leading-trailing-spaces.csv     |  2 +
 .../resources/trailing-leading-spaces.csv     |  1 -
 9 files changed, 78 insertions(+), 157 deletions(-)
 create mode 100644 junit-jupiter-params/src/test/resources/leading-trailing-spaces.csv
 delete mode 100644 junit-jupiter-params/src/test/resources/trailing-leading-spaces.csv

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 1484a82ee075..8c3bb2be24ef 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -156,5 +156,5 @@
 	 * @since 5.8
 	 */
 	@API(status = EXPERIMENTAL, since = "5.8")
-	boolean ignoreTrailingAndLeadingWhitespace() default true;
+	boolean ignoreLeadingAndTrailingWhitespace() default true;
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index d9961687697e..18df453cf4fc 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -34,14 +34,14 @@ static CsvParser createParserFor(CsvSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
 		return createParser(delimiter, LINE_SEPARATOR, SINGLE_QUOTE, annotation.emptyValue(),
 			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_SOURCE,
-			annotation.ignoreTrailingAndLeadingWhitespace());
+			annotation.ignoreLeadingAndTrailingWhitespace());
 	}
 
 	static CsvParser createParserFor(CsvFileSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
 		return createParser(delimiter, annotation.lineSeparator(), DOUBLE_QUOTE, annotation.emptyValue(),
 			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE,
-			annotation.ignoreTrailingAndLeadingWhitespace());
+			annotation.ignoreLeadingAndTrailingWhitespace());
 	}
 
 	private static String selectDelimiter(Annotation annotation, char delimiter, String delimiterString) {
@@ -58,14 +58,14 @@ private static String selectDelimiter(Annotation annotation, char delimiter, Str
 	}
 
 	private static CsvParser createParser(String delimiter, String lineSeparator, char quote, String emptyValue,
-			int maxCharsPerColumn, boolean commentProcessingEnabled, boolean ignoreTrailingAndLeadingWhitespace) {
+			int maxCharsPerColumn, boolean commentProcessingEnabled, boolean ignoreLeadingAndTrailingWhitespace) {
 		return new CsvParser(createParserSettings(delimiter, lineSeparator, quote, emptyValue, maxCharsPerColumn,
-			commentProcessingEnabled, ignoreTrailingAndLeadingWhitespace));
+			commentProcessingEnabled, ignoreLeadingAndTrailingWhitespace));
 	}
 
 	private static CsvParserSettings createParserSettings(String delimiter, String lineSeparator, char quote,
 			String emptyValue, int maxCharsPerColumn, boolean commentProcessingEnabled,
-			boolean ignoreTrailingAndLeadingWhitespace) {
+			boolean ignoreLeadingAndTrailingWhitespace) {
 
 		CsvParserSettings settings = new CsvParserSettings();
 		settings.getFormat().setDelimiter(delimiter);
@@ -75,8 +75,8 @@ private static CsvParserSettings createParserSettings(String delimiter, String l
 		settings.setEmptyValue(emptyValue);
 		settings.setCommentProcessingEnabled(commentProcessingEnabled);
 		settings.setAutoConfigurationEnabled(false);
-		settings.setIgnoreLeadingWhitespaces(ignoreTrailingAndLeadingWhitespace);
-		settings.setIgnoreTrailingWhitespaces(ignoreTrailingAndLeadingWhitespace);
+		settings.setIgnoreLeadingWhitespaces(ignoreLeadingAndTrailingWhitespace);
+		settings.setIgnoreTrailingWhitespaces(ignoreLeadingAndTrailingWhitespace);
 		Preconditions.condition(maxCharsPerColumn > 0,
 			() -> "maxCharsPerColumn must be a positive number: " + maxCharsPerColumn);
 		settings.setMaxCharsPerColumn(maxCharsPerColumn);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index b65756b9b6da..47aabcc36902 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -128,5 +128,5 @@
 	 * @since 5.8
 	 */
 	@API(status = EXPERIMENTAL, since = "5.8")
-	boolean ignoreTrailingAndLeadingWhitespace() default true;
+	boolean ignoreLeadingAndTrailingWhitespace() default true;
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index c58a71523ce8..ed0f9e32465f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -165,31 +165,39 @@ void executesWithAggregator() {
 	}
 
 	@Test
-	void executesWithIgnoreTrailingAndLeadingSetToFalseForCsvSource() {
-		var results = execute("testCsvSourceWithIgnoreTrailingAndLeadingWhitespaceSetToFalse", String.class);
-		results.allEvents().assertThatEvents().haveAtLeast(1,
-			event(test(), finishedWithFailure(instanceOf(AssertionError.class))));
+	void executesWithIgnoreLeadingAndTrailingSetToFalseForCsvSource() {
+		var results = execute("testWithIgnoreLeadingAndTrailingWhitespaceSetToFalseForCsvSource", String.class,
+			String.class);
+		results.allEvents().assertThatEvents() //
+				.haveExactly(1, event(test(), finishedWithFailure(message("arguments: ' ab ', ' cd'")))) //
+				.haveExactly(1, event(test(), finishedWithFailure(message("arguments: 'ef ', 'gh'"))));
 	}
 
 	@Test
-	void executesWithIgnoreTrailingAndLeadingSetToTrueForCsvSource() {
-		var results = execute("testCsvSourceWithIgnoreTrailingAndLeadingWhitespaceSetToTrue", String.class);
-		results.allEvents().assertThatEvents().haveAtLeast(1,
-			event(test(), finishedWithFailure(instanceOf(AssertionError.class))));
+	void executesWithIgnoreLeadingAndTrailingSetToTrueForCsvSource() {
+		var results = execute("testWithIgnoreLeadingAndTrailingWhitespaceSetToTrueForCsvSource", String.class,
+			String.class);
+		results.allEvents().assertThatEvents() //
+				.haveExactly(1, event(test(), finishedWithFailure(message("arguments: 'ab', 'cd'")))) //
+				.haveExactly(1, event(test(), finishedWithFailure(message("arguments: 'ef', 'gh'"))));
 	}
 
 	@Test
-	void executesWithIgnoreTrailingAndLeadingSetToFalseForCsvFileSource() {
-		var results = execute("testCsvFileSourceWithIgnoreTrailingAndLeadingWhitespaceSetToFalse", String.class);
-		results.allEvents().assertThatEvents().haveAtLeast(1,
-			event(test(), finishedWithFailure(instanceOf(AssertionError.class))));
+	void executesWithIgnoreLeadingAndTrailingSetToFalseForCsvFileSource() {
+		var results = execute("testWithIgnoreLeadingAndTrailingWhitespaceSetToFalseForCsvFileSource", String.class,
+			String.class);
+		results.allEvents().assertThatEvents() //
+				.haveExactly(1, event(test(), finishedWithFailure(message("arguments: ' ab ', ' cd'")))) //
+				.haveExactly(1, event(test(), finishedWithFailure(message("arguments: 'ef ', 'gh'"))));
 	}
 
 	@Test
-	void executesWithIgnoreTrailingAndLeadingSetToTrueForCsvFileSource() {
-		var results = execute("testCsvFileSourceWithIgnoreTrailingAndLeadingWhitespaceSetToTrue", String.class);
-		results.allEvents().assertThatEvents().haveAtLeast(1,
-			event(test(), finishedWithFailure(instanceOf(AssertionError.class))));
+	void executesWithIgnoreLeadingAndTrailingSetToTrueForCsvFileSource() {
+		var results = execute("testWithIgnoreLeadingAndTrailingWhitespaceSetToTrueForCsvFileSource", String.class,
+			String.class);
+		results.allEvents().assertThatEvents() //
+				.haveExactly(1, event(test(), finishedWithFailure(message("arguments: 'ab', 'cd'")))) //
+				.haveExactly(1, event(test(), finishedWithFailure(message("arguments: 'ef', 'gh'"))));
 	}
 
 	@Test
@@ -724,27 +732,27 @@ void testWithAggregator(@AggregateWith(StringAggregator.class) String concatenat
 		}
 
 		@ParameterizedTest
-		@CsvSource(value = { " ab,  cd", "ef, gh" }, ignoreTrailingAndLeadingWhitespace = false)
-		void testCsvSourceWithIgnoreTrailingAndLeadingWhitespaceSetToFalse(String argument) {
-			fail("arg:" + argument);
+		@CsvSource(value = { " ab , cd", "ef ,gh" }, ignoreLeadingAndTrailingWhitespace = false)
+		void testWithIgnoreLeadingAndTrailingWhitespaceSetToFalseForCsvSource(String argument1, String argument2) {
+			fail("arguments: '" + argument1 + "', '" + argument2 + "'");
 		}
 
 		@ParameterizedTest
-		@CsvSource(value = { " ab,  cd", "ef, gh" }, ignoreTrailingAndLeadingWhitespace = true)
-		void testCsvSourceWithIgnoreTrailingAndLeadingWhitespaceSetToTrue(String argument) {
-			fail("arg:" + argument);
+		@CsvSource(value = { " ab , cd", "ef ,gh" }, ignoreLeadingAndTrailingWhitespace = true)
+		void testWithIgnoreLeadingAndTrailingWhitespaceSetToTrueForCsvSource(String argument1, String argument2) {
+			fail("arguments: '" + argument1 + "', '" + argument2 + "'");
 		}
 
 		@ParameterizedTest
-		@CsvFileSource(resources = "/trailing-leading-spaces.csv", ignoreTrailingAndLeadingWhitespace = false)
-		void testCsvFileSourceWithIgnoreTrailingAndLeadingWhitespaceSetToFalse(String argument) {
-			fail("arg:" + argument);
+		@CsvFileSource(resources = "/leading-trailing-spaces.csv", ignoreLeadingAndTrailingWhitespace = false)
+		void testWithIgnoreLeadingAndTrailingWhitespaceSetToFalseForCsvFileSource(String argument1, String argument2) {
+			fail("arguments: '" + argument1 + "', '" + argument2 + "'");
 		}
 
 		@ParameterizedTest
-		@CsvFileSource(resources = "/trailing-leading-spaces.csv", ignoreTrailingAndLeadingWhitespace = true)
-		void testCsvFileSourceWithIgnoreTrailingAndLeadingWhitespaceSetToTrue(String argument) {
-			fail("arg:" + argument);
+		@CsvFileSource(resources = "/leading-trailing-spaces.csv", ignoreLeadingAndTrailingWhitespace = true)
+		void testWithIgnoreLeadingAndTrailingWhitespaceSetToTrueForCsvFileSource(String argument1, String argument2) {
+			fail("arguments: '" + argument1 + "', '" + argument2 + "'");
 		}
 
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index df2b47bd0165..bbe3baab612d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -79,6 +79,17 @@ void trimsTrailingSpaces() {
 		assertThat(arguments).containsExactly(new Object[][] { { "1", "" }, { "2", "" }, { "3", "" }, { "4", "" } });
 	}
 
+	@Test
+	void ignoresLeadingAndTrailingSpaces() {
+		var annotation = csvSource().lines("1,a", "2, b", "3,c ", "4, d ") //
+				.ignoreLeadingAndTrailingWhitespace(false).build();
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(
+			new Object[][] { { "1", "a" }, { "2", " b" }, { "3", "c " }, { "4", " d " } });
+	}
+
 	@Test
 	void understandsQuotes() {
 		var annotation = csvSource("'foo, bar'");
@@ -143,60 +154,6 @@ void defaultEmptyValueAndDefaultNullValue() {
 		assertThat(arguments).containsExactly(array("", "null", null, "apple"));
 	}
 
-	@Test
-	void defaultLeadingSpaces() {
-		var annotation = csvSource("   as, null, , apple");
-
-		var arguments = provideArguments(annotation);
-
-		assertThat(arguments).containsExactly(array("as", "null", null, "apple"));
-	}
-
-	@Test
-	void defaultLeadingSpacesWithIgnoredTrailingAndLeadingWhitespace() {
-		var annotation = csvSource(false, "   as, null, , apple");
-
-		var arguments = provideArguments(annotation);
-
-		assertThat(arguments).containsExactly(array("   as", "null", null, "apple"));
-	}
-
-	@Test
-	void defaultTrailingSpaces() {
-		var annotation = csvSource("as      , null, , apple");
-
-		var arguments = provideArguments(annotation);
-
-		assertThat(arguments).containsExactly(array("as", "null", null, "apple"));
-	}
-
-	@Test
-	void defaultTrailingSpacesWithIgnoredTrailingAndLeadingSpaces() {
-		var annotation = csvSource(false, "as      , null, , apple");
-
-		var arguments = provideArguments(annotation);
-
-		assertThat(arguments).containsExactly(array("as      ", "null", null, "apple"));
-	}
-
-	@Test
-	void defaultLeadingAndTrailingSpaces() {
-		var annotation = csvSource("        as      , null, , apple");
-
-		var arguments = provideArguments(annotation);
-
-		assertThat(arguments).containsExactly(array("as", "null", null, "apple"));
-	}
-
-	@Test
-	void defaultLeadingAndTrailingSpacesWithIgnoredTrailingAndLeadingSpaces() {
-		var annotation = csvSource(false, " as ,orange,apple");
-
-		var arguments = provideArguments(annotation);
-
-		assertThat(arguments).containsExactly(array(" as ", "orange", "apple"));
-	}
-
 	@Test
 	void customEmptyValueAndDefaultNullValue() {
 		var annotation = csvSource().emptyValue("EMPTY").lines("'', null, , apple").build();
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index c6e1f11e5759..43e6087e2e1d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -432,34 +432,36 @@ void throwsExceptionForExceedsMaxCharsFileWithDefaultConfig(@TempDir Path tempDi
 	}
 
 	@Test
-	void ignoreTrimLeadingAndTrailingSpaces(@TempDir Path tempDir) throws java.io.IOException {
-		var csvFile = writeClasspathResourceToFile("/trailing-leading-spaces.csv",
-			tempDir.resolve("trailing-leading-spaces.csv"));
+	void ignoresLeadingAndTrailingSpaces(@TempDir Path tempDir) throws IOException {
+		var csvFile = writeClasspathResourceToFile("/leading-trailing-spaces.csv",
+			tempDir.resolve("leading-trailing-spaces.csv"));
 		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
-				.resources("/trailing-leading-spaces.csv")//
+				.resources("/leading-trailing-spaces.csv")//
 				.files(csvFile.toAbsolutePath().toString())//
-				.build(true);
-		System.out.println(annotation.ignoreTrailingAndLeadingWhitespace());
+				.ignoreLeadingAndTrailingWhitespace(true)//
+				.build();
+
 		var arguments = provideArguments(new ByteArrayInputStream(Files.readAllBytes(csvFile)), annotation);
 
-		assertThat(arguments).containsExactly(array("a", "b", "c"));
+		assertThat(arguments).containsExactly(array("ab", "cd"), array("ef", "gh"));
 	}
 
 	@Test
-	void notIgnoreTrimLeadingAndTrailingSpaces(@TempDir Path tempDir) throws IOException {
-		var csvFile = writeClasspathResourceToFile("/trailing-leading-spaces.csv",
-			tempDir.resolve("trailing-leading-spaces.csv"));
+	void trimsLeadingAndTrailingSpaces(@TempDir Path tempDir) throws IOException {
+		var csvFile = writeClasspathResourceToFile("/leading-trailing-spaces.csv",
+			tempDir.resolve("leading-trailing-spaces.csv"));
 		var annotation = csvFileSource()//
 				.encoding("ISO-8859-1")//
-				.resources("/trailing-leading-spaces.csv")//
+				.resources("/leading-trailing-spaces.csv")//
 				.files(csvFile.toAbsolutePath().toString())//
 				.delimiter(',')//
-				.build(false);
+				.ignoreLeadingAndTrailingWhitespace(false)//
+				.build();
 
 		var arguments = provideArguments(new ByteArrayInputStream(Files.readAllBytes(csvFile)), annotation);
 
-		assertThat(arguments).containsExactly(array("a", "b", "c"));
+		assertThat(arguments).containsExactly(array(" ab ", " cd"), array("ef ", "gh"));
 	}
 
 	private Stream<Object[]> provideArguments(CsvFileSource annotation, String content) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index c8c1101c2975..438393631c5a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -24,10 +24,6 @@ static CsvSource csvSource(String... lines) {
 		return csvSource().lines(lines).build();
 	}
 
-	static CsvSource csvSource(boolean ignoreTrailingAndLeadingWhitespace, String... lines) {
-		return csvSource().lines(lines).build(ignoreTrailingAndLeadingWhitespace);
-	}
-
 	static MockCsvSourceBuilder csvSource() {
 		return new MockCsvSourceBuilder();
 	}
@@ -43,7 +39,7 @@ static MockCsvFileSourceBuilder csvFileSource() {
 	protected String emptyValue = "";
 	protected String[] nullValues = new String[0];
 	protected int maxCharsPerColumn = 4096;
-	protected boolean ignoreTrailingAndLeadingWhitespace = true;
+	protected boolean ignoreLeadingAndTrailingWhitespace = true;
 
 	private MockCsvAnnotationBuilder() {
 	}
@@ -75,8 +71,8 @@ B maxCharsPerColumn(int maxCharsPerColumn) {
 		return getSelf();
 	}
 
-	B ignoreTrailingAndLeadingWhitespace(boolean ignoreTrailingAndLeadingWhitespace) {
-		this.ignoreTrailingAndLeadingWhitespace = ignoreTrailingAndLeadingWhitespace;
+	B ignoreLeadingAndTrailingWhitespace(boolean ignoreLeadingAndTrailingWhitespace) {
+		this.ignoreLeadingAndTrailingWhitespace = ignoreLeadingAndTrailingWhitespace;
 		return getSelf();
 	}
 
@@ -108,24 +104,7 @@ CsvSource build() {
 			when(annotation.emptyValue()).thenReturn(super.emptyValue);
 			when(annotation.nullValues()).thenReturn(super.nullValues);
 			when(annotation.maxCharsPerColumn()).thenReturn(super.maxCharsPerColumn);
-			when(annotation.ignoreTrailingAndLeadingWhitespace()).thenReturn(super.ignoreTrailingAndLeadingWhitespace);
-
-			// @CsvSource
-			when(annotation.value()).thenReturn(this.lines);
-
-			return annotation;
-		}
-
-		CsvSource build(boolean ignoreTrailingAndLeadingWhitespace) {
-			var annotation = mock(CsvSource.class);
-
-			// Common
-			when(annotation.delimiter()).thenReturn(super.delimiter);
-			when(annotation.delimiterString()).thenReturn(super.delimiterString);
-			when(annotation.emptyValue()).thenReturn(super.emptyValue);
-			when(annotation.nullValues()).thenReturn(super.nullValues);
-			when(annotation.maxCharsPerColumn()).thenReturn(super.maxCharsPerColumn);
-			when(annotation.ignoreTrailingAndLeadingWhitespace()).thenReturn(ignoreTrailingAndLeadingWhitespace);
+			when(annotation.ignoreLeadingAndTrailingWhitespace()).thenReturn(super.ignoreLeadingAndTrailingWhitespace);
 
 			// @CsvSource
 			when(annotation.value()).thenReturn(this.lines);
@@ -142,7 +121,6 @@ static class MockCsvFileSourceBuilder extends MockCsvAnnotationBuilder<CsvFileSo
 		private String encoding = "UTF-8";
 		private String lineSeparator = "\n";
 		private int numLinesToSkip = 0;
-		private boolean ignoreTrailingAndLeadingWhitespace = true;
 
 		@Override
 		protected MockCsvFileSourceBuilder getSelf() {
@@ -174,11 +152,6 @@ MockCsvFileSourceBuilder numLinesToSkip(int numLinesToSkip) {
 			return this;
 		}
 
-		MockCsvFileSourceBuilder ignoreTrailingAndLeadingWhitespace(boolean ignoreTrailingAndLeadingWhitespace) {
-			this.ignoreTrailingAndLeadingWhitespace = ignoreTrailingAndLeadingWhitespace;
-			return this;
-		}
-
 		@Override
 		CsvFileSource build() {
 			var annotation = mock(CsvFileSource.class);
@@ -189,6 +162,7 @@ CsvFileSource build() {
 			when(annotation.emptyValue()).thenReturn(super.emptyValue);
 			when(annotation.nullValues()).thenReturn(super.nullValues);
 			when(annotation.maxCharsPerColumn()).thenReturn(super.maxCharsPerColumn);
+			when(annotation.ignoreLeadingAndTrailingWhitespace()).thenReturn(super.ignoreLeadingAndTrailingWhitespace);
 
 			// @CsvFileSource
 			when(annotation.resources()).thenReturn(this.resources);
@@ -196,31 +170,10 @@ CsvFileSource build() {
 			when(annotation.encoding()).thenReturn(this.encoding);
 			when(annotation.lineSeparator()).thenReturn(this.lineSeparator);
 			when(annotation.numLinesToSkip()).thenReturn(this.numLinesToSkip);
-			when(annotation.ignoreTrailingAndLeadingWhitespace()).thenReturn(ignoreTrailingAndLeadingWhitespace);
 
 			return annotation;
 		}
 
-		CsvFileSource build(boolean ignoreTrailingAndLeadingWhitespace) {
-			var annotation = mock(CsvFileSource.class);
-
-			// Common
-			when(annotation.delimiter()).thenReturn(super.delimiter);
-			when(annotation.delimiterString()).thenReturn(super.delimiterString);
-			when(annotation.emptyValue()).thenReturn(super.emptyValue);
-			when(annotation.nullValues()).thenReturn(super.nullValues);
-			when(annotation.maxCharsPerColumn()).thenReturn(super.maxCharsPerColumn);
-
-			// @CsvFileSource
-			when(annotation.resources()).thenReturn(this.resources);
-			when(annotation.files()).thenReturn(this.files);
-			when(annotation.encoding()).thenReturn(this.encoding);
-			when(annotation.lineSeparator()).thenReturn(this.lineSeparator);
-			when(annotation.numLinesToSkip()).thenReturn(this.numLinesToSkip);
-			when(annotation.ignoreTrailingAndLeadingWhitespace()).thenReturn(ignoreTrailingAndLeadingWhitespace);
-
-			return annotation;
-		}
 	}
 
 }
diff --git a/junit-jupiter-params/src/test/resources/leading-trailing-spaces.csv b/junit-jupiter-params/src/test/resources/leading-trailing-spaces.csv
new file mode 100644
index 000000000000..260888ce1b2f
--- /dev/null
+++ b/junit-jupiter-params/src/test/resources/leading-trailing-spaces.csv
@@ -0,0 +1,2 @@
+ ab , cd
+ef ,gh
\ No newline at end of file
diff --git a/junit-jupiter-params/src/test/resources/trailing-leading-spaces.csv b/junit-jupiter-params/src/test/resources/trailing-leading-spaces.csv
deleted file mode 100644
index cd6e7b7f5dd9..000000000000
--- a/junit-jupiter-params/src/test/resources/trailing-leading-spaces.csv
+++ /dev/null
@@ -1 +0,0 @@
-a,b,c
\ No newline at end of file

From d64a4a575d9c41492fc2a9c2e11b6fa428865cdf Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Sun, 3 Jan 2021 16:25:41 +0100
Subject: [PATCH 0163/1433] Add documentation and release note following #2491

---
 .../release-notes/release-notes-5.8.0-M1.adoc |  2 ++
 .../asciidoc/user-guide/writing-tests.adoc    | 23 +++++++++++++------
 .../params/provider/CsvFileSource.java        |  5 ++--
 .../jupiter/params/provider/CsvSource.java    |  5 ++--
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index c5fc61e15ac3..889669b54a38 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -72,6 +72,8 @@ on GitHub.
 * Dynamic tests now require less memory thanks to a number of improvements to internal
   data structures.
 * Allow rows in `@CsvSource` to start with a number sign (#)
+* New `ignoreLeadingAndTrailingWhitespace` attribute to control whether or not to trim
+  whitespaces in `@CsvSource` and `@CsvFileSource` (set to `true` by default).
 
 [[release-notes-5.8.0-M1-junit-vintage]]
 === JUnit Vintage
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 4e4500018543..8f247e7fa0d9 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1260,15 +1260,20 @@ reference is a primitive type.
 NOTE: An _unquoted_ empty value will always be converted to a `null` reference regardless
 of any custom values configured via the `nullValues` attribute.
 
+Unless it starts with a quote character, leading and trailing whitespaces of a
+CSV column are trimmed by default. This behavior can be changed by setting the
+`ignoreLeadingAndTrailingWhitespace` attribute to `true`.
+
 [cols="50,50"]
 |===
-| Example Input                                                       | Resulting Argument List
-
-| `@CsvSource({ "apple, banana" })`                                   | `"apple"`, `"banana"`
-| `@CsvSource({ "apple, 'lemon, lime'" })`                            | `"apple"`, `"lemon, lime"`
-| `@CsvSource({ "apple, ''" })`                                       | `"apple"`, `""`
-| `@CsvSource({ "apple, " })`                                         | `"apple"`, `null`
-| `@CsvSource(value = { "apple, banana, NIL" }, nullValues = "NIL")` | `"apple"`, `"banana"`, `null`
+| Example Input                                                                           | Resulting Argument List
+
+| `@CsvSource({ "apple, banana" })`                                                       | `"apple"`, `"banana"`
+| `@CsvSource({ "apple, 'lemon, lime'" })`                                                | `"apple"`, `"lemon, lime"`
+| `@CsvSource({ "apple, ''" })`                                                           | `"apple"`, `""`
+| `@CsvSource({ "apple, " })`                                                             | `"apple"`, `null`
+| `@CsvSource(value = { "apple, banana, NIL" }, nullValues = "NIL")`                      | `"apple"`, `"banana"`, `null`
+| `@CsvSource(value = { " apple , banana" }, ignoreLeadingAndTrailingWhitespace = false)` | `" apple "`, `" banana"`
 |===
 
 [[writing-tests-parameterized-tests-sources-CsvFileSource]]
@@ -1308,6 +1313,10 @@ reference is a primitive type.
 NOTE: An _unquoted_ empty value will always be converted to a `null` reference regardless
 of any custom values configured via the `nullValues` attribute.
 
+Unless it starts with a quote character, leading and trailing whitespaces of a
+CSV column are trimmed by default. This behavior can be changed by setting the
+`ignoreLeadingAndTrailingWhitespace` attribute to `true`.
+
 [[writing-tests-parameterized-tests-sources-ArgumentsSource]]
 ===== @ArgumentsSource
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 8c3bb2be24ef..5e19035da09c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -147,9 +147,8 @@
 	int maxCharsPerColumn() default 4096;
 
 	/**
-	 * Identifies whether leading and trailing whitespace characters of unquoted CSV columns should be ignored.
-	 *
-	 * <p>Must be a boolean value.
+	 * Identifies whether leading and trailing whitespace characters of
+	 * unquoted CSV columns should be ignored.
 	 *
 	 * <p>Defaults to {@code true}.
 	 *
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index 47aabcc36902..194341bf6630 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -119,9 +119,8 @@
 	int maxCharsPerColumn() default 4096;
 
 	/**
-	 * Identifies whether leading and trailing whitespace characters of unquoted CSV columns should be ignored.
-	 *
-	 * <p>Must be a boolean value.
+	 * Identifies whether leading and trailing whitespace characters of
+	 * unquoted CSV columns should be ignored.
 	 *
 	 * <p>Defaults to {@code true}.
 	 *

From cbea9170e100f17a8d2596ebb646166360dfcc52 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 16 Jan 2021 20:55:14 +0100
Subject: [PATCH 0164/1433] Allow publishing build scans to scans.gradle.com
 (#2533)

Prior to this commit, only members of the JUnit team were able to
publish build scans because ge.junit.org was configured as server and
requires authentication. Now, CI builds for external branches publish
scans to scans.gradle.com and contributors can manually publish scans
by specifying Gradle's `--scan` option and accepting Gradle's terms and
conditions.
---
 settings.gradle.kts | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 94e155dab7e8..0f3cc86dbbfd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,12 +28,28 @@ val junitBuildCachePassword: String? by extra
 
 gradleEnterprise {
 	buildScan {
-		server = gradleEnterpriseServer
 		isCaptureTaskInputFiles = true
 		isUploadInBackground = !isCiServer
-		publishAlways()
-		this as BuildScanExtensionWithHiddenFeatures
-		publishIfAuthenticated()
+
+		fun accessKeysAreMissingOrBlank(): Boolean {
+			val accessKeys = File(gradle.gradleUserHomeDir, "enterprise/keys.properties")
+			return !accessKeys.isFile || accessKeys.readText().isBlank()
+		}
+
+		if (gradle.startParameter.isBuildScan || (isCiServer && accessKeysAreMissingOrBlank())) {
+			termsOfServiceUrl = "https://gradle.com/terms-of-service"
+		} else {
+			server = gradleEnterpriseServer
+			publishAlways()
+			this as BuildScanExtensionWithHiddenFeatures
+			publishIfAuthenticated()
+		}
+
+		if (isCiServer) {
+			publishAlways()
+			termsOfServiceAgree = "yes"
+		}
+
 		obfuscation {
 			if (isCiServer) {
 				username { "github" }

From 276973e218694c9b01cfbfa86349165985069edd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 16 Jan 2021 21:17:05 +0100
Subject: [PATCH 0165/1433] Remove explicit --scan arguments

so that CI publishes to ge.gradle.org again, if possible.
---
 .github/workflows/cross-version.yml | 2 +-
 .github/workflows/main.yml          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index afc53e9d4e6a..bb2b9332c347 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -49,4 +49,4 @@ jobs:
       - name: Test
         run: |
           ./gradlew --version
-          ./gradlew --scan --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
+          ./gradlew --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 396911c24813..cc4a46f444b0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Test and Coverage
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo build jacocoRootReport
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo build jacocoRootReport
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 
@@ -94,7 +94,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
         ./gradlew --stop
 
   mac:
@@ -131,7 +131,7 @@ jobs:
     - name: 'Test'
       run: |
         ./gradlew --version
-        ./gradlew --scan --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true build
 
   publish_artifacts:
     name: Publish Snapshot Artifacts
@@ -160,7 +160,7 @@ jobs:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-      run: ./gradlew --scan publish -x check
+      run: ./gradlew publish -x check
 
   update_documentation:
     name: Update Snapshot Documentation

From aba78ffb638b95ba8284489f9a7f919b7ac06582 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 16 Jan 2021 21:41:00 +0100
Subject: [PATCH 0166/1433] Ensure tests are executed on all operating systems
 on CI

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 137d0d9e67d6..32c14b50524c 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
+import org.gradle.internal.os.OperatingSystem
 
 plugins {
 	id("org.gradle.test-retry")
@@ -28,6 +29,8 @@ tasks.withType<Test>().configureEach {
 			"-XX:FlightRecorderOptions=stackdepth=1024"
 		)
 	}
+	// Track OS as input so that tests are executed on all configured operating systems on CI
+	inputs.property("os", OperatingSystem.current().familyName)
 }
 
 dependencies {

From 17d3b440f3b6c3ba4616fc927e7782e74582ea86 Mon Sep 17 00:00:00 2001
From: JUnit Team <team@junit.org>
Date: Sun, 17 Jan 2021 14:25:04 +0100
Subject: [PATCH 0167/1433] Update copyright

---
 documentation/src/main/java/example/domain/Person.java          | 2 +-
 documentation/src/main/java/example/registration/WebClient.java | 2 +-
 .../src/main/java/example/registration/WebResponse.java         | 2 +-
 .../src/main/java/example/registration/WebServerExtension.java  | 2 +-
 documentation/src/main/java/example/util/Calculator.java        | 2 +-
 documentation/src/main/java/example/util/ListWriter.java        | 2 +-
 documentation/src/main/java/example/util/StringUtils.java       | 2 +-
 documentation/src/test/java/example/AssertionsDemo.java         | 2 +-
 documentation/src/test/java/example/AssumptionsDemo.java        | 2 +-
 .../src/test/java/example/ConditionalTestExecutionDemo.java     | 2 +-
 documentation/src/test/java/example/CustomTestEngine.java       | 2 +-
 documentation/src/test/java/example/DisabledClassDemo.java      | 2 +-
 documentation/src/test/java/example/DisabledTestsDemo.java      | 2 +-
 documentation/src/test/java/example/DisplayNameDemo.java        | 2 +-
 .../src/test/java/example/DisplayNameGeneratorDemo.java         | 2 +-
 documentation/src/test/java/example/DocumentationTestSuite.java | 2 +-
 documentation/src/test/java/example/DynamicTestsDemo.java       | 2 +-
 documentation/src/test/java/example/ExampleTestCase.java        | 2 +-
 .../src/test/java/example/ExternalMethodSourceDemo.java         | 2 +-
 documentation/src/test/java/example/Fast.java                   | 2 +-
 documentation/src/test/java/example/FastTest.java               | 2 +-
 documentation/src/test/java/example/HamcrestAssertionsDemo.java | 2 +-
 documentation/src/test/java/example/IgnoredTestsDemo.java       | 2 +-
 documentation/src/test/java/example/JUnit4Tests.java            | 2 +-
 documentation/src/test/java/example/JUnitPlatformClassDemo.java | 2 +-
 documentation/src/test/java/example/JUnitPlatformSuiteDemo.java | 2 +-
 .../src/test/java/example/MyFirstJUnitJupiterTests.java         | 2 +-
 documentation/src/test/java/example/OrderedTestsDemo.java       | 2 +-
 documentation/src/test/java/example/ParameterizedTestDemo.java  | 2 +-
 documentation/src/test/java/example/PollingTimeoutDemo.java     | 2 +-
 documentation/src/test/java/example/RepeatedTestsDemo.java      | 2 +-
 documentation/src/test/java/example/SharedResourcesDemo.java    | 2 +-
 documentation/src/test/java/example/SlowTests.java              | 2 +-
 documentation/src/test/java/example/StandardTests.java          | 2 +-
 documentation/src/test/java/example/TaggingDemo.java            | 2 +-
 documentation/src/test/java/example/TempDirectoryDemo.java      | 2 +-
 documentation/src/test/java/example/TestInfoDemo.java           | 2 +-
 documentation/src/test/java/example/TestReporterDemo.java       | 2 +-
 documentation/src/test/java/example/TestTemplateDemo.java       | 2 +-
 documentation/src/test/java/example/TestingAStackDemo.java      | 2 +-
 documentation/src/test/java/example/TimeoutDemo.java            | 2 +-
 documentation/src/test/java/example/UsingTheLauncherDemo.java   | 2 +-
 .../src/test/java/example/callbacks/AbstractDatabaseTests.java  | 2 +-
 .../java/example/callbacks/BrokenLifecycleMethodConfigDemo.java | 2 +-
 .../src/test/java/example/callbacks/DatabaseTestsDemo.java      | 2 +-
 documentation/src/test/java/example/callbacks/Extension1.java   | 2 +-
 documentation/src/test/java/example/callbacks/Extension2.java   | 2 +-
 documentation/src/test/java/example/callbacks/Logger.java       | 2 +-
 .../test/java/example/defaultmethods/ComparableContract.java    | 2 +-
 .../src/test/java/example/defaultmethods/EqualsContract.java    | 2 +-
 .../src/test/java/example/defaultmethods/StringTests.java       | 2 +-
 .../src/test/java/example/defaultmethods/Testable.java          | 2 +-
 .../test/java/example/exception/IgnoreIOExceptionExtension.java | 2 +-
 .../src/test/java/example/exception/IgnoreIOExceptionTests.java | 2 +-
 .../test/java/example/exception/MultipleHandlersTestCase.java   | 2 +-
 .../java/example/exception/RecordStateOnErrorExtension.java     | 2 +-
 .../src/test/java/example/interceptor/SwingEdtInterceptor.java  | 2 +-
 .../src/test/java/example/registration/DocumentationDemo.java   | 2 +-
 .../src/test/java/example/registration/WebServerDemo.java       | 2 +-
 .../src/test/java/example/testinterface/TestInterfaceDemo.java  | 2 +-
 .../example/testinterface/TestInterfaceDynamicTestsDemo.java    | 2 +-
 .../test/java/example/testinterface/TestLifecycleLogger.java    | 2 +-
 .../test/java/example/testinterface/TimeExecutionLogger.java    | 2 +-
 .../test/java/example/testkit/EngineTestKitAllEventsDemo.java   | 2 +-
 .../java/example/testkit/EngineTestKitFailedMethodDemo.java     | 2 +-
 .../java/example/testkit/EngineTestKitSkippedMethodDemo.java    | 2 +-
 .../test/java/example/testkit/EngineTestKitStatisticsDemo.java  | 2 +-
 documentation/src/test/java/example/timing/TimingExtension.java | 2 +-
 .../src/test/java/example/timing/TimingExtensionTests.java      | 2 +-
 documentation/src/test/java/extensions/ExpectToFail.java        | 2 +-
 .../test/java/org/junit/api/tools/AbstractApiReportWriter.java  | 2 +-
 documentation/src/test/java/org/junit/api/tools/ApiReport.java  | 2 +-
 .../src/test/java/org/junit/api/tools/ApiReportGenerator.java   | 2 +-
 .../src/test/java/org/junit/api/tools/ApiReportWriter.java      | 2 +-
 .../test/java/org/junit/api/tools/AsciidocApiReportWriter.java  | 2 +-
 .../src/test/java/org/junit/api/tools/HtmlApiReportWriter.java  | 2 +-
 .../test/java/org/junit/api/tools/MarkdownApiReportWriter.java  | 2 +-
 documentation/src/test/kotlin/example/FibonacciCalculator.kt    | 2 +-
 documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt   | 2 +-
 .../src/test/kotlin/example/registration/KotlinWebServerDemo.kt | 2 +-
 .../src/main/java/org/junit/jupiter/api/AfterAll.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/AfterEach.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertAll.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertArrayEquals.java  | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertEquals.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertFalse.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertInstanceOf.java   | 2 +-
 .../main/java/org/junit/jupiter/api/AssertIterableEquals.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertLinesMatch.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotEquals.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotNull.java      | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotSame.java      | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNull.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertSame.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertThrows.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertTimeout.java      | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertTrue.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertionUtils.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/Assertions.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/Assumptions.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/BeforeAll.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/BeforeEach.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/Disabled.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/DisplayName.java        | 2 +-
 .../main/java/org/junit/jupiter/api/DisplayNameGeneration.java  | 2 +-
 .../main/java/org/junit/jupiter/api/DisplayNameGenerator.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicContainer.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicNode.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicTest.java        | 2 +-
 .../org/junit/jupiter/api/IndicativeSentencesGeneration.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodDescriptor.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodOrderer.java      | 2 +-
 .../main/java/org/junit/jupiter/api/MethodOrdererContext.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/Nested.java             | 2 +-
 .../src/main/java/org/junit/jupiter/api/Order.java              | 2 +-
 .../src/main/java/org/junit/jupiter/api/RepeatedTest.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/RepetitionInfo.java     | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java  | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestFactory.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestInfo.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestInstance.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestMethodOrder.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestReporter.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestTemplate.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/Timeout.java            | 2 +-
 .../api/condition/AbstractRepeatableAnnotationCondition.java    | 2 +-
 .../junit/jupiter/api/condition/BooleanExecutionCondition.java  | 2 +-
 .../org/junit/jupiter/api/condition/DisabledForJreRange.java    | 2 +-
 .../jupiter/api/condition/DisabledForJreRangeCondition.java     | 2 +-
 .../main/java/org/junit/jupiter/api/condition/DisabledIf.java   | 2 +-
 .../org/junit/jupiter/api/condition/DisabledIfCondition.java    | 2 +-
 .../jupiter/api/condition/DisabledIfEnvironmentVariable.java    | 2 +-
 .../api/condition/DisabledIfEnvironmentVariableCondition.java   | 2 +-
 .../jupiter/api/condition/DisabledIfEnvironmentVariables.java   | 2 +-
 .../junit/jupiter/api/condition/DisabledIfSystemProperties.java | 2 +-
 .../junit/jupiter/api/condition/DisabledIfSystemProperty.java   | 2 +-
 .../api/condition/DisabledIfSystemPropertyCondition.java        | 2 +-
 .../java/org/junit/jupiter/api/condition/DisabledOnJre.java     | 2 +-
 .../org/junit/jupiter/api/condition/DisabledOnJreCondition.java | 2 +-
 .../main/java/org/junit/jupiter/api/condition/DisabledOnOs.java | 2 +-
 .../org/junit/jupiter/api/condition/DisabledOnOsCondition.java  | 2 +-
 .../org/junit/jupiter/api/condition/EnabledForJreRange.java     | 2 +-
 .../jupiter/api/condition/EnabledForJreRangeCondition.java      | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledIf.java    | 2 +-
 .../org/junit/jupiter/api/condition/EnabledIfCondition.java     | 2 +-
 .../jupiter/api/condition/EnabledIfEnvironmentVariable.java     | 2 +-
 .../api/condition/EnabledIfEnvironmentVariableCondition.java    | 2 +-
 .../jupiter/api/condition/EnabledIfEnvironmentVariables.java    | 2 +-
 .../junit/jupiter/api/condition/EnabledIfSystemProperties.java  | 2 +-
 .../junit/jupiter/api/condition/EnabledIfSystemProperty.java    | 2 +-
 .../jupiter/api/condition/EnabledIfSystemPropertyCondition.java | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledOnJre.java | 2 +-
 .../org/junit/jupiter/api/condition/EnabledOnJreCondition.java  | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledOnOs.java  | 2 +-
 .../org/junit/jupiter/api/condition/EnabledOnOsCondition.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/condition/JRE.java      | 2 +-
 .../org/junit/jupiter/api/condition/MethodBasedCondition.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/condition/OS.java       | 2 +-
 .../java/org/junit/jupiter/api/extension/AfterAllCallback.java  | 2 +-
 .../java/org/junit/jupiter/api/extension/AfterEachCallback.java | 2 +-
 .../junit/jupiter/api/extension/AfterTestExecutionCallback.java | 2 +-
 .../java/org/junit/jupiter/api/extension/BeforeAllCallback.java | 2 +-
 .../org/junit/jupiter/api/extension/BeforeEachCallback.java     | 2 +-
 .../jupiter/api/extension/BeforeTestExecutionCallback.java      | 2 +-
 .../junit/jupiter/api/extension/ConditionEvaluationResult.java  | 2 +-
 .../jupiter/api/extension/DynamicTestInvocationContext.java     | 2 +-
 .../org/junit/jupiter/api/extension/ExecutionCondition.java     | 2 +-
 .../main/java/org/junit/jupiter/api/extension/ExtendWith.java   | 2 +-
 .../main/java/org/junit/jupiter/api/extension/Extension.java    | 2 +-
 .../jupiter/api/extension/ExtensionConfigurationException.java  | 2 +-
 .../java/org/junit/jupiter/api/extension/ExtensionContext.java  | 2 +-
 .../junit/jupiter/api/extension/ExtensionContextException.java  | 2 +-
 .../main/java/org/junit/jupiter/api/extension/Extensions.java   | 2 +-
 .../org/junit/jupiter/api/extension/InvocationInterceptor.java  | 2 +-
 .../api/extension/LifecycleMethodExecutionExceptionHandler.java | 2 +-
 .../java/org/junit/jupiter/api/extension/ParameterContext.java  | 2 +-
 .../jupiter/api/extension/ParameterResolutionException.java     | 2 +-
 .../java/org/junit/jupiter/api/extension/ParameterResolver.java | 2 +-
 .../jupiter/api/extension/ReflectiveInvocationContext.java      | 2 +-
 .../java/org/junit/jupiter/api/extension/RegisterExtension.java | 2 +-
 .../jupiter/api/extension/TestExecutionExceptionHandler.java    | 2 +-
 .../org/junit/jupiter/api/extension/TestInstanceFactory.java    | 2 +-
 .../junit/jupiter/api/extension/TestInstanceFactoryContext.java | 2 +-
 .../junit/jupiter/api/extension/TestInstancePostProcessor.java  | 2 +-
 .../jupiter/api/extension/TestInstancePreDestroyCallback.java   | 2 +-
 .../java/org/junit/jupiter/api/extension/TestInstances.java     | 2 +-
 .../junit/jupiter/api/extension/TestInstantiationException.java | 2 +-
 .../jupiter/api/extension/TestTemplateInvocationContext.java    | 2 +-
 .../api/extension/TestTemplateInvocationContextProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/api/extension/TestWatcher.java  | 2 +-
 .../api/extension/support/TypeBasedParameterResolver.java       | 2 +-
 .../main/java/org/junit/jupiter/api/function/Executable.java    | 2 +-
 .../java/org/junit/jupiter/api/function/ThrowingConsumer.java   | 2 +-
 .../java/org/junit/jupiter/api/function/ThrowingSupplier.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/io/TempDir.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Execution.java | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ExecutionMode.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Isolated.java  | 2 +-
 .../java/org/junit/jupiter/api/parallel/ResourceAccessMode.java | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ResourceLock.java  | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ResourceLocks.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Resources.java | 2 +-
 .../src/main/kotlin/org/junit/jupiter/api/Assertions.kt         | 2 +-
 .../src/module/org.junit.jupiter.api/module-info.java           | 2 +-
 .../api/extension/ExtensionContextParameterResolver.java        | 2 +-
 .../java/org/junit/jupiter/api/fixtures/TrackLogRecords.java    | 2 +-
 .../src/main/java/org/junit/jupiter/engine/Constants.java       | 2 +-
 .../main/java/org/junit/jupiter/engine/JupiterTestEngine.java   | 2 +-
 .../jupiter/engine/config/CachingJupiterConfiguration.java      | 2 +-
 .../jupiter/engine/config/DefaultJupiterConfiguration.java      | 2 +-
 .../engine/config/EnumConfigurationParameterConverter.java      | 2 +-
 .../config/InstantiatingConfigurationParameterConverter.java    | 2 +-
 .../org/junit/jupiter/engine/config/JupiterConfiguration.java   | 2 +-
 .../jupiter/engine/descriptor/AbstractExtensionContext.java     | 2 +-
 .../jupiter/engine/descriptor/ClassBasedTestDescriptor.java     | 2 +-
 .../junit/jupiter/engine/descriptor/ClassExtensionContext.java  | 2 +-
 .../junit/jupiter/engine/descriptor/ClassTestDescriptor.java    | 2 +-
 .../engine/descriptor/DefaultDynamicTestInvocationContext.java  | 2 +-
 .../engine/descriptor/DefaultTestInstanceFactoryContext.java    | 2 +-
 .../org/junit/jupiter/engine/descriptor/DisplayNameUtils.java   | 2 +-
 .../engine/descriptor/DynamicContainerTestDescriptor.java       | 2 +-
 .../jupiter/engine/descriptor/DynamicDescendantFilter.java      | 2 +-
 .../jupiter/engine/descriptor/DynamicExtensionContext.java      | 2 +-
 .../jupiter/engine/descriptor/DynamicNodeTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/DynamicTestTestDescriptor.java    | 2 +-
 .../org/junit/jupiter/engine/descriptor/ExtensionUtils.java     | 2 +-
 .../java/org/junit/jupiter/engine/descriptor/Filterable.java    | 2 +-
 .../jupiter/engine/descriptor/JupiterEngineDescriptor.java      | 2 +-
 .../engine/descriptor/JupiterEngineExtensionContext.java        | 2 +-
 .../junit/jupiter/engine/descriptor/JupiterTestDescriptor.java  | 2 +-
 .../junit/jupiter/engine/descriptor/LifecycleMethodUtils.java   | 2 +-
 .../jupiter/engine/descriptor/MethodBasedTestDescriptor.java    | 2 +-
 .../junit/jupiter/engine/descriptor/MethodExtensionContext.java | 2 +-
 .../junit/jupiter/engine/descriptor/MethodSourceSupport.java    | 2 +-
 .../jupiter/engine/descriptor/NestedClassTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/TestFactoryTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/TestInstanceLifecycleUtils.java   | 2 +-
 .../jupiter/engine/descriptor/TestMethodTestDescriptor.java     | 2 +-
 .../jupiter/engine/descriptor/TestTemplateExtensionContext.java | 2 +-
 .../engine/descriptor/TestTemplateInvocationTestDescriptor.java | 2 +-
 .../jupiter/engine/descriptor/TestTemplateTestDescriptor.java   | 2 +-
 .../junit/jupiter/engine/discovery/ClassSelectorResolver.java   | 2 +-
 .../junit/jupiter/engine/discovery/DefaultMethodDescriptor.java | 2 +-
 .../jupiter/engine/discovery/DefaultMethodOrdererContext.java   | 2 +-
 .../jupiter/engine/discovery/DiscoverySelectorResolver.java     | 2 +-
 .../java/org/junit/jupiter/engine/discovery/MethodFinder.java   | 2 +-
 .../junit/jupiter/engine/discovery/MethodOrderingVisitor.java   | 2 +-
 .../junit/jupiter/engine/discovery/MethodSelectorResolver.java  | 2 +-
 .../junit/jupiter/engine/discovery/predicates/IsInnerClass.java | 2 +-
 .../jupiter/engine/discovery/predicates/IsNestedTestClass.java  | 2 +-
 .../engine/discovery/predicates/IsPotentialTestContainer.java   | 2 +-
 .../engine/discovery/predicates/IsTestClassWithTests.java       | 2 +-
 .../engine/discovery/predicates/IsTestFactoryMethod.java        | 2 +-
 .../junit/jupiter/engine/discovery/predicates/IsTestMethod.java | 2 +-
 .../engine/discovery/predicates/IsTestTemplateMethod.java       | 2 +-
 .../jupiter/engine/discovery/predicates/IsTestableMethod.java   | 2 +-
 .../junit/jupiter/engine/execution/AfterEachMethodAdapter.java  | 2 +-
 .../junit/jupiter/engine/execution/BeforeEachMethodAdapter.java | 2 +-
 .../jupiter/engine/execution/ConditionEvaluationException.java  | 2 +-
 .../org/junit/jupiter/engine/execution/ConditionEvaluator.java  | 2 +-
 .../junit/jupiter/engine/execution/ConstructorInvocation.java   | 2 +-
 .../junit/jupiter/engine/execution/DefaultParameterContext.java | 2 +-
 .../junit/jupiter/engine/execution/DefaultTestInstances.java    | 2 +-
 .../org/junit/jupiter/engine/execution/ExecutableInvoker.java   | 2 +-
 .../junit/jupiter/engine/execution/ExtensionValuesStore.java    | 2 +-
 .../jupiter/engine/execution/InvocationInterceptorChain.java    | 2 +-
 .../jupiter/engine/execution/JupiterEngineExecutionContext.java | 2 +-
 .../org/junit/jupiter/engine/execution/MethodInvocation.java    | 2 +-
 .../org/junit/jupiter/engine/execution/NamespaceAwareStore.java | 2 +-
 .../junit/jupiter/engine/execution/TestInstancesProvider.java   | 2 +-
 .../org/junit/jupiter/engine/extension/DisabledCondition.java   | 2 +-
 .../org/junit/jupiter/engine/extension/ExtensionRegistrar.java  | 2 +-
 .../org/junit/jupiter/engine/extension/ExtensionRegistry.java   | 2 +-
 .../jupiter/engine/extension/MutableExtensionRegistry.java      | 2 +-
 .../engine/extension/RepeatedTestDisplayNameFormatter.java      | 2 +-
 .../junit/jupiter/engine/extension/RepeatedTestExtension.java   | 2 +-
 .../jupiter/engine/extension/RepeatedTestInvocationContext.java | 2 +-
 .../engine/extension/RepetitionInfoParameterResolver.java       | 2 +-
 .../java/org/junit/jupiter/engine/extension/TempDirectory.java  | 2 +-
 .../jupiter/engine/extension/TestInfoParameterResolver.java     | 2 +-
 .../jupiter/engine/extension/TestReporterParameterResolver.java | 2 +-
 .../junit/jupiter/engine/extension/TimeoutConfiguration.java    | 2 +-
 .../org/junit/jupiter/engine/extension/TimeoutDuration.java     | 2 +-
 .../junit/jupiter/engine/extension/TimeoutDurationParser.java   | 2 +-
 .../org/junit/jupiter/engine/extension/TimeoutExtension.java    | 2 +-
 .../org/junit/jupiter/engine/extension/TimeoutInvocation.java   | 2 +-
 .../engine/support/JupiterThrowableCollectorFactory.java        | 2 +-
 .../support/OpenTest4JAndJUnit4AwareThrowableCollector.java     | 2 +-
 .../src/module/org.junit.jupiter.engine/module-info.java        | 2 +-
 .../groovy/org/junit/jupiter/api/GroovyAssertEqualsTests.groovy | 2 +-
 .../org/junit/jupiter/api/GroovyAssertNotEqualsTests.groovy     | 2 +-
 .../org/junit/jupiter/api/PrimitiveAndWrapperTypeHelpers.groovy | 2 +-
 junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java  | 2 +-
 .../src/test/java/org/junit/jupiter/JupiterTestSuite.java       | 2 +-
 .../java/org/junit/jupiter/api/AssertAllAssertionsTests.java    | 2 +-
 .../org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java | 2 +-
 .../junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java    | 2 +-
 .../java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java | 2 +-
 .../java/org/junit/jupiter/api/AssertFalseAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java  | 2 +-
 .../junit/jupiter/api/AssertIterableEqualsAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java   | 2 +-
 .../org/junit/jupiter/api/AssertNotNullAssertionsTests.java     | 2 +-
 .../org/junit/jupiter/api/AssertNotSameAssertionsTests.java     | 2 +-
 .../java/org/junit/jupiter/api/AssertNullAssertionsTests.java   | 2 +-
 .../java/org/junit/jupiter/api/AssertSameAssertionsTests.java   | 2 +-
 .../java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java | 2 +-
 .../org/junit/jupiter/api/AssertTimeoutAssertionsTests.java     | 2 +-
 .../java/org/junit/jupiter/api/AssertTrueAssertionsTests.java   | 2 +-
 .../src/test/java/org/junit/jupiter/api/AssertionTestUtils.java | 2 +-
 .../src/test/java/org/junit/jupiter/api/AssumptionsTests.java   | 2 +-
 .../java/org/junit/jupiter/api/DisplayNameGenerationTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/api/DynamicTestTests.java   | 2 +-
 .../src/test/java/org/junit/jupiter/api/EnigmaThrowable.java    | 2 +-
 .../test/java/org/junit/jupiter/api/FailAssertionsTests.java    | 2 +-
 .../src/test/java/org/junit/jupiter/api/IterableFactory.java    | 2 +-
 .../jupiter/api/condition/AbstractExecutionConditionTests.java  | 2 +-
 .../api/condition/DisabledForJreRangeConditionTests.java        | 2 +-
 .../api/condition/DisabledForJreRangeIntegrationTests.java      | 2 +-
 .../junit/jupiter/api/condition/DisabledIfConditionTests.java   | 2 +-
 .../condition/DisabledIfEnvironmentVariableConditionTests.java  | 2 +-
 .../DisabledIfEnvironmentVariableIntegrationTests.java          | 2 +-
 .../junit/jupiter/api/condition/DisabledIfIntegrationTests.java | 2 +-
 .../api/condition/DisabledIfSystemPropertyConditionTests.java   | 2 +-
 .../api/condition/DisabledIfSystemPropertyIntegrationTests.java | 2 +-
 .../jupiter/api/condition/DisabledOnJreConditionTests.java      | 2 +-
 .../jupiter/api/condition/DisabledOnJreIntegrationTests.java    | 2 +-
 .../junit/jupiter/api/condition/DisabledOnOsConditionTests.java | 2 +-
 .../jupiter/api/condition/DisabledOnOsIntegrationTests.java     | 2 +-
 .../jupiter/api/condition/EnabledForJreRangeConditionTests.java | 2 +-
 .../api/condition/EnabledForJreRangeIntegrationTests.java       | 2 +-
 .../junit/jupiter/api/condition/EnabledIfConditionTests.java    | 2 +-
 .../condition/EnabledIfEnvironmentVariableConditionTests.java   | 2 +-
 .../condition/EnabledIfEnvironmentVariableIntegrationTests.java | 2 +-
 .../junit/jupiter/api/condition/EnabledIfIntegrationTests.java  | 2 +-
 .../api/condition/EnabledIfSystemPropertyConditionTests.java    | 2 +-
 .../api/condition/EnabledIfSystemPropertyIntegrationTests.java  | 2 +-
 .../junit/jupiter/api/condition/EnabledOnJreConditionTests.java | 2 +-
 .../jupiter/api/condition/EnabledOnJreIntegrationTests.java     | 2 +-
 .../junit/jupiter/api/condition/EnabledOnOsConditionTests.java  | 2 +-
 .../jupiter/api/condition/EnabledOnOsIntegrationTests.java      | 2 +-
 .../src/test/java/org/junit/jupiter/api/condition/JRETests.java | 2 +-
 .../org/junit/jupiter/api/condition/StaticConditionMethods.java | 2 +-
 .../api/extension/CloseableResourceIntegrationTests.java        | 2 +-
 .../jupiter/api/extension/ExtensionComposabilityTests.java      | 2 +-
 .../org/junit/jupiter/api/extension/KitchenSinkExtension.java   | 2 +-
 .../api/extension/support/TypeBasedParameterResolverTests.java  | 2 +-
 .../junit/jupiter/api/subpackage/SubclassedAssertionsTests.java | 2 +-
 .../jupiter/api/subpackage/SubclassedAssumptionsTests.java      | 2 +-
 .../junit/jupiter/engine/AbstractJupiterTestEngineTests.java    | 2 +-
 .../org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java    | 2 +-
 .../engine/BeforeAllAndAfterAllComposedAnnotationTests.java     | 2 +-
 .../engine/BeforeEachAndAfterEachComposedAnnotationTests.java   | 2 +-
 .../org/junit/jupiter/engine/DefaultExecutionModeTests.java     | 2 +-
 .../test/java/org/junit/jupiter/engine/DefaultMethodTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/engine/DisabledTests.java   | 2 +-
 .../org/junit/jupiter/engine/DynamicNodeGenerationTests.java    | 2 +-
 .../java/org/junit/jupiter/engine/ExceptionHandlingTests.java   | 2 +-
 .../java/org/junit/jupiter/engine/FailedAssumptionsTests.java   | 2 +-
 .../engine/InvalidLifecycleMethodConfigurationTests.java        | 2 +-
 .../org/junit/jupiter/engine/JupiterTestEngineBasicTests.java   | 2 +-
 .../junit/jupiter/engine/MultipleTestableAnnotationsTests.java  | 2 +-
 .../java/org/junit/jupiter/engine/NestedTestClassesTests.java   | 2 +-
 .../org/junit/jupiter/engine/NestedWithInheritanceTests.java    | 2 +-
 .../jupiter/engine/NestedWithSeparateInheritanceTests.java      | 2 +-
 .../jupiter/engine/NonVoidTestableMethodIntegrationTests.java   | 2 +-
 .../org/junit/jupiter/engine/OverloadedTestMethodTests.java     | 2 +-
 .../src/test/java/org/junit/jupiter/engine/ReportingTests.java  | 2 +-
 .../java/org/junit/jupiter/engine/StandardTestClassTests.java   | 2 +-
 .../org/junit/jupiter/engine/TestClassInheritanceTests.java     | 2 +-
 .../jupiter/engine/TestInstanceLifecycleConfigurationTests.java | 2 +-
 .../junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java  | 2 +-
 .../org/junit/jupiter/engine/TestInstanceLifecycleTests.java    | 2 +-
 .../org/junit/jupiter/engine/TestTemplateInvocationTests.java   | 2 +-
 .../junit/jupiter/engine/bridge/AbstractNonGenericTests.java    | 2 +-
 .../org/junit/jupiter/engine/bridge/AbstractNumberTests.java    | 2 +-
 .../java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java | 2 +-
 .../org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java | 2 +-
 .../junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java  | 2 +-
 .../java/org/junit/jupiter/engine/bridge/NumberResolver.java    | 2 +-
 .../java/org/junit/jupiter/engine/bridge/NumberTestGroup.java   | 2 +-
 .../org/junit/jupiter/engine/bridge/PackagePrivateParent.java   | 2 +-
 .../jupiter/engine/config/CachingJupiterConfigurationTests.java | 2 +-
 .../jupiter/engine/config/DefaultJupiterConfigurationTests.java | 2 +-
 .../InstantiatingConfigurationParameterConverterTests.java      | 2 +-
 .../jupiter/engine/descriptor/CustomDisplayNameGenerator.java   | 2 +-
 .../junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java  | 2 +-
 .../junit/jupiter/engine/descriptor/ExtensionContextTests.java  | 2 +-
 .../jupiter/engine/descriptor/JupiterTestDescriptorTests.java   | 2 +-
 .../jupiter/engine/descriptor/LifecycleMethodUtilsTests.java    | 2 +-
 .../engine/descriptor/TestFactoryTestDescriptorTests.java       | 2 +-
 .../engine/descriptor/TestInstanceLifecycleUtilsTests.java      | 2 +-
 .../descriptor/TestTemplateInvocationTestDescriptorTests.java   | 2 +-
 .../engine/descriptor/TestTemplateTestDescriptorTests.java      | 2 +-
 .../engine/descriptor/subpackage/Class1WithTestCases.java       | 2 +-
 .../engine/descriptor/subpackage/Class2WithTestCases.java       | 2 +-
 .../descriptor/subpackage/ClassWithStaticInnerTestCases.java    | 2 +-
 .../engine/descriptor/subpackage/ClassWithoutTestCases.java     | 2 +-
 .../engine/discovery/DiscoverySelectorResolverTests.java        | 2 +-
 .../java/org/junit/jupiter/engine/discovery/DiscoveryTests.java | 2 +-
 .../junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java  | 2 +-
 .../jupiter/engine/discovery/predicates/IsInnerClassTests.java  | 2 +-
 .../engine/discovery/predicates/IsNestedTestClassTests.java     | 2 +-
 .../discovery/predicates/IsPotentialTestContainerTests.java     | 2 +-
 .../engine/discovery/predicates/IsTestClassWithTestsTests.java  | 2 +-
 .../engine/discovery/predicates/IsTestFactoryMethodTests.java   | 2 +-
 .../jupiter/engine/discovery/predicates/IsTestMethodTests.java  | 2 +-
 .../engine/discovery/predicates/IsTestTemplateMethodTests.java  | 2 +-
 .../jupiter/engine/execution/DefaultTestInstancesTests.java     | 2 +-
 .../jupiter/engine/execution/DynamicTestIntegrationTests.java   | 2 +-
 .../junit/jupiter/engine/execution/ExecutableInvokerTests.java  | 2 +-
 .../engine/execution/ExtensionContextStoreConcurrencyTests.java | 2 +-
 .../jupiter/engine/execution/ExtensionContextStoreTests.java    | 2 +-
 .../jupiter/engine/execution/ExtensionValuesStoreTests.java     | 2 +-
 .../engine/execution/JupiterEngineExecutionContextTests.java    | 2 +-
 .../UniqueIdParsingForArrayParameterIntegrationTests.java       | 2 +-
 .../engine/execution/injection/sample/CustomAnnotation.java     | 2 +-
 .../injection/sample/CustomAnnotationParameterResolver.java     | 2 +-
 .../jupiter/engine/execution/injection/sample/CustomType.java   | 2 +-
 .../execution/injection/sample/CustomTypeParameterResolver.java | 2 +-
 .../execution/injection/sample/DoubleParameterResolver.java     | 2 +-
 .../execution/injection/sample/LongParameterResolver.java       | 2 +-
 .../injection/sample/MapOfListsTypeBasedParameterResolver.java  | 2 +-
 .../injection/sample/MapOfStringsParameterResolver.java         | 2 +-
 .../injection/sample/NullIntegerParameterResolver.java          | 2 +-
 .../execution/injection/sample/NumberParameterResolver.java     | 2 +-
 .../injection/sample/PrimitiveArrayParameterResolver.java       | 2 +-
 .../injection/sample/PrimitiveIntegerParameterResolver.java     | 2 +-
 .../junit/jupiter/engine/extension/BeforeAndAfterAllTests.java  | 2 +-
 .../junit/jupiter/engine/extension/BeforeAndAfterEachTests.java | 2 +-
 .../extension/BeforeAndAfterTestExecutionCallbackTests.java     | 2 +-
 .../org/junit/jupiter/engine/extension/EnigmaException.java     | 2 +-
 .../engine/extension/EventuallyInterruptibleInvocation.java     | 2 +-
 .../junit/jupiter/engine/extension/ExecutionConditionTests.java | 2 +-
 .../engine/extension/ExtensionContextExecutionTests.java        | 2 +-
 .../junit/jupiter/engine/extension/ExtensionRegistryTests.java  | 2 +-
 .../jupiter/engine/extension/InvocationInterceptorTests.java    | 2 +-
 .../LifecycleMethodExecutionExceptionHandlerTests.java          | 2 +-
 .../org/junit/jupiter/engine/extension/OrderedMethodTests.java  | 2 +-
 .../OrderedProgrammaticExtensionRegistrationTests.java          | 2 +-
 .../junit/jupiter/engine/extension/ParameterResolverTests.java  | 2 +-
 .../extension/ProgrammaticExtensionRegistrationTests.java       | 2 +-
 .../org/junit/jupiter/engine/extension/RepeatedTestTests.java   | 2 +-
 .../junit/jupiter/engine/extension/ServiceLoaderExtension.java  | 2 +-
 .../org/junit/jupiter/engine/extension/TempDirectoryTests.java  | 2 +-
 .../engine/extension/TestExecutionExceptionHandlerTests.java    | 2 +-
 .../engine/extension/TestInfoParameterResolverTests.java        | 2 +-
 .../jupiter/engine/extension/TestInstanceFactoryTests.java      | 2 +-
 .../TestInstancePostProcessorAndPreDestroyCallbackTests.java    | 2 +-
 .../engine/extension/TestInstancePostProcessorTests.java        | 2 +-
 .../engine/extension/TestInstancePreDestroyCallbackTests.java   | 2 +-
 .../TestInstancePreDestroyCallbackUtilityMethodTests.java       | 2 +-
 .../engine/extension/TestReporterParameterResolverTests.java    | 2 +-
 .../org/junit/jupiter/engine/extension/TestWatcherTests.java    | 2 +-
 .../jupiter/engine/extension/TimeoutConfigurationTests.java     | 2 +-
 .../jupiter/engine/extension/TimeoutDurationParserTests.java    | 2 +-
 .../junit/jupiter/engine/extension/TimeoutDurationTests.java    | 2 +-
 .../junit/jupiter/engine/extension/TimeoutExtensionTests.java   | 2 +-
 .../junit/jupiter/engine/extension/TimeoutInvocationTests.java  | 2 +-
 .../jupiter/engine/extension/sub/AlwaysDisabledCondition.java   | 2 +-
 .../engine/extension/sub/AnotherAlwaysDisabledCondition.java    | 2 +-
 .../jupiter/engine/extension/sub/SystemPropertyCondition.java   | 2 +-
 .../OpenTest4JAndJUnit4AwareThrowableCollectorTests.java        | 2 +-
 .../org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt | 2 +-
 .../test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt  | 2 +-
 .../kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt   | 2 +-
 .../jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt      | 2 +-
 .../jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt     | 2 +-
 .../jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt    | 2 +-
 .../jupiter/migrationsupport/EnableJUnit4MigrationSupport.java  | 2 +-
 .../jupiter/migrationsupport/conditions/IgnoreCondition.java    | 2 +-
 .../migrationsupport/rules/EnableRuleMigrationSupport.java      | 2 +-
 .../migrationsupport/rules/ExpectedExceptionSupport.java        | 2 +-
 .../jupiter/migrationsupport/rules/ExternalResourceSupport.java | 2 +-
 .../junit/jupiter/migrationsupport/rules/TestRuleSupport.java   | 2 +-
 .../junit/jupiter/migrationsupport/rules/VerifierSupport.java   | 2 +-
 .../migrationsupport/rules/adapter/AbstractTestRuleAdapter.java | 2 +-
 .../rules/adapter/ExpectedExceptionAdapter.java                 | 2 +-
 .../migrationsupport/rules/adapter/ExternalResourceAdapter.java | 2 +-
 .../rules/adapter/GenericBeforeAndAfterAdvice.java              | 2 +-
 .../jupiter/migrationsupport/rules/adapter/VerifierAdapter.java | 2 +-
 .../rules/member/AbstractTestRuleAnnotatedMember.java           | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedField.java   | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedMember.java  | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedMethod.java  | 2 +-
 .../module/org.junit.jupiter.migrationsupport/module-info.java  | 2 +-
 .../migrationsupport/JupiterMigrationSupportTestSuite.java      | 2 +-
 .../conditions/IgnoreAnnotationIntegrationTests.java            | 2 +-
 .../migrationsupport/conditions/IgnoreConditionTests.java       | 2 +-
 .../migrationsupport/rules/AbstractTestRuleAdapterTests.java    | 2 +-
 .../rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java | 2 +-
 .../migrationsupport/rules/ExpectedExceptionSupportTests.java   | 2 +-
 ...esourceSupportForDifferentDeclaredReturnTypesRulesTests.java | 2 +-
 ...ExternalResourceSupportForMixedMethodAndFieldRulesTests.java | 2 +-
 .../ExternalResourceSupportForMultipleFieldRulesTests.java      | 2 +-
 .../ExternalResourceSupportForMultipleMethodRulesTests.java     | 2 +-
 .../ExternalResourceSupportForTemporaryFolderFieldTests.java    | 2 +-
 .../rules/ExternalResourceSupportWithInheritanceTests.java      | 2 +-
 .../rules/ExternalResourceWithoutAdapterTests.java              | 2 +-
 .../jupiter/migrationsupport/rules/FailAfterAllHelper.java      | 2 +-
 .../rules/LauncherBasedEnableRuleMigrationSupportTests.java     | 2 +-
 .../rules/VerifierSupportForMixedMethodAndFieldRulesTests.java  | 2 +-
 .../rules/WrongExtendWithForVerifierFieldTests.java             | 2 +-
 .../rules/WrongExtendWithForVerifierMethodTests.java            | 2 +-
 .../main/java/org/junit/jupiter/params/ParameterizedTest.java   | 2 +-
 .../org/junit/jupiter/params/ParameterizedTestExtension.java    | 2 +-
 .../jupiter/params/ParameterizedTestInvocationContext.java      | 2 +-
 .../junit/jupiter/params/ParameterizedTestMethodContext.java    | 2 +-
 .../junit/jupiter/params/ParameterizedTestNameFormatter.java    | 2 +-
 .../jupiter/params/ParameterizedTestParameterResolver.java      | 2 +-
 .../java/org/junit/jupiter/params/aggregator/AggregateWith.java | 2 +-
 .../jupiter/params/aggregator/ArgumentAccessException.java      | 2 +-
 .../org/junit/jupiter/params/aggregator/ArgumentsAccessor.java  | 2 +-
 .../params/aggregator/ArgumentsAggregationException.java        | 2 +-
 .../junit/jupiter/params/aggregator/ArgumentsAggregator.java    | 2 +-
 .../jupiter/params/aggregator/DefaultArgumentsAccessor.java     | 2 +-
 .../jupiter/params/converter/ArgumentConversionException.java   | 2 +-
 .../org/junit/jupiter/params/converter/ArgumentConverter.java   | 2 +-
 .../java/org/junit/jupiter/params/converter/ConvertWith.java    | 2 +-
 .../jupiter/params/converter/DefaultArgumentConverter.java      | 2 +-
 .../params/converter/FallbackStringToObjectConverter.java       | 2 +-
 .../jupiter/params/converter/JavaTimeArgumentConverter.java     | 2 +-
 .../jupiter/params/converter/JavaTimeConversionPattern.java     | 2 +-
 .../junit/jupiter/params/converter/SimpleArgumentConverter.java | 2 +-
 .../junit/jupiter/params/converter/TypedArgumentConverter.java  | 2 +-
 .../main/java/org/junit/jupiter/params/provider/Arguments.java  | 2 +-
 .../org/junit/jupiter/params/provider/ArgumentsProvider.java    | 2 +-
 .../java/org/junit/jupiter/params/provider/ArgumentsSource.java | 2 +-
 .../org/junit/jupiter/params/provider/ArgumentsSources.java     | 2 +-
 .../org/junit/jupiter/params/provider/CsvArgumentsProvider.java | 2 +-
 .../junit/jupiter/params/provider/CsvFileArgumentsProvider.java | 2 +-
 .../java/org/junit/jupiter/params/provider/CsvFileSource.java   | 2 +-
 .../org/junit/jupiter/params/provider/CsvParserFactory.java     | 2 +-
 .../org/junit/jupiter/params/provider/CsvParsingException.java  | 2 +-
 .../main/java/org/junit/jupiter/params/provider/CsvSource.java  | 2 +-
 .../junit/jupiter/params/provider/EmptyArgumentsProvider.java   | 2 +-
 .../java/org/junit/jupiter/params/provider/EmptySource.java     | 2 +-
 .../junit/jupiter/params/provider/EnumArgumentsProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/params/provider/EnumSource.java | 2 +-
 .../junit/jupiter/params/provider/MethodArgumentsProvider.java  | 2 +-
 .../java/org/junit/jupiter/params/provider/MethodSource.java    | 2 +-
 .../org/junit/jupiter/params/provider/NullAndEmptySource.java   | 2 +-
 .../junit/jupiter/params/provider/NullArgumentsProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/params/provider/NullEnum.java   | 2 +-
 .../main/java/org/junit/jupiter/params/provider/NullSource.java | 2 +-
 .../junit/jupiter/params/provider/ValueArgumentsProvider.java   | 2 +-
 .../java/org/junit/jupiter/params/provider/ValueSource.java     | 2 +-
 .../org/junit/jupiter/params/support/AnnotationConsumer.java    | 2 +-
 .../jupiter/params/support/AnnotationConsumerInitializer.java   | 2 +-
 .../org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt    | 2 +-
 .../src/module/org.junit.jupiter.params/module-info.java        | 2 +-
 .../junit/jupiter/params/ParameterizedTestExtensionTests.java   | 2 +-
 .../junit/jupiter/params/ParameterizedTestIntegrationTests.java | 2 +-
 .../jupiter/params/ParameterizedTestMethodContextTests.java     | 2 +-
 .../jupiter/params/ParameterizedTestNameFormatterTests.java     | 2 +-
 .../java/org/junit/jupiter/params/ParameterizedTestSuite.java   | 2 +-
 .../jupiter/params/aggregator/AggregatorIntegrationTests.java   | 2 +-
 .../params/aggregator/DefaultArgumentsAccessorTests.java        | 2 +-
 .../jupiter/params/converter/DefaultArgumentConverterTests.java | 2 +-
 .../params/converter/FallbackStringToObjectConverterTests.java  | 2 +-
 .../params/converter/JavaTimeArgumentConverterTests.java        | 2 +-
 .../jupiter/params/converter/TypedArgumentConverterTest.java    | 2 +-
 .../java/org/junit/jupiter/params/provider/ArgumentsTests.java  | 2 +-
 .../jupiter/params/provider/CsvArgumentsProviderTests.java      | 2 +-
 .../jupiter/params/provider/CsvFileArgumentsProviderTests.java  | 2 +-
 .../jupiter/params/provider/EnumArgumentsProviderTests.java     | 2 +-
 .../java/org/junit/jupiter/params/provider/EnumSourceTests.java | 2 +-
 .../jupiter/params/provider/MethodArgumentsProviderTests.java   | 2 +-
 .../junit/jupiter/params/provider/MockCsvAnnotationBuilder.java | 2 +-
 .../jupiter/params/provider/ValueArgumentsProviderTests.java    | 2 +-
 .../jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt   | 2 +-
 .../org/junit/jupiter/params/aggregator/DisplayNameTests.kt     | 2 +-
 junit-jupiter/src/module/org.junit.jupiter/module-info.java     | 2 +-
 .../main/java/org/junit/platform/commons/JUnitException.java    | 2 +-
 .../junit/platform/commons/PreconditionViolationException.java  | 2 +-
 .../java/org/junit/platform/commons/annotation/Testable.java    | 2 +-
 .../src/main/java/org/junit/platform/commons/function/Try.java  | 2 +-
 .../org/junit/platform/commons/logging/LogRecordListener.java   | 2 +-
 .../main/java/org/junit/platform/commons/logging/Logger.java    | 2 +-
 .../java/org/junit/platform/commons/logging/LoggerFactory.java  | 2 +-
 .../org/junit/platform/commons/support/AnnotationSupport.java   | 2 +-
 .../java/org/junit/platform/commons/support/ClassSupport.java   | 2 +-
 .../junit/platform/commons/support/HierarchyTraversalMode.java  | 2 +-
 .../org/junit/platform/commons/support/ModifierSupport.java     | 2 +-
 .../org/junit/platform/commons/support/ReflectionSupport.java   | 2 +-
 .../java/org/junit/platform/commons/util/AnnotationUtils.java   | 2 +-
 .../org/junit/platform/commons/util/BlacklistedExceptions.java  | 2 +-
 .../java/org/junit/platform/commons/util/ClassFileVisitor.java  | 2 +-
 .../main/java/org/junit/platform/commons/util/ClassFilter.java  | 2 +-
 .../java/org/junit/platform/commons/util/ClassLoaderUtils.java  | 2 +-
 .../platform/commons/util/ClassNamePatternFilterUtils.java      | 2 +-
 .../main/java/org/junit/platform/commons/util/ClassUtils.java   | 2 +-
 .../java/org/junit/platform/commons/util/ClasspathScanner.java  | 2 +-
 .../java/org/junit/platform/commons/util/CloseablePath.java     | 2 +-
 .../java/org/junit/platform/commons/util/CollectionUtils.java   | 2 +-
 .../java/org/junit/platform/commons/util/ExceptionUtils.java    | 2 +-
 .../java/org/junit/platform/commons/util/FunctionUtils.java     | 2 +-
 .../src/main/java/org/junit/platform/commons/util/LruCache.java | 2 +-
 .../main/java/org/junit/platform/commons/util/ModuleUtils.java  | 2 +-
 .../main/java/org/junit/platform/commons/util/PackageUtils.java | 2 +-
 .../platform/commons/util/PreconditionViolationException.java   | 2 +-
 .../java/org/junit/platform/commons/util/Preconditions.java     | 2 +-
 .../java/org/junit/platform/commons/util/ReflectionUtils.java   | 2 +-
 .../main/java/org/junit/platform/commons/util/RuntimeUtils.java | 2 +-
 .../main/java/org/junit/platform/commons/util/StringUtils.java  | 2 +-
 .../java/org/junit/platform/commons/util/ToStringBuilder.java   | 2 +-
 .../junit/platform/commons/util/UnrecoverableExceptions.java    | 2 +-
 .../main/java9/org/junit/platform/commons/util/ModuleUtils.java | 2 +-
 .../src/module/org.junit.platform.commons/module-info.java      | 2 +-
 .../main/java/org/junit/platform/console/ConsoleLauncher.java   | 2 +-
 .../junit/platform/console/ConsoleLauncherExecutionResult.java  | 2 +-
 .../org/junit/platform/console/options/AvailableOptions.java    | 2 +-
 .../org/junit/platform/console/options/CommandLineOptions.java  | 2 +-
 .../platform/console/options/CommandLineOptionsParser.java      | 2 +-
 .../main/java/org/junit/platform/console/options/Details.java   | 2 +-
 .../console/options/PicocliCommandLineOptionsParser.java        | 2 +-
 .../src/main/java/org/junit/platform/console/options/Theme.java | 2 +-
 .../src/main/java/org/junit/platform/console/tasks/Color.java   | 2 +-
 .../org/junit/platform/console/tasks/ConsoleTestExecutor.java   | 2 +-
 .../console/tasks/CustomContextClassLoaderExecutor.java         | 2 +-
 .../junit/platform/console/tasks/DiscoveryRequestCreator.java   | 2 +-
 .../org/junit/platform/console/tasks/FlatPrintingListener.java  | 2 +-
 .../main/java/org/junit/platform/console/tasks/TreeNode.java    | 2 +-
 .../main/java/org/junit/platform/console/tasks/TreePrinter.java | 2 +-
 .../org/junit/platform/console/tasks/TreePrintingListener.java  | 2 +-
 .../platform/console/tasks/VerboseTreePrintingListener.java     | 2 +-
 .../org/junit/platform/console/ConsoleLauncherToolProvider.java | 2 +-
 .../src/module/org.junit.platform.console/module-info.java      | 2 +-
 .../main/java/org/junit/platform/engine/CompositeFilter.java    | 2 +-
 .../java/org/junit/platform/engine/ConfigurationParameters.java | 2 +-
 .../main/java/org/junit/platform/engine/DiscoveryFilter.java    | 2 +-
 .../main/java/org/junit/platform/engine/DiscoverySelector.java  | 2 +-
 .../java/org/junit/platform/engine/EngineDiscoveryListener.java | 2 +-
 .../java/org/junit/platform/engine/EngineDiscoveryRequest.java  | 2 +-
 .../java/org/junit/platform/engine/EngineExecutionListener.java | 2 +-
 .../main/java/org/junit/platform/engine/ExecutionRequest.java   | 2 +-
 .../src/main/java/org/junit/platform/engine/Filter.java         | 2 +-
 .../src/main/java/org/junit/platform/engine/FilterResult.java   | 2 +-
 .../org/junit/platform/engine/SelectorResolutionResult.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestDescriptor.java | 2 +-
 .../src/main/java/org/junit/platform/engine/TestEngine.java     | 2 +-
 .../java/org/junit/platform/engine/TestExecutionResult.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestSource.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestTag.java        | 2 +-
 .../src/main/java/org/junit/platform/engine/UniqueId.java       | 2 +-
 .../src/main/java/org/junit/platform/engine/UniqueIdFormat.java | 2 +-
 .../platform/engine/discovery/AbstractClassNameFilter.java      | 2 +-
 .../org/junit/platform/engine/discovery/ClassNameFilter.java    | 2 +-
 .../java/org/junit/platform/engine/discovery/ClassSelector.java | 2 +-
 .../platform/engine/discovery/ClasspathResourceSelector.java    | 2 +-
 .../junit/platform/engine/discovery/ClasspathRootSelector.java  | 2 +-
 .../org/junit/platform/engine/discovery/DirectorySelector.java  | 2 +-
 .../org/junit/platform/engine/discovery/DiscoverySelectors.java | 2 +-
 .../junit/platform/engine/discovery/ExcludeClassNameFilter.java | 2 +-
 .../platform/engine/discovery/ExcludePackageNameFilter.java     | 2 +-
 .../java/org/junit/platform/engine/discovery/FilePosition.java  | 2 +-
 .../java/org/junit/platform/engine/discovery/FileSelector.java  | 2 +-
 .../junit/platform/engine/discovery/IncludeClassNameFilter.java | 2 +-
 .../platform/engine/discovery/IncludePackageNameFilter.java     | 2 +-
 .../org/junit/platform/engine/discovery/MethodSelector.java     | 2 +-
 .../org/junit/platform/engine/discovery/ModuleSelector.java     | 2 +-
 .../junit/platform/engine/discovery/NestedClassSelector.java    | 2 +-
 .../junit/platform/engine/discovery/NestedMethodSelector.java   | 2 +-
 .../org/junit/platform/engine/discovery/PackageNameFilter.java  | 2 +-
 .../org/junit/platform/engine/discovery/PackageSelector.java    | 2 +-
 .../org/junit/platform/engine/discovery/UniqueIdSelector.java   | 2 +-
 .../java/org/junit/platform/engine/discovery/UriSelector.java   | 2 +-
 .../java/org/junit/platform/engine/reporting/ReportEntry.java   | 2 +-
 .../engine/support/config/PrefixedConfigurationParameters.java  | 2 +-
 .../engine/support/descriptor/AbstractTestDescriptor.java       | 2 +-
 .../junit/platform/engine/support/descriptor/ClassSource.java   | 2 +-
 .../engine/support/descriptor/ClasspathResourceSource.java      | 2 +-
 .../platform/engine/support/descriptor/CompositeTestSource.java | 2 +-
 .../platform/engine/support/descriptor/DefaultUriSource.java    | 2 +-
 .../platform/engine/support/descriptor/DirectorySource.java     | 2 +-
 .../platform/engine/support/descriptor/EngineDescriptor.java    | 2 +-
 .../junit/platform/engine/support/descriptor/FilePosition.java  | 2 +-
 .../junit/platform/engine/support/descriptor/FileSource.java    | 2 +-
 .../platform/engine/support/descriptor/FileSystemSource.java    | 2 +-
 .../junit/platform/engine/support/descriptor/MethodSource.java  | 2 +-
 .../junit/platform/engine/support/descriptor/PackageSource.java | 2 +-
 .../junit/platform/engine/support/descriptor/ResourceUtils.java | 2 +-
 .../org/junit/platform/engine/support/descriptor/UriSource.java | 2 +-
 .../support/discovery/ClassContainerSelectorResolver.java       | 2 +-
 .../support/discovery/EngineDiscoveryRequestResolution.java     | 2 +-
 .../support/discovery/EngineDiscoveryRequestResolver.java       | 2 +-
 .../platform/engine/support/discovery/SelectorResolver.java     | 2 +-
 .../engine/support/filter/ClasspathScanningSupport.java         | 2 +-
 .../platform/engine/support/hierarchical/CompositeLock.java     | 2 +-
 .../hierarchical/DefaultParallelExecutionConfiguration.java     | 2 +-
 .../DefaultParallelExecutionConfigurationStrategy.java          | 2 +-
 .../engine/support/hierarchical/EngineExecutionContext.java     | 2 +-
 .../platform/engine/support/hierarchical/ExclusiveResource.java | 2 +-
 .../ForkJoinPoolHierarchicalTestExecutorService.java            | 2 +-
 .../engine/support/hierarchical/HierarchicalTestEngine.java     | 2 +-
 .../engine/support/hierarchical/HierarchicalTestExecutor.java   | 2 +-
 .../support/hierarchical/HierarchicalTestExecutorService.java   | 2 +-
 .../junit/platform/engine/support/hierarchical/LockManager.java | 2 +-
 .../org/junit/platform/engine/support/hierarchical/Node.java    | 2 +-
 .../engine/support/hierarchical/NodeExecutionAdvisor.java       | 2 +-
 .../platform/engine/support/hierarchical/NodeTestTask.java      | 2 +-
 .../engine/support/hierarchical/NodeTestTaskContext.java        | 2 +-
 .../platform/engine/support/hierarchical/NodeTreeWalker.java    | 2 +-
 .../junit/platform/engine/support/hierarchical/NodeUtils.java   | 2 +-
 .../org/junit/platform/engine/support/hierarchical/NopLock.java | 2 +-
 .../support/hierarchical/OpenTest4JAwareThrowableCollector.java | 2 +-
 .../support/hierarchical/ParallelExecutionConfiguration.java    | 2 +-
 .../hierarchical/ParallelExecutionConfigurationStrategy.java    | 2 +-
 .../platform/engine/support/hierarchical/ResourceLock.java      | 2 +-
 .../hierarchical/SameThreadHierarchicalTestExecutorService.java | 2 +-
 .../junit/platform/engine/support/hierarchical/SingleLock.java  | 2 +-
 .../engine/support/hierarchical/SingleTestExecutor.java         | 2 +-
 .../engine/support/hierarchical/ThrowableCollector.java         | 2 +-
 .../src/module/org.junit.platform.engine/module-info.java       | 2 +-
 .../engine/support/hierarchical/DemoEngineExecutionContext.java | 2 +-
 .../hierarchical/DemoHierarchicalContainerDescriptor.java       | 2 +-
 .../support/hierarchical/DemoHierarchicalEngineDescriptor.java  | 2 +-
 .../support/hierarchical/DemoHierarchicalTestDescriptor.java    | 2 +-
 .../engine/support/hierarchical/DemoHierarchicalTestEngine.java | 2 +-
 .../java/org/junit/platform/fakes/TestDescriptorStub.java       | 2 +-
 .../java/org/junit/platform/fakes/TestEngineSpy.java            | 2 +-
 .../java/org/junit/platform/fakes/TestEngineStub.java           | 2 +-
 .../junit/platform/jfr/FlightRecordingDiscoveryListener.java    | 2 +-
 .../junit/platform/jfr/FlightRecordingExecutionListener.java    | 2 +-
 .../src/main/java/org/junit/platform/jfr/UniqueId.java          | 2 +-
 .../src/module/org.junit.platform.jfr/module-info.java          | 2 +-
 .../java/org/junit/platform/launcher/EngineDiscoveryResult.java | 2 +-
 .../src/main/java/org/junit/platform/launcher/EngineFilter.java | 2 +-
 .../src/main/java/org/junit/platform/launcher/Launcher.java     | 2 +-
 .../java/org/junit/platform/launcher/LauncherConstants.java     | 2 +-
 .../org/junit/platform/launcher/LauncherDiscoveryListener.java  | 2 +-
 .../org/junit/platform/launcher/LauncherDiscoveryRequest.java   | 2 +-
 .../main/java/org/junit/platform/launcher/LauncherSession.java  | 2 +-
 .../org/junit/platform/launcher/LauncherSessionListener.java    | 2 +-
 .../java/org/junit/platform/launcher/PostDiscoveryFilter.java   | 2 +-
 .../src/main/java/org/junit/platform/launcher/TagFilter.java    | 2 +-
 .../java/org/junit/platform/launcher/TestExecutionListener.java | 2 +-
 .../main/java/org/junit/platform/launcher/TestIdentifier.java   | 2 +-
 .../src/main/java/org/junit/platform/launcher/TestPlan.java     | 2 +-
 .../platform/launcher/core/CompositeTestExecutionListener.java  | 2 +-
 .../junit/platform/launcher/core/DefaultDiscoveryRequest.java   | 2 +-
 .../java/org/junit/platform/launcher/core/DefaultLauncher.java  | 2 +-
 .../org/junit/platform/launcher/core/DefaultLauncherConfig.java | 2 +-
 .../junit/platform/launcher/core/DefaultLauncherSession.java    | 2 +-
 .../launcher/core/DelegatingEngineExecutionListener.java        | 2 +-
 .../platform/launcher/core/EngineDiscoveryErrorDescriptor.java  | 2 +-
 .../platform/launcher/core/EngineDiscoveryOrchestrator.java     | 2 +-
 .../platform/launcher/core/EngineDiscoveryResultValidator.java  | 2 +-
 .../platform/launcher/core/EngineExecutionOrchestrator.java     | 2 +-
 .../org/junit/platform/launcher/core/EngineIdValidator.java     | 2 +-
 .../junit/platform/launcher/core/ExecutionListenerAdapter.java  | 2 +-
 .../java/org/junit/platform/launcher/core/InternalLauncher.java | 2 +-
 .../java/org/junit/platform/launcher/core/InternalTestPlan.java | 2 +-
 .../java/org/junit/platform/launcher/core/LauncherConfig.java   | 2 +-
 .../platform/launcher/core/LauncherConfigurationParameters.java | 2 +-
 .../platform/launcher/core/LauncherDiscoveryRequestBuilder.java | 2 +-
 .../junit/platform/launcher/core/LauncherDiscoveryResult.java   | 2 +-
 .../java/org/junit/platform/launcher/core/LauncherFactory.java  | 2 +-
 .../java/org/junit/platform/launcher/core/ListenerRegistry.java | 2 +-
 .../launcher/core/OutcomeDelayingEngineExecutionListener.java   | 2 +-
 .../org/junit/platform/launcher/core/ServiceLoaderRegistry.java | 2 +-
 .../platform/launcher/core/ServiceLoaderTestEngineRegistry.java | 2 +-
 .../junit/platform/launcher/core/SessionPerRequestLauncher.java | 2 +-
 .../launcher/core/StreamInterceptingTestExecutionListener.java  | 2 +-
 .../org/junit/platform/launcher/core/StreamInterceptor.java     | 2 +-
 .../junit/platform/launcher/listeners/LegacyReportingUtils.java | 2 +-
 .../org/junit/platform/launcher/listeners/LoggingListener.java  | 2 +-
 .../launcher/listeners/MutableTestExecutionSummary.java         | 2 +-
 .../platform/launcher/listeners/SummaryGeneratingListener.java  | 2 +-
 .../junit/platform/launcher/listeners/TestExecutionSummary.java | 2 +-
 .../discovery/AbortOnFailureLauncherDiscoveryListener.java      | 2 +-
 .../listeners/discovery/CompositeLauncherDiscoveryListener.java | 2 +-
 .../listeners/discovery/LauncherDiscoveryListeners.java         | 2 +-
 .../listeners/discovery/LoggingLauncherDiscoveryListener.java   | 2 +-
 .../listeners/session/CompositeLauncherSessionListener.java     | 2 +-
 .../launcher/listeners/session/LauncherSessionListeners.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/DequeStack.java   | 2 +-
 .../org/junit/platform/launcher/tagexpression/Operator.java     | 2 +-
 .../org/junit/platform/launcher/tagexpression/Operators.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseResult.java  | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseResults.java | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseStatus.java  | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Parser.java  | 2 +-
 .../org/junit/platform/launcher/tagexpression/ShuntingYard.java | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Stack.java   | 2 +-
 .../junit/platform/launcher/tagexpression/TagExpression.java    | 2 +-
 .../junit/platform/launcher/tagexpression/TagExpressions.java   | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Token.java   | 2 +-
 .../org/junit/platform/launcher/tagexpression/TokenWith.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/Tokenizer.java    | 2 +-
 .../src/module/org.junit.platform.launcher/module-info.java     | 2 +-
 .../launcher/core/ConfigurationParametersFactoryForTests.java   | 2 +-
 .../launcher/core/LauncherFactoryForTestingPurposesOnly.java    | 2 +-
 .../junit/platform/reporting/legacy/LegacyReportingUtils.java   | 2 +-
 .../reporting/legacy/xml/LegacyXmlReportGeneratingListener.java | 2 +-
 .../org/junit/platform/reporting/legacy/xml/XmlReportData.java  | 2 +-
 .../junit/platform/reporting/legacy/xml/XmlReportWriter.java    | 2 +-
 .../src/module/org.junit.platform.reporting/module-info.java    | 2 +-
 .../src/main/java/org/junit/platform/runner/JUnitPlatform.java  | 2 +-
 .../org/junit/platform/runner/JUnitPlatformRunnerListener.java  | 2 +-
 .../java/org/junit/platform/runner/JUnitPlatformTestTree.java   | 2 +-
 .../src/module/org.junit.platform.runner/module-info.java       | 2 +-
 .../org/junit/platform/suite/api/ExcludeClassNamePatterns.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/ExcludeEngines.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/ExcludePackages.java | 2 +-
 .../src/main/java/org/junit/platform/suite/api/ExcludeTags.java | 2 +-
 .../org/junit/platform/suite/api/IncludeClassNamePatterns.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/IncludeEngines.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/IncludePackages.java | 2 +-
 .../src/main/java/org/junit/platform/suite/api/IncludeTags.java | 2 +-
 .../main/java/org/junit/platform/suite/api/SelectClasses.java   | 2 +-
 .../main/java/org/junit/platform/suite/api/SelectPackages.java  | 2 +-
 .../java/org/junit/platform/suite/api/SuiteDisplayName.java     | 2 +-
 .../java/org/junit/platform/suite/api/UseTechnicalNames.java    | 2 +-
 .../src/module/org.junit.platform.suite.api/module-info.java    | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Assertions.java | 2 +-
 .../junit/platform/testkit/engine/EngineExecutionResults.java   | 2 +-
 .../java/org/junit/platform/testkit/engine/EngineTestKit.java   | 2 +-
 .../src/main/java/org/junit/platform/testkit/engine/Event.java  | 2 +-
 .../java/org/junit/platform/testkit/engine/EventConditions.java | 2 +-
 .../java/org/junit/platform/testkit/engine/EventStatistics.java | 2 +-
 .../main/java/org/junit/platform/testkit/engine/EventType.java  | 2 +-
 .../src/main/java/org/junit/platform/testkit/engine/Events.java | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Execution.java  | 2 +-
 .../org/junit/platform/testkit/engine/ExecutionRecorder.java    | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Executions.java | 2 +-
 .../java/org/junit/platform/testkit/engine/TerminationInfo.java | 2 +-
 .../platform/testkit/engine/TestExecutionResultConditions.java  | 2 +-
 .../src/module/org.junit.platform.testkit/module-info.java      | 2 +-
 .../main/java/org/junit/vintage/engine/JUnit4VersionCheck.java  | 2 +-
 .../main/java/org/junit/vintage/engine/VintageTestEngine.java   | 2 +-
 .../org/junit/vintage/engine/descriptor/DescriptionUtils.java   | 2 +-
 .../main/java/org/junit/vintage/engine/descriptor/OrFilter.java | 2 +-
 .../org/junit/vintage/engine/descriptor/RunnerDecorator.java    | 2 +-
 .../java/org/junit/vintage/engine/descriptor/RunnerRequest.java | 2 +-
 .../junit/vintage/engine/descriptor/RunnerTestDescriptor.java   | 2 +-
 .../org/junit/vintage/engine/descriptor/TestSourceProvider.java | 2 +-
 .../vintage/engine/descriptor/VintageEngineDescriptor.java      | 2 +-
 .../junit/vintage/engine/descriptor/VintageTestDescriptor.java  | 2 +-
 .../junit/vintage/engine/discovery/ClassSelectorResolver.java   | 2 +-
 .../discovery/DefensiveAllDefaultPossibilitiesBuilder.java      | 2 +-
 .../engine/discovery/FilterableIgnoringRunnerDecorator.java     | 2 +-
 .../junit/vintage/engine/discovery/IgnoringRunnerDecorator.java | 2 +-
 .../vintage/engine/discovery/IsPotentialJUnit4TestClass.java    | 2 +-
 .../vintage/engine/discovery/IsPotentialJUnit4TestMethod.java   | 2 +-
 .../junit/vintage/engine/discovery/MethodSelectorResolver.java  | 2 +-
 .../engine/discovery/RunnerTestDescriptorPostProcessor.java     | 2 +-
 .../java/org/junit/vintage/engine/discovery/UniqueIdFilter.java | 2 +-
 .../org/junit/vintage/engine/discovery/VintageDiscoverer.java   | 2 +-
 .../main/java/org/junit/vintage/engine/execution/EventType.java | 2 +-
 .../org/junit/vintage/engine/execution/RunListenerAdapter.java  | 2 +-
 .../java/org/junit/vintage/engine/execution/RunnerExecutor.java | 2 +-
 .../main/java/org/junit/vintage/engine/execution/TestRun.java   | 2 +-
 .../java/org/junit/vintage/engine/support/UniqueIdReader.java   | 2 +-
 .../org/junit/vintage/engine/support/UniqueIdStringifier.java   | 2 +-
 .../src/module/org.junit.vintage.engine/module-info.java        | 2 +-
 .../java/org/junit/vintage/engine/JUnit4ParameterizedTests.java | 2 +-
 .../java/org/junit/vintage/engine/JUnit4VersionCheckTests.java  | 2 +-
 .../junit/vintage/engine/VintageLauncherIntegrationTests.java   | 2 +-
 .../org/junit/vintage/engine/VintageTestEngineBasicTests.java   | 2 +-
 .../junit/vintage/engine/VintageTestEngineDiscoveryTests.java   | 2 +-
 .../junit/vintage/engine/VintageTestEngineExecutionTests.java   | 2 +-
 .../org/junit/vintage/engine/VintageTestEngineTestSuite.java    | 2 +-
 .../java/org/junit/vintage/engine/VintageUniqueIdBuilder.java   | 2 +-
 .../junit/vintage/engine/descriptor/DescriptionUtilsTests.java  | 2 +-
 .../java/org/junit/vintage/engine/descriptor/OrFilterTests.java | 2 +-
 .../vintage/engine/descriptor/TestSourceProviderTests.java      | 2 +-
 .../vintage/engine/descriptor/VintageTestDescriptorTests.java   | 2 +-
 .../engine/discovery/IsPotentialJUnit4TestClassTests.java       | 2 +-
 .../discovery/RunnerTestDescriptorPostProcessorTests.java       | 2 +-
 .../junit/vintage/engine/discovery/VintageDiscovererTests.java  | 2 +-
 .../java/org/junit/vintage/engine/execution/TestRunTests.java   | 2 +-
 .../org/junit/vintage/engine/support/UniqueIdReaderTests.java   | 2 +-
 .../junit/vintage/engine/support/UniqueIdStringifierTests.java  | 2 +-
 .../samples/PlainOldJavaClassWithoutAnyTestsTestCase.java       | 2 +-
 .../vintage/engine/samples/junit3/AbstractJUnit3TestCase.java   | 2 +-
 .../engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java | 2 +-
 .../JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java  | 2 +-
 .../vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java | 2 +-
 .../junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java     | 2 +-
 .../vintage/engine/samples/junit4/AbstractJUnit4TestCase.java   | 2 +-
 .../junit4/AbstractJunit4TestCaseWithConstructorParameter.java  | 2 +-
 .../org/junit/vintage/engine/samples/junit4/Categories.java     | 2 +-
 .../engine/samples/junit4/CompletelyDynamicTestCase.java        | 2 +-
 .../vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java   | 2 +-
 .../junit/vintage/engine/samples/junit4/ConfigurableRunner.java | 2 +-
 .../org/junit/vintage/engine/samples/junit4/DynamicRunner.java  | 2 +-
 .../vintage/engine/samples/junit4/EmptyIgnoredTestCase.java     | 2 +-
 .../vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java   | 2 +-
 .../vintage/engine/samples/junit4/ExceptionThrowingRunner.java  | 2 +-
 .../vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java    | 2 +-
 .../junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java    | 2 +-
 .../engine/samples/junit4/IgnoredParameterizedTestCase.java     | 2 +-
 .../engine/samples/junit4/JUnit4ParameterizedTestCase.java      | 2 +-
 .../junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java     | 2 +-
 .../junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java     | 2 +-
 ...iteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java | 2 +-
 ...it4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java | 2 +-
 .../samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java  | 2 +-
 .../samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java    | 2 +-
 .../junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java    | 2 +-
 ...iteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java | 2 +-
 .../JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java    | 2 +-
 ...stCaseWithFailingDescriptionThatIsNotReportedAsFinished.java | 2 +-
 ...it4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java | 2 +-
 ...uiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java | 2 +-
 .../engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java      | 2 +-
 .../JUnit4TestCaseWithAssumptionFailureInBeforeClass.java       | 2 +-
 .../JUnit4TestCaseWithDistinguishableOverloadedMethod.java      | 2 +-
 ...JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java | 2 +-
 .../samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java     | 2 +-
 .../samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java    | 2 +-
 .../junit4/JUnit4TestCaseWithExceptionThrowingRunner.java       | 2 +-
 ...stCaseWithFailingDescriptionThatIsNotReportedAsFinished.java | 2 +-
 .../JUnit4TestCaseWithIndistinguishableOverloadedMethod.java    | 2 +-
 .../samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java   | 2 +-
 ...it4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java | 2 +-
 ...estCaseWithRunnerWithDuplicateChangingChildDescriptions.java | 2 +-
 .../vintage/engine/samples/junit4/MalformedJUnit4TestCase.java  | 2 +-
 .../vintage/engine/samples/junit4/NotFilterableRunner.java      | 2 +-
 .../vintage/engine/samples/junit4/ParameterizedTestCase.java    | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java  | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java | 2 +-
 .../PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java   | 2 +-
 .../junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java     | 2 +-
 .../junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java   | 2 +-
 .../engine/samples/junit4/RunnerThatOnlyReportsFailures.java    | 2 +-
 .../junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java        | 2 +-
 .../engine/samples/junit4/SingleFailingTheoryTestCase.java      | 2 +-
 .../samples/junit4/TestCaseRunWithJUnitPlatformRunner.java      | 2 +-
 .../src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java | 2 +-
 platform-tests/src/test/java/DefaultPackageTestCase.java        | 2 +-
 .../src/test/java/org/junit/jupiter/api/condition/OSTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/extensions/Heavyweight.java | 2 +-
 .../org/junit/jupiter/extensions/HeavyweightAlphaTests.java     | 2 +-
 .../java/org/junit/jupiter/extensions/HeavyweightBetaTests.java | 2 +-
 .../java/org/junit/platform/AbstractEqualsAndHashCodeTests.java | 2 +-
 .../test/java/org/junit/platform/JUnitPlatformTestSuite.java    | 2 +-
 .../src/test/java/org/junit/platform/TestEngineTests.java       | 2 +-
 .../platform/commons/annotation/TestableAnnotationTests.java    | 2 +-
 .../test/java/org/junit/platform/commons/function/TryTests.java | 2 +-
 .../junit/platform/commons/support/AnnotationSupportTests.java  | 2 +-
 .../org/junit/platform/commons/support/ClassSupportTests.java   | 2 +-
 .../junit/platform/commons/support/ModifierSupportTests.java    | 2 +-
 .../junit/platform/commons/support/PreconditionAssertions.java  | 2 +-
 .../junit/platform/commons/support/ReflectionSupportTests.java  | 2 +-
 .../org/junit/platform/commons/util/AnnotationUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ClassLoaderUtilsTests.java  | 2 +-
 .../platform/commons/util/ClassNamePatternFilterUtilsTests.java | 2 +-
 .../java/org/junit/platform/commons/util/ClassUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ClasspathScannerTests.java  | 2 +-
 .../org/junit/platform/commons/util/CollectionUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ExceptionUtilsTests.java    | 2 +-
 .../org/junit/platform/commons/util/FunctionUtilsTests.java     | 2 +-
 .../java/org/junit/platform/commons/util/LruCacheTests.java     | 2 +-
 .../java/org/junit/platform/commons/util/ModuleUtilsTests.java  | 2 +-
 .../java/org/junit/platform/commons/util/PackageUtilsTests.java | 2 +-
 .../org/junit/platform/commons/util/PreconditionsTests.java     | 2 +-
 .../org/junit/platform/commons/util/ReflectionUtilsTests.java   | 2 +-
 .../util/ReflectionUtilsWithGenericTypeHierarchiesTests.java    | 2 +-
 .../java/org/junit/platform/commons/util/RuntimeUtilsTests.java | 2 +-
 .../org/junit/platform/commons/util/SerializationUtils.java     | 2 +-
 .../java/org/junit/platform/commons/util/StringUtilsTests.java  | 2 +-
 .../org/junit/platform/commons/util/ToStringBuilderTests.java   | 2 +-
 .../platform/commons/util/classes/AExecutionConditionClass.java | 2 +-
 .../commons/util/classes/ATestExecutionListenerClass.java       | 2 +-
 .../org/junit/platform/commons/util/classes/AVanillaEmpty.java  | 2 +-
 .../platform/commons/util/classes/BExecutionConditionClass.java | 2 +-
 .../commons/util/classes/BTestExecutionListenerClass.java       | 2 +-
 .../org/junit/platform/commons/util/classes/BVanillaEmpty.java  | 2 +-
 .../java/org/junit/platform/console/ConsoleDetailsTests.java    | 2 +-
 .../platform/console/ConsoleLauncherExecutionResultTests.java   | 2 +-
 .../junit/platform/console/ConsoleLauncherIntegrationTests.java | 2 +-
 .../java/org/junit/platform/console/ConsoleLauncherTests.java   | 2 +-
 .../java/org/junit/platform/console/ConsoleLauncherWrapper.java | 2 +-
 .../junit/platform/console/ConsoleLauncherWrapperResult.java    | 2 +-
 .../console/options/PicocliCommandLineOptionsParserTests.java   | 2 +-
 .../java/org/junit/platform/console/options/ThemeTests.java     | 2 +-
 .../platform/console/subpackage/ContainerForInnerTest.java      | 2 +-
 .../platform/console/subpackage/ContainerForInnerTests.java     | 2 +-
 .../console/subpackage/ContainerForStaticNestedTest.java        | 2 +-
 .../console/subpackage/ContainerForStaticNestedTests.java       | 2 +-
 .../java/org/junit/platform/console/subpackage/SecondTest.java  | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Test.java   | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Test1.java  | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Tests.java  | 2 +-
 .../java/org/junit/platform/console/subpackage/ThirdTests.java  | 2 +-
 .../junit/platform/console/tasks/ConsoleTestExecutorTests.java  | 2 +-
 .../console/tasks/CustomContextClassLoaderExecutorTests.java    | 2 +-
 .../platform/console/tasks/DiscoveryRequestCreatorTests.java    | 2 +-
 .../junit/platform/console/tasks/FlatPrintingListenerTests.java | 2 +-
 .../java/org/junit/platform/console/tasks/TreeNodeTests.java    | 2 +-
 .../java/org/junit/platform/console/tasks/TreePrinterTests.java | 2 +-
 .../junit/platform/console/tasks/VerboseTreeListenerTests.java  | 2 +-
 .../java/org/junit/platform/engine/FilterCompositionTests.java  | 2 +-
 .../java/org/junit/platform/engine/TestDescriptorTests.java     | 2 +-
 .../src/test/java/org/junit/platform/engine/TestTagTests.java   | 2 +-
 .../java/org/junit/platform/engine/UniqueIdFormatTests.java     | 2 +-
 .../src/test/java/org/junit/platform/engine/UniqueIdTests.java  | 2 +-
 .../junit/platform/engine/discovery/ClassNameFilterTests.java   | 2 +-
 .../org/junit/platform/engine/discovery/ClassSelectorTests.java | 2 +-
 .../engine/discovery/ClasspathResourceSelectorTests.java        | 2 +-
 .../platform/engine/discovery/ClasspathRootSelectorTests.java   | 2 +-
 .../junit/platform/engine/discovery/DirectorySelectorTests.java | 2 +-
 .../platform/engine/discovery/DiscoverySelectorsTests.java      | 2 +-
 .../org/junit/platform/engine/discovery/FilePositionTests.java  | 2 +-
 .../org/junit/platform/engine/discovery/FileSelectorTests.java  | 2 +-
 .../junit/platform/engine/discovery/MethodSelectorTests.java    | 2 +-
 .../junit/platform/engine/discovery/ModuleSelectorTests.java    | 2 +-
 .../platform/engine/discovery/NestedClassSelectorTests.java     | 2 +-
 .../platform/engine/discovery/NestedMethodSelectorTests.java    | 2 +-
 .../junit/platform/engine/discovery/PackageNameFilterTests.java | 2 +-
 .../junit/platform/engine/discovery/PackageSelectorTests.java   | 2 +-
 .../junit/platform/engine/discovery/UniqueIdSelectorTests.java  | 2 +-
 .../org/junit/platform/engine/discovery/UriSelectorTests.java   | 2 +-
 .../support/config/PrefixedConfigurationParametersTests.java    | 2 +-
 .../engine/support/descriptor/AbstractTestDescriptorTests.java  | 2 +-
 .../engine/support/descriptor/AbstractTestSourceTests.java      | 2 +-
 .../platform/engine/support/descriptor/ClassSourceTests.java    | 2 +-
 .../engine/support/descriptor/ClasspathResourceSourceTests.java | 2 +-
 .../engine/support/descriptor/CompositeTestSourceTests.java     | 2 +-
 .../engine/support/descriptor/DefaultUriSourceTests.java        | 2 +-
 .../engine/support/descriptor/DemoClassTestDescriptor.java      | 2 +-
 .../engine/support/descriptor/DemoMethodTestDescriptor.java     | 2 +-
 .../platform/engine/support/descriptor/FilePositionTests.java   | 2 +-
 .../engine/support/descriptor/FileSystemSourceTests.java        | 2 +-
 .../platform/engine/support/descriptor/MethodSourceTests.java   | 2 +-
 .../platform/engine/support/descriptor/PackageSourceTests.java  | 2 +-
 .../engine/support/hierarchical/CompositeLockTests.java         | 2 +-
 .../DefaultParallelExecutionConfigurationStrategyTests.java     | 2 +-
 .../support/hierarchical/HierarchicalTestExecutorTests.java     | 2 +-
 .../platform/engine/support/hierarchical/LockManagerTests.java  | 2 +-
 .../platform/engine/support/hierarchical/MemoryLeakTests.java   | 2 +-
 .../support/hierarchical/NodeTreeWalkerIntegrationTests.java    | 2 +-
 .../support/hierarchical/ParallelExecutionIntegrationTests.java | 2 +-
 .../engine/support/hierarchical/ResourceLockSupport.java        | 2 +-
 .../hierarchical/SameThreadExecutionIntegrationTests.java       | 2 +-
 .../platform/engine/support/hierarchical/SingleLockTests.java   | 2 +-
 .../engine/support/hierarchical/SingleTestExecutorTests.java    | 2 +-
 .../engine/support/hierarchical/ThrowableCollectorTests.java    | 2 +-
 .../jfr/FlightRecordingDiscoveryListenerIntegrationTests.java   | 2 +-
 .../jfr/FlightRecordingExecutionListenerIntegrationTests.java   | 2 +-
 .../java/org/junit/platform/launcher/DiscoveryFilterStub.java   | 2 +-
 .../src/test/java/org/junit/platform/launcher/FilterStub.java   | 2 +-
 .../org/junit/platform/launcher/PostDiscoveryFilterStub.java    | 2 +-
 .../test/java/org/junit/platform/launcher/TagFilterTests.java   | 2 +-
 .../java/org/junit/platform/launcher/TagIntegrationTests.java   | 2 +-
 .../java/org/junit/platform/launcher/TestIdentifierTests.java   | 2 +-
 .../junit/platform/launcher/TestLauncherDiscoveryListener.java  | 2 +-
 .../junit/platform/launcher/TestLauncherSessionListener.java    | 2 +-
 .../test/java/org/junit/platform/launcher/TestPlanTests.java    | 2 +-
 .../org/junit/platform/launcher/TestPostDiscoveryTagFilter.java | 2 +-
 .../launcher/core/CompositeTestExecutionListenerTests.java      | 2 +-
 .../org/junit/platform/launcher/core/DefaultLauncherTests.java  | 2 +-
 .../launcher/core/EngineDiscoveryResultValidatorTests.java      | 2 +-
 .../platform/launcher/core/ExecutionListenerAdapterTests.java   | 2 +-
 .../org/junit/platform/launcher/core/LauncherConfigTests.java   | 2 +-
 .../launcher/core/LauncherConfigurationParametersTests.java     | 2 +-
 .../launcher/core/LauncherDiscoveryRequestBuilderTests.java     | 2 +-
 .../org/junit/platform/launcher/core/LauncherFactoryTests.java  | 2 +-
 .../org/junit/platform/launcher/core/LauncherSessionTests.java  | 2 +-
 .../org/junit/platform/launcher/core/ListenerRegistryTests.java | 2 +-
 ...StreamInterceptingTestExecutionListenerIntegrationTests.java | 2 +-
 .../junit/platform/launcher/core/StreamInterceptorTests.java    | 2 +-
 .../launcher/listeners/AnotherUnusedTestExecutionListener.java  | 2 +-
 .../platform/launcher/listeners/NoopTestExecutionListener.java  | 2 +-
 .../platform/launcher/listeners/SummaryGenerationTests.java     | 2 +-
 .../launcher/listeners/UnusedTestExecutionListener.java         | 2 +-
 .../discovery/AbortOnFailureLauncherDiscoveryListenerTests.java | 2 +-
 .../discovery/AbstractLauncherDiscoveryListenerTests.java       | 2 +-
 .../discovery/LoggingLauncherDiscoveryListenerTests.java        | 2 +-
 .../junit/platform/launcher/tagexpression/ParserErrorTests.java | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParserTests.java  | 2 +-
 .../platform/launcher/tagexpression/TagExpressionsTests.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/TokenTests.java   | 2 +-
 .../junit/platform/launcher/tagexpression/TokenizerTests.java   | 2 +-
 .../platform/reporting/legacy/LegacyReportingUtilsTests.java    | 2 +-
 .../junit/platform/reporting/legacy/xml/IncrementingClock.java  | 2 +-
 .../legacy/xml/LegacyXmlReportGeneratingListenerTests.java      | 2 +-
 .../platform/reporting/legacy/xml/XmlReportAssertions.java      | 2 +-
 .../junit/platform/reporting/legacy/xml/XmlReportDataTests.java | 2 +-
 .../platform/reporting/legacy/xml/XmlReportWriterTests.java     | 2 +-
 .../org/junit/platform/runner/JUnitPlatformRunnerTests.java     | 2 +-
 .../org/junit/platform/testkit/engine/EngineTestKitTests.java   | 2 +-
 .../java/org/junit/platform/testkit/engine/EventsTests.java     | 2 +-
 .../platform/testkit/engine/ExecutionsIntegrationTests.java     | 2 +-
 .../testkit/engine/NestedContainerEventConditionTests.java      | 2 +-
 .../src/main/java/com/example/project/Calculator.java           | 2 +-
 .../src/test/java/com/example/project/CalculatorTests.java      | 2 +-
 .../test/kotlin/com/example/project/ExtensionFunctionsTests.kt  | 2 +-
 .../projects/gradle-missing-engine/src/test/java/FooTests.java  | 2 +-
 .../src/main/java/com/example/project/Calculator.java           | 2 +-
 .../src/test/java/com/example/project/CalculatorTests.java      | 2 +-
 .../src/main/java/com/example/project/Calculator.java           | 2 +-
 .../src/test/java/com/example/project/CalculatorTests.java      | 2 +-
 .../java/integration/integration/JupiterIntegrationTests.java   | 2 +-
 .../src/test/java/integration/integration/ModuleUtilsTests.java | 2 +-
 .../projects/standalone/src/standalone/JupiterIntegration.java  | 2 +-
 .../standalone/src/standalone/JupiterParamsIntegration.java     | 2 +-
 .../projects/standalone/src/standalone/VintageIntegration.java  | 2 +-
 .../src/main/java/platform/tooling/support/Helper.java          | 2 +-
 .../src/main/java/platform/tooling/support/Request.java         | 2 +-
 .../src/test/java/platform/tooling/support/HelperTests.java     | 2 +-
 .../java/platform/tooling/support/tests/AntStarterTests.java    | 2 +-
 .../test/java/platform/tooling/support/tests/ArchUnitTests.java | 2 +-
 .../tooling/support/tests/GradleKotlinExtensionsTests.java      | 2 +-
 .../tooling/support/tests/GradleMissingEngineTests.java         | 2 +-
 .../platform/tooling/support/tests/GradleModuleFileTests.java   | 2 +-
 .../java/platform/tooling/support/tests/GradleStarterTests.java | 2 +-
 .../tooling/support/tests/JarContainsManifestFirstTests.java    | 2 +-
 .../platform/tooling/support/tests/JarDescribeModuleTests.java  | 2 +-
 .../java/platform/tooling/support/tests/JavaVersionsTests.java  | 2 +-
 .../java/platform/tooling/support/tests/JavacModulesTests.java  | 2 +-
 .../test/java/platform/tooling/support/tests/ManifestTests.java | 2 +-
 .../java/platform/tooling/support/tests/MavenPomFileTests.java  | 2 +-
 .../java/platform/tooling/support/tests/MavenStarterTests.java  | 2 +-
 .../platform/tooling/support/tests/ModularUserGuideTests.java   | 2 +-
 .../platform/tooling/support/tests/MultiReleaseJarTests.java    | 2 +-
 .../tooling/support/tests/PackageCyclesDetectionTests.java      | 2 +-
 .../java/platform/tooling/support/tests/StandaloneTests.java    | 2 +-
 .../java/platform/tooling/support/tests/ToolProviderTests.java  | 2 +-
 .../tooling/support/tests/VintageGradleIntegrationTests.java    | 2 +-
 .../tooling/support/tests/VintageMavenIntegrationTests.java     | 2 +-
 src/spotless/eclipse-public-license-2.0.java                    | 2 +-
 1129 files changed, 1129 insertions(+), 1129 deletions(-)

diff --git a/documentation/src/main/java/example/domain/Person.java b/documentation/src/main/java/example/domain/Person.java
index f34c00d1b1f6..5a75f7127483 100644
--- a/documentation/src/main/java/example/domain/Person.java
+++ b/documentation/src/main/java/example/domain/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebClient.java b/documentation/src/main/java/example/registration/WebClient.java
index 26088b910f47..c6c3fac7516a 100644
--- a/documentation/src/main/java/example/registration/WebClient.java
+++ b/documentation/src/main/java/example/registration/WebClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebResponse.java b/documentation/src/main/java/example/registration/WebResponse.java
index 0cd2fb438f20..5d396e05bd22 100644
--- a/documentation/src/main/java/example/registration/WebResponse.java
+++ b/documentation/src/main/java/example/registration/WebResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebServerExtension.java b/documentation/src/main/java/example/registration/WebServerExtension.java
index ed9a0c5b7e80..6a0e5021323a 100644
--- a/documentation/src/main/java/example/registration/WebServerExtension.java
+++ b/documentation/src/main/java/example/registration/WebServerExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/Calculator.java b/documentation/src/main/java/example/util/Calculator.java
index 8f6cc877d020..55791891d80b 100644
--- a/documentation/src/main/java/example/util/Calculator.java
+++ b/documentation/src/main/java/example/util/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/ListWriter.java b/documentation/src/main/java/example/util/ListWriter.java
index b2f0e26177d0..fe17e5bf55cc 100644
--- a/documentation/src/main/java/example/util/ListWriter.java
+++ b/documentation/src/main/java/example/util/ListWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/StringUtils.java b/documentation/src/main/java/example/util/StringUtils.java
index e489cd7be79c..4233e00a2fed 100644
--- a/documentation/src/main/java/example/util/StringUtils.java
+++ b/documentation/src/main/java/example/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/AssertionsDemo.java b/documentation/src/test/java/example/AssertionsDemo.java
index 22311e974840..670695e3e3fd 100644
--- a/documentation/src/test/java/example/AssertionsDemo.java
+++ b/documentation/src/test/java/example/AssertionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/AssumptionsDemo.java b/documentation/src/test/java/example/AssumptionsDemo.java
index 75914749a7bf..6340feca4eab 100644
--- a/documentation/src/test/java/example/AssumptionsDemo.java
+++ b/documentation/src/test/java/example/AssumptionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
index fcd7a2dcc4be..7e0a7d060c29 100644
--- a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
+++ b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/CustomTestEngine.java b/documentation/src/test/java/example/CustomTestEngine.java
index b12a8e862c49..cd7974280389 100644
--- a/documentation/src/test/java/example/CustomTestEngine.java
+++ b/documentation/src/test/java/example/CustomTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisabledClassDemo.java b/documentation/src/test/java/example/DisabledClassDemo.java
index 761547508255..7874a0048771 100644
--- a/documentation/src/test/java/example/DisabledClassDemo.java
+++ b/documentation/src/test/java/example/DisabledClassDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisabledTestsDemo.java b/documentation/src/test/java/example/DisabledTestsDemo.java
index 93e11e251b51..ad60c5afe539 100644
--- a/documentation/src/test/java/example/DisabledTestsDemo.java
+++ b/documentation/src/test/java/example/DisabledTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisplayNameDemo.java b/documentation/src/test/java/example/DisplayNameDemo.java
index b30092e8d7d5..fb98cc889244 100644
--- a/documentation/src/test/java/example/DisplayNameDemo.java
+++ b/documentation/src/test/java/example/DisplayNameDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisplayNameGeneratorDemo.java b/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
index a59f4fd3f157..04b77952e0ed 100644
--- a/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
+++ b/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DocumentationTestSuite.java b/documentation/src/test/java/example/DocumentationTestSuite.java
index 1b2f9d575883..c068a7d5b41d 100644
--- a/documentation/src/test/java/example/DocumentationTestSuite.java
+++ b/documentation/src/test/java/example/DocumentationTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DynamicTestsDemo.java b/documentation/src/test/java/example/DynamicTestsDemo.java
index 8aa063a57dbe..34360741f672 100644
--- a/documentation/src/test/java/example/DynamicTestsDemo.java
+++ b/documentation/src/test/java/example/DynamicTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ExampleTestCase.java b/documentation/src/test/java/example/ExampleTestCase.java
index e08950b1df9b..8581b92851bf 100644
--- a/documentation/src/test/java/example/ExampleTestCase.java
+++ b/documentation/src/test/java/example/ExampleTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ExternalMethodSourceDemo.java b/documentation/src/test/java/example/ExternalMethodSourceDemo.java
index cda486d775de..d12398508a73 100644
--- a/documentation/src/test/java/example/ExternalMethodSourceDemo.java
+++ b/documentation/src/test/java/example/ExternalMethodSourceDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/Fast.java b/documentation/src/test/java/example/Fast.java
index 911fdb2df0d7..a1045122dbd0 100644
--- a/documentation/src/test/java/example/Fast.java
+++ b/documentation/src/test/java/example/Fast.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/FastTest.java b/documentation/src/test/java/example/FastTest.java
index f85066f7db29..e596c7519b27 100644
--- a/documentation/src/test/java/example/FastTest.java
+++ b/documentation/src/test/java/example/FastTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/HamcrestAssertionsDemo.java b/documentation/src/test/java/example/HamcrestAssertionsDemo.java
index 5f9cd857cb81..2bef36f34cc2 100644
--- a/documentation/src/test/java/example/HamcrestAssertionsDemo.java
+++ b/documentation/src/test/java/example/HamcrestAssertionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/IgnoredTestsDemo.java b/documentation/src/test/java/example/IgnoredTestsDemo.java
index 6bddc9134c9f..edf05bb2b5c9 100644
--- a/documentation/src/test/java/example/IgnoredTestsDemo.java
+++ b/documentation/src/test/java/example/IgnoredTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnit4Tests.java b/documentation/src/test/java/example/JUnit4Tests.java
index 2caac8b99351..800ce8a46958 100644
--- a/documentation/src/test/java/example/JUnit4Tests.java
+++ b/documentation/src/test/java/example/JUnit4Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnitPlatformClassDemo.java b/documentation/src/test/java/example/JUnitPlatformClassDemo.java
index 09acf1b0e24d..8dbfaa25d678 100644
--- a/documentation/src/test/java/example/JUnitPlatformClassDemo.java
+++ b/documentation/src/test/java/example/JUnitPlatformClassDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java b/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
index a5c698558967..5c9a4d0030d0 100644
--- a/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
+++ b/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java b/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
index 6eea9d7210d6..1166849171a6 100644
--- a/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
+++ b/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/OrderedTestsDemo.java b/documentation/src/test/java/example/OrderedTestsDemo.java
index d54ff5b3fc82..2dbbeca1d66e 100644
--- a/documentation/src/test/java/example/OrderedTestsDemo.java
+++ b/documentation/src/test/java/example/OrderedTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ParameterizedTestDemo.java b/documentation/src/test/java/example/ParameterizedTestDemo.java
index 40f440d305ee..62ff347d7e9a 100644
--- a/documentation/src/test/java/example/ParameterizedTestDemo.java
+++ b/documentation/src/test/java/example/ParameterizedTestDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/PollingTimeoutDemo.java b/documentation/src/test/java/example/PollingTimeoutDemo.java
index 2242b6b86c84..cfc2d2d28791 100644
--- a/documentation/src/test/java/example/PollingTimeoutDemo.java
+++ b/documentation/src/test/java/example/PollingTimeoutDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/RepeatedTestsDemo.java b/documentation/src/test/java/example/RepeatedTestsDemo.java
index 98d552952f4d..07d2e77249f5 100644
--- a/documentation/src/test/java/example/RepeatedTestsDemo.java
+++ b/documentation/src/test/java/example/RepeatedTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/SharedResourcesDemo.java b/documentation/src/test/java/example/SharedResourcesDemo.java
index 99d3727437cc..95c5c3010cb0 100644
--- a/documentation/src/test/java/example/SharedResourcesDemo.java
+++ b/documentation/src/test/java/example/SharedResourcesDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/SlowTests.java b/documentation/src/test/java/example/SlowTests.java
index a1fba4358f35..b4aee752547b 100644
--- a/documentation/src/test/java/example/SlowTests.java
+++ b/documentation/src/test/java/example/SlowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/StandardTests.java b/documentation/src/test/java/example/StandardTests.java
index 91bd871f9ffa..9395b88ea1b7 100644
--- a/documentation/src/test/java/example/StandardTests.java
+++ b/documentation/src/test/java/example/StandardTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TaggingDemo.java b/documentation/src/test/java/example/TaggingDemo.java
index 6ab3e162badf..d70205927a3d 100644
--- a/documentation/src/test/java/example/TaggingDemo.java
+++ b/documentation/src/test/java/example/TaggingDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index e656b44142dc..217977408229 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestInfoDemo.java b/documentation/src/test/java/example/TestInfoDemo.java
index 806397b9408d..941105942db6 100644
--- a/documentation/src/test/java/example/TestInfoDemo.java
+++ b/documentation/src/test/java/example/TestInfoDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestReporterDemo.java b/documentation/src/test/java/example/TestReporterDemo.java
index 5638d24f19d8..0edb0471fc2a 100644
--- a/documentation/src/test/java/example/TestReporterDemo.java
+++ b/documentation/src/test/java/example/TestReporterDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestTemplateDemo.java b/documentation/src/test/java/example/TestTemplateDemo.java
index e017af9d7db0..da330056d3b1 100644
--- a/documentation/src/test/java/example/TestTemplateDemo.java
+++ b/documentation/src/test/java/example/TestTemplateDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestingAStackDemo.java b/documentation/src/test/java/example/TestingAStackDemo.java
index c9cc1e0adc06..d3a6c7e2c5be 100644
--- a/documentation/src/test/java/example/TestingAStackDemo.java
+++ b/documentation/src/test/java/example/TestingAStackDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TimeoutDemo.java b/documentation/src/test/java/example/TimeoutDemo.java
index 5959befda41f..93e5cb810d72 100644
--- a/documentation/src/test/java/example/TimeoutDemo.java
+++ b/documentation/src/test/java/example/TimeoutDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/UsingTheLauncherDemo.java b/documentation/src/test/java/example/UsingTheLauncherDemo.java
index 2ecba15089d6..544cf960ccdc 100644
--- a/documentation/src/test/java/example/UsingTheLauncherDemo.java
+++ b/documentation/src/test/java/example/UsingTheLauncherDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java b/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
index aec3d20ec30a..58344c1c7c7c 100644
--- a/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
+++ b/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java b/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
index 7d3ed08f75eb..cedeb020be28 100644
--- a/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
+++ b/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java b/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
index aadda9995f2c..e6dc21582ff2 100644
--- a/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
+++ b/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Extension1.java b/documentation/src/test/java/example/callbacks/Extension1.java
index a02451794e86..6bf297f9550f 100644
--- a/documentation/src/test/java/example/callbacks/Extension1.java
+++ b/documentation/src/test/java/example/callbacks/Extension1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Extension2.java b/documentation/src/test/java/example/callbacks/Extension2.java
index ea0cf0467eb7..d4e595167bbf 100644
--- a/documentation/src/test/java/example/callbacks/Extension2.java
+++ b/documentation/src/test/java/example/callbacks/Extension2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Logger.java b/documentation/src/test/java/example/callbacks/Logger.java
index e3e3a76dcb65..aa7250cab307 100644
--- a/documentation/src/test/java/example/callbacks/Logger.java
+++ b/documentation/src/test/java/example/callbacks/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/ComparableContract.java b/documentation/src/test/java/example/defaultmethods/ComparableContract.java
index 0002836ebada..ac55e4b7ac69 100644
--- a/documentation/src/test/java/example/defaultmethods/ComparableContract.java
+++ b/documentation/src/test/java/example/defaultmethods/ComparableContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/EqualsContract.java b/documentation/src/test/java/example/defaultmethods/EqualsContract.java
index 47e1252d6236..357c74146466 100644
--- a/documentation/src/test/java/example/defaultmethods/EqualsContract.java
+++ b/documentation/src/test/java/example/defaultmethods/EqualsContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/StringTests.java b/documentation/src/test/java/example/defaultmethods/StringTests.java
index 965100debfbd..95973a1b2ccd 100644
--- a/documentation/src/test/java/example/defaultmethods/StringTests.java
+++ b/documentation/src/test/java/example/defaultmethods/StringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/Testable.java b/documentation/src/test/java/example/defaultmethods/Testable.java
index 273a225c20ff..90028b28659b 100644
--- a/documentation/src/test/java/example/defaultmethods/Testable.java
+++ b/documentation/src/test/java/example/defaultmethods/Testable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java b/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
index 28505bf3e7a9..1e2e15dfbcb8 100644
--- a/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
+++ b/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java b/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
index f4de1484fad7..690b22dfa328 100644
--- a/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
+++ b/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java b/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
index 48ee9ec88d7d..8455247839cd 100644
--- a/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
+++ b/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java b/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
index 3f0422107036..ddd0a9ad6456 100644
--- a/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
+++ b/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java b/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
index 78f21e8e3b66..09a805c9dcc1 100644
--- a/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
+++ b/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/registration/DocumentationDemo.java b/documentation/src/test/java/example/registration/DocumentationDemo.java
index fe542cf37c28..008c734b5b94 100644
--- a/documentation/src/test/java/example/registration/DocumentationDemo.java
+++ b/documentation/src/test/java/example/registration/DocumentationDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/registration/WebServerDemo.java b/documentation/src/test/java/example/registration/WebServerDemo.java
index c99d9c0e70f6..4b839e53a8b4 100644
--- a/documentation/src/test/java/example/registration/WebServerDemo.java
+++ b/documentation/src/test/java/example/registration/WebServerDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java b/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
index 86b64961afb3..51ba1f8bbec5 100644
--- a/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
+++ b/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java b/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
index ee611239e61d..2e751d622652 100644
--- a/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
+++ b/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java b/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
index d6dae294e16a..935f56133edf 100644
--- a/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
+++ b/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java b/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
index 944e7c72ada7..32f88d3c4391 100644
--- a/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
+++ b/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
index 03f0ffdc62e2..6090550547fe 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
index 78d2173f2ebd..a2ab5c59baf7 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
index 708dfe598c38..dc4b40ff2bdc 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
index ef3ca601494b..399189e67790 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/timing/TimingExtension.java b/documentation/src/test/java/example/timing/TimingExtension.java
index 6c4fcc73027e..f219e8175214 100644
--- a/documentation/src/test/java/example/timing/TimingExtension.java
+++ b/documentation/src/test/java/example/timing/TimingExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/timing/TimingExtensionTests.java b/documentation/src/test/java/example/timing/TimingExtensionTests.java
index b9b11a1582d6..caa01fc7026b 100644
--- a/documentation/src/test/java/example/timing/TimingExtensionTests.java
+++ b/documentation/src/test/java/example/timing/TimingExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/extensions/ExpectToFail.java b/documentation/src/test/java/extensions/ExpectToFail.java
index c325a81de5db..4787142e7143 100644
--- a/documentation/src/test/java/extensions/ExpectToFail.java
+++ b/documentation/src/test/java/extensions/ExpectToFail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
index ed59e28e792b..1e2e30f9e4ed 100644
--- a/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReport.java b/documentation/src/test/java/org/junit/api/tools/ApiReport.java
index 067d5318f8eb..c51de7a6b17c 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReport.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java b/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
index 963d0c4553cb..b6f88801359e 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
index 8fcadb342744..12976610581c 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
index 98f5f8fb2a51..f29f979bd102 100644
--- a/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
index b260f8ff1ce3..0498deefff02 100644
--- a/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
index 65f0f918b2f8..653ddc39b5b1 100644
--- a/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/FibonacciCalculator.kt b/documentation/src/test/kotlin/example/FibonacciCalculator.kt
index ae16322fc335..c7c111039bec 100644
--- a/documentation/src/test/kotlin/example/FibonacciCalculator.kt
+++ b/documentation/src/test/kotlin/example/FibonacciCalculator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
index 23c901fa1672..723ea2ac43ae 100644
--- a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
+++ b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
index 73b36a59365e..84b0d2a70213 100644
--- a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
+++ b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index 6ae092d20b64..746452c7a9c7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
index 1c693e922b49..f95ed4f53a47 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
index 0cf00416fde0..ca2c7412cde9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
index 67b75c0bc608..32a0707efd7b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
index 20b9ba749fb5..2e7f00afa57f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
index 2ed37d219f6f..a66ff5d3bb38 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
index 01c67a0e87ea..fe3239d354a0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
index 44e423a99fb2..ef1cf28f1ab6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
index 98df2ba54493..8cc9f609bebe 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
index 138b46e523bd..f6eadb91807d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
index abc3295e1974..cf1655bd9f66 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
index 9d2fb08f5478..6f6b8f978fed 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
index f596080dd42d..b8635cb17f94 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
index d730f2555b27..c0b9185a1e14 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
index 06056746b5e3..620c52a8ac79 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
index 675e1b717b8e..0a6b0d4864b4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index b8f6a029bea4..e3043ef42804 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
index 853f6051cb48..2aba46841a9c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
index 0aba77997855..a091cf0947e6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index bf17b39e0a51..fca32402ac12 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
index b3ec15998f82..f4711a285274 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index 057cddd0ae30..98665c5427ce 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
index 4ea0738f2e59..2fc46372e0c3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
index 6b784a958494..fc6db60bf4fd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
index 9f6e96937ba7..bb30c8846867 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
index 237d9b5e1002..b9cb2ffbda2f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 94bba94d3bf1..0e6284891266 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
index 09ba38d6edeb..88c40789b96f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
index 3dab77739a5b..f7e2b42b3a6d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
index b4b1ef0c350c..23b380df07c5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
index 3a5372eeb482..82acc5cfb913 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
index ce0db501e3d6..0c9ab15a8670 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 59d8f1318034..4426d97de861 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
index db9290c92408..03f414da97d4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
index e7f2f4c0dbb0..d22db68298c4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
index 3a2e77e2526f..10f48336573c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
index 3ef06dbe6ff5..23ce4b26f22e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
index b45f5e6e7bbd..d6b0079d2261 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
index 599b365464ed..02467574ab66 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
index afbc8e588425..a5b66474364b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
index 71736cf1bb89..b4ace03ed44d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
index e4dc0ef90769..f2ed493518f5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
index 4e6535f5ddbf..3417272f4a7e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
index 76c95c4d3a2e..4dce4a2b568b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
index 9f51eca599ae..2cad2ec58e12 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
index 90e43768345c..a309c33fe095 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
index 1ee31cb84d10..4a1b23181191 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
index 046e1b9c4771..4d9c1e3af4ed 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
index 67f33628f94d..0b1b2383f6e5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
index ec78cb0f0e48..c31122d7ab82 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
index 541f5598e4af..d2266bdcdb73 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
index 342f01cfd437..f059cd8c3d7d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
index c304ac2bafa7..cfd13aa5db83 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
index 6c9a44e8d7d7..63aea9a6b43b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
index 251795aa04cd..0c1a5f0e9a60 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
index 8bf49646b251..f81891306c29 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
index e3a2a1319228..91b3eb4bf8f7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
index 31c0965ebdfe..bc6740925eb3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
index 0727e7545a40..ddbcd6ce5d95 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
index 5d3d37d5e9c0..c81420ac71e7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
index 0761da1a7ddd..268c67019006 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
index 29a9f5f1c955..22e3ab32c6da 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index 9e2f232cc289..6bf37171846a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
index e22676bc16e8..f5db7b4b7daf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
index 70f01c29d986..7df3a0310362 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
index 95b78b7fa422..b1d45642660f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
index e53d4f9692f0..e546733e7a4a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
index 5006bc167a8f..7bd93c0f37cd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
index 0db42264f2f8..cb8a5c6d119c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
index b23fa0315689..9787da3f4b2e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
index 76f476d8563e..957b5e1e97e8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
index feb6cb7e22c4..79f168f5d0d2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
index bbf4620d7ab1..e4fa31447d15 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
index 599d7ddccbcb..d83e4fd4ae1c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
index a7155d3d1cfa..12dc4091138a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
index 817a361fb389..11963520c999 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index 8fd412e088f6..f4000c3c5673 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
index 832e5cf06f29..222107a68b22 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index 97dea28c3bc8..200a2df181c6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index f6ac220137e3..101019a1ec9b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
index 4895d4596c71..4492d9edefb2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
index 03402c6d6bbd..8086f90c0ab3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
index 8fd7e9da87d6..d3a03a0b578c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
index d6b59612c711..d2c671b0fd84 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
index acac670438d2..ed93069878a0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
index 97f3cce8d615..f0ee9a1da463 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
index d5628ddf449a..7051044e57e2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
index f28aad531def..72ee94bfbadf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
index 39ad238cf64e..db1c8bc54a88 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
index 2fafc86c8248..6021558bff60 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
index 33a66f89e205..3139e3832d77 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
index c16a1bfae19b..c0b3b0000db7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
index 4fcc4d75031c..0d0518d3b5ad 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index 6a244f950e54..40e5d1eefba8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
index 46b7ae76dbbb..1d0aa9932cfb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
index ad19e103ddc6..f9480b8ec609 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
index a002168fab5d..918a43d52e41 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
index f32f372dc749..0fc8a00f7c3d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
index 8f2d0e1a13b4..c6c344f9df43 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
index 40defd7d4a8b..42eabf33f36b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
index d0a1394126ea..107ed852df60 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
index 1dc52e66d99c..03b1f5b1af50 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
index 7e07f302de38..dfd3ef157c8b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
index a63d0df66297..521f7c579ad1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
index 68cc766ccbb1..b3e7ed085f1d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
index 0338de102ec0..50a105cf00c5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
index db1d09f7ce5c..a86379184abc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
index f9509fdcee7a..e29ef7c407a3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
index 01a31038011e..f3c5720f8781 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
index 42df1a6db800..55e25579c3c5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
index f4b9e855305a..51ca08ba683a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
index 7c462af6cd89..73591bb1b689 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
index 006cbf3f5875..8d00095662e7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
index b0eed4b2c33b..289c05a8295b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
index 4e1774dfebd6..07feadd14d3a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
index 518861538487..5584648de6ff 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
index c4446add5f2e..857c53086a76 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 4b392444155e..3d9bf2f1ce7b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index ba98fa9b4aed..a78a8fb4d8f0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
index 6c7a9e2da0a8..013f8787dfba 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
index 104e6a44ef62..de656a57785f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
index a9245526c0a4..042dc334849a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
index c07b32f000a4..b3baee4857d8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
index f4465e08ced9..0b9fcf4e8468 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
index 89a22048319e..cf99b6205af3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
index 8ebbcacf02f3..bf9609943877 100644
--- a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
+++ b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
index 6cd3017ed238..ad1578b8243a 100644
--- a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
+++ b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
index 4c6df517335c..48aa51f87c28 100644
--- a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
+++ b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
index d37aa792fbaf..2c4ea4ce3f23 100644
--- a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
+++ b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 880980ee79f3..5d9f893a78c5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
index c7b920d7679f..87bd99de7149 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index e9be15598526..2c99046d8f00 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index 13fdd46218ba..ffb9bf03f822 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
index c4a994d513fc..47cfb8bad03b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
index f9c9a9642a3c..f94e63a96e8d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index b7131230ea82..63963b11dfd8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
index 6bd341afc702..be4ad4f37a77 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index ab94f86a330d..ef1c47f8ba7e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
index 9564a6180879..09a9127fff8a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
index e6b61e2e8e1e..0630e4a02c1c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
index 4b6cb2b34dd7..f12ce3af178e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
index 3f0500d1ebc7..db82b8482f58 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
index 1d1de39d685f..23e9a94428bb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
index d4e8273f59b3..9d9cfca10bca 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
index 1ab19aa6b178..2f75a6178925 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
index bbfd1ef3e809..8d2c7b950bc3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
index ef0abc6c9fab..64ef2c12eaef 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
index e35293fa4754..91b53ff33187 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 838a432da5be..0c1ed17525ef 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
index d5948ff94718..e39e9e5ca72c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
index 045afe35c4a2..54439ede3b44 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
index 00a4edd70be0..b6f98d4b1fad 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
index 706a562ef742..7bff29c261cc 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
index 90eb3e2969d1..cbec4966d543 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
index 2bd1a502dbf8..e5ef8e0e66fd 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
index 75c7b5b63497..c7d291b69c0a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
index a97bc0bde207..a6c0b1b97e56 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
index 9ef3cb447f5b..2eb93aedba78 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
index 21358b175844..1f8fc6504aa9 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
index fcf2c54d15d0..cf18bf33e30c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
index 09f2a0ccd1ae..e5ca8e640dab 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
index 692a920f1b90..6dc49084b922 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
index da4fee467a64..71366b56c2b1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
index 52bd229b50e1..749502ad48ad 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
index 7497b29553dc..874984a83ca1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
index 2b858546fa65..d46e0467487e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
index e216cd55f171..be873d0a63d7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
index 36975a27b7be..2061f58fe15e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
index b901b8134ce3..bcc3d2c7056a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
index 2e6b797fb8ed..3f9b0c39ebeb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
index af3afe7852f1..d85b3d6afd64 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
index 46d18eb62509..b60f65000bb1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
index 2f4bd2e610ff..c2d9c0e1513c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
index a8b258a19a9e..7c4a9a3cc6a4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
index 4faa8f7776f6..72c8c4378379 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
index 7849e3b1521a..312b3a181433 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
index a496a1b9d9cf..e7d6d321c8f0 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
index e35be4459947..81973bcfc58b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
index 42ac3c05fdc2..97abba7bb103 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
index 75847e2c9c94..b495fa449d9f 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
index f45f683b2741..d480ec8fbfc5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
index 99654a1935b6..e859f75e84c2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
index f01adfd11f12..2b35ea39b195 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
index 7f83e24d8a7c..2dbe5b13baa7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
index 43280ed45605..9ee48c40ae02 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
index 74ae9bce43af..56f62d1abf10 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java
index a03fa9e9d522..1f113368b438 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
index cc1c1d899b77..ebb584517975 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
index aeb645163416..b8b24aa1ca21 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
index 55c49ab58202..ecf40625b7fa 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
index d444c818f65c..b3705b4d2ec8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
index dee0a94199af..b49c12aab664 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
index 51b2e308e5db..23b67c5f8654 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
index 1dcaa184b829..bf86b23d5024 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
index 4a0668e65cce..74dba1afb865 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
index 8e4126d92ee1..1e253bec400a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 56333bd08508..85b709cada51 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
index b0705e828a7b..220ff19da216 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
index ac6fba49d8a2..1c58efa7e370 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
index cc914b162ff6..eab532dc7336 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
index 28eee804b610..a9a7b59eed12 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index c497b3018e87..6b25465bbf60 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
index c242198ccc1d..4e0945c6b9dd 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
index 36f56360e8b5..9cf84e53e627 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
index 322bbbd0f539..870ffe21b3f5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
index 501c4c3909f4..00a02c299d2f 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
index cb67f5e682ac..b54228e5c6ee 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
index 54664405ddb0..1fb00792497b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java
index f67d29e6f20f..87f33e6386cb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
index 754da76b08f9..76bd8b17c04e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
index 3cb95e44f0a2..33d5401cee9b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java b/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
index 357455d748fe..69b7097993bf 100644
--- a/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
+++ b/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/GroovyAssertEqualsTests.groovy b/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/GroovyAssertEqualsTests.groovy
index ef2b68863fff..7554f9420405 100644
--- a/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/GroovyAssertEqualsTests.groovy
+++ b/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/GroovyAssertEqualsTests.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/GroovyAssertNotEqualsTests.groovy b/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/GroovyAssertNotEqualsTests.groovy
index 4ea5dacfef7b..bf95310e7931 100644
--- a/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/GroovyAssertNotEqualsTests.groovy
+++ b/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/GroovyAssertNotEqualsTests.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/PrimitiveAndWrapperTypeHelpers.groovy b/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/PrimitiveAndWrapperTypeHelpers.groovy
index a278d677e6d9..a33d8031beef 100644
--- a/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/PrimitiveAndWrapperTypeHelpers.groovy
+++ b/junit-jupiter-engine/src/test/groovy/org/junit/jupiter/api/PrimitiveAndWrapperTypeHelpers.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java b/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
index c735c46d6609..22c9d0fec493 100644
--- a/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
+++ b/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
index 3e13ac458a7d..3847801ae13f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
index 48758f9920fc..0fdc38d40c6f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
index bde8427c70b3..9c0e6880cc22 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
index c9b2b5b7cdc0..b9b8bab79674 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
index 9233aeb1353f..e8629ae6ec9f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
index 8d206ba4bcfc..e9e7e410ee03 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
index 2acafd1fdff6..93a4fdd50318 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
index 1181113636c2..2a9dd981e063 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
index 521f07585d6d..eb6228663df1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
index 820b3c21cb29..e7cf2ef0d43d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
index db7c265a3d48..e120bd4f9098 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
index 1d2f379ed076..f79d3445112c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
index e902411a19eb..13e4063e7e11 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
index 2513485a9cff..acdbe033f4e7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
index a4d5c5cf2855..d3e20009ed6f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index f748faceb417..e37209c503df 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
index 7066f8346284..4f36599c92a2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
index 68cbb9ec7a69..a95c27212ab1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
index 82ba47216b2a..a82403dee77b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
index cc49eed0eae9..f466c402f2c7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
index 25527af98a23..5709868ad41b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
index daa07abc65e2..70e58699db7c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
index e260863b1012..16fc8e5af636 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
index d2bdf457714e..d8739bb0ce14 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
index 038a1c27265e..2eaac6d690e2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index d4ac17ad137e..3cc2162017b0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index e6433a92deb1..da27aa6b4a25 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
index 4e596dcbebe7..74468d6eb34b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
index 1ec83c271879..331fb28fa090 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
index c3e44db98ee9..f1c05d171025 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
index 9cbdd48701cc..901a642da945 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
index f701c40a9922..2ee17e4e61b3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
index 77b55553305d..b8e01dfed68c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index 459a95adaf57..c0428d3e80b5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 16bd2d922e53..3cabc869504e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
index b222c354d728..42322bc47ade 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
index de49d083e946..1b8b035fcc69 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 135e7a47f92e..7f70a1b3937b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index 8aacf053e46a..241eadb79aeb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
index f39640d4b356..6a8fd811103a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
index c9d06ada811d..bf4602ccb8c3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
index 02527c553aba..22ad1bc58913 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
index b17baa6a591d..4b2cd6f265f5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
index 9fde3dfe0460..8f0920ff71ea 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
index 178e59e4642a..fc5cd647f0f8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index fbda32fcd4c5..abe24fa05d10 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index 8fb9d0902ca6..f170cad98c91 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
index 18ac37114650..bc057012d028 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
index 696c5f4b792a..6784f7931690 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
index a60d3e7668d1..d488335afbe8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
index 2abf95bd3603..c85ff399cef4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
index 8337dc6ea8d6..4ca92ed4252a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
index 254cd4e25095..55b7c5bdf7bd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
index 558ffa305c12..73edebc46ac8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
index 940e25701c5b..851b1a3dcdd2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
index d0f026f6d700..e945c932bcb9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
index 69fab0e67370..6d2f35d1aad5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
index 96c5adb4513c..4c00b8147bc6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
index dd7205edd425..e266c405b885 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
index 51ca976195f9..984c884bb586 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
index 9689d534c90a..bee53a29afba 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
index 69b1cb108be7..a2e15e6bb4f3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
index 28fed1fe7e95..da3400f70d34 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
index 632e2e72d75e..021a34c7a453 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
index b9e0d847d0dc..9ad5a33b6f3f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
index 74ee98cae27c..a7a3898c3c2b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
index 56fa9e3e62a1..b97c4536f574 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
index 955772b9fb95..7124447ca4c5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
index f08b35edaa8b..e66dd1cec817 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
index 40aa762b1fbf..345301d3cb8c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
index 2a12f6c199d3..3237b230c779 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
index ab8779932280..b6d01e3cf0ff 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
index ec7860159a2a..2dede7ef0ac6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
index a68454540819..f509efd41e2c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
index f3e5c8e28cfb..1beb46ab3615 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
index 6e9e6c3330de..31ef077bc1ac 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
index 3357c2091da2..088a642ca0fe 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
index c7ec092b2b7d..35fefe9bc600 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
index 65918853ce01..8d7551299055 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
index ad3fbd9483c1..44f04b2816b0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
index fd160212ff55..72eb7039ab24 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
index 6abe26936542..7a5fe3426e98 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
index 0697904a6d87..68dd2e33cb32 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
index 1b295b060d07..d5c0776903bd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
index 196e5b77b45d..0f5057efd6d7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
index 92ec5713f704..d2c85118748d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
index a94c6ebec1df..732d1b7f68f0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
index 0c5969573d22..21ad5715194f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
index 8263dfe233d7..54cde15680cb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
index 98a04de0174d..81c9a10dc988 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
index c7d770e9761d..de3a389ccbe6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
index 9bd3f9d4e4e8..5a27ae57ce60 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
index 7fe365ae8e65..8577f372197a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
index b26e191666bc..fffdb00ed3fb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
index 489141706aff..79b5d3656537 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
index 37b9342efaa0..c8df68ee224d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
index 854023218e8b..02b8c1ee92ff 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
index 68cc2f27f315..ed43d8d446d2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
index 8bb5ed3a5b63..a4d852f2f8be 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
index eaa81791334e..aaadf2b1c419 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
index abbbf9f770ef..750317f4d4f7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
index 2b85df39249b..79e78425b9eb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
index f99c8258cf8c..2f8c65076aad 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
index 5e8af983f0ff..937c00d235c1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
index 3ee0899ecc60..e7b506f14270 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
index 0db061fb624c..5bc49398517b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
index fca80ea73372..e191e2e0d5ab 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
index 6d32a3f2d2be..be77a5868d3d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
index 2ca495513886..4ee8a5ee6e8b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
index ab0b7f67e923..fd73fa409622 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
index 93debe18ea1c..7d595c528993 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
index 2be23703d5e6..87b62e7be62a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
index 9605a0c2e397..1d97d6cf3ff4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
index 282769baf3b4..a69b1693f53f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
index c9a7604b6fb6..c4ce4cdb49ae 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
index 3bc6537c7003..04078c65688f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
index 16a54d02eabe..22094796a83f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
index 1f26714bfc94..a39c756aebec 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java
index 008fbb02adf2..e3cd1351a077 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
index 155f2e282c1b..3cf14688f82c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
index b0bb8299e402..a2ebe331f840 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
index 5036d8bf5008..661f6087f86a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
index 08859eb72d41..bd7dbd63e2fe 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
index b12479d0b9de..91aae317ed3b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
index 0ead5fef5474..f37369227ab7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
index f097d2b8386a..67555f98d1c3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
index b11c3e78ec7b..f1f95a8f1ac1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
index 8d4d2cbe6fb5..93eb37909bf6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
index 39f8955b664c..931495f61206 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
index 0e625dde4431..422f956aed76 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
index 199100ae18cb..6d653eefd845 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
index 9d87b872a5ba..dcc1acbe1940 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
index 8c879f79fcc8..e7143d2dda9c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
index 6db36b39c63b..56b123d4442f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
index e3971b1c5d88..0cca20002c3e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
index 218ba2dec6de..a55fd0bade6f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
index 290e87d4be1f..82c9c90be262 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
index eadff2325223..33bc9260a34f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
index 4cd24a3faff7..a3062fce0cc1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
index db030c8645cd..0a144163da7c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
index 65a36ed8df83..3d290bdfa69c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
index 80ef0e96eb97..3c7d8a8247d9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
index 86469c8f8a92..9ea8c8e66cec 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
index 234a3f7470de..54856358ffbf 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
index 880681c4bcae..04479927e4d9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
index 1bbd09cab02a..83a1c1f4bc11 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
index 9733f8f97d85..04de0e29521e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
index 48d93d952474..2dc6d03717a5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
index 9a6e0156dd2c..c407f42b62b3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
index 8334b560263f..29fcadc9385c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
index 1c37027a2d11..cdb1d65c0698 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
index 173f147e637a..35c3fac0e114 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
index 7d4ab1a752d8..7350a771c9e6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
index 46b91488a142..64c8442c2f13 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
index 06ed0f1cb9d6..8e66af3c0cc8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
index 2bb66e500f62..153522ac6a31 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
index d9e8e1a51472..7d20f80278d7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
index 6d14539fbbb3..431550b71f6e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
index 26af331d941b..6d021fd5cdcb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
index f6f5c3908239..fd555d8a3c76 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
index cfbc0d01eaa7..19e668b67728 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
index 7ed5e3503bfb..ad81f4c72425 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
index 01aa1832dff5..a396e7f975df 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
index 23937e6768b6..d50d7d816a9e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
index 85d4d4f4ab2c..139e28488d76 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index e75e3f00ef37..7f7b6013240e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java
index 2ab4d8f50243..164e240a8b1b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
index e99df4e25100..812f993e7ba3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
index cb513429c66d..311888850620 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
index 6740305b8230..fa44b0f8bb4a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
index ae9ed0b4f854..a2b057400791 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
index 3366d1e70b5f..0a4889b81c7e 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
index ab03031d1a09..d90a1e11ca2f 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
index c2d85b287003..f2c631bef939 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
index a7ba382c5d69..2f94a3f71124 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
index 68480a32cc26..9638bd733e3f 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
index 5db066530ea2..f2fb8b4e6eba 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
index b7bb452c07b4..5899ccc7e254 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
index f99562fd0f0a..5680c09a2ca1 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
index a898357a27f7..a9e9e10d0f0c 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
index f37052e6f422..42a0032734d8 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
index 79fb40e7e526..2c822c0e3add 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
index 8c85adc0e83a..1ac9f65b7b2d 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
index 73c76d5bcd51..4b6a9d5ad7cb 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
index 1f7b6655f72b..84929dd24bf0 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
index df83797bf230..b45b934f39bd 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
index ed221489ac21..d74a5d6787ac 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
index 668d195e7ca9..be2d221e0d40 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
index 3a902b25d678..ed55d3230c66 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
index 09d5b70c521a..992cbc69e94f 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
index ed70f35078d2..d8790a4afa4a 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
index 9ed11aa43215..9e0359ceb8fa 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
index 28f258a7c318..5e25e9264918 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
index c54b6e041d0c..c33255747653 100644
--- a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
+++ b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
index 2962009cee42..bb1d88cbc220 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
index 620744be4420..ed547ca9682f 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
index 8879904dfd1e..d7fbd7e30575 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
index 7be4b83c9a94..f465cc1eb356 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
index 3b80f664af29..f360438b29c3 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
index cd9bd0803753..5212d35399b8 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
index 90cfad031fce..290d979cc765 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
index e4c37fc559d8..a01f5d33ae6e 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
index 19a0ec5733a4..92fab45ed474 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
index 523663613ef3..6766fd97809a 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
index 0d0100ffde94..943f04727f14 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
index 4656e5038a8c..7c8650267152 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
index 39eccc964be8..27ca31190142 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
index 28a6fc969a72..6639b7599276 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
index c93bb8d81f6e..59ac457115d2 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
index 0a8d61b59b9a..4fde2321d9e0 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
index 8df022024189..b5ac3c51c6d0 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
index 6a0fd13cc3d7..7dd517ea89a7 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index 39f4e0d5ddd8..f2faa61bbe20 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
index 65dde70187f4..e50d8bcfc0c7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
index 47b40e6a893e..0746f24b33f4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
index bf28d46130df..5d82fc06555d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
index 937e91f60103..49cf34c39320 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
index 970a75c6f16e..d47889f8cd15 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
index 55ee74286491..496f89abe6ad 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
index a6b87baa386e..6108428fcf1e 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
index ba41d656c488..4e8aaefce950 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
index 3fefa5ee1990..4df6c313ee20 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
index 4686ec96a2b5..bab7592fa662 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
index 899f5e680a13..d4258eb759cb 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
index 6e5aabbed654..72679c4114c8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
index 80483a604e79..3baf3a5760f4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
index 68f879a362f6..00360939dd17 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index 72e555f42fe5..70942775b98f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
index 8e863ddc2f5c..99e3aa74310c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
index 105ea6f599ae..e91e448a6d06 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
index db13fed17f13..657bce9620d2 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
index 37691d74c673..9832592a2146 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index c4c88a2c1418..f28171a7240f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
index 90d85cc8d876..39d07d94c2b5 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
index ee9b4112c23f..2d8b5aab526c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
index 3a2ec546bee1..ecb11db04a2f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
index a30b8887c8db..728188895265 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 78aa438315bc..863a68eace1f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index eb52ed5940ec..eb578b9956b1 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 5e19035da09c..7636b208c18f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index 18df453cf4fc..51c4652c04e2 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
index 488bdf306e1e..374824d3f86c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index 194341bf6630..eb7c6f18be66 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
index 1db8f32a79d2..c1c84e279a89 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
index b3e526aa1237..d7ca266a85de 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
index eabdd2cd147e..561099e8603d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
index 53cb77e1676f..928fda84a59a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index c7ed2a5a2325..116b751f4d0d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index b6a78e625853..d1fb10374482 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
index 19e3d9bddc9d..d85148f4d6f8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
index 836b3142e5e9..6c68b94d2df8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
index 05b925e1e825..70213f7895a4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
index b6cfb55327a4..c98e65cff76b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
index 98c3642f446c..344c3145d88a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
index c53eb8bcc3b0..2566b1c470ee 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
index 56620e1ecc84..6f07fcbed749 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
index 3dfd9dcb6fb7..925243644e38 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt b/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
index bdbd9310e75c..0028b05827e8 100644
--- a/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
+++ b/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
index 42f04fd1d7eb..c690245aab51 100644
--- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
+++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index 6ad6e471fd10..24f4df196a0d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index ed0f9e32465f..39332383d443 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
index 82614506ff29..a3dce4932bc7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
index dd97bfc4ec51..f9de719db4e9 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
index d5073cbe78f8..e3c872925cf6 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
index 34e8738758df..b1bfaffc07ae 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
index eaf4d22f2ddd..4b36111aee4a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index f9318cacdd2e..0f300132d83b 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
index 687482cc4504..6e84738d700f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
index 06efb164c17d..e7532f1e9427 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java
index 57b78f8e3312..b6843dd7867a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
index d8f0b7e564bf..45c38da24fd1 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index bbe3baab612d..d0a876a17cb9 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index 43e6087e2e1d..7016d86d614e 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
index 67759795e218..5a3c24f67c3a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
index 48e4c559f8e4..919798c9e887 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index c254fbb8f440..efd474399cad 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index 438393631c5a..097caa0a9cdc 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
index cf9c789f2a94..bab82fe96451 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
index 4ff069f6bce7..6414b755fc4d 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
index 804e414c7b4f..cd9336bbded9 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter/src/module/org.junit.jupiter/module-info.java b/junit-jupiter/src/module/org.junit.jupiter/module-info.java
index dbdc0a6635b8..986039ad9e54 100644
--- a/junit-jupiter/src/module/org.junit.jupiter/module-info.java
+++ b/junit-jupiter/src/module/org.junit.jupiter/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
index e3743fe8dcff..4c9eaa084306 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
index 6d4a21708d9c..079756e9f1ce 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
index 4a0f2315be97..0c45f4e16f43 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
index 0276a9a0101a..43bb1f36cd13 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
index 47ce1a17df23..f6e17fcdfca3 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
index 9036e31d15ac..6f5073426c38 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
index 541a8fb65db6..0ed0ff7fbd76 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
index 4f1a102fb176..315e458c793d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
index 98b61aef3a4f..70d4559e237a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
index 54e31b6b9560..fea4699d8b35 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
index a9ea245656cd..7e290e53cece 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
index 7c23735c97a5..60d9e1c7a682 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
index 7091d54ecd5d..cab0dd7357bb 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
index 2a58f72e70b4..ea444b22caed 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
index 1af606dcc9a1..c840442d7f1b 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
index 85005c086e94..203543094175 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
index 083c142bef00..94c2526dfa34 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
index 2305bcdde193..2bfe68b09c88 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
index df789f5388d0..f65242898641 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
index 3011d96accf7..08a6b3535a7d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
index 9e4f6a080d58..a7db3bb46196 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index 4eae3ca2c44d..06592d4f8b1e 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
index 39c1cdd71a96..02c208a204d1 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
index e88c87286a80..966c110535e7 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
index f64ede0b94b7..e814fcbb8f6d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
index 55d5d544855c..6aa35fe92ba2 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
index 98922e666552..0e220bde4a75 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
index d8e0b573840b..9eb1942e9222 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
index e3316b39df4f..96df396aed4e 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 1182dd7f649c..da12cd70032e 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
index 2bcbd7cafbaf..28955051f62c 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
index a704d935e403..8eaeed47b405 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
index 414cda2d1291..3e98c3fb3759 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
index b4fae56ced65..25df35605f6a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
index 23f442103ffa..6e02d92b3dd1 100644
--- a/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
+++ b/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
index 065111ab9648..b4e0774b29c8 100644
--- a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
+++ b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index 279a1f7beb17..7e21b7a63f2b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
index fd24004cf82b..6ce97bd088b4 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index 4348a2c6b30c..5be7162835f5 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index ff245923b882..7607cade328e 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
index f4f1a1fcfa3e..833c2cac9689 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
index 053cb83e086d..5aee8744827e 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
index 7b559294bcd9..7eca6f911e47 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
index 940ff5071ad2..88f0c5403d43 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
index c0097ad70e31..62b1c1da87b5 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index 61b48e66b446..a76d5c93545a 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
index 07e805779f03..6d6761c6f93b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
index 8ebd0909797c..a240ff9db664 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
index 87abb2e24467..09188c21be87 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
index 96bd05bef3ca..a1ca226d8e05 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
index 9fdefb3819b6..d189591474f6 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
index 107ae85f59ce..cf17f1800731 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
index a373a9942da4..97035579a99d 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
index 885cb34fe894..2543b4a6342b 100644
--- a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
+++ b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/module/org.junit.platform.console/module-info.java b/junit-platform-console/src/module/org.junit.platform.console/module-info.java
index 2a5f7a6a81bd..eddd184b22c3 100644
--- a/junit-platform-console/src/module/org.junit.platform.console/module-info.java
+++ b/junit-platform-console/src/module/org.junit.platform.console/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
index 2d91be35dae3..bc10bdba91d6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
index ff57edbb19d7..5110f4536d0a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
index cef80c6da22e..a198792a45ae 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
index c0ca4a1f5d69..e73c89b18aa6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
index 7cf3308301e9..cc825f64822c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
index 38f07def0b70..50a95877a082 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
index e74ad5fd989a..21e24dbe8594 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
index db3a9dec06a6..ee6654f57b90 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
index 500ab4af4be3..26f9bace5a0e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
index 9d6e039ffcf2..a6256aba204d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
index a7abc5ce6f5c..9fde84cfd5ee 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
index 8971c92e1836..3e78954e9994 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
index 258c4980dc75..0bd69e6a0927 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
index ebb470c8e635..e35eb262f2f8 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
index 821bd411c029..e7a21de3f080 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
index c996a38ba201..110dd5c0c9ec 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index b88926eab24c..ef6e552f90ca 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
index 5f2e843b74f3..852cd7504f29 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
index 5684d7c3b598..ee6ca96fb020 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
index e4e83d896018..3c4ded198198 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
index 25da8dd48cdd..034085991378 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
index 792d37150909..6098d426fcbc 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
index b5eba5bc2b57..6fcf1dfb9354 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
index 46acd9499015..a06a4cb7fa00 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 47caa2daf621..156e07b628c0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
index 643dde29308c..68b409ae9ef9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
index a7735e209d62..438a0d997a4a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
index 1f2d6cae817c..b2253bc4c2d6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
index 0e76c5c68348..187f30235f69 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
index d70ba2f46836..932a0e793117 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
index c545f73ca8be..462f6a32e770 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 344403360eae..967ef7fba61d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
index bdc909d6ff24..97bc4dfafa13 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
index d5ff424211c8..68aa2c7334a2 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index cc80b300812d..cd35eef9def4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
index f2751763c766..e98c6ebfe750 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
index a60b631da537..f4c50acd4db3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
index ddc3940ddf3c..9e4c15f2033a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
index 67f6dcbe8952..e23210ed4bd5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
index 6eb2ccaed2d9..b620ee26312a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
index 53403c69dfa4..2406f5589fc4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
index 981a34d645a6..44aa335f1032 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
index 3e91901b54f2..901db0cf7c80 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
index 0a46d31e3874..415371f0d0cb 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
index 1a96f0ad4f60..35c2fd648be5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
index 2dde27eb4d4a..98601d505d8d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
index 13c8ef336e59..5426eb884f2b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
index 090121b594e2..8e69ccb0bf31 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
index e1076fba4e81..269f9b4ff5cf 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
index 972ea3fae489..7b2b00e31080 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
index bcea7ca15749..3d29ee8d9d08 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
index b5c861c7891d..f3fd80749646 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
index 7d9d58aa9afb..11cb04a7c0fa 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
index 7b90c9757fe5..4bf7ebef0a68 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
index 5b3a69dc16e1..e52e584e4046 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
index 7fb3db4d381a..ec6565e1cf1e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
index dc03d251cb27..dcde44dbf9de 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
index cae9543325b0..2deb3e563621 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
index 53a10f65b618..487339c4f59e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
index 51dbe73f45bf..3ab6072fd4ad 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
index e379771b605d..be97a27da4ca 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
index 3c4085c2abce..57ccabb35e69 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
index 9383fae6bfc3..d3256ff3de54 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
index 9d2b6afb6276..1199cea0d875 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
index 564350ae10ac..70ac97b25fb9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
index 6bf2313fd539..063bb3669424 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
index ee8fbe153eb2..9936ea514dc5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
index e238b5626aeb..9cfac92fcb6e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
index ea20113eb6cf..456efe2389c0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
index e2c79d8cd347..d620cda3558a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
index 862d39b87a86..5d7817f37bdf 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
index 4b54a115b887..1e95e0516598 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
index a722a3f51328..1414b5099881 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
index 598d685ba01b..a5dee9587b30 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
index 01a6ce3faabe..4ba6c20b204e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
index a08036c5e94d..33e9eeb214db 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
index ab385129eccc..426ceb74a69b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
index ee2d367e9da5..606db4b7e192 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
index 35bcf16532a1..e499ad4495d2 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
index 84648616d5f4..6816b3401464 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
index 42c8834d71ef..2b7ff304a2ee 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
index 5a5c3d3b8d68..b9bee1fd0837 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
index 062e3cba94f2..9fc3a9fe26db 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
index f4d42a8cee3d..8db798ac61ec 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
index 96bc1bbe480a..511f10553937 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
index 91f4e095fbde..2f3f4528c0d0 100644
--- a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
+++ b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
index 53b30d51c6ad..174d51196bcf 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
index 9b51c75c7b57..18afe7707bed 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
index e10efb55eaad..c14fa1921222 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
index 731357e4722d..57058e827a75 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
index 9780098afd09..f389c7682690 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
index 8f739f06faa0..d97d6ad5762d 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
index 8856d50e11de..ba94ac5ff8b7 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
index e5274abdb0e8..35f5dd9ef4c3 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
index c3c52445311a..4cbe23bdc1f0 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
index c7013a2aacfd..839b0d02dd6b 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
index 270d5b5c651b..df7799df5185 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java b/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
index 0636e4eff966..f79379168925 100644
--- a/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
+++ b/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
index 265fa8988c43..7f7419401c4b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
index 4dfd5d6a5d78..53eada499f6e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
index 3ca1dcd21eed..82421f6e4254 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index bc69e3a47534..07715dfd08cc 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index 2e1dbf99017c..d5b7945b634d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
index edce58483298..aebec8bd5886 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
index 7be37218c5c4..144bbd05572d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
index eedc7ff4405a..b03601dadc3b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
index 2fecbe1bb613..610d610acb37 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
index 641534e29478..edc1bb02f2a4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
index e15413a890f8..b0505e9e213a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index 29681e3048b1..15ab32387a23 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index bc6075d8158e..9e268224b134 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
index 7fc64521fd29..41919c7fdcb4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
index dfe1de3086b3..5e629f150007 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index 8e2a5c97597c..5b8af43c137a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
index be1046cc4bac..4fd4d72441f7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
index f9e19979a48f..0fa19cd7b63b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
index ef09b55228d4..763f04a5eb54 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
index 103c76dc68ca..f57ce7002cbf 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index c0853d311140..b1752e0219a9 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
index 0bb4023d0986..6c5dcd4e9d15 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index 68271ea446fb..788303775a3c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
index 7fe0d07878be..f50a2f35e63e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
index a1bbd258ba7c..7d5af7d8a996 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
index 53aba88068e9..c163b64c6daa 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
index aba75ff99280..559d603e885e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
index 06eb1b6790f5..3238753c3aa2 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
index 2e97ea80f81c..ba9dff7de319 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 7a27914cad8a..5f4a563d119c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
index 72e4a51101bd..fb1bd04de26b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 4fda66637101..df826399fd5b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
index 6946ef2c2a64..0ac9a94a2543 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
index b17dcded202c..781c847f8b8a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
index 9adcd1711e88..490214c19d63 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
index ced5003f7bc1..98671f73a003 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
index 6d54315b86df..df129e586371 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
index 139b32dc4070..edda5c1f791d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
index 63d36c091d66..b040e8489107 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
index a39514fa57cb..f025aca3dcb7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
index 0a1256ef99b2..802a25cf98d8 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
index 24287fcf129b..e1b5af2030fb 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
index bffe5da57d7e..39ce7fe0540e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
index 098335f8fb47..99a7545e08a2 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
index 1f115af2ad9f..a26026d1ae21 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
index 2a504abe0e0c..04a052c16270 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
index b04940c02cce..546d2bbb9023 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
index edff6d732248..7557de0b78cd 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
index 8b5ba267214b..80473b99d298 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
index 1aa0428a2ac1..4e654afcf568 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
index ef4e1de9f166..b5263325973e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
index 086957f3abf9..9ab15093048f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
index a58b11a2d2ba..3795ed95d452 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
index 329ea7b634c1..2aa92b98f6d9 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
index c5ccaa3312ac..cfab5d857586 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
index aa05eef45526..38117f1072b4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
index 33b5e3866009..48449c9e8ae6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
index a94c35c2b922..405f898b5837 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
index a431f40de3f6..fc5a1ab6da22 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
index 40c9110c05c3..5d791410765d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
index 657741594364..880c7793b4c1 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
index b3ee66599ef7..efd481e69dcd 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
index 34e0a03a6a59..7443b5dcd4ad 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
index e5820633b7de..7088110b642c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
index ee0fc5627728..b7484c8df876 100644
--- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
+++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
index 22256999a35b..272548b82e4c 100644
--- a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
+++ b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
index 2a9962578abd..0f90f0438452 100644
--- a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
+++ b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
index e8eaa616d56c..39131eb133c2 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
index 672c5cb09d3e..0e2677a60001 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
index 16cf43236705..000fbd7015c7 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
index 8348e179e6ca..4724a36948e6 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
index 81f57ecc08fc..f452446933a1 100644
--- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index 29b7e1ef7e84..4e232ff135bc 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
index 490de18795a2..bb4f59de8692 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
index 79b209c3ee33..631dab46556a 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
index 57e7e8879cbf..108bd2188189 100644
--- a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
+++ b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
index df71781d4e67..4c7bf6194aae 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
index 595dac610ee5..d5b87bf74769 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
index c373489bb3be..11d8113df66e 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
index 8d570157131d..75427acad23e 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
index c94d8111c05d..c4c4d3284477 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
index e57349aef850..7047caea1d40 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
index a7d6244b7db7..bcfe221ff90f 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
index 3b09a1ba12e6..16d94108345c 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
index acecad13afed..a4aeb1cf8dea 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
index 013268bde762..9592461204cc 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
index 36419b0f7322..3d8bf880bb5b 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
index 0e99e0a24c79..596b9137a2dd 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
index 5294c6e7148e..6b88fc29025d 100644
--- a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
+++ b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
index 71433337f109..a66ad615bd23 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
index 3fa46f93a67a..181563681279 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index b50c3111bd61..f2a1d95767c5 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
index 15d73909251b..4eddb5255300 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
index c99e8875bae1..350453569a02 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
index d3c609fa0dd2..3550a5dd35ca 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
index 266dc0a39303..023003ce8b86 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
index 5ba21e04306d..7a4e78477585 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
index 28ca07746b0c..2dcce3e28fe6 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
index b301f33f67d5..a927028ead2a 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
index 5ca835bf3240..9d487c441ace 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
index 87cb4df332dc..5c8a08c9ca37 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
index d6bc10104861..e50ac4c4e94d 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
index 11bc650906a3..ea99b0e8ff92 100644
--- a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
+++ b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
index 3f65d520d5c3..6d9c5e254063 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
index 0b90e0d58ef8..83ca4ed3a33f 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
index a4d632b83da3..950d60faf0d0 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
index 568730cadeba..98be1e884d20 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
index feaa78282acc..346dab3d4186 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
index 7256c4f3f4b2..b9687efce26c 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
index efd386a04df0..047ce94ebb11 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
index 10976e6b9336..e84224758c2b 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
index 23f09d7b0b14..63bb392a261a 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
index 7953a29b956d..4431ad4c3401 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
index 87d33dd321c3..894364861e79 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
index c80780be9759..ab108e0f32e1 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
index e1cd92b89e18..a3972dcba983 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
index 1b28c97e6f88..a4ad9b4be3cf 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
index 686c80655145..90186a524588 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
index 8b99eff78c15..652ea12aad54 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
index c725e4bdc097..aaa29b43763f 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
index daa518e7f75a..77d15318afa1 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
index 50adeed529e5..558e76aa8fb8 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
index 26422dec3484..8a331d211acf 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
index d65b5e076567..30f6d4f0145d 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
index 821b892fcf6c..a7799ee17e38 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
index 871a7f28383a..5e486c2ac80a 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
index b309b1a5e054..6ec2a8736755 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
index 81dcde0ea179..690271cd3836 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
index 4787f87ed462..99897c096dc1 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java b/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
index e7c194de7a8b..0baad6dbff1e 100644
--- a/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
+++ b/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
index cde4f8cc4c17..8eb633df7788 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
index ce1198e63833..45212a158416 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
index c33f757ffd0d..2730315e52b3 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
index 01ee771ba42c..00abbdbdedc1 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
index ef40db7b40af..8aa70d01bd5b 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
index d7c5f851d17a..e32766a31a97 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
index 8cd277c2f040..80064e4e133e 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
index 3d61ccce9b01..e9328423bd84 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
index 49b9f1c5dd7d..c03f613f89fe 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
index 1baaad2091c9..1a937cfc8b2f 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
index 857f68e37bd5..530458d7c365 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
index f8fe68433350..5eb1786c6ee6 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
index db7e02b4eb34..a3168b7a0ee1 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
index 22e841e6765a..e78395c3b8a7 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
index b50aa69cb4b1..63dddffb44bf 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
index 802f69d5abe3..ef6b555a724b 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
index a062bfe2678d..4934b2637598 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
index 8e6bfa4822e9..7ac2e73fec5c 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
index 284efad17057..d3e8aee61509 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
index c1d54606241d..30582b651418 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
index 4242bafd94c6..b58b2497c54f 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
index 3bced3afad82..f7c69ad5caf0 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
index 6656b467c913..697c6ce7fbaf 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
index 9dbd46931b80..a1b6cb1a946b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
index e57804e27d8b..582aa3e03827 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
index eecfd16bbda4..b18862251a79 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
index 58de29fd1e94..0026a937b93a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
index add05ce7d9f6..150cf33efb32 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
index a6156449f57a..2680cb881b41 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
index 00ee9c6cda24..10d640a510ed 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
index e3c04380c07b..8f58db958e00 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
index 1d5cb5634b41..0c86f14738ca 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
index a13d7901b925..f6b9ec769115 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
index 5c5536ebb773..58d9f6dcb3c5 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
index a73aff4301ba..19ea74600356 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
index 92daf578b349..c7a780f6bd78 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
index ee35d42b54a5..4e3168fa5258 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
index 281019b85882..7811e4b33ffd 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
index 2a0ef130a4c5..8fe310355e28 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
index 77819b3ec5a0..7aec2deefb7f 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index 5ba7a57fcdc8..60e57a529d83 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
index c9ddf271f3e8..ae88b62d8ce4 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
index a8c0b6a0c104..1bb289adf1d3 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
index 3112feff9f5f..6f7a0b0a7d02 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
index 6dfb96131dc1..98b28e932837 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index 304e40605ca4..c36ff60c1982 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
index ca172cf6233d..c5e60d152fca 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
index 196f5302851a..bc0db4f1639a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
index 008358859a35..6b1718822653 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
index b0463c61e009..146d004d93a8 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
index 486688be1c03..df3afd2b8fb2 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index b741baf01681..635562ece9dd 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
index b1f777662a8c..ad6f1603490b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
index 47ce826d9ced..6b2a53ad977a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
index 14f2af0190bc..495c1ee962ab 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
index a519c7702d10..bce83eee8e71 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
index c878e75bc50c..c807d7b17a6a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
index 29c611b0026d..82d3f4c1c471 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
index 5024ad818e6a..222c97e54330 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
index 646c343a6cfa..f3c901c37e4d 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
index f0c3720a0f42..175cfeec0d26 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
index 3951efd1a568..c79eebdd9d83 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
index b397cba754a4..0835e614b9a1 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
index 43c2a2581e6f..f0890b7b8ccc 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
index 54c05a3f7235..0f1c0d339cfa 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
index c011490cf9f2..114f65bd7218 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
index b65aa62ad4bd..b03e9608bb56 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
index 754357373fde..f5a0a6c0a9f0 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
index 369ea2284dc8..85b64024c986 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
index 03674c04eb77..011a7b177128 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
index 1143b6c19911..133c0c487883 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
index 5fe2f0e3efe7..202d96f6da45 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
index 0763719d7b0b..971f19cc642f 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
index 30b4658eeec6..054104725c95 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
index 81c6439a574d..99596696558d 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java b/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
index b3785ada9fe2..d41d7a86f7d2 100644
--- a/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
+++ b/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/DefaultPackageTestCase.java b/platform-tests/src/test/java/DefaultPackageTestCase.java
index addd6a31bd68..e902fc670a05 100644
--- a/platform-tests/src/test/java/DefaultPackageTestCase.java
+++ b/platform-tests/src/test/java/DefaultPackageTestCase.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java b/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
index 6c415c3f3513..7b787fcf298f 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
index fce622ec973e..ae8998cb783d 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightAlphaTests.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightAlphaTests.java
index 316acdab1a22..c57687960147 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightAlphaTests.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightAlphaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightBetaTests.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightBetaTests.java
index 89ae7d5bd3c9..a2823d758210 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightBetaTests.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightBetaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java b/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
index 26902302155c..3ec2fba68fea 100644
--- a/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
index 4d16c20a99fe..d634d52c9f8b 100644
--- a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java b/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
index ec8bd0e19524..4a4d7551c68f 100644
--- a/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java b/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
index ec2db2b8e235..de8db8c1ce17 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
index 3521213e8c09..87aff28c74cf 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
index 42d46cc57c26..bb68f22feeac 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
index 8a993c563c87..0d5bf3f035c4 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
index 8a9d30acb2e8..c4222bd23c9f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java b/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
index bb51916cd308..a9cb66e78922 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index 8262a31b7a07..46b9dedc1288 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
index 76d9c9fd9862..6f7e2cf00747 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
index 13e296cfb8f1..bc4ce0de5d67 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
index 0567ae3eaeea..12f2dda8e469 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
index 5aa80642e595..1d2e857c59dd 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
index a752394aef77..b1bf941f99ee 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index d836fdf7bc52..ef55a0344537 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
index e4e0ee28fe96..736273453d2e 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
index 2d4f03a75262..507857f62bf4 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
index 7a6775b62d0f..ec0668ac601c 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
index 6834edeeecce..6effa2bcae0b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
index cc30ab49ee16..ee9fe5b8e26d 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
index edfedaec8a90..cbbc4b82e54f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index d1ae36e6df88..58f9775a39ed 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
index d68b48a36ea4..3f42f01f9a7a 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
index ad65dbc84bc6..66cb4fb1baad 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
index 838a8e3d0489..847ad5040481 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
index bbf2cbc4b2c5..54115734a725 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
index 9ce48ce795ab..ec2d2ca19adc 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
index ad3407d1bb44..461b1f325f2a 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
index 16aa53e90336..226712dfea11 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
index 81a35b9e79ed..65b45ef2b94b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
index 04585487289a..ed54d32ba7ca 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
index 3e8e2872afc6..c5790d84e263 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
index b43b9e85aafe..15ef8bdbcb02 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
index 4e39a4a3a802..01b208b62290 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
index bf37a87b39af..2dda1beb0c01 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
index 073bb1c63360..89c999053f37 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index 363197658cd1..566b0742d136 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
index e010155592c8..05c93d4cfdfd 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
index bc8808128510..195cb9ed62dd 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index a4a61fb4a0d3..e163214ef7a1 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
index 42ef2fe16ebd..776257e5959e 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
index 5cc0efc2e0c0..38dfc294423c 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
index 9b7fe61806ac..a8a1977020ff 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
index d9240cb28cc3..1cbd5b9a7b64 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
index 6ecca48a183e..a5a872c49a93 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
index 764a600178d9..2e45164e33c0 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
index 46d5e7fc0d34..64b66b7dd568 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
index 341272f37521..0c264b83a487 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
index 631c11133336..8aee33f5c4e1 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
index 9986d9ebda0a..53bcb1cd8fdb 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index b78479d7a3aa..2ca1e4320de4 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
index 058d20c5f971..77efc0cdafee 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index 7543298649e7..cb2745359a1f 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
index d745ad2ad638..fd731358cae8 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
index de7a1f3a00ff..8d218170b9ac 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
index e7487fb9a994..95ea579f9738 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
index a69451ee122a..a172bdcc1995 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
index b3728eb20426..400ce7bc4304 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
index 4b184385f6ee..d9198a47ad17 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
index 2352bf19381d..ff57740b1cd4 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
index 851990fbdef0..3b1298f50488 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
index bbaf6b15d107..f3a01a506da3 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
index 82ca3a17fb4d..85a5959e74b9 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
index d4bc907069df..8b07b914b1a8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
index 67f34d315f00..e07907d9355f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
index 65ee11c9cfc0..ebf1c08fad54 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
index b367e8b86914..91ac2ed262bf 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index c66a17059cf0..c94a4860bdf9 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
index 63fcaca67e50..2f1f46f7388c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
index 970815160de1..905f175839db 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 9729b108232a..700987f483f3 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
index 9edeaab82492..468415f81c7a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
index 63288527500b..8f9cf88bda69 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
index 405416dbdac7..831f9e636beb 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
index ef672c456ac7..bcb0e078f278 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
index abc4f76e7029..afa33556b816 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
index e29d31223657..de8a24ee3a72 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
index 796ca31b0219..5cf25cd3c85e 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
index 21941cb49a16..52a07568cf97 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
index 522e08115b11..82de658318ce 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
index 3ebb2a2105e5..bda2bc614a7d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
index c9ef68082966..cd7688ff3df8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
index 82eca17f5c7d..770e6fe3d46d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
index 059fc277bfec..44d5005ead18 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
index 11ba87897b92..1806a72c3724 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
index 01307356383c..f435cd9f111c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
index 1401d34997a8..ad128096bd69 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
index c93dc0cf98c5..d3b30c5673db 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
index 41debcde238f..a3aaaeb95baa 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
index 001cfd77dfe7..f5e0fde6f1e1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
index 0ef5b8ab69cd..23655be4feae 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
index 0ae2ec0aedcb..bc1dfe6ce357 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
index c8db3d759403..119caed41735 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
index 20167699afeb..df89984acb30 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
index dac88f8367ff..fad8d16f22ca 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
index 18a662392d66..173b09dd5390 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
index 7cb996d3e2d7..db399188d59a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
index c32d73105ee1..e719767df803 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
index caf8d85c894c..fbbfd080d55b 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
index 2707428e839c..657515dfe52f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
index c0fa0b930cd3..3b39d74d2b0d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
index 6b9daa061f18..514850f814c5 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
index a7b9e34c4b3c..89c3459049b5 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
index c70de8452e61..11257652f8e9 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
index 36ff8135f444..9ec0eaa0ecc2 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
index a81e15f0092f..86999dfeea7b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
index d8b558b7b6ba..2a9782454475 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
index a23a6810c171..e9be8894e765 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
index 1880936bbe20..389a48a9ccbf 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
index 6f5e9089eb92..c26fdc3142fb 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
index b82c02615a99..2d5a29d5b66b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
index c91e9fe3dea0..1c2de148b093 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
index 335ba892d693..46d6cad63f89 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
index f7f77f4e017a..65e313100c2d 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
index c2941901e504..2a448877ed43 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
index 9da3af4a23b4..7475acee1cc2 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 0ff85c43cc1b..5c3b457d91f8 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
index 9b6e453d3cef..13a280be24c1 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
index a1e7eddc2d9a..88a256addbe4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
index 5f9712f76d67..a419cc8928cf 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
index 217a3705b006..b380b4db7c7f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
index a3d6833987c4..8d0630f5dc45 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 5a42197c9ce2..31e0d98080f9 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
index 25488058b727..e4c3523e489a 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
index 68c7b6b5478f..abefde4b1d53 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
index 9c2e2cd99c33..977a5b43ae33 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
index 3c9e9ee18aff..c39550078382 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
index f23538e6afd7..2d41ae6f778a 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
index 4f8ca1f7ba24..d2cf26b0f506 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index 56fda7ca14d8..85fb04c13524 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
index bef4cec18d4e..6e4bc4390b8f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
index a9d647d45c41..17c52de1a978 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
index f102928d4c9e..8e33cb23d7b4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
index fbac2f47f921..07bcd190a1df 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
index c26431e30fe4..35054e05c125 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
index 4f47b5b7e82f..d60802a39ca6 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
index 64c68a997519..e13a06dec87d 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
index 5bacfc948009..ece4d0ff4bb8 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
index 9df2a95263db..81762e33995b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
index 1f9343c58a96..0a2acf7774e4 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
index 3668640ddb78..570e3d020d82 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index bf834c0ed939..ae6e42870f38 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
index f9428edf52ac..a64c5d758ce0 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index ca13a6782cb9..7f339554a6ed 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index c47dae5d1239..923413491208 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index 2f9b6075a8ea..cb4665600b52 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
index a3f386fa9b03..906ce70cb5ad 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
index cca1ddc6eddb..b380eeaaafef 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
index 89fbca886766..f32413cea271 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
index 3d0ffad4d147..729ae1996c9f 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/ant-starter/src/main/java/com/example/project/Calculator.java b/platform-tooling-support-tests/projects/ant-starter/src/main/java/com/example/project/Calculator.java
index c329fa8778cf..91436757229c 100644
--- a/platform-tooling-support-tests/projects/ant-starter/src/main/java/com/example/project/Calculator.java
+++ b/platform-tooling-support-tests/projects/ant-starter/src/main/java/com/example/project/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/ant-starter/src/test/java/com/example/project/CalculatorTests.java b/platform-tooling-support-tests/projects/ant-starter/src/test/java/com/example/project/CalculatorTests.java
index cab32965e36f..b0dfc0524564 100644
--- a/platform-tooling-support-tests/projects/ant-starter/src/test/java/com/example/project/CalculatorTests.java
+++ b/platform-tooling-support-tests/projects/ant-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/src/test/kotlin/com/example/project/ExtensionFunctionsTests.kt b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/src/test/kotlin/com/example/project/ExtensionFunctionsTests.kt
index da654d31d4d8..b74c92e28f70 100644
--- a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/src/test/kotlin/com/example/project/ExtensionFunctionsTests.kt
+++ b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/src/test/kotlin/com/example/project/ExtensionFunctionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/gradle-missing-engine/src/test/java/FooTests.java b/platform-tooling-support-tests/projects/gradle-missing-engine/src/test/java/FooTests.java
index 1770520072e4..79025029964a 100644
--- a/platform-tooling-support-tests/projects/gradle-missing-engine/src/test/java/FooTests.java
+++ b/platform-tooling-support-tests/projects/gradle-missing-engine/src/test/java/FooTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/gradle-starter/src/main/java/com/example/project/Calculator.java b/platform-tooling-support-tests/projects/gradle-starter/src/main/java/com/example/project/Calculator.java
index c329fa8778cf..91436757229c 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/src/main/java/com/example/project/Calculator.java
+++ b/platform-tooling-support-tests/projects/gradle-starter/src/main/java/com/example/project/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java b/platform-tooling-support-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java
index cab32965e36f..b0dfc0524564 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java
+++ b/platform-tooling-support-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java b/platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java
index c329fa8778cf..91436757229c 100644
--- a/platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java
+++ b/platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java b/platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java
index cab32965e36f..b0dfc0524564 100644
--- a/platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java
+++ b/platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/JupiterIntegrationTests.java b/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/JupiterIntegrationTests.java
index 1520214c94da..2542b21a8011 100644
--- a/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/JupiterIntegrationTests.java
+++ b/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/JupiterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/ModuleUtilsTests.java b/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/ModuleUtilsTests.java
index 7c9645e40ede..a4f0442a40c2 100644
--- a/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/ModuleUtilsTests.java
+++ b/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/ModuleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterIntegration.java b/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterIntegration.java
index ad9978760907..fbedffaffe6a 100644
--- a/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterIntegration.java
+++ b/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterIntegration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterParamsIntegration.java b/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterParamsIntegration.java
index 739a17a19ab2..d94a2f54ddd0 100644
--- a/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterParamsIntegration.java
+++ b/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterParamsIntegration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/standalone/src/standalone/VintageIntegration.java b/platform-tooling-support-tests/projects/standalone/src/standalone/VintageIntegration.java
index 9119f6e9fb3e..16bcab6704c6 100644
--- a/platform-tooling-support-tests/projects/standalone/src/standalone/VintageIntegration.java
+++ b/platform-tooling-support-tests/projects/standalone/src/standalone/VintageIntegration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 0cf68a0d3381..00ad77862d79 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
index f19c07e3e010..30d7048ce9ff 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
index 681f184d3391..816504c33e11 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
index 03996a1382a1..89e49437044d 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
index e253f12e3f58..71be9fd0b170 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
index d59b1f939710..bc920124e32a 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
index 99f3f1362f82..7aeeb385d13b 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
index fb71356fa8e9..17cdcd5829e6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
index fc5273efb42f..eafd69e23fc5 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
index dc481de1630a..0b8e60312086 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
index d58fe161e9a2..4b0b3242e9ff 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
index 3eb0dcc4a7c2..ae97a03580bb 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
index 8caf2081a3f6..256432a66317 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
index c66fee5b3258..4c69587bb0ef 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
index 832df24d1e5a..c33a507fbfdf 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
index 3d08523ceeb6..971f2c089d69 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index c0291d095776..5986b927b988 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
index f4d715329d9d..9784a1030078 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
index 3da83f9a8588..055eb4f0e6f4 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index ff890a63c46e..55a79bf4c779 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
index f6da542cd3ef..afbae951f852 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index 140c515ec276..2823ee61cbf3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index 4916f5761490..e654d896c294 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/src/spotless/eclipse-public-license-2.0.java b/src/spotless/eclipse-public-license-2.0.java
index 5d687704ddb7..a74c31a03f26 100644
--- a/src/spotless/eclipse-public-license-2.0.java
+++ b/src/spotless/eclipse-public-license-2.0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2021 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which

From 4b010233e7485223de094f65d0e7b2438168f98f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 16 Jan 2021 21:56:27 +0100
Subject: [PATCH 0168/1433] Update Gradle plugins

---
 documentation/documentation.gradle.kts |  1 +
 gradle.properties                      | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index f3b6cb564ce5..157461ceea79 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -73,6 +73,7 @@ val apiGuardianDocVersion = if (versions.apiguardian.contains("SNAPSHOT")) "snap
 gitPublish {
 	repoUri.set("https://github.com/junit-team/junit5.git")
 	branch.set("gh-pages")
+	sign.set(false)
 
 	contents {
 		from(docsDir)
diff --git a/gradle.properties b/gradle.properties
index 0d38902b743a..43c9197a1f3f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -47,14 +47,14 @@ surefire.version=2.22.2
 bnd.version=5.2.0
 
 # Plugins
-gradle.enterprise.plugin.version=3.5
+gradle.enterprise.plugin.version=3.5.1
 gradle.user-data.plugin.version=1.0.0
 versioning.plugin.version=2.14.0
-versions.plugin.version=0.29.0
-spotless.plugin.version=5.6.1
-git-publish.plugin.version=2.1.3
+versions.plugin.version=0.36.0
+spotless.plugin.version=5.9.0
+git-publish.plugin.version=3.0.0
 kotlin.plugin.version=1.4.0
 asciidoctor-pdf.version=1.5.3
-asciidoctor.plugin.version=3.2.0
-jmh.plugin.version=0.5.0
+asciidoctor.plugin.version=3.3.0
+jmh.plugin.version=0.5.2
 nohttp.plugin.version=0.0.5.RELEASE

From 2d005728058a532340181bae9093267b262184ff Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 16 Jan 2021 21:57:06 +0100
Subject: [PATCH 0169/1433] Update dependencies

---
 buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts | 2 +-
 gradle.properties                                        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts b/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
index deb9fdced557..2c1dfc17e4d9 100644
--- a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
+++ b/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 		}
 	}
 	pluginManager.withPlugin("osgi-conventions") {
-		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.13_1")
+		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:${versions["junit4.osgi"]}")
 	}
 }
 
diff --git a/gradle.properties b/gradle.properties
index 43c9197a1f3f..cf2cab231675 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,11 +18,12 @@ org.gradle.parallel=true
 
 # Dependencies
 apiguardian.version=1.1.1
-assertj.version=3.16.1
+assertj.version=3.18.1
 junit4.version=4.13.1
+junit4.osgi.version=4.13.1_1
 junit4Min.version=4.12
 opentest4j.version=1.2.0
-picocli.version=4.5.0
+picocli.version=4.6.1
 univocity-parsers.version=2.9.0
 
 # Test Dependencies

From 2210c9920ac60f66be82daae23e9d7fa87cd0b80 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 16 Jan 2021 21:57:18 +0100
Subject: [PATCH 0170/1433] Update test dependencies

---
 gradle.properties | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index cf2cab231675..5eadff992814 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,12 +29,12 @@ univocity-parsers.version=2.9.0
 # Test Dependencies
 archunit.version=0.15.0
 bartholdy.version=0.2.3
-classgraph.version=4.8.87
-commons-io.version=2.7
-kotlinx-coroutines-core.version=1.3.9
-groovy.version=3.0.6
-log4j.version=2.13.3
-mockito.version=3.5.0
+classgraph.version=4.8.98
+commons-io.version=2.8.0
+kotlinx-coroutines-core.version=1.4.2
+groovy.version=3.0.7
+log4j.version=2.14.0
+mockito.version=3.7.7
 slf4j.version=1.7.30
 spock.version=1.3-groovy-2.5
 jfrunit.version=main-SNAPSHOT
@@ -42,7 +42,7 @@ jfrunit.version=main-SNAPSHOT
 # Tools
 checkstyle.version=8.36.2
 jacoco.version=0.8.6
-jmh.version=1.25
+jmh.version=1.27
 ktlint.version=0.35.0
 surefire.version=2.22.2
 bnd.version=5.2.0

From e143c52b321acf86cd35dde5d0e8fd7f13c08d34 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 17 Jan 2021 13:48:21 +0100
Subject: [PATCH 0171/1433] Use groovy instead of groovy-all

---
 dependencies/dependencies.gradle.kts                        | 6 +++++-
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts        | 2 +-
 platform-tests/platform-tests.gradle.kts                    | 2 +-
 .../platform-tooling-support-tests.gradle.kts               | 2 +-
 .../java/platform/tooling/support/tests/ManifestTests.java  | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 27c846279ade..7921c47f032a 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -2,7 +2,12 @@ plugins {
 	`java-platform`
 }
 
+javaPlatform {
+	allowDependencies()
+}
+
 dependencies {
+	api(platform("org.codehaus.groovy:groovy-bom:${versions["groovy"]}"))
 	constraints {
 		// api means "the dependency is for both compilation and runtime"
 		// runtime means "the dependency is only for runtime, not for compilation"
@@ -13,7 +18,6 @@ dependencies {
 		runtime("org.apache.logging.log4j:log4j-core:${versions["log4j"]}")
 		runtime("org.apache.logging.log4j:log4j-jul:${versions["log4j"]}")
 		api("io.github.classgraph:classgraph:${versions["classgraph"]}")
-		api("org.codehaus.groovy:groovy-all:${versions["groovy"]}")
 		api("junit:junit:[${versions.junit4Min},)") {
 			version {
 				prefer(versions.junit4)
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 5daa63c41f1a..9f739e03db44 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -19,5 +19,5 @@ dependencies {
 	testImplementation(project(":junit-platform-testkit"))
 	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
-	testImplementation("org.codehaus.groovy:groovy-all")
+	testImplementation("org.codehaus.groovy:groovy")
 }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 596b3ef2bd46..592e0488562d 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(project(":junit-vintage-engine"))
-	testRuntimeOnly("org.codehaus.groovy:groovy-all") {
+	testRuntimeOnly("org.codehaus.groovy:groovy") {
 		because("`ReflectionUtilsTests.findNestedClassesWithInvalidNestedClassFile` needs it")
 	}
 
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 1f45aa624309..e14f5271015e 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 	testImplementation("com.tngtech.archunit:archunit-junit5-api") {
 		because("checking the architecture of JUnit 5")
 	}
-	testImplementation("org.codehaus.groovy:groovy-all") {
+	testImplementation("org.codehaus.groovy:groovy") {
 		because("it provides convenience methods to handle process output")
 		exclude(group = "org.junit.platform", module = "junit-platform-launcher")
 	}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
index 4c69587bb0ef..c39660a31b7d 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
@@ -11,9 +11,9 @@
 package platform.tooling.support.tests;
 
 import static aQute.bnd.osgi.Constants.VERSION_ATTRIBUTE;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static platform.tooling.support.Helper.createJarPath;
 
 import java.io.File;

From 22b0cd338e5a1851ae6396a0952bb2923a7543c6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 17 Jan 2021 14:05:42 +0100
Subject: [PATCH 0172/1433] Suppress illegal reflective access warnings from
 Groovy 2.5

---
 junit-vintage-engine/junit-vintage-engine.gradle.kts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 833224ac2713..360e763da5af 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -70,6 +70,11 @@ tasks {
 			excludeTags("missing-junit4")
 		}
 	}
+	withType<Test>().configureEach {
+		// Workaround for Groovy 2.5
+		jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
+		jvmArgs("--add-opens", "java.base/java.util=ALL-UNNAMED")
+	}
 	check {
 		dependsOn(testWithoutJUnit4)
 	}

From 16e5fe56b6caee8992dcabfb2e0bbb60a120f0a2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 17 Jan 2021 14:37:26 +0100
Subject: [PATCH 0173/1433] Suppress ConsoleLauncher output unless there are
 test failures

---
 documentation/documentation.gradle.kts | 34 ++++++++++++++++++--------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 157461ceea79..dad56942de3f 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -107,19 +107,33 @@ require(externalModulesWithoutModularJavadoc.values.all { it.endsWith("/") }) {
 
 tasks {
 
-	val consoleLauncherTest by registering(JavaExec::class) {
-		dependsOn(testClasses)
+	val consoleLauncherTest by registering {
+		val runtimeClasspath = sourceSets["test"].runtimeClasspath
+		inputs.files(runtimeClasspath).withNormalizer(ClasspathNormalizer::class)
 		val reportsDir = file("$buildDir/test-results")
 		outputs.dir(reportsDir)
 		outputs.cacheIf { true }
-		classpath = sourceSets["test"].runtimeClasspath
-		main = "org.junit.platform.console.ConsoleLauncher"
-		args("--scan-classpath")
-		args("--include-classname", ".*Tests")
-		args("--include-classname", ".*Demo")
-		args("--exclude-tag", "exclude")
-		args("--reports-dir", reportsDir)
-		systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
+		doFirst {
+			val output = ByteArrayOutputStream()
+			val result = javaexec {
+				classpath = runtimeClasspath
+				main = "org.junit.platform.console.ConsoleLauncher"
+				args("--scan-classpath")
+				args("--include-classname", ".*Tests")
+				args("--include-classname", ".*Demo")
+				args("--exclude-tag", "exclude")
+				args("--reports-dir", reportsDir)
+				systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
+				standardOutput = output
+				errorOutput = output
+				isIgnoreExitValue = true
+			}
+			if (result.exitValue != 0) {
+				System.out.write(output.toByteArray())
+				System.out.flush()
+			}
+			result.rethrowFailure().assertNormalExitValue()
+		}
 	}
 
 	test {

From bc92844361d4d3133f887786f7b6666e66f4c8d3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 17 Jan 2021 15:14:44 +0100
Subject: [PATCH 0174/1433] Configure Git author for documentation publishing

---
 documentation/documentation.gradle.kts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index dad56942de3f..917a6dd245c0 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -385,8 +385,19 @@ tasks {
 		into("$docsDir/current")
 	}
 
+	val configureGitAuthor by registering {
+		dependsOn(gitPublishReset)
+		doFirst {
+			File(gitPublish.repoDir.get().asFile, ".git/config").appendText("""
+				[user]
+					name = JUnit Team
+					email = team@junit.org
+			""".trimIndent())
+		}
+	}
+
 	gitPublishCommit {
-		dependsOn(prepareDocsForUploadToGhPages, createCurrentDocsFolder)
+		dependsOn(prepareDocsForUploadToGhPages, createCurrentDocsFolder, configureGitAuthor)
 	}
 }
 

From 8385518cc7f53d0267eaf617a7d6f94c6987b1c8 Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <rien.korstanje@gmail.com>
Date: Sat, 16 Jan 2021 03:54:20 +0100
Subject: [PATCH 0175/1433] Block parallel tests longer on CI

Various tests in `ParallelExecutionIntegrationTests` verify that different
tests were indeed executed by different threads. To ensure that an incorrect
implementation does not block the test suite indefinitely these tests contain
an intentional race condition.

This race condition assumes awaiting at most 100ms will be sufficient to schedule
another thread. This assumption is hardware dependent and does not hold on
Github CI[1]. Increasing the maximum time spend waiting by a factor 10 while in CI
is hopefully sufficient.

1. https://github.com/junit-team/junit5/pull/2416/checks?check_run_id=1712237454
```
2021-01-16T02:00:44.8166959Z > Task :platform-tests:test
2021-01-16T02:00:44.8167430Z
2021-01-16T02:00:44.8168932Z ParallelExecutionIntegrationTests > customContextClassLoader() FAILED
2021-01-16T02:00:44.8177847Z     java.lang.AssertionError:
2021-01-16T02:00:44.8178812Z     Expected size:<3> but was:<2> in:
2021-01-16T02:00:44.8179762Z     <["ForkJoinPool-19-worker-3", "ForkJoinPool-19-worker-5"]>
2021-01-16T02:00:44.8183737Z         at org.junit.platform.engine.support.hierarchical.ParallelExecutionIntegrationTests.customContextClassLoader(ParallelExecutionIntegrationTests.java:135)
2021-01-16T02:01:05.6171111Z
2021-01-16T02:01:05.6173697Z ParallelExecutionIntegrationTests > customContextClassLoader() FAILED
2021-01-16T02:01:05.6175991Z     java.lang.AssertionError:
2021-01-16T02:01:05.6177743Z     Expected size:<3> but was:<2> in:
2021-01-16T02:01:05.6178859Z     <["ForkJoinPool-1-worker-3", "ForkJoinPool-1-worker-5"]>
2021-01-16T02:01:05.6183298Z         at org.junit.platform.engine.support.hierarchical.ParallelExecutionIntegrationTests.customContextClassLoader(ParallelExecutionIntegrationTests.java:135)
2021-01-16T02:01:09.0267715Z
2021-01-16T02:01:09.0280937Z
2021-01-16T02:01:09.0282574Z ParallelExecutionIntegrationTests > customContextClassLoader() FAILED
2021-01-16T02:01:09.0283978Z 1534 tests completed, 3 failed, 7 skipped
2021-01-16T02:01:09.0284818Z     java.lang.AssertionError:
2021-01-16T02:01:09.0290826Z     Expected size:<3> but was:<2> in:
2021-01-16T02:01:09.0291728Z     <["ForkJoinPool-1-worker-3", "ForkJoinPool-1-worker-5"]>
2021-01-16T02:01:09.0295567Z         at org.junit.platform.engine.support.hierarchical.ParallelExecutionIntegrationTests.customContextClassLoader(ParallelExecutionIntegrationTests.java:135)
```
---
 .../ParallelExecutionIntegrationTests.java    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
index e719767df803..a7f5eec8d7bf 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
@@ -766,7 +766,7 @@ private static int incrementAndBlock(AtomicInteger sharedResource, CountDownLatc
 			throws InterruptedException {
 		var value = sharedResource.incrementAndGet();
 		countDownLatch.countDown();
-		countDownLatch.await(100, MILLISECONDS);
+		countDownLatch.await(estimateSimulatedTestDurationInMiliseconds(), MILLISECONDS);
 		return value;
 	}
 
@@ -774,10 +774,25 @@ private static void storeAndBlockAndCheck(AtomicInteger sharedResource, CountDow
 			throws InterruptedException {
 		var value = sharedResource.get();
 		countDownLatch.countDown();
-		countDownLatch.await(100, MILLISECONDS);
+		countDownLatch.await(estimateSimulatedTestDurationInMiliseconds(), MILLISECONDS);
 		assertEquals(value, sharedResource.get());
 	}
 
+	/**
+	 * To simulate tests running in parallel tests will modify a shared
+	 * resource, simulate work by waiting, then check if the shared resource was
+	 * not modified by any other thread.
+	 *
+	 * Depending on system performance the simulation of work needs to be longer
+	 * on slower systems to ensure tests can run in parallel.
+	 *
+	 * Currently CI is known to be slow.
+	 */
+	private static long estimateSimulatedTestDurationInMiliseconds() {
+		var runningInCi = Boolean.valueOf(System.getenv("CI"));
+		return runningInCi ? 1000 : 100;
+	}
+
 	static class ThreadReporter implements AfterTestExecutionCallback {
 
 		private static Stream<String> getLoaderNames(List<Event> events) {

From e3d77d40063a9cf1e24e75985fab2ce636d8a0c8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Mon, 18 Jan 2021 18:13:03 +0100
Subject: [PATCH 0176/1433] Fix @since and @API versions in
 ClassNamePatternFilterUtils

---
 .../platform/commons/util/ClassNamePatternFilterUtils.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
index 2bfe68b09c88..85e11aaf23e6 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
@@ -31,9 +31,9 @@
  * itself. <strong>Any usage by external parties is not supported.</strong>
  * Use at your own risk!
  *
- * @since 5.7
+ * @since 1.7
  */
-@API(status = INTERNAL, since = "5.7")
+@API(status = INTERNAL, since = "1.7")
 public class ClassNamePatternFilterUtils {
 
 	private ClassNamePatternFilterUtils() {

From ae9167891568cdd06a244b64bd8ab54afa1f0276 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Mon, 18 Jan 2021 18:13:34 +0100
Subject: [PATCH 0177/1433] Fix @since version in
 ClassNamePatternFilterUtilsTests

---
 .../platform/commons/util/ClassNamePatternFilterUtilsTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
index 12f2dda8e469..f2ba82645a5f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
@@ -30,7 +30,7 @@
 /**
  * Unit tests for {@link ClassNamePatternFilterUtils}.
  *
- * @since 5.7
+ * @since 1.7
  */
 @TestInstance(Lifecycle.PER_CLASS)
 class ClassNamePatternFilterUtilsTests {

From 0cd71078b4ea62268bcb26626bbb09dcdbc746ae Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 19 Jan 2021 21:09:23 +0100
Subject: [PATCH 0178/1433] Use correct version

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5eadff992814..eda9a86e036f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,7 +49,7 @@ bnd.version=5.2.0
 
 # Plugins
 gradle.enterprise.plugin.version=3.5.1
-gradle.user-data.plugin.version=1.0.0
+gradle.user-data.plugin.version=1.0
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.36.0
 spotless.plugin.version=5.9.0

From a4211d8ac7797fc7cabf0192fb8169b833ff0e63 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Sun, 24 Jan 2021 09:48:41 +0100
Subject: [PATCH 0179/1433] Update AssertJ to 3.19.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index eda9a86e036f..9a5a6cbdbb70 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ org.gradle.parallel=true
 
 # Dependencies
 apiguardian.version=1.1.1
-assertj.version=3.18.1
+assertj.version=3.19.0
 junit4.version=4.13.1
 junit4.osgi.version=4.13.1_1
 junit4Min.version=4.12

From e08ab9e6adfc3ed8b0ae3942cc3ac56c2c010fb1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 24 Jan 2021 11:33:09 +0100
Subject: [PATCH 0180/1433] Upgradle to 6.8.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 87e87435cbe3..f604ed1642c0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e2774e6fb77c43657decde25542dea710aafd78c4022d19b196e7e78d79d8c6c
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionSha256Sum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 33f7d6e7832a6bc05d81c67e43d8bcda6590a795 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Tue, 26 Jan 2021 17:43:04 +0100
Subject: [PATCH 0181/1433] Fix package path computation in ClasspathScanner

Prior to this commit no trailing `/` character was
appended to the computed package path.

Now, except for the default package `""`, a `/` is
appended to package path. This leads to corrected
and documented behavior even if two modules start
with the same name elements.

Fixes #2500
---
 .../release-notes/release-notes-5.8.0-M1.adoc |   3 +-
 .../commons/util/ClasspathScanner.java        |   6 ++-
 .../commons/util/ClasspathScannerTests.java   |  44 ++++++++++++++----
 .../src/test/resources/com.greetings@1-ea.jar | Bin 1380 -> 0 bytes
 .../modules-2500/foo.bar/FooBar.java          |   3 ++
 .../modules-2500/foo.bar/module-info.java     |   3 ++
 .../test/resources/modules-2500/foo/Foo.java  |   3 ++
 .../modules-2500/foo/module-info.java         |   3 ++
 .../support/tests/JavacModulesTests.java      |   1 +
 9 files changed, 54 insertions(+), 12 deletions(-)
 delete mode 100644 platform-tests/src/test/resources/com.greetings@1-ea.jar
 create mode 100644 platform-tests/src/test/resources/modules-2500/foo.bar/FooBar.java
 create mode 100644 platform-tests/src/test/resources/modules-2500/foo.bar/module-info.java
 create mode 100644 platform-tests/src/test/resources/modules-2500/foo/Foo.java
 create mode 100644 platform-tests/src/test/resources/modules-2500/foo/module-info.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 889669b54a38..a39045f25bcb 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -15,7 +15,8 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Method `scanForClassesInPackage(String)` in `ClasspathScanner` now returns a valid list
+  of class names when the package name is equal to the name of a module on the module path.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
index 08a6b3535a7d..398332d7d25a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
@@ -211,7 +211,11 @@ private ClassLoader getClassLoader() {
 	}
 
 	private static String packagePath(String packageName) {
-		return packageName.replace(PACKAGE_SEPARATOR_CHAR, CLASSPATH_RESOURCE_PATH_SEPARATOR);
+		if (packageName.isEmpty()) {
+			return "";
+		}
+		String path = packageName.replace(PACKAGE_SEPARATOR_CHAR, CLASSPATH_RESOURCE_PATH_SEPARATOR);
+		return path + CLASSPATH_RESOURCE_PATH_SEPARATOR;
 	}
 
 	private List<URI> getRootUrisForPackage(String basePackageName) {
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
index b1bf941f99ee..72b07feccba4 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
@@ -33,6 +33,7 @@
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
+import java.util.spi.ToolProvider;
 import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
@@ -180,22 +181,45 @@ void scanForClassesInPackage() {
 
 	@Test
 	// #2500
-	void scanForClassesInPackageWithinModuleSharingNames() throws Exception {
-		var jarfile = getClass().getResource("/com.greetings@1-ea.jar");
+	void scanForClassesInPackageWithinModulesSharingNamePrefix(@TempDir Path temp) throws Exception {
+		var moduleSourcePath = Path.of(getClass().getResource("/modules-2500/").toURI()).toString();
+		run("javac", "--module", "foo,foo.bar", "--module-source-path", moduleSourcePath, "-d", temp.toString());
 
-		var module = "com.greetings";
+		checkModules2500(ModuleFinder.of(temp)); // exploded modules
+
+		var foo = temp.resolve("foo.jar");
+		var bar = temp.resolve("foo.bar.jar");
+		run("jar", "--create", "--file", foo.toString(), "-C", temp.resolve("foo").toString(), ".");
+		run("jar", "--create", "--file", bar.toString(), "-C", temp.resolve("foo.bar").toString(), ".");
+
+		checkModules2500(ModuleFinder.of(foo, bar)); // jarred modules
+
+		System.gc(); // required on Windows in order to release JAR file handles
+	}
+
+	private static int run(String tool, String... args) {
+		return ToolProvider.findFirst(tool).orElseThrow().run(System.out, System.err, args);
+	}
+
+	private void checkModules2500(ModuleFinder finder) {
+		var root = "foo.bar";
 		var before = ModuleFinder.of();
-		var finder = ModuleFinder.of(Path.of(jarfile.toURI()));
 		var boot = ModuleLayer.boot();
-		var configuration = boot.configuration().resolveAndBind(before, finder, Set.of(module));
+		var configuration = boot.configuration().resolve(before, finder, Set.of(root));
 		var parent = ClassLoader.getPlatformClassLoader();
 		var layer = ModuleLayer.defineModulesWithOneLoader(configuration, List.of(boot), parent).layer();
 
-		var classpathScanner = new ClasspathScanner(() -> layer.findLoader(module), ReflectionUtils::tryToLoadClass);
-
-		var classes = classpathScanner.scanForClassesInPackage("com.greetings", allClasses);
-		var classNames = classes.stream().map(Class::getName).collect(Collectors.toList());
-		assertThat(classNames).hasSize(1).contains("com.greetings.Main");
+		var classpathScanner = new ClasspathScanner(() -> layer.findLoader(root), ReflectionUtils::tryToLoadClass);
+		{
+			var classes = classpathScanner.scanForClassesInPackage("foo", allClasses);
+			var classNames = classes.stream().map(Class::getName).collect(Collectors.toList());
+			assertThat(classNames).hasSize(2).contains("foo.Foo", "foo.bar.FooBar");
+		}
+		{
+			var classes = classpathScanner.scanForClassesInPackage("foo.bar", allClasses);
+			var classNames = classes.stream().map(Class::getName).collect(Collectors.toList());
+			assertThat(classNames).hasSize(1).contains("foo.bar.FooBar");
+		}
 	}
 
 	@Test
diff --git a/platform-tests/src/test/resources/com.greetings@1-ea.jar b/platform-tests/src/test/resources/com.greetings@1-ea.jar
deleted file mode 100644
index 38c7b065939520c1cc747b02cbb4e2acacdda028..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1380
zcmWIWW@Zs#;Nak35ScF@$bbYm8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1g<Oz^PdT
zr~<Cp*U`_@%{4eg&(}@#)Iz=n1%ZZ#=Z;wmm>w{R=$JI~Y~A6>8x?o#*50=_>i_%x
z3#U4D%G@7anr*&$_7<)dg^C+re;!I|>s1IfS$O#_=M!o7wMtXcoLSTIgZ9U$xoGNc
z{_U#0HV))A=Y6ZhqJTEX0Wog32?Awv^HWN5Qgt))((?6^a}tY-eSNL@ngRsogt7?Q
za~zBASh!)6$wp(tk1YN%oLzfb)UVAueTcb2<1w?+uA_BnY3XtAj|(3Vk~_Hbg!9Bt
zIw$)sF$vzWSFq@ut-zyH$@yr`&sixOKP3wE6darN(Zo1^#!okunXIe-{dg#RgJt&@
zu5V5o`P(mWiMQPI6RSM(S|zn<=gKC|!&NuCUg#u+wFL4`dAB-5qm(`B$FxSpQ@eX7
z&I>LnF?W2CeRV<L&Z$A_Nii#T%Y(f9P2Kav7NCb%7$IKfVqgG9(f4_%amfNyk({5a
z4+<3QD)^u((u-14OEUA)i@|CkDFfX!2@JKqiJ5tjaLf(#_CD+&@Nb*%Y&Ey&)z`LP
zb6@y1;XwA0?gi7sTDz3yZF_6xHcKaGTa&#vKUdQ~hWaTMonEzX6VuA%?$;Q9{`Kt(
z(*ftRZfudlZOt;Dc$Q|@9lp!hU-NxOvF@%}iu<Kq8t)~axF(%0#<juc2H&v<e?0Q<
zAB$?4qS_u}a@j|@vBW<_;N`ZkruH~SVV=wFUL3M6bun+XCBw2mM(G*_CTWzXzW5a%
zxczAJ2{*}LwPmtr790wY`FdOagGJhgnuXDu%w;&7)|t;*+`_*;J(=&bnwX4EQfJ~T
z`8bp0_*D~x-{1XZ&eA0$_<qyRYR$OE_diPX)ZSE9I+`ZXxj6BL;HxR+LRoGehYdnr
zO|SnboxbJ7v<u;z$`6V1w~BSC8SnVyc{A5CB(_jM#UO0c<hLx0*&3H#PMXf>-RE93
zv+nc~$(MJoDc_Kl<k437ywaGPd-aMS&q=#Jzg&Cguui}9`4cfIr;oDxY?C*rwp+FJ
zvYVxq<Gfpwj&7L8W`612?DwD)VaQUKSqDrFe!yHB;LXS+!ho8;VVM_{zfl1^!-8@<
zx>n@81<KtBU<+izwIbzpbQ6%1Dku*kz)c_%BS(U?b1`5~t*9<P1N1E<b>r3nO5X_Z
u4ypq=wIf0bl-`j;5tQB$KnfUuAlndn5vf1Go0Scuk_`w8fOgzt2JrxLE2uXB

diff --git a/platform-tests/src/test/resources/modules-2500/foo.bar/FooBar.java b/platform-tests/src/test/resources/modules-2500/foo.bar/FooBar.java
new file mode 100644
index 000000000000..0b855e5d5b17
--- /dev/null
+++ b/platform-tests/src/test/resources/modules-2500/foo.bar/FooBar.java
@@ -0,0 +1,3 @@
+package foo.bar;
+
+public class FooBar {}
diff --git a/platform-tests/src/test/resources/modules-2500/foo.bar/module-info.java b/platform-tests/src/test/resources/modules-2500/foo.bar/module-info.java
new file mode 100644
index 000000000000..d216af08a2bf
--- /dev/null
+++ b/platform-tests/src/test/resources/modules-2500/foo.bar/module-info.java
@@ -0,0 +1,3 @@
+open module foo.bar {
+  requires foo;
+}
diff --git a/platform-tests/src/test/resources/modules-2500/foo/Foo.java b/platform-tests/src/test/resources/modules-2500/foo/Foo.java
new file mode 100644
index 000000000000..7f566bafd458
--- /dev/null
+++ b/platform-tests/src/test/resources/modules-2500/foo/Foo.java
@@ -0,0 +1,3 @@
+package foo;
+
+public class Foo {}
diff --git a/platform-tests/src/test/resources/modules-2500/foo/module-info.java b/platform-tests/src/test/resources/modules-2500/foo/module-info.java
new file mode 100644
index 000000000000..430849782b21
--- /dev/null
+++ b/platform-tests/src/test/resources/modules-2500/foo/module-info.java
@@ -0,0 +1,3 @@
+module foo {
+  exports foo;
+}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
index 256432a66317..e5affb4b7588 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
@@ -100,6 +100,7 @@ private static List<String> compileModules(Path temp, Writer out, Writer err, Fu
 		try (var walk = Files.walk(base)) {
 			var projects = walk.filter(path -> path.endsWith("module-info.java")) //
 					.map(base::relativize) //
+					.filter(path -> !path.startsWith("platform-tests")) //
 					.filter(path -> !path.startsWith("platform-tooling-support-tests")) //
 					.map(base::resolve) //
 					.map(Project::new) //

From b3ce7aefa14b2157f87c0004c898e8857d66adeb Mon Sep 17 00:00:00 2001
From: ledoyen <ledoyen.loic@gmail.com>
Date: Tue, 8 Dec 2020 20:51:23 +0100
Subject: [PATCH 0182/1433] Introduce support for ordering test classes

This commit introduces support for ordering test classes analogous to
the existing support for ordering test methods.

Specifically, this commit introduces a new ClassOrderer API and related
ClassDescriptor and ClassOrdererContext types.

JUnit Jupiter provides the following built-in implementations of the
new ClassOrderer API.

- ClassOrderer.ClassName
- ClassOrderer.DisplayName
- ClassOrderer.OrderAnnotation
- ClassOrderer.Random

The default ClassOrderer implementation can be configured globally via
the configuration parameter: junit.jupiter.testclass.order.default

See the Javadoc and User Guide for details.

Issue: #1948
Closes: #2488
---
 .../release-notes/release-notes-5.8.0-M1.adoc |   4 +
 .../asciidoc/user-guide/writing-tests.adoc    |  51 +++-
 .../junit/jupiter/api/ClassDescriptor.java    |  86 +++++++
 .../org/junit/jupiter/api/ClassOrderer.java   | 235 ++++++++++++++++++
 .../jupiter/api/ClassOrdererContext.java      |  55 ++++
 .../org/junit/jupiter/api/MethodOrderer.java  |   5 +
 .../java/org/junit/jupiter/api/Order.java     |  12 +-
 .../org/junit/jupiter/engine/Constants.java   |  11 +
 .../config/CachingJupiterConfiguration.java   |   8 +
 .../config/DefaultJupiterConfiguration.java   |   8 +
 .../engine/config/JupiterConfiguration.java   |   4 +
 .../AbstractAnnotatedElementDescriptor.java   |  58 +++++
 .../discovery/AbstractOrderingVisitor.java    |  90 +++++++
 .../discovery/ClassOrderingVisitor.java       |  54 ++++
 .../discovery/DefaultClassDescriptor.java     |  38 +++
 .../discovery/DefaultClassOrdererContext.java |  44 ++++
 .../discovery/DefaultMethodDescriptor.java    |  41 +--
 .../discovery/DiscoverySelectorResolver.java  |   1 +
 .../discovery/MethodOrderingVisitor.java      |  73 +-----
 .../engine/extension/OrderedClassTests.java   | 113 +++++++++
 .../extension/RandomlyOrderedTests.java       |  91 +++++++
 21 files changed, 973 insertions(+), 109 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index a39045f25bcb..bc2bd62343ab 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -75,6 +75,10 @@ on GitHub.
 * Allow rows in `@CsvSource` to start with a number sign (#)
 * New `ignoreLeadingAndTrailingWhitespace` attribute to control whether or not to trim
   whitespaces in `@CsvSource` and `@CsvFileSource` (set to `true` by default).
+* Top-level test classes can now be ordered by passing the fully-qualified name of a
+  class implementing `ClassOrderer` as value of the new
+  `junit.jupiter.testclass.order.default` configuration property.
+
 
 [[release-notes-5.8.0-M1-junit-vintage]]
 === JUnit Vintage
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 8f247e7fa0d9..8759e0e4bdc9 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -511,11 +511,15 @@ custom annotations for tags.
 [[writing-tests-test-execution-order]]
 === Test Execution Order
 
-By default, test methods will be ordered using an algorithm that is deterministic but
-intentionally nonobvious. This ensures that subsequent runs of a test suite execute test
-methods in the same order, thereby allowing for repeatable builds.
+By default, test classes and methods will be ordered using an algorithm that is
+deterministic but intentionally nonobvious. This ensures that subsequent runs of several
+test suites execute test methods in the same order, thereby allowing for repeatable
+builds.
 
-NOTE: See <<writing-tests-classes-and-methods>> for a definition of _test method_.
+NOTE: See <<writing-tests-classes-and-methods>> for a definition of _test method_ and
+_test class_.
+
+==== Method Order
 
 Although true _unit tests_ typically should not rely on the order in which they are
 executed, there are times when it is necessary to enforce a specific test method execution
@@ -551,7 +555,7 @@ include::{testDir}/example/OrderedTestsDemo.java[tags=user_guide]
 ----
 
 [[writing-tests-test-execution-order-default]]
-==== Setting the Default Method Orderer
+===== Setting the Default Method Orderer
 
 You can use the `junit.jupiter.testmethod.order.default` <<running-tests-config-params,
 configuration parameter>> to specify the fully qualified class name of the
@@ -573,6 +577,43 @@ junit.jupiter.testmethod.order.default = \
 Similarly, you can specify the fully qualified name of any custom class that implements
 `MethodOrderer`.
 
+==== Class Order
+
+For build optimization purposes, it can be helpful to run _test classes_ in a specific
+order.
+For example:
+* previously failed tests and faster tests first: fail fast
+* with parallelism enabled, longer tests first: shortest test execution duration
+* etc.
+
+You can use the `junit.jupiter.testclass.order.default`
+<<running-tests-config-params, configuration parameter>> to specify the fully qualified
+class name of the `{ClassOrderer}` you would like to use. The supplied class has to
+implement the `ClassOrderer` interface.
+
+You can implement your own custom `ClassOrderer` or use one of the
+following built-in `ClassOrderer` implementations.
+
+* `{DisplayName}`: sorts test classes _alphanumerically_ based on their display names
+  (see <<writing-tests-display-name-generator-precedence-rules, display name generation
+  precedence rules>>).
+* `{ClassName}`: sorts test classes _alphanumerically_ based on their class name.
+* `{OrderAnnotation}`: sorts test classes _numerically_ based on values specified via the
+  `{Order}` annotation.
+* `{Random}`: orders test classes _pseudo-randomly_ and supports configuration of a
+  custom _seed_.
+
+For example for the `@Order` annotation to be honored on _test classes_, you should set
+the `{OrderAnnotation}` class orderer, using the configuration parameter with the
+corresponding fully qualified class name (e.g., in
+`src/test/resources/junit-platform.properties`):
+
+[source,properties,indent=0]
+----
+junit.jupiter.testclass.order.default = \
+    org.junit.jupiter.api.ClassOrderer$OrderAnnotation
+----
+
 [[writing-tests-test-instance-lifecycle]]
 === Test Instance Lifecycle
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
new file mode 100644
index 000000000000..5eac4e76e402
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Optional;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code ClassDescriptor} encapsulates functionality for a given {@link Class}.
+ *
+ * @since 5.8
+ * @see ClassOrdererContext
+ */
+@API(status = EXPERIMENTAL, since = "5.8")
+public interface ClassDescriptor {
+
+	/**
+	 * Get the class for this descriptor.
+	 *
+	 * @return the class; never {@code null}
+	 */
+	Class<?> getTestClass();
+
+	/**
+	 * Get the display name for this descriptor's {@link #getClass()} () class}.
+	 *
+	 * @return the display name for this descriptor's class; never {@code null}
+	 * or blank
+	 */
+	String getDisplayName();
+
+	/**
+	 * Determine if an annotation of {@code annotationType} is either
+	 * <em>present</em> or <em>meta-present</em> on the {@link Class} for
+	 * this descriptor.
+	 *
+	 * @param annotationType the annotation type to search for; never {@code null}
+	 * @return {@code true} if the annotation is present or meta-present
+	 * @see #findAnnotation(Class)
+	 * @see #findRepeatableAnnotations(Class)
+	 */
+	boolean isAnnotated(Class<? extends Annotation> annotationType);
+
+	/**
+	 * Find the first annotation of {@code annotationType} that is either
+	 * <em>present</em> or <em>meta-present</em> on the {@link Class} for
+	 * this descriptor.
+	 *
+	 * @param <A> the annotation type
+	 * @param annotationType the annotation type to search for; never {@code null}
+	 * @return an {@code Optional} containing the annotation; never {@code null} but
+	 * potentially empty
+	 * @see #isAnnotated(Class)
+	 * @see #findRepeatableAnnotations(Class)
+	 */
+	<A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType);
+
+	/**
+	 * Find all <em>repeatable</em> {@linkplain Annotation annotations} of
+	 * {@code annotationType} that are either <em>present</em> or
+	 * <em>meta-present</em> on the {@link Class} for this descriptor.
+	 *
+	 * @param <A> the annotation type
+	 * @param annotationType the repeatable annotation type to search for; never
+	 * {@code null}
+	 * @return the list of all such annotations found; neither {@code null} nor
+	 * mutable, but potentially empty
+	 * @see #isAnnotated(Class)
+	 * @see #findAnnotation(Class)
+	 * @see java.lang.annotation.Repeatable
+	 */
+	<A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType);
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
new file mode 100644
index 000000000000..33453d5de1e2
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static java.util.Comparator.comparingInt;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Optional;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+
+/**
+ * {@code ClassOrderer} defines the API for ordering the <em>top-level test classes</em>,
+ * without considering nested test classes.
+ *
+ * <p>In this context, the term "test class" refers to any class containing methods annotated with
+ * {@code @Test}, {@code @RepeatedTest}, {@code @ParameterizedTest},
+ * {@code @TestFactory}, or {@code @TestTemplate} and not being annotated with {@code @Nested}.
+ *
+ * <h4>Built-in Implementations</h4>
+ *
+ * <p>JUnit Jupiter provides the following built-in {@code ClassOrderer}
+ * implementations.
+ *
+ * <ul>
+ * <li>{@link ClassOrderer.ClassName}</li>
+ * <li>{@link ClassOrderer.DisplayName}</li>
+ * <li>{@link ClassOrderer.OrderAnnotation}</li>
+ * <li>{@link ClassOrderer.Random}</li>
+ * </ul>
+ *
+ * @see ClassOrdererContext
+ * @see #orderClasses(ClassOrdererContext)
+ * @since 5.8
+ */
+@API(status = EXPERIMENTAL, since = "5.8")
+public interface ClassOrderer {
+
+	/**
+	 * Order the classes encapsulated in the supplied {@link ClassOrdererContext}.
+	 *
+	 * <p>The classes to order or sort are made indirectly available via
+	 * {@link ClassOrdererContext#getClassDescriptors()} ()}. Since this method
+	 * has a {@code void} return type, the list of class descriptors must be
+	 * modified directly.
+	 *
+	 * <p>For example, a simplified implementation of the {@link ClassOrderer.Random}
+	 * {@code ClassOrderer} might look like the following.
+	 *
+	 * <pre class="code">
+	 * public void orderClasses(ClassOrdererContext context) {
+	 *     Collections.shuffle(context.getClassDescriptors());
+	 * }
+	 * </pre>
+	 *
+	 * @param context the {@code ClassOrdererContext} containing the
+	 *                {@link ClassDescriptor class descriptors} to order; never {@code null}
+	 */
+	void orderClasses(ClassOrdererContext context);
+
+	/**
+	 * {@code ClassOrderer} that sorts classes alphanumerically based on their
+	 * qualified names using {@link String#compareTo(String)}.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	class ClassName implements ClassOrderer {
+
+		/**
+		 * Sort the classes encapsulated in the supplied
+		 * {@link ClassOrdererContext} alphanumerically based on their qualified names.
+		 */
+		@Override
+		public void orderClasses(ClassOrdererContext context) {
+			context.getClassDescriptors().sort(comparator);
+		}
+
+		private static final Comparator<ClassDescriptor> comparator = Comparator. //
+				comparing(descriptor -> descriptor.getTestClass().getName());
+	}
+
+	/**
+	 * {@code ClassOrderer} that sorts classes alphanumerically based on their
+	 * display names using {@link String#compareTo(String)}
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	class DisplayName implements ClassOrderer {
+
+		/**
+		 * Sort the classes encapsulated in the supplied
+		 * {@link ClassOrdererContext} alphanumerically based on their display
+		 * names.
+		 */
+		@Override
+		public void orderClasses(ClassOrdererContext context) {
+			context.getClassDescriptors().sort(comparator);
+		}
+
+		private static final Comparator<ClassDescriptor> comparator = Comparator.comparing(
+			ClassDescriptor::getDisplayName);
+	}
+
+	/**
+	 * {@code ClassOrderer} that sorts classes based on the {@link Order @Order}
+	 * annotation.
+	 *
+	 * <p>Any classes that are assigned the same order value will be sorted
+	 * arbitrarily adjacent to each other.
+	 *
+	 * <p>Any classes not annotated with {@code @Order} will be assigned the
+	 * {@link org.junit.jupiter.api.Order#DEFAULT default order} value which will
+	 * effectively cause them to appear at the end of the sorted list, unless
+	 * certain classes are assigned an explicit order value greater than the default
+	 * order value. Any classes assigned an explicit order value greater than the
+	 * default order value will appear after non-annotated classes in the sorted
+	 * list.
+	 */
+	class OrderAnnotation implements ClassOrderer {
+
+		/**
+		 * Sort the classes encapsulated in the supplied
+		 * {@link ClassOrdererContext} based on the {@link Order @Order}
+		 * annotation.
+		 */
+		@Override
+		public void orderClasses(ClassOrdererContext context) {
+			context.getClassDescriptors().sort(comparingInt(OrderAnnotation::getOrder));
+		}
+
+		private static int getOrder(ClassDescriptor descriptor) {
+			return descriptor.findAnnotation(Order.class).map(Order::value).orElse(Order.DEFAULT);
+		}
+	}
+
+	/**
+	 * {@code ClassOrderer} that orders classes pseudo-randomly.
+	 *
+	 * <h4>Custom Seed</h4>
+	 *
+	 * <p>By default, the random <em>seed</em> used for ordering classes is the
+	 * value returned by {@link System#nanoTime()} during static initialization
+	 * of this class. In order to support repeatable builds, the value of the
+	 * default random seed is logged at {@code INFO} level. In addition, a
+	 * custom seed (potentially the default seed from the previous test plan
+	 * execution) may be specified via the {@link Random#RANDOM_SEED_PROPERTY_NAME
+	 * junit.jupiter.execution.class.order.random.seed} <em>configuration parameter</em>
+	 * which can be supplied via the {@code Launcher} API, build tools (e.g.,
+	 * Gradle and Maven), a JVM system property, or the JUnit Platform configuration
+	 * file (i.e., a file named {@code junit-platform.properties} in the root of
+	 * the class path). Consult the User Guide for further information.
+	 *
+	 * @see Random#RANDOM_SEED_PROPERTY_NAME
+	 * @see java.util.Random
+	 */
+	class Random implements ClassOrderer {
+
+		private static final Logger logger = LoggerFactory.getLogger(Random.class);
+
+		/**
+		 * Default seed, which is generated during initialization of this class
+		 * via {@link System#nanoTime()} for reproducibility of tests.
+		 */
+		private static final long DEFAULT_SEED;
+
+		static {
+			DEFAULT_SEED = System.nanoTime();
+			logger.info(() -> "ClassOrderer.Random default seed: " + DEFAULT_SEED);
+		}
+
+		/**
+		 * Property name used to set the random seed used by this
+		 * {@code ClassOrderer}: {@value}
+		 *
+		 * The same property is used by {@link MethodOrderer.Random} for consistency
+		 * between the two random orderers.
+		 *
+		 * <h3>Supported Values</h3>
+		 *
+		 * <p>Supported values include any string that can be converted to a
+		 * {@link Long} via {@link Long#valueOf(String)}.
+		 *
+		 * <p>If not specified or if the specified value cannot be converted to
+		 * a {@link Long}, the default random seed will be used (see the
+		 * {@linkplain Random class-level Javadoc} for details).
+		 *
+		 * @see MethodOrderer.Random
+		 */
+		public static final String RANDOM_SEED_PROPERTY_NAME = MethodOrderer.Random.RANDOM_SEED_PROPERTY_NAME;
+
+		/**
+		 * Order the classes encapsulated in the supplied
+		 * {@link ClassOrdererContext} pseudo-randomly.
+		 */
+		@Override
+		public void orderClasses(ClassOrdererContext context) {
+			Collections.shuffle(context.getClassDescriptors(),
+				new java.util.Random(getCustomSeed(context).orElse(DEFAULT_SEED)));
+		}
+
+		private Optional<Long> getCustomSeed(ClassOrdererContext context) {
+			return context.getConfigurationParameter(RANDOM_SEED_PROPERTY_NAME).map(configurationParameter -> {
+				Long seed = null;
+				try {
+					seed = Long.valueOf(configurationParameter);
+					logger.config(
+						() -> String.format("Using custom seed for configuration parameter [%s] with value [%s].",
+							RANDOM_SEED_PROPERTY_NAME, configurationParameter));
+				}
+				catch (NumberFormatException ex) {
+					logger.warn(ex,
+						() -> String.format(
+							"Failed to convert configuration parameter [%s] with value [%s] to a long. "
+									+ "Using default seed [%s] as fallback.",
+							RANDOM_SEED_PROPERTY_NAME, configurationParameter, DEFAULT_SEED));
+				}
+				return seed;
+			});
+		}
+	}
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
new file mode 100644
index 000000000000..3857ef73097c
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code ClassOrdererContext} encapsulates the <em>context</em> in which
+ * a {@link ClassOrderer} will be invoked.
+ *
+ * @since 5.8
+ * @see ClassOrderer
+ * @see ClassDescriptor
+ */
+@API(status = EXPERIMENTAL, since = "5.8")
+public interface ClassOrdererContext {
+
+	/**
+	 * Get the list of {@linkplain ClassDescriptor class descriptors} to
+	 * order.
+	 *
+	 * @return the list of class descriptors; never {@code null}
+	 */
+	List<? extends ClassDescriptor> getClassDescriptors();
+
+	/**
+	 * Get the configuration parameter stored under the specified {@code key}.
+	 *
+	 * <p>If no such key is present in the {@code ConfigurationParameters} for
+	 * the JUnit Platform, an attempt will be made to look up the value as a
+	 * JVM system property. If no such system property exists, an attempt will
+	 * be made to look up the value in the JUnit Platform properties file.
+	 *
+	 * @param key the key to look up; never {@code null} or blank
+	 * @return an {@code Optional} containing the value; never {@code null}
+	 * but potentially empty
+	 *
+	 * @see System#getProperty(String)
+	 * @see org.junit.platform.engine.ConfigurationParameters
+	 */
+	Optional<String> getConfigurationParameter(String key);
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 4426d97de861..7cc5b22ec854 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -260,6 +260,9 @@ class Random implements MethodOrderer {
 		 * Property name used to set the random seed used by this
 		 * {@code MethodOrderer}: {@value}
 		 *
+		 * The same property is used by {@link ClassOrderer.Random} for consistency
+		 * between the two random orderers.
+		 *
 		 * <h3>Supported Values</h3>
 		 *
 		 * <p>Supported values include any string that can be converted to a
@@ -268,6 +271,8 @@ class Random implements MethodOrderer {
 		 * <p>If not specified or if the specified value cannot be converted to
 		 * a {@link Long}, the default random seed will be used (see the
 		 * {@linkplain Random class-level Javadoc} for details).
+		 *
+		 * @see ClassOrderer.Random
 		 */
 		public static final String RANDOM_SEED_PROPERTY_NAME = "junit.jupiter.execution.order.random.seed";
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
index 10f48336573c..ee3c94f6873a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
@@ -23,9 +23,9 @@
 
 /**
  * {@code @Order} is an annotation that is used to configure the
- * {@linkplain #value order} in which the annotated element (i.e., field or
- * method) should be evaluated or executed relative to other elements of the
- * same category.
+ * {@linkplain #value order} in which the annotated element (i.e., field,
+ * method or class) should be evaluated or executed relative to other elements
+ * of the same category.
  *
  * <p>When used with
  * {@link org.junit.jupiter.api.extension.RegisterExtension @RegisterExtension},
@@ -36,11 +36,15 @@
  * <p>If {@code @Order} is not explicitly declared on an element, the
  * {@link #DEFAULT} order value will be assigned to the element.
  *
+ * <p>If {@code @Order} is used on classes, ordering is performed only if
+ * the matching {@link ClassOrderer.OrderAnnotation} is configured.
+ *
  * @since 5.4
  * @see MethodOrderer.OrderAnnotation
+ * @see ClassOrderer.OrderAnnotation
  * @see org.junit.jupiter.api.extension.RegisterExtension @RegisterExtension
  */
-@Target({ ElementType.FIELD, ElementType.METHOD })
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @API(status = EXPERIMENTAL, since = "5.4")
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 5d9f893a78c5..3cb58fc2f7e2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -463,6 +463,17 @@ public final class Constants {
 	@API(status = EXPERIMENTAL, since = "5.7")
 	public static final String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME;
 
+	/**
+	 * Property name used to set the class orderer class name: {@value}
+	 *
+	 * <h3>Supported Values</h3>
+	 *
+	 * <p>Supported values include fully qualified class names for types that
+	 * implement {@link org.junit.jupiter.api.ClassOrderer}.
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	public static final String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME;
+
 	private Constants() {
 		/* no-op */
 	}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index 2c99046d8f00..d49ae5ee386c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -18,6 +18,7 @@
 import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestInstance;
@@ -98,4 +99,11 @@ public Optional<MethodOrderer> getDefaultTestMethodOrderer() {
 		return (Optional<MethodOrderer>) cache.computeIfAbsent(DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME,
 			key -> delegate.getDefaultTestMethodOrderer());
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Optional<ClassOrderer> getTestClassOrderer() {
+		return (Optional<ClassOrderer>) cache.computeIfAbsent(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME,
+			key -> delegate.getTestClassOrderer());
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index ffb9bf03f822..fffeb14c168e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -17,6 +17,7 @@
 import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
@@ -46,6 +47,9 @@ public class DefaultJupiterConfiguration implements JupiterConfiguration {
 	private static final InstantiatingConfigurationParameterConverter<MethodOrderer> methodOrdererConverter = //
 		new InstantiatingConfigurationParameterConverter<>(MethodOrderer.class, "method orderer");
 
+	private static final InstantiatingConfigurationParameterConverter<ClassOrderer> classOrdererConverter = //
+		new InstantiatingConfigurationParameterConverter<>(ClassOrderer.class, "class orderer");
+
 	private final ConfigurationParameters configurationParameters;
 
 	public DefaultJupiterConfiguration(ConfigurationParameters configurationParameters) {
@@ -108,4 +112,8 @@ public Optional<MethodOrderer> getDefaultTestMethodOrderer() {
 		return methodOrdererConverter.get(configurationParameters, DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME);
 	}
 
+	@Override
+	public Optional<ClassOrderer> getTestClassOrderer() {
+		return classOrdererConverter.get(configurationParameters, DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME);
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index 63963b11dfd8..a4301d881e51 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -17,6 +17,7 @@
 import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestInstance;
@@ -39,6 +40,7 @@ public interface JupiterConfiguration {
 	String DEACTIVATE_ALL_CONDITIONS_PATTERN = ClassNamePatternFilterUtils.DEACTIVATE_ALL_PATTERN;
 	String DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME = "junit.jupiter.displayname.generator.default";
 	String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = "junit.jupiter.testmethod.order.default";
+	String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = "junit.jupiter.testclass.order.default";
 
 	String DEFAULT_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.default";
 	String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testable.method.default";
@@ -71,4 +73,6 @@ public interface JupiterConfiguration {
 	DisplayNameGenerator getDefaultDisplayNameGenerator();
 
 	Optional<MethodOrderer> getDefaultTestMethodOrderer();
+
+	Optional<ClassOrderer> getTestClassOrderer();
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java
new file mode 100644
index 000000000000..13917501dcf9
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.discovery;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.platform.commons.util.AnnotationUtils;
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.engine.TestDescriptor;
+
+abstract class AbstractAnnotatedElementDescriptor<E extends AnnotatedElement> {
+
+	private final TestDescriptor testDescriptor;
+	private final E annotatedElement;
+
+	AbstractAnnotatedElementDescriptor(TestDescriptor testDescriptor, E annotatedElement) {
+		this.testDescriptor = testDescriptor;
+		this.annotatedElement = annotatedElement;
+	}
+
+	protected E getAnnotatedElement() {
+		return annotatedElement;
+	}
+
+	TestDescriptor getTestDescriptor() {
+		return testDescriptor;
+	}
+
+	public final String getDisplayName() {
+		return this.testDescriptor.getDisplayName();
+	}
+
+	public boolean isAnnotated(Class<? extends Annotation> annotationType) {
+		Preconditions.notNull(annotationType, "annotationType must not be null");
+		return AnnotationUtils.isAnnotated(getAnnotatedElement(), annotationType);
+	}
+
+	public <A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType) {
+		Preconditions.notNull(annotationType, "annotationType must not be null");
+		return AnnotationUtils.findAnnotation(getAnnotatedElement(), annotationType);
+	}
+
+	public <A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType) {
+		Preconditions.notNull(annotationType, "annotationType must not be null");
+		return AnnotationUtils.findRepeatableAnnotations(getAnnotatedElement(), annotationType);
+	}
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
new file mode 100644
index 000000000000..4739399f63ae
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.discovery;
+
+import static java.util.stream.Collectors.toCollection;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+import org.junit.platform.commons.util.UnrecoverableExceptions;
+import org.junit.platform.engine.TestDescriptor;
+
+class AbstractOrderingVisitor {
+
+	private static final Logger logger = LoggerFactory.getLogger(AbstractOrderingVisitor.class);
+
+	@SuppressWarnings({ "unchecked" })
+	protected <T extends TestDescriptor> void doWithMatchingDescriptor(Class<T> descriptorSubType,
+			TestDescriptor testDescriptor, Consumer<T> action, Function<T, String> errorMessageBuilder) {
+		if (descriptorSubType.isAssignableFrom(testDescriptor.getClass())) {
+			T specificTestDescriptor = (T) testDescriptor;
+			try {
+				action.accept(specificTestDescriptor);
+			}
+			catch (Throwable t) {
+				UnrecoverableExceptions.rethrowIfUnrecoverable(t);
+				logger.error(t, () -> errorMessageBuilder.apply(specificTestDescriptor));
+			}
+		}
+	}
+
+	protected <T extends TestDescriptor, D extends AbstractAnnotatedElementDescriptor<?>> void orderChildrenTestDescriptors(
+			TestDescriptor parentTestDescriptor, Class<T> matchingChildrenType, Function<T, D> descriptorWrapperBuilder,
+			Consumer<List<D>> orderingAction, IntFunction<String> descriptorAdditionLogger,
+			IntFunction<String> descriptorDeletionLogger) {
+		Set<? extends TestDescriptor> children = parentTestDescriptor.getChildren();
+
+		List<TestDescriptor> nonMatchingTestDescriptors = children.stream()//
+				.filter(childTestDescriptor -> !(matchingChildrenType.isAssignableFrom(childTestDescriptor.getClass())))//
+				.collect(Collectors.toList());
+
+		List<D> matchingDescriptorWrappers = children.stream()//
+				.filter(matchingChildrenType::isInstance)//
+				.map(matchingChildrenType::cast)//
+				.map(descriptorWrapperBuilder)//
+				.collect(toCollection(ArrayList::new));
+
+		// Make a local copy for later validation
+		Set<D> originalDescriptors = new LinkedHashSet<>(matchingDescriptorWrappers);
+
+		orderingAction.accept(matchingDescriptorWrappers);
+
+		int difference = matchingDescriptorWrappers.size() - originalDescriptors.size();
+
+		if (difference > 0) {
+			logger.warn(() -> descriptorAdditionLogger.apply(difference));
+		}
+		else if (difference < 0) {
+			logger.warn(() -> descriptorDeletionLogger.apply(difference));
+		}
+
+		Set<TestDescriptor> sortedTestDescriptors = matchingDescriptorWrappers.stream()//
+				.filter(originalDescriptors::contains)//
+				.map(AbstractAnnotatedElementDescriptor::getTestDescriptor)//
+				.collect(toCollection(LinkedHashSet::new));
+
+		// Currently no way to removeAll or addAll children at once.
+		Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
+				.forEach(parentTestDescriptor::removeChild);
+		Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
+				.forEach(parentTestDescriptor::addChild);
+	}
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
new file mode 100644
index 000000000000..634a3a930dfd
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.discovery;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
+import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
+import org.junit.platform.engine.TestDescriptor;
+
+/**
+ * @since 5.8
+ */
+class ClassOrderingVisitor extends AbstractOrderingVisitor implements TestDescriptor.Visitor {
+
+	private final JupiterConfiguration configuration;
+
+	public ClassOrderingVisitor(JupiterConfiguration configuration) {
+		this.configuration = configuration;
+	}
+
+	@Override
+	public void visit(TestDescriptor testDescriptor) {
+		Optional<ClassOrderer> testClassOrderer = configuration.getTestClassOrderer();
+		if (!testClassOrderer.isPresent()) {
+			return;
+		}
+		doWithMatchingDescriptor(JupiterEngineDescriptor.class, testDescriptor,
+			descriptor -> orderContainedClasses(descriptor, testClassOrderer.get()),
+			descriptor -> "Failed to order classes");
+	}
+
+	private void orderContainedClasses(JupiterEngineDescriptor jupiterEngineDescriptor, ClassOrderer classOrderer) {
+		orderChildrenTestDescriptors(jupiterEngineDescriptor, ClassBasedTestDescriptor.class,
+			DefaultClassDescriptor::new,
+			descriptorWrappers -> classOrderer.orderClasses(
+				new DefaultClassOrdererContext(descriptorWrappers, this.configuration)),
+			difference -> String.format("ClassOrderer [%s] added %s ClassDescriptor(s) which will be ignored.",
+				classOrderer.getClass().getName(), difference),
+			difference -> String.format(
+				"ClassOrderer [%s] removed %s ClassDescriptor(s) which will be retained with arbitrary ordering.",
+				classOrderer.getClass().getName(), -difference));
+	}
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
new file mode 100644
index 000000000000..30ad21c4634d
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.discovery;
+
+import org.junit.jupiter.api.ClassDescriptor;
+import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
+import org.junit.platform.commons.util.ToStringBuilder;
+
+/**
+ * Default implementation of {@link ClassDescriptor}, backed by
+ * a {@link ClassBasedTestDescriptor}.
+ *
+ * @since 5.8
+ */
+class DefaultClassDescriptor extends AbstractAnnotatedElementDescriptor<Class<?>> implements ClassDescriptor {
+
+	DefaultClassDescriptor(ClassBasedTestDescriptor testDescriptor) {
+		super(testDescriptor, testDescriptor.getTestClass());
+	}
+
+	@Override
+	public final Class<?> getTestClass() {
+		return getAnnotatedElement();
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("class", getTestClass().toGenericString()).toString();
+	}
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
new file mode 100644
index 000000000000..94fb4f7c9c90
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.discovery;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.jupiter.api.ClassDescriptor;
+import org.junit.jupiter.api.ClassOrdererContext;
+import org.junit.jupiter.engine.config.JupiterConfiguration;
+
+/**
+ * Default implementation of {@link ClassOrdererContext}.
+ *
+ * @since 5.8
+ */
+class DefaultClassOrdererContext implements ClassOrdererContext {
+
+	private final List<? extends ClassDescriptor> classDescriptors;
+	private final JupiterConfiguration configuration;
+
+	DefaultClassOrdererContext(List<? extends ClassDescriptor> classDescriptors, JupiterConfiguration configuration) {
+		this.classDescriptors = classDescriptors;
+		this.configuration = configuration;
+	}
+
+	@Override
+	public List<? extends ClassDescriptor> getClassDescriptors() {
+		return classDescriptors;
+	}
+
+	@Override
+	public Optional<String> getConfigurationParameter(String key) {
+		return this.configuration.getRawConfigurationParameter(key);
+	}
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
index d46e0467487e..26fa7ee2fc54 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
@@ -10,15 +10,10 @@
 
 package org.junit.jupiter.engine.discovery;
 
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Optional;
 
 import org.junit.jupiter.api.MethodDescriptor;
 import org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor;
-import org.junit.platform.commons.util.AnnotationUtils;
-import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ToStringBuilder;
 
 /**
@@ -27,49 +22,19 @@
  *
  * @since 5.4
  */
-class DefaultMethodDescriptor implements MethodDescriptor {
-
-	private final MethodBasedTestDescriptor testDescriptor;
+class DefaultMethodDescriptor extends AbstractAnnotatedElementDescriptor<Method> implements MethodDescriptor {
 
 	DefaultMethodDescriptor(MethodBasedTestDescriptor testDescriptor) {
-		this.testDescriptor = testDescriptor;
-	}
-
-	MethodBasedTestDescriptor getTestDescriptor() {
-		return testDescriptor;
+		super(testDescriptor, testDescriptor.getTestMethod());
 	}
 
 	@Override
 	public final Method getMethod() {
-		return this.testDescriptor.getTestMethod();
-	}
-
-	@Override
-	public final String getDisplayName() {
-		return this.testDescriptor.getDisplayName();
-	}
-
-	@Override
-	public boolean isAnnotated(Class<? extends Annotation> annotationType) {
-		Preconditions.notNull(annotationType, "annotationType must not be null");
-		return AnnotationUtils.isAnnotated(getMethod(), annotationType);
-	}
-
-	@Override
-	public <A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType) {
-		Preconditions.notNull(annotationType, "annotationType must not be null");
-		return AnnotationUtils.findAnnotation(getMethod(), annotationType);
-	}
-
-	@Override
-	public <A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType) {
-		Preconditions.notNull(annotationType, "annotationType must not be null");
-		return AnnotationUtils.findRepeatableAnnotations(getMethod(), annotationType);
+		return getAnnotatedElement();
 	}
 
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this).append("method", getMethod().toGenericString()).toString();
 	}
-
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
index 2061f58fe15e..541be65df359 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
@@ -36,6 +36,7 @@ public class DiscoverySelectorResolver {
 			.addClassContainerSelectorResolver(new IsTestClassWithTests())
 			.addSelectorResolver(context -> new ClassSelectorResolver(context.getClassNameFilter(), context.getEngineDescriptor().getConfiguration()))
 			.addSelectorResolver(context -> new MethodSelectorResolver(context.getEngineDescriptor().getConfiguration()))
+			.addTestDescriptorVisitor(context -> new ClassOrderingVisitor(context.getEngineDescriptor().getConfiguration()))
 			.addTestDescriptorVisitor(context -> new MethodOrderingVisitor(context.getEngineDescriptor().getConfiguration()))
 			.addTestDescriptorVisitor(context -> TestDescriptor::prune)
 			.build();
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
index 3f9b0c39ebeb..056114630ef2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
@@ -10,16 +10,9 @@
 
 package org.junit.jupiter.engine.discovery;
 
-import static java.util.stream.Collectors.toCollection;
 import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
 
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -27,18 +20,13 @@
 import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
 import org.junit.jupiter.engine.descriptor.JupiterTestDescriptor;
 import org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor;
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ReflectionUtils;
-import org.junit.platform.commons.util.UnrecoverableExceptions;
 import org.junit.platform.engine.TestDescriptor;
 
 /**
  * @since 5.5
  */
-class MethodOrderingVisitor implements TestDescriptor.Visitor {
-
-	private static final Logger logger = LoggerFactory.getLogger(MethodOrderingVisitor.class);
+class MethodOrderingVisitor extends AbstractOrderingVisitor implements TestDescriptor.Visitor {
 
 	private final JupiterConfiguration configuration;
 
@@ -48,16 +36,9 @@ class MethodOrderingVisitor implements TestDescriptor.Visitor {
 
 	@Override
 	public void visit(TestDescriptor testDescriptor) {
-		if (testDescriptor instanceof ClassBasedTestDescriptor) {
-			ClassBasedTestDescriptor classBasedTestDescriptor = (ClassBasedTestDescriptor) testDescriptor;
-			try {
-				orderContainedMethods(classBasedTestDescriptor, classBasedTestDescriptor.getTestClass());
-			}
-			catch (Throwable t) {
-				UnrecoverableExceptions.rethrowIfUnrecoverable(t);
-				logger.error(t, () -> "Failed to order methods for " + classBasedTestDescriptor.getTestClass());
-			}
-		}
+		doWithMatchingDescriptor(ClassBasedTestDescriptor.class, testDescriptor,
+			descriptor -> orderContainedMethods(descriptor, descriptor.getTestClass()),
+			descriptor -> "Failed to order methods for " + descriptor.getTestClass());
 	}
 
 	/**
@@ -70,48 +51,16 @@ private void orderContainedMethods(ClassBasedTestDescriptor classBasedTestDescri
 				.map(Optional::of)//
 				.orElseGet(configuration::getDefaultTestMethodOrderer)//
 				.ifPresent(methodOrderer -> {
-
-					Set<? extends TestDescriptor> children = classBasedTestDescriptor.getChildren();
-
-					List<TestDescriptor> nonMethodTestDescriptors = children.stream()//
-							.filter(testDescriptor -> !(testDescriptor instanceof MethodBasedTestDescriptor))//
-							.collect(Collectors.toList());
-
-					List<DefaultMethodDescriptor> methodDescriptors = children.stream()//
-							.filter(MethodBasedTestDescriptor.class::isInstance)//
-							.map(MethodBasedTestDescriptor.class::cast)//
-							.map(DefaultMethodDescriptor::new)//
-							.collect(toCollection(ArrayList::new));
-
-					// Make a local copy for later validation
-					Set<DefaultMethodDescriptor> originalMethodDescriptors = new LinkedHashSet<>(methodDescriptors);
-
-					methodOrderer.orderMethods(
-						new DefaultMethodOrdererContext(methodDescriptors, testClass, this.configuration));
-
-					int difference = methodDescriptors.size() - originalMethodDescriptors.size();
-
-					if (difference > 0) {
-						logger.warn(() -> String.format(
+					orderChildrenTestDescriptors(classBasedTestDescriptor, MethodBasedTestDescriptor.class,
+						DefaultMethodDescriptor::new,
+						descriptorWrappers -> methodOrderer.orderMethods(
+							new DefaultMethodOrdererContext(descriptorWrappers, testClass, this.configuration)),
+						difference -> String.format(
 							"MethodOrderer [%s] added %s MethodDescriptor(s) for test class [%s] which will be ignored.",
-							methodOrderer.getClass().getName(), difference, testClass.getName()));
-					}
-					else if (difference < 0) {
-						logger.warn(() -> String.format(
+							methodOrderer.getClass().getName(), difference, testClass.getName()),
+						difference -> String.format(
 							"MethodOrderer [%s] removed %s MethodDescriptor(s) for test class [%s] which will be retained with arbitrary ordering.",
 							methodOrderer.getClass().getName(), -difference, testClass.getName()));
-					}
-
-					Set<TestDescriptor> sortedMethodTestDescriptors = methodDescriptors.stream()//
-							.filter(originalMethodDescriptors::contains)//
-							.map(DefaultMethodDescriptor::getTestDescriptor)//
-							.collect(toCollection(LinkedHashSet::new));
-
-					// Currently no way to removeAll or addAll children at once.
-					Stream.concat(sortedMethodTestDescriptors.stream(), nonMethodTestDescriptors.stream())//
-							.forEach(classBasedTestDescriptor::removeChild);
-					Stream.concat(sortedMethodTestDescriptors.stream(), nonMethodTestDescriptors.stream())//
-							.forEach(classBasedTestDescriptor::addChild);
 
 					// Note: MethodOrderer#getDefaultExecutionMode() is guaranteed
 					// to be invoked after MethodOrderer#orderMethods().
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
new file mode 100644
index 000000000000..30f031f91840
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.platform.testkit.engine.EngineTestKit;
+import org.junit.platform.testkit.engine.Events;
+
+class OrderedClassTests {
+
+	private static final Set<String> callSequence = Collections.synchronizedSet(new LinkedHashSet<>());
+
+	@BeforeEach
+	void clearCallSequence() {
+		callSequence.clear();
+	}
+
+	@Test
+	void className() {
+		var tests = executeTests(ClassOrderer.ClassName.class);
+
+		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+
+		assertThat(callSequence)//
+				.containsExactly("A_TestCase", "B_TestCase", "C_TestCase");
+	}
+
+	@Test
+	void displayName() {
+		var tests = executeTests(ClassOrderer.DisplayName.class);
+
+		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+
+		assertThat(callSequence)//
+				.containsExactly("C_TestCase", "B_TestCase", "A_TestCase");
+	}
+
+	@Test
+	void orderAnnotation() {
+		var tests = executeTests(ClassOrderer.OrderAnnotation.class);
+
+		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+
+		assertThat(callSequence)//
+				.containsExactly("A_TestCase", "C_TestCase", "B_TestCase");
+	}
+
+	@Test
+	void random() {
+		var tests = executeTests(ClassOrderer.Random.class);
+
+		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+	}
+
+	private Events executeTests(Class<? extends ClassOrderer> classOrderer) {
+		// @formatter:off
+        return EngineTestKit
+                .engine("junit-jupiter")
+                .configurationParameter(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, classOrderer.getName())
+                .selectors(selectClass(A_TestCase.class), selectClass(B_TestCase.class), selectClass(C_TestCase.class))
+                .execute()
+                .testEvents();
+        // @formatter:on
+	}
+
+	abstract static class BaseTestCase {
+
+		@BeforeEach
+		void trackInvocations(TestInfo testInfo) {
+			var testClass = testInfo.getTestClass().get();
+
+			callSequence.add(testClass.getSimpleName());
+		}
+
+		@Test
+		void a() {
+		}
+	}
+
+	@Order(2)
+	@DisplayName("Z")
+	static class A_TestCase extends BaseTestCase {
+	}
+
+	static class B_TestCase extends BaseTestCase {
+	}
+
+	@Order(10)
+	@DisplayName("A")
+	static class C_TestCase extends BaseTestCase {
+	}
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
new file mode 100644
index 000000000000..a3d9fb938cba
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME;
+import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.platform.testkit.engine.EngineTestKit;
+import org.junit.platform.testkit.engine.Events;
+
+class RandomlyOrderedTests {
+
+	private static final Set<String> callSequence = Collections.synchronizedSet(new LinkedHashSet<>());
+
+	@Test
+	void randomSeedForClassAndMethodOrderingIsDeterministic() {
+		IntStream.range(0, 20).forEach(i -> {
+			callSequence.clear();
+			var tests = executeTests(1618034L);
+
+			tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+			assertThat(callSequence).containsExactlyInAnyOrder("B_TestCase#b", "B_TestCase#c", "B_TestCase#a",
+				"C_TestCase#b", "C_TestCase#c", "C_TestCase#a", "A_TestCase#b", "A_TestCase#c", "A_TestCase#a");
+		});
+	}
+
+	private Events executeTests(long randomSeed) {
+		// @formatter:off
+		return EngineTestKit
+				.engine("junit-jupiter")
+				.configurationParameter(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, ClassOrderer.Random.class.getName())
+				.configurationParameter(DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME, MethodOrderer.Random.class.getName())
+				.configurationParameter(MethodOrderer.Random.RANDOM_SEED_PROPERTY_NAME, String.valueOf(randomSeed))
+				.selectors(selectClass(A_TestCase.class), selectClass(B_TestCase.class), selectClass(C_TestCase.class))
+				.execute()
+				.testEvents();
+		// @formatter:on
+	}
+
+	abstract static class BaseTestCase {
+
+		@BeforeEach
+		void trackInvocations(TestInfo testInfo) {
+			var testClass = testInfo.getTestClass().get();
+			var testMethod = testInfo.getTestMethod().get();
+
+			callSequence.add(testClass.getSimpleName() + "#" + testMethod.getName());
+		}
+
+		@Test
+		void a() {
+		}
+
+		@Test
+		void b() {
+		}
+
+		@Test
+		void c() {
+		}
+	}
+
+	static class A_TestCase extends BaseTestCase {
+	}
+
+	static class B_TestCase extends BaseTestCase {
+	}
+
+	static class C_TestCase extends BaseTestCase {
+	}
+}

From 49565e9cb35c722871c17d0549f505ea70cc2e3d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 28 Jan 2021 18:10:20 +0100
Subject: [PATCH 0183/1433] Polish contribution

See #2488
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  4 +-
 .../asciidoc/user-guide/writing-tests.adoc    | 43 +++++++++--------
 .../junit/jupiter/api/ClassDescriptor.java    |  3 +-
 .../org/junit/jupiter/api/ClassOrderer.java   | 48 +++++++++----------
 .../jupiter/api/ClassOrdererContext.java      |  1 +
 .../org/junit/jupiter/api/MethodOrderer.java  | 26 +++++-----
 .../java/org/junit/jupiter/api/Order.java     | 15 +++---
 .../org/junit/jupiter/engine/Constants.java   |  2 +-
 .../config/CachingJupiterConfiguration.java   |  5 +-
 .../config/DefaultJupiterConfiguration.java   |  3 +-
 .../engine/config/JupiterConfiguration.java   |  3 +-
 .../AbstractAnnotatedElementDescriptor.java   | 14 ++++--
 .../discovery/AbstractOrderingVisitor.java    | 11 +++--
 .../discovery/ClassOrderingVisitor.java       | 15 +++---
 .../discovery/DefaultClassDescriptor.java     |  1 +
 .../discovery/DefaultClassOrdererContext.java |  3 +-
 .../discovery/DefaultMethodDescriptor.java    |  1 +
 .../src/test/java/example/B_TestCase.java     | 37 ++++++++++++++
 .../engine/extension/OrderedClassTests.java   | 44 +++++++++++++----
 .../extension/RandomlyOrderedTests.java       |  4 ++
 20 files changed, 180 insertions(+), 103 deletions(-)
 create mode 100644 junit-jupiter-engine/src/test/java/example/B_TestCase.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index bc2bd62343ab..db3eda92ff5e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -76,8 +76,8 @@ on GitHub.
 * New `ignoreLeadingAndTrailingWhitespace` attribute to control whether or not to trim
   whitespaces in `@CsvSource` and `@CsvFileSource` (set to `true` by default).
 * Top-level test classes can now be ordered by passing the fully-qualified name of a
-  class implementing `ClassOrderer` as value of the new
-  `junit.jupiter.testclass.order.default` configuration property.
+  class implementing `ClassOrderer` as the value of the new
+  `junit.jupiter.testclass.order.default` configuration parameter.
 
 
 [[release-notes-5.8.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 8759e0e4bdc9..a8fd911b1503 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -512,9 +512,9 @@ custom annotations for tags.
 === Test Execution Order
 
 By default, test classes and methods will be ordered using an algorithm that is
-deterministic but intentionally nonobvious. This ensures that subsequent runs of several
-test suites execute test methods in the same order, thereby allowing for repeatable
-builds.
+deterministic but intentionally nonobvious. This ensures that subsequent runs of a test
+suite execute test classes and test methods in the same order, thereby allowing for
+repeatable builds.
 
 NOTE: See <<writing-tests-classes-and-methods>> for a definition of _test method_ and
 _test class_.
@@ -535,14 +535,14 @@ following built-in `MethodOrderer` implementations.
 * `{DisplayName}`: sorts test methods _alphanumerically_ based on their display names (see
   <<writing-tests-display-name-generator-precedence-rules, display name generation
   precedence rules>>)
-* `{MethodName}`: sorts test methods _alphanumerically_ based on their method name and formal
-  parameter lists.
+* `{MethodName}`: sorts test methods _alphanumerically_ based on their names and formal
+  parameter lists
 * `{OrderAnnotation}`: sorts test methods _numerically_ based on values specified via the
-  `{Order}` annotation.
+  `{Order}` annotation
 * `{Random}`: orders test methods _pseudo-randomly_ and supports configuration of a custom
-  _seed_.
+  _seed_
 * `{Alphanumeric}`: sorts test methods _alphanumerically_ based on their names and formal
-  parameter lists. **Deprecated in favor of `{MethodName}`. Will be removed in 6.0**
+  parameter lists; **Deprecated in favor of `{MethodName}`, to be removed in 6.0**
 
 NOTE: See also: <<extensions-execution-order-wrapping-behavior>>
 
@@ -581,30 +581,33 @@ Similarly, you can specify the fully qualified name of any custom class that imp
 
 For build optimization purposes, it can be helpful to run _test classes_ in a specific
 order.
+
 For example:
+
 * previously failed tests and faster tests first: fail fast
 * with parallelism enabled, longer tests first: shortest test execution duration
 * etc.
 
-You can use the `junit.jupiter.testclass.order.default`
-<<running-tests-config-params, configuration parameter>> to specify the fully qualified
-class name of the `{ClassOrderer}` you would like to use. The supplied class has to
-implement the `ClassOrderer` interface.
+You can use the `junit.jupiter.testclass.order.default` <<running-tests-config-params,
+configuration parameter>> to specify the fully qualified class name of the
+`{ClassOrderer}` you would like to use. The supplied class must implement the
+`ClassOrderer` interface.
 
-You can implement your own custom `ClassOrderer` or use one of the
-following built-in `ClassOrderer` implementations.
+You can implement your own custom `ClassOrderer` or use one of the following built-in
+`ClassOrderer` implementations.
 
 * `{DisplayName}`: sorts test classes _alphanumerically_ based on their display names
   (see <<writing-tests-display-name-generator-precedence-rules, display name generation
-  precedence rules>>).
-* `{ClassName}`: sorts test classes _alphanumerically_ based on their class name.
+  precedence rules>>)
+* `{ClassName}`: sorts test classes _alphanumerically_ based on their fully qualified
+  class names
 * `{OrderAnnotation}`: sorts test classes _numerically_ based on values specified via the
-  `{Order}` annotation.
+  `{Order}` annotation
 * `{Random}`: orders test classes _pseudo-randomly_ and supports configuration of a
-  custom _seed_.
+  custom _seed_
 
-For example for the `@Order` annotation to be honored on _test classes_, you should set
-the `{OrderAnnotation}` class orderer, using the configuration parameter with the
+For example, for the `@Order` annotation to be honored on _test classes_, you should
+configure the `{OrderAnnotation}` class orderer using the configuration parameter with the
 corresponding fully qualified class name (e.g., in
 `src/test/resources/junit-platform.properties`):
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
index 5eac4e76e402..db6dafcc42c3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
@@ -35,7 +35,7 @@ public interface ClassDescriptor {
 	Class<?> getTestClass();
 
 	/**
-	 * Get the display name for this descriptor's {@link #getClass()} () class}.
+	 * Get the display name for this descriptor's {@link #getClass() class}.
 	 *
 	 * @return the display name for this descriptor's class; never {@code null}
 	 * or blank
@@ -83,4 +83,5 @@ public interface ClassDescriptor {
 	 * @see java.lang.annotation.Repeatable
 	 */
 	<A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType);
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 33453d5de1e2..0f2f029aa0ae 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -22,12 +22,13 @@
 import org.junit.platform.commons.logging.LoggerFactory;
 
 /**
- * {@code ClassOrderer} defines the API for ordering the <em>top-level test classes</em>,
- * without considering nested test classes.
+ * {@code ClassOrderer} defines the API for ordering the <em>top-level test
+ * classes</em>, without considering nested test classes.
  *
- * <p>In this context, the term "test class" refers to any class containing methods annotated with
- * {@code @Test}, {@code @RepeatedTest}, {@code @ParameterizedTest},
- * {@code @TestFactory}, or {@code @TestTemplate} and not being annotated with {@code @Nested}.
+ * <p>In this context, the term "test class" refers to any class containing methods
+ * annotated with {@code @Test}, {@code @RepeatedTest}, {@code @ParameterizedTest},
+ * {@code @TestFactory}, or {@code @TestTemplate}. {@link Nested @Nested} test
+ * classes cannot be ordered by a {@code ClassOrderer}.
  *
  * <h4>Built-in Implementations</h4>
  *
@@ -41,9 +42,9 @@
  * <li>{@link ClassOrderer.Random}</li>
  * </ul>
  *
+ * @since 5.8
  * @see ClassOrdererContext
  * @see #orderClasses(ClassOrdererContext)
- * @since 5.8
  */
 @API(status = EXPERIMENTAL, since = "5.8")
 public interface ClassOrderer {
@@ -52,7 +53,7 @@ public interface ClassOrderer {
 	 * Order the classes encapsulated in the supplied {@link ClassOrdererContext}.
 	 *
 	 * <p>The classes to order or sort are made indirectly available via
-	 * {@link ClassOrdererContext#getClassDescriptors()} ()}. Since this method
+	 * {@link ClassOrdererContext#getClassDescriptors()}. Since this method
 	 * has a {@code void} return type, the list of class descriptors must be
 	 * modified directly.
 	 *
@@ -66,39 +67,34 @@ public interface ClassOrderer {
 	 * </pre>
 	 *
 	 * @param context the {@code ClassOrdererContext} containing the
-	 *                {@link ClassDescriptor class descriptors} to order; never {@code null}
+	 * {@linkplain ClassDescriptor class descriptors} to order; never {@code null}
 	 */
 	void orderClasses(ClassOrdererContext context);
 
 	/**
 	 * {@code ClassOrderer} that sorts classes alphanumerically based on their
-	 * qualified names using {@link String#compareTo(String)}.
-	 *
-	 * @since 5.8
+	 * fully qualified names using {@link String#compareTo(String)}.
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
 	class ClassName implements ClassOrderer {
 
 		/**
 		 * Sort the classes encapsulated in the supplied
-		 * {@link ClassOrdererContext} alphanumerically based on their qualified names.
+		 * {@link ClassOrdererContext} alphanumerically based on their fully
+		 * qualified names.
 		 */
 		@Override
 		public void orderClasses(ClassOrdererContext context) {
 			context.getClassDescriptors().sort(comparator);
 		}
 
-		private static final Comparator<ClassDescriptor> comparator = Comparator. //
-				comparing(descriptor -> descriptor.getTestClass().getName());
+		private static final Comparator<ClassDescriptor> comparator = Comparator.comparing(
+			descriptor -> descriptor.getTestClass().getName());
 	}
 
 	/**
 	 * {@code ClassOrderer} that sorts classes alphanumerically based on their
 	 * display names using {@link String#compareTo(String)}
-	 *
-	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
 	class DisplayName implements ClassOrderer {
 
 		/**
@@ -123,12 +119,11 @@ public void orderClasses(ClassOrdererContext context) {
 	 * arbitrarily adjacent to each other.
 	 *
 	 * <p>Any classes not annotated with {@code @Order} will be assigned the
-	 * {@link org.junit.jupiter.api.Order#DEFAULT default order} value which will
-	 * effectively cause them to appear at the end of the sorted list, unless
-	 * certain classes are assigned an explicit order value greater than the default
-	 * order value. Any classes assigned an explicit order value greater than the
-	 * default order value will appear after non-annotated classes in the sorted
-	 * list.
+	 * {@link Order#DEFAULT default order} value which will effectively cause them
+	 * to appear at the end of the sorted list, unless certain classes are assigned
+	 * an explicit order value greater than the default order value. Any classes
+	 * assigned an explicit order value greater than the default order value will
+	 * appear after non-annotated classes in the sorted list.
 	 */
 	class OrderAnnotation implements ClassOrderer {
 
@@ -186,8 +181,8 @@ class Random implements ClassOrderer {
 		 * Property name used to set the random seed used by this
 		 * {@code ClassOrderer}: {@value}
 		 *
-		 * The same property is used by {@link MethodOrderer.Random} for consistency
-		 * between the two random orderers.
+		 * <p>The same property is used by {@link MethodOrderer.Random} for
+		 * consistency between the two random orderers.
 		 *
 		 * <h3>Supported Values</h3>
 		 *
@@ -232,4 +227,5 @@ private Optional<Long> getCustomSeed(ClassOrdererContext context) {
 			});
 		}
 	}
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
index 3857ef73097c..8942a327e206 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
@@ -52,4 +52,5 @@ public interface ClassOrdererContext {
 	 * @see org.junit.platform.engine.ConfigurationParameters
 	 */
 	Optional<String> getConfigurationParameter(String key);
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 7cc5b22ec854..35876db10e3d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -71,7 +71,7 @@ public interface MethodOrderer {
 	 * </pre>
 	 *
 	 * @param context the {@code MethodOrdererContext} containing the
-	 * {@link MethodDescriptor method descriptors} to order; never {@code null}
+	 * {@linkplain MethodDescriptor method descriptors} to order; never {@code null}
 	 * @see #getDefaultExecutionMode()
 	 */
 	void orderMethods(MethodOrdererContext context);
@@ -112,12 +112,11 @@ default Optional<ExecutionMode> getDefaultExecutionMode() {
 	 *
 	 * <p>If two methods have the same name, {@code String} representations of
 	 * their formal parameter lists will be used as a fallback for comparing the
-	 * methods.</p>
-	 * <p> <b>This class has been deprecated in favor of
-	 * {@link MethodOrderer.MethodName} and will be removed in 6.0</b></p>
+	 * methods.
 	 *
 	 * @since 5.4
-	 * @deprecated Please use {@link MethodOrderer.MethodName} instead.
+	 * @deprecated as of JUnit Jupiter 5.7 in favor of {@link MethodOrderer.MethodName};
+	 * to be removed in 6.0
 	 */
 	@API(status = DEPRECATED, since = "5.7")
 	@Deprecated
@@ -126,6 +125,7 @@ class Alphanumeric extends MethodName {
 		public Alphanumeric() {
 		}
 	}
+
 	/**
 	 * {@code MethodOrderer} that sorts methods alphanumerically based on their
 	 * names using {@link String#compareTo(String)}.
@@ -133,6 +133,7 @@ public Alphanumeric() {
 	 * <p>If two methods have the same name, {@code String} representations of
 	 * their formal parameter lists will be used as a fallback for comparing the
 	 * methods.
+	 *
 	 * @since 5.7
 	 */
 	@API(status = EXPERIMENTAL, since = "5.7")
@@ -194,12 +195,11 @@ public void orderMethods(MethodOrdererContext context) {
 	 * arbitrarily adjacent to each other.
 	 *
 	 * <p>Any methods not annotated with {@code @Order} will be assigned the
-	 * {@link org.junit.jupiter.api.Order#DEFAULT default order} value which will
-	 * effectively cause them to appear at the end of the sorted list, unless
-	 * certain methods are assigned an explicit order value greater than the default
-	 * order value. Any methods assigned an explicit order value greater than the
-	 * default order value will appear after non-annotated methods in the sorted
-	 * list.
+	 * {@link Order#DEFAULT default order} value which will effectively cause them
+	 * to appear at the end of the sorted list, unless certain methods are assigned
+	 * an explicit order value greater than the default order value. Any methods
+	 * assigned an explicit order value greater than the default order value will
+	 * appear after non-annotated methods in the sorted list.
 	 */
 	class OrderAnnotation implements MethodOrderer {
 
@@ -260,8 +260,8 @@ class Random implements MethodOrderer {
 		 * Property name used to set the random seed used by this
 		 * {@code MethodOrderer}: {@value}
 		 *
-		 * The same property is used by {@link ClassOrderer.Random} for consistency
-		 * between the two random orderers.
+		 * <p>The same property is used by {@link ClassOrderer.Random} for
+		 * consistency between the two random orderers.
 		 *
 		 * <h3>Supported Values</h3>
 		 *
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
index ee3c94f6873a..6971f5a39d8c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
@@ -19,26 +19,23 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 
 /**
  * {@code @Order} is an annotation that is used to configure the
  * {@linkplain #value order} in which the annotated element (i.e., field,
- * method or class) should be evaluated or executed relative to other elements
+ * method, or class) should be evaluated or executed relative to other elements
  * of the same category.
  *
  * <p>When used with
  * {@link org.junit.jupiter.api.extension.RegisterExtension @RegisterExtension},
- * the category applies to <em>extension fields</em>. When used with the
- * {@link OrderAnnotation} {@link MethodOrderer}, the category applies to
- * <em>test methods</em>.
+ * the category applies to <em>extension fields</em>. When used with
+ * {@link MethodOrderer.OrderAnnotation}, the category applies to <em>test methods</em>.
+ * When used with {@link ClassOrderer.OrderAnnotation}, the category applies to
+ * top-level <em>test classes</em>.
  *
  * <p>If {@code @Order} is not explicitly declared on an element, the
  * {@link #DEFAULT} order value will be assigned to the element.
  *
- * <p>If {@code @Order} is used on classes, ordering is performed only if
- * the matching {@link ClassOrderer.OrderAnnotation} is configured.
- *
  * @since 5.4
  * @see MethodOrderer.OrderAnnotation
  * @see ClassOrderer.OrderAnnotation
@@ -61,7 +58,7 @@
 	int DEFAULT = Integer.MAX_VALUE / 2;
 
 	/**
-	 * The order value for the annotated element (i.e., field or method).
+	 * The order value for the annotated element (i.e., field, method, or class).
 	 *
 	 * <p>Elements are ordered based on priority where a lower value has greater
 	 * priority than a higher value. For example, {@link Integer#MAX_VALUE} has
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 3cb58fc2f7e2..9c2c92bd1b78 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -464,7 +464,7 @@ public final class Constants {
 	public static final String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME;
 
 	/**
-	 * Property name used to set the class orderer class name: {@value}
+	 * Property name used to set the default class orderer class name: {@value}
 	 *
 	 * <h3>Supported Values</h3>
 	 *
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index d49ae5ee386c..c77626266284 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -102,8 +102,9 @@ public Optional<MethodOrderer> getDefaultTestMethodOrderer() {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Optional<ClassOrderer> getTestClassOrderer() {
+	public Optional<ClassOrderer> getDefaultTestClassOrderer() {
 		return (Optional<ClassOrderer>) cache.computeIfAbsent(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME,
-			key -> delegate.getTestClassOrderer());
+			key -> delegate.getDefaultTestClassOrderer());
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index fffeb14c168e..f8823892a5d7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -113,7 +113,8 @@ public Optional<MethodOrderer> getDefaultTestMethodOrderer() {
 	}
 
 	@Override
-	public Optional<ClassOrderer> getTestClassOrderer() {
+	public Optional<ClassOrderer> getDefaultTestClassOrderer() {
 		return classOrdererConverter.get(configurationParameters, DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME);
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index a4301d881e51..2259d96739b1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -74,5 +74,6 @@ public interface JupiterConfiguration {
 
 	Optional<MethodOrderer> getDefaultTestMethodOrderer();
 
-	Optional<ClassOrderer> getTestClassOrderer();
+	Optional<ClassOrderer> getDefaultTestClassOrderer();
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java
index 13917501dcf9..3ec0e6a7c57a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java
@@ -19,6 +19,9 @@
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.TestDescriptor;
 
+/**
+ * @since 5.8
+ */
 abstract class AbstractAnnotatedElementDescriptor<E extends AnnotatedElement> {
 
 	private final TestDescriptor testDescriptor;
@@ -30,29 +33,30 @@ abstract class AbstractAnnotatedElementDescriptor<E extends AnnotatedElement> {
 	}
 
 	protected E getAnnotatedElement() {
-		return annotatedElement;
+		return this.annotatedElement;
 	}
 
 	TestDescriptor getTestDescriptor() {
-		return testDescriptor;
+		return this.testDescriptor;
 	}
 
 	public final String getDisplayName() {
 		return this.testDescriptor.getDisplayName();
 	}
 
-	public boolean isAnnotated(Class<? extends Annotation> annotationType) {
+	public final boolean isAnnotated(Class<? extends Annotation> annotationType) {
 		Preconditions.notNull(annotationType, "annotationType must not be null");
 		return AnnotationUtils.isAnnotated(getAnnotatedElement(), annotationType);
 	}
 
-	public <A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType) {
+	public final <A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType) {
 		Preconditions.notNull(annotationType, "annotationType must not be null");
 		return AnnotationUtils.findAnnotation(getAnnotatedElement(), annotationType);
 	}
 
-	public <A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType) {
+	public final <A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType) {
 		Preconditions.notNull(annotationType, "annotationType must not be null");
 		return AnnotationUtils.findRepeatableAnnotations(getAnnotatedElement(), annotationType);
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
index 4739399f63ae..02e553450ab6 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
@@ -34,6 +34,7 @@ class AbstractOrderingVisitor {
 	@SuppressWarnings({ "unchecked" })
 	protected <T extends TestDescriptor> void doWithMatchingDescriptor(Class<T> descriptorSubType,
 			TestDescriptor testDescriptor, Consumer<T> action, Function<T, String> errorMessageBuilder) {
+
 		if (descriptorSubType.isAssignableFrom(testDescriptor.getClass())) {
 			T specificTestDescriptor = (T) testDescriptor;
 			try {
@@ -48,8 +49,9 @@ protected <T extends TestDescriptor> void doWithMatchingDescriptor(Class<T> desc
 
 	protected <T extends TestDescriptor, D extends AbstractAnnotatedElementDescriptor<?>> void orderChildrenTestDescriptors(
 			TestDescriptor parentTestDescriptor, Class<T> matchingChildrenType, Function<T, D> descriptorWrapperBuilder,
-			Consumer<List<D>> orderingAction, IntFunction<String> descriptorAdditionLogger,
-			IntFunction<String> descriptorDeletionLogger) {
+			Consumer<List<D>> orderingAction, IntFunction<String> descriptorsAddedLogger,
+			IntFunction<String> descriptorsRemovedLogger) {
+
 		Set<? extends TestDescriptor> children = parentTestDescriptor.getChildren();
 
 		List<TestDescriptor> nonMatchingTestDescriptors = children.stream()//
@@ -70,10 +72,10 @@ protected <T extends TestDescriptor, D extends AbstractAnnotatedElementDescripto
 		int difference = matchingDescriptorWrappers.size() - originalDescriptors.size();
 
 		if (difference > 0) {
-			logger.warn(() -> descriptorAdditionLogger.apply(difference));
+			logger.warn(() -> descriptorsAddedLogger.apply(difference));
 		}
 		else if (difference < 0) {
-			logger.warn(() -> descriptorDeletionLogger.apply(difference));
+			logger.warn(() -> descriptorsRemovedLogger.apply(difference));
 		}
 
 		Set<TestDescriptor> sortedTestDescriptors = matchingDescriptorWrappers.stream()//
@@ -87,4 +89,5 @@ else if (difference < 0) {
 		Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
 				.forEach(parentTestDescriptor::addChild);
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
index 634a3a930dfd..8114ea544ad6 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
@@ -10,8 +10,6 @@
 
 package org.junit.jupiter.engine.discovery;
 
-import java.util.Optional;
-
 import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
@@ -31,13 +29,11 @@ public ClassOrderingVisitor(JupiterConfiguration configuration) {
 
 	@Override
 	public void visit(TestDescriptor testDescriptor) {
-		Optional<ClassOrderer> testClassOrderer = configuration.getTestClassOrderer();
-		if (!testClassOrderer.isPresent()) {
-			return;
-		}
-		doWithMatchingDescriptor(JupiterEngineDescriptor.class, testDescriptor,
-			descriptor -> orderContainedClasses(descriptor, testClassOrderer.get()),
-			descriptor -> "Failed to order classes");
+		this.configuration.getDefaultTestClassOrderer().ifPresent(testClassOrderer -> {
+			doWithMatchingDescriptor(JupiterEngineDescriptor.class, testDescriptor,
+				descriptor -> orderContainedClasses(descriptor, testClassOrderer),
+				descriptor -> "Failed to order classes");
+		});
 	}
 
 	private void orderContainedClasses(JupiterEngineDescriptor jupiterEngineDescriptor, ClassOrderer classOrderer) {
@@ -51,4 +47,5 @@ private void orderContainedClasses(JupiterEngineDescriptor jupiterEngineDescript
 				"ClassOrderer [%s] removed %s ClassDescriptor(s) which will be retained with arbitrary ordering.",
 				classOrderer.getClass().getName(), -difference));
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
index 30ad21c4634d..dd3baa5b1cb5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
@@ -35,4 +35,5 @@ public final Class<?> getTestClass() {
 	public String toString() {
 		return new ToStringBuilder(this).append("class", getTestClass().toGenericString()).toString();
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
index 94fb4f7c9c90..66467eb0abf8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
@@ -34,11 +34,12 @@ class DefaultClassOrdererContext implements ClassOrdererContext {
 
 	@Override
 	public List<? extends ClassDescriptor> getClassDescriptors() {
-		return classDescriptors;
+		return this.classDescriptors;
 	}
 
 	@Override
 	public Optional<String> getConfigurationParameter(String key) {
 		return this.configuration.getRawConfigurationParameter(key);
 	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
index 26fa7ee2fc54..13aeed85efb8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
@@ -37,4 +37,5 @@ public final Method getMethod() {
 	public String toString() {
 		return new ToStringBuilder(this).append("method", getMethod().toGenericString()).toString();
 	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/example/B_TestCase.java b/junit-jupiter-engine/src/test/java/example/B_TestCase.java
new file mode 100644
index 000000000000..7112e67930ea
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/example/B_TestCase.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+
+/**
+ * @since 5.8
+ */
+public class B_TestCase {
+
+	public static Set<String> callSequence;
+
+	@BeforeEach
+	void trackInvocations(TestInfo testInfo) {
+		if (callSequence != null) {
+			callSequence.add(testInfo.getTestClass().get().getName());
+		}
+	}
+
+	@Test
+	void a() {
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
index 30f031f91840..d207291cceba 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
@@ -27,6 +27,9 @@
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.junit.platform.testkit.engine.Events;
 
+/**
+ * @since 5.8
+ */
 class OrderedClassTests {
 
 	private static final Set<String> callSequence = Collections.synchronizedSet(new LinkedHashSet<>());
@@ -46,6 +49,30 @@ void className() {
 				.containsExactly("A_TestCase", "B_TestCase", "C_TestCase");
 	}
 
+	@Test
+	void classNameAcrossPackages() {
+		try {
+			example.B_TestCase.callSequence = callSequence;
+
+			// @formatter:off
+			var tests = EngineTestKit
+				.engine("junit-jupiter")
+				.configurationParameter(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, ClassOrderer.ClassName.class.getName())
+				.selectors(selectClass(B_TestCase.class), selectClass(example.B_TestCase.class))
+				.execute()
+				.testEvents();
+			// @formatter:on
+
+			tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+
+			assertThat(callSequence)//
+					.containsExactly("example.B_TestCase", "B_TestCase");
+		}
+		finally {
+			example.B_TestCase.callSequence = null;
+		}
+	}
+
 	@Test
 	void displayName() {
 		var tests = executeTests(ClassOrderer.DisplayName.class);
@@ -75,16 +102,16 @@ void random() {
 
 	private Events executeTests(Class<? extends ClassOrderer> classOrderer) {
 		// @formatter:off
-        return EngineTestKit
-                .engine("junit-jupiter")
-                .configurationParameter(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, classOrderer.getName())
-                .selectors(selectClass(A_TestCase.class), selectClass(B_TestCase.class), selectClass(C_TestCase.class))
-                .execute()
-                .testEvents();
-        // @formatter:on
+		return EngineTestKit
+			.engine("junit-jupiter")
+			.configurationParameter(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, classOrderer.getName())
+			.selectors(selectClass(A_TestCase.class), selectClass(B_TestCase.class), selectClass(C_TestCase.class))
+			.execute()
+			.testEvents();
+		// @formatter:on
 	}
 
-	abstract static class BaseTestCase {
+	static abstract class BaseTestCase {
 
 		@BeforeEach
 		void trackInvocations(TestInfo testInfo) {
@@ -110,4 +137,5 @@ static class B_TestCase extends BaseTestCase {
 	@DisplayName("A")
 	static class C_TestCase extends BaseTestCase {
 	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
index a3d9fb938cba..23fe300f005c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
@@ -28,6 +28,9 @@
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.junit.platform.testkit.engine.Events;
 
+/**
+ * @since 5.8
+ */
 class RandomlyOrderedTests {
 
 	private static final Set<String> callSequence = Collections.synchronizedSet(new LinkedHashSet<>());
@@ -88,4 +91,5 @@ static class B_TestCase extends BaseTestCase {
 
 	static class C_TestCase extends BaseTestCase {
 	}
+
 }

From 76d4ca39bd7c8d70dfcc1fc9c2016f159587d657 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 28 Jan 2021 18:38:10 +0100
Subject: [PATCH 0184/1433] Fix broken links to ClassOrderer implementations in
 User Guide

See #2488
---
 .../src/docs/asciidoc/link-attributes.adoc    | 15 ++++--
 .../asciidoc/user-guide/writing-tests.adoc    | 51 ++++++++++---------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 0c0efa94d34c..c584ea825317 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -60,16 +60,21 @@ endif::[]
 :TestExecutionResultConditions:              {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/TestExecutionResultConditions.html[TestExecutionResultConditions]
 // Jupiter Core API
 :api-package:                                {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/package-summary.html[org.junit.jupiter.api]
-:Alphanumeric:                               {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.Alphanumeric.html[Alphanumeric]
-:MethodName:                                 {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.MethodName.html[MethodName]
 :Assertions:                                 {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/Assertions.html[org.junit.jupiter.api.Assertions]
 :Assumptions:                                {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/Assumptions.html[org.junit.jupiter.api.Assumptions]
+:ClassOrderer_ClassName:                     {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/ClassOrderer.ClassName.html[ClassOrderer.ClassName]
+:ClassOrderer_DisplayName:                   {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/ClassOrderer.DisplayName.html[ClassOrderer.DisplayName]
+:ClassOrderer_OrderAnnotation:               {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/ClassOrderer.OrderAnnotation.html[ClassOrderer.OrderAnnotation]
+:ClassOrderer_Random:                        {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/ClassOrderer.Random.html[ClassOrderer.Random]
+:ClassOrderer:                               {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/ClassOrderer.html[ClassOrderer]
 :Disabled:                                   {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/Disabled.html[@Disabled]
-:DisplayName:                                {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.DisplayName.html[DisplayName]
+:MethodOrderer_Alphanumeric:                 {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.Alphanumeric.html[MethodOrderer.Alphanumeric]
+:MethodOrderer_DisplayName:                  {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.DisplayName.html[MethodOrderer.DisplayName]
+:MethodOrderer_MethodName:                   {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.MethodName.html[MethodOrderer.MethodName]
+:MethodOrderer_OrderAnnotation:              {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.OrderAnnotation.html[MethodOrderer.OrderAnnotation]
+:MethodOrderer_Random:                       {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.Random.html[MethodOrderer.Random]
 :MethodOrderer:                              {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.html[MethodOrderer]
 :Order:                                      {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/Order.html[@Order]
-:OrderAnnotation:                            {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.OrderAnnotation.html[OrderAnnotation]
-:Random:                                     {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.Random.html[Random]
 :RepetitionInfo:                             {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/RepetitionInfo.html[RepetitionInfo]
 :TestInfo:                                   {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/TestInfo.html[TestInfo]
 :TestMethodOrder:                            {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/TestMethodOrder.html[@TestMethodOrder]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index a8fd911b1503..221ae27805dc 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -532,17 +532,18 @@ interface with `{TestMethodOrder}` and specify the desired `{MethodOrderer}`
 implementation. You can implement your own custom `MethodOrderer` or use one of the
 following built-in `MethodOrderer` implementations.
 
-* `{DisplayName}`: sorts test methods _alphanumerically_ based on their display names (see
-  <<writing-tests-display-name-generator-precedence-rules, display name generation
-  precedence rules>>)
-* `{MethodName}`: sorts test methods _alphanumerically_ based on their names and formal
-  parameter lists
-* `{OrderAnnotation}`: sorts test methods _numerically_ based on values specified via the
-  `{Order}` annotation
-* `{Random}`: orders test methods _pseudo-randomly_ and supports configuration of a custom
-  _seed_
-* `{Alphanumeric}`: sorts test methods _alphanumerically_ based on their names and formal
-  parameter lists; **Deprecated in favor of `{MethodName}`, to be removed in 6.0**
+* `{MethodOrderer_DisplayName}`: sorts test methods _alphanumerically_ based on their
+  display names (see <<writing-tests-display-name-generator-precedence-rules, display name
+  generation precedence rules>>)
+* `{MethodOrderer_MethodName}`: sorts test methods _alphanumerically_ based on their names
+  and formal parameter lists
+* `{MethodOrderer_OrderAnnotation}`: sorts test methods _numerically_ based on values
+  specified via the `{Order}` annotation
+* `{MethodOrderer_Random}`: orders test methods _pseudo-randomly_ and supports
+  configuration of a custom _seed_
+* `{MethodOrderer_Alphanumeric}`: sorts test methods _alphanumerically_ based on their
+  names and formal parameter lists; **deprecated in favor of `{MethodOrderer_MethodName}`,
+  to be removed in 6.0**
 
 NOTE: See also: <<extensions-execution-order-wrapping-behavior>>
 
@@ -564,9 +565,9 @@ via the `{TestMethodOrder}` annotation, the supplied class has to implement the
 `MethodOrderer` interface. The default orderer will be used for all tests unless the
 `@TestMethodOrder` annotation is present on an enclosing test class or test interface.
 
-For example, to use the `{OrderAnnotation}` method orderer by default, you should set the
-configuration parameter to the corresponding fully qualified class name (e.g., in
-`src/test/resources/junit-platform.properties`):
+For example, to use the `{MethodOrderer_OrderAnnotation}` method orderer by default, you
+should set the configuration parameter to the corresponding fully qualified class name
+(e.g., in `src/test/resources/junit-platform.properties`):
 
 [source,properties,indent=0]
 ----
@@ -596,19 +597,19 @@ configuration parameter>> to specify the fully qualified class name of the
 You can implement your own custom `ClassOrderer` or use one of the following built-in
 `ClassOrderer` implementations.
 
-* `{DisplayName}`: sorts test classes _alphanumerically_ based on their display names
-  (see <<writing-tests-display-name-generator-precedence-rules, display name generation
-  precedence rules>>)
-* `{ClassName}`: sorts test classes _alphanumerically_ based on their fully qualified
-  class names
-* `{OrderAnnotation}`: sorts test classes _numerically_ based on values specified via the
-  `{Order}` annotation
-* `{Random}`: orders test classes _pseudo-randomly_ and supports configuration of a
-  custom _seed_
+* `{ClassOrderer_DisplayName}`: sorts test classes _alphanumerically_ based on their
+  display names (see <<writing-tests-display-name-generator-precedence-rules, display name
+  generation precedence rules>>)
+* `{ClassOrderer_ClassName}`: sorts test classes _alphanumerically_ based on their fully
+  qualified class names
+* `{ClassOrderer_OrderAnnotation}`: sorts test classes _numerically_ based on values
+  specified via the `{Order}` annotation
+* `{ClassOrderer_Random}`: orders test classes _pseudo-randomly_ and supports
+  configuration of a custom _seed_
 
 For example, for the `@Order` annotation to be honored on _test classes_, you should
-configure the `{OrderAnnotation}` class orderer using the configuration parameter with the
-corresponding fully qualified class name (e.g., in
+configure the `{ClassOrderer_OrderAnnotation}` class orderer using the configuration
+parameter with the corresponding fully qualified class name (e.g., in
 `src/test/resources/junit-platform.properties`):
 
 [source,properties,indent=0]

From 2e042d549f5e55c8ddf9c1f4b6f5047b397f1050 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 29 Jan 2021 12:26:30 +0100
Subject: [PATCH 0185/1433] Polish assertInstanceOf support

---
 .../java/org/junit/jupiter/api/AssertInstanceOf.java  | 11 +++++------
 .../main/java/org/junit/jupiter/api/Assertions.java   |  3 +++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
index ef1cf28f1ab6..f6fbff1420c5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
@@ -20,8 +20,8 @@
 
 /**
  * {@code AssertInstanceOf} is a collection of utility methods that support
- * asserting that a value is of a expected instance type -
- * in other words, if it can be assigned to the expected type.
+ * asserting that an object is of an expected type &mdash; in other words, if it
+ * can be assigned to the expected type.
  *
  * @since 5.8
  */
@@ -45,13 +45,12 @@ static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Supplie
 
 	private static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Object messageOrSupplier) {
 		if (!expectedType.isInstance(actualValue)) {
-			String template = "Unexpected type";
-			if (actualValue == null)
-				template = "Unexpected null value";
+			String reason = (actualValue == null ? "Unexpected null value" : "Unexpected type");
 			String message = buildPrefix(nullSafeGet(messageOrSupplier))
-					+ format(expectedType, actualValue == null ? null : actualValue.getClass(), template);
+					+ format(expectedType, actualValue == null ? null : actualValue.getClass(), reason);
 			throw new AssertionFailedError(message);
 		}
 		return expectedType.cast(actualValue);
 	}
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index fca32402ac12..e60dec142872 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -3449,6 +3449,8 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 		return AssertTimeout.assertTimeoutPreemptively(timeout, supplier, messageSupplier);
 	}
 
+	// --- assertInstanceOf ----------------------------------------------------
+
 	/**
 	 * <em>Assert</em> that the supplied {@code actualValue} is an instance of the
 	 * {@code expectedType}.
@@ -3495,4 +3497,5 @@ public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue,
 	public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Supplier<String> messageSupplier) {
 		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue, messageSupplier);
 	}
+
 }

From 5e0569a3babc1c8ce1e5d49dd6e7f0b4fc830a1e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 29 Jan 2021 12:55:05 +0100
Subject: [PATCH 0186/1433] Improve failure message for assertNull()

Prior to this commit, if the `toString()` implementation for the
`actual` object passed to assertNull() returned `null` or `"null"`, the
following assertion failure message was generated, which is very
confusing and difficult to debug.

    expected <null> but was <null>

This commit improves the assertion failure message in such cases by
including the actual object's type and identity hash in addition to the
result of invoking `toString()` (i.e., "null").

For example, invoking `assertNull("null")` will now result in an
assertion failure message similar to the following.

    expected: null<null> but was: java.lang.String@264b3504<null>

Closes #2523
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  3 +
 .../org/junit/jupiter/api/AssertNull.java     | 10 ++-
 .../api/AssertNullAssertionsTests.java        | 73 +++++++++++++++++++
 3 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index db3eda92ff5e..64e910bebe75 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -64,6 +64,9 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* `assertNull()` failure messages now include the actual object's type if the `toString()`
+  implementation for the actual object returns `null` or `"null"`. This avoids the
+  generation of confusing failure messages such as `expected <null> but was <null>`.
 * Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
   underscores as in some JVM languages, to improve readability of long numbers like
   `700_000_000`.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
index c0b9185a1e14..f843202d4a20 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
@@ -12,6 +12,7 @@
 
 import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
 import static org.junit.jupiter.api.AssertionUtils.fail;
+import static org.junit.jupiter.api.AssertionUtils.format;
 import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 
 import java.util.function.Supplier;
@@ -45,6 +46,13 @@ static void assertNull(Object actual, Supplier<String> messageSupplier) {
 	}
 
 	private static void failNotNull(Object actual, String message) {
-		fail(buildPrefix(message) + "expected: <null> but was: <" + actual + ">", null, actual);
+		String stringRepresentation = actual.toString();
+		if (stringRepresentation == null || stringRepresentation.equals("null")) {
+			fail(format(null, actual, message), null, actual);
+		}
+		else {
+			fail(buildPrefix(message) + "expected: <null> but was: <" + actual + ">", null, actual);
+		}
 	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
index 13e4063e7e11..a47ca27207d6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
@@ -16,6 +16,8 @@
 import static org.junit.jupiter.api.AssertionTestUtils.expectAssertionFailedError;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import java.util.function.Supplier;
+
 import org.opentest4j.AssertionFailedError;
 
 /**
@@ -49,6 +51,69 @@ void assertNullWithNonNullObject() {
 		}
 	}
 
+	@Test
+	void assertNullWithNonNullObjectWithNullStringReturnedFromToString() {
+		assertNullWithNonNullObjectWithNullStringReturnedFromToString(null);
+	}
+
+	@Test
+	void assertNullWithNonNullObjectWithNullStringReturnedFromToStringAndMessageSupplier() {
+		assertNullWithNonNullObjectWithNullStringReturnedFromToString(() -> "boom");
+	}
+
+	private void assertNullWithNonNullObjectWithNullStringReturnedFromToString(Supplier<String> messageSupplier) {
+		String actual = "null";
+		try {
+			if (messageSupplier == null) {
+				assertNull(actual);
+			}
+			else {
+				assertNull(actual, messageSupplier);
+			}
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			// Should look something like:
+			// expected: null<null> but was: java.lang.String@264b3504<null>
+			String prefix = (messageSupplier != null ? messageSupplier.get() + " ==> " : "");
+			assertMessageStartsWith(ex, prefix + "expected: null<null> but was: java.lang.String@");
+			assertMessageEndsWith(ex, "<null>");
+			assertExpectedAndActualValues(ex, null, actual);
+		}
+	}
+
+	@Test
+	void assertNullWithNonNullObjectWithNullReferenceReturnedFromToString() {
+		assertNullWithNonNullObjectWithNullReferenceReturnedFromToString(null);
+	}
+
+	@Test
+	void assertNullWithNonNullObjectWithNullReferenceReturnedFromToStringAndMessageSupplier() {
+		assertNullWithNonNullObjectWithNullReferenceReturnedFromToString(() -> "boom");
+	}
+
+	private void assertNullWithNonNullObjectWithNullReferenceReturnedFromToString(Supplier<String> messageSupplier) {
+		Object actual = new NullToString();
+		try {
+			if (messageSupplier == null) {
+				assertNull(actual);
+			}
+			else {
+				assertNull(actual, messageSupplier);
+			}
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			// Should look something like:
+			// expected: null<null> but was: org.junit.jupiter.api.AssertNullAssertionsTests$NullToString@4e7912d8<null>
+			String prefix = (messageSupplier != null ? messageSupplier.get() + " ==> " : "");
+			assertMessageStartsWith(ex,
+				prefix + "expected: null<null> but was: org.junit.jupiter.api.AssertNullAssertionsTests$NullToString@");
+			assertMessageEndsWith(ex, "<null>");
+			assertExpectedAndActualValues(ex, null, actual);
+		}
+	}
+
 	@Test
 	void assertNullWithNonNullObjectAndMessage() {
 		try {
@@ -75,4 +140,12 @@ void assertNullWithNonNullObjectAndMessageSupplier() {
 		}
 	}
 
+	private static class NullToString {
+
+		@Override
+		public String toString() {
+			return null;
+		}
+	}
+
 }

From 2ea0998c2d1eb803c0608b6c657abe54a23145c1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 29 Jan 2021 13:15:44 +0100
Subject: [PATCH 0187/1433] Polish 5.8 M1 release notes

---
 .../release-notes/release-notes-5.8.0-M1.adoc | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 64e910bebe75..35a7c72cf1ae 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -30,21 +30,22 @@ on GitHub.
   nested container events when using the `EngineTestKit`. For example,
   `test(displayName("my test"))` can be used to match against a test whose display name is
   `my test`.
-* The `junit-platform-jfr` module now also reports execution events for containers, e.g.
-  test classes.
-* The `junit-platform-jfr` module now also reports test discovery events for the launcher
-  and registered test engines.
+* The `junit-platform-jfr` module now reports execution events for containers -- for
+  example, test classes.
+* The `junit-platform-jfr` module now reports test discovery events for the launcher and
+  registered test engines.
 * Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
   `{ServiceLoader}` mechanism.
 * Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
 * Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
   longer store `String` representations of unique IDs.
-* Improvement of `ExclusiveResource` handling, if a `Node` has only read locks and no read-write locks,
-  then descendants are not forced into `SAME_THREAD` execution, and can run concurrently.
+* Improved of `ExclusiveResource` handling: if a `Node` has only read locks and no
+  read-write locks, then descendants are not forced into `SAME_THREAD` execution and can
+  run concurrently.
 * Tools that make multiple calls to the `Launcher` API should now create a
-  `LauncherSession` instead in order to allow for executing global setup and teardown code
-  exactly once via the new `LauncherSessionListener` interface that can be registered via
-  Java’s `{ServiceLoader}` mechanism.
+  `LauncherSession` in order to allow for executing global setup and teardown code exactly
+  once via the new `LauncherSessionListener` interface that can be registered via Java’s
+  `{ServiceLoader}` mechanism.
 
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
@@ -56,31 +57,33 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , ExtensionContext)` has
+* `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, ExtensionContext)` has
   been deprecated in favor of
-  `InvocationInterceptor.interceptDynamicTest(Invocation<Void> , DynamicTestInvocationContext, ExtensionContext)`
-  that allows to access the dynamic test executable via
+  `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, DynamicTestInvocationContext, ExtensionContext)`
+  that provides access to the dynamic test executable via
   `DynamicTestInvocationContext.getExecutable()`.
 
 ==== New Features and Improvements
 
+* Top-level test classes can now be ordered by passing the fully-qualified name of a
+  class implementing `ClassOrderer` as the value of the new
+  `junit.jupiter.testclass.order.default` configuration parameter.
+* New `assertInstanceOf()` methods which produce better error messages comparable to those
+  produced by `assertThrows`. These new methods serve as a replacement for
+  `assertTrue(obj instanceof X)`.
 * `assertNull()` failure messages now include the actual object's type if the `toString()`
   implementation for the actual object returns `null` or `"null"`. This avoids the
   generation of confusing failure messages such as `expected <null> but was <null>`.
+
 * Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
   underscores as in some JVM languages, to improve readability of long numbers like
   `700_000_000`.
-* Documented constant values in `Resources`.
-* New `assertInstanceOf` methods as a replacement for `assertTrue(obj instanceof X)` which
-  provide better error messages comparable to those of `assertThrows`.
+* CSV rows provided via `@CsvSource` may now start with a number sign (`#`).
+* New `ignoreLeadingAndTrailingWhitespace` attributes in `@CsvSource` and `@CsvFileSource`
+  (set to `true` by default) to control whether or not to trim whitespace.
 * Dynamic tests now require less memory thanks to a number of improvements to internal
   data structures.
-* Allow rows in `@CsvSource` to start with a number sign (#)
-* New `ignoreLeadingAndTrailingWhitespace` attribute to control whether or not to trim
-  whitespaces in `@CsvSource` and `@CsvFileSource` (set to `true` by default).
-* Top-level test classes can now be ordered by passing the fully-qualified name of a
-  class implementing `ClassOrderer` as the value of the new
-  `junit.jupiter.testclass.order.default` configuration parameter.
+* Documented constant values in `org.junit.jupiter.api.parallel.Resources`.
 
 
 [[release-notes-5.8.0-M1-junit-vintage]]

From 12874e9f98911689557d97ddec92bad3b7896570 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Jan 2021 20:27:56 +0100
Subject: [PATCH 0188/1433] Move entry to 5.7.1 release notes

---
 .../src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc   | 2 ++
 .../docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc    | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index 4b776d75d361..34aec9be9e00 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -25,6 +25,8 @@ GitHub.
 * `StringUtils.nullSafeToString()` now returns `"null"` if the invocation of `toString()`
   on the supplied object returns `null`. Although this is an internal utility, the effect
   of this change may be witnessed by end users and test engine or extension authors.
+* Method `scanForClassesInPackage(String)` in `ClasspathScanner` now returns a valid list
+  of class names when the package name is equal to the name of a module on the module path.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 35a7c72cf1ae..d13b4fb712bb 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -15,8 +15,7 @@ on GitHub.
 
 ==== Bug Fixes
 
-* Method `scanForClassesInPackage(String)` in `ClasspathScanner` now returns a valid list
-  of class names when the package name is equal to the name of a module on the module path.
+* ❓
 
 ==== Deprecations and Breaking Changes
 

From 31aaac8d30230eba1ff3c626cdc0b7e6b9a1f6f1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 30 Jan 2021 17:44:09 +0100
Subject: [PATCH 0189/1433] Track inputs of compileModule tasks correctly

---
 .../kotlin/java-library-conventions.gradle.kts  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 137355d7b451..1d52ba465358 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.api.tasks.PathSensitivity.RELATIVE
+
 plugins {
 	`java-library`
 	eclipse
@@ -219,18 +221,19 @@ tasks.compileTestJava {
 	))
 }
 
-inner class ModulePathArgumentProvider : CommandLineArgumentProvider {
-	@get:Input val modulePath: Provider<Configuration> = configurations.compileClasspath
-	override fun asArguments(): List<String> = listOf("--module-path", modulePath.get().asPath)
+inner class ModulePathArgumentProvider : CommandLineArgumentProvider, Named {
+	@get:CompileClasspath val modulePath: Provider<Configuration> = configurations.compileClasspath
+	override fun asArguments() = listOf("--module-path", modulePath.get().asPath)
+	override fun getName() = "module-path"
 }
 
-inner class PatchModuleArgumentProvider(it: Project) : CommandLineArgumentProvider {
+inner class PatchModuleArgumentProvider(it: Project) : CommandLineArgumentProvider, Named {
 
 	@get:Input val module: String = it.javaModuleName
 
-	@get:Input val patch: Provider<FileCollection> = provider {
+	@get:InputFiles @get:PathSensitive(RELATIVE) val patch: Provider<FileCollection> = provider {
 		if (it == project)
-			files(sourceSets.matching { it.name.startsWith("main") }.map { it.output }) + configurations.compileClasspath.get()
+			files(sourceSets.matching { it.name.startsWith("main") }.map { it.output })
 		else
 			files(it.sourceSets["main"].java.srcDirs)
 	}
@@ -242,6 +245,8 @@ inner class PatchModuleArgumentProvider(it: Project) : CommandLineArgumentProvid
 		}
 		return listOf("--patch-module", "$module=$path")
 	}
+
+	override fun getName() = "patch-module($module)"
 }
 
 afterEvaluate {

From dc7cab302e0682ccd015d03c07548e9099ee4d3b Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <rien.korstanje@gmail.com>
Date: Sat, 30 Jan 2021 16:01:21 +0100
Subject: [PATCH 0190/1433] Fix warnings on JDK 17

---
 .../java/org/junit/jupiter/api/ClassOrderer.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 0f2f029aa0ae..2eb44412265e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -77,6 +77,9 @@ public interface ClassOrderer {
 	 */
 	class ClassName implements ClassOrderer {
 
+		public ClassName() {
+		}
+
 		/**
 		 * Sort the classes encapsulated in the supplied
 		 * {@link ClassOrdererContext} alphanumerically based on their fully
@@ -97,6 +100,9 @@ public void orderClasses(ClassOrdererContext context) {
 	 */
 	class DisplayName implements ClassOrderer {
 
+		public DisplayName() {
+		}
+
 		/**
 		 * Sort the classes encapsulated in the supplied
 		 * {@link ClassOrdererContext} alphanumerically based on their display
@@ -127,6 +133,9 @@ public void orderClasses(ClassOrdererContext context) {
 	 */
 	class OrderAnnotation implements ClassOrderer {
 
+		public OrderAnnotation() {
+		}
+
 		/**
 		 * Sort the classes encapsulated in the supplied
 		 * {@link ClassOrdererContext} based on the {@link Order @Order}
@@ -197,6 +206,9 @@ class Random implements ClassOrderer {
 		 */
 		public static final String RANDOM_SEED_PROPERTY_NAME = MethodOrderer.Random.RANDOM_SEED_PROPERTY_NAME;
 
+		public Random() {
+		}
+
 		/**
 		 * Order the classes encapsulated in the supplied
 		 * {@link ClassOrdererContext} pseudo-randomly.

From eab64902fa14528376b25884eaf4ecab87dc3af6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 30 Jan 2021 21:32:29 +0100
Subject: [PATCH 0191/1433] Use jOOX to test XML reports

Instead of asserting string subsequences, we select elements and
attributes in the DOM via jOOX which allows for much more expressive
assertions.
---
 dependencies/dependencies.gradle.kts          |   1 +
 gradle.properties                             |   1 +
 platform-tests/platform-tests.gradle.kts      |   1 +
 ...egacyXmlReportGeneratingListenerTests.java | 312 ++++++++----------
 .../legacy/xml/XmlReportAssertions.java       |  11 +-
 .../legacy/xml/XmlReportWriterTests.java      | 159 ++++-----
 6 files changed, 207 insertions(+), 278 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 7921c47f032a..10470cb05888 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -38,5 +38,6 @@ dependencies {
 		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
 		api("org.spockframework:spock-core:${versions["spock"]}")
 		api("com.github.gunnarmorling:jfrunit:${versions["jfrunit"]}")
+		api("org.jooq:joox:${versions["joox"]}")
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index 9a5a6cbdbb70..76bd93b5a7bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,6 +38,7 @@ mockito.version=3.7.7
 slf4j.version=1.7.30
 spock.version=1.3-groovy-2.5
 jfrunit.version=main-SNAPSHOT
+joox.version=1.6.2
 
 # Tools
 checkstyle.version=8.36.2
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 592e0488562d..c8d92f145b1f 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
 	testImplementation(project(":junit-jupiter-engine"))
 	testImplementation("org.apiguardian:apiguardian-api")
 	testImplementation("com.github.gunnarmorling:jfrunit")
+	testImplementation("org.jooq:joox")
 
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(project(":junit-vintage-engine"))
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index ae6e42870f38..e0c73d2039f2 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -11,6 +11,7 @@
 package org.junit.platform.reporting.legacy.xml;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.joox.JOOX.$;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
@@ -37,8 +38,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.joox.Match;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestReporter;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.UniqueId;
@@ -65,29 +66,26 @@ void writesFileForSingleSucceedingTest(@TempDir Path tempDirectory) throws Excep
 
 		executeTests(engine, tempDirectory);
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite name=\"dummy\" tests=\"1\" skipped=\"0\" failures=\"0\" errors=\"0\"",
-
-					"<testcase name=\"display&lt;--&gt;Name 😎\" classname=\"dummy\"",
-						"<system-out>",
-							"unique-id: [engine:dummy]/[test:succeedingTest]",
-							"display-name: display<-->Name 😎",
-						"</system-out>",
-					"</testcase>",
-
-					"<system-out>",
-						"unique-id: [engine:dummy]",
-						"display-name: dummy",
-					"</system-out>",
-				"</testsuite>")
-			.doesNotContain("<skipped")
-			.doesNotContain("<failure")
-			.doesNotContain("<error");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("name")).isEqualTo("dummy");
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("skipped", int.class)).isEqualTo(0);
+		assertThat(testsuite.attr("failures", int.class)).isEqualTo(0);
+		assertThat(testsuite.attr("errors", int.class)).isEqualTo(0);
+		assertThat(testsuite.child("system-out").text()) //
+				.containsSubsequence("unique-id: [engine:dummy]", "display-name: dummy");
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("display<-->Name 😎");
+		assertThat(testcase.attr("classname")).isEqualTo("dummy");
+		assertThat(testcase.child("system-out").text()) //
+				.containsSubsequence("unique-id: [engine:dummy]/[test:succeedingTest]",
+					"display-name: display<-->Name 😎");
+
+		assertThat(testsuite.find("skipped")).isEmpty();
+		assertThat(testsuite.find("failure")).isEmpty();
+		assertThat(testsuite.find("error")).isEmpty();
 	}
 
 	@Test
@@ -97,22 +95,23 @@ void writesFileForSingleFailingTest(@TempDir Path tempDirectory) throws Exceptio
 
 		executeTests(engine, tempDirectory);
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite name=\"dummy\" tests=\"1\" skipped=\"0\" failures=\"1\" errors=\"0\"",
-				"<testcase name=\"failingTest\"",
-				"<failure message=\"expected to &lt;b&gt;fail&lt;/b&gt;\" type=\"" + AssertionFailedError.class.getName() + "\">",
-				"AssertionFailedError: expected to <b>fail</b>",
-				"\tat",
-				"</failure>",
-				"</testcase>",
-				"</testsuite>")
-			.doesNotContain("<skipped")
-			.doesNotContain("<error");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("skipped", int.class)).isEqualTo(0);
+		assertThat(testsuite.attr("failures", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("errors", int.class)).isEqualTo(0);
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("failingTest");
+
+		var failure = testcase.child("failure");
+		assertThat(failure.attr("message")).isEqualTo("expected to <b>fail</b>");
+		assertThat(failure.attr("type")).isEqualTo(AssertionFailedError.class.getName());
+		assertThat(failure.text()).containsSubsequence("AssertionFailedError: expected to <b>fail</b>", "\tat");
+
+		assertThat(testsuite.find("skipped")).isEmpty();
+		assertThat(testsuite.find("error")).isEmpty();
 	}
 
 	@Test
@@ -124,22 +123,23 @@ void writesFileForSingleErroneousTest(@TempDir Path tempDirectory) throws Except
 
 		executeTests(engine, tempDirectory);
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite name=\"dummy\" tests=\"1\" skipped=\"0\" failures=\"0\" errors=\"1\"",
-				"<testcase name=\"failingTest\"",
-				"<error message=\"error occurred\" type=\"java.lang.RuntimeException\">",
-				"RuntimeException: error occurred",
-				"\tat ",
-				"</error>",
-				"</testcase>",
-				"</testsuite>")
-			.doesNotContain("<skipped")
-			.doesNotContain("<failure");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("skipped", int.class)).isEqualTo(0);
+		assertThat(testsuite.attr("failures", int.class)).isEqualTo(0);
+		assertThat(testsuite.attr("errors", int.class)).isEqualTo(1);
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("failingTest");
+
+		var error = testcase.child("error");
+		assertThat(error.attr("message")).isEqualTo("error occurred");
+		assertThat(error.attr("type")).isEqualTo(RuntimeException.class.getName());
+		assertThat(error.text()).containsSubsequence("RuntimeException: error occurred", "\tat");
+
+		assertThat(testsuite.find("skipped")).isEmpty();
+		assertThat(testsuite.find("failure")).isEmpty();
 	}
 
 	@Test
@@ -150,23 +150,22 @@ void writesFileForSingleSkippedTest(@TempDir Path tempDirectory) throws Exceptio
 
 		executeTests(engine, tempDirectory);
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite name=\"dummy\" tests=\"1\" skipped=\"1\" failures=\"0\" errors=\"0\"",
-				"<testcase name=\"skippedTest\"",
-				"<skipped>",
-				"should be skipped",
-				"</skipped>",
-				"</testcase>",
-				"</testsuite>")
-			.doesNotContain("<failure")
-			.doesNotContain("<error");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("skipped", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("failures", int.class)).isEqualTo(0);
+		assertThat(testsuite.attr("errors", int.class)).isEqualTo(0);
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("skippedTest");
+		assertThat(testcase.child("skipped").text()).isEqualTo("should be skipped");
+
+		assertThat(testsuite.find("failure")).isEmpty();
+		assertThat(testsuite.find("error")).isEmpty();
 	}
 
+	@SuppressWarnings("ConstantConditions")
 	@Test
 	void writesFileForSingleAbortedTest(@TempDir Path tempDirectory) throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
@@ -174,23 +173,20 @@ void writesFileForSingleAbortedTest(@TempDir Path tempDirectory) throws Exceptio
 
 		executeTests(engine, tempDirectory);
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite name=\"dummy\" tests=\"1\" skipped=\"1\" failures=\"0\" errors=\"0\"",
-				"<testcase name=\"abortedTest\"",
-				"<skipped>",
-				"TestAbortedException: ",
-				"deliberately aborted",
-				"at ",
-				"</skipped>",
-				"</testcase>",
-				"</testsuite>")
-			.doesNotContain("<failure")
-			.doesNotContain("<error");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("skipped", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("failures", int.class)).isEqualTo(0);
+		assertThat(testsuite.attr("errors", int.class)).isEqualTo(0);
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("abortedTest");
+		assertThat(testcase.child("skipped").text()) //
+				.containsSubsequence("TestAbortedException: ", "deliberately aborted", "at ");
+
+		assertThat(testsuite.find("failure")).isEmpty();
+		assertThat(testsuite.find("error")).isEmpty();
 	}
 
 	@Test
@@ -203,20 +199,20 @@ void measuresTimesInSeconds(@TempDir Path tempDirectory) throws Exception {
 
 		executeTests(engine, tempDirectory, new IncrementingClock(0, Duration.ofMillis(333)));
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
-		// @formatter:off
 		//               start        end
 		// ----------- ---------- -----------
 		// engine          0 (1)    1,665 (6)
 		// firstTest     333 (2)      666 (3)
 		// secondTest    999 (4)    1,332 (5)
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite", "time=\"1.665\"",
-				"<testcase name=\"firstTest\" classname=\"dummy\" time=\"0.333\"",
-				"<testcase name=\"secondTest\" classname=\"dummy\" time=\"0.333\"");
-		// @formatter:on
+
+		assertThat(testsuite.attr("time", double.class)) //
+				.isEqualTo(1.665);
+		assertThat(testsuite.children("testcase").matchAttr("name", "firstTest").attr("time", double.class)) //
+				.isEqualTo(0.333);
+		assertThat(testsuite.children("testcase").matchAttr("name", "secondTest").attr("time", double.class)) //
+				.isEqualTo(0.333);
 	}
 
 	@Test
@@ -227,14 +223,9 @@ void testWithImmeasurableTimeIsOutputCorrectly(@TempDir Path tempDirectory) thro
 
 		executeTests(engine, tempDirectory, Clock.fixed(Instant.EPOCH, ZoneId.systemDefault()));
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite",
-				"<testcase name=\"test\" classname=\"dummy\" time=\"0\"");
-		// @formatter:on
+		assertThat(testsuite.child("testcase").attr("time")).isEqualTo("0");
 	}
 
 	@Test
@@ -245,19 +236,14 @@ void writesFileForSkippedContainer(@TempDir Path tempDirectory) throws Exception
 
 		executeTests(engine, tempDirectory);
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite name=\"dummy\" tests=\"1\" skipped=\"1\" failures=\"0\" errors=\"0\"",
-				"<testcase name=\"test\"",
-				"<skipped>",
-				"parent was skipped: should be skipped",
-				"</skipped>",
-				"</testcase>",
-				"</testsuite>");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("skipped", int.class)).isEqualTo(1);
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("test");
+		assertThat(testcase.child("skipped").text()).isEqualTo("parent was skipped: should be skipped");
 	}
 
 	@Test
@@ -268,20 +254,18 @@ void writesFileForFailingContainer(@TempDir Path tempDirectory) throws Exception
 
 		executeTests(engine, tempDirectory);
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite name=\"dummy\" tests=\"1\" skipped=\"0\" failures=\"1\" errors=\"0\"",
-				"<testcase name=\"test\"",
-				"<failure message=\"failure before all tests\" type=\"" + AssertionFailedError.class.getName() + "\">",
-				"AssertionFailedError: failure before all tests",
-				"\tat",
-				"</failure>",
-				"</testcase>",
-				"</testsuite>");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("failures", int.class)).isEqualTo(1);
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("test");
+
+		var failure = testcase.child("failure");
+		assertThat(failure.attr("message")).isEqualTo("failure before all tests");
+		assertThat(failure.attr("type")).isEqualTo(AssertionFailedError.class.getName());
+		assertThat(failure.text()).containsSubsequence("AssertionFailedError: failure before all tests", "\tat");
 	}
 
 	@Test
@@ -292,19 +276,10 @@ void writesSystemProperties(@TempDir Path tempDirectory) throws Exception {
 
 		executeTests(engine, tempDirectory);
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite",
-				"<properties>",
-				"<property name=\"file.separator\" value=\"" + File.separator + "\"/>",
-				"<property name=\"path.separator\" value=\"" + File.pathSeparator + "\"/>",
-				"</properties>",
-				"<testcase",
-				"</testsuite>");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		var properties = testsuite.child("properties").children("property");
+		assertThat(properties.matchAttr("name", "file\\.separator").attr("value")).isEqualTo(File.separator);
+		assertThat(properties.matchAttr("name", "path\\.separator").attr("value")).isEqualTo(File.pathSeparator);
 	}
 
 	@Test
@@ -318,17 +293,9 @@ void writesHostNameAndTimestamp(@TempDir Path tempDirectory) throws Exception {
 
 		executeTests(engine, tempDirectory, Clock.fixed(ZonedDateTime.of(now, zone).toInstant(), zone));
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite",
-				"hostname=\"" + InetAddress.getLocalHost().getHostName() + "\"",
-				"timestamp=\"2016-01-28T14:02:59\"",
-				"<testcase",
-				"</testsuite>");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+		assertThat(testsuite.attr("hostname")).isEqualTo(InetAddress.getLocalHost().getHostName());
+		assertThat(testsuite.attr("timestamp")).isEqualTo("2016-01-28T14:02:59");
 	}
 
 	@Test
@@ -362,8 +329,7 @@ void printsExceptionWhenReportCouldNotBeWritten(@TempDir Path tempDirectory) thr
 	}
 
 	@Test
-	void writesReportEntriesToSystemOutElement(@TempDir Path tempDirectory, TestReporter testReporter)
-			throws Exception {
+	void writesReportEntriesToSystemOutElement(@TempDir Path tempDirectory) throws Exception {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor));
@@ -382,24 +348,12 @@ void writesReportEntriesToSystemOutElement(@TempDir Path tempDirectory, TestRepo
 		listener.executionFinished(testIdentifier, successful());
 		listener.executionFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());
 
-		var content = readValidXmlFile(tempDirectory.resolve("TEST-engine.xml"));
-		//testReporter.publishEntry("xml", content);
-
-		// @formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite",
-				"<testcase",
-				"<system-out>",
-				"Report Entry #1 (timestamp: " + Year.now(),
-				"- foo: bar\n",
-				"Report Entry #2 (timestamp: " + Year.now(),
-				"- bar: baz\n",
-				"- qux: foo\n",
-				"</system-out>",
-				"</testcase>",
-				"</testsuite>");
-		// @formatter:on
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-engine.xml"));
+
+		assertThat(String.join("\n", testsuite.child("testcase").children("system-out").texts())) //
+				.containsSubsequence( //
+					"Report Entry #1 (timestamp: " + Year.now(), "- foo: bar\n",
+					"Report Entry #2 (timestamp: " + Year.now(), "- bar: baz\n", "- qux: foo\n");
 	}
 
 	private void executeTests(TestEngine engine, Path tempDirectory) {
@@ -414,11 +368,13 @@ private void executeTests(TestEngine engine, Path tempDirectory, Clock clock) {
 		launcher.execute(request().selectors(selectUniqueId(UniqueId.forEngine(engine.getId()))).build());
 	}
 
-	private String readValidXmlFile(Path xmlFile) throws Exception {
+	private Match readValidXmlFile(Path xmlFile) throws Exception {
 		assertTrue(Files.exists(xmlFile), () -> "File does not exist: " + xmlFile);
-		var content = Files.readString(xmlFile);
-		assertValidAccordingToJenkinsSchema(content);
-		return content;
+		try (var reader = Files.newBufferedReader(xmlFile)) {
+			var xml = $(reader);
+			assertValidAccordingToJenkinsSchema(xml.document());
+			return xml;
+		}
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
index a64c5d758ce0..b3d1037db4ac 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
@@ -12,14 +12,13 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-import java.io.StringReader;
-
 import javax.xml.XMLConstants;
-import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.dom.DOMSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
+import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 /**
@@ -27,14 +26,14 @@
  */
 class XmlReportAssertions {
 
-	static void assertValidAccordingToJenkinsSchema(String content) throws Exception {
+	static void assertValidAccordingToJenkinsSchema(Document document) throws Exception {
 		try {
 			// Schema is thread-safe, Validator is not
 			var validator = CachedSchema.JENKINS.newValidator();
-			validator.validate(new StreamSource(new StringReader(content)));
+			validator.validate(new DOMSource(document));
 		}
 		catch (SAXException e) {
-			fail("Invalid XML document: " + content, e);
+			fail("Invalid XML document: " + document, e);
 		}
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index 923413491208..2b6cdf1dceeb 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -11,6 +11,7 @@
 package org.junit.platform.reporting.legacy.xml;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.joox.JOOX.$;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement;
@@ -20,6 +21,7 @@
 import static org.junit.platform.launcher.LauncherConstants.STDOUT_REPORT_ENTRY_KEY;
 import static org.junit.platform.reporting.legacy.xml.XmlReportAssertions.assertValidAccordingToJenkinsSchema;
 
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.time.Clock;
@@ -27,8 +29,8 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import org.joox.Match;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -52,16 +54,13 @@ void writesTestsuiteElementsWithoutTestcaseElementsWithoutAnyTests() throws Exce
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 
-		var content = writeXmlReport(testPlan, reportData);
+		var testsuite = writeXmlReport(testPlan, reportData);
 
-		assertValidAccordingToJenkinsSchema(content);
-		//@formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testsuite name=\"Engine\" tests=\"0\"",
-				"</testsuite>")
-			.doesNotContain("<testcase");
-		//@formatter:on
+		assertValidAccordingToJenkinsSchema(testsuite.document());
+		assertThat(testsuite.document().getDocumentElement().getTagName()).isEqualTo("testsuite");
+		assertThat(testsuite.attr("name")).isEqualTo("Engine");
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(0);
+		assertThat(testsuite.find("testcase")).isEmpty();
 	}
 
 	@Test
@@ -75,17 +74,11 @@ void writesReportEntry() throws Exception {
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), ReportEntry.from("myKey", "myValue"));
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), successful());
 
-		var content = writeXmlReport(testPlan, reportData);
-
-		assertValidAccordingToJenkinsSchema(content);
-		//@formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<system-out>",
-					"Report Entry #1 (timestamp: ",
-					"- myKey: myValue",
-				"</system-out>");
-		//@formatter:on
+		var testsuite = writeXmlReport(testPlan, reportData);
+
+		assertValidAccordingToJenkinsSchema(testsuite.document());
+		assertThat(String.join("\n", testsuite.find("system-out").texts())) //
+				.containsSubsequence("Report Entry #1 (timestamp: ", "- myKey: myValue");
 	}
 
 	@Test
@@ -104,30 +97,18 @@ void writesCapturedOutput() throws Exception {
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), ReportEntry.from(Map.of("baz", "qux")));
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), successful());
 
-		var content = writeXmlReport(testPlan, reportData);
-
-		assertValidAccordingToJenkinsSchema(content);
-		//@formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<system-out>",
-					"unique-id: ", "test:test",
-					"display-name: successfulTest",
-				"</system-out>",
-				"<system-out>",
-					"Report Entry #1 (timestamp: ",
-					"- foo: bar",
-					"Report Entry #2 (timestamp: ",
-					"- baz: qux",
-				"</system-out>",
-				"<system-out>",
-					"normal output",
-				"</system-out>",
-				"<system-err>",
-					"error output",
-				"</system-err>")
-			.doesNotContain(STDOUT_REPORT_ENTRY_KEY, STDERR_REPORT_ENTRY_KEY);
-		//@formatter:on
+		var testsuite = writeXmlReport(testPlan, reportData);
+
+		assertValidAccordingToJenkinsSchema(testsuite.document());
+		assertThat(testsuite.find("system-out").text(0)) //
+				.containsSubsequence("unique-id: ", "test:test", "display-name: successfulTest");
+		assertThat(testsuite.find("system-out").text(1)) //
+				.containsSubsequence("Report Entry #1 (timestamp: ", "- foo: bar", "Report Entry #2 (timestamp: ",
+					"- baz: qux");
+		assertThat(testsuite.find("system-out").text(2).trim()) //
+				.isEqualTo("normal output");
+		assertThat(testsuite.find("system-err").text().trim()) //
+				.isEqualTo("error output");
 	}
 
 	@Test
@@ -139,16 +120,14 @@ void writesEmptySkippedElementForSkippedTestWithoutReason() throws Exception {
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markSkipped(testPlan.getTestIdentifier(uniqueId.toString()), null);
 
-		var content = writeXmlReport(testPlan, reportData);
+		var testsuite = writeXmlReport(testPlan, reportData);
 
-		assertValidAccordingToJenkinsSchema(content);
-		//@formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testcase name=\"skippedTest\"",
-				"<skipped/>",
-				"</testcase>");
-		//@formatter:on
+		assertValidAccordingToJenkinsSchema(testsuite.document());
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("skippedTest");
+		var skipped = testcase.child("skipped");
+		assertThat(skipped.size()).isEqualTo(1);
+		assertThat(skipped.children()).isEmpty();
 	}
 
 	@Test
@@ -171,16 +150,15 @@ public String getLegacyReportingName() {
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(null));
 
-		var content = writeXmlReport(testPlan, reportData);
+		var testsuite = writeXmlReport(testPlan, reportData);
 
-		assertValidAccordingToJenkinsSchema(content);
-		//@formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testcase name=\"failedTest\" classname=\"myEngine\"",
-				"<error/>",
-				"</testcase>");
-		//@formatter:on
+		assertValidAccordingToJenkinsSchema(testsuite.document());
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("failedTest");
+		assertThat(testcase.attr("classname")).isEqualTo("myEngine");
+		var error = testcase.child("error");
+		assertThat(error.size()).isEqualTo(1);
+		assertThat(error.children()).isEmpty();
 	}
 
 	@Test
@@ -192,16 +170,12 @@ void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exce
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(new NullPointerException()));
 
-		var content = writeXmlReport(testPlan, reportData);
+		var testsuite = writeXmlReport(testPlan, reportData);
 
-		assertValidAccordingToJenkinsSchema(content);
-		//@formatter:off
-		assertThat(content)
-			.containsSubsequence(
-				"<testcase name=\"failedTest\"",
-				"<error type=\"java.lang.NullPointerException\">",
-				"</testcase>");
-		//@formatter:on
+		assertValidAccordingToJenkinsSchema(testsuite.document());
+		var error = testsuite.find("error");
+		assertThat(error.attr("type")).isEqualTo("java.lang.NullPointerException");
+		assertThat(error.attr("message")).isNull();
 	}
 
 	@Test
@@ -214,21 +188,14 @@ void writesValidXmlEvenIfExceptionMessageContainsCData() throws Exception {
 		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
 
-		var content = writeXmlReport(testPlan, reportData);
-
-		assertValidAccordingToJenkinsSchema(content);
-		//@formatter:off
-		assertThat(content)
-				.containsSubsequence(
-						"<![CDATA[",
-						"<foo><![CDATA[bar]]]]><![CDATA[></foo>",
-						"]]>")
-				.doesNotContain(assertionError.getMessage());
-		//@formatter:on
+		var testsuite = writeXmlReport(testPlan, reportData);
+
+		assertValidAccordingToJenkinsSchema(testsuite.document());
+		assertThat(testsuite.find("failure").attr("message")).isEqualTo("<foo><![CDATA[bar]]></foo>");
 	}
 
 	@Test
-	void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages(TestInfo testInfo) throws Exception {
+	void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor));
@@ -238,18 +205,21 @@ void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages(TestInfo tes
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
 
 		System.setProperty("foo.bar", "\1");
-		String content;
+		Match testsuite;
 		try {
-			content = writeXmlReport(testPlan, reportData);
+			testsuite = writeXmlReport(testPlan, reportData);
 		}
 		finally {
 			System.getProperties().remove("foo.bar");
 		}
 
-		assertValidAccordingToJenkinsSchema(content);
-		assertThat(content) //
-				.contains("<property name=\"foo.bar\" value=\"&amp;#1;\"/>") //
-				.contains("failure message=\"expected: &lt;A&gt; but was: &lt;B&amp;#0;&gt;\"") //
+		assertValidAccordingToJenkinsSchema(testsuite.document());
+		assertThat(testsuite.find("property").matchAttr("name", "foo\\.bar").attr("value")) //
+				.isEqualTo("&#1;");
+		var failure = testsuite.find("failure");
+		assertThat(failure.attr("message")) //
+				.isEqualTo("expected: <A> but was: <B&#0;>");
+		assertThat(failure.text()) //
 				.contains("AssertionError: expected: <A> but was: <B&#0;>");
 	}
 
@@ -264,9 +234,10 @@ void doesNotReopenCDataWithinCDataContent() throws Exception {
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
 		Writer assertingWriter = new StringWriter() {
 
+			@SuppressWarnings("NullableProblems")
 			@Override
-			public void write(char[] cbuf, int off, int len) {
-				assertThat(new String(cbuf, off, len)).doesNotContain("]]><![CDATA[");
+			public void write(char[] buffer, int off, int len) {
+				assertThat(new String(buffer, off, len)).doesNotContain("]]><![CDATA[");
 			}
 		};
 
@@ -293,10 +264,10 @@ static Stream<Arguments> stringPairs() {
 		);
 	}
 
-	private String writeXmlReport(TestPlan testPlan, XmlReportData reportData) throws Exception {
+	private Match writeXmlReport(TestPlan testPlan, XmlReportData reportData) throws Exception {
 		var out = new StringWriter();
 		writeXmlReport(testPlan, reportData, out);
-		return out.toString();
+		return $(new StringReader(out.toString()));
 	}
 
 	private void writeXmlReport(TestPlan testPlan, XmlReportData reportData, Writer out) throws Exception {

From 68bcfdde3889ffe263869005453d531f2ceb3a12 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 31 Jan 2021 14:55:51 +0100
Subject: [PATCH 0192/1433] Improve failure message for null vs. null
 comparisons

Prior to this commit, if the expected and actual values for a failed
assertion both had "null" string representations and if either the
expected or actual value was the null reference, the generated failure
message looked something like the following.

    expected: null<null> but was: java.lang.String@264b3504<null>

This commit improves the assertion failure message in such cases by
representing the null reference as "<null>" instead of "null<null>",
leading to generated failure messages similar to the following.

    expected: <null> but was: java.lang.String@264b3504<null>

This improvement applies to assertEquals(), assertNull, and any other
assertion that internally delegates to format(Object, Object, String) or
formatValues(Object, Object) in AssertionUtils.

See #2523
---
 .../org/junit/jupiter/api/AssertionUtils.java |  4 +++
 .../api/AssertEqualsAssertionsTests.java      | 26 +++++++++++++++++++
 .../api/AssertNullAssertionsTests.java        |  8 +++---
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
index a091cf0947e6..faeeb6ab6808 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
@@ -123,6 +123,10 @@ static String formatValues(Object expected, Object actual) {
 	}
 
 	private static String formatClassAndValue(Object value, String valueString) {
+		// If the value is null, return <null> instead of null<null>.
+		if (value == null) {
+			return "<null>";
+		}
 		String classAndHash = getClassName(value) + toHash(value);
 		// if it's a class, there's no need to repeat the class name contained in the valueString.
 		return (value instanceof Class ? "<" + classAndHash + ">" : classAndHash + "<" + valueString + ">");
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
index e8629ae6ec9f..288cb8a51875 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
@@ -550,6 +550,32 @@ void assertEqualsWithObjectVsNull() {
 		}
 	}
 
+	@Test
+	void assertEqualsWithObjectWithNullStringReturnedFromToStringVsNull() {
+		try {
+			assertEquals("null", null);
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageStartsWith(ex, "expected: java.lang.String@");
+			assertMessageEndsWith(ex, "<null> but was: <null>");
+			assertExpectedAndActualValues(ex, "null", null);
+		}
+	}
+
+	@Test
+	void assertEqualsWithNullVsObjectWithNullStringReturnedFromToString() {
+		try {
+			assertEquals(null, "null");
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageStartsWith(ex, "expected: <null> but was: java.lang.String@");
+			assertMessageEndsWith(ex, "<null>");
+			assertExpectedAndActualValues(ex, null, "null");
+		}
+	}
+
 	@Test
 	void assertEqualsWithNullVsObjectAndMessageSupplier() {
 		try {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
index a47ca27207d6..e219e3342189 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
@@ -74,9 +74,9 @@ private void assertNullWithNonNullObjectWithNullStringReturnedFromToString(Suppl
 		}
 		catch (AssertionFailedError ex) {
 			// Should look something like:
-			// expected: null<null> but was: java.lang.String@264b3504<null>
+			// expected: <null> but was: java.lang.String@264b3504<null>
 			String prefix = (messageSupplier != null ? messageSupplier.get() + " ==> " : "");
-			assertMessageStartsWith(ex, prefix + "expected: null<null> but was: java.lang.String@");
+			assertMessageStartsWith(ex, prefix + "expected: <null> but was: java.lang.String@");
 			assertMessageEndsWith(ex, "<null>");
 			assertExpectedAndActualValues(ex, null, actual);
 		}
@@ -105,10 +105,10 @@ private void assertNullWithNonNullObjectWithNullReferenceReturnedFromToString(Su
 		}
 		catch (AssertionFailedError ex) {
 			// Should look something like:
-			// expected: null<null> but was: org.junit.jupiter.api.AssertNullAssertionsTests$NullToString@4e7912d8<null>
+			// expected: <null> but was: org.junit.jupiter.api.AssertNullAssertionsTests$NullToString@4e7912d8<null>
 			String prefix = (messageSupplier != null ? messageSupplier.get() + " ==> " : "");
 			assertMessageStartsWith(ex,
-				prefix + "expected: null<null> but was: org.junit.jupiter.api.AssertNullAssertionsTests$NullToString@");
+				prefix + "expected: <null> but was: org.junit.jupiter.api.AssertNullAssertionsTests$NullToString@");
 			assertMessageEndsWith(ex, "<null>");
 			assertExpectedAndActualValues(ex, null, actual);
 		}

From ebe74080110975b0c1b013c8d4e635ba1e98edc8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 31 Jan 2021 17:28:24 +0100
Subject: [PATCH 0193/1433] Introduce AssertionTestUtils.assertMessageMatches

assertMessageMatches() is a convenience method for using a RegEx instead
of assertMessageStartsWith()/assertMessageEndsWith() combos.

This commit makes use of the new method in AssertNullAssertionsTests but
leaves all other existing tests unchanged.

assertMessageMatches() can be used for new tests, or we can slowly
migrate to it where it makes sense as we modify existing tests for some
other reason.
---
 .../api/AssertNullAssertionsTests.java        | 20 ++++++++-----------
 .../junit/jupiter/api/AssertionTestUtils.java |  7 +++++++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
index e219e3342189..54849ad6d3be 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
@@ -11,8 +11,8 @@
 package org.junit.jupiter.api;
 
 import static org.junit.jupiter.api.AssertionTestUtils.assertExpectedAndActualValues;
-import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEndsWith;
-import static org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith;
+import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals;
+import static org.junit.jupiter.api.AssertionTestUtils.assertMessageMatches;
 import static org.junit.jupiter.api.AssertionTestUtils.expectAssertionFailedError;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -46,7 +46,7 @@ void assertNullWithNonNullObject() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageEndsWith(ex, "expected: <null> but was: <foo>");
+			assertMessageEquals(ex, "expected: <null> but was: <foo>");
 			assertExpectedAndActualValues(ex, null, "foo");
 		}
 	}
@@ -76,8 +76,7 @@ private void assertNullWithNonNullObjectWithNullStringReturnedFromToString(Suppl
 			// Should look something like:
 			// expected: <null> but was: java.lang.String@264b3504<null>
 			String prefix = (messageSupplier != null ? messageSupplier.get() + " ==> " : "");
-			assertMessageStartsWith(ex, prefix + "expected: <null> but was: java.lang.String@");
-			assertMessageEndsWith(ex, "<null>");
+			assertMessageMatches(ex, prefix + "expected: <null> but was: java\\.lang\\.String@.+<null>");
 			assertExpectedAndActualValues(ex, null, actual);
 		}
 	}
@@ -107,9 +106,8 @@ private void assertNullWithNonNullObjectWithNullReferenceReturnedFromToString(Su
 			// Should look something like:
 			// expected: <null> but was: org.junit.jupiter.api.AssertNullAssertionsTests$NullToString@4e7912d8<null>
 			String prefix = (messageSupplier != null ? messageSupplier.get() + " ==> " : "");
-			assertMessageStartsWith(ex,
-				prefix + "expected: <null> but was: org.junit.jupiter.api.AssertNullAssertionsTests$NullToString@");
-			assertMessageEndsWith(ex, "<null>");
+			assertMessageMatches(ex, prefix
+					+ "expected: <null> but was: org\\.junit\\.jupiter\\.api\\.AssertNullAssertionsTests\\$NullToString@.+<null>");
 			assertExpectedAndActualValues(ex, null, actual);
 		}
 	}
@@ -121,8 +119,7 @@ void assertNullWithNonNullObjectAndMessage() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "a message");
-			assertMessageEndsWith(ex, "expected: <null> but was: <foo>");
+			assertMessageEquals(ex, "a message ==> expected: <null> but was: <foo>");
 			assertExpectedAndActualValues(ex, null, "foo");
 		}
 	}
@@ -134,8 +131,7 @@ void assertNullWithNonNullObjectAndMessageSupplier() {
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "test");
-			assertMessageEndsWith(ex, "expected: <null> but was: <foo>");
+			assertMessageEquals(ex, "test ==> expected: <null> but was: <foo>");
 			assertExpectedAndActualValues(ex, null, "foo");
 		}
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
index a95c27212ab1..a2cd16f66290 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
@@ -38,6 +38,13 @@ static void assertMessageEquals(Throwable ex, String msg) throws AssertionError
 		}
 	}
 
+	static void assertMessageMatches(Throwable ex, String regex) throws AssertionError {
+		if (!ex.getMessage().matches(regex)) {
+			throw new AssertionError("Exception message should match regular expression [" + regex + "], but was ["
+					+ ex.getMessage() + "].");
+		}
+	}
+
 	static void assertMessageStartsWith(Throwable ex, String msg) throws AssertionError {
 		if (!ex.getMessage().startsWith(msg)) {
 			throw new AssertionError(

From 3583c879a4d9b3e8b4df573a788157d97667c8e7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 1 Feb 2021 19:30:32 +0100
Subject: [PATCH 0194/1433] Fix container failure XML reporting (#2542)

Prior to this commit, failing containers were only reported in case they
contained at least one test. However, for example for a parameterized
Jupiter tests and an exception in a `@BeforeAll` method, that led to
failures being silently swallowed. Now, in addition to tests, leaf
nodes of the test tree are always included in the XML report, even if
they are containers, not tests.

Moreover, failures on the container level that occurred after their
children had been executed were not reported, e.g. when an exception
was thrown from a Jupiter `@AfterAll` method. Now such failures cause
the contained tests to be reported as failed.

Fixes #2537.
---
 .../release-notes/release-notes-5.7.1.adoc    |   2 +
 .../DemoEngineExecutionContext.java           |   2 +-
 .../DemoHierarchicalTestDescriptor.java       |   2 +-
 .../DemoHierarchicalTestEngine.java           |  23 ++-
 .../reporting/legacy/xml/XmlReportData.java   |  38 ++--
 .../reporting/legacy/xml/XmlReportWriter.java | 172 ++++++++++--------
 ...egacyXmlReportGeneratingListenerTests.java |  90 +++++++--
 .../legacy/xml/XmlReportDataTests.java        |  18 +-
 8 files changed, 221 insertions(+), 126 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index 34aec9be9e00..535dd7bd657f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -27,6 +27,8 @@ GitHub.
   of this change may be witnessed by end users and test engine or extension authors.
 * Method `scanForClassesInPackage(String)` in `ClasspathScanner` now returns a valid list
   of class names when the package name is equal to the name of a module on the module path.
+* The legacy XML report now always includes container-level failures (e.g. from
+  `@BeforeAll` Jupiter lifecycle methods).
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
index 174d51196bcf..8baf48abf067 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
@@ -13,5 +13,5 @@
 /**
  * @since 1.0
  */
-class DemoEngineExecutionContext implements EngineExecutionContext {
+public class DemoEngineExecutionContext implements EngineExecutionContext {
 }
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
index 57058e827a75..320e712a7d28 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
@@ -26,7 +26,7 @@ public class DemoHierarchicalTestDescriptor extends AbstractTestDescriptor imple
 	private String skippedReason;
 	private boolean skipped;
 
-	DemoHierarchicalTestDescriptor(UniqueId uniqueId, String displayName, Runnable executeBlock) {
+	public DemoHierarchicalTestDescriptor(UniqueId uniqueId, String displayName, Runnable executeBlock) {
 		this(uniqueId, displayName, null, executeBlock);
 	}
 
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
index f389c7682690..f4e6c3fd300c 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
+import java.util.function.Function;
+
 import org.junit.platform.engine.EngineDiscoveryRequest;
 import org.junit.platform.engine.ExecutionRequest;
 import org.junit.platform.engine.TestDescriptor;
@@ -47,10 +49,8 @@ public DemoHierarchicalTestDescriptor addTest(String uniqueName, Runnable execut
 	}
 
 	public DemoHierarchicalTestDescriptor addTest(String uniqueName, String displayName, Runnable executeBlock) {
-		var uniqueId = engineDescriptor.getUniqueId().append("test", uniqueName);
-		var child = new DemoHierarchicalTestDescriptor(uniqueId, displayName, executeBlock);
-		engineDescriptor.addChild(child);
-		return child;
+		return addChild(uniqueName, uniqueId -> new DemoHierarchicalTestDescriptor(uniqueId, displayName, executeBlock),
+			"test");
 	}
 
 	public DemoHierarchicalContainerDescriptor addContainer(String uniqueName, String displayName, TestSource source) {
@@ -64,10 +64,17 @@ public DemoHierarchicalContainerDescriptor addContainer(String uniqueName, Runna
 	public DemoHierarchicalContainerDescriptor addContainer(String uniqueName, String displayName, TestSource source,
 			Runnable beforeBlock) {
 
-		var uniqueId = engineDescriptor.getUniqueId().append("container", uniqueName);
-		var container = new DemoHierarchicalContainerDescriptor(uniqueId, displayName, source, beforeBlock);
-		engineDescriptor.addChild(container);
-		return container;
+		return addChild(uniqueName,
+			uniqueId -> new DemoHierarchicalContainerDescriptor(uniqueId, displayName, source, beforeBlock),
+			"container");
+	}
+
+	public <T extends TestDescriptor & Node<DemoEngineExecutionContext>> T addChild(String uniqueName,
+			Function<UniqueId, T> creator, String segmentType) {
+		var uniqueId = engineDescriptor.getUniqueId().append(segmentType, uniqueName);
+		var child = creator.apply(uniqueId);
+		engineDescriptor.addChild(child);
+		return child;
 	}
 
 	@Override
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
index 000fbd7015c7..18437a60b6b5 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
@@ -11,8 +11,8 @@
 package org.junit.platform.reporting.legacy.xml;
 
 import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
 import static org.junit.platform.engine.TestExecutionResult.Status.ABORTED;
-import static org.junit.platform.engine.TestExecutionResult.Status.SUCCESSFUL;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
@@ -103,19 +104,11 @@ String getSkipReason(TestIdentifier testIdentifier) {
 		}).orElse(null);
 	}
 
-	Optional<TestExecutionResult> getResult(TestIdentifier testIdentifier) {
-		if (this.finishedTests.containsKey(testIdentifier)) {
-			return Optional.of(this.finishedTests.get(testIdentifier));
-		}
-		Optional<TestIdentifier> parent = this.testPlan.getParent(testIdentifier);
-		Optional<TestIdentifier> ancestor = findAncestor(parent, this.finishedTests::containsKey);
-		if (ancestor.isPresent()) {
-			TestExecutionResult result = this.finishedTests.get(ancestor.get());
-			if (result.getStatus() != SUCCESSFUL) {
-				return Optional.of(result);
-			}
-		}
-		return Optional.empty();
+	List<TestExecutionResult> getResults(TestIdentifier testIdentifier) {
+		return getAncestors(testIdentifier).stream() //
+				.map(this.finishedTests::get) //
+				.filter(Objects::nonNull) //
+				.collect(toList());
 	}
 
 	List<ReportEntry> getReportEntries(TestIdentifier testIdentifier) {
@@ -123,12 +116,11 @@ List<ReportEntry> getReportEntries(TestIdentifier testIdentifier) {
 	}
 
 	private Optional<TestIdentifier> findSkippedAncestor(TestIdentifier testIdentifier) {
-		return findAncestor(Optional.of(testIdentifier), this.skippedTests::containsKey);
+		return findAncestor(testIdentifier, this.skippedTests::containsKey);
 	}
 
-	private Optional<TestIdentifier> findAncestor(Optional<TestIdentifier> testIdentifier,
-			Predicate<TestIdentifier> predicate) {
-		Optional<TestIdentifier> current = testIdentifier;
+	private Optional<TestIdentifier> findAncestor(TestIdentifier testIdentifier, Predicate<TestIdentifier> predicate) {
+		Optional<TestIdentifier> current = Optional.of(testIdentifier);
 		while (current.isPresent()) {
 			if (predicate.test(current.get())) {
 				return current;
@@ -138,4 +130,14 @@ private Optional<TestIdentifier> findAncestor(Optional<TestIdentifier> testIdent
 		return Optional.empty();
 	}
 
+	private List<TestIdentifier> getAncestors(TestIdentifier testIdentifier) {
+		TestIdentifier current = testIdentifier;
+		List<TestIdentifier> ancestors = new ArrayList<>();
+		while (current != null) {
+			ancestors.add(current);
+			current = this.testPlan.getParent(current).orElse(null);
+		}
+		return ancestors;
+	}
+
 }
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
index 4724a36948e6..015cfe0fa2d2 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
@@ -12,12 +12,23 @@
 
 import static java.text.MessageFormat.format;
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+import static java.util.Collections.emptyList;
+import static java.util.Comparator.naturalOrder;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.counting;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
 import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
 import static org.junit.platform.commons.util.ExceptionUtils.readStackTrace;
 import static org.junit.platform.commons.util.StringUtils.isNotBlank;
 import static org.junit.platform.engine.TestExecutionResult.Status.FAILED;
 import static org.junit.platform.launcher.LauncherConstants.STDERR_REPORT_ENTRY_KEY;
 import static org.junit.platform.launcher.LauncherConstants.STDOUT_REPORT_ENTRY_KEY;
+import static org.junit.platform.reporting.legacy.xml.XmlReportWriter.AggregatedTestResult.Type.ERROR;
+import static org.junit.platform.reporting.legacy.xml.XmlReportWriter.AggregatedTestResult.Type.FAILURE;
+import static org.junit.platform.reporting.legacy.xml.XmlReportWriter.AggregatedTestResult.Type.SKIPPED;
+import static org.junit.platform.reporting.legacy.xml.XmlReportWriter.AggregatedTestResult.Type.SUCCESS;
 
 import java.io.Writer;
 import java.net.InetAddress;
@@ -25,10 +36,13 @@
 import java.text.NumberFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.TreeSet;
@@ -41,7 +55,9 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.reporting.legacy.LegacyReportingUtils;
+import org.junit.platform.reporting.legacy.xml.XmlReportWriter.AggregatedTestResult.Type;
 
 /**
  * {@code XmlReportWriter} writes an XML report whose format is compatible
@@ -62,18 +78,28 @@ class XmlReportWriter {
 		this.reportData = reportData;
 	}
 
-	void writeXmlReport(TestIdentifier testIdentifier, Writer out) throws XMLStreamException {
-		// @formatter:off
-		List<TestIdentifier> tests = this.reportData.getTestPlan().getDescendants(testIdentifier)
-				.stream()
-				.filter(TestIdentifier::isTest)
-				.collect(toList());
-		// @formatter:on
-		writeXmlReport(testIdentifier, tests, out);
+	void writeXmlReport(TestIdentifier rootDescriptor, Writer out) throws XMLStreamException {
+		TestPlan testPlan = this.reportData.getTestPlan();
+		Map<TestIdentifier, AggregatedTestResult> tests = testPlan.getDescendants(rootDescriptor) //
+				.stream() //
+				.filter(testIdentifier -> shouldInclude(testPlan, testIdentifier)) //
+				.collect(toMap(identity(), this::toAggregatedResult)); //
+		writeXmlReport(rootDescriptor, tests, out);
 	}
 
-	private void writeXmlReport(TestIdentifier testIdentifier, List<TestIdentifier> tests, Writer out)
-			throws XMLStreamException {
+	private AggregatedTestResult toAggregatedResult(TestIdentifier testIdentifier) {
+		if (this.reportData.wasSkipped(testIdentifier)) {
+			return AggregatedTestResult.skipped();
+		}
+		return AggregatedTestResult.nonSkipped(this.reportData.getResults(testIdentifier));
+	}
+
+	private boolean shouldInclude(TestPlan testPlan, TestIdentifier testIdentifier) {
+		return testIdentifier.isTest() || testPlan.getChildren(testIdentifier).isEmpty();
+	}
+
+	private void writeXmlReport(TestIdentifier testIdentifier, Map<TestIdentifier, AggregatedTestResult> tests,
+			Writer out) throws XMLStreamException {
 
 		XMLOutputFactory factory = XMLOutputFactory.newInstance();
 		XMLStreamWriter xmlWriter = factory.createXMLStreamWriter(out);
@@ -85,8 +111,8 @@ private void writeXmlReport(TestIdentifier testIdentifier, List<TestIdentifier>
 		xmlWriter.close();
 	}
 
-	private void writeTestsuite(TestIdentifier testIdentifier, List<TestIdentifier> tests, XMLStreamWriter writer)
-			throws XMLStreamException {
+	private void writeTestsuite(TestIdentifier testIdentifier, Map<TestIdentifier, AggregatedTestResult> tests,
+			XMLStreamWriter writer) throws XMLStreamException {
 
 		// NumberFormat is not thread-safe. Thus, we instantiate it here and pass it to
 		// writeTestcase instead of using a constant
@@ -94,13 +120,13 @@ private void writeTestsuite(TestIdentifier testIdentifier, List<TestIdentifier>
 
 		writer.writeStartElement("testsuite");
 
-		writeSuiteAttributes(testIdentifier, tests, numberFormat, writer);
+		writeSuiteAttributes(testIdentifier, tests.values(), numberFormat, writer);
 
 		newLine(writer);
 		writeSystemProperties(writer);
 
-		for (TestIdentifier test : tests) {
-			writeTestcase(test, numberFormat, writer);
+		for (Entry<TestIdentifier, AggregatedTestResult> entry : tests.entrySet()) {
+			writeTestcase(entry.getKey(), entry.getValue(), numberFormat, writer);
 		}
 
 		writeOutputElement("system-out", formatNonStandardAttributesAsString(testIdentifier), writer);
@@ -109,22 +135,24 @@ private void writeTestsuite(TestIdentifier testIdentifier, List<TestIdentifier>
 		newLine(writer);
 	}
 
-	private void writeSuiteAttributes(TestIdentifier testIdentifier, List<TestIdentifier> tests,
+	private void writeSuiteAttributes(TestIdentifier testIdentifier, Collection<AggregatedTestResult> testResults,
 			NumberFormat numberFormat, XMLStreamWriter writer) throws XMLStreamException {
 
 		writeAttributeSafely(writer, "name", testIdentifier.getDisplayName());
-		writeTestCounts(tests, writer);
+		writeTestCounts(testResults, writer);
 		writeAttributeSafely(writer, "time", getTime(testIdentifier, numberFormat));
 		writeAttributeSafely(writer, "hostname", getHostname().orElse("<unknown host>"));
 		writeAttributeSafely(writer, "timestamp", ISO_LOCAL_DATE_TIME.format(getCurrentDateTime()));
 	}
 
-	private void writeTestCounts(List<TestIdentifier> tests, XMLStreamWriter writer) throws XMLStreamException {
-		TestCounts testCounts = TestCounts.from(this.reportData, tests);
-		writeAttributeSafely(writer, "tests", String.valueOf(testCounts.getTotal()));
-		writeAttributeSafely(writer, "skipped", String.valueOf(testCounts.getSkipped()));
-		writeAttributeSafely(writer, "failures", String.valueOf(testCounts.getFailures()));
-		writeAttributeSafely(writer, "errors", String.valueOf(testCounts.getErrors()));
+	private void writeTestCounts(Collection<AggregatedTestResult> testResults, XMLStreamWriter writer)
+			throws XMLStreamException {
+		Map<Type, Long> counts = testResults.stream().map(it -> it.type).collect(groupingBy(identity(), counting()));
+		long total = counts.values().stream().mapToLong(Long::longValue).sum();
+		writeAttributeSafely(writer, "tests", String.valueOf(total));
+		writeAttributeSafely(writer, "skipped", counts.getOrDefault(SKIPPED, 0L).toString());
+		writeAttributeSafely(writer, "failures", counts.getOrDefault(FAILURE, 0L).toString());
+		writeAttributeSafely(writer, "errors", counts.getOrDefault(ERROR, 0L).toString());
 	}
 
 	private void writeSystemProperties(XMLStreamWriter writer) throws XMLStreamException {
@@ -141,8 +169,8 @@ private void writeSystemProperties(XMLStreamWriter writer) throws XMLStreamExcep
 		newLine(writer);
 	}
 
-	private void writeTestcase(TestIdentifier testIdentifier, NumberFormat numberFormat, XMLStreamWriter writer)
-			throws XMLStreamException {
+	private void writeTestcase(TestIdentifier testIdentifier, AggregatedTestResult testResult,
+			NumberFormat numberFormat, XMLStreamWriter writer) throws XMLStreamException {
 
 		writer.writeStartElement("testcase");
 
@@ -151,7 +179,7 @@ private void writeTestcase(TestIdentifier testIdentifier, NumberFormat numberFor
 		writeAttributeSafely(writer, "time", getTime(testIdentifier, numberFormat));
 		newLine(writer);
 
-		writeSkippedOrErrorOrFailureElement(testIdentifier, writer);
+		writeSkippedOrErrorOrFailureElement(testIdentifier, testResult, writer);
 
 		List<String> systemOutElements = new ArrayList<>();
 		List<String> systemErrElements = new ArrayList<>();
@@ -172,16 +200,18 @@ private String getClassName(TestIdentifier testIdentifier) {
 		return LegacyReportingUtils.getClassName(this.reportData.getTestPlan(), testIdentifier);
 	}
 
-	private void writeSkippedOrErrorOrFailureElement(TestIdentifier testIdentifier, XMLStreamWriter writer)
-			throws XMLStreamException {
+	private void writeSkippedOrErrorOrFailureElement(TestIdentifier testIdentifier, AggregatedTestResult testResult,
+			XMLStreamWriter writer) throws XMLStreamException {
 
-		if (this.reportData.wasSkipped(testIdentifier)) {
+		if (testResult.type == SKIPPED) {
 			writeSkippedElement(this.reportData.getSkipReason(testIdentifier), writer);
 		}
 		else {
-			Optional<TestExecutionResult> result = this.reportData.getResult(testIdentifier);
-			if (result.isPresent() && result.get().getStatus() == FAILED) {
-				writeErrorOrFailureElement(result.get(), writer);
+			Map<Type, List<Optional<Throwable>>> throwablesByType = testResult.getThrowablesByType();
+			for (Type type : EnumSet.of(FAILURE, ERROR)) {
+				for (Optional<Throwable> throwable : throwablesByType.getOrDefault(type, emptyList())) {
+					writeErrorOrFailureElement(type, throwable.orElse(null), writer);
+				}
 			}
 		}
 	}
@@ -198,17 +228,17 @@ private void writeSkippedElement(String reason, XMLStreamWriter writer) throws X
 		newLine(writer);
 	}
 
-	private void writeErrorOrFailureElement(TestExecutionResult result, XMLStreamWriter writer)
+	private void writeErrorOrFailureElement(Type type, Throwable throwable, XMLStreamWriter writer)
 			throws XMLStreamException {
 
-		Optional<Throwable> throwable = result.getThrowable();
-		if (throwable.isPresent()) {
-			writer.writeStartElement(isFailure(result) ? "failure" : "error");
-			writeFailureAttributesAndContent(throwable.get(), writer);
+		String elementName = type == FAILURE ? "failure" : "error";
+		if (throwable != null) {
+			writer.writeStartElement(elementName);
+			writeFailureAttributesAndContent(throwable, writer);
 			writer.writeEndElement();
 		}
 		else {
-			writer.writeEmptyElement("error");
+			writer.writeEmptyElement(elementName);
 		}
 		newLine(writer);
 	}
@@ -342,54 +372,46 @@ private static boolean isFailure(TestExecutionResult result) {
 		return throwable.isPresent() && throwable.get() instanceof AssertionError;
 	}
 
-	private static class TestCounts {
-
-		static TestCounts from(XmlReportData reportData, List<TestIdentifier> tests) {
-			TestCounts counts = new TestCounts(tests.size());
-			for (TestIdentifier test : tests) {
-				if (reportData.wasSkipped(test)) {
-					counts.skipped++;
-				}
-				else {
-					Optional<TestExecutionResult> result = reportData.getResult(test);
-					if (result.isPresent() && result.get().getStatus() == FAILED) {
-						if (isFailure(result.get())) {
-							counts.failures++;
-						}
-						else {
-							counts.errors++;
-						}
-					}
-				}
-			}
-			return counts;
-		}
+	static class AggregatedTestResult {
 
-		private final long total;
-		private long skipped;
-		private long failures;
-		private long errors;
+		private static final AggregatedTestResult SKIPPED_RESULT = new AggregatedTestResult(SKIPPED, emptyList());
 
-		TestCounts(long total) {
-			this.total = total;
+		public static AggregatedTestResult skipped() {
+			return SKIPPED_RESULT;
 		}
 
-		public long getTotal() {
-			return total;
+		public static AggregatedTestResult nonSkipped(List<TestExecutionResult> executionResults) {
+			Type type = executionResults.stream() //
+					.map(Type::from) //
+					.max(naturalOrder()) //
+					.orElse(SUCCESS);
+			return new AggregatedTestResult(type, executionResults);
 		}
 
-		public long getSkipped() {
-			return skipped;
-		}
+		private final Type type;
+		private final List<TestExecutionResult> executionResults;
 
-		public long getFailures() {
-			return failures;
+		private AggregatedTestResult(Type type, List<TestExecutionResult> executionResults) {
+			this.type = type;
+			this.executionResults = executionResults;
 		}
 
-		public long getErrors() {
-			return errors;
+		public Map<Type, List<Optional<Throwable>>> getThrowablesByType() {
+			return executionResults.stream() //
+					.collect(groupingBy(Type::from, mapping(TestExecutionResult::getThrowable, toList())));
 		}
 
+		enum Type {
+
+			SUCCESS, SKIPPED, FAILURE, ERROR;
+
+			private static Type from(TestExecutionResult executionResult) {
+				if (executionResult.getStatus() == FAILED) {
+					return isFailure(executionResult) ? FAILURE : ERROR;
+				}
+				return SUCCESS;
+			}
+		}
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index e0c73d2039f2..546cb1331c1f 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -45,6 +45,9 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
+import org.junit.platform.engine.support.hierarchical.DemoEngineExecutionContext;
+import org.junit.platform.engine.support.hierarchical.DemoHierarchicalContainerDescriptor;
+import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestDescriptor;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 import org.junit.platform.fakes.TestDescriptorStub;
 import org.junit.platform.launcher.TestIdentifier;
@@ -58,8 +61,11 @@
  */
 class LegacyXmlReportGeneratingListenerTests {
 
+	@TempDir
+	Path tempDirectory;
+
 	@Test
-	void writesFileForSingleSucceedingTest(@TempDir Path tempDirectory) throws Exception {
+	void writesFileForSingleSucceedingTest() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("succeedingTest", "display<-->Name 😎", () -> {
 		});
@@ -89,7 +95,7 @@ void writesFileForSingleSucceedingTest(@TempDir Path tempDirectory) throws Excep
 	}
 
 	@Test
-	void writesFileForSingleFailingTest(@TempDir Path tempDirectory) throws Exception {
+	void writesFileForSingleFailingTest() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("failingTest", () -> fail("expected to <b>fail</b>"));
 
@@ -115,7 +121,7 @@ void writesFileForSingleFailingTest(@TempDir Path tempDirectory) throws Exceptio
 	}
 
 	@Test
-	void writesFileForSingleErroneousTest(@TempDir Path tempDirectory) throws Exception {
+	void writesFileForSingleErroneousTest() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("failingTest", () -> {
 			throw new RuntimeException("error occurred");
@@ -143,7 +149,7 @@ void writesFileForSingleErroneousTest(@TempDir Path tempDirectory) throws Except
 	}
 
 	@Test
-	void writesFileForSingleSkippedTest(@TempDir Path tempDirectory) throws Exception {
+	void writesFileForSingleSkippedTest() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		var testDescriptor = engine.addTest("skippedTest", () -> fail("never called"));
 		testDescriptor.markSkipped("should be skipped");
@@ -167,7 +173,7 @@ void writesFileForSingleSkippedTest(@TempDir Path tempDirectory) throws Exceptio
 
 	@SuppressWarnings("ConstantConditions")
 	@Test
-	void writesFileForSingleAbortedTest(@TempDir Path tempDirectory) throws Exception {
+	void writesFileForSingleAbortedTest() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("abortedTest", () -> assumeFalse(true, "deliberately aborted"));
 
@@ -190,7 +196,7 @@ void writesFileForSingleAbortedTest(@TempDir Path tempDirectory) throws Exceptio
 	}
 
 	@Test
-	void measuresTimesInSeconds(@TempDir Path tempDirectory) throws Exception {
+	void measuresTimesInSeconds() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("firstTest", () -> {
 		});
@@ -216,7 +222,7 @@ void measuresTimesInSeconds(@TempDir Path tempDirectory) throws Exception {
 	}
 
 	@Test
-	void testWithImmeasurableTimeIsOutputCorrectly(@TempDir Path tempDirectory) throws Exception {
+	void testWithImmeasurableTimeIsOutputCorrectly() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> {
 		});
@@ -229,7 +235,7 @@ void testWithImmeasurableTimeIsOutputCorrectly(@TempDir Path tempDirectory) thro
 	}
 
 	@Test
-	void writesFileForSkippedContainer(@TempDir Path tempDirectory) throws Exception {
+	void writesFileForSkippedContainer() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> fail("never called"));
 		engine.getEngineDescriptor().markSkipped("should be skipped");
@@ -247,7 +253,7 @@ void writesFileForSkippedContainer(@TempDir Path tempDirectory) throws Exception
 	}
 
 	@Test
-	void writesFileForFailingContainer(@TempDir Path tempDirectory) throws Exception {
+	void writesFileForFailingContainer() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> fail("never called"));
 		engine.getEngineDescriptor().setBeforeAllBehavior(() -> fail("failure before all tests"));
@@ -269,7 +275,63 @@ void writesFileForFailingContainer(@TempDir Path tempDirectory) throws Exception
 	}
 
 	@Test
-	void writesSystemProperties(@TempDir Path tempDirectory) throws Exception {
+	void writesFileForFailingContainerWithoutTest() throws Exception {
+		var engine = new DemoHierarchicalTestEngine("dummy");
+		engine.addContainer("failingContainer", () -> {
+			throw new RuntimeException("boom");
+		});
+
+		executeTests(engine, tempDirectory);
+
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("errors", int.class)).isEqualTo(1);
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("failingContainer");
+		assertThat(testcase.attr("classname")).isEqualTo("dummy");
+
+		var error = testcase.child("error");
+		assertThat(error.attr("message")).isEqualTo("boom");
+		assertThat(error.attr("type")).isEqualTo(RuntimeException.class.getName());
+		assertThat(error.text()).containsSubsequence("RuntimeException: boom", "\tat");
+	}
+
+	@Test
+	void writesFileForContainerFailingAfterTest() throws Exception {
+		var engine = new DemoHierarchicalTestEngine("dummy");
+
+		var container = engine.addChild("failingContainer",
+			uniqueId -> new DemoHierarchicalContainerDescriptor(uniqueId, "failingContainer", null, null) {
+				@Override
+				public void after(DemoEngineExecutionContext context) {
+					throw new RuntimeException("boom");
+				}
+			}, "child");
+		container.addChild(
+			new DemoHierarchicalTestDescriptor(container.getUniqueId().append("test", "someTest"), "someTest", () -> {
+			}));
+
+		executeTests(engine, tempDirectory);
+
+		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
+
+		assertThat(testsuite.attr("tests", int.class)).isEqualTo(1);
+		assertThat(testsuite.attr("errors", int.class)).isEqualTo(1);
+
+		var testcase = testsuite.child("testcase");
+		assertThat(testcase.attr("name")).isEqualTo("someTest");
+		assertThat(testcase.attr("classname")).isEqualTo("failingContainer");
+
+		var error = testcase.child("error");
+		assertThat(error.attr("message")).isEqualTo("boom");
+		assertThat(error.attr("type")).isEqualTo(RuntimeException.class.getName());
+		assertThat(error.text()).containsSubsequence("RuntimeException: boom", "\tat");
+	}
+
+	@Test
+	void writesSystemProperties() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> {
 		});
@@ -283,7 +345,7 @@ void writesSystemProperties(@TempDir Path tempDirectory) throws Exception {
 	}
 
 	@Test
-	void writesHostNameAndTimestamp(@TempDir Path tempDirectory) throws Exception {
+	void writesHostNameAndTimestamp() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("test", () -> {
 		});
@@ -299,7 +361,7 @@ void writesHostNameAndTimestamp(@TempDir Path tempDirectory) throws Exception {
 	}
 
 	@Test
-	void printsExceptionWhenReportsDirCannotBeCreated(@TempDir Path tempDirectory) throws Exception {
+	void printsExceptionWhenReportsDirCannotBeCreated() throws Exception {
 		var reportsDir = tempDirectory.resolve("dummy.txt");
 		Files.write(reportsDir, Set.of("content"));
 
@@ -313,7 +375,7 @@ void printsExceptionWhenReportsDirCannotBeCreated(@TempDir Path tempDirectory) t
 	}
 
 	@Test
-	void printsExceptionWhenReportCouldNotBeWritten(@TempDir Path tempDirectory) throws Exception {
+	void printsExceptionWhenReportCouldNotBeWritten() throws Exception {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 
 		var xmlFile = tempDirectory.resolve("TEST-engine.xml");
@@ -329,7 +391,7 @@ void printsExceptionWhenReportCouldNotBeWritten(@TempDir Path tempDirectory) thr
 	}
 
 	@Test
-	void writesReportEntriesToSystemOutElement(@TempDir Path tempDirectory) throws Exception {
+	void writesReportEntriesToSystemOutElement() throws Exception {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor));
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index 7f339554a6ed..0a528f543559 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -29,19 +29,19 @@
 class XmlReportDataTests {
 
 	@Test
-	void resultOfTestIdentifierWithoutAnyReportedEventsIsEmpty() {
+	void resultsOfTestIdentifierWithoutAnyReportedEventsAreEmpty() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor));
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		var result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
+		var results = reportData.getResults(testPlan.getTestIdentifier("[child:test]"));
 
-		assertThat(result).isEmpty();
+		assertThat(results).isEmpty();
 	}
 
 	@Test
-	void resultOfTestIdentifierWithoutReportedEventsIsFailureOfAncestor() {
+	void resultsOfTestIdentifierWithoutReportedEventsContainsOnlyFailureOfAncestor() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor));
@@ -50,13 +50,13 @@ void resultOfTestIdentifierWithoutReportedEventsIsFailureOfAncestor() {
 		var failureOfAncestor = failed(new RuntimeException("failed!"));
 		reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), failureOfAncestor);
 
-		var result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
+		var results = reportData.getResults(testPlan.getTestIdentifier("[child:test]"));
 
-		assertThat(result).contains(failureOfAncestor);
+		assertThat(results).containsExactly(failureOfAncestor);
 	}
 
 	@Test
-	void resultOfTestIdentifierWithoutReportedEventsIsEmptyWhenAncestorWasSuccessful() {
+	void resultsOfTestIdentifierWithoutReportedEventsContainsOnlySuccessOfAncestor() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor));
@@ -64,8 +64,8 @@ void resultOfTestIdentifierWithoutReportedEventsIsEmptyWhenAncestorWasSuccessful
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());
 
-		var result = reportData.getResult(testPlan.getTestIdentifier("[child:test]"));
+		var results = reportData.getResults(testPlan.getTestIdentifier("[child:test]"));
 
-		assertThat(result).isEmpty();
+		assertThat(results).containsExactly(successful());
 	}
 }

From 5ad2cd621636adca469aa23871ecbe19018566f4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 1 Feb 2021 19:28:41 +0100
Subject: [PATCH 0195/1433] Upgrade ArchUnit to 0.16.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 76bd93b5a7bd..c7a69ac63ad5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,7 @@ picocli.version=4.6.1
 univocity-parsers.version=2.9.0
 
 # Test Dependencies
-archunit.version=0.15.0
+archunit.version=0.16.0
 bartholdy.version=0.2.3
 classgraph.version=4.8.98
 commons-io.version=2.8.0

From 24a1b9c0a3f38e1189e785b46671ce45c3b167a8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 4 Feb 2021 20:41:37 +0100
Subject: [PATCH 0196/1433] Finalize release notes for 5.7.1

---
 .../release-notes/release-notes-5.7.1.adoc    | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
index 535dd7bd657f..6264f0b4234e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.7.1]]
 == 5.7.1
 
-*Date of Release:* ❓
+*Date of Release:* February 4, 2021
 
 *Scope:* Bug fixes since 5.7.0
 
@@ -30,14 +30,6 @@ GitHub.
 * The legacy XML report now always includes container-level failures (e.g. from
   `@BeforeAll` Jupiter lifecycle methods).
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
-
 
 [[release-notes-5.7.1-junit-jupiter]]
 === JUnit Jupiter
@@ -51,10 +43,6 @@ GitHub.
 * Creator functions passed to `ExtensionContext.Store.getOrComputeIfAbsent()` are now only
   called once even if they throw an exception.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * The user guide now explains Nested Tests in more detail.
@@ -70,11 +58,3 @@ GitHub.
 
 * The legacy reporting name of top-level test classes is now always their fully-qualified
   class name. Previously, a textual description was returned for JUnit 3 suites.
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓

From da2dee2bfb89f480008bffb76cf08e612f642a63 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 4 Feb 2021 20:45:29 +0100
Subject: [PATCH 0197/1433] Release 5.7.1

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b7055b276a18..c6b6e453af25 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.7.0](https://github.com/junit-team/junit5/releases/tag/r5.7.0) (September 13, 2020)
+- General Availability (GA): [JUnit 5.7.1](https://github.com/junit-team/junit5/releases/tag/r5.7.1) (February 4, 2021)
 - Preview (Milestone/Release Candidate): n/a
 
 ## Documentation

From e1700117be9b28a0c958cb3a73b738969ca8ce77 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 6 Feb 2021 11:28:40 +0100
Subject: [PATCH 0198/1433] Upgradle to 6.8.2

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f604ed1642c0..299cd1a9e796 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionSha256Sum=8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 9bdc01e71e4ef1ce5aa19ea0f9ab60745059263e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 7 Feb 2021 16:42:19 +0100
Subject: [PATCH 0199/1433] Avoid publishing shadow jar twice

Prior to this commit, projects using shadow were publishing their jars
twice: once with "all" classifier and once without any classifier.
---
 buildSrc/src/main/kotlin/shadow-conventions.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
index 0a5d8db24510..0f1a4bc8d36d 100644
--- a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
@@ -49,6 +49,7 @@ tasks {
 	shadowJar {
 		configurations = listOf(shadowed)
 		exclude("META-INF/maven/**")
+		archiveClassifier.set("")
 	}
 	jar {
 		dependsOn(shadowJar)

From 189a5a224be2fcc35a3ca2f73be260b19277c45b Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Sun, 7 Feb 2021 17:32:50 +0100
Subject: [PATCH 0200/1433] Expect correct modular JAR file name

---
 .../jar-describe-module/junit-jupiter-params.expected.txt       | 2 +-
 .../jar-describe-module/junit-platform-console.expected.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
index 079a57db8655..328486500421 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.params@${jupiterVersion} jar:file:.+junit-jupiter-params/build/libs/junit-jupiter-params-${jupiterVersion}-all.jar..module-info.class
+org.junit.jupiter.params@${jupiterVersion} jar:file:.+junit-jupiter-params/build/libs/junit-jupiter-params-${jupiterVersion}.jar..module-info.class
 exports org.junit.jupiter.params
 exports org.junit.jupiter.params.aggregator
 exports org.junit.jupiter.params.converter
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
index 51cff827ef0e..54620335d7b3 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.console@${platformVersion} jar:file:.+junit-platform-console/build/libs/junit-platform-console-${platformVersion}-all.jar..module-info.class
+org.junit.platform.console@${platformVersion} jar:file:.+junit-platform-console/build/libs/junit-platform-console-${platformVersion}.jar..module-info.class
 requires java.base mandated
 requires org.apiguardian.api
 requires org.junit.platform.commons

From d49bc10803450e27fd1258cfaa46daf475800ff3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 7 Feb 2021 19:22:13 +0100
Subject: [PATCH 0201/1433] Simplify Helper

---
 .../src/main/java/platform/tooling/support/Helper.java      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 00ad77862d79..9bdfe26f6547 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -91,10 +91,8 @@ public static List<String> loadModuleDirectoryNames() {
 	}
 
 	public static Path createJarPath(String module) {
-		var parent = Paths.get("..", module, "build", "libs");
-		var jar = parent.resolve(module + '-' + version(module) + ".jar");
-		var shadowJar = parent.resolve(module + '-' + version(module) + "-all.jar");
-		return Files.exists(jar) ? jar : shadowJar;
+		return Paths.get("..", module, "build", "libs") //
+				.resolve(module + '-' + version(module) + ".jar");
 	}
 
 	static JarFile createJarFile(String module) {

From 9c4da0934db8e33600a4a8622ec2fc03ffe374be Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Mon, 8 Feb 2021 13:27:07 +0100
Subject: [PATCH 0202/1433] Named arguments in parameterized tests (#2521)

This commit introduces a `Named` interface, which is used to wrap test arguments and give them names.
Thanks to this, arguments in parameterized tests with `@MethodSource` or `@ArgumentSource` can now have optional names. When the argument is included in the display name of an iteration, this name will be used instead of the value.
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  4 +-
 .../asciidoc/user-guide/writing-tests.adoc    | 14 ++++++
 .../java/example/ParameterizedTestDemo.java   | 15 ++++++
 .../java/org/junit/jupiter/api/Named.java     | 48 +++++++++++++++++++
 .../params/ParameterizedTestExtension.java    |  6 ++-
 .../ParameterizedTestNameFormatter.java       | 12 ++++-
 .../ParameterizedTestParameterResolver.java   | 15 +++++-
 .../ParameterizedTestIntegrationTests.java    | 20 ++++++++
 8 files changed, 128 insertions(+), 6 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index d13b4fb712bb..cbe30705d16a 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -83,7 +83,9 @@ on GitHub.
 * Dynamic tests now require less memory thanks to a number of improvements to internal
   data structures.
 * Documented constant values in `org.junit.jupiter.api.parallel.Resources`.
-
+* In parameterized tests with `@MethodSource` or `@ArgumentSource`, arguments can now have
+  optional names. When the argument is included in the display name of an iteration, this
+  name will be used instead of the value.
 
 [[release-notes-5.8.0-M1-junit-vintage]]
 === JUnit Vintage
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 221ae27805dc..e4cc3b40aae1 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1634,6 +1634,20 @@ if they exceed the configured maximum length. The limit is configurable via the
 `junit.jupiter.params.displayname.argument.maxlength` configuration parameter and defaults
 to 512 characters.
 
+When using `@MethodSource` or `@ArgumentSource`, you can give names to arguments. This
+name will be used if the argument is included in the invocation display name, like in
+the example below.
+
+[source,java,indent=0]
+----
+include::{testDir}/example/ParameterizedTestDemo.java[tags=named_arguments]
+----
+
+....
+A parameterized test with named arguments ✔
+├─ 1: An important file ✔
+└─ 2: Another file ✔
+....
 
 [[writing-tests-parameterized-tests-lifecycle-interop]]
 ==== Lifecycle and Interoperability
diff --git a/documentation/src/test/java/example/ParameterizedTestDemo.java b/documentation/src/test/java/example/ParameterizedTestDemo.java
index 62ff347d7e9a..8e1f851fc8a3 100644
--- a/documentation/src/test/java/example/ParameterizedTestDemo.java
+++ b/documentation/src/test/java/example/ParameterizedTestDemo.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE;
 import static org.junit.jupiter.params.provider.EnumSource.Mode.MATCH_ALL;
 
+import java.io.File;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -39,6 +40,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestReporter;
@@ -441,4 +443,17 @@ void testWithCustomAggregatorAnnotation(@CsvToPerson Person person) {
 	void testWithCustomDisplayNames(String fruit, int rank) {
 	}
 	// end::custom_display_names[]
+
+	// tag::named_arguments[]
+	@DisplayName("A parameterized test with named arguments")
+	@ParameterizedTest(name = "{index}: {0}")
+	@MethodSource("namedArguments")
+	void testWithNamedArguments(File file) {
+	}
+
+	static Stream<Arguments> namedArguments() {
+		return Stream.of(arguments(Named.of("An important file", new File("path1"))),
+			arguments(Named.of("Another file", new File("path2"))));
+	}
+	// end::named_arguments[]
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
new file mode 100644
index 000000000000..cd2b6cfbccd5
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.apiguardian.api.API.Status.STABLE;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code Named} is used to wrap an object and give it a name.
+ *
+ * @param <T> the type of the payload
+ */
+@API(status = STABLE, since = "5.8")
+public interface Named<T> {
+
+	static <T> Named<T> of(String name, T payload) {
+		return new Named<T>() {
+			@Override
+			public String getName() {
+				return name;
+			}
+
+			@Override
+			public T getPayload() {
+				return payload;
+			}
+
+			@Override
+			public String toString() {
+				return name;
+			}
+		};
+	}
+
+	String getName();
+
+	T getPayload();
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
index e50d8bcfc0c7..7d110ce37805 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -143,8 +143,10 @@ protected static Stream<? extends Arguments> arguments(ArgumentsProvider provide
 
 	private Object[] consumedArguments(Object[] arguments, ParameterizedTestMethodContext methodContext) {
 		int parameterCount = methodContext.getParameterCount();
-		return methodContext.hasAggregator() ? arguments
-				: (arguments.length > parameterCount ? Arrays.copyOf(arguments, parameterCount) : arguments);
+		if (methodContext.hasAggregator()) {
+			return arguments;
+		}
+		return arguments.length > parameterCount ? Arrays.copyOf(arguments, parameterCount) : arguments;
 	}
 
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
index 49cf34c39320..3f10d21d26c1 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.stream.IntStream;
 
+import org.junit.jupiter.api.Named;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.StringUtils;
 
@@ -56,12 +57,19 @@ String format(int invocationIndex, Object... arguments) {
 	}
 
 	private String formatSafely(int invocationIndex, Object[] arguments) {
-		String pattern = prepareMessageFormatPattern(invocationIndex, arguments);
+		Object[] namedArguments = extractNamedArguments(arguments);
+		String pattern = prepareMessageFormatPattern(invocationIndex, namedArguments);
 		MessageFormat format = new MessageFormat(pattern);
-		Object[] humanReadableArguments = makeReadable(format, arguments);
+		Object[] humanReadableArguments = makeReadable(format, namedArguments);
 		return format.format(humanReadableArguments);
 	}
 
+	private Object[] extractNamedArguments(Object[] arguments) {
+		return Arrays.stream(arguments) //
+				.map(argument -> argument instanceof Named ? ((Named<?>) argument).getName() : argument) //
+				.toArray();
+	}
+
 	private String prepareMessageFormatPattern(int invocationIndex, Object[] arguments) {
 		String result = pattern//
 				.replace(DISPLAY_NAME_PLACEHOLDER, this.displayName)//
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
index d47889f8cd15..6185897d9d02 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
@@ -12,7 +12,9 @@
 
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 
+import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
@@ -60,8 +62,19 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 	@Override
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
 			throws ParameterResolutionException {
+		return this.methodContext.resolve(parameterContext, extractPayloads(this.arguments));
+	}
 
-		return this.methodContext.resolve(parameterContext, this.arguments);
+	@SuppressWarnings("unchecked")
+	private Object[] extractPayloads(Object[] arguments) {
+		return Arrays.stream(arguments) //
+				.map(argument -> {
+					if (argument instanceof Named) {
+						return ((Named<Object>) argument).getPayload();
+					}
+					return argument;
+				}) //
+				.toArray();
 	}
 
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 39332383d443..8423b3c23fb3 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -46,6 +46,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -625,6 +626,15 @@ private EngineExecutionResults execute(String methodName, Class<?>... methodPara
 				methodParameterTypes);
 		}
 
+		@Test
+		void namedParameters() {
+			execute("namedParameters", String.class).allEvents().assertThatEvents() //
+					.haveAtLeast(1,
+						event(test(), displayName("cool name"), finishedWithFailure(message("parameter value")))) //
+					.haveAtLeast(1,
+						event(test(), displayName("default name"), finishedWithFailure(message("default name"))));
+		}
+
 	}
 
 	@Nested
@@ -1009,6 +1019,12 @@ void streamOfTwoDimensionalObjectArrays(Object[][] array) {
 			fail(Arrays.deepToString(array));
 		}
 
+		@MethodSourceTest
+		@Order(13)
+		void namedParameters(String string) {
+			fail(string);
+		}
+
 		// ---------------------------------------------------------------------
 
 		static Stream<Arguments> emptyMethodSource() {
@@ -1066,6 +1082,10 @@ static Stream<Object[][]> streamOfTwoDimensionalObjectArrays() {
 				new Object[][] { { "five", 6 }, { "seven", 8 } });
 		}
 
+		static Stream<Arguments> namedParameters() {
+			return Stream.of(arguments(Named.of("cool name", "parameter value")), arguments("default name"));
+		}
+
 		// ---------------------------------------------------------------------
 
 		@MethodSourceTest

From b2a98105cc3d5c751e5a2a5709ad463021924613 Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Tue, 9 Feb 2021 14:14:57 +0100
Subject: [PATCH 0203/1433] Introduce junit-platform-suite-engine (#2416)

Implements a test engine that allows declarative execution of test suites using
the `@Suite` annotation.

Internally the Suite Engine uses the JUnit Platform Launcher. The engine works
adding the test descriptors of the discovered engines and tests as children to its
own test descriptor.

```java
package org.junit.platform.suite;

import org.junit.platform.suite.api.SelectPackages;

@Suite
@SelectPackages("org.junit.suite.testcases")
class SelectPackageSuite {

}
```

Is equivalent to:

```java
import org.junit.platform.engine.discovery.DiscoverySelectors;
import org.junit.platform.launcher.Launcher;
import org.junit.platform.launcher.LauncherDiscoveryRequest;
import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
import org.junit.platform.launcher.core.LauncherFactory;

public class Main {

    public static void main(String[] args) {
        Launcher launcher = LauncherFactory.create();
        LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
                .selectors(DiscoverySelectors.selectPackage("org.junit.suite.testcases"))
                .build();
        launcher.execute(request);
    }
}
```

Resolves #744.
---
 build.gradle.kts                              |   5 +
 documentation/documentation.gradle.kts        |   1 +
 .../src/docs/asciidoc/link-attributes.adoc    |   3 +-
 .../release-notes/release-notes-5.8.0-M1.adoc |   4 +-
 .../asciidoc/user-guide/advanced-topics.adoc  |   2 +
 .../docs/asciidoc/user-guide/appendix.adoc    |  41 +-
 .../junit-platform-suite-engine.adoc          |  45 ++
 .../asciidoc/user-guide/launcher-api.adoc     |   3 +
 .../asciidoc/user-guide/running-tests.adoc    |   1 +
 .../src/test/java/example/SuiteDemo.java      |  26 ++
 .../module-info.java                          |   3 +
 .../org/junit/platform/engine/UniqueId.java   |  19 +
 .../engine/discovery/DiscoverySelectors.java  |   4 +-
 .../launcher/core/DefaultLauncher.java        |   2 +-
 .../core/EngineDiscoveryOrchestrator.java     |  56 ++-
 .../core/EngineExecutionOrchestrator.java     |   2 +-
 .../launcher/core/EngineIdValidator.java      |   4 +
 .../core/LauncherDiscoveryResult.java         |   4 +-
 .../core/ServiceLoaderTestEngineRegistry.java |   9 +-
 .../junit-platform-runner.gradle.kts          |   2 +
 .../junit/platform/runner/JUnitPlatform.java  | 217 ++--------
 .../module-info.java                          |   1 +
 .../junit-platform-suite-api.gradle.kts       |   1 +
 .../suite/api/ConfigurationParameter.java     |  53 +++
 .../suite/api/ConfigurationParameters.java    |  41 ++
 .../suite/api/ExcludeClassNamePatterns.java   |  18 +-
 .../platform/suite/api/ExcludeEngines.java    |  18 +-
 .../platform/suite/api/ExcludePackages.java   |  19 +-
 .../junit/platform/suite/api/ExcludeTags.java |  18 +-
 .../suite/api/IncludeClassNamePatterns.java   |  18 +-
 .../platform/suite/api/IncludeEngines.java    |  18 +-
 .../platform/suite/api/IncludePackages.java   |  17 +-
 .../junit/platform/suite/api/IncludeTags.java |  18 +-
 .../platform/suite/api/SelectClasses.java     |  17 +-
 .../suite/api/SelectClasspathResource.java    |  57 +++
 .../suite/api/SelectClasspathResources.java   |  46 ++
 .../platform/suite/api/SelectDirectories.java |  44 ++
 .../junit/platform/suite/api/SelectFile.java  |  57 +++
 .../junit/platform/suite/api/SelectFiles.java |  46 ++
 .../platform/suite/api/SelectModules.java     |  45 ++
 .../platform/suite/api/SelectPackages.java    |  18 +-
 .../junit/platform/suite/api/SelectUris.java  |  44 ++
 .../org/junit/platform/suite/api/Suite.java   |  65 +++
 .../platform/suite/api/SuiteDisplayName.java  |  16 +-
 .../platform/suite/api/UseTechnicalNames.java |  11 -
 .../platform/suite/api/package-info.java      |   8 +
 .../module-info.java                          |   1 +
 .../junit-platform-suite-commons.gradle.kts   |  19 +
 .../commons/AdditionalDiscoverySelectors.java | 113 +++++
 .../SuiteLauncherDiscoveryRequestBuilder.java | 185 ++++++++
 .../platform/suite/commons/package-info.java  |  11 +
 .../module-info.java                          |  21 +
 ...teLauncherDiscoveryRequestBuilderTest.java | 400 ++++++++++++++++++
 .../junit-platform-suite-engine.gradle.kts    |  24 ++
 .../suite/engine/ClassSelectorResolver.java   |  93 ++++
 .../engine/DiscoverySelectorResolver.java     |  40 ++
 .../engine/IsPotentialTestContainer.java      |  39 ++
 .../platform/suite/engine/IsSuiteClass.java   |  31 ++
 .../suite/engine/SuiteEngineDescriptor.java   |  29 ++
 .../platform/suite/engine/SuiteLauncher.java  |  59 +++
 .../suite/engine/SuiteTestDescriptor.java     | 129 ++++++
 .../suite/engine/SuiteTestEngine.java         |  78 ++++
 .../platform/suite/engine/package-info.java   |   5 +
 .../org.junit.platform.engine.TestEngine      |   1 +
 .../module-info.java                          |  21 +
 .../suite/engine/SuiteEngineTest.java         | 276 ++++++++++++
 .../suite/engine/SuiteTestDescriptorTest.java |  96 +++++
 .../suite/engine/testcases/DynamicTest.java   |  30 ++
 .../suite/engine/testcases/MultipleTest.java  |  26 ++
 .../suite/engine/testcases/SimpleTest.java    |  21 +
 .../engine/testsuites/AbstractSuite.java      |  21 +
 .../suite/engine/testsuites/CyclicSuite.java  |  22 +
 .../suite/engine/testsuites/DynamicSuite.java |  20 +
 .../engine/testsuites/MultipleSuite.java      |  21 +
 .../suite/engine/testsuites/NestedSuite.java  |  32 ++
 .../engine/testsuites/SelectClassesSuite.java |  21 +
 .../testsuites/SuiteDisplayNameSuite.java     |  23 +
 .../suite/engine/testsuites/SuiteSuite.java   |  22 +
 .../junit-platform-suite.gradle.kts           |  13 +
 .../org.junit.platform.suite/module-info.java |  19 +
 .../junit/platform/engine/UniqueIdTests.java  |   8 +
 .../runner/JUnitPlatformRunnerTests.java      |   4 +-
 .../junit-platform-commons.expected.txt       |   4 +-
 .../junit-platform-runner.expected.txt        |   3 +-
 .../junit-platform-suite-api.expected.txt     |   1 +
 .../junit-platform-suite-commons.expected.txt |   8 +
 .../junit-platform-suite-engine.expected.txt  |  10 +
 .../junit-platform-suite.expected.txt         |   4 +
 .../platform/tooling/support/HelperTests.java |   3 +
 .../support/tests/JavacModulesTests.java      |   2 +-
 settings.gradle.kts                           |   3 +
 ...ishDocumentationSnapshotOnlyIfNecessary.sh |   3 +
 92 files changed, 2794 insertions(+), 388 deletions(-)
 create mode 100644 documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc
 create mode 100644 documentation/src/test/java/example/SuiteDemo.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
 create mode 100644 junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
 create mode 100644 junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
 create mode 100644 junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
 create mode 100644 junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
 create mode 100644 junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
 create mode 100644 junit-platform-suite-commons/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java
 create mode 100644 junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/package-info.java
 create mode 100644 junit-platform-suite-engine/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine
 create mode 100644 junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
 create mode 100644 junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java
 create mode 100644 junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/DynamicTest.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/MultipleTest.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/SimpleTest.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
 create mode 100644 junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
 create mode 100644 junit-platform-suite/junit-platform-suite.gradle.kts
 create mode 100644 junit-platform-suite/src/module/org.junit.platform.suite/module-info.java
 create mode 100644 platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
 create mode 100644 platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
 create mode 100644 platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite.expected.txt

diff --git a/build.gradle.kts b/build.gradle.kts
index 6e6a8fa98792..beec328ed747 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,7 +42,10 @@ val platformProjects by extra(listOf(
 		project(":junit-platform-launcher"),
 		project(":junit-platform-reporting"),
 		project(":junit-platform-runner"),
+		project(":junit-platform-suite"),
 		project(":junit-platform-suite-api"),
+		project(":junit-platform-suite-commons"),
+		project(":junit-platform-suite-engine"),
 		project(":junit-platform-testkit")
 ))
 
@@ -76,6 +79,8 @@ val jacocoTestProjects = listOf(
 		project(":junit-jupiter-migrationsupport"),
 		project(":junit-jupiter-params"),
 		project(":junit-platform-runner"),
+		project(":junit-platform-suite-commons"),
+		project(":junit-platform-suite-engine"),
 		project(":junit-vintage-engine"),
 		project(":platform-tests")
 )
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 917a6dd245c0..6ecf26cbb3ef 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -41,6 +41,7 @@ dependencies {
 	testImplementation(project(":junit-jupiter-migrationsupport"))
 	testImplementation(project(":junit-platform-console"))
 	testImplementation(project(":junit-platform-runner"))
+	testImplementation(project(":junit-platform-suite"))
 	testImplementation(project(":junit-platform-testkit"))
 	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 
diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index c584ea825317..987287be3d68 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -43,8 +43,9 @@ endif::[]
 :LegacyXmlReportGeneratingListener:          {javadoc-root}/org.junit.platform.reporting/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.html[LegacyXmlReportGeneratingListener]
 // Platform Runner
 :JUnitPlatform-Runner:                       {javadoc-root}/org.junit.platform.runnner/org/junit/platform/runner/JUnitPlatform.html[JUnitPlatform]
-// Platform Suite API
+// Platform Suite
 :suite-api-package:                          {javadoc-root}/org.junit.platform.suite.api/org/junit/platform/suite/api/package-summary.html[org.junit.platform.suite.api]
+:junit-platform-suite-engine                 {javadoc-root}/org.junit.platform.suite.engine/org/junit/platform/suite/engine/package-summary.html[junit-platform-suite-engine]
 // Platform Test Kit
 :testkit-engine-package:                     {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/package-summary.html[org.junit.platform.testkit.engine]
 :EngineExecutionResults:                     {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/EngineExecutionResults.html[EngineExecutionResults]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index cbe30705d16a..d9be75d3f793 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -45,7 +45,9 @@ on GitHub.
   `LauncherSession` in order to allow for executing global setup and teardown code exactly
   once via the new `LauncherSessionListener` interface that can be registered via Java’s
   `{ServiceLoader}` mechanism.
-
+* New `junit-platform-suite-engine` to execute declarative test suites using the JUnit
+  Platform Launcher.
+* Added additional selectors to the `junit-platform-suite-api`
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
index 53164790e5b2..af8e07e8ee03 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
@@ -3,6 +3,8 @@
 
 include::launcher-api.adoc[]
 
+include::junit-platform-suite-engine.adoc[]
+
 include::testkit.adoc[]
 
 ////
diff --git a/documentation/src/docs/asciidoc/user-guide/appendix.adoc b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
index ab0164d15321..d850ea57c94b 100644
--- a/documentation/src/docs/asciidoc/user-guide/appendix.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
@@ -50,10 +50,17 @@ artifacts are deployed to Sonatype's {snapshot-repo}[snapshots repository] under
   `junit-platform-runner`::
     Runner for executing tests and test suites on the JUnit Platform in a JUnit 4
     environment. See <<running-tests-junit-platform-runner>> for details.
+  `junit-platform-suite`::
+    JUnit Platform Suite artifact that transitively pulls in dependencies on
+    `junit-platform-suite-api`, `junit-platform-suite-engine` for simplified
+    dependency management in build tools such as Gradle and Maven.
   `junit-platform-suite-api`::
     Annotations for configuring test suites on the JUnit Platform. Supported by the
-    <<running-tests-junit-platform-runner,JUnitPlatform runner>> and possibly by
-    third-party `TestEngine` implementations.
+    <<junit-platform-suite-engine,JUnit Platform Suite Engine>> and
+    <<running-tests-junit-platform-runner,JUnitPlatform runner>>.
+  `junit-platform-suite-engine`::
+    Engine to execute suites on the JUnit Platform. See
+    <<junit-platform-suite-engine,JUnit Platform Suite Engine>> for details.
   `junit-platform-testkit`::
      Provides support for executing a test plan for a given `TestEngine` and then
      accessing the results via a fluent API to verify the expected results.
@@ -148,7 +155,10 @@ package org.junit.platform {
     [junit-platform-launcher] as launcher
     [junit-platform-reporting] as reporting
     [junit-platform-runner] as runner
+    [junit-platform-suite] as suite
     [junit-platform-suite-api] as suite_api
+    [junit-platform-suite-commons] as suite_commons
+    [junit-platform-suite-engine] as suite_engine
     [junit-platform-testkit] as testkit
 }
 
@@ -173,15 +183,15 @@ jupiter ..> jupiter_api
 jupiter ..> jupiter_params
 jupiter ..> jupiter_engine
 
-jupiter_api ..> opentest4j
-jupiter_api ..> commons
+jupiter_api ....> opentest4j
+jupiter_api ...> commons
 
-jupiter_engine ..> engine
+jupiter_engine ...> engine
 jupiter_engine ..> jupiter_api
 
 jupiter_params ..> jupiter_api
 jupiter_migration_support ..> jupiter_api
-jupiter_migration_support ..> junit4
+jupiter_migration_support ...> junit4
 
 console ..> launcher
 console ..> reporting
@@ -190,18 +200,25 @@ launcher ..> engine
 
 jfr ..> launcher
 
-engine ..> opentest4j
+engine ....> opentest4j
 engine ..> commons
 
 reporting ..> launcher
 
-runner ..> launcher
-runner ..> suite_api
-runner ..> junit4
+runner ..> suite_commons
+runner ...> junit4
 
-testkit ..> opentest4j
+suite ..> suite_api
+suite ..> suite_engine
+
+suite_engine ..> suite_commons
+
+suite_commons ..> launcher
+suite_commons ..> suite_api
+
+testkit ....> opentest4j
 testkit ..> launcher
 
-vintage_engine ..> engine
+vintage_engine ...> engine
 vintage_engine ..> junit4
 ----
diff --git a/documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc b/documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc
new file mode 100644
index 000000000000..f22c96a40031
--- /dev/null
+++ b/documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc
@@ -0,0 +1,45 @@
+[[junit-platform-suite-engine]]
+=== JUnit Platform Suite Engine
+
+The JUnit Platform supports declarative definition and execution of suites of tests from
+_any_ test engine using the Junit Platform.
+
+==== Setup
+
+In addition to _at least one_ other test engine, you need the following artifacts and
+their dependencies on the classpath. See <<dependency-metadata>> for details regarding
+group IDs, artifact IDs, and versions.
+
+===== Explicit Dependencies
+
+* `junit-platform-suite-api` in _test_ scope
+* `junit-platform-suite-engine` in _test runtime_ scope: implementation of the
+                                `TestEngine` API for the declarative Junit Platform
+                                Suites
+
+NOTE: Both dependencies are aggregated in `junit-platform-suite` which can be used in
+_test_ scope.
+
+===== Transitive Dependencies
+
+* `junit-platform-suite-commons` in _test_ scope
+* `junit-platform-launcher` in _test_ scope
+* `junit-platform-engine` in _test_ scope
+* `junit-platform-commons` in _test_ scope
+* `opentest4j` in _test_ scope
+
+==== Test Suite
+
+By annotating a class with `@Suite` it is marked as a test suite on the JUnit Platform.
+As seen in the following example, selector and filter annotations can then be used to
+control the contents of the suite.
+
+[source,java,indent=0]
+----
+include::{testDir}/example/SuiteDemo.java[tags=user_guide]
+----
+
+.Additional Configuration Options
+NOTE: There are more configuration options for discovering and filtering tests than just
+`@SelectPackages`. Please consult the Javadoc of the `{suite-api-package}` package for
+further details.
diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index 441f8f7b8376..04a1566bd12b 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -77,6 +77,9 @@ JUnit currently provides two `{TestEngine}` implementations.
 * `{junit-jupiter-engine}`: The core of JUnit Jupiter.
 * `{junit-vintage-engine}`: A thin layer on top of JUnit 4 to allow running _vintage_
   tests with the launcher infrastructure.
+* `{junit-platform-suite-engine}`: To execute declarative suites of tests with the
+  launcher infrastructure.
+
 
 Third parties may also contribute their own `TestEngine` by implementing the interfaces
 in the {junit-platform-engine} module and _registering_ their engine. By default, engine
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 9e66659de68f..a6c1d3e34c39 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -630,6 +630,7 @@ You need the following artifacts and their dependencies on the classpath. See
 ===== Transitive Dependencies
 
 * `junit-platform-suite-api` in _test_ scope
+* `junit-platform-suite-commons` in _test_ scope
 * `junit-platform-launcher` in _test_ scope
 * `junit-platform-engine` in _test_ scope
 * `junit-platform-commons` in _test_ scope
diff --git a/documentation/src/test/java/example/SuiteDemo.java b/documentation/src/test/java/example/SuiteDemo.java
new file mode 100644
index 000000000000..278b662715b8
--- /dev/null
+++ b/documentation/src/test/java/example/SuiteDemo.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example;
+
+//tag::user_guide[]
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SuiteDisplayName;
+
+@Suite
+@SuiteDisplayName("JUnit Platform Suite Demo")
+@SelectPackages("example")
+//end::user_guide[]
+@org.junit.platform.suite.api.ExcludeTags("exclude")
+//tag::user_guide[]
+public class SuiteDemo {
+}
+//end::user_guide[]
diff --git a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
index b4e0774b29c8..c1bcc1b22550 100644
--- a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
+++ b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
@@ -32,6 +32,7 @@
 			org.junit.platform.reporting,
 			org.junit.platform.runner,
 			org.junit.platform.suite.api,
+			org.junit.platform.suite.engine,
 			org.junit.platform.testkit,
 			org.junit.vintage.engine;
 	exports org.junit.platform.commons.support;
@@ -46,6 +47,8 @@
 			org.junit.platform.reporting,
 			org.junit.platform.runner,
 			org.junit.platform.suite.api,
+			org.junit.platform.suite.commons,
+			org.junit.platform.suite.engine,
 			org.junit.platform.testkit,
 			org.junit.vintage.engine;
 }
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index ef6e552f90ca..8e601904a0da 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -12,6 +12,7 @@
 
 import static java.util.Collections.singletonList;
 import static java.util.Collections.unmodifiableList;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.io.Serializable;
@@ -162,6 +163,24 @@ public final UniqueId append(Segment segment) {
 		return new UniqueId(this.uniqueIdFormat, baseSegments);
 	}
 
+	/**
+	 * Construct a new {@code UniqueId} by appending a new {@link Segment}, based
+	 * on the supplied {@code engineId}, to the end of this {@code UniqueId}.
+	 *
+	 * <p>This {@code UniqueId} will not be modified.
+	 *
+	 * <p>The engine ID will be stored in a {@link Segment} with
+	 * {@link Segment#getType type} {@value ENGINE_SEGMENT_TYPE}.
+	 *
+	 * @param engineId the engine ID; never {@code null} or blank
+	 *
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	public UniqueId appendEngine(String engineId) {
+		return append(new Segment(ENGINE_SEGMENT_TYPE, engineId));
+	}
+
 	/**
 	 * Determine if the supplied {@code UniqueId} is a prefix for this
 	 * {@code UniqueId}.
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 156e07b628c0..e2f892efdc76 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -343,8 +343,8 @@ public static ModuleSelector selectModule(String moduleName) {
 	 */
 	@API(status = EXPERIMENTAL, since = "1.1")
 	public static List<ModuleSelector> selectModules(Set<String> moduleNames) {
-		Preconditions.notNull(moduleNames, "moduleNames must not be null");
-		Preconditions.containsNoNullElements(moduleNames, "individual module name must not be null");
+		Preconditions.notNull(moduleNames, "Module names must not be null");
+		Preconditions.containsNoNullElements(moduleNames, "Individual module name must not be null");
 
 		// @formatter:off
 		return moduleNames.stream()
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index 5b8af43c137a..15b7bef4e8b9 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -58,7 +58,7 @@ class DefaultLauncher implements InternalLauncher {
 		Preconditions.notNull(postDiscoveryFilters, "PostDiscoveryFilter array must not be null");
 		Preconditions.containsNoNullElements(postDiscoveryFilters,
 			"PostDiscoveryFilter array must not contain null elements");
-		this.discoveryOrchestrator = new EngineDiscoveryOrchestrator(EngineIdValidator.validate(testEngines),
+		this.discoveryOrchestrator = new EngineDiscoveryOrchestrator(testEngines,
 			unmodifiableCollection(postDiscoveryFilters), launcherDiscoveryListenerRegistry);
 	}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index b1752e0219a9..a2571030be64 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -11,6 +11,7 @@
 package org.junit.platform.launcher.core;
 
 import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toMap;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.engine.Filter.composeFilters;
 
@@ -20,13 +21,16 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.function.Function;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.UnrecoverableExceptions;
+import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.Filter;
 import org.junit.platform.engine.FilterResult;
 import org.junit.platform.engine.TestDescriptor;
@@ -42,7 +46,7 @@
  *
  * @since 1.7
  */
-@API(status = INTERNAL, since = "1.7", consumers = "testkit")
+@API(status = INTERNAL, since = "1.7", consumers = { "org.junit.platform.testkit", "org.junit.platform.suite.engine" })
 public class EngineDiscoveryOrchestrator {
 
 	private static final Logger logger = LoggerFactory.getLogger(EngineDiscoveryOrchestrator.class);
@@ -59,7 +63,7 @@ public EngineDiscoveryOrchestrator(Iterable<TestEngine> testEngines,
 
 	EngineDiscoveryOrchestrator(Iterable<TestEngine> testEngines, Collection<PostDiscoveryFilter> postDiscoveryFilters,
 			ListenerRegistry<LauncherDiscoveryListener> launcherDiscoveryListenerRegistry) {
-		this.testEngines = testEngines;
+		this.testEngines = EngineIdValidator.validate(testEngines);
 		this.postDiscoveryFilters = postDiscoveryFilters;
 		this.launcherDiscoveryListenerRegistry = launcherDiscoveryListenerRegistry;
 	}
@@ -73,18 +77,43 @@ public EngineDiscoveryOrchestrator(Iterable<TestEngine> testEngines,
 	 * {@linkplain TestDescriptor#prune() prunes} the resulting test tree.
 	 */
 	public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase phase) {
+		Map<TestEngine, TestDescriptor> result = discover(request, phase, UniqueId::forEngine);
+		return new LauncherDiscoveryResult(result, request.getConfigurationParameters());
+	}
+
+	/**
+	 * Discovers tests for the supplied request in the supplied phase using the
+	 * configured test engines to be used by the suite engine.
+	 *
+	 * <p>Applies {@linkplain org.junit.platform.launcher.EngineFilter engine
+	 * filters} and {@linkplain PostDiscoveryFilter post-discovery filters} and
+	 * {@linkplain TestDescriptor#prune() prunes} the resulting test tree.
+	 *
+	 * Note: The test descriptors in the discovery result can safely be used as
+	 * non-root descriptors. Engine-test descriptor entries are pruned from
+	 * the returned result. As such execution by
+	 * {@link EngineExecutionOrchestrator#execute(LauncherDiscoveryResult, EngineExecutionListener)}
+	 * will not emit start or emit events for engines without tests.
+	 */
+	public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase phase, UniqueId parentId) {
+		Map<TestEngine, TestDescriptor> result = discover(request, phase, parentId::appendEngine);
+		return new LauncherDiscoveryResult(pruneEngines(result), request.getConfigurationParameters());
+	}
+
+	private Map<TestEngine, TestDescriptor> discover(LauncherDiscoveryRequest request, Phase phase,
+			Function<String, UniqueId> uniqueIdCreator) {
 		LauncherDiscoveryListener listener = getLauncherDiscoveryListener(request);
 		listener.launcherDiscoveryStarted(request);
 		try {
-			return discoverSafely(request, phase, listener);
+			return discoverSafely(request, phase, listener, uniqueIdCreator);
 		}
 		finally {
 			listener.launcherDiscoveryFinished(request);
 		}
 	}
 
-	private LauncherDiscoveryResult discoverSafely(LauncherDiscoveryRequest request, Phase phase,
-			LauncherDiscoveryListener listener) {
+	private Map<TestEngine, TestDescriptor> discoverSafely(LauncherDiscoveryRequest request, Phase phase,
+			LauncherDiscoveryListener listener, Function<String, UniqueId> uniqueIdCreator) {
 		Map<TestEngine, TestDescriptor> testEngineDescriptors = new LinkedHashMap<>();
 
 		for (TestEngine testEngine : this.testEngines) {
@@ -102,7 +131,7 @@ private LauncherDiscoveryResult discoverSafely(LauncherDiscoveryRequest request,
 			logger.debug(() -> String.format("Discovering tests during Launcher %s phase in engine '%s'.", phase,
 				testEngine.getId()));
 
-			TestDescriptor rootDescriptor = discoverEngineRoot(testEngine, request, listener);
+			TestDescriptor rootDescriptor = discoverEngineRoot(testEngine, request, listener, uniqueIdCreator);
 			testEngineDescriptors.put(testEngine, rootDescriptor);
 		}
 
@@ -112,12 +141,12 @@ private LauncherDiscoveryResult discoverSafely(LauncherDiscoveryRequest request,
 		applyPostDiscoveryFilters(testEngineDescriptors, filters);
 		prune(testEngineDescriptors);
 
-		return new LauncherDiscoveryResult(testEngineDescriptors, request.getConfigurationParameters());
+		return testEngineDescriptors;
 	}
 
 	private TestDescriptor discoverEngineRoot(TestEngine testEngine, LauncherDiscoveryRequest request,
-			LauncherDiscoveryListener listener) {
-		UniqueId uniqueEngineId = UniqueId.forEngine(testEngine.getId());
+			LauncherDiscoveryListener listener, Function<String, UniqueId> uniqueIdCreator) {
+		UniqueId uniqueEngineId = uniqueIdCreator.apply(testEngine.getId());
 		try {
 			listener.engineDiscoveryStarted(uniqueEngineId);
 			TestDescriptor engineRoot = testEngine.discover(request, uniqueEngineId);
@@ -173,6 +202,15 @@ private void logTestDescriptorExclusionReasons(Map<String, List<TestDescriptor>>
 		});
 	}
 
+	private Map<TestEngine, TestDescriptor> pruneEngines(Map<TestEngine, TestDescriptor> result) {
+		// @formatter:off
+		return result.entrySet()
+				.stream()
+				.filter(entry -> TestDescriptor.containsTests(entry.getValue()))
+				.collect(toMap(Entry::getKey, Entry::getValue));
+		// @formatter:on
+	}
+
 	/**
 	 * Prune all branches in the tree of {@link TestDescriptor TestDescriptors}
 	 * that do not have executable tests.
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index 788303775a3c..eaf2c71bff5c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -31,7 +31,7 @@
  *
  * @since 1.7
  */
-@API(status = INTERNAL, since = "1.7", consumers = "testkit")
+@API(status = INTERNAL, since = "1.7", consumers = { "org.junit.platform.testkit", "org.junit.platform.suite.engine" })
 public class EngineExecutionOrchestrator {
 
 	private final ListenerRegistry<TestExecutionListener> listenerRegistry;
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
index f50a2f35e63e..de0a8186ba92 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
@@ -61,6 +61,10 @@ private static boolean validateReservedIds(TestEngine testEngine) {
 			validateWellKnownClassName(testEngine, "org.junit.vintage.engine.VintageTestEngine");
 			return true;
 		}
+		if (engineId.equals("junit-platform-suite")) {
+			validateWellKnownClassName(testEngine, "org.junit.platform.suite.engine.SuiteTestEngine");
+			return true;
+		}
 		return false;
 	}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
index fb1bd04de26b..d96ad1dee15a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
@@ -28,7 +28,7 @@
  *
  * @since 1.7
  */
-@API(status = INTERNAL, since = "1.7", consumers = "testkit")
+@API(status = INTERNAL, since = "1.7", consumers = { "org.junit.platform.testkit", "org.junit.platform.suite.engine" })
 public class LauncherDiscoveryResult {
 
 	private final Map<TestEngine, TestDescriptor> testEngineDescriptors;
@@ -48,7 +48,7 @@ ConfigurationParameters getConfigurationParameters() {
 		return configurationParameters;
 	}
 
-	Collection<TestEngine> getTestEngines() {
+	public Collection<TestEngine> getTestEngines() {
 		return this.testEngineDescriptors.keySet();
 	}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
index 98671f73a003..29e8ae95d3d0 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
@@ -12,12 +12,14 @@
 
 import static java.lang.String.join;
 import static java.util.stream.Collectors.toList;
+import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.stream.Stream;
 
+import org.apiguardian.api.API;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ClassLoaderUtils;
@@ -27,7 +29,12 @@
 /**
  * @since 1.0
  */
-class ServiceLoaderTestEngineRegistry {
+@API(status = INTERNAL, since = "1.0", consumers = "org.junit.platform.suite.engine")
+public final class ServiceLoaderTestEngineRegistry {
+
+	public ServiceLoaderTestEngineRegistry() {
+
+	}
 
 	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderTestEngineRegistry.class);
 
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index 126265fbfcb3..a6aab3ce037c 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -16,6 +16,8 @@ dependencies {
 	api(project(":junit-platform-launcher"))
 	api(project(":junit-platform-suite-api"))
 
+	implementation(project(":junit-platform-suite-commons"))
+
 	testImplementation(testFixtures(project(":junit-platform-engine")))
 	testImplementation(testFixtures(project(":junit-platform-launcher")))
 }
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index 4e232ff135bc..a750594af635 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -10,38 +10,26 @@
 
 package org.junit.platform.runner;
 
-import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toList;
 import static org.apiguardian.api.API.Status.STABLE;
-import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
-import static org.junit.platform.engine.discovery.ClassNameFilter.excludeClassNamePatterns;
-import static org.junit.platform.engine.discovery.ClassNameFilter.includeClassNamePatterns;
+import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
-import static org.junit.platform.engine.discovery.PackageNameFilter.excludePackageNames;
-import static org.junit.platform.engine.discovery.PackageNameFilter.includePackageNames;
-import static org.junit.platform.launcher.EngineFilter.excludeEngines;
-import static org.junit.platform.launcher.EngineFilter.includeEngines;
-import static org.junit.platform.launcher.TagFilter.excludeTags;
-import static org.junit.platform.launcher.TagFilter.includeTags;
-import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+import static org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder.request;
 
 import java.lang.annotation.Annotation;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Function;
 
 import org.apiguardian.api.API;
-import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
-import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
+import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.ExcludeClassNamePatterns;
 import org.junit.platform.suite.api.ExcludeEngines;
 import org.junit.platform.suite.api.ExcludePackages;
@@ -51,9 +39,15 @@
 import org.junit.platform.suite.api.IncludePackages;
 import org.junit.platform.suite.api.IncludeTags;
 import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectDirectories;
+import org.junit.platform.suite.api.SelectFile;
+import org.junit.platform.suite.api.SelectModules;
 import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.SelectUris;
 import org.junit.platform.suite.api.SuiteDisplayName;
 import org.junit.platform.suite.api.UseTechnicalNames;
+import org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
@@ -93,25 +87,40 @@
  * ClassNameFilter#STANDARD_INCLUDE_PATTERN}).
  *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
  * @see SelectClasses
+ * @see SelectClasspathResource
+ * @see SelectDirectories
+ * @see SelectFile
+ * @see SelectModules
+ * @see SelectPackages
+ * @see SelectUris
  * @see IncludeClassNamePatterns
  * @see ExcludeClassNamePatterns
+ * @see IncludeEngines
+ * @see ExcludeEngines
  * @see IncludePackages
  * @see ExcludePackages
  * @see IncludeTags
  * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
+ * @see SuiteDisplayName
+ * @see UseTechnicalNames
+ * @see ConfigurationParameter
  */
 @API(status = STABLE, since = "1.0")
 public class JUnitPlatform extends Runner implements Filterable {
 
-	private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
-	private static final String[] EMPTY_STRING_ARRAY = new String[0];
-	private static final String[] STANDARD_INCLUDE_PATTERN_ARRAY = new String[] { STANDARD_INCLUDE_PATTERN };
+	// @formatter:off
+	private static final List<Class<? extends Annotation>> IMPLICIT_SUITE_ANNOTATIONS = Arrays.asList(
+			SelectClasses.class,
+			SelectClasspathResource.class,
+			SelectDirectories.class,
+			SelectFile.class,
+			SelectFile.class,
+			SelectModules.class,
+			SelectPackages.class,
+			SelectUris.class
+	);
+	// @formatter:on
 
 	private final Class<?> testClass;
 	private final Launcher launcher;
@@ -145,160 +154,26 @@ private JUnitPlatformTestTree generateTestTree(LauncherDiscoveryRequest discover
 	}
 
 	private LauncherDiscoveryRequest createDiscoveryRequest() {
-		List<DiscoverySelector> selectors = getSelectorsFromAnnotations();
-
+		SuiteLauncherDiscoveryRequestBuilder requestBuilder = request();
 		// Allows @RunWith(JUnitPlatform.class) to be added to any test case
-		boolean isSuite = !selectors.isEmpty();
+		boolean isSuite = isSuite();
 		if (!isSuite) {
-			selectors.add(selectClass(this.testClass));
-		}
-
-		LauncherDiscoveryRequestBuilder requestBuilder = request().selectors(selectors);
-		addFiltersFromAnnotations(requestBuilder, isSuite);
-		return requestBuilder.build();
-	}
-
-	private void addFiltersFromAnnotations(LauncherDiscoveryRequestBuilder requestBuilder, boolean isSuite) {
-		addIncludeClassNamePatternFilter(requestBuilder, isSuite);
-		addExcludeClassNamePatternFilter(requestBuilder);
-
-		addIncludePackagesFilter(requestBuilder);
-		addExcludePackagesFilter(requestBuilder);
-
-		addIncludedTagsFilter(requestBuilder);
-		addExcludedTagsFilter(requestBuilder);
-
-		addIncludedEnginesFilter(requestBuilder);
-		addExcludedEnginesFilter(requestBuilder);
-	}
-
-	private List<DiscoverySelector> getSelectorsFromAnnotations() {
-		List<DiscoverySelector> selectors = new ArrayList<>();
-
-		selectors.addAll(transform(getSelectedClasses(), DiscoverySelectors::selectClass));
-		selectors.addAll(transform(getSelectedPackageNames(), DiscoverySelectors::selectPackage));
-
-		return selectors;
-	}
-
-	private <T> List<DiscoverySelector> transform(T[] sourceElements, Function<T, DiscoverySelector> transformer) {
-		return stream(sourceElements).map(transformer).collect(toList());
-	}
-
-	private void addIncludeClassNamePatternFilter(LauncherDiscoveryRequestBuilder requestBuilder, boolean isSuite) {
-		String[] patterns = getIncludeClassNamePatterns(isSuite);
-		if (patterns.length > 0) {
-			requestBuilder.filters(includeClassNamePatterns(patterns));
+			requestBuilder.selectors(selectClass(this.testClass));
 		}
-	}
 
-	private void addExcludeClassNamePatternFilter(LauncherDiscoveryRequestBuilder requestBuilder) {
-		String[] patterns = getExcludeClassNamePatterns();
-		if (patterns.length > 0) {
-			requestBuilder.filters(excludeClassNamePatterns(patterns));
-		}
-	}
-
-	private void addIncludePackagesFilter(LauncherDiscoveryRequestBuilder requestBuilder) {
-		String[] includedPackages = getIncludedPackages();
-		if (includedPackages.length > 0) {
-			requestBuilder.filters(includePackageNames(includedPackages));
-		}
-	}
-
-	private void addExcludePackagesFilter(LauncherDiscoveryRequestBuilder requestBuilder) {
-		String[] excludedPackages = getExcludedPackages();
-		if (excludedPackages.length > 0) {
-			requestBuilder.filters(excludePackageNames(excludedPackages));
-		}
-	}
-
-	private void addIncludedTagsFilter(LauncherDiscoveryRequestBuilder requestBuilder) {
-		String[] includedTags = getIncludedTags();
-		if (includedTags.length > 0) {
-			requestBuilder.filters(includeTags(includedTags));
-		}
-	}
-
-	private void addExcludedTagsFilter(LauncherDiscoveryRequestBuilder requestBuilder) {
-		String[] excludedTags = getExcludedTags();
-		if (excludedTags.length > 0) {
-			requestBuilder.filters(excludeTags(excludedTags));
-		}
-	}
-
-	private void addIncludedEnginesFilter(LauncherDiscoveryRequestBuilder requestBuilder) {
-		String[] engineIds = getIncludedEngineIds();
-		if (engineIds.length > 0) {
-			requestBuilder.filters(includeEngines(engineIds));
-		}
-	}
-
-	private void addExcludedEnginesFilter(LauncherDiscoveryRequestBuilder requestBuilder) {
-		String[] engineIds = getExcludedEngineIds();
-		if (engineIds.length > 0) {
-			requestBuilder.filters(excludeEngines(engineIds));
-		}
-	}
-
-	private Class<?>[] getSelectedClasses() {
-		return getValueFromAnnotation(SelectClasses.class, SelectClasses::value, EMPTY_CLASS_ARRAY);
-	}
-
-	private String[] getSelectedPackageNames() {
-		return getValueFromAnnotation(SelectPackages.class, SelectPackages::value, EMPTY_STRING_ARRAY);
-	}
-
-	private String[] getIncludedPackages() {
-		return getValueFromAnnotation(IncludePackages.class, IncludePackages::value, EMPTY_STRING_ARRAY);
-	}
-
-	private String[] getExcludedPackages() {
-		return getValueFromAnnotation(ExcludePackages.class, ExcludePackages::value, EMPTY_STRING_ARRAY);
-	}
-
-	private String[] getIncludedTags() {
-		return getValueFromAnnotation(IncludeTags.class, IncludeTags::value, EMPTY_STRING_ARRAY);
-	}
-
-	private String[] getExcludedTags() {
-		return getValueFromAnnotation(ExcludeTags.class, ExcludeTags::value, EMPTY_STRING_ARRAY);
-	}
-
-	private String[] getIncludedEngineIds() {
-		return getValueFromAnnotation(IncludeEngines.class, IncludeEngines::value, EMPTY_STRING_ARRAY);
-	}
-
-	private String[] getExcludedEngineIds() {
-		return getValueFromAnnotation(ExcludeEngines.class, ExcludeEngines::value, EMPTY_STRING_ARRAY);
-	}
-
-	private String[] getIncludeClassNamePatterns(boolean isSuite) {
-		String[] patterns = trimmed(getValueFromAnnotation(IncludeClassNamePatterns.class,
-			IncludeClassNamePatterns::value, EMPTY_STRING_ARRAY));
-		if (patterns.length == 0 && isSuite) {
-			return STANDARD_INCLUDE_PATTERN_ARRAY;
-		}
-		return patterns;
-	}
-
-	private String[] getExcludeClassNamePatterns() {
-		return trimmed(getValueFromAnnotation(ExcludeClassNamePatterns.class, ExcludeClassNamePatterns::value,
-			EMPTY_STRING_ARRAY));
-	}
-
-	private String[] trimmed(String[] patterns) {
-		if (patterns.length == 0) {
-			return patterns;
-		}
-		return Arrays.stream(patterns).filter(StringUtils::isNotBlank).map(String::trim).toArray(String[]::new);
+		// @formatter:off
+		return requestBuilder
+				.filterStandardClassNamePatterns(isSuite)
+				.suite(this.testClass)
+				.build();
+		// @formatter:on
 	}
 
-	private <A extends Annotation, V> V getValueFromAnnotation(Class<A> annotationClass, Function<A, V> extractor,
-			V defaultValue) {
-
-		A annotation = this.testClass.getAnnotation(annotationClass);
-		return (annotation != null ? extractor.apply(annotation) : defaultValue);
+	private boolean isSuite() {
+		// @formatter:off
+		return IMPLICIT_SUITE_ANNOTATIONS.stream()
+				.anyMatch(annotation -> isAnnotated(testClass, annotation));
+		// @formatter:on
 	}
 
 	@Override
diff --git a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
index 108bd2188189..fcbf296ecc9b 100644
--- a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
+++ b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
@@ -19,6 +19,7 @@
 	requires transitive org.apiguardian.api;
 	requires transitive org.junit.platform.launcher;
 	requires transitive org.junit.platform.suite.api;
+	requires org.junit.platform.suite.commons;
 
 	exports org.junit.platform.runner;
 }
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
index 9013d8c82b5d..434370974777 100644
--- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
+++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
 
 	api(platform(project(":junit-bom")))
 	api("org.apiguardian:apiguardian-api")
+	api(project(":junit-platform-commons"))
 
 	osgiVerification(project(":junit-platform-commons"))
 }
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
new file mode 100644
index 000000000000..6e8c44d8c7b9
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @Configuration} specifies the configuration {@linkplain #key key} and
+ * {@linkplain #value value} pairs to be added to the discovery request when running
+ * a test suite on the JUnit Platform.
+ *
+ * @since 1.8
+ * @see Suite
+ * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder#configurationParameter(String, String)
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+@Repeatable(ConfigurationParameters.class)
+public @interface ConfigurationParameter {
+
+	/**
+	 * The configuration parameter key under which to add the
+	 * value to the discovery request; never {@code null} or blank.
+	 */
+	String key();
+
+	/**
+	 * The value to add to the discovery request.
+	 */
+	String value();
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
new file mode 100644
index 000000000000..3637674b3637
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @Configurations} is a container for one or more
+ * {@link ConfigurationParameter @Configuration} declarations.
+ *
+ * @since 1.8
+ * @see ConfigurationParameter
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+public @interface ConfigurationParameters {
+
+	/**
+	 * An array of one or more {@link ConfigurationParameter Configurations}.
+	 */
+	ConfigurationParameter[] value();
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
index 4c7bf6194aae..a96042077026 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
@@ -30,24 +30,10 @@
  * of a class matches against at least one of the patterns, the class will be
  * excluded from the test plan.
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
- * @see org.junit.platform.engine.discovery.ClassNameFilter#excludeClassNamePatterns
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.ClassNameFilter#excludeClassNamePatterns
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
index d5b87bf74769..7551584683b6 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
@@ -26,24 +26,10 @@
  * {@link org.junit.platform.engine.TestEngine TestEngines} to be excluded
  * when running a test suite on the JUnit Platform.
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see org.junit.platform.launcher.EngineFilter#excludeEngines
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.launcher.EngineFilter#excludeEngines
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
index 11d8113df66e..addffb419282 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
@@ -24,24 +24,11 @@
 /**
  * {@code @ExcludePackages} specifies the {@linkplain #value packages} to be
  * excluded when running a test suite on the JUnit Platform.
- *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
+
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.PackageNameFilter#excludePackageNames(String...)
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
index 75427acad23e..e08c7c7c9d6a 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
@@ -53,24 +53,10 @@
  * <li>{@code "!"}</li>
  * </ul>
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
- * @see org.junit.platform.launcher.TagFilter#excludeTags
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.launcher.TagFilter#excludeTags
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
index c4c4d3284477..f4004f82317b 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
@@ -30,25 +30,11 @@
  * of a class matches against at least one of the patterns, the class will be
  * included in the test plan.
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
+ * @see Suite
+ * @see org.junit.platform.runner.JUnitPlatform
  * @see org.junit.platform.engine.discovery.ClassNameFilter#STANDARD_INCLUDE_PATTERN
  * @see org.junit.platform.engine.discovery.ClassNameFilter#includeClassNamePatterns
- * @see org.junit.platform.runner.JUnitPlatform
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
index 7047caea1d40..fffed4eed54f 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
@@ -26,24 +26,10 @@
  * {@link org.junit.platform.engine.TestEngine TestEngines} to be included
  * when running a test suite on the JUnit Platform.
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see ExcludeEngines
- * @see org.junit.platform.launcher.EngineFilter#includeEngines
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.launcher.EngineFilter#includeEngines
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
index bcfe221ff90f..94b720e6e2a0 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
@@ -25,23 +25,10 @@
  * {@code @IncludePackages} specifies the {@linkplain #value packages} to be
  * included when running a test suite on the JUnit Platform.
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.PackageNameFilter#includePackageNames(String...)
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
index 16d94108345c..32de491b2785 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
@@ -53,24 +53,10 @@
  * <li>{@code "!"}</li>
  * </ul>
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
- * @see org.junit.platform.launcher.TagFilter#includeTags
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.launcher.TagFilter#includeTags
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
index a4aeb1cf8dea..57b23cf157e0 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
@@ -25,24 +25,9 @@
  * {@code @SelectClasses} specifies the classes to <em>select</em> when running
  * a test suite on the JUnit Platform.
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
- * @see org.junit.platform.engine.discovery.ClassSelector
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectClass(Class)
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
new file mode 100644
index 000000000000..9120204b83e2
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @SelectClasspathResource} specifies the classpath resource to
+ * <em>select</em> when running a test suite on the JUnit Platform.
+ *
+ * @since 1.8
+ * @see Suite
+ * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectClasspathResource(String, org.junit.platform.engine.discovery.FilePosition)
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+@Repeatable(SelectClasspathResources.class)
+public @interface SelectClasspathResource {
+
+	/**
+	 * A classpath resource name to select.
+	 */
+	String value();
+
+	/**
+	 * The line number; ignored if not greater than zero.
+	 */
+	int line() default 0;
+
+	/**
+	 * The column number; ignored if the line number is ignored; ignored if not
+	 * greater than zero.
+	 */
+	int column() default 0;
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
new file mode 100644
index 000000000000..5ad74c95aabf
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @SelectClasspathResources} is a container for one or more
+ * {@link SelectClasspathResource @SelectClasspathResource} declarations.
+ *
+ * <p>Note, however, that use of the {@code @SelectClasspathResources} container is
+ * completely optional since {@code @SelectClasspathResource} is a
+ * {@linkplain java.lang.annotation.Repeatable repeatable} annotation.
+ *
+ * @since 1.8
+ * @see SelectClasspathResource
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+public @interface SelectClasspathResources {
+
+	/**
+	 * An array of one or more {@link SelectClasspathResource SelectClasspathResources}.
+	 */
+	SelectClasspathResource[] value();
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
new file mode 100644
index 000000000000..378f6cc28dce
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @SelectDirectories} specifies the directories to
+ * <em>select</em> when running a test suite on the JUnit Platform.
+ *
+ * @since 1.8
+ * @see Suite
+ * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectDirectory(String)
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+public @interface SelectDirectories {
+
+	/**
+	 * One or more directories to select.
+	 */
+	String[] value();
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
new file mode 100644
index 000000000000..04c475a9430d
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @SelectFiles} specifies the files to
+ * <em>select</em> when running a test suite on the JUnit Platform.
+ *
+ * @see Suite
+ * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectFile(String, org.junit.platform.engine.discovery.FilePosition)
+ * @since 1.8
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+@Repeatable(SelectFiles.class)
+public @interface SelectFile {
+
+	/**
+	 * A file to select.
+	 */
+	String value();
+
+	/**
+	 * The line number; ignored if not greater than zero.
+	 */
+	int line() default 0;
+
+	/**
+	 * The column number; ignored if the line number is ignored; ignored if not
+	 * greater than zero.
+	 */
+	int column() default 0;
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
new file mode 100644
index 000000000000..dc95a2d07b64
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @SelectFiles} is a container for one or more
+ * {@link SelectFile @SelectFile} declarations.
+ *
+ * <p>Note, however, that use of the {@code @SelectFiles} container is
+ * completely optional since {@code @SelectFile} is a
+ * {@linkplain java.lang.annotation.Repeatable repeatable} annotation.
+ *
+ * @since 1.8
+ * @see SelectFile
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+public @interface SelectFiles {
+
+	/**
+	 * An array of one or more {@link SelectFile SelectFiles}.
+	 */
+	SelectFile[] value();
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
new file mode 100644
index 000000000000..57bea0744fd0
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Set;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @SelectModules} specifies the modules to
+ * <em>select</em> when running a test suite on the JUnit Platform.
+ *
+ * @since 1.8
+ * @see Suite
+ * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectModules(Set)
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+public @interface SelectModules {
+
+	/**
+	 * One or more modules to select.
+	 */
+	String[] value();
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
index 9592461204cc..4659689c598d 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
@@ -25,24 +25,10 @@
  * {@code @SelectPackages} specifies the names of packages to <em>select</em>
  * when running a test suite on the JUnit Platform.
  *
- * <h4>JUnit 4 Suite Support</h4>
- * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
- * {@code @RunWith(JUnitPlatform.class)}.
- *
  * @since 1.0
- * @see SuiteDisplayName
- * @see UseTechnicalNames
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
- * @see org.junit.platform.engine.discovery.PackageSelector
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectPackage(String)
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
new file mode 100644
index 000000000000..cee5d4e2990b
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * {@code @SelectUris} specifies the uris to
+ * <em>select</em> when running a test suite on the JUnit Platform.
+ *
+ * @since 1.8
+ * @see Suite
+ * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectUri(String)
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+public @interface SelectUris {
+
+	/**
+	 * One or more uris to select.
+	 */
+	String[] value();
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
new file mode 100644
index 000000000000..8b01fe2cdb97
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+import org.junit.platform.commons.annotation.Testable;
+
+/**
+ * {@code @Suite} marks class as a test suite on the JUnit Platform.
+ * <p>Selector and filter annotations are used to control the contents of the
+ * suite. Additionally configuration can be passed to the suite via the
+ * configuration annotations.
+ *
+ * <p>When the {@link IncludeClassNamePatterns @IncludeClassNamePatterns}
+ * annotation is not present, the default include pattern
+ * {@value org.junit.platform.engine.discovery.ClassNameFilter#STANDARD_INCLUDE_PATTERN}
+ * will be used in order to avoid loading classes unnecessarily (see {@link
+ * org.junit.platform.engine.discovery.ClassNameFilter#STANDARD_INCLUDE_PATTERN
+ * ClassNameFilter#STANDARD_INCLUDE_PATTERN}).
+ *
+ * @since 1.8
+ * @see SelectClasses
+ * @see SelectClasspathResource
+ * @see SelectDirectories
+ * @see SelectFile
+ * @see SelectModules
+ * @see SelectPackages
+ * @see SelectUris
+ * @see IncludeClassNamePatterns
+ * @see ExcludeClassNamePatterns
+ * @see IncludeEngines
+ * @see ExcludeEngines
+ * @see IncludePackages
+ * @see ExcludePackages
+ * @see IncludeTags
+ * @see ExcludeTags
+ * @see SuiteDisplayName
+ * @see ConfigurationParameter
+ * @see org.junit.platform.launcher.LauncherDiscoveryRequest
+ * @see org.junit.platform.launcher.Launcher
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+@Testable
+public @interface Suite {
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
index 3d8bf880bb5b..f63baa5d1edb 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
@@ -32,18 +32,12 @@
  * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
  * {@code @RunWith(JUnitPlatform.class)}.
  *
+ * <h4>JUnit 5 Suite Support</h4>
+ * <p>Test suites can be run on the JUnit Platform in a JUnit 5 environment via
+ * the {@code junit-platform-suite} engine.
+ *
  * @since 1.1
- * @see UseTechnicalNames
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
  */
 @Retention(RUNTIME)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
index 596b9137a2dd..32ede2d0aa3a 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
@@ -42,17 +42,6 @@
  * {@code @RunWith(JUnitPlatform.class)}.
  *
  * @since 1.0
- * @see SuiteDisplayName
- * @see SelectPackages
- * @see SelectClasses
- * @see IncludeClassNamePatterns
- * @see ExcludeClassNamePatterns
- * @see IncludePackages
- * @see ExcludePackages
- * @see IncludeTags
- * @see ExcludeTags
- * @see IncludeEngines
- * @see ExcludeEngines
  * @see org.junit.platform.runner.JUnitPlatform
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/package-info.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/package-info.java
index ab20a1f6600e..27a247baea60 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/package-info.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/package-info.java
@@ -1,5 +1,13 @@
 /**
  * Annotations for configuring a <em>test suite</em> on the JUnit Platform.
+ *
+ * <h4>JUnit 4 Suite Support</h4>
+ * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
+ * {@code @RunWith(JUnitPlatform.class)} with the {@code junit-platform-runner}.
+ *
+ * <h4>JUnit 5 Suite Support</h4>
+ * <p>Test suites can be run on the JUnit Platform in a JUnit 5 environment via
+ * {@link Suite @Suite} with the {@code junit-platform-suite-engine}.
  */
 
 package org.junit.platform.suite.api;
diff --git a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
index 6b88fc29025d..c65659ee0833 100644
--- a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
+++ b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
@@ -15,6 +15,7 @@
  */
 module org.junit.platform.suite.api {
 	requires transitive org.apiguardian.api;
+	requires transitive org.junit.platform.commons;
 
 	exports org.junit.platform.suite.api;
 }
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
new file mode 100644
index 000000000000..11ffb7fe7a53
--- /dev/null
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+	`java-library-conventions`
+	`testing-conventions`
+}
+
+description = "JUnit Platform Suite Commons"
+
+dependencies {
+	internal(platform(project(":dependencies")))
+
+	api(platform(project(":junit-bom")))
+	api("org.apiguardian:apiguardian-api")
+	api(project(":junit-platform-launcher"))
+
+	implementation(project(":junit-platform-engine"))
+	implementation(project(":junit-platform-suite-api"))
+
+	testImplementation(project(":junit-jupiter-engine"))
+}
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
new file mode 100644
index 000000000000..4efd8f35b5da
--- /dev/null
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.commons;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.ClasspathResourceSelector;
+import org.junit.platform.engine.discovery.DirectorySelector;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.engine.discovery.FilePosition;
+import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.ModuleSelector;
+import org.junit.platform.engine.discovery.PackageSelector;
+import org.junit.platform.engine.discovery.UriSelector;
+
+class AdditionalDiscoverySelectors {
+
+	static List<UriSelector> selectUris(String... uris) {
+		Preconditions.notNull(uris, "Uris must not be null");
+		Preconditions.containsNoNullElements(uris, "Individual uris must not be null");
+
+		// @formatter:off
+		return uniqueStreamOf(uris)
+				.filter(s -> !s.isEmpty())
+				.map(DiscoverySelectors::selectUri)
+				.collect(Collectors.toList());
+		// @formatter:on
+	}
+
+	static List<DirectorySelector> selectDirectories(String... paths) {
+		Preconditions.notNull(paths, "Directory paths must not be null");
+		Preconditions.containsNoNullElements(paths, "Individual directory paths must not be null");
+
+		// @formatter:off
+		return uniqueStreamOf(paths)
+				.filter(s -> !s.isEmpty())
+				.map(DiscoverySelectors::selectDirectory)
+				.collect(Collectors.toList());
+		// @formatter:on
+	}
+
+	static List<PackageSelector> selectPackages(String... packageNames) {
+		Preconditions.notNull(packageNames, "Package names must not be null");
+		Preconditions.containsNoNullElements(packageNames, "Individual package names must not be null");
+
+		// @formatter:off
+		return uniqueStreamOf(packageNames)
+				.map(DiscoverySelectors::selectPackage)
+				.collect(Collectors.toList());
+		// @formatter:on
+	}
+
+	static List<ClassSelector> selectClasses(Class<?>... classes) {
+		Preconditions.notNull(classes, "classes must not be null");
+		Preconditions.containsNoNullElements(classes, "individual classes must not be null");
+
+		// @formatter:off
+		return uniqueStreamOf(classes)
+				.map(DiscoverySelectors::selectClass)
+				.collect(Collectors.toList());
+		// @formatter:on
+	}
+
+	static List<ModuleSelector> selectModules(String... moduleNames) {
+		Preconditions.notNull(moduleNames, "Module names must not be null");
+		Preconditions.containsNoNullElements(moduleNames, "Individual module name must not be null");
+
+		return DiscoverySelectors.selectModules(uniqueStreamOf(moduleNames).collect(Collectors.toSet()));
+	}
+
+	static FileSelector selectFile(String path, int line, int column) {
+		Preconditions.notBlank(path, "File path must not be null or blank");
+
+		if (line <= 0) {
+			return DiscoverySelectors.selectFile(path);
+		}
+		if (column <= 0) {
+			return DiscoverySelectors.selectFile(path, FilePosition.from(line));
+		}
+		return DiscoverySelectors.selectFile(path, FilePosition.from(line, column));
+	}
+
+	static ClasspathResourceSelector selectClasspathResource(String classpathResourceName, int line, int column) {
+		Preconditions.notBlank(classpathResourceName, "Classpath resource name must not be null or blank");
+
+		if (line <= 0) {
+			return DiscoverySelectors.selectClasspathResource(classpathResourceName);
+		}
+		if (column <= 0) {
+			return DiscoverySelectors.selectClasspathResource(classpathResourceName, FilePosition.from(line));
+		}
+		return DiscoverySelectors.selectClasspathResource(classpathResourceName, FilePosition.from(line, column));
+	}
+
+	private static <T> Stream<T> uniqueStreamOf(T[] packageNames) {
+		return new LinkedHashSet<>(Arrays.asList(packageNames)).stream();
+	}
+
+}
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
new file mode 100644
index 000000000000..d36f90d79feb
--- /dev/null
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.commons;
+
+import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
+import static org.junit.platform.commons.support.AnnotationSupport.findRepeatableAnnotations;
+import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
+import static org.junit.platform.suite.commons.AdditionalDiscoverySelectors.selectClasspathResource;
+import static org.junit.platform.suite.commons.AdditionalDiscoverySelectors.selectFile;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.commons.util.StringUtils;
+import org.junit.platform.engine.DiscoverySelector;
+import org.junit.platform.engine.Filter;
+import org.junit.platform.engine.discovery.ClassNameFilter;
+import org.junit.platform.engine.discovery.PackageNameFilter;
+import org.junit.platform.launcher.EngineFilter;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.TagFilter;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.suite.api.ConfigurationParameter;
+import org.junit.platform.suite.api.ExcludeClassNamePatterns;
+import org.junit.platform.suite.api.ExcludeEngines;
+import org.junit.platform.suite.api.ExcludePackages;
+import org.junit.platform.suite.api.ExcludeTags;
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.IncludeEngines;
+import org.junit.platform.suite.api.IncludePackages;
+import org.junit.platform.suite.api.IncludeTags;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectDirectories;
+import org.junit.platform.suite.api.SelectFile;
+import org.junit.platform.suite.api.SelectModules;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.SelectUris;
+
+@API(status = Status.INTERNAL, since = "1.8", consumers = { "org.junit.platform.suite.engine",
+		"org.junit.platform.runner" })
+public final class SuiteLauncherDiscoveryRequestBuilder {
+
+	private final LauncherDiscoveryRequestBuilder delegate = LauncherDiscoveryRequestBuilder.request();
+	private boolean includeClassNamePatternsUsed;
+	private boolean filterStandardClassNamePatterns = false;
+
+	private SuiteLauncherDiscoveryRequestBuilder() {
+
+	}
+
+	public static SuiteLauncherDiscoveryRequestBuilder request() {
+		return new SuiteLauncherDiscoveryRequestBuilder();
+	}
+
+	public SuiteLauncherDiscoveryRequestBuilder filterStandardClassNamePatterns(
+			boolean filterStandardClassNamePatterns) {
+		this.filterStandardClassNamePatterns = filterStandardClassNamePatterns;
+		return this;
+	}
+
+	public LauncherDiscoveryRequestBuilder selectors(DiscoverySelector... selectors) {
+		return delegate.selectors(selectors);
+	}
+
+	public LauncherDiscoveryRequestBuilder selectors(List<? extends DiscoverySelector> selectors) {
+		return delegate.selectors(selectors);
+	}
+
+	public LauncherDiscoveryRequestBuilder filters(Filter<?>... filters) {
+		return delegate.filters(filters);
+	}
+
+	public LauncherDiscoveryRequestBuilder configurationParameter(String key, String value) {
+		return delegate.configurationParameter(key, value);
+	}
+
+	public LauncherDiscoveryRequestBuilder configurationParameters(Map<String, String> configurationParameters) {
+		return delegate.configurationParameters(configurationParameters);
+	}
+
+	public SuiteLauncherDiscoveryRequestBuilder suite(AnnotatedElement suite) {
+		Preconditions.notNull(suite, "Test class must not be null");
+
+		// Annotations in alphabetical order
+		// @formatter:off
+		findRepeatableAnnotations(suite, ConfigurationParameter.class)
+				.forEach(configuration -> configurationParameter(configuration.key(), configuration.value()));
+		findAnnotationValues(suite, ExcludeClassNamePatterns.class, ExcludeClassNamePatterns::value)
+				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
+				.map(ClassNameFilter::excludeClassNamePatterns)
+				.ifPresent(this::filters);
+		findAnnotationValues(suite, ExcludeEngines.class, ExcludeEngines::value)
+				.map(EngineFilter::excludeEngines)
+				.ifPresent(this::filters);
+		findAnnotationValues(suite, ExcludePackages.class, ExcludePackages::value)
+				.map(PackageNameFilter::excludePackageNames)
+				.ifPresent(this::filters);
+		findAnnotationValues(suite, ExcludeTags.class, ExcludeTags::value)
+				.map(TagFilter::excludeTags)
+				.ifPresent(this::filters);
+		findAnnotationValues(suite, IncludeClassNamePatterns.class, IncludeClassNamePatterns::value)
+				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
+				.map(ClassNameFilter::includeClassNamePatterns)
+				.ifPresent(filters ->{
+					includeClassNamePatternsUsed = true;
+					this.filters(filters);
+				});
+		findAnnotationValues(suite, IncludeEngines.class, IncludeEngines::value)
+				.map(EngineFilter::includeEngines)
+				.ifPresent(this::filters);
+		findAnnotationValues(suite, IncludePackages.class, IncludePackages::value)
+				.map(PackageNameFilter::includePackageNames)
+				.ifPresent(this::filters);
+		findAnnotationValues(suite, IncludeTags.class, IncludeTags::value)
+				.map(TagFilter::includeTags)
+				.ifPresent(this::filters);
+		findAnnotationValues(suite, SelectClasses.class, SelectClasses::value)
+				.map(AdditionalDiscoverySelectors::selectClasses)
+				.ifPresent(this::selectors);
+		findRepeatableAnnotations(suite, SelectClasspathResource.class)
+				.stream()
+				.map(annotation -> selectClasspathResource(annotation.value(), annotation.line(), annotation.column()))
+				.forEach(this::selectors);
+		findAnnotationValues(suite, SelectDirectories.class, SelectDirectories::value)
+				.map(AdditionalDiscoverySelectors::selectDirectories)
+				.ifPresent(this::selectors);
+		findRepeatableAnnotations(suite, SelectFile.class)
+				.stream()
+				.map(annotation -> selectFile(annotation.value(), annotation.line(), annotation.column()))
+				.forEach(this::selectors);
+		findAnnotationValues(suite, SelectModules.class, SelectModules::value)
+				.map(AdditionalDiscoverySelectors::selectModules)
+				.ifPresent(this::selectors);
+		findAnnotationValues(suite, SelectUris.class, SelectUris::value)
+				.map(AdditionalDiscoverySelectors::selectUris)
+				.ifPresent(this::selectors);
+		findAnnotationValues(suite, SelectPackages.class, SelectPackages::value)
+				.map(AdditionalDiscoverySelectors::selectPackages)
+				.ifPresent(this::selectors);
+		// @formatter:on
+		return this;
+	}
+
+	public LauncherDiscoveryRequest build() {
+		if (filterStandardClassNamePatterns && !includeClassNamePatternsUsed) {
+			delegate.filters(ClassNameFilter.includeClassNamePatterns(STANDARD_INCLUDE_PATTERN));
+		}
+		return delegate.build();
+	}
+
+	private static <A extends Annotation, V> Optional<V[]> findAnnotationValues(AnnotatedElement element,
+			Class<A> annotationType, Function<A, V[]> valueExtractor) {
+		return findAnnotation(element, annotationType).map(valueExtractor).filter(values -> values.length > 0);
+	}
+
+	private static Optional<String[]> trimmed(String[] patterns) {
+		if (patterns.length == 0) {
+			return Optional.empty();
+		}
+		// @formatter:off
+		return Optional.of(Arrays.stream(patterns)
+				.filter(StringUtils::isNotBlank)
+				.map(String::trim)
+				.toArray(String[]::new));
+		// @formatter:on
+	}
+
+}
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
new file mode 100644
index 000000000000..a35d7d91a9a7
--- /dev/null
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * Common APIs and support utilities for the JUnit Platform Suite.
+ *
+ * <h3>DISCLAIMER</h3>
+ *
+ * <p>Any API annotated with {@code @API(status = INTERNAL)} is intended solely
+ * for usage within the JUnit framework itself. <strong>Any usage of internal
+ * APIs by external parties is not supported!</strong>
+ */
+
+package org.junit.platform.suite.commons;
diff --git a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
new file mode 100644
index 000000000000..a65200213874
--- /dev/null
+++ b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+module org.junit.platform.suite.commons {
+	requires transitive org.apiguardian.api;
+	requires org.junit.platform.suite.api;
+	requires org.junit.platform.commons;
+	requires org.junit.platform.engine;
+	requires transitive org.junit.platform.launcher;
+
+	exports org.junit.platform.suite.commons to
+			org.junit.platform.suite.engine,
+			org.junit.platform.runner;
+}
diff --git a/junit-platform-suite-commons/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java b/junit-platform-suite-commons/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java
new file mode 100644
index 000000000000..8d47e4e8acb7
--- /dev/null
+++ b/junit-platform-suite-commons/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java
@@ -0,0 +1,400 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.commons;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.net.URI;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.engine.JupiterTestEngine;
+import org.junit.platform.engine.ConfigurationParameters;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestTag;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.discovery.ClassNameFilter;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.ClasspathResourceSelector;
+import org.junit.platform.engine.discovery.DirectorySelector;
+import org.junit.platform.engine.discovery.FilePosition;
+import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.ModuleSelector;
+import org.junit.platform.engine.discovery.PackageNameFilter;
+import org.junit.platform.engine.discovery.PackageSelector;
+import org.junit.platform.engine.discovery.UriSelector;
+import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
+import org.junit.platform.launcher.EngineFilter;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.PostDiscoveryFilter;
+import org.junit.platform.suite.api.ConfigurationParameter;
+import org.junit.platform.suite.api.ExcludeClassNamePatterns;
+import org.junit.platform.suite.api.ExcludeEngines;
+import org.junit.platform.suite.api.ExcludePackages;
+import org.junit.platform.suite.api.ExcludeTags;
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.IncludeEngines;
+import org.junit.platform.suite.api.IncludePackages;
+import org.junit.platform.suite.api.IncludeTags;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.SelectDirectories;
+import org.junit.platform.suite.api.SelectFile;
+import org.junit.platform.suite.api.SelectModules;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.SelectUris;
+
+class SuiteLauncherDiscoveryRequestBuilderTest {
+
+	SuiteLauncherDiscoveryRequestBuilder builder = SuiteLauncherDiscoveryRequestBuilder.request();
+
+	@Test
+	void configurationParameter() {
+		@ConfigurationParameter(key = "com.example", value = "*")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		ConfigurationParameters configuration = request.getConfigurationParameters();
+		Optional<String> parameter = configuration.get("com.example");
+		assertEquals(Optional.of("*"), parameter);
+	}
+
+	@Test
+	void excludeClassNamePatterns() {
+		class TestCase {
+
+		}
+		@ExcludeClassNamePatterns("^.*TestCase$")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+		assertTrue(exactlyOne(filters).apply(TestCase.class.getName()).excluded());
+	}
+
+	@Test
+	void excludeEngines() {
+		@ExcludeEngines("junit-jupiter")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<EngineFilter> filters = request.getEngineFilters();
+		assertTrue(exactlyOne(filters).apply(new JupiterTestEngine()).excluded());
+	}
+
+	@Test
+	void excludePackages() {
+		@ExcludePackages("com.example.testcases")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<PackageNameFilter> filters = request.getFiltersByType(PackageNameFilter.class);
+		assertTrue(exactlyOne(filters).apply("com.example.testcases").excluded());
+	}
+
+	@Test
+	void excludeTags() {
+		@ExcludeTags("test-tag")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<PostDiscoveryFilter> filters = request.getPostDiscoveryFilters();
+		TestDescriptor testDescriptor = new StubAbstractTestDescriptor();
+		assertTrue(exactlyOne(filters).apply(testDescriptor).excluded());
+	}
+
+	@Test
+	void includeClassNamePatterns() {
+		class TestCase {
+
+		}
+		@IncludeClassNamePatterns("^.*TestCase$")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+		assertTrue(exactlyOne(filters).apply(TestCase.class.getName()).included());
+		assertTrue(exactlyOne(filters).apply(Suite.class.getName()).excluded());
+	}
+
+	@Test
+	void filtersOnStandardClassNamePatternsWhenIncludeClassNamePatternsIsOmitted() {
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		assertTrue(request.getFiltersByType(ClassNameFilter.class).isEmpty());
+	}
+
+	@Test
+	void filtersOnStandardClassNamePatternsWhenIncludeClassNamePatternsIsOmittedUnlessDisabled() {
+		class ExampleTest {
+
+		}
+		class Suite {
+
+		}
+		// @formatter:off
+		LauncherDiscoveryRequest request = builder
+				.filterStandardClassNamePatterns(true)
+				.suite(Suite.class)
+				.build();
+		// @formatter:on
+		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
+		assertTrue(exactlyOne(filters).apply(ExampleTest.class.getName()).included());
+		assertTrue(exactlyOne(filters).apply(Suite.class.getName()).excluded());
+	}
+
+	@Test
+	void includeEngines() {
+		@IncludeEngines("junit-jupiter")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<EngineFilter> filters = request.getEngineFilters();
+		assertTrue(exactlyOne(filters).apply(new JupiterTestEngine()).included());
+	}
+
+	@Test
+	void includePackages() {
+		@IncludePackages("com.example.testcases")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<PackageNameFilter> filters = request.getFiltersByType(PackageNameFilter.class);
+		assertTrue(exactlyOne(filters).apply("com.example.testcases").included());
+	}
+
+	@Test
+	void includeTags() {
+		@IncludeTags("test-tag")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<PostDiscoveryFilter> filters = request.getPostDiscoveryFilters();
+		TestDescriptor testDescriptor = new StubAbstractTestDescriptor();
+		assertTrue(exactlyOne(filters).apply(testDescriptor).included());
+	}
+
+	@Test
+	void selectClasses() {
+		class TestCase {
+
+		}
+		@SelectClasses(TestCase.class)
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<ClassSelector> selectors = request.getSelectorsByType(ClassSelector.class);
+		assertFalse(selectors.isEmpty());
+		assertEquals(TestCase.class, exactlyOne(selectors).getJavaClass());
+	}
+
+	@Test
+	void selectClasspathResource() {
+		@SelectClasspathResource("com.example.testcases")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<ClasspathResourceSelector> selectors = request.getSelectorsByType(ClasspathResourceSelector.class);
+		assertEquals("com.example.testcases", exactlyOne(selectors).getClasspathResourceName());
+	}
+
+	@Test
+	void selectClasspathResourcePosition() {
+		@SelectClasspathResource(value = "com.example.testcases", line = 42)
+		@SelectClasspathResource(value = "com.example.testcases", line = 14, column = 15)
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<ClasspathResourceSelector> selectors = request.getSelectorsByType(ClasspathResourceSelector.class);
+		assertEquals(Optional.of(FilePosition.from(42)), selectors.get(0).getPosition());
+		assertEquals(Optional.of(FilePosition.from(14, 15)), selectors.get(1).getPosition());
+	}
+
+	@Test
+	void ignoreClasspathResourcePosition() {
+		@SelectClasspathResource(value = "com.example.testcases", line = -1)
+		@SelectClasspathResource(value = "com.example.testcases", column = 12)
+		@SelectClasspathResource(value = "com.example.testcases", line = 42, column = -12)
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<ClasspathResourceSelector> selectors = request.getSelectorsByType(ClasspathResourceSelector.class);
+		assertEquals(Optional.empty(), selectors.get(0).getPosition());
+		assertEquals(Optional.empty(), selectors.get(1).getPosition());
+		assertEquals(Optional.of(FilePosition.from(42)), selectors.get(2).getPosition());
+	}
+
+	@Test
+	void selectDirectories() {
+		@SelectDirectories("path/to/root")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<DirectorySelector> selectors = request.getSelectorsByType(DirectorySelector.class);
+		assertEquals(Paths.get("path/to/root"), exactlyOne(selectors).getPath());
+	}
+
+	@Test
+	void selectDirectoriesFiltersEmptyPaths() {
+		@SelectDirectories("")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		assertTrue(request.getSelectorsByType(DirectorySelector.class).isEmpty());
+	}
+
+	@Test
+	void selectFile() {
+		@SelectFile("path/to/root")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<FileSelector> selectors = request.getSelectorsByType(FileSelector.class);
+		assertEquals(Paths.get("path/to/root"), exactlyOne(selectors).getPath());
+	}
+
+	@Test
+	void selectFilePosition() {
+		@SelectFile(value = "path/to/root", line = 42)
+		@SelectFile(value = "path/to/root", line = 14, column = 15)
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<FileSelector> selectors = request.getSelectorsByType(FileSelector.class);
+		assertEquals(Optional.of(FilePosition.from(42)), selectors.get(0).getPosition());
+		assertEquals(Optional.of(FilePosition.from(14, 15)), selectors.get(1).getPosition());
+	}
+
+	@Test
+	void ignoreInvalidFilePosition() {
+		@SelectFile(value = "path/to/root", line = -1)
+		@SelectFile(value = "path/to/root", column = 12)
+		@SelectFile(value = "path/to/root", line = 42, column = -12)
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<FileSelector> selectors = request.getSelectorsByType(FileSelector.class);
+		assertEquals(Optional.empty(), selectors.get(0).getPosition());
+		assertEquals(Optional.empty(), selectors.get(1).getPosition());
+		assertEquals(Optional.of(FilePosition.from(42)), selectors.get(2).getPosition());
+	}
+
+	@Test
+	void selectModules() {
+		@SelectModules("com.example.testcases")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<ModuleSelector> selectors = request.getSelectorsByType(ModuleSelector.class);
+		assertEquals("com.example.testcases", exactlyOne(selectors).getModuleName());
+	}
+
+	@Test
+	void selectUris() {
+		@SelectUris("path/to/root")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<UriSelector> selectors = request.getSelectorsByType(UriSelector.class);
+		assertEquals(URI.create("path/to/root"), exactlyOne(selectors).getUri());
+	}
+
+	@Test
+	void selectUrisFiltersEmptyUris() {
+		@SelectUris("")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		assertTrue(request.getSelectorsByType(UriSelector.class).isEmpty());
+	}
+
+	@Test
+	void selectPackages() {
+		@SelectPackages("com.example.testcases")
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<PackageSelector> selectors = request.getSelectorsByType(PackageSelector.class);
+		assertEquals("com.example.testcases", exactlyOne(selectors).getPackageName());
+	}
+
+	@SelectPackages("com.example.testcases")
+	@Retention(RetentionPolicy.RUNTIME)
+	@interface Meta {
+
+	}
+
+	@Test
+	void metaAnnotations() {
+		@Meta
+		class Suite {
+
+		}
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<PackageSelector> pSelectors = request.getSelectorsByType(PackageSelector.class);
+		assertEquals("com.example.testcases", exactlyOne(pSelectors).getPackageName());
+	}
+
+	private static <T> T exactlyOne(List<T> list) {
+		assertEquals(1, list.size());
+		return list.get(0);
+	}
+
+	private static class StubAbstractTestDescriptor extends AbstractTestDescriptor {
+		public StubAbstractTestDescriptor() {
+			super(UniqueId.forEngine("test"), "stub");
+		}
+
+		@Override
+		public Type getType() {
+			return Type.CONTAINER;
+		}
+
+		@Override
+		public Set<TestTag> getTags() {
+			return Collections.singleton(TestTag.create("test-tag"));
+		}
+
+	}
+
+}
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
new file mode 100644
index 000000000000..9618efbab32f
--- /dev/null
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -0,0 +1,24 @@
+plugins {
+	`java-library-conventions`
+	`testing-conventions`
+	`java-test-fixtures`
+}
+
+description = "JUnit Platform Suite Engine"
+
+dependencies {
+	internal(platform(project(":dependencies")))
+
+	api(platform(project(":junit-bom")))
+	api("org.apiguardian:apiguardian-api")
+	api(project(":junit-platform-engine"))
+	api(project(":junit-platform-suite-api"))
+
+	implementation(project(":junit-platform-suite-commons"))
+
+	testFixturesApi(project(":junit-jupiter-api"))
+	testFixturesApi(project(":junit-platform-suite-api"))
+
+	testImplementation(project(":junit-platform-testkit"))
+	testImplementation(project(":junit-jupiter-engine"))
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
new file mode 100644
index 000000000000..58db2bf1f740
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import static org.junit.platform.engine.support.discovery.SelectorResolver.Resolution.unresolved;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.UniqueId.Segment;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.UniqueIdSelector;
+import org.junit.platform.engine.support.discovery.SelectorResolver;
+
+final class ClassSelectorResolver implements SelectorResolver {
+
+	private static final IsSuiteClass isSuiteClass = new IsSuiteClass();
+
+	private final Predicate<String> classNameFilter;
+	private final SuiteEngineDescriptor suiteEngineDescriptor;
+
+	ClassSelectorResolver(Predicate<String> classNameFilter, SuiteEngineDescriptor suiteEngineDescriptor) {
+		this.classNameFilter = classNameFilter;
+		this.suiteEngineDescriptor = suiteEngineDescriptor;
+	}
+
+	@Override
+	public Resolution resolve(ClassSelector selector, Context context) {
+		Class<?> testClass = selector.getJavaClass();
+		if (isSuiteClass.test(testClass)) {
+			if (classNameFilter.test(testClass.getName())) {
+				// @formatter:off
+				Optional<SuiteTestDescriptor> suiteWithDiscoveryRequest = context
+						.addToParent(parent -> newSuiteDescriptor(testClass, parent))
+						.map(suite -> suite.addDiscoveryRequestFrom(testClass));
+				return toResolution(suiteWithDiscoveryRequest);
+				// @formatter:on
+			}
+		}
+		return unresolved();
+	}
+
+	@Override
+	public Resolution resolve(UniqueIdSelector selector, Context context) {
+		UniqueId uniqueId = selector.getUniqueId();
+		UniqueId engineId = suiteEngineDescriptor.getUniqueId();
+		List<Segment> resolvedSegments = engineId.getSegments();
+		// @formatter:off
+		return uniqueId.getSegments()
+				.stream()
+				.skip(resolvedSegments.size())
+				.findFirst()
+				.filter(suiteSegment -> SuiteTestDescriptor.SEGMENT_TYPE.equals(suiteSegment.getType()))
+				.flatMap(ClassSelectorResolver::tryLoadSuiteClass)
+				.filter(isSuiteClass)
+				.map(suiteClass -> context
+						.addToParent(parent -> newSuiteDescriptor(suiteClass, parent))
+						.map(suite -> uniqueId.equals(suite.getUniqueId())
+								// The uniqueId selector either targeted a class annotated with @Suite;
+								? suite.addDiscoveryRequestFrom(suiteClass)
+								// or a specific test in that suite
+								: suite.addDiscoveryRequestFrom(uniqueId)))
+				.map(ClassSelectorResolver::toResolution)
+				.orElseGet(Resolution::unresolved);
+		// @formatter:on
+	}
+
+	private static Optional<Class<?>> tryLoadSuiteClass(UniqueId.Segment segment) {
+		return ReflectionUtils.tryToLoadClass(segment.getValue()).toOptional();
+	}
+
+	private static Resolution toResolution(Optional<SuiteTestDescriptor> suite) {
+		return suite.map(Match::exact).map(Resolution::match).orElseGet(Resolution::unresolved);
+	}
+
+	private static Optional<SuiteTestDescriptor> newSuiteDescriptor(Class<?> suiteClass, TestDescriptor parent) {
+		UniqueId id = parent.getUniqueId().append(SuiteTestDescriptor.SEGMENT_TYPE, suiteClass.getName());
+		return Optional.of(new SuiteTestDescriptor(id, suiteClass));
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
new file mode 100644
index 000000000000..8f90faad4b3c
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import org.junit.platform.engine.EngineDiscoveryRequest;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolver;
+
+final class DiscoverySelectorResolver {
+
+	// @formatter:off
+	private static final EngineDiscoveryRequestResolver<SuiteEngineDescriptor> resolver = EngineDiscoveryRequestResolver.<SuiteEngineDescriptor>builder()
+			.addClassContainerSelectorResolver(new IsSuiteClass())
+			.addSelectorResolver(context -> new ClassSelectorResolver(context.getClassNameFilter(), context.getEngineDescriptor()))
+			.build();
+	// @formatter:on
+
+	private static void discoverSuites(SuiteEngineDescriptor engineDescriptor) {
+		// @formatter:off
+		engineDescriptor.getChildren().stream()
+				.map(SuiteTestDescriptor.class::cast)
+				.forEach(SuiteTestDescriptor::discover);
+		// @formatter:on
+	}
+
+	void resolveSelectors(EngineDiscoveryRequest request, SuiteEngineDescriptor engineDescriptor) {
+		resolver.resolve(request, engineDescriptor);
+		discoverSuites(engineDescriptor);
+		engineDescriptor.accept(TestDescriptor::prune);
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
new file mode 100644
index 000000000000..3926ab05a753
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import static org.junit.platform.commons.util.ReflectionUtils.isAbstract;
+import static org.junit.platform.commons.util.ReflectionUtils.isInnerClass;
+import static org.junit.platform.commons.util.ReflectionUtils.isPrivate;
+
+import java.util.function.Predicate;
+
+final class IsPotentialTestContainer implements Predicate<Class<?>> {
+
+	@Override
+	public boolean test(Class<?> candidate) {
+		// Please do not collapse the following into a single statement.
+		if (isPrivate(candidate)) {
+			return false;
+		}
+		if (isAbstract(candidate)) {
+			return false;
+		}
+		if (candidate.isLocalClass()) {
+			return false;
+		}
+		if (candidate.isAnonymousClass()) {
+			return false;
+		}
+		return !isInnerClass(candidate);
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
new file mode 100644
index 000000000000..0ba4b4221a07
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import java.util.function.Predicate;
+
+import org.junit.platform.commons.support.AnnotationSupport;
+import org.junit.platform.suite.api.Suite;
+
+final class IsSuiteClass implements Predicate<Class<?>> {
+
+	private static final IsPotentialTestContainer isPotentialTestContainer = new IsPotentialTestContainer();
+
+	@Override
+	public boolean test(Class<?> testClass) {
+		return isPotentialTestContainer.test(testClass) && hasSuiteAnnotation(testClass);
+	}
+
+	private boolean hasSuiteAnnotation(Class<?> testClass) {
+		return AnnotationSupport.isAnnotated(testClass, Suite.class);
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
new file mode 100644
index 000000000000..2c77a4185061
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.support.descriptor.EngineDescriptor;
+
+final class SuiteEngineDescriptor extends EngineDescriptor {
+
+	static final String ENGINE_ID = "junit-platform-suite";
+
+	SuiteEngineDescriptor(UniqueId uniqueId) {
+		super(uniqueId, "JUnit Platform Suite");
+	}
+
+	@Override
+	public Type getType() {
+		return Type.CONTAINER;
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
new file mode 100644
index 000000000000..18a5737a07f0
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import static java.util.Collections.emptyList;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.TestEngine;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.core.EngineDiscoveryOrchestrator;
+import org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.Phase;
+import org.junit.platform.launcher.core.EngineExecutionOrchestrator;
+import org.junit.platform.launcher.core.LauncherDiscoveryResult;
+import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
+
+class SuiteLauncher {
+
+	private final EngineExecutionOrchestrator executionOrchestrator = new EngineExecutionOrchestrator();
+	private final EngineDiscoveryOrchestrator discoveryOrchestrator;
+
+	static SuiteLauncher create() {
+		Set<TestEngine> engines = new LinkedHashSet<>();
+		new ServiceLoaderTestEngineRegistry().loadTestEngines().forEach(engines::add);
+		return new SuiteLauncher(engines);
+	}
+
+	private SuiteLauncher(Set<TestEngine> testEngines) {
+		Preconditions.condition(hasTestEngineOtherThanSuiteEngine(testEngines),
+			() -> "Cannot create SuiteLauncher without at least one other TestEngine; "
+					+ "consider adding an engine implementation JAR to the classpath");
+		this.discoveryOrchestrator = new EngineDiscoveryOrchestrator(testEngines, emptyList());
+	}
+
+	private boolean hasTestEngineOtherThanSuiteEngine(Set<TestEngine> testEngines) {
+		return testEngines.stream().anyMatch(testEngine -> !SuiteEngineDescriptor.ENGINE_ID.equals(testEngine.getId()));
+	}
+
+	LauncherDiscoveryResult discover(LauncherDiscoveryRequest discoveryRequest, UniqueId parentId) {
+		return discoveryOrchestrator.discover(discoveryRequest, Phase.DISCOVERY, parentId);
+	}
+
+	void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionListener listener) {
+		executionOrchestrator.execute(discoveryResult, listener);
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
new file mode 100644
index 000000000000..2bed05b2d7bb
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.counting;
+import static java.util.stream.Collectors.groupingBy;
+import static org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder.request;
+
+import java.util.function.Supplier;
+
+import org.junit.platform.commons.util.AnnotationUtils;
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.commons.util.StringUtils;
+import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.UniqueId.Segment;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.core.LauncherDiscoveryResult;
+import org.junit.platform.suite.api.SuiteDisplayName;
+import org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder;
+
+/**
+ * {@link TestDescriptor} for tests based on the JUnit Platform Launcher API.
+ *
+ * <h3>Default Display Names</h3>
+ *
+ * <p>The default display name is the simple name of the class.
+ *
+ * @since 1.8
+ * @see SuiteDisplayName
+ */
+final class SuiteTestDescriptor extends AbstractTestDescriptor {
+
+	static final String SEGMENT_TYPE = "suite";
+
+	private final SuiteLauncherDiscoveryRequestBuilder discoveryRequestBuilder = request();
+
+	private LauncherDiscoveryResult launcherDiscoveryResult;
+	private SuiteLauncher launcher;
+
+	SuiteTestDescriptor(UniqueId id, Class<?> suiteClass) {
+		super(requireNoCycles(id), getSuiteDisplayName(suiteClass), ClassSource.from(suiteClass));
+	}
+
+	private static UniqueId requireNoCycles(UniqueId id) {
+		// @formatter:off
+		boolean containsCycle = id.getSegments().stream()
+				.filter(segment -> SuiteTestDescriptor.SEGMENT_TYPE.equals(segment.getType()))
+				.map(Segment::getValue)
+				.collect(groupingBy(identity(), counting()))
+				.values()
+				.stream()
+				.anyMatch(count -> count > 1);
+		// @formatter:on
+		Supplier<String> message = () -> String.format(
+			"Configuration error: The suite configuration may not contain a cycle [%s]", id);
+		Preconditions.condition(!containsCycle, message);
+		return id;
+	}
+
+	SuiteTestDescriptor addDiscoveryRequestFrom(Class<?> suiteClass) {
+		Preconditions.condition(launcherDiscoveryResult == null,
+			"discovery request can not be modified after discovery");
+		discoveryRequestBuilder.suite(suiteClass);
+		return this;
+	}
+
+	SuiteTestDescriptor addDiscoveryRequestFrom(UniqueId uniqueId) {
+		Preconditions.condition(launcherDiscoveryResult == null,
+			"discovery request can not be modified after discovery");
+		discoveryRequestBuilder.selectors(DiscoverySelectors.selectUniqueId(uniqueId));
+		return this;
+	}
+
+	void discover() {
+		if (launcherDiscoveryResult != null) {
+			return;
+		}
+
+		// @formatter:off
+		LauncherDiscoveryRequest request = discoveryRequestBuilder
+				.filterStandardClassNamePatterns(true)
+				.build();
+		// @formatter:on
+		this.launcher = SuiteLauncher.create();
+		this.launcherDiscoveryResult = launcher.discover(request, getUniqueId());
+		// @formatter:off
+		launcherDiscoveryResult.getTestEngines()
+				.stream()
+				.map(testEngine -> launcherDiscoveryResult.getEngineTestDescriptor(testEngine))
+				.forEach(this::addChild);
+		// @formatter:on
+	}
+
+	@Override
+	public Type getType() {
+		return Type.CONTAINER;
+	}
+
+	private static String getSuiteDisplayName(Class<?> testClass) {
+		// @formatter:off
+		return AnnotationUtils.findAnnotation(testClass, SuiteDisplayName.class)
+				.map(SuiteDisplayName::value)
+				.filter(StringUtils::isNotBlank)
+				.orElse(testClass.getSimpleName());
+		// @formatter:on
+	}
+
+	void execute(EngineExecutionListener listener) {
+		listener.executionStarted(this);
+		launcher.execute(launcherDiscoveryResult, listener);
+		listener.executionFinished(this, TestExecutionResult.successful());
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
new file mode 100644
index 000000000000..f608b9737a6c
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.util.Optional;
+
+import org.apiguardian.api.API;
+import org.junit.platform.engine.EngineDiscoveryRequest;
+import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.ExecutionRequest;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestEngine;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.UniqueId;
+
+/**
+ * The JUnit Platform Suite {@link org.junit.platform.engine.TestEngine TestEngine}.
+ *
+ * @since 5.8
+ */
+@API(status = INTERNAL, since = "5.8")
+public final class SuiteTestEngine implements TestEngine {
+
+	@Override
+	public String getId() {
+		return SuiteEngineDescriptor.ENGINE_ID;
+	}
+
+	/**
+	 * Returns {@code org.junit.platform} as the group ID.
+	 */
+	@Override
+	public Optional<String> getGroupId() {
+		return Optional.of("org.junit.platform");
+	}
+
+	/**
+	 * Returns {@code junit-platform-suite-engine} as the artifact ID.
+	 */
+	@Override
+	public Optional<String> getArtifactId() {
+		return Optional.of("junit-platform-suite-engine");
+	}
+
+	@Override
+	public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
+		SuiteEngineDescriptor engineDescriptor = new SuiteEngineDescriptor(uniqueId);
+		new DiscoverySelectorResolver().resolveSelectors(discoveryRequest, engineDescriptor);
+		return engineDescriptor;
+	}
+
+	@Override
+	public void execute(ExecutionRequest request) {
+		SuiteEngineDescriptor suiteEngineDescriptor = (SuiteEngineDescriptor) request.getRootTestDescriptor();
+		EngineExecutionListener engineExecutionListener = request.getEngineExecutionListener();
+
+		engineExecutionListener.executionStarted(suiteEngineDescriptor);
+
+		// @formatter:off
+		suiteEngineDescriptor.getChildren()
+				.stream()
+				.map(SuiteTestDescriptor.class::cast)
+				.forEach(suiteTestDescriptor -> suiteTestDescriptor.execute(engineExecutionListener));
+		// @formatter:on
+		engineExecutionListener.executionFinished(suiteEngineDescriptor, TestExecutionResult.successful());
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/package-info.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/package-info.java
new file mode 100644
index 000000000000..fa4237d3cec4
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Core package for the JUnit Platform Suite test engine.
+ */
+
+package org.junit.platform.suite.engine;
diff --git a/junit-platform-suite-engine/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine b/junit-platform-suite-engine/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine
new file mode 100644
index 000000000000..5832d4fc4620
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine
@@ -0,0 +1 @@
+org.junit.platform.suite.engine.SuiteTestEngine
diff --git a/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java b/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
new file mode 100644
index 000000000000..79f6fe1c45e6
--- /dev/null
+++ b/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+module org.junit.platform.suite.engine {
+	requires org.apiguardian.api;
+	requires org.junit.platform.suite.api;
+	requires org.junit.platform.suite.commons;
+	requires org.junit.platform.commons;
+	requires org.junit.platform.engine;
+	requires org.junit.platform.launcher;
+
+	provides org.junit.platform.engine.TestEngine
+			with org.junit.platform.suite.engine.SuiteTestEngine;
+}
diff --git a/junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java b/junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java
new file mode 100644
index 000000000000..9e0720660c39
--- /dev/null
+++ b/junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
+import static org.junit.platform.suite.engine.SuiteEngineDescriptor.ENGINE_ID;
+import static org.junit.platform.testkit.engine.EventConditions.container;
+import static org.junit.platform.testkit.engine.EventConditions.displayName;
+import static org.junit.platform.testkit.engine.EventConditions.event;
+import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
+import static org.junit.platform.testkit.engine.EventConditions.test;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
+import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
+import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
+import org.junit.platform.engine.FilterResult;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.support.descriptor.MethodSource;
+import org.junit.platform.launcher.PostDiscoveryFilter;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.DynamicTest;
+import org.junit.platform.suite.engine.testcases.MultipleTest;
+import org.junit.platform.suite.engine.testcases.SimpleTest;
+import org.junit.platform.suite.engine.testsuites.AbstractSuite;
+import org.junit.platform.suite.engine.testsuites.DynamicSuite;
+import org.junit.platform.suite.engine.testsuites.MultipleSuite;
+import org.junit.platform.suite.engine.testsuites.NestedSuite;
+import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
+import org.junit.platform.suite.engine.testsuites.SuiteDisplayNameSuite;
+import org.junit.platform.suite.engine.testsuites.SuiteSuite;
+import org.junit.platform.testkit.engine.EngineTestKit;
+
+class SuiteEngineTest {
+
+	@Test
+	void selectClasses() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(SelectClassesSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(SelectClassesSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(SimpleTest.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void suiteDisplayName() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(SuiteDisplayNameSuite.class))
+				.execute()
+				.allEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(container(displayName("Suite Display Name")), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void abstractSuiteIsNotExecuted() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(AbstractSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.isEmpty();
+		// @formatter:on
+	}
+
+	@Test
+	void privateSuiteIsNotExecuted() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(PrivateSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.isEmpty();
+		// @formatter:on
+	}
+
+	@Suite
+	@SelectClasses(SimpleTest.class)
+	private static class PrivateSuite {
+
+	}
+
+	@Test
+	void innerSuiteIsNotExecuted() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(InnerSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.isEmpty();
+		// @formatter:on
+	}
+
+	@SuppressWarnings("InnerClassMayBeStatic")
+	@Suite
+	@SelectClasses(SimpleTest.class)
+	private class InnerSuite {
+
+	}
+
+	@Test
+	void nestedSuiteIsNotExecuted() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(NestedSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.isEmpty();
+		// @formatter:on
+	}
+
+	@Test
+	void dynamicSuite() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(DynamicSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(2, event(test(DynamicTest.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void suiteSuite() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(SuiteSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(SuiteSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(SelectClassesSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(SimpleTest.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void selectClassesByUniqueId() {
+		// @formatter:off
+		UniqueId uniqId = UniqueId.forEngine(ENGINE_ID)
+				.append(SuiteTestDescriptor.SEGMENT_TYPE, SelectClassesSuite.class.getName());
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectUniqueId(uniqId))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(SelectClassesSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(SimpleTest.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void selectMethodInTestPlanByUniqueId() {
+		// @formatter:off
+		UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID)
+				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName())
+				.append("engine", JupiterEngineDescriptor.ENGINE_ID)
+				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTest.class.getName())
+				.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
+
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectUniqueId(uniqueId))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(MultipleSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(MultipleTest.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void selectSuiteByUniqueId() {
+		// @formatter:off
+		UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID)
+				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName());
+
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectUniqueId(uniqueId))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(2, event(test(MultipleSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(2, event(test(MultipleTest.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void selectMethodAndSuiteInTestPlanByUniqueId() {
+		// @formatter:off
+		UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID)
+				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName())
+				.append("engine", JupiterEngineDescriptor.ENGINE_ID)
+				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTest.class.getName())
+				.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
+
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectUniqueId(uniqueId))
+				.selectors(selectClass(SelectClassesSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(SelectClassesSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(SimpleTest.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(MultipleSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(MultipleTest.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void selectMethodsInTestPlanByUniqueId() {
+		// @formatter:off
+		UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID)
+				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName())
+				.append("engine", JupiterEngineDescriptor.ENGINE_ID)
+				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTest.class.getName())
+				.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
+
+		UniqueId uniqueId2 = UniqueId.forEngine(ENGINE_ID)
+				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName())
+				.append("engine", JupiterEngineDescriptor.ENGINE_ID)
+				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTest.class.getName())
+				.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test2()");
+
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectUniqueId(uniqueId))
+				.selectors(selectUniqueId(uniqueId2))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(2, event(test(MultipleSuite.class.getName()), finishedSuccessfully()))
+				.haveExactly(2, event(test(MultipleTest.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void postDiscoveryCanRemoveTestDescriptorsInSuite() {
+		// @formatter:off
+		PostDiscoveryFilter postDiscoveryFilter = testDescriptor -> testDescriptor.getSource()
+				.filter(MethodSource.class::isInstance)
+				.map(MethodSource.class::cast)
+				.filter(classSource -> SimpleTest.class.equals(classSource.getJavaClass()))
+				.map(classSource -> FilterResult.excluded("Was a test in SimpleTest"))
+				.orElseGet(() -> FilterResult.included("Was not a test in SimpleTest"));
+
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(SelectClassesSuite.class))
+				.filters(postDiscoveryFilter)
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.isEmpty();
+		// @formatter:on
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java b/junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java
new file mode 100644
index 000000000000..5281cacc7047
--- /dev/null
+++ b/junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import static java.util.Collections.emptySet;
+import static java.util.stream.Collectors.toSet;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
+import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
+import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
+import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.suite.engine.testcases.SimpleTest;
+import org.junit.platform.suite.engine.testsuites.CyclicSuite;
+import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
+
+class SuiteTestDescriptorTest {
+
+	UniqueId engineId = UniqueId.forEngine(SuiteEngineDescriptor.ENGINE_ID);
+	UniqueId suiteId = engineId.append(SuiteTestDescriptor.SEGMENT_TYPE, "test");
+	UniqueId jupiterEngineId = suiteId.append("engine", JupiterEngineDescriptor.ENGINE_ID);
+	UniqueId testClassId = jupiterEngineId.append(ClassTestDescriptor.SEGMENT_TYPE, SimpleTest.class.getName());
+	UniqueId methodId = testClassId.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
+
+	SuiteTestDescriptor suite = new SuiteTestDescriptor(suiteId, Object.class);
+
+	@Test
+	void suiteIsEmptyBeforeDiscovery() {
+		suite.addDiscoveryRequestFrom(SelectClassesSuite.class);
+		assertEquals(emptySet(), suite.getChildren());
+	}
+
+	@Test
+	void suitDiscoversTestsFromClass() {
+		suite.addDiscoveryRequestFrom(SelectClassesSuite.class);
+		suite.discover();
+		assertEquals(Set.of(jupiterEngineId, testClassId, methodId),
+			suite.getDescendants().stream().map(TestDescriptor::getUniqueId).collect(toSet()));
+	}
+
+	@Test
+	void suitDiscoversTestsFromUniqueId() {
+		suite.addDiscoveryRequestFrom(methodId);
+		suite.discover();
+		assertEquals(Set.of(jupiterEngineId, testClassId, methodId),
+			suite.getDescendants().stream().map(TestDescriptor::getUniqueId).collect(toSet()));
+	}
+
+	@Test
+	void discoveryPlanCanNotBeModifiedAfterDiscovery() {
+		suite.addDiscoveryRequestFrom(SelectClassesSuite.class);
+		suite.discover();
+		assertAll(() -> {
+			PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+				() -> suite.addDiscoveryRequestFrom(SelectClassesSuite.class));
+			assertEquals("discovery request can not be modified after discovery", exception.getMessage());
+
+		}, () -> {
+			PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
+				() -> suite.addDiscoveryRequestFrom(methodId));
+			assertEquals("discovery request can not be modified after discovery", exception.getMessage());
+		});
+	}
+
+	@Test
+	void suitesMayNotContainACycle() {
+		// @formatter:off
+		UniqueId expectedCycle = suiteId
+				.append("engine", SuiteEngineDescriptor.ENGINE_ID)
+				.append(SuiteTestDescriptor.SEGMENT_TYPE, CyclicSuite.class.getName())
+				.append("engine", SuiteEngineDescriptor.ENGINE_ID)
+				.append(SuiteTestDescriptor.SEGMENT_TYPE, CyclicSuite.class.getName());
+		// @formatter:on
+		suite.addDiscoveryRequestFrom(CyclicSuite.class);
+		JUnitException exception = assertThrows(JUnitException.class, suite::discover);
+		assertEquals("Configuration error: The suite configuration may not contain a cycle [" + expectedCycle + "]",
+			exception.getCause().getCause().getCause().getMessage());
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/DynamicTest.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/DynamicTest.java
new file mode 100644
index 000000000000..5d7220ab7dd6
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/DynamicTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testcases;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.jupiter.api.TestFactory;
+
+public class DynamicTest {
+
+	@TestFactory
+	Collection<org.junit.jupiter.api.DynamicTest> dynamicTestsWithCollection() {
+		return Arrays.asList(
+			org.junit.jupiter.api.DynamicTest.dynamicTest("Add test", () -> assertEquals(2, Math.addExact(1, 1))),
+			org.junit.jupiter.api.DynamicTest.dynamicTest("Multiply Test",
+				() -> assertEquals(4, Math.multiplyExact(2, 2))));
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/MultipleTest.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/MultipleTest.java
new file mode 100644
index 000000000000..1ce75302e7c2
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/MultipleTest.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testcases;
+
+import org.junit.jupiter.api.Test;
+
+public class MultipleTest {
+
+	@Test
+	void test() {
+
+	}
+
+	@Test
+	void test2() {
+
+	}
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/SimpleTest.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/SimpleTest.java
new file mode 100644
index 000000000000..bc8eb9dcc628
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/SimpleTest.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testcases;
+
+import org.junit.jupiter.api.Test;
+
+public class SimpleTest {
+
+	@Test
+	void test() {
+
+	}
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
new file mode 100644
index 000000000000..7862260ac52a
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.SimpleTest;
+
+@Suite
+@SelectClasses(SimpleTest.class)
+public abstract class AbstractSuite {
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
new file mode 100644
index 000000000000..3871f8bee0a4
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@IncludeClassNamePatterns(".*")
+@SelectClasses(CyclicSuite.class)
+public class CyclicSuite {
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
new file mode 100644
index 000000000000..fd1aa14bdd78
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages("org.junit.platform.suite.engine.testcases")
+public class DynamicSuite {
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
new file mode 100644
index 000000000000..c0b7e5324d7f
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.MultipleTest;
+
+@Suite
+@SelectClasses(MultipleTest.class)
+public class MultipleSuite {
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
new file mode 100644
index 000000000000..fccc7923d534
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.MultipleTest;
+import org.junit.platform.suite.engine.testcases.SimpleTest;
+
+public class NestedSuite {
+
+	@Suite
+	@SelectClasses(SimpleTest.class)
+	static public class Jupiter {
+
+	}
+
+	@Suite
+	@SelectClasses(MultipleTest.class)
+	static public class Tagged {
+
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
new file mode 100644
index 000000000000..cc4efeec05a3
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.SimpleTest;
+
+@Suite
+@SelectClasses(SimpleTest.class)
+public class SelectClassesSuite {
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
new file mode 100644
index 000000000000..102bedec99ad
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SuiteDisplayName;
+import org.junit.platform.suite.engine.testcases.SimpleTest;
+
+@Suite
+@SelectClasses(SimpleTest.class)
+@SuiteDisplayName("Suite Display Name")
+public class SuiteDisplayNameSuite {
+
+}
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
new file mode 100644
index 000000000000..6a46a6a73de8
--- /dev/null
+++ b/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@IncludeClassNamePatterns(".*")
+@SelectClasses(SelectClassesSuite.class)
+public class SuiteSuite {
+
+}
diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
new file mode 100644
index 000000000000..e9ff61917051
--- /dev/null
+++ b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+	`java-library-conventions`
+}
+
+description = "JUnit Platform Suite (Aggregator)"
+
+dependencies {
+	internal(platform(project(":dependencies")))
+
+	api(platform(project(":junit-bom")))
+	api(project(":junit-platform-suite-api"))
+	implementation(project(":junit-platform-suite-engine"))
+}
diff --git a/junit-platform-suite/src/module/org.junit.platform.suite/module-info.java b/junit-platform-suite/src/module/org.junit.platform.suite/module-info.java
new file mode 100644
index 000000000000..74a575d71c5e
--- /dev/null
+++ b/junit-platform-suite/src/module/org.junit.platform.suite/module-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+/**
+ * Aggregates all JUnit Platform Suite modules.
+ *
+ * @since 1.8
+ */
+module org.junit.platform.suite {
+	requires transitive org.junit.platform.suite.api;
+	requires transitive org.junit.platform.suite.engine;
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
index f3a01a506da3..9f31532958f7 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
@@ -36,6 +36,7 @@
 class UniqueIdTests {
 
 	private static final String ENGINE_ID = "junit-jupiter";
+	private static final String SUITE_ENGINE_ID = "junit-platform-suite";
 
 	@Nested
 	class Creation {
@@ -48,6 +49,13 @@ void uniqueIdCanBeCreatedFromEngineId() {
 			assertSegment(uniqueId.getSegments().get(0), "engine", "junit-jupiter");
 		}
 
+		@Test
+		void engineIdCanBeAppended() {
+			var suiteEngineId = UniqueId.forEngine(SUITE_ENGINE_ID);
+			var uniqueId = suiteEngineId.appendEngine(ENGINE_ID);
+			assertSegment(uniqueId.getSegments().get(1), "engine", "junit-jupiter");
+		}
+
 		@Test
 		void retrievingOptionalEngineId() {
 			var uniqueIdWithEngine = UniqueId.forEngine(ENGINE_ID);
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index cb4665600b52..edcd0546e5ed 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -269,13 +269,13 @@ class TestCase {
 			var filters = request.getEngineFilters();
 			assertThat(filters).hasSize(2);
 
-			var includeFilter = filters.get(0);
+			var includeFilter = filters.get(1);
 			assertTrue(includeFilter.apply(fooEngine).included());
 			assertTrue(includeFilter.apply(barEngine).included());
 			assertTrue(includeFilter.apply(bazEngine).included());
 			assertTrue(includeFilter.apply(quuxEngine).excluded());
 
-			var excludeFilter = filters.get(1);
+			var excludeFilter = filters.get(0);
 			assertTrue(excludeFilter.apply(fooEngine).included());
 			assertTrue(excludeFilter.apply(barEngine).excluded());
 			assertTrue(excludeFilter.apply(bazEngine).included());
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
index 6633c600100d..ad6e2c7c66d4 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
@@ -7,5 +7,5 @@ requires java.base mandated
 requires java.logging
 requires java.management
 requires org.apiguardian.api transitive
-qualified exports org.junit.platform.commons.logging to org.junit.jupiter.api org.junit.jupiter.engine org.junit.jupiter.migrationsupport org.junit.jupiter.params org.junit.platform.console org.junit.platform.engine org.junit.platform.launcher org.junit.platform.reporting org.junit.platform.runner org.junit.platform.suite.api org.junit.platform.testkit org.junit.vintage.engine
-qualified exports org.junit.platform.commons.util to org.junit.jupiter.api org.junit.jupiter.engine org.junit.jupiter.migrationsupport org.junit.jupiter.params org.junit.platform.console org.junit.platform.engine org.junit.platform.launcher org.junit.platform.reporting org.junit.platform.runner org.junit.platform.suite.api org.junit.platform.testkit org.junit.vintage.engine
\ No newline at end of file
+qualified exports org.junit.platform.commons.logging to org.junit.jupiter.api org.junit.jupiter.engine org.junit.jupiter.migrationsupport org.junit.jupiter.params org.junit.platform.console org.junit.platform.engine org.junit.platform.launcher org.junit.platform.reporting org.junit.platform.runner org.junit.platform.suite.api org.junit.platform.suite.engine org.junit.platform.testkit org.junit.vintage.engine
+qualified exports org.junit.platform.commons.util to org.junit.jupiter.api org.junit.jupiter.engine org.junit.jupiter.migrationsupport org.junit.jupiter.params org.junit.platform.console org.junit.platform.engine org.junit.platform.launcher org.junit.platform.reporting org.junit.platform.runner org.junit.platform.suite.api org.junit.platform.suite.commons org.junit.platform.suite.engine org.junit.platform.testkit org.junit.vintage.engine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
index 8ebeee20a3dd..e7ec0686461e 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
@@ -4,4 +4,5 @@ requires java.base mandated
 requires junit transitive
 requires org.apiguardian.api transitive
 requires org.junit.platform.launcher transitive
-requires org.junit.platform.suite.api transitive
\ No newline at end of file
+requires org.junit.platform.suite.api transitive
+requires org.junit.platform.suite.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
index cf4f7fdcad33..89ec3ed1b94d 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
@@ -2,3 +2,4 @@ org.junit.platform.suite.api@${platformVersion} jar:file:.+junit-platform-suite-
 exports org.junit.platform.suite.api
 requires java.base mandated
 requires org.apiguardian.api transitive
+requires org.junit.platform.commons transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
new file mode 100644
index 000000000000..88011288252d
--- /dev/null
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
@@ -0,0 +1,8 @@
+org.junit.platform.suite.commons@${platformVersion} jar:file:.+junit-platform-suite-commons/build/libs/junit-platform-suite-commons-${platformVersion}.jar..module-info.class
+requires java.base mandated
+requires org.apiguardian.api transitive
+requires org.junit.platform.commons
+requires org.junit.platform.engine
+requires org.junit.platform.launcher transitive
+requires org.junit.platform.suite.api
+qualified exports org.junit.platform.suite.commons to org.junit.platform.runner org.junit.platform.suite.engine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
new file mode 100644
index 000000000000..f3ca8fbc91f5
--- /dev/null
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
@@ -0,0 +1,10 @@
+org.junit.platform.suite.engine@${platformVersion} jar:file:.+junit-platform-suite-engine/build/libs/junit-platform-suite-engine-${platformVersion}.jar..module-info.class
+requires java.base mandated
+requires org.apiguardian.api
+requires org.junit.platform.commons
+requires org.junit.platform.engine
+requires org.junit.platform.launcher
+requires org.junit.platform.suite.api
+requires org.junit.platform.suite.commons
+provides org.junit.platform.engine.TestEngine with org.junit.platform.suite.engine.SuiteTestEngine
+contains org.junit.platform.suite.engine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite.expected.txt
new file mode 100644
index 000000000000..c70a146e3c3f
--- /dev/null
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite.expected.txt
@@ -0,0 +1,4 @@
+org.junit.platform.suite@${platformVersion} jar:file:.+junit-platform-suite/build/libs/junit-platform-suite-${platformVersion}.jar..module-info.class
+requires java.base mandated
+requires org.junit.platform.suite.api transitive
+requires org.junit.platform.suite.engine transitive
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
index 816504c33e11..2895a7bbbf85 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
@@ -41,7 +41,10 @@ void loadModuleDirectoryNames() {
 			"junit-platform-launcher", //
 			"junit-platform-reporting", //
 			"junit-platform-runner", //
+			"junit-platform-suite", //
 			"junit-platform-suite-api", //
+			"junit-platform-suite-commons", //
+			"junit-platform-suite-engine", //
 			"junit-platform-testkit", //
 			"junit-vintage-engine"//
 		), Helper.loadModuleDirectoryNames());
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
index e5affb4b7588..7fa8a022bfdb 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
@@ -105,7 +105,7 @@ private static List<String> compileModules(Path temp, Writer out, Writer err, Fu
 					.map(base::resolve) //
 					.map(Project::new) //
 					.collect(Collectors.toList());
-			assertEquals(15, projects.size());
+			assertEquals(18, projects.size());
 
 			args.add("--module-source-path");
 			args.add(projects.stream() //
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0f3cc86dbbfd..f8d7de5104dd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -97,7 +97,10 @@ include("junit-platform-jfr")
 include("junit-platform-launcher")
 include("junit-platform-reporting")
 include("junit-platform-runner")
+include("junit-platform-suite")
 include("junit-platform-suite-api")
+include("junit-platform-suite-commons")
+include("junit-platform-suite-engine")
 include("junit-platform-testkit")
 include("junit-vintage-engine")
 include("platform-tests")
diff --git a/src/publishDocumentationSnapshotOnlyIfNecessary.sh b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
index 14372c100b91..c4ed2762ebf0 100755
--- a/src/publishDocumentationSnapshotOnlyIfNecessary.sh
+++ b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
@@ -26,7 +26,10 @@ md5sum $(find junit-platform-engine -wholename '**/src/main/*.java') >> "${curre
 md5sum $(find junit-platform-launcher -wholename '**/src/main/*.java') >> "${current}"
 md5sum $(find junit-platform-reporting -wholename '**/src/main/*.java') >> "${current}"
 md5sum $(find junit-platform-runner -wholename '**/src/main/*.java') >> "${current}"
+md5sum $(find junit-platform-suite -wholename '**/src/main/*.java') >> "${current}"
 md5sum $(find junit-platform-suite-api -wholename '**/src/main/*.java') >> "${current}"
+md5sum $(find junit-platform-suite-commons -wholename '**/src/main/*.java') >> "${current}"
+md5sum $(find junit-platform-suite-engine -wholename '**/src/main/*.java') >> "${current}"
 md5sum $(find junit-platform-testkit -wholename '**/src/main/*.java') >> "${current}"
 md5sum $(find junit-vintage-engine -wholename '**/src/main/*.java') >> "${current}"
 # skip module platform-tests because it doesn't contain relevant documentation

From e884aa6acbc06d984fab3ecd715314711072424f Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Tue, 9 Feb 2021 21:58:41 +0100
Subject: [PATCH 0204/1433] =?UTF-8?q?Support=20named=20sources=20for=20Dyn?=
 =?UTF-8?q?amicTest.stream(=E2=80=A6)=20(#2548)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduction of `DynamicTest.stream(Iterator<? extends Named<T>>, ThrowingConsumer<? super T>)` and `DynamicTest.stream(Stream<? extends Named<T>>, ThrowingConsumer<? super T>)`. Both methods use each name-value pair provided by the first parameter as the display name and value for each generated dynamic test.

Resolves #2375.
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  4 ++
 .../test/java/example/DynamicTestsDemo.java   | 18 +++++
 .../org/junit/jupiter/api/DynamicTest.java    | 71 +++++++++++++++++++
 .../junit/jupiter/api/DynamicTestTests.java   | 35 +++++++++
 4 files changed, 128 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index d9be75d3f793..cf5dcc022ecc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -88,6 +88,10 @@ on GitHub.
 * In parameterized tests with `@MethodSource` or `@ArgumentSource`, arguments can now have
   optional names. When the argument is included in the display name of an iteration, this
   name will be used instead of the value.
+* `DynamicTests.stream()` can now consume `Named` input and will use each name-value
+  pair as the display name and value for each generated dynamic test (see
+  <<../user-guide/index.adoc#writing-tests-dynamic-tests-examples,User Guide>> for details).
+
 
 [[release-notes-5.8.0-M1-junit-vintage]]
 === JUnit Vintage
diff --git a/documentation/src/test/java/example/DynamicTestsDemo.java b/documentation/src/test/java/example/DynamicTestsDemo.java
index 34360741f672..f93a60aef728 100644
--- a/documentation/src/test/java/example/DynamicTestsDemo.java
+++ b/documentation/src/test/java/example/DynamicTestsDemo.java
@@ -33,6 +33,7 @@
 
 import org.junit.jupiter.api.DynamicNode;
 import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.function.ThrowingConsumer;
@@ -151,6 +152,23 @@ Stream<DynamicTest> dynamicTestsFromStreamFactoryMethod() {
 		return DynamicTest.stream(inputStream, displayNameGenerator, testExecutor);
 	}
 
+	@TestFactory
+	Stream<DynamicTest> dynamicTestsFromStreamFactoryMethodWithNames() {
+		// Stream of palindromes to check
+		Stream<Named<String>> inputStream = Stream.of(
+				Named.of("racecar is a palindrome", "racecar"),
+				Named.of("radar is also a palindrome", "radar"),
+				Named.of("mom also seems to be a palindrome", "mom"),
+				Named.of("dad is yet another palindrome", "dad")
+		);
+
+		// Executes tests based on the current input value.
+		ThrowingConsumer<String> testExecutor = text -> assertTrue(isPalindrome(text));
+
+		// Returns a stream of dynamic tests.
+		return DynamicTest.stream(inputStream, testExecutor);
+	}
+
 	@TestFactory
 	Stream<DynamicNode> dynamicTestsWithContainers() {
 		return Stream.of("A", "B", "C")
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
index 23b380df07c5..de0e03cfe88e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
@@ -155,6 +155,77 @@ public static <T> Stream<DynamicTest> stream(Stream<T> inputStream,
 				.map(input -> dynamicTest(displayNameGenerator.apply(input), () -> testExecutor.accept(input)));
 	}
 
+	/**
+	 * Generate a stream of dynamic tests based on the given generator and test
+	 * executor.
+	 *
+	 * <p>Use this method when the set of dynamic tests is nondeterministic in
+	 * nature or when the input comes from an existing {@link Iterator}. See
+	 * {@link #stream(Stream, ThrowingConsumer)} as an alternative.
+	 *
+	 * <p>The given {@code inputGenerator} is responsible for generating
+	 * input values and display names. A {@link DynamicTest} will be added to
+	 * the resulting stream for each dynamically generated input value,
+	 * using the given {@code testExecutor}.
+	 *
+	 * @param inputGenerator an {@code Iterator} with {@code Named} values
+	 * that serves as a dynamic <em>input generator</em>; never {@code null}
+	 * @param testExecutor a consumer that executes a test based on an input
+	 * value; never {@code null}
+	 * @param <T> the type of <em>input</em> generated by the {@code inputGenerator}
+	 * and used by the {@code testExecutor}
+	 * @return a stream of dynamic tests based on the given generator and
+	 * executor; never {@code null}
+	 * @since 5.8
+	 *
+	 * @see #dynamicTest(String, Executable)
+	 * @see #stream(Stream, ThrowingConsumer)
+	 * @see Named
+	 */
+	@API(status = MAINTAINED, since = "5.8")
+	public static <T> Stream<DynamicTest> stream(Iterator<? extends Named<T>> inputGenerator,
+			ThrowingConsumer<? super T> testExecutor) {
+		Preconditions.notNull(inputGenerator, "inputGenerator must not be null");
+
+		return stream(StreamSupport.stream(spliteratorUnknownSize(inputGenerator, ORDERED), false), testExecutor);
+	}
+
+	/**
+	 * Generate a stream of dynamic tests based on the given input stream and
+	 * test executor.
+	 *
+	 * <p>Use this method when the set of dynamic tests is nondeterministic in
+	 * nature or when the input comes from an existing {@link Stream}. See
+	 * {@link #stream(Iterator, ThrowingConsumer)} as an alternative.
+	 *
+	 * <p>The given {@code inputStream} is responsible for supplying input values
+	 * and display names. A {@link DynamicTest} will be added to the resulting stream for
+	 * each dynamically supplied input value, using the given {@code testExecutor}.
+	 *
+	 * @param inputStream a {@code Stream} that supplies dynamic {@code Named}
+	 * input values; never {@code null}
+	 * @param testExecutor a consumer that executes a test based on an input
+	 * value; never {@code null}
+	 * @param <T> the type of <em>input</em> supplied by the {@code inputStream}
+	 * and used by the {@code displayNameGenerator} and {@code testExecutor}
+	 * @return a stream of dynamic tests based on the given generator and
+	 * executor; never {@code null}
+	 * @since 5.8
+	 *
+	 * @see #dynamicTest(String, Executable)
+	 * @see #stream(Iterator, ThrowingConsumer)
+	 * @see Named
+	 */
+	@API(status = MAINTAINED, since = "5.8")
+	public static <T> Stream<DynamicTest> stream(Stream<? extends Named<T>> inputStream,
+			ThrowingConsumer<? super T> testExecutor) {
+		Preconditions.notNull(inputStream, "inputStream must not be null");
+		Preconditions.notNull(testExecutor, "testExecutor must not be null");
+
+		return inputStream //
+				.map(input -> dynamicTest(input.getName(), () -> testExecutor.accept(input.getPayload())));
+	}
+
 	private final Executable executable;
 
 	private DynamicTest(String displayName, URI testSourceUri, Executable executable) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
index 5709868ad41b..7ea7c1e926fb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
@@ -70,6 +70,26 @@ void streamFromIteratorPreconditions() {
 			() -> DynamicTest.stream(emptyIterator(), displayNameGenerator, null));
 	}
 
+	@Test
+	void streamFromStreamWithNamesPreconditions() {
+		ThrowingConsumer<Object> testExecutor = input -> {
+		};
+
+		assertThrows(PreconditionViolationException.class,
+			() -> DynamicTest.stream((Stream<? extends Named<Object>>) null, testExecutor));
+		assertThrows(PreconditionViolationException.class, () -> DynamicTest.stream(Stream.empty(), null));
+	}
+
+	@Test
+	void streamFromIteratorWithNamesPreconditions() {
+		ThrowingConsumer<Object> testExecutor = input -> {
+		};
+
+		assertThrows(PreconditionViolationException.class,
+			() -> DynamicTest.stream((Iterator<? extends Named<Object>>) null, testExecutor));
+		assertThrows(PreconditionViolationException.class, () -> DynamicTest.stream(emptyIterator(), null));
+	}
+
 	@Test
 	void streamFromStream() throws Throwable {
 		Stream<DynamicTest> stream = DynamicTest.stream(Stream.of("foo", "bar", "baz"), String::toUpperCase,
@@ -84,6 +104,21 @@ void streamFromIterator() throws Throwable {
 		assertStream(stream);
 	}
 
+	@Test
+	void streamFromStreamWithNames() throws Throwable {
+		Stream<DynamicTest> stream = DynamicTest.stream(
+			Stream.of(Named.of("FOO", "foo"), Named.of("BAR", "bar"), Named.of("BAZ", "baz")), this::throwingConsumer);
+		assertStream(stream);
+	}
+
+	@Test
+	void streamFromIteratorWithNames() throws Throwable {
+		Stream<DynamicTest> stream = DynamicTest.stream(
+			List.of(Named.of("FOO", "foo"), Named.of("BAR", "bar"), Named.of("BAZ", "baz")).iterator(),
+			this::throwingConsumer);
+		assertStream(stream);
+	}
+
 	private void assertStream(Stream<DynamicTest> stream) throws Throwable {
 		List<DynamicTest> dynamicTests = stream.collect(Collectors.toList());
 

From ce82b18c93b06dc4e7419316432131c5a65cedd8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 11 Feb 2021 12:09:12 +0100
Subject: [PATCH 0205/1433] Make SummaryGeneratingListener thread-safe (#2549)

Prior to this commit, concurrently reported failures were stored in an
unguarded `ArrayList` which caused a race condition that sometimes
caused failures to get lost and hence not reported. Now the list of
failures is wrapped in `synchronizedList` to make it thread-safe.

Fixes #2546.

Co-authored-by: Christian Stein <sormuras@gmail.com>
---
 .../release-notes/release-notes-5.8.0-M1.adoc |  3 +-
 .../junit-jupiter-engine.gradle.kts           |  1 +
 .../execution/ExtensionValuesStoreTests.java  | 34 +--------
 .../junit-platform-commons.gradle.kts         |  1 +
 .../commons/test/ConcurrencyTestingUtils.java | 69 +++++++++++++++++++
 .../MutableTestExecutionSummary.java          |  3 +-
 platform-tests/platform-tests.gradle.kts      |  1 +
 .../listeners/SummaryGenerationTests.java     | 23 +++++++
 8 files changed, 101 insertions(+), 34 deletions(-)
 create mode 100644 junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index cf5dcc022ecc..46dcffd460d1 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -15,7 +15,8 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* `SummaryGeneratingListener` is now thread-safe and can handle concurrently failing
+  tests.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 9f739e03db44..9cb4fd434c14 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -17,6 +17,7 @@ dependencies {
 	testImplementation(project(":junit-platform-launcher"))
 	testImplementation(project(":junit-platform-runner"))
 	testImplementation(project(":junit-platform-testkit"))
+	testImplementation(testFixtures(project(":junit-platform-commons")))
 	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	testImplementation("org.codehaus.groovy:groovy")
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
index 661f6087f86a..b804b6feba9a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
@@ -10,22 +10,16 @@
 
 package org.junit.jupiter.engine.execution;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.platform.commons.test.ConcurrencyTestingUtils.executeConcurrently;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -300,7 +294,7 @@ void removeNullValueWithTypeSafety() {
 		}
 
 		@Test
-		void simulateRaceConditionInGetOrComputeIfAbsent() {
+		void simulateRaceConditionInGetOrComputeIfAbsent() throws Exception {
 			int threads = 10;
 			AtomicInteger counter = new AtomicInteger();
 			ExtensionValuesStore localStore = new ExtensionValuesStore(null);
@@ -313,30 +307,6 @@ void simulateRaceConditionInGetOrComputeIfAbsent() {
 		}
 	}
 
-	private <T> List<T> executeConcurrently(int threads, Supplier<T> supplier) {
-		ExecutorService executorService = Executors.newFixedThreadPool(threads);
-		try {
-			CountDownLatch latch = new CountDownLatch(threads);
-			List<CompletableFuture<T>> futures = new ArrayList<>();
-			for (int i = 0; i < threads; i++) {
-				futures.add(CompletableFuture.supplyAsync(() -> {
-					latch.countDown();
-					try {
-						latch.await();
-					}
-					catch (InterruptedException e) {
-						Thread.currentThread().interrupt();
-					}
-					return supplier.get();
-				}, executorService));
-			}
-			return futures.stream().map(CompletableFuture::join).collect(toList());
-		}
-		finally {
-			executorService.shutdown();
-		}
-	}
-
 	@Nested
 	class InheritedValuesTests {
 
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index c720729127d8..4fe02c95ee33 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 	`java-library-conventions`
 	`java-multi-release-sources`
 	`java-repackage-jars`
+	`java-test-fixtures`
 }
 
 description = "JUnit Platform Commons"
diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java
new file mode 100644
index 000000000000..62b235b5fca6
--- /dev/null
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.commons.test;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class ConcurrencyTestingUtils {
+
+	public static void executeConcurrently(int threads, Runnable action) throws Exception {
+		executeConcurrently(threads, () -> {
+			action.run();
+			return null;
+		});
+	}
+
+	public static <T> List<T> executeConcurrently(int threads, Callable<T> action) throws Exception {
+		ExecutorService executorService = Executors.newFixedThreadPool(threads);
+		try {
+			CountDownLatch latch = new CountDownLatch(threads);
+			List<CompletableFuture<T>> futures = new ArrayList<>();
+			for (int i = 0; i < threads; i++) {
+				futures.add(CompletableFuture.supplyAsync(() -> {
+					try {
+						latch.countDown();
+						latch.await();
+						return action.call();
+					}
+					catch (InterruptedException e) {
+						Thread.currentThread().interrupt();
+						throw new CompletionException(e);
+					}
+					catch (Exception e) {
+						throw new CompletionException("Action failed", e);
+					}
+				}, executorService));
+			}
+			List<T> list = new ArrayList<>();
+			for (CompletableFuture<T> future : futures) {
+				list.add(future.get(5, SECONDS));
+			}
+			return list;
+		}
+		finally {
+			executorService.shutdownNow();
+			var terminated = executorService.awaitTermination(5, SECONDS);
+			if (!terminated) {
+				//noinspection ThrowFromFinallyBlock
+				throw new AssertionError("ExecutorService did not cleanly shut down");
+			}
+		}
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
index e1b5af2030fb..f9236ad91cae 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
@@ -11,6 +11,7 @@
 package org.junit.platform.launcher.listeners;
 
 import static java.lang.String.join;
+import static java.util.Collections.synchronizedList;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -54,7 +55,7 @@ class MutableTestExecutionSummary implements TestExecutionSummary {
 	final AtomicLong testsFailed = new AtomicLong();
 
 	private final TestPlan testPlan;
-	private final List<Failure> failures = new ArrayList<>();
+	private final List<Failure> failures = synchronizedList(new ArrayList<>());
 	private final long timeStarted;
 	long timeFinished;
 
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index c8d92f145b1f..babacf5a3439 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
 	// --- Things we are testing with ---------------------------------------------
 	testImplementation(project(":junit-platform-runner"))
 	testImplementation(project(":junit-platform-testkit"))
+	testImplementation(testFixtures(project(":junit-platform-commons")))
 	testImplementation(testFixtures(project(":junit-platform-engine")))
 	testImplementation(testFixtures(project(":junit-platform-launcher")))
 	testImplementation(project(":junit-jupiter-engine"))
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index 85fb04c13524..229e82f1f639 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -15,12 +15,14 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.platform.commons.test.ConcurrencyTestingUtils.executeConcurrently;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.List;
 import java.util.Optional;
 
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
@@ -220,6 +222,27 @@ public Optional<TestSource> getSource() {
 		);
 	}
 
+	@RepeatedTest(10)
+	void reportingConcurrentlyFinishedTests() throws Exception {
+		var numThreads = 250;
+		var testIdentifier = TestIdentifier.from(new TestDescriptorStub(UniqueId.root("root", "2"), "failingTest") {
+			@Override
+			public Optional<TestSource> getSource() {
+				return Optional.of(ClassSource.from(Object.class));
+			}
+		});
+		var result = TestExecutionResult.failed(new RuntimeException());
+
+		listener.testPlanExecutionStarted(testPlan);
+		executeConcurrently(numThreads, () -> {
+			listener.executionStarted(testIdentifier);
+			listener.executionFinished(testIdentifier, result);
+		});
+		listener.testPlanExecutionFinished(testPlan);
+
+		assertThat(listener.getSummary().getFailures()).hasSize(numThreads);
+	}
+
 	@SuppressWarnings("deprecation")
 	private TestIdentifier createTestIdentifier(String uniqueId) {
 		var identifier = TestIdentifier.from(new TestDescriptorStub(UniqueId.root("test", uniqueId), uniqueId));

From 0bdb0ff61647a43d7a864df898e3f534056a15b6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 11 Feb 2021 18:40:30 +0100
Subject: [PATCH 0206/1433] Prepare release notes for 5.8.0-M1

---
 .../release-notes/release-notes-5.8.0-M1.adoc | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 46dcffd460d1..e403990f5b80 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -1,9 +1,15 @@
 [[release-notes-5.8.0-M1]]
 == 5.8.0-M1
 
-*Date of Release:* ❓
+*Date of Release:* February 11, 2021
 
-*Scope:* ❓
+*Scope:*
+
+* Declarative test suites
+* Test class ordering
+* `LauncherSession` and accompanying listener
+* More fine-grained JFR events
+* Memory and performance optimizations
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/51?closed=1+[5.8 M1] milestone page in the JUnit repository
@@ -50,13 +56,10 @@ on GitHub.
   Platform Launcher.
 * Added additional selectors to the `junit-platform-suite-api`
 
+
 [[release-notes-5.8.0-M1-junit-jupiter]]
 === JUnit Jupiter
 
-==== Bug Fixes
-
-* ❓
-
 ==== Deprecations and Breaking Changes
 
 * `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, ExtensionContext)` has
@@ -76,7 +79,6 @@ on GitHub.
 * `assertNull()` failure messages now include the actual object's type if the `toString()`
   implementation for the actual object returns `null` or `"null"`. This avoids the
   generation of confusing failure messages such as `expected <null> but was <null>`.
-
 * Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
   underscores as in some JVM languages, to improve readability of long numbers like
   `700_000_000`.
@@ -97,14 +99,6 @@ on GitHub.
 [[release-notes-5.8.0-M1-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * The JUnit Vintage engine now requires less memory and allows for earlier garbage

From 9b7a0edcdb0eaca40b66e3fe35c96f73bbfb00b7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 11 Feb 2021 18:54:08 +0100
Subject: [PATCH 0207/1433] Polish release notes for 5.8 M1

---
 .../release-notes/release-notes-5.8.0-M1.adoc | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index e403990f5b80..bff82f016661 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -21,8 +21,7 @@ on GitHub.
 
 ==== Bug Fixes
 
-* `SummaryGeneratingListener` is now thread-safe and can handle concurrently failing
-  tests.
+* `SummaryGeneratingListener` is now thread-safe and can handle concurrently failing tests.
 
 ==== Deprecations and Breaking Changes
 
@@ -45,16 +44,16 @@ on GitHub.
 * Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
 * Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
   longer store `String` representations of unique IDs.
-* Improved of `ExclusiveResource` handling: if a `Node` has only read locks and no
-  read-write locks, then descendants are not forced into `SAME_THREAD` execution and can
-  run concurrently.
+* Improved `ExclusiveResource` handling: if a `Node` has only read locks and no read-write
+  locks, then descendants are not forced into `SAME_THREAD` execution and can run
+  concurrently.
 * Tools that make multiple calls to the `Launcher` API should now create a
   `LauncherSession` in order to allow for executing global setup and teardown code exactly
   once via the new `LauncherSessionListener` interface that can be registered via Java’s
   `{ServiceLoader}` mechanism.
 * New `junit-platform-suite-engine` to execute declarative test suites using the JUnit
   Platform Launcher.
-* Added additional selectors to the `junit-platform-suite-api`
+* Additional selectors in the suite API in the `junit-platform-suite-api` module.
 
 
 [[release-notes-5.8.0-M1-junit-jupiter]]
@@ -70,8 +69,8 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* Top-level test classes can now be ordered by passing the fully-qualified name of a
-  class implementing `ClassOrderer` as the value of the new
+* Top-level test classes can now be ordered by passing the fully-qualified name of a class
+  implementing `ClassOrderer` as the value of the new
   `junit.jupiter.testclass.order.default` configuration parameter.
 * New `assertInstanceOf()` methods which produce better error messages comparable to those
   produced by `assertThrows`. These new methods serve as a replacement for
@@ -89,10 +88,10 @@ on GitHub.
   data structures.
 * Documented constant values in `org.junit.jupiter.api.parallel.Resources`.
 * In parameterized tests with `@MethodSource` or `@ArgumentSource`, arguments can now have
-  optional names. When the argument is included in the display name of an iteration, this
-  name will be used instead of the value.
-* `DynamicTests.stream()` can now consume `Named` input and will use each name-value
-  pair as the display name and value for each generated dynamic test (see
+  optional names (supplied via the new `Named` API). When the argument is included in the
+  display name of an iteration, this name will be used instead of the value.
+* `DynamicTests.stream()` can now consume `Named` input and will use each name-value pair
+  as the display name and value for each generated dynamic test (see
   <<../user-guide/index.adoc#writing-tests-dynamic-tests-examples,User Guide>> for details).
 
 

From 375f55b5ac6063d546d9f9bc5d97a49a7bb91b9d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 11 Feb 2021 19:56:28 +0100
Subject: [PATCH 0208/1433] Ensure platform-tests use junit-jupiter from
 current build

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 32c14b50524c..ef60d6f4539a 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -40,10 +40,7 @@ dependencies {
 	}
 
 	if (project.name != "junit-jupiter-engine") {
-		"testImplementation"(project(":junit-jupiter-api"))
-		"testImplementation"(project(":junit-jupiter-params"))
-
-		"testRuntimeOnly"(project(":junit-jupiter-engine"))
+		"testImplementation"(project(":junit-jupiter"))
 	}
 	"testImplementation"(testFixtures(project(":junit-jupiter-api")))
 

From b38e3a309cb27eebe748263b3bef55bb065fca76 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 11 Feb 2021 19:39:36 +0100
Subject: [PATCH 0209/1433] Release 5.8.0-M1

---
 README.md         | 2 +-
 gradle.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c6b6e453af25..ec2a28a4db85 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 ## Latest Releases
 
 - General Availability (GA): [JUnit 5.7.1](https://github.com/junit-team/junit5/releases/tag/r5.7.1) (February 4, 2021)
-- Preview (Milestone/Release Candidate): n/a
+- Preview (Milestone/Release Candidate): [JUnit 5.8.0-M1](https://github.com/junit-team/junit5/releases/tag/r5.8.0-M1) (February 11, 2021)
 
 ## Documentation
 
diff --git a/gradle.properties b/gradle.properties
index c7a69ac63ad5..c8478c73a009 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.8.0-SNAPSHOT
+version         = 5.8.0-M1
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.8.0-SNAPSHOT
+platformVersion = 1.8.0-M1
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.8.0-SNAPSHOT
+vintageVersion  = 5.8.0-M1
 
 defaultBuiltBy  = JUnit Team
 

From 7d91d0ac73d2bde57f6a72db441d29407338f8e5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 11 Feb 2021 20:22:15 +0100
Subject: [PATCH 0210/1433] Fix docs

---
 documentation/src/docs/asciidoc/link-attributes.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 987287be3d68..297c2bab8441 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -45,7 +45,7 @@ endif::[]
 :JUnitPlatform-Runner:                       {javadoc-root}/org.junit.platform.runnner/org/junit/platform/runner/JUnitPlatform.html[JUnitPlatform]
 // Platform Suite
 :suite-api-package:                          {javadoc-root}/org.junit.platform.suite.api/org/junit/platform/suite/api/package-summary.html[org.junit.platform.suite.api]
-:junit-platform-suite-engine                 {javadoc-root}/org.junit.platform.suite.engine/org/junit/platform/suite/engine/package-summary.html[junit-platform-suite-engine]
+:junit-platform-suite-engine:                {javadoc-root}/org.junit.platform.suite.engine/org/junit/platform/suite/engine/package-summary.html[junit-platform-suite-engine]
 // Platform Test Kit
 :testkit-engine-package:                     {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/package-summary.html[org.junit.platform.testkit.engine]
 :EngineExecutionResults:                     {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/EngineExecutionResults.html[EngineExecutionResults]

From 9bcbc5b8c39d7083175e470faca777759b9a64de Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 11 Feb 2021 20:29:35 +0100
Subject: [PATCH 0211/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c8478c73a009..c7a69ac63ad5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.8.0-M1
+version         = 5.8.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.8.0-M1
+platformVersion = 1.8.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.8.0-M1
+vintageVersion  = 5.8.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From d65aff05d1422ed8fb11ba166b301359724571c9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 Feb 2021 15:02:54 +0100
Subject: [PATCH 0212/1433] Resolve Gradle deprecation warnings

Annotate `getName()` with `@Internal`
---
 .../main/kotlin/java-library-conventions.gradle.kts  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 1d52ba465358..6b2e0625aba5 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -222,16 +222,21 @@ tasks.compileTestJava {
 }
 
 inner class ModulePathArgumentProvider : CommandLineArgumentProvider, Named {
-	@get:CompileClasspath val modulePath: Provider<Configuration> = configurations.compileClasspath
+	@get:CompileClasspath
+	val modulePath: Provider<Configuration> = configurations.compileClasspath
 	override fun asArguments() = listOf("--module-path", modulePath.get().asPath)
+	@Internal
 	override fun getName() = "module-path"
 }
 
 inner class PatchModuleArgumentProvider(it: Project) : CommandLineArgumentProvider, Named {
 
-	@get:Input val module: String = it.javaModuleName
+	@get:Input
+	val module: String = it.javaModuleName
 
-	@get:InputFiles @get:PathSensitive(RELATIVE) val patch: Provider<FileCollection> = provider {
+	@get:InputFiles
+	@get:PathSensitive(RELATIVE)
+	val patch: Provider<FileCollection> = provider {
 		if (it == project)
 			files(sourceSets.matching { it.name.startsWith("main") }.map { it.output })
 		else
@@ -246,6 +251,7 @@ inner class PatchModuleArgumentProvider(it: Project) : CommandLineArgumentProvid
 		return listOf("--patch-module", "$module=$path")
 	}
 
+	@Internal
 	override fun getName() = "patch-module($module)"
 }
 

From b0c6e3623f0727cf5cd83538fe8e9eea759fa175 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 Feb 2021 15:50:02 +0100
Subject: [PATCH 0213/1433] Fix Javadoc stylesheet for JDK 15

Fixes #2513.
---
 .../src/javadoc/junit-stylesheet.css          | 102 +++++++++++-------
 1 file changed, 63 insertions(+), 39 deletions(-)

diff --git a/documentation/src/javadoc/junit-stylesheet.css b/documentation/src/javadoc/junit-stylesheet.css
index 4ad313bfeb8c..19fe4f0cee0a 100644
--- a/documentation/src/javadoc/junit-stylesheet.css
+++ b/documentation/src/javadoc/junit-stylesheet.css
@@ -36,96 +36,120 @@ pre, code, tt, dt code, table tr td dt code {
     background-color:#25a162;
 }
 
-.topNav {
+.top-nav {
     background-color:#25a162;
 }
 
-.bottomNav {
+.bottom-nav {
     background-color:#25a162;
 }
 
-.subNav {
+.sub-nav {
     background-color:#f5f5f5;
 }
 
-.topNav a:hover, .bottomNav a:hover {
+.top-nav a:hover, .bottom-nav a:hover {
     text-decoration:underline;
     color:inherit;
 }
 
-.navBarCell1Rev {
+.nav-bar-cell1-rev {
     background-color:#fff;
     color:#dc524a;
     border-radius: 6px;
 }
 
-.indexNav {
+.index-nav {
     background-color:#eee;
 }
 
-div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
-    background-color:#ddd;
-    border:1px solid #ddd;
+body.class-declaration-page .summary h2,
+body.class-declaration-page .details h2,
+body.class-use-page  h2,
+body.module-declaration-page  .block-list h2 {
+    font-style: italic;
+    padding:0;
+    margin:15px 0;
 }
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
+body.class-declaration-page .summary h3,
+body.class-declaration-page .details h3,
+body.class-declaration-page .summary .inherited-list h2,
+div.details ul.block-list ul.block-list ul.block-list li.block-list h4,
+ul.block-list ul.block-list ul.block-list li.block-list h3 {
     background-color:#ddd;
     border:1px solid #ddd;
 }
 
-.constantsSummary caption a:link, .constantsSummary caption a:visited,
-.useSummary caption a:link, .useSummary caption a:visited {
+.constants-summary caption a:link, .constants-summary caption a:visited,
+.use-summary caption a:link, .use-summary caption a:visited {
     color:#fff;
 }
 
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span,
-.requiresSummary caption span, .packagesSummary caption span, .providesSummary caption span,
-.usesSummary caption span,
-.memberSummary caption span.activeTableTab span, .packagesSummary caption span.activeTableTab span,
-.overviewSummary caption span.activeTableTab span, .typeSummary caption span.activeTableTab span,
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd,
-.requiresSummary .tabEnd, .packagesSummary .tabEnd, .providesSummary .tabEnd, .usesSummary .tabEnd,
-.memberSummary .activeTableTab .tabEnd, .packagesSummary .activeTableTab .tabEnd,
-.overviewSummary .activeTableTab .tabEnd, .typeSummary .activeTableTab .tabEnd {
+.overview-summary caption span, .member-summary caption span, .type-summary caption span,
+.use-summary caption span, .constants-summary caption span, .deprecated-summary caption span,
+.requires-summary caption span, .packages-summary caption span, .provides-summary caption span,
+.uses-summary caption span,
+.member-summary caption span.active-table-tab span, .packages-summary caption span.active-table-tab span,
+.overview-summary caption span.active-table-tab span, .type-summary caption span.active-table-tab span,
+div.table-tabs > button.active-table-tab
+{
     background-color:#dc524a;
     color: #fff;
 }
 
-.memberSummary caption span.tableTab span, .packagesSummary caption span.tableTab span,
-.overviewSummary caption span.tableTab span, .typeSummary caption span.tableTab span,
-.memberSummary .tableTab .tabEnd, .packagesSummary .tableTab .tabEnd,
-.overviewSummary .tableTab .tabEnd, .typeSummary .tableTab .tabEnd,
-.ui-autocomplete-category {
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+    /* Overrides the color of selection used in jQuery UI */
+    background: #dc524a !important;
+    color: #fff !important;
+}
+
+main a[href*="://"]::after,
+main a[href*="://"]:hover::after,
+main a[href*="://"]:focus::after {
+    background-image:url('data:image/svg+xml; utf8, \
+      <svg xmlns="http://www.w3.org/2000/svg" width="768" height="768">\
+        <path d="M584 664H104V184h216V80H0v688h688V448H584zM384 0l132 \
+        132-240 240 120 120 240-240 132 132V0z" fill="%23aaa"/>\
+      </svg>');
+}
+
+.member-summary caption span.table-tab span, .packages-summary caption span.table-tab span,
+.overview-summary caption span.table-tab span, .type-summary caption span.table-tab span,
+.ui-autocomplete-category,
+div.table-tabs > button.table-tab {
     background-color:#aaa;
     color: #fff;
 }
 
-th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .constantsSummary th,
-.packagesSummary th {
+th.col-first, th.col-second, th.col-last, th.col-constructor-name, th.col-deprecated-item-name, .constants-summary th,
+.packages-summary th {
     background:#eee;
 }
 
-.tableSubHeadingColor {
+.table-sub-heading-color {
     background-color:#eee;
 }
 
-.altColor, .altColor th {
+.alt-color, .alt-color th {
     background-color:#fff;
 }
 
-.rowColor, .rowColor th {
+.row-color, .row-color th {
     background-color:#eee;
 }
 
 .block {
-    margin:0px 10px 5px 0px;
+    margin:0 10px 5px 0;
 }
 
-th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .constantsSummary th,
-.packagesSummary th, .overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td,
-.requiresSummary td, .packagesSummary td, .providesSummary td, .usesSummary td {
+th.col-first, th.col-second, th.col-last, th.col-constructor-name, th.col-deprecated-item-name, .constants-summary th,
+.packages-summary th, .overview-summary td, .member-summary td, .type-summary td,
+.use-summary td, .constants-summary td, .deprecated-summary td,
+.requires-summary td, .packages-summary td, .provides-summary td, .uses-summary td {
     padding-left:7px;
 }

From 06eda3ea91d6476e5cbd904fb9f4cea515ebe205 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 Feb 2021 15:50:25 +0100
Subject: [PATCH 0214/1433] Add missing Javadoc for new suite modules

---
 .../org.junit.platform.suite.commons/module-info.java      | 5 +++++
 .../org.junit.platform.suite.engine/module-info.java       | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
index a65200213874..9fc4a5293162 100644
--- a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
+++ b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
@@ -8,6 +8,11 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
+/**
+ * Common support utilities for declarative test suite executors.
+ *
+ * @since 1.8
+ */
 module org.junit.platform.suite.commons {
 	requires transitive org.apiguardian.api;
 	requires org.junit.platform.suite.api;
diff --git a/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java b/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
index 79f6fe1c45e6..a5c077e99461 100644
--- a/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
+++ b/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
@@ -8,6 +8,13 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
+/**
+ * Provides a {@linkplain org.junit.platform.engine.TestEngine} for running
+ * declarative test suites.
+ *
+ * @since 1.8
+ * @provides org.junit.platform.engine.TestEngine
+ */
 module org.junit.platform.suite.engine {
 	requires org.apiguardian.api;
 	requires org.junit.platform.suite.api;

From b12136c9ff2b4957c00213f69e5b2ce15d5a5e19 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 Feb 2021 15:50:37 +0100
Subject: [PATCH 0215/1433] Fix Javadoc reference

---
 .../src/main/java/org/junit/jupiter/api/ClassDescriptor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
index db6dafcc42c3..9a6a660b9497 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
@@ -35,7 +35,7 @@ public interface ClassDescriptor {
 	Class<?> getTestClass();
 
 	/**
-	 * Get the display name for this descriptor's {@link #getClass() class}.
+	 * Get the display name for this descriptor's {@link #getTestClass() class}.
 	 *
 	 * @return the display name for this descriptor's class; never {@code null}
 	 * or blank

From 108df22cf125bc33488bc4594b9e40402fa7837e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 Feb 2021 18:03:21 +0100
Subject: [PATCH 0216/1433] Upgrade to JUnit 4.13.2

---
 gradle.properties                                               | 2 +-
 .../java/org/junit/vintage/engine/JUnit4VersionCheckTests.java  | 1 +
 .../platform/tooling/support/tests/ModularUserGuideTests.java   | 2 +-
 .../tooling/support/tests/VintageGradleIntegrationTests.java    | 2 +-
 .../tooling/support/tests/VintageMavenIntegrationTests.java     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c7a69ac63ad5..e1e2eb455f97 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ org.gradle.parallel=true
 # Dependencies
 apiguardian.version=1.1.1
 assertj.version=3.19.0
-junit4.version=4.13.1
+junit4.version=4.13.2
 junit4.osgi.version=4.13.1_1
 junit4Min.version=4.12
 opentest4j.version=1.2.0
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
index 45212a158416..00cbe0f49d20 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
@@ -32,6 +32,7 @@ void handlesParsingSupportedVersionIdWithStandardVersionFormat() {
 		assertDoesNotThrow(() -> JUnit4VersionCheck.checkSupported(() -> "4.12"));
 		assertDoesNotThrow(() -> JUnit4VersionCheck.checkSupported(() -> "4.13"));
 		assertDoesNotThrow(() -> JUnit4VersionCheck.checkSupported(() -> "4.13.1"));
+		assertDoesNotThrow(() -> JUnit4VersionCheck.checkSupported(() -> "4.13.2"));
 	}
 
 	/**
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index 5986b927b988..d06bb399deb3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -69,7 +69,7 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
 		args.add(temp.resolve("destination").toString());
 
 		var lib = Files.createDirectories(temp.resolve("lib"));
-		Helper.load(lib, "junit", "junit", Helper.version("junit4", "4.13.1"));
+		Helper.load(lib, "junit", "junit", Helper.version("junit4", "4.13.2"));
 		Helper.load(lib, "org.assertj", "assertj-core", Helper.version("assertJ", "3.14.0"));
 		Helper.load(lib, "org.apiguardian", "apiguardian-api", Helper.version("apiGuardian", "1.1.0"));
 		Helper.load(lib, "org.hamcrest", "hamcrest", Helper.version("hamcrest", "2.2"));
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index 2823ee61cbf3..9604d834729d 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -40,7 +40,7 @@ void unsupportedVersion() {
 	}
 
 	@ParameterizedTest(name = "{0}")
-	@ValueSource(strings = { "4.12", "4.13.1" })
+	@ValueSource(strings = { "4.12", "4.13.2" })
 	void supportedVersions(String version) {
 		var result = run(version);
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index e654d896c294..5bd512335ecc 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -37,7 +37,7 @@ void unsupportedVersion() {
 	}
 
 	@ParameterizedTest(name = "{0}")
-	@ValueSource(strings = { "4.12", "4.13.1" })
+	@ValueSource(strings = { "4.12", "4.13.2" })
 	void supportedVersions(String version) {
 		var result = run(version);
 

From d93cd35e2c7afb97584ad827742c8fb4d7d47fb7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 Feb 2021 20:55:41 +0100
Subject: [PATCH 0217/1433] Omit automatic compile dependency on kotlin-stdlib

Fixes #2551.
---
 gradle.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index e1e2eb455f97..163e7fd3bdaf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,10 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
 org.gradle.caching=true
 org.gradle.parallel=true
 
+# Omit automatic compile dependency on kotlin-stdlib
+# https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
+kotlin.stdlib.default.dependency=false
+
 # Dependencies
 apiguardian.version=1.1.1
 assertj.version=3.19.0

From a1d9bbece3318342ccedd9d7c64c232b529b9211 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 15 Feb 2021 12:25:33 +0100
Subject: [PATCH 0218/1433] Use new Nexus publish-plugin

---
 build.gradle.kts                                     |  8 ++++++++
 buildSrc/build.gradle.kts                            |  1 -
 .../main/kotlin/publishing-conventions.gradle.kts    | 12 ------------
 gradle.properties                                    |  1 +
 settings.gradle.kts                                  |  1 +
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index beec328ed747..a744ac40be8c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
 	id("com.github.ben-manes.versions") // gradle dependencyUpdates
 	id("com.diffplug.spotless")
 	id("io.spring.nohttp")
+	id("io.github.gradle-nexus.publish-plugin")
 }
 
 val buildTimeAndDate by extra {
@@ -87,6 +88,13 @@ val jacocoTestProjects = listOf(
 val jacocoCoveredProjects = modularProjects
 val jacocoClassesDir = file("$buildDir/jacoco/classes")
 
+nexusPublishing {
+	packageGroup.set("org.junit")
+	repositories {
+		sonatype()
+	}
+}
+
 allprojects {
 
 	apply(plugin = "eclipse")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index d97ba94cbd15..b3c266a5ba3b 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,6 @@ repositories {
 
 dependencies {
 	implementation(kotlin("gradle-plugin"))
-	implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0")
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0")
 	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.0")
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index 6f58ce7453af..2dae1cc8f8ca 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -1,9 +1,6 @@
-import java.time.Duration
-
 plugins {
 	`maven-publish`
 	signing
-	id("de.marcphilipp.nexus-publish")
 }
 
 val isSnapshot = project.version.toString().contains("SNAPSHOT")
@@ -29,15 +26,6 @@ tasks.withType<Sign>().configureEach {
 	}
 }
 
-nexusPublishing {
-	connectTimeout.set(Duration.ofMinutes(2))
-	clientTimeout.set(Duration.ofMinutes(2))
-	packageGroup.set("org.junit")
-	repositories {
-		sonatype()
-	}
-}
-
 publishing {
 	publications {
 		create<MavenPublication>("maven") {
diff --git a/gradle.properties b/gradle.properties
index 163e7fd3bdaf..8ac76b1e4a7c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -64,3 +64,4 @@ asciidoctor-pdf.version=1.5.3
 asciidoctor.plugin.version=3.3.0
 jmh.plugin.version=0.5.2
 nohttp.plugin.version=0.0.5.RELEASE
+nexus-publish.plugin.version=1.0.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f8d7de5104dd..84641ffc19e9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,6 +13,7 @@ pluginManagement {
 		id("org.asciidoctor.jvm.pdf") version settings.extra["asciidoctor.plugin.version"] as String
 		id("me.champeau.gradle.jmh") version settings.extra["jmh.plugin.version"] as String
 		id("io.spring.nohttp") version settings.extra["nohttp.plugin.version"] as String
+		id("io.github.gradle-nexus.publish-plugin") version settings.extra["nexus-publish.plugin.version"] as String
 	}
 }
 

From fdadcbcb736742a325517bc20a0dac913aaf3fca Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Thu, 18 Feb 2021 10:28:23 +0100
Subject: [PATCH 0219/1433]  Improve Javadoc for Assumptions.assumingThat

Closes: #2554
---
 .../org/junit/jupiter/api/Assumptions.java    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
index f4711a285274..d4055d43b18c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
@@ -212,11 +212,12 @@ public static void assumeFalse(BooleanSupplier assumptionSupplier, Supplier<Stri
 	 * Execute the supplied {@link Executable}, but only if the supplied
 	 * assumption is valid.
 	 *
-	 * <p>If the assumption is invalid, this method does nothing.
-	 *
-	 * <p>If the {@code executable} throws an exception, it will be rethrown
-	 * <em>as is</em> but  {@link ExceptionUtils#throwAsUncheckedException masked}
-	 * as an unchecked exception.
+	 * <p>Unlike the other assumption methods, this method will not abort the test.
+	 * If the assumption is invalid, this method does nothing. If the assumption is
+	 * valid and the {@code executable} throws an exception, it will be treated like
+	 * a regular test <em>error</em>. That exception will be rethrown <em>as is</em>
+	 * but {@link ExceptionUtils#throwAsUncheckedException masked} as an unchecked
+	 * exception.
 	 *
 	 * @param assumptionSupplier the supplier of the assumption to validate
 	 * @param executable the block of code to execute if the assumption is valid
@@ -230,11 +231,12 @@ public static void assumingThat(BooleanSupplier assumptionSupplier, Executable e
 	 * Execute the supplied {@link Executable}, but only if the supplied
 	 * assumption is valid.
 	 *
-	 * <p>If the assumption is invalid, this method does nothing.
-	 *
-	 * <p>If the {@code executable} throws an exception, it will be rethrown
-	 * <em>as is</em> but  {@link ExceptionUtils#throwAsUncheckedException masked}
-	 * as an unchecked exception.
+	 * <p>Unlike the other assumption methods, this method will not abort the test.
+	 * If the assumption is invalid, this method does nothing. If the assumption is
+	 * valid and the {@code executable} throws an exception, it will be treated like
+	 * a regular test <em>error</em>. That exception will be rethrown <em>as is</em>
+	 * but {@link ExceptionUtils#throwAsUncheckedException masked} as an unchecked
+	 * exception.
 	 *
 	 * @param assumption the assumption to validate
 	 * @param executable the block of code to execute if the assumption is valid

From d8b4504dbd5ff7115738448a5a87724fbf0249e6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 18 Feb 2021 10:30:38 +0100
Subject: [PATCH 0220/1433] Polish contribution

See: #2554
---
 .../src/main/java/org/junit/jupiter/api/Assumptions.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
index d4055d43b18c..51e308cced3a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
@@ -215,7 +215,7 @@ public static void assumeFalse(BooleanSupplier assumptionSupplier, Supplier<Stri
 	 * <p>Unlike the other assumption methods, this method will not abort the test.
 	 * If the assumption is invalid, this method does nothing. If the assumption is
 	 * valid and the {@code executable} throws an exception, it will be treated like
-	 * a regular test <em>error</em>. That exception will be rethrown <em>as is</em>
+	 * a regular test <em>failure</em>. That exception will be rethrown <em>as is</em>
 	 * but {@link ExceptionUtils#throwAsUncheckedException masked} as an unchecked
 	 * exception.
 	 *
@@ -234,7 +234,7 @@ public static void assumingThat(BooleanSupplier assumptionSupplier, Executable e
 	 * <p>Unlike the other assumption methods, this method will not abort the test.
 	 * If the assumption is invalid, this method does nothing. If the assumption is
 	 * valid and the {@code executable} throws an exception, it will be treated like
-	 * a regular test <em>error</em>. That exception will be rethrown <em>as is</em>
+	 * a regular test <em>failure</em>. That exception will be rethrown <em>as is</em>
 	 * but {@link ExceptionUtils#throwAsUncheckedException masked} as an unchecked
 	 * exception.
 	 *

From c6b363f36373732977848dbb90998c28a35ce85d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 24 Feb 2021 21:26:02 +0100
Subject: [PATCH 0221/1433] Upgrade bnd to 5.3.0

---
 buildSrc/build.gradle.kts | 2 +-
 gradle.properties         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b3c266a5ba3b..864391b24205 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
 	implementation(kotlin("gradle-plugin"))
-	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0")
+	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.0")
 }
diff --git a/gradle.properties b/gradle.properties
index 8ac76b1e4a7c..f272a78e6051 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -50,7 +50,7 @@ jacoco.version=0.8.6
 jmh.version=1.27
 ktlint.version=0.35.0
 surefire.version=2.22.2
-bnd.version=5.2.0
+bnd.version=5.3.0
 
 # Plugins
 gradle.enterprise.plugin.version=3.5.1

From a58ff5d355043b90ec29dd72601f33f26ef6f106 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 24 Feb 2021 21:26:13 +0100
Subject: [PATCH 0222/1433] Upgrade ArchUnit to 0.17.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index f272a78e6051..ebb5019aff16 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ picocli.version=4.6.1
 univocity-parsers.version=2.9.0
 
 # Test Dependencies
-archunit.version=0.16.0
+archunit.version=0.17.0
 bartholdy.version=0.2.3
 classgraph.version=4.8.98
 commons-io.version=2.8.0

From 0fcdb516495199c78bcd3dd628c94bcb43a4d851 Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Tue, 2 Mar 2021 17:29:25 +0100
Subject: [PATCH 0223/1433] Update Gradle Enterprise Gradle Plugin to 3.5.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ebb5019aff16..04ef91553ef7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -53,7 +53,7 @@ surefire.version=2.22.2
 bnd.version=5.3.0
 
 # Plugins
-gradle.enterprise.plugin.version=3.5.1
+gradle.enterprise.plugin.version=3.5.2
 gradle.user-data.plugin.version=1.0
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.36.0

From 0d6d21f0d8bcc3d06e1524b87b7dcdd3f308941a Mon Sep 17 00:00:00 2001
From: Chia-Ping Tsai <chia7712@gmail.com>
Date: Sun, 7 Mar 2021 03:13:48 +0800
Subject: [PATCH 0224/1433] Make default parameterized display name template
 configurable

This commit introduces the `junit.jupiter.params.displayname.default`
configuration parameter for configuring the default display name
template of parameterized tests.
---
 .../asciidoc/user-guide/writing-tests.adoc    | 14 +++++
 .../jupiter/params/ParameterizedTest.java     | 10 +++-
 .../params/ParameterizedTestExtension.java    | 14 +++--
 .../ParameterizedTestExtensionTests.java      | 52 ++++++++++++++++++-
 .../ParameterizedTestIntegrationTests.java    | 11 ++++
 5 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index e4cc3b40aae1..6d754563811c 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1649,6 +1649,20 @@ A parameterized test with named arguments ✔
 └─ 2: Another file ✔
 ....
 
+If you'd like to set default name pattern for all parameterized tests in your project, you can add the following
+configuration to `junit-platform.properties`
+
+[source,properties,indent=0]
+----
+junit.jupiter.params.displayname.default = {index}
+----
+
+the display name for a parameterized method is determined according to the following precedence rules:
+
+1. `name` of `@ParameterizedTest`, if present
+2. the value of `junit.jupiter.params.displayname.default` (from junit-platform.properties), if present
+3. `DEFAULT_DISPLAY_NAME` constant defined in `@ParameterizedTest`
+
 [[writing-tests-parameterized-tests-lifecycle-interop]]
 ==== Lifecycle and Interoperability
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index f2faa61bbe20..f4a740f690a9 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -182,7 +182,11 @@
 	 * The display name to be used for individual invocations of the
 	 * parameterized test; never blank or consisting solely of whitespace.
 	 *
-	 * <p>Defaults to {@link #DEFAULT_DISPLAY_NAME}.
+	 * <p> If "{default_display_name}" is returned when invoking name(), we will:
+	 * <ul>
+	 * <li>Look up the new config param from junit-platform.properties, and if it has been set, use it</li>
+	 * <li>otherwise, we will use the value of the {@link #DEFAULT_DISPLAY_NAME} constant.</li>
+	 * </ul>
 	 *
 	 * <h4>Supported placeholders</h4>
 	 * <ul>
@@ -192,6 +196,8 @@
 	 * <li><code>{0}</code>, <code>{1}</code>, etc.: an individual argument (0-based)</li>
 	 * </ul>
 	 *
+	 * <p>Note that "{default_display_name}" is a flag rather than a placeholder.
+	 *
 	 * <p>For the latter, you may use {@link java.text.MessageFormat} patterns
 	 * to customize formatting. Please note that the original arguments are
 	 * passed when formatting, regardless of any implicit or explicit argument
@@ -199,6 +205,6 @@
 	 *
 	 * @see java.text.MessageFormat
 	 */
-	String name() default DEFAULT_DISPLAY_NAME;
+	String name() default "{default_display_name}";
 
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
index 7d110ce37805..ec6aac46ba5f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -39,6 +39,8 @@ class ParameterizedTestExtension implements TestTemplateInvocationContextProvide
 
 	private static final String METHOD_CONTEXT_KEY = "context";
 	static final String ARGUMENT_MAX_LENGTH_KEY = "junit.jupiter.params.displayname.argument.maxlength";
+	private static final String DEFAULT_DISPLAY_NAME = "{default_display_name}";
+	static final String DISPLAY_NAME_PATTERN_KEY = "junit.jupiter.params.displayname.default";
 
 	@Override
 	public boolean supportsTestTemplate(ExtensionContext context) {
@@ -75,8 +77,8 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 				.get(METHOD_CONTEXT_KEY, ParameterizedTestMethodContext.class);
 		int argumentMaxLength = extensionContext.getConfigurationParameter(ARGUMENT_MAX_LENGTH_KEY,
 			Integer::parseInt).orElse(512);
-		ParameterizedTestNameFormatter formatter = createNameFormatter(templateMethod, methodContext, displayName,
-			argumentMaxLength);
+		ParameterizedTestNameFormatter formatter = createNameFormatter(extensionContext, templateMethod, methodContext,
+			displayName, argumentMaxLength);
 		AtomicLong invocationCount = new AtomicLong(0);
 
 		// @formatter:off
@@ -122,10 +124,14 @@ private TestTemplateInvocationContext createInvocationContext(ParameterizedTestN
 		return new ParameterizedTestInvocationContext(formatter, methodContext, arguments);
 	}
 
-	private ParameterizedTestNameFormatter createNameFormatter(Method templateMethod,
+	private ParameterizedTestNameFormatter createNameFormatter(ExtensionContext extensionContext, Method templateMethod,
 			ParameterizedTestMethodContext methodContext, String displayName, int argumentMaxLength) {
 		ParameterizedTest parameterizedTest = findAnnotation(templateMethod, ParameterizedTest.class).get();
-		String pattern = Preconditions.notBlank(parameterizedTest.name().trim(),
+		String pattern = parameterizedTest.name().equals(DEFAULT_DISPLAY_NAME)
+				? extensionContext.getConfigurationParameter(DISPLAY_NAME_PATTERN_KEY).orElse(
+					ParameterizedTest.DEFAULT_DISPLAY_NAME)
+				: parameterizedTest.name();
+		pattern = Preconditions.notBlank(pattern.trim(),
 			() -> String.format(
 				"Configuration error: @ParameterizedTest on method [%s] must be declared with a non-empty name.",
 				templateMethod));
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index 24f4df196a0d..f83ddcc68a8c 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -24,6 +24,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
@@ -37,6 +38,7 @@
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.PreconditionViolationException;
 
 /**
  * Unit tests for {@link ParameterizedTestExtension}.
@@ -85,6 +87,31 @@ void streamsReturnedByProvidersAreClosedWhenCallingProvide() {
 		assertTrue(streamWasClosed);
 	}
 
+	@Test
+	void emptyDisplayNameIsIllegal() {
+		var extensionContext = getExtensionContextReturningSingleMethod(new EmptyDisplayNameProviderTestCase());
+		assertThrows(PreconditionViolationException.class,
+			() -> this.parameterizedTestExtension.provideTestTemplateInvocationContexts(extensionContext));
+	}
+
+	@Test
+	void defaultDisplayNameWithEmptyStringInConfigurationIsIllegal() {
+		AtomicInteger invocations = new AtomicInteger();
+		Function<String, Optional<String>> configurationSupplier = key -> {
+			if (key.equals(ParameterizedTestExtension.DISPLAY_NAME_PATTERN_KEY)) {
+				invocations.incrementAndGet();
+				return Optional.of("");
+			}
+			else
+				return Optional.empty();
+		};
+		var extensionContext = getExtensionContextReturningSingleMethod(new DefaultDisplayNameProviderTestCase(),
+			configurationSupplier);
+		assertThrows(PreconditionViolationException.class,
+			() -> this.parameterizedTestExtension.provideTestTemplateInvocationContexts(extensionContext));
+		assertEquals(1, invocations.get());
+	}
+
 	@Test
 	void argumentsRethrowsOriginalExceptionFromProviderAsUncheckedException() {
 		ArgumentsProvider failingProvider = (context) -> {
@@ -145,6 +172,11 @@ private <T> void assertArgumentsProviderInstantiationException(JUnitException ex
 	}
 
 	private ExtensionContext getExtensionContextReturningSingleMethod(Object testCase) {
+		return getExtensionContextReturningSingleMethod(testCase, ignored -> Optional.empty());
+	}
+
+	private ExtensionContext getExtensionContextReturningSingleMethod(Object testCase,
+			Function<String, Optional<String>> configurationSupplier) {
 
 		// @formatter:off
 		var optional = Arrays.stream(testCase.getClass().getDeclaredMethods())
@@ -218,12 +250,12 @@ public Optional<Throwable> getExecutionException() {
 
 			@Override
 			public Optional<String> getConfigurationParameter(String key) {
-				return Optional.empty();
+				return configurationSupplier.apply(key);
 			}
 
 			@Override
 			public <T> Optional<T> getConfigurationParameter(String key, Function<String, T> transformer) {
-				return Optional.empty();
+				return configurationSupplier.apply(key).map(transformer);
 			}
 
 			@Override
@@ -294,6 +326,22 @@ void method() {
 		}
 	}
 
+	static class EmptyDisplayNameProviderTestCase {
+
+		@ParameterizedTest(name = "")
+		@ArgumentsSource(MissingNoArgumentsConstructorArgumentsProvider.class)
+		void method() {
+		}
+	}
+
+	static class DefaultDisplayNameProviderTestCase {
+
+		@ParameterizedTest
+		@ArgumentsSource(MissingNoArgumentsConstructorArgumentsProvider.class)
+		void method() {
+		}
+	}
+
 	static class MissingNoArgumentsConstructorArgumentsProvider implements ArgumentsProvider {
 
 		MissingNoArgumentsConstructorArgumentsProvider(String parameter) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 8423b3c23fb3..69da7f6d47f2 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -268,6 +268,17 @@ void truncatesArgumentsThatExceedMaxLength() {
 				.haveExactly(1, event(displayName("[2] argument=b…"), started()));
 	}
 
+	@Test
+	void displayNamePatternFromConfiguration() {
+		var results = EngineTestKit.engine(new JupiterTestEngine()) //
+				.configurationParameter(ParameterizedTestExtension.DISPLAY_NAME_PATTERN_KEY, "{index}") //
+				.selectors(selectMethod(TestCase.class, "testWithCsvSource", String.class.getName())) //
+				.execute();
+		results.testEvents().assertThatEvents() //
+				.haveExactly(1, event(displayName("1"), started())) //
+				.haveExactly(1, event(displayName("2"), started()));
+	}
+
 	private EngineExecutionResults execute(DiscoverySelector... selectors) {
 		return EngineTestKit.engine(new JupiterTestEngine()).selectors(selectors).execute();
 	}

From ce95634e08cf69105967c19ed2448440ef8d672f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 11 Mar 2021 20:40:39 +0100
Subject: [PATCH 0225/1433] Upgrade common-custom-user-data-gradle-plugin

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 04ef91553ef7..7b723a2f6d46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -54,7 +54,7 @@ bnd.version=5.3.0
 
 # Plugins
 gradle.enterprise.plugin.version=3.5.2
-gradle.user-data.plugin.version=1.0
+gradle.user-data.plugin.version=1.2
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.36.0
 spotless.plugin.version=5.9.0

From 9558af1961a8f539288f4c7ac59d4666417c9990 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 11 Mar 2021 20:52:12 +0100
Subject: [PATCH 0226/1433] Upgradle to 6.8.3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 299cd1a9e796..51d930a381f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionSha256Sum=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 760a5d1c1a3428555950e9e4ad0c3a4672e405c2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 15 Mar 2021 14:41:04 +0100
Subject: [PATCH 0227/1433] Upgrade Gradle Enterprise plugin to 3.6

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7b723a2f6d46..bc9c1e4d74b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -53,7 +53,7 @@ surefire.version=2.22.2
 bnd.version=5.3.0
 
 # Plugins
-gradle.enterprise.plugin.version=3.5.2
+gradle.enterprise.plugin.version=3.6
 gradle.user-data.plugin.version=1.2
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.36.0

From bc31a17e3d119e8ef73a1064208323e0003f4cb8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 15 Mar 2021 15:03:58 +0100
Subject: [PATCH 0228/1433] Simplify injection of GE credentials

---
 .github/workflows/codeql-analysis.yml    |  5 +----
 .github/workflows/cross-version.yml      |  5 +----
 .github/workflows/main.yml               | 15 +--------------
 .github/workflows/reproducible-build.yml |  6 +-----
 settings.gradle.kts                      |  5 +----
 5 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e91dd4d6a5bb..a302ec4aae6c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -11,6 +11,7 @@ on:
 
 env:
   ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   analyze:
@@ -40,10 +41,6 @@ jobs:
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
-    - name: Prepare Gradle Enterprise credentials
-      run: |
-        mkdir -p $HOME/.gradle/enterprise/
-        echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > $HOME/.gradle/enterprise/keys.properties
     - name: Build
       run: |
         ./gradlew --version
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index bb2b9332c347..628ce793c1e5 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -13,6 +13,7 @@ env:
   ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
   ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
   ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   openjdk:
@@ -42,10 +43,6 @@ jobs:
           key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             test-${{ runner.os }}-maven-
-      - name: Prepare Gradle Enterprise credentials
-        run: |
-          mkdir -p /root/.gradle/enterprise/
-          echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > /root/.gradle/enterprise/keys.properties
       - name: Test
         run: |
           ./gradlew --version
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cc4a46f444b0..a40d3ee9644d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,6 +13,7 @@ env:
   ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
   ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
   ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   linux:
@@ -40,10 +41,6 @@ jobs:
         key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           test-${{ runner.os }}-maven-
-    - name: Prepare Gradle Enterprise credentials
-      run: |
-        mkdir -p /root/.gradle/enterprise/
-        echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > /root/.gradle/enterprise/keys.properties
     - name: Test and Coverage
       run: |
         ./gradlew --version
@@ -85,11 +82,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 15
-    - name: Prepare Gradle Enterprise credentials
-      shell: bash
-      run: |
-        mkdir -p $HOME/.gradle/enterprise/
-        echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > $HOME/.gradle/enterprise/keys.properties
     - name: Test
       shell: bash
       run: |
@@ -124,10 +116,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 15
-    - name: Prepare Gradle Enterprise credentials
-      run: |
-        mkdir -p $HOME/.gradle/enterprise/
-        echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > $HOME/.gradle/enterprise/keys.properties
     - name: 'Test'
       run: |
         ./gradlew --version
@@ -159,7 +147,6 @@ jobs:
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       run: ./gradlew publish -x check
 
   update_documentation:
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index b53c03ef6d2a..8171bb2fbb04 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -11,6 +11,7 @@ on:
 
 env:
   ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
+  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   check_build_reproducibility:
@@ -33,11 +34,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 15
-    - name: Prepare Gradle Enterprise credentials
-      shell: bash
-      run: |
-        mkdir -p $HOME/.gradle/enterprise/
-        echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > $HOME/.gradle/enterprise/keys.properties
     - name: Build and compare checksums
       shell: bash
       run: |
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 84641ffc19e9..40b99b011640 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -32,10 +32,7 @@ gradleEnterprise {
 		isCaptureTaskInputFiles = true
 		isUploadInBackground = !isCiServer
 
-		fun accessKeysAreMissingOrBlank(): Boolean {
-			val accessKeys = File(gradle.gradleUserHomeDir, "enterprise/keys.properties")
-			return !accessKeys.isFile || accessKeys.readText().isBlank()
-		}
+		fun accessKeysAreMissingOrBlank() = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNullOrBlank()
 
 		if (gradle.startParameter.isBuildScan || (isCiServer && accessKeysAreMissingOrBlank())) {
 			termsOfServiceUrl = "https://gradle.com/terms-of-service"

From 9ba84f853d591b19b6b8d27d70e34415bcb55141 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 18 Mar 2021 15:25:22 +0100
Subject: [PATCH 0229/1433] Use JDK 11 to run Gradle (#2566)

* Use JDK 11 toolchain for Spock 2.x test classes
* Use default toolchain to look up "jar" executable
* Document JDK requirements
---
 .github/workflows/main.yml                    | 35 +++++++++++++------
 .github/workflows/reproducible-build.yml      | 10 +++++-
 README.md                                     |  6 ++--
 .../java-toolchain-conventions.gradle.kts     |  2 +-
 .../junit-platform-commons.gradle.kts         | 10 ++++--
 .../junit-platform-console.gradle.kts         | 10 ++++--
 .../junit-vintage-engine.gradle.kts           |  6 ++++
 7 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a40d3ee9644d..01e0f8bf1445 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -82,11 +82,18 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 15
+    - name: Prepare JDK15 env var
+      shell: bash
+      run: echo "JDK15=$JAVA_HOME" >> $GITHUB_ENV
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
     - name: Test
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8 build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK15 build
         ./gradlew --stop
 
   mac:
@@ -112,19 +119,34 @@ jobs:
         key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           test-${{ runner.os }}-maven-
+    - name: Set up JDK 8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: Prepare JDK8 env var
+      shell: bash
+      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 15
       uses: actions/setup-java@v1
       with:
         java-version: 15
+    - name: Prepare JDK15 env var
+      shell: bash
+      run: echo "JDK15=$JAVA_HOME" >> $GITHUB_ENV
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
     - name: 'Test'
       run: |
         ./gradlew --version
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK15 build
 
   publish_artifacts:
     name: Publish Snapshot Artifacts
     needs: linux
     runs-on: ubuntu-latest
+    container: ghcr.io/junit-team/build
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && (startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main')
     steps:
     - uses: actions/checkout@v2
@@ -139,10 +161,6 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: Set up JDK 15
-      uses: actions/setup-java@v1
-      with:
-        java-version: 15
     - name: Publish
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
@@ -153,6 +171,7 @@ jobs:
     name: Update Snapshot Documentation
     needs: linux
     runs-on: ubuntu-latest
+    container: ghcr.io/junit-team/build
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - uses: actions/checkout@v2
@@ -167,10 +186,6 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: Set up JDK 15
-      uses: actions/setup-java@v1
-      with:
-        java-version: 15
     - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 8171bb2fbb04..19921775356c 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -11,6 +11,7 @@ on:
 
 env:
   ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
+  ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK15'
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
@@ -30,10 +31,17 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: 'Set up JDK 15'
+    - name: Set up JDK 15
       uses: actions/setup-java@v1
       with:
         java-version: 15
+    - name: Prepare JDK15 env var
+      shell: bash
+      run: echo "JDK15=$JAVA_HOME" >> $GITHUB_ENV
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
     - name: Build and compare checksums
       shell: bash
       run: |
diff --git a/README.md b/README.md
index ec2a28a4db85..166f0b7ad4e7 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,8 @@ so that local builds can reuse task outputs from previous CI builds.
 
 ## Building from Source
 
-You need [JDK 15] to build JUnit 5.
+You need [JDK 11] to build JUnit 5. [Gradle toolchains] are used to detect and
+potentially download additional JDKs for compilation and test execution.
 
 All modules can be _built_ with the [Gradle Wrapper] using the following command.
 
@@ -91,10 +92,11 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 [CONTRIBUTING.md]: https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md
 [Dependency Metadata]: https://junit.org/junit5/docs/current/user-guide/#dependency-metadata
 [Gitter]: https://gitter.im/junit-team/junit5
+[Gradle toolchains]: https://docs.gradle.org/current/userguide/toolchains.html
 [Gradle Wrapper]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:using_wrapper
 [JaCoCo]: https://www.eclemma.org/jacoco/
 [Javadoc]: https://junit.org/junit5/docs/current/api/
-[JDK 15]: https://jdk.java.net/15/
+[JDK 11]: https://adoptopenjdk.net/archive.html?variant=openjdk11&jvmVariant=hotspot
 [Release Notes]: https://junit.org/junit5/docs/current/release-notes/
 [Samples]: https://github.com/junit-team/junit5-samples
 [StackOverflow]: https://stackoverflow.com/questions/tagged/junit5
diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index 7d97f10b2479..7ec8dc3971af 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -21,7 +21,7 @@ project.pluginManager.withPlugin("java") {
 	}
 	tasks.withType<GroovyCompile>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor {
-			// Groovy does not yet support JDK 16, see https://issues.apache.org/jira/browse/GROOVY-9752
+			// Groovy does not yet support JDK 17, see https://issues.apache.org/jira/browse/GROOVY-9943
 			languageVersion.set(minOf(javaLanguageVersion, defaultLanguageVersion))
 		})
 	}
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 4fe02c95ee33..47df635c1339 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -19,10 +19,16 @@ tasks.jar {
 	val release9ClassesDir = sourceSets.mainRelease9.get().output.classesDirs.singleFile
 	inputs.dir(release9ClassesDir).withPathSensitivity(PathSensitivity.RELATIVE)
 	doLast {
-		ToolProvider.findFirst("jar").get().run(System.out, System.err, "--update",
+		exec {
+			executable = project.the<JavaToolchainService>().launcherFor(java.toolchain).get()
+				.metadata.installationPath.file("bin/jar").asFile.absolutePath
+			args(
+				"--update",
 				"--file", archiveFile.get().asFile.absolutePath,
 				"--release", "9",
-				"-C", release9ClassesDir.absolutePath, ".")
+				"-C", release9ClassesDir.absolutePath, "."
+			)
+		}
 	}
 }
 
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 97cb4f5dfe32..869f90e5b962 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -30,9 +30,15 @@ tasks {
 		}
 		from(sourceSets.mainRelease9.get().output.classesDirs)
 		doLast {
-			ToolProvider.findFirst("jar").get().run(System.out, System.err, "--update",
+			exec {
+				executable = project.the<JavaToolchainService>().launcherFor(java.toolchain).get()
+					.metadata.installationPath.file("bin/jar").asFile.absolutePath
+				args(
+					"--update",
 					"--file", archiveFile.get().asFile.absolutePath,
-					"--main-class", "org.junit.platform.console.ConsoleLauncher")
+					"--main-class", "org.junit.platform.console.ConsoleLauncher"
+				)
+			}
 		}
 	}
 	jar {
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 360e763da5af..440eaf775b4b 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -37,6 +37,12 @@ configurations.all {
 }
 
 tasks {
+	compileTestFixturesGroovy {
+		javaLauncher.set(project.the<JavaToolchainService>().launcherFor {
+			// Groovy 2.x (used for Spock tests) does not support JDK 16
+			languageVersion.set(JavaLanguageVersion.of(11))
+		})
+	}
 	jar {
 		withConvention(BundleTaskConvention::class) {
 			bnd("""

From 9c5063c1cd8b70afb343f241daf4600f7259660a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 18 Mar 2021 15:56:41 +0100
Subject: [PATCH 0230/1433] Use Ubuntu for docs publishing job

---
 .github/workflows/main.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 01e0f8bf1445..7cfe6a48b472 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -171,7 +171,6 @@ jobs:
     name: Update Snapshot Documentation
     needs: linux
     runs-on: ubuntu-latest
-    container: ghcr.io/junit-team/build
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - uses: actions/checkout@v2
@@ -186,10 +185,22 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
+    - name: Set up JDK 15
+      uses: actions/setup-java@v1
+      with:
+        java-version: 15
+    - name: Prepare JDK15 env var
+      shell: bash
+      run: echo "JDK15=$JAVA_HOME" >> $GITHUB_ENV
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
     - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+        ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK15'
       run: |
         sudo apt-get install graphviz
         ./src/publishDocumentationSnapshotOnlyIfNecessary.sh

From 87673a0c4905ba21ecbb5f5920dbe9bbaa0e253e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 18 Mar 2021 16:51:33 +0100
Subject: [PATCH 0231/1433] Test on JDK 16 (#2574)

---
 .github/workflows/cross-version.yml           |  2 +-
 .github/workflows/main.yml                    | 30 +++++++--------
 .github/workflows/reproducible-build.yml      | 10 ++---
 .../src/main/kotlin/JavaLibraryExtension.kt   |  2 +-
 .../java-toolchain-conventions.gradle.kts     |  2 +-
 gradle.properties                             |  3 ++
 .../org/junit/jupiter/engine/RecordTests.java | 38 +++++++++++++++++++
 7 files changed, 64 insertions(+), 23 deletions(-)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 628ce793c1e5..1f2794bc6a18 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -19,7 +19,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [16, 17]
+        jdk: [17]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     container: "ghcr.io/junit-team/build:${{ matrix.jdk }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7cfe6a48b472..e7710a1b56c6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -78,13 +78,13 @@ jobs:
     - name: Prepare JDK8 env var
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 15
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 15
-    - name: Prepare JDK15 env var
+        java-version: 16
+    - name: Prepare JDK16 env var
       shell: bash
-      run: echo "JDK15=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
@@ -93,7 +93,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK15 build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 build
         ./gradlew --stop
 
   mac:
@@ -126,13 +126,13 @@ jobs:
     - name: Prepare JDK8 env var
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 15
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 15
-    - name: Prepare JDK15 env var
+        java-version: 16
+    - name: Prepare JDK16 env var
       shell: bash
-      run: echo "JDK15=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
@@ -140,7 +140,7 @@ jobs:
     - name: 'Test'
       run: |
         ./gradlew --version
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK15 build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 build
 
   publish_artifacts:
     name: Publish Snapshot Artifacts
@@ -185,13 +185,13 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: Set up JDK 15
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 15
-    - name: Prepare JDK15 env var
+        java-version: 16
+    - name: Prepare JDK16 env var
       shell: bash
-      run: echo "JDK15=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
@@ -200,7 +200,7 @@ jobs:
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-        ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK15'
+        ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK16'
       run: |
         sudo apt-get install graphviz
         ./src/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 19921775356c..6a67d1ea1e91 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
-  ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK15'
+  ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK16'
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
@@ -31,13 +31,13 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: Set up JDK 15
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 15
-    - name: Prepare JDK15 env var
+        java-version: 16
+    - name: Prepare JDK16 env var
       shell: bash
-      run: echo "JDK15=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
diff --git a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
index 86da500d0a5f..acd240f6cb0e 100644
--- a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
+++ b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
@@ -3,5 +3,5 @@ import org.gradle.api.JavaVersion
 @Suppress("UnstableApiUsage")
 open class JavaLibraryExtension {
     var mainJavaVersion: JavaVersion = Versions.jvmTarget
-    var testJavaVersion: JavaVersion = JavaVersion.VERSION_15
+    var testJavaVersion: JavaVersion = JavaVersion.VERSION_16
 }
diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index 7ec8dc3971af..6653c80374df 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 
 val javaToolchainVersion: String? by project
-val defaultLanguageVersion = JavaLanguageVersion.of(15)
+val defaultLanguageVersion = JavaLanguageVersion.of(16)
 val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: defaultLanguageVersion
 
 project.pluginManager.withPlugin("java") {
diff --git a/gradle.properties b/gradle.properties
index bc9c1e4d74b9..71a1b8b79609 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -65,3 +65,6 @@ asciidoctor.plugin.version=3.3.0
 jmh.plugin.version=0.5.2
 nohttp.plugin.version=0.0.5.RELEASE
 nexus-publish.plugin.version=1.0.0
+
+# Temporarily disabled until test-retry plugin is compatible with JDK 16
+retries=0
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java
new file mode 100644
index 000000000000..2ab8697f041d
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Test;
+
+class RecordTests extends AbstractJupiterTestEngineTests {
+
+	@Test
+	void recordsAreTestClasses() {
+		executeTestsForClass(TestCase.class).testEvents() //
+				.assertStatistics(stats -> stats.finished(2).succeeded(1).failed(1));
+	}
+
+	record TestCase() {
+
+		@Test
+		void succeedingTest() {
+			assertTrue(true);
+		}
+
+		@Test
+		void failingTest() {
+			fail("always fails");
+		}
+	}
+}

From e8d91f94920fe6bc065f7b2f58c6bb53ebc61c29 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 10:22:08 +0100
Subject: [PATCH 0232/1433] Print Java toolchains

---
 .github/workflows/codeql-analysis.yml    | 1 +
 .github/workflows/cross-version.yml      | 1 +
 .github/workflows/main.yml               | 8 +++++++-
 .github/workflows/reproducible-build.yml | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a302ec4aae6c..ab09ccaca923 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,6 +44,7 @@ jobs:
     - name: Build
       run: |
         ./gradlew --version
+        ./gradlew javaToolchains
         ./gradlew --no-build-cache allMainClasses -PjavaToolchainVersion=11
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 1f2794bc6a18..edd1bc0fe724 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -46,4 +46,5 @@ jobs:
       - name: Test
         run: |
           ./gradlew --version
+          ./gradlew javaToolchains
           ./gradlew --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e7710a1b56c6..011ca71fe3c0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,6 +44,7 @@ jobs:
     - name: Test and Coverage
       run: |
         ./gradlew --version
+        ./gradlew javaToolchains
         ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo build jacocoRootReport
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
@@ -93,6 +94,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
+        ./gradlew javaToolchains
         ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 build
         ./gradlew --stop
 
@@ -140,6 +142,7 @@ jobs:
     - name: 'Test'
       run: |
         ./gradlew --version
+        ./gradlew javaToolchains
         ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 build
 
   publish_artifacts:
@@ -165,7 +168,9 @@ jobs:
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
-      run: ./gradlew publish -x check
+      run: |
+        ./gradlew javaToolchains
+        ./gradlew publish -x check
 
   update_documentation:
     name: Update Snapshot Documentation
@@ -203,4 +208,5 @@ jobs:
         ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK16'
       run: |
         sudo apt-get install graphviz
+        ./gradlew javaToolchains
         ./src/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 6a67d1ea1e91..342b45101cad 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -45,4 +45,5 @@ jobs:
     - name: Build and compare checksums
       shell: bash
       run: |
+        ./gradlew javaToolchains
         ./src/checkBuildReproducibility.sh

From 113ca4d43f2668ed9b2c8ce516de118bf371a36f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 10:22:45 +0100
Subject: [PATCH 0233/1433] Publish documentation from Docker container

---
 .github/workflows/main.yml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 011ca71fe3c0..0ba4f09190d5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -176,6 +176,7 @@ jobs:
     name: Update Snapshot Documentation
     needs: linux
     runs-on: ubuntu-latest
+    container: ghcr.io/junit-team/build
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - uses: actions/checkout@v2
@@ -190,23 +191,11 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
-    - name: Set up JDK 16
-      uses: actions/setup-java@v1
-      with:
-        java-version: 16
-    - name: Prepare JDK16 env var
-      shell: bash
-      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
     - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK16'
       run: |
-        sudo apt-get install graphviz
         ./gradlew javaToolchains
         ./src/publishDocumentationSnapshotOnlyIfNecessary.sh

From 53fb099e2360ccdf73b3af8cfba6137746024ca9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 10:28:08 +0100
Subject: [PATCH 0234/1433] Remove ineffectual env vars

Env vars with dots don't work on most OSes
---
 .github/workflows/codeql-analysis.yml    | 1 -
 .github/workflows/cross-version.yml      | 1 -
 .github/workflows/main.yml               | 2 --
 .github/workflows/reproducible-build.yml | 2 --
 4 files changed, 6 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ab09ccaca923..91dc3cf47d14 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -10,7 +10,6 @@ on:
     - cron: '0 19 * * 3'
 
 env:
-  ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index edd1bc0fe724..7ea9420251dc 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -12,7 +12,6 @@ on:
 env:
   ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
   ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
-  ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0ba4f09190d5..cbeeafb65d46 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,6 @@ on:
 env:
   ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
   ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
-  ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
@@ -195,7 +194,6 @@ jobs:
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-        ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK16'
       run: |
         ./gradlew javaToolchains
         ./src/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 342b45101cad..9cb23a2a9d86 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -10,8 +10,6 @@ on:
     - '*'
 
 env:
-  ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
-  ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv: 'JDK16'
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:

From 882a9a76915e8bbc621b4758ba8bd8243264ab1b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 10:36:20 +0100
Subject: [PATCH 0235/1433] Disable toolchain download on CI

---
 .github/workflows/codeql-analysis.yml              | 2 +-
 .github/workflows/cross-version.yml                | 2 +-
 .github/workflows/main.yml                         | 8 ++++----
 src/checkBuildReproducibility.sh                   | 2 +-
 src/publishDocumentationSnapshotOnlyIfNecessary.sh | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 91dc3cf47d14..2d0b5bb66543 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,6 +44,6 @@ jobs:
       run: |
         ./gradlew --version
         ./gradlew javaToolchains
-        ./gradlew --no-build-cache allMainClasses -PjavaToolchainVersion=11
+        ./gradlew --no-build-cache allMainClasses -PjavaToolchainVersion=11 -Porg.gradle.java.installations.auto-download=false
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 7ea9420251dc..c8e5d9e474c7 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -46,4 +46,4 @@ jobs:
         run: |
           ./gradlew --version
           ./gradlew javaToolchains
-          ./gradlew --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} build "-Dscan.tag.JDK_${{ matrix.jdk }}"
+          ./gradlew --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} -Porg.gradle.java.installations.auto-download=false build "-Dscan.tag.JDK_${{ matrix.jdk }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cbeeafb65d46..c2740c5e0709 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,7 +44,7 @@ jobs:
       run: |
         ./gradlew --version
         ./gradlew javaToolchains
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo build jacocoRootReport
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo -Porg.gradle.java.installations.auto-download=false build jacocoRootReport
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 
@@ -94,7 +94,7 @@ jobs:
       run: |
         ./gradlew --version
         ./gradlew javaToolchains
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 -Porg.gradle.java.installations.auto-download=false build
         ./gradlew --stop
 
   mac:
@@ -142,7 +142,7 @@ jobs:
       run: |
         ./gradlew --version
         ./gradlew javaToolchains
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 -Porg.gradle.java.installations.auto-download=false build
 
   publish_artifacts:
     name: Publish Snapshot Artifacts
@@ -169,7 +169,7 @@ jobs:
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       run: |
         ./gradlew javaToolchains
-        ./gradlew publish -x check
+        ./gradlew publish -x check -Porg.gradle.java.installations.auto-download=false
 
   update_documentation:
     name: Update Snapshot Documentation
diff --git a/src/checkBuildReproducibility.sh b/src/checkBuildReproducibility.sh
index a9fe7071ecdd..6432c6d242c0 100755
--- a/src/checkBuildReproducibility.sh
+++ b/src/checkBuildReproducibility.sh
@@ -7,7 +7,7 @@ export SOURCE_DATE_EPOCH=$(date +%s)
 function calculate_checksums() {
     OUTPUT=$1
 
-    ./gradlew --no-build-cache clean assemble --parallel
+    ./gradlew --no-build-cache clean assemble --parallel -Porg.gradle.java.installations.auto-download=false
 
     find . -name '*.jar' \
         | grep '/build/libs/' \
diff --git a/src/publishDocumentationSnapshotOnlyIfNecessary.sh b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
index c4ed2762ebf0..76013da728b6 100755
--- a/src/publishDocumentationSnapshotOnlyIfNecessary.sh
+++ b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
@@ -58,5 +58,5 @@ else
   echo "Creating and publishing documentation..."
   echo
   cp --force "${current}" "${published}"
-  ./gradlew --scan gitPublishPush
+  ./gradlew --scan gitPublishPush -Porg.gradle.java.installations.auto-download=false
 fi

From d9b83a9fb365a00150b41a2face5e69a41a2637e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 10:40:15 +0100
Subject: [PATCH 0236/1433] Inject toolchains via env vars consistently

---
 .github/workflows/main.yml | 4 ++--
 gradle.properties          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c2740c5e0709..53f56064e034 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -94,7 +94,7 @@ jobs:
       run: |
         ./gradlew --version
         ./gradlew javaToolchains
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 -Porg.gradle.java.installations.auto-download=false build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.auto-download=false build
         ./gradlew --stop
 
   mac:
@@ -142,7 +142,7 @@ jobs:
       run: |
         ./gradlew --version
         ./gradlew javaToolchains
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.fromEnv=JDK8,JDK16 -Porg.gradle.java.installations.auto-download=false build
+        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.auto-download=false build
 
   publish_artifacts:
     name: Publish Snapshot Artifacts
diff --git a/gradle.properties b/gradle.properties
index 71a1b8b79609..a93d783b30fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,7 @@ defaultBuiltBy  = JUnit Team
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true
 org.gradle.parallel=true
+org.gradle.java.installations.fromEnv=JDK8,JDK16
 
 # Omit automatic compile dependency on kotlin-stdlib
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library

From b81ca8957d0cdb873250389d5a25c04f1eac5ab6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 10:48:49 +0100
Subject: [PATCH 0237/1433] Apply auto-download settings to javaToolchains task

---
 .github/workflows/codeql-analysis.yml    |  2 +-
 .github/workflows/cross-version.yml      |  2 +-
 .github/workflows/main.yml               | 10 +++++-----
 .github/workflows/reproducible-build.yml |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2d0b5bb66543..835adf22a476 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build
       run: |
         ./gradlew --version
-        ./gradlew javaToolchains
+        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./gradlew --no-build-cache allMainClasses -PjavaToolchainVersion=11 -Porg.gradle.java.installations.auto-download=false
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index c8e5d9e474c7..843af6e7833d 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -45,5 +45,5 @@ jobs:
       - name: Test
         run: |
           ./gradlew --version
-          ./gradlew javaToolchains
+          ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
           ./gradlew --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} -Porg.gradle.java.installations.auto-download=false build "-Dscan.tag.JDK_${{ matrix.jdk }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 53f56064e034..c48ca538b915 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Test and Coverage
       run: |
         ./gradlew --version
-        ./gradlew javaToolchains
+        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo -Porg.gradle.java.installations.auto-download=false build jacocoRootReport
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
@@ -93,7 +93,7 @@ jobs:
       shell: bash
       run: |
         ./gradlew --version
-        ./gradlew javaToolchains
+        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.auto-download=false build
         ./gradlew --stop
 
@@ -141,7 +141,7 @@ jobs:
     - name: 'Test'
       run: |
         ./gradlew --version
-        ./gradlew javaToolchains
+        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.auto-download=false build
 
   publish_artifacts:
@@ -168,7 +168,7 @@ jobs:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       run: |
-        ./gradlew javaToolchains
+        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./gradlew publish -x check -Porg.gradle.java.installations.auto-download=false
 
   update_documentation:
@@ -195,5 +195,5 @@ jobs:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       run: |
-        ./gradlew javaToolchains
+        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./src/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 9cb23a2a9d86..f9c60055c82a 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -43,5 +43,5 @@ jobs:
     - name: Build and compare checksums
       shell: bash
       run: |
-        ./gradlew javaToolchains
+        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./src/checkBuildReproducibility.sh

From b5a35fc2c1801622c2614375aeb7c88a3c86e7d4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 11:05:26 +0100
Subject: [PATCH 0238/1433] Only output toolchains when building docs

---
 .github/workflows/main.yml                         | 4 +---
 src/publishDocumentationSnapshotOnlyIfNecessary.sh | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c48ca538b915..c778fd6ddb23 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -194,6 +194,4 @@ jobs:
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-      run: |
-        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
-        ./src/publishDocumentationSnapshotOnlyIfNecessary.sh
+      run: ./src/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/src/publishDocumentationSnapshotOnlyIfNecessary.sh b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
index 76013da728b6..613ea73759a2 100755
--- a/src/publishDocumentationSnapshotOnlyIfNecessary.sh
+++ b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
@@ -58,5 +58,5 @@ else
   echo "Creating and publishing documentation..."
   echo
   cp --force "${current}" "${published}"
-  ./gradlew --scan gitPublishPush -Porg.gradle.java.installations.auto-download=false
+  ./gradlew javaToolchains gitPublishPush -Porg.gradle.java.installations.auto-download=false
 fi

From bbe0f1fff07c36dd10692018d5f3214697356f85 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 13:34:57 +0100
Subject: [PATCH 0239/1433] Remove Jupiter API dependency to avoid confusion

---
 .../junit-vintage-engine.gradle.kts           |  1 -
 .../junit4/AbstractJUnit4TestCase.java        |  2 +-
 .../junit4/JUnit4ParameterizedTestCase.java   |  2 +-
 ...nerWithCustomUniqueIdsAndDisplayNames.java | 14 ++++++++++---
 ...nerWithCustomUniqueIdsAndDisplayNames.java | 21 ++++++++++++-------
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 440eaf775b4b..75985528acf7 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -19,7 +19,6 @@ dependencies {
 	api("junit:junit")
 
 	testFixturesApi("org.spockframework:spock-core")
-	testFixturesApi(project(":junit-jupiter-api"))
 	testFixturesImplementation(project(":junit-platform-runner"))
 
 	testImplementation(project(":junit-platform-launcher"))
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
index 582aa3e03827..210f6e883007 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
@@ -10,7 +10,7 @@
 
 package org.junit.vintage.engine.samples.junit4;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public abstract class AbstractJUnit4TestCase {
 
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
index 7811e4b33ffd..16b4bbb897db 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
@@ -10,7 +10,7 @@
 
 package org.junit.vintage.engine.samples.junit4;
 
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
index 175cfeec0d26..713c0abd9c0e 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -10,22 +10,30 @@
 
 package org.junit.vintage.engine.samples.junit4;
 
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.runner.RunWith;
 
 /**
  * @since 4.12
  */
-@DisplayName("(TestClass)")
+@Label("(TestClass)")
 @RunWith(RunnerWithCustomUniqueIdsAndDisplayNames.class)
 public class JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames {
 
 	@Test
-	@DisplayName("(TestMethod)")
+	@Label("(TestMethod)")
 	public void test() {
 		Assert.fail();
 	}
 
 }
+
+@Retention(RUNTIME)
+@interface Label {
+	String value();
+}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
index 971f19cc642f..c106c6649cd4 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -12,12 +12,14 @@
 
 import static org.junit.runner.Description.createTestDescription;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Objects;
+import java.util.function.Supplier;
 
-import org.junit.jupiter.api.DisplayName;
 import org.junit.runner.Description;
 import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.Annotatable;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 
@@ -32,23 +34,28 @@ public RunnerWithCustomUniqueIdsAndDisplayNames(Class<?> klass) throws Initializ
 
 	@Override
 	protected String getName() {
-		var displayName = getTestClass().getAnnotation(DisplayName.class);
-		return displayName == null ? super.getName() : displayName.value();
+		return getLabel(getTestClass(), super::getName);
 	}
 
 	@Override
 	protected Description describeChild(FrameworkMethod method) {
-		var testName = getTestName(method);
+		var testName = testName(method);
 		return createTestDescription(getTestClass().getJavaClass().getName(), testName, new CustomUniqueId(testName));
 	}
 
-	private String getTestName(FrameworkMethod method) {
-		var displayName = method.getAnnotation(DisplayName.class);
-		return displayName == null ? testName(method) : displayName.value();
+	@Override
+	protected String testName(FrameworkMethod method) {
+		return getLabel(method, () -> super.testName(method));
+	}
+
+	private String getLabel(Annotatable element, Supplier<String> fallback) {
+		var label = element.getAnnotation(Label.class);
+		return label == null ? fallback.get() : label.value();
 	}
 
 	private static class CustomUniqueId implements Serializable {
 
+		@Serial
 		private static final long serialVersionUID = 1L;
 
 		private final String testName;

From bd72a4f3d42892ab4d11f7c9d209ded2bcfc0c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C5=91rinc=20Pap?= <lorinc@gradle.com>
Date: Fri, 19 Mar 2021 17:57:47 +0100
Subject: [PATCH 0240/1433] Remove package name validation from classpath
 scanning (#2571)

The validation was problematic since it re-implemented name validation
to avoid a dependency to a JDK class and was missing checks for
primitive types. Removing it is fine since classpath scanning with
invalid package names does not cause errors but merely doesn't find any
classes, just like classpath scanning for a non-existent package.

Fixes #2570.
---
 .../commons/util/ClasspathScanner.java        |  6 +-
 .../platform/commons/util/PackageUtils.java   | 92 +------------------
 .../support/ReflectionSupportTests.java       |  6 +-
 .../commons/util/PackageUtilsTests.java       | 53 -----------
 4 files changed, 8 insertions(+), 149 deletions(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
index 398332d7d25a..c1cc51fab77b 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
@@ -15,6 +15,7 @@
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static org.junit.platform.commons.util.ClassFileVisitor.CLASS_FILE_SUFFIX;
+import static org.junit.platform.commons.util.StringUtils.isNotBlank;
 
 import java.io.IOException;
 import java.net.URI;
@@ -69,8 +70,9 @@ class ClasspathScanner {
 	}
 
 	List<Class<?>> scanForClassesInPackage(String basePackageName, ClassFilter classFilter) {
-
-		PackageUtils.assertPackageNameIsValid(basePackageName);
+		Preconditions.condition(
+			PackageUtils.DEFAULT_PACKAGE_NAME.equals(basePackageName) || isNotBlank(basePackageName),
+			"basePackageName must not be null or blank");
 		Preconditions.notNull(classFilter, "classFilter must not be null");
 		basePackageName = basePackageName.trim();
 
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
index 0e220bde4a75..12978601f6f3 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
@@ -14,17 +14,11 @@
 
 import java.io.File;
 import java.net.URL;
-import java.security.CodeSource;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Optional;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
-import java.util.regex.Pattern;
 
 import org.apiguardian.api.API;
 
@@ -48,36 +42,6 @@ private PackageUtils() {
 
 	static final String DEFAULT_PACKAGE_NAME = "";
 
-	/**
-	 * Compiled {@code "\."} pattern used to split canonical package (and type) names.
-	 */
-	private static final Pattern DOT_PATTERN = Pattern.compile("\\.");
-
-	/**
-	 * Assert that the supplied package name is valid in terms of Java syntax.
-	 *
-	 * <p>Note: this method does not actually verify if the named package
-	 * exists in the classpath.
-	 *
-	 * <p>The default package is represented by an empty string ({@code ""}).
-	 *
-	 * @param packageName the package name to validate
-	 * @throws org.junit.platform.commons.PreconditionViolationException if the
-	 * supplied package name is {@code null}, contains only whitespace, or
-	 * contains parts that are not valid in terms of Java syntax (e.g.,
-	 * containing keywords such as {@code void}, {@code import}, etc.)
-	 * @see JavaNameUtils#isJavaName(String)
-	 */
-	public static void assertPackageNameIsValid(String packageName) {
-		Preconditions.notNull(packageName, "package name must not be null");
-		if (packageName.equals(DEFAULT_PACKAGE_NAME)) {
-			return;
-		}
-		Preconditions.notBlank(packageName, "package name must not contain only whitespace");
-		boolean allValid = Arrays.stream(DOT_PATTERN.split(packageName, -1)).allMatch(JavaNameUtils::isJavaName);
-		Preconditions.condition(allValid, "invalid part(s) in package name: " + packageName);
-	}
-
 	/**
 	 * Get the package attribute for the supplied {@code type} using the
 	 * supplied {@code function}.
@@ -101,11 +65,7 @@ public static void assertPackageNameIsValid(String packageName) {
 	public static Optional<String> getAttribute(Class<?> type, Function<Package, String> function) {
 		Preconditions.notNull(type, "type must not be null");
 		Preconditions.notNull(function, "function must not be null");
-		Package typePackage = type.getPackage();
-		if (typePackage != null) {
-			return Optional.ofNullable(function.apply(typePackage));
-		}
-		return Optional.empty();
+		return Optional.ofNullable(type.getPackage()).map(function);
 	}
 
 	/**
@@ -129,11 +89,9 @@ public static Optional<String> getAttribute(Class<?> type, String name) {
 		Preconditions.notNull(type, "type must not be null");
 		Preconditions.notBlank(name, "name must not be blank");
 		try {
-			CodeSource codeSource = type.getProtectionDomain().getCodeSource();
-			URL jarUrl = codeSource.getLocation();
+			URL jarUrl = type.getProtectionDomain().getCodeSource().getLocation();
 			try (JarFile jarFile = new JarFile(new File(jarUrl.toURI()))) {
-				Manifest manifest = jarFile.getManifest();
-				Attributes mainAttributes = manifest.getMainAttributes();
+				Attributes mainAttributes = jarFile.getManifest().getMainAttributes();
 				return Optional.ofNullable(mainAttributes.getValue(name));
 			}
 		}
@@ -141,48 +99,4 @@ public static Optional<String> getAttribute(Class<?> type, String name) {
 			return Optional.empty();
 		}
 	}
-
-	/**
-	 * Collection of utilities for working with qualified names in Java.
-	 *
-	 * @since 1.6
-	 */
-	static class JavaNameUtils {
-
-		private static final Set<String> RESTRICTED_KEYWORDS = Collections.unmodifiableSet(
-			new HashSet<>(Arrays.asList("_", "abstract", "assert", "break", "case", "catch", "const", "continue",
-				"default", "do", "else", "enum", "false", "final", "finally", "for", "goto", "if", "import",
-				"instanceof", "native", "new", "null", "private", "protected", "public", "return", "static", "strictfp",
-				"super", "switch", "synchronized", "this", "throw", "transient", "true", "try", "volatile", "while")));
-
-		/**
-		 * Determine if the supplied {@code name} is a syntactically valid qualified name.
-		 *
-		 * @param name the string to check
-		 * @return {@code true} if the supplied string is a syntactically valid name
-		 */
-		static boolean isJavaName(String name) {
-			return name != null && !name.isEmpty() && isNotRestrictedKeyword(name) && isJavaIdentifier(name);
-		}
-
-		private static boolean isNotRestrictedKeyword(String name) {
-			return !RESTRICTED_KEYWORDS.contains(name);
-		}
-
-		private static boolean isJavaIdentifier(String name) {
-			int start = name.codePointAt(0);
-			if (!Character.isJavaIdentifierStart(start)) {
-				return false;
-			}
-			int charCount = Character.charCount(start);
-			for (int i = charCount; i < name.length(); i += charCount) {
-				int codePoint = name.codePointAt(i);
-				if (!Character.isJavaIdentifierPart(codePoint)) {
-					return false;
-				}
-			}
-			return true;
-		}
-	}
-
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index 46b9dedc1288..3e3298ad4879 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -105,10 +105,6 @@ void findAllClassesInClasspathRootPreconditions() {
 
 	@Test
 	void findAllClassesInPackageDelegates() {
-		assertThrows(PreconditionViolationException.class,
-			() -> ReflectionUtils.findAllClassesInPackage("void.return.null", allTypes, allNames));
-		assertThrows(PreconditionViolationException.class,
-			() -> ReflectionSupport.findAllClassesInPackage("void.return.null", allTypes, allNames));
 		assertNotEquals(0, ReflectionSupport.findAllClassesInPackage("org.junit", allTypes, allNames).size());
 		assertEquals(ReflectionUtils.findAllClassesInPackage("org.junit", allTypes, allNames),
 			ReflectionSupport.findAllClassesInPackage("org.junit", allTypes, allNames));
@@ -116,7 +112,7 @@ void findAllClassesInPackageDelegates() {
 
 	@Test
 	void findAllClassesInPackagePreconditions() {
-		assertPreconditionViolationException("package name",
+		assertPreconditionViolationExceptionForString("basePackageName",
 			() -> ReflectionSupport.findAllClassesInPackage(null, allTypes, allNames));
 		assertPreconditionViolationException("class predicate",
 			() -> ReflectionSupport.findAllClassesInPackage("org.junit", null, allNames));
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
index ee9fe5b8e26d..0005995a1e00 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
@@ -19,17 +19,11 @@
 import java.util.List;
 import java.util.function.Function;
 
-import javax.lang.model.SourceVersion;
-
 import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.function.Executable;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.PreconditionViolationException;
-import org.junit.platform.commons.util.PackageUtils.JavaNameUtils;
 import org.opentest4j.ValueWrapper;
 
 /**
@@ -39,30 +33,6 @@
  */
 class PackageUtilsTests {
 
-	@Test
-	void assertPackageNameIsValidForValidPackageNames() {
-		PackageUtils.assertPackageNameIsValid(""); // default package
-		PackageUtils.assertPackageNameIsValid("non.existing.but.all.segments.are.syntactically.valid");
-	}
-
-	@Test
-	void assertPackageNameIsValidForNullPackageName() {
-		assertThrows(PreconditionViolationException.class, () -> PackageUtils.assertPackageNameIsValid(null));
-	}
-
-	@Test
-	void assertPackageNameIsValidForWhitespacePackageName() {
-		assertThrows(PreconditionViolationException.class, () -> PackageUtils.assertPackageNameIsValid("    "));
-	}
-
-	@Test
-	void assertPackageNameIsValidForInvalidPackageNames() {
-		assertThrows(PreconditionViolationException.class, () -> PackageUtils.assertPackageNameIsValid(".a"));
-		assertThrows(PreconditionViolationException.class, () -> PackageUtils.assertPackageNameIsValid("a."));
-		assertThrows(PreconditionViolationException.class, () -> PackageUtils.assertPackageNameIsValid("a..b"));
-		assertThrows(PreconditionViolationException.class, () -> PackageUtils.assertPackageNameIsValid("byte.true"));
-	}
-
 	@Test
 	void getAttributeWithNullType() {
 		var exception = assertThrows(PreconditionViolationException.class,
@@ -125,27 +95,4 @@ void getAttributeWithEmptyName() {
 			() -> PackageUtils.getAttribute(getClass(), ""));
 		assertEquals("name must not be blank", exception.getMessage());
 	}
-
-	@Nested
-	class JavaNameUtilsTests {
-
-		@ParameterizedTest
-		@ValueSource(strings = { "name", "_NAME", "null", "var", "public", "$+!", "", "  ", "123", "true" })
-		void isJavaName(String s) {
-			assertEquals(SourceVersion.isName(s), JavaNameUtils.isJavaName(s));
-		}
-
-		@Test
-		void isJavaNameWithNullValue() {
-			// According to https://bugs.openjdk.java.net/browse/JDK-6362039,
-			// SourceVersion.isName(null) throws a NullPointerException instead
-			// of returning false.
-			assertThrows(NullPointerException.class, () -> SourceVersion.isName(null));
-
-			// However, for our purposes, we return false for a null value.
-			assertFalse(JavaNameUtils.isJavaName(null));
-		}
-
-	}
-
 }

From 37171ef100573126e0b70ec95c6ffd7556a3142f Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Sun, 21 Mar 2021 19:36:06 +0100
Subject: [PATCH 0241/1433] Document fully qualified method name syntax for
 custom conditions

This commit adds a sample in the user guide to clarify the use of custom conditions located in external classes.

Resolves #2556
---
 .../asciidoc/user-guide/writing-tests.adoc    | 14 ++++++--
 .../example/ExternalCustomConditionDemo.java  | 34 +++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 documentation/src/test/java/example/ExternalCustomConditionDemo.java

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 6d754563811c..88d3ee2c1137 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -462,8 +462,7 @@ indirectly present, or meta-present on a given element.
 
 A container or test may be enabled or disabled based on the boolean return of a
 method via the `{EnabledIf}` and `{DisabledIf}` annotations. The method is provided to
-the annotation via its name, or its fully qualified name if located outside the test
-class.
+the annotation via its name.
 If needed, the condition method can take a single parameter of type `ExtensionContext`.
 
 [source,java,indent=0]
@@ -471,6 +470,17 @@ If needed, the condition method can take a single parameter of type `ExtensionCo
 include::{testDir}/example/ConditionalTestExecutionDemo.java[tags=user_guide_custom]
 ----
 
+Alternatively, the condition method can be located outside the test class. In this case,
+it has to be referenced by its _fully qualified name_ as demonstrated in the following
+example.
+
+[source,java,indent=0]
+----
+package example;
+
+include::{testDir}/example/ExternalCustomConditionDemo.java[tags=user_guide_external_custom_condition]
+----
+
 NOTE: When `{EnabledIf}` or `{DisabledIf}` is used at class level, the condition method
 must always be `static`. Condition methods located in external classes must also be
 `static`. In any other case, you can use both static or instance methods.
diff --git a/documentation/src/test/java/example/ExternalCustomConditionDemo.java b/documentation/src/test/java/example/ExternalCustomConditionDemo.java
new file mode 100644
index 000000000000..c577c61f0741
--- /dev/null
+++ b/documentation/src/test/java/example/ExternalCustomConditionDemo.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example;
+
+// tag::user_guide_external_custom_condition[]
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+
+class ExternalCustomConditionDemo {
+
+	@Test
+	@EnabledIf("example.ExternalCondition#customCondition")
+	void enabled() {
+		// ...
+	}
+
+}
+
+class ExternalCondition {
+
+	static boolean customCondition() {
+		return true;
+	}
+
+}
+// end::user_guide_external_custom_condition[]

From e16bf9e64e6d7bff2e765aee5421314f52307f63 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 22 Mar 2021 17:12:07 +0100
Subject: [PATCH 0242/1433] Upgrade to latest test-retry plugin and remove
 workaround

---
 buildSrc/build.gradle.kts | 2 +-
 gradle.properties         | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 864391b24205..1d44413d34d1 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
-	implementation("org.gradle:test-retry-gradle-plugin:1.2.0")
+	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/gradle.properties b/gradle.properties
index a93d783b30fd..a20933fbd46a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -66,6 +66,3 @@ asciidoctor.plugin.version=3.3.0
 jmh.plugin.version=0.5.2
 nohttp.plugin.version=0.0.5.RELEASE
 nexus-publish.plugin.version=1.0.0
-
-# Temporarily disabled until test-retry plugin is compatible with JDK 16
-retries=0

From 3dc9650ef34084d291004efdbe7d6b118948b3a8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 Mar 2021 17:46:57 +0100
Subject: [PATCH 0243/1433] Enable Test Distribution in all but one project

---
 buildSrc/build.gradle.kts                                 | 2 ++
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts   | 5 +++++
 gradle.properties                                         | 4 ++++
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts      | 8 ++++++++
 .../launcher/listeners/MutableTestExecutionSummary.java   | 6 +++++-
 .../launcher/listeners/SummaryGeneratingListener.java     | 1 +
 junit-vintage-engine/junit-vintage-engine.gradle.kts      | 4 +---
 .../junit/vintage/engine/VintageTestEngineBasicTests.java | 5 -----
 platform-tests/platform-tests.gradle.kts                  | 5 +++++
 .../java/org/junit/jupiter/extensions/Heavyweight.java    | 1 +
 .../options/PicocliCommandLineOptionsParserTests.java     | 8 +++++---
 .../platform-tooling-support-tests.gradle.kts             | 4 ++++
 settings.gradle.kts                                       | 6 ++++++
 13 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 1d44413d34d1..b48dc52db322 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
+	maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 }
 
 dependencies {
@@ -14,6 +15,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.2-rc-2")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index ef60d6f4539a..e4a9073dae02 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -18,6 +18,11 @@ tasks.withType<Test>().configureEach {
 	retry {
 		maxRetries.set(providers.gradleProperty("retries").map(String::toInt).orElse(2))
 	}
+	distribution {
+		enabled.convention(providers.gradleProperty("enableTestDistribution").map(String::toBoolean).orElse(false))
+		maxLocalExecutors.set(providers.gradleProperty("testDistribution.maxLocalExecutors").map(String::toInt).orElse(1))
+		maxRemoteExecutors.set(providers.gradleProperty("testDistribution.maxRemoteExecutors").map(String::toInt))
+	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 	// Required until ASM officially supports the JDK 14
 	systemProperty("net.bytebuddy.experimental", true)
diff --git a/gradle.properties b/gradle.properties
index a20933fbd46a..25acc52bf6a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,6 +17,9 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.java.installations.fromEnv=JDK8,JDK16
 
+# Test Distribution
+gradle.internal.testdistribution.writeTraceFile=true
+
 # Omit automatic compile dependency on kotlin-stdlib
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
 kotlin.stdlib.default.dependency=false
@@ -55,6 +58,7 @@ bnd.version=5.3.0
 
 # Plugins
 gradle.enterprise.plugin.version=3.6
+test.distribution.plugin.version=2.0.2-rc-2
 gradle.user-data.plugin.version=1.2
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.36.0
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 9cb4fd434c14..9c6763e75174 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.api.tasks.PathSensitivity.RELATIVE
+
 plugins {
 	`kotlin-library-conventions`
 	`testing-conventions`
@@ -22,3 +24,9 @@ dependencies {
 	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	testImplementation("org.codehaus.groovy:groovy")
 }
+
+tasks {
+	test {
+		inputs.dir("src/test/resources").withPathSensitivity(RELATIVE)
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
index f9236ad91cae..09890e551fe4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
@@ -14,6 +14,7 @@
 import static java.util.Collections.synchronizedList;
 
 import java.io.PrintWriter;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -57,13 +58,16 @@ class MutableTestExecutionSummary implements TestExecutionSummary {
 	private final TestPlan testPlan;
 	private final List<Failure> failures = synchronizedList(new ArrayList<>());
 	private final long timeStarted;
+	private final long timeStartedNanos;
 	long timeFinished;
+	long timeFinishedNanos;
 
 	MutableTestExecutionSummary(TestPlan testPlan) {
 		this.testPlan = testPlan;
 		this.containersFound.set(testPlan.countTestIdentifiers(TestIdentifier::isContainer));
 		this.testsFound.set(testPlan.countTestIdentifiers(TestIdentifier::isTest));
 		this.timeStarted = System.currentTimeMillis();
+		this.timeStartedNanos = System.nanoTime();
 	}
 
 	void addFailure(TestIdentifier testIdentifier, Throwable throwable) {
@@ -165,7 +169,7 @@ public void printTo(PrintWriter writer) {
 			+ "[%10d tests failed          ]%n"
 			+ "%n",
 
-			(this.timeFinished - this.timeStarted),
+			Duration.ofNanos(this.timeFinishedNanos - this.timeStartedNanos).toMillis(),
 
 			getContainersFoundCount(),
 			getContainersSkippedCount(),
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
index 39ce7fe0540e..451e92e98bf4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
@@ -51,6 +51,7 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 	@Override
 	public void testPlanExecutionFinished(TestPlan testPlan) {
 		this.summary.timeFinished = System.currentTimeMillis();
+		this.summary.timeFinishedNanos = System.nanoTime();
 	}
 
 	@Override
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 75985528acf7..c02f2158124b 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -63,9 +63,7 @@ tasks {
 		(options as JUnitPlatformOptions).apply {
 			includeTags("missing-junit4")
 		}
-		filter {
-			includeTestsMatching("org.junit.vintage.engine.JUnit4VersionCheckTests")
-		}
+		setIncludes(listOf("**/JUnit4VersionCheckTests.class"))
 		classpath = classpath.filter {
 			!it.name.startsWith("junit-4")
 		}
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
index 00abbdbdedc1..f16342cad37c 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
@@ -39,9 +39,4 @@ void artifactId() {
 		assertEquals("junit-vintage-engine", vintage.getArtifactId().get());
 	}
 
-	@Test
-	void version() {
-		assertEquals("DEVELOPMENT", vintage.getVersion().get());
-	}
-
 }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index babacf5a3439..bc75c1ae9638 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.api.tasks.PathSensitivity.RELATIVE
+
 plugins {
 	`java-library-conventions`
 	`junit4-compatibility`
@@ -59,6 +61,9 @@ tasks {
 		}
 		jvmArgs("-Xmx1g")
 	}
+	test {
+		inputs.dir("src/test/resources").withPathSensitivity(RELATIVE)
+	}
 	test_4_12 {
 		useJUnitPlatform {
 			includeTags("junit4")
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
index ae8998cb783d..499b00220308 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
@@ -72,6 +72,7 @@ private static class ResourceValue implements Resource, CloseableResource, AutoC
 		public void close() {
 			// Close resources here.
 			assertEquals(9, usages.get(), "Usage counter mismatch!");
+			usages.set(0);
 		}
 
 		@Override
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index e163214ef7a1..9bea3b47d942 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -26,6 +26,7 @@
 import java.io.Writer;
 import java.net.URI;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +35,7 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.platform.commons.JUnitException;
@@ -265,7 +267,7 @@ void parseInvalidExcludedEngines() {
 
 	@ParameterizedTest
 	@EnumSource
-	void parseValidAdditionalClasspathEntries(ArgsType type) {
+	void parseValidAdditionalClasspathEntries(ArgsType type, @TempDir Path tempDir) {
 		var dir = Paths.get(".");
 		// @formatter:off
 		assertAll(
@@ -277,8 +279,8 @@ void parseValidAdditionalClasspathEntries(ArgsType type) {
 			() -> assertEquals(List.of(dir), type.parseArgLine("--classpath=.").getAdditionalClasspathEntries()),
 			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path .").getAdditionalClasspathEntries()),
 			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path=.").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir, Paths.get("src", "test", "java")), type.parseArgLine("-cp . -cp src/test/java").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir, Paths.get("src", "test", "java")), type.parseArgLine("-cp ." + File.pathSeparator + "src/test/java").getAdditionalClasspathEntries())
+			() -> assertEquals(List.of(dir, tempDir), type.parseArgLine("-cp . -cp " + tempDir).getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir, tempDir), type.parseArgLine("-cp ." + File.pathSeparator + tempDir).getAdditionalClasspathEntries())
 		);
 		// @formatter:on
 	}
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index e14f5271015e..d4c15d41d159 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -78,6 +78,10 @@ tasks.test {
 		includeEngines("archunit")
 	}
 
+	distribution {
+		enabled.set(false)
+	}
+
 	maxParallelForks = 1 // Bartholdy.install is not parallel safe, see https://github.com/sormuras/bartholdy/issues/4
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 40b99b011640..06d3bf2b961e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,8 +1,13 @@
 import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
 
 pluginManagement {
+	repositories {
+		gradlePluginPortal()
+		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
+	}
 	plugins {
 		id("com.gradle.enterprise") version settings.extra["gradle.enterprise.plugin.version"] as String
+		id("com.gradle.enterprise.test-distribution") version settings.extra["test.distribution.plugin.version"] as String
 		id("com.gradle.common-custom-user-data-gradle-plugin") version settings.extra["gradle.user-data.plugin.version"] as String
 		id("net.nemerosa.versioning") version settings.extra["versioning.plugin.version"] as String
 		id("com.github.ben-manes.versions") version settings.extra["versions.plugin.version"] as String
@@ -19,6 +24,7 @@ pluginManagement {
 
 plugins {
 	id("com.gradle.enterprise")
+	id("com.gradle.enterprise.test-distribution")
 	id("com.gradle.common-custom-user-data-gradle-plugin")
 }
 

From 7ded907944fc8cccdf7cee8465b7433c316d6dc8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 25 Mar 2021 18:33:47 +0100
Subject: [PATCH 0244/1433] Clear temp repo so it only contains single snapshot

---
 build.gradle.kts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index a744ac40be8c..71a131c240f0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -123,6 +123,12 @@ allprojects {
 	}
 }
 
+val clearTempRepoDir by tasks.registering {
+	doFirst {
+		tempRepoDir.deleteRecursively()
+	}
+}
+
 subprojects {
 
 	if (project in jupiterProjects) {
@@ -201,6 +207,11 @@ subprojects {
 				}
 			}
 		}
+		tasks.withType<PublishToMavenRepository>().configureEach {
+			if (name.endsWith("To${tempRepoName.capitalize()}Repository")) {
+				dependsOn(clearTempRepoDir)
+			}
+		}
 	}
 }
 

From 500be6e20106a8ca1673616c27102f5c0830b013 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 25 Mar 2021 18:34:26 +0100
Subject: [PATCH 0245/1433] Only pass toolchain JDK if TD is disabled

---
 .../platform-tooling-support-tests.gradle.kts        | 12 +++++++++---
 .../main/java/platform/tooling/support/Helper.java   |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index d4c15d41d159..47b9c12a8f6d 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -90,6 +90,9 @@ class MavenRepo(@get:InputDirectory @get:PathSensitive(PathSensitivity.RELATIVE)
 }
 
 class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgumentProvider {
+	@Internal
+	val passToolchain = project.providers.gradleProperty("enableTestDistribution").map(String::toBoolean).orElse(false).map { !it }
+
 	@Internal
 	val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
 			.value(project.provider {
@@ -103,8 +106,11 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 			})
 
 	override fun asArguments(): List<String> {
-		val metadata = javaLauncher.map { it.metadata }
-		val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
-		return javaHome?.let { listOf("-Djava.home.$version=$it") } ?: emptyList()
+		if (passToolchain.get()) {
+			val metadata = javaLauncher.map { it.metadata }
+			val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
+			return javaHome?.let { listOf("-Djava.home.$version=$it") } ?: emptyList()
+		}
+		return emptyList()
 	}
 }
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 9bdfe26f6547..b6c79dec27a0 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -117,7 +117,8 @@ public static Optional<Path> getJavaHome(String version) {
 			System.getProperty("jdk.home." + version), //
 			System.getProperty("jdk." + version), //
 			System.getenv("JAVA_HOME_" + version), //
-			System.getenv("JAVA_" + version) //
+			System.getenv("JAVA_" + version), //
+			System.getenv("JDK" + version) //
 		);
 		return sources.filter(Objects::nonNull).findFirst().map(Path::of);
 	}

From 07302b3e30cb5b734fd6a9fc5f283544e73f8423 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 25 Mar 2021 18:34:45 +0100
Subject: [PATCH 0246/1433] Add build scan tag when TD is enabled

---
 settings.gradle.kts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 06d3bf2b961e..154de8d6475b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -62,6 +62,14 @@ gradleEnterprise {
 				ipAddresses { emptyList() }
 			}
 		}
+
+		val enableTestDistribution = providers.gradleProperty("enableTestDistribution")
+			.forUseAtConfigurationTime()
+			.map(String::toBoolean)
+			.getOrElse(false)
+		if (enableTestDistribution) {
+			tag("test-distribution")
+		}
 	}
 }
 

From 1d01ba77e8d0b98b1a03ed16e38806cbf674aa39 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 11:34:38 +0100
Subject: [PATCH 0247/1433] Delete JavacModulesTest

The test duplicates what the build is doing when compiling module
descriptors.
---
 .../support/tests/JavacModulesTests.java      | 155 ------------------
 1 file changed, 155 deletions(-)
 delete mode 100644 platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
deleted file mode 100644
index 7fa8a022bfdb..000000000000
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavacModulesTests.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2015-2021 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package platform.tooling.support.tests;
-
-import static java.util.stream.Collectors.joining;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertLinesMatch;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UncheckedIOException;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-import java.util.spi.ToolProvider;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import platform.tooling.support.Helper;
-
-/**
- * @since 1.5
- */
-class JavacModulesTests {
-
-	private static final Pattern MODULE_NAME_PATTERN = Pattern.compile("(module)\\s+(.+)\\s*\\{.*");
-
-	private static class Project {
-		final Path moduleInfo;
-		final Path moduleSource;
-		final String moduleName;
-		final Path javaClassesDir;
-
-		Project(Path moduleInfo) {
-			this.moduleInfo = moduleInfo;
-			this.moduleSource = moduleInfo.getParent().getParent();
-			this.javaClassesDir = moduleSource.getParent().getParent().resolve("build/classes/java");
-			try {
-				var nameMatcher = MODULE_NAME_PATTERN.matcher(Files.readString(moduleInfo));
-				if (!nameMatcher.find()) {
-					throw new Error("Expected java module descriptor unit, but got: " + moduleInfo);
-				}
-				this.moduleName = nameMatcher.group(2).trim();
-			}
-			catch (Exception e) {
-				throw new Error("Extracting module name failed", e);
-			}
-		}
-
-		private Stream<Path> getMainOutputDirs() {
-			try {
-				return Files.list(javaClassesDir) //
-						.filter(Files::isDirectory) //
-						.filter(dir -> dir.getFileName().toString().startsWith("main"));
-			}
-			catch (IOException e) {
-				throw new UncheckedIOException(e);
-			}
-		}
-	}
-
-	private static List<String> compileModules(Path temp, Writer out, Writer err, Function<Project, Stream<Path>> patch)
-			throws Exception {
-		var args = new ArrayList<String>();
-		args.add("-Xlint:all,-requires-automatic,-requires-transitive-automatic");
-		args.add("-proc:none"); // disable annotation processing
-		args.add("-cp");
-		args.add(""); // set empty class path, otherwise system property "java.class.path" is read
-
-		args.add("-d");
-		args.add(temp.resolve("destination").toString());
-
-		var lib = temp.resolve("lib");
-		Files.createDirectories(lib);
-		Helper.load(lib, "junit", "junit", "4.12");
-		Helper.load(lib, "org.assertj", "assertj-core", "3.13.2");
-		Helper.load(lib, "org.apiguardian", "apiguardian-api", "1.1.0");
-		Helper.load(lib, "org.opentest4j", "opentest4j", "1.2.0");
-		args.add("--module-path");
-		args.add(lib.toString());
-
-		var base = Path.of("..").toAbsolutePath().normalize();
-		try (var walk = Files.walk(base)) {
-			var projects = walk.filter(path -> path.endsWith("module-info.java")) //
-					.map(base::relativize) //
-					.filter(path -> !path.startsWith("platform-tests")) //
-					.filter(path -> !path.startsWith("platform-tooling-support-tests")) //
-					.map(base::resolve) //
-					.map(Project::new) //
-					.collect(Collectors.toList());
-			assertEquals(18, projects.size());
-
-			args.add("--module-source-path");
-			args.add(projects.stream() //
-					.map(project -> project.moduleSource) //
-					.map(Object::toString) //
-					.collect(joining(File.pathSeparator)));
-
-			for (var project : projects) {
-				var path = patch.apply(project).map(Path::toString).collect(joining(File.pathSeparator));
-				if (path.isEmpty()) {
-					continue;
-				}
-				args.add("--patch-module");
-				args.add(project.moduleName + "=" + path);
-			}
-
-			projects.forEach(project -> args.add(project.moduleInfo.toString()));
-
-			var javac = ToolProvider.findFirst("javac").orElseThrow();
-			javac.run(new PrintWriter(out), new PrintWriter(err), args.toArray(String[]::new));
-
-			assertTrue(out.toString().isBlank(), out.toString());
-		}
-		return args;
-	}
-
-	@Test
-	void patchMainClasses(@TempDir Path temp) throws Exception {
-		var out = new StringWriter();
-		var err = new StringWriter();
-
-		var args = compileModules(temp, out, err, Project::getMainOutputDirs);
-
-		assertTrue(err.toString().isBlank(), () -> err.toString() + "\n\n" + String.join("\n", args));
-
-		var listing = Helper.treeWalk(temp);
-		assertLinesMatch(List.of( //
-			"destination", //
-			">> CLASSES >>", //
-			"lib", //
-			"lib/apiguardian-api-1.1.0.jar", //
-			"lib/assertj-core-3.13.2.jar", //
-			"lib/junit-4.12.jar", //
-			"lib/opentest4j-1.2.0.jar"), listing);
-	}
-
-}

From d767a990873c16dfd548c46c1bf479113af2006e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 11:35:14 +0100
Subject: [PATCH 0248/1433] Remove unnecessary test filter

---
 .../platform-tooling-support-tests.gradle.kts                | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 47b9c12a8f6d..c916a13850ae 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -69,11 +69,6 @@ tasks.test {
 		jvmArgumentProviders += JavaHomeDir(project, 8)
 	}
 
-	filter {
-		// Include only tests from this module
-		includeTestsMatching("platform.tooling.support.*")
-	}
-
 	(options as JUnitPlatformOptions).apply {
 		includeEngines("archunit")
 	}

From f105349869c0dad1d65a743b23c8ab56de1226e0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 11:36:58 +0100
Subject: [PATCH 0249/1433] Read artifacts from local Maven repo

---
 .../platform-tooling-support-tests.gradle.kts | 36 +++++++-----
 .../junit-jupiter-api.expected.txt            |  4 +-
 .../junit-jupiter-engine.expected.txt         |  2 +-
 ...unit-jupiter-migrationsupport.expected.txt |  2 +-
 .../junit-jupiter-params.expected.txt         |  4 +-
 .../junit-jupiter.expected.txt                |  2 +-
 .../junit-platform-commons.expected.txt       |  2 +-
 .../junit-platform-console.expected.txt       |  2 +-
 .../junit-platform-engine.expected.txt        |  2 +-
 .../junit-platform-jfr.expected.txt           |  2 +-
 .../junit-platform-launcher.expected.txt      |  2 +-
 .../junit-platform-reporting.expected.txt     |  4 +-
 .../junit-platform-runner.expected.txt        |  2 +-
 .../junit-platform-suite-api.expected.txt     |  2 +-
 .../junit-platform-suite-commons.expected.txt |  2 +-
 .../junit-platform-suite-engine.expected.txt  |  2 +-
 .../junit-platform-suite.expected.txt         |  2 +-
 .../junit-platform-testkit.expected.txt       |  4 +-
 .../junit-vintage-engine.expected.txt         |  4 +-
 .../java/platform/tooling/support/Helper.java | 22 ++++---
 .../platform/tooling/support/MavenRepo.java   | 57 +++++++++++++++++++
 .../support/tests/AntStarterTests.java        |  7 ++-
 .../tests/GradleKotlinExtensionsTests.java    |  7 ++-
 .../tests/GradleMissingEngineTests.java       | 10 ++--
 .../support/tests/GradleModuleFileTests.java  |  7 +--
 .../support/tests/GradleStarterTests.java     |  7 ++-
 .../tests/JarContainsManifestFirstTests.java  |  4 +-
 .../support/tests/JarDescribeModuleTests.java | 10 ++--
 .../support/tests/JavaVersionsTests.java      |  7 ++-
 .../tooling/support/tests/ManifestTests.java  |  9 +--
 .../support/tests/MavenPomFileTests.java      | 12 +---
 .../support/tests/MavenStarterTests.java      |  7 ++-
 .../support/tests/MultiReleaseJarTests.java   |  8 ++-
 .../tests/PackageCyclesDetectionTests.java    |  4 +-
 .../support/tests/StandaloneTests.java        | 11 ++--
 .../support/tests/ToolProviderTests.java      | 11 +++-
 .../tests/VintageGradleIntegrationTests.java  |  7 ++-
 .../tests/VintageMavenIntegrationTests.java   |  7 ++-
 38 files changed, 186 insertions(+), 110 deletions(-)
 create mode 100644 platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index c916a13850ae..5086239a2b93 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -1,3 +1,4 @@
+import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.jvm.toolchain.internal.NoToolchainAvailableException
 
 plugins {
@@ -41,8 +42,6 @@ dependencies {
 }
 
 tasks.test {
-	inputs.dir("projects")
-
 	// Opt-in via system property: '-Dplatform.tooling.support.tests.enabled=true'
 	enabled = System.getProperty("platform.tooling.support.tests.enabled")?.toBoolean() ?: false
 
@@ -53,34 +52,45 @@ tasks.test {
 		// All maven-aware projects must be installed, i.e. published to the local repository
 		val mavenizedProjects: List<Project> by rootProject
 		val tempRepoName: String by rootProject
-		val tempRepoDir: File by rootProject
 
 		(mavenizedProjects + project(":junit-bom"))
 				.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") }
 				.forEach { dependsOn(it) }
+	}
 
-		// Pass version constants (declared in Versions.kt) to tests as system properties
-		systemProperty("Versions.apiGuardian", versions.apiguardian)
-		systemProperty("Versions.assertJ", versions.assertj)
-		systemProperty("Versions.junit4", versions.junit4)
-		systemProperty("Versions.ota4j", versions.opentest4j)
+	val tempRepoDir: File by rootProject
+	jvmArgumentProviders += MavenRepo(tempRepoDir)
 
-		jvmArgumentProviders += MavenRepo(tempRepoDir)
-		jvmArgumentProviders += JavaHomeDir(project, 8)
-	}
+	// Pass version constants (declared in Versions.kt) to tests as system properties
+	systemProperty("Versions.apiGuardian", versions.apiguardian)
+	systemProperty("Versions.assertJ", versions.assertj)
+	systemProperty("Versions.junit4", versions.junit4)
+	systemProperty("Versions.ota4j", versions.opentest4j)
 
 	(options as JUnitPlatformOptions).apply {
 		includeEngines("archunit")
 	}
 
+	inputs.apply {
+		dir("projects").withPathSensitivity(RELATIVE)
+		file("${rootDir}/gradle.properties")
+		file("${rootDir}/settings.gradle.kts")
+		file("${rootDir}/gradlew")
+		file("${rootDir}/gradlew.bat")
+		dir("${rootDir}/gradle/wrapper").withPathSensitivity(RELATIVE)
+		dir("${rootDir}/documentation/src/main").withPathSensitivity(RELATIVE)
+		dir("${rootDir}/documentation/src/test").withPathSensitivity(RELATIVE)
+	}
+
 	distribution {
-		enabled.set(false)
+		requirements.add("jdk=8")
 	}
+	jvmArgumentProviders += JavaHomeDir(project, 8)
 
 	maxParallelForks = 1 // Bartholdy.install is not parallel safe, see https://github.com/sormuras/bartholdy/issues/4
 }
 
-class MavenRepo(@get:InputDirectory @get:PathSensitive(PathSensitivity.RELATIVE) val repoDir: File) : CommandLineArgumentProvider {
+class MavenRepo(@get:InputDirectory @get:PathSensitive(RELATIVE) val repoDir: File) : CommandLineArgumentProvider {
 	override fun asArguments() = listOf("-Dmaven.repo=$repoDir")
 }
 
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
index 3e136ea8a241..03c16e3a7fb9 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.api@${jupiterVersion} jar:file:.+junit-jupiter-api/build/libs/junit-jupiter-api-${jupiterVersion}.jar..module-info.class
+org.junit.jupiter.api@${jupiterVersion} jar:file:.+/junit-jupiter-api-\d.+\.jar..module-info\.class
 exports org.junit.jupiter.api
 exports org.junit.jupiter.api.condition
 exports org.junit.jupiter.api.extension
@@ -9,4 +9,4 @@ requires java.base mandated
 requires org.apiguardian.api transitive
 requires org.junit.platform.commons transitive
 requires org.opentest4j transitive
-qualified opens org.junit.jupiter.api.condition to org.junit.platform.commons
\ No newline at end of file
+qualified opens org.junit.jupiter.api.condition to org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
index 40eef7f332f5..d8cd4a2c24a5 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.engine@${jupiterVersion} jar:file:.+junit-jupiter-engine/build/libs/junit-jupiter-engine-${jupiterVersion}.jar..module-info.class
+org.junit.jupiter.engine@${jupiterVersion} jar:file:.+/junit-jupiter-engine-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.apiguardian.api
 requires org.junit.jupiter.api
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
index 60f2be783d11..a96ffb5c0185 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.migrationsupport@${jupiterVersion} jar:file:.+junit-jupiter-migrationsupport/build/libs/junit-jupiter-migrationsupport-${jupiterVersion}.jar..module-info.class
+org.junit.jupiter.migrationsupport@${jupiterVersion} jar:file:.+/junit-jupiter-migrationsupport-\d.+\.jar..module-info\.class
 exports org.junit.jupiter.migrationsupport
 exports org.junit.jupiter.migrationsupport.conditions
 exports org.junit.jupiter.migrationsupport.rules
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
index 328486500421..341c529915dc 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter.params@${jupiterVersion} jar:file:.+junit-jupiter-params/build/libs/junit-jupiter-params-${jupiterVersion}.jar..module-info.class
+org.junit.jupiter.params@${jupiterVersion} jar:file:.+/junit-jupiter-params-\d.+\.jar..module-info\.class
 exports org.junit.jupiter.params
 exports org.junit.jupiter.params.aggregator
 exports org.junit.jupiter.params.converter
@@ -10,4 +10,4 @@ requires org.junit.jupiter.api transitive
 requires org.junit.platform.commons transitive
 qualified opens org.junit.jupiter.params to org.junit.platform.commons
 qualified opens org.junit.jupiter.params.converter to org.junit.platform.commons
-qualified opens org.junit.jupiter.params.provider to org.junit.platform.commons
\ No newline at end of file
+qualified opens org.junit.jupiter.params.provider to org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter.expected.txt
index 007d3af432ba..768342398c7e 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter.expected.txt
@@ -1,4 +1,4 @@
-org.junit.jupiter@${jupiterVersion} jar:file:.+junit-jupiter/build/libs/junit-jupiter-${jupiterVersion}.jar..module-info.class
+org.junit.jupiter@${jupiterVersion} jar:file:.+/junit-jupiter-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.junit.jupiter.api transitive
 requires org.junit.jupiter.engine transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
index ad6e2c7c66d4..12c846de99a2 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.commons@${platformVersion} jar:file:.+junit-platform-commons/build/libs/junit-platform-commons-${platformVersion}.jar..module-info.class
+org.junit.platform.commons@${platformVersion} jar:file:.+/junit-platform-commons-\d.+\.jar..module-info\.class
 exports org.junit.platform.commons
 exports org.junit.platform.commons.annotation
 exports org.junit.platform.commons.function
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
index 54620335d7b3..872aface24f4 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.console@${platformVersion} jar:file:.+junit-platform-console/build/libs/junit-platform-console-${platformVersion}.jar..module-info.class
+org.junit.platform.console@${platformVersion} jar:file:.+/junit-platform-console-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.apiguardian.api
 requires org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
index dc319ccacac0..1db8ec2099e2 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.engine@${platformVersion} jar:file:.+junit-platform-engine/build/libs/junit-platform-engine-${platformVersion}.jar..module-info.class
+org.junit.platform.engine@${platformVersion} jar:file:.+/junit-platform-engine-\d.+\.jar..module-info\.class
 exports org.junit.platform.engine
 exports org.junit.platform.engine.discovery
 exports org.junit.platform.engine.reporting
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
index ecee3737775f..688eb980e7d5 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.jfr@${platformVersion} jar:file:.+junit-platform-jfr/build/libs/junit-platform-jfr-${platformVersion}.jar..module-info.class
+org.junit.platform.jfr@${platformVersion} jar:file:.+/junit-platform-jfr-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires jdk.jfr
 requires org.apiguardian.api
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
index bd0e934131eb..d643d8067969 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.launcher@${platformVersion} jar:file:.+junit-platform-launcher/build/libs/junit-platform-launcher-${platformVersion}.jar..module-info.class
+org.junit.platform.launcher@${platformVersion} jar:file:.+/junit-platform-launcher-\d.+\.jar..module-info\.class
 exports org.junit.platform.launcher
 exports org.junit.platform.launcher.core
 exports org.junit.platform.launcher.listeners
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
index 27b0aa74b7bf..71c474d193ff 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.reporting@${platformVersion} jar:file:.+junit-platform-reporting/build/libs/junit-platform-reporting-${platformVersion}.jar..module-info.class
+org.junit.platform.reporting@${platformVersion} jar:file:.+/junit-platform-reporting-\d.+\.jar..module-info\.class
 exports org.junit.platform.reporting.legacy
 exports org.junit.platform.reporting.legacy.xml
 requires java.base mandated
@@ -6,4 +6,4 @@ requires java.xml
 requires org.apiguardian.api transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine transitive
-requires org.junit.platform.launcher transitive
\ No newline at end of file
+requires org.junit.platform.launcher transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
index e7ec0686461e..a9da89b60b64 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.runner@${platformVersion} jar:file:.+junit-platform-runner/build/libs/junit-platform-runner-${platformVersion}.jar..module-info.class
+org.junit.platform.runner@${platformVersion} jar:file:.+/junit-platform-runner-\d.+\.jar..module-info\.class
 exports org.junit.platform.runner
 requires java.base mandated
 requires junit transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
index 89ec3ed1b94d..3d1a3db0ea4d 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.suite.api@${platformVersion} jar:file:.+junit-platform-suite-api/build/libs/junit-platform-suite-api-${platformVersion}.jar..module-info.class
+org.junit.platform.suite.api@${platformVersion} jar:file:.+/junit-platform-suite-api-\d.+\.jar..module-info\.class
 exports org.junit.platform.suite.api
 requires java.base mandated
 requires org.apiguardian.api transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
index 88011288252d..5f099abb5ff3 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.suite.commons@${platformVersion} jar:file:.+junit-platform-suite-commons/build/libs/junit-platform-suite-commons-${platformVersion}.jar..module-info.class
+org.junit.platform.suite.commons@${platformVersion} jar:file:.+/junit-platform-suite-commons-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.apiguardian.api transitive
 requires org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
index f3ca8fbc91f5..5a1d3ef28734 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.suite.engine@${platformVersion} jar:file:.+junit-platform-suite-engine/build/libs/junit-platform-suite-engine-${platformVersion}.jar..module-info.class
+org.junit.platform.suite.engine@${platformVersion} jar:file:.+/junit-platform-suite-engine-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.apiguardian.api
 requires org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite.expected.txt
index c70a146e3c3f..d6114f727332 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.suite@${platformVersion} jar:file:.+junit-platform-suite/build/libs/junit-platform-suite-${platformVersion}.jar..module-info.class
+org.junit.platform.suite@${platformVersion} jar:file:.+/junit-platform-suite-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.junit.platform.suite.api transitive
 requires org.junit.platform.suite.engine transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
index 247d82ecccfe..65fdb5f7accc 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
@@ -1,4 +1,4 @@
-org.junit.platform.testkit@${platformVersion} jar:file:.+junit-platform-testkit/build/libs/junit-platform-testkit-${platformVersion}.jar..module-info.class
+org.junit.platform.testkit@${platformVersion} jar:file:.+/junit-platform-testkit-\d.+\.jar..module-info\.class
 exports org.junit.platform.testkit.engine
 requires java.base mandated
 requires org.apiguardian.api transitive
@@ -7,4 +7,4 @@ requires org.junit.platform.commons
 requires org.junit.platform.engine transitive
 requires org.junit.platform.launcher
 requires org.opentest4j transitive
-uses org.junit.platform.engine.TestEngine
\ No newline at end of file
+uses org.junit.platform.engine.TestEngine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
index 84259d0cb197..d205b2aea88c 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
@@ -1,7 +1,7 @@
-org.junit.vintage.engine@${vintageVersion} jar:file:.+junit-vintage-engine/build/libs/junit-vintage-engine-${jupiterVersion}.jar..module-info.class
+org.junit.vintage.engine@${vintageVersion} jar:file:.+/junit-vintage-engine-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires junit
 requires org.apiguardian.api
 requires org.junit.platform.engine
 provides org.junit.platform.engine.TestEngine with org.junit.vintage.engine.VintageTestEngine
-contains org.junit.vintage.engine
\ No newline at end of file
+contains org.junit.vintage.engine
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index b6c79dec27a0..0ab9c0cac804 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -67,6 +67,19 @@ public static String version(String moduleOrSystemProperty, String defaultVersio
 		return System.getProperty("Versions." + moduleOrSystemProperty, defaultVersion);
 	}
 
+	static String groupId(String artifactId) {
+		if (artifactId.startsWith("junit-jupiter")) {
+			return "org.junit.jupiter";
+		}
+		if (artifactId.startsWith("junit-platform")) {
+			return "org.junit.platform";
+		}
+		if (artifactId.startsWith("junit-vintage")) {
+			return "org.junit.vintage";
+		}
+		return "org.junit";
+	}
+
 	public static String replaceVersionPlaceholders(String line) {
 		line = line.replace("${jupiterVersion}", version("junit-jupiter"));
 		line = line.replace("${vintageVersion}", version("junit-vintage"));
@@ -90,13 +103,8 @@ public static List<String> loadModuleDirectoryNames() {
 		}
 	}
 
-	public static Path createJarPath(String module) {
-		return Paths.get("..", module, "build", "libs") //
-				.resolve(module + '-' + version(module) + ".jar");
-	}
-
 	static JarFile createJarFile(String module) {
-		var path = createJarPath(module);
+		var path = MavenRepo.jar(module);
 		try {
 			return new JarFile(path.toFile());
 		}
@@ -126,7 +134,7 @@ public static Optional<Path> getJavaHome(String version) {
 	/** Load, here copy, modular jar files to the given target directory. */
 	public static void loadAllJUnitModules(Path target) throws Exception {
 		for (var module : loadModuleDirectoryNames()) {
-			var jar = createJarPath(module);
+			var jar = MavenRepo.jar(module);
 			Files.copy(jar, target.resolve(jar.getFileName()));
 		}
 	}
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
new file mode 100644
index 000000000000..d0cf8151ccfb
--- /dev/null
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package platform.tooling.support;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Predicate;
+
+public class MavenRepo {
+
+	private MavenRepo() {
+	}
+
+	public static Path dir() {
+		return Path.of(System.getProperty("maven.repo"));
+	}
+
+	public static Path jar(String artifactId) {
+		return artifact(artifactId, fileName -> fileName.endsWith(".jar") //
+				&& !fileName.endsWith("-sources.jar") //
+				&& !fileName.endsWith("-javadoc.jar"));
+	}
+
+	public static Path gradleModuleMetadata(String artifactId) {
+		return artifact(artifactId, fileName -> fileName.endsWith(".module"));
+	}
+
+	public static Path pom(String artifactId) {
+		return artifact(artifactId, fileName -> fileName.endsWith(".pom"));
+	}
+
+	private static Path artifact(String artifactId, Predicate<String> fileNamePredicate) {
+		var parentDir = dir() //
+				.resolve(Helper.groupId(artifactId).replace('.', File.separatorChar)) //
+				.resolve(artifactId) //
+				.resolve(Helper.version(artifactId));
+		try (var files = Files.list(parentDir)) {
+			return files.filter(
+				file -> fileNamePredicate.test(file.getFileName().toString())).findFirst().orElseThrow();
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
+	}
+
+}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
index 89e49437044d..cf83d453fae7 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
@@ -12,8 +12,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.nio.file.Paths;
 import java.util.List;
@@ -24,6 +24,7 @@
 import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -33,7 +34,7 @@ class AntStarterTests {
 
 	@Test
 	void ant_1_10_6() {
-		var standalone = Paths.get("..", "junit-platform-console-standalone", "build", "libs");
+		var standalone = MavenRepo.jar("junit-platform-console-standalone").getParent();
 		var result = Request.builder() //
 				.setTool(Ant.install("1.10.6", Paths.get("build", "test-tools"))) //
 				.setProject("ant-starter") //
@@ -42,7 +43,7 @@ void ant_1_10_6() {
 				.build() //
 				.run();
 
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assertEquals(0, result.getExitCode());
 		assertEquals("", result.getOutput("err"), "error log isn't empty");
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
index bc920124e32a..839aa1cf4116 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -11,8 +11,8 @@
 package platform.tooling.support.tests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.time.Duration;
 
@@ -22,6 +22,7 @@
 import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -34,14 +35,14 @@ void gradle_wrapper() {
 		var result = Request.builder() //
 				.setTool(new GradleWrapper(Request.PROJECTS.resolve("gradle-kotlin-extensions"))) //
 				.setProject("gradle-kotlin-extensions") //
-				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
 				.run();
 
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assertEquals(0, result.getExitCode(), "result=" + result);
 		assertTrue(result.getOutputLines("out").stream().anyMatch(line -> line.contains("BUILD SUCCESSFUL")));
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
index 7aeeb385d13b..0208f6f050b3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -11,10 +11,11 @@
 package platform.tooling.support.tests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.util.List;
 
 import de.sormuras.bartholdy.Tool;
@@ -24,6 +25,7 @@
 import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -42,13 +44,13 @@ private void test(Tool gradle) {
 				.setProject(project) //
 				.setWorkspace(project + "-wrapper") //
 				.setTool(gradle) //
-				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
-				.build() //
+				.setTimeout(Duration.ofMinutes(2)).build() //
 				.run();
 
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assertEquals(1, result.getExitCode());
 		assertLinesMatch(List.of( //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
index 17cdcd5829e6..a581df45e1d5 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
@@ -13,10 +13,10 @@
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import platform.tooling.support.MavenRepo;
 
 /**
  * @since 1.6
@@ -160,9 +160,6 @@ void jupiterAggregatorGradleModuleMetadataVariants() throws Exception {
 			"  ]", //
 			"}");
 
-		System.out.println(Path.of(".").toAbsolutePath().normalize());
-
-		assertLinesMatch(expected,
-			Files.readAllLines(Path.of("../junit-jupiter/build/publications/maven/module.json")));
+		assertLinesMatch(expected, Files.readAllLines(MavenRepo.gradleModuleMetadata("junit-jupiter")));
 	}
 }
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
index eafd69e23fc5..5b39603e2938 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -12,8 +12,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.nio.file.Paths;
 import java.time.Duration;
@@ -24,6 +24,7 @@
 import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -36,14 +37,14 @@ void gradle_wrapper() {
 		var result = Request.builder() //
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setProject("gradle-starter") //
-				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
 				.run();
 
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assertEquals(0, result.getExitCode());
 		assertTrue(result.getOutputLines("out").stream().anyMatch(line -> line.contains("BUILD SUCCESSFUL")));
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
index 0b8e60312086..2c3f5a36dc30 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
@@ -12,7 +12,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
-import static platform.tooling.support.Helper.createJarPath;
 
 import java.io.FileInputStream;
 import java.nio.file.Files;
@@ -20,6 +19,7 @@
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+import platform.tooling.support.MavenRepo;
 
 /**
  * @since 1.8
@@ -29,7 +29,7 @@ class JarContainsManifestFirstTests {
 	@ParameterizedTest
 	@MethodSource("platform.tooling.support.Helper#loadModuleDirectoryNames")
 	void manifestFirst(String module) throws Exception {
-		var modulePath = createJarPath(module);
+		var modulePath = MavenRepo.jar(module);
 
 		if (Files.notExists(modulePath)) {
 			fail("No such file: " + modulePath);
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
index 4b0b3242e9ff..50d8b5dd35e0 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
@@ -11,11 +11,10 @@
 package platform.tooling.support.tests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static platform.tooling.support.Helper.createJarPath;
 
 import java.lang.module.ModuleFinder;
 import java.nio.file.Files;
@@ -29,6 +28,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -39,7 +39,7 @@ class JarDescribeModuleTests {
 	@ParameterizedTest
 	@MethodSource("platform.tooling.support.Helper#loadModuleDirectoryNames")
 	void describeModule(String module) throws Exception {
-		var modulePath = createJarPath(module);
+		var modulePath = MavenRepo.jar(module);
 		var result = Request.builder() //
 				.setTool(new Jar()) //
 				.setProject("jar-describe-module") //
@@ -49,7 +49,7 @@ void describeModule(String module) throws Exception {
 				.build() //
 				.run();
 
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assertEquals(0, result.getExitCode());
 		assertEquals("", result.getOutput("err"), "error log isn't empty");
@@ -66,7 +66,7 @@ void describeModule(String module) throws Exception {
 	@ParameterizedTest
 	@MethodSource("platform.tooling.support.Helper#loadModuleDirectoryNames")
 	void packageNamesStartWithNameOfTheModule(String module) {
-		var modulePath = createJarPath(module);
+		var modulePath = MavenRepo.jar(module);
 		var moduleDescriptor = ModuleFinder.of(modulePath).findAll().iterator().next().descriptor();
 		var moduleName = moduleDescriptor.name();
 		for (var packageName : moduleDescriptor.packages()) {
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
index ae97a03580bb..d8bbac4203b4 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -11,8 +11,8 @@
 package platform.tooling.support.tests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.nio.file.Path;
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -52,12 +53,12 @@ List<String> execute(String version, Path javaHome) {
 				.setTool(Request.maven()) //
 				.setProject("java-versions") //
 				.setWorkspace("java-versions-" + version) //
-				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("--debug", "verify") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.setJavaHome(javaHome) //
 				.build().run();
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 		assertEquals(0, result.getExitCode());
 		assertEquals("", result.getOutput("err"));
 		return result.getOutputLines("out");
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
index c39660a31b7d..4700a5de9e54 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
@@ -14,10 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static platform.tooling.support.Helper.createJarPath;
 
-import java.io.File;
-import java.lang.module.ModuleFinder;
 import java.util.jar.Attributes;
 
 import aQute.bnd.osgi.Domain;
@@ -28,7 +25,9 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.osgi.framework.Version;
 import org.osgi.framework.VersionRange;
+
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 
 /**
  * @since 1.5
@@ -39,9 +38,7 @@ class ManifestTests {
 	@MethodSource("platform.tooling.support.Helper#loadModuleDirectoryNames")
 	void manifestEntriesAdhereToConventions(String module) throws Exception {
 		var version = Helper.version(module);
-		var modulePath = createJarPath(module);
-		var uri = ModuleFinder.of(modulePath).findAll().iterator().next().location().orElseThrow();
-		var jarFile = new File(uri);
+		var jarFile = MavenRepo.jar(module).toFile();
 		try (var jar = new Jar(jarFile)) {
 			var manifest = jar.getManifest();
 			var attributes = manifest.getMainAttributes();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
index c33a507fbfdf..e107bb522f47 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
@@ -13,10 +13,10 @@
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import platform.tooling.support.MavenRepo;
 
 /**
  * @since 1.4
@@ -60,10 +60,7 @@ void jupiterAggregatorPomDependencies() throws Exception {
 			"  </dependencies>", //
 			">> TAIL >>");
 
-		System.out.println(Path.of(".").toAbsolutePath().normalize());
-
-		assertLinesMatch(expected,
-			Files.readAllLines(Path.of("../junit-jupiter/build/publications/maven/pom-default.xml")));
+		assertLinesMatch(expected, Files.readAllLines(MavenRepo.pom("junit-jupiter")));
 	}
 
 	@Test
@@ -73,9 +70,6 @@ void jupiterAggregatorGradleMetadataMarker() throws Exception {
 			"  <!-- do_not_remove: published-with-gradle-metadata -->", //
 			">> TAIL >>");
 
-		System.out.println(Path.of(".").toAbsolutePath().normalize());
-
-		assertLinesMatch(expected,
-			Files.readAllLines(Path.of("../junit-jupiter/build/publications/maven/pom-default.xml")));
+		assertLinesMatch(expected, Files.readAllLines(MavenRepo.pom("junit-jupiter")));
 	}
 }
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
index 971f2c089d69..19a9111220e9 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -12,8 +12,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.time.Duration;
 
@@ -21,6 +21,7 @@
 import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -33,14 +34,14 @@ void verifyMavenStarterProject() {
 		var result = Request.builder() //
 				.setTool(Request.maven()) //
 				.setProject("maven-starter") //
-				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("--debug", "verify") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
 				.run();
 
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assertEquals(0, result.getExitCode());
 		assertEquals("", result.getOutput("err"));
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
index 9784a1030078..971a9192c1e2 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -11,9 +11,9 @@
 package platform.tooling.support.tests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -23,6 +23,8 @@
 import de.sormuras.bartholdy.Result;
 
 import org.junit.jupiter.api.Test;
+
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -81,13 +83,13 @@ private Result mvn(String variant) {
 		var result = Request.builder() //
 				.setTool(Request.maven()) //
 				.setProject("multi-release-jar") //
-				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("--show-version", "--errors", "--file", variant, "test") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.build() //
 				.run();
 
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		return result;
 	}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
index 055eb4f0e6f4..213988361fac 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 
 /**
  * @since 1.3
@@ -29,7 +29,7 @@ class PackageCyclesDetectionTests {
 	@MethodSource("platform.tooling.support.Helper#loadModuleDirectoryNames")
 	@Disabled("Need to pass --module-path...")
 	void moduleDoesNotContainCyclicPackageReferences(String module) {
-		var jar = Helper.createJarPath(module);
+		var jar = MavenRepo.jar(module);
 		var result = new CyclesDetector(jar, this::ignore).run(Configuration.of());
 		assertEquals(0, result.getExitCode(), "result=" + result);
 	}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 55a79bf4c779..9a13a30a19c1 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -17,7 +17,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 
 import de.sormuras.bartholdy.jdk.Jar;
@@ -31,6 +30,7 @@
 import org.junit.jupiter.api.TestMethodOrder;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -47,7 +47,7 @@ void compile() throws Exception {
 				.setTool(new Javac()) //
 				.setProject("standalone") //
 				.addArguments("-d", workspace.resolve("bin")) //
-				.addArguments("--class-path", Helper.createJarPath("junit-platform-console-standalone")) //
+				.addArguments("--class-path", MavenRepo.jar("junit-platform-console-standalone")) //
 				.addArguments(workspace.resolve("src/standalone/JupiterIntegration.java")) //
 				.addArguments(workspace.resolve("src/standalone/JupiterParamsIntegration.java")) //
 				.addArguments(workspace.resolve("src/standalone/VintageIntegration.java")).build() //
@@ -72,15 +72,13 @@ void compile() throws Exception {
 	@Test
 	@Order(2)
 	void test() throws IOException {
-		var root = Path.of("../../..");
-		var jar = root.resolve(Helper.createJarPath("junit-platform-console-standalone"));
 		var result = Request.builder() //
 				.setTool(new Java()) //
 				.setProject("standalone") //
 				.addArguments("--show-version") //
 				.addArguments("-enableassertions") //
 				.addArguments("-Djava.util.logging.config.file=logging.properties") //
-				.addArguments("-jar", jar) //
+				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
 				.addArguments("--scan-class-path") //
 				.addArguments("--disable-banner") //
 				.addArguments("--include-classname", "standalone.*") //
@@ -107,8 +105,7 @@ void test() throws IOException {
 	@Order(3)
 	@Disabled("https://github.com/junit-team/junit5/issues/1724")
 	void testWithJarredTestClasses() {
-		var root = Path.of("../../..");
-		var jar = root.resolve(Helper.createJarPath("junit-platform-console-standalone"));
+		var jar = MavenRepo.jar("junit-platform-console-standalone");
 		var path = new ArrayList<String>();
 		// path.add("bin"); // "exploded" test classes are found, see also test() above
 		path.add(Request.WORKSPACE.resolve("standalone/jar/tests.jar").toAbsolutePath().toString());
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
index afbae951f852..90e1c369ab0e 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
@@ -26,7 +26,6 @@
 import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
@@ -39,6 +38,7 @@
 import org.junit.jupiter.api.Test;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -52,10 +52,15 @@ class ToolProviderTests {
 	static void prepareLocalLibraryDirectoryWithJUnitPlatformModules() {
 		try {
 			var lib = Files.createDirectories(LIB);
+			try (var directoryStream = Files.newDirectoryStream(lib, "*.jar")) {
+				for (Path jarFile : directoryStream) {
+					Files.delete(jarFile);
+				}
+			}
 			for (var module : Helper.loadModuleDirectoryNames()) {
 				if (module.startsWith("junit-platform")) {
-					var jar = Helper.createJarPath(module);
-					Files.copy(jar, lib.resolve(jar.getFileName()), StandardCopyOption.REPLACE_EXISTING);
+					var jar = MavenRepo.jar(module);
+					Files.copy(jar, lib.resolve(module + ".jar"));
 				}
 			}
 			Helper.load(lib, "org.apiguardian", "apiguardian-api", Helper.version("apiGuardian", "1.1.0"));
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index 9604d834729d..f795bb2dd6b3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -11,7 +11,7 @@
 package platform.tooling.support.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.nio.file.Paths;
 import java.time.Duration;
@@ -25,6 +25,7 @@
 import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 class VintageGradleIntegrationTests {
@@ -60,12 +61,12 @@ private Result run(String version) {
 				.setProject("vintage") //
 				.setWorkspace("vintage-gradle-" + version) //
 				.addArguments("clean", "test", "--stacktrace") //
-				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.build() //
 				.run();
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 		return result;
 	}
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index 5bd512335ecc..bdb10eb257bb 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -11,7 +11,7 @@
 package platform.tooling.support.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.time.Duration;
 
@@ -23,6 +23,7 @@
 import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 class VintageMavenIntegrationTests {
@@ -60,12 +61,12 @@ private Result run(String version) {
 				.setProject("vintage") //
 				.setWorkspace("vintage-maven-" + version) //
 				.addArguments("clean", "test", "--debug") //
-				.addArguments("-Dmaven.repo=" + System.getProperty("maven.repo")) //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.build() //
 				.run();
-		assumeFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 		return result;
 	}
 

From 3ace14cc672d8c071a7d7e19949af120bef001c2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 13:20:05 +0100
Subject: [PATCH 0250/1433] Merge Heavyweight test classes

---
 .../junit/jupiter/extensions/Heavyweight.java |   5 +-
 .../extensions/HeavyweightAlphaTests.java     |  64 ----------
 .../extensions/HeavyweightBetaTests.java      |  57 ---------
 .../jupiter/extensions/HeavyweightTests.java  | 110 ++++++++++++++++++
 4 files changed, 112 insertions(+), 124 deletions(-)
 delete mode 100644 platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightAlphaTests.java
 delete mode 100644 platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightBetaTests.java
 create mode 100644 platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java

diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
index 499b00220308..59ed57442b64 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
@@ -57,9 +57,9 @@ interface Resource {
 	 * {@link ResourceValue#close()} method implementation is needed to comply
 	 * with both interfaces.
 	 */
-	private static class ResourceValue implements Resource, CloseableResource, AutoCloseable {
+	static class ResourceValue implements Resource, CloseableResource, AutoCloseable {
 
-		private static final AtomicInteger creations = new AtomicInteger();
+		static final AtomicInteger creations = new AtomicInteger();
 		private final AtomicInteger usages = new AtomicInteger();
 
 		@SuppressWarnings("unused") // used via reflection
@@ -72,7 +72,6 @@ private static class ResourceValue implements Resource, CloseableResource, AutoC
 		public void close() {
 			// Close resources here.
 			assertEquals(9, usages.get(), "Usage counter mismatch!");
-			usages.set(0);
 		}
 
 		@Override
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightAlphaTests.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightAlphaTests.java
deleted file mode 100644
index c57687960147..000000000000
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightAlphaTests.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2015-2021 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.extensions;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestFactory;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.ResourceLock;
-
-/**
- * Unit tests for {@link org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource}
- * stored values.
- *
- * @since 1.1
- */
-@ExtendWith(Heavyweight.class)
-@ResourceLock(Heavyweight.Resource.ID)
-class HeavyweightAlphaTests {
-
-	private static int mark;
-
-	@BeforeAll
-	static void setMark(Heavyweight.Resource resource) {
-		assertTrue(resource.usages() > 0);
-		mark = resource.usages();
-	}
-
-	@TestFactory
-	Stream<DynamicTest> alpha1(Heavyweight.Resource resource) {
-		return Stream.of(dynamicTest("foo", () -> assertTrue(resource.usages() > 1)));
-	}
-
-	@Test
-	void alpha2(Heavyweight.Resource resource) {
-		assertTrue(resource.usages() > 1);
-	}
-
-	@Test
-	void alpha3(Heavyweight.Resource resource) {
-		assertTrue(resource.usages() > 1);
-	}
-
-	@AfterAll
-	static void checkMark(Heavyweight.Resource resource) {
-		assertEquals(mark, resource.usages() - 4);
-	}
-}
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightBetaTests.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightBetaTests.java
deleted file mode 100644
index a2823d758210..000000000000
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightBetaTests.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2015-2021 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.extensions;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.parallel.ResourceLock;
-
-/**
- * Unit tests for {@link org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource}
- * stored values.
- *
- * @since 1.1
- */
-@ExtendWith(Heavyweight.class)
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@ResourceLock(Heavyweight.Resource.ID)
-class HeavyweightBetaTests {
-
-	private int mark;
-
-	@BeforeAll
-	void beforeAll(Heavyweight.Resource resource) {
-		assertTrue(resource.usages() > 0);
-		mark = resource.usages();
-	}
-
-	@BeforeEach
-	void beforeEach(Heavyweight.Resource resource) {
-		assertTrue(resource.usages() > 1);
-	}
-
-	@Test
-	void beta(Heavyweight.Resource resource) {
-		assertTrue(resource.usages() > 2);
-	}
-
-	@AfterAll
-	void afterAll(Heavyweight.Resource resource) {
-		assertEquals(mark, resource.usages() - 3);
-	}
-}
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java
new file mode 100644
index 000000000000..641f8a2ffbfe
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.extensions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.ResourceLock;
+
+/**
+ * Unit tests for {@link org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource}
+ * stored values.
+ *
+ * @since 1.1
+ */
+class HeavyweightTests {
+
+	@AfterAll
+	static void afterAll() {
+		Heavyweight.ResourceValue.creations.set(0);
+	}
+
+	@Nested
+	@TestInstance(PER_CLASS)
+	@ExtendWith(Heavyweight.class)
+	@ResourceLock(Heavyweight.Resource.ID)
+	class Alpha {
+
+		private int mark;
+
+		@BeforeAll
+		void setMark(Heavyweight.Resource resource) {
+			assertTrue(resource.usages() > 0);
+			mark = resource.usages();
+		}
+
+		@TestFactory
+		Stream<DynamicTest> alpha1(Heavyweight.Resource resource) {
+			return Stream.of(dynamicTest("foo", () -> assertTrue(resource.usages() > 1)));
+		}
+
+		@Test
+		void alpha2(Heavyweight.Resource resource) {
+			assertTrue(resource.usages() > 1);
+		}
+
+		@Test
+		void alpha3(Heavyweight.Resource resource) {
+			assertTrue(resource.usages() > 1);
+		}
+
+		@AfterAll
+		void checkMark(Heavyweight.Resource resource) {
+			assertEquals(mark, resource.usages() - 4);
+		}
+
+	}
+
+	@Nested
+	@TestInstance(PER_CLASS)
+	@ExtendWith(Heavyweight.class)
+	@ResourceLock(Heavyweight.Resource.ID)
+	class Beta {
+
+		private int mark;
+
+		@BeforeAll
+		void beforeAll(Heavyweight.Resource resource) {
+			assertTrue(resource.usages() > 0);
+			mark = resource.usages();
+		}
+
+		@BeforeEach
+		void beforeEach(Heavyweight.Resource resource) {
+			assertTrue(resource.usages() > 1);
+		}
+
+		@Test
+		void beta(Heavyweight.Resource resource) {
+			assertTrue(resource.usages() > 2);
+		}
+
+		@AfterAll
+		void afterAll(Heavyweight.Resource resource) {
+			assertEquals(mark, resource.usages() - 3);
+		}
+
+	}
+}

From 8f78ed8cecb037401848686a9c4ae092b7717de7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 13:20:14 +0100
Subject: [PATCH 0251/1433] Remove unused imports

---
 junit-platform-commons/junit-platform-commons.gradle.kts | 2 --
 junit-platform-console/junit-platform-console.gradle.kts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 47df635c1339..f19d86f85175 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -1,5 +1,3 @@
-import java.util.spi.ToolProvider
-
 plugins {
 	`java-library-conventions`
 	`java-multi-release-sources`
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 869f90e5b962..32c1ff5fe90a 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -1,5 +1,3 @@
-import java.util.spi.ToolProvider
-
 plugins {
 	`java-library-conventions`
 	`shadow-conventions`

From 42f7f77ab59b9edc56d0c689cc73970aaae30e87 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 13:59:39 +0100
Subject: [PATCH 0252/1433] Require same OS on CI

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 7 +++++++
 settings.gradle.kts                                     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index e4a9073dae02..4acc3f68cdd9 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -22,6 +22,13 @@ tasks.withType<Test>().configureEach {
 		enabled.convention(providers.gradleProperty("enableTestDistribution").map(String::toBoolean).orElse(false))
 		maxLocalExecutors.set(providers.gradleProperty("testDistribution.maxLocalExecutors").map(String::toInt).orElse(1))
 		maxRemoteExecutors.set(providers.gradleProperty("testDistribution.maxRemoteExecutors").map(String::toInt))
+		if (System.getenv("CI") != null) {
+			when {
+				OperatingSystem.current().isLinux -> requirements.add("os=linux")
+				OperatingSystem.current().isWindows -> requirements.add("os=windows")
+				OperatingSystem.current().isMacOsX -> requirements.add("os=macos")
+			}
+		}
 	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 	// Required until ASM officially supports the JDK 14
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 154de8d6475b..658e4a4807cf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -29,7 +29,7 @@ plugins {
 }
 
 val gradleEnterpriseServer = "https://ge.junit.org"
-val isCiServer = System.getenv("CI") != null || System.getenv("GITHUB_ACTIONS") != null
+val isCiServer = System.getenv("CI") != null
 val junitBuildCacheUsername: String? by extra
 val junitBuildCachePassword: String? by extra
 

From 16fbf9bb73636a7b774741a15de7fcc969269ad4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 14:11:42 +0100
Subject: [PATCH 0253/1433] Enable TD on CI

---
 .github/workflows/cross-version.yml | 7 +++++++
 .github/workflows/main.yml          | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 843af6e7833d..3f7e2bb69581 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -43,7 +43,14 @@ jobs:
           restore-keys: |
             test-${{ runner.os }}-maven-
       - name: Test
+        env:
+          ORG_GRADLE_PROJECT_enableTestDistribution: true
         run: |
           ./gradlew --version
           ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
           ./gradlew --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} -Porg.gradle.java.installations.auto-download=false build "-Dscan.tag.JDK_${{ matrix.jdk }}"
+      - name: Upload Test Distribution trace files
+        uses: actions/upload-artifact@v2
+        with:
+          name: Test Distribution trace files
+          path: '**/build/test-results/*/trace.json'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c778fd6ddb23..87c440afe851 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,11 +40,18 @@ jobs:
         key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           test-${{ runner.os }}-maven-
-    - name: Test and Coverage
+    - name: Test and coverage
+      env:
+        ORG_GRADLE_PROJECT_enableTestDistribution: true
       run: |
         ./gradlew --version
         ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo -Porg.gradle.java.installations.auto-download=false build jacocoRootReport
+    - name: Upload Test Distribution trace files
+      uses: actions/upload-artifact@v2
+      with:
+        name: Test Distribution trace files
+        path: '**/build/test-results/*/trace.json'
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 

From 253658f87656af538b7b5811e8522e6017c5df0b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 14:37:05 +0100
Subject: [PATCH 0254/1433] Add support for PR builds

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 4acc3f68cdd9..b0c55706efe5 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -19,10 +19,14 @@ tasks.withType<Test>().configureEach {
 		maxRetries.set(providers.gradleProperty("retries").map(String::toInt).orElse(2))
 	}
 	distribution {
-		enabled.convention(providers.gradleProperty("enableTestDistribution").map(String::toBoolean).orElse(false))
+		val isCiServer = System.getenv("CI") != null
+		enabled.convention(providers.gradleProperty("enableTestDistribution")
+			.map(String::toBoolean)
+			.map { enabled -> enabled && (!isCiServer || System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNotBlank()) }
+			.orElse(false))
 		maxLocalExecutors.set(providers.gradleProperty("testDistribution.maxLocalExecutors").map(String::toInt).orElse(1))
 		maxRemoteExecutors.set(providers.gradleProperty("testDistribution.maxRemoteExecutors").map(String::toInt))
-		if (System.getenv("CI") != null) {
+		if (isCiServer) {
 			when {
 				OperatingSystem.current().isLinux -> requirements.add("os=linux")
 				OperatingSystem.current().isWindows -> requirements.add("os=windows")

From 43638eb6a870e0d6c49224053dfeb39dcf0ef33f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 26 Mar 2021 17:12:14 +0100
Subject: [PATCH 0255/1433] Filter additional classpath entries lazily

---
 .../platform/console/options/CommandLineOptions.java   | 10 ++++++----
 .../platform/console/tasks/ConsoleTestExecutor.java    |  2 +-
 .../console/tasks/DiscoveryRequestCreator.java         |  2 +-
 .../options/PicocliCommandLineOptionsParserTests.java  |  7 +++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index 7607cade328e..c289beb9308f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -13,6 +13,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
 
@@ -20,7 +21,6 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -128,14 +128,16 @@ public void setTheme(Theme theme) {
 		this.theme = theme;
 	}
 
+	public List<Path> getExistingAdditionalClasspathEntries() {
+		return this.additionalClasspathEntries.stream().filter(Files::exists).collect(toList());
+	}
+
 	public List<Path> getAdditionalClasspathEntries() {
 		return this.additionalClasspathEntries;
 	}
 
 	public void setAdditionalClasspathEntries(List<Path> additionalClasspathEntries) {
-		// Create a modifiable copy
-		this.additionalClasspathEntries = new ArrayList<>(additionalClasspathEntries);
-		this.additionalClasspathEntries.removeIf(path -> !Files.exists(path));
+		this.additionalClasspathEntries = additionalClasspathEntries;
 	}
 
 	public boolean isFailIfNoTests() {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index a76d5c93545a..adad9244a17b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -74,7 +74,7 @@ private TestExecutionSummary executeTests(PrintWriter out) {
 	}
 
 	private Optional<ClassLoader> createCustomClassLoader() {
-		List<Path> additionalClasspathEntries = options.getAdditionalClasspathEntries();
+		List<Path> additionalClasspathEntries = options.getExistingAdditionalClasspathEntries();
 		if (!additionalClasspathEntries.isEmpty()) {
 			URL[] urls = additionalClasspathEntries.stream().map(this::toURL).toArray(URL[]::new);
 			ClassLoader parentClassLoader = ClassLoaderUtils.getDefaultClassLoader();
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
index a240ff9db664..021603d4fe8b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
@@ -77,7 +77,7 @@ private List<ClasspathRootSelector> createClasspathRootSelectors(CommandLineOpti
 	private Set<Path> determineClasspathRoots(CommandLineOptions options) {
 		if (options.getSelectedClasspathEntries().isEmpty()) {
 			Set<Path> rootDirs = new LinkedHashSet<>(ReflectionUtils.getAllClasspathRootDirectories());
-			rootDirs.addAll(options.getAdditionalClasspathEntries());
+			rootDirs.addAll(options.getExistingAdditionalClasspathEntries());
 			return rootDirs;
 		}
 		return new LinkedHashSet<>(options.getSelectedClasspathEntries());
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index 9bea3b47d942..07a522f8c7d5 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -35,7 +35,6 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.platform.commons.JUnitException;
@@ -267,7 +266,7 @@ void parseInvalidExcludedEngines() {
 
 	@ParameterizedTest
 	@EnumSource
-	void parseValidAdditionalClasspathEntries(ArgsType type, @TempDir Path tempDir) {
+	void parseValidAdditionalClasspathEntries(ArgsType type) {
 		var dir = Paths.get(".");
 		// @formatter:off
 		assertAll(
@@ -279,8 +278,8 @@ void parseValidAdditionalClasspathEntries(ArgsType type, @TempDir Path tempDir)
 			() -> assertEquals(List.of(dir), type.parseArgLine("--classpath=.").getAdditionalClasspathEntries()),
 			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path .").getAdditionalClasspathEntries()),
 			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path=.").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir, tempDir), type.parseArgLine("-cp . -cp " + tempDir).getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir, tempDir), type.parseArgLine("-cp ." + File.pathSeparator + tempDir).getAdditionalClasspathEntries())
+			() -> assertEquals(List.of(dir, Path.of("lib/some.jar")), type.parseArgLine("-cp . -cp lib/some.jar").getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir, Path.of("lib/some.jar")), type.parseArgLine("-cp ." + File.pathSeparator + "lib/some.jar").getAdditionalClasspathEntries())
 		);
 		// @formatter:on
 	}

From dc762488bb828d750dcd2008b68bd49d5a387999 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 8 Apr 2021 20:31:26 +0200
Subject: [PATCH 0256/1433] Remove Gradle distribution checksum for IDEA 2021.1
 compatibility

---
 gradle/wrapper/gradle-wrapper.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 51d930a381f3..442d9132ea32 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 34a9b0a1c09064f69449ec3fe1cda040512451bf Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Fri, 9 Apr 2021 13:12:33 +0200
Subject: [PATCH 0257/1433] Update to Gradle Enterprise Gradle Plugin 3.6.1

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 25acc52bf6a9..c6f3dfd75fa7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,7 +57,7 @@ surefire.version=2.22.2
 bnd.version=5.3.0
 
 # Plugins
-gradle.enterprise.plugin.version=3.6
+gradle.enterprise.plugin.version=3.6.1
 test.distribution.plugin.version=2.0.2-rc-2
 gradle.user-data.plugin.version=1.2
 versioning.plugin.version=2.14.0

From 352e5c12e8f560de16e3f2f8c9730151ab2aff31 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Apr 2021 13:46:46 +0200
Subject: [PATCH 0258/1433] Update test-distribution plugin

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c6f3dfd75fa7..87ae366fcafe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -58,7 +58,7 @@ bnd.version=5.3.0
 
 # Plugins
 gradle.enterprise.plugin.version=3.6.1
-test.distribution.plugin.version=2.0.2-rc-2
+test.distribution.plugin.version=2.0.2
 gradle.user-data.plugin.version=1.2
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.36.0

From 286cf076eba8414d7fe2c395b74d06b21318ef86 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Apr 2021 13:47:19 +0200
Subject: [PATCH 0259/1433] Update common-custom-user-data-gradle-plugin

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 87ae366fcafe..93681e0d0d3c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -59,7 +59,7 @@ bnd.version=5.3.0
 # Plugins
 gradle.enterprise.plugin.version=3.6.1
 test.distribution.plugin.version=2.0.2
-gradle.user-data.plugin.version=1.2
+gradle.user-data.plugin.version=1.2.1
 versioning.plugin.version=2.14.0
 versions.plugin.version=0.36.0
 spotless.plugin.version=5.9.0

From 64befca7bd5c985d72716a493f9ae985037681d9 Mon Sep 17 00:00:00 2001
From: Mincong Huang <mincong.h@gmail.com>
Date: Fri, 9 Apr 2021 23:35:31 +0800
Subject: [PATCH 0260/1433] Document array of dynamic tests in the User Guide

Closes #2588
---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 88d3ee2c1137..af89e8bca78a 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1766,8 +1766,8 @@ and dynamic tests.
 The first method returns an invalid return type. Since an invalid return type cannot be
 detected at compile time, a `JUnitException` is thrown when it is detected at runtime.
 
-The next five methods are very simple examples that demonstrate the generation of a
-`Collection`, `Iterable`, `Iterator`, or `Stream` of `DynamicTest` instances. Most of
+The next six methods are very simple examples that demonstrate the generation of a
+`Collection`, `Iterable`, `Iterator`, array, or `Stream` of `DynamicTest` instances. Most of
 these examples do not really exhibit dynamic behavior but merely demonstrate the
 supported return types in principle. However, `dynamicTestsFromStream()` and
 `dynamicTestsFromIntStream()` demonstrate how easy it is to generate dynamic tests for a

From 3deb9032712f9f454d2302a1268bb63c132760fc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 10 Apr 2021 16:53:33 +0200
Subject: [PATCH 0261/1433] Update Gradle plugins and dependencies

---
 gradle.properties | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 93681e0d0d3c..d7b55970b6dc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,21 +28,21 @@ kotlin.stdlib.default.dependency=false
 apiguardian.version=1.1.1
 assertj.version=3.19.0
 junit4.version=4.13.2
-junit4.osgi.version=4.13.1_1
+junit4.osgi.version=4.13.2_1
 junit4Min.version=4.12
 opentest4j.version=1.2.0
 picocli.version=4.6.1
-univocity-parsers.version=2.9.0
+univocity-parsers.version=2.9.1
 
 # Test Dependencies
 archunit.version=0.17.0
 bartholdy.version=0.2.3
-classgraph.version=4.8.98
+classgraph.version=4.8.104
 commons-io.version=2.8.0
-kotlinx-coroutines-core.version=1.4.2
+kotlinx-coroutines-core.version=1.4.3
 groovy.version=3.0.7
-log4j.version=2.14.0
-mockito.version=3.7.7
+log4j.version=2.14.1
+mockito.version=3.9.0
 slf4j.version=1.7.30
 spock.version=1.3-groovy-2.5
 jfrunit.version=main-SNAPSHOT
@@ -51,7 +51,7 @@ joox.version=1.6.2
 # Tools
 checkstyle.version=8.36.2
 jacoco.version=0.8.6
-jmh.version=1.27
+jmh.version=1.29
 ktlint.version=0.35.0
 surefire.version=2.22.2
 bnd.version=5.3.0
@@ -61,12 +61,12 @@ gradle.enterprise.plugin.version=3.6.1
 test.distribution.plugin.version=2.0.2
 gradle.user-data.plugin.version=1.2.1
 versioning.plugin.version=2.14.0
-versions.plugin.version=0.36.0
-spotless.plugin.version=5.9.0
+versions.plugin.version=0.38.0
+spotless.plugin.version=5.12.0
 git-publish.plugin.version=3.0.0
 kotlin.plugin.version=1.4.0
 asciidoctor-pdf.version=1.5.3
-asciidoctor.plugin.version=3.3.0
-jmh.plugin.version=0.5.2
-nohttp.plugin.version=0.0.5.RELEASE
+asciidoctor.plugin.version=3.3.2
+jmh.plugin.version=0.5.3
+nohttp.plugin.version=0.0.6.RELEASE
 nexus-publish.plugin.version=1.0.0

From 5ef975c783dbfda2abc1babdc334e1f1fdfeb1b3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 10 Apr 2021 17:25:19 +0200
Subject: [PATCH 0262/1433] Upgradle to 7.0

---
 buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts | 2 --
 gradle/wrapper/gradle-wrapper.properties                       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index 6653c80374df..ed8746404c4b 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -16,8 +16,6 @@ project.pluginManager.withPlugin("java") {
 	}
 	tasks.withType<JavaCompile>().configureEach {
 		javaCompiler.set(compiler)
-		// Temporary workaround for https://github.com/gradle/gradle/issues/15538
-		options.forkOptions.jvmArgs!!.addAll(listOf("--add-opens", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"))
 	}
 	tasks.withType<GroovyCompile>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132ea32..f371643eed77 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 5ea021da226899dfb6f7599ab73e33eb29435c45 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:34:28 +0200
Subject: [PATCH 0263/1433] Suppress deprecation warning when compiling against
 JUnit 4.13.2

---
 .../junit/vintage/engine/descriptor/DescriptionUtilsTests.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
index c03f613f89fe..29de0ec67a43 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
@@ -27,6 +27,7 @@
 
 class DescriptionUtilsTests {
 
+	@SuppressWarnings("deprecation")
 	AllDefaultPossibilitiesBuilder builder = new AllDefaultPossibilitiesBuilder(true);
 
 	@TestFactory

From 1f33b5e891ec78131b2f2ae5351fd45a06a1d732 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:36:27 +0200
Subject: [PATCH 0264/1433] Use version catalog for main dependencies

---
 buildSrc/src/main/kotlin/Versions.kt            |  6 ------
 .../main/kotlin/junit4-compatibility.gradle.kts |  4 +++-
 .../main/kotlin/testing-conventions.gradle.kts  |  3 ++-
 dependencies/dependencies.gradle.kts            | 10 ----------
 documentation/documentation.gradle.kts          | 14 +++++++-------
 gradle.properties                               | 10 ----------
 gradle/libs.versions.toml                       | 17 +++++++++++++++++
 junit-jupiter-api/junit-jupiter-api.gradle.kts  |  6 ++----
 .../junit-jupiter-engine.gradle.kts             |  2 +-
 .../junit-jupiter-migrationsupport.gradle.kts   |  8 ++++----
 .../junit-jupiter-params.gradle.kts             |  5 ++---
 junit-jupiter/junit-jupiter.gradle.kts          |  2 --
 .../junit-platform-commons.gradle.kts           |  3 +--
 .../junit-platform-console.gradle.kts           |  7 ++-----
 .../junit-platform-engine.gradle.kts            |  8 +++-----
 .../junit-platform-jfr.gradle.kts               |  4 +---
 .../junit-platform-launcher.gradle.kts          |  4 +---
 .../junit-platform-reporting.gradle.kts         |  4 +---
 .../junit-platform-runner.gradle.kts            |  8 +++-----
 .../junit-platform-suite-api.gradle.kts         |  4 +---
 .../junit-platform-suite-commons.gradle.kts     |  2 +-
 .../junit-platform-suite-engine.gradle.kts      |  2 +-
 .../junit-platform-suite.gradle.kts             |  2 --
 .../junit-platform-testkit.gradle.kts           |  8 +++-----
 .../junit-vintage-engine.gradle.kts             | 17 +++++++++--------
 platform-tests/platform-tests.gradle.kts        |  2 +-
 .../platform-tooling-support-tests.gradle.kts   |  8 ++++----
 settings.gradle.kts                             |  2 ++
 28 files changed, 72 insertions(+), 100 deletions(-)
 create mode 100644 gradle/libs.versions.toml

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index c74c5265d80f..be96753eccd8 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -13,12 +13,6 @@ class Versions(private val project: Project) {
         operator fun getValue(receiver: Any?, property: KProperty<*>) = get(property.name)
     }
 
-    val junit4 by properties
-    val junit4Min by properties
-    val opentest4j by properties
-    val apiguardian by properties
-    val assertj by properties
-
     operator fun get(name: String) = project.extra.get("$name.version") as String
 
 }
diff --git a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts b/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
index 2c1dfc17e4d9..70a5072cb015 100644
--- a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
+++ b/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
@@ -13,7 +13,9 @@ dependencies {
 		}
 	}
 	pluginManager.withPlugin("osgi-conventions") {
-		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:${versions["junit4.osgi"]}")
+		val libs = project.extensions["libs"] as VersionCatalog
+		val junit4Osgi = libs.findVersion("junit4Osgi").get().requiredVersion
+		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:${junit4Osgi}")
 	}
 }
 
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index b0c55706efe5..677d53cefc65 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -50,7 +50,8 @@ tasks.withType<Test>().configureEach {
 }
 
 dependencies {
-	"testImplementation"("org.assertj:assertj-core")
+	val libs = project.extensions["libs"] as VersionCatalog
+	"testImplementation"(libs.findDependency("assertj").get())
 	"testImplementation"("org.mockito:mockito-junit-jupiter") {
 		exclude(module = "junit-jupiter-engine")
 	}
diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 10470cb05888..719383d45398 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -13,19 +13,9 @@ dependencies {
 		// runtime means "the dependency is only for runtime, not for compilation"
 		// In other words, marking dependency as "runtime" would avoid accidental
 		// dependency on it during compilation
-		api("org.apiguardian:apiguardian-api:${versions.apiguardian}")
-		api("org.opentest4j:opentest4j:${versions.opentest4j}")
 		runtime("org.apache.logging.log4j:log4j-core:${versions["log4j"]}")
 		runtime("org.apache.logging.log4j:log4j-jul:${versions["log4j"]}")
 		api("io.github.classgraph:classgraph:${versions["classgraph"]}")
-		api("junit:junit:[${versions.junit4Min},)") {
-			version {
-				prefer(versions.junit4)
-			}
-		}
-		api("com.univocity:univocity-parsers:${versions["univocity-parsers"]}")
-		api("info.picocli:picocli:${versions["picocli"]}")
-		api("org.assertj:assertj-core:${versions.assertj}")
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("de.sormuras:bartholdy:${versions["bartholdy"]}")
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 6ecf26cbb3ef..f46b6b480c15 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -68,8 +68,8 @@ val docsDir = file("$buildDir/ghpages-docs")
 val replaceCurrentDocs = project.hasProperty("replaceCurrentDocs")
 val uploadPdfs = !snapshot
 val userGuidePdfFileName = "junit-user-guide-${rootProject.version}.pdf"
-val ota4jDocVersion = if (versions.opentest4j.contains("SNAPSHOT")) "snapshot" else versions.opentest4j
-val apiGuardianDocVersion = if (versions.apiguardian.contains("SNAPSHOT")) "snapshot" else versions.apiguardian
+val ota4jDocVersion = if (libs.versions.opentest4j.get().contains("SNAPSHOT")) "snapshot" else libs.versions.opentest4j.get()
+val apiGuardianDocVersion = if (libs.versions.apiguardian.get().contains("SNAPSHOT")) "snapshot" else libs.versions.apiguardian.get()
 
 gitPublish {
 	repoUri.set("https://github.com/junit-team/junit5.git")
@@ -99,7 +99,7 @@ val jdkJavadocBaseUrl = "https://docs.oracle.com/en/java/javase/11/docs/api"
 val elementListsDir = file("$buildDir/elementLists")
 val externalModulesWithoutModularJavadoc = mapOf(
 		"org.apiguardian.api" to "https://apiguardian-team.github.io/apiguardian/docs/$apiGuardianDocVersion/api/",
-		"org.assertj.core" to "https://javadoc.io/doc/org.assertj/assertj-core/${versions.assertj}/",
+		"org.assertj.core" to "https://javadoc.io/doc/org.assertj/assertj-core/${libs.versions.assertj.get()}/",
 		"org.opentest4j" to "https://ota4j-team.github.io/opentest4j/docs/$ota4jDocVersion/api/"
 )
 require(externalModulesWithoutModularJavadoc.values.all { it.endsWith("/") }) {
@@ -181,9 +181,9 @@ tasks {
 				"platform-version" to project.property("platformVersion"),
 				"vintage-version" to project.property("vintageVersion"),
 				"bom-version" to version,
-				"junit4-version" to versions.junit4,
-				"apiguardian-version" to versions.apiguardian,
-				"ota4j-version" to versions.opentest4j,
+				"junit4-version" to libs.versions.junit4.get(),
+				"apiguardian-version" to libs.versions.apiguardian.get(),
+				"ota4j-version" to libs.versions.opentest4j.get(),
 				"surefire-version" to versions["surefire"],
 				"release-branch" to releaseBranch,
 				"docs-version" to docsVersion,
@@ -287,7 +287,7 @@ tasks {
 			)
 
 			links(jdkJavadocBaseUrl)
-			links("https://junit.org/junit4/javadoc/${versions.junit4}/")
+			links("https://junit.org/junit4/javadoc/${libs.versions.junit4.get()}/")
 			externalModulesWithoutModularJavadoc.forEach { (moduleName, baseUrl) ->
 				linksOffline(baseUrl, "$elementListsDir/$moduleName")
 			}
diff --git a/gradle.properties b/gradle.properties
index d7b55970b6dc..0da627fd2910 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,16 +24,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
 kotlin.stdlib.default.dependency=false
 
-# Dependencies
-apiguardian.version=1.1.1
-assertj.version=3.19.0
-junit4.version=4.13.2
-junit4.osgi.version=4.13.2_1
-junit4Min.version=4.12
-opentest4j.version=1.2.0
-picocli.version=4.6.1
-univocity-parsers.version=2.9.1
-
 # Test Dependencies
 archunit.version=0.17.0
 bartholdy.version=0.2.3
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000000..109adff3a9de
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,17 @@
+[versions]
+apiguardian = "1.1.1"
+assertj = "3.19.0"
+junit4 = "4.13.2"
+junit4Osgi = "4.13.2_1"
+junit4Min = "4.12"
+opentest4j = "1.2.0"
+picocli = "4.6.1"
+univocity-parsers = "2.9.1"
+
+[libraries]
+apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
+assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
+junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
+opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
+picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
+univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocity-parsers" }
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index f7a66e3c419b..10b082dde7bd 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -6,11 +6,9 @@ plugins {
 description = "JUnit Jupiter API"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
-	api("org.opentest4j:opentest4j")
+	api(libs.apiguardian)
+	api(libs.opentest4j)
 	api(project(":junit-platform-commons"))
 
 	compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 9c6763e75174..36d817c0559a 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 	internal(platform(project(":dependencies")))
 
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-engine"))
 	api(project(":junit-jupiter-api"))
 
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index 847707f90724..a8ca3e348220 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -12,8 +12,8 @@ dependencies {
 	internal(platform(project(":dependencies")))
 
 	api(platform(project(":junit-bom")))
-	api("junit:junit")
-	api("org.apiguardian:apiguardian-api")
+	api(libs.junit4)
+	api(libs.apiguardian)
 	api(project(":junit-jupiter-api"))
 
 	testImplementation(project(":junit-jupiter-engine"))
@@ -28,9 +28,9 @@ tasks.jar {
 			# Import JUnit4 packages with a version
 			Import-Package: \
 				!org.apiguardian.api,\
-				org.junit;version="[${versions.junit4Min},5)",\
+				org.junit;version="[${libs.versions.junit4Min.get()},5)",\
 				org.junit.platform.commons.logging;status=INTERNAL,\
-				org.junit.rules;version="[${versions.junit4Min},5)",\
+				org.junit.rules;version="[${libs.versions.junit4Min.get()},5)",\
 				*
 		""")
 	}
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 234fb19d0f4b..ce35c90cd25e 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -10,11 +10,10 @@ dependencies {
 	internal(platform(project(":dependencies")))
 
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-jupiter-api"))
 
-	shadowed(platform(project(":dependencies")))
-	shadowed("com.univocity:univocity-parsers")
+	shadowed(libs.univocity.parsers)
 
 	testImplementation(project(":junit-platform-testkit"))
 	testImplementation(project(":junit-jupiter-engine"))
diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts
index 3ef81ae52660..f19ef52b086c 100644
--- a/junit-jupiter/junit-jupiter.gradle.kts
+++ b/junit-jupiter/junit-jupiter.gradle.kts
@@ -5,8 +5,6 @@ plugins {
 description = "JUnit Jupiter (Aggregator)"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
 	api(project(":junit-jupiter-api"))
 	api(project(":junit-jupiter-params"))
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index f19d86f85175..fb5a6651d721 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -8,9 +8,8 @@ plugins {
 description = "JUnit Platform Commons"
 
 dependencies {
-	internal(platform(project(":dependencies")))
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 }
 
 tasks.jar {
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 32c1ff5fe90a..5566a2512011 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -8,14 +8,11 @@ plugins {
 description = "JUnit Platform Console"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-reporting"))
 
-	shadowed(platform(project(":dependencies")))
-	shadowed("info.picocli:picocli")
+	shadowed(libs.picocli)
 }
 
 tasks {
diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
index af2a6092e17a..c7d91f6e2c4d 100644
--- a/junit-platform-engine/junit-platform-engine.gradle.kts
+++ b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -6,12 +6,10 @@ plugins {
 description = "JUnit Platform Engine API"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
-	api("org.opentest4j:opentest4j")
+	api(libs.apiguardian)
+	api(libs.opentest4j)
 	api(project(":junit-platform-commons"))
 
-	testImplementation("org.assertj:assertj-core")
+	testImplementation(libs.assertj)
 }
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index 0882b63d5761..fab69f5ecf3b 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -5,10 +5,8 @@ plugins {
 description = "JUnit Platform Flight Recorder Support"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-launcher"))
 }
 
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
index d3a5ecf284fe..0e2c4412bbdf 100644
--- a/junit-platform-launcher/junit-platform-launcher.gradle.kts
+++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -6,9 +6,7 @@ plugins {
 description = "JUnit Platform Launcher"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-engine"))
 }
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index bc0b0867c790..0812110890c9 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -5,9 +5,7 @@ plugins {
 description = "JUnit Platform Reporting"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-launcher"))
 }
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index a6aab3ce037c..3be2a0e79c74 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -8,11 +8,9 @@ plugins {
 description = "JUnit Platform Runner"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("junit:junit")
-	api("org.apiguardian:apiguardian-api")
+	api(libs.junit4)
+	api(libs.apiguardian)
 	api(project(":junit-platform-launcher"))
 	api(project(":junit-platform-suite-api"))
 
@@ -29,7 +27,7 @@ tasks.jar {
 			Import-Package: \
 				!org.apiguardian.api,\
 				org.junit.platform.commons.logging;status=INTERNAL,\
-				org.junit.runner.*;version="[${versions.junit4Min},5)",\
+				org.junit.runner.*;version="[${libs.versions.junit4Min.get()},5)",\
 				*
 		""")
 	}
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
index 434370974777..b519350f9d0c 100644
--- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
+++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -5,10 +5,8 @@ plugins {
 description = "JUnit Platform Suite API"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-commons"))
 
 	osgiVerification(project(":junit-platform-commons"))
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 11ffb7fe7a53..81f528c0ba52 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
 	internal(platform(project(":dependencies")))
 
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-launcher"))
 
 	implementation(project(":junit-platform-engine"))
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index 9618efbab32f..b55280b8280b 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 	internal(platform(project(":dependencies")))
 
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-engine"))
 	api(project(":junit-platform-suite-api"))
 
diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
index e9ff61917051..77a097c4aa91 100644
--- a/junit-platform-suite/junit-platform-suite.gradle.kts
+++ b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -5,8 +5,6 @@ plugins {
 description = "JUnit Platform Suite (Aggregator)"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
 	api(project(":junit-platform-suite-api"))
 	implementation(project(":junit-platform-suite-engine"))
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
index 2ba9c4a12089..cc8de483bc25 100644
--- a/junit-platform-testkit/junit-platform-testkit.gradle.kts
+++ b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -5,11 +5,9 @@ plugins {
 description = "JUnit Platform Test Kit"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
-	api("org.assertj:assertj-core")
-	api("org.opentest4j:opentest4j")
+	api(libs.apiguardian)
+	api(libs.assertj)
+	api(libs.opentest4j)
 	api(project(":junit-platform-launcher"))
 }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index c02f2158124b..0d2b3fdd0f5d 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -14,9 +14,9 @@ dependencies {
 	internal(platform(project(":dependencies")))
 
 	api(platform(project(":junit-bom")))
-	api("org.apiguardian:apiguardian-api")
+	api(libs.apiguardian)
 	api(project(":junit-platform-engine"))
-	api("junit:junit")
+	api(libs.junit4)
 
 	testFixturesApi("org.spockframework:spock-core")
 	testFixturesImplementation(project(":junit-platform-runner"))
@@ -44,17 +44,18 @@ tasks {
 	}
 	jar {
 		withConvention(BundleTaskConvention::class) {
+			val junit4Min = libs.versions.junit4Min.get()
 			bnd("""
 				# Import JUnit4 packages with a version
 				Import-Package: \
 					!org.apiguardian.api,\
-					junit.runner;version="[${versions.junit4Min},5)",\
-					org.junit;version="[${versions.junit4Min},5)",\
-					org.junit.experimental.categories;version="[${versions.junit4Min},5)",\
-					org.junit.internal.builders;version="[${versions.junit4Min},5)",\
+					junit.runner;version="[${junit4Min},5)",\
+					org.junit;version="[${junit4Min},5)",\
+					org.junit.experimental.categories;version="[${junit4Min},5)",\
+					org.junit.internal.builders;version="[${junit4Min},5)",\
 					org.junit.platform.commons.logging;status=INTERNAL,\
-					org.junit.runner.*;version="[${versions.junit4Min},5)",\
-					org.junit.runners.model;version="[${versions.junit4Min},5)",\
+					org.junit.runner.*;version="[${junit4Min},5)",\
+					org.junit.runners.model;version="[${junit4Min},5)",\
 					*
 			""")
 		}
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index bc75c1ae9638..bf12638089c2 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
 	jmhAnnotationProcessor("org.openjdk.jmh:jmh-generator-annprocess")
 	jmh(platform(project(":dependencies")))
 	jmh(project(":junit-jupiter-api"))
-	jmh("junit:junit")
+	jmh(libs.junit4)
 }
 
 jmh {
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 5086239a2b93..91b77154f428 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -62,10 +62,10 @@ tasks.test {
 	jvmArgumentProviders += MavenRepo(tempRepoDir)
 
 	// Pass version constants (declared in Versions.kt) to tests as system properties
-	systemProperty("Versions.apiGuardian", versions.apiguardian)
-	systemProperty("Versions.assertJ", versions.assertj)
-	systemProperty("Versions.junit4", versions.junit4)
-	systemProperty("Versions.ota4j", versions.opentest4j)
+	systemProperty("Versions.apiGuardian", libs.versions.apiguardian.get())
+	systemProperty("Versions.assertJ", libs.versions.assertj.get())
+	systemProperty("Versions.junit4", libs.versions.junit4.get())
+	systemProperty("Versions.ota4j", libs.versions.opentest4j.get())
 
 	(options as JUnitPlatformOptions).apply {
 		includeEngines("archunit")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 658e4a4807cf..eaadc6d14352 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -130,3 +130,5 @@ rootProject.children.forEach { project ->
 		"${project.buildFile} must exist"
 	}
 }
+
+enableFeaturePreview("VERSION_CATALOGS")

From 4e76ca0e6d76c46734b17caab6d2948fa563b55e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:36:39 +0200
Subject: [PATCH 0265/1433] Use shorthand notation for kotlin-stdlib

---
 documentation/documentation.gradle.kts               | 2 +-
 junit-jupiter-api/junit-jupiter-api.gradle.kts       | 2 +-
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts | 2 +-
 junit-jupiter-params/junit-jupiter-params.gradle.kts | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index f46b6b480c15..9932e09f2ba8 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
 	testImplementation(project(":junit-platform-runner"))
 	testImplementation(project(":junit-platform-suite"))
 	testImplementation(project(":junit-platform-testkit"))
-	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
+	testImplementation(kotlin("stdlib"))
 
 	testImplementation(project(":junit-vintage-engine"))
 	testRuntimeOnly("org.apache.logging.log4j:log4j-core")
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index 10b082dde7bd..43ded844f9d6 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
 	api(libs.opentest4j)
 	api(project(":junit-platform-commons"))
 
-	compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
+	compileOnly(kotlin("stdlib"))
 }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 36d817c0559a..43f787856b07 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 	testImplementation(project(":junit-platform-runner"))
 	testImplementation(project(":junit-platform-testkit"))
 	testImplementation(testFixtures(project(":junit-platform-commons")))
-	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
+	testImplementation(kotlin("stdlib"))
 	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	testImplementation("org.codehaus.groovy:groovy")
 }
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index ce35c90cd25e..d9152ccbb6d7 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -20,8 +20,8 @@ dependencies {
 	testImplementation(project(":junit-platform-launcher"))
 	testImplementation(project(":junit-platform-runner"))
 
-	compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
-	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
+	compileOnly(kotlin("stdlib"))
+	testImplementation(kotlin("stdlib"))
 }
 
 tasks {

From cfbb9e772abfff1fe54594275669bab830e9dd40 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:43:09 +0200
Subject: [PATCH 0266/1433] Move ArchUnit to version catalog

---
 dependencies/dependencies.gradle.kts                         | 2 --
 gradle.properties                                            | 1 -
 gradle/libs.versions.toml                                    | 2 ++
 .../platform-tooling-support-tests.gradle.kts                | 5 +----
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 719383d45398..ce0ee626391c 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -20,8 +20,6 @@ dependencies {
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("de.sormuras:bartholdy:${versions["bartholdy"]}")
 		api("commons-io:commons-io:${versions["commons-io"]}")
-		api("com.tngtech.archunit:archunit-junit5-api:${versions["archunit"]}")
-		api("com.tngtech.archunit:archunit-junit5-engine:${versions["archunit"]}")
 		api("org.slf4j:slf4j-jdk14:${versions["slf4j"]}")
 		api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions["kotlinx-coroutines-core"]}")
 		api("org.mockito:mockito-junit-jupiter:${versions["mockito"]}")
diff --git a/gradle.properties b/gradle.properties
index 0da627fd2910..c2d1258e0918 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-archunit.version=0.17.0
 bartholdy.version=0.2.3
 classgraph.version=4.8.104
 commons-io.version=2.8.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 109adff3a9de..cca97f55b5c7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,6 @@
 [versions]
 apiguardian = "1.1.1"
+archunit = "0.17.0"
 assertj = "3.19.0"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
@@ -10,6 +11,7 @@ univocity-parsers = "2.9.1"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version.ref = "archunit" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 91b77154f428..ff37c0e87e0f 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 	testImplementation("org.assertj:assertj-core") {
 		because("more assertions")
 	}
-	testImplementation("com.tngtech.archunit:archunit-junit5-api") {
+	testImplementation(libs.archunit) {
 		because("checking the architecture of JUnit 5")
 	}
 	testImplementation("org.codehaus.groovy:groovy") {
@@ -33,9 +33,6 @@ dependencies {
 	testImplementation("biz.aQute.bnd:biz.aQute.bndlib") {
 		because("parsing OSGi metadata")
 	}
-	testRuntimeOnly("com.tngtech.archunit:archunit-junit5-engine") {
-		because("contains the ArchUnit TestEngine implementation")
-	}
 	testRuntimeOnly("org.slf4j:slf4j-jdk14") {
 		because("provide appropriate SLF4J binding")
 	}

From 1681e8ec05500215090630fdf565426c881297a4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:43:22 +0200
Subject: [PATCH 0267/1433] Remove duplicate declaration of AssertJ

---
 .../platform-tooling-support-tests.gradle.kts                  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index ff37c0e87e0f..016d9b76ae31 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -20,9 +20,6 @@ dependencies {
 		because("moving/deleting directory trees")
 	}
 
-	testImplementation("org.assertj:assertj-core") {
-		because("more assertions")
-	}
 	testImplementation(libs.archunit) {
 		because("checking the architecture of JUnit 5")
 	}

From 2829f2dc3142bfe0b52bedd2a08de147b5b06cbd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:48:48 +0200
Subject: [PATCH 0268/1433] Move Bartholdy to version catalog

---
 dependencies/dependencies.gradle.kts                            | 1 -
 gradle/libs.versions.toml                                       | 1 +
 .../platform-tooling-support-tests.gradle.kts                   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index ce0ee626391c..48c71d8e4436 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
 		api("io.github.classgraph:classgraph:${versions["classgraph"]}")
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
-		api("de.sormuras:bartholdy:${versions["bartholdy"]}")
 		api("commons-io:commons-io:${versions["commons-io"]}")
 		api("org.slf4j:slf4j-jdk14:${versions["slf4j"]}")
 		api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions["kotlinx-coroutines-core"]}")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cca97f55b5c7..b45c2f106015 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,6 +13,7 @@ univocity-parsers = "2.9.1"
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version.ref = "archunit" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
+bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 016d9b76ae31..52bcf2dd840f 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -13,7 +13,7 @@ javaLibrary {
 dependencies {
 	internal(platform(project(":dependencies")))
 
-	implementation("de.sormuras:bartholdy") {
+	implementation(libs.bartholdy) {
 		because("manage external tool installations")
 	}
 	implementation("commons-io:commons-io") {

From 9de985004971d60e13772aec86b12eca84c134e9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:49:08 +0200
Subject: [PATCH 0269/1433] Inline versions that are only used once

---
 gradle.properties         | 1 -
 gradle/libs.versions.toml | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c2d1258e0918..8002a166cd29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-bartholdy.version=0.2.3
 classgraph.version=4.8.104
 commons-io.version=2.8.0
 kotlinx-coroutines-core.version=1.4.3
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b45c2f106015..7ac421515672 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,20 +1,17 @@
 [versions]
 apiguardian = "1.1.1"
-archunit = "0.17.0"
 assertj = "3.19.0"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 opentest4j = "1.2.0"
-picocli = "4.6.1"
-univocity-parsers = "2.9.1"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version.ref = "archunit" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.17.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
-picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
-univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocity-parsers" }
+picocli = { module = "info.picocli:picocli", version = "4.6.1" }
+univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }

From ddc91afebc2f4d6b93ec0f091a18e8e36e0100ec Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:50:36 +0200
Subject: [PATCH 0270/1433] Move Classgraph to version catalog

---
 dependencies/dependencies.gradle.kts   | 1 -
 documentation/documentation.gradle.kts | 2 +-
 gradle.properties                      | 1 -
 gradle/libs.versions.toml              | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 48c71d8e4436..455fff32da0a 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
 		// dependency on it during compilation
 		runtime("org.apache.logging.log4j:log4j-core:${versions["log4j"]}")
 		runtime("org.apache.logging.log4j:log4j-jul:${versions["log4j"]}")
-		api("io.github.classgraph:classgraph:${versions["classgraph"]}")
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("commons-io:commons-io:${versions["commons-io"]}")
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 9932e09f2ba8..433d466a9b76 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
 	testRuntimeOnly("org.apache.logging.log4j:log4j-core")
 	testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
 
-	testImplementation("io.github.classgraph:classgraph") {
+	testImplementation(libs.classgraph) {
 		because("ApiReportGenerator needs it")
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index 8002a166cd29..eab8b05e99ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-classgraph.version=4.8.104
 commons-io.version=2.8.0
 kotlinx-coroutines-core.version=1.4.3
 groovy.version=3.0.7
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7ac421515672..306feee6b58c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,6 +11,7 @@ apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apigu
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.17.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.104" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }

From 048468129357ee79870d9b834b082400f210333f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:55:13 +0200
Subject: [PATCH 0271/1433] Move commons-io to version catalog

---
 dependencies/dependencies.gradle.kts                            | 1 -
 gradle.properties                                               | 1 -
 gradle/libs.versions.toml                                       | 1 +
 .../platform-tooling-support-tests.gradle.kts                   | 2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 455fff32da0a..c53c79108ce9 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -17,7 +17,6 @@ dependencies {
 		runtime("org.apache.logging.log4j:log4j-jul:${versions["log4j"]}")
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
-		api("commons-io:commons-io:${versions["commons-io"]}")
 		api("org.slf4j:slf4j-jdk14:${versions["slf4j"]}")
 		api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions["kotlinx-coroutines-core"]}")
 		api("org.mockito:mockito-junit-jupiter:${versions["mockito"]}")
diff --git a/gradle.properties b/gradle.properties
index eab8b05e99ec..5da1dea8ed29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-commons-io.version=2.8.0
 kotlinx-coroutines-core.version=1.4.3
 groovy.version=3.0.7
 log4j.version=2.14.1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 306feee6b58c..e12eae93f4ff 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,7 @@ archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.17.0"
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.104" }
+commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 52bcf2dd840f..0587da6a19ed 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation(libs.bartholdy) {
 		because("manage external tool installations")
 	}
-	implementation("commons-io:commons-io") {
+	implementation(libs.commons.io) {
 		because("moving/deleting directory trees")
 	}
 

From 4622a6f49d3217e63f0e127dc78e6c2cd196a8dc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 12:57:14 +0200
Subject: [PATCH 0272/1433] Move kotlinx-coroutines to version catalog

---
 dependencies/dependencies.gradle.kts                 | 1 -
 gradle.properties                                    | 1 -
 gradle/libs.versions.toml                            | 1 +
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts | 2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index c53c79108ce9..eb0a54d0d75f 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("org.slf4j:slf4j-jdk14:${versions["slf4j"]}")
-		api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions["kotlinx-coroutines-core"]}")
 		api("org.mockito:mockito-junit-jupiter:${versions["mockito"]}")
 		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
 		api("org.spockframework:spock-core:${versions["spock"]}")
diff --git a/gradle.properties b/gradle.properties
index 5da1dea8ed29..df6350160ac6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-kotlinx-coroutines-core.version=1.4.3
 groovy.version=3.0.7
 log4j.version=2.14.1
 mockito.version=3.9.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e12eae93f4ff..5625f50980ba 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,6 +14,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.104" }
 commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 43f787856b07..3cfee6695ba7 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
 	testImplementation(project(":junit-platform-testkit"))
 	testImplementation(testFixtures(project(":junit-platform-commons")))
 	testImplementation(kotlin("stdlib"))
-	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+	testImplementation(libs.kotlinx.coroutines)
 	testImplementation("org.codehaus.groovy:groovy")
 }
 

From 31f41401c32487ceb8e6756f344626ebaba78788 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 13:20:14 +0200
Subject: [PATCH 0273/1433] Move Groovy to version catalog

---
 dependencies/dependencies.gradle.kts                   |  5 -----
 gradle.properties                                      |  1 -
 gradle/libs.versions.toml                              |  2 ++
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts   |  2 +-
 junit-vintage-engine/junit-vintage-engine.gradle.kts   | 10 +---------
 platform-tests/platform-tests.gradle.kts               |  4 ++--
 .../platform-tooling-support-tests.gradle.kts          |  3 +--
 7 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index eb0a54d0d75f..25de163c35e3 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -2,12 +2,7 @@ plugins {
 	`java-platform`
 }
 
-javaPlatform {
-	allowDependencies()
-}
-
 dependencies {
-	api(platform("org.codehaus.groovy:groovy-bom:${versions["groovy"]}"))
 	constraints {
 		// api means "the dependency is for both compilation and runtime"
 		// runtime means "the dependency is only for runtime, not for compilation"
diff --git a/gradle.properties b/gradle.properties
index df6350160ac6..295371e375e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-groovy.version=3.0.7
 log4j.version=2.14.1
 mockito.version=3.9.0
 slf4j.version=1.7.30
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5625f50980ba..4a61c7cb0dbd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,6 +13,8 @@ assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.104" }
 commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
+groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.7" }
+groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 3cfee6695ba7..1e202a5f9693 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 	testImplementation(testFixtures(project(":junit-platform-commons")))
 	testImplementation(kotlin("stdlib"))
 	testImplementation(libs.kotlinx.coroutines)
-	testImplementation("org.codehaus.groovy:groovy")
+	testImplementation(libs.groovy3)
 }
 
 tasks {
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 0d2b3fdd0f5d..566fab76e8a1 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
 	api(project(":junit-platform-engine"))
 	api(libs.junit4)
 
+	testFixturesApi(platform(libs.groovy2.bom))
 	testFixturesApi("org.spockframework:spock-core")
 	testFixturesImplementation(project(":junit-platform-runner"))
 
@@ -26,15 +27,6 @@ dependencies {
 	testImplementation(project(":junit-platform-testkit"))
 }
 
-configurations.all {
-	resolutionStrategy.eachDependency {
-		if (requested.group == "org.codehaus.groovy") {
-			useVersion("2.5.11")
-			because("Spock is not yet compatible with Groovy 3.x")
-		}
-	}
-}
-
 tasks {
 	compileTestFixturesGroovy {
 		javaLauncher.set(project.the<JavaToolchainService>().launcherFor {
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index bf12638089c2..4e7de10cb497 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -24,13 +24,13 @@ dependencies {
 	testImplementation(testFixtures(project(":junit-platform-engine")))
 	testImplementation(testFixtures(project(":junit-platform-launcher")))
 	testImplementation(project(":junit-jupiter-engine"))
-	testImplementation("org.apiguardian:apiguardian-api")
+	testImplementation(libs.apiguardian)
 	testImplementation("com.github.gunnarmorling:jfrunit")
 	testImplementation("org.jooq:joox")
 
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(project(":junit-vintage-engine"))
-	testRuntimeOnly("org.codehaus.groovy:groovy") {
+	testRuntimeOnly(libs.groovy3) {
 		because("`ReflectionUtilsTests.findNestedClassesWithInvalidNestedClassFile` needs it")
 	}
 
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 0587da6a19ed..fdbb917b87b0 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -23,9 +23,8 @@ dependencies {
 	testImplementation(libs.archunit) {
 		because("checking the architecture of JUnit 5")
 	}
-	testImplementation("org.codehaus.groovy:groovy") {
+	testImplementation(libs.groovy3) {
 		because("it provides convenience methods to handle process output")
-		exclude(group = "org.junit.platform", module = "junit-platform-launcher")
 	}
 	testImplementation("biz.aQute.bnd:biz.aQute.bndlib") {
 		because("parsing OSGi metadata")

From 51e7f418e7cdeebc77e3fcd1f620fe5b4aeec102 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 13:30:15 +0200
Subject: [PATCH 0274/1433] Move Log4J to version catalog

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 3 +--
 dependencies/dependencies.gradle.kts                    | 6 ------
 documentation/documentation.gradle.kts                  | 3 +--
 gradle.properties                                       | 1 -
 gradle/libs.versions.toml                               | 6 ++++++
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 677d53cefc65..7acb9e3ce059 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -64,6 +64,5 @@ dependencies {
 	"testRuntimeOnly"(project(":junit-platform-launcher"))
 	"testRuntimeOnly"(project(":junit-platform-jfr"))
 
-	"testRuntimeOnly"("org.apache.logging.log4j:log4j-core")
-	"testRuntimeOnly"("org.apache.logging.log4j:log4j-jul")
+	"testRuntimeOnly"(libs.findBundle("log4j").get())
 }
diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 25de163c35e3..e77521646bbc 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -4,12 +4,6 @@ plugins {
 
 dependencies {
 	constraints {
-		// api means "the dependency is for both compilation and runtime"
-		// runtime means "the dependency is only for runtime, not for compilation"
-		// In other words, marking dependency as "runtime" would avoid accidental
-		// dependency on it during compilation
-		runtime("org.apache.logging.log4j:log4j-core:${versions["log4j"]}")
-		runtime("org.apache.logging.log4j:log4j-jul:${versions["log4j"]}")
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("org.slf4j:slf4j-jdk14:${versions["slf4j"]}")
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 433d466a9b76..f3c93e89e32e 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -46,8 +46,7 @@ dependencies {
 	testImplementation(kotlin("stdlib"))
 
 	testImplementation(project(":junit-vintage-engine"))
-	testRuntimeOnly("org.apache.logging.log4j:log4j-core")
-	testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
+	testRuntimeOnly(libs.bundles.log4j)
 
 	testImplementation(libs.classgraph) {
 		because("ApiReportGenerator needs it")
diff --git a/gradle.properties b/gradle.properties
index 295371e375e3..ce93340ccba1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-log4j.version=2.14.1
 mockito.version=3.9.0
 slf4j.version=1.7.30
 spock.version=1.3-groovy-2.5
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a61c7cb0dbd..407140a895a0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@ assertj = "3.19.0"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
+log4j = "2.14.1"
 opentest4j = "1.2.0"
 
 [libraries]
@@ -17,6 +18,11 @@ groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.7" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
+log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
+log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
+
+[bundles]
+log4j = ["log4j-core", "log4j-jul"]

From 6e3954dcb388b24dcacd407b4ea35a9cdf69d51a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 13:48:42 +0200
Subject: [PATCH 0275/1433] Move SLF4J to version catalog

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts       | 4 +---
 dependencies/dependencies.gradle.kts                          | 2 --
 gradle.properties                                             | 2 --
 gradle/libs.versions.toml                                     | 2 ++
 .../platform-tooling-support-tests.gradle.kts                 | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 7acb9e3ce059..8f1af23b18ed 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -52,9 +52,7 @@ tasks.withType<Test>().configureEach {
 dependencies {
 	val libs = project.extensions["libs"] as VersionCatalog
 	"testImplementation"(libs.findDependency("assertj").get())
-	"testImplementation"("org.mockito:mockito-junit-jupiter") {
-		exclude(module = "junit-jupiter-engine")
-	}
+	"testImplementation"(libs.findDependency("mockito").get())
 
 	if (project.name != "junit-jupiter-engine") {
 		"testImplementation"(project(":junit-jupiter"))
diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index e77521646bbc..94c06a3f4cc6 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -6,8 +6,6 @@ dependencies {
 	constraints {
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
-		api("org.slf4j:slf4j-jdk14:${versions["slf4j"]}")
-		api("org.mockito:mockito-junit-jupiter:${versions["mockito"]}")
 		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
 		api("org.spockframework:spock-core:${versions["spock"]}")
 		api("com.github.gunnarmorling:jfrunit:${versions["jfrunit"]}")
diff --git a/gradle.properties b/gradle.properties
index ce93340ccba1..6b25587e5abb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,8 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-mockito.version=3.9.0
-slf4j.version=1.7.30
 spock.version=1.3-groovy-2.5
 jfrunit.version=main-SNAPSHOT
 joox.version=1.6.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 407140a895a0..fecdd2c8d693 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,8 +20,10 @@ junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "3.9.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }
+slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.30" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 
 [bundles]
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index fdbb917b87b0..aff47a96941e 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
 	testImplementation("biz.aQute.bnd:biz.aQute.bndlib") {
 		because("parsing OSGi metadata")
 	}
-	testRuntimeOnly("org.slf4j:slf4j-jdk14") {
+	testRuntimeOnly(libs.slf4j.julBinding) {
 		because("provide appropriate SLF4J binding")
 	}
 }

From 2e43c396d9500a6beef3a1322b2c09fbb37ef333 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 13:56:12 +0200
Subject: [PATCH 0276/1433] Move Spock to version catalog

---
 dependencies/dependencies.gradle.kts                 | 1 -
 gradle.properties                                    | 1 -
 gradle/libs.versions.toml                            | 1 +
 junit-vintage-engine/junit-vintage-engine.gradle.kts | 2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 94c06a3f4cc6..0cb165fd15a6 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -7,7 +7,6 @@ dependencies {
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
-		api("org.spockframework:spock-core:${versions["spock"]}")
 		api("com.github.gunnarmorling:jfrunit:${versions["jfrunit"]}")
 		api("org.jooq:joox:${versions["joox"]}")
 	}
diff --git a/gradle.properties b/gradle.properties
index 6b25587e5abb..9c83faa65f96 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-spock.version=1.3-groovy-2.5
 jfrunit.version=main-SNAPSHOT
 joox.version=1.6.2
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fecdd2c8d693..6ac570587760 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,6 +24,7 @@ mockito = { module = "org.mockito:mockito-junit-jupiter", version = "3.9.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.30" }
+spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 
 [bundles]
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 566fab76e8a1..ac8b762e5522 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
 	api(libs.junit4)
 
 	testFixturesApi(platform(libs.groovy2.bom))
-	testFixturesApi("org.spockframework:spock-core")
+	testFixturesApi(libs.spock1)
 	testFixturesImplementation(project(":junit-platform-runner"))
 
 	testImplementation(project(":junit-platform-launcher"))

From d7d226870b410499621d2b39ba2a0a98bce424bd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 14:04:35 +0200
Subject: [PATCH 0277/1433] Move JFRUnit to version catalog

---
 dependencies/dependencies.gradle.kts     | 1 -
 gradle.properties                        | 1 -
 gradle/libs.versions.toml                | 1 +
 platform-tests/platform-tests.gradle.kts | 2 +-
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 0cb165fd15a6..bd6f72e9936c 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -7,7 +7,6 @@ dependencies {
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
-		api("com.github.gunnarmorling:jfrunit:${versions["jfrunit"]}")
 		api("org.jooq:joox:${versions["joox"]}")
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index 9c83faa65f96..b3bc912140f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 kotlin.stdlib.default.dependency=false
 
 # Test Dependencies
-jfrunit.version=main-SNAPSHOT
 joox.version=1.6.2
 
 # Tools
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6ac570587760..d8465005d249 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,6 +16,7 @@ classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.104" }
 commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
 groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.7" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
+jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "main-SNAPSHOT" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 4e7de10cb497..6c891b13bf0b 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 	testImplementation(testFixtures(project(":junit-platform-launcher")))
 	testImplementation(project(":junit-jupiter-engine"))
 	testImplementation(libs.apiguardian)
-	testImplementation("com.github.gunnarmorling:jfrunit")
+	testImplementation(libs.jfrunit)
 	testImplementation("org.jooq:joox")
 
 	// --- Test run-time dependencies ---------------------------------------------

From c12497b2f9fc1c09ce2d52ef5e58767c96469c77 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 14:07:11 +0200
Subject: [PATCH 0278/1433] Move JOOX to version catalog

---
 dependencies/dependencies.gradle.kts     | 1 -
 gradle.properties                        | 3 ---
 gradle/libs.versions.toml                | 1 +
 platform-tests/platform-tests.gradle.kts | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index bd6f72e9936c..6247855a5763 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -7,6 +7,5 @@ dependencies {
 		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
 		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
-		api("org.jooq:joox:${versions["joox"]}")
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index b3bc912140f6..a947666b922d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,9 +24,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
 kotlin.stdlib.default.dependency=false
 
-# Test Dependencies
-joox.version=1.6.2
-
 # Tools
 checkstyle.version=8.36.2
 jacoco.version=0.8.6
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d8465005d249..8a0097ac4390 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,6 +17,7 @@ commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
 groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.7" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "main-SNAPSHOT" }
+joox = { module = "org.jooq:joox", version = "1.6.2" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 6c891b13bf0b..c575a7ee18c7 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 	testImplementation(project(":junit-jupiter-engine"))
 	testImplementation(libs.apiguardian)
 	testImplementation(libs.jfrunit)
-	testImplementation("org.jooq:joox")
+	testImplementation(libs.joox)
 
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(project(":junit-vintage-engine"))

From 4463885c91a8998a004625c2cbd951a5af528b72 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 14:23:14 +0200
Subject: [PATCH 0279/1433] Move JMH to version catalog

---
 dependencies/dependencies.gradle.kts     |  2 --
 gradle.properties                        |  1 -
 gradle/libs.versions.toml                |  3 +++
 platform-tests/platform-tests.gradle.kts | 10 +++-------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 6247855a5763..1dbb3f59251e 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -4,8 +4,6 @@ plugins {
 
 dependencies {
 	constraints {
-		api("org.openjdk.jmh:jmh-core:${versions["jmh"]}")
-		api("org.openjdk.jmh:jmh-generator-annprocess:${versions["jmh"]}")
 		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index a947666b922d..b911c3343657 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,6 @@ kotlin.stdlib.default.dependency=false
 # Tools
 checkstyle.version=8.36.2
 jacoco.version=0.8.6
-jmh.version=1.29
 ktlint.version=0.35.0
 surefire.version=2.22.2
 bnd.version=5.3.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8a0097ac4390..49a309439aee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,7 @@
 [versions]
 apiguardian = "1.1.1"
 assertj = "3.19.0"
+jmh = "1.29"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
@@ -17,6 +18,8 @@ commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
 groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.7" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "main-SNAPSHOT" }
+jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
+jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "1.6.2" }
 junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index c575a7ee18c7..65e4c36759ed 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -35,18 +35,14 @@ dependencies {
 	}
 
 	// --- https://openjdk.java.net/projects/code-tools/jmh/ -----------------------
-	jmh("org.openjdk.jmh:jmh-core") {
-		exclude(module = "jopt-simple")
-	}
-	jmhAnnotationProcessor(platform(project(":dependencies")))
-	jmhAnnotationProcessor("org.openjdk.jmh:jmh-generator-annprocess")
-	jmh(platform(project(":dependencies")))
+	jmh(libs.jmh.core)
 	jmh(project(":junit-jupiter-api"))
 	jmh(libs.junit4)
+	jmhAnnotationProcessor(libs.jmh.generator.annprocess)
 }
 
 jmh {
-	jmhVersion = versions["jmh"]
+	jmhVersion = libs.versions.jmh.get()
 
 	duplicateClassesStrategy = DuplicatesStrategy.WARN
 	fork = 0 // Too long command line on Windows...

From b79c024145e35d48b533dc5d6aea11e806c13fc4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 17:35:06 +0200
Subject: [PATCH 0280/1433] Move BND to version catalog

---
 dependencies/dependencies.gradle.kts                        | 6 ------
 gradle.properties                                           | 1 -
 gradle/libs.versions.toml                                   | 1 +
 .../platform-tooling-support-tests.gradle.kts               | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
index 1dbb3f59251e..6784570ded6a 100644
--- a/dependencies/dependencies.gradle.kts
+++ b/dependencies/dependencies.gradle.kts
@@ -1,9 +1,3 @@
 plugins {
 	`java-platform`
 }
-
-dependencies {
-	constraints {
-		api("biz.aQute.bnd:biz.aQute.bndlib:${versions["bnd"]}")
-	}
-}
diff --git a/gradle.properties b/gradle.properties
index b911c3343657..b4adf5a33445 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,6 @@ checkstyle.version=8.36.2
 jacoco.version=0.8.6
 ktlint.version=0.35.0
 surefire.version=2.22.2
-bnd.version=5.3.0
 
 # Plugins
 gradle.enterprise.plugin.version=3.6.1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 49a309439aee..5ed4c43857a4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,6 +13,7 @@ apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apigu
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.17.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
+bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.104" }
 commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
 groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.7" }
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index aff47a96941e..ea8a952d1491 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 	testImplementation(libs.groovy3) {
 		because("it provides convenience methods to handle process output")
 	}
-	testImplementation("biz.aQute.bnd:biz.aQute.bndlib") {
+	testImplementation(libs.bnd) {
 		because("parsing OSGi metadata")
 	}
 	testRuntimeOnly(libs.slf4j.julBinding) {

From 53c2a857b6ef300956b4300a549d577a4751bc07 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 17:50:25 +0200
Subject: [PATCH 0281/1433] Remove internal platform project and configuration

---
 .../kotlin/java-library-conventions.gradle.kts    | 15 ---------------
 .../src/main/kotlin/shadow-conventions.gradle.kts |  4 +---
 dependencies/dependencies.gradle.kts              |  3 ---
 documentation/documentation.gradle.kts            |  6 +-----
 .../junit-jupiter-engine.gradle.kts               |  2 --
 .../junit-jupiter-migrationsupport.gradle.kts     |  2 --
 .../junit-jupiter-params.gradle.kts               |  2 --
 .../junit-platform-console-standalone.gradle.kts  |  1 -
 .../junit-platform-suite-commons.gradle.kts       |  2 --
 .../junit-platform-suite-engine.gradle.kts        |  2 --
 .../junit-vintage-engine.gradle.kts               |  2 --
 platform-tests/platform-tests.gradle.kts          |  2 --
 .../platform-tooling-support-tests.gradle.kts     |  2 --
 settings.gradle.kts                               |  1 -
 14 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 dependencies/dependencies.gradle.kts

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 6b2e0625aba5..8dfabc75345d 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -15,25 +15,12 @@ val buildTime: String by rootProject.extra
 val buildRevision: Any by rootProject.extra
 val builtByValue: String by rootProject.extra
 
-val internal by configurations.creating {
-	isVisible = false
-	isCanBeConsumed = false
-	isCanBeResolved = false
-}
-
 val extension = extensions.create<JavaLibraryExtension>("javaLibrary")
 
 val moduleSourceDir = file("src/module/$javaModuleName")
 val moduleOutputDir = file("$buildDir/classes/java/module")
 val javaVersion = JavaVersion.current()
 
-configurations {
-	compileClasspath.get().extendsFrom(internal)
-	runtimeClasspath.get().extendsFrom(internal)
-	testCompileClasspath.get().extendsFrom(internal)
-	testRuntimeClasspath.get().extendsFrom(internal)
-}
-
 eclipse {
 	jdt {
 		file {
@@ -98,8 +85,6 @@ if (project in mavenizedProjects) {
 		val javaComponent = components["java"] as AdhocComponentWithVariants
 		javaComponent.withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() }
 		javaComponent.withVariantsFromConfiguration(configurations["testFixturesRuntimeElements"]) { skip() }
-		configurations["testFixturesCompileClasspath"].extendsFrom(internal)
-		configurations["testFixturesRuntimeClasspath"].extendsFrom(internal)
 	}
 
 	configure<PublishingExtension> {
diff --git a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
index 0f1a4bc8d36d..33474a01a36a 100644
--- a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
@@ -3,9 +3,7 @@ plugins {
 	id("com.github.johnrengelman.shadow")
 }
 
-val shadowed by configurations.creating {
-	extendsFrom(configurations["internal"])
-}
+val shadowed by configurations.creating
 
 configurations.forEach { configuration ->
 	configuration.outgoing.apply {
diff --git a/dependencies/dependencies.gradle.kts b/dependencies/dependencies.gradle.kts
deleted file mode 100644
index 6784570ded6a..000000000000
--- a/dependencies/dependencies.gradle.kts
+++ /dev/null
@@ -1,3 +0,0 @@
-plugins {
-	`java-platform`
-}
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index f3c93e89e32e..57cb970dd5c0 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -22,13 +22,9 @@ javaLibrary {
 	testJavaVersion = JavaVersion.VERSION_1_8
 }
 
-val apiReport by configurations.creating {
-	extendsFrom(configurations.internal.get())
-}
+val apiReport by configurations.creating
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	implementation(project(":junit-jupiter-api")) {
 		because("Jupiter API is used in src/main/java")
 	}
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 1e202a5f9693..64be7221ca2b 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -9,8 +9,6 @@ plugins {
 description = "JUnit Jupiter Engine"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
 	api(libs.apiguardian)
 	api(project(":junit-platform-engine"))
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index a8ca3e348220..c4447c5d28ba 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -9,8 +9,6 @@ plugins {
 description = "JUnit Jupiter Migration Support"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
 	api(libs.junit4)
 	api(libs.apiguardian)
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index d9152ccbb6d7..4ca58a8e8cff 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -7,8 +7,6 @@ plugins {
 description = "JUnit Jupiter Params"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
 	api(libs.apiguardian)
 	api(project(":junit-jupiter-api"))
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 00777e1c3486..007edd487d24 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -8,7 +8,6 @@ plugins {
 description = "JUnit Platform Console Standalone"
 
 dependencies {
-	internal(platform(project(":dependencies")))
 	shadowed(project(":junit-platform-reporting"))
 	shadowed(project(":junit-platform-console"))
 	shadowed(project(":junit-jupiter-engine"))
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 81f528c0ba52..70bd5f27d121 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -6,8 +6,6 @@ plugins {
 description = "JUnit Platform Suite Commons"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
 	api(libs.apiguardian)
 	api(project(":junit-platform-launcher"))
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index b55280b8280b..0a2b0345cd02 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -7,8 +7,6 @@ plugins {
 description = "JUnit Platform Suite Engine"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
 	api(libs.apiguardian)
 	api(project(":junit-platform-engine"))
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index ac8b762e5522..bfe478eb145a 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -11,8 +11,6 @@ plugins {
 description = "JUnit Vintage Engine"
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	api(platform(project(":junit-bom")))
 	api(libs.apiguardian)
 	api(project(":junit-platform-engine"))
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 65e4c36759ed..cded8420ac07 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -8,8 +8,6 @@ plugins {
 }
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	// --- Things we are testing --------------------------------------------------
 	testImplementation(project(":junit-platform-commons"))
 	testImplementation(project(":junit-platform-console"))
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index ea8a952d1491..acd9690f6f83 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -11,8 +11,6 @@ javaLibrary {
 }
 
 dependencies {
-	internal(platform(project(":dependencies")))
-
 	implementation(libs.bartholdy) {
 		because("manage external tool installations")
 	}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index eaadc6d14352..20f29cbba575 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -94,7 +94,6 @@ require(javaVersion.isJava9Compatible) {
 
 rootProject.name = "junit5"
 
-include("dependencies")
 include("documentation")
 include("junit-jupiter")
 include("junit-jupiter-api")

From 81b40ca24b238aded2d8109224dd008012919077 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 18:14:43 +0200
Subject: [PATCH 0282/1433] Move tool versions to version catalog

---
 build.gradle.kts                               |  4 ++--
 .../src/main/kotlin/JavaLibraryExtension.kt    |  2 +-
 buildSrc/src/main/kotlin/ProjectExtensions.kt  |  6 ------
 buildSrc/src/main/kotlin/Versions.kt           | 18 ------------------
 .../kotlin/java-library-conventions.gradle.kts |  3 ++-
 .../kotlin-library-conventions.gradle.kts      |  2 +-
 documentation/documentation.gradle.kts         |  4 ++--
 gradle.properties                              |  7 -------
 gradle/libs.versions.toml                      |  5 +++++
 9 files changed, 13 insertions(+), 38 deletions(-)
 delete mode 100644 buildSrc/src/main/kotlin/Versions.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 71a131c240f0..c1d56e7d864f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -104,7 +104,7 @@ allprojects {
 	if (enableJaCoCo) {
 		apply(plugin = "jacoco")
 		configure<JacocoPluginExtension> {
-			toolVersion = versions["jacoco"]
+			toolVersion = libs.versions.jacoco.get()
 		}
 	}
 
@@ -170,7 +170,7 @@ subprojects {
 			}
 
 			kotlin {
-				ktlint(versions["ktlint"])
+				ktlint(libs.versions.ktlint.get())
 				licenseHeaderFile(headerFile)
 				trimTrailingWhitespace()
 				endWithNewline()
diff --git a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
index acd240f6cb0e..1f92e1b24c0b 100644
--- a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
+++ b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
@@ -2,6 +2,6 @@ import org.gradle.api.JavaVersion
 
 @Suppress("UnstableApiUsage")
 open class JavaLibraryExtension {
-    var mainJavaVersion: JavaVersion = Versions.jvmTarget
+    var mainJavaVersion: JavaVersion = JavaVersion.VERSION_1_8
     var testJavaVersion: JavaVersion = JavaVersion.VERSION_16
 }
diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/buildSrc/src/main/kotlin/ProjectExtensions.kt
index d6d2f4215049..315126c5bae3 100644
--- a/buildSrc/src/main/kotlin/ProjectExtensions.kt
+++ b/buildSrc/src/main/kotlin/ProjectExtensions.kt
@@ -4,9 +4,3 @@ import org.gradle.kotlin.dsl.provideDelegate
 
 val Project.javaModuleName: String
     get() = "org." + this.name.replace('-', '.')
-
-val Project.versions: Versions
-    get() {
-        var versions: Versions? by rootProject.extra
-        return versions ?: Versions(rootProject).also { versions = it }
-    }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
deleted file mode 100644
index be96753eccd8..000000000000
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-import org.gradle.api.JavaVersion
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.extra
-import kotlin.reflect.KProperty
-
-class Versions(private val project: Project) {
-
-    companion object {
-        val jvmTarget = JavaVersion.VERSION_1_8
-    }
-
-    private val properties = object {
-        operator fun getValue(receiver: Any?, property: KProperty<*>) = get(property.name)
-    }
-
-    operator fun get(name: String) = project.extra.get("$name.version") as String
-
-}
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 8dfabc75345d..8cd196d81e10 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -274,7 +274,8 @@ afterEvaluate {
 }
 
 checkstyle {
-	toolVersion = versions["checkstyle"]
+	val libs = project.extensions["libs"] as VersionCatalog
+	toolVersion = libs.findVersion("checkstyle").get().requiredVersion
 	configDirectory.set(rootProject.file("src/checkstyle"))
 }
 
diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index 9f0d594d327a..dccb39c91d35 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
 	kotlinOptions {
-		jvmTarget = Versions.jvmTarget.toString()
+		jvmTarget = "1.8"
 		apiVersion = "1.3"
 		languageVersion = "1.3"
 		allWarningsAsErrors = true
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 57cb970dd5c0..c4e1f95c385e 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
 asciidoctorj {
 	modules {
 		diagram.use()
-		pdf.version(versions["asciidoctor-pdf"])
+		pdf.version(libs.versions.asciidoctor.pdf)
 	}
 }
 
@@ -179,7 +179,7 @@ tasks {
 				"junit4-version" to libs.versions.junit4.get(),
 				"apiguardian-version" to libs.versions.apiguardian.get(),
 				"ota4j-version" to libs.versions.opentest4j.get(),
-				"surefire-version" to versions["surefire"],
+				"surefire-version" to libs.versions.surefire.get(),
 				"release-branch" to releaseBranch,
 				"docs-version" to docsVersion,
 				"revnumber" to version,
diff --git a/gradle.properties b/gradle.properties
index b4adf5a33445..38816f771f4e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,12 +24,6 @@ gradle.internal.testdistribution.writeTraceFile=true
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
 kotlin.stdlib.default.dependency=false
 
-# Tools
-checkstyle.version=8.36.2
-jacoco.version=0.8.6
-ktlint.version=0.35.0
-surefire.version=2.22.2
-
 # Plugins
 gradle.enterprise.plugin.version=3.6.1
 test.distribution.plugin.version=2.0.2
@@ -39,7 +33,6 @@ versions.plugin.version=0.38.0
 spotless.plugin.version=5.12.0
 git-publish.plugin.version=3.0.0
 kotlin.plugin.version=1.4.0
-asciidoctor-pdf.version=1.5.3
 asciidoctor.plugin.version=3.3.2
 jmh.plugin.version=0.5.3
 nohttp.plugin.version=0.0.6.RELEASE
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5ed4c43857a4..fafce9a52ecc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,17 @@
 [versions]
 apiguardian = "1.1.1"
+asciidoctor-pdf = "1.5.3"
 assertj = "3.19.0"
+checkstyle = "8.36.2"
+jacoco = "0.8.6"
 jmh = "1.29"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
+ktlint = "0.35.0"
 log4j = "2.14.1"
 opentest4j = "1.2.0"
+surefire = "2.22.2"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }

From 83858253cebcdd9b6a5a0d9daab5c9ff8257e01d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 18:20:29 +0200
Subject: [PATCH 0283/1433] Move plugin versions to settings.gradle.kts

---
 gradle.properties   | 14 --------------
 settings.gradle.kts | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 38816f771f4e..83439302e974 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,17 +23,3 @@ gradle.internal.testdistribution.writeTraceFile=true
 # Omit automatic compile dependency on kotlin-stdlib
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
 kotlin.stdlib.default.dependency=false
-
-# Plugins
-gradle.enterprise.plugin.version=3.6.1
-test.distribution.plugin.version=2.0.2
-gradle.user-data.plugin.version=1.2.1
-versioning.plugin.version=2.14.0
-versions.plugin.version=0.38.0
-spotless.plugin.version=5.12.0
-git-publish.plugin.version=3.0.0
-kotlin.plugin.version=1.4.0
-asciidoctor.plugin.version=3.3.2
-jmh.plugin.version=0.5.3
-nohttp.plugin.version=0.0.6.RELEASE
-nexus-publish.plugin.version=1.0.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 20f29cbba575..e83e834f42c3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,19 +6,19 @@ pluginManagement {
 		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 	}
 	plugins {
-		id("com.gradle.enterprise") version settings.extra["gradle.enterprise.plugin.version"] as String
-		id("com.gradle.enterprise.test-distribution") version settings.extra["test.distribution.plugin.version"] as String
-		id("com.gradle.common-custom-user-data-gradle-plugin") version settings.extra["gradle.user-data.plugin.version"] as String
-		id("net.nemerosa.versioning") version settings.extra["versioning.plugin.version"] as String
-		id("com.github.ben-manes.versions") version settings.extra["versions.plugin.version"] as String
-		id("com.diffplug.spotless") version settings.extra["spotless.plugin.version"] as String
-		id("org.ajoberstar.git-publish") version settings.extra["git-publish.plugin.version"] as String
-		kotlin("jvm") version settings.extra["kotlin.plugin.version"] as String
-		id("org.asciidoctor.jvm.convert") version settings.extra["asciidoctor.plugin.version"] as String
-		id("org.asciidoctor.jvm.pdf") version settings.extra["asciidoctor.plugin.version"] as String
-		id("me.champeau.gradle.jmh") version settings.extra["jmh.plugin.version"] as String
-		id("io.spring.nohttp") version settings.extra["nohttp.plugin.version"] as String
-		id("io.github.gradle-nexus.publish-plugin") version settings.extra["nexus-publish.plugin.version"] as String
+		id("com.gradle.enterprise") version "3.6.1"
+		id("com.gradle.enterprise.test-distribution") version "2.0.2"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.2.1"
+		id("net.nemerosa.versioning") version "2.14.0"
+		id("com.github.ben-manes.versions") version "0.38.0"
+		id("com.diffplug.spotless") version "5.12.0"
+		id("org.ajoberstar.git-publish") version "3.0.0"
+		kotlin("jvm") version "1.4.0"
+		id("org.asciidoctor.jvm.convert") version "3.3.2"
+		id("org.asciidoctor.jvm.pdf") version "3.3.2"
+		id("me.champeau.gradle.jmh") version "0.5.3"
+		id("io.spring.nohttp") version "0.0.6.RELEASE"
+		id("io.github.gradle-nexus.publish-plugin") version "1.0.0"
 	}
 }
 

From cb37d9ac7d8fa960284f324768abeeaec570cf7d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 19:48:22 +0200
Subject: [PATCH 0284/1433] Always reference extension on root project in
 allprojects block

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c1d56e7d864f..450f9480d20d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -104,7 +104,7 @@ allprojects {
 	if (enableJaCoCo) {
 		apply(plugin = "jacoco")
 		configure<JacocoPluginExtension> {
-			toolVersion = libs.versions.jacoco.get()
+			toolVersion = rootProject.libs.versions.jacoco.get()
 		}
 	}
 

From 0da4a414aa2eda5ea8de3f34515d566c15277c12 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Apr 2021 20:43:20 +0200
Subject: [PATCH 0285/1433] Manually add type safe project accessors

---
 build.gradle.kts                              | 56 +++++++++----------
 buildSrc/src/main/kotlin/ProjectExtensions.kt |  6 ++
 buildSrc/src/main/kotlin/Projects.kt          | 53 ++++++++++++++++++
 .../kotlin/testing-conventions.gradle.kts     | 10 ++--
 documentation/documentation.gradle.kts        | 24 ++++----
 .../junit-jupiter-api.gradle.kts              |  4 +-
 .../junit-jupiter-engine.gradle.kts           | 14 ++---
 .../junit-jupiter-migrationsupport.gradle.kts | 12 ++--
 .../junit-jupiter-params.gradle.kts           | 12 ++--
 junit-jupiter/junit-jupiter.gradle.kts        |  8 +--
 .../junit-platform-commons.gradle.kts         |  2 +-
 ...nit-platform-console-standalone.gradle.kts | 14 ++---
 .../junit-platform-console.gradle.kts         |  4 +-
 .../junit-platform-engine.gradle.kts          |  4 +-
 .../junit-platform-jfr.gradle.kts             |  4 +-
 .../junit-platform-launcher.gradle.kts        |  4 +-
 .../junit-platform-reporting.gradle.kts       |  4 +-
 .../junit-platform-runner.gradle.kts          | 12 ++--
 .../junit-platform-suite-api.gradle.kts       |  6 +-
 .../junit-platform-suite-commons.gradle.kts   | 10 ++--
 .../junit-platform-suite-engine.gradle.kts    | 16 +++---
 .../junit-platform-suite.gradle.kts           |  6 +-
 .../junit-platform-testkit.gradle.kts         |  4 +-
 .../junit-vintage-engine.gradle.kts           | 12 ++--
 platform-tests/platform-tests.gradle.kts      | 30 +++++-----
 .../platform-tooling-support-tests.gradle.kts |  2 +-
 26 files changed, 196 insertions(+), 137 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/Projects.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 450f9480d20d..6cc7b38fda96 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,35 +35,35 @@ val buildRevision by extra { versioning.info.commit }
 val builtByValue by extra { project.findProperty("builtBy") ?: project.property("defaultBuiltBy") }
 
 val platformProjects by extra(listOf(
-		project(":junit-platform-commons"),
-		project(":junit-platform-console"),
-		project(":junit-platform-console-standalone"),
-		project(":junit-platform-engine"),
-		project(":junit-platform-jfr"),
-		project(":junit-platform-launcher"),
-		project(":junit-platform-reporting"),
-		project(":junit-platform-runner"),
-		project(":junit-platform-suite"),
-		project(":junit-platform-suite-api"),
-		project(":junit-platform-suite-commons"),
-		project(":junit-platform-suite-engine"),
-		project(":junit-platform-testkit")
+		projects.platform.commons,
+		projects.platform.console,
+		projects.platform.`console-standalone`,
+		projects.platform.engine,
+		projects.platform.jfr,
+		projects.platform.launcher,
+		projects.platform.reporting,
+		projects.platform.runner,
+		projects.platform.suite.aggregator,
+		projects.platform.suite.api,
+		projects.platform.suite.commons,
+		projects.platform.suite.engine,
+		projects.platform.testkit
 ))
 
 val jupiterProjects by extra(listOf(
-		project(":junit-jupiter"),
-		project(":junit-jupiter-api"),
-		project(":junit-jupiter-engine"),
-		project(":junit-jupiter-migrationsupport"),
-		project(":junit-jupiter-params")
+		projects.jupiter.aggregator,
+		projects.jupiter.api,
+		projects.jupiter.engine,
+		projects.jupiter.migrationsupport,
+		projects.jupiter.params
 ))
 
 val vintageProjects by extra(listOf(
-		project(":junit-vintage-engine")
+		projects.vintage.engine
 ))
 
 val mavenizedProjects by extra(platformProjects + jupiterProjects + vintageProjects)
-val modularProjects by extra(mavenizedProjects - listOf(project(":junit-platform-console-standalone")))
+val modularProjects by extra(mavenizedProjects - listOf(projects.platform.`console-standalone`))
 
 val license by extra(License(
 		name = "Eclipse Public License v2.0",
@@ -76,14 +76,14 @@ val tempRepoDir by extra(file("$buildDir/repo"))
 
 val enableJaCoCo = project.hasProperty("enableJaCoCo")
 val jacocoTestProjects = listOf(
-		project(":junit-jupiter-engine"),
-		project(":junit-jupiter-migrationsupport"),
-		project(":junit-jupiter-params"),
-		project(":junit-platform-runner"),
-		project(":junit-platform-suite-commons"),
-		project(":junit-platform-suite-engine"),
-		project(":junit-vintage-engine"),
-		project(":platform-tests")
+		projects.jupiter.engine,
+		projects.jupiter.migrationsupport,
+		projects.jupiter.params,
+		projects.platform.runner,
+		projects.platform.suite.commons,
+		projects.platform.suite.engine,
+		projects.vintage.engine,
+		projects.platform.tests
 )
 val jacocoCoveredProjects = modularProjects
 val jacocoClassesDir = file("$buildDir/jacoco/classes")
diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/buildSrc/src/main/kotlin/ProjectExtensions.kt
index 315126c5bae3..8bac577a5d6e 100644
--- a/buildSrc/src/main/kotlin/ProjectExtensions.kt
+++ b/buildSrc/src/main/kotlin/ProjectExtensions.kt
@@ -4,3 +4,9 @@ import org.gradle.kotlin.dsl.provideDelegate
 
 val Project.javaModuleName: String
     get() = "org." + this.name.replace('-', '.')
+
+val Project.projects: Projects
+    get() {
+        var versions: Projects? by rootProject.extra
+        return versions ?: Projects(rootProject).also { versions = it }
+    }
diff --git a/buildSrc/src/main/kotlin/Projects.kt b/buildSrc/src/main/kotlin/Projects.kt
new file mode 100644
index 000000000000..2738c4608ce9
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Projects.kt
@@ -0,0 +1,53 @@
+import org.gradle.api.Project
+import kotlin.reflect.KProperty
+
+class Projects(private val rootProject: Project) {
+    val bom = project("junit-bom")
+    val platform = Platform()
+    val jupiter = Jupiter()
+    val vintage = Vintage()
+
+    private fun project(name: String) = rootProject.project(":${name}")
+
+    inner class Platform {
+        private val platformProject = object {
+            operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-platform-${property.name}")
+        }
+        val commons by platformProject
+        val console by platformProject
+        val `console-standalone` by platformProject
+        val engine by platformProject
+        val jfr by platformProject
+        val launcher by platformProject
+        val reporting by platformProject
+        val runner by platformProject
+        val suite = Suite()
+        val testkit by platformProject
+        val tests = project("platform-tests")
+
+        inner class Suite {
+            private val suiteProject = object {
+                operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-platform-suite-${property.name}")
+            }
+            val aggregator = project("junit-platform-suite")
+            val api by suiteProject
+            val commons by suiteProject
+            val engine by suiteProject
+        }
+    }
+
+    inner class Jupiter {
+        private val jupiterProject = object {
+            operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-jupiter-${property.name}")
+        }
+        val aggregator = project("junit-jupiter")
+        val api by jupiterProject
+        val engine by jupiterProject
+        val migrationsupport by jupiterProject
+        val params by jupiterProject
+    }
+
+    inner class Vintage {
+        val engine = project("junit-vintage-engine")
+    }
+}
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 8f1af23b18ed..2b8ddb33cfe3 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -54,13 +54,13 @@ dependencies {
 	"testImplementation"(libs.findDependency("assertj").get())
 	"testImplementation"(libs.findDependency("mockito").get())
 
-	if (project.name != "junit-jupiter-engine") {
-		"testImplementation"(project(":junit-jupiter"))
+	if (project != projects.jupiter.engine) {
+		"testImplementation"(projects.jupiter.aggregator)
 	}
-	"testImplementation"(testFixtures(project(":junit-jupiter-api")))
+	"testImplementation"(testFixtures(projects.jupiter.api))
 
-	"testRuntimeOnly"(project(":junit-platform-launcher"))
-	"testRuntimeOnly"(project(":junit-platform-jfr"))
+	"testRuntimeOnly"(projects.platform.launcher)
+	"testRuntimeOnly"(projects.platform.jfr)
 
 	"testRuntimeOnly"(libs.findBundle("log4j").get())
 }
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index c4e1f95c385e..83eff2fd3811 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -25,7 +25,7 @@ javaLibrary {
 val apiReport by configurations.creating
 
 dependencies {
-	implementation(project(":junit-jupiter-api")) {
+	implementation(project(projects.jupiter.api.path)) {
 		because("Jupiter API is used in src/main/java")
 	}
 
@@ -33,15 +33,15 @@ dependencies {
 	// in reports generated by the ApiReportGenerator.
 	modularProjects.forEach { apiReport(it) }
 
-	testImplementation(project(":junit-jupiter"))
-	testImplementation(project(":junit-jupiter-migrationsupport"))
-	testImplementation(project(":junit-platform-console"))
-	testImplementation(project(":junit-platform-runner"))
-	testImplementation(project(":junit-platform-suite"))
-	testImplementation(project(":junit-platform-testkit"))
+	testImplementation(projects.jupiter.aggregator)
+	testImplementation(projects.jupiter.migrationsupport)
+	testImplementation(projects.platform.console)
+	testImplementation(projects.platform.runner)
+	testImplementation(projects.platform.suite.aggregator)
+	testImplementation(projects.platform.testkit)
 	testImplementation(kotlin("stdlib"))
 
-	testImplementation(project(":junit-vintage-engine"))
+	testImplementation(projects.vintage.engine)
 	testRuntimeOnly(libs.bundles.log4j)
 
 	testImplementation(libs.classgraph) {
@@ -409,14 +409,14 @@ fun JavaExec.redirectOutput(outputFile: File) {
 
 eclipse {
 	classpath {
-		plusConfigurations.add(project(":junit-platform-console").configurations["shadowed"])
-		plusConfigurations.add(project(":junit-jupiter-params").configurations["shadowed"])
+		plusConfigurations.add(projects.platform.console.configurations["shadowed"])
+		plusConfigurations.add(projects.jupiter.params.configurations["shadowed"])
 	}
 }
 
 idea {
 	module {
-		scopes["PROVIDED"]!!["plus"]!!.add(project(":junit-platform-console").configurations["shadowed"])
-		scopes["PROVIDED"]!!["plus"]!!.add(project(":junit-jupiter-params").configurations["shadowed"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.platform.console.configurations["shadowed"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.jupiter.params.configurations["shadowed"])
 	}
 }
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index 43ded844f9d6..247887a63bde 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 description = "JUnit Jupiter API"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
 	api(libs.opentest4j)
-	api(project(":junit-platform-commons"))
+	api(projects.platform.commons)
 
 	compileOnly(kotlin("stdlib"))
 }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 64be7221ca2b..1e4c05756764 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -9,15 +9,15 @@ plugins {
 description = "JUnit Jupiter Engine"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-engine"))
-	api(project(":junit-jupiter-api"))
+	api(projects.platform.engine)
+	api(projects.jupiter.api)
 
-	testImplementation(project(":junit-platform-launcher"))
-	testImplementation(project(":junit-platform-runner"))
-	testImplementation(project(":junit-platform-testkit"))
-	testImplementation(testFixtures(project(":junit-platform-commons")))
+	testImplementation(projects.platform.launcher)
+	testImplementation(projects.platform.runner)
+	testImplementation(projects.platform.testkit)
+	testImplementation(testFixtures(projects.platform.commons))
 	testImplementation(kotlin("stdlib"))
 	testImplementation(libs.kotlinx.coroutines)
 	testImplementation(libs.groovy3)
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index c4447c5d28ba..ebdd9bf9bf15 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -9,15 +9,15 @@ plugins {
 description = "JUnit Jupiter Migration Support"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.junit4)
 	api(libs.apiguardian)
-	api(project(":junit-jupiter-api"))
+	api(projects.jupiter.api)
 
-	testImplementation(project(":junit-jupiter-engine"))
-	testImplementation(project(":junit-platform-launcher"))
-	testImplementation(project(":junit-platform-runner"))
-	testImplementation(project(":junit-platform-testkit"))
+	testImplementation(projects.jupiter.engine)
+	testImplementation(projects.platform.launcher)
+	testImplementation(projects.platform.runner)
+	testImplementation(projects.platform.testkit)
 }
 
 tasks.jar {
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 4ca58a8e8cff..4e4a727844c0 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -7,16 +7,16 @@ plugins {
 description = "JUnit Jupiter Params"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-jupiter-api"))
+	api(projects.jupiter.api)
 
 	shadowed(libs.univocity.parsers)
 
-	testImplementation(project(":junit-platform-testkit"))
-	testImplementation(project(":junit-jupiter-engine"))
-	testImplementation(project(":junit-platform-launcher"))
-	testImplementation(project(":junit-platform-runner"))
+	testImplementation(projects.platform.testkit)
+	testImplementation(projects.jupiter.engine)
+	testImplementation(projects.platform.launcher)
+	testImplementation(projects.platform.runner)
 
 	compileOnly(kotlin("stdlib"))
 	testImplementation(kotlin("stdlib"))
diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts
index f19ef52b086c..a95f708ce8dd 100644
--- a/junit-jupiter/junit-jupiter.gradle.kts
+++ b/junit-jupiter/junit-jupiter.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 description = "JUnit Jupiter (Aggregator)"
 
 dependencies {
-	api(platform(project(":junit-bom")))
-	api(project(":junit-jupiter-api"))
-	api(project(":junit-jupiter-params"))
+	api(platform(projects.bom))
+	api(projects.jupiter.api)
+	api(projects.jupiter.params)
 
-	runtimeOnly(project(":junit-jupiter-engine"))
+	runtimeOnly(projects.jupiter.engine)
 }
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index fb5a6651d721..1b0962546f56 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 description = "JUnit Platform Commons"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
 }
 
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 007edd487d24..dc805c9b8a3e 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 description = "JUnit Platform Console Standalone"
 
 dependencies {
-	shadowed(project(":junit-platform-reporting"))
-	shadowed(project(":junit-platform-console"))
-	shadowed(project(":junit-jupiter-engine"))
-	shadowed(project(":junit-jupiter-params"))
-	shadowed(project(":junit-vintage-engine"))
+	shadowed(projects.platform.reporting)
+	shadowed(projects.platform.console)
+	shadowed(projects.jupiter.engine)
+	shadowed(projects.jupiter.params)
+	shadowed(projects.vintage.engine)
 }
 
 val jupiterVersion = rootProject.version
@@ -28,11 +28,11 @@ tasks {
 		// https://github.com/junit-team/junit5/issues/761
 		// prevent duplicates, add 3rd-party licenses explicitly
 		exclude("META-INF/LICENSE*.md")
-		from(project(":junit-platform-console").projectDir) {
+		from(project.projects.platform.console.projectDir) {
 			include("LICENSE-picocli.md")
 			into("META-INF")
 		}
-		from(project(":junit-jupiter-params").projectDir) {
+		from(project.projects.jupiter.params.projectDir) {
 			include("LICENSE-univocity-parsers.md")
 			into("META-INF")
 		}
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 5566a2512011..0f6610d79545 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -8,9 +8,9 @@ plugins {
 description = "JUnit Platform Console"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-reporting"))
+	api(projects.platform.reporting)
 
 	shadowed(libs.picocli)
 }
diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
index c7d91f6e2c4d..d223d80a7e78 100644
--- a/junit-platform-engine/junit-platform-engine.gradle.kts
+++ b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 description = "JUnit Platform Engine API"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
 	api(libs.opentest4j)
-	api(project(":junit-platform-commons"))
+	api(projects.platform.commons)
 
 	testImplementation(libs.assertj)
 }
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index fab69f5ecf3b..3aaeb32fb78b 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 description = "JUnit Platform Flight Recorder Support"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-launcher"))
+	api(projects.platform.launcher)
 }
 
 javaLibrary {
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
index 0e2c4412bbdf..89355b7abf98 100644
--- a/junit-platform-launcher/junit-platform-launcher.gradle.kts
+++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 description = "JUnit Platform Launcher"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-engine"))
+	api(projects.platform.engine)
 }
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index 0812110890c9..b872ef23b69e 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 description = "JUnit Platform Reporting"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-launcher"))
+	api(projects.platform.launcher)
 }
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index 3be2a0e79c74..6f864fe0bf12 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -8,16 +8,16 @@ plugins {
 description = "JUnit Platform Runner"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.junit4)
 	api(libs.apiguardian)
-	api(project(":junit-platform-launcher"))
-	api(project(":junit-platform-suite-api"))
+	api(projects.platform.launcher)
+	api(projects.platform.suite.api)
 
-	implementation(project(":junit-platform-suite-commons"))
+	implementation(projects.platform.suite.commons)
 
-	testImplementation(testFixtures(project(":junit-platform-engine")))
-	testImplementation(testFixtures(project(":junit-platform-launcher")))
+	testImplementation(testFixtures(projects.platform.engine))
+	testImplementation(testFixtures(projects.platform.launcher))
 }
 
 tasks.jar {
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
index b519350f9d0c..9845a3142657 100644
--- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
+++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 description = "JUnit Platform Suite API"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-commons"))
+	api(projects.platform.commons)
 
-	osgiVerification(project(":junit-platform-commons"))
+	osgiVerification(projects.platform.commons)
 }
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 70bd5f27d121..155ced0af6a1 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 description = "JUnit Platform Suite Commons"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-launcher"))
+	api(projects.platform.launcher)
 
-	implementation(project(":junit-platform-engine"))
-	implementation(project(":junit-platform-suite-api"))
+	implementation(projects.platform.engine)
+	implementation(projects.platform.suite.api)
 
-	testImplementation(project(":junit-jupiter-engine"))
+	testImplementation(projects.jupiter.engine)
 }
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index 0a2b0345cd02..6a9a5dd1e4d5 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -7,16 +7,16 @@ plugins {
 description = "JUnit Platform Suite Engine"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-engine"))
-	api(project(":junit-platform-suite-api"))
+	api(projects.platform.engine)
+	api(projects.platform.suite.api)
 
-	implementation(project(":junit-platform-suite-commons"))
+	implementation(projects.platform.suite.commons)
 
-	testFixturesApi(project(":junit-jupiter-api"))
-	testFixturesApi(project(":junit-platform-suite-api"))
+	testFixturesApi(projects.jupiter.api)
+	testFixturesApi(projects.platform.suite.api)
 
-	testImplementation(project(":junit-platform-testkit"))
-	testImplementation(project(":junit-jupiter-engine"))
+	testImplementation(projects.platform.testkit)
+	testImplementation(projects.jupiter.engine)
 }
diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
index 77a097c4aa91..f1c104ab9efe 100644
--- a/junit-platform-suite/junit-platform-suite.gradle.kts
+++ b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 description = "JUnit Platform Suite (Aggregator)"
 
 dependencies {
-	api(platform(project(":junit-bom")))
-	api(project(":junit-platform-suite-api"))
-	implementation(project(":junit-platform-suite-engine"))
+	api(platform(projects.bom))
+	api(projects.platform.suite.api)
+	implementation(projects.platform.suite.engine)
 }
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
index cc8de483bc25..8defbaae230b 100644
--- a/junit-platform-testkit/junit-platform-testkit.gradle.kts
+++ b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 description = "JUnit Platform Test Kit"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
 	api(libs.assertj)
 	api(libs.opentest4j)
-	api(project(":junit-platform-launcher"))
+	api(projects.platform.launcher)
 }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index bfe478eb145a..d6b53b33da81 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -11,18 +11,18 @@ plugins {
 description = "JUnit Vintage Engine"
 
 dependencies {
-	api(platform(project(":junit-bom")))
+	api(platform(projects.bom))
 	api(libs.apiguardian)
-	api(project(":junit-platform-engine"))
+	api(projects.platform.engine)
 	api(libs.junit4)
 
 	testFixturesApi(platform(libs.groovy2.bom))
 	testFixturesApi(libs.spock1)
-	testFixturesImplementation(project(":junit-platform-runner"))
+	testFixturesImplementation(projects.platform.runner)
 
-	testImplementation(project(":junit-platform-launcher"))
-	testImplementation(project(":junit-platform-runner"))
-	testImplementation(project(":junit-platform-testkit"))
+	testImplementation(projects.platform.launcher)
+	testImplementation(projects.platform.runner)
+	testImplementation(projects.platform.testkit)
 }
 
 tasks {
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index cded8420ac07..979e7068b2de 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -9,32 +9,32 @@ plugins {
 
 dependencies {
 	// --- Things we are testing --------------------------------------------------
-	testImplementation(project(":junit-platform-commons"))
-	testImplementation(project(":junit-platform-console"))
-	testImplementation(project(":junit-platform-engine"))
-	testImplementation(project(":junit-platform-jfr"))
-	testImplementation(project(":junit-platform-launcher"))
+	testImplementation(projects.platform.commons)
+	testImplementation(projects.platform.console)
+	testImplementation(projects.platform.engine)
+	testImplementation(projects.platform.jfr)
+	testImplementation(projects.platform.launcher)
 
 	// --- Things we are testing with ---------------------------------------------
-	testImplementation(project(":junit-platform-runner"))
-	testImplementation(project(":junit-platform-testkit"))
-	testImplementation(testFixtures(project(":junit-platform-commons")))
-	testImplementation(testFixtures(project(":junit-platform-engine")))
-	testImplementation(testFixtures(project(":junit-platform-launcher")))
-	testImplementation(project(":junit-jupiter-engine"))
+	testImplementation(projects.platform.runner)
+	testImplementation(projects.platform.testkit)
+	testImplementation(testFixtures(projects.platform.commons))
+	testImplementation(testFixtures(projects.platform.engine))
+	testImplementation(testFixtures(projects.platform.launcher))
+	testImplementation(projects.jupiter.engine)
 	testImplementation(libs.apiguardian)
 	testImplementation(libs.jfrunit)
 	testImplementation(libs.joox)
 
 	// --- Test run-time dependencies ---------------------------------------------
-	testRuntimeOnly(project(":junit-vintage-engine"))
+	testRuntimeOnly(projects.vintage.engine)
 	testRuntimeOnly(libs.groovy3) {
 		because("`ReflectionUtilsTests.findNestedClassesWithInvalidNestedClassFile` needs it")
 	}
 
 	// --- https://openjdk.java.net/projects/code-tools/jmh/ -----------------------
 	jmh(libs.jmh.core)
-	jmh(project(":junit-jupiter-api"))
+	jmh(projects.jupiter.api)
 	jmh(libs.junit4)
 	jmhAnnotationProcessor(libs.jmh.generator.annprocess)
 }
@@ -70,12 +70,12 @@ tasks {
 
 eclipse {
 	classpath {
-		plusConfigurations.add(project(":junit-platform-console").configurations["shadowed"])
+		plusConfigurations.add(projects.platform.console.configurations["shadowed"])
 	}
 }
 
 idea {
 	module {
-		scopes["PROVIDED"]!!["plus"]!!.add(project(":junit-platform-console").configurations["shadowed"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.platform.console.configurations["shadowed"])
 	}
 }
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index acd9690f6f83..bf54593ac0d9 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -44,7 +44,7 @@ tasks.test {
 		val mavenizedProjects: List<Project> by rootProject
 		val tempRepoName: String by rootProject
 
-		(mavenizedProjects + project(":junit-bom"))
+		(mavenizedProjects + projects.bom)
 				.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") }
 				.forEach { dependsOn(it) }
 	}

From b54793d575a1bdad90fcbf7519f7e8c0bf773d81 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 12 Apr 2021 20:59:54 +0200
Subject: [PATCH 0286/1433] Downgrade Asciidoctor plugin

---
 settings.gradle.kts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index e83e834f42c3..90e2ae6fbe6e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,8 +14,9 @@ pluginManagement {
 		id("com.diffplug.spotless") version "5.12.0"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.4.0"
-		id("org.asciidoctor.jvm.convert") version "3.3.2"
-		id("org.asciidoctor.jvm.pdf") version "3.3.2"
+		// Don't upgrade until https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599 is fixed
+		id("org.asciidoctor.jvm.convert") version "3.3.0"
+		id("org.asciidoctor.jvm.pdf") version "3.3.0"
 		id("me.champeau.gradle.jmh") version "0.5.3"
 		id("io.spring.nohttp") version "0.0.6.RELEASE"
 		id("io.github.gradle-nexus.publish-plugin") version "1.0.0"

From 4f4f6b73b4fc705c0c20202ed50c717e9685b57d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 12 Apr 2021 21:13:56 +0200
Subject: [PATCH 0287/1433] Use BOM

---
 .../asciidoc/user-guide/running-tests.adoc    | 56 +++++++++++--------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index a6c1d3e34c39..c04c9cc352fb 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -28,35 +28,47 @@ include the corresponding versions of the `junit-platform-launcher`,
 [source,groovy]
 [subs=attributes+]
 ----
+testImplementation(platform("org.junit:junit-bom:{bom-version}"))
 // Only needed to run tests in a version of IntelliJ IDEA that bundles older versions
-testRuntimeOnly("org.junit.platform:junit-platform-launcher:{platform-version}")
-testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:{jupiter-version}")
-testRuntimeOnly("org.junit.vintage:junit-vintage-engine:{vintage-version}")
+testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 ----
 
 .Additional Maven Dependencies
 [source,xml]
 [subs=attributes+]
 ----
-<!-- Only needed to run tests in a version of IntelliJ IDEA that bundles older versions -->
-<dependency>
-	<groupId>org.junit.platform</groupId>
-	<artifactId>junit-platform-launcher</artifactId>
-	<version>{platform-version}</version>
-	<scope>test</scope>
-</dependency>
-<dependency>
-	<groupId>org.junit.jupiter</groupId>
-	<artifactId>junit-jupiter-engine</artifactId>
-	<version>{jupiter-version}</version>
-	<scope>test</scope>
-</dependency>
-<dependency>
-	<groupId>org.junit.vintage</groupId>
-	<artifactId>junit-vintage-engine</artifactId>
-	<version>{vintage-version}</version>
-	<scope>test</scope>
-</dependency>
+<!-- ... -->
+<dependencies>
+	<!-- Only needed to run tests in a version of IntelliJ IDEA that bundles older versions -->
+	<dependency>
+		<groupId>org.junit.platform</groupId>
+		<artifactId>junit-platform-launcher</artifactId>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>org.junit.jupiter</groupId>
+		<artifactId>junit-jupiter-engine</artifactId>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>org.junit.vintage</groupId>
+		<artifactId>junit-vintage-engine</artifactId>
+		<scope>test</scope>
+	</dependency>
+</dependencies>
+<dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit-bom</artifactId>
+			<version>{bom-version}</version>
+			<type>pom</type>
+			<scope>import</scope>
+		</dependency>
+	</dependencies>
+</dependencyManagement>
 ----
 
 [[running-tests-ide-eclipse]]

From 5a292f2800f92317bd79a7fe6ece7200f80ee2f3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 12 Apr 2021 21:14:44 +0200
Subject: [PATCH 0288/1433] Fix indentation and syntax highlighting

---
 .../asciidoc/user-guide/running-tests.adoc    | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index c04c9cc352fb..84fa873d121d 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -133,25 +133,25 @@ https://docs.gradle.org/current/userguide/java_testing.html#using_junit5[native
 for executing tests on the JUnit Platform. To enable it, you just need to specify
 `useJUnitPlatform()` within a `test` task declaration in `build.gradle`:
 
-[source,java,indent=0]
+[source,groovy,indent=0]
 [subs=attributes+]
 ----
 test {
-    useJUnitPlatform()
+	useJUnitPlatform()
 }
 ----
 
 Filtering by tags or engines is also supported:
 
-[source,java,indent=0]
+[source,groovy,indent=0]
 [subs=attributes+]
 ----
 test {
-    useJUnitPlatform {
-        includeTags 'fast', 'smoke & feature-a'
-        // excludeTags 'slow', 'ci'
-        includeEngines 'junit-jupiter'
-        // excludeEngines 'junit-vintage'
+	useJUnitPlatform {
+		includeTags("fast", "smoke & feature-a")
+		// excludeTags("slow", "ci")
+		includeEngines("junit-jupiter")
+		// excludeEngines("junit-vintage")
 	}
 }
 ----
@@ -169,15 +169,13 @@ discovery and execution. However, you can provide configuration parameters withi
 build script via system properties (as shown below) or via the
 `junit-platform.properties` file.
 
-[source,java,indent=0]
+[source,groovy,indent=0]
 ----
 test {
 	// ...
-	systemProperty 'junit.jupiter.conditions.deactivate', '*'
-	systemProperties = [
-		'junit.jupiter.extensions.autodetection.enabled': 'true',
-		'junit.jupiter.testinstance.lifecycle.default': 'per_class'
-	]
+	systemProperty("junit.jupiter.conditions.deactivate", "*")
+	systemProperty("junit.jupiter.extensions.autodetection.enabled", true)
+	systemProperty("junit.jupiter.testinstance.lifecycle.default", "per_class")
 	// ...
 }
 ----
@@ -191,7 +189,7 @@ To configure support for JUnit Jupiter based tests, configure a `testImplementat
 on the JUnit Jupiter API and a `testRuntimeOnly` dependency on the JUnit Jupiter `TestEngine`
 implementation similar to the following.
 
-[source,java,indent=0]
+[source,groovy,indent=0]
 [subs=attributes+]
 ----
 dependencies {
@@ -204,7 +202,7 @@ The JUnit Platform can run JUnit 4 based tests as long as you configure a `testI
 dependency on JUnit 4 and a `testRuntimeOnly` dependency on the JUnit Vintage `TestEngine`
 implementation similar to the following.
 
-[source,java,indent=0]
+[source,groovy,indent=0]
 [subs=attributes+]
 ----
 dependencies {
@@ -227,11 +225,11 @@ qualified class name_ of the `{LogManager}` implementation to use. The example b
 demonstrates how to configure Log4j{nbsp}2.x (see {Log4j_JDK_Logging_Adapter} for
 details).
 
-[source,java,indent=0]
+[source,groovy,indent=0]
 [subs=attributes+]
 ----
 test {
-	systemProperty 'java.util.logging.manager', 'org.apache.logging.log4j.jul.LogManager'
+	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 }
 ----
 
@@ -406,7 +404,7 @@ the following configuration properties.
 				<configuration>
 					<groups>acceptance | !feature-a</groups>
 					<excludedGroups>integration, regression</excludedGroups>
-			    </configuration>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

From 28c68fa94074f3fd22b18a2a3de10617fe5c2293 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 12 Apr 2021 21:15:48 +0200
Subject: [PATCH 0289/1433] Use junit-jupiter dependency-aggregating artifact

---
 .../docs/asciidoc/user-guide/running-tests.adoc    | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 84fa873d121d..d1aafe8e1620 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -186,15 +186,13 @@ test {
 In order to run any tests at all, a `TestEngine` implementation must be on the classpath.
 
 To configure support for JUnit Jupiter based tests, configure a `testImplementation` dependency
-on the JUnit Jupiter API and a `testRuntimeOnly` dependency on the JUnit Jupiter `TestEngine`
-implementation similar to the following.
+on the dependency-aggregating JUnit Jupiter artifact similar to the following.
 
 [source,groovy,indent=0]
 [subs=attributes+]
 ----
 dependencies {
-	testImplementation("org.junit.jupiter:junit-jupiter-api:{jupiter-version}")
-	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:{jupiter-version}")
+	testImplementation("org.junit.jupiter:junit-jupiter:{jupiter-version}")
 }
 ----
 
@@ -286,13 +284,7 @@ following.
 		<!-- ... -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>{jupiter-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
+			<artifactId>junit-jupiter</artifactId>
 			<version>{jupiter-version}</version>
 			<scope>test</scope>
 		</dependency>

From f6b320980c984b5986094e83425b3df19d1074eb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 12 Apr 2021 21:16:00 +0200
Subject: [PATCH 0290/1433] Use canonical POM order

---
 .../asciidoc/user-guide/running-tests.adoc    | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index d1aafe8e1620..9adaf6895044 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -267,18 +267,6 @@ following.
 [source,xml,indent=0]
 [subs=attributes+]
 ----
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>{surefire-version}</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>{surefire-version}</version>
-			</plugin>
-		</plugins>
-	</build>
 	<!-- ... -->
 	<dependencies>
 		<!-- ... -->
@@ -290,17 +278,6 @@ following.
 		</dependency>
 		<!-- ... -->
 	</dependencies>
-	<!-- ... -->
-----
-
-Maven Surefire and Maven Failsafe can run JUnit 4 based tests alongside Jupiter tests as
-long as you configure `test` scoped dependencies on JUnit 4 and the JUnit Vintage
-`TestEngine` implementation similar to the following.
-
-[source,xml,indent=0]
-[subs=attributes+]
-----
-	<!-- ... -->
 	<build>
 		<plugins>
 			<plugin>
@@ -314,6 +291,16 @@ long as you configure `test` scoped dependencies on JUnit 4 and the JUnit Vintag
 		</plugins>
 	</build>
 	<!-- ... -->
+----
+
+Maven Surefire and Maven Failsafe can run JUnit 4 based tests alongside Jupiter tests as
+long as you configure `test` scoped dependencies on JUnit 4 and the JUnit Vintage
+`TestEngine` implementation similar to the following.
+
+[source,xml,indent=0]
+[subs=attributes+]
+----
+	<!-- ... -->
 	<dependencies>
 		<!-- ... -->
 		<dependency>
@@ -331,6 +318,19 @@ long as you configure `test` scoped dependencies on JUnit 4 and the JUnit Vintag
 		<!-- ... -->
 	</dependencies>
 	<!-- ... -->
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>{surefire-version}</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>{surefire-version}</version>
+			</plugin>
+		</plugins>
+	</build>
+	<!-- ... -->
 ----
 
 [[running-tests-build-maven-filter-test-class-names]]

From 0820cf3e8c2617302cb3421b2cd062d77012bc51 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 13 Apr 2021 19:02:34 +0200
Subject: [PATCH 0291/1433] Disable inferring module path for compileModule
 tasks

This resolves a warning that appeared after upgrading to Gradle 7.0
---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 8cd196d81e10..cc11a6b4e807 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -150,6 +150,7 @@ val compileModule by tasks.registering(JavaCompile::class) {
 	))
 	options.compilerArgumentProviders.add(ModulePathArgumentProvider())
 	options.compilerArgumentProviders.addAll(modularProjects.map { PatchModuleArgumentProvider(it) })
+	modularity.inferModulePath.set(false)
 }
 
 tasks.withType<Jar>().configureEach {

From dd6df993a48ec790af787d1960a2b3b595c1cbf1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 13 Apr 2021 19:11:15 +0200
Subject: [PATCH 0292/1433] Add explicit dependency to resolve deprecation
 warning

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6cc7b38fda96..f8218daa8c32 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -268,6 +268,7 @@ rootProject.apply {
 			register<JacocoReport>("jacocoRootReport") {
 				dependsOn(jacocoMerge)
 				jacocoCoveredProjects.forEach {
+					dependsOn(it.tasks.named("extractJar"))
 					it.pluginManager.withPlugin("java") {
 						sourceDirectories.from(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
 					}

From 477498dc4c7e959bd12acffb7cbc130c06e4c2b0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 13 Apr 2021 19:11:43 +0200
Subject: [PATCH 0293/1433] Resolve IDEA warnings

---
 build.gradle.kts | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f8218daa8c32..b3d340918d1b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 	id("io.github.gradle-nexus.publish-plugin")
 }
 
-val buildTimeAndDate by extra {
+val buildTimeAndDate: OffsetDateTime by extra {
 
 	// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against
 	// in order to achieve reproducible builds
@@ -29,9 +29,9 @@ val buildTimeAndDate by extra {
 	}
 }
 
-val buildDate by extra { DateTimeFormatter.ISO_LOCAL_DATE.format(buildTimeAndDate) }
-val buildTime by extra { DateTimeFormatter.ofPattern("HH:mm:ss.SSSZ").format(buildTimeAndDate) }
-val buildRevision by extra { versioning.info.commit }
+val buildDate: String by extra { DateTimeFormatter.ISO_LOCAL_DATE.format(buildTimeAndDate) }
+val buildTime: String by extra { DateTimeFormatter.ofPattern("HH:mm:ss.SSSZ").format(buildTimeAndDate) }
+val buildRevision: String by extra { versioning.info.commit }
 val builtByValue by extra { project.findProperty("builtBy") ?: project.property("defaultBuiltBy") }
 
 val platformProjects by extra(listOf(
@@ -131,16 +131,18 @@ val clearTempRepoDir by tasks.registering {
 
 subprojects {
 
-	if (project in jupiterProjects) {
-		group = property("jupiterGroup")!!
-	}
-	else if (project in platformProjects) {
-		group = property("platformGroup")!!
-		version = property("platformVersion")!!
-	}
-	else if (project in vintageProjects) {
-		group = property("vintageGroup")!!
-		version = property("vintageVersion")!!
+	when (project) {
+		in jupiterProjects -> {
+			group = property("jupiterGroup")!!
+		}
+		in platformProjects -> {
+			group = property("platformGroup")!!
+			version = property("platformVersion")!!
+		}
+		in vintageProjects -> {
+			group = property("vintageGroup")!!
+			version = property("vintageVersion")!!
+		}
 	}
 
 	tasks.withType<AbstractArchiveTask>().configureEach {
@@ -181,7 +183,7 @@ subprojects {
 			if (enableJaCoCo && project in jacocoCoveredProjects) {
 				val jarTask = (tasks.findByName("shadowJar") ?: tasks["jar"]) as Jar
 				val extractJar by tasks.registering(Copy::class) {
-					from(zipTree(jarTask.archivePath))
+					from(zipTree(jarTask.archiveFile))
 					into(jacocoClassesDir)
 					include("**/*.class")
 					// don't report coverage for shadowed classes

From 7dbc414b5caa78650917ab97b80ef9437d5bfdc7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 13 Apr 2021 19:25:20 +0200
Subject: [PATCH 0294/1433] Work around Asciidoctor Gradle plugin issue

Issue: asciidoctor/asciidoctor-gradle-plugin#599
---
 documentation/documentation.gradle.kts | 4 ++++
 settings.gradle.kts                    | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 83eff2fd3811..3b32739e91a8 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -1,4 +1,5 @@
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
+import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.junit.gradle.exec.ClasspathSystemPropertyProvider
 import org.junit.gradle.javadoc.ModuleSpecificJavadocFileOption
@@ -171,6 +172,9 @@ tasks {
 			}
 		}
 
+		// Temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
+		inputs.dir(sourceDir).withPropertyName("sourceDir").withPathSensitivity(RELATIVE)
+
 		attributes(mapOf(
 				"jupiter-version" to version,
 				"platform-version" to project.property("platformVersion"),
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 90e2ae6fbe6e..468b21ba55f3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,9 +14,9 @@ pluginManagement {
 		id("com.diffplug.spotless") version "5.12.0"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.4.0"
-		// Don't upgrade until https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599 is fixed
-		id("org.asciidoctor.jvm.convert") version "3.3.0"
-		id("org.asciidoctor.jvm.pdf") version "3.3.0"
+		// Check if workaround in documentation.gradle.kts can be removed when upgrading
+		id("org.asciidoctor.jvm.convert") version "3.3.2"
+		id("org.asciidoctor.jvm.pdf") version "3.3.2"
 		id("me.champeau.gradle.jmh") version "0.5.3"
 		id("io.spring.nohttp") version "0.0.6.RELEASE"
 		id("io.github.gradle-nexus.publish-plugin") version "1.0.0"

From b9601f2bd705c651385a7cf111ddfd57986b2436 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 13 Apr 2021 21:49:24 +0200
Subject: [PATCH 0295/1433] Use auto-generated type-safe project accessors

---
 build.gradle.kts                              | 60 +++++++++----------
 buildSrc/src/main/kotlin/ProjectExtensions.kt |  6 --
 buildSrc/src/main/kotlin/Projects.kt          | 53 ----------------
 .../kotlin/testing-conventions.gradle.kts     | 10 ++--
 documentation/documentation.gradle.kts        | 24 ++++----
 .../junit-jupiter-api.gradle.kts              |  4 +-
 .../junit-jupiter-engine.gradle.kts           | 14 ++---
 .../junit-jupiter-migrationsupport.gradle.kts | 12 ++--
 .../junit-jupiter-params.gradle.kts           | 12 ++--
 junit-jupiter/junit-jupiter.gradle.kts        |  8 +--
 .../junit-platform-commons.gradle.kts         |  2 +-
 ...nit-platform-console-standalone.gradle.kts | 14 ++---
 .../junit-platform-console.gradle.kts         |  4 +-
 .../junit-platform-engine.gradle.kts          |  4 +-
 .../junit-platform-jfr.gradle.kts             |  4 +-
 .../junit-platform-launcher.gradle.kts        |  4 +-
 .../junit-platform-reporting.gradle.kts       |  4 +-
 .../junit-platform-runner.gradle.kts          | 12 ++--
 .../junit-platform-suite-api.gradle.kts       |  6 +-
 .../junit-platform-suite-commons.gradle.kts   | 10 ++--
 .../junit-platform-suite-engine.gradle.kts    | 16 ++---
 .../junit-platform-suite.gradle.kts           |  6 +-
 .../junit-platform-testkit.gradle.kts         |  4 +-
 .../junit-vintage-engine.gradle.kts           | 12 ++--
 platform-tests/platform-tests.gradle.kts      | 30 +++++-----
 .../platform-tooling-support-tests.gradle.kts |  2 +-
 settings.gradle.kts                           |  1 +
 27 files changed, 140 insertions(+), 198 deletions(-)
 delete mode 100644 buildSrc/src/main/kotlin/Projects.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index b3d340918d1b..0aa286988901 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,35 +35,35 @@ val buildRevision: String by extra { versioning.info.commit }
 val builtByValue by extra { project.findProperty("builtBy") ?: project.property("defaultBuiltBy") }
 
 val platformProjects by extra(listOf(
-		projects.platform.commons,
-		projects.platform.console,
-		projects.platform.`console-standalone`,
-		projects.platform.engine,
-		projects.platform.jfr,
-		projects.platform.launcher,
-		projects.platform.reporting,
-		projects.platform.runner,
-		projects.platform.suite.aggregator,
-		projects.platform.suite.api,
-		projects.platform.suite.commons,
-		projects.platform.suite.engine,
-		projects.platform.testkit
-))
+		projects.junitPlatformCommons,
+		projects.junitPlatformConsole,
+		projects.junitPlatformConsoleStandalone,
+		projects.junitPlatformEngine,
+		projects.junitPlatformJfr,
+		projects.junitPlatformLauncher,
+		projects.junitPlatformReporting,
+		projects.junitPlatformRunner,
+		projects.junitPlatformSuite,
+		projects.junitPlatformSuiteApi,
+		projects.junitPlatformSuiteCommons,
+		projects.junitPlatformSuiteEngine,
+		projects.junitPlatformTestkit
+).map { it.dependencyProject })
 
 val jupiterProjects by extra(listOf(
-		projects.jupiter.aggregator,
-		projects.jupiter.api,
-		projects.jupiter.engine,
-		projects.jupiter.migrationsupport,
-		projects.jupiter.params
-))
+		projects.junitJupiter,
+		projects.junitJupiterApi,
+		projects.junitJupiterEngine,
+		projects.junitJupiterMigrationsupport,
+		projects.junitJupiterParams
+).map { it.dependencyProject })
 
 val vintageProjects by extra(listOf(
-		projects.vintage.engine
+		projects.junitVintageEngine.dependencyProject
 ))
 
 val mavenizedProjects by extra(platformProjects + jupiterProjects + vintageProjects)
-val modularProjects by extra(mavenizedProjects - listOf(projects.platform.`console-standalone`))
+val modularProjects by extra(mavenizedProjects - listOf(projects.junitPlatformConsoleStandalone.dependencyProject))
 
 val license by extra(License(
 		name = "Eclipse Public License v2.0",
@@ -76,14 +76,14 @@ val tempRepoDir by extra(file("$buildDir/repo"))
 
 val enableJaCoCo = project.hasProperty("enableJaCoCo")
 val jacocoTestProjects = listOf(
-		projects.jupiter.engine,
-		projects.jupiter.migrationsupport,
-		projects.jupiter.params,
-		projects.platform.runner,
-		projects.platform.suite.commons,
-		projects.platform.suite.engine,
-		projects.vintage.engine,
-		projects.platform.tests
+		projects.junitJupiterEngine,
+		projects.junitJupiterMigrationsupport,
+		projects.junitJupiterParams,
+		projects.junitPlatformRunner,
+		projects.junitPlatformSuiteCommons,
+		projects.junitPlatformSuiteEngine,
+		projects.junitVintageEngine,
+		projects.platformTests
 )
 val jacocoCoveredProjects = modularProjects
 val jacocoClassesDir = file("$buildDir/jacoco/classes")
diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/buildSrc/src/main/kotlin/ProjectExtensions.kt
index 8bac577a5d6e..315126c5bae3 100644
--- a/buildSrc/src/main/kotlin/ProjectExtensions.kt
+++ b/buildSrc/src/main/kotlin/ProjectExtensions.kt
@@ -4,9 +4,3 @@ import org.gradle.kotlin.dsl.provideDelegate
 
 val Project.javaModuleName: String
     get() = "org." + this.name.replace('-', '.')
-
-val Project.projects: Projects
-    get() {
-        var versions: Projects? by rootProject.extra
-        return versions ?: Projects(rootProject).also { versions = it }
-    }
diff --git a/buildSrc/src/main/kotlin/Projects.kt b/buildSrc/src/main/kotlin/Projects.kt
deleted file mode 100644
index 2738c4608ce9..000000000000
--- a/buildSrc/src/main/kotlin/Projects.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-import org.gradle.api.Project
-import kotlin.reflect.KProperty
-
-class Projects(private val rootProject: Project) {
-    val bom = project("junit-bom")
-    val platform = Platform()
-    val jupiter = Jupiter()
-    val vintage = Vintage()
-
-    private fun project(name: String) = rootProject.project(":${name}")
-
-    inner class Platform {
-        private val platformProject = object {
-            operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-platform-${property.name}")
-        }
-        val commons by platformProject
-        val console by platformProject
-        val `console-standalone` by platformProject
-        val engine by platformProject
-        val jfr by platformProject
-        val launcher by platformProject
-        val reporting by platformProject
-        val runner by platformProject
-        val suite = Suite()
-        val testkit by platformProject
-        val tests = project("platform-tests")
-
-        inner class Suite {
-            private val suiteProject = object {
-                operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-platform-suite-${property.name}")
-            }
-            val aggregator = project("junit-platform-suite")
-            val api by suiteProject
-            val commons by suiteProject
-            val engine by suiteProject
-        }
-    }
-
-    inner class Jupiter {
-        private val jupiterProject = object {
-            operator fun getValue(receiver: Any?, property: KProperty<*>) = project("junit-jupiter-${property.name}")
-        }
-        val aggregator = project("junit-jupiter")
-        val api by jupiterProject
-        val engine by jupiterProject
-        val migrationsupport by jupiterProject
-        val params by jupiterProject
-    }
-
-    inner class Vintage {
-        val engine = project("junit-vintage-engine")
-    }
-}
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 2b8ddb33cfe3..3f04b3535976 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -54,13 +54,13 @@ dependencies {
 	"testImplementation"(libs.findDependency("assertj").get())
 	"testImplementation"(libs.findDependency("mockito").get())
 
-	if (project != projects.jupiter.engine) {
-		"testImplementation"(projects.jupiter.aggregator)
+	if (project != project(":junit-jupiter-engine")) {
+		"testImplementation"(project(":junit-jupiter"))
 	}
-	"testImplementation"(testFixtures(projects.jupiter.api))
+	"testImplementation"(testFixtures(project(":junit-jupiter-api")))
 
-	"testRuntimeOnly"(projects.platform.launcher)
-	"testRuntimeOnly"(projects.platform.jfr)
+	"testRuntimeOnly"(project(":junit-platform-engine"))
+	"testRuntimeOnly"(project(":junit-platform-jfr"))
 
 	"testRuntimeOnly"(libs.findBundle("log4j").get())
 }
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 3b32739e91a8..c223b69da7b1 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -26,7 +26,7 @@ javaLibrary {
 val apiReport by configurations.creating
 
 dependencies {
-	implementation(project(projects.jupiter.api.path)) {
+	implementation(projects.junitJupiterApi) {
 		because("Jupiter API is used in src/main/java")
 	}
 
@@ -34,15 +34,15 @@ dependencies {
 	// in reports generated by the ApiReportGenerator.
 	modularProjects.forEach { apiReport(it) }
 
-	testImplementation(projects.jupiter.aggregator)
-	testImplementation(projects.jupiter.migrationsupport)
-	testImplementation(projects.platform.console)
-	testImplementation(projects.platform.runner)
-	testImplementation(projects.platform.suite.aggregator)
-	testImplementation(projects.platform.testkit)
+	testImplementation(projects.junitJupiter)
+	testImplementation(projects.junitJupiterMigrationsupport)
+	testImplementation(projects.junitPlatformConsole)
+	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformSuite)
+	testImplementation(projects.junitPlatformTestkit)
 	testImplementation(kotlin("stdlib"))
 
-	testImplementation(projects.vintage.engine)
+	testImplementation(projects.junitVintageEngine)
 	testRuntimeOnly(libs.bundles.log4j)
 
 	testImplementation(libs.classgraph) {
@@ -413,14 +413,14 @@ fun JavaExec.redirectOutput(outputFile: File) {
 
 eclipse {
 	classpath {
-		plusConfigurations.add(projects.platform.console.configurations["shadowed"])
-		plusConfigurations.add(projects.jupiter.params.configurations["shadowed"])
+		plusConfigurations.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"])
+		plusConfigurations.add(projects.junitJupiterParams.dependencyProject.configurations["shadowed"])
 	}
 }
 
 idea {
 	module {
-		scopes["PROVIDED"]!!["plus"]!!.add(projects.platform.console.configurations["shadowed"])
-		scopes["PROVIDED"]!!["plus"]!!.add(projects.jupiter.params.configurations["shadowed"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitJupiterParams.dependencyProject.configurations["shadowed"])
 	}
 }
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index 247887a63bde..8e8e39ac6ea6 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 description = "JUnit Jupiter API"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
 	api(libs.opentest4j)
-	api(projects.platform.commons)
+	api(projects.junitPlatformCommons)
 
 	compileOnly(kotlin("stdlib"))
 }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 1e4c05756764..be338ed699d8 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -9,15 +9,15 @@ plugins {
 description = "JUnit Jupiter Engine"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.engine)
-	api(projects.jupiter.api)
+	api(projects.junitPlatformEngine)
+	api(projects.junitJupiterApi)
 
-	testImplementation(projects.platform.launcher)
-	testImplementation(projects.platform.runner)
-	testImplementation(projects.platform.testkit)
-	testImplementation(testFixtures(projects.platform.commons))
+	testImplementation(projects.junitPlatformLauncher)
+	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformTestkit)
+	testImplementation(testFixtures(projects.junitPlatformCommons))
 	testImplementation(kotlin("stdlib"))
 	testImplementation(libs.kotlinx.coroutines)
 	testImplementation(libs.groovy3)
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index ebdd9bf9bf15..4f778d0298a6 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -9,15 +9,15 @@ plugins {
 description = "JUnit Jupiter Migration Support"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.junit4)
 	api(libs.apiguardian)
-	api(projects.jupiter.api)
+	api(projects.junitJupiterApi)
 
-	testImplementation(projects.jupiter.engine)
-	testImplementation(projects.platform.launcher)
-	testImplementation(projects.platform.runner)
-	testImplementation(projects.platform.testkit)
+	testImplementation(projects.junitJupiterEngine)
+	testImplementation(projects.junitPlatformLauncher)
+	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformTestkit)
 }
 
 tasks.jar {
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 4e4a727844c0..e52ed31bfceb 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -7,16 +7,16 @@ plugins {
 description = "JUnit Jupiter Params"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.jupiter.api)
+	api(projects.junitJupiterApi)
 
 	shadowed(libs.univocity.parsers)
 
-	testImplementation(projects.platform.testkit)
-	testImplementation(projects.jupiter.engine)
-	testImplementation(projects.platform.launcher)
-	testImplementation(projects.platform.runner)
+	testImplementation(projects.junitPlatformTestkit)
+	testImplementation(projects.junitJupiterEngine)
+	testImplementation(projects.junitPlatformLauncher)
+	testImplementation(projects.junitPlatformRunner)
 
 	compileOnly(kotlin("stdlib"))
 	testImplementation(kotlin("stdlib"))
diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts
index a95f708ce8dd..e453e4325d7c 100644
--- a/junit-jupiter/junit-jupiter.gradle.kts
+++ b/junit-jupiter/junit-jupiter.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 description = "JUnit Jupiter (Aggregator)"
 
 dependencies {
-	api(platform(projects.bom))
-	api(projects.jupiter.api)
-	api(projects.jupiter.params)
+	api(platform(projects.junitBom))
+	api(projects.junitJupiterApi)
+	api(projects.junitJupiterParams)
 
-	runtimeOnly(projects.jupiter.engine)
+	runtimeOnly(projects.junitJupiterEngine)
 }
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 1b0962546f56..80582cdf3f2a 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 description = "JUnit Platform Commons"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
 }
 
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index dc805c9b8a3e..03544646a5f2 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 description = "JUnit Platform Console Standalone"
 
 dependencies {
-	shadowed(projects.platform.reporting)
-	shadowed(projects.platform.console)
-	shadowed(projects.jupiter.engine)
-	shadowed(projects.jupiter.params)
-	shadowed(projects.vintage.engine)
+	shadowed(projects.junitPlatformReporting)
+	shadowed(projects.junitPlatformConsole)
+	shadowed(projects.junitJupiterEngine)
+	shadowed(projects.junitJupiterParams)
+	shadowed(projects.junitVintageEngine)
 }
 
 val jupiterVersion = rootProject.version
@@ -28,11 +28,11 @@ tasks {
 		// https://github.com/junit-team/junit5/issues/761
 		// prevent duplicates, add 3rd-party licenses explicitly
 		exclude("META-INF/LICENSE*.md")
-		from(project.projects.platform.console.projectDir) {
+		from(project.projects.junitPlatformConsole.dependencyProject.projectDir) {
 			include("LICENSE-picocli.md")
 			into("META-INF")
 		}
-		from(project.projects.jupiter.params.projectDir) {
+		from(project.projects.junitJupiterParams.dependencyProject.projectDir) {
 			include("LICENSE-univocity-parsers.md")
 			into("META-INF")
 		}
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 0f6610d79545..6f4561ee0192 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -8,9 +8,9 @@ plugins {
 description = "JUnit Platform Console"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.reporting)
+	api(projects.junitPlatformReporting)
 
 	shadowed(libs.picocli)
 }
diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
index d223d80a7e78..8d1a06e2f51c 100644
--- a/junit-platform-engine/junit-platform-engine.gradle.kts
+++ b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 description = "JUnit Platform Engine API"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
 	api(libs.opentest4j)
-	api(projects.platform.commons)
+	api(projects.junitPlatformCommons)
 
 	testImplementation(libs.assertj)
 }
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index 3aaeb32fb78b..ebcc646c8b29 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 description = "JUnit Platform Flight Recorder Support"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.launcher)
+	api(projects.junitPlatformLauncher)
 }
 
 javaLibrary {
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
index 89355b7abf98..a80a02901aac 100644
--- a/junit-platform-launcher/junit-platform-launcher.gradle.kts
+++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 description = "JUnit Platform Launcher"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.engine)
+	api(projects.junitPlatformEngine)
 }
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index b872ef23b69e..3b33528cbe97 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 description = "JUnit Platform Reporting"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.launcher)
+	api(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index 6f864fe0bf12..9a12966b91b5 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -8,16 +8,16 @@ plugins {
 description = "JUnit Platform Runner"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.junit4)
 	api(libs.apiguardian)
-	api(projects.platform.launcher)
-	api(projects.platform.suite.api)
+	api(projects.junitPlatformLauncher)
+	api(projects.junitPlatformSuiteApi)
 
-	implementation(projects.platform.suite.commons)
+	implementation(projects.junitPlatformSuiteCommons)
 
-	testImplementation(testFixtures(projects.platform.engine))
-	testImplementation(testFixtures(projects.platform.launcher))
+	testImplementation(testFixtures(projects.junitPlatformEngine))
+	testImplementation(testFixtures(projects.junitPlatformLauncher))
 }
 
 tasks.jar {
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
index 9845a3142657..84011b85987a 100644
--- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
+++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 description = "JUnit Platform Suite API"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.commons)
+	api(projects.junitPlatformCommons)
 
-	osgiVerification(projects.platform.commons)
+	osgiVerification(projects.junitPlatformCommons)
 }
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 155ced0af6a1..4c0aa95c9d52 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -6,12 +6,12 @@ plugins {
 description = "JUnit Platform Suite Commons"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.launcher)
+	api(projects.junitPlatformLauncher)
 
-	implementation(projects.platform.engine)
-	implementation(projects.platform.suite.api)
+	implementation(projects.junitPlatformEngine)
+	implementation(projects.junitPlatformSuiteApi)
 
-	testImplementation(projects.jupiter.engine)
+	testImplementation(projects.junitJupiterEngine)
 }
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index 6a9a5dd1e4d5..701b5ec1ef68 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -7,16 +7,16 @@ plugins {
 description = "JUnit Platform Suite Engine"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.engine)
-	api(projects.platform.suite.api)
+	api(projects.junitPlatformEngine)
+	api(projects.junitPlatformSuiteApi)
 
-	implementation(projects.platform.suite.commons)
+	implementation(projects.junitPlatformSuiteCommons)
 
-	testFixturesApi(projects.jupiter.api)
-	testFixturesApi(projects.platform.suite.api)
+	testFixturesApi(projects.junitJupiterApi)
+	testFixturesApi(projects.junitPlatformSuiteApi)
 
-	testImplementation(projects.platform.testkit)
-	testImplementation(projects.jupiter.engine)
+	testImplementation(projects.junitPlatformTestkit)
+	testImplementation(projects.junitJupiterEngine)
 }
diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
index f1c104ab9efe..67ec26ab10a2 100644
--- a/junit-platform-suite/junit-platform-suite.gradle.kts
+++ b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 description = "JUnit Platform Suite (Aggregator)"
 
 dependencies {
-	api(platform(projects.bom))
-	api(projects.platform.suite.api)
-	implementation(projects.platform.suite.engine)
+	api(platform(projects.junitBom))
+	api(projects.junitPlatformSuiteApi)
+	implementation(projects.junitPlatformSuiteEngine)
 }
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
index 8defbaae230b..d3b45822f96d 100644
--- a/junit-platform-testkit/junit-platform-testkit.gradle.kts
+++ b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 description = "JUnit Platform Test Kit"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
 	api(libs.assertj)
 	api(libs.opentest4j)
-	api(projects.platform.launcher)
+	api(projects.junitPlatformLauncher)
 }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index d6b53b33da81..a0433fbec2c0 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -11,18 +11,18 @@ plugins {
 description = "JUnit Vintage Engine"
 
 dependencies {
-	api(platform(projects.bom))
+	api(platform(projects.junitBom))
 	api(libs.apiguardian)
-	api(projects.platform.engine)
+	api(projects.junitPlatformEngine)
 	api(libs.junit4)
 
 	testFixturesApi(platform(libs.groovy2.bom))
 	testFixturesApi(libs.spock1)
-	testFixturesImplementation(projects.platform.runner)
+	testFixturesImplementation(projects.junitPlatformRunner)
 
-	testImplementation(projects.platform.launcher)
-	testImplementation(projects.platform.runner)
-	testImplementation(projects.platform.testkit)
+	testImplementation(projects.junitPlatformLauncher)
+	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformTestkit)
 }
 
 tasks {
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 979e7068b2de..276f78759fca 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -9,32 +9,32 @@ plugins {
 
 dependencies {
 	// --- Things we are testing --------------------------------------------------
-	testImplementation(projects.platform.commons)
-	testImplementation(projects.platform.console)
-	testImplementation(projects.platform.engine)
-	testImplementation(projects.platform.jfr)
-	testImplementation(projects.platform.launcher)
+	testImplementation(projects.junitPlatformCommons)
+	testImplementation(projects.junitPlatformConsole)
+	testImplementation(projects.junitPlatformEngine)
+	testImplementation(projects.junitPlatformJfr)
+	testImplementation(projects.junitPlatformLauncher)
 
 	// --- Things we are testing with ---------------------------------------------
-	testImplementation(projects.platform.runner)
-	testImplementation(projects.platform.testkit)
-	testImplementation(testFixtures(projects.platform.commons))
-	testImplementation(testFixtures(projects.platform.engine))
-	testImplementation(testFixtures(projects.platform.launcher))
-	testImplementation(projects.jupiter.engine)
+	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformTestkit)
+	testImplementation(testFixtures(projects.junitPlatformCommons))
+	testImplementation(testFixtures(projects.junitPlatformEngine))
+	testImplementation(testFixtures(projects.junitPlatformLauncher))
+	testImplementation(projects.junitJupiterEngine)
 	testImplementation(libs.apiguardian)
 	testImplementation(libs.jfrunit)
 	testImplementation(libs.joox)
 
 	// --- Test run-time dependencies ---------------------------------------------
-	testRuntimeOnly(projects.vintage.engine)
+	testRuntimeOnly(projects.junitVintageEngine)
 	testRuntimeOnly(libs.groovy3) {
 		because("`ReflectionUtilsTests.findNestedClassesWithInvalidNestedClassFile` needs it")
 	}
 
 	// --- https://openjdk.java.net/projects/code-tools/jmh/ -----------------------
 	jmh(libs.jmh.core)
-	jmh(projects.jupiter.api)
+	jmh(projects.junitJupiterApi)
 	jmh(libs.junit4)
 	jmhAnnotationProcessor(libs.jmh.generator.annprocess)
 }
@@ -70,12 +70,12 @@ tasks {
 
 eclipse {
 	classpath {
-		plusConfigurations.add(projects.platform.console.configurations["shadowed"])
+		plusConfigurations.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"])
 	}
 }
 
 idea {
 	module {
-		scopes["PROVIDED"]!!["plus"]!!.add(projects.platform.console.configurations["shadowed"])
+		scopes["PROVIDED"]!!["plus"]!!.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"])
 	}
 }
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index bf54593ac0d9..7310badca306 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -44,7 +44,7 @@ tasks.test {
 		val mavenizedProjects: List<Project> by rootProject
 		val tempRepoName: String by rootProject
 
-		(mavenizedProjects + projects.bom)
+		(mavenizedProjects + projects.junitBom.dependencyProject)
 				.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") }
 				.forEach { dependsOn(it) }
 	}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 468b21ba55f3..72826880a4c8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -132,3 +132,4 @@ rootProject.children.forEach { project ->
 }
 
 enableFeaturePreview("VERSION_CATALOGS")
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

From bbdb56103a7c394e715858c93a992547a2bb7dd9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 15 Apr 2021 19:55:42 +0200
Subject: [PATCH 0296/1433] Fix jacocoMerge task

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0aa286988901..6f61363dd5a9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -84,7 +84,7 @@ val jacocoTestProjects = listOf(
 		projects.junitPlatformSuiteEngine,
 		projects.junitVintageEngine,
 		projects.platformTests
-)
+).map { it.dependencyProject }
 val jacocoCoveredProjects = modularProjects
 val jacocoClassesDir = file("$buildDir/jacoco/classes")
 

From ddf881c0d4726572150dbb5c64e388ac6e8e70fa Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 15 Apr 2021 09:18:08 +0200
Subject: [PATCH 0297/1433] Update ArchUnit to 0.18.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fafce9a52ecc..0b961306c8d5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ surefire = "2.22.2"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.17.0" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.18.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }

From 8f81c3477cfacd9777acdd0620ac2ecb6d8f4439 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 16 Apr 2021 08:17:09 +0200
Subject: [PATCH 0298/1433] Resolve build deprecation warning

---
 documentation/documentation.gradle.kts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index c223b69da7b1..ed8a0096740a 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -396,8 +396,12 @@ tasks {
 		}
 	}
 
+	gitPublishCopy {
+		dependsOn(prepareDocsForUploadToGhPages, createCurrentDocsFolder)
+	}
+
 	gitPublishCommit {
-		dependsOn(prepareDocsForUploadToGhPages, createCurrentDocsFolder, configureGitAuthor)
+		dependsOn(configureGitAuthor)
 	}
 }
 

From f1ee6b58c1d1dc2e118ace69ae9e76b27a605a77 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Fri, 16 Apr 2021 15:06:01 +0200
Subject: [PATCH 0299/1433] Exclude compiled module descriptors from shadowed
 JAR files

Prior to this commit, compiled module descriptors (`module-info.class` files)
weren't excluded while creating the JUnit Platform Console Standalone JAR
file. Due to an external change (#2551), one of the shadowed JAR files supplied
a compiled module descriptor that; which in turn was persisted in the JAR file
of this standalone artifact.

This commit excludes all external module descriptor from shadowed JAR files.
It also ensures, that the JUnit Platform Console Standalone JAR file is free
of any module-info.class file.

Fixes #2557
Closes #2558
---
 ...unit-platform-console-standalone.gradle.kts |  3 +++
 .../platform/tooling/support/MavenRepo.java    |  5 ++++-
 .../tooling/support/tests/StandaloneTests.java | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 03544646a5f2..efd599163243 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -25,6 +25,9 @@ tasks {
 		}
 	}
 	shadowJar {
+		// https://github.com/junit-team/junit5/issues/2557
+		// exclude compiled module declarations from any source (e.g. /*, /META-INF/versions/N/*)
+		exclude("**/module-info.class")
 		// https://github.com/junit-team/junit5/issues/761
 		// prevent duplicates, add 3rd-party licenses explicitly
 		exclude("META-INF/LICENSE*.md")
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
index d0cf8151ccfb..d6e5bd2b9130 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
@@ -16,6 +16,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 public class MavenRepo {
 
@@ -23,7 +24,9 @@ private MavenRepo() {
 	}
 
 	public static Path dir() {
-		return Path.of(System.getProperty("maven.repo"));
+		var candidates = Stream.of(Path.of("../build/repo"));
+		var candidate = candidates.filter(Files::isDirectory).findFirst().orElse(Path.of("build/repo"));
+		return Path.of(System.getProperty("maven.repo", candidate.toString()));
 	}
 
 	public static Path jar(String artifactId) {
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 9a13a30a19c1..70a852c997d5 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -16,7 +16,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 
 import de.sormuras.bartholdy.jdk.Jar;
@@ -39,6 +41,22 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class StandaloneTests {
 
+	@Test
+	void jarFileWithoutCompiledModuleDescriptorClass() throws Exception {
+		var jar = MavenRepo.jar("junit-platform-console-standalone");
+		var name = "module-info.class";
+		var found = new ArrayList<Path>();
+		try (var fileSystem = FileSystems.newFileSystem(jar)) {
+			for (var rootDirectory : fileSystem.getRootDirectories()) {
+				try (var stream = Files.walk(rootDirectory)) {
+					stream.filter(path -> path.getNameCount() > 0) // skip root entry
+							.filter(path -> path.getFileName().toString().equals(name)).forEach(found::add);
+				}
+			}
+		}
+		assertTrue(found.isEmpty(), jar + " must not contain any " + name + " files: " + found);
+	}
+
 	@Test
 	@Order(1)
 	void compile() throws Exception {

From d1c54510d6e71cffa21dce8240b8874c2d6c8165 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 16 Apr 2021 15:45:15 +0200
Subject: [PATCH 0300/1433] Move Platform Suite tests to platform-tests module

This relocation is necessary in order to allow the projects to be
imported into Eclipse IDE without cycles in the classpath.
---
 .../junit-platform-suite-commons.gradle.kts               | 3 ---
 .../junit-platform-suite-engine.gradle.kts                | 8 --------
 platform-tests/platform-tests.gradle.kts                  | 2 ++
 .../platform/launcher/core/LauncherFactoryTests.java      | 5 +++--
 .../commons/SuiteLauncherDiscoveryRequestBuilderTest.java | 0
 .../org/junit/platform/suite/engine/SuiteEngineTest.java  | 0
 .../platform/suite/engine/SuiteTestDescriptorTest.java    | 0
 .../org/junit/platform/suite}/testcases/DynamicTest.java  | 0
 .../org/junit/platform/suite}/testcases/MultipleTest.java | 0
 .../org/junit/platform/suite}/testcases/SimpleTest.java   | 0
 .../junit/platform/suite}/testsuites/AbstractSuite.java   | 0
 .../org/junit/platform/suite}/testsuites/CyclicSuite.java | 0
 .../junit/platform/suite}/testsuites/DynamicSuite.java    | 0
 .../junit/platform/suite}/testsuites/MultipleSuite.java   | 0
 .../org/junit/platform/suite}/testsuites/NestedSuite.java | 0
 .../platform/suite}/testsuites/SelectClassesSuite.java    | 0
 .../platform/suite}/testsuites/SuiteDisplayNameSuite.java | 0
 .../org/junit/platform/suite}/testsuites/SuiteSuite.java  | 0
 18 files changed, 5 insertions(+), 13 deletions(-)
 rename {junit-platform-suite-commons => platform-tests}/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java (100%)
 rename {junit-platform-suite-engine => platform-tests}/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java (100%)
 rename {junit-platform-suite-engine => platform-tests}/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testcases/DynamicTest.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testcases/MultipleTest.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testcases/SimpleTest.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testsuites/AbstractSuite.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testsuites/CyclicSuite.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testsuites/DynamicSuite.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testsuites/MultipleSuite.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testsuites/NestedSuite.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testsuites/SelectClassesSuite.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testsuites/SuiteDisplayNameSuite.java (100%)
 rename {junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine => platform-tests/src/test/java/org/junit/platform/suite}/testsuites/SuiteSuite.java (100%)

diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 4c0aa95c9d52..63b089a7cb56 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
 	`java-library-conventions`
-	`testing-conventions`
 }
 
 description = "JUnit Platform Suite Commons"
@@ -12,6 +11,4 @@ dependencies {
 
 	implementation(projects.junitPlatformEngine)
 	implementation(projects.junitPlatformSuiteApi)
-
-	testImplementation(projects.junitJupiterEngine)
 }
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index 701b5ec1ef68..3471aada3f72 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -1,7 +1,5 @@
 plugins {
 	`java-library-conventions`
-	`testing-conventions`
-	`java-test-fixtures`
 }
 
 description = "JUnit Platform Suite Engine"
@@ -13,10 +11,4 @@ dependencies {
 	api(projects.junitPlatformSuiteApi)
 
 	implementation(projects.junitPlatformSuiteCommons)
-
-	testFixturesApi(projects.junitJupiterApi)
-	testFixturesApi(projects.junitPlatformSuiteApi)
-
-	testImplementation(projects.junitPlatformTestkit)
-	testImplementation(projects.junitJupiterEngine)
 }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 276f78759fca..1e19216bc66a 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -14,6 +14,8 @@ dependencies {
 	testImplementation(projects.junitPlatformEngine)
 	testImplementation(projects.junitPlatformJfr)
 	testImplementation(projects.junitPlatformLauncher)
+	testImplementation(projects.junitPlatformSuiteCommons)
+	testImplementation(projects.junitPlatformSuiteEngine)
 
 	// --- Things we are testing with ---------------------------------------------
 	testImplementation(projects.junitPlatformRunner)
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 31e0d98080f9..30400989c8b9 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -72,7 +72,7 @@ void create() {
 
 		var testPlan = LauncherFactory.create().discover(discoveryRequest);
 		var roots = testPlan.getRoots();
-		assertThat(roots).hasSize(2);
+		assertThat(roots).hasSize(3);
 
 		// @formatter:off
 		var ids = roots.stream()
@@ -80,7 +80,8 @@ void create() {
 				.collect(toList());
 		// @formatter:on
 
-		assertThat(ids).containsOnly("[engine:junit-vintage]", "[engine:junit-jupiter]");
+		assertThat(ids).containsOnly("[engine:junit-vintage]", "[engine:junit-jupiter]",
+			"[engine:junit-platform-suite]");
 	}
 
 	@Test
diff --git a/junit-platform-suite-commons/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java
similarity index 100%
rename from junit-platform-suite-commons/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java
diff --git a/junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java
similarity index 100%
rename from junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java
diff --git a/junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java
similarity index 100%
rename from junit-platform-suite-engine/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/DynamicTest.java b/platform-tests/src/test/java/org/junit/platform/suite/testcases/DynamicTest.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/DynamicTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testcases/DynamicTest.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/MultipleTest.java b/platform-tests/src/test/java/org/junit/platform/suite/testcases/MultipleTest.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/MultipleTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testcases/MultipleTest.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/SimpleTest.java b/platform-tests/src/test/java/org/junit/platform/suite/testcases/SimpleTest.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testcases/SimpleTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testcases/SimpleTest.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/testsuites/AbstractSuite.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testsuites/AbstractSuite.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/testsuites/CyclicSuite.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testsuites/CyclicSuite.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/testsuites/DynamicSuite.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testsuites/DynamicSuite.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/testsuites/MultipleSuite.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testsuites/MultipleSuite.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/testsuites/NestedSuite.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testsuites/NestedSuite.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/testsuites/SelectClassesSuite.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testsuites/SelectClassesSuite.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/testsuites/SuiteDisplayNameSuite.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testsuites/SuiteDisplayNameSuite.java
diff --git a/junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/testsuites/SuiteSuite.java
similarity index 100%
rename from junit-platform-suite-engine/src/testFixtures/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/testsuites/SuiteSuite.java

From 2f690ef5081ac232df1682e035d71a7626465502 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 16 Apr 2021 16:05:57 +0200
Subject: [PATCH 0301/1433] Move Suite test fixtures to correct folder

The source code for Suite test fixtures now resides in a folder that
matches the package name used in the classes.
---
 .../junit/platform/suite/{ => engine}/testcases/DynamicTest.java  | 0
 .../junit/platform/suite/{ => engine}/testcases/MultipleTest.java | 0
 .../junit/platform/suite/{ => engine}/testcases/SimpleTest.java   | 0
 .../platform/suite/{ => engine}/testsuites/AbstractSuite.java     | 0
 .../junit/platform/suite/{ => engine}/testsuites/CyclicSuite.java | 0
 .../platform/suite/{ => engine}/testsuites/DynamicSuite.java      | 0
 .../platform/suite/{ => engine}/testsuites/MultipleSuite.java     | 0
 .../junit/platform/suite/{ => engine}/testsuites/NestedSuite.java | 0
 .../suite/{ => engine}/testsuites/SelectClassesSuite.java         | 0
 .../suite/{ => engine}/testsuites/SuiteDisplayNameSuite.java      | 0
 .../junit/platform/suite/{ => engine}/testsuites/SuiteSuite.java  | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testcases/DynamicTest.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testcases/MultipleTest.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testcases/SimpleTest.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testsuites/AbstractSuite.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testsuites/CyclicSuite.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testsuites/DynamicSuite.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testsuites/MultipleSuite.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testsuites/NestedSuite.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testsuites/SelectClassesSuite.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testsuites/SuiteDisplayNameSuite.java (100%)
 rename platform-tests/src/test/java/org/junit/platform/suite/{ => engine}/testsuites/SuiteSuite.java (100%)

diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testcases/DynamicTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTest.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testcases/DynamicTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTest.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testcases/MultipleTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTest.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testcases/MultipleTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTest.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testcases/SimpleTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SimpleTest.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testcases/SimpleTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SimpleTest.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testsuites/AbstractSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testsuites/AbstractSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testsuites/CyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testsuites/CyclicSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testsuites/DynamicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testsuites/DynamicSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testsuites/MultipleSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testsuites/MultipleSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testsuites/NestedSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testsuites/NestedSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testsuites/SelectClassesSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testsuites/SelectClassesSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testsuites/SuiteDisplayNameSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testsuites/SuiteDisplayNameSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/testsuites/SuiteSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
similarity index 100%
rename from platform-tests/src/test/java/org/junit/platform/suite/testsuites/SuiteSuite.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java

From 727f51d316f49074c7fb82e7f1136bfbb42e5a9a Mon Sep 17 00:00:00 2001
From: Oliver Weiler <oliver.weiler@meinestadt.de>
Date: Fri, 9 Apr 2021 13:42:38 +0200
Subject: [PATCH 0302/1433] Introduce Named.named() as an alias for Named.of()

Closes #2591
---
 .../release-notes/release-notes-5.8.0-M2.adoc | 61 +++++++++++++++++++
 .../java/org/junit/jupiter/api/Named.java     | 29 +++++++++
 .../ParameterizedTestIntegrationTests.java    | 20 ++++++
 3 files changed, 110 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
new file mode 100644
index 000000000000..5807e436541e
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -0,0 +1,61 @@
+// TODO: replace all occurrences of ⚠️ with appropriate values, delete this comment, and
+// 'include:' this new file in index.adoc.
+[[release-notes-⚠️]]
+== ⚠️
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/⚠️?closed=1+[⚠️] milestone page in the JUnit repository on
+GitHub.
+
+
+[[release-notes-⚠️-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-⚠️-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* New `named()` static factory method in the `Named` interface that serves as an
+  _alias_ for `Named.of()`. `named()` is intended to be used via `import static`.
+
+
+[[release-notes-⚠️-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
index cd2b6cfbccd5..c1e01367e337 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
@@ -18,10 +18,22 @@
  * {@code Named} is used to wrap an object and give it a name.
  *
  * @param <T> the type of the payload
+ *
+ * @since 5.8
  */
 @API(status = STABLE, since = "5.8")
 public interface Named<T> {
 
+	/**
+	 * Factory method for creating an instance of {@code Named} based on a
+	 * {@code name} and a {@code payload}.
+	 *
+	 * @param name the name to be used for the wrapped object
+	 * @param payload the object to be wrapped
+	 * @param <T> the type of the payload
+	 * @return an instance of {@code Named}; never {@code null}
+	 * @see #named(String, java.lang.Object)
+	 */
 	static <T> Named<T> of(String name, T payload) {
 		return new Named<T>() {
 			@Override
@@ -41,6 +53,23 @@ public String toString() {
 		};
 	}
 
+	/**
+	 * Factory method for creating an instance of {@code Named} based on a
+	 * {@code name} and a {@code payload}.
+	 *
+	 * <p>This method is an <em>alias</em> for {@link Named#of} and is
+	 * intended to be used when statically imported &mdash; for example, via:
+	 * {@code import static org.junit.jupiter.api.Named.named;}
+	 *
+	 * @param name the name to be used for the wrapped object
+	 * @param payload the object to be wrapped
+	 * @param <T> the type of the payload
+	 * @return an instance of {@code Named}; never {@code null}
+	 */
+	static <T> Named<T> named(String name, T payload) {
+		return of(name, payload);
+	}
+
 	String getName();
 
 	T getPayload();
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 69da7f6d47f2..14c6df5c5835 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Named.named;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
@@ -646,6 +647,15 @@ void namedParameters() {
 						event(test(), displayName("default name"), finishedWithFailure(message("default name"))));
 		}
 
+		@Test
+		void nameParametersAlias() {
+			execute("namedParametersAlias", String.class).allEvents().assertThatEvents() //
+					.haveAtLeast(1,
+						event(test(), displayName("cool name"), finishedWithFailure(message("parameter value")))) //
+					.haveAtLeast(1,
+						event(test(), displayName("default name"), finishedWithFailure(message("default name"))));
+		}
+
 	}
 
 	@Nested
@@ -1036,6 +1046,12 @@ void namedParameters(String string) {
 			fail(string);
 		}
 
+		@MethodSourceTest
+		@Order(14)
+		void namedParametersAlias(String string) {
+			fail(string);
+		}
+
 		// ---------------------------------------------------------------------
 
 		static Stream<Arguments> emptyMethodSource() {
@@ -1097,6 +1113,10 @@ static Stream<Arguments> namedParameters() {
 			return Stream.of(arguments(Named.of("cool name", "parameter value")), arguments("default name"));
 		}
 
+		static Stream<Arguments> namedParametersAlias() {
+			return Stream.of(arguments(named("cool name", "parameter value")), arguments("default name"));
+		}
+
 		// ---------------------------------------------------------------------
 
 		@MethodSourceTest

From ce567289b26f3e9c2591b1ab2444f7ae3f4d28a6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 16 Apr 2021 18:13:43 +0200
Subject: [PATCH 0303/1433] Polish Named Javadoc and add precondition

---
 .../java/org/junit/jupiter/api/Named.java     | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
index c1e01367e337..d707529a7e50 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
@@ -13,9 +13,10 @@
 import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
+import org.junit.platform.commons.util.Preconditions;
 
 /**
- * {@code Named} is used to wrap an object and give it a name.
+ * {@code Named} is a container that associates a name with a given payload.
  *
  * @param <T> the type of the payload
  *
@@ -28,13 +29,17 @@ public interface Named<T> {
 	 * Factory method for creating an instance of {@code Named} based on a
 	 * {@code name} and a {@code payload}.
 	 *
-	 * @param name the name to be used for the wrapped object
-	 * @param payload the object to be wrapped
+	 * @param name the name associated with the payload; never {@code null} or
+	 * blank
+	 * @param payload the object that serves as the payload; may be {@code null}
+	 * depending on the use case
 	 * @param <T> the type of the payload
 	 * @return an instance of {@code Named}; never {@code null}
 	 * @see #named(String, java.lang.Object)
 	 */
 	static <T> Named<T> of(String name, T payload) {
+		Preconditions.notBlank(name, "name must not be null or blank");
+
 		return new Named<T>() {
 			@Override
 			public String getName() {
@@ -61,8 +66,10 @@ public String toString() {
 	 * intended to be used when statically imported &mdash; for example, via:
 	 * {@code import static org.junit.jupiter.api.Named.named;}
 	 *
-	 * @param name the name to be used for the wrapped object
-	 * @param payload the object to be wrapped
+	 * @param name the name associated with the payload; never {@code null} or
+	 * blank
+	 * @param payload the object that serves as the payload; may be {@code null}
+	 * depending on the use case
 	 * @param <T> the type of the payload
 	 * @return an instance of {@code Named}; never {@code null}
 	 */
@@ -70,8 +77,18 @@ static <T> Named<T> named(String name, T payload) {
 		return of(name, payload);
 	}
 
+	/**
+	 * Get the name of the payload.
+	 *
+	 * @return the name of the payload; never {@code null} or blank
+	 */
 	String getName();
 
+	/**
+	 * Get the payload.
+	 *
+	 * @return the payload; may be {@code null} depending on the use case
+	 */
 	T getPayload();
 
 }

From 8d7cdf07388f922212d7f358682f39c3b28648ae Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 16 Apr 2021 18:30:30 +0200
Subject: [PATCH 0304/1433] Include 5.8 M2 in the generated release notes

---
 .../src/docs/asciidoc/release-notes/index.adoc   |  2 ++
 .../release-notes/release-notes-5.8.0-M2.adoc    | 16 +++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 1cd60e14ee5a..e9761bc7c414 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.8.0-M2.adoc[]
+
 include::{basedir}/release-notes-5.8.0-M1.adoc[]
 
 include::{basedir}/release-notes-5.7.1.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 5807e436541e..9f73ac01adcf 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -1,18 +1,16 @@
-// TODO: replace all occurrences of ⚠️ with appropriate values, delete this comment, and
-// 'include:' this new file in index.adoc.
-[[release-notes-⚠️]]
-== ⚠️
+[[release-notes-5.8.0-M2]]
+== 5.8.0-M2
 
 *Date of Release:* ❓
 
 *Scope:* ❓
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/⚠️?closed=1+[⚠️] milestone page in the JUnit repository on
-GitHub.
+link:{junit5-repo}+/milestone/55?closed=1+[5.8 M2] milestone page in the JUnit repository
+on GitHub.
 
 
-[[release-notes-⚠️-junit-platform]]
+[[release-notes-5.8.0-M2-junit-platform]]
 === JUnit Platform
 
 ==== Bug Fixes
@@ -28,7 +26,7 @@ GitHub.
 * ❓
 
 
-[[release-notes-⚠️-junit-jupiter]]
+[[release-notes-5.8.0-M2-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -45,7 +43,7 @@ GitHub.
   _alias_ for `Named.of()`. `named()` is intended to be used via `import static`.
 
 
-[[release-notes-⚠️-junit-vintage]]
+[[release-notes-5.8.0-M2-junit-vintage]]
 === JUnit Vintage
 
 ==== Bug Fixes

From ea448484a73e60a88f67779256e2b9ccdc8574ef Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 16 Apr 2021 20:34:38 +0200
Subject: [PATCH 0305/1433] Disable inferring module path to fix Eclipse

---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index cc11a6b4e807..5a9b2ad2d734 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -33,6 +33,10 @@ eclipse {
 	}
 }
 
+java {
+	modularity.inferModulePath.set(false)
+}
+
 if (project in mavenizedProjects) {
 
 	apply(plugin = "publishing-conventions")

From 204e3b217993b7a62801aa2e81b863d5bc92b5af Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 16 Apr 2021 20:49:23 +0200
Subject: [PATCH 0306/1433] Fix circular dependency in Eclipse

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 3f04b3535976..5049363e737f 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
 	"testImplementation"(libs.findDependency("assertj").get())
 	"testImplementation"(libs.findDependency("mockito").get())
 
-	if (project != project(":junit-jupiter-engine")) {
+	if (!project.name.startsWith("junit-jupiter")) {
 		"testImplementation"(project(":junit-jupiter"))
 	}
 	"testImplementation"(testFixtures(project(":junit-jupiter-api")))

From dfee0b923edf650c31a98abd5d3639baceae2eef Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 16 Apr 2021 20:56:17 +0200
Subject: [PATCH 0307/1433] Remove suite projects from JaCoCo config

---
 build.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6f61363dd5a9..e2ffbe4960e3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -80,8 +80,6 @@ val jacocoTestProjects = listOf(
 		projects.junitJupiterMigrationsupport,
 		projects.junitJupiterParams,
 		projects.junitPlatformRunner,
-		projects.junitPlatformSuiteCommons,
-		projects.junitPlatformSuiteEngine,
 		projects.junitVintageEngine,
 		projects.platformTests
 ).map { it.dependencyProject }

From 600cd7d3d0d372fa3f96471807cdcc5d1a4a077e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 20 Apr 2021 22:10:01 +0200
Subject: [PATCH 0308/1433] Update to Groovy 3.0.8

---
 .../main/kotlin/java-toolchain-conventions.gradle.kts    | 9 ---------
 gradle/libs.versions.toml                                | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index ed8746404c4b..c281cdcd49ad 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -14,15 +14,6 @@ project.pluginManager.withPlugin("java") {
 			kotlinOptions.jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
 		}
 	}
-	tasks.withType<JavaCompile>().configureEach {
-		javaCompiler.set(compiler)
-	}
-	tasks.withType<GroovyCompile>().configureEach {
-		javaLauncher.set(javaToolchainService.launcherFor {
-			// Groovy does not yet support JDK 17, see https://issues.apache.org/jira/browse/GROOVY-9943
-			languageVersion.set(minOf(javaLanguageVersion, defaultLanguageVersion))
-		})
-	}
 	tasks.withType<JavaExec>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor(extension.toolchain))
 	}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0b961306c8d5..e7a96785449b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.104" }
 commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
-groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.7" }
+groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.8" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "main-SNAPSHOT" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }

From da6879b973a3d5910ed97c4809f1f0a6bcef404b Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Fri, 23 Apr 2021 13:24:14 +0200
Subject: [PATCH 0309/1433] Set JMH's fork option to `1`

The current version of JMH, namely 1.29, does not produce too long
command lines on Windows. This renders setting `fork = 0` superseded.

Find more details at https://github.com/openjdk/jmh

Closes #1548
---
 platform-tests/platform-tests.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 1e19216bc66a..7d275f267040 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -45,7 +45,7 @@ jmh {
 	jmhVersion = libs.versions.jmh.get()
 
 	duplicateClassesStrategy = DuplicatesStrategy.WARN
-	fork = 0 // Too long command line on Windows...
+	fork = 1
 	warmupIterations = 1
 	iterations = 5
 }

From ddaec1bb07b6a3ed3afd318bc9412d9e848b499f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 23 Apr 2021 17:21:23 +0200
Subject: [PATCH 0310/1433] Require Java 11+ for Gradle build in
 settings.gradle.kts

---
 settings.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 72826880a4c8..7eedcb8f0432 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -89,8 +89,8 @@ buildCache {
 }
 
 val javaVersion = JavaVersion.current()
-require(javaVersion.isJava9Compatible) {
-	"The JUnit 5 build requires Java 9 or higher. Currently executing with Java ${javaVersion.majorVersion}."
+require(javaVersion.isJava11Compatible) {
+	"The JUnit 5 build requires Java 11 or higher. Currently executing with Java ${javaVersion.majorVersion}."
 }
 
 rootProject.name = "junit5"

From 573abe6d53dfe6dcfd8aace5c3c786f5aa25c641 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Apr 2021 16:25:51 +0200
Subject: [PATCH 0311/1433] Fix NPE when filtering SuiteMethod runner

Fixes #2601.
---
 .../docs/asciidoc/release-notes/index.adoc    |  2 ++
 .../release-notes/release-notes-5.7.2.adoc    | 34 +++++++++++++++++++
 .../descriptor/RunnerTestDescriptor.java      |  5 ++-
 .../VintageLauncherIntegrationTests.java      | 25 ++++++++++++++
 4 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index e9761bc7c414..930b50d525af 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -20,6 +20,8 @@ include::{basedir}/release-notes-5.8.0-M2.adoc[]
 
 include::{basedir}/release-notes-5.8.0-M1.adoc[]
 
+include::{basedir}/release-notes-5.7.2.adoc[]
+
 include::{basedir}/release-notes-5.7.1.adoc[]
 
 include::{basedir}/release-notes-5.7.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
new file mode 100644
index 000000000000..2e44999d67e4
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
@@ -0,0 +1,34 @@
+[[release-notes-5.7.2]]
+== 5.7.2
+
+*Date of Release:* ❓
+
+*Scope:* Bug fixes since 5.7.1
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/56?closed=1+[5.7.2] milestone page in the JUnit repository on
+GitHub.
+
+
+[[release-notes-5.7.2-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+
+[[release-notes-5.7.2-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+
+[[release-notes-5.7.2-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* Fix `NullPointerException` that occurred when using JUnit 3 style `suite()` methods in conjunction with `PostDiscoveryFilters`.
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
index 047ce94ebb11..18d567b32ccc 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
@@ -115,8 +115,7 @@ else if (rejectedExclusions.containsAll(getDescription().getChildren())) {
 	private void logIncompleteFiltering() {
 		if (runner instanceof Filterable) {
 			logger.warn(() -> "Runner " + getRunnerToReport().getClass().getName() //
-					+ " (used on class " + getDescription().getTestClass().getName()
-					+ ") was not able to satisfy all filter requests.");
+					+ " (used on class " + getLegacyReportingName() + ") was not able to satisfy all filter requests.");
 		}
 		else {
 			warnAboutUnfilterableRunner();
@@ -125,7 +124,7 @@ private void logIncompleteFiltering() {
 
 	private void warnAboutUnfilterableRunner() {
 		logger.warn(() -> "Runner " + getRunnerToReport().getClass().getName() //
-				+ " (used on class " + getDescription().getTestClass().getName() + ") does not support filtering" //
+				+ " (used on class " + getLegacyReportingName() + ") does not support filtering" //
 				+ " and will therefore be run completely.");
 	}
 
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
index 2730315e52b3..47b3397e8b88 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
@@ -26,6 +26,7 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
+import org.junit.internal.runners.SuiteMethod;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.platform.commons.logging.LogRecordListener;
@@ -39,6 +40,8 @@
 import org.junit.platform.launcher.core.LauncherFactory;
 import org.junit.runners.Suite;
 import org.junit.vintage.engine.descriptor.RunnerTestDescriptor;
+import org.junit.vintage.engine.samples.junit3.JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails;
+import org.junit.vintage.engine.samples.junit3.PlainJUnit3TestCaseWithSingleTestWhichFails;
 import org.junit.vintage.engine.samples.junit4.Categories;
 import org.junit.vintage.engine.samples.junit4.EnclosedJUnit4TestCase;
 import org.junit.vintage.engine.samples.junit4.JUnit4SuiteOfSuiteWithFilterableChildRunner;
@@ -191,6 +194,28 @@ void executesAllTestsForNotFilterableChildRunnerOfSuite(LogRecordListener logRec
 						+ " was not able to satisfy all filter requests.");
 	}
 
+	@TrackLogRecords
+	@Test
+	void executesAllTestsWhenFilterDidNotExcludeTestForJUnit3Suite(LogRecordListener logRecordListener) {
+		Class<?> suiteClass = JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.class;
+		Class<?> testClass = PlainJUnit3TestCaseWithSingleTestWhichFails.class;
+		var request = request() //
+				.selectors(selectClass(suiteClass)) //
+				.filters((PostDiscoveryFilter) descriptor -> excluded("not today"));
+
+		var testPlan = discover(request);
+		logRecordListener.clear();
+		assertThat(testPlan.getDescendants(getOnlyElement(testPlan.getRoots()))).hasSize(3);
+
+		var results = execute(request);
+		assertThat(results.keySet().stream().map(TestIdentifier::getDisplayName)) //
+				.containsExactlyInAnyOrder("JUnit Vintage", suiteClass.getSimpleName(), testClass.getName(), "test");
+		assertThat(logRecordListener.stream(RunnerTestDescriptor.class, Level.WARNING).map(LogRecord::getMessage)) //
+				.containsExactly(
+					"Runner " + SuiteMethod.class.getName() + " (used on class " + suiteClass.getName() + ")" //
+							+ " was not able to satisfy all filter requests.");
+	}
+
 	@Test
 	void executesOnlyTaggedMethodsForSuite() {
 		Class<?> suiteClass = JUnit4SuiteWithTwoTestCases.class;

From ec2afa1ccbc5637e0f9f3a61d8369adee220a5c2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Apr 2021 17:45:50 +0200
Subject: [PATCH 0312/1433] Clarify that JUnit 4.12 or later is required for
 Vintage engine

Resolves #2599.
---
 documentation/src/docs/asciidoc/user-guide/overview.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/overview.adoc b/documentation/src/docs/asciidoc/user-guide/overview.adoc
index afad42176c2f..b4b1b96d64a1 100644
--- a/documentation/src/docs/asciidoc/user-guide/overview.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/overview.adoc
@@ -36,7 +36,7 @@ support for the JUnit Platform also exists in popular IDEs (see
 sub-project provides a `TestEngine` for running Jupiter based tests on the platform.
 
 **JUnit Vintage** provides a `TestEngine` for running JUnit 3 and JUnit 4 based tests on
-the platform.
+the platform. It requires JUnit 4.12 or later to be present on the class/module path.
 
 [[overview-java-versions]]
 === Supported Java Versions

From d597bb5826ff7c5ccb77e3ed94109ae15dfd5e1d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 25 Apr 2021 18:38:18 +0200
Subject: [PATCH 0313/1433] Upgrade gradle-nexus.publish-plugin

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7eedcb8f0432..c376c711ddb0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,7 +19,7 @@ pluginManagement {
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"
 		id("me.champeau.gradle.jmh") version "0.5.3"
 		id("io.spring.nohttp") version "0.0.6.RELEASE"
-		id("io.github.gradle-nexus.publish-plugin") version "1.0.0"
+		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 	}
 }
 

From c62cd6ab1183e16b4d3b1c35358f0c31ada13108 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Wed, 12 May 2021 07:59:24 +0200
Subject: [PATCH 0314/1433] Fix package path computation in `ClasspathScanner`

Fix `getRootUrisForPackage()` in class `ClasspathScanner` by looking for two
"wordings" of a package name.

For example, package `foo.bar` is expanded to `foo/bar` and `foo/bar/`.
The latter allows find package `foo.bar` in a module called `foo.bar`,
and not `foo`.
This commit also ensures, that there's no regression (compared to #2531)
by launching test runs using the standalone artifact with `--select-package`
and `--scan-class-path`.

Fixes #2500
Fixes #2600
Fixes #2612
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  4 +-
 .../commons/util/ClasspathScanner.java        | 28 +++++++-
 .../support/tests/StandaloneTests.java        | 68 +++++++++++++++++++
 3 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 9f73ac01adcf..77973e5d40d6 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -15,7 +15,9 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Method `getRootUrisForPackage()` in class `ClasspathScanner` now returns a
+  valid list of class names when the package name is equal to the name of a
+  module on the module path and when running on Java 8.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
index c1cc51fab77b..4bac8c3cc789 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
@@ -25,7 +25,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -50,6 +52,8 @@ class ClasspathScanner {
 	private static final Logger logger = LoggerFactory.getLogger(ClasspathScanner.class);
 
 	private static final char CLASSPATH_RESOURCE_PATH_SEPARATOR = '/';
+	private static final String CLASSPATH_RESOURCE_PATH_SEPARATOR_STRING = String.valueOf(
+		CLASSPATH_RESOURCE_PATH_SEPARATOR);
 	private static final char PACKAGE_SEPARATOR_CHAR = '.';
 	private static final String PACKAGE_SEPARATOR_STRING = String.valueOf(PACKAGE_SEPARATOR_CHAR);
 
@@ -76,7 +80,8 @@ List<Class<?>> scanForClassesInPackage(String basePackageName, ClassFilter class
 		Preconditions.notNull(classFilter, "classFilter must not be null");
 		basePackageName = basePackageName.trim();
 
-		return findClassesForUris(getRootUrisForPackage(basePackageName), basePackageName, classFilter);
+		return findClassesForUris(getRootUrisForPackageNameOnClassPathAndModulePath(basePackageName), basePackageName,
+			classFilter);
 	}
 
 	List<Class<?>> scanForClassesInClasspathRoot(URI root, ClassFilter classFilter) {
@@ -212,12 +217,29 @@ private ClassLoader getClassLoader() {
 		return this.classLoaderSupplier.get();
 	}
 
+	private List<URI> getRootUrisForPackageNameOnClassPathAndModulePath(String basePackageName) {
+		Set<URI> uriSet = new LinkedHashSet<>(getRootUrisForPackage(basePackageName));
+		if (!basePackageName.isEmpty() && !basePackageName.endsWith(PACKAGE_SEPARATOR_STRING)) {
+			getRootUrisForPackage(basePackageName + PACKAGE_SEPARATOR_STRING).stream() //
+					.map(ClasspathScanner::removeTrailingClasspathResourcePathSeparator) //
+					.forEach(uriSet::add);
+		}
+		return new ArrayList<>(uriSet);
+	}
+
+	private static URI removeTrailingClasspathResourcePathSeparator(URI uri) {
+		String string = uri.toString();
+		if (string.endsWith(CLASSPATH_RESOURCE_PATH_SEPARATOR_STRING)) {
+			return URI.create(string.substring(0, string.length() - 1));
+		}
+		return uri;
+	}
+
 	private static String packagePath(String packageName) {
 		if (packageName.isEmpty()) {
 			return "";
 		}
-		String path = packageName.replace(PACKAGE_SEPARATOR_CHAR, CLASSPATH_RESOURCE_PATH_SEPARATOR);
-		return path + CLASSPATH_RESOURCE_PATH_SEPARATOR;
+		return packageName.replace(PACKAGE_SEPARATOR_CHAR, CLASSPATH_RESOURCE_PATH_SEPARATOR);
 	}
 
 	private List<URI> getRootUrisForPackage(String basePackageName) {
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 70a852c997d5..1aa4146550b5 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -30,6 +30,7 @@
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.Helper;
 import platform.tooling.support.MavenRepo;
@@ -121,6 +122,73 @@ void test() throws IOException {
 
 	@Test
 	@Order(3)
+	void testOnJava8() throws IOException {
+		var result = Request.builder() //
+				.setTool(new Java()) //
+				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.setProject("standalone") //
+				.addArguments("--show-version") //
+				.addArguments("-enableassertions") //
+				.addArguments("-Djava.util.logging.config.file=logging.properties") //
+				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
+				.addArguments("--scan-class-path") //
+				.addArguments("--disable-banner") //
+				.addArguments("--include-classname", "standalone.*") //
+				.addArguments("--classpath", "bin").build() //
+				.run(false);
+
+		assertEquals(1, result.getExitCode(), String.join("\n", result.getOutputLines("out")));
+
+		var workspace = Request.WORKSPACE.resolve("standalone");
+		var expectedOutLines = Files.readAllLines(workspace.resolve("expected-out.txt"));
+		var expectedErrLines = Files.readAllLines(workspace.resolve("expected-err.txt"));
+		assertLinesMatch(expectedOutLines, result.getOutputLines("out"));
+		assertLinesMatch(expectedErrLines, result.getOutputLines("err"));
+
+		var jupiterVersion = Helper.version("junit-jupiter-engine");
+		var vintageVersion = Helper.version("junit-vintage-engine");
+		assertTrue(result.getOutput("err").contains("junit-jupiter"
+				+ " (group ID: org.junit.jupiter, artifact ID: junit-jupiter-engine, version: " + jupiterVersion));
+		assertTrue(result.getOutput("err").contains("junit-vintage"
+				+ " (group ID: org.junit.vintage, artifact ID: junit-vintage-engine, version: " + vintageVersion));
+	}
+
+	@Test
+	@Order(3)
+	// https://github.com/junit-team/junit5/issues/2600
+	void testOnJava8SelectPackage() throws IOException {
+		var result = Request.builder() //
+				.setTool(new Java()) //
+				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.setProject("standalone") //
+				.addArguments("--show-version") //
+				.addArguments("-enableassertions") //
+				.addArguments("-Djava.util.logging.config.file=logging.properties") //
+				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
+				.addArguments("--select-package", "standalone") //
+				.addArguments("--disable-banner") //
+				.addArguments("--include-classname", "standalone.*") //
+				.addArguments("--classpath", "bin").build() //
+				.run(false);
+
+		assertEquals(1, result.getExitCode(), String.join("\n", result.getOutputLines("out")));
+
+		var workspace = Request.WORKSPACE.resolve("standalone");
+		var expectedOutLines = Files.readAllLines(workspace.resolve("expected-out.txt"));
+		var expectedErrLines = Files.readAllLines(workspace.resolve("expected-err.txt"));
+		assertLinesMatch(expectedOutLines, result.getOutputLines("out"));
+		assertLinesMatch(expectedErrLines, result.getOutputLines("err"));
+
+		var jupiterVersion = Helper.version("junit-jupiter-engine");
+		var vintageVersion = Helper.version("junit-vintage-engine");
+		assertTrue(result.getOutput("err").contains("junit-jupiter"
+				+ " (group ID: org.junit.jupiter, artifact ID: junit-jupiter-engine, version: " + jupiterVersion));
+		assertTrue(result.getOutput("err").contains("junit-vintage"
+				+ " (group ID: org.junit.vintage, artifact ID: junit-vintage-engine, version: " + vintageVersion));
+	}
+
+	@Test
+	@Order(5)
 	@Disabled("https://github.com/junit-team/junit5/issues/1724")
 	void testWithJarredTestClasses() {
 		var jar = MavenRepo.jar("junit-platform-console-standalone");

From 4a89a78fd7a7c10191fcd5fddc7a7e817b47774e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 11:53:39 +0200
Subject: [PATCH 0315/1433] Update test-distribution plugin

---
 buildSrc/build.gradle.kts | 3 +--
 settings.gradle.kts       | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b48dc52db322..2d1538a3f832 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
-	maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 }
 
 dependencies {
@@ -15,7 +14,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.2-rc-2")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c376c711ddb0..f1f9397cd904 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,13 +1,9 @@
 import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
 
 pluginManagement {
-	repositories {
-		gradlePluginPortal()
-		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
-	}
 	plugins {
 		id("com.gradle.enterprise") version "3.6.1"
-		id("com.gradle.enterprise.test-distribution") version "2.0.2"
+		id("com.gradle.enterprise.test-distribution") version "2.0.3"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.2.1"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.38.0"

From 721cdd84f156695a1021454ced9a107c1d42411e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 11:53:51 +0200
Subject: [PATCH 0316/1433] Update JaCoCo

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e7a96785449b..b68cb9b131a2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ apiguardian = "1.1.1"
 asciidoctor-pdf = "1.5.3"
 assertj = "3.19.0"
 checkstyle = "8.36.2"
-jacoco = "0.8.6"
+jacoco = "0.8.7"
 jmh = "1.29"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"

From fef558a308d05a6649d0d57b37ca2e368942fe57 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 11:54:10 +0200
Subject: [PATCH 0317/1433] Update spring-nohttp plugin

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index f1f9397cd904..e844f051cb40 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,7 +14,7 @@ pluginManagement {
 		id("org.asciidoctor.jvm.convert") version "3.3.2"
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"
 		id("me.champeau.gradle.jmh") version "0.5.3"
-		id("io.spring.nohttp") version "0.0.6.RELEASE"
+		id("io.spring.nohttp") version "0.0.7"
 		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 	}
 }

From 9c44df3c5434b089ff6b9b935e46091e2cf558c1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 11:54:22 +0200
Subject: [PATCH 0318/1433] Update common-custom-user-data-gradle-plugin

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index e844f051cb40..a80e25c88ead 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,7 +4,7 @@ pluginManagement {
 	plugins {
 		id("com.gradle.enterprise") version "3.6.1"
 		id("com.gradle.enterprise.test-distribution") version "2.0.3"
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.2.1"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.38.0"
 		id("com.diffplug.spotless") version "5.12.0"

From f363fa3b37d3c1ae263617fea5be6c0e35adb0fa Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 11:54:32 +0200
Subject: [PATCH 0319/1433] Update Spotless

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a80e25c88ead..392e42ae6750 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.38.0"
-		id("com.diffplug.spotless") version "5.12.0"
+		id("com.diffplug.spotless") version "5.12.4"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.4.0"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From 81e6b008f742a5d2a4e1aaa23e409199f1c55b86 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 11:54:42 +0200
Subject: [PATCH 0320/1433] Update Kotlin plugin

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 392e42ae6750..b19286a401e8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
 		id("com.github.ben-manes.versions") version "0.38.0"
 		id("com.diffplug.spotless") version "5.12.4"
 		id("org.ajoberstar.git-publish") version "3.0.0"
-		kotlin("jvm") version "1.4.0"
+		kotlin("jvm") version "1.5.0"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "3.3.2"
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"

From 4f206d347fda5c84b1a46245b0c57d427f24039b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 11:54:51 +0200
Subject: [PATCH 0321/1433] Update shadow plugin

---
 buildSrc/build.gradle.kts                                    | 2 +-
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 3 ++-
 buildSrc/src/main/kotlin/shadow-conventions.gradle.kts       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 2d1538a3f832..ffec97504145 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
-	implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
+	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3")
 }
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 5a9b2ad2d734..aa4e20cae78e 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
@@ -163,7 +164,7 @@ tasks.withType<Jar>().configureEach {
 		into("META-INF")
 	}
 	val suffix = archiveClassifier.getOrElse("")
-	if (suffix.isBlank() || suffix == "all") { // "all" is used by shadow plugin
+	if (suffix.isBlank() || this is ShadowJar) {
 		dependsOn(allMainClasses, compileModule)
 		from("$moduleOutputDir/$javaModuleName") {
 			include("module-info.class")
diff --git a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
index 33474a01a36a..44c5bacec51d 100644
--- a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
@@ -47,6 +47,7 @@ tasks {
 	shadowJar {
 		configurations = listOf(shadowed)
 		exclude("META-INF/maven/**")
+		excludes.remove("module-info.class")
 		archiveClassifier.set("")
 	}
 	jar {

From a02c62ac53a9d4d271e4bfd8ee28f438d4dbe4f8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 13:29:52 +0200
Subject: [PATCH 0322/1433] Move entry to 5.7.2 release notes

---
 .../src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc  | 4 +++-
 .../docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc   | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
index 2e44999d67e4..c99f73578b77 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
@@ -15,7 +15,9 @@ GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Method `getRootUrisForPackage()` in class `ClasspathScanner` now returns a
+valid list of class names when the package name is equal to the name of a
+module on the module path and when running on Java 8.
 
 
 [[release-notes-5.7.2-junit-jupiter]]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 77973e5d40d6..9f73ac01adcf 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -15,9 +15,7 @@ on GitHub.
 
 ==== Bug Fixes
 
-* Method `getRootUrisForPackage()` in class `ClasspathScanner` now returns a
-  valid list of class names when the package name is equal to the name of a
-  module on the module path and when running on Java 8.
+* ❓
 
 ==== Deprecations and Breaking Changes
 

From 6359e512436a642ad1efc986f754105344b94ff3 Mon Sep 17 00:00:00 2001
From: kriegfrj <fr.jkrieg@greekwelfaresa.org.au>
Date: Thu, 4 Feb 2021 17:46:17 +1030
Subject: [PATCH 0323/1433] Add Provide-Capability OSGi header to engine
 bundles

Fixes #2100. Closes #2544.
---
 .../junit-jupiter-engine.gradle.kts                | 14 ++++++++++++++
 .../junit-vintage-engine.gradle.kts                |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index be338ed699d8..33a01b5bbfb4 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -1,3 +1,4 @@
+import aQute.bnd.gradle.BundleTaskConvention
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
@@ -28,3 +29,16 @@ tasks {
 		inputs.dir("src/test/resources").withPathSensitivity(RELATIVE)
 	}
 }
+
+tasks {
+	jar {
+		withConvention(BundleTaskConvention::class) {
+			bnd("""
+				Provide-Capability:\
+					org.junit.platform.engine;\
+						org.junit.platform.engine='junit-jupiter';\
+						version:Version="${'$'}{version_cleanup;${project.version}}"
+			""")
+		}
+	}
+}
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index a0433fbec2c0..334567d2ea02 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -1,4 +1,4 @@
-import aQute.bnd.gradle.BundleTaskConvention;
+import aQute.bnd.gradle.BundleTaskConvention
 
 plugins {
 	`java-library-conventions`
@@ -47,6 +47,11 @@ tasks {
 					org.junit.runner.*;version="[${junit4Min},5)",\
 					org.junit.runners.model;version="[${junit4Min},5)",\
 					*
+
+				Provide-Capability:\
+					org.junit.platform.engine;\
+						org.junit.platform.engine='junit-vintage';\
+						version:Version="${'$'}{version_cleanup;${project.version}}"
 			""")
 		}
 	}

From 4e98f5530b6d731f9167cbe4e43cf8d0fcc2f525 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 18:10:36 +0200
Subject: [PATCH 0324/1433] Hard-wrap at 90 chars and add indentation

---
 .../docs/asciidoc/release-notes/release-notes-5.7.2.adoc    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
index c99f73578b77..14bf051a4380 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
@@ -15,9 +15,9 @@ GitHub.
 
 ==== Bug Fixes
 
-* Method `getRootUrisForPackage()` in class `ClasspathScanner` now returns a
-valid list of class names when the package name is equal to the name of a
-module on the module path and when running on Java 8.
+* Method `getRootUrisForPackage()` in class `ClasspathScanner` now returns a valid list of
+  class names when the package name is equal to the name of a module on the module path
+  and when running on Java 8.
 
 
 [[release-notes-5.7.2-junit-jupiter]]

From 8d9ef8045bc28645953baace63999cc994e1d4e1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 19:23:52 +0200
Subject: [PATCH 0325/1433] Update spring-nohttp plugin

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index b19286a401e8..76b7b010e2e0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,7 +14,7 @@ pluginManagement {
 		id("org.asciidoctor.jvm.convert") version "3.3.2"
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"
 		id("me.champeau.gradle.jmh") version "0.5.3"
-		id("io.spring.nohttp") version "0.0.7"
+		id("io.spring.nohttp") version "0.0.8"
 		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 	}
 }

From 05414dc722cee139718c8de7202e3f8a79a1f680 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 19:24:01 +0200
Subject: [PATCH 0326/1433] Upgradle to 7.0.1

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643eed77..e5338d370bad 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 267ce626491b02a86af7fb94191313adb8959f8e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 20:00:07 +0200
Subject: [PATCH 0327/1433] Add Stalebot configuration

Resolves #2602.
---
 .github/stale.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000000..2ef85c0b65a5
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,69 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+# Configuration options apply to both Issues and Pull Requests.
+# We configure those individually to match our workflow (see `pulls:` and `issues:`)
+
+pulls:
+  # Number of days of inactivity before a Pull Request becomes stale
+  daysUntilStale: 60
+
+  # Number of days of inactivity before a Pull Request with the stale label is closed.
+  # Set to false to disable. If disabled, Pull Request still need to be closed manually, but will remain marked as stale.
+  daysUntilClose: 21
+
+  # Comment to post when marking as stale. Set to `false` to disable
+  markComment: >
+    This pull request has been automatically marked as stale because it has not had recent activity.
+    Given the limited bandwidth of the team, it will be closed if no further activity occurs.
+    If you intend to work on this pull request, please reopen the PR.
+    Thank you for your contributions.
+  # Comment to post when closing a stale Pull Request.
+  closeComment: >
+    This pull request has been automatically closed due to inactivity.
+    If you are still interested in contributing this, please ensure that
+    it is rebased against the latest branch (usually `main`), all review
+    comments have been addressed and the build is passing.
+issues:
+  daysUntilStale: 365
+
+  # Number of days of inactivity before an Issue with the stale label is closed.
+  # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+  daysUntilClose: 21
+
+  # Comment to post when marking as stale. Set to `false` to disable
+  markComment: >
+    This issue has been automatically marked as stale because it has not had recent activity.
+    Given the limited bandwidth of the team, it will be automatically closed if no further
+    activity occurs.
+    Thank you for your contribution.
+  # Comment to post when closing a stale Issue.
+  closeComment: >
+    This issue has been automatically closed due to inactivity. If you have a good use case for this
+    feature, please feel free to reopen the issue.
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+#onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels: []
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: "status: stale"
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues

From e6d74ab2f2d17c88c166a30fbcd8bb97f3fc8f31 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 13 May 2021 18:21:34 +0200
Subject: [PATCH 0328/1433] Acquire global read lock in presence of other
 exclusive resources

Prior to this commit, the global read lock was not acquired for test
classes with `@ResourceLock` annotations causing `@Isolated` tests to
run in parallel.

Fixes #2605.
---
 .../release-notes/release-notes-5.7.2.adoc    |  5 ++++-
 .../support/hierarchical/NodeTreeWalker.java  | 11 +++++-----
 .../NodeTreeWalkerIntegrationTests.java       | 10 +++++-----
 .../ParallelExecutionIntegrationTests.java    | 20 +++++++++++++++++++
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
index 14bf051a4380..44b8253af7fd 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
@@ -18,6 +18,8 @@ GitHub.
 * Method `getRootUrisForPackage()` in class `ClasspathScanner` now returns a valid list of
   class names when the package name is equal to the name of a module on the module path
   and when running on Java 8.
+* Direct child descriptors of the engine descriptor now also acquire the global read lock
+  when they require other exclusive resources.
 
 
 [[release-notes-5.7.2-junit-jupiter]]
@@ -25,7 +27,8 @@ GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Test classes annotated with `@ResourceLock` no longer run in parallel with `@Isolated`
+  ones.
 
 
 [[release-notes-5.7.2-junit-vintage]]
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
index 4ba6c20b204e..b1403967eec7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
@@ -74,15 +74,16 @@ private void walk(TestDescriptor globalLockDescriptor, TestDescriptor testDescri
 				forceDescendantExecutionModeRecursively(advisor, globalLockDescriptor);
 				advisor.useResourceLock(globalLockDescriptor, globalReadWriteLock);
 			}
+			if (globalLockDescriptor.equals(testDescriptor) && !allResources.contains(GLOBAL_READ_WRITE)) {
+				allResources.add(GLOBAL_READ);
+			}
 			advisor.useResourceLock(testDescriptor, lockManager.getLockForResources(allResources));
 		}
 	}
 
-	private void forceDescendantExecutionModeRecursively(NodeExecutionAdvisor advisor,
-			TestDescriptor globalLockDescriptor) {
-		advisor.forceDescendantExecutionMode(globalLockDescriptor, SAME_THREAD);
-		doForChildrenRecursively(globalLockDescriptor,
-			child -> advisor.forceDescendantExecutionMode(child, SAME_THREAD));
+	private void forceDescendantExecutionModeRecursively(NodeExecutionAdvisor advisor, TestDescriptor testDescriptor) {
+		advisor.forceDescendantExecutionMode(testDescriptor, SAME_THREAD);
+		doForChildrenRecursively(testDescriptor, child -> advisor.forceDescendantExecutionMode(child, SAME_THREAD));
 	}
 
 	private boolean isReadOnly(Set<ExclusiveResource> exclusiveResources) {
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
index db399188d59a..4f292c846870 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
@@ -48,7 +48,7 @@ void pullUpExclusiveChildResourcesToTestClass() {
 
 		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
-				.isEqualTo(List.of(getReadWriteLock("a"), getReadWriteLock("b")));
+				.isEqualTo(List.of(getLock(GLOBAL_READ), getReadWriteLock("a"), getReadWriteLock("b")));
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
 		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
@@ -64,7 +64,7 @@ void setsForceExecutionModeForChildrenWithWriteLocksOnClass() {
 
 		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
-				.isEqualTo(List.of(getReadWriteLock("a")));
+				.isEqualTo(List.of(getLock(GLOBAL_READ), getReadWriteLock("a")));
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
 		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
@@ -80,7 +80,7 @@ void doesntSetForceExecutionModeForChildrenWithReadLocksOnClass() {
 
 		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
-				.isEqualTo(List.of(getReadLock("a")));
+				.isEqualTo(List.of(getLock(GLOBAL_READ), getReadLock("a")));
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
 		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
@@ -96,7 +96,7 @@ void setsForceExecutionModeForChildrenWithReadLocksOnClassAndWriteLockOnTest() {
 
 		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
-				.isEqualTo(List.of(getReadWriteLock("a")));
+				.isEqualTo(List.of(getLock(GLOBAL_READ), getReadWriteLock("a")));
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
 		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
@@ -112,7 +112,7 @@ void doesntSetForceExecutionModeForChildrenWithReadLocksOnClassAndReadLockOnTest
 
 		var testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		assertThat(advisor.getResourceLock(testClassDescriptor)).extracting(allLocks()) //
-				.isEqualTo(List.of(getReadLock("a"), getReadLock("b")));
+				.isEqualTo(List.of(getLock(GLOBAL_READ), getReadLock("a"), getReadLock("b")));
 		assertThat(advisor.getForcedExecutionMode(testClassDescriptor)).isEmpty();
 
 		var testMethodDescriptor = getOnlyElement(testClassDescriptor.getChildren());
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
index a7f5eec8d7bf..5facf032285f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
@@ -243,6 +243,13 @@ void canRunTestsIsolatedFromEachOtherAcrossClasses() {
 		assertThat(events.stream().filter(event(test(), finishedWithFailure())::matches)).isEmpty();
 	}
 
+	@RepeatedTest(10)
+	void canRunTestsIsolatedFromEachOtherAcrossClassesWithOtherResourceLocks() {
+		var events = executeConcurrently(4, IndependentClasses.B.class, IndependentClasses.C.class);
+
+		assertThat(events.stream().filter(event(test(), finishedWithFailure())::matches)).isEmpty();
+	}
+
 	@Isolated("testing")
 	static class IsolatedTestCase {
 		static AtomicInteger sharedResource;
@@ -343,6 +350,19 @@ void b() throws Exception {
 				storeAndBlockAndCheck(sharedResource, countDownLatch);
 			}
 		}
+
+		@ResourceLock("other")
+		static class C {
+			@Test
+			void a() throws Exception {
+				storeAndBlockAndCheck(sharedResource, countDownLatch);
+			}
+
+			@Test
+			void b() throws Exception {
+				storeAndBlockAndCheck(sharedResource, countDownLatch);
+			}
+		}
 	}
 
 	private List<Event> getEventsOfChildren(EngineExecutionResults results, TestDescriptor container) {

From 0ba600e478c728cdb80c83dcbf554c08f7a0755c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 15 May 2021 10:35:24 +0200
Subject: [PATCH 0329/1433] Move #2423 to 5.7.2

---
 .../docs/asciidoc/release-notes/release-notes-5.7.2.adoc    | 6 ++++++
 .../docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
index 44b8253af7fd..01858e3863b5 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
@@ -30,6 +30,12 @@ GitHub.
 * Test classes annotated with `@ResourceLock` no longer run in parallel with `@Isolated`
   ones.
 
+==== New Features and Improvements
+
+* Improved `ExclusiveResource` handling: if a `Node` has only read locks and no read-write
+  locks, then descendants are not forced into `SAME_THREAD` execution and can run
+  concurrently.
+
 
 [[release-notes-5.7.2-junit-vintage]]
 === JUnit Vintage
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index bff82f016661..912bb36b1b95 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -44,9 +44,6 @@ on GitHub.
 * Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
 * Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
   longer store `String` representations of unique IDs.
-* Improved `ExclusiveResource` handling: if a `Node` has only read locks and no read-write
-  locks, then descendants are not forced into `SAME_THREAD` execution and can run
-  concurrently.
 * Tools that make multiple calls to the `Launcher` API should now create a
   `LauncherSession` in order to allow for executing global setup and teardown code exactly
   once via the new `LauncherSessionListener` interface that can be registered via Java’s

From 903df16c7f1c4cfb06671117acd4da16b3e4083e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 15 May 2021 14:10:17 +0200
Subject: [PATCH 0330/1433] Release 5.7.2

---
 README.md                                                       | 2 +-
 .../src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 166f0b7ad4e7..17219faed989 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.7.1](https://github.com/junit-team/junit5/releases/tag/r5.7.1) (February 4, 2021)
+- General Availability (GA): [JUnit 5.7.2](https://github.com/junit-team/junit5/releases/tag/r5.7.2) (May 15, 2021)
 - Preview (Milestone/Release Candidate): [JUnit 5.8.0-M1](https://github.com/junit-team/junit5/releases/tag/r5.8.0-M1) (February 11, 2021)
 
 ## Documentation
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
index 01858e3863b5..6c4ecffb1f23 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.7.2]]
 == 5.7.2
 
-*Date of Release:* ❓
+*Date of Release:* May 15, 2021
 
 *Scope:* Bug fixes since 5.7.1
 

From a34ab1b94935dac19ba00660343f4a693fa0eeb9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 18 May 2021 20:59:49 +0200
Subject: [PATCH 0331/1433] Upgradle to 7.0.2

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e5338d370bad..0f80bbf516ce 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 36db8934e343193509067a41fd8d0b75972125d3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 May 2021 15:31:43 +0200
Subject: [PATCH 0332/1433] Use consistent naming for loggers

---
 .../jupiter/engine/execution/InvocationInterceptorChain.java  | 4 ++--
 .../launcher/core/CompositeTestExecutionListener.java         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
index b8b24aa1ca21..3f561ca57db2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
@@ -114,7 +114,7 @@ public void skip() {
 
 	private static class ValidatingInvocation<T> implements Invocation<T> {
 
-		private static final Logger LOG = LoggerFactory.getLogger(ValidatingInvocation.class);
+		private static final Logger logger = LoggerFactory.getLogger(ValidatingInvocation.class);
 
 		private final AtomicBoolean invokedOrSkipped = new AtomicBoolean();
 		private final Invocation<T> delegate;
@@ -133,7 +133,7 @@ public T proceed() throws Throwable {
 
 		@Override
 		public void skip() {
-			LOG.debug(() -> "The invocation is skipped");
+			logger.debug(() -> "The invocation is skipped");
 			markInvokedOrSkipped();
 			delegate.skip();
 		}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
index 41919c7fdcb4..7b7931f1425e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
@@ -28,7 +28,7 @@
 
 class CompositeTestExecutionListener implements TestExecutionListener {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CompositeTestExecutionListener.class);
+	private static final Logger logger = LoggerFactory.getLogger(CompositeTestExecutionListener.class);
 
 	private final List<TestExecutionListener> testExecutionListeners;
 	private final List<EagerTestExecutionListener> eagerTestExecutionListeners;
@@ -96,7 +96,7 @@ private static <T extends TestExecutionListener> void notifyEach(List<T> listene
 			}
 			catch (Throwable throwable) {
 				UnrecoverableExceptions.rethrowIfUnrecoverable(throwable);
-				LOGGER.warn(throwable, () -> String.format("TestExecutionListener [%s] threw exception for method: %s",
+				logger.warn(throwable, () -> String.format("TestExecutionListener [%s] threw exception for method: %s",
 					listener.getClass().getName(), description.get()));
 			}
 		});

From 79cfec0d686799801e36337eb585ce30d93b5829 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 May 2021 09:21:09 +0200
Subject: [PATCH 0333/1433] Use actions/setup-java@v2

---
 .github/workflows/codeql-analysis.yml    |  7 +++---
 .github/workflows/main.yml               | 30 ++++++++++++++----------
 .github/workflows/reproducible-build.yml | 10 ++++----
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 835adf22a476..e9cc12327a72 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -32,10 +32,11 @@ jobs:
         key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           test-${{ runner.os }}-gradle-
-    - name: Setup JDK 11
-      uses: actions/setup-java@v1
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
       with:
-        java-version: 11
+        distribution: 'adopt'
+        java-version: '11'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 87c440afe851..4a86bbbcd574 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -79,23 +79,26 @@ jobs:
         restore-keys: |
           test-${{ runner.os }}-maven-
     - name: Set up JDK 8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 8
+        distribution: 'adopt'
+        java-version: '8'
     - name: Prepare JDK8 env var
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 16
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 16
+        distribution: 'adopt'
+        java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
       run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 11
+        distribution: 'adopt'
+        java-version: '11'
     - name: Test
       shell: bash
       run: |
@@ -128,23 +131,26 @@ jobs:
         restore-keys: |
           test-${{ runner.os }}-maven-
     - name: Set up JDK 8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 8
+        distribution: 'adopt'
+        java-version: '8'
     - name: Prepare JDK8 env var
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 16
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 16
+        distribution: 'adopt'
+        java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
       run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 11
+        distribution: 'adopt'
+        java-version: '11'
     - name: 'Test'
       run: |
         ./gradlew --version
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index f9c60055c82a..e74632fe7d7b 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -30,16 +30,18 @@ jobs:
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
     - name: Set up JDK 16
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 16
+        distribution: 'adopt'
+        java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
       run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 11
+        distribution: 'adopt'
+        java-version: '11'
     - name: Build and compare checksums
       shell: bash
       run: |

From 470e9d6d87858e9da0c84dd34af0cd327b1fd5ea Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 May 2021 10:38:31 +0200
Subject: [PATCH 0334/1433] Stop using custom Docker image (#2629)

Use sormuras/download-jdk@v1 to download EA JDK instead.
---
 .github/workflows/cross-version.yml | 28 +++++++++++++++-
 .github/workflows/main.yml          | 50 +++++++++++++++++++++++++++--
 gradle.properties                   |  2 +-
 3 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 3f7e2bb69581..d24ce34fdc11 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -21,7 +21,6 @@ jobs:
         jdk: [17]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
-    container: "ghcr.io/junit-team/build:${{ matrix.jdk }}"
     steps:
       - uses: actions/checkout@v2
         with:
@@ -42,6 +41,33 @@ jobs:
           key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             test-${{ runner.os }}-maven-
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '8'
+      - name: Prepare JDK8 env var
+        shell: bash
+        run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
+      - name: 'Download JDK ${{ matrix.jdk }}'
+        id: download-jdk
+        uses: sormuras/download-jdk@v1
+        with:
+          feature: '${{ matrix.jdk }}'
+      - name: 'Set up JDK ${{ matrix.jdk }}'
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'jdkfile'
+          java-version: '${{ steps.download-jdk.outputs.version }}'
+          jdkFile: '${{ steps.download-jdk.outputs.file }}'
+      - name: 'Prepare JDK${{ matrix.jdk }} env var'
+        shell: bash
+        run: echo "JDK${{ matrix.jdk }}=$JAVA_HOME" >> $GITHUB_ENV
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
       - name: Test
         env:
           ORG_GRADLE_PROJECT_enableTestDistribution: true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4a86bbbcd574..57a94b5e2f77 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,6 @@ jobs:
   linux:
     name: Linux
     runs-on: ubuntu-latest
-    container: ghcr.io/junit-team/build
     steps:
     - uses: actions/checkout@v2
       with:
@@ -40,6 +39,27 @@ jobs:
         key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           test-${{ runner.os }}-maven-
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '8'
+    - name: Prepare JDK8 env var
+      shell: bash
+      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
+    - name: Set up JDK 16
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '16'
+    - name: Prepare JDK16 env var
+      shell: bash
+      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
     - name: Test and coverage
       env:
         ORG_GRADLE_PROJECT_enableTestDistribution: true
@@ -161,7 +181,6 @@ jobs:
     name: Publish Snapshot Artifacts
     needs: linux
     runs-on: ubuntu-latest
-    container: ghcr.io/junit-team/build
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && (startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main')
     steps:
     - uses: actions/checkout@v2
@@ -176,6 +195,19 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
+    - name: Set up JDK 16
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '16'
+    - name: Prepare JDK16 env var
+      shell: bash
+      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
     - name: Publish
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
@@ -188,7 +220,6 @@ jobs:
     name: Update Snapshot Documentation
     needs: linux
     runs-on: ubuntu-latest
-    container: ghcr.io/junit-team/build
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - uses: actions/checkout@v2
@@ -203,6 +234,19 @@ jobs:
         key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
         restore-keys: |
           assemble-${{ runner.os }}-gradle-
+    - name: Set up JDK 16
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '16'
+    - name: Prepare JDK16 env var
+      shell: bash
+      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
     - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
diff --git a/gradle.properties b/gradle.properties
index 83439302e974..77f353304411 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ defaultBuiltBy  = JUnit Team
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.java.installations.fromEnv=JDK8,JDK16
+org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true

From b295940c832ebb17e4b2e486267c2a04747dcd8a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 May 2021 17:39:25 +0200
Subject: [PATCH 0335/1433] Upload JaCoCo reports

---
 .github/workflows/main.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 57a94b5e2f77..070e485bc294 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,6 +72,11 @@ jobs:
       with:
         name: Test Distribution trace files
         path: '**/build/test-results/*/trace.json'
+    - name: Upload JaCoCo reports
+      uses: actions/upload-artifact@v2
+      with:
+        name: JaCoCo reports
+        path: 'build/reports/jacoco/jacocoRootReport/**'
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 

From a34d435f7bd2c8bbb5e30cc8ad72371df2404451 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 25 May 2021 15:04:08 +0200
Subject: [PATCH 0336/1433] Introduce a Unique ID tracking
 TestExecutionListener

This commit introduces UniqueIdTrackingListener which is a
TestExecutionListener that tracks the unique IDs of all tests that were
executed during the TestPlan and generates a file containing the unique
IDs.

The generated file can be used to rerun those tests -- for example, in
order to run the same set of tests executed on the JVM subsequently
within a GraalVM native image.

See the Javadoc for UniqueIdTrackingListener for configuration options
and details.

Closes #2619
---
 build.gradle.kts                              |   1 +
 .../src/docs/asciidoc/link-attributes.adoc    |   1 +
 .../release-notes/release-notes-5.8.0-M2.adoc |   6 +-
 .../listeners/UniqueIdTrackingListener.java   | 223 +++++++++++++++
 ...it.platform.launcher.TestExecutionListener |   1 +
 ...queIdTrackingListenerIntegrationTests.java | 254 ++++++++++++++++++
 .../UniqueIdTrackingListenerUnitTests.java    | 113 ++++++++
 .../uidtracking/gradle/groovy/build.gradle    |   1 +
 .../groovy/sub-project/sub-project.gradle     |   1 +
 .../gradle/kotlin/build.gradle.kts            |   1 +
 .../kotlin/sub-project/sub-project.gradle.kts |   1 +
 .../listeners/uidtracking/maven/pom.xml       |   1 +
 .../projects/standalone/expected-err.txt      |   2 +-
 13 files changed, 604 insertions(+), 2 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
 create mode 100644 junit-platform-launcher/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
 create mode 100644 platform-tests/src/test/resources/listeners/uidtracking/gradle/groovy/build.gradle
 create mode 100644 platform-tests/src/test/resources/listeners/uidtracking/gradle/groovy/sub-project/sub-project.gradle
 create mode 100644 platform-tests/src/test/resources/listeners/uidtracking/gradle/kotlin/build.gradle.kts
 create mode 100644 platform-tests/src/test/resources/listeners/uidtracking/gradle/kotlin/sub-project/sub-project.gradle.kts
 create mode 100644 platform-tests/src/test/resources/listeners/uidtracking/maven/pom.xml

diff --git a/build.gradle.kts b/build.gradle.kts
index e2ffbe4960e3..983fba7ea17b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -170,6 +170,7 @@ subprojects {
 			}
 
 			kotlin {
+				targetExclude("**/src/test/resources/**")
 				ktlint(libs.versions.ktlint.get())
 				licenseHeaderFile(headerFile)
 				trimTrailingWhitespace()
diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 297c2bab8441..68d61bc1bbd1 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -39,6 +39,7 @@ endif::[]
 :SummaryGeneratingListener:                  {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/listeners/SummaryGeneratingListener.html[SummaryGeneratingListener]
 :TestExecutionListener:                      {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/TestExecutionListener.html[TestExecutionListener]
 :TestPlan:                                   {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/TestPlan.html[TestPlan]
+:UniqueIdTrackingListener:                   {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.html[UniqueIdTrackingListener]
 // Platform Reporting
 :LegacyXmlReportGeneratingListener:          {javadoc-root}/org.junit.platform.reporting/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.html[LegacyXmlReportGeneratingListener]
 // Platform Runner
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 9f73ac01adcf..8ba703254d23 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -23,7 +23,11 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* New `UniqueIdTrackingListener` which is a `TestExecutionListener` that tracks the unique
+  IDs of all tests that were executed during the `TestPlan` and generates a file
+  containing the unique IDs. The generated file can be used to rerun those tests -- for
+  example, in order to run the same set of tests executed on the JVM subsequently within a
+  GraalVM native image. See the Javadoc for `{UniqueIdTrackingListener}` for details.
 
 
 [[release-notes-5.8.0-M2-junit-jupiter]]
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
new file mode 100644
index 000000000000..7e6a921b5dc4
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.listeners;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+import org.junit.platform.commons.util.StringUtils;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+/**
+ * {@code UniqueIdTrackingListener} is a {@link TestExecutionListener} that tracks
+ * the {@linkplain TestIdentifier#getUniqueId() unique IDs} of all
+ * {@linkplain TestIdentifier#isTest() tests} that were
+ * {@linkplain #executionFinished executed} during the execution of the
+ * {@link TestPlan} and generates a file containing the unique IDs once execution
+ * of the {@code TestPlan} has {@linkplain #testPlanExecutionFinished(TestPlan)
+ * finished}.
+ *
+ * <p>Tests are tracked regardless of their {@link TestExecutionResult}, and the
+ * unique IDs are written to the output file, one ID per line, encoding using UTF-8.
+ *
+ * <p>The output file can be used to execute the same set of tests again without
+ * having to query the user configuration for the test plan and without having to
+ * perform test discovery again. This can be useful for test environments such as
+ * within a native image &mdash; for example, a GraalVM native image &mdash; in
+ * order to rerun the exact same tests from a standard JVM test run within a
+ * native image.
+ *
+ * <h3>Configuration and Defaults</h3>
+ *
+ * <p>The {@code OUTPUT_DIR} is the directory in which this listener generates
+ * the output file (the {@code OUTPUT_FILE}). The exact path of the generated file
+ * is {@code OUTPUT_DIR}/{@code OUTPUT_FILE}.
+ *
+ * <p>The name of the {@code OUTPUT_FILE} defaults to {@link #DEFAULT_FILE_NAME},
+ * but a custom file name can be configured via the {@link #OUTPUT_FILE_PROPERTY_NAME}
+ * JVM system property.
+ *
+ * <p>The {@code OUTPUT_DIR} can be set to a custom directory via the
+ * {@link #OUTPUT_DIR_PROPERTY_NAME} JVM system property. Otherwise the following
+ * algorithm is used to select a default output directory.
+ *
+ * <ul>
+ * <li>If the current working directory of the Java process contains a file named
+ * {@code pom.xml}, the output directory will be {@code ./target}, following the
+ * conventions of Maven.</li>
+ * <li>If the current working directory of the Java process contains a file with
+ * the extension {@code .gradle} or {@code .gradle.kts}, the output directory
+ * will be {@code ./build}, following the conventions of Gradle.</li>
+ * <li>Otherwise, the current working directory of the Java process will be used
+ * as the output directory.</li>
+ * </ul>
+ *
+ * <p>For example, in a project using Gradle as the build tool, the file generated
+ * by this listener would be {@code ./build/junit-platform-unique-test-ids.txt}
+ * by default.
+ *
+ * @since 1.8
+ */
+@API(status = EXPERIMENTAL, since = "1.8")
+public class UniqueIdTrackingListener implements TestExecutionListener {
+
+	/**
+	 * Property name used to enable the {@code UniqueIdTrackingListener}: {@value}
+	 *
+	 * <p>The {@code UniqueIdTrackingListener} is registered automatically via
+	 * Java's {@link java.util.ServiceLoader} mechanism but disabled by default.
+	 *
+	 * <p>Set the value of this property to {@code true} to enable this listener.
+	 */
+	public static final String LISTENER_ENABLED_PROPERTY_NAME = "junit.platform.listeners.uid.tracking.enabled";
+
+	/**
+	 * Property name used to set the path to the output directory for the file
+	 * generated by the {@code UniqueIdTrackingListener}: {@value}
+	 *
+	 * <p>For details on the default output directory, see the
+	 * {@linkplain UniqueIdTrackingListener class-level Javadoc}.
+	 */
+	public static final String OUTPUT_DIR_PROPERTY_NAME = "junit.platform.listeners.uid.tracking.output.dir";
+
+	/**
+	 * Property name used to set the name of the file generated by the
+	 * {@code UniqueIdTrackingListener}: {@value}
+	 *
+	 * <p>Defaults to {@link #DEFAULT_FILE_NAME}.
+	 */
+	public static final String OUTPUT_FILE_PROPERTY_NAME = "junit.platform.listeners.uid.tracking.output.file";
+
+	/**
+	 * The default name of the file generated by the {@code UniqueIdTrackingListener}: {@value}
+	 *
+	 * @see #OUTPUT_FILE_PROPERTY_NAME
+	 */
+	public static final String DEFAULT_FILE_NAME = "junit-platform-unique-test-ids.txt";
+
+	private final Logger logger = LoggerFactory.getLogger(UniqueIdTrackingListener.class);
+
+	private final List<String> uniqueIds = new ArrayList<>();
+
+	private final boolean enabled;
+
+	public UniqueIdTrackingListener() {
+		this.enabled = Boolean.getBoolean(LISTENER_ENABLED_PROPERTY_NAME);
+	}
+
+	@Override
+	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+		if (this.enabled && testIdentifier.isTest()) {
+			this.uniqueIds.add(testIdentifier.getUniqueId());
+		}
+	}
+
+	@Override
+	public void testPlanExecutionFinished(TestPlan testPlan) {
+		if (this.enabled) {
+			Path outputFile;
+			try {
+				outputFile = getOutputFile();
+			}
+			catch (IOException ex) {
+				logger.error(ex, () -> "Failed to create output file");
+				// Abort since we cannot generate the file.
+				return;
+			}
+
+			logger.debug(() -> "Writing unique IDs to output file " + outputFile.toAbsolutePath());
+			try (PrintWriter writer = new PrintWriter(Files.newBufferedWriter(outputFile, StandardCharsets.UTF_8))) {
+				this.uniqueIds.forEach(writer::println);
+				writer.flush();
+			}
+			catch (IOException ex) {
+				logger.error(ex, () -> "Failed to write unique IDs to output file " + outputFile.toAbsolutePath());
+			}
+		}
+	}
+
+	private Path getOutputFile() throws IOException {
+		String filename = System.getProperty(OUTPUT_FILE_PROPERTY_NAME, DEFAULT_FILE_NAME);
+		Path outputFile = getOutputDir().resolve(filename);
+
+		if (Files.exists(outputFile)) {
+			Files.delete(outputFile);
+		}
+
+		Files.createFile(outputFile);
+
+		return outputFile;
+	}
+
+	Path getOutputDir() throws IOException {
+		Path cwd = currentWorkingDir();
+		Path outputDir;
+
+		String customDir = System.getProperty(OUTPUT_DIR_PROPERTY_NAME);
+		if (StringUtils.isNotBlank(customDir)) {
+			outputDir = cwd.resolve(customDir);
+		}
+		else if (Files.exists(cwd.resolve("pom.xml"))) {
+			outputDir = cwd.resolve("target");
+		}
+		else if (containsFilesWithExtensions(cwd, ".gradle", ".gradle.kts")) {
+			outputDir = cwd.resolve("build");
+		}
+		else {
+			outputDir = cwd;
+		}
+
+		if (!Files.exists(outputDir)) {
+			Files.createDirectories(outputDir);
+		}
+
+		return outputDir;
+	}
+
+	/**
+	 * Get the current working directory.
+	 * <p>Package private for testing purposes.
+	 */
+	Path currentWorkingDir() {
+		return Paths.get(".");
+	}
+
+	/**
+	 * Determine if the supplied directory contains files with any of the
+	 * supplied extensions.
+	 */
+	private boolean containsFilesWithExtensions(Path dir, String... extensions) throws IOException {
+		return Files.find(dir, 1, //
+			(path, basicFileAttributes) -> {
+				for (String extension : extensions) {
+					if (path.getFileName().toString().endsWith(extension)) {
+						return true;
+					}
+				}
+				return false;
+			}).findFirst().isPresent();
+	}
+
+}
diff --git a/junit-platform-launcher/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/junit-platform-launcher/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
new file mode 100644
index 000000000000..85f17ac249d5
--- /dev/null
+++ b/junit-platform-launcher/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
@@ -0,0 +1 @@
+org.junit.platform.launcher.listeners.UniqueIdTrackingListener
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
new file mode 100644
index 000000000000..4853697367df
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.listeners;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.junit.platform.commons.util.FunctionUtils.where;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.launcher.EngineFilter.includeEngines;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.DEFAULT_FILE_NAME;
+import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.LISTENER_ENABLED_PROPERTY_NAME;
+import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.OUTPUT_DIR_PROPERTY_NAME;
+import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.OUTPUT_FILE_PROPERTY_NAME;
+import static org.junit.platform.testkit.engine.Event.byTestDescriptor;
+import static org.junit.platform.testkit.engine.EventConditions.abortedWithReason;
+import static org.junit.platform.testkit.engine.EventConditions.event;
+import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
+import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
+import static org.junit.platform.testkit.engine.EventConditions.test;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.stream.Stream;
+
+import org.assertj.core.api.Condition;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.core.LauncherFactory;
+import org.junit.platform.testkit.engine.EngineTestKit;
+import org.junit.platform.testkit.engine.Event;
+import org.opentest4j.AssertionFailedError;
+import org.opentest4j.TestAbortedException;
+
+/**
+ * Integration tests for the {@link UniqueIdTrackingListener}.
+ *
+ * @since 1.8
+ */
+class UniqueIdTrackingListenerIntegrationTests {
+
+	private static final String passingTest = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[method:passingTest()]";
+	private static final String abortedTest = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[method:abortedTest()]";
+	private static final String failingTest = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[method:failingTest()]";
+	private static final String dynamicTest1 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[test-factory:dynamicTests()]/[dynamic-test:#1]";
+	private static final String dynamicTest2 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[test-factory:dynamicTests()]/[dynamic-test:#2]";
+	private static final String test1 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase2]/[method:test1()]";
+	private static final String test2 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase2]/[method:test2()]";
+
+	private static final String[] expectedUniqueIds = { passingTest, abortedTest, failingTest, dynamicTest1,
+			dynamicTest2, test1, test2 };
+
+	@BeforeEach
+	@AfterEach
+	void clearSystemProperties() {
+		System.clearProperty(LISTENER_ENABLED_PROPERTY_NAME);
+		System.clearProperty(OUTPUT_DIR_PROPERTY_NAME);
+		System.clearProperty(OUTPUT_FILE_PROPERTY_NAME);
+	}
+
+	@Test
+	void confirmExpectedUniqueIdsViaEngineTestKit() {
+		// @formatter:off
+		EngineTestKit.engine("junit-jupiter")
+			.selectors(selectClasses())
+			.execute()
+			.testEvents()
+			.assertStatistics(stats -> stats.started(7).skipped(1).aborted(1).succeeded(5).failed(1))
+			.assertEventsMatchLoosely(
+				event(test(uniqueId(passingTest)), finishedSuccessfully()),
+				event(test(uniqueId(abortedTest)), abortedWithReason(instanceOf(TestAbortedException.class))),
+				event(test(uniqueId(failingTest)), finishedWithFailure(instanceOf(AssertionFailedError.class))),
+				event(test(uniqueId(dynamicTest1)), finishedSuccessfully()),
+				event(test(uniqueId(dynamicTest2)), finishedSuccessfully()),
+				event(test(uniqueId(test1)), finishedSuccessfully()),
+				event(test(uniqueId(test2)), finishedSuccessfully())
+			);
+		// @formatter:on
+	}
+
+	@Test
+	void listenerIsRegisteredButDisabledByDefault() throws Exception {
+		long numListenersRegistered = ServiceLoader.load(TestExecutionListener.class).stream()//
+				.filter(provider -> UniqueIdTrackingListener.class.equals(provider.type()))//
+				.count();
+		assertThat(numListenersRegistered).isEqualTo(1);
+
+		Path path = Paths.get("build", DEFAULT_FILE_NAME);
+		Files.deleteIfExists(path);
+
+		try {
+			List<String> actualUniqueIds = executeTests();
+
+			// Sanity check using the results of our local TestExecutionListener
+			assertThat(actualUniqueIds).containsExactlyInAnyOrder(expectedUniqueIds);
+
+			// Check that file was not generated by the UniqueIdTrackingListener
+			assertThat(path).doesNotExist();
+		}
+		finally {
+			Files.deleteIfExists(path);
+		}
+	}
+
+	@Test
+	void verifyUniqueIdsAreTrackedWithDefaults() throws Exception {
+		Path path = Paths.get("build", DEFAULT_FILE_NAME);
+		verifyUniqueIdsAreTracked(path);
+	}
+
+	@Test
+	void verifyUniqueIdsAreTrackedWithCustomOutputFile() throws Exception {
+		String customFilename = "test_ids.txt";
+		System.setProperty(OUTPUT_FILE_PROPERTY_NAME, customFilename);
+
+		Path path = Paths.get("build", customFilename);
+		verifyUniqueIdsAreTracked(path);
+	}
+
+	@Test
+	void verifyUniqueIdsAreTrackedWithCustomOutputDir() throws Exception {
+		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
+		System.setProperty(OUTPUT_DIR_PROPERTY_NAME, customDir);
+
+		Path path = Paths.get(customDir, DEFAULT_FILE_NAME);
+		verifyUniqueIdsAreTracked(path);
+	}
+
+	@Test
+	void verifyUniqueIdsAreTrackedWithCustomOutputFileAndCustomOutputDir() throws Exception {
+		String customFilename = "test_ids.txt";
+		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
+		System.setProperty(OUTPUT_DIR_PROPERTY_NAME, customDir);
+		System.setProperty(OUTPUT_FILE_PROPERTY_NAME, customFilename);
+
+		Path path = Paths.get(customDir, customFilename);
+		verifyUniqueIdsAreTracked(path);
+	}
+
+	private void verifyUniqueIdsAreTracked(Path path) throws IOException {
+		enableListener();
+		Files.deleteIfExists(path);
+		try {
+			List<String> actualUniqueIds = executeTests();
+
+			// Sanity check using the results of our local TestExecutionListener
+			assertThat(actualUniqueIds).containsExactlyInAnyOrder(expectedUniqueIds);
+
+			// Check contents of the file generated by the UniqueIdTrackingListener
+			assertThat(Files.readAllLines(path)).containsExactlyInAnyOrder(expectedUniqueIds);
+		}
+		finally {
+			Files.deleteIfExists(path);
+		}
+	}
+
+	private static void enableListener() {
+		System.setProperty(LISTENER_ENABLED_PROPERTY_NAME, "true");
+	}
+
+	private static Condition<Event> uniqueId(String uniqueId) {
+		return new Condition<>(
+			byTestDescriptor(where(TestDescriptor::getUniqueId, uid -> uid.toString().equals(uniqueId))),
+			"descriptor with uniqueId '%s'", uniqueId);
+	}
+
+	private static List<String> executeTests() {
+		List<String> uniqueIds = new ArrayList<>();
+		LauncherDiscoveryRequest request = request()//
+				.selectors(selectClasses())//
+				.filters(includeEngines("junit-jupiter")).build();
+		LauncherFactory.create().execute(request, new TestExecutionListener() {
+			@Override
+			public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+				if (testIdentifier.isTest()) {
+					uniqueIds.add(testIdentifier.getUniqueId());
+				}
+			}
+		});
+		return uniqueIds;
+	}
+
+	private static ClassSelector[] selectClasses() {
+		return new ClassSelector[] { selectClass(TestCase1.class), selectClass(TestCase2.class) };
+	}
+
+	// -------------------------------------------------------------------------
+
+	static class TestCase1 {
+
+		@Test
+		void passingTest() {
+		}
+
+		@Test
+		@Disabled("testing")
+		void disabledTest() {
+		}
+
+		@Test
+		void abortedTest() {
+			assumeTrue(false);
+		}
+
+		@Test
+		void failingTest() {
+			fail();
+		}
+
+		@TestFactory
+		Stream<DynamicTest> dynamicTests() {
+			return Stream.of("cat", "dog").map(text -> dynamicTest(text, () -> assertEquals(3, text.length())));
+		}
+	}
+
+	static class TestCase2 {
+
+		@Test
+		void test1() {
+		}
+
+		@Test
+		void test2() {
+		}
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
new file mode 100644
index 000000000000..a04ba7251156
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.listeners;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.OUTPUT_DIR_PROPERTY_NAME;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for the {@link UniqueIdTrackingListener}.
+ *
+ * @since 1.8
+ */
+class UniqueIdTrackingListenerUnitTests {
+
+	@Test
+	void getOutputDirUsesCustomOutputDir() throws Exception {
+		try {
+			String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
+			System.setProperty(OUTPUT_DIR_PROPERTY_NAME, customDir);
+
+			UniqueIdTrackingListener listener = new UniqueIdTrackingListener();
+			Path outputDir = listener.getOutputDir();
+			assertThat(Files.isSameFile(Paths.get(customDir), outputDir)).isTrue();
+			assertThat(outputDir).exists();
+		}
+		finally {
+			System.clearProperty(OUTPUT_DIR_PROPERTY_NAME);
+		}
+	}
+
+	@Test
+	void getOutputDirFallsBackToCurrentWorkingDir() throws Exception {
+		String cwd = "src/test/resources/listeners/uidtracking";
+
+		UniqueIdTrackingListener listener = new UniqueIdTrackingListener() {
+			@Override
+			Path currentWorkingDir() {
+				return Paths.get(cwd);
+			}
+		};
+		Path outputDir = listener.getOutputDir();
+		assertThat(Files.isSameFile(Paths.get(cwd), outputDir)).isTrue();
+		assertThat(outputDir).exists();
+	}
+
+	@Test
+	void getOutputDirDetectsMavenPom() throws Exception {
+		String cwd = "src/test/resources/listeners/uidtracking/maven";
+		String expected = "target";
+
+		assertOutputDirIsDetected(cwd, expected);
+	}
+
+	@Test
+	void getOutputDirDetectsGradleGroovyDefaultBuildScript() throws Exception {
+		String cwd = "src/test/resources/listeners/uidtracking/gradle/groovy";
+		String expected = "build";
+
+		assertOutputDirIsDetected(cwd, expected);
+	}
+
+	@Test
+	void getOutputDirDetectsGradleGroovyCustomBuildScript() throws Exception {
+		String cwd = "src/test/resources/listeners/uidtracking/gradle/groovy/sub-project";
+		String expected = "build";
+
+		assertOutputDirIsDetected(cwd, expected);
+	}
+
+	@Test
+	void getOutputDirDetectsGradleKotlinDefaultBuildScript() throws Exception {
+		String cwd = "src/test/resources/listeners/uidtracking/gradle/kotlin";
+		String expected = "build";
+
+		assertOutputDirIsDetected(cwd, expected);
+	}
+
+	@Test
+	void getOutputDirDetectsGradleKotlinCustomBuildScript() throws Exception {
+		String cwd = "src/test/resources/listeners/uidtracking/gradle/kotlin/sub-project";
+		String expected = "build";
+
+		assertOutputDirIsDetected(cwd, expected);
+	}
+
+	private void assertOutputDirIsDetected(String cwd, String expected) throws IOException {
+		UniqueIdTrackingListener listener = new UniqueIdTrackingListener() {
+			@Override
+			Path currentWorkingDir() {
+				return Paths.get(cwd);
+			}
+		};
+		Path outputDir = listener.getOutputDir();
+		assertThat(Files.isSameFile(Paths.get(cwd, expected), outputDir)).isTrue();
+		assertThat(outputDir).exists();
+	}
+
+}
diff --git a/platform-tests/src/test/resources/listeners/uidtracking/gradle/groovy/build.gradle b/platform-tests/src/test/resources/listeners/uidtracking/gradle/groovy/build.gradle
new file mode 100644
index 000000000000..a4185e83967b
--- /dev/null
+++ b/platform-tests/src/test/resources/listeners/uidtracking/gradle/groovy/build.gradle
@@ -0,0 +1 @@
+// This file is used in tests for the UniqueIdTrackingListener
diff --git a/platform-tests/src/test/resources/listeners/uidtracking/gradle/groovy/sub-project/sub-project.gradle b/platform-tests/src/test/resources/listeners/uidtracking/gradle/groovy/sub-project/sub-project.gradle
new file mode 100644
index 000000000000..a4185e83967b
--- /dev/null
+++ b/platform-tests/src/test/resources/listeners/uidtracking/gradle/groovy/sub-project/sub-project.gradle
@@ -0,0 +1 @@
+// This file is used in tests for the UniqueIdTrackingListener
diff --git a/platform-tests/src/test/resources/listeners/uidtracking/gradle/kotlin/build.gradle.kts b/platform-tests/src/test/resources/listeners/uidtracking/gradle/kotlin/build.gradle.kts
new file mode 100644
index 000000000000..a4185e83967b
--- /dev/null
+++ b/platform-tests/src/test/resources/listeners/uidtracking/gradle/kotlin/build.gradle.kts
@@ -0,0 +1 @@
+// This file is used in tests for the UniqueIdTrackingListener
diff --git a/platform-tests/src/test/resources/listeners/uidtracking/gradle/kotlin/sub-project/sub-project.gradle.kts b/platform-tests/src/test/resources/listeners/uidtracking/gradle/kotlin/sub-project/sub-project.gradle.kts
new file mode 100644
index 000000000000..a4185e83967b
--- /dev/null
+++ b/platform-tests/src/test/resources/listeners/uidtracking/gradle/kotlin/sub-project/sub-project.gradle.kts
@@ -0,0 +1 @@
+// This file is used in tests for the UniqueIdTrackingListener
diff --git a/platform-tests/src/test/resources/listeners/uidtracking/maven/pom.xml b/platform-tests/src/test/resources/listeners/uidtracking/maven/pom.xml
new file mode 100644
index 000000000000..1a462ec9525d
--- /dev/null
+++ b/platform-tests/src/test/resources/listeners/uidtracking/maven/pom.xml
@@ -0,0 +1 @@
+<!-- This file is used in tests for the UniqueIdTrackingListener -->
diff --git a/platform-tooling-support-tests/projects/standalone/expected-err.txt b/platform-tooling-support-tests/projects/standalone/expected-err.txt
index d49887b2d69b..ae1258c81b77 100644
--- a/platform-tooling-support-tests/projects/standalone/expected-err.txt
+++ b/platform-tooling-support-tests/projects/standalone/expected-err.txt
@@ -5,6 +5,6 @@
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded LauncherDiscoveryListener instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
-.+ Loaded TestExecutionListener instances: ..
+.+ Loaded TestExecutionListener instances: .+
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded LauncherSessionListener instances: ..

From b0498e8aca80df059dc9b62589df08bbd501ff2c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 1 Jun 2021 22:07:14 +0200
Subject: [PATCH 0337/1433] Make UniqueIdTrackingListenerIntegrationTests work
 with TD

---
 platform-tests/platform-tests.gradle.kts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 7d275f267040..a47012c46d29 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -1,3 +1,4 @@
+import org.gradle.api.tasks.PathSensitivity.NONE
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
@@ -58,7 +59,9 @@ tasks {
 		jvmArgs("-Xmx1g")
 	}
 	test {
+		// Additional inputs for remote execution with Test Distribution
 		inputs.dir("src/test/resources").withPathSensitivity(RELATIVE)
+		inputs.file(buildFile).withPathSensitivity(NONE) // for UniqueIdTrackingListenerIntegrationTests
 	}
 	test_4_12 {
 		useJUnitPlatform {

From 0d8be3763f86d51948224a06ca09521471afb746 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 1 Jun 2021 22:07:41 +0200
Subject: [PATCH 0338/1433] Update dependencies

---
 gradle/libs.versions.toml                | 10 +++++-----
 platform-tests/platform-tests.gradle.kts | 12 ++++++------
 settings.gradle.kts                      |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b68cb9b131a2..8514172c2e66 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ asciidoctor-pdf = "1.5.3"
 assertj = "3.19.0"
 checkstyle = "8.36.2"
 jacoco = "0.8.7"
-jmh = "1.29"
+jmh = "1.32"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
@@ -15,12 +15,12 @@ surefire = "2.22.2"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.18.0" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.19.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }
-classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.104" }
-commons-io = { module = "commons-io:commons-io", version = "2.8.0" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.106" }
+commons-io = { module = "commons-io:commons-io", version = "2.9.0" }
 groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.8" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "main-SNAPSHOT" }
@@ -31,7 +31,7 @@ junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
-mockito = { module = "org.mockito:mockito-junit-jupiter", version = "3.9.0" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "3.10.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.30" }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index a47012c46d29..4f530f4e6963 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 	`java-library-conventions`
 	`junit4-compatibility`
 	`testing-conventions`
-	id("me.champeau.gradle.jmh")
+	id("me.champeau.jmh")
 }
 
 dependencies {
@@ -43,12 +43,12 @@ dependencies {
 }
 
 jmh {
-	jmhVersion = libs.versions.jmh.get()
+	jmhVersion.set(libs.versions.jmh)
 
-	duplicateClassesStrategy = DuplicatesStrategy.WARN
-	fork = 1
-	warmupIterations = 1
-	iterations = 5
+	duplicateClassesStrategy.set(DuplicatesStrategy.WARN)
+	fork.set(1)
+	warmupIterations.set(1)
+	iterations.set(5)
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 76b7b010e2e0..c8acdde3d0eb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,18 +2,18 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 
 pluginManagement {
 	plugins {
-		id("com.gradle.enterprise") version "3.6.1"
+		id("com.gradle.enterprise") version "3.6.2"
 		id("com.gradle.enterprise.test-distribution") version "2.0.3"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
-		id("com.github.ben-manes.versions") version "0.38.0"
-		id("com.diffplug.spotless") version "5.12.4"
+		id("com.github.ben-manes.versions") version "0.39.0"
+		id("com.diffplug.spotless") version "5.12.5"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.0"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "3.3.2"
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"
-		id("me.champeau.gradle.jmh") version "0.5.3"
+		id("me.champeau.jmh") version "0.6.5"
 		id("io.spring.nohttp") version "0.0.8"
 		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 	}

From 9604d8eeafff81c4ca90fece1b0e5e446597c74a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 1 Jun 2021 16:16:23 +0200
Subject: [PATCH 0339/1433] Provide access to ConfigurationParameters via the
 TestPlan

Prior to this commit, a TestExecutionListener did not have access to
JUnit Platform configuration parameters. This meant that a
TestExecutionListener could only be configured via JVM system
properties or some other mechanism outside standard JUnit Platform
features.

This commit introduces a new getConfigurationParameters() method in the
TestPlan which allows a TestExecutionListener to access access the
ConfigurationParameters via the TestPlan supplied to the
testPlanExecutionStarted(TestPlan) and
testPlanExecutionFinished(TestPlan) callback methods.

This commit also refactors UniqueIdTrackingListener to retrieve its
configuration from ConfigurationParameters instead of relying solely on
JVM system properties.

Closes #2631
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  5 ++
 .../asciidoc/user-guide/launcher-api.adoc     | 16 +++++-
 .../asciidoc/user-guide/running-tests.adoc    |  4 +-
 .../engine/ConfigurationParameters.java       |  4 ++
 .../launcher/TestExecutionListener.java       |  7 +++
 .../org/junit/platform/launcher/TestPlan.java | 27 ++++++++--
 .../launcher/core/InternalTestPlan.java       |  5 +-
 .../listeners/UniqueIdTrackingListener.java   | 30 ++++++-----
 .../platform/launcher/TestPlanTests.java      | 11 ++--
 .../CompositeTestExecutionListenerTests.java  |  7 ++-
 .../core/ExecutionListenerAdapterTests.java   |  4 +-
 .../listeners/SummaryGenerationTests.java     |  4 +-
 ...queIdTrackingListenerIntegrationTests.java | 45 ++++++----------
 .../UniqueIdTrackingListenerUnitTests.java    | 52 +++++++++----------
 .../legacy/LegacyReportingUtilsTests.java     |  6 ++-
 ...egacyXmlReportGeneratingListenerTests.java |  8 +--
 .../legacy/xml/XmlReportDataTests.java        | 11 ++--
 .../legacy/xml/XmlReportWriterTests.java      | 22 ++++----
 .../runner/JUnitPlatformRunnerTests.java      | 15 ++++--
 19 files changed, 178 insertions(+), 105 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 8ba703254d23..bd7d93c2bf85 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -23,6 +23,11 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* New `getConfigurationParameters()` method in the `TestPlan` which allows a
+  `TestExecutionListener` to access
+  <<../user-guide/index.adoc#running-tests-config-params, configuration parameters>>. See
+  <<../user-guide/index.adoc#launcher-api-listeners-config, Configuring an Execution
+  Listener>> for details.
 * New `UniqueIdTrackingListener` which is a `TestExecutionListener` that tracks the unique
   IDs of all tests that were executed during the `TestPlan` and generates a file
   containing the unique IDs. The generated file can be used to rerun those tests -- for
diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index 04a1566bd12b..164541c5cf8c 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -120,7 +120,7 @@ declared within the `/META-INF/services/org.junit.platform.launcher.PostDiscover
 file is loaded and applied automatically.
 
 [[launcher-api-launcher-session-listeners-custom]]
-==== Plugging in your own Launcher Sessions Listeners
+==== Plugging in your own Launcher Session Listeners
 
 Registered implementations of `{LauncherSessionListener}` are notified when a
 `{LauncherSession}` is opened, i.e. before a `{Launcher}` first discovers and executes
@@ -161,6 +161,20 @@ For example, an `example.CustomTestExecutionListener` class implementing
 `/META-INF/services/org.junit.platform.launcher.TestExecutionListener` file is loaded and
 registered automatically.
 
+[[launcher-api-listeners-config]]
+==== Configuring an Execution Listener
+
+When a `{TestExecutionListener}` is registered programmatically via the `{Launcher}` API,
+the listener may provide programmatic ways for it to be configured -- for example, via its
+constructor, setter methods, etc. However, when a `TestExecutionListener` is registered
+automatically via Java's `ServiceLoader` mechanism (see
+<<launcher-api-listeners-custom>>), there is no way for the user to directly configure the
+listener. In such cases, the author of a `TestExecutionListener` may choose to make the
+listener configurable via <<running-tests-config-params, configuration parameters>>. The
+listener can then access the configuration parameters via the `TestPlan` supplied to the
+`testPlanExecutionStarted(TestPlan)` and `testPlanExecutionFinished(TestPlan)` callback
+methods. See the `{UniqueIdTrackingListener}` for an example.
+
 [[launcher-api-listeners-custom-deactivation]]
 ==== Deactivating Execution Listeners
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 9adaf6895044..c386605599b0 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -699,8 +699,8 @@ infrastructure.
 
 In addition to instructing the platform which test classes and test engines to include,
 which packages to scan, etc., it is sometimes necessary to provide additional custom
-configuration parameters that are specific to a particular test engine or registered
-extension. For example, the JUnit Jupiter `TestEngine` supports _configuration
+configuration parameters that are specific to a particular test engine, listener, or
+registered extension. For example, the JUnit Jupiter `TestEngine` supports _configuration
 parameters_ for the following use cases.
 
 - <<writing-tests-test-instance-lifecycle-changing-default>>
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
index 5110f4536d0a..e7fa8419af76 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
@@ -26,6 +26,10 @@
  * <p>For example, the JUnit Jupiter engine uses a configuration parameter to
  * enable IDEs and build tools to deactivate conditional test execution.
  *
+ * <p>As of JUnit Platform 1.8, configuration parameters are also made available to
+ * implementations of the {@link org.junit.platform.launcher.TestExecutionListener}
+ * API via the {@link org.junit.platform.launcher.TestPlan}.
+ *
  * @see TestEngine
  * @see EngineDiscoveryRequest
  * @see ExecutionRequest
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
index b0505e9e213a..e502dd3f439c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
@@ -39,6 +39,13 @@
  * Jupiter engines comply with this contract, there is no way to guarantee this for
  * third-party engines.
  *
+ * <p>As of JUnit Platform 1.8, a {@code TestExecutionListener} can access
+ * {@linkplain org.junit.platform.engine.ConfigurationParameters configuration
+ * parameters} via the {@link TestPlan#getConfigurationParameters()
+ * getConfigurationParameters()} method in the {@code TestPlan} supplied to
+ * {@link #testPlanExecutionStarted(TestPlan)} and
+ * {@link #testPlanExecutionFinished(TestPlan)}.
+ *
  * @since 1.0
  * @see Launcher
  * @see TestPlan
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index 9e268224b134..617bdf6a24c9 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -15,6 +15,7 @@
 import static java.util.Collections.unmodifiableSet;
 import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.apiguardian.api.API.Status.MAINTAINED;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Collection;
@@ -28,6 +29,7 @@
 import org.apiguardian.api.API;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestDescriptor.Visitor;
 import org.junit.platform.engine.UniqueId;
@@ -66,6 +68,8 @@ public class TestPlan {
 
 	private final boolean containsTests;
 
+	private final ConfigurationParameters configurationParameters;
+
 	/**
 	 * Construct a new {@code TestPlan} from the supplied collection of
 	 * {@link TestDescriptor TestDescriptors}.
@@ -75,20 +79,26 @@ public class TestPlan {
 	 *
 	 * @param engineDescriptors the engine test descriptors from which the test
 	 * plan should be created; never {@code null}
+	 * @param configurationParameters the {@code ConfigurationParameters} for
+	 * this test plan; never {@code null}
 	 * @return a new test plan
 	 */
 	@API(status = INTERNAL, since = "1.0")
-	public static TestPlan from(Collection<TestDescriptor> engineDescriptors) {
+	public static TestPlan from(Collection<TestDescriptor> engineDescriptors,
+			ConfigurationParameters configurationParameters) {
 		Preconditions.notNull(engineDescriptors, "Cannot create TestPlan from a null collection of TestDescriptors");
-		TestPlan testPlan = new TestPlan(engineDescriptors.stream().anyMatch(TestDescriptor::containsTests));
+		Preconditions.notNull(configurationParameters, "Cannot create TestPlan from null ConfigurationParameters");
+		TestPlan testPlan = new TestPlan(engineDescriptors.stream().anyMatch(TestDescriptor::containsTests),
+			configurationParameters);
 		Visitor visitor = descriptor -> testPlan.add(TestIdentifier.from(descriptor));
 		engineDescriptors.forEach(engineDescriptor -> engineDescriptor.accept(visitor));
 		return testPlan;
 	}
 
 	@API(status = INTERNAL, since = "1.4")
-	protected TestPlan(boolean containsTests) {
+	protected TestPlan(boolean containsTests, ConfigurationParameters configurationParameters) {
 		this.containsTests = containsTests;
+		this.configurationParameters = configurationParameters;
 	}
 
 	/**
@@ -222,4 +232,15 @@ public boolean containsTests() {
 		return containsTests;
 	}
 
+	/**
+	 * Get the {@link ConfigurationParameters} for this test plan.
+	 *
+	 * @return the configuration parameters; never {@code null}
+	 * @since 1.8
+	 */
+	@API(status = MAINTAINED, since = "1.8")
+	public ConfigurationParameters getConfigurationParameters() {
+		return this.configurationParameters;
+	}
+
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
index 559d603e885e..5f9c6a574183 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
@@ -34,12 +34,13 @@ class InternalTestPlan extends TestPlan {
 	private final TestPlan delegate;
 
 	static InternalTestPlan from(LauncherDiscoveryResult discoveryResult) {
-		TestPlan delegate = TestPlan.from(discoveryResult.getEngineTestDescriptors());
+		TestPlan delegate = TestPlan.from(discoveryResult.getEngineTestDescriptors(),
+			discoveryResult.getConfigurationParameters());
 		return new InternalTestPlan(discoveryResult, delegate);
 	}
 
 	private InternalTestPlan(LauncherDiscoveryResult discoveryResult, TestPlan delegate) {
-		super(delegate.containsTests());
+		super(delegate.containsTests(), delegate.getConfigurationParameters());
 		this.discoveryResult = discoveryResult;
 		this.delegate = delegate;
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index 7e6a921b5dc4..81afea40a43b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -25,6 +25,7 @@
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.StringUtils;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
@@ -56,11 +57,11 @@
  * is {@code OUTPUT_DIR}/{@code OUTPUT_FILE}.
  *
  * <p>The name of the {@code OUTPUT_FILE} defaults to {@link #DEFAULT_FILE_NAME},
- * but a custom file name can be configured via the {@link #OUTPUT_FILE_PROPERTY_NAME}
- * JVM system property.
+ * but a custom file name can be set via the {@link #OUTPUT_FILE_PROPERTY_NAME}
+ * configuration property.
  *
  * <p>The {@code OUTPUT_DIR} can be set to a custom directory via the
- * {@link #OUTPUT_DIR_PROPERTY_NAME} JVM system property. Otherwise the following
+ * {@link #OUTPUT_DIR_PROPERTY_NAME} configuration property. Otherwise the following
  * algorithm is used to select a default output directory.
  *
  * <ul>
@@ -78,6 +79,10 @@
  * by this listener would be {@code ./build/junit-platform-unique-test-ids.txt}
  * by default.
  *
+ * <p>Configuration properties can be set via JVM system properties, via a
+ * {@code junit-platform.properties} file in the root of the classpath, or as
+ * JUnit Platform {@linkplain ConfigurationParameters configuration parameters}.
+ *
  * @since 1.8
  */
 @API(status = EXPERIMENTAL, since = "1.8")
@@ -121,10 +126,11 @@ public class UniqueIdTrackingListener implements TestExecutionListener {
 
 	private final List<String> uniqueIds = new ArrayList<>();
 
-	private final boolean enabled;
+	private boolean enabled;
 
-	public UniqueIdTrackingListener() {
-		this.enabled = Boolean.getBoolean(LISTENER_ENABLED_PROPERTY_NAME);
+	@Override
+	public void testPlanExecutionStarted(TestPlan testPlan) {
+		this.enabled = testPlan.getConfigurationParameters().getBoolean(LISTENER_ENABLED_PROPERTY_NAME).orElse(false);
 	}
 
 	@Override
@@ -139,7 +145,7 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 		if (this.enabled) {
 			Path outputFile;
 			try {
-				outputFile = getOutputFile();
+				outputFile = getOutputFile(testPlan.getConfigurationParameters());
 			}
 			catch (IOException ex) {
 				logger.error(ex, () -> "Failed to create output file");
@@ -158,9 +164,9 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 		}
 	}
 
-	private Path getOutputFile() throws IOException {
-		String filename = System.getProperty(OUTPUT_FILE_PROPERTY_NAME, DEFAULT_FILE_NAME);
-		Path outputFile = getOutputDir().resolve(filename);
+	private Path getOutputFile(ConfigurationParameters configurationParameters) throws IOException {
+		String filename = configurationParameters.get(OUTPUT_FILE_PROPERTY_NAME).orElse(DEFAULT_FILE_NAME);
+		Path outputFile = getOutputDir(configurationParameters).resolve(filename);
 
 		if (Files.exists(outputFile)) {
 			Files.delete(outputFile);
@@ -171,11 +177,11 @@ private Path getOutputFile() throws IOException {
 		return outputFile;
 	}
 
-	Path getOutputDir() throws IOException {
+	Path getOutputDir(ConfigurationParameters configurationParameters) throws IOException {
 		Path cwd = currentWorkingDir();
 		Path outputDir;
 
-		String customDir = System.getProperty(OUTPUT_DIR_PROPERTY_NAME);
+		String customDir = configurationParameters.get(OUTPUT_DIR_PROPERTY_NAME).orElse(null);
 		if (StringUtils.isNotBlank(customDir)) {
 			outputDir = cwd.resolve(customDir);
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
index 65e313100c2d..f30043aa5233 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
@@ -11,16 +11,20 @@
 package org.junit.platform.launcher;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 
 class TestPlanTests {
 
+	private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+
 	private EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("foo"), "Foo");
 
 	@Test
@@ -33,7 +37,7 @@ public Type getType() {
 				}
 			});
 
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		assertThat(testPlan.containsTests()).as("contains tests").isFalse();
 	}
@@ -48,7 +52,7 @@ public Type getType() {
 				}
 			});
 
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		assertThat(testPlan.containsTests()).as("contains tests").isTrue();
 	}
@@ -68,8 +72,9 @@ public boolean mayRegisterTests() {
 				}
 			});
 
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		assertThat(testPlan.containsTests()).as("contains tests").isTrue();
 	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
index 7475acee1cc2..76c4c945be4d 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.platform.commons.logging.LogRecordListener;
 import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
@@ -91,7 +92,8 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionStartedListenerMethodFails(
 			LogRecordListener logRecordListener) {
 		var testDescriptor = getDemoMethodTestDescriptor();
 
-		compositeTestExecutionListener().testPlanExecutionStarted(TestPlan.from(Set.of(testDescriptor)));
+		compositeTestExecutionListener().testPlanExecutionStarted(
+			TestPlan.from(Set.of(testDescriptor), mock(ConfigurationParameters.class)));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"testPlanExecutionStarted");
@@ -102,7 +104,8 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionFinishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
 		var testDescriptor = getDemoMethodTestDescriptor();
 
-		compositeTestExecutionListener().testPlanExecutionFinished(TestPlan.from(Set.of(testDescriptor)));
+		compositeTestExecutionListener().testPlanExecutionFinished(
+			TestPlan.from(Set.of(testDescriptor), mock(ConfigurationParameters.class)));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"testPlanExecutionFinished");
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
index 88a256addbe4..1bf3e03e2940 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
@@ -17,6 +17,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.UniqueId;
@@ -35,7 +36,8 @@ class ExecutionListenerAdapterTests {
 	void testReportingEntryPublished() {
 		var testDescriptor = getSampleMethodTestDescriptor();
 
-		var discoveryResult = new LauncherDiscoveryResult(Map.of(mock(TestEngine.class), testDescriptor), null);
+		var discoveryResult = new LauncherDiscoveryResult(Map.of(mock(TestEngine.class), testDescriptor),
+			mock(ConfigurationParameters.class));
 		var testPlan = InternalTestPlan.from(discoveryResult);
 		var testIdentifier = testPlan.getTestIdentifier(testDescriptor.getUniqueId().toString());
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index 229e82f1f639..b22e51d18437 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -16,6 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.platform.commons.test.ConcurrencyTestingUtils.executeConcurrently;
+import static org.mockito.Mockito.mock;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -24,6 +25,7 @@
 
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
@@ -38,7 +40,7 @@
 class SummaryGenerationTests {
 
 	private final SummaryGeneratingListener listener = new SummaryGeneratingListener();
-	private final TestPlan testPlan = TestPlan.from(List.of());
+	private final TestPlan testPlan = TestPlan.from(List.of(), mock(ConfigurationParameters.class));
 
 	@Test
 	void emptyReport() {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
index 4853697367df..2e15a828284f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
@@ -36,13 +36,13 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.stream.Stream;
 
 import org.assertj.core.api.Condition;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
@@ -77,14 +77,6 @@ class UniqueIdTrackingListenerIntegrationTests {
 	private static final String[] expectedUniqueIds = { passingTest, abortedTest, failingTest, dynamicTest1,
 			dynamicTest2, test1, test2 };
 
-	@BeforeEach
-	@AfterEach
-	void clearSystemProperties() {
-		System.clearProperty(LISTENER_ENABLED_PROPERTY_NAME);
-		System.clearProperty(OUTPUT_DIR_PROPERTY_NAME);
-		System.clearProperty(OUTPUT_FILE_PROPERTY_NAME);
-	}
-
 	@Test
 	void confirmExpectedUniqueIdsViaEngineTestKit() {
 		// @formatter:off
@@ -116,7 +108,7 @@ void listenerIsRegisteredButDisabledByDefault() throws Exception {
 		Files.deleteIfExists(path);
 
 		try {
-			List<String> actualUniqueIds = executeTests();
+			List<String> actualUniqueIds = executeTests(Map.of());
 
 			// Sanity check using the results of our local TestExecutionListener
 			assertThat(actualUniqueIds).containsExactlyInAnyOrder(expectedUniqueIds);
@@ -132,43 +124,42 @@ void listenerIsRegisteredButDisabledByDefault() throws Exception {
 	@Test
 	void verifyUniqueIdsAreTrackedWithDefaults() throws Exception {
 		Path path = Paths.get("build", DEFAULT_FILE_NAME);
-		verifyUniqueIdsAreTracked(path);
+		verifyUniqueIdsAreTracked(path, Map.of());
 	}
 
 	@Test
 	void verifyUniqueIdsAreTrackedWithCustomOutputFile() throws Exception {
 		String customFilename = "test_ids.txt";
-		System.setProperty(OUTPUT_FILE_PROPERTY_NAME, customFilename);
 
 		Path path = Paths.get("build", customFilename);
-		verifyUniqueIdsAreTracked(path);
+		verifyUniqueIdsAreTracked(path, Map.of(OUTPUT_FILE_PROPERTY_NAME, customFilename));
 	}
 
 	@Test
 	void verifyUniqueIdsAreTrackedWithCustomOutputDir() throws Exception {
 		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
-		System.setProperty(OUTPUT_DIR_PROPERTY_NAME, customDir);
 
 		Path path = Paths.get(customDir, DEFAULT_FILE_NAME);
-		verifyUniqueIdsAreTracked(path);
+		verifyUniqueIdsAreTracked(path, Map.of(OUTPUT_DIR_PROPERTY_NAME, customDir));
 	}
 
 	@Test
 	void verifyUniqueIdsAreTrackedWithCustomOutputFileAndCustomOutputDir() throws Exception {
 		String customFilename = "test_ids.txt";
 		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
-		System.setProperty(OUTPUT_DIR_PROPERTY_NAME, customDir);
-		System.setProperty(OUTPUT_FILE_PROPERTY_NAME, customFilename);
 
 		Path path = Paths.get(customDir, customFilename);
-		verifyUniqueIdsAreTracked(path);
+		verifyUniqueIdsAreTracked(path,
+			Map.of(OUTPUT_DIR_PROPERTY_NAME, customDir, OUTPUT_FILE_PROPERTY_NAME, customFilename));
 	}
 
-	private void verifyUniqueIdsAreTracked(Path path) throws IOException {
-		enableListener();
+	private void verifyUniqueIdsAreTracked(Path path, Map<String, String> configurationParameters) throws IOException {
+		configurationParameters = new HashMap<>(configurationParameters);
+		configurationParameters.put(LISTENER_ENABLED_PROPERTY_NAME, "true");
+
 		Files.deleteIfExists(path);
 		try {
-			List<String> actualUniqueIds = executeTests();
+			List<String> actualUniqueIds = executeTests(configurationParameters);
 
 			// Sanity check using the results of our local TestExecutionListener
 			assertThat(actualUniqueIds).containsExactlyInAnyOrder(expectedUniqueIds);
@@ -181,21 +172,19 @@ private void verifyUniqueIdsAreTracked(Path path) throws IOException {
 		}
 	}
 
-	private static void enableListener() {
-		System.setProperty(LISTENER_ENABLED_PROPERTY_NAME, "true");
-	}
-
 	private static Condition<Event> uniqueId(String uniqueId) {
 		return new Condition<>(
 			byTestDescriptor(where(TestDescriptor::getUniqueId, uid -> uid.toString().equals(uniqueId))),
 			"descriptor with uniqueId '%s'", uniqueId);
 	}
 
-	private static List<String> executeTests() {
+	private static List<String> executeTests(Map<String, String> configurationParameters) {
 		List<String> uniqueIds = new ArrayList<>();
 		LauncherDiscoveryRequest request = request()//
 				.selectors(selectClasses())//
-				.filters(includeEngines("junit-jupiter")).build();
+				.filters(includeEngines("junit-jupiter"))//
+				.configurationParameters(configurationParameters)//
+				.build();
 		LauncherFactory.create().execute(request, new TestExecutionListener() {
 			@Override
 			public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
index a04ba7251156..2aea2aff3855 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
@@ -12,13 +12,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.OUTPUT_DIR_PROPERTY_NAME;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.ConfigurationParameters;
 
 /**
  * Unit tests for the {@link UniqueIdTrackingListener}.
@@ -27,41 +31,31 @@
  */
 class UniqueIdTrackingListenerUnitTests {
 
+	private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+
 	@Test
 	void getOutputDirUsesCustomOutputDir() throws Exception {
-		try {
-			String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
-			System.setProperty(OUTPUT_DIR_PROPERTY_NAME, customDir);
-
-			UniqueIdTrackingListener listener = new UniqueIdTrackingListener();
-			Path outputDir = listener.getOutputDir();
-			assertThat(Files.isSameFile(Paths.get(customDir), outputDir)).isTrue();
-			assertThat(outputDir).exists();
-		}
-		finally {
-			System.clearProperty(OUTPUT_DIR_PROPERTY_NAME);
-		}
+		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
+
+		when(configParams.get(OUTPUT_DIR_PROPERTY_NAME)).thenReturn(Optional.of(customDir));
+
+		Path outputDir = new UniqueIdTrackingListener().getOutputDir(configParams);
+		assertThat(Files.isSameFile(Paths.get(customDir), outputDir)).isTrue();
+		assertThat(outputDir).exists();
 	}
 
 	@Test
 	void getOutputDirFallsBackToCurrentWorkingDir() throws Exception {
 		String cwd = "src/test/resources/listeners/uidtracking";
+		String expected = cwd;
 
-		UniqueIdTrackingListener listener = new UniqueIdTrackingListener() {
-			@Override
-			Path currentWorkingDir() {
-				return Paths.get(cwd);
-			}
-		};
-		Path outputDir = listener.getOutputDir();
-		assertThat(Files.isSameFile(Paths.get(cwd), outputDir)).isTrue();
-		assertThat(outputDir).exists();
+		assertOutputDirIsDetected(cwd, expected);
 	}
 
 	@Test
 	void getOutputDirDetectsMavenPom() throws Exception {
 		String cwd = "src/test/resources/listeners/uidtracking/maven";
-		String expected = "target";
+		String expected = cwd + "/target";
 
 		assertOutputDirIsDetected(cwd, expected);
 	}
@@ -69,7 +63,7 @@ void getOutputDirDetectsMavenPom() throws Exception {
 	@Test
 	void getOutputDirDetectsGradleGroovyDefaultBuildScript() throws Exception {
 		String cwd = "src/test/resources/listeners/uidtracking/gradle/groovy";
-		String expected = "build";
+		String expected = cwd + "/build";
 
 		assertOutputDirIsDetected(cwd, expected);
 	}
@@ -77,7 +71,7 @@ void getOutputDirDetectsGradleGroovyDefaultBuildScript() throws Exception {
 	@Test
 	void getOutputDirDetectsGradleGroovyCustomBuildScript() throws Exception {
 		String cwd = "src/test/resources/listeners/uidtracking/gradle/groovy/sub-project";
-		String expected = "build";
+		String expected = cwd + "/build";
 
 		assertOutputDirIsDetected(cwd, expected);
 	}
@@ -85,7 +79,7 @@ void getOutputDirDetectsGradleGroovyCustomBuildScript() throws Exception {
 	@Test
 	void getOutputDirDetectsGradleKotlinDefaultBuildScript() throws Exception {
 		String cwd = "src/test/resources/listeners/uidtracking/gradle/kotlin";
-		String expected = "build";
+		String expected = cwd + "/build";
 
 		assertOutputDirIsDetected(cwd, expected);
 	}
@@ -93,20 +87,22 @@ void getOutputDirDetectsGradleKotlinDefaultBuildScript() throws Exception {
 	@Test
 	void getOutputDirDetectsGradleKotlinCustomBuildScript() throws Exception {
 		String cwd = "src/test/resources/listeners/uidtracking/gradle/kotlin/sub-project";
-		String expected = "build";
+		String expected = cwd + "/build";
 
 		assertOutputDirIsDetected(cwd, expected);
 	}
 
 	private void assertOutputDirIsDetected(String cwd, String expected) throws IOException {
+		when(configParams.get(OUTPUT_DIR_PROPERTY_NAME)).thenReturn(Optional.empty());
+
 		UniqueIdTrackingListener listener = new UniqueIdTrackingListener() {
 			@Override
 			Path currentWorkingDir() {
 				return Paths.get(cwd);
 			}
 		};
-		Path outputDir = listener.getOutputDir();
-		assertThat(Files.isSameFile(Paths.get(cwd, expected), outputDir)).isTrue();
+		Path outputDir = listener.getOutputDir(configParams);
+		assertThat(Files.isSameFile(Paths.get(expected), outputDir)).isTrue();
 		assertThat(outputDir).exists();
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
index 0a2acf7774e4..366a1d644adb 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
@@ -11,10 +11,12 @@
 package org.junit.platform.reporting.legacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
@@ -70,13 +72,13 @@ void legacyReportingClassNameForDescendantOfTestIdentifierWithClassSourceIsClass
 	}
 
 	private String getClassName(UniqueId uniqueId) {
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
 		return LegacyReportingUtils.getClassName(testPlan, testPlan.getTestIdentifier(uniqueId.toString()));
 	}
 
 	@SuppressWarnings("deprecation")
 	private String getClassNameFromOldLocation(UniqueId uniqueId) {
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
 		return org.junit.platform.launcher.listeners.LegacyReportingUtils.getClassName(testPlan,
 			testPlan.getTestIdentifier(uniqueId.toString()));
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 546cb1331c1f..87852e3c3df8 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -20,6 +20,7 @@
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 import static org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly.createLauncher;
 import static org.junit.platform.reporting.legacy.xml.XmlReportAssertions.assertValidAccordingToJenkinsSchema;
+import static org.mockito.Mockito.mock;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -41,6 +42,7 @@
 import org.joox.Match;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
@@ -368,7 +370,7 @@ void printsExceptionWhenReportsDirCannotBeCreated() throws Exception {
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(reportsDir, new PrintWriter(out));
 
-		listener.testPlanExecutionStarted(TestPlan.from(Set.of()));
+		listener.testPlanExecutionStarted(TestPlan.from(Set.of(), mock(ConfigurationParameters.class)));
 
 		assertThat(out.toString()).containsSubsequence("Could not create reports directory",
 			"FileAlreadyExistsException", "at ");
@@ -384,7 +386,7 @@ void printsExceptionWhenReportCouldNotBeWritten() throws Exception {
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
 
-		listener.testPlanExecutionStarted(TestPlan.from(Set.of(engineDescriptor)));
+		listener.testPlanExecutionStarted(TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class)));
 		listener.executionFinished(TestIdentifier.from(engineDescriptor), successful());
 
 		assertThat(out.toString()).containsSubsequence("Could not write XML report", "Exception", "at ");
@@ -394,7 +396,7 @@ void printsExceptionWhenReportCouldNotBeWritten() throws Exception {
 	void writesReportEntriesToSystemOutElement() throws Exception {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
 
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index 0a528f543559..906e7d6d040f 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -13,11 +13,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.platform.engine.TestExecutionResult.failed;
 import static org.junit.platform.engine.TestExecutionResult.successful;
+import static org.mockito.Mockito.mock;
 
 import java.time.Clock;
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 import org.junit.platform.fakes.TestDescriptorStub;
@@ -28,11 +30,13 @@
  */
 class XmlReportDataTests {
 
+	private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+
 	@Test
 	void resultsOfTestIdentifierWithoutAnyReportedEventsAreEmpty() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var results = reportData.getResults(testPlan.getTestIdentifier("[child:test]"));
@@ -44,7 +48,7 @@ void resultsOfTestIdentifierWithoutAnyReportedEventsAreEmpty() {
 	void resultsOfTestIdentifierWithoutReportedEventsContainsOnlyFailureOfAncestor() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var failureOfAncestor = failed(new RuntimeException("failed!"));
@@ -59,7 +63,7 @@ void resultsOfTestIdentifierWithoutReportedEventsContainsOnlyFailureOfAncestor()
 	void resultsOfTestIdentifierWithoutReportedEventsContainsOnlySuccessOfAncestor() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());
@@ -68,4 +72,5 @@ void resultsOfTestIdentifierWithoutReportedEventsContainsOnlySuccessOfAncestor()
 
 		assertThat(results).containsExactly(successful());
 	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index 2b6cdf1dceeb..5b02b962f368 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -20,6 +20,7 @@
 import static org.junit.platform.launcher.LauncherConstants.STDERR_REPORT_ENTRY_KEY;
 import static org.junit.platform.launcher.LauncherConstants.STDOUT_REPORT_ENTRY_KEY;
 import static org.junit.platform.reporting.legacy.xml.XmlReportAssertions.assertValidAccordingToJenkinsSchema;
+import static org.mockito.Mockito.mock;
 
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -34,6 +35,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
@@ -46,11 +48,13 @@
  */
 class XmlReportWriterTests {
 
+	private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+
 	private EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 
 	@Test
 	void writesTestsuiteElementsWithoutTestcaseElementsWithoutAnyTests() throws Exception {
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 
@@ -68,7 +72,7 @@ void writesReportEntry() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		var testDescriptor = new TestDescriptorStub(uniqueId, "successfulTest");
 		engineDescriptor.addChild(testDescriptor);
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), ReportEntry.from("myKey", "myValue"));
@@ -86,7 +90,7 @@ void writesCapturedOutput() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		var testDescriptor = new TestDescriptorStub(uniqueId, "successfulTest");
 		engineDescriptor.addChild(testDescriptor);
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var reportEntry = ReportEntry.from(Map.of( //
@@ -115,7 +119,7 @@ void writesCapturedOutput() throws Exception {
 	void writesEmptySkippedElementForSkippedTestWithoutReason() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "skippedTest"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markSkipped(testPlan.getTestIdentifier(uniqueId.toString()), null);
@@ -145,7 +149,7 @@ public String getLegacyReportingName() {
 				return "failedTest";
 			}
 		});
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(null));
@@ -165,7 +169,7 @@ public String getLegacyReportingName() {
 	void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "failedTest"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(new NullPointerException()));
@@ -182,7 +186,7 @@ void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exce
 	void writesValidXmlEvenIfExceptionMessageContainsCData() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
@@ -198,7 +202,7 @@ void writesValidXmlEvenIfExceptionMessageContainsCData() throws Exception {
 	void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("expected: <A> but was: <B\0>");
@@ -227,7 +231,7 @@ void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages() throws Exc
 	void doesNotReopenCDataWithinCDataContent() throws Exception {
 		var uniqueId = engineDescriptor.getUniqueId().append("test", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(uniqueId, "test"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index edcd0546e5ed..bcecf702374f 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -43,6 +43,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.EngineDiscoveryRequest;
 import org.junit.platform.engine.ExecutionRequest;
 import org.junit.platform.engine.TestDescriptor;
@@ -432,7 +433,7 @@ void convertsTestIdentifiersIntoDescriptions() {
 			TestDescriptor container2 = new TestDescriptorStub(UniqueId.root("root", "container2"), "container2");
 			container2.addChild(new TestDescriptorStub(UniqueId.root("root", "test2a"), "test2a"));
 			container2.addChild(new TestDescriptorStub(UniqueId.root("root", "test2b"), "test2b"));
-			var testPlan = TestPlan.from(List.of(container1, container2));
+			var testPlan = TestPlan.from(List.of(container1, container2), mock(ConfigurationParameters.class));
 
 			var launcher = mock(Launcher.class);
 			when(launcher.discover(any())).thenReturn(testPlan);
@@ -461,6 +462,8 @@ void convertsTestIdentifiersIntoDescriptions() {
 	@Nested
 	class Filtering {
 
+		private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+
 		@Test
 		void appliesFilter() throws Exception {
 
@@ -469,11 +472,11 @@ void appliesFilter() throws Exception {
 			TestDescriptor originalParent2 = new TestDescriptorStub(UniqueId.root("root", "parent2"), "parent2");
 			originalParent2.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2a"), "leaf2a"));
 			originalParent2.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2b"), "leaf2b"));
-			var fullTestPlan = TestPlan.from(List.of(originalParent1, originalParent2));
+			var fullTestPlan = TestPlan.from(List.of(originalParent1, originalParent2), configParams);
 
 			TestDescriptor filteredParent = new TestDescriptorStub(UniqueId.root("root", "parent2"), "parent2");
 			filteredParent.addChild(new TestDescriptorStub(UniqueId.root("root", "leaf2b"), "leaf2b"));
-			var filteredTestPlan = TestPlan.from(Set.of(filteredParent));
+			var filteredTestPlan = TestPlan.from(Set.of(filteredParent), configParams);
 
 			var launcher = mock(Launcher.class);
 			var captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
@@ -495,7 +498,8 @@ void appliesFilter() throws Exception {
 
 		@Test
 		void throwsNoTestsRemainExceptionWhenNoTestIdentifierMatchesFilter() {
-			var testPlan = TestPlan.from(Set.of(new TestDescriptorStub(UniqueId.root("root", "test"), "test")));
+			var testPlan = TestPlan.from(Set.of(new TestDescriptorStub(UniqueId.root("root", "test"), "test")),
+				configParams);
 
 			var launcher = mock(Launcher.class);
 			when(launcher.discover(any())).thenReturn(testPlan);
@@ -733,7 +737,8 @@ private TestDescriptor testDescriptorWithTags(String... tag) {
 	private LauncherDiscoveryRequest instantiateRunnerAndCaptureGeneratedRequest(Class<?> testClass) {
 		var launcher = mock(Launcher.class);
 		var captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
-		when(launcher.discover(captor.capture())).thenReturn(TestPlan.from(Set.of()));
+		when(launcher.discover(captor.capture())).thenReturn(
+			TestPlan.from(Set.of(), mock(ConfigurationParameters.class)));
 
 		new JUnitPlatform(testClass, launcher);
 

From b68c895433598121bc55814811773661a16fedd0 Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Thu, 3 Jun 2021 15:39:22 +0200
Subject: [PATCH 0340/1433] Clarify intended usage of assert{Not}Equals

Resolves #2567.
---
 .../main/java/org/junit/jupiter/api/Assertions.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index e60dec142872..98e9e5c6aa34 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -34,6 +34,17 @@
  * <p>Unless otherwise noted, a <em>failed</em> assertion will throw an
  * {@link org.opentest4j.AssertionFailedError} or a subclass thereof.
  *
+ * <p>Assertion methods comparing two values for equality, such as {@code assertEquals},
+ * are <em>only</em> intended to test equality for an (un-)expected and an actual result
+ * value. They are not designed for testing whether a class correctly implements
+ * {@code equals(Object)}. For example {@code assertEquals} might return fast when
+ * provided with the same object as expected and actual value without calling
+ * {@code equals(Object)} at all. Such tests trying to verify the {@code equals(Object)}
+ * implementation should instead be written explicitly and
+ * {@link #assertTrue(boolean) assertTrue} or {@link #assertFalse(boolean) assertFalse}
+ * should be used to verify the result, e.g.: {@code assertTrue(obj.equals(obj))},
+ * {@code assertFalse(obj.equals(null))}.
+ *
  * <h3>Kotlin Support</h3>
  *
  * <p>Additional <a href="https://kotlinlang.org/">Kotlin</a> assertions can be

From 22b610706dbaf417feb4f4c59ea7188fb76d5bfe Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 3 Jun 2021 16:23:03 +0200
Subject: [PATCH 0341/1433] Polish contribution

See #2567, #2632
---
 .../org/junit/jupiter/api/Assertions.java     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 98e9e5c6aa34..0482e43caf64 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -34,16 +34,21 @@
  * <p>Unless otherwise noted, a <em>failed</em> assertion will throw an
  * {@link org.opentest4j.AssertionFailedError} or a subclass thereof.
  *
- * <p>Assertion methods comparing two values for equality, such as {@code assertEquals},
- * are <em>only</em> intended to test equality for an (un-)expected and an actual result
- * value. They are not designed for testing whether a class correctly implements
- * {@code equals(Object)}. For example {@code assertEquals} might return fast when
- * provided with the same object as expected and actual value without calling
- * {@code equals(Object)} at all. Such tests trying to verify the {@code equals(Object)}
- * implementation should instead be written explicitly and
- * {@link #assertTrue(boolean) assertTrue} or {@link #assertFalse(boolean) assertFalse}
- * should be used to verify the result, e.g.: {@code assertTrue(obj.equals(obj))},
- * {@code assertFalse(obj.equals(null))}.
+ * <h3>Object Equality</h3>
+ *
+ * <p>Assertion methods comparing two objects for <em>equality</em>, such as the
+ * {@code assertEquals(expected, actual)} and {@code assertNotEquals(unexpected, actual)}
+ * variants, are <em>only</em> intended to test equality for an (un-)expected value
+ * and an actual value. They are not designed for testing whether a class correctly
+ * implements {@link Object#equals(Object)}. For example, {@code assertEquals()}
+ * might immediately return {@code true} when provided the same object for the
+ * expected and actual values, without calling {@code equals(Object)} at all.
+ * Tests that aim to verify the {@code equals(Object)} implementation should instead
+ * be written to explicitly verify the {@link Object#equals(Object)} contract by
+ * using {@link #assertTrue(boolean) assertTrue()} or {@link #assertFalse(boolean)
+ * assertFalse()} &mdash; for example, {@code assertTrue(expected.equals(actual))},
+ * {@code assertTrue(actual.equals(expected))}, {@code assertFalse(expected.equals(null))},
+ * etc.
  *
  * <h3>Kotlin Support</h3>
  *

From ac01aa33686d1f629d51ff2946d774fe25303d9e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 3 Jun 2021 17:12:02 +0200
Subject: [PATCH 0342/1433] Polish documentation for Launcher-related topics

---
 .../asciidoc/user-guide/launcher-api.adoc     | 111 +++++++++---------
 .../launcher/LauncherSessionListener.java     |  15 ++-
 .../launcher/core/LauncherFactory.java        |   4 +-
 3 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index 164541c5cf8c..3b032851bfc6 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -19,9 +19,9 @@ An example consumer of the launcher API is the `{ConsoleLauncher}` in the
 [[launcher-api-discovery]]
 ==== Discovering Tests
 
-Introducing _test discovery_ as a dedicated feature of the platform itself will
-(hopefully) free IDEs and build tools from most of the difficulties they had to go
-through to identify test classes and test methods in the past.
+Having _test discovery_ as a dedicated feature of the platform itself frees IDEs and build
+tools from most of the difficulties they had to go through to identify test classes and
+test methods in previous versions of JUnit.
 
 Usage Example:
 
@@ -35,9 +35,9 @@ include::{testDir}/example/UsingTheLauncherDemo.java[tags=imports]
 include::{testDir}/example/UsingTheLauncherDemo.java[tags=discovery]
 ----
 
-There's currently the possibility to select classes, methods, and all classes in a
-package or even search for all tests in the classpath. Discovery takes place across all
-participating test engines.
+You can select classes, methods, and all classes in a package or even search for all tests
+in the class-path or module-path. Discovery takes place across all participating test
+engines.
 
 The resulting `TestPlan` is a hierarchical (and read-only) description of all engines,
 classes, and test methods that fit the `LauncherDiscoveryRequest`. The client can
@@ -45,12 +45,13 @@ traverse the tree, retrieve details about a node, and get a link to the original
 (like class, method, or file position). Every node in the test plan has a _unique ID_
 that can be used to invoke a particular test or group of tests.
 
-Clients can register one or more `{LauncherDiscoveryListener}` implementations to get
-insights into events that occur during test discovery via the
-`{LauncherDiscoveryRequestBuilder}`. The builder registers a default listener that can be
-changed via the `junit.platform.discovery.listener.default` configuration parameter. If
-the parameter is not set, test discovery will be aborted after the first failure is
-encountered.
+Clients can register one or more `{LauncherDiscoveryListener}` implementations via the
+`{LauncherDiscoveryRequestBuilder}` to gain insight into events that occur during test
+discovery. By default, the builder registers an "abort on failure" listener that aborts
+test discovery after the first discovery failure is encountered. The default
+`LauncherDiscoveryListener` can be changed via the
+`junit.platform.discovery.listener.default` <<running-tests-config-params, configuration
+parameter>>.
 
 [[launcher-api-execution]]
 ==== Executing Tests
@@ -65,14 +66,15 @@ following example.
 include::{testDir}/example/UsingTheLauncherDemo.java[tags=execution]
 ----
 
-There is no return value for the `execute()` method, but you can easily use a listener to
-aggregate the final results in an object of your own. For examples see the
-`{SummaryGeneratingListener}` and `{LegacyXmlReportGeneratingListener}`.
+There is no return value for the `execute()` method, but you can use a
+`TestExecutionListener` to aggregate the results. For examples see the
+`{SummaryGeneratingListener}`, `{LegacyXmlReportGeneratingListener}`, and
+`{UniqueIdTrackingListener}`.
 
 [[launcher-api-engines-custom]]
-==== Plugging in your own Test Engine
+==== Registering a TestEngine
 
-JUnit currently provides two `{TestEngine}` implementations.
+JUnit provides three `{TestEngine}` implementations.
 
 * `{junit-jupiter-engine}`: The core of JUnit Jupiter.
 * `{junit-vintage-engine}`: A thin layer on top of JUnit 4 to allow running _vintage_
@@ -80,13 +82,12 @@ JUnit currently provides two `{TestEngine}` implementations.
 * `{junit-platform-suite-engine}`: To execute declarative suites of tests with the
   launcher infrastructure.
 
-
-Third parties may also contribute their own `TestEngine` by implementing the interfaces
-in the {junit-platform-engine} module and _registering_ their engine. By default, engine
-registration is supported via Java's `{ServiceLoader}` mechanism. For example, the
-`junit-jupiter-engine` module registers its `org.junit.jupiter.engine.JupiterTestEngine`
-in a file named `org.junit.platform.engine.TestEngine` within the `/META-INF/services` in
-the `junit-jupiter-engine` JAR.
+Third parties may also contribute their own `TestEngine` by implementing the interfaces in
+the {junit-platform-engine} module and _registering_ their engine. Engine registration is
+supported via Java's `{ServiceLoader}` mechanism. For example, the `junit-jupiter-engine`
+module registers its `org.junit.jupiter.engine.JupiterTestEngine` in a file named
+`org.junit.platform.engine.TestEngine` within the `/META-INF/services` folder in the
+`junit-jupiter-engine` JAR.
 
 NOTE: `{HierarchicalTestEngine}` is a convenient abstract base implementation (used by
 the `{junit-jupiter-engine}`) that only requires implementors to provide the logic for
@@ -108,61 +109,61 @@ by the JUnit Team may use the `junit-` prefix for their `TestEngine` IDs.
 ====
 
 [[launcher-api-post-discovery-filters-custom]]
-==== Plugging in your own Post-Discovery Filters
+==== Registering a PostDiscoveryFilter
 
 In addition to specifying post-discovery filters as part of a `{LauncherDiscoveryRequest}`
-passed to the `{Launcher}` API, by default custom `{PostDiscoveryFilter}` implementations
-will be discovered at runtime via Java's `{ServiceLoader}` mechanism and automatically
-applied by the `Launcher` in addition to those that are part of the request.
+passed to the `{Launcher}` API, `{PostDiscoveryFilter}` implementations will be discovered
+at runtime via Java's `{ServiceLoader}` mechanism and automatically applied by the
+`Launcher` in addition to those that are part of the request.
 
-For example, an `example.CustomTagFilter` class implementing `{PostDiscoveryFilter}` and
+For example, an `example.CustomTagFilter` class implementing `PostDiscoveryFilter` and
 declared within the `/META-INF/services/org.junit.platform.launcher.PostDiscoveryFilter`
 file is loaded and applied automatically.
 
 [[launcher-api-launcher-session-listeners-custom]]
-==== Plugging in your own Launcher Session Listeners
+==== Registering a LauncherSessionListener
 
 Registered implementations of `{LauncherSessionListener}` are notified when a
-`{LauncherSession}` is opened, i.e. before a `{Launcher}` first discovers and executes
-tests, and closed, i.e. when no more tests will be discovered or executed. They can be
-registered programmatically on the `{LauncherConfig}` that is passed to
-`{LauncherFactory}` or, unless disabled, will be discovered at runtime via Java's
-`{ServiceLoader}` mechanism and automatically registered with `{LauncherSession}`.
+`{LauncherSession}` is opened (before a `{Launcher}` first discovers and executes tests)
+and closed (when no more tests will be discovered or executed). They can be registered
+programmatically via the `{LauncherConfig}` that is passed to the `{LauncherFactory}`, or
+they can be discovered at runtime via Java's `{ServiceLoader}` mechanism and automatically
+registered with `LauncherSession` (unless automatic registration is disabled.)
 
 For example, an `example.CustomLauncherSessionListener` class implementing
-`{LauncherSessionListener}` and declared within the
+`LauncherSessionListener` and declared within the
 `/META-INF/services/org.junit.platform.launcher.LauncherSessionListener` file is loaded
 and registered automatically.
 
 [[launcher-api-launcher-discovery-listeners-custom]]
-==== Plugging in your own Discovery Listeners
+==== Registering a LauncherDiscoveryListener
 
-In addition to specifying discovery listeners as part of a `{LauncherDiscoveryRequest}`
-or registering them programmatically using the public `{Launcher}` API method,  custom
-`{LauncherDiscoveryListener}` implementations can be discovered at runtime via Java's
-`{ServiceLoader}` mechanism and automatically registered with the `{Launcher}` created via
+In addition to specifying discovery listeners as part of a `{LauncherDiscoveryRequest}` or
+registering them programmatically via the `{Launcher}` API, custom
+`LauncherDiscoveryListener` implementations can be discovered at runtime via Java's
+`{ServiceLoader}` mechanism and automatically registered with the `Launcher` created via
 the `{LauncherFactory}`.
 
 For example, an `example.CustomLauncherDiscoveryListener` class implementing
-`{LauncherDiscoveryListener}` and declared within the
+`LauncherDiscoveryListener` and declared within the
 `/META-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener` file is loaded
 and registered automatically.
 
 [[launcher-api-listeners-custom]]
-==== Plugging in your own Execution Listener
+==== Registering a TestExecutionListener
 
-In addition to the public `{Launcher}` API method for registering test execution
-listeners programmatically, by default custom `{TestExecutionListener}` implementations
-will be discovered at runtime via Java's `{ServiceLoader}` mechanism and automatically
-registered with the `{Launcher}` created via the `{LauncherFactory}`.
+In addition to the public `{Launcher}` API method for registering test execution listeners
+programmatically, custom `{TestExecutionListener}` implementations will be discovered at
+runtime via Java's `{ServiceLoader}` mechanism and automatically registered with the
+`Launcher` created via the `{LauncherFactory}`.
 
 For example, an `example.CustomTestExecutionListener` class implementing
-`{TestExecutionListener}` and declared within the
+`TestExecutionListener` and declared within the
 `/META-INF/services/org.junit.platform.launcher.TestExecutionListener` file is loaded and
 registered automatically.
 
 [[launcher-api-listeners-config]]
-==== Configuring an Execution Listener
+==== Configuring a TestExecutionListener
 
 When a `{TestExecutionListener}` is registered programmatically via the `{Launcher}` API,
 the listener may provide programmatic ways for it to be configured -- for example, via its
@@ -176,7 +177,7 @@ listener can then access the configuration parameters via the `TestPlan` supplie
 methods. See the `{UniqueIdTrackingListener}` for an example.
 
 [[launcher-api-listeners-custom-deactivation]]
-==== Deactivating Execution Listeners
+==== Deactivating a TestExecutionListener
 
 Sometimes it can be useful to run a test suite _without_ certain execution listeners being
 active. For example, you might have custom a `{TestExecutionListener}` that sends the test
@@ -197,7 +198,7 @@ In addition, since execution listeners are registered before the test run starts
 `junit.platform.execution.listeners.deactivate` _configuration parameter_ can only be
 supplied as a JVM system property or via the JUnit Platform configuration file (see
 <<running-tests-config-params>> for details). This _configuration parameter_ cannot be
-supplied in the `{LauncherDiscoveryRequest}` that is passed to the `{Launcher}`.
+supplied in the `LauncherDiscoveryRequest` that is passed to the `{Launcher}`.
 ====
 
 [[launcher-api-listeners-custom-deactivation-pattern]]
@@ -219,7 +220,7 @@ the following implementation.
   The `LegacyXmlReportGeneratingListener` is used by the
   <<running-tests-console-launcher>> as well.
 
-NOTE: The `{junit-platform-launcher}` module also contains `{TestExecutionListener}`
+NOTE: The `{junit-platform-launcher}` module also contains `TestExecutionListener`
 implementations that can be used for reporting purposes. See `{LoggingListener}` and
 `{SummaryGeneratingListener}` for details.
 
@@ -227,9 +228,9 @@ implementations that can be used for reporting purposes. See `{LoggingListener}`
 ==== Configuring the Launcher
 
 If you require fine-grained control over automatic detection and registration of test
-engines and test execution listeners, you may create an instance of `{LauncherConfig}` and
-supply that to the `{LauncherFactory}`. Typically, an instance of `{LauncherConfig}` is
-created via the built-in fluent _builder_ API, as demonstrated in the following example.
+engines and listeners, you may create an instance of `{LauncherConfig}` and supply that to
+the `{LauncherFactory}`. Typically, an instance of `LauncherConfig` is created via the
+built-in fluent _builder_ API, as demonstrated in the following example.
 
 [source,java,indent=0]
 ----
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
index b03601dadc3b..2860331013c0 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
@@ -17,12 +17,15 @@
 import org.junit.platform.launcher.core.LauncherFactory;
 
 /**
- * Register an implementation of this interface with the
- * {@link LauncherConfig.Builder#addLauncherSessionListeners LauncherConfig}
- * passed to
- * {@link LauncherFactory#openSession(LauncherConfig) LauncherFactory} or via
- * ServiceLoader to be notified when a {@link LauncherSession} is opened and
- * closed.
+ * Register an implementation of this interface to be notified when a
+ * {@link LauncherSession} is opened and closed.
+ *
+ * <p>A {@code LauncherSessionListener} can be registered programmatically with
+ * the {@link LauncherConfig.Builder#addLauncherSessionListeners LauncherConfig}
+ * passed to the
+ * {@link LauncherFactory#openSession(LauncherConfig) LauncherFactory} or
+ * automatically via Java's {@link java.util.ServiceLoader ServiceLoader}
+ * mechanism.
  *
  * <p>All methods in this class have empty <em>default</em> implementations.
  * Subclasses may therefore override one or more of these methods to be notified
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index df826399fd5b..4aacb959d08c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -89,7 +89,7 @@ public static LauncherSession openSession() throws PreconditionViolationExceptio
 	 * @param config the configuration for the session and the launcher; never
 	 * {@code null}
 	 * @throws PreconditionViolationException if the supplied configuration is
-	 * {@code null}, or if no test engines are detected or
+	 * {@code null}, or if no test engines are detected
 	 * @see #openSession()
 	 * @since 1.8
 	 */
@@ -115,7 +115,7 @@ public static Launcher create() throws PreconditionViolationException {
 	 *
 	 * @param config the configuration for the launcher; never {@code null}
 	 * @throws PreconditionViolationException if the supplied configuration is
-	 * {@code null}, or if no test engines are detected or
+	 * {@code null}, or if no test engines are detected
 	 * registered
 	 * @see #create()
 	 * @since 1.3

From 227a413f041fc66b7d53f453605cee94e9ccb1d9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 3 Jun 2021 18:01:00 +0200
Subject: [PATCH 0343/1433] Fix documentation regarding @TestFactory method
 return values

---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index af89e8bca78a..659c1efa2a38 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -113,7 +113,8 @@ Test classes must not be `abstract` and must have a single constructor.
 Test methods and lifecycle methods may be declared locally within the current test class,
 inherited from superclasses, or inherited from interfaces (see
 <<writing-tests-test-interfaces-and-default-methods>>). In addition, test methods and
-lifecycle methods must not be `abstract` and must not return a value.
+lifecycle methods must not be `abstract` and must not return a value (except `@TestFactory`
+methods which are required to return a value).
 
 NOTE: Test classes, test methods, and lifecycle methods are not required to be `public`,
 but they must _not_ be `private`.

From 419ddb12f13049692949f0f12d50e8f38cf43cba Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 3 Jun 2021 18:02:08 +0200
Subject: [PATCH 0344/1433] Document best practices for test method and test
 class visibility

Closes #2626
---
 .../src/docs/asciidoc/user-guide/writing-tests.adoc  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 659c1efa2a38..a8d38cfbcfd0 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -116,8 +116,16 @@ inherited from superclasses, or inherited from interfaces (see
 lifecycle methods must not be `abstract` and must not return a value (except `@TestFactory`
 methods which are required to return a value).
 
-NOTE: Test classes, test methods, and lifecycle methods are not required to be `public`,
-but they must _not_ be `private`.
+[NOTE]
+.Class and method visibility
+====
+Test classes, test methods, and lifecycle methods are not required to be `public`, but
+they must _not_ be `private`.
+
+It is generally recommended to omit the `public` modifier for test classes, test methods,
+and lifecycle methods unless there is a technical reason for doing so – for example, when
+a test class is extended by a test class in another package.
+====
 
 The following test class demonstrates the use of `@Test` methods and all supported
 lifecycle methods. For further information on runtime semantics, see

From 3d774251339b6c5660bf50ffcafa4201a2b85b86 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 4 Jun 2021 12:15:56 +0200
Subject: [PATCH 0345/1433] Only consider files as potential build scripts in
 UniqueIdTrackingListener

See #2619
---
 .../launcher/listeners/UniqueIdTrackingListener.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index 81afea40a43b..991e25451350 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -217,9 +217,11 @@ Path currentWorkingDir() {
 	private boolean containsFilesWithExtensions(Path dir, String... extensions) throws IOException {
 		return Files.find(dir, 1, //
 			(path, basicFileAttributes) -> {
-				for (String extension : extensions) {
-					if (path.getFileName().toString().endsWith(extension)) {
-						return true;
+				if (basicFileAttributes.isRegularFile()) {
+					for (String extension : extensions) {
+						if (path.getFileName().toString().endsWith(extension)) {
+							return true;
+						}
 					}
 				}
 				return false;

From faa56b1cf7edac42b164dacba924cdcf47b6ea00 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 4 Jun 2021 12:50:29 +0200
Subject: [PATCH 0346/1433] Work around diffplug/spotless#834

---
 gradle.properties | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 77f353304411..b9157a3889a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,13 @@ vintageVersion  = 5.8.0-SNAPSHOT
 defaultBuiltBy  = JUnit Team
 
 # We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
-org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
+# The exports are needed due to https://github.com/diffplug/spotless/issues/834
+org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError \
+  --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17

From 26e074af81f32f72a88e324e22d471f82291c9b1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 4 Jun 2021 14:00:49 +0200
Subject: [PATCH 0347/1433] Improve documentation for listener APIs in User
 Guide

Closes #2636
---
 .../asciidoc/user-guide/advanced-topics.adoc  |  2 +
 .../docs/asciidoc/user-guide/appendix.adoc    |  6 +-
 .../user-guide/junit-platform-reporting.adoc  | 17 +++++
 .../asciidoc/user-guide/launcher-api.adoc     | 18 -----
 .../asciidoc/user-guide/running-tests.adoc    | 70 +++++++++++++++++--
 5 files changed, 86 insertions(+), 27 deletions(-)
 create mode 100644 documentation/src/docs/asciidoc/user-guide/junit-platform-reporting.adoc

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
index af8e07e8ee03..bc1d41be4c93 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
@@ -3,6 +3,8 @@
 
 include::launcher-api.adoc[]
 
+include::junit-platform-reporting.adoc[]
+
 include::junit-platform-suite-engine.adoc[]
 
 include::testkit.adoc[]
diff --git a/documentation/src/docs/asciidoc/user-guide/appendix.adoc b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
index d850ea57c94b..afd8a372d591 100644
--- a/documentation/src/docs/asciidoc/user-guide/appendix.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
@@ -40,13 +40,15 @@ artifacts are deployed to Sonatype's {snapshot-repo}[snapshots repository] under
   `junit-platform-engine`::
     Public API for test engines. See <<launcher-api-engines-custom>> for details.
   `junit-platform-jfr`::
-    Provides a `TestExecutionListener` for Java Flight Recorder events on the JUnit Platform. See <<running-tests-flight-recorder>> for details.
+    Provides a `LauncherDiscoveryListener` and `TestExecutionListener` for Java Flight
+	Recorder events on the JUnit Platform. See <<running-tests-listeners-flight-recorder>>
+	for details.
   `junit-platform-launcher`::
     Public API for configuring and launching test plans -- typically used by IDEs and
     build tools. See <<launcher-api>> for details.
   `junit-platform-reporting`::
     `TestExecutionListener` implementations that generate test reports -- typically used
-    by IDEs and build tools. See <<launcher-api-listeners-reporting>> for details.
+    by IDEs and build tools. See <<junit-platform-reporting>> for details.
   `junit-platform-runner`::
     Runner for executing tests and test suites on the JUnit Platform in a JUnit 4
     environment. See <<running-tests-junit-platform-runner>> for details.
diff --git a/documentation/src/docs/asciidoc/user-guide/junit-platform-reporting.adoc b/documentation/src/docs/asciidoc/user-guide/junit-platform-reporting.adoc
new file mode 100644
index 000000000000..586d32b0cab6
--- /dev/null
+++ b/documentation/src/docs/asciidoc/user-guide/junit-platform-reporting.adoc
@@ -0,0 +1,17 @@
+[[junit-platform-reporting]]
+=== JUnit Platform Reporting
+
+The `junit-platform-reporting` artifact contains `{TestExecutionListener}`
+implementations that generate test reports. These listeners are typically used by IDEs
+and build tools. The package `org.junit.platform.reporting.legacy.xml` currently contains
+the following implementation.
+
+* `{LegacyXmlReportGeneratingListener}` generates a separate XML report for each root in
+  the `{TestPlan}`. Note that the generated XML format is compatible with the de facto
+  standard for JUnit 4 based test reports that was made popular by the Ant build system.
+  The `LegacyXmlReportGeneratingListener` is used by the
+  <<running-tests-console-launcher>> as well.
+
+NOTE: The `{junit-platform-launcher}` module also contains `TestExecutionListener`
+implementations that can be used for reporting purposes. See <<running-tests-listeners>>
+for details.
diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index 3b032851bfc6..63a22848b6d0 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -206,24 +206,6 @@ supplied in the `LauncherDiscoveryRequest` that is passed to the `{Launcher}`.
 
 Refer to <<running-tests-config-params-deactivation-pattern>> for details.
 
-[[launcher-api-listeners-reporting]]
-==== JUnit Platform Reporting
-
-The `junit-platform-reporting` artifact contains `{TestExecutionListener}`
-implementations that generate test reports. These listeners are typically used by IDEs
-and build tools. The package `org.junit.platform.reporting.legacy.xml` currently contains
-the following implementation.
-
-* `{LegacyXmlReportGeneratingListener}` generates a separate XML report for each root in
-  the `{TestPlan}`. Note that the generated XML format is compatible with the de facto
-  standard for JUnit 4 based test reports that was made popular by the Ant build system.
-  The `LegacyXmlReportGeneratingListener` is used by the
-  <<running-tests-console-launcher>> as well.
-
-NOTE: The `{junit-platform-launcher}` module also contains `TestExecutionListener`
-implementations that can be used for reporting purposes. See `{LoggingListener}` and
-`{SummaryGeneratingListener}` for details.
-
 [[launcher-api-launcher-config]]
 ==== Configuring the Launcher
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index c386605599b0..de42becbb0e1 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -828,8 +828,63 @@ because particularly when
 <<writing-tests-parallel-execution, executing tests in parallel>> it would be impossible
 to attribute it to a specific test or container.
 
-[[running-tests-flight-recorder]]
-=== Flight Recorder Support
+[[running-tests-listeners]]
+=== Using Listeners
+
+The JUnit Platform provides the following listener APIs that allow JUnit, third parties,
+and custom user code to react to events fired at various points during the discovery and
+execution of a `TestPlan`.
+
+* `{LauncherSessionListener}`: receives events when a `{LauncherSession}` is opened and
+  closed.
+* `{LauncherDiscoveryListener}`: receives events that occur during test discovery.
+* `{TestExecutionListener}`: receives events that occur during test execution.
+
+The `LauncherSessionListener` API is typically implemented by build tools or IDEs and
+registered automatically for you in order to support some feature of the build tool or IDE.
+
+The `LauncherDiscoveryListener` and `TestExecutionListener` APIs are often implemented in
+order to produce some form of report or to display a graphical representation of the test
+plan in an IDE. Such listeners may be implemented and automatically registered by a build
+tool or IDE, or they may be included in a third-party library – potentially registered
+for you automatically. You can also implement and register your own listeners.
+
+For details on registering and configuring listeners, see the following sections of this
+guide.
+
+* <<launcher-api-launcher-session-listeners-custom>>
+* <<launcher-api-launcher-discovery-listeners-custom>>
+* <<launcher-api-listeners-custom>>
+* <<launcher-api-listeners-config>>
+* <<launcher-api-listeners-custom-deactivation>>
+
+The JUnit Platform provides the following listeners which you may wish to use with your
+test suite.
+
+<<running-tests-listeners-flight-recorder>> ::
+  `FlightRecordingExecutionListener` and `FlightRecordingDiscoveryListener` that generate
+  Java Flight Recorder events during test discovery and execution.
+
+`{LegacyXmlReportGeneratingListener}` ::
+  `TestExecutionListener` that generates XML reports compatible with the de facto
+  standard for JUnit 4 based test reports. See <<junit-platform-reporting>> for
+  details.
+
+`{LoggingListener}` ::
+  `TestExecutionListener` for logging informational messages for all events via a
+  `BiConsumer` that consumes `Throwable` and `Supplier<String>`.
+
+`{SummaryGeneratingListener}` ::
+  `TestExecutionListener` that generates a summary of the test execution which can be
+  printed via a `PrintWriter`.
+
+`{UniqueIdTrackingListener}` ::
+  `TestExecutionListener` that that tracks the unique IDs of all tests that were
+  executed during the execution of the `TestPlan` and generates a file containing the
+  unique IDs once execution of the `TestPlan` has finished.
+
+[[running-tests-listeners-flight-recorder]]
+==== Flight Recorder Support
 
 Since version 1.7, the JUnit Platform provides opt-in support for generating Flight
 Recorder events. https://openjdk.java.net/jeps/328[JEP 328] describes the Java Flight
@@ -842,9 +897,10 @@ to a problem.
 
 In order to record Flight Recorder events generated while running tests, you need to:
 
-1. Provide module `org.junit.platform.jfr` (`junit-platform-jfr-{platform-version}.jar`)
+1. Ensure that you are using Java 11 or later.
+2. Provide the `org.junit.platform.jfr` module (`junit-platform-jfr-{platform-version}.jar`)
    on the class-path or module-path at test runtime.
-2. Start flight recording when launching a test run. Flight Recorder can be started via
+3. Start flight recording when launching a test run. Flight Recorder can be started via
    java command line option:
 
    -XX:StartFlightRecording:filename=...
@@ -856,6 +912,6 @@ https://docs.oracle.com/en/java/javase/14/docs/specs/man/jfr.html[jfr]
 command line tool shipped with recent JDKs or open the recording file with
 https://jdk.java.net/jmc/[JDK Mission Control].
 
-WARNING: Flight Recorder support is currently an _experimental_ feature. You're
-invited to give it a try and provide feedback to the JUnit team so they can improve
-and eventually <<api-evolution, promote>> this feature.
+WARNING: Flight Recorder support is currently an _experimental_ feature. You're invited to
+give it a try and provide feedback to the JUnit team so they can improve and eventually
+<<api-evolution, promote>> this feature.

From bdaf1d2182f2ff2d1ed5889503d91baa6c0c7f85 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Fri, 4 Jun 2021 16:07:05 +0200
Subject: [PATCH 0348/1433] Add identifier element to `TempDir` annotation

Prior to this commit, all `@TempDir` usage within a single
test-lifecycle context resolved to the same temporary
directory managed by JUnit Jupiter.
With this commit, a user-specified identifier may be used
to create distinct temporary directories within a single
test-lifecycle context.

Closes #1967

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  2 +
 .../asciidoc/user-guide/writing-tests.adoc    |  9 ++
 .../test/java/example/TempDirectoryDemo.java  | 12 +++
 .../org/junit/jupiter/api/io/TempDir.java     | 46 +++++----
 .../engine/extension/TempDirectory.java       | 12 ++-
 .../engine/extension/TempDirectoryTests.java  | 99 +++++++++++++++++++
 6 files changed, 158 insertions(+), 22 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index bd7d93c2bf85..fc0b6c547cf0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -48,6 +48,8 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* `@TempDir` now supports creating multiple temporary directories via an identifier
+  specified on the annotation (e.g. `@TempDir("a")` and `@TempDir("b")`).
 * New `named()` static factory method in the `Named` interface that serves as an
   _alias_ for `Named.of()`. `named()` is intended to be used via `import static`.
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index a8d38cfbcfd0..6e2df586b933 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2187,6 +2187,15 @@ its content.
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_parameter_injection]
 ----
 
+You can inject multiple temporary directories by specifying explicit identifiers via the
+annotation parameter.
+
+[source,java,indent=0]
+.A test method that requires multiple temporary directories
+----
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_multiple_directories]
+----
+
 WARNING: `@TempDir` is not supported on constructor parameters. If you wish to retain a
 single reference to a temp directory across lifecycle methods and the current test method,
 please use field injection, by annotating a non-private instance field with `@TempDir`.
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index 217977408229..4eadfcb4a885 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -35,6 +35,18 @@ void writeItemsToFile(@TempDir Path tempDir) throws IOException {
 	}
 	// end::user_guide_parameter_injection[]
 
+	// tag::user_guide_multiple_directories[]
+	@Test
+	void copyFileFromSourceToTarget(@TempDir("from") Path source, @TempDir("to") Path target) throws IOException {
+		Path sourceFile = source.resolve("test.txt");
+
+		new ListWriter(sourceFile).write("a", "b", "c");
+		Path targetFile = Files.copy(sourceFile, target.resolve("test.txt"));
+
+		assertEquals(singletonList("a,b,c"), Files.readAllLines(targetFile));
+	}
+	// end::user_guide_multiple_directories[]
+
 	static
 	// tag::user_guide_field_injection[]
 	class SharedTempDirectoryDemo {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 3d9bf2f1ce7b..ddd1ff2431af 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -30,16 +30,20 @@
  * or a parameter in a lifecycle method or test method of type {@link Path} or
  * {@link File} that should be resolved into a temporary directory.
  *
+ * <p>Multiple temporary directories can be created by supplying different
+ * {@linkplain #value identifiers} on the annotation.
+ *
  * <p>Please note that {@code @TempDir} is not supported on constructor
  * parameters. Please use field injection instead, by annotating a non-private
  * instance field with {@code @TempDir}.
  *
  * <h3>Temporary Directory Creation</h3>
  *
- * <p>The temporary directory is only created if a field in a test class or a
- * parameter in a lifecycle method or test method is annotated with
- * {@code @TempDir}. If the field type or parameter type is neither {@link Path}
- * nor {@link File} or if the temporary directory cannot be created, an
+ * <p>The temporary directory with the supplied {@linkplain #value identifier}
+ * is only created if a field in a test class or a parameter in a lifecycle
+ * method or test method is annotated with {@code @TempDir}. If the field type
+ * or parameter type is neither {@link Path} nor {@link File} or if the
+ * temporary directory cannot be created, an
  * {@link ExtensionConfigurationException} or a
  * {@link ParameterResolutionException} will be thrown as appropriate. In
  * addition, a {@code ParameterResolutionException} will be thrown for a
@@ -48,23 +52,25 @@
  * <h3>Temporary Directory Scope</h3>
  *
  * <p>The scope of the temporary directory depends on where the first
- * {@code @TempDir} annotation is encountered when executing a test class. The
- * temporary directory will be shared by all tests in a class when the
- * annotation is present on a {@code static} field or on a parameter of a
- * {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method. Otherwise &mdash;
+ * {@code @TempDir} annotation with the supplied {@linkplain #value identifier}
+ * is encountered when executing a test class. The temporary directory with that
+ * identifier will be shared by all tests in a class when the annotation is
+ * present with the same identifier on a {@code static} field or on a parameter
+ * of a {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method. Otherwise –
  * for example, when {@code @TempDir} is only used on instance fields or on
- * parameters in test, {@link org.junit.jupiter.api.BeforeEach @BeforeEach},
- * or {@link org.junit.jupiter.api.AfterEach @AfterEach} methods &mdash; each test
- * will use its own temporary directory.
+ * parameters in test, {@link org.junit.jupiter.api.BeforeEach @BeforeEach}, or
+ * {@link org.junit.jupiter.api.AfterEach @AfterEach} methods – each test will
+ * use its own temporary directory.
  *
  * <h3>Temporary Directory Deletion</h3>
  *
- * <p>When the end of the scope of a temporary directory is reached, i.e. when
- * the test method or class has finished execution, JUnit will attempt to
- * recursively delete all files and directories in the temporary directory
- * and, finally, the temporary directory itself. In case deletion of a file or
- * directory fails, an {@link IOException} will be thrown that will cause the
- * test or test class to fail.
+ * <p>When the end of the scope of a temporary directory with a certain
+ * {@linkplain #value identifier} is reached, i.e. when the test method or class
+ * has finished execution, JUnit will attempt to recursively delete all files
+ * and directories in the temporary directory and, finally, the temporary
+ * directory itself. In case deletion of a file or directory fails, an
+ * {@link IOException} will be thrown that will cause the test or test class to
+ * fail.
  *
  * @since 5.4
  */
@@ -73,4 +79,10 @@
 @Documented
 @API(status = EXPERIMENTAL, since = "5.4")
 public @interface TempDir {
+	/**
+	 * The identifier of the temporary directory.
+	 *
+	 * @since 5.8
+	 */
+	String value() default "";
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 6b25465bbf60..8926f9b4a48d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -13,6 +13,7 @@
 import static java.nio.file.FileVisitResult.CONTINUE;
 import static java.util.stream.Collectors.joining;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.ReflectionUtils.isPrivate;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
 
@@ -61,7 +62,6 @@
 class TempDirectory implements BeforeAllCallback, BeforeEachCallback, ParameterResolver {
 
 	private static final Namespace NAMESPACE = Namespace.create(TempDirectory.class);
-	private static final String KEY = "temp.dir";
 	private static final String TEMP_DIR_PREFIX = "junit";
 
 	/**
@@ -98,8 +98,9 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 
 		findAnnotatedFields(testClass, TempDir.class, predicate).forEach(field -> {
 			assertValidFieldCandidate(field);
+			String id = findAnnotation(field, TempDir.class).map(TempDir::value).orElse("");
 			try {
-				makeAccessible(field).set(testInstance, getPathOrFile(field.getType(), context));
+				makeAccessible(field).set(testInstance, getPathOrFile(field.getType(), context, id));
 			}
 			catch (Throwable t) {
 				ExceptionUtils.throwAsUncheckedException(t);
@@ -136,7 +137,8 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 		Class<?> parameterType = parameterContext.getParameter().getType();
 		assertSupportedType("parameter", parameterType);
-		return getPathOrFile(parameterType, extensionContext);
+		String id = parameterContext.findAnnotation(TempDir.class).map(TempDir::value).orElse("");
+		return getPathOrFile(parameterType, extensionContext, id);
 	}
 
 	private void assertSupportedType(String target, Class<?> type) {
@@ -146,9 +148,9 @@ private void assertSupportedType(String target, Class<?> type) {
 		}
 	}
 
-	private Object getPathOrFile(Class<?> type, ExtensionContext extensionContext) {
+	private Object getPathOrFile(Class<?> type, ExtensionContext extensionContext, String id) {
 		Path path = extensionContext.getStore(NAMESPACE) //
-				.getOrComputeIfAbsent(KEY, key -> createTempDir(), CloseablePath.class) //
+				.getOrComputeIfAbsent(id, __ -> createTempDir(), CloseablePath.class) //
 				.get();
 
 		return (type == Path.class) ? path : path.toFile();
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
index 7350a771c9e6..0ea486877f15 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.engine.extension;
 
+import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -70,6 +71,12 @@ void resetStaticVariables() {
 		BaseSeparateTempDirsParameterInjectionTestCase.tempDirs.clear();
 	}
 
+	@Test
+	void supportsMultipleTempDirs() {
+		executeTestsForClass(MultipleTempDirsTestCase.class).allEvents()//
+				.assertStatistics(stats -> stats.started(3).succeeded(3));
+	}
+
 	@Test
 	@DisplayName("does not prevent constructor parameter resolution")
 	void tempDirectoryDoesNotPreventConstructorParameterResolution() {
@@ -884,4 +891,96 @@ void nested() {
 			}
 		}
 	}
+
+	static class MultipleTempDirsTestCase {
+
+		@TempDir("a")
+		static Path A;
+		static Path B;
+
+		@BeforeAll
+		static void beforeAll(@TempDir("a") Path dir1, @TempDir("b") Path dir2) {
+			assertEquals(A, requireNonNull(dir1));
+			B = requireNonNull(dir2);
+			assertNotEquals(A, B);
+			assertTrue(Files.exists(A));
+			assertTrue(Files.exists(B));
+		}
+
+		@TempDir("c")
+		Path c;
+		static Path C, D, E;
+
+		@BeforeEach
+		void beforeEach(@TempDir("d") Path dir1, @TempDir("b") Path dir2, @TempDir("c") Path dir3,
+				@TempDir("a") Path dir4) {
+			assertEquals(A, dir4);
+			assertEquals(B, dir2);
+			assertEquals(c, dir3);
+
+			C = requireNonNull(dir3);
+			assertNotEquals(A, C);
+			assertNotEquals(B, C);
+
+			D = requireNonNull(dir1);
+			assertNotEquals(A, D);
+			assertNotEquals(B, D);
+			assertNotEquals(C, D);
+
+			assertTrue(Files.exists(A));
+			assertTrue(Files.exists(B));
+			assertTrue(Files.exists(C));
+			assertTrue(Files.exists(D));
+		}
+
+		@Test
+		void test(@TempDir("c") Path dir1, @TempDir("e") Path dir2, @TempDir("a") Path dir3, @TempDir("d") Path dir4,
+				@TempDir("b") Path dir5) {
+			assertEquals(A, dir3);
+			assertEquals(B, dir5);
+			assertEquals(C, dir1);
+			assertEquals(D, dir4);
+
+			E = requireNonNull(dir2);
+			assertNotEquals(A, E);
+			assertNotEquals(B, E);
+			assertNotEquals(C, E);
+			assertNotEquals(D, E);
+
+			assertTrue(Files.exists(A));
+			assertTrue(Files.exists(B));
+			assertTrue(Files.exists(C));
+			assertTrue(Files.exists(D));
+			assertTrue(Files.exists(E));
+		}
+
+		@AfterEach
+		void afterEach(@TempDir("b") Path dir1, @TempDir("a") Path dir2, @TempDir("c") Path dir3,
+				@TempDir("e") Path dir4, @TempDir("d") Path dir5) {
+			assertEquals(A, dir2);
+			assertEquals(B, dir1);
+			assertEquals(C, dir3);
+			assertEquals(D, dir5);
+			assertEquals(E, dir4);
+
+			assertTrue(Files.exists(A));
+			assertTrue(Files.exists(B));
+			assertTrue(Files.exists(C));
+			assertTrue(Files.exists(D));
+			assertTrue(Files.exists(E));
+		}
+
+		@AfterAll
+		static void afterAll(@TempDir("b") Path dir1, @TempDir("a") Path dir2) {
+			assertEquals(A, dir2);
+			assertEquals(B, dir1);
+
+			assertTrue(Files.exists(A));
+			assertTrue(Files.exists(B));
+
+			assertTrue(Files.notExists(C));
+			assertTrue(Files.notExists(D));
+			assertTrue(Files.notExists(E));
+		}
+	}
 }

From b145d3e3db6241103317387378dd256f5abfef9a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 4 Jun 2021 19:01:54 +0200
Subject: [PATCH 0349/1433] Remove GitHub branch protection patterns

---
 .idea/vcs.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 7c23889dd37b..fb8322da259f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,16 +3,6 @@
   <component name="GitSharedSettings">
     <option name="synchronizeBranchProtectionRules" value="false" />
   </component>
-  <component name="GithubSharedProjectSettings">
-    <option name="branchProtectionPatterns">
-      <list>
-        <option value="gh-pages" />
-        <option value="releases\/.*" />
-        <option value="proposals" />
-        <option value="main" />
-      </list>
-    </option>
-  </component>
   <component name="IssueNavigationConfiguration">
     <option name="links">
       <list>

From 05a97bed784fa76b91253c1a0f65b5b38fce5c28 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 4 Jun 2021 19:03:25 +0200
Subject: [PATCH 0350/1433] Install GraphViz before generating docs

---
 .github/workflows/main.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 070e485bc294..33beb8ae08e7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -252,6 +252,10 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: '11'
+    - name: Install Graphviz
+      run: |
+        sudo apt-get update
+        sudo apt-get install graphviz
     - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}

From 84bacb62a2e4278ccb5f81aaf53a7896680960e0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 4 Jun 2021 20:07:56 +0200
Subject: [PATCH 0351/1433] Temporarily disable Codecov status checks

---
 .codecov.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.codecov.yml b/.codecov.yml
index d724eb3c1d0b..35cde5cd5e85 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,6 +1,4 @@
 coverage:
   status:
-    project:
-      default:
-        threshold: 1
+    project: off
     patch: off

From 10845bab077c2e43b499518eb024b196305ecba8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 4 Jun 2021 20:08:32 +0200
Subject: [PATCH 0352/1433] Enable and archive per-project coverage reports

---
 .github/workflows/main.yml |  2 +-
 build.gradle.kts           | 48 +++++++++++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 33beb8ae08e7..f406c02de565 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,7 +76,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: JaCoCo reports
-        path: 'build/reports/jacoco/jacocoRootReport/**'
+        path: '**/build/reports/jacoco/**'
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 983fba7ea17b..c6d685a59eaf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -179,20 +179,42 @@ subprojects {
 		}
 
 		afterEvaluate {
-			if (enableJaCoCo && project in jacocoCoveredProjects) {
-				val jarTask = (tasks.findByName("shadowJar") ?: tasks["jar"]) as Jar
-				val extractJar by tasks.registering(Copy::class) {
-					from(zipTree(jarTask.archiveFile))
-					into(jacocoClassesDir)
-					include("**/*.class")
-					// don't report coverage for shadowed classes
-					exclude("**/shadow/**")
-					// don't version-specific classes of MR JARs
-					exclude("META-INF/versions/**")
-					includeEmptyDirs = false
-					onlyIf { jarTask.enabled }
+			if (enableJaCoCo) {
+				if (project in jacocoCoveredProjects) {
+					val jarTask = (tasks.findByName("shadowJar") ?: tasks["jar"]) as Jar
+					val extractJar by tasks.registering(Copy::class) {
+						from(zipTree(jarTask.archiveFile))
+						into(jacocoClassesDir)
+						include("**/*.class")
+						// don't report coverage for shadowed classes
+						exclude("**/shadow/**")
+						// don't version-specific classes of MR JARs
+						exclude("META-INF/versions/**")
+						includeEmptyDirs = false
+						onlyIf { jarTask.enabled }
+					}
+					jarTask.finalizedBy(extractJar)
+				}
+				if (project in jacocoTestProjects) {
+					tasks.named<Test>("test") {
+						finalizedBy("jacocoTestReport")
+					}
+					tasks.named<JacocoReport>("jacocoTestReport").configure {
+						dependsOn("test")
+						reports {
+							html.isEnabled = true
+							xml.isEnabled = true
+							csv.isEnabled = false
+						}
+						jacocoCoveredProjects.forEach {
+							dependsOn(it.tasks.named("extractJar"))
+							it.pluginManager.withPlugin("java") {
+								sourceDirectories.setFrom(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
+							}
+						}
+						classDirectories.setFrom(files(jacocoClassesDir))
+					}
 				}
-				jarTask.finalizedBy(extractJar)
 			}
 		}
 	}

From d6fc062f45ce5ccee7df7a0841d1b8f09df5af05 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 4 Jun 2021 20:12:44 +0200
Subject: [PATCH 0353/1433] Include JFR module in up-to-date check for docs

---
 src/publishDocumentationSnapshotOnlyIfNecessary.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/publishDocumentationSnapshotOnlyIfNecessary.sh b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
index 613ea73759a2..75f8eaeb3728 100755
--- a/src/publishDocumentationSnapshotOnlyIfNecessary.sh
+++ b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
@@ -22,7 +22,7 @@ md5sum $(find junit-platform-commons -wholename '**/src/main/*.java') >> "${curr
 md5sum $(find junit-platform-console -wholename '**/src/main/*.java') >> "${current}"
 # skip module junit-platform-console-standalone because it doesn't contain relevant documentation
 md5sum $(find junit-platform-engine -wholename '**/src/main/*.java') >> "${current}"
-# TODO md5sum $(find junit-platform-jfr -wholename '**/src/main/*.java') >> "${current}"
+md5sum $(find junit-platform-jfr -wholename '**/src/main/*.java') >> "${current}"
 md5sum $(find junit-platform-launcher -wholename '**/src/main/*.java') >> "${current}"
 md5sum $(find junit-platform-reporting -wholename '**/src/main/*.java') >> "${current}"
 md5sum $(find junit-platform-runner -wholename '**/src/main/*.java') >> "${current}"

From 59a4652957642d8c1f1200f0393d91b420c093e8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 4 Jun 2021 20:18:20 +0200
Subject: [PATCH 0354/1433] Only archive JaCoCo exec files

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f406c02de565..49cf3f4d2329 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,7 +76,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: JaCoCo reports
-        path: '**/build/reports/jacoco/**'
+        path: '**/build/jacoco/*.exec'
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 

From 474d0ab8b5e78798649a11e44b08e84bfffa0a50 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 5 Jun 2021 10:50:37 +0200
Subject: [PATCH 0355/1433] Archive JaCoCo XML reports as well

---
 .github/workflows/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 49cf3f4d2329..8cf1c7d30965 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,7 +76,9 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: JaCoCo reports
-        path: '**/build/jacoco/*.exec'
+        path: |
+          **/build/jacoco/*.exec
+          **/build/reports/jacoco/*/*.xml
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 

From 94112e025b2bdbe9e9cddece18d3ca4a5075e998 Mon Sep 17 00:00:00 2001
From: therealryan <therealryan@gmail.com>
Date: Sat, 5 Jun 2021 09:56:50 +0100
Subject: [PATCH 0356/1433] Add 'class' URI scheme for dynamic test sources
 (#2637)

This enables dynamic tests instances to be located using the information
available in a `StackTraceElement`, so it becomes possible to
automatically provide test locations by walking the call stack

Resolves #2635.
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  2 +
 .../asciidoc/user-guide/writing-tests.adoc    |  4 ++
 .../descriptor/TestFactoryTestDescriptor.java |  5 +++
 .../support/descriptor/ClassSource.java       | 44 +++++++++++++++++++
 .../support/descriptor/ClassSourceTests.java  | 30 +++++++++++++
 5 files changed, 85 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index fc0b6c547cf0..71833bfe2770 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -52,6 +52,8 @@ on GitHub.
   specified on the annotation (e.g. `@TempDir("a")` and `@TempDir("b")`).
 * New `named()` static factory method in the `Named` interface that serves as an
   _alias_ for `Named.of()`. `named()` is intended to be used via `import static`.
+* New `class` URI scheme added for dynamic test sources. This allows tests to be located
+  using the information available in a `StackTraceElement`.
 
 
 [[release-notes-5.8.0-M2-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 6e2df586b933..c54b0d8e1e11 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1830,6 +1830,10 @@ implementations.
   refer to the Javadoc for `DiscoverySelectors.selectMethod(String)` for the supported
   formats for a FQMN.
 
+`ClassSource` ::
+  If the `URI` contains the `class` scheme and the fully qualified class name --
+  for example, `class:org.junit.Foo?line=42`.
+
 `UriSource` ::
   If none of the above `TestSource` implementations are applicable.
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
index 1f8fc6504aa9..d6adeda3ccab 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
@@ -12,6 +12,7 @@
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.jupiter.engine.descriptor.MethodSourceSupport.METHOD_SCHEME;
+import static org.junit.platform.engine.support.descriptor.ClassSource.CLASS_SCHEME;
 import static org.junit.platform.engine.support.descriptor.ClasspathResourceSource.CLASSPATH_SCHEME;
 
 import java.lang.reflect.Method;
@@ -39,6 +40,7 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.ClasspathResourceSource;
 import org.junit.platform.engine.support.descriptor.UriSource;
 
@@ -169,6 +171,9 @@ static TestSource fromUri(URI uri) {
 		if (CLASSPATH_SCHEME.equals(uri.getScheme())) {
 			return ClasspathResourceSource.from(uri);
 		}
+		if (CLASS_SCHEME.equals(uri.getScheme())) {
+			return ClassSource.from(uri);
+		}
 		if (METHOD_SCHEME.equals(uri.getScheme())) {
 			return MethodSourceSupport.from(uri);
 		}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
index 901db0cf7c80..3fe2022a0e1c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
@@ -12,6 +12,7 @@
 
 import static org.apiguardian.api.API.Status.STABLE;
 
+import java.net.URI;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -44,6 +45,14 @@ public class ClassSource implements TestSource {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * {@link URI} {@linkplain URI#getScheme() scheme} for class
+	 * sources: {@value}
+	 *
+	 * @since 1.3
+	 */
+	public static final String CLASS_SCHEME = "class";
+
 	/**
 	 * Create a new {@code ClassSource} using the supplied class name.
 	 *
@@ -84,6 +93,41 @@ public static ClassSource from(Class<?> javaClass, FilePosition filePosition) {
 		return new ClassSource(javaClass, filePosition);
 	}
 
+	/**
+	 * Create a new {@code ClassSource} from the supplied {@link URI}.
+	 * <p>
+	 * URIs should be formatted as <code>class:fully.qualified.class.Name</code>. An
+	 * optional query can be appended detailing <code>line</code> and/or
+	 * <code>column</code> numbers, e.g.
+	 * <code>class:com.foo.Bar?line=42&amp;column=13</code>. The URI fragment, if
+	 * present, is ignored.
+	 *
+	 * @param uri the {@code URI} for the class source; never {@code null}
+	 * @return a new {@code ClassSource}; never {@code null}
+	 * @throws PreconditionViolationException if the supplied {@code URI} is
+	 * {@code null} or if the scheme of the supplied {@code URI} is not equal
+	 * to the {@link #CLASS_SCHEME}, or if the specified class name is empty.
+	 * @since 1.3
+	 * @see #CLASS_SCHEME
+	 */
+	public static ClassSource from(URI uri) {
+		Preconditions.notNull(uri, "URI must not be null");
+		Preconditions.condition(CLASS_SCHEME.equals(uri.getScheme()),
+			() -> "URI [" + uri + "] must have [" + CLASS_SCHEME + "] scheme");
+
+		String className = uri.getSchemeSpecificPart();
+		FilePosition filePosition = null;
+		int qi = className.indexOf('?');
+		if (qi >= 0) {
+			filePosition = FilePosition.fromQuery(className.substring(qi + 1)).orElse(null);
+			className = className.substring(0, qi);
+		}
+
+		Preconditions.condition(!className.isEmpty(), () -> "Class name cannot be empty");
+
+		return ClassSource.from(className, filePosition);
+	}
+
 	private final String className;
 	private final FilePosition filePosition;
 	private Class<?> javaClass;
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
index cd7688ff3df8..329a88426de4 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
@@ -14,6 +14,8 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.Serializable;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
@@ -44,6 +46,9 @@ void preconditions() {
 		assertThrows(PreconditionViolationException.class, () -> ClassSource.from("    ", null));
 		assertThrows(PreconditionViolationException.class, () -> ClassSource.from((Class<?>) null));
 		assertThrows(PreconditionViolationException.class, () -> ClassSource.from((Class<?>) null, null));
+		assertThrows(PreconditionViolationException.class, () -> ClassSource.from((URI) null));
+		assertThrows(PreconditionViolationException.class, () -> ClassSource.from(new URI("badscheme:/com.foo.Bar")));
+		assertThrows(PreconditionViolationException.class, () -> ClassSource.from(new URI("class:?line=1")));
 	}
 
 	@Test
@@ -89,6 +94,31 @@ void classSourceFromReferenceAndFilePosition() {
 		assertThat(source.getPosition()).hasValue(position);
 	}
 
+	@Test
+	void classSourceFromURI() throws URISyntaxException {
+		var source = ClassSource.from(new URI("class:java.lang.Object"));
+
+		assertThat(source.getJavaClass()).isEqualTo(Object.class);
+		assertThat(source.getPosition()).isEmpty();
+	}
+
+	@Test
+	void classSourceFromURIWithLineQuery() throws URISyntaxException {
+		var source = ClassSource.from(new URI("class:java.lang.Object?line=42"));
+
+		assertThat(source.getJavaClass()).isEqualTo(Object.class);
+		assertThat(source.getPosition()).isNotEmpty();
+		assertThat(source.getPosition().get().getLine()).isEqualTo(42);
+	}
+
+	@Test
+	void classSourceFromURIWithMalformedQuery() throws URISyntaxException {
+		var source = ClassSource.from(new URI("class:java.lang.Object?foo=42"));
+
+		assertThat(source.getJavaClass()).isEqualTo(Object.class);
+		assertThat(source.getPosition()).isEmpty();
+	}
+
 	@Test
 	void equalsAndHashCodeForClassSourceFromName() {
 		var name1 = String.class.getName();

From 8b910ecefff4dff177867db812c2fb28bb274f34 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 5 Jun 2021 18:09:21 +0200
Subject: [PATCH 0357/1433] Forbid modification of TestPlan

After being deprecated for ~2 years, attempts to modify the TestPlan now
throw an exception.

Resolves #1732.
---
 .../org/junit/platform/launcher/TestPlan.java  | 16 ++++++++++++----
 .../launcher/core/InternalTestPlan.java        | 18 ++++--------------
 .../launcher/core/DefaultLauncherTests.java    | 13 ++++---------
 .../listeners/SummaryGenerationTests.java      |  6 ++----
 4 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index 617bdf6a24c9..91d4fc69f4ca 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -27,6 +27,7 @@
 import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
+import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.ConfigurationParameters;
@@ -90,7 +91,7 @@ public static TestPlan from(Collection<TestDescriptor> engineDescriptors,
 		Preconditions.notNull(configurationParameters, "Cannot create TestPlan from null ConfigurationParameters");
 		TestPlan testPlan = new TestPlan(engineDescriptors.stream().anyMatch(TestDescriptor::containsTests),
 			configurationParameters);
-		Visitor visitor = descriptor -> testPlan.add(TestIdentifier.from(descriptor));
+		Visitor visitor = descriptor -> testPlan.addInternal(TestIdentifier.from(descriptor));
 		engineDescriptors.forEach(engineDescriptor -> engineDescriptor.accept(visitor));
 		return testPlan;
 	}
@@ -105,12 +106,19 @@ protected TestPlan(boolean containsTests, ConfigurationParameters configurationP
 	 * Add the supplied {@link TestIdentifier} to this test plan.
 	 *
 	 * @param testIdentifier the identifier to add; never {@code null}
-	 * @deprecated Please discontinue use of this method. A future version of the
-	 * JUnit Platform will ignore this call and eventually even throw an exception.
+	 * @deprecated Calling this method is no longer supported and will throw an
+	 * exception.
+	 * @throws JUnitException always
 	 */
 	@Deprecated
 	@API(status = DEPRECATED, since = "1.4")
-	public void add(TestIdentifier testIdentifier) {
+	public void add(@SuppressWarnings("unused") TestIdentifier testIdentifier) {
+		throw new JUnitException("Unsupported attempt to modify the TestPlan was detected. "
+				+ "Please contact your IDE/tool vendor and request a fix or downgrade to JUnit 5.7.x (see https://github.com/junit-team/junit5/issues/1732 for details).");
+	}
+
+	@API(status = INTERNAL, since = "1.8")
+	public void addInternal(TestIdentifier testIdentifier) {
 		Preconditions.notNull(testIdentifier, "testIdentifier must not be null");
 		allIdentifiers.put(testIdentifier.getUniqueIdObject(), testIdentifier);
 		if (testIdentifier.getParentIdObject().isPresent()) {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
index 5f9c6a574183..807a2dab4a32 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
@@ -16,8 +16,6 @@
 import java.util.function.Predicate;
 
 import org.junit.platform.commons.PreconditionViolationException;
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 
@@ -26,10 +24,7 @@
  */
 class InternalTestPlan extends TestPlan {
 
-	private static final Logger logger = LoggerFactory.getLogger(InternalTestPlan.class);
-
 	private final AtomicBoolean executionStarted = new AtomicBoolean(false);
-	private final AtomicBoolean warningEmitted = new AtomicBoolean(false);
 	private final LauncherDiscoveryResult discoveryResult;
 	private final TestPlan delegate;
 
@@ -58,17 +53,12 @@ LauncherDiscoveryResult getDiscoveryResult() {
 	@Override
 	@SuppressWarnings("deprecation")
 	public void add(TestIdentifier testIdentifier) {
-		if (warningEmitted.compareAndSet(false, true)) {
-			logger.warn(() -> "Attempt to modify the TestPlan was detected. "
-					+ "A future version of the JUnit Platform will ignore this call and eventually even throw an exception. "
-					+ "Please contact your IDE/tool vendor and request a fix (see https://github.com/junit-team/junit5/issues/1732 for details).");
-		}
-		addInternal(testIdentifier);
+		delegate.add(testIdentifier);
 	}
 
-	@SuppressWarnings("deprecation")
-	void addInternal(TestIdentifier testIdentifier) {
-		delegate.add(testIdentifier);
+	@Override
+	public void addInternal(TestIdentifier testIdentifier) {
+		delegate.addInternal(testIdentifier);
 	}
 
 	@Override
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 5c3b457d91f8..41471f02f883 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.launcher.core;
 
-import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -684,9 +683,8 @@ void launcherCanExecuteTestPlanExactlyOnce() {
 	}
 
 	@Test
-	@TrackLogRecords
 	@SuppressWarnings("deprecation")
-	void testPlanWarnsWhenModified(LogRecordListener listener) {
+	void testPlanThrowsExceptionWhenModified() {
 		TestEngine engine = new TestEngineSpy();
 		var launcher = createLauncher(engine);
 		var testPlan = launcher.discover(request().build());
@@ -696,14 +694,11 @@ void testPlanWarnsWhenModified(LogRecordListener listener) {
 
 		var addedIdentifier = TestIdentifier.from(
 			new TestDescriptorStub(engineUniqueId.append("test", "test2"), "test2"));
-		testPlan.add(addedIdentifier);
-		testPlan.add(addedIdentifier);
 
+		var exception = assertThrows(JUnitException.class, () -> testPlan.add(addedIdentifier));
+		assertThat(exception).hasMessage("Unsupported attempt to modify the TestPlan was detected. "
+				+ "Please contact your IDE/tool vendor and request a fix or downgrade to JUnit 5.7.x (see https://github.com/junit-team/junit5/issues/1732 for details).");
 		assertThat(testPlan.getChildren(engineIdentifier)).hasSize(1).doesNotContain(addedIdentifier);
-		assertThat(listener.stream(InternalTestPlan.class, Level.WARNING).map(LogRecord::getMessage).collect(
-			toList())).containsExactly("Attempt to modify the TestPlan was detected. " //
-					+ "A future version of the JUnit Platform will ignore this call and eventually even throw an exception. " //
-					+ "Please contact your IDE/tool vendor and request a fix (see https://github.com/junit-team/junit5/issues/1732 for details).");
 	}
 
 	@Test
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index b22e51d18437..35951ffe7f85 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -245,14 +245,12 @@ public Optional<TestSource> getSource() {
 		assertThat(listener.getSummary().getFailures()).hasSize(numThreads);
 	}
 
-	@SuppressWarnings("deprecation")
 	private TestIdentifier createTestIdentifier(String uniqueId) {
 		var identifier = TestIdentifier.from(new TestDescriptorStub(UniqueId.root("test", uniqueId), uniqueId));
-		testPlan.add(identifier);
+		testPlan.addInternal(identifier);
 		return identifier;
 	}
 
-	@SuppressWarnings("deprecation")
 	private TestIdentifier createContainerIdentifier(String uniqueId) {
 		var identifier = TestIdentifier.from(new TestDescriptorStub(UniqueId.root("container", uniqueId), uniqueId) {
 
@@ -261,7 +259,7 @@ public Type getType() {
 				return Type.CONTAINER;
 			}
 		});
-		testPlan.add(identifier);
+		testPlan.addInternal(identifier);
 		return identifier;
 	}
 

From 7e1a12d107bb28d193907ae7de232624952b61b0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 5 Jun 2021 18:22:17 +0200
Subject: [PATCH 0358/1433] Allow for more parallelization when running tooling
 support tests

Previously all published modules had to be fully built and tested. Now,
:platform-tooling-support-tests:test can run in parallel.
---
 .../src/main/kotlin/publishing-conventions.gradle.kts    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index 2dae1cc8f8ca..1acbaf8e5841 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -9,7 +9,14 @@ val isJitPackEnvironment = System.getenv("JITPACK")?.toBoolean() ?: false
 
 // ensure project is built successfully before publishing it
 tasks.withType<PublishToMavenRepository>().configureEach {
-	dependsOn(tasks.build)
+	dependsOn(provider {
+		val tempRepoName: String by rootProject
+		if (repository.name != tempRepoName) {
+			listOf(tasks.build)
+		} else {
+			emptyList()
+		}
+	})
 }
 tasks.withType<PublishToMavenLocal>().configureEach {
 	dependsOn(tasks.build)

From ace871e6bd3af302caf6912ba6db1186581e8e8e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 7 Jun 2021 12:12:58 +0200
Subject: [PATCH 0359/1433] Polish `class` scheme support for ClassSource and
 dynamic tests

See #2637, #2635
---
 .../release-notes/release-notes-5.8.0-M2.adoc | 12 ++++--
 .../support/descriptor/ClassSource.java       | 37 ++++++++++---------
 .../descriptor/ClasspathResourceSource.java   |  1 +
 .../support/descriptor/ClassSourceTests.java  | 29 ++++++++++++---
 4 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 71833bfe2770..0f83816589f0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -23,6 +23,10 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* New `ClassSource.from(URI)` static factory method for creating a `ClassSource` from a
+  URI using the `class` scheme and optional query parameters specifying the line number
+  and column number. This is analogous to the existing `ClasspathResourceSource.from(URI)`
+  factory method.
 * New `getConfigurationParameters()` method in the `TestPlan` which allows a
   `TestExecutionListener` to access
   <<../user-guide/index.adoc#running-tests-config-params, configuration parameters>>. See
@@ -50,10 +54,10 @@ on GitHub.
 
 * `@TempDir` now supports creating multiple temporary directories via an identifier
   specified on the annotation (e.g. `@TempDir("a")` and `@TempDir("b")`).
-* New `named()` static factory method in the `Named` interface that serves as an
-  _alias_ for `Named.of()`. `named()` is intended to be used via `import static`.
-* New `class` URI scheme added for dynamic test sources. This allows tests to be located
-  using the information available in a `StackTraceElement`.
+* New `named()` static factory method in the `Named` interface that serves as an _alias_
+  for `Named.of()`. `named()` is intended to be used via `import static`.
+* New `class` URI scheme for dynamic test sources. This allows tests to be located using
+  the information available in a `StackTraceElement`.
 
 
 [[release-notes-5.8.0-M2-junit-vintage]]
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
index 3fe2022a0e1c..411f4957ce50 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
@@ -46,11 +46,11 @@ public class ClassSource implements TestSource {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * {@link URI} {@linkplain URI#getScheme() scheme} for class
-	 * sources: {@value}
+	 * {@link URI} {@linkplain URI#getScheme() scheme} for class sources: {@value}
 	 *
-	 * @since 1.3
+	 * @since 1.8
 	 */
+	@API(status = STABLE, since = "1.8")
 	public static final String CLASS_SCHEME = "class";
 
 	/**
@@ -95,21 +95,24 @@ public static ClassSource from(Class<?> javaClass, FilePosition filePosition) {
 
 	/**
 	 * Create a new {@code ClassSource} from the supplied {@link URI}.
-	 * <p>
-	 * URIs should be formatted as <code>class:fully.qualified.class.Name</code>. An
-	 * optional query can be appended detailing <code>line</code> and/or
-	 * <code>column</code> numbers, e.g.
-	 * <code>class:com.foo.Bar?line=42&amp;column=13</code>. The URI fragment, if
-	 * present, is ignored.
+	 *
+	 * <p>URIs should be formatted as {@code class:fully.qualified.class.Name}.
+	 * The {@linkplain URI#getQuery() query} component of the {@code URI}, if
+	 * present, will be used to retrieve the {@link FilePosition} via
+	 * {@link FilePosition#fromQuery(String)}. For example, line 42 and column
+	 * 13 can be referenced in class {@code org.example.MyType} via the following
+	 * URI: {@code class:com.example.MyType?line=42&column=13}. The URI fragment,
+	 * if present, will be ignored.
 	 *
 	 * @param uri the {@code URI} for the class source; never {@code null}
 	 * @return a new {@code ClassSource}; never {@code null}
 	 * @throws PreconditionViolationException if the supplied {@code URI} is
-	 * {@code null} or if the scheme of the supplied {@code URI} is not equal
-	 * to the {@link #CLASS_SCHEME}, or if the specified class name is empty.
-	 * @since 1.3
+	 * {@code null}, if the scheme of the supplied {@code URI} is not equal
+	 * to the {@link #CLASS_SCHEME}, or if the specified class name is empty
+	 * @since 1.8
 	 * @see #CLASS_SCHEME
 	 */
+	@API(status = STABLE, since = "1.8")
 	public static ClassSource from(URI uri) {
 		Preconditions.notNull(uri, "URI must not be null");
 		Preconditions.condition(CLASS_SCHEME.equals(uri.getScheme()),
@@ -117,14 +120,12 @@ public static ClassSource from(URI uri) {
 
 		String className = uri.getSchemeSpecificPart();
 		FilePosition filePosition = null;
-		int qi = className.indexOf('?');
-		if (qi >= 0) {
-			filePosition = FilePosition.fromQuery(className.substring(qi + 1)).orElse(null);
-			className = className.substring(0, qi);
+		int indexOfQuery = className.indexOf('?');
+		if (indexOfQuery >= 0) {
+			filePosition = FilePosition.fromQuery(className.substring(indexOfQuery + 1)).orElse(null);
+			className = className.substring(0, indexOfQuery);
 		}
 
-		Preconditions.condition(!className.isEmpty(), () -> "Class name cannot be empty");
-
 		return ClassSource.from(className, filePosition);
 	}
 
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
index 415371f0d0cb..0f4de18dddf0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
@@ -97,6 +97,7 @@ public static ClasspathResourceSource from(String classpathResourceName, FilePos
 	 * @since 1.3
 	 * @see #CLASSPATH_SCHEME
 	 */
+	@API(status = STABLE, since = "1.3")
 	public static ClasspathResourceSource from(URI uri) {
 		Preconditions.notNull(uri, "URI must not be null");
 		Preconditions.condition(CLASSPATH_SCHEME.equals(uri.getScheme()),
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
index 329a88426de4..03c6c4d6341a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
@@ -95,7 +95,7 @@ void classSourceFromReferenceAndFilePosition() {
 	}
 
 	@Test
-	void classSourceFromURI() throws URISyntaxException {
+	void classSourceFromUri() throws URISyntaxException {
 		var source = ClassSource.from(new URI("class:java.lang.Object"));
 
 		assertThat(source.getJavaClass()).isEqualTo(Object.class);
@@ -103,17 +103,34 @@ void classSourceFromURI() throws URISyntaxException {
 	}
 
 	@Test
-	void classSourceFromURIWithLineQuery() throws URISyntaxException {
+	void classSourceFromUriWithLineNumber() throws URISyntaxException {
+		var position = FilePosition.from(42);
 		var source = ClassSource.from(new URI("class:java.lang.Object?line=42"));
 
 		assertThat(source.getJavaClass()).isEqualTo(Object.class);
-		assertThat(source.getPosition()).isNotEmpty();
-		assertThat(source.getPosition().get().getLine()).isEqualTo(42);
+		assertThat(source.getPosition()).hasValue(position);
+	}
+
+	@Test
+	void classSourceFromUriWithLineAndColumnNumbers() throws URISyntaxException {
+		var position = FilePosition.from(42, 23);
+		var source = ClassSource.from(new URI("class:java.lang.Object?line=42&foo=bar&column=23"));
+
+		assertThat(source.getJavaClass()).isEqualTo(Object.class);
+		assertThat(source.getPosition()).hasValue(position);
+	}
+
+	@Test
+	void classSourceFromUriWithEmptyQuery() throws URISyntaxException {
+		var source = ClassSource.from(new URI("class:java.lang.Object?"));
+
+		assertThat(source.getJavaClass()).isEqualTo(Object.class);
+		assertThat(source.getPosition()).isEmpty();
 	}
 
 	@Test
-	void classSourceFromURIWithMalformedQuery() throws URISyntaxException {
-		var source = ClassSource.from(new URI("class:java.lang.Object?foo=42"));
+	void classSourceFromUriWithUnsupportedParametersInQuery() throws URISyntaxException {
+		var source = ClassSource.from(new URI("class:java.lang.Object?foo=42&bar"));
 
 		assertThat(source.getJavaClass()).isEqualTo(Object.class);
 		assertThat(source.getPosition()).isEmpty();

From f5f7bc323811e78bd3f71838a616e9c50e6e869b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 7 Jun 2021 20:02:17 +0200
Subject: [PATCH 0360/1433] Update Test Distribution plugin to 2.1.1-rc-1

This version contains fixes for classpath ordering and JaCoCo file
merging.
---
 settings.gradle.kts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c8acdde3d0eb..59f7604a2f9a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,9 +1,13 @@
 import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
 
 pluginManagement {
+	repositories {
+		gradlePluginPortal()
+		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
+	}
 	plugins {
 		id("com.gradle.enterprise") version "3.6.2"
-		id("com.gradle.enterprise.test-distribution") version "2.0.3"
+		id("com.gradle.enterprise.test-distribution") version "2.1.1-rc-1"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"

From 5b56268b95cd939e4ccc2e75d237cff519f4fd22 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 7 Jun 2021 20:02:48 +0200
Subject: [PATCH 0361/1433] Re-enable Codecov status checks

---
 .codecov.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.codecov.yml b/.codecov.yml
index 35cde5cd5e85..d724eb3c1d0b 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,4 +1,6 @@
 coverage:
   status:
-    project: off
+    project:
+      default:
+        threshold: 1
     patch: off

From 639f9946e5edbf2e1a829c8acc5d383817b60295 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 7 Jun 2021 20:21:25 +0200
Subject: [PATCH 0362/1433] Stop archiving JaCoCo reports

---
 .github/workflows/main.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8cf1c7d30965..1664e6b023e5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,13 +72,6 @@ jobs:
       with:
         name: Test Distribution trace files
         path: '**/build/test-results/*/trace.json'
-    - name: Upload JaCoCo reports
-      uses: actions/upload-artifact@v2
-      with:
-        name: JaCoCo reports
-        path: |
-          **/build/jacoco/*.exec
-          **/build/reports/jacoco/*/*.xml
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v1
 

From 8ebcbae6cb9f471a033564bed570236f686314bf Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 8 Jun 2021 09:19:34 +0200
Subject: [PATCH 0363/1433] Make module `org.junit.platform.jfr` work on Java
 8u262+

Prior to this commit, all classes of this module targeted Java 11.

Now all classes target Java 8, except for `module-info.class`, which
still targets Java 11. At runtime, Java 8 Update 262 or later is required
as the Java Flight Recorder was backported to that Java release.
---
 buildSrc/src/main/kotlin/JavaLibraryExtension.kt  |  1 +
 .../kotlin/java-library-conventions.gradle.kts    | 14 ++++++++++++--
 .../src/main/kotlin/osgi-conventions.gradle.kts   |  2 +-
 junit-platform-jfr/junit-platform-jfr.gradle.kts  |  8 +++++++-
 .../jfr/FlightRecordingDiscoveryListener.java     |  6 +++---
 .../jfr/FlightRecordingExecutionListener.java     | 15 ++++++++-------
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
index 1f92e1b24c0b..ef33ff62d670 100644
--- a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
+++ b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
@@ -4,4 +4,5 @@ import org.gradle.api.JavaVersion
 open class JavaLibraryExtension {
     var mainJavaVersion: JavaVersion = JavaVersion.VERSION_1_8
     var testJavaVersion: JavaVersion = JavaVersion.VERSION_16
+    var configureRelease: Boolean = true
 }
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index aa4e20cae78e..25711e7ecb72 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -261,10 +261,20 @@ afterEvaluate {
 	}
 	tasks {
 		compileJava {
-			options.release.set(extension.mainJavaVersion.majorVersion.toInt())
+			if (extension.configureRelease) {
+				options.release.set(extension.mainJavaVersion.majorVersion.toInt())
+			} else {
+				sourceCompatibility = extension.mainJavaVersion.majorVersion
+				targetCompatibility = extension.mainJavaVersion.majorVersion
+			}
 		}
 		compileTestJava {
-			options.release.set(extension.testJavaVersion.majorVersion.toInt())
+			if (extension.configureRelease) {
+				options.release.set(extension.testJavaVersion.majorVersion.toInt())
+			} else {
+				sourceCompatibility = extension.testJavaVersion.majorVersion
+				targetCompatibility = extension.testJavaVersion.majorVersion
+			}
 		}
 	}
 	pluginManager.withPlugin("groovy") {
diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index 00570e03379b..f9047abd9c68 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -79,7 +79,7 @@ val osgiProperties by tasks.registering(WriteProperties::class) {
 		property("-runee", "JavaSE-${javaLibrary.mainJavaVersion}")
 	}
 	property("-runrequires", "osgi.identity;filter:='(osgi.identity=${project.name})'")
-	property("-runsystempackages", "jdk.internal.misc,sun.misc")
+	property("-runsystempackages", "jdk.internal.misc,jdk.jfr,sun.misc")
 }
 
 val osgiVerification by configurations.creating {
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index ebcc646c8b29..9d4b613ad3bc 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -11,10 +11,16 @@ dependencies {
 }
 
 javaLibrary {
-	mainJavaVersion = JavaVersion.VERSION_11
+	mainJavaVersion = JavaVersion.VERSION_1_8
+	configureRelease = false
 }
 
 tasks {
+	compileJava {
+		javaCompiler.set(project.the<JavaToolchainService>().compilerFor {
+			languageVersion.set(JavaLanguageVersion.of(8))
+		})
+	}
 	compileModule {
 		options.release.set(11)
 	}
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
index 4cbe23bdc1f0..c693186daa3f 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
@@ -44,7 +44,7 @@ public class FlightRecordingDiscoveryListener implements LauncherDiscoveryListen
 
 	@Override
 	public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
-		var event = new LauncherDiscoveryEvent();
+		LauncherDiscoveryEvent event = new LauncherDiscoveryEvent();
 		event.selectors = request.getSelectorsByType(DiscoverySelector.class).size();
 		event.filters = request.getFiltersByType(DiscoveryFilter.class).size();
 		event.begin();
@@ -58,7 +58,7 @@ public void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
 
 	@Override
 	public void engineDiscoveryStarted(org.junit.platform.engine.UniqueId engineId) {
-		var event = new EngineDiscoveryEvent();
+		EngineDiscoveryEvent event = new EngineDiscoveryEvent();
 		event.uniqueId = engineId.toString();
 		event.begin();
 		engineDiscoveryEvents.put(engineId, event);
@@ -66,7 +66,7 @@ public void engineDiscoveryStarted(org.junit.platform.engine.UniqueId engineId)
 
 	@Override
 	public void engineDiscoveryFinished(org.junit.platform.engine.UniqueId engineId, EngineDiscoveryResult result) {
-		var event = engineDiscoveryEvents.remove(engineId);
+		EngineDiscoveryEvent event = engineDiscoveryEvents.remove(engineId);
 		event.result = result.getStatus().toString();
 		event.commit();
 	}
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
index 839b0d02dd6b..170654d6c380 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
@@ -13,6 +13,7 @@
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -45,7 +46,7 @@ public class FlightRecordingExecutionListener implements TestExecutionListener {
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan plan) {
-		var event = new TestPlanExecutionEvent();
+		TestPlanExecutionEvent event = new TestPlanExecutionEvent();
 		event.containsTests = plan.containsTests();
 		event.engineNames = plan.getRoots().stream().map(TestIdentifier::getDisplayName).collect(
 			Collectors.joining(", "));
@@ -60,7 +61,7 @@ public void testPlanExecutionFinished(TestPlan plan) {
 
 	@Override
 	public void executionSkipped(TestIdentifier test, String reason) {
-		var event = new SkippedTestEvent();
+		SkippedTestEvent event = new SkippedTestEvent();
 		event.initialize(test);
 		event.reason = reason;
 		event.commit();
@@ -68,7 +69,7 @@ public void executionSkipped(TestIdentifier test, String reason) {
 
 	@Override
 	public void executionStarted(TestIdentifier test) {
-		var event = new TestExecutionEvent();
+		TestExecutionEvent event = new TestExecutionEvent();
 		testExecutionEvents.put(test.getUniqueId(), event);
 		event.initialize(test);
 		event.begin();
@@ -76,8 +77,8 @@ public void executionStarted(TestIdentifier test) {
 
 	@Override
 	public void executionFinished(TestIdentifier test, TestExecutionResult result) {
-		var throwable = result.getThrowable();
-		var event = testExecutionEvents.remove(test.getUniqueId());
+		Optional<Throwable> throwable = result.getThrowable();
+		TestExecutionEvent event = testExecutionEvents.remove(test.getUniqueId());
 		event.end();
 		event.result = result.getStatus().toString();
 		event.exceptionClass = throwable.map(Throwable::getClass).orElse(null);
@@ -87,8 +88,8 @@ public void executionFinished(TestIdentifier test, TestExecutionResult result) {
 
 	@Override
 	public void reportingEntryPublished(TestIdentifier test, ReportEntry reportEntry) {
-		for (var entry : reportEntry.getKeyValuePairs().entrySet()) {
-			var event = new ReportEntryEvent();
+		for (Map.Entry<String, String> entry : reportEntry.getKeyValuePairs().entrySet()) {
+			ReportEntryEvent event = new ReportEntryEvent();
 			event.uniqueId = test.getUniqueId();
 			event.key = entry.getKey();
 			event.value = entry.getValue();

From 072aca9024a8c19fc42f7e968a69d7b2821913f9 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Tue, 8 Jun 2021 09:45:09 +0200
Subject: [PATCH 0364/1433] Update documentation with new Java 8 support of
 module `org.junit.platform.jfr`

See #2638
---
 .../docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc   | 4 +++-
 documentation/src/docs/asciidoc/user-guide/running-tests.adoc | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 0f83816589f0..da0104d38a62 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -37,7 +37,9 @@ on GitHub.
   containing the unique IDs. The generated file can be used to rerun those tests -- for
   example, in order to run the same set of tests executed on the JVM subsequently within a
   GraalVM native image. See the Javadoc for `{UniqueIdTrackingListener}` for details.
-
+* Generating Java Flight Recorder events via module `org.junit.platform.jfr` is now also
+  supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
+  <<../user-guide/index.adoc#running-tests, Flight Recorder Support>> for details.
 
 [[release-notes-5.8.0-M2-junit-jupiter]]
 === JUnit Jupiter
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index de42becbb0e1..be12e85a9c1c 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -897,7 +897,7 @@ to a problem.
 
 In order to record Flight Recorder events generated while running tests, you need to:
 
-1. Ensure that you are using Java 11 or later.
+1. Ensure that you are using either Java 8 Update 262 or higher or Java 11 or later.
 2. Provide the `org.junit.platform.jfr` module (`junit-platform-jfr-{platform-version}.jar`)
    on the class-path or module-path at test runtime.
 3. Start flight recording when launching a test run. Flight Recorder can be started via

From 1db39927fdc072f4045ae9e2c3e27fa09026c646 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 8 Jun 2021 19:59:24 +0200
Subject: [PATCH 0365/1433] Use new Property APIs

---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 2 +-
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 25711e7ecb72..b191ea2905bb 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -141,7 +141,7 @@ val allMainClasses by tasks.registering {
 val compileModule by tasks.registering(JavaCompile::class) {
 	dependsOn(allMainClasses)
 	source = fileTree(moduleSourceDir)
-	destinationDir = moduleOutputDir
+	destinationDirectory.set(moduleOutputDir)
 	sourceCompatibility = "9"
 	targetCompatibility = "9"
 	classpath = files()
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 5049363e737f..037f3012856b 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -41,7 +41,7 @@ tasks.withType<Test>().configureEach {
 		jvmArgs(
 			"-XX:+UnlockDiagnosticVMOptions",
 			"-XX:+DebugNonSafepoints",
-			"-XX:StartFlightRecording=filename=${reports.junitXml.destination},dumponexit=true,settings=profile.jfc",
+			"-XX:StartFlightRecording=filename=${reports.junitXml.outputLocation.get()},dumponexit=true,settings=profile.jfc",
 			"-XX:FlightRecorderOptions=stackdepth=1024"
 		)
 	}

From f27ce8c94aa0fd9a62a5d22c49c58d4262f80b0c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 8 Jun 2021 20:19:24 +0200
Subject: [PATCH 0366/1433] Upgradle to 7.1-rc-2

---
 buildSrc/src/main/kotlin/osgi-conventions.gradle.kts | 2 ++
 gradle/wrapper/gradle-wrapper.properties             | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index f9047abd9c68..c32c58f100ac 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -59,6 +59,7 @@ tasks.withType<Jar>().matching {
 		""")
 
 	// Add the convention to the jar task
+	@Suppress("deprecation") // https://github.com/bndtools/bnd/issues/4699
 	convention.plugins["bundle"] = btc
 
 	doLast {
@@ -93,6 +94,7 @@ val verifyOSGi by tasks.registering(Resolve::class) {
 	dependsOn(osgiProperties)
 	setBndrun(osgiPropertiesFile)
 	isReportOptional = false
+	@Suppress("deprecation") // https://github.com/bndtools/bnd/issues/4699
 	withConvention(FileSetRepositoryConvention::class) {
 
 		// By default bnd will use jars found in:
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf516ce..0bd36ab9ea74 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionSha256Sum=caa8e323577de2fa421b47dded5278e7376c2bb6420221fbaf7908dfa9be8657
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-rc-2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From f59ba49436b7a89d8e29676b8623475e1138029f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 9 Jun 2021 13:56:53 +0200
Subject: [PATCH 0367/1433] Add GH Actions workflow for labeling new issues

---
 .github/workflows/issue-labels.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/issue-labels.yml

diff --git a/.github/workflows/issue-labels.yml b/.github/workflows/issue-labels.yml
new file mode 100644
index 000000000000..3dadaf6b4ad6
--- /dev/null
+++ b/.github/workflows/issue-labels.yml
@@ -0,0 +1,14 @@
+name: Label new issues
+on:
+  issues:
+      types: ['opened']
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Renato66/auto-label@69b3cbe79438b2079aed0a49474275d3e572cae5 # or v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          labels-synonyms: '{"3rd-party: Eclipse":["Eclipse"],"3rd-party: Gradle":["Gradle"],"3rd-party: IntelliJ IDEA":["IDEA","IntelliJ"],"3rd-party: Maven Surefire":["Failsafe","Maven","Surefire"],"3rd-party: Pioneer":["pioneer"],"component: Groovy":["Groovy"],"component: Test Kit":["Test Kit","TestKit"]}'
+          labels-not-allowed: '["dependencies","status: blocked","status: declined","status: duplicate","status: in progress","status: invalid","status: stale","status: superseded","status: team discussion","status: waiting-for-feedback","status: waiting-for-interest","status: works-as-designed","up-for-grabs"]'
+          default-labels: '["status: new"]'

From cee45bbbcfb4c3ceb59a6d79a8b8b90bda96ac79 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 11 Jun 2021 14:39:02 +0200
Subject: [PATCH 0368/1433] Add security policy

---
 SECURITY.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000000..0e51f7ff7479
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.7.x   | :white_check_mark: |
+| < 5.7   | :x:                |
+
+## Reporting a Vulnerability
+
+To report a security vulnerability, please send an email to security@junit.org.

From 6eb450cbbdb59f6c3d924b10f8347fddf37fdb76 Mon Sep 17 00:00:00 2001
From: Philzen <Philzen@users.noreply.github.com>
Date: Fri, 11 Jun 2021 17:31:27 +0200
Subject: [PATCH 0369/1433] Restore executable/readable directory permissions
 when deleting temp dir

Instead of failing when a directory's permissions have been changed,
`@TempDir` cleanup now resets readable and executable permissions of
the root temporary directory and any contained directories.

Resolves #2609.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.8.0-M2.adoc |   2 +
 .../engine/extension/TempDirectory.java       |  76 ++--
 .../engine/extension/TempDirectoryTests.java  | 392 ++++++++++++++++++
 3 files changed, 430 insertions(+), 40 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index da0104d38a62..1a4cd87238cc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -60,6 +60,8 @@ on GitHub.
   for `Named.of()`. `named()` is intended to be used via `import static`.
 * New `class` URI scheme for dynamic test sources. This allows tests to be located using
   the information available in a `StackTraceElement`.
+* `@TempDir` cleanup resets readable and executable permissions of the root temporary
+  directory and any contained directories instead of failing to delete them.
 
 
 [[release-notes-5.8.0-M2-junit-vintage]]
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 8926f9b4a48d..0b4f8481426b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -44,7 +44,6 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.io.TempDir;
-import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
@@ -191,8 +190,24 @@ private SortedMap<Path, IOException> deleteAllFilesAndDirectories() throws IOExc
 			}
 
 			SortedMap<Path, IOException> failures = new TreeMap<>();
+			resetPermissions(dir);
 			Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
 
+				@Override
+				public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+					if (!dir.equals(CloseablePath.this.dir)) {
+						resetPermissions(dir);
+					}
+					return CONTINUE;
+				}
+
+				@Override
+				public FileVisitResult visitFileFailed(Path file, IOException exc) {
+					// IOException includes `AccessDeniedException` thrown by non-readable or non-executable flags
+					resetPermissionsAndTryToDeleteAgain(file, exc);
+					return CONTINUE;
+				}
+
 				@Override
 				public FileVisitResult visitFile(Path file, BasicFileAttributes attributes) {
 					return deleteAndContinue(file);
@@ -214,45 +229,41 @@ private FileVisitResult deleteAndContinue(Path path) {
 						failures.put(path, exception);
 					}
 					catch (IOException exception) {
-						makeWritableAndTryToDeleteAgain(path, exception);
+						// IOException includes `AccessDeniedException` thrown by non-readable or non-executable flags
+						resetPermissionsAndTryToDeleteAgain(path, exception);
 					}
 					return CONTINUE;
 				}
 
-				private void makeWritableAndTryToDeleteAgain(Path path, IOException exception) {
+				private void resetPermissionsAndTryToDeleteAgain(Path path, IOException exception) {
 					try {
-						tryToMakeParentDirsWritable(path);
-						makeWritable(path);
-						Files.delete(path);
+						resetPermissions(path);
+						if (Files.isDirectory(path)) {
+							Files.walkFileTree(path, this);
+						}
+						else {
+							Files.delete(path);
+						}
 					}
 					catch (Exception suppressed) {
 						exception.addSuppressed(suppressed);
 						failures.put(path, exception);
 					}
 				}
-
-				private void tryToMakeParentDirsWritable(Path path) {
-					Path relativePath = dir.relativize(path);
-					Path parent = dir;
-					for (int i = 0; i < relativePath.getNameCount(); i++) {
-						boolean writable = parent.toFile().setWritable(true);
-						if (!writable) {
-							break;
-						}
-						parent = parent.resolve(relativePath.getName(i));
-					}
-				}
-
-				private void makeWritable(Path path) {
-					boolean writable = path.toFile().setWritable(true);
-					if (!writable) {
-						throw new UndeletableFileException("Attempt to make file '" + path + "' writable failed");
-					}
-				}
 			});
 			return failures;
 		}
 
+		@SuppressWarnings("ResultOfMethodCallIgnored")
+		private static void resetPermissions(Path path) {
+			File file = path.toFile();
+			file.setReadable(true);
+			file.setWritable(true);
+			if (Files.isDirectory(path)) {
+				file.setExecutable(true);
+			}
+		}
+
 		private IOException createIOExceptionWithAttachedFailures(SortedMap<Path, IOException> failures) {
 			// @formatter:off
 			String joinedPaths = failures.keySet().stream()
@@ -286,19 +297,4 @@ private Path relativizeSafely(Path path) {
 		}
 	}
 
-	private static class UndeletableFileException extends JUnitException {
-
-		private static final long serialVersionUID = 1L;
-
-		UndeletableFileException(String message) {
-			super(message);
-		}
-
-		@Override
-		public synchronized Throwable fillInStackTrace() {
-			return this; // Make the output smaller by omitting the stacktrace
-		}
-
-	}
-
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
index 0ea486877f15..c9d772765be7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
@@ -59,6 +59,7 @@
  *
  * @since 5.4
  */
+@SuppressWarnings("ALL")
 @DisplayName("TempDirectory extension")
 class TempDirectoryTests extends AbstractJupiterTestEngineTests {
 
@@ -98,6 +99,20 @@ void nonWritableFileDoesNotCauseFailure() {
 				.assertStatistics(stats -> stats.started(1).succeeded(1));
 	}
 
+	@Test
+	@DisplayName("is capable of removal of non-executable, non-writable, or non-readable directories and folders")
+	void nonMintPermissionsContentDoesNotCauseFailure() {
+		executeTestsForClass(NonMintPermissionContentInTempDirectoryDoesNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(13).succeeded(13));
+	}
+
+	@Test
+	@DisplayName("is capable of removal when its permissions were been changed")
+	void nonMintPermissionsDoNotCauseFailure() {
+		executeTestsForClass(NonMintTempDirectoryPermissionsDoNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(42).succeeded(42));
+	}
+
 	@Test
 	@DisabledOnOs(OS.WINDOWS)
 	@DisplayName("is capable of removal of a read-only file in a read-only dir")
@@ -833,6 +848,383 @@ void createReadOnlyFileInReadOnlyDir(@TempDir File tempDir) throws IOException {
 
 	}
 
+	// https://github.com/junit-team/junit5/issues/2609
+	static class NonMintPermissionContentInTempDirectoryDoesNotCauseFailureTestCase {
+
+		@Test
+		void createFile(@TempDir Path tempDir) throws IOException {
+			Files.createFile(tempDir.resolve("test-file.txt")).toFile();
+		}
+
+		@Test
+		void createFolder(@TempDir Path tempDir) throws IOException {
+			Files.createFile(tempDir.resolve("test-file.txt")).toFile();
+		}
+
+		@Test
+		void createNonWritableFile(@TempDir Path tempDir) throws IOException {
+			Files.createFile(tempDir.resolve("test-file.txt")).toFile().setWritable(false);
+		}
+
+		@Test
+		void createNonReadableFile(@TempDir Path tempDir) throws IOException {
+			Files.createFile(tempDir.resolve("test-file.txt")).toFile().setReadable(false);
+		}
+
+		@Test
+		void createNonWritableDirectory(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setWritable(false);
+		}
+
+		@Test
+		void createNonReadableDirectory(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setReadable(false);
+		}
+
+		@Test
+		void createNonExecutableDirectory(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setExecutable(false);
+		}
+
+		@Test
+		void createNonEmptyNonWritableDirectory(@TempDir Path tempDir) throws IOException {
+			Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+			subDir.toFile().setWritable(false);
+		}
+
+		@Test
+		void createNonEmptyNonReadableDirectory(@TempDir Path tempDir) throws IOException {
+			Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+			subDir.toFile().setReadable(false);
+		}
+
+		@Test
+		void createNonEmptyNonExecutableDirectory(@TempDir Path tempDir) throws IOException {
+			Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+			subDir.toFile().setExecutable(false);
+		}
+
+		@Test
+		void createNonEmptyDirectory(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+		}
+
+		@Test
+		void createNonEmptyDirectoryWithNonWritableFile(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setWritable(false);
+		}
+
+		@Test
+		void createNonEmptyDirectoryWithNonReadableFile(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setReadable(false);
+		}
+	}
+
+	// https://github.com/junit-team/junit5/issues/2609
+	static class NonMintTempDirectoryPermissionsDoNotCauseFailureTestCase {
+
+		@Nested
+		class NonWritable {
+
+			@Test
+			void makeEmptyTempDirectoryNonWritable(@TempDir Path tempDir) {
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithFileNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt"));
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithEmptyFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFileNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFileNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setWritable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setReadable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonExecutableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setExecutable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonReadableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setReadable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonWritableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setWritable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonExecutableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setExecutable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonWritableFileNonWritable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonReadableFileNonWritable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setWritable(false);
+			}
+		}
+
+		@Nested
+		class NonReadable {
+
+			@Test
+			void makeEmptyTempDirectoryNonReadable(@TempDir Path tempDir) {
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithFileNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt"));
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithEmptyFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFileNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFileNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setWritable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setReadable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonExecutableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setExecutable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonWritableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setWritable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonReadableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setReadable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonExecutableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setExecutable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonWritableFileNonReadable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonReadableFileNonReadable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setReadable(false);
+			}
+		}
+
+		@Nested
+		class NonExecutable {
+
+			@Test
+			void makeEmptyTempDirectoryNonExecutable(@TempDir Path tempDir) {
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithFileNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt"));
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithEmptyFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFileNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFileNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setWritable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setReadable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonExecutableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setExecutable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonWritableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setWritable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonReadableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setReadable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonExecutableFolderNonExecutable(@TempDir Path tempDir)
+					throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setExecutable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonWritableFileNonExecutable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonReadableFileNonExecutable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+		}
+	}
+
 	// https://github.com/junit-team/junit5/issues/2079
 	static class TempDirUsageInsideNestedClassesTestCase {
 

From 2f43ffe69f7f98f2abe4537a8b561a6f5bc66331 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Wed, 16 Jun 2021 17:45:20 +0200
Subject: [PATCH 0370/1433] Fix broken links to Logger and LoggerFactory

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 18e6158b17ac..94ab41b602ef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -127,8 +127,8 @@ See [`ExtensionContext`](junit-jupiter-api/src/main/java/org/junit/jupiter/api/e
 ### Logging
 
 - In general, logging should be used sparingly.
-- All logging must be performed via the internal `Logger` façade provided via the JUnit [LoggerFactory](https://junit.org/junit5/docs/current/api/org/junit/platform/commons/logging/LoggerFactory.html).
-- Levels defined in JUnit's [Logger](https://junit.org/junit5/docs/current/api/org/junit/platform/commons/logging/Logger.html) façade.
+- All logging must be performed via the internal `Logger` façade provided via the JUnit [LoggerFactory](https://github.com/junit-team/junit5/blob/main/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java).
+- Levels defined in JUnit's [Logger](https://github.com/junit-team/junit5/blob/main/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java) façade, which delegates to Java Util Logging (JUL) for the actual logging.
   - _error_ (JUL: `SEVERE`, Log4J: `ERROR`): extra information (in addition to an Exception) about errors that will halt execution
   - _warn_ (JUL: `WARNING`, Log4J: `WARN`): potential usage or configuration errors that should not halt execution
   - _info_ (JUL: `INFO`, Log4J: `INFO`): information the users might want to know but not by default

From 882bf488e228b1f55ed3b636838825dec31ec20d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Wed, 16 Jun 2021 17:58:50 +0200
Subject: [PATCH 0371/1433] Document spelling guidelines

---
 CONTRIBUTING.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 94ab41b602ef..e2a44b38b935 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -87,6 +87,11 @@ possible.
 
 In multi-line bullet point entries, subsequent lines should be indented.
 
+### Spelling
+
+Use American English spelling rules when writing documentation as well as for
+code -- class names, method names, variable names, etc.
+
 ### Javadoc
 
 - Javadoc comments should be wrapped after 80 characters whenever possible.

From 694efb6dbd8506d623d5c117d1df39f9260f72df Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Thu, 17 Jun 2021 18:01:11 +0200
Subject: [PATCH 0372/1433] Fix enclosing class bug in IndicativeSentences

Prior to this commit, the IndicativeSentences DisplayNameGenerator
included the display name of the enclosing class when generating an
"indicative sentence" even if the enclosing class was not configured to
use the IndicativeSentences display name generator.

For example, in the DisplayNameGeneratorDemo used in the User Guide,
the generated display name for one of nested test classes was:

    DisplayNameGeneratorDemo$A year is a leap year

Whereas, it should be the following, without
"DisplayNameGeneratorDemo$" as a prefix for the nested test class.

    A year is a leap year

This commit fixes this bug and polishes the implementation of
IndicativeSentences.

Fixes #2645
---
 .../release-notes/release-notes-5.8.0-M2.adoc |   4 +-
 .../jupiter/api/DisplayNameGenerator.java     | 195 +++++++++++-------
 .../api/IndicativeSentencesGeneration.java    |  26 ++-
 .../engine/descriptor/DisplayNameUtils.java   |   5 +-
 .../api/DisplayNameGenerationTests.java       |  42 +++-
 .../IndicativeSentencesNestedTestCase.java    |  32 +++
 .../IndicativeSentencesTopLevelTestCase.java  |  32 +++
 7 files changed, 243 insertions(+), 93 deletions(-)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 1a4cd87238cc..103543a2205a 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -46,7 +46,9 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* The `IndicativeSentences` `DisplayNameGenerator` no longer includes the display name of
+  the enclosing class when generating an _indicative sentence_ if the enclosing class is
+  not configured to use the `IndicativeSentences` display name generator as well.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 0e6284891266..4aa6206f26fe 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -12,12 +12,15 @@
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
-import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
+import static org.junit.platform.commons.support.ModifierSupport.isStatic;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Optional;
+import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
+import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -31,6 +34,14 @@
  *
  * <p>Concrete implementations must have a <em>default constructor</em>.
  *
+ * <h4>Built-in Implementations</h4>
+ * <ul>
+ * <li>{@link Standard}</li>
+ * <li>{@link Simple}</li>
+ * <li>{@link ReplaceUnderscores}</li>
+ * <li>{@link IndicativeSentences}</li>
+ * </ul>
+ *
  * @since 5.4
  * @see DisplayName @DisplayName
  * @see DisplayNameGeneration @DisplayNameGeneration
@@ -181,11 +192,12 @@ private static String replaceUnderscores(String name) {
 	/**
 	 * {@code DisplayNameGenerator} that generates complete sentences.
 	 *
-	 * <p>This implements the functionality of {@link DisplayNameGenerator}
-	 * by generating complete sentences display names, these
-	 * sentences are divided with a separator, and the generator and separator
-	 * can be customisable by using the {@link IndicativeSentencesGeneration}
-	 * interface as annotation.
+	 * <p>This generator generates display names that build up complete sentences
+	 * by concatenating the names of the test and the enclosing classes. The
+	 * sentence fragments are concatenated using a separator. The separator and
+	 * the display name generator for individual sentence fragments can be configured
+	 * via the {@link IndicativeSentencesGeneration @IndicativeSentencesGeneration}
+	 * annotation.
 	 *
 	 * @since 5.7
 	 */
@@ -199,7 +211,7 @@ public IndicativeSentences() {
 
 		@Override
 		public String generateDisplayNameForClass(Class<?> testClass) {
-			return getGeneratorForIndicativeSentence(testClass).generateDisplayNameForClass(testClass);
+			return getGeneratorFor(testClass).generateDisplayNameForClass(testClass);
 		}
 
 		@Override
@@ -209,94 +221,133 @@ public String generateDisplayNameForNestedClass(Class<?> nestedClass) {
 
 		@Override
 		public String generateDisplayNameForMethod(Class<?> testClass, Method testMethod) {
-			return getSentenceBeginning(testClass) + getSentenceSeparator(testClass)
-					+ getGeneratorForIndicativeSentence(testClass).generateDisplayNameForMethod(testClass, testMethod);
+			return getSentenceBeginning(testClass) + getFragmentSeparator(testClass)
+					+ getGeneratorFor(testClass).generateDisplayNameForMethod(testClass, testMethod);
 		}
 
 		private String getSentenceBeginning(Class<?> testClass) {
-			Class<?> enclosingParent = testClass.getEnclosingClass();
-			Optional<DisplayName> displayName = findAnnotation(testClass, DisplayName.class);
-			Optional<DisplayNameGeneration> displayNameGeneration = findAnnotation(testClass,
-				DisplayNameGeneration.class);
-
-			if (enclosingParent == null || displayNameGeneration.isPresent()) {
-				return displayName.map(DisplayName::value).orElseGet(() -> generateDisplayNameForClass(testClass));
+			Class<?> enclosingClass = testClass.getEnclosingClass();
+			boolean topLevelTestClass = (enclosingClass == null || isStatic(testClass));
+			Optional<String> displayName = AnnotationSupport.findAnnotation(testClass, DisplayName.class)//
+					.map(DisplayName::value).map(String::trim);
+
+			if (topLevelTestClass) {
+				if (displayName.isPresent()) {
+					return displayName.get();
+				}
+				Class<? extends DisplayNameGenerator> generatorClass = findDisplayNameGeneration(testClass)//
+						.map(DisplayNameGeneration::value)//
+						.filter(not(IndicativeSentences.class))//
+						.orElse(null);
+				if (generatorClass != null) {
+					return getDisplayNameGenerator(generatorClass).generateDisplayNameForClass(testClass);
+				}
+				return generateDisplayNameForClass(testClass);
 			}
-			String separator = getSentenceSeparator(testClass);
-			String sentenceBeginning = getSentenceBeginning(enclosingParent);
-			return displayName.map(name -> sentenceBeginning + separator + name.value()) //
-					.orElseGet(() -> sentenceBeginning + separator
-							+ getGeneratorForIndicativeSentence(testClass).generateDisplayNameForNestedClass(
-								testClass));
+
+			// Only build prefix based on the enclosing class if the enclosing
+			// class is also configured to use the IndicativeSentences generator.
+			boolean buildPrefix = findDisplayNameGeneration(enclosingClass)//
+					.map(DisplayNameGeneration::value)//
+					.filter(IndicativeSentences.class::equals)//
+					.isPresent();
+
+			String prefix = (buildPrefix ? getSentenceBeginning(enclosingClass) + getFragmentSeparator(testClass) : "");
+
+			return prefix + displayName.orElseGet(
+				() -> getGeneratorFor(testClass).generateDisplayNameForNestedClass(testClass));
 		}
 
 		/**
-		 * Gets the separator for {@link IndicativeSentencesGeneration} when extracting the
-		 * annotation from {@code IndicativeSentencesGeneration}, if it doesn't find it,
-		 * then search for the parent classes, if no separator is found use @code{", "} by default.
+		 * Get the sentence fragment separator.
+		 *
+		 * <p>If {@link IndicativeSentencesGeneration @IndicativeSentencesGeneration}
+		 * is present (searching enclosing classes if not found locally), the
+		 * configured {@link IndicativeSentencesGeneration#separator() separator}
+		 * will be used. Otherwise, {@link IndicativeSentencesGeneration#DEFAULT_SEPARATOR}
+		 * will be used.
 		 *
-		 * @param testClass Class to get Indicative sentence annotation separator either custom or default
-		 * @return the indicative sentence separator
+		 * @param testClass the test class to search on for {@code @IndicativeSentencesGeneration}
+		 * @return the sentence fragment separator
 		 */
-		private String getSentenceSeparator(Class<?> testClass) {
-			Optional<IndicativeSentencesGeneration> indicativeSentencesGeneration = getIndicativeSentencesGeneration(
-				testClass);
-			if (indicativeSentencesGeneration.isPresent()) {
-				if (indicativeSentencesGeneration.get().separator().equals("")) {
-					return IndicativeSentencesGeneration.DEFAULT_SEPARATOR;
-				}
-				return indicativeSentencesGeneration.get().separator();
-			}
-
-			return IndicativeSentencesGeneration.DEFAULT_SEPARATOR;
+		private static String getFragmentSeparator(Class<?> testClass) {
+			return findIndicativeSentencesGeneration(testClass)//
+					.map(IndicativeSentencesGeneration::separator)//
+					.orElse(IndicativeSentencesGeneration.DEFAULT_SEPARATOR);
 		}
 
 		/**
-		 * Gets the generator for {@link IndicativeSentencesGeneration} when extracting the
-		 * annotation from {@code IndicativeSentencesGeneration}, if it doesn't find it,
-		 * then search for the parent classes, if no generator value is found use
-		 * {@link Standard} by default.
+		 * Get the display name generator to use for the supplied test class.
+		 *
+		 * <p>If {@link IndicativeSentencesGeneration @IndicativeSentencesGeneration}
+		 * is present (searching enclosing classes if not found locally), the
+		 * configured {@link IndicativeSentencesGeneration#generator() generator}
+		 * will be used. Otherwise, {@link IndicativeSentencesGeneration#DEFAULT_GENERATOR}
+		 * will be used.
 		 *
-		 * @param testClass Class to get Indicative sentence generator either custom or default
-		 * @return the {@code DisplayNameGenerator} instance to use in indicative sentences generator
+		 * @param testClass the test class to search on for {@code @IndicativeSentencesGeneration}
+		 * @return the {@code DisplayNameGenerator} instance to use
 		 */
-		private DisplayNameGenerator getGeneratorForIndicativeSentence(Class<?> testClass) {
-			Optional<IndicativeSentencesGeneration> indicativeSentencesGeneration = getIndicativeSentencesGeneration(
-				testClass);
-			if (indicativeSentencesGeneration.isPresent()) {
-				DisplayNameGenerator displayNameGenerator = getDisplayNameGenerator(
-					indicativeSentencesGeneration.get().generator());
-				if (displayNameGenerator.getClass() == IndicativeSentences.class) {
-					return getDisplayNameGenerator(IndicativeSentencesGeneration.DEFAULT_GENERATOR);
-				}
-				return displayNameGenerator;
-			}
-
-			return getDisplayNameGenerator(IndicativeSentencesGeneration.DEFAULT_GENERATOR);
+		private static DisplayNameGenerator getGeneratorFor(Class<?> testClass) {
+			return findIndicativeSentencesGeneration(testClass)//
+					.map(IndicativeSentencesGeneration::generator)//
+					.filter(not(IndicativeSentences.class))//
+					.map(DisplayNameGenerator::getDisplayNameGenerator)//
+					.orElseGet(() -> getDisplayNameGenerator(IndicativeSentencesGeneration.DEFAULT_GENERATOR));
 		}
 
 		/**
-		 * Finds the {@code IndicativeSentencesGeneration} annotation that is present,
-		 * meta-present or if it doesn't find it, then search for the enclosing
-		 * parent classes, if no annotation is found returns empty.
+		 * Find the first {@code DisplayNameGeneration} annotation that is either
+		 * <em>directly present</em>, <em>meta-present</em>, or <em>indirectly present</em>
+		 * on the supplied {@code testClass} or on an enclosing class.
 		 *
-		 * @param testClass the test class to find the {@code IndicativeSentencesGeneration}
-		 * annotation
-		 * @return the optional annotation retrieved from the test class.
+		 * @param testClass the test class on which to find the annotation; never {@code null}
+		 * @return an {@code Optional} containing the annotation, potentially empty if not found
 		 */
-		private Optional<IndicativeSentencesGeneration> getIndicativeSentencesGeneration(Class<?> testClass) {
-			Optional<IndicativeSentencesGeneration> indicativeSentencesGeneration = findAnnotation(testClass,
-				IndicativeSentencesGeneration.class);
+		private static Optional<DisplayNameGeneration> findDisplayNameGeneration(Class<?> testClass) {
+			return findAnnotation(testClass, DisplayNameGeneration.class);
+		}
 
-			if (indicativeSentencesGeneration.isPresent()) {
-				return indicativeSentencesGeneration;
-			}
-			if (testClass.getEnclosingClass() != null) {
-				return getIndicativeSentencesGeneration(testClass.getEnclosingClass());
-			}
+		/**
+		 * Find the first {@code IndicativeSentencesGeneration} annotation that is either
+		 * <em>directly present</em>, <em>meta-present</em>, or <em>indirectly present</em>
+		 * on the supplied {@code testClass} or on an enclosing class.
+		 *
+		 * @param testClass the test class on which to find the annotation; never {@code null}
+		 * @return an {@code Optional} containing the annotation, potentially empty if not found
+		 */
+		private static Optional<IndicativeSentencesGeneration> findIndicativeSentencesGeneration(Class<?> testClass) {
+			return findAnnotation(testClass, IndicativeSentencesGeneration.class);
+		}
 
+		/**
+		 * Find the first annotation of the specified type that is either
+		 * <em>directly present</em>, <em>meta-present</em>, or <em>indirectly
+		 * present</em> on the supplied {@code testClass} or on an enclosing class.
+		 *
+		 * @param <A> the annotation type
+		 * @param testClass the test class on which to search for the annotation;
+		 * never {@code null}
+		 * @param annotationType the annotation type to search for; never {@code null}
+		 * @return an {@code Optional} containing the annotation; never {@code null} but
+		 * potentially empty
+		 */
+		private static <A extends Annotation> Optional<A> findAnnotation(Class<?> testClass, Class<A> annotationType) {
+			Class<?> candidate = testClass;
+			do {
+				Optional<A> annotation = AnnotationSupport.findAnnotation(candidate, annotationType);
+				if (annotation.isPresent()) {
+					return annotation;
+				}
+				candidate = candidate.getEnclosingClass();
+			} while (candidate != null);
 			return Optional.empty();
 		}
+
+		private static Predicate<Class<?>> not(Class<?> clazz) {
+			return ((Predicate<Class<?>>) clazz::equals).negate();
+		}
+
 	}
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
index 82acc5cfb913..183fb8c6dd15 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
@@ -20,18 +20,24 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.DisplayNameGenerator.IndicativeSentences;
 
 /**
- * {@code @IndicativeSentencesGeneration} is used to declare a custom parameters
- * by {@code IndicativeSentences}, if this notation has some not declared
- * parameters, it will use the default values instead.
+ * {@code @IndicativeSentencesGeneration} is used to register the
+ * {@link IndicativeSentences} display name generator and configure it.
+ *
+ * <p>The {@link #separator} for sentence fragments and the display name
+ * {@link #generator} for sentence fragments are configurable. If this annotation
+ * is declared without any attributes &mdash; for example,
+ * {@code @IndicativeSentencesGeneration} or {@code @IndicativeSentencesGeneration()}
+ * &mdash; the default configuration will be used.
  *
  * @since 5.7
  * @see DisplayName
  * @see DisplayNameGenerator
  * @see DisplayNameGenerator.IndicativeSentences
  */
-@DisplayNameGeneration(DisplayNameGenerator.IndicativeSentences.class)
+@DisplayNameGeneration(IndicativeSentences.class)
 @Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
@@ -40,15 +46,21 @@
 public @interface IndicativeSentencesGeneration {
 
 	String DEFAULT_SEPARATOR = ", ";
+
 	Class<? extends DisplayNameGenerator> DEFAULT_GENERATOR = DisplayNameGenerator.Standard.class;
 
 	/**
-	 * Custom separator for indicative sentences generator.
+	 * Custom separator for sentence fragments.
+	 *
+	 * <p>Defaults to {@value #DEFAULT_SEPARATOR}.
 	 */
-	String separator() default "";
+	String separator() default DEFAULT_SEPARATOR;
 
 	/**
-	 * Custom display name generator.
+	 * Custom display name generator to use for sentence fragments.
+	 *
+	 * <p>Defaults to {@link DisplayNameGenerator.Standard}.
 	 */
 	Class<? extends DisplayNameGenerator> generator() default DisplayNameGenerator.Standard.class;
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
index 23e9a94428bb..549fd19b57f5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.engine.descriptor;
 
-import static org.junit.jupiter.api.DisplayNameGenerator.IndicativeSentences;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 
 import java.lang.reflect.AnnotatedElement;
@@ -21,6 +20,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.DisplayNameGenerator.IndicativeSentences;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
 import org.junit.jupiter.api.DisplayNameGenerator.Simple;
 import org.junit.jupiter.api.DisplayNameGenerator.Standard;
@@ -128,7 +128,7 @@ private static DisplayNameGenerator getDisplayNameGenerator(Class<?> testClass,
 
 	/**
 	 * Find the first {@code DisplayNameGeneration} annotation that is either
-	 * <em>directly present</em>, <em>meta-present</em>, <em>indirectly present</em>
+	 * <em>directly present</em>, <em>meta-present</em>, or <em>indirectly present</em>
 	 * on the supplied {@code testClass} or on an enclosing class.
 	 */
 	private static Optional<DisplayNameGeneration> getDisplayNameGeneration(Class<?> testClass) {
@@ -142,4 +142,5 @@ private static Optional<DisplayNameGeneration> getDisplayNameGeneration(Class<?>
 		} while (candidate != null);
 		return Optional.empty();
 	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
index f466c402f2c7..ba748df29eff 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
@@ -82,7 +82,7 @@ void underscoreGenerator() {
 	}
 
 	@Test
-	void indicativeSentencesGenerator() {
+	void indicativeSentencesGeneratorOnStaticNestedClass() {
 		var expectedDisplayNames = List.of( //
 			"CONTAINER: DisplayNameGenerationTests$IndicativeStyleTestCase", //
 			"TEST: @DisplayName prevails", //
@@ -96,6 +96,26 @@ void indicativeSentencesGenerator() {
 		check(IndicativeStyleTestCase.class, expectedDisplayNames);
 	}
 
+	@Test
+	void indicativeSentencesGeneratorOnTopLevelClass() {
+		var expectedDisplayNames = List.of( //
+			"CONTAINER: IndicativeSentencesTopLevelTestCase", //
+			"CONTAINER: IndicativeSentencesTopLevelTestCase -> A year is a leap year", //
+			"TEST: IndicativeSentencesTopLevelTestCase -> A year is a leap year -> if it is divisible by 4 but not by 100" //
+		);
+		check(IndicativeSentencesTopLevelTestCase.class, expectedDisplayNames);
+	}
+
+	@Test
+	void indicativeSentencesGeneratorOnNestedClass() {
+		var expectedDisplayNames = List.of( //
+			"CONTAINER: A year is a leap year", //
+			"CONTAINER: IndicativeSentencesNestedTestCase", //
+			"TEST: A year is a leap year -> if it is divisible by 4 but not by 100" //
+		);
+		check(IndicativeSentencesNestedTestCase.class, expectedDisplayNames);
+	}
+
 	@Test
 	void noNameGenerator() {
 		check(NoNameStyleTestCase.class, List.of( //
@@ -130,11 +150,11 @@ void checkDisplayNameGeneratedForTestingAStackDemo() {
 	void checkDisplayNameGeneratedForIndicativeGeneratorTestCase() {
 		check(IndicativeGeneratorTestCase.class, List.of( //
 			"CONTAINER: A stack", //
-			"CONTAINER: A stack, when is new", //
-			"CONTAINER: A stack, when is new, after pushing an element to an empty stack", //
+			"CONTAINER: A stack, when new", //
+			"CONTAINER: A stack, when new, after pushing an element to an empty stack", //
 			"TEST: A stack, is instantiated with new constructor", //
-			"TEST: A stack, when is new, after pushing an element to an empty stack, is no longer empty", //
-			"TEST: A stack, when is new, throws EmptyStackException when peeked" //
+			"TEST: A stack, when new, after pushing an element to an empty stack, is no longer empty", //
+			"TEST: A stack, when new, throws EmptyStackException when peeked" //
 		));
 	}
 
@@ -142,11 +162,11 @@ void checkDisplayNameGeneratedForIndicativeGeneratorTestCase() {
 	void checkDisplayNameGeneratedForIndicativeGeneratorWithCustomSeparatorTestCase() {
 		check(IndicativeGeneratorWithCustomSeparatorTestCase.class, List.of( //
 			"CONTAINER: A stack", //
-			"CONTAINER: A stack >> when is new", //
-			"CONTAINER: A stack >> when is new >> after pushing an element to an empty stack", //
+			"CONTAINER: A stack >> when new", //
+			"CONTAINER: A stack >> when new >> after pushing an element to an empty stack", //
 			"TEST: A stack >> is instantiated with new constructor", //
-			"TEST: A stack >> when is new >> after pushing an element to an empty stack >> is no longer empty", //
-			"TEST: A stack >> when is new >> throws EmptyStackException when peeked"//
+			"TEST: A stack >> when new >> after pushing an element to an empty stack >> is no longer empty", //
+			"TEST: A stack >> when new >> throws EmptyStackException when peeked"//
 		));
 	}
 
@@ -319,7 +339,7 @@ void is_instantiated_with_new_constructor() {
 		}
 
 		@Nested
-		class when_is_new {
+		class when_new {
 
 			@BeforeEach
 			void create_with_new_stack() {
@@ -363,7 +383,7 @@ void is_instantiated_with_new_constructor() {
 		}
 
 		@Nested
-		class when_is_new {
+		class when_new {
 
 			@BeforeEach
 			void create_with_new_stack() {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
new file mode 100644
index 000000000000..018cd5255a08
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
+
+/**
+ * This test case declares {@link IndicativeSentencesGeneration} on a test class
+ * that is nested directly within a top-level test class.
+ *
+ * @see IndicativeSentencesTopLevelTestCase
+ */
+class IndicativeSentencesNestedTestCase {
+
+	@Nested
+	@IndicativeSentencesGeneration(separator = " -> ", generator = ReplaceUnderscores.class)
+	class A_year_is_a_leap_year {
+
+		@Test
+		void if_it_is_divisible_by_4_but_not_by_100() {
+		}
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
new file mode 100644
index 000000000000..03fd754bb00f
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
+
+/**
+ * This test case declares {@link IndicativeSentencesGeneration} on a top-level
+ * test class that contains a nested test class.
+ *
+ * @see IndicativeSentencesNestedTestCase
+ */
+@IndicativeSentencesGeneration(separator = " -> ", generator = ReplaceUnderscores.class)
+class IndicativeSentencesTopLevelTestCase {
+
+	@Nested
+	class A_year_is_a_leap_year {
+
+		@Test
+		void if_it_is_divisible_by_4_but_not_by_100() {
+		}
+	}
+
+}

From 57e48f68e22fd9505566be38a04ec07cb5acd193 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 17 Jun 2021 18:23:09 +0200
Subject: [PATCH 0373/1433] Document best practices for test method and test
 class visibility

This is a follow up to 419ddb12f13049692949f0f12d50e8f38cf43cba.

Closes #2626
---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index c54b0d8e1e11..f466fe86fea2 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -124,7 +124,9 @@ they must _not_ be `private`.
 
 It is generally recommended to omit the `public` modifier for test classes, test methods,
 and lifecycle methods unless there is a technical reason for doing so – for example, when
-a test class is extended by a test class in another package.
+a test class is extended by a test class in another package. Another technical reason for
+making classes and methods `public` is to simplify testing on the module path when using
+the Java Module System.
 ====
 
 The following test class demonstrates the use of `@Test` methods and all supported

From b7499dc0f44b52d236a10c1f9b4074dbca7c80de Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Jun 2021 15:20:51 +0200
Subject: [PATCH 0374/1433] Only search for annotations on enclosing class for
 inner classes

Prior to this commit, the annotation search algorithms used to find @DisplayNameGeneration
and @IndicativeSentencesGeneration accidentally found such annotations on the enclosing
class for a static nested class; however, this is in contrast to JUnit Jupiter's
annotation search support for other features.

This commit fixes this problem by introducing a new findAnnotation() variant in
AnnotationUtils that can find annotations within the enclosing class hierarchy but only
above inner classes (such as @Nested test classes).

Fixes #2647
---
 .../release-notes/release-notes-5.8.0-M2.adoc |   3 +
 .../jupiter/api/DisplayNameGeneration.java    |   5 +
 .../jupiter/api/DisplayNameGenerator.java     |  33 +----
 .../api/IndicativeSentencesGeneration.java    |   5 +
 .../engine/descriptor/DisplayNameUtils.java   |  20 +--
 ...playNameGenerationInheritanceTestCase.java |  36 ++++++
 .../api/DisplayNameGenerationTests.java       | 120 +++++++++++-------
 ...entencesGenerationInheritanceTestCase.java |  36 ++++++
 .../IndicativeSentencesNestedTestCase.java    |   1 +
 .../IndicativeSentencesTopLevelTestCase.java  |   1 +
 .../discovery/JupiterUniqueIdBuilder.java     |   5 +-
 .../commons/util/AnnotationUtils.java         |  40 ++++++
 12 files changed, 209 insertions(+), 96 deletions(-)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 103543a2205a..5c08cbc6af05 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -41,11 +41,14 @@ on GitHub.
   supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
   <<../user-guide/index.adoc#running-tests, Flight Recorder Support>> for details.
 
+
 [[release-notes-5.8.0-M2-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
 
+* `@DisplayNameGeneration` and `@IndicativeSentencesGeneration` are now only inherited
+  from enclosing classes if the current class is a `@Nested` test class.
 * The `IndicativeSentences` `DisplayNameGenerator` no longer includes the display name of
   the enclosing class when generating an _indicative sentence_ if the enclosing class is
   not configured to use the `IndicativeSentences` display name generator as well.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
index b9cb2ffbda2f..f12a81923bd1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
@@ -25,9 +25,14 @@
  * {@code @DisplayNameGeneration} is used to declare a custom display name
  * generator for the annotated test class.
  *
+ * <p>This annotation is <em>inherited</em> from superclasses and implemented
+ * interfaces. It is also inherited from {@linkplain Class#getEnclosingClass()
+ * enclosing classes} for {@link Nested @Nested} test classes.
+ *
  * @since 5.4
  * @see DisplayName
  * @see DisplayNameGenerator
+ * @see IndicativeSentencesGeneration
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 4aa6206f26fe..58a5038b162e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -13,14 +13,13 @@
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.commons.support.ModifierSupport.isStatic;
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Optional;
 import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
-import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -228,7 +227,7 @@ public String generateDisplayNameForMethod(Class<?> testClass, Method testMethod
 		private String getSentenceBeginning(Class<?> testClass) {
 			Class<?> enclosingClass = testClass.getEnclosingClass();
 			boolean topLevelTestClass = (enclosingClass == null || isStatic(testClass));
-			Optional<String> displayName = AnnotationSupport.findAnnotation(testClass, DisplayName.class)//
+			Optional<String> displayName = findAnnotation(testClass, DisplayName.class)//
 					.map(DisplayName::value).map(String::trim);
 
 			if (topLevelTestClass) {
@@ -305,7 +304,7 @@ private static DisplayNameGenerator getGeneratorFor(Class<?> testClass) {
 		 * @return an {@code Optional} containing the annotation, potentially empty if not found
 		 */
 		private static Optional<DisplayNameGeneration> findDisplayNameGeneration(Class<?> testClass) {
-			return findAnnotation(testClass, DisplayNameGeneration.class);
+			return findAnnotation(testClass, DisplayNameGeneration.class, true);
 		}
 
 		/**
@@ -317,31 +316,7 @@ private static Optional<DisplayNameGeneration> findDisplayNameGeneration(Class<?
 		 * @return an {@code Optional} containing the annotation, potentially empty if not found
 		 */
 		private static Optional<IndicativeSentencesGeneration> findIndicativeSentencesGeneration(Class<?> testClass) {
-			return findAnnotation(testClass, IndicativeSentencesGeneration.class);
-		}
-
-		/**
-		 * Find the first annotation of the specified type that is either
-		 * <em>directly present</em>, <em>meta-present</em>, or <em>indirectly
-		 * present</em> on the supplied {@code testClass} or on an enclosing class.
-		 *
-		 * @param <A> the annotation type
-		 * @param testClass the test class on which to search for the annotation;
-		 * never {@code null}
-		 * @param annotationType the annotation type to search for; never {@code null}
-		 * @return an {@code Optional} containing the annotation; never {@code null} but
-		 * potentially empty
-		 */
-		private static <A extends Annotation> Optional<A> findAnnotation(Class<?> testClass, Class<A> annotationType) {
-			Class<?> candidate = testClass;
-			do {
-				Optional<A> annotation = AnnotationSupport.findAnnotation(candidate, annotationType);
-				if (annotation.isPresent()) {
-					return annotation;
-				}
-				candidate = candidate.getEnclosingClass();
-			} while (candidate != null);
-			return Optional.empty();
+			return findAnnotation(testClass, IndicativeSentencesGeneration.class, true);
 		}
 
 		private static Predicate<Class<?>> not(Class<?> clazz) {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
index 183fb8c6dd15..a3ded3df9de9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
@@ -32,10 +32,15 @@
  * {@code @IndicativeSentencesGeneration} or {@code @IndicativeSentencesGeneration()}
  * &mdash; the default configuration will be used.
  *
+ * <p>This annotation is <em>inherited</em> from superclasses and implemented
+ * interfaces. It is also inherited from {@linkplain Class#getEnclosingClass()
+ * enclosing classes} for {@link Nested @Nested} test classes.
+ *
  * @since 5.7
  * @see DisplayName
  * @see DisplayNameGenerator
  * @see DisplayNameGenerator.IndicativeSentences
+ * @see DisplayNameGeneration
  */
 @DisplayNameGeneration(IndicativeSentences.class)
 @Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE })
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
index 549fd19b57f5..10ee9652776e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -27,6 +27,7 @@
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
+import org.junit.platform.commons.util.AnnotationUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.commons.util.StringUtils;
@@ -106,7 +107,7 @@ private static DisplayNameGenerator getDisplayNameGenerator(Class<?> testClass,
 			JupiterConfiguration configuration) {
 		Preconditions.notNull(testClass, "Test class must not be null");
 
-		return getDisplayNameGeneration(testClass) //
+		return AnnotationUtils.findAnnotation(testClass, DisplayNameGeneration.class, true) //
 				.map(DisplayNameGeneration::value) //
 				.map(displayNameGeneratorClass -> {
 					if (displayNameGeneratorClass == Standard.class) {
@@ -126,21 +127,4 @@ private static DisplayNameGenerator getDisplayNameGenerator(Class<?> testClass,
 				.orElseGet(configuration::getDefaultDisplayNameGenerator);
 	}
 
-	/**
-	 * Find the first {@code DisplayNameGeneration} annotation that is either
-	 * <em>directly present</em>, <em>meta-present</em>, or <em>indirectly present</em>
-	 * on the supplied {@code testClass} or on an enclosing class.
-	 */
-	private static Optional<DisplayNameGeneration> getDisplayNameGeneration(Class<?> testClass) {
-		Class<?> candidate = testClass;
-		do {
-			Optional<DisplayNameGeneration> generation = findAnnotation(candidate, DisplayNameGeneration.class);
-			if (generation.isPresent()) {
-				return generation;
-			}
-			candidate = candidate.getEnclosingClass();
-		} while (candidate != null);
-		return Optional.empty();
-	}
-
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
new file mode 100644
index 000000000000..ee990808595e
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
+
+/**
+ * @since 5.8
+ */
+@DisplayNameGeneration(ReplaceUnderscores.class)
+class DisplayNameGenerationInheritanceTestCase {
+
+	@Nested
+	class InnerNestedTestCase {
+
+		@Test
+		void this_is_a_test() {
+		}
+	}
+
+	static class StaticNestedTestCase {
+
+		@Test
+		void this_is_a_test() {
+		}
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
index ba748df29eff..eff86d0a759b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
@@ -10,10 +10,9 @@
 
 package org.junit.jupiter.api;
 
-import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
@@ -21,7 +20,6 @@
 
 import java.lang.reflect.Method;
 import java.util.EmptyStackException;
-import java.util.List;
 import java.util.Stack;
 
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
@@ -39,7 +37,7 @@ class DisplayNameGenerationTests extends AbstractJupiterTestEngineTests {
 
 	@Test
 	void standardGenerator() {
-		check(DefaultStyleTestCase.class, List.of( //
+		check(DefaultStyleTestCase.class, //
 			"CONTAINER: DisplayNameGenerationTests$DefaultStyleTestCase", //
 			"TEST: @DisplayName prevails", //
 			"TEST: test()", //
@@ -48,12 +46,12 @@ void standardGenerator() {
 			"TEST: testUsingCamelCase_and_also_UnderScores()", //
 			"TEST: testUsingCamelCase_and_also_UnderScores_keepingParameterTypeNamesIntact(TestInfo)", //
 			"TEST: test_with_underscores()" //
-		));
+		);
 	}
 
 	@Test
 	void simpleGenerator() {
-		check(SimpleStyleTestCase.class, List.of( //
+		check(SimpleStyleTestCase.class, //
 			"CONTAINER: DisplayNameGenerationTests$SimpleStyleTestCase", //
 			"TEST: @DisplayName prevails", //
 			"TEST: test", //
@@ -62,28 +60,32 @@ void simpleGenerator() {
 			"TEST: testUsingCamelCase_and_also_UnderScores", //
 			"TEST: testUsingCamelCase_and_also_UnderScores_keepingParameterTypeNamesIntact (TestInfo)", //
 			"TEST: test_with_underscores" //
-		));
+		);
 	}
 
 	@Test
 	void underscoreGenerator() {
-		var expectedDisplayNames = List.of( //
-			"CONTAINER: DisplayNameGenerationTests\\$UnderscoreStyle.*", //
-			"TEST: @DisplayName prevails", //
-			"TEST: test", //
-			"TEST: test (TestInfo)", //
-			"TEST: test with underscores", //
-			"TEST: testUsingCamelCase and also UnderScores", //
-			"TEST: testUsingCamelCase and also UnderScores keepingParameterTypeNamesIntact (TestInfo)", //
-			"TEST: testUsingCamelCaseStyle" //
-		);
+		var expectedDisplayNames = new String[] { //
+				"<replace me>", //
+				"TEST: @DisplayName prevails", //
+				"TEST: test", //
+				"TEST: test (TestInfo)", //
+				"TEST: test with underscores", //
+				"TEST: testUsingCamelCase and also UnderScores", //
+				"TEST: testUsingCamelCase and also UnderScores keepingParameterTypeNamesIntact (TestInfo)", //
+				"TEST: testUsingCamelCaseStyle" //
+		};
+
+		expectedDisplayNames[0] = "CONTAINER: DisplayNameGenerationTests$UnderscoreStyleTestCase";
 		check(UnderscoreStyleTestCase.class, expectedDisplayNames);
+
+		expectedDisplayNames[0] = "CONTAINER: DisplayNameGenerationTests$UnderscoreStyleInheritedFromSuperClassTestCase";
 		check(UnderscoreStyleInheritedFromSuperClassTestCase.class, expectedDisplayNames);
 	}
 
 	@Test
 	void indicativeSentencesGeneratorOnStaticNestedClass() {
-		var expectedDisplayNames = List.of( //
+		check(IndicativeStyleTestCase.class, //
 			"CONTAINER: DisplayNameGenerationTests$IndicativeStyleTestCase", //
 			"TEST: @DisplayName prevails", //
 			"TEST: DisplayNameGenerationTests$IndicativeStyleTestCase -> test", //
@@ -93,32 +95,29 @@ void indicativeSentencesGeneratorOnStaticNestedClass() {
 			"TEST: DisplayNameGenerationTests$IndicativeStyleTestCase -> testUsingCamelCase and also UnderScores keepingParameterTypeNamesIntact (TestInfo)", //
 			"TEST: DisplayNameGenerationTests$IndicativeStyleTestCase -> testUsingCamelCaseStyle" //
 		);
-		check(IndicativeStyleTestCase.class, expectedDisplayNames);
 	}
 
 	@Test
 	void indicativeSentencesGeneratorOnTopLevelClass() {
-		var expectedDisplayNames = List.of( //
+		check(IndicativeSentencesTopLevelTestCase.class, //
 			"CONTAINER: IndicativeSentencesTopLevelTestCase", //
 			"CONTAINER: IndicativeSentencesTopLevelTestCase -> A year is a leap year", //
 			"TEST: IndicativeSentencesTopLevelTestCase -> A year is a leap year -> if it is divisible by 4 but not by 100" //
 		);
-		check(IndicativeSentencesTopLevelTestCase.class, expectedDisplayNames);
 	}
 
 	@Test
 	void indicativeSentencesGeneratorOnNestedClass() {
-		var expectedDisplayNames = List.of( //
-			"CONTAINER: A year is a leap year", //
+		check(IndicativeSentencesNestedTestCase.class, //
 			"CONTAINER: IndicativeSentencesNestedTestCase", //
+			"CONTAINER: A year is a leap year", //
 			"TEST: A year is a leap year -> if it is divisible by 4 but not by 100" //
 		);
-		check(IndicativeSentencesNestedTestCase.class, expectedDisplayNames);
 	}
 
 	@Test
 	void noNameGenerator() {
-		check(NoNameStyleTestCase.class, List.of( //
+		check(NoNameStyleTestCase.class, //
 			"CONTAINER: nn", //
 			"TEST: @DisplayName prevails", //
 			"TEST: nn", //
@@ -127,54 +126,81 @@ void noNameGenerator() {
 			"TEST: nn", //
 			"TEST: nn", //
 			"TEST: nn" //
-		));
+		);
 	}
 
 	@Test
 	void checkDisplayNameGeneratedForTestingAStackDemo() {
-		check(StackTestCase.class, List.of( //
-			"CONTAINER: A new stack", //
+		check(StackTestCase.class, //
 			"CONTAINER: A stack", //
-			"CONTAINER: After pushing an element to an empty stack", //
-			"TEST: is empty", //
 			"TEST: is instantiated using its noarg constructor", //
+			"CONTAINER: A new stack", //
+			"TEST: throws an EmptyStackException when peeked", //
+			"TEST: throws an EmptyStackException when popped", //
+			"TEST: is empty", //
+			"CONTAINER: After pushing an element to an empty stack", //
 			"TEST: peek returns that element without removing it from the stack", //
 			"TEST: pop returns that element and leaves an empty stack", //
-			"TEST: the stack is no longer empty", //
-			"TEST: throws an EmptyStackException when peeked", //
-			"TEST: throws an EmptyStackException when popped" //
-		));
+			"TEST: the stack is no longer empty" //
+		);
 	}
 
 	@Test
 	void checkDisplayNameGeneratedForIndicativeGeneratorTestCase() {
-		check(IndicativeGeneratorTestCase.class, List.of( //
+		check(IndicativeGeneratorTestCase.class, //
 			"CONTAINER: A stack", //
+			"TEST: A stack, is instantiated with new constructor", //
 			"CONTAINER: A stack, when new", //
+			"TEST: A stack, when new, throws EmptyStackException when peeked", //
 			"CONTAINER: A stack, when new, after pushing an element to an empty stack", //
-			"TEST: A stack, is instantiated with new constructor", //
-			"TEST: A stack, when new, after pushing an element to an empty stack, is no longer empty", //
-			"TEST: A stack, when new, throws EmptyStackException when peeked" //
-		));
+			"TEST: A stack, when new, after pushing an element to an empty stack, is no longer empty" //
+		);
 	}
 
 	@Test
 	void checkDisplayNameGeneratedForIndicativeGeneratorWithCustomSeparatorTestCase() {
-		check(IndicativeGeneratorWithCustomSeparatorTestCase.class, List.of( //
+		check(IndicativeGeneratorWithCustomSeparatorTestCase.class, //
 			"CONTAINER: A stack", //
+			"TEST: A stack >> is instantiated with new constructor", //
 			"CONTAINER: A stack >> when new", //
+			"TEST: A stack >> when new >> throws EmptyStackException when peeked", //
 			"CONTAINER: A stack >> when new >> after pushing an element to an empty stack", //
-			"TEST: A stack >> is instantiated with new constructor", //
-			"TEST: A stack >> when new >> after pushing an element to an empty stack >> is no longer empty", //
-			"TEST: A stack >> when new >> throws EmptyStackException when peeked"//
-		));
+			"TEST: A stack >> when new >> after pushing an element to an empty stack >> is no longer empty" //
+		);
+	}
+
+	@Test
+	void displayNameGenerationInheritance() {
+		check(DisplayNameGenerationInheritanceTestCase.InnerNestedTestCase.class, //
+			"CONTAINER: DisplayNameGenerationInheritanceTestCase", //
+			"CONTAINER: InnerNestedTestCase", //
+			"TEST: this is a test"//
+		);
+
+		check(DisplayNameGenerationInheritanceTestCase.StaticNestedTestCase.class, //
+			"CONTAINER: DisplayNameGenerationInheritanceTestCase$StaticNestedTestCase", //
+			"TEST: this_is_a_test()"//
+		);
+	}
+
+	@Test
+	void indicativeSentencesGenerationInheritance() {
+		check(IndicativeSentencesGenerationInheritanceTestCase.InnerNestedTestCase.class, //
+			"CONTAINER: IndicativeSentencesGenerationInheritanceTestCase", //
+			"CONTAINER: IndicativeSentencesGenerationInheritanceTestCase -> InnerNestedTestCase", //
+			"TEST: IndicativeSentencesGenerationInheritanceTestCase -> InnerNestedTestCase -> this is a test"//
+		);
+
+		check(IndicativeSentencesGenerationInheritanceTestCase.StaticNestedTestCase.class, //
+			"CONTAINER: IndicativeSentencesGenerationInheritanceTestCase$StaticNestedTestCase", //
+			"TEST: this_is_a_test()"//
+		);
 	}
 
-	private void check(Class<?> testClass, List<String> expectedDisplayNames) {
+	private void check(Class<?> testClass, String... expectedDisplayNames) {
 		var request = request().selectors(selectClass(testClass)).build();
 		var descriptors = discoverTests(request).getDescendants();
-		var sortedNames = descriptors.stream().map(this::describe).sorted().collect(toList());
-		assertLinesMatch(expectedDisplayNames, sortedNames);
+		assertThat(descriptors).map(this::describe).containsExactlyInAnyOrder(expectedDisplayNames);
 	}
 
 	private String describe(TestDescriptor descriptor) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java
new file mode 100644
index 000000000000..5ade3aa36db5
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
+
+/**
+ * @since 5.8
+ */
+@IndicativeSentencesGeneration(separator = " -> ", generator = ReplaceUnderscores.class)
+class IndicativeSentencesGenerationInheritanceTestCase {
+
+	@Nested
+	class InnerNestedTestCase {
+
+		@Test
+		void this_is_a_test() {
+		}
+	}
+
+	static class StaticNestedTestCase {
+
+		@Test
+		void this_is_a_test() {
+		}
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
index 018cd5255a08..a1790bdd27a9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
@@ -17,6 +17,7 @@
  * that is nested directly within a top-level test class.
  *
  * @see IndicativeSentencesTopLevelTestCase
+ * @since 5.8
  */
 class IndicativeSentencesNestedTestCase {
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
index 03fd754bb00f..9e27bd45efa7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
@@ -17,6 +17,7 @@
  * test class that contains a nested test class.
  *
  * @see IndicativeSentencesNestedTestCase
+ * @since 5.8
  */
 @IndicativeSentencesGeneration(separator = " -> ", generator = ReplaceUnderscores.class)
 class IndicativeSentencesTopLevelTestCase {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
index 4ee8a5ee6e8b..40166e222ff7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
@@ -10,13 +10,14 @@
 
 package org.junit.jupiter.engine.discovery;
 
+import static org.junit.platform.commons.util.ReflectionUtils.isInnerClass;
+
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
 import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
 import org.junit.jupiter.engine.descriptor.NestedClassTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestFactoryTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestTemplateTestDescriptor;
-import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.engine.UniqueId;
 
 /**
@@ -30,7 +31,7 @@ public class JupiterUniqueIdBuilder {
 
 	public static UniqueId uniqueIdForClass(Class<?> clazz) {
 		UniqueId containerId = engineId();
-		if (clazz.getEnclosingClass() != null && !ReflectionUtils.isStatic(clazz)) {
+		if (isInnerClass(clazz)) {
 			containerId = uniqueIdForClass(clazz.getEnclosingClass());
 			return containerId.append(NestedClassTestDescriptor.SEGMENT_TYPE, clazz.getSimpleName());
 		}
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
index cab0dd7357bb..849b12d85dcd 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
@@ -13,6 +13,7 @@
 import static java.util.Arrays.asList;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
+import static org.junit.platform.commons.util.ReflectionUtils.isInnerClass;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Inherited;
@@ -183,6 +184,45 @@ private static <A extends Annotation> Optional<A> findMetaAnnotation(Class<A> an
 		return Optional.empty();
 	}
 
+	/**
+	 * Find the first annotation of the specified type that is either
+	 * <em>directly present</em>, <em>meta-present</em>, or <em>indirectly
+	 * present</em> on the supplied class, optionally searching recursively
+	 * through the enclosing class hierarchy if not found on the supplied class.
+	 *
+	 * <p>The enclosing class hierarchy will only be searched above an <em>inner
+	 * class</em> (i.e., a non-static member class).
+	 *
+	 * @param <A> the annotation type
+	 * @param clazz the class on which to search for the annotation; may be {@code null}
+	 * @param annotationType the annotation type to search for; never {@code null}
+	 * @param searchEnclosingClasses whether the enclosing class hierarchy should
+	 * be searched
+	 * @return an {@code Optional} containing the annotation; never {@code null} but
+	 * potentially empty
+	 * @since 1.8
+	 * @see #findAnnotation(AnnotatedElement, Class)
+	 */
+	public static <A extends Annotation> Optional<A> findAnnotation(Class<?> clazz, Class<A> annotationType,
+			boolean searchEnclosingClasses) {
+
+		Preconditions.notNull(annotationType, "annotationType must not be null");
+
+		if (!searchEnclosingClasses) {
+			return findAnnotation(clazz, annotationType);
+		}
+
+		Class<?> candidate = clazz;
+		while (candidate != null) {
+			Optional<A> annotation = findAnnotation(candidate, annotationType);
+			if (annotation.isPresent()) {
+				return annotation;
+			}
+			candidate = (isInnerClass(candidate) ? candidate.getEnclosingClass() : null);
+		}
+		return Optional.empty();
+	}
+
 	/**
 	 * @since 1.5
 	 * @see org.junit.platform.commons.support.AnnotationSupport#findRepeatableAnnotations(Optional, Class)

From 5bc261a563c1cf1f8687b38949aee85be4650f10 Mon Sep 17 00:00:00 2001
From: kriegfrj <fr.jkrieg@greekwelfaresa.org.au>
Date: Tue, 15 Jun 2021 12:05:21 +0930
Subject: [PATCH 0375/1433] [osgi] Optionally import org.apiguardian.api

Fixes #2547.
---
 buildSrc/settings.gradle.kts                     |  8 +++++++-
 .../src/main/kotlin/osgi-conventions.gradle.kts  | 16 ++++++++++++++--
 .../junit-jupiter-migrationsupport.gradle.kts    |  2 +-
 .../junit-platform-console-standalone.gradle.kts |  2 +-
 .../junit-platform-runner.gradle.kts             |  2 +-
 .../junit-vintage-engine.gradle.kts              |  2 +-
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 44425d9c15fc..8e6efa3d0060 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -1 +1,7 @@
-// intentionally left blank
+dependencyResolutionManagement {
+	versionCatalogs {
+		create("libs") {
+			from(files("../gradle/libs.versions.toml"))
+		}
+	}
+}
diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index c32c58f100ac..48200104953e 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -6,6 +6,12 @@ plugins {
 	`java-library`
 }
 
+// Because the current build version of apiguardian (1.1.1) doesn't have OSGi metadata, bnd
+// cannot automatically determine the correct version to use in the Import-Package statement.
+// Fetch the current version out of the libs.versions.toml file.
+val apiguardianVersion = project.extensions.getByType(VersionCatalogsExtension::class).named("libs").findVersion("apiguardian").get()
+val importAPIGuardian = "org.apiguardian.*;version=\"\${range;[==,+);${apiguardianVersion}}\";resolution:=\"optional\""
+
 // This task enhances `jar` and `shadowJar` tasks with the bnd
 // `BundleTaskConvention` convention which allows for generating OSGi
 // metadata into the jar
@@ -14,6 +20,8 @@ tasks.withType<Jar>().matching {
 }.configureEach {
 	val btc = BundleTaskConvention(this)
 
+	extra["importAPIGuardian"] = importAPIGuardian
+
 	// These are bnd instructions necessary for generating OSGi metadata.
 	// We've generalized these so that they are widely applicable limiting
 	// module configurations to special cases.
@@ -28,14 +36,15 @@ tasks.withType<Jar>().matching {
 
 			# These are the general rules for package imports.
 			Import-Package: \
-				!org.apiguardian.api,\
+				${importAPIGuardian},\
 				org.junit.platform.commons.logging;status=INTERNAL,\
 				kotlin.*;resolution:="optional",\
 				*
 
 			# This tells bnd not to complain if a module doesn't actually import
-			# the kotlin packages, but enough modules do to make it a default.
+			# the kotlin and apiguardian packages, but enough modules do to make it a default.
 			-fixupmessages.kotlin.import: "Unused Import-Package instructions: \\[kotlin.*\\]";is:=ignore
+			-fixupmessages.apiguardian.import: "Unused Import-Package instructions: \\[org.apiguardian.*\\]";is:=ignore
 
 			# This tells bnd to ignore classes it finds in `META-INF/versions/`
 			# because bnd doesn't yet support multi-release jars.
@@ -81,6 +90,9 @@ val osgiProperties by tasks.registering(WriteProperties::class) {
 	}
 	property("-runrequires", "osgi.identity;filter:='(osgi.identity=${project.name})'")
 	property("-runsystempackages", "jdk.internal.misc,jdk.jfr,sun.misc")
+	// API Guardian should be optional -> instruct resolver to ignore it
+	// during resolution. Resolve should still pass.
+	property("-runblacklist", "org.apiguardian.api")
 }
 
 val osgiVerification by configurations.creating {
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index 4f778d0298a6..16e74f7f3669 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -25,7 +25,7 @@ tasks.jar {
 		bnd("""
 			# Import JUnit4 packages with a version
 			Import-Package: \
-				!org.apiguardian.api,\
+				${extra["importAPIGuardian"]},\
 				org.junit;version="[${libs.versions.junit4Min.get()},5)",\
 				org.junit.platform.commons.logging;status=INTERNAL,\
 				org.junit.rules;version="[${libs.versions.junit4Min.get()},5)",\
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index efd599163243..01131a6f8938 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -44,7 +44,7 @@ tasks {
 			bnd("""
 				# Customize the imports because this is an aggregate jar
 				Import-Package: \
-					!org.apiguardian.api,\
+					${extra["importAPIGuardian"]},\
 					kotlin.*;resolution:="optional",\
 					*
 				# Disable the APIGuardian plugin since everything was already
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index 9a12966b91b5..e0af2ebd308d 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -25,7 +25,7 @@ tasks.jar {
 		bnd("""
 			# Import JUnit4 packages with a version
 			Import-Package: \
-				!org.apiguardian.api,\
+				${extra["importAPIGuardian"]},\
 				org.junit.platform.commons.logging;status=INTERNAL,\
 				org.junit.runner.*;version="[${libs.versions.junit4Min.get()},5)",\
 				*
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 334567d2ea02..38a4c66b1e46 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -38,7 +38,7 @@ tasks {
 			bnd("""
 				# Import JUnit4 packages with a version
 				Import-Package: \
-					!org.apiguardian.api,\
+					${extra["importAPIGuardian"]},\
 					junit.runner;version="[${junit4Min},5)",\
 					org.junit;version="[${junit4Min},5)",\
 					org.junit.experimental.categories;version="[${junit4Min},5)",\

From 55721b258a0d64505dc4fc65f8a98cbabc2f0868 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 19 Jun 2021 15:22:54 +0200
Subject: [PATCH 0376/1433] Upgradle to 7.1

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 59203 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18435
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
B8dv}T

delta 17845
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
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0bd36ab9ea74..234b6472e12a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=caa8e323577de2fa421b47dded5278e7376c2bb6420221fbaf7908dfa9be8657
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-rc-2-bin.zip
+distributionSha256Sum=2debee19271e1b82c6e41137d78e44e6e841035230a1a169ca47fd3fb09ed87b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c811f..744e882ed572 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

From ae607de17eb4bf1b863522978d8e574410bf74f7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 19 Jun 2021 15:23:04 +0200
Subject: [PATCH 0377/1433] Update Test Distribution Gradle plugin

---
 buildSrc/build.gradle.kts | 3 ++-
 settings.gradle.kts       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ffec97504145..9a84ede1f267 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
+	maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 }
 
 dependencies {
@@ -14,7 +15,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1-rc-2")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 59f7604a2f9a..59565f570d24 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.6.2"
-		id("com.gradle.enterprise.test-distribution") version "2.1.1-rc-1"
+		id("com.gradle.enterprise.test-distribution") version "2.1.1-rc-2"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"

From 931ecaa04c4181612284b70b267e320e1cb1b787 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 20 Jun 2021 10:45:33 +0200
Subject: [PATCH 0378/1433] Configure release for Groovy compilation tasks as
 well

---
 .../kotlin/java-library-conventions.gradle.kts   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index b191ea2905bb..e26140159719 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -279,12 +279,20 @@ afterEvaluate {
 	}
 	pluginManager.withPlugin("groovy") {
 		tasks.named<GroovyCompile>("compileGroovy").configure {
-			sourceCompatibility = extension.mainJavaVersion.majorVersion
-			targetCompatibility = extension.mainJavaVersion.majorVersion
+			if (extension.configureRelease) {
+				options.release.set(extension.mainJavaVersion.majorVersion.toInt())
+			} else {
+				sourceCompatibility = extension.mainJavaVersion.majorVersion
+				targetCompatibility = extension.mainJavaVersion.majorVersion
+			}
 		}
 		tasks.named<GroovyCompile>("compileTestGroovy").configure {
-			sourceCompatibility = extension.testJavaVersion.majorVersion
-			targetCompatibility = extension.testJavaVersion.majorVersion
+			if (extension.configureRelease) {
+				options.release.set(extension.testJavaVersion.majorVersion.toInt())
+			} else {
+				sourceCompatibility = extension.testJavaVersion.majorVersion
+				targetCompatibility = extension.testJavaVersion.majorVersion
+			}
 		}
 	}
 }

From c5ee49d1347bdab01b7e72d6aa61a0e3c1a9065b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 20 Jun 2021 11:03:04 +0200
Subject: [PATCH 0379/1433] Reduce scope of API Guardian for downstream Gradle
 projects

---
 documentation/documentation.gradle.kts                     | 3 +++
 .../asciidoc/release-notes/release-notes-5.8.0-M2.adoc     | 7 +++++++
 junit-jupiter-api/junit-jupiter-api.gradle.kts             | 3 ++-
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts       | 3 ++-
 .../junit-jupiter-migrationsupport.gradle.kts              | 3 ++-
 junit-jupiter-params/junit-jupiter-params.gradle.kts       | 3 ++-
 junit-platform-commons/junit-platform-commons.gradle.kts   | 3 ++-
 .../junit-platform-console-standalone.gradle.kts           | 3 +++
 junit-platform-console/junit-platform-console.gradle.kts   | 3 ++-
 junit-platform-engine/junit-platform-engine.gradle.kts     | 3 ++-
 junit-platform-jfr/junit-platform-jfr.gradle.kts           | 3 ++-
 junit-platform-launcher/junit-platform-launcher.gradle.kts | 3 ++-
 .../junit-platform-reporting.gradle.kts                    | 3 ++-
 junit-platform-runner/junit-platform-runner.gradle.kts     | 3 ++-
 .../junit-platform-suite-api.gradle.kts                    | 3 ++-
 .../junit-platform-suite-commons.gradle.kts                | 3 ++-
 .../junit-platform-suite-engine.gradle.kts                 | 3 ++-
 junit-platform-testkit/junit-platform-testkit.gradle.kts   | 3 ++-
 junit-vintage-engine/junit-vintage-engine.gradle.kts       | 3 ++-
 19 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index ed8a0096740a..49933ca367f8 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -44,6 +44,9 @@ dependencies {
 
 	testImplementation(projects.junitVintageEngine)
 	testRuntimeOnly(libs.bundles.log4j)
+	testRuntimeOnly(libs.apiguardian) {
+		because("it's required to generate API tables")
+	}
 
 	testImplementation(libs.classgraph) {
 		because("ApiReportGenerator needs it")
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 5c08cbc6af05..40808ef95315 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -10,6 +10,13 @@ link:{junit5-repo}+/milestone/55?closed=1+[5.8 M2] milestone page in the JUnit r
 on GitHub.
 
 
+[[release-notes-5.8.0-M2-general-improvements]]
+=== General improvements
+
+* The API Guardian dependency is now exported as a compile-only dependency for consuming
+  Gradle projects.
+
+
 [[release-notes-5.8.0-M2-junit-platform]]
 === JUnit Platform
 
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index 8e8e39ac6ea6..a356601ca00b 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -7,9 +7,10 @@ description = "JUnit Jupiter API"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(libs.opentest4j)
 	api(projects.junitPlatformCommons)
 
+	compileOnlyApi(libs.apiguardian)
+
 	compileOnly(kotlin("stdlib"))
 }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 33a01b5bbfb4..e3cf2f0d363e 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -11,10 +11,11 @@ description = "JUnit Jupiter Engine"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformEngine)
 	api(projects.junitJupiterApi)
 
+	compileOnlyApi(libs.apiguardian)
+
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformRunner)
 	testImplementation(projects.junitPlatformTestkit)
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index 16e74f7f3669..4004620a5992 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -11,9 +11,10 @@ description = "JUnit Jupiter Migration Support"
 dependencies {
 	api(platform(projects.junitBom))
 	api(libs.junit4)
-	api(libs.apiguardian)
 	api(projects.junitJupiterApi)
 
+	compileOnlyApi(libs.apiguardian)
+
 	testImplementation(projects.junitJupiterEngine)
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformRunner)
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index e52ed31bfceb..54f37c90dc81 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -8,9 +8,10 @@ description = "JUnit Jupiter Params"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitJupiterApi)
 
+	compileOnlyApi(libs.apiguardian)
+
 	shadowed(libs.univocity.parsers)
 
 	testImplementation(projects.junitPlatformTestkit)
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 80582cdf3f2a..54ffb5efc50e 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -9,7 +9,8 @@ description = "JUnit Platform Commons"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
+
+	compileOnlyApi(libs.apiguardian)
 }
 
 tasks.jar {
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 01131a6f8938..02853dcc3c56 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -13,6 +13,9 @@ dependencies {
 	shadowed(projects.junitJupiterEngine)
 	shadowed(projects.junitJupiterParams)
 	shadowed(projects.junitVintageEngine)
+	shadowed(libs.apiguardian) {
+		because("downstream projects need it to avoid compiler warnings")
+	}
 }
 
 val jupiterVersion = rootProject.version
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 6f4561ee0192..04c96ed4c342 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -9,9 +9,10 @@ description = "JUnit Platform Console"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformReporting)
 
+	compileOnlyApi(libs.apiguardian)
+
 	shadowed(libs.picocli)
 }
 
diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
index 8d1a06e2f51c..3c0d77c5cf6c 100644
--- a/junit-platform-engine/junit-platform-engine.gradle.kts
+++ b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -7,9 +7,10 @@ description = "JUnit Platform Engine API"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(libs.opentest4j)
 	api(projects.junitPlatformCommons)
 
+	compileOnlyApi(libs.apiguardian)
+
 	testImplementation(libs.assertj)
 }
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index 9d4b613ad3bc..a821de7bc484 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -6,8 +6,9 @@ description = "JUnit Platform Flight Recorder Support"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformLauncher)
+
+	compileOnlyApi(libs.apiguardian)
 }
 
 javaLibrary {
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
index a80a02901aac..0a154bef093d 100644
--- a/junit-platform-launcher/junit-platform-launcher.gradle.kts
+++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -7,6 +7,7 @@ description = "JUnit Platform Launcher"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformEngine)
+
+	compileOnlyApi(libs.apiguardian)
 }
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index 3b33528cbe97..de71c0c576ad 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -6,6 +6,7 @@ description = "JUnit Platform Reporting"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformLauncher)
+
+	compileOnlyApi(libs.apiguardian)
 }
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index e0af2ebd308d..dab2224f84a7 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -10,10 +10,11 @@ description = "JUnit Platform Runner"
 dependencies {
 	api(platform(projects.junitBom))
 	api(libs.junit4)
-	api(libs.apiguardian)
 	api(projects.junitPlatformLauncher)
 	api(projects.junitPlatformSuiteApi)
 
+	compileOnlyApi(libs.apiguardian)
+
 	implementation(projects.junitPlatformSuiteCommons)
 
 	testImplementation(testFixtures(projects.junitPlatformEngine))
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
index 84011b85987a..416e7cdbdf2b 100644
--- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
+++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -6,8 +6,9 @@ description = "JUnit Platform Suite API"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformCommons)
 
+	compileOnlyApi(libs.apiguardian)
+
 	osgiVerification(projects.junitPlatformCommons)
 }
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 63b089a7cb56..9dcffb8467d3 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -6,9 +6,10 @@ description = "JUnit Platform Suite Commons"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformLauncher)
 
+	compileOnlyApi(libs.apiguardian)
+
 	implementation(projects.junitPlatformEngine)
 	implementation(projects.junitPlatformSuiteApi)
 }
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index 3471aada3f72..e5b737fd6b89 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -6,9 +6,10 @@ description = "JUnit Platform Suite Engine"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformEngine)
 	api(projects.junitPlatformSuiteApi)
 
+	compileOnlyApi(libs.apiguardian)
+
 	implementation(projects.junitPlatformSuiteCommons)
 }
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
index d3b45822f96d..8b5ecf9a1eb7 100644
--- a/junit-platform-testkit/junit-platform-testkit.gradle.kts
+++ b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -6,8 +6,9 @@ description = "JUnit Platform Test Kit"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(libs.assertj)
 	api(libs.opentest4j)
 	api(projects.junitPlatformLauncher)
+
+	compileOnlyApi(libs.apiguardian)
 }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 38a4c66b1e46..0cb2a01717cb 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -12,10 +12,11 @@ description = "JUnit Vintage Engine"
 
 dependencies {
 	api(platform(projects.junitBom))
-	api(libs.apiguardian)
 	api(projects.junitPlatformEngine)
 	api(libs.junit4)
 
+	compileOnlyApi(libs.apiguardian)
+
 	testFixturesApi(platform(libs.groovy2.bom))
 	testFixturesApi(libs.spock1)
 	testFixturesImplementation(projects.junitPlatformRunner)

From 620ea0d845e4824ee7bea3e1d0afcd4838ecd76b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 20 Jun 2021 21:27:08 +0200
Subject: [PATCH 0380/1433] Add `assertThrowsExactly` assertion method (#2643)

Resolves #2509.

Co-authored-by: Ihnat <autushka.ihnat@gmail.com>
Co-authored-by: Sam Brannen <sbrannen@pivotal.io>
---
 .../release-notes/release-notes-5.8.0-M2.adoc |   2 +
 .../jupiter/api/AssertThrowsExactly.java      |  74 ++++
 .../org/junit/jupiter/api/Assertions.java     |  58 ++++
 .../AssertThrowsExactlyAssertionsTests.java   | 324 ++++++++++++++++++
 4 files changed, 458 insertions(+)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 40808ef95315..29209f84aaa9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -74,6 +74,8 @@ on GitHub.
   the information available in a `StackTraceElement`.
 * `@TempDir` cleanup resets readable and executable permissions of the root temporary
   directory and any contained directories instead of failing to delete them.
+* New `assertThrowsExactly` method which is a more strict version of `assertThrows`
+  that allows you to assert that the thrown exception has the exact specified class.
 
 
 [[release-notes-5.8.0-M2-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
new file mode 100644
index 000000000000..a2852ed390d1
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
+import static org.junit.jupiter.api.AssertionUtils.format;
+import static org.junit.jupiter.api.AssertionUtils.getCanonicalName;
+import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.function.Executable;
+import org.junit.platform.commons.util.UnrecoverableExceptions;
+import org.opentest4j.AssertionFailedError;
+
+/**
+ * {@code AssertThrowsExactly} is a collection of utility methods that support asserting
+ * an exception of an exact type is thrown.
+ *
+ * @since 5.8
+ */
+class AssertThrowsExactly {
+
+	private AssertThrowsExactly() {
+		/* no-op */
+	}
+
+	static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable) {
+		return assertThrowsExactly(expectedType, executable, (Object) null);
+	}
+
+	static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable, String message) {
+		return assertThrowsExactly(expectedType, executable, (Object) message);
+	}
+
+	static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable,
+			Supplier<String> messageSupplier) {
+
+		return assertThrowsExactly(expectedType, executable, (Object) messageSupplier);
+	}
+
+	@SuppressWarnings("unchecked")
+	private static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable,
+			Object messageOrSupplier) {
+
+		try {
+			executable.execute();
+		}
+		catch (Throwable actualException) {
+			if (expectedType.equals(actualException.getClass())) {
+				return (T) actualException;
+			}
+			else {
+				UnrecoverableExceptions.rethrowIfUnrecoverable(actualException);
+				String message = buildPrefix(nullSafeGet(messageOrSupplier))
+						+ format(expectedType, actualException.getClass(), "Unexpected exception type thrown");
+				throw new AssertionFailedError(message, actualException);
+			}
+		}
+
+		String message = buildPrefix(nullSafeGet(messageOrSupplier))
+				+ String.format("Expected %s to be thrown, but nothing was thrown.", getCanonicalName(expectedType));
+		throw new AssertionFailedError(message);
+	}
+
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 0482e43caf64..2e96dcd06c2b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -3010,6 +3010,64 @@ public static void assertAll(String heading, Stream<Executable> executables) thr
 
 	// --- executable ---
 
+	/**
+	 * <em>Assert</em> that execution of the supplied {@code executable} throws
+	 * an exception of exactly the {@code expectedType} and return the exception.
+	 *
+	 * <p>If no exception is thrown, or if an exception of a different type is
+	 * thrown, this method will fail.
+	 *
+	 * <p>If you do not want to perform additional checks on the exception instance,
+	 * ignore the return value.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	public static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable) {
+		return AssertThrowsExactly.assertThrowsExactly(expectedType, executable);
+	}
+
+	/**
+	 * <em>Assert</em> that execution of the supplied {@code executable} throws
+	 * an exception of exactly the {@code expectedType} and return the exception.
+	 *
+	 * <p>If no exception is thrown, or if an exception of a different type is
+	 * thrown, this method will fail.
+	 *
+	 * <p>If you do not want to perform additional checks on the exception instance,
+	 * ignore the return value.
+	 *
+	 * <p>Fails with the supplied failure {@code message}.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	public static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable,
+			String message) {
+		return AssertThrowsExactly.assertThrowsExactly(expectedType, executable, message);
+	}
+
+	/**
+	 * <em>Assert</em> that execution of the supplied {@code executable} throws
+	 * an exception of exactly the {@code expectedType} and return the exception.
+	 *
+	 * <p>If no exception is thrown, or if an exception of a different type is
+	 * thrown, this method will fail.
+	 *
+	 * <p>If necessary, the failure message will be retrieved lazily from the
+	 * supplied {@code messageSupplier}.
+	 *
+	 * <p>If you do not want to perform additional checks on the exception instance,
+	 * ignore the return value.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	public static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable,
+			Supplier<String> messageSupplier) {
+		return AssertThrowsExactly.assertThrowsExactly(expectedType, executable, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that execution of the supplied {@code executable} throws
 	 * an exception of the {@code expectedType} and return the exception.
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
new file mode 100644
index 000000000000..762c6ce1d9aa
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
@@ -0,0 +1,324 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.junit.jupiter.api.AssertionTestUtils.assertMessageContains;
+import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals;
+import static org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith;
+import static org.junit.jupiter.api.AssertionTestUtils.expectAssertionFailedError;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+
+import org.junit.jupiter.api.function.Executable;
+import org.opentest4j.AssertionFailedError;
+
+/**
+ * Unit tests for JUnit Jupiter {@link Assertions}.
+ *
+ * @since 5.8
+ */
+class AssertThrowsExactlyAssertionsTests {
+
+	private static final Executable nix = () -> {
+	};
+
+	@Test
+	void assertThrowsExactlyTheSpecifiedExceptionClass() {
+		var actual = assertThrowsExactly(EnigmaThrowable.class, (Executable) () -> {
+			throw new EnigmaThrowable();
+		});
+		assertNotNull(actual);
+	}
+
+	@Test
+	void assertThrowsExactlyWithTheExpectedChildException() {
+		try {
+			assertThrowsExactly(RuntimeException.class, (Executable) () -> {
+				throw new Exception();
+			});
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "expected: <java.lang.RuntimeException>");
+			assertMessageContains(ex, "but was: <java.lang.Exception>");
+		}
+	}
+
+	@Test
+	void assertThrowsExactlyWithTheExpectedParentException() {
+		try {
+			assertThrowsExactly(RuntimeException.class, (Executable) () -> {
+				throw new NumberFormatException();
+			});
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "expected: <java.lang.RuntimeException>");
+			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+		}
+	}
+
+	@Test
+	void assertThrowsWithMethodReferenceForNonVoidReturnType() {
+		FutureTask<String> future = new FutureTask<>(() -> {
+			throw new RuntimeException("boom");
+		});
+		future.run();
+
+		ExecutionException exception = assertThrowsExactly(ExecutionException.class, future::get);
+		assertEquals("boom", exception.getCause().getMessage());
+	}
+
+	@Test
+	void assertThrowsWithMethodReferenceForVoidReturnType() {
+		var object = new Object();
+		IllegalMonitorStateException exception;
+
+		exception = assertThrowsExactly(IllegalMonitorStateException.class, object::notify);
+		assertNotNull(exception);
+
+		// Note that Object.wait(...) is an overloaded method with a void return type
+		exception = assertThrowsExactly(IllegalMonitorStateException.class, object::wait);
+		assertNotNull(exception);
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsThrowable() {
+		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, (Executable) () -> {
+			throw new EnigmaThrowable();
+		});
+		assertNotNull(enigmaThrowable);
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsThrowableWithMessage() {
+		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, (Executable) () -> {
+			throw new EnigmaThrowable();
+		}, "message");
+		assertNotNull(enigmaThrowable);
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsThrowableWithMessageSupplier() {
+		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, (Executable) () -> {
+			throw new EnigmaThrowable();
+		}, () -> "message");
+		assertNotNull(enigmaThrowable);
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsCheckedException() {
+		IOException exception = assertThrowsExactly(IOException.class, (Executable) () -> {
+			throw new IOException();
+		});
+		assertNotNull(exception);
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsRuntimeException() {
+		IllegalStateException illegalStateException = assertThrowsExactly(IllegalStateException.class,
+			(Executable) () -> {
+				throw new IllegalStateException();
+			});
+		assertNotNull(illegalStateException);
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsError() {
+		StackOverflowError stackOverflowError = assertThrowsExactly(StackOverflowError.class,
+			(Executable) AssertionTestUtils::recurseIndefinitely);
+		assertNotNull(stackOverflowError);
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatDoesNotThrowAnException() {
+		try {
+			assertThrowsExactly(IllegalStateException.class, nix);
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageEquals(ex, "Expected java.lang.IllegalStateException to be thrown, but nothing was thrown.");
+		}
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatDoesNotThrowAnExceptionWithMessageString() {
+		try {
+			assertThrowsExactly(IOException.class, nix, "Custom message");
+			expectAssertionFailedError();
+		}
+		catch (AssertionError ex) {
+			assertMessageEquals(ex,
+				"Custom message ==> Expected java.io.IOException to be thrown, but nothing was thrown.");
+		}
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatDoesNotThrowAnExceptionWithMessageSupplier() {
+		try {
+			assertThrowsExactly(IOException.class, nix, () -> "Custom message");
+			expectAssertionFailedError();
+		}
+		catch (AssertionError ex) {
+			assertMessageEquals(ex,
+				"Custom message ==> Expected java.io.IOException to be thrown, but nothing was thrown.");
+		}
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsAnUnexpectedException() {
+		try {
+			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+				throw new NumberFormatException();
+			});
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
+			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+		}
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsAnUnexpectedExceptionWithMessageString() {
+		try {
+			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+				throw new NumberFormatException();
+			}, "Custom message");
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			// Should look something like this:
+			// Custom message ==> Unexpected exception type thrown ==> expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
+			assertMessageStartsWith(ex, "Custom message ==> ");
+			assertMessageContains(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
+			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+		}
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsAnUnexpectedExceptionWithMessageSupplier() {
+		try {
+			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+				throw new NumberFormatException();
+			}, () -> "Custom message");
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			// Should look something like this:
+			// Custom message ==> Unexpected exception type thrown ==> expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
+			assertMessageStartsWith(ex, "Custom message ==> ");
+			assertMessageContains(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
+			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+		}
+	}
+
+	@Test
+	@SuppressWarnings("serial")
+	void assertThrowsWithExecutableThatThrowsInstanceOfAnonymousInnerClassAsUnexpectedException() {
+		try {
+			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+				throw new NumberFormatException() {
+				};
+			});
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
+			// As of the time of this writing, the class name of the above anonymous inner
+			// class is org.junit.jupiter.api.AssertThrowsExactlyAssertionsTests$2; however, hard
+			// coding "$2" is fragile. So we just check for the presence of the "$"
+			// appended to this class's name.
+			assertMessageContains(ex, "but was: <" + getClass().getName() + "$");
+		}
+	}
+
+	@Test
+	void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpectedException() {
+		try {
+			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+				throw new LocalException();
+			});
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
+			// The following verifies that the canonical name is used (i.e., "." instead of "$").
+			assertMessageContains(ex, "but was: <" + LocalException.class.getName().replace("$", ".") + ">");
+		}
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoader() throws Exception {
+		try (EnigmaClassLoader enigmaClassLoader = new EnigmaClassLoader()) {
+
+			// Load expected exception type from different class loader
+			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) enigmaClassLoader.loadClass(
+				EnigmaThrowable.class.getName());
+
+			try {
+				assertThrowsExactly(enigmaThrowableClass, (Executable) () -> {
+					throw new EnigmaThrowable();
+				});
+				expectAssertionFailedError();
+			}
+			catch (AssertionFailedError ex) {
+				// Example Output:
+				//
+				// Unexpected exception type thrown ==>
+				// expected: <org.junit.jupiter.api.EnigmaThrowable@5d3411d>
+				// but was: <org.junit.jupiter.api.EnigmaThrowable@2471cca7>
+
+				assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+				// The presence of the "@" sign is sufficient to indicate that the hash was
+				// generated to disambiguate between the two identical class names.
+				assertMessageContains(ex, "expected: <org.junit.jupiter.api.EnigmaThrowable@");
+				assertMessageContains(ex, "but was: <org.junit.jupiter.api.EnigmaThrowable@");
+			}
+		}
+	}
+
+	// -------------------------------------------------------------------------
+
+	@SuppressWarnings("serial")
+	private static class LocalException extends RuntimeException {
+	}
+
+	private static class EnigmaClassLoader extends URLClassLoader {
+
+		EnigmaClassLoader() {
+			super(new URL[] { EnigmaClassLoader.class.getProtectionDomain().getCodeSource().getLocation() },
+				getSystemClassLoader());
+		}
+
+		@Override
+		public Class<?> loadClass(String name) throws ClassNotFoundException {
+			return (EnigmaThrowable.class.getName().equals(name) ? findClass(name) : super.loadClass(name));
+		}
+
+	}
+
+}

From 163e90195c4b20eeb4ecc7a8d8a068539a648d4b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Jun 2021 07:51:21 +0200
Subject: [PATCH 0381/1433] Downgrade Test Distribution plugin to work around
 repo downtime

---
 buildSrc/build.gradle.kts | 3 +--
 gradle.properties         | 1 +
 settings.gradle.kts       | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9a84ede1f267..ffec97504145 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
-	maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 }
 
 dependencies {
@@ -15,7 +14,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1-rc-2")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/gradle.properties b/gradle.properties
index b9157a3889a9..4d6544cce2ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,6 +25,7 @@ org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true
+testDistribution.maxRemoteExecutors=0
 
 # Omit automatic compile dependency on kotlin-stdlib
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 59565f570d24..c8bb438d0e53 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,11 +3,10 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.6.2"
-		id("com.gradle.enterprise.test-distribution") version "2.1.1-rc-2"
+		id("com.gradle.enterprise.test-distribution") version "2.0.3"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"

From 4a9b660b3d7c6de41c728f1e9140cd8fbb682107 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Jun 2021 08:47:38 +0200
Subject: [PATCH 0382/1433] Fix ArchUnitTests

---
 .../platform-tooling-support-tests.gradle.kts                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 7310badca306..926fe366eb5f 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -21,6 +21,9 @@ dependencies {
 	testImplementation(libs.archunit) {
 		because("checking the architecture of JUnit 5")
 	}
+	testImplementation(libs.apiguardian) {
+		because("we validate that public classes are annotated")
+	}
 	testImplementation(libs.groovy3) {
 		because("it provides convenience methods to handle process output")
 	}

From d0017f6618d6bb6f07b38e8d9a315e80e5f917aa Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Jun 2021 20:50:53 +0200
Subject: [PATCH 0383/1433] Use local third-party jars instead of downloading
 them

---
 gradle/libs.versions.toml                     |  1 +
 .../platform-tooling-support-tests.gradle.kts | 19 +++++++----
 .../java/platform/tooling/support/Helper.java | 27 +++------------
 .../tooling/support/ThirdPartyJars.java       | 33 +++++++++++++++++++
 .../support/tests/ModularUserGuideTests.java  | 12 ++++---
 .../support/tests/ToolProviderTests.java      |  5 +--
 6 files changed, 62 insertions(+), 35 deletions(-)
 create mode 100644 platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8514172c2e66..d7cf159a9d5a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,6 +23,7 @@ classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.106" }
 commons-io = { module = "commons-io:commons-io", version = "2.9.0" }
 groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.8" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
+hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "main-SNAPSHOT" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 926fe366eb5f..f0a690733035 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -10,6 +10,8 @@ javaLibrary {
 	mainJavaVersion = JavaVersion.VERSION_11
 }
 
+val thirdPartyJars by configurations.creating
+
 dependencies {
 	implementation(libs.bartholdy) {
 		because("manage external tool installations")
@@ -33,6 +35,12 @@ dependencies {
 	testRuntimeOnly(libs.slf4j.julBinding) {
 		because("provide appropriate SLF4J binding")
 	}
+
+	thirdPartyJars(libs.junit4)
+	thirdPartyJars(libs.assertj)
+	thirdPartyJars(libs.apiguardian)
+	thirdPartyJars(libs.hamcrest)
+	thirdPartyJars(libs.opentest4j)
 }
 
 tasks.test {
@@ -54,12 +62,7 @@ tasks.test {
 
 	val tempRepoDir: File by rootProject
 	jvmArgumentProviders += MavenRepo(tempRepoDir)
-
-	// Pass version constants (declared in Versions.kt) to tests as system properties
-	systemProperty("Versions.apiGuardian", libs.versions.apiguardian.get())
-	systemProperty("Versions.assertJ", libs.versions.assertj.get())
-	systemProperty("Versions.junit4", libs.versions.junit4.get())
-	systemProperty("Versions.ota4j", libs.versions.opentest4j.get())
+	jvmArgumentProviders += ThirdPartyJars(thirdPartyJars)
 
 	(options as JUnitPlatformOptions).apply {
 		includeEngines("archunit")
@@ -113,3 +116,7 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 		return emptyList()
 	}
 }
+
+class ThirdPartyJars(@Classpath val configuration: Configuration) : CommandLineArgumentProvider {
+	override fun asArguments() = listOf("-DthirdPartyJars=${configuration.asPath}")
+}
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 0ab9c0cac804..34b79040e3c7 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -12,11 +12,9 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -50,21 +48,17 @@ public class Helper {
 		}
 	}
 
-	public static String version(String moduleOrSystemProperty) {
-		return version(moduleOrSystemProperty, "<no default version specified>");
-	}
-
-	public static String version(String moduleOrSystemProperty, String defaultVersion) {
-		if (moduleOrSystemProperty.startsWith("junit-jupiter")) {
+	public static String version(String module) {
+		if (module.startsWith("junit-jupiter")) {
 			return gradleProperties.getProperty("version");
 		}
-		if (moduleOrSystemProperty.startsWith("junit-platform")) {
+		if (module.startsWith("junit-platform")) {
 			return gradleProperties.getProperty("platformVersion");
 		}
-		if (moduleOrSystemProperty.startsWith("junit-vintage")) {
+		if (module.startsWith("junit-vintage")) {
 			return gradleProperties.getProperty("vintageVersion");
 		}
-		return System.getProperty("Versions." + moduleOrSystemProperty, defaultVersion);
+		throw new AssertionError("Unknown module: " + module);
 	}
 
 	static String groupId(String artifactId) {
@@ -139,17 +133,6 @@ public static void loadAllJUnitModules(Path target) throws Exception {
 		}
 	}
 
-	/** Load single JAR from Maven Central. */
-	public static void load(Path target, String group, String artifact, String version) throws Exception {
-		var jar = String.format("%s-%s.jar", artifact, version);
-		var mvn = "https://repo1.maven.org/maven2/";
-		var grp = group.replace('.', '/');
-		var url = new URL(mvn + String.join("/", grp, artifact, version, jar));
-		try (var stream = url.openStream()) {
-			Files.copy(stream, target.resolve(jar), StandardCopyOption.REPLACE_EXISTING);
-		}
-	}
-
 	/** Walk directory tree structure. */
 	public static List<String> treeWalk(Path root) {
 		var lines = new ArrayList<String>();
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java
new file mode 100644
index 000000000000..6e7db80e130c
--- /dev/null
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package platform.tooling.support;
+
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+public class ThirdPartyJars {
+
+	private ThirdPartyJars() {
+	}
+
+	public static void copy(Path targetDir, String group, String artifact) throws Exception {
+		Path source = Stream.of(System.getProperty("thirdPartyJars").split(File.pathSeparator)) //
+				.filter(it -> it.replace(File.separator, "/").contains("/" + group + "/" + artifact + "/")) //
+				.map(Path::of) //
+				.findFirst() //
+				.orElseThrow(() -> new AssertionError("Failed to find JAR file for " + group + ":" + artifact));
+		Files.copy(source, targetDir.resolve(source.getFileName()), REPLACE_EXISTING);
+	}
+}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index d06bb399deb3..d573651817dc 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -28,7 +28,9 @@
 import org.codehaus.groovy.runtime.ProcessGroovyMethods;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+
 import platform.tooling.support.Helper;
+import platform.tooling.support.ThirdPartyJars;
 
 /**
  * @since 1.5
@@ -69,11 +71,11 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
 		args.add(temp.resolve("destination").toString());
 
 		var lib = Files.createDirectories(temp.resolve("lib"));
-		Helper.load(lib, "junit", "junit", Helper.version("junit4", "4.13.2"));
-		Helper.load(lib, "org.assertj", "assertj-core", Helper.version("assertJ", "3.14.0"));
-		Helper.load(lib, "org.apiguardian", "apiguardian-api", Helper.version("apiGuardian", "1.1.0"));
-		Helper.load(lib, "org.hamcrest", "hamcrest", Helper.version("hamcrest", "2.2"));
-		Helper.load(lib, "org.opentest4j", "opentest4j", Helper.version("ota4j", "1.2.0"));
+		ThirdPartyJars.copy(lib, "junit", "junit");
+		ThirdPartyJars.copy(lib, "org.assertj", "assertj-core");
+		ThirdPartyJars.copy(lib, "org.apiguardian", "apiguardian-api");
+		ThirdPartyJars.copy(lib, "org.hamcrest", "hamcrest");
+		ThirdPartyJars.copy(lib, "org.opentest4j", "opentest4j");
 		Helper.loadAllJUnitModules(lib);
 		args.add("--module-path");
 		args.add(lib.toString());
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
index 90e1c369ab0e..95393d902006 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
@@ -40,6 +40,7 @@
 import platform.tooling.support.Helper;
 import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
+import platform.tooling.support.ThirdPartyJars;
 
 /**
  * @since 1.6
@@ -63,8 +64,8 @@ static void prepareLocalLibraryDirectoryWithJUnitPlatformModules() {
 					Files.copy(jar, lib.resolve(module + ".jar"));
 				}
 			}
-			Helper.load(lib, "org.apiguardian", "apiguardian-api", Helper.version("apiGuardian", "1.1.0"));
-			Helper.load(lib, "org.opentest4j", "opentest4j", Helper.version("ota4j", "1.2.0"));
+			ThirdPartyJars.copy(lib, "org.apiguardian", "apiguardian-api");
+			ThirdPartyJars.copy(lib, "org.opentest4j", "opentest4j");
 		}
 		catch (Exception e) {
 			throw new AssertionError("Preparing local library folder failed", e);

From e2a23053a4c1bfc266b71ebc294a005c4222a456 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Jun 2021 20:50:59 +0200
Subject: [PATCH 0384/1433] Revert "Downgrade Test Distribution plugin to work
 around repo downtime"

This reverts commit 163e90195c4b20eeb4ecc7a8d8a068539a648d4b.
---
 buildSrc/build.gradle.kts | 3 ++-
 gradle.properties         | 1 -
 settings.gradle.kts       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ffec97504145..9a84ede1f267 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
+	maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 }
 
 dependencies {
@@ -14,7 +15,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1-rc-2")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/gradle.properties b/gradle.properties
index 4d6544cce2ab..b9157a3889a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true
-testDistribution.maxRemoteExecutors=0
 
 # Omit automatic compile dependency on kotlin-stdlib
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c8bb438d0e53..59565f570d24 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,10 +3,11 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
+		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.6.2"
-		id("com.gradle.enterprise.test-distribution") version "2.0.3"
+		id("com.gradle.enterprise.test-distribution") version "2.1.1-rc-2"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"

From e62e6e6a66f21049bef61894cd81292348e92470 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Jun 2021 21:27:46 +0200
Subject: [PATCH 0385/1433] Enable Maven's batch mode

---
 .../java/platform/tooling/support/tests/JavaVersionsTests.java  | 2 +-
 .../java/platform/tooling/support/tests/MavenStarterTests.java  | 2 +-
 .../platform/tooling/support/tests/MultiReleaseJarTests.java    | 2 +-
 .../tooling/support/tests/VintageMavenIntegrationTests.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
index d8bbac4203b4..7a762022e388 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -54,7 +54,7 @@ List<String> execute(String version, Path javaHome) {
 				.setProject("java-versions") //
 				.setWorkspace("java-versions-" + version) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("--debug", "verify") //
+				.addArguments("--debug", "--batch-mode", "verify") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.setJavaHome(javaHome) //
 				.build().run();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
index 19a9111220e9..7ae2cff7b9bc 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -35,7 +35,7 @@ void verifyMavenStarterProject() {
 				.setTool(Request.maven()) //
 				.setProject("maven-starter") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("--debug", "verify") //
+				.addArguments("--debug", "--batch-mode", "verify") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
index 971a9192c1e2..65c1edcaa0f1 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -84,7 +84,7 @@ private Result mvn(String variant) {
 				.setTool(Request.maven()) //
 				.setProject("multi-release-jar") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("--show-version", "--errors", "--file", variant, "test") //
+				.addArguments("--show-version", "--errors", "--batch-mode", "--file", variant, "test") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.build() //
 				.run();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index bdb10eb257bb..cf992c88b3eb 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -60,7 +60,7 @@ private Result run(String version) {
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.setProject("vintage") //
 				.setWorkspace("vintage-maven-" + version) //
-				.addArguments("clean", "test", "--debug") //
+				.addArguments("clean", "test", "--debug", "--batch-mode") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
 				.setTimeout(Duration.ofMinutes(2)) //

From ecb10b332465ded70f423ebe080087ed5ddc46e6 Mon Sep 17 00:00:00 2001
From: Fr Jeremy Krieg <kriegfrj@users.noreply.github.com>
Date: Wed, 23 Jun 2021 15:28:11 +0930
Subject: [PATCH 0386/1433] Bump API Guardian version to 1.1.2-SNAPSHOT (#2650)

Because API Guardian 1.1.2-SNAPSHOT now has OSGi metadata, bumping
to this dependency allows Bnd to automatically calculate the
correct version of the package to import. This allows removing
the extra gymnastics that were inserted to calculate it manually.

Fixes #2547 (again!)
---
 buildSrc/settings.gradle.kts                         | 8 +-------
 buildSrc/src/main/kotlin/osgi-conventions.gradle.kts | 6 +-----
 gradle/libs.versions.toml                            | 2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 8e6efa3d0060..44425d9c15fc 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -1,7 +1 @@
-dependencyResolutionManagement {
-	versionCatalogs {
-		create("libs") {
-			from(files("../gradle/libs.versions.toml"))
-		}
-	}
-}
+// intentionally left blank
diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index 48200104953e..bc4197a5e6bd 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -6,11 +6,7 @@ plugins {
 	`java-library`
 }
 
-// Because the current build version of apiguardian (1.1.1) doesn't have OSGi metadata, bnd
-// cannot automatically determine the correct version to use in the Import-Package statement.
-// Fetch the current version out of the libs.versions.toml file.
-val apiguardianVersion = project.extensions.getByType(VersionCatalogsExtension::class).named("libs").findVersion("apiguardian").get()
-val importAPIGuardian = "org.apiguardian.*;version=\"\${range;[==,+);${apiguardianVersion}}\";resolution:=\"optional\""
+val importAPIGuardian = "org.apiguardian.*;resolution:=\"optional\""
 
 // This task enhances `jar` and `shadowJar` tasks with the bnd
 // `BundleTaskConvention` convention which allows for generating OSGi
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d7cf159a9d5a..7fdc33e3eb49 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-apiguardian = "1.1.1"
+apiguardian = "1.1.2-SNAPSHOT"
 asciidoctor-pdf = "1.5.3"
 assertj = "3.19.0"
 checkstyle = "8.36.2"

From 41111fa2e98c3b75d3d3342301f04b10887624f2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 21 Jun 2021 07:51:21 +0200
Subject: [PATCH 0387/1433] Downgrade Test Distribution plugin to work around
 repo downtime

---
 buildSrc/build.gradle.kts | 3 +--
 gradle.properties         | 1 +
 settings.gradle.kts       | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9a84ede1f267..ffec97504145 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
-	maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 }
 
 dependencies {
@@ -15,7 +14,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1-rc-2")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/gradle.properties b/gradle.properties
index b9157a3889a9..4d6544cce2ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,6 +25,7 @@ org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true
+testDistribution.maxRemoteExecutors=0
 
 # Omit automatic compile dependency on kotlin-stdlib
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 59565f570d24..c8bb438d0e53 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,11 +3,10 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.6.2"
-		id("com.gradle.enterprise.test-distribution") version "2.1.1-rc-2"
+		id("com.gradle.enterprise.test-distribution") version "2.0.3"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"

From 4751c9ed0ed807a0e20ed6bc6e8b309a22a6f4ce Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 27 Jun 2021 15:07:38 +0200
Subject: [PATCH 0388/1433] Update to @API Guardian v1.1.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7fdc33e3eb49..4f33eea4ca1c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-apiguardian = "1.1.2-SNAPSHOT"
+apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
 assertj = "3.19.0"
 checkstyle = "8.36.2"

From 00431bab10e019682c0fc143c34473b2916dd9e7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 30 Jun 2021 15:02:46 +0200
Subject: [PATCH 0389/1433] Track skipped tests in UniqueIdTrackingListener

Closes #2619
---
 .../release-notes/release-notes-5.8.0-M2.adoc     |  9 +++++----
 .../docs/asciidoc/user-guide/running-tests.adoc   |  4 ++--
 .../listeners/UniqueIdTrackingListener.java       | 14 ++++++++++++--
 .../UniqueIdTrackingListenerIntegrationTests.java | 15 ++++++++++++---
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 29209f84aaa9..ce37c3b5e6c5 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -40,10 +40,11 @@ on GitHub.
   <<../user-guide/index.adoc#launcher-api-listeners-config, Configuring an Execution
   Listener>> for details.
 * New `UniqueIdTrackingListener` which is a `TestExecutionListener` that tracks the unique
-  IDs of all tests that were executed during the `TestPlan` and generates a file
-  containing the unique IDs. The generated file can be used to rerun those tests -- for
-  example, in order to run the same set of tests executed on the JVM subsequently within a
-  GraalVM native image. See the Javadoc for `{UniqueIdTrackingListener}` for details.
+  IDs of all tests that were skipped or executed during the `TestPlan` and generates a
+  file containing the unique IDs. The generated file can be used to rerun those tests --
+  for example, in order to run the same set of tests executed on the JVM subsequently
+  within a GraalVM native image. See the Javadoc for `{UniqueIdTrackingListener}` for
+  details.
 * Generating Java Flight Recorder events via module `org.junit.platform.jfr` is now also
   supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
   <<../user-guide/index.adoc#running-tests, Flight Recorder Support>> for details.
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index be12e85a9c1c..ce4c4c866b02 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -879,8 +879,8 @@ test suite.
   printed via a `PrintWriter`.
 
 `{UniqueIdTrackingListener}` ::
-  `TestExecutionListener` that that tracks the unique IDs of all tests that were
-  executed during the execution of the `TestPlan` and generates a file containing the
+  `TestExecutionListener` that that tracks the unique IDs of all tests that were skipped
+  or executed during the execution of the `TestPlan` and generates a file containing the
   unique IDs once execution of the `TestPlan` has finished.
 
 [[running-tests-listeners-flight-recorder]]
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index 991e25451350..c75a7bf72ea9 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -40,8 +40,9 @@
  * of the {@code TestPlan} has {@linkplain #testPlanExecutionFinished(TestPlan)
  * finished}.
  *
- * <p>Tests are tracked regardless of their {@link TestExecutionResult}, and the
- * unique IDs are written to the output file, one ID per line, encoding using UTF-8.
+ * <p>Tests are tracked regardless of their {@link TestExecutionResult} or whether
+ * they were skipped, and the unique IDs are written to the output file, one ID
+ * per line, encoding using UTF-8.
  *
  * <p>The output file can be used to execute the same set of tests again without
  * having to query the user configuration for the test plan and without having to
@@ -133,8 +134,17 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 		this.enabled = testPlan.getConfigurationParameters().getBoolean(LISTENER_ENABLED_PROPERTY_NAME).orElse(false);
 	}
 
+	@Override
+	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
+		trackTestUid(testIdentifier);
+	}
+
 	@Override
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+		trackTestUid(testIdentifier);
+	}
+
+	private void trackTestUid(TestIdentifier testIdentifier) {
 		if (this.enabled && testIdentifier.isTest()) {
 			this.uniqueIds.add(testIdentifier.getUniqueId());
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
index 2e15a828284f..041943e8ec3c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
@@ -67,6 +67,7 @@
 class UniqueIdTrackingListenerIntegrationTests {
 
 	private static final String passingTest = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[method:passingTest()]";
+	private static final String skippedTest = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[method:skippedTest()]";
 	private static final String abortedTest = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[method:abortedTest()]";
 	private static final String failingTest = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[method:failingTest()]";
 	private static final String dynamicTest1 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[test-factory:dynamicTests()]/[dynamic-test:#1]";
@@ -74,8 +75,8 @@ class UniqueIdTrackingListenerIntegrationTests {
 	private static final String test1 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase2]/[method:test1()]";
 	private static final String test2 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase2]/[method:test2()]";
 
-	private static final String[] expectedUniqueIds = { passingTest, abortedTest, failingTest, dynamicTest1,
-			dynamicTest2, test1, test2 };
+	private static final String[] expectedUniqueIds = { passingTest, skippedTest, abortedTest, failingTest,
+			dynamicTest1, dynamicTest2, test1, test2 };
 
 	@Test
 	void confirmExpectedUniqueIdsViaEngineTestKit() {
@@ -186,6 +187,14 @@ private static List<String> executeTests(Map<String, String> configurationParame
 				.configurationParameters(configurationParameters)//
 				.build();
 		LauncherFactory.create().execute(request, new TestExecutionListener() {
+
+			@Override
+			public void executionSkipped(TestIdentifier testIdentifier, String reason) {
+				if (testIdentifier.isTest()) {
+					uniqueIds.add(testIdentifier.getUniqueId());
+				}
+			}
+
 			@Override
 			public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
 				if (testIdentifier.isTest()) {
@@ -210,7 +219,7 @@ void passingTest() {
 
 		@Test
 		@Disabled("testing")
-		void disabledTest() {
+		void skippedTest() {
 		}
 
 		@Test

From 9a1db7309f908f474b6042c9eb68c1e596e58453 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 1 Jul 2021 21:33:22 +0200
Subject: [PATCH 0390/1433] Support concurrent use cases in the
 UniqueIdTrackingListener

Prior to this commit, the UniqueIdTrackingListener wrote to an output
file with a specific name. This approach works fine when only one
listener is writing the file per test suite. However, when multiple
TestPlans are executed in parallel for the same test suite (for
example, with parallel test execution in a Gradle build), each
UniqueIdTrackingListener will attempt to recreate and write to the
exact same file. The result is that the "last one wins", meaning that
the output file only contains the tracked UIDs for the last
UniqueIdTrackingListener, and all other tracked UIDs are lost.

This commit fixes this by ensuring that each UniqueIdTrackingListener
instance writes to an output file that includes a random number in the
file name, thereby creating one unique output file per listener.

Consequently, consumers of the output files must now read the UIDs from
all such output files. In addition, the output files must be deleted
prior to TestPlan execution since the UniqueIdTrackingListener no
longer overwrites the previous output file.

Closes #2619
---
 .../listeners/UniqueIdTrackingListener.java   |  41 +++--
 ...queIdTrackingListenerIntegrationTests.java | 165 ++++++++++++++----
 2 files changed, 152 insertions(+), 54 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index c75a7bf72ea9..90b1f5b0733e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -18,6 +18,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,7 +42,7 @@
  * finished}.
  *
  * <p>Tests are tracked regardless of their {@link TestExecutionResult} or whether
- * they were skipped, and the unique IDs are written to the output file, one ID
+ * they were skipped, and the unique IDs are written to an output file, one ID
  * per line, encoding using UTF-8.
  *
  * <p>The output file can be used to execute the same set of tests again without
@@ -54,16 +55,19 @@
  * <h3>Configuration and Defaults</h3>
  *
  * <p>The {@code OUTPUT_DIR} is the directory in which this listener generates
- * the output file (the {@code OUTPUT_FILE}). The exact path of the generated file
- * is {@code OUTPUT_DIR}/{@code OUTPUT_FILE}.
+ * the output file. The exact path of the generated file is
+ * {@code OUTPUT_DIR/OUTPUT_FILE_PREFIX-<random number>.txt}, where
+ * {@code <random number>} is a pseudo-random number. The inclusion of a random
+ * number in the file name ensures that multiple concurrently executing test
+ * plans do not overwrite each other's results.
  *
- * <p>The name of the {@code OUTPUT_FILE} defaults to {@link #DEFAULT_FILE_NAME},
- * but a custom file name can be set via the {@link #OUTPUT_FILE_PROPERTY_NAME}
- * configuration property.
+ * <p>The value of the {@code OUTPUT_FILE_PREFIX} defaults to
+ * {@link #DEFAULT_OUTPUT_FILE_PREFIX}, but a custom prefix can be set via the
+ * {@link #OUTPUT_FILE_PREFIX_PROPERTY_NAME} configuration property.
  *
  * <p>The {@code OUTPUT_DIR} can be set to a custom directory via the
- * {@link #OUTPUT_DIR_PROPERTY_NAME} configuration property. Otherwise the following
- * algorithm is used to select a default output directory.
+ * {@link #OUTPUT_DIR_PROPERTY_NAME} configuration property. Otherwise the
+ * following algorithm is used to select a default output directory.
  *
  * <ul>
  * <li>If the current working directory of the Java process contains a file named
@@ -77,7 +81,7 @@
  * </ul>
  *
  * <p>For example, in a project using Gradle as the build tool, the file generated
- * by this listener would be {@code ./build/junit-platform-unique-test-ids.txt}
+ * by this listener would be {@code ./build/junit-platform-unique-ids-<random number>.txt}
  * by default.
  *
  * <p>Configuration properties can be set via JVM system properties, via a
@@ -109,19 +113,20 @@ public class UniqueIdTrackingListener implements TestExecutionListener {
 	public static final String OUTPUT_DIR_PROPERTY_NAME = "junit.platform.listeners.uid.tracking.output.dir";
 
 	/**
-	 * Property name used to set the name of the file generated by the
-	 * {@code UniqueIdTrackingListener}: {@value}
+	 * Property name used to set the prefix for the name of the file generated
+	 * by the {@code UniqueIdTrackingListener}: {@value}
 	 *
-	 * <p>Defaults to {@link #DEFAULT_FILE_NAME}.
+	 * <p>Defaults to {@link #DEFAULT_OUTPUT_FILE_PREFIX}.
 	 */
-	public static final String OUTPUT_FILE_PROPERTY_NAME = "junit.platform.listeners.uid.tracking.output.file";
+	public static final String OUTPUT_FILE_PREFIX_PROPERTY_NAME = "junit.platform.listeners.uid.tracking.output.file.prefix";
 
 	/**
-	 * The default name of the file generated by the {@code UniqueIdTrackingListener}: {@value}
+	 * The default prefix for the name of the file generated by the
+	 * {@code UniqueIdTrackingListener}: {@value}
 	 *
-	 * @see #OUTPUT_FILE_PROPERTY_NAME
+	 * @see #OUTPUT_FILE_PREFIX_PROPERTY_NAME
 	 */
-	public static final String DEFAULT_FILE_NAME = "junit-platform-unique-test-ids.txt";
+	public static final String DEFAULT_OUTPUT_FILE_PREFIX = "junit-platform-unique-ids";
 
 	private final Logger logger = LoggerFactory.getLogger(UniqueIdTrackingListener.class);
 
@@ -175,7 +180,9 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 	}
 
 	private Path getOutputFile(ConfigurationParameters configurationParameters) throws IOException {
-		String filename = configurationParameters.get(OUTPUT_FILE_PROPERTY_NAME).orElse(DEFAULT_FILE_NAME);
+		String prefix = configurationParameters.get(OUTPUT_FILE_PREFIX_PROPERTY_NAME)//
+				.orElse(DEFAULT_OUTPUT_FILE_PREFIX);
+		String filename = String.format("%s-%d.txt", prefix, Math.abs(new SecureRandom().nextLong()));
 		Path outputFile = getOutputDir(configurationParameters).resolve(filename);
 
 		if (Files.exists(outputFile)) {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
index 041943e8ec3c..abec2cbfd5a3 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
@@ -19,10 +19,10 @@
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.launcher.EngineFilter.includeEngines;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
-import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.DEFAULT_FILE_NAME;
+import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.DEFAULT_OUTPUT_FILE_PREFIX;
 import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.LISTENER_ENABLED_PROPERTY_NAME;
 import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.OUTPUT_DIR_PROPERTY_NAME;
-import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.OUTPUT_FILE_PROPERTY_NAME;
+import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.OUTPUT_FILE_PREFIX_PROPERTY_NAME;
 import static org.junit.platform.testkit.engine.Event.byTestDescriptor;
 import static org.junit.platform.testkit.engine.EventConditions.abortedWithReason;
 import static org.junit.platform.testkit.engine.EventConditions.event;
@@ -32,6 +32,7 @@
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -72,11 +73,17 @@ class UniqueIdTrackingListenerIntegrationTests {
 	private static final String failingTest = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[method:failingTest()]";
 	private static final String dynamicTest1 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[test-factory:dynamicTests()]/[dynamic-test:#1]";
 	private static final String dynamicTest2 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase1]/[test-factory:dynamicTests()]/[dynamic-test:#2]";
-	private static final String test1 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase2]/[method:test1()]";
-	private static final String test2 = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase2]/[method:test2()]";
+	private static final String testA = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase2]/[method:testA()]";
+	private static final String testB = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase2]/[method:testB()]";
+	private static final String testC = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase3]/[method:testC()]";
+	private static final String testD = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase3]/[method:testD()]";
+	private static final String testE = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase4]/[method:testE()]";
+	private static final String testF = "[engine:junit-jupiter]/[class:org.junit.platform.launcher.listeners.UniqueIdTrackingListenerIntegrationTests$TestCase4]/[method:testF()]";
 
 	private static final String[] expectedUniqueIds = { passingTest, skippedTest, abortedTest, failingTest,
-			dynamicTest1, dynamicTest2, test1, test2 };
+			dynamicTest1, dynamicTest2, testA, testB };
+
+	private static final String[] expectedConcurrentUniqueIds = { testA, testB, testC, testD, testE, testF };
 
 	@Test
 	void confirmExpectedUniqueIdsViaEngineTestKit() {
@@ -92,12 +99,18 @@ void confirmExpectedUniqueIdsViaEngineTestKit() {
 				event(test(uniqueId(failingTest)), finishedWithFailure(instanceOf(AssertionFailedError.class))),
 				event(test(uniqueId(dynamicTest1)), finishedSuccessfully()),
 				event(test(uniqueId(dynamicTest2)), finishedSuccessfully()),
-				event(test(uniqueId(test1)), finishedSuccessfully()),
-				event(test(uniqueId(test2)), finishedSuccessfully())
+				event(test(uniqueId(testA)), finishedSuccessfully()),
+				event(test(uniqueId(testB)), finishedSuccessfully())
 			);
 		// @formatter:on
 	}
 
+	private Condition<Event> uniqueId(String uniqueId) {
+		return new Condition<>(
+			byTestDescriptor(where(TestDescriptor::getUniqueId, uid -> uid.toString().equals(uniqueId))),
+			"descriptor with uniqueId '%s'", uniqueId);
+	}
+
 	@Test
 	void listenerIsRegisteredButDisabledByDefault() throws Exception {
 		long numListenersRegistered = ServiceLoader.load(TestExecutionListener.class).stream()//
@@ -105,8 +118,10 @@ void listenerIsRegisteredButDisabledByDefault() throws Exception {
 				.count();
 		assertThat(numListenersRegistered).isEqualTo(1);
 
-		Path path = Paths.get("build", DEFAULT_FILE_NAME);
-		Files.deleteIfExists(path);
+		String outputDir = "build";
+		String prefix = DEFAULT_OUTPUT_FILE_PREFIX;
+
+		deleteFiles(outputDir, prefix);
 
 		try {
 			List<String> actualUniqueIds = executeTests(Map.of());
@@ -114,75 +129,97 @@ void listenerIsRegisteredButDisabledByDefault() throws Exception {
 			// Sanity check using the results of our local TestExecutionListener
 			assertThat(actualUniqueIds).containsExactlyInAnyOrder(expectedUniqueIds);
 
-			// Check that file was not generated by the UniqueIdTrackingListener
-			assertThat(path).doesNotExist();
+			// Check that files were not generated by the UniqueIdTrackingListener
+			assertThat(findFiles(outputDir, prefix)).isEmpty();
 		}
 		finally {
-			Files.deleteIfExists(path);
+			deleteFiles(outputDir, prefix);
 		}
 	}
 
 	@Test
 	void verifyUniqueIdsAreTrackedWithDefaults() throws Exception {
-		Path path = Paths.get("build", DEFAULT_FILE_NAME);
-		verifyUniqueIdsAreTracked(path, Map.of());
+		verifyUniqueIdsAreTracked("build", DEFAULT_OUTPUT_FILE_PREFIX, Map.of());
 	}
 
 	@Test
 	void verifyUniqueIdsAreTrackedWithCustomOutputFile() throws Exception {
-		String customFilename = "test_ids.txt";
-
-		Path path = Paths.get("build", customFilename);
-		verifyUniqueIdsAreTracked(path, Map.of(OUTPUT_FILE_PROPERTY_NAME, customFilename));
+		String customPrefix = "test_ids";
+		verifyUniqueIdsAreTracked("build", customPrefix, Map.of(OUTPUT_FILE_PREFIX_PROPERTY_NAME, customPrefix));
 	}
 
 	@Test
 	void verifyUniqueIdsAreTrackedWithCustomOutputDir() throws Exception {
 		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
-
-		Path path = Paths.get(customDir, DEFAULT_FILE_NAME);
-		verifyUniqueIdsAreTracked(path, Map.of(OUTPUT_DIR_PROPERTY_NAME, customDir));
+		verifyUniqueIdsAreTracked(customDir, DEFAULT_OUTPUT_FILE_PREFIX, Map.of(OUTPUT_DIR_PROPERTY_NAME, customDir));
 	}
 
 	@Test
 	void verifyUniqueIdsAreTrackedWithCustomOutputFileAndCustomOutputDir() throws Exception {
-		String customFilename = "test_ids.txt";
+		String customPrefix = "test_ids";
 		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
 
-		Path path = Paths.get(customDir, customFilename);
-		verifyUniqueIdsAreTracked(path,
-			Map.of(OUTPUT_DIR_PROPERTY_NAME, customDir, OUTPUT_FILE_PROPERTY_NAME, customFilename));
+		verifyUniqueIdsAreTracked(customDir, customPrefix,
+			Map.of(OUTPUT_DIR_PROPERTY_NAME, customDir, OUTPUT_FILE_PREFIX_PROPERTY_NAME, customPrefix));
 	}
 
-	private void verifyUniqueIdsAreTracked(Path path, Map<String, String> configurationParameters) throws IOException {
+	private void verifyUniqueIdsAreTracked(String outputDir, String prefix, Map<String, String> configurationParameters)
+			throws IOException {
+
 		configurationParameters = new HashMap<>(configurationParameters);
 		configurationParameters.put(LISTENER_ENABLED_PROPERTY_NAME, "true");
 
-		Files.deleteIfExists(path);
+		deleteFiles(outputDir, prefix);
+
 		try {
 			List<String> actualUniqueIds = executeTests(configurationParameters);
 
 			// Sanity check using the results of our local TestExecutionListener
 			assertThat(actualUniqueIds).containsExactlyInAnyOrder(expectedUniqueIds);
 
-			// Check contents of the file generated by the UniqueIdTrackingListener
-			assertThat(Files.readAllLines(path)).containsExactlyInAnyOrder(expectedUniqueIds);
+			// Check contents of the file (or files) generated by the UniqueIdTrackingListener
+			assertThat(readAllFiles(outputDir, prefix)).containsExactlyInAnyOrder(expectedUniqueIds);
 		}
 		finally {
-			Files.deleteIfExists(path);
+			deleteFiles(outputDir, prefix);
 		}
 	}
 
-	private static Condition<Event> uniqueId(String uniqueId) {
-		return new Condition<>(
-			byTestDescriptor(where(TestDescriptor::getUniqueId, uid -> uid.toString().equals(uniqueId))),
-			"descriptor with uniqueId '%s'", uniqueId);
+	@Test
+	void verifyUniqueIdsAreTrackedWithConcurrentlyExecutingTestPlans() throws Exception {
+		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
+		String prefix = DEFAULT_OUTPUT_FILE_PREFIX;
+
+		Map<String, String> configurationParameters = new HashMap<>();
+		configurationParameters.put(LISTENER_ENABLED_PROPERTY_NAME, "true");
+		configurationParameters.put(OUTPUT_DIR_PROPERTY_NAME, customDir);
+
+		deleteFiles(customDir, prefix);
+
+		try {
+			Stream.of(TestCase2.class, TestCase3.class, TestCase4.class).parallel()//
+					.forEach(clazz -> executeTests(configurationParameters, selectClass(clazz)));
+
+			// 3 output files should have been generated.
+			assertThat(findFiles(customDir, prefix)).hasSize(3);
+
+			// Check contents of the file (or files) generated by the UniqueIdTrackingListener
+			assertThat(readAllFiles(customDir, prefix)).containsExactlyInAnyOrder(expectedConcurrentUniqueIds);
+		}
+		finally {
+			deleteFiles(customDir, prefix);
+		}
 	}
 
 	private static List<String> executeTests(Map<String, String> configurationParameters) {
+		return executeTests(configurationParameters, selectClasses());
+	}
+
+	private static List<String> executeTests(Map<String, String> configurationParameters,
+			ClassSelector... classSelectors) {
 		List<String> uniqueIds = new ArrayList<>();
 		LauncherDiscoveryRequest request = request()//
-				.selectors(selectClasses())//
+				.selectors(classSelectors)//
 				.filters(includeEngines("junit-jupiter"))//
 				.configurationParameters(configurationParameters)//
 				.build();
@@ -209,6 +246,38 @@ private static ClassSelector[] selectClasses() {
 		return new ClassSelector[] { selectClass(TestCase1.class), selectClass(TestCase2.class) };
 	}
 
+	private static Stream<Path> findFiles(String dir, String prefix) throws IOException {
+		Path outputDir = Paths.get(dir);
+		if (!Files.exists(outputDir)) {
+			return Stream.empty();
+		}
+		return Files.find(outputDir, 1, //
+			(path, basicFileAttributes) -> (basicFileAttributes.isRegularFile()
+					&& path.getFileName().toString().startsWith(prefix)));
+	}
+
+	private void deleteFiles(String outputDir, String prefix) throws IOException {
+		findFiles(outputDir, prefix).forEach(file -> {
+			try {
+				Files.deleteIfExists(file);
+			}
+			catch (IOException ex) {
+				throw new UncheckedIOException(ex);
+			}
+		});
+	}
+
+	private Stream<String> readAllFiles(String outputDir, String prefix) throws IOException {
+		return findFiles(outputDir, prefix).map(outputFile -> {
+			try {
+				return Files.readAllLines(outputFile);
+			}
+			catch (IOException ex) {
+				throw new UncheckedIOException(ex);
+			}
+		}).flatMap(List::stream);
+	}
+
 	// -------------------------------------------------------------------------
 
 	static class TestCase1 {
@@ -241,11 +310,33 @@ Stream<DynamicTest> dynamicTests() {
 	static class TestCase2 {
 
 		@Test
-		void test1() {
+		void testA() {
+		}
+
+		@Test
+		void testB() {
+		}
+	}
+
+	static class TestCase3 {
+
+		@Test
+		void testC() {
+		}
+
+		@Test
+		void testD() {
+		}
+	}
+
+	static class TestCase4 {
+
+		@Test
+		void testE() {
 		}
 
 		@Test
-		void test2() {
+		void testF() {
 		}
 	}
 

From 7c5e47ea606e48d6566c9807282db5e4aa5b6b66 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 3 Jul 2021 12:43:47 +0200
Subject: [PATCH 0391/1433] Upgradle to 7.1.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 234b6472e12a..2957f4374467 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=2debee19271e1b82c6e41137d78e44e6e841035230a1a169ca47fd3fb09ed87b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionSha256Sum=bf8b869948901d422e9bb7d1fa61da6a6e19411baa7ad6ee929073df85d6365d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From bb83427958ce60538884988a5571dd9dd1e30139 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 3 Jul 2021 12:44:06 +0200
Subject: [PATCH 0392/1433] Revert "Downgrade Test Distribution plugin to work
 around repo downtime"

This reverts commit 41111fa2e98c3b75d3d3342301f04b10887624f2.
---
 buildSrc/build.gradle.kts | 3 ++-
 gradle.properties         | 1 -
 settings.gradle.kts       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ffec97504145..9a84ede1f267 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
+	maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 }
 
 dependencies {
@@ -14,7 +15,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.0.3")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1-rc-2")
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/gradle.properties b/gradle.properties
index 4d6544cce2ab..b9157a3889a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,6 @@ org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true
-testDistribution.maxRemoteExecutors=0
 
 # Omit automatic compile dependency on kotlin-stdlib
 # https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c8bb438d0e53..59565f570d24 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,10 +3,11 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
+		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.6.2"
-		id("com.gradle.enterprise.test-distribution") version "2.0.3"
+		id("com.gradle.enterprise.test-distribution") version "2.1.1-rc-2"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"

From b5e2f16916e4a339e8e3747c4af6f4b247dba6df Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Jul 2021 10:00:08 +0200
Subject: [PATCH 0393/1433] Update ArchUnit to 0.20.0 (#2658)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4f33eea4ca1c..2dbe8e834cc4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ surefire = "2.22.2"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.19.0" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.20.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }

From 7f9f413f6670027271e2d950077e9a0398da3380 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Tue, 13 Jul 2021 16:29:36 +0200
Subject: [PATCH 0394/1433] Support AutoCloseable for arguments provided to a
 @ParameterizedTest (#2653)

This commit introduces a new `autoCloseArguments` attribute in `@ParameterizedTest` to close `AutoCloseable` arguments at the end of the test. This attribute defaults to true.

Closes #2597.
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  2 +
 .../asciidoc/user-guide/writing-tests.adoc    |  4 ++
 .../jupiter/params/ParameterizedTest.java     | 13 ++++++
 .../ParameterizedTestParameterResolver.java   | 45 ++++++++++++++++++-
 .../ParameterizedTestIntegrationTests.java    | 35 +++++++++++++++
 5 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index ce37c3b5e6c5..72401b1f4cda 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -77,6 +77,8 @@ on GitHub.
   directory and any contained directories instead of failing to delete them.
 * New `assertThrowsExactly` method which is a more strict version of `assertThrows`
   that allows you to assert that the thrown exception has the exact specified class.
+* New `autoCloseArguments` attribute in `@ParameterizedTest` to close `AutoCloseable`
+  arguments at the end of the test. This attribute defaults to true.
 
 
 [[release-notes-5.8.0-M2-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index f466fe86fea2..d0369186f502 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1105,6 +1105,10 @@ parameterized method at the same index in the method's formal parameter list. An
 _aggregator_ is any parameter of type `ArgumentsAccessor` or any parameter annotated with
 `@AggregateWith`.
 
+NOTE: Arguments of type `AutoCloseable` will be closed once `@AfterEach` methods and
+`AfterEachCallback` implementations have been called. To prevent this from happening, set
+the `autoCloseArguments` attribute in `@ParameterizedTest` to `false`.
+
 [[writing-tests-parameterized-tests-sources]]
 ==== Sources of Arguments
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index f4a740f690a9..40e1ff324217 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.params;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
@@ -207,4 +208,16 @@
 	 */
 	String name() default "{default_display_name}";
 
+	/**
+	 * If true, all arguments of the parameterized test implementing {@link AutoCloseable}
+	 * will be closed after {@code @AfterEach} methods and {@code AfterEachCallbacks}
+	 * have been called.
+	 *
+	 * @since 5.8
+	 * @see java.lang.AutoCloseable
+	 * @see ParameterizedTestParameterResolver
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8")
+	boolean autoCloseArguments() default true;
+
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
index 6185897d9d02..841fab711d21 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
@@ -13,17 +13,24 @@
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.Named;
+import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.platform.commons.util.AnnotationUtils;
 
 /**
  * @since 5.0
  */
-class ParameterizedTestParameterResolver implements ParameterResolver {
+class ParameterizedTestParameterResolver implements ParameterResolver, AfterTestExecutionCallback {
+
+	private static final Namespace NAMESPACE = Namespace.create(ParameterizedTestParameterResolver.class);
 
 	private final ParameterizedTestMethodContext methodContext;
 	private final Object[] arguments;
@@ -65,6 +72,42 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 		return this.methodContext.resolve(parameterContext, extractPayloads(this.arguments));
 	}
 
+	/**
+	 * @since 5.8
+	 */
+	@Override
+	public void afterTestExecution(ExtensionContext context) {
+		ParameterizedTest parameterizedTest = AnnotationUtils.findAnnotation(context.getRequiredTestMethod(),
+			ParameterizedTest.class).get();
+		if (!parameterizedTest.autoCloseArguments()) {
+			return;
+		}
+
+		Store store = context.getStore(NAMESPACE);
+		AtomicInteger argumentIndex = new AtomicInteger();
+
+		Arrays.stream(arguments) //
+				.filter(AutoCloseable.class::isInstance) //
+				.map(AutoCloseable.class::cast) //
+				.map(CloseableArgument::new) //
+				.forEach(closeable -> store.put("closeableArgument" + argumentIndex.getAndIncrement(), closeable));
+	}
+
+	private static class CloseableArgument implements Store.CloseableResource {
+
+		private final AutoCloseable autoCloseable;
+
+		CloseableArgument(AutoCloseable autoCloseable) {
+			this.autoCloseable = autoCloseable;
+		}
+
+		@Override
+		public void close() throws Throwable {
+			autoCloseable.close();
+		}
+
+	}
+
 	@SuppressWarnings("unchecked")
 	private Object[] extractPayloads(Object[] arguments) {
 		return Arrays.stream(arguments) //
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 14c6df5c5835..737877422c46 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.params;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Named.named;
@@ -21,6 +22,7 @@
 import static org.junit.platform.testkit.engine.EventConditions.container;
 import static org.junit.platform.testkit.engine.EventConditions.displayName;
 import static org.junit.platform.testkit.engine.EventConditions.event;
+import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
 import static org.junit.platform.testkit.engine.EventConditions.started;
 import static org.junit.platform.testkit.engine.EventConditions.test;
@@ -704,6 +706,15 @@ private EngineExecutionResults execute(String methodName, Class<?>... methodPara
 
 	}
 
+	@Test
+	void closeAutoCloseableArgumentsAfterTest() {
+		var results = execute("testWithAutoCloseableArgument", AutoCloseableArgument.class);
+		results.allEvents().assertThatEvents() //
+				.haveExactly(1, event(test(), finishedSuccessfully()));
+
+		assertTrue(AutoCloseableArgument.isClosed);
+	}
+
 	// -------------------------------------------------------------------------
 
 	static class TestCase {
@@ -786,6 +797,12 @@ void testWithIgnoreLeadingAndTrailingWhitespaceSetToTrueForCsvFileSource(String
 			fail("arguments: '" + argument1 + "', '" + argument2 + "'");
 		}
 
+		@ParameterizedTest
+		@ArgumentsSource(AutoCloseableArgumentProvider.class)
+		void testWithAutoCloseableArgument(AutoCloseableArgument autoCloseable) {
+			assertFalse(AutoCloseableArgument.isClosed);
+		}
+
 	}
 
 	static class NullSourceTestCase {
@@ -1258,6 +1275,24 @@ public Object convert(Object source, ParameterContext context) throws ArgumentCo
 		}
 	}
 
+	private static class AutoCloseableArgumentProvider implements ArgumentsProvider {
+
+		@Override
+		public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+			return Stream.of(arguments(new AutoCloseableArgument()));
+		}
+	}
+
+	static class AutoCloseableArgument implements AutoCloseable {
+
+		static boolean isClosed = false;
+
+		@Override
+		public void close() {
+			isClosed = true;
+		}
+	}
+
 	static class Book {
 
 		private final String title;

From 06835b829c9e9726d7424e7f761dd7847094d1ea Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 24 Jul 2021 13:00:12 +0300
Subject: [PATCH 0395/1433] Fix link to MethodOrderer.Random in the User Guide

---
 .../src/docs/asciidoc/user-guide/writing-tests.adoc    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index d0369186f502..92512297e65b 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2010,11 +2010,11 @@ junit.jupiter.execution.parallel.mode.default = concurrent
 
 The default execution mode is applied to all nodes of the test tree with a few notable
 exceptions, namely test classes that use the `Lifecycle.PER_CLASS` mode or a
-`{MethodOrderer}` (except for `{Random}`). In the former case, test authors have to
-ensure that the test class is thread-safe; in the latter, concurrent execution might
-conflict with the configured execution order. Thus, in both cases, test methods in such
-test classes are only executed concurrently if the `@Execution(CONCURRENT)` annotation is
-present on the test class or method.
+`{MethodOrderer}` (except for `{MethodOrderer_Random}`). In the former case, test authors
+have to ensure that the test class is thread-safe; in the latter, concurrent execution
+might conflict with the configured execution order. Thus, in both cases, test methods in
+such test classes are only executed concurrently if the `@Execution(CONCURRENT)`
+annotation is present on the test class or method.
 
 All nodes of the test tree that are configured with the `CONCURRENT` execution mode will
 be executed fully in parallel according to the provided

From b629b994aa7858376c5b90809e24d006045a51ff Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 26 Jul 2021 10:00:05 +0200
Subject: [PATCH 0396/1433] Update to ArchUnit 0.20.1 (#2665)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2dbe8e834cc4..07b3de73113f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ surefire = "2.22.2"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.20.0" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.20.1" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }

From 9b927f0f316f91fa8f27ada98239724592d204c2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 26 Jul 2021 12:24:40 +0200
Subject: [PATCH 0397/1433] Update AssertJ to 3.20.2 (#2672)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 07b3de73113f..5d8003e02983 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
-assertj = "3.19.0"
+assertj = "3.20.2"
 checkstyle = "8.36.2"
 jacoco = "0.8.7"
 jmh = "1.32"

From eaab286a53d534966de7cf6200955c0d3b8830f4 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 28 Jul 2021 12:25:45 +0200
Subject: [PATCH 0398/1433] Fix build due to JfrUnit's support for Spock 2

JfrUnit now supports Spock 2.

Specifically, @JfrEventTest is annotated with @ExtensionAnnotation
which resulted in the following build error.

> Task :platform-tests:compileTestJava
/.../jfrunit-main-SNAPSHOT.jar(/dev/morling/jfrunit/JfrEventTest.class):
  warning: Cannot find annotation method 'value()' in type 'ExtensionAnnotation':
  class file for org.spockframework.runtime.extension.ExtensionAnnotation not found
error: warnings found and -Werror specified
1 error
1 warning
> Task :platform-tests:compileTestJava FAILED

This commit allows the build to proceed by adding a testCompileOnly
dependency on Spock 2 in the platform-tests project.
---
 gradle/libs.versions.toml                | 1 +
 platform-tests/platform-tests.gradle.kts | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d8003e02983..d2ecb058a8f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,6 +37,7 @@ opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j"
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.30" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
+spock2 = { module = "org.spockframework:spock-core", version = "2.0-groovy-3.0" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 
 [bundles]
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 4f530f4e6963..6ad766764e40 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -29,6 +29,12 @@ dependencies {
 	testImplementation(libs.jfrunit)
 	testImplementation(libs.joox)
 
+	// --- Test compile-only dependencies ---------------------------------------------
+
+	testCompileOnly(libs.spock2) {
+		because("JfrUnit's @JfrEventTest is annotated with @org.spockframework.runtime.extension.ExtensionAnnotation")
+	}
+
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(projects.junitVintageEngine)
 	testRuntimeOnly(libs.groovy3) {

From a411d71614dc4c99e72683d1709e6655985c85fa Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Thu, 29 Jul 2021 15:25:59 +0200
Subject: [PATCH 0399/1433] Use stable JfrUnit version via JitPack

Prior to this commit, the version of JfrUnit used in our tests was
updated on-the-fly due to using `main-SNAPSHOT` as the version
tag.

Now, a fixed version of JfrUnit is used, namely `f3b30c0784`.
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d2ecb058a8f7..e17648b273a2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ commons-io = { module = "commons-io:commons-io", version = "2.9.0" }
 groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.8" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
-jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "main-SNAPSHOT" }
+jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "f3b30c0784" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "1.6.2" }

From 17902b7d321fb963de9711bf46b0cba012bd7e7c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 31 Jul 2021 16:42:47 +0200
Subject: [PATCH 0400/1433] Suppress serialization warning in
 TestSourceProvider

---
 .../org/junit/vintage/engine/descriptor/TestSourceProvider.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
index e84224758c2b..24b1ed79c8b9 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
@@ -36,6 +36,7 @@
 @API(status = INTERNAL, since = "5.6")
 public class TestSourceProvider {
 
+	@SuppressWarnings("serial")
 	private static final TestSource NULL_SOURCE = new TestSource() {
 	};
 

From 02748ce7de97c489b2675b00332c273bd6f28277 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 1 Aug 2021 17:31:31 +0200
Subject: [PATCH 0401/1433] Ensure TestInstanceFactory is supported with
 multiple constructors

Prior to this commit, we did not have a test in place which verified
that a test class can declare multiple constructors if and only if a
TestInstanceFactory is registered.
---
 .../extension/TestInstanceFactoryTests.java   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
index 153522ac6a31..ebec08edc32f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
@@ -282,6 +282,19 @@ void instanceFactoryOnTopLevelTestClass() {
 		// @formatter:on
 	}
 
+	@Test
+	void instanceFactorySupportedWhenTestClassDeclaresMultipleConstructors() {
+		executeTestsForClass(MultipleConstructorsTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+			"MultipleConstructorsTestInstanceFactory instantiated: MultipleConstructorsTestCase",
+				"test: 42"
+		);
+		// @formatter:on
+	}
+
 	@Test
 	void inheritedFactoryInTestClassHierarchy() {
 		EngineExecutionResults executionResults = executeTestsForClass(InheritedFactoryTestCase.class);
@@ -429,6 +442,34 @@ void testShouldNotBeCalled() {
 	static class PerClassLifecycleExplosiveTestInstanceFactoryTestCase extends ExplosiveTestInstanceFactoryTestCase {
 	}
 
+	private static class MultipleConstructorsTestInstanceFactory implements TestInstanceFactory {
+
+		@Override
+		public Object createTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext extensionContext) {
+			instantiated(getClass(), factoryContext.getTestClass());
+			return new MultipleConstructorsTestCase(42);
+		}
+	}
+
+	@ExtendWith(MultipleConstructorsTestInstanceFactory.class)
+	static class MultipleConstructorsTestCase {
+
+		private final int number;
+
+		public MultipleConstructorsTestCase(String text) {
+			this.number = -1;
+		}
+
+		public MultipleConstructorsTestCase(int number) {
+			this.number = number;
+		}
+
+		@Test
+		void test() {
+			callSequence.add("test: " + this.number);
+		}
+	}
+
 	@ExtendWith(FooInstanceFactory.class)
 	static class ParentTestCase {
 

From 1d52b08e5273f5722c5b5413218ec27808c3aefd Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 1 Aug 2021 18:30:14 +0200
Subject: [PATCH 0402/1433] Introduce test logging config for
 MutableExtensionRegistry

---
 junit-jupiter-engine/src/test/resources/log4j2-test.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/junit-jupiter-engine/src/test/resources/log4j2-test.xml b/junit-jupiter-engine/src/test/resources/log4j2-test.xml
index 802d9c230cd0..d734a7fa7da2 100644
--- a/junit-jupiter-engine/src/test/resources/log4j2-test.xml
+++ b/junit-jupiter-engine/src/test/resources/log4j2-test.xml
@@ -10,6 +10,7 @@
 		<Logger name="org.junit.jupiter.api" level="off" />
 		<Logger name="org.junit.jupiter.engine" level="off" />
 		<Logger name="org.junit.platform.launcher.listeners.discovery.LoggingLauncherDiscoveryListener" level="off" />
+		<Logger name="org.junit.jupiter.engine.extension.MutableExtensionRegistry" level="off" />
 		<Root level="error">
 			<AppenderRef ref="Console" />
 		</Root>

From 9f6472fd1e8dc19ef109b58dfd232712ec73dc6f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 1 Aug 2021 18:24:12 +0200
Subject: [PATCH 0403/1433] Improve logging for extension registration in JUnit
 Jupiter

This commit improves the logging for extension registration within
JUnit Jupiter by introducing the following categories for logged
extensions.

- default
- auto-detected
- local

All registered extensions are now logged consistently, and aggregated
logging for default and auto-detected extensions has been removed.

If the `source` is a Method or Field, the source information is
prefixed with "method" or "field", respectively, and the source is
converted to a short description of the method or field.

Furthermore, the `source` is no longer logged if it does not provide
additional context.

Closes #2679
---
 .../extension/MutableExtensionRegistry.java   | 85 +++++++++++--------
 1 file changed, 48 insertions(+), 37 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 85b709cada51..9d9fa504d79e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -10,10 +10,11 @@
 
 package org.junit.jupiter.engine.extension;
 
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Stream.concat;
 import static org.apiguardian.api.API.Status.INTERNAL;
 
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -22,7 +23,6 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.Extension;
@@ -71,12 +71,6 @@ public class MutableExtensionRegistry implements ExtensionRegistry, ExtensionReg
 	public static MutableExtensionRegistry createRegistryWithDefaultExtensions(JupiterConfiguration configuration) {
 		MutableExtensionRegistry extensionRegistry = new MutableExtensionRegistry(null);
 
-		// @formatter:off
-		logger.trace(() -> "Registering default extensions: " + DEFAULT_EXTENSIONS.stream()
-						.map(extension -> extension.getClass().getName())
-						.collect(toList()));
-		// @formatter:on
-
 		DEFAULT_EXTENSIONS.forEach(extensionRegistry::registerDefaultExtension);
 
 		if (configuration.isExtensionAutoDetectionEnabled()) {
@@ -87,16 +81,8 @@ public static MutableExtensionRegistry createRegistryWithDefaultExtensions(Jupit
 	}
 
 	private static void registerAutoDetectedExtensions(MutableExtensionRegistry extensionRegistry) {
-		Iterable<Extension> extensions = ServiceLoader.load(Extension.class, ClassLoaderUtils.getDefaultClassLoader());
-
-		// @formatter:off
-		logger.config(() -> "Registering auto-detected extensions: "
-				+ StreamSupport.stream(extensions.spliterator(), false)
-						.map(extension -> extension.getClass().getName())
-						.collect(toList()));
-		// @formatter:on
-
-		extensions.forEach(extensionRegistry::registerDefaultExtension);
+		ServiceLoader.load(Extension.class, ClassLoaderUtils.getDefaultClassLoader())//
+				.forEach(extensionRegistry::registerAutoDetectedExtension);
 	}
 
 	/**
@@ -153,15 +139,6 @@ private <E extends Extension> Stream<E> streamLocal(Class<E> extensionType) {
 		// @formatter:on
 	}
 
-	/**
-	 * Determine if the supplied type is already registered in this registry or in a
-	 * parent registry.
-	 */
-	private boolean isAlreadyRegistered(Class<? extends Extension> extensionType) {
-		return (this.registeredExtensionTypes.contains(extensionType)
-				|| (this.parent != null && this.parent.isAlreadyRegistered(extensionType)));
-	}
-
 	/**
 	 * Instantiate an extension of the given type using its default constructor
 	 * and register it in this registry.
@@ -173,28 +150,62 @@ private boolean isAlreadyRegistered(Class<? extends Extension> extensionType) {
 	 */
 	void registerExtension(Class<? extends Extension> extensionType) {
 		if (!isAlreadyRegistered(extensionType)) {
-			registerExtension(ReflectionUtils.newInstance(extensionType));
-			this.registeredExtensionTypes.add(extensionType);
+			registerLocalExtension(ReflectionUtils.newInstance(extensionType));
 		}
 	}
 
+	/**
+	 * Determine if the supplied type is already registered in this registry or in a
+	 * parent registry.
+	 */
+	private boolean isAlreadyRegistered(Class<? extends Extension> extensionType) {
+		return (this.registeredExtensionTypes.contains(extensionType)
+				|| (this.parent != null && this.parent.isAlreadyRegistered(extensionType)));
+	}
+
+	@Override
+	public void registerExtension(Extension extension, Object source) {
+		Preconditions.notNull(source, "source must not be null");
+		registerExtension("local", extension, source);
+	}
+
 	private void registerDefaultExtension(Extension extension) {
-		this.registeredExtensions.add(extension);
-		this.registeredExtensionTypes.add(extension.getClass());
+		registerExtension("default", extension);
 	}
 
-	private void registerExtension(Extension extension) {
-		registerExtension(extension, extension);
+	private void registerAutoDetectedExtension(Extension extension) {
+		registerExtension("auto-detected", extension);
 	}
 
-	@Override
-	public void registerExtension(Extension extension, Object source) {
+	private void registerLocalExtension(Extension extension) {
+		registerExtension("local", extension);
+	}
+
+	private void registerExtension(String category, Extension extension) {
+		registerExtension(category, extension, null);
+	}
+
+	private void registerExtension(String category, Extension extension, Object source) {
+		Preconditions.notBlank(category, "category must not be null or blank");
 		Preconditions.notNull(extension, "Extension must not be null");
-		Preconditions.notNull(source, "source must not be null");
 
-		logger.trace(() -> String.format("Registering extension [%s] from source [%s].", extension, source));
+		logger.trace(
+			() -> String.format("Registering %s extension [%s]%s.", category, extension, buildSourceInfo(source)));
 
 		this.registeredExtensions.add(extension);
+		this.registeredExtensionTypes.add(extension.getClass());
+	}
+
+	private String buildSourceInfo(Object source) {
+		if (source == null) {
+			return "";
+		}
+		if (source instanceof Member) {
+			Member member = (Member) source;
+			Object type = (member instanceof Method ? "method" : "field");
+			source = String.format("%s %s.%s", type, member.getDeclaringClass().getName(), member.getName());
+		}
+		return " from source [" + source + "]";
 	}
 
 }

From 66564c4110a18279f4d26a6646fa462e40307187 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 2 Aug 2021 17:49:15 +0200
Subject: [PATCH 0404/1433] Log synthetic extensions under a dedicated category

Issue: #2679
---
 .../engine/descriptor/ClassBasedTestDescriptor.java    |  2 +-
 .../jupiter/engine/extension/ExtensionRegistrar.java   | 10 ++++++++++
 .../engine/extension/MutableExtensionRegistry.java     |  5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index ef1c47f8ba7e..da6f15e851c0 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -468,7 +468,7 @@ private void registerAfterEachMethodAdapters(ExtensionRegistrar registrar) {
 	private void registerMethodsAsExtensions(List<Method> methods, ExtensionRegistrar registrar,
 			Function<Method, Extension> extensionSynthesizer) {
 
-		methods.forEach(method -> registrar.registerExtension(extensionSynthesizer.apply(method), method));
+		methods.forEach(method -> registrar.registerSyntheticExtension(extensionSynthesizer.apply(method), method));
 	}
 
 	private BeforeEachMethodAdapter synthesizeBeforeEachMethodAdapter(Method method) {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
index 74dba1afb865..5bb624c0d20b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
@@ -45,4 +45,14 @@ public interface ExtensionRegistrar {
 	 */
 	void registerExtension(Extension extension, Object source);
 
+	/**
+	 * Register the supplied {@link Extension} as a <em>synthetic</em> extension,
+	 * without checking if an extension of that type has already been registered.
+	 *
+	 * @param extension the extension to register; never {@code null}
+	 * @param source the source of the extension; never {@code null}
+	 * @see #registerExtension(Extension, Object)
+	 */
+	void registerSyntheticExtension(Extension extension, Object source);
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 9d9fa504d79e..d66df40da0f0 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -169,6 +169,11 @@ public void registerExtension(Extension extension, Object source) {
 		registerExtension("local", extension, source);
 	}
 
+	@Override
+	public void registerSyntheticExtension(Extension extension, Object source) {
+		registerExtension("synthetic", extension, source);
+	}
+
 	private void registerDefaultExtension(Extension extension) {
 		registerExtension("default", extension);
 	}

From 1a64b670ef7d7db8a4a5d3afcdb303cf22afcf28 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 2 Aug 2021 17:54:37 +0200
Subject: [PATCH 0405/1433] Polishing

---
 .../jupiter/engine/extension/MutableExtensionRegistry.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index d66df40da0f0..58432a0206de 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -195,7 +195,7 @@ private void registerExtension(String category, Extension extension, Object sour
 		Preconditions.notNull(extension, "Extension must not be null");
 
 		logger.trace(
-			() -> String.format("Registering %s extension [%s]%s.", category, extension, buildSourceInfo(source)));
+			() -> String.format("Registering %s extension [%s]%s", category, extension, buildSourceInfo(source)));
 
 		this.registeredExtensions.add(extension);
 		this.registeredExtensionTypes.add(extension.getClass());

From eee7df0a5d3fc35af97fe6412388ca0dd9ae46a1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 2 Aug 2021 18:24:44 +0200
Subject: [PATCH 0406/1433] Add missing @since tag

---
 .../org/junit/jupiter/engine/extension/ExtensionRegistrar.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
index 5bb624c0d20b..cf4908dab321 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
@@ -51,6 +51,7 @@ public interface ExtensionRegistrar {
 	 *
 	 * @param extension the extension to register; never {@code null}
 	 * @param source the source of the extension; never {@code null}
+	 * @since 5.8
 	 * @see #registerExtension(Extension, Object)
 	 */
 	void registerSyntheticExtension(Extension extension, Object source);

From 4cc14ee4aef0ac3e22a692bd804a2e7fe0555fd7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 09:30:02 +0200
Subject: [PATCH 0407/1433] Update to JfrUnit 1.0.0.Alpha1

---
 build.gradle.kts                                      |  5 -----
 gradle/libs.versions.toml                             |  2 +-
 ...ghtRecordingDiscoveryListenerIntegrationTests.java | 11 +++++------
 ...ghtRecordingExecutionListenerIntegrationTests.java | 11 +++++------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c6d685a59eaf..b20a290e8a05 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -113,11 +113,6 @@ allprojects {
 				snapshotsOnly()
 			}
 		}
-		maven(url = "https://jitpack.io") {
-			mavenContent {
-				includeModule("com.github.gunnarmorling", "jfrunit")
-			}
-		}
 	}
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e17648b273a2..2ad8432e62eb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ commons-io = { module = "commons-io:commons-io", version = "2.9.0" }
 groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.8" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
-jfrunit = { module = "com.github.gunnarmorling:jfrunit", version = "f3b30c0784" }
+jfrunit = { module = "org.moditect.jfrunit:jfrunit", version = "1.0.0.Alpha1" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "1.6.2" }
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
index 11257652f8e9..4bf11025fa16 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
@@ -10,18 +10,17 @@
 
 package org.junit.platform.jfr;
 
-import static dev.morling.jfrunit.ExpectedEvent.event;
-import static dev.morling.jfrunit.JfrEventsAssert.assertThat;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
-
-import dev.morling.jfrunit.EnableEvent;
-import dev.morling.jfrunit.JfrEventTest;
-import dev.morling.jfrunit.JfrEvents;
+import static org.moditect.jfrunit.ExpectedEvent.event;
+import static org.moditect.jfrunit.JfrEventsAssert.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly;
+import org.moditect.jfrunit.EnableEvent;
+import org.moditect.jfrunit.JfrEventTest;
+import org.moditect.jfrunit.JfrEvents;
 
 @JfrEventTest
 public class FlightRecordingDiscoveryListenerIntegrationTests {
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
index 9ec0eaa0ecc2..85e41b69a8d3 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
@@ -10,20 +10,19 @@
 
 package org.junit.platform.jfr;
 
-import static dev.morling.jfrunit.ExpectedEvent.event;
-import static dev.morling.jfrunit.JfrEventsAssert.assertThat;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
-
-import dev.morling.jfrunit.EnableEvent;
-import dev.morling.jfrunit.JfrEventTest;
-import dev.morling.jfrunit.JfrEvents;
+import static org.moditect.jfrunit.ExpectedEvent.event;
+import static org.moditect.jfrunit.JfrEventsAssert.assertThat;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestReporter;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly;
+import org.moditect.jfrunit.EnableEvent;
+import org.moditect.jfrunit.JfrEventTest;
+import org.moditect.jfrunit.JfrEvents;
 
 @JfrEventTest
 public class FlightRecordingExecutionListenerIntegrationTests {

From 8f006f7b97474c79d7e28f2b883c83eb5be9d2c6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 11:56:55 +0200
Subject: [PATCH 0408/1433] Revert "Fix build due to JfrUnit's support for
 Spock 2"

This reverts commit eaab286a53d534966de7cf6200955c0d3b8830f4.
---
 gradle/libs.versions.toml                | 1 -
 platform-tests/platform-tests.gradle.kts | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2ad8432e62eb..3ce0c7890254 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,7 +37,6 @@ opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j"
 picocli = { module = "info.picocli:picocli", version = "4.6.1" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.30" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
-spock2 = { module = "org.spockframework:spock-core", version = "2.0-groovy-3.0" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 
 [bundles]
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 6ad766764e40..4f530f4e6963 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -29,12 +29,6 @@ dependencies {
 	testImplementation(libs.jfrunit)
 	testImplementation(libs.joox)
 
-	// --- Test compile-only dependencies ---------------------------------------------
-
-	testCompileOnly(libs.spock2) {
-		because("JfrUnit's @JfrEventTest is annotated with @org.spockframework.runtime.extension.ExtensionAnnotation")
-	}
-
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(projects.junitVintageEngine)
 	testRuntimeOnly(libs.groovy3) {

From 06ab1ebabef0af896035c4ac5c977ba7c09fe10e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 11:52:27 +0200
Subject: [PATCH 0409/1433] Fix names of test classes and test cases

---
 .../JupiterTestDescriptorTests.java           |  8 ++--
 ....java => TypedArgumentConverterTests.java} |  2 +-
 .../NodeTreeWalkerIntegrationTests.java       |  8 ++--
 ...LauncherDiscoveryRequestBuilderTests.java} |  2 +-
 ...eEngineTest.java => SuiteEngineTests.java} | 43 ++++++++++---------
 ...est.java => SuiteTestDescriptorTests.java} |  6 +--
 ...micTest.java => DynamicTestsTestCase.java} | 20 +++++----
 ...leTest.java => MultipleTestsTestCase.java} |  7 +--
 ...impleTest.java => SingleTestTestCase.java} |  6 ++-
 .../engine/testsuites/AbstractSuite.java      |  8 ++--
 .../suite/engine/testsuites/DynamicSuite.java |  2 +
 .../engine/testsuites/MultipleSuite.java      | 10 +++--
 .../suite/engine/testsuites/NestedSuite.java  | 17 ++++----
 .../engine/testsuites/SelectClassesSuite.java | 10 +++--
 .../testsuites/SuiteDisplayNameSuite.java     | 10 +++--
 15 files changed, 93 insertions(+), 66 deletions(-)
 rename junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/{TypedArgumentConverterTest.java => TypedArgumentConverterTests.java} (96%)
 rename platform-tests/src/test/java/org/junit/platform/suite/commons/{SuiteLauncherDiscoveryRequestBuilderTest.java => SuiteLauncherDiscoveryRequestBuilderTests.java} (99%)
 rename platform-tests/src/test/java/org/junit/platform/suite/engine/{SuiteEngineTest.java => SuiteEngineTests.java} (83%)
 rename platform-tests/src/test/java/org/junit/platform/suite/engine/{SuiteTestDescriptorTest.java => SuiteTestDescriptorTests.java} (96%)
 rename platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/{DynamicTest.java => DynamicTestsTestCase.java} (54%)
 rename platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/{MultipleTest.java => MultipleTestsTestCase.java} (88%)
 rename platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/{SimpleTest.java => SingleTestTestCase.java} (88%)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
index 02b8c1ee92ff..8ab2d34fe6a4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
@@ -209,8 +209,8 @@ void constructFromMethodWithMultidimensionalObjectArrayParameter() throws Except
 
 	@Test
 	void constructFromInheritedMethod() throws Exception {
-		Method testMethod = ConcreteTest.class.getMethod("theTest");
-		TestMethodTestDescriptor descriptor = new TestMethodTestDescriptor(uniqueId, ConcreteTest.class, testMethod,
+		Method testMethod = ConcreteTestCase.class.getMethod("theTest");
+		TestMethodTestDescriptor descriptor = new TestMethodTestDescriptor(uniqueId, ConcreteTestCase.class, testMethod,
 			configuration);
 
 		assertEquals(testMethod, descriptor.getTestMethod());
@@ -219,7 +219,7 @@ void constructFromInheritedMethod() throws Exception {
 		assertThat(sourceOptional).containsInstanceOf(MethodSource.class);
 
 		MethodSource methodSource = (MethodSource) sourceOptional.orElseThrow();
-		assertEquals(ConcreteTest.class.getName(), methodSource.getClassName());
+		assertEquals(ConcreteTestCase.class.getName(), methodSource.getClassName());
 		assertEquals("theTest", methodSource.getMethodName());
 	}
 
@@ -400,7 +400,7 @@ public void theTest() {
 		}
 	}
 
-	private static class ConcreteTest extends AbstractTestBase {
+	private static class ConcreteTestCase extends AbstractTestBase {
 	}
 
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
similarity index 96%
rename from junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java
rename to junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
index b6843dd7867a..d1da3a6f32de 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTest.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
@@ -19,7 +19,7 @@
  *
  * @since 5.7
  */
-public class TypedArgumentConverterTest {
+class TypedArgumentConverterTests {
 
 	@Test
 	void convertsSourceToTarget() {
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
index 4f292c846870..e7b9fdf5c449 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
@@ -90,7 +90,7 @@ void doesntSetForceExecutionModeForChildrenWithReadLocksOnClass() {
 
 	@Test
 	void setsForceExecutionModeForChildrenWithReadLocksOnClassAndWriteLockOnTest() {
-		var engineDescriptor = discover(TestCaseWithResourceReadLockOnClassAndWriteClockOnTest.class);
+		var engineDescriptor = discover(TestCaseWithResourceReadLockOnClassAndWriteClockOnTestCase.class);
 
 		var advisor = nodeTreeWalker.walk(engineDescriptor);
 
@@ -106,7 +106,7 @@ void setsForceExecutionModeForChildrenWithReadLocksOnClassAndWriteLockOnTest() {
 
 	@Test
 	void doesntSetForceExecutionModeForChildrenWithReadLocksOnClassAndReadLockOnTest() {
-		var engineDescriptor = discover(TestCaseWithResourceReadLockOnClassAndReadClockOnTest.class);
+		var engineDescriptor = discover(TestCaseWithResourceReadLockOnClassAndReadClockOnTestCase.class);
 
 		var advisor = nodeTreeWalker.walk(engineDescriptor);
 
@@ -240,7 +240,7 @@ void test() {
 	}
 
 	@ResourceLock(value = "a", mode = ResourceAccessMode.READ)
-	static class TestCaseWithResourceReadLockOnClassAndWriteClockOnTest {
+	static class TestCaseWithResourceReadLockOnClassAndWriteClockOnTestCase {
 		@Test
 		@ResourceLock("a")
 		void test() {
@@ -248,7 +248,7 @@ void test() {
 	}
 
 	@ResourceLock(value = "a", mode = ResourceAccessMode.READ)
-	static class TestCaseWithResourceReadLockOnClassAndReadClockOnTest {
+	static class TestCaseWithResourceReadLockOnClassAndReadClockOnTestCase {
 		@Test
 		@ResourceLock(value = "b", mode = ResourceAccessMode.READ)
 		void test() {
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
similarity index 99%
rename from platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index 8d47e4e8acb7..732008e6f824 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -60,7 +60,7 @@
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.SelectUris;
 
-class SuiteLauncherDiscoveryRequestBuilderTest {
+class SuiteLauncherDiscoveryRequestBuilderTests {
 
 	SuiteLauncherDiscoveryRequestBuilder builder = SuiteLauncherDiscoveryRequestBuilder.request();
 
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
similarity index 83%
rename from platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index 9e0720660c39..17e5d6771e9e 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -29,9 +29,9 @@
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
-import org.junit.platform.suite.engine.testcases.DynamicTest;
-import org.junit.platform.suite.engine.testcases.MultipleTest;
-import org.junit.platform.suite.engine.testcases.SimpleTest;
+import org.junit.platform.suite.engine.testcases.DynamicTestsTestCase;
+import org.junit.platform.suite.engine.testcases.MultipleTestsTestCase;
+import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 import org.junit.platform.suite.engine.testsuites.AbstractSuite;
 import org.junit.platform.suite.engine.testsuites.DynamicSuite;
 import org.junit.platform.suite.engine.testsuites.MultipleSuite;
@@ -41,7 +41,10 @@
 import org.junit.platform.suite.engine.testsuites.SuiteSuite;
 import org.junit.platform.testkit.engine.EngineTestKit;
 
-class SuiteEngineTest {
+/**
+ * @since 1.8
+ */
+class SuiteEngineTests {
 
 	@Test
 	void selectClasses() {
@@ -52,7 +55,7 @@ void selectClasses() {
 				.testEvents()
 				.assertThatEvents()
 				.haveExactly(1, event(test(SelectClassesSuite.class.getName()), finishedSuccessfully()))
-				.haveExactly(1, event(test(SimpleTest.class.getName()), finishedSuccessfully()));
+				.haveExactly(1, event(test(SingleTestTestCase.class.getName()), finishedSuccessfully()));
 		// @formatter:on
 	}
 
@@ -93,7 +96,7 @@ void privateSuiteIsNotExecuted() {
 	}
 
 	@Suite
-	@SelectClasses(SimpleTest.class)
+	@SelectClasses(SingleTestTestCase.class)
 	private static class PrivateSuite {
 
 	}
@@ -112,7 +115,7 @@ void innerSuiteIsNotExecuted() {
 
 	@SuppressWarnings("InnerClassMayBeStatic")
 	@Suite
-	@SelectClasses(SimpleTest.class)
+	@SelectClasses(SingleTestTestCase.class)
 	private class InnerSuite {
 
 	}
@@ -137,7 +140,7 @@ void dynamicSuite() {
 				.execute()
 				.testEvents()
 				.assertThatEvents()
-				.haveExactly(2, event(test(DynamicTest.class.getName()), finishedSuccessfully()));
+				.haveExactly(2, event(test(DynamicTestsTestCase.class.getName()), finishedSuccessfully()));
 		// @formatter:on
 	}
 
@@ -151,7 +154,7 @@ void suiteSuite() {
 				.assertThatEvents()
 				.haveExactly(1, event(test(SuiteSuite.class.getName()), finishedSuccessfully()))
 				.haveExactly(1, event(test(SelectClassesSuite.class.getName()), finishedSuccessfully()))
-				.haveExactly(1, event(test(SimpleTest.class.getName()), finishedSuccessfully()));
+				.haveExactly(1, event(test(SingleTestTestCase.class.getName()), finishedSuccessfully()));
 		// @formatter:on
 	}
 
@@ -166,7 +169,7 @@ void selectClassesByUniqueId() {
 				.testEvents()
 				.assertThatEvents()
 				.haveExactly(1, event(test(SelectClassesSuite.class.getName()), finishedSuccessfully()))
-				.haveExactly(1, event(test(SimpleTest.class.getName()), finishedSuccessfully()));
+				.haveExactly(1, event(test(SingleTestTestCase.class.getName()), finishedSuccessfully()));
 		// @formatter:on
 	}
 
@@ -176,7 +179,7 @@ void selectMethodInTestPlanByUniqueId() {
 		UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID)
 				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName())
 				.append("engine", JupiterEngineDescriptor.ENGINE_ID)
-				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTest.class.getName())
+				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTestsTestCase.class.getName())
 				.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
 
 		EngineTestKit.engine(ENGINE_ID)
@@ -185,7 +188,7 @@ void selectMethodInTestPlanByUniqueId() {
 				.testEvents()
 				.assertThatEvents()
 				.haveExactly(1, event(test(MultipleSuite.class.getName()), finishedSuccessfully()))
-				.haveExactly(1, event(test(MultipleTest.class.getName()), finishedSuccessfully()));
+				.haveExactly(1, event(test(MultipleTestsTestCase.class.getName()), finishedSuccessfully()));
 		// @formatter:on
 	}
 
@@ -201,7 +204,7 @@ void selectSuiteByUniqueId() {
 				.testEvents()
 				.assertThatEvents()
 				.haveExactly(2, event(test(MultipleSuite.class.getName()), finishedSuccessfully()))
-				.haveExactly(2, event(test(MultipleTest.class.getName()), finishedSuccessfully()));
+				.haveExactly(2, event(test(MultipleTestsTestCase.class.getName()), finishedSuccessfully()));
 		// @formatter:on
 	}
 
@@ -211,7 +214,7 @@ void selectMethodAndSuiteInTestPlanByUniqueId() {
 		UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID)
 				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName())
 				.append("engine", JupiterEngineDescriptor.ENGINE_ID)
-				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTest.class.getName())
+				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTestsTestCase.class.getName())
 				.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
 
 		EngineTestKit.engine(ENGINE_ID)
@@ -221,9 +224,9 @@ void selectMethodAndSuiteInTestPlanByUniqueId() {
 				.testEvents()
 				.assertThatEvents()
 				.haveExactly(1, event(test(SelectClassesSuite.class.getName()), finishedSuccessfully()))
-				.haveExactly(1, event(test(SimpleTest.class.getName()), finishedSuccessfully()))
+				.haveExactly(1, event(test(SingleTestTestCase.class.getName()), finishedSuccessfully()))
 				.haveExactly(1, event(test(MultipleSuite.class.getName()), finishedSuccessfully()))
-				.haveExactly(1, event(test(MultipleTest.class.getName()), finishedSuccessfully()));
+				.haveExactly(1, event(test(MultipleTestsTestCase.class.getName()), finishedSuccessfully()));
 		// @formatter:on
 	}
 
@@ -233,13 +236,13 @@ void selectMethodsInTestPlanByUniqueId() {
 		UniqueId uniqueId = UniqueId.forEngine(ENGINE_ID)
 				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName())
 				.append("engine", JupiterEngineDescriptor.ENGINE_ID)
-				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTest.class.getName())
+				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTestsTestCase.class.getName())
 				.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
 
 		UniqueId uniqueId2 = UniqueId.forEngine(ENGINE_ID)
 				.append(SuiteTestDescriptor.SEGMENT_TYPE, MultipleSuite.class.getName())
 				.append("engine", JupiterEngineDescriptor.ENGINE_ID)
-				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTest.class.getName())
+				.append(ClassTestDescriptor.SEGMENT_TYPE, MultipleTestsTestCase.class.getName())
 				.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test2()");
 
 		EngineTestKit.engine(ENGINE_ID)
@@ -249,7 +252,7 @@ void selectMethodsInTestPlanByUniqueId() {
 				.testEvents()
 				.assertThatEvents()
 				.haveExactly(2, event(test(MultipleSuite.class.getName()), finishedSuccessfully()))
-				.haveExactly(2, event(test(MultipleTest.class.getName()), finishedSuccessfully()));
+				.haveExactly(2, event(test(MultipleTestsTestCase.class.getName()), finishedSuccessfully()));
 		// @formatter:on
 	}
 
@@ -259,7 +262,7 @@ void postDiscoveryCanRemoveTestDescriptorsInSuite() {
 		PostDiscoveryFilter postDiscoveryFilter = testDescriptor -> testDescriptor.getSource()
 				.filter(MethodSource.class::isInstance)
 				.map(MethodSource.class::cast)
-				.filter(classSource -> SimpleTest.class.equals(classSource.getJavaClass()))
+				.filter(classSource -> SingleTestTestCase.class.equals(classSource.getJavaClass()))
 				.map(classSource -> FilterResult.excluded("Was a test in SimpleTest"))
 				.orElseGet(() -> FilterResult.included("Was not a test in SimpleTest"));
 
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
similarity index 96%
rename from platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index 5281cacc7047..89a2e673f84e 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -26,16 +26,16 @@
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
-import org.junit.platform.suite.engine.testcases.SimpleTest;
+import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 import org.junit.platform.suite.engine.testsuites.CyclicSuite;
 import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
 
-class SuiteTestDescriptorTest {
+class SuiteTestDescriptorTests {
 
 	UniqueId engineId = UniqueId.forEngine(SuiteEngineDescriptor.ENGINE_ID);
 	UniqueId suiteId = engineId.append(SuiteTestDescriptor.SEGMENT_TYPE, "test");
 	UniqueId jupiterEngineId = suiteId.append("engine", JupiterEngineDescriptor.ENGINE_ID);
-	UniqueId testClassId = jupiterEngineId.append(ClassTestDescriptor.SEGMENT_TYPE, SimpleTest.class.getName());
+	UniqueId testClassId = jupiterEngineId.append(ClassTestDescriptor.SEGMENT_TYPE, SingleTestTestCase.class.getName());
 	UniqueId methodId = testClassId.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
 
 	SuiteTestDescriptor suite = new SuiteTestDescriptor(suiteId, Object.class);
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
similarity index 54%
rename from platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
index 5d7220ab7dd6..8a7577c935f9 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
@@ -11,20 +11,24 @@
 package org.junit.platform.suite.engine.testcases;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
+import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 
-public class DynamicTest {
+/**
+ * @since 1.8
+ */
+public class DynamicTestsTestCase {
 
 	@TestFactory
-	Collection<org.junit.jupiter.api.DynamicTest> dynamicTestsWithCollection() {
-		return Arrays.asList(
-			org.junit.jupiter.api.DynamicTest.dynamicTest("Add test", () -> assertEquals(2, Math.addExact(1, 1))),
-			org.junit.jupiter.api.DynamicTest.dynamicTest("Multiply Test",
-				() -> assertEquals(4, Math.multiplyExact(2, 2))));
+	Stream<DynamicTest> dynamicTests() {
+		return Stream.of(//
+			dynamicTest("Add test", () -> assertEquals(2, Math.addExact(1, 1))),
+			dynamicTest("Multiply Test", () -> assertEquals(4, Math.multiplyExact(2, 2)))//
+		);
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
similarity index 88%
rename from platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
index 1ce75302e7c2..b4e9b020c63a 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
@@ -12,15 +12,16 @@
 
 import org.junit.jupiter.api.Test;
 
-public class MultipleTest {
+/**
+ * @since 1.8
+ */
+public class MultipleTestsTestCase {
 
 	@Test
 	void test() {
-
 	}
 
 	@Test
 	void test2() {
-
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SimpleTest.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
similarity index 88%
rename from platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SimpleTest.java
rename to platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
index bc8eb9dcc628..1f8c153eaa29 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SimpleTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
@@ -12,10 +12,12 @@
 
 import org.junit.jupiter.api.Test;
 
-public class SimpleTest {
+/**
+ * @since 1.8
+ */
+public class SingleTestTestCase {
 
 	@Test
 	void test() {
-
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
index 7862260ac52a..c7ca90da21e7 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
@@ -12,10 +12,12 @@
 
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
-import org.junit.platform.suite.engine.testcases.SimpleTest;
+import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 
+/**
+ * @since 1.8
+ */
 @Suite
-@SelectClasses(SimpleTest.class)
+@SelectClasses(SingleTestTestCase.class)
 public abstract class AbstractSuite {
-
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
index fd1aa14bdd78..393012b02680 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
@@ -10,10 +10,12 @@
 
 package org.junit.platform.suite.engine.testsuites;
 
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.Suite;
 
 @Suite
+@IncludeClassNamePatterns(".*TestCase$")
 @SelectPackages("org.junit.platform.suite.engine.testcases")
 public class DynamicSuite {
 
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
index c0b7e5324d7f..3fcfd54292e7 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
@@ -10,12 +10,16 @@
 
 package org.junit.platform.suite.engine.testsuites;
 
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
-import org.junit.platform.suite.engine.testcases.MultipleTest;
+import org.junit.platform.suite.engine.testcases.MultipleTestsTestCase;
 
+/**
+ * @since 1.8
+ */
 @Suite
-@SelectClasses(MultipleTest.class)
+@IncludeClassNamePatterns(".*TestCase$")
+@SelectClasses(MultipleTestsTestCase.class)
 public class MultipleSuite {
-
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
index fccc7923d534..0c79bd93c72c 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
@@ -12,21 +12,22 @@
 
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
-import org.junit.platform.suite.engine.testcases.MultipleTest;
-import org.junit.platform.suite.engine.testcases.SimpleTest;
+import org.junit.platform.suite.engine.testcases.MultipleTestsTestCase;
+import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 
+/**
+ * @since 1.8
+ */
 public class NestedSuite {
 
 	@Suite
-	@SelectClasses(SimpleTest.class)
-	static public class Jupiter {
-
+	@SelectClasses(SingleTestTestCase.class)
+	static class Jupiter {
 	}
 
 	@Suite
-	@SelectClasses(MultipleTest.class)
-	static public class Tagged {
-
+	@SelectClasses(MultipleTestsTestCase.class)
+	static class Tagged {
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
index cc4efeec05a3..98007c744b41 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
@@ -10,12 +10,16 @@
 
 package org.junit.platform.suite.engine.testsuites;
 
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
-import org.junit.platform.suite.engine.testcases.SimpleTest;
+import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 
+/**
+ * @since 1.8
+ */
 @Suite
-@SelectClasses(SimpleTest.class)
+@IncludeClassNamePatterns(".*TestCase$")
+@SelectClasses(SingleTestTestCase.class)
 public class SelectClassesSuite {
-
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
index 102bedec99ad..e91af825b0f1 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
@@ -10,14 +10,18 @@
 
 package org.junit.platform.suite.engine.testsuites;
 
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.api.SuiteDisplayName;
-import org.junit.platform.suite.engine.testcases.SimpleTest;
+import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 
+/**
+ * @since 1.8
+ */
 @Suite
-@SelectClasses(SimpleTest.class)
+@IncludeClassNamePatterns(".*TestCase$")
+@SelectClasses(SingleTestTestCase.class)
 @SuiteDisplayName("Suite Display Name")
 public class SuiteDisplayNameSuite {
-
 }

From 2e796f0842e789fda7fa6b328055ce59cfabbef7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 11:54:00 +0200
Subject: [PATCH 0410/1433] Fix Javadoc issues for the JUnit Platform Suite
 support

---
 .../suite/api/ConfigurationParameter.java         | 11 ++++++-----
 .../suite/api/ConfigurationParameters.java        | 11 ++++++++---
 .../suite/api/SelectClasspathResource.java        | 14 ++++++++------
 .../suite/api/SelectClasspathResources.java       |  3 ++-
 .../platform/suite/api/SelectDirectories.java     |  4 ++--
 .../org/junit/platform/suite/api/SelectFile.java  | 15 ++++++++-------
 .../org/junit/platform/suite/api/SelectFiles.java |  2 +-
 .../junit/platform/suite/api/SelectModules.java   |  4 ++--
 .../org/junit/platform/suite/api/SelectUris.java  |  6 +++---
 .../java/org/junit/platform/suite/api/Suite.java  |  3 ++-
 .../commons/AdditionalDiscoverySelectors.java     |  3 +++
 .../SuiteLauncherDiscoveryRequestBuilder.java     |  3 +++
 .../suite/engine/ClassSelectorResolver.java       |  3 +++
 .../suite/engine/DiscoverySelectorResolver.java   |  3 +++
 .../suite/engine/IsPotentialTestContainer.java    |  3 +++
 .../junit/platform/suite/engine/IsSuiteClass.java |  3 +++
 .../suite/engine/SuiteEngineDescriptor.java       |  3 +++
 .../platform/suite/engine/SuiteLauncher.java      |  3 +++
 .../suite/engine/SuiteTestDescriptor.java         |  2 +-
 .../platform/suite/engine/SuiteTestEngine.java    |  4 ++--
 .../suite/engine/SuiteTestDescriptorTests.java    |  3 +++
 .../suite/engine/testsuites/CyclicSuite.java      |  4 +++-
 .../suite/engine/testsuites/DynamicSuite.java     |  4 +++-
 .../suite/engine/testsuites/SuiteSuite.java       |  4 +++-
 24 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
index 6e8c44d8c7b9..9d0e9497d212 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
@@ -22,8 +22,9 @@
 import org.apiguardian.api.API.Status;
 
 /**
- * {@code @Configuration} specifies the configuration {@linkplain #key key} and
- * {@linkplain #value value} pairs to be added to the discovery request when running
+ * {@code @ConfigurationParameter} is a {@linkplain Repeatable repeatable}
+ * annotation that specifies a configuration {@link #key key} and
+ * {@link #value value} pair to be added to the discovery request when running
  * a test suite on the JUnit Platform.
  *
  * @since 1.8
@@ -40,13 +41,13 @@
 public @interface ConfigurationParameter {
 
 	/**
-	 * The configuration parameter key under which to add the
-	 * value to the discovery request; never {@code null} or blank.
+	 * The configuration parameter key under which to add the {@link #value() value}
+	 * to the discovery request; never {@code null} or blank.
 	 */
 	String key();
 
 	/**
-	 * The value to add to the discovery request.
+	 * The value to add to the discovery request for the specified {@link #key() key}.
 	 */
 	String value();
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
index 3637674b3637..e63205a3809a 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
@@ -21,8 +21,12 @@
 import org.apiguardian.api.API.Status;
 
 /**
- * {@code @Configurations} is a container for one or more
- * {@link ConfigurationParameter @Configuration} declarations.
+ * {@code @ConfigurationParameters} is a container for one or more
+ * {@link ConfigurationParameter @ConfigurationParameter} declarations.
+ *
+ * <p>Note, however, that use of the {@code @ConfigurationParameters} container
+ * is completely optional since {@code @ConfigurationParameter} is a
+ * {@linkplain java.lang.annotation.Repeatable repeatable} annotation.
  *
  * @since 1.8
  * @see ConfigurationParameter
@@ -35,7 +39,8 @@
 public @interface ConfigurationParameters {
 
 	/**
-	 * An array of one or more {@link ConfigurationParameter Configurations}.
+	 * An array of one or more {@link ConfigurationParameter @ConfigurationParameter}
+	 * declarations.
 	 */
 	ConfigurationParameter[] value();
 }
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
index 9120204b83e2..678d8829b1d4 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
@@ -22,8 +22,9 @@
 import org.apiguardian.api.API.Status;
 
 /**
- * {@code @SelectClasspathResource} specifies the classpath resource to
- * <em>select</em> when running a test suite on the JUnit Platform.
+ * {@code @SelectClasspathResource} is a {@linkplain Repeatable repeatable}
+ * annotation that specifies a classpath resource to <em>select</em> when running
+ * a test suite on the JUnit Platform.
  *
  * @since 1.8
  * @see Suite
@@ -39,18 +40,19 @@
 public @interface SelectClasspathResource {
 
 	/**
-	 * A classpath resource name to select.
+	 * The name of the classpath resource to select.
 	 */
 	String value();
 
 	/**
-	 * The line number; ignored if not greater than zero.
+	 * The line number within the classpath resource; ignored if not greater than
+	 * zero.
 	 */
 	int line() default 0;
 
 	/**
-	 * The column number; ignored if the line number is ignored; ignored if not
-	 * greater than zero.
+	 * The column number within the classpath resource; ignored if the line number
+	 * is ignored or if not greater than zero.
 	 */
 	int column() default 0;
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
index 5ad74c95aabf..8eebf8f0ebfc 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
@@ -39,7 +39,8 @@
 public @interface SelectClasspathResources {
 
 	/**
-	 * An array of one or more {@link SelectClasspathResource SelectClasspathResources}.
+	 * An array of one or more {@link SelectClasspathResource @SelectClasspathResource}
+	 * declarations.
 	 */
 	SelectClasspathResource[] value();
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
index 378f6cc28dce..85fc2bc4c71f 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
@@ -21,8 +21,8 @@
 import org.apiguardian.api.API.Status;
 
 /**
- * {@code @SelectDirectories} specifies the directories to
- * <em>select</em> when running a test suite on the JUnit Platform.
+ * {@code @SelectDirectories} specifies the directories to <em>select</em> when
+ * running a test suite on the JUnit Platform.
  *
  * @since 1.8
  * @see Suite
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
index 04c475a9430d..263e9fe32c2d 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
@@ -22,13 +22,14 @@
 import org.apiguardian.api.API.Status;
 
 /**
- * {@code @SelectFiles} specifies the files to
- * <em>select</em> when running a test suite on the JUnit Platform.
+ * {@code @SelectFile} is a {@linkplain Repeatable repeatable} annotation that
+ * specifies a file to <em>select</em> when running a test suite on the JUnit
+ * Platform.
  *
+ * @since 1.8
  * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
  * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectFile(String, org.junit.platform.engine.discovery.FilePosition)
- * @since 1.8
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
@@ -39,18 +40,18 @@
 public @interface SelectFile {
 
 	/**
-	 * A file to select.
+	 * The file to select.
 	 */
 	String value();
 
 	/**
-	 * The line number; ignored if not greater than zero.
+	 * The line number within the file; ignored if not greater than zero.
 	 */
 	int line() default 0;
 
 	/**
-	 * The column number; ignored if the line number is ignored; ignored if not
-	 * greater than zero.
+	 * The column number within the file; ignored if the line number is ignored
+	 * or if not greater than zero.
 	 */
 	int column() default 0;
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
index dc95a2d07b64..b12ad33a1f4f 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
@@ -39,7 +39,7 @@
 public @interface SelectFiles {
 
 	/**
-	 * An array of one or more {@link SelectFile SelectFiles}.
+	 * An array of one or more {@link SelectFile @SelectFile} declarations.
 	 */
 	SelectFile[] value();
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
index 57bea0744fd0..d15a80882953 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
@@ -22,8 +22,8 @@
 import org.apiguardian.api.API.Status;
 
 /**
- * {@code @SelectModules} specifies the modules to
- * <em>select</em> when running a test suite on the JUnit Platform.
+ * {@code @SelectModules} specifies the modules to <em>select</em> when running
+ * a test suite on the JUnit Platform.
  *
  * @since 1.8
  * @see Suite
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
index cee5d4e2990b..1b94f688cf0a 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
@@ -21,8 +21,8 @@
 import org.apiguardian.api.API.Status;
 
 /**
- * {@code @SelectUris} specifies the uris to
- * <em>select</em> when running a test suite on the JUnit Platform.
+ * {@code @SelectUris} specifies the URIs to <em>select</em> when running a test
+ * suite on the JUnit Platform.
  *
  * @since 1.8
  * @see Suite
@@ -37,7 +37,7 @@
 public @interface SelectUris {
 
 	/**
-	 * One or more uris to select.
+	 * One or more URIs to select.
 	 */
 	String[] value();
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
index 8b01fe2cdb97..214bc17b8543 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
@@ -22,7 +22,8 @@
 import org.junit.platform.commons.annotation.Testable;
 
 /**
- * {@code @Suite} marks class as a test suite on the JUnit Platform.
+ * {@code @Suite} marks a class as a test suite on the JUnit Platform.
+ *
  * <p>Selector and filter annotations are used to control the contents of the
  * suite. Additionally configuration can be passed to the suite via the
  * configuration annotations.
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
index 4efd8f35b5da..6e32077081a7 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -27,6 +27,9 @@
 import org.junit.platform.engine.discovery.PackageSelector;
 import org.junit.platform.engine.discovery.UriSelector;
 
+/**
+ * @since 1.8
+ */
 class AdditionalDiscoverySelectors {
 
 	static List<UriSelector> selectUris(String... uris) {
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index d36f90d79feb..66678b4b6580 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -53,6 +53,9 @@
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.SelectUris;
 
+/**
+ * @since 1.8
+ */
 @API(status = Status.INTERNAL, since = "1.8", consumers = { "org.junit.platform.suite.engine",
 		"org.junit.platform.runner" })
 public final class SuiteLauncherDiscoveryRequestBuilder {
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
index 58db2bf1f740..87e08b4bf98a 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
@@ -24,6 +24,9 @@
 import org.junit.platform.engine.discovery.UniqueIdSelector;
 import org.junit.platform.engine.support.discovery.SelectorResolver;
 
+/**
+ * @since 1.8
+ */
 final class ClassSelectorResolver implements SelectorResolver {
 
 	private static final IsSuiteClass isSuiteClass = new IsSuiteClass();
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
index 8f90faad4b3c..9f32c9e004dd 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
@@ -14,6 +14,9 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolver;
 
+/**
+ * @since 1.8
+ */
 final class DiscoverySelectorResolver {
 
 	// @formatter:off
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
index 3926ab05a753..348e1c1b2dc0 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
@@ -16,6 +16,9 @@
 
 import java.util.function.Predicate;
 
+/**
+ * @since 1.8
+ */
 final class IsPotentialTestContainer implements Predicate<Class<?>> {
 
 	@Override
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
index 0ba4b4221a07..9f81798b9dd9 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
@@ -15,6 +15,9 @@
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.suite.api.Suite;
 
+/**
+ * @since 1.8
+ */
 final class IsSuiteClass implements Predicate<Class<?>> {
 
 	private static final IsPotentialTestContainer isPotentialTestContainer = new IsPotentialTestContainer();
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
index 2c77a4185061..51afa206cdd2 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
@@ -13,6 +13,9 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 
+/**
+ * @since 1.8
+ */
 final class SuiteEngineDescriptor extends EngineDescriptor {
 
 	static final String ENGINE_ID = "junit-platform-suite";
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
index 18a5737a07f0..b0af0e9c8895 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
@@ -26,6 +26,9 @@
 import org.junit.platform.launcher.core.LauncherDiscoveryResult;
 import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
 
+/**
+ * @since 1.8
+ */
 class SuiteLauncher {
 
 	private final EngineExecutionOrchestrator executionOrchestrator = new EngineExecutionOrchestrator();
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index 2bed05b2d7bb..c013381beb02 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -34,7 +34,7 @@
 import org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder;
 
 /**
- * {@link TestDescriptor} for tests based on the JUnit Platform Launcher API.
+ * {@link TestDescriptor} for tests based on the JUnit Platform Suite API.
  *
  * <h3>Default Display Names</h3>
  *
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
index f608b9737a6c..8045ae2f3303 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
@@ -26,9 +26,9 @@
 /**
  * The JUnit Platform Suite {@link org.junit.platform.engine.TestEngine TestEngine}.
  *
- * @since 5.8
+ * @since 1.8
  */
-@API(status = INTERNAL, since = "5.8")
+@API(status = INTERNAL, since = "1.8")
 public final class SuiteTestEngine implements TestEngine {
 
 	@Override
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index 89a2e673f84e..620e0a0b6651 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -30,6 +30,9 @@
 import org.junit.platform.suite.engine.testsuites.CyclicSuite;
 import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
 
+/**
+ * @since 1.8
+ */
 class SuiteTestDescriptorTests {
 
 	UniqueId engineId = UniqueId.forEngine(SuiteEngineDescriptor.ENGINE_ID);
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
index 3871f8bee0a4..23534540f372 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
@@ -14,9 +14,11 @@
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 
+/**
+ * @since 1.8
+ */
 @Suite
 @IncludeClassNamePatterns(".*")
 @SelectClasses(CyclicSuite.class)
 public class CyclicSuite {
-
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
index 393012b02680..a6f6aef1fdfa 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
@@ -14,9 +14,11 @@
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.Suite;
 
+/**
+ * @since 1.8
+ */
 @Suite
 @IncludeClassNamePatterns(".*TestCase$")
 @SelectPackages("org.junit.platform.suite.engine.testcases")
 public class DynamicSuite {
-
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
index 6a46a6a73de8..12679a1cb98d 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
@@ -14,9 +14,11 @@
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 
+/**
+ * @since 1.8
+ */
 @Suite
 @IncludeClassNamePatterns(".*")
 @SelectClasses(SelectClassesSuite.class)
 public class SuiteSuite {
-
 }

From 20fe58d6e63e38b15d187970acf87ccca169076d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 12:44:21 +0200
Subject: [PATCH 0411/1433] Update Javadoc for @NullSource

---
 .../java/org/junit/jupiter/params/provider/NullSource.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
index c98e65cff76b..3878c47d251b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
@@ -25,7 +25,8 @@
  * {@code null} argument to the annotated {@code @ParameterizedTest} method.
  *
  * <p>Note that {@code @NullSource} cannot be used for an argument that has
- * a primitive type.
+ * a primitive type, unless the argument is converted to a corresponding wrapper
+ * type with an {@link org.junit.jupiter.params.converter.ArgumentConverter}.
  *
  * @since 5.4
  * @see org.junit.jupiter.params.provider.ArgumentsSource

From 931da053f694a858ff42b29d3201a704620a146d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 12:54:44 +0200
Subject: [PATCH 0412/1433] Enforce preconditions in TypedArgumentConverter

---
 .../params/converter/TypedArgumentConverter.java    |  7 +++++--
 .../converter/TypedArgumentConverterTests.java      | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index f28171a7240f..980525b89dcb 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -14,6 +14,7 @@
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.platform.commons.util.Preconditions;
 
 /**
  * {@code TypedArgumentConverter} is an {@code ArgumentConverter} that
@@ -31,6 +32,8 @@ public abstract class TypedArgumentConverter<S, T> implements ArgumentConverter
 	private final Class<T> targetType;
 
 	protected TypedArgumentConverter(Class<S> sourceType, Class<T> targetType) {
+		Preconditions.notNull(sourceType, "sourceType must not be null");
+		Preconditions.notNull(targetType, "targetType must not be null");
 		this.sourceType = sourceType;
 		this.targetType = targetType;
 	}
@@ -47,8 +50,8 @@ public final Object convert(Object source, ParameterContext context) throws Argu
 	}
 
 	/**
-	 * Convert the supplied {@code source} object of type S into an object
-	 * of type T.
+	 * Convert the supplied {@code source} object of type {@code S} into an object
+	 * of type {@code T}.
 	 *
 	 * @param source the source object to convert; may be {@code null}
 	 * @return the converted object
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
index d1da3a6f32de..ef06cdad33a5 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
@@ -11,8 +11,10 @@
 package org.junit.jupiter.params.converter;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import org.junit.jupiter.api.Test;
+import org.junit.platform.commons.PreconditionViolationException;
 
 /**
  * Unit tests for {@link TypedArgumentConverter}.
@@ -21,6 +23,17 @@
  */
 class TypedArgumentConverterTests {
 
+	@Test
+	void preconditions() {
+		assertThatExceptionOfType(PreconditionViolationException.class)//
+				.isThrownBy(() -> new PassThroughConstructorConverter(null, String.class))//
+				.withMessage("sourceType must not be null");
+
+		assertThatExceptionOfType(PreconditionViolationException.class)//
+				.isThrownBy(() -> new PassThroughConstructorConverter(String.class, null))//
+				.withMessage("targetType must not be null");
+	}
+
 	@Test
 	void convertsSourceToTarget() {
 		assertConverts("abcd", 4);

From 72fa59b5dec581901bf4e68ff374b1ee8fa7647e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 13:04:27 +0200
Subject: [PATCH 0413/1433] Polish TypedArgumentConverter

---
 .../params/converter/TypedArgumentConverter.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index 980525b89dcb..4f3b780ee715 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -40,13 +40,13 @@ protected TypedArgumentConverter(Class<S> sourceType, Class<T> targetType) {
 
 	@Override
 	public final Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
-		if (!sourceType.isAssignableFrom(source.getClass())) {
-			throw new ArgumentConversionException("Can only convert objects of type " + sourceType);
+		if (!this.sourceType.isAssignableFrom(source.getClass())) {
+			throw new ArgumentConversionException("Can only convert objects of type " + this.sourceType.getName());
 		}
-		if (!targetType.isAssignableFrom(context.getParameter().getType())) {
-			throw new ArgumentConversionException("Can only convert to type " + targetType);
+		if (!this.targetType.isAssignableFrom(context.getParameter().getType())) {
+			throw new ArgumentConversionException("Can only convert to type " + this.targetType.getName());
 		}
-		return convert(sourceType.cast(source));
+		return convert(this.sourceType.cast(source));
 	}
 
 	/**

From 30af669c09011273c68560f10fc431bc66749922 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 13:11:24 +0200
Subject: [PATCH 0414/1433] Fix broken test

---
 .../TypedArgumentConverterTests.java          | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
index ef06cdad33a5..e3b35d31ae18 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
@@ -12,50 +12,59 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.junit.jupiter.api.Assertions.assertAll;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**
- * Unit tests for {@link TypedArgumentConverter}.
+ * Tests for {@link TypedArgumentConverter}.
  *
  * @since 5.7
  */
 class TypedArgumentConverterTests {
 
+	/**
+	 * @since 5.8
+	 */
 	@Test
 	void preconditions() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
-				.isThrownBy(() -> new PassThroughConstructorConverter(null, String.class))//
+				.isThrownBy(() -> new StringLengthArgumentConverter(null, Integer.class))//
 				.withMessage("sourceType must not be null");
 
 		assertThatExceptionOfType(PreconditionViolationException.class)//
-				.isThrownBy(() -> new PassThroughConstructorConverter(String.class, null))//
+				.isThrownBy(() -> new StringLengthArgumentConverter(String.class, null))//
 				.withMessage("targetType must not be null");
 	}
 
 	@Test
 	void convertsSourceToTarget() {
-		assertConverts("abcd", 4);
-		assertConverts("", 0);
+		assertAll(//
+			() -> assertConverts("abcd", 4), //
+			() -> assertConverts("", 0) //
+		);
 	}
 
-	private void assertConverts(String input, Integer expectedOutput) {
-		var result = new StringLengthArgumentConverter().convert(input);
-		assertThat(result).isEqualTo(expectedOutput);
+	private void assertConverts(String input, int expected) {
+		int length = new StringLengthArgumentConverter().convert(input);
+		assertThat(length).isEqualTo(expected);
 	}
 
 	private static class StringLengthArgumentConverter extends TypedArgumentConverter<String, Integer> {
 
-		protected StringLengthArgumentConverter() {
-			super(String.class, Integer.class);
+		StringLengthArgumentConverter() {
+			this(String.class, Integer.class);
+		}
+
+		StringLengthArgumentConverter(Class<String> sourceType, Class<Integer> targetType) {
+			super(sourceType, targetType);
 		}
 
 		@Override
 		protected Integer convert(String source) throws ArgumentConversionException {
 			return source.length();
 		}
-
 	}
 
 }

From af6f76b980d95273047d6f27b1feec4b43517f00 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 16:54:32 +0200
Subject: [PATCH 0415/1433] Support conversion of null source value in
 TypedArgumentConverter

Prior to this commit, if a concrete subclass of TypedArgumentConverter
was supplied a `null` source value, the convert(Object, ParameterContext)
method in TypedArgumentConverter threw a NullPointerException.

This commit ensures that TypedArgumentConverter supports the conversion
of a `null` source value in parameterized tests by delegating
immediately to the protected convert(S) method with a value of `null`,
thereby avoiding a NullPointerException.

Note, however, that concrete subclasses of TypedArgumentConverter must
properly support the conversion of `null` into the configured target
type.

Fixes #2682
---
 .../release-notes/release-notes-5.8.0-M2.adoc    |  2 ++
 .../params/converter/TypedArgumentConverter.java |  3 +++
 .../converter/TypedArgumentConverterTests.java   | 16 ++++++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 72401b1f4cda..4ff68117dee8 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -60,6 +60,8 @@ on GitHub.
 * The `IndicativeSentences` `DisplayNameGenerator` no longer includes the display name of
   the enclosing class when generating an _indicative sentence_ if the enclosing class is
   not configured to use the `IndicativeSentences` display name generator as well.
+* The `TypedArgumentConverter` base class now supports the conversion of a `null` source
+  value in parameterized tests.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index 4f3b780ee715..452b72849e4a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -40,6 +40,9 @@ protected TypedArgumentConverter(Class<S> sourceType, Class<T> targetType) {
 
 	@Override
 	public final Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+		if (source == null) {
+			return convert(null);
+		}
 		if (!this.sourceType.isAssignableFrom(source.getClass())) {
 			throw new ArgumentConversionException("Can only convert objects of type " + this.sourceType.getName());
 		}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
index e3b35d31ae18..033d3d5349cc 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
@@ -15,6 +15,8 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullSource;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**
@@ -42,7 +44,8 @@ void preconditions() {
 	void convertsSourceToTarget() {
 		assertAll(//
 			() -> assertConverts("abcd", 4), //
-			() -> assertConverts("", 0) //
+			() -> assertConverts("", 0), //
+			() -> assertConverts(null, 0)//
 		);
 	}
 
@@ -51,6 +54,15 @@ private void assertConverts(String input, int expected) {
 		assertThat(length).isEqualTo(expected);
 	}
 
+	/**
+	 * @since 5.8
+	 */
+	@ParameterizedTest
+	@NullSource
+	void nullSourceIntegrationTest(@ConvertWith(StringLengthArgumentConverter.class) int length) {
+		assertThat(length).isEqualTo(0);
+	}
+
 	private static class StringLengthArgumentConverter extends TypedArgumentConverter<String, Integer> {
 
 		StringLengthArgumentConverter() {
@@ -63,7 +75,7 @@ private static class StringLengthArgumentConverter extends TypedArgumentConverte
 
 		@Override
 		protected Integer convert(String source) throws ArgumentConversionException {
-			return source.length();
+			return (source != null ? source.length() : 0);
 		}
 	}
 

From 6f68306fd8cac3349c604fb1392db2469aa63801 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 17:12:29 +0200
Subject: [PATCH 0416/1433] Document TypedArgumentConverter constructor's
 contract

---
 .../converter/TypedArgumentConverter.java     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index 452b72849e4a..f7f04f347f96 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -17,11 +17,11 @@
 import org.junit.platform.commons.util.Preconditions;
 
 /**
- * {@code TypedArgumentConverter} is an {@code ArgumentConverter} that
- * always converts a given type to another.
+ * {@code TypedArgumentConverter} is an {@code ArgumentConverter} that always
+ * converts objects of a given source type into a given target type.
  *
- * @param <S> the type of the argument to convert
- * @param <T> the type of the target
+ * @param <S> the type of the source argument to convert
+ * @param <T> the type of the target object to create from the source
  * @since 5.7
  * @see ArgumentConverter
  */
@@ -31,11 +31,16 @@ public abstract class TypedArgumentConverter<S, T> implements ArgumentConverter
 	private final Class<S> sourceType;
 	private final Class<T> targetType;
 
+	/**
+	 * Create a new {@codeTypedArgumentConverter}.
+	 *
+	 * @param sourceType the type of the argument to convert; never {@code null}
+	 * @param targetType the type of the target object to create from the source;
+	 * never {@code null}
+	 */
 	protected TypedArgumentConverter(Class<S> sourceType, Class<T> targetType) {
-		Preconditions.notNull(sourceType, "sourceType must not be null");
-		Preconditions.notNull(targetType, "targetType must not be null");
-		this.sourceType = sourceType;
-		this.targetType = targetType;
+		this.sourceType = Preconditions.notNull(sourceType, "sourceType must not be null");
+		this.targetType = Preconditions.notNull(targetType, "targetType must not be null");
 	}
 
 	@Override

From b43b11eeb5f9e466b7f8f101adf8c2b5261aa989 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 10 Aug 2021 17:32:39 +0200
Subject: [PATCH 0417/1433] Improve Javadoc for ArgumentConverter and abstract
 implementations

---
 .../params/converter/ArgumentConverter.java        | 14 ++++++++++----
 .../params/converter/SimpleArgumentConverter.java  |  7 +++++--
 .../params/converter/TypedArgumentConverter.java   | 11 +++++++----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
index 3baf3a5760f4..7eb1ae4f7b02 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
@@ -24,20 +24,26 @@
  * method with the help of a
  * {@link org.junit.jupiter.params.converter.ConvertWith @ConvertWith} annotation.
  *
- * <p>See {@link SimpleArgumentConverter} in case your implementation only needs
- * to know about the target type instead of the complete
- * {@link ParameterContext}.
- *
  * <p>Implementations must provide a no-args constructor and should not make any
  * assumptions regarding when they are instantiated or how often they are called.
  * Since instances may potentially be cached and called from different threads,
  * they should be thread-safe and designed to be used as singletons.
  *
+ * <p>Extend {@link SimpleArgumentConverter} if your implementation only needs
+ * to know the target type and does not need access to the {@link ParameterContext}
+ * to perform the conversion.
+ *
+ * <p>Extend {@link TypedArgumentConverter} if your implementation always converts
+ * from a given source type into a given target type and does not need access to
+ * the {@link ParameterContext} to perform the conversion.
+ *
  * @since 5.0
  * @see SimpleArgumentConverter
  * @see org.junit.jupiter.params.ParameterizedTest
  * @see org.junit.jupiter.params.converter.ConvertWith
  * @see org.junit.jupiter.params.support.AnnotationConsumer
+ * @see SimpleArgumentConverter
+ * @see TypedArgumentConverter
  */
 @API(status = STABLE, since = "5.7")
 public interface ArgumentConverter {
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
index 9832592a2146..e8d0116fae29 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
@@ -16,11 +16,14 @@
 import org.junit.jupiter.api.extension.ParameterContext;
 
 /**
- * {@code SimpleArgumentConverter} is an abstract base class for {@link ArgumentConverter}
- * implementations.
+ * {@code SimpleArgumentConverter} is an abstract base class for
+ * {@link ArgumentConverter} implementations that only need to know the target
+ * type and do not need access to the {@link ParameterContext} to perform the
+ * conversion.
  *
  * @since 5.0
  * @see ArgumentConverter
+ * @see TypedArgumentConverter
  */
 @API(status = STABLE, since = "5.7")
 public abstract class SimpleArgumentConverter implements ArgumentConverter {
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index f7f04f347f96..9f797e114791 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -17,13 +17,15 @@
 import org.junit.platform.commons.util.Preconditions;
 
 /**
- * {@code TypedArgumentConverter} is an {@code ArgumentConverter} that always
- * converts objects of a given source type into a given target type.
+ * {@code TypedArgumentConverter} is an abstract base class for
+ * {@link ArgumentConverter} implementations that always convert objects of a
+ * given source type into a given target type.
  *
  * @param <S> the type of the source argument to convert
  * @param <T> the type of the target object to create from the source
  * @since 5.7
  * @see ArgumentConverter
+ * @see SimpleArgumentConverter
  */
 @API(status = EXPERIMENTAL, since = "5.7")
 public abstract class TypedArgumentConverter<S, T> implements ArgumentConverter {
@@ -62,8 +64,9 @@ public final Object convert(Object source, ParameterContext context) throws Argu
 	 * of type {@code T}.
 	 *
 	 * @param source the source object to convert; may be {@code null}
-	 * @return the converted object
-	 * @throws ArgumentConversionException in case an error occurs during the
+	 * @return the converted object; may be {@code null} but only if the target
+	 * type is a reference type
+	 * @throws ArgumentConversionException if an error occurs during the
 	 * conversion
 	 */
 	protected abstract T convert(S source) throws ArgumentConversionException;

From c01814303e445910e0e884849d4660a4b3b7e18d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 11 Aug 2021 10:45:51 +0200
Subject: [PATCH 0418/1433] Fix Javadoc tag in TypedArgumentConverter

---
 .../junit/jupiter/params/converter/TypedArgumentConverter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index 9f797e114791..c48d1a52b8a7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -34,7 +34,7 @@ public abstract class TypedArgumentConverter<S, T> implements ArgumentConverter
 	private final Class<T> targetType;
 
 	/**
-	 * Create a new {@codeTypedArgumentConverter}.
+	 * Create a new {@code TypedArgumentConverter}.
 	 *
 	 * @param sourceType the type of the argument to convert; never {@code null}
 	 * @param targetType the type of the target object to create from the source;

From a0dd37160c81167ac05376888debb64b00315dc9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 11 Aug 2021 11:54:54 +0200
Subject: [PATCH 0419/1433] Introduce
 ReflectionUtils.isAssignableTo(Class,Class)

This is similar to isAssignableTo(Object,Class), but the new method can
be used when a source object is not available.

This is a prerequisite for #2685.
---
 .../commons/util/ReflectionUtils.java         |  37 ++++
 .../commons/util/ReflectionUtilsTests.java    | 172 +++++++++++++-----
 2 files changed, 160 insertions(+), 49 deletions(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index da12cd70032e..e359120257b6 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -364,6 +364,42 @@ public static boolean isMultidimensionalArray(Object obj) {
 		return (obj != null && obj.getClass().isArray() && obj.getClass().getComponentType().isArray());
 	}
 
+	/**
+	 * Determine if an object of the supplied source type can be assigned to the
+	 * supplied target type for the purpose of reflective method invocations.
+	 *
+	 * <p>In contrast to {@link Class#isAssignableFrom(Class)}, this method
+	 * returns {@code true} if the target type represents a primitive type whose
+	 * wrapper matches the supplied source type. In addition, this method
+	 * also supports
+	 * <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-5.html#jls-5.1.2">
+	 * widening conversions</a> for primitive target types.
+	 *
+	 * @param sourceType the non-primitive target type; never {@code null}
+	 * @param targetType the target type; never {@code null}
+	 * @return {@code true} if an object of the source type is assignment compatible
+	 * with the target type
+	 * @since 1.8
+	 * @see Class#isInstance(Object)
+	 * @see Class#isAssignableFrom(Class)
+	 * @see #isAssignableTo(Object, Class)
+	 */
+	public static boolean isAssignableTo(Class<?> sourceType, Class<?> targetType) {
+		Preconditions.notNull(sourceType, "source type must not be null");
+		Preconditions.condition(!sourceType.isPrimitive(), "source type must not be a primitive type");
+		Preconditions.notNull(targetType, "target type must not be null");
+
+		if (targetType.isAssignableFrom(sourceType)) {
+			return true;
+		}
+
+		if (targetType.isPrimitive()) {
+			return sourceType == primitiveToWrapperMap.get(targetType) || isWideningConversion(sourceType, targetType);
+		}
+
+		return false;
+	}
+
 	/**
 	 * Determine if the supplied object can be assigned to the supplied target
 	 * type for the purpose of reflective method invocations.
@@ -384,6 +420,7 @@ public static boolean isMultidimensionalArray(Object obj) {
 	 * @return {@code true} if the object is assignment compatible
 	 * @see Class#isInstance(Object)
 	 * @see Class#isAssignableFrom(Class)
+	 * @see #isAssignableTo(Class, Class)
 	 */
 	public static boolean isAssignableTo(Object obj, Class<?> targetType) {
 		Preconditions.notNull(targetType, "target type must not be null");
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 58f9775a39ed..08fc346820db 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -46,6 +46,7 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.jupiter.api.io.TempDir;
@@ -279,47 +280,136 @@ void tryToReadFieldValueOfExistingInstanceField() throws Exception {
 		assertThrows(PreconditionViolationException.class, () -> tryToReadFieldValue(field, null).get());
 	}
 
-	@Test
-	void isAssignableToForNullClass() {
-		assertThrows(PreconditionViolationException.class, () -> ReflectionUtils.isAssignableTo(new Object(), null));
+	@Nested
+	class IsClassAssignableToClassTests {
+
+		@Test
+		void isAssignableToForNullSourceType() {
+			assertThatExceptionOfType(PreconditionViolationException.class)//
+					.isThrownBy(() -> ReflectionUtils.isAssignableTo(null, getClass()))//
+					.withMessage("source type must not be null");
+		}
+
+		@Test
+		void isAssignableToForPrimitiveSourceType() {
+			assertThatExceptionOfType(PreconditionViolationException.class)//
+					.isThrownBy(() -> ReflectionUtils.isAssignableTo(int.class, Integer.class))//
+					.withMessage("source type must not be a primitive type");
+		}
+
+		@Test
+		void isAssignableToForNullTargetType() {
+			assertThatExceptionOfType(PreconditionViolationException.class)//
+					.isThrownBy(() -> ReflectionUtils.isAssignableTo(getClass(), null))//
+					.withMessage("target type must not be null");
+		}
+
+		@Test
+		void isAssignableTo() {
+			// Reference Types
+			assertTrue(ReflectionUtils.isAssignableTo(String.class, Object.class));
+			assertTrue(ReflectionUtils.isAssignableTo(String.class, CharSequence.class));
+			assertTrue(ReflectionUtils.isAssignableTo(String.class, String.class));
+			assertTrue(ReflectionUtils.isAssignableTo(Integer.class, Number.class));
+			assertTrue(ReflectionUtils.isAssignableTo(Integer.class, Integer.class));
+
+			assertFalse(ReflectionUtils.isAssignableTo(Object.class, String.class));
+			assertFalse(ReflectionUtils.isAssignableTo(CharSequence.class, String.class));
+			assertFalse(ReflectionUtils.isAssignableTo(Number.class, Integer.class));
+
+			// Arrays
+			assertTrue(ReflectionUtils.isAssignableTo(int[].class, int[].class));
+			assertTrue(ReflectionUtils.isAssignableTo(double[].class, double[].class));
+			assertTrue(ReflectionUtils.isAssignableTo(double[].class, Object.class));
+			assertTrue(ReflectionUtils.isAssignableTo(String[].class, Object.class));
+			assertTrue(ReflectionUtils.isAssignableTo(String[].class, Object[].class));
+			assertTrue(ReflectionUtils.isAssignableTo(String[].class, String[].class));
+
+			// Wrappers to Primitives
+			assertTrue(ReflectionUtils.isAssignableTo(Integer.class, int.class));
+			assertTrue(ReflectionUtils.isAssignableTo(Boolean.class, boolean.class));
+
+			// Widening Conversions from Wrappers to Primitives
+			assertTrue(ReflectionUtils.isAssignableTo(Integer.class, long.class));
+			assertTrue(ReflectionUtils.isAssignableTo(Float.class, double.class));
+			assertTrue(ReflectionUtils.isAssignableTo(Byte.class, double.class));
+
+			// Widening Conversions from Wrappers to Wrappers (not supported by Java)
+			assertFalse(ReflectionUtils.isAssignableTo(Integer.class, Long.class));
+			assertFalse(ReflectionUtils.isAssignableTo(Float.class, Double.class));
+			assertFalse(ReflectionUtils.isAssignableTo(Byte.class, Double.class));
+
+			// Narrowing Conversions
+			assertFalse(ReflectionUtils.isAssignableTo(Integer.class, char.class));
+			assertFalse(ReflectionUtils.isAssignableTo(Long.class, byte.class));
+			assertFalse(ReflectionUtils.isAssignableTo(Long.class, int.class));
+		}
+
 	}
 
-	@Test
-	void isAssignableTo() {
-		// Reference Types
-		assertTrue(ReflectionUtils.isAssignableTo("string", String.class));
-		assertTrue(ReflectionUtils.isAssignableTo("string", CharSequence.class));
-		assertTrue(ReflectionUtils.isAssignableTo("string", Object.class));
+	@Nested
+	class IsObjectAssignableToClassTests {
+
+		@Test
+		void isAssignableToForNullClass() {
+			assertThrows(PreconditionViolationException.class,
+				() -> ReflectionUtils.isAssignableTo(new Object(), null));
+		}
+
+		@Test
+		void isAssignableTo() {
+			// Reference Types
+			assertTrue(ReflectionUtils.isAssignableTo("string", String.class));
+			assertTrue(ReflectionUtils.isAssignableTo("string", CharSequence.class));
+			assertTrue(ReflectionUtils.isAssignableTo("string", Object.class));
 
-		assertFalse(ReflectionUtils.isAssignableTo(new Object(), String.class));
-		assertFalse(ReflectionUtils.isAssignableTo(Integer.valueOf("1"), StringBuilder.class));
-		assertFalse(ReflectionUtils.isAssignableTo(new StringBuilder(), String.class));
+			assertFalse(ReflectionUtils.isAssignableTo(new Object(), String.class));
+			assertFalse(ReflectionUtils.isAssignableTo(Integer.valueOf("1"), StringBuilder.class));
+			assertFalse(ReflectionUtils.isAssignableTo(new StringBuilder(), String.class));
 
-		// Arrays
-		assertTrue(ReflectionUtils.isAssignableTo(new int[0], int[].class));
-		assertTrue(ReflectionUtils.isAssignableTo(new double[0], Object.class));
-		assertTrue(ReflectionUtils.isAssignableTo(new String[0], String[].class));
-		assertTrue(ReflectionUtils.isAssignableTo(new String[0], Object.class));
+			// Arrays
+			assertTrue(ReflectionUtils.isAssignableTo(new int[0], int[].class));
+			assertTrue(ReflectionUtils.isAssignableTo(new double[0], Object.class));
+			assertTrue(ReflectionUtils.isAssignableTo(new String[0], String[].class));
+			assertTrue(ReflectionUtils.isAssignableTo(new String[0], Object.class));
 
-		// Primitive Types
-		assertTrue(ReflectionUtils.isAssignableTo(1, int.class));
-		assertTrue(ReflectionUtils.isAssignableTo(Long.valueOf("1"), long.class));
-		assertTrue(ReflectionUtils.isAssignableTo(Boolean.TRUE, boolean.class));
+			// Primitive Types
+			assertTrue(ReflectionUtils.isAssignableTo(1, int.class));
+			assertTrue(ReflectionUtils.isAssignableTo(Long.valueOf("1"), long.class));
+			assertTrue(ReflectionUtils.isAssignableTo(Boolean.TRUE, boolean.class));
+
+			// Widening Conversions to Primitives
+			assertTrue(ReflectionUtils.isAssignableTo(1, long.class));
+			assertTrue(ReflectionUtils.isAssignableTo(1f, double.class));
+			assertTrue(ReflectionUtils.isAssignableTo((byte) 1, double.class));
+
+			// Widening Conversions to Wrappers (not supported by Java)
+			assertFalse(ReflectionUtils.isAssignableTo(1, Long.class));
+			assertFalse(ReflectionUtils.isAssignableTo(1f, Double.class));
+			assertFalse(ReflectionUtils.isAssignableTo((byte) 1, Double.class));
+
+			// Narrowing Conversions
+			assertFalse(ReflectionUtils.isAssignableTo(1, char.class));
+			assertFalse(ReflectionUtils.isAssignableTo(1L, byte.class));
+			assertFalse(ReflectionUtils.isAssignableTo(1L, int.class));
+		}
 
-		// Widening Conversions to Primitives
-		assertTrue(ReflectionUtils.isAssignableTo(1, long.class));
-		assertTrue(ReflectionUtils.isAssignableTo(1f, double.class));
-		assertTrue(ReflectionUtils.isAssignableTo((byte) 1, double.class));
+		@Test
+		void isAssignableToForNullObject() {
+			assertTrue(ReflectionUtils.isAssignableTo((Object) null, Object.class));
+			assertTrue(ReflectionUtils.isAssignableTo((Object) null, String.class));
+			assertTrue(ReflectionUtils.isAssignableTo((Object) null, Long.class));
+			assertTrue(ReflectionUtils.isAssignableTo((Object) null, Character[].class));
+		}
 
-		// Widening Conversions to Wrappers (not supported by Java)
-		assertFalse(ReflectionUtils.isAssignableTo(1, Long.class));
-		assertFalse(ReflectionUtils.isAssignableTo(1f, Double.class));
-		assertFalse(ReflectionUtils.isAssignableTo((byte) 1, Double.class));
+		@Test
+		void isAssignableToForNullObjectAndPrimitive() {
+			assertFalse(ReflectionUtils.isAssignableTo((Object) null, byte.class));
+			assertFalse(ReflectionUtils.isAssignableTo((Object) null, int.class));
+			assertFalse(ReflectionUtils.isAssignableTo((Object) null, long.class));
+			assertFalse(ReflectionUtils.isAssignableTo((Object) null, boolean.class));
+		}
 
-		// Narrowing Conversions
-		assertFalse(ReflectionUtils.isAssignableTo(1, char.class));
-		assertFalse(ReflectionUtils.isAssignableTo(1L, byte.class));
-		assertFalse(ReflectionUtils.isAssignableTo(1L, int.class));
 	}
 
 	@Test
@@ -389,22 +479,6 @@ void wideningConversion() {
 		assertFalse(ReflectionUtils.isWideningConversion(String.class, int.class)); // neither a primitive nor a wrapper
 	}
 
-	@Test
-	void isAssignableToForNullObject() {
-		assertTrue(ReflectionUtils.isAssignableTo(null, Object.class));
-		assertTrue(ReflectionUtils.isAssignableTo(null, String.class));
-		assertTrue(ReflectionUtils.isAssignableTo(null, Long.class));
-		assertTrue(ReflectionUtils.isAssignableTo(null, Character[].class));
-	}
-
-	@Test
-	void isAssignableToForNullObjectAndPrimitive() {
-		assertFalse(ReflectionUtils.isAssignableTo(null, byte.class));
-		assertFalse(ReflectionUtils.isAssignableTo(null, int.class));
-		assertFalse(ReflectionUtils.isAssignableTo(null, long.class));
-		assertFalse(ReflectionUtils.isAssignableTo(null, boolean.class));
-	}
-
 	@Test
 	void invokeMethodPreconditions() {
 		// @formatter:off

From a02182439933a2a639c5e828d73eb6533a9783f0 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 11 Aug 2021 13:06:18 +0200
Subject: [PATCH 0420/1433] Ensure TypedArgumentConverter can convert to a
 primitive

Prior to this commit, a TypedArgumentConverter would throw an
ArgumentConversionException when attempting to convert from a wrapper
type to its corresponding primitive type (for example, from Integer to
int), even though Java reflection APIs permit such an invocation for a
method.

This commit fixes this by checking for compatibility using the new
ReflectionUtils.isAssignableTo(Class,Class) method introduced in
commit a0dd37160c81167ac05376888debb64b00315dc9.

This commit also improves the error messages for source and target
compatibility failures in TypedArgumentConverter.

Fixes: #2685
---
 .../release-notes/release-notes-5.8.0-M2.adoc |   3 +
 .../converter/TypedArgumentConverter.java     |  14 +-
 .../TypedArgumentConverterTests.java          | 150 ++++++++++++++----
 3 files changed, 135 insertions(+), 32 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 4ff68117dee8..1a78f6c0a1a6 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -62,6 +62,9 @@ on GitHub.
   not configured to use the `IndicativeSentences` display name generator as well.
 * The `TypedArgumentConverter` base class now supports the conversion of a `null` source
   value in parameterized tests.
+* The `TypedArgumentConverter` base class now supports conversion to a primitive type if
+  the configured target type is a wrapper for the target primitive type, including
+  primitive widening support -- for example, from `Integer` to `int` or `long`.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index c48d1a52b8a7..904e1aad3a39 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -15,6 +15,7 @@
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
  * {@code TypedArgumentConverter} is an abstract base class for
@@ -50,11 +51,16 @@ public final Object convert(Object source, ParameterContext context) throws Argu
 		if (source == null) {
 			return convert(null);
 		}
-		if (!this.sourceType.isAssignableFrom(source.getClass())) {
-			throw new ArgumentConversionException("Can only convert objects of type " + this.sourceType.getName());
+		if (!this.sourceType.isInstance(source)) {
+			String message = String.format(
+				"%s cannot convert objects of type [%s]. Only source objects of type [%s] are supported.",
+				getClass().getSimpleName(), source.getClass().getName(), this.sourceType.getName());
+			throw new ArgumentConversionException(message);
 		}
-		if (!this.targetType.isAssignableFrom(context.getParameter().getType())) {
-			throw new ArgumentConversionException("Can only convert to type " + this.targetType.getName());
+		if (!ReflectionUtils.isAssignableTo(this.targetType, context.getParameter().getType())) {
+			String message = String.format("%s cannot convert to type [%s]. Only target type [%s] is supported.",
+				getClass().getSimpleName(), context.getParameter().getType().getName(), this.targetType.getName());
+			throw new ArgumentConversionException(message);
 		}
 		return convert(this.sourceType.cast(source));
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
index 033d3d5349cc..1302b2810f8c 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
@@ -13,11 +13,24 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.mockito.Mockito.when;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.util.ReflectionUtils;
+import org.mockito.Mockito;
 
 /**
  * Tests for {@link TypedArgumentConverter}.
@@ -26,41 +39,122 @@
  */
 class TypedArgumentConverterTests {
 
-	/**
-	 * @since 5.8
-	 */
-	@Test
-	void preconditions() {
-		assertThatExceptionOfType(PreconditionViolationException.class)//
-				.isThrownBy(() -> new StringLengthArgumentConverter(null, Integer.class))//
-				.withMessage("sourceType must not be null");
-
-		assertThatExceptionOfType(PreconditionViolationException.class)//
-				.isThrownBy(() -> new StringLengthArgumentConverter(String.class, null))//
-				.withMessage("targetType must not be null");
-	}
+	@Nested
+	class UnitTests {
 
-	@Test
-	void convertsSourceToTarget() {
-		assertAll(//
-			() -> assertConverts("abcd", 4), //
-			() -> assertConverts("", 0), //
-			() -> assertConverts(null, 0)//
-		);
-	}
+		private final StringLengthArgumentConverter converter = new StringLengthArgumentConverter();
+
+		/**
+		 * @since 5.8
+		 */
+		@Test
+		void preconditions() {
+			assertThatExceptionOfType(PreconditionViolationException.class)//
+					.isThrownBy(() -> new StringLengthArgumentConverter(null, Integer.class))//
+					.withMessage("sourceType must not be null");
+
+			assertThatExceptionOfType(PreconditionViolationException.class)//
+					.isThrownBy(() -> new StringLengthArgumentConverter(String.class, null))//
+					.withMessage("targetType must not be null");
+		}
+
+		@Test
+		void convertsSourceToTarget() {
+			assertAll(//
+				() -> assertConverts("abcd", 4), //
+				() -> assertConverts("", 0), //
+				() -> assertConverts(null, 0)//
+			);
+		}
+
+		private void assertConverts(String input, int expected) {
+			assertThat(this.converter.convert(input)).isEqualTo(expected);
+		}
+
+		@Test
+		void sourceTypeMismatch() {
+			Parameter parameter = findParameterOfMethod("stringToBoolean", Boolean.class);
+			ParameterContext parameterContext = parameterContext(parameter);
+			assertThatExceptionOfType(ArgumentConversionException.class)//
+					.isThrownBy(() -> this.converter.convert(Boolean.TRUE, parameterContext))//
+					.withMessage("StringLengthArgumentConverter cannot convert objects of type [java.lang.Boolean]. "
+							+ "Only source objects of type [java.lang.String] are supported.");
+		}
+
+		@Test
+		void targetTypeMismatch() {
+			Parameter parameter = findParameterOfMethod("stringToBoolean", Boolean.class);
+			ParameterContext parameterContext = parameterContext(parameter);
+			assertThatExceptionOfType(ArgumentConversionException.class)//
+					.isThrownBy(() -> this.converter.convert("enigma", parameterContext))//
+					.withMessage("StringLengthArgumentConverter cannot convert to type [java.lang.Boolean]. "
+							+ "Only target type [java.lang.Integer] is supported.");
+		}
+
+		private ParameterContext parameterContext(Parameter parameter) {
+			ParameterContext parameterContext = Mockito.mock(ParameterContext.class);
+			when(parameterContext.getParameter()).thenReturn(parameter);
+			return parameterContext;
+		}
+
+		private Parameter findParameterOfMethod(String methodName, Class<?>... parameterTypes) {
+			Method method = ReflectionUtils.findMethod(getClass(), methodName, parameterTypes).get();
+			return method.getParameters()[0];
+		}
+
+		void stringToBoolean(Boolean b) {
+		}
 
-	private void assertConverts(String input, int expected) {
-		int length = new StringLengthArgumentConverter().convert(input);
-		assertThat(length).isEqualTo(expected);
 	}
 
 	/**
 	 * @since 5.8
 	 */
-	@ParameterizedTest
-	@NullSource
-	void nullSourceIntegrationTest(@ConvertWith(StringLengthArgumentConverter.class) int length) {
-		assertThat(length).isEqualTo(0);
+	@Nested
+	class IntegrationTests {
+
+		@ParameterizedTest
+		@NullSource
+		void nullStringToInteger(@StringLength Integer length) {
+			assertThat(length).isEqualTo(0);
+		}
+
+		@ParameterizedTest
+		@NullSource
+		void nullStringToPrimitiveInt(@StringLength int length) {
+			assertThat(length).isEqualTo(0);
+		}
+
+		@ParameterizedTest
+		@NullSource
+		void nullStringToPrimitiveLong(@StringLength long length) {
+			assertThat(length).isEqualTo(0);
+		}
+
+		@ParameterizedTest
+		@ValueSource(strings = "enigma")
+		void stringToInteger(@StringLength Integer length) {
+			assertThat(length).isEqualTo(6);
+		}
+
+		@ParameterizedTest
+		@ValueSource(strings = "enigma")
+		void stringToPrimitiveInt(@StringLength int length) {
+			assertThat(length).isEqualTo(6);
+		}
+
+		@ParameterizedTest
+		@ValueSource(strings = "enigma")
+		void stringToPrimitiveLong(@StringLength long length) {
+			assertThat(length).isEqualTo(6);
+		}
+
+	}
+
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.RUNTIME)
+	@ConvertWith(StringLengthArgumentConverter.class)
+	private @interface StringLength {
 	}
 
 	private static class StringLengthArgumentConverter extends TypedArgumentConverter<String, Integer> {

From 4ab68585928fd925722b17237aa11d9d61f95f68 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 11 Aug 2021 13:26:50 +0200
Subject: [PATCH 0421/1433] Fix TypedArgumentConverter example in User Guide

Issue: #2682
---
 documentation/src/test/java/example/ParameterizedTestDemo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/test/java/example/ParameterizedTestDemo.java b/documentation/src/test/java/example/ParameterizedTestDemo.java
index 8e1f851fc8a3..bcd0f0a12668 100644
--- a/documentation/src/test/java/example/ParameterizedTestDemo.java
+++ b/documentation/src/test/java/example/ParameterizedTestDemo.java
@@ -347,7 +347,7 @@ protected ToLengthArgumentConverter() {
 
 		@Override
 		protected Integer convert(String source) {
-			return source.length();
+			return (source != null ? source.length() : 0);
 		}
 
 	}

From 69a196b7bdcb463707845f5066a5e3e679cf0cce Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 11 Aug 2021 13:54:52 +0200
Subject: [PATCH 0422/1433] Polishing

---
 .../commons/AdditionalDiscoverySelectors.java    | 16 ++++++++--------
 .../SuiteLauncherDiscoveryRequestBuilder.java    |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
index 6e32077081a7..b8bc45165d0a 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -11,12 +11,12 @@
 package org.junit.platform.suite.commons;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.ClasspathResourceSelector;
 import org.junit.platform.engine.discovery.DirectorySelector;
@@ -33,12 +33,12 @@
 class AdditionalDiscoverySelectors {
 
 	static List<UriSelector> selectUris(String... uris) {
-		Preconditions.notNull(uris, "Uris must not be null");
-		Preconditions.containsNoNullElements(uris, "Individual uris must not be null");
+		Preconditions.notNull(uris, "URI list must not be null");
+		Preconditions.containsNoNullElements(uris, "Individual URIs must not be null");
 
 		// @formatter:off
 		return uniqueStreamOf(uris)
-				.filter(s -> !s.isEmpty())
+				.filter(StringUtils::isNotBlank)
 				.map(DiscoverySelectors::selectUri)
 				.collect(Collectors.toList());
 		// @formatter:on
@@ -50,7 +50,7 @@ static List<DirectorySelector> selectDirectories(String... paths) {
 
 		// @formatter:off
 		return uniqueStreamOf(paths)
-				.filter(s -> !s.isEmpty())
+				.filter(StringUtils::isNotBlank)
 				.map(DiscoverySelectors::selectDirectory)
 				.collect(Collectors.toList());
 		// @formatter:on
@@ -69,7 +69,7 @@ static List<PackageSelector> selectPackages(String... packageNames) {
 
 	static List<ClassSelector> selectClasses(Class<?>... classes) {
 		Preconditions.notNull(classes, "classes must not be null");
-		Preconditions.containsNoNullElements(classes, "individual classes must not be null");
+		Preconditions.containsNoNullElements(classes, "Individual classes must not be null");
 
 		// @formatter:off
 		return uniqueStreamOf(classes)
@@ -80,7 +80,7 @@ static List<ClassSelector> selectClasses(Class<?>... classes) {
 
 	static List<ModuleSelector> selectModules(String... moduleNames) {
 		Preconditions.notNull(moduleNames, "Module names must not be null");
-		Preconditions.containsNoNullElements(moduleNames, "Individual module name must not be null");
+		Preconditions.containsNoNullElements(moduleNames, "Individual module names must not be null");
 
 		return DiscoverySelectors.selectModules(uniqueStreamOf(moduleNames).collect(Collectors.toSet()));
 	}
@@ -110,7 +110,7 @@ static ClasspathResourceSelector selectClasspathResource(String classpathResourc
 	}
 
 	private static <T> Stream<T> uniqueStreamOf(T[] packageNames) {
-		return new LinkedHashSet<>(Arrays.asList(packageNames)).stream();
+		return Arrays.stream(packageNames).distinct();
 	}
 
 }
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index 66678b4b6580..91e96de72634 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -65,7 +65,6 @@ public final class SuiteLauncherDiscoveryRequestBuilder {
 	private boolean filterStandardClassNamePatterns = false;
 
 	private SuiteLauncherDiscoveryRequestBuilder() {
-
 	}
 
 	public static SuiteLauncherDiscoveryRequestBuilder request() {
@@ -121,9 +120,9 @@ public SuiteLauncherDiscoveryRequestBuilder suite(AnnotatedElement suite) {
 		findAnnotationValues(suite, IncludeClassNamePatterns.class, IncludeClassNamePatterns::value)
 				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
 				.map(ClassNameFilter::includeClassNamePatterns)
-				.ifPresent(filters ->{
+				.ifPresent(filters -> {
 					includeClassNamePatternsUsed = true;
-					this.filters(filters);
+					filters(filters);
 				});
 		findAnnotationValues(suite, IncludeEngines.class, IncludeEngines::value)
 				.map(EngineFilter::includeEngines)

From c6f868d6f1122344f1e42858b5985da90b4b38d3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 11 Aug 2021 15:33:02 +0200
Subject: [PATCH 0423/1433] Polishing

---
 .../junit/platform/runner/JUnitPlatform.java  |  4 +-
 .../SuiteLauncherDiscoveryRequestBuilder.java |  4 +-
 ...eLauncherDiscoveryRequestBuilderTests.java | 55 +++++++++----------
 3 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index a750594af635..adc47426c3cd 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -172,13 +172,13 @@ private LauncherDiscoveryRequest createDiscoveryRequest() {
 	private boolean isSuite() {
 		// @formatter:off
 		return IMPLICIT_SUITE_ANNOTATIONS.stream()
-				.anyMatch(annotation -> isAnnotated(testClass, annotation));
+				.anyMatch(annotation -> isAnnotated(this.testClass, annotation));
 		// @formatter:on
 	}
 
 	@Override
 	public void filter(Filter filter) throws NoTestsRemainException {
-		Set<TestIdentifier> filteredIdentifiers = testTree.getFilteredLeaves(filter);
+		Set<TestIdentifier> filteredIdentifiers = this.testTree.getFilteredLeaves(filter);
 		if (filteredIdentifiers.isEmpty()) {
 			throw new NoTestsRemainException();
 		}
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index 91e96de72634..fef36d67b3e2 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.suite.commons;
 
-import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
-import static org.junit.platform.commons.support.AnnotationSupport.findRepeatableAnnotations;
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
+import static org.junit.platform.commons.util.AnnotationUtils.findRepeatableAnnotations;
 import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
 import static org.junit.platform.suite.commons.AdditionalDiscoverySelectors.selectClasspathResource;
 import static org.junit.platform.suite.commons.AdditionalDiscoverySelectors.selectFile;
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index 732008e6f824..6de3d3ba2baa 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -68,8 +68,8 @@ class SuiteLauncherDiscoveryRequestBuilderTests {
 	void configurationParameter() {
 		@ConfigurationParameter(key = "com.example", value = "*")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		ConfigurationParameters configuration = request.getConfigurationParameters();
 		Optional<String> parameter = configuration.get("com.example");
@@ -79,12 +79,11 @@ class Suite {
 	@Test
 	void excludeClassNamePatterns() {
 		class TestCase {
-
 		}
 		@ExcludeClassNamePatterns("^.*TestCase$")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
 		assertTrue(exactlyOne(filters).apply(TestCase.class.getName()).excluded());
@@ -94,8 +93,8 @@ class Suite {
 	void excludeEngines() {
 		@ExcludeEngines("junit-jupiter")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<EngineFilter> filters = request.getEngineFilters();
 		assertTrue(exactlyOne(filters).apply(new JupiterTestEngine()).excluded());
@@ -105,8 +104,8 @@ class Suite {
 	void excludePackages() {
 		@ExcludePackages("com.example.testcases")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<PackageNameFilter> filters = request.getFiltersByType(PackageNameFilter.class);
 		assertTrue(exactlyOne(filters).apply("com.example.testcases").excluded());
@@ -116,8 +115,8 @@ class Suite {
 	void excludeTags() {
 		@ExcludeTags("test-tag")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<PostDiscoveryFilter> filters = request.getPostDiscoveryFilters();
 		TestDescriptor testDescriptor = new StubAbstractTestDescriptor();
@@ -127,12 +126,11 @@ class Suite {
 	@Test
 	void includeClassNamePatterns() {
 		class TestCase {
-
 		}
 		@IncludeClassNamePatterns("^.*TestCase$")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<ClassNameFilter> filters = request.getFiltersByType(ClassNameFilter.class);
 		assertTrue(exactlyOne(filters).apply(TestCase.class.getName()).included());
@@ -142,8 +140,8 @@ class Suite {
 	@Test
 	void filtersOnStandardClassNamePatternsWhenIncludeClassNamePatternsIsOmitted() {
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		assertTrue(request.getFiltersByType(ClassNameFilter.class).isEmpty());
 	}
@@ -151,11 +149,10 @@ class Suite {
 	@Test
 	void filtersOnStandardClassNamePatternsWhenIncludeClassNamePatternsIsOmittedUnlessDisabled() {
 		class ExampleTest {
-
 		}
 		class Suite {
-
 		}
+
 		// @formatter:off
 		LauncherDiscoveryRequest request = builder
 				.filterStandardClassNamePatterns(true)
@@ -171,8 +168,8 @@ class Suite {
 	void includeEngines() {
 		@IncludeEngines("junit-jupiter")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<EngineFilter> filters = request.getEngineFilters();
 		assertTrue(exactlyOne(filters).apply(new JupiterTestEngine()).included());
@@ -182,8 +179,8 @@ class Suite {
 	void includePackages() {
 		@IncludePackages("com.example.testcases")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<PackageNameFilter> filters = request.getFiltersByType(PackageNameFilter.class);
 		assertTrue(exactlyOne(filters).apply("com.example.testcases").included());
@@ -193,8 +190,8 @@ class Suite {
 	void includeTags() {
 		@IncludeTags("test-tag")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<PostDiscoveryFilter> filters = request.getPostDiscoveryFilters();
 		TestDescriptor testDescriptor = new StubAbstractTestDescriptor();
@@ -204,12 +201,11 @@ class Suite {
 	@Test
 	void selectClasses() {
 		class TestCase {
-
 		}
 		@SelectClasses(TestCase.class)
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<ClassSelector> selectors = request.getSelectorsByType(ClassSelector.class);
 		assertFalse(selectors.isEmpty());
@@ -220,8 +216,8 @@ class Suite {
 	void selectClasspathResource() {
 		@SelectClasspathResource("com.example.testcases")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<ClasspathResourceSelector> selectors = request.getSelectorsByType(ClasspathResourceSelector.class);
 		assertEquals("com.example.testcases", exactlyOne(selectors).getClasspathResourceName());
@@ -232,8 +228,8 @@ void selectClasspathResourcePosition() {
 		@SelectClasspathResource(value = "com.example.testcases", line = 42)
 		@SelectClasspathResource(value = "com.example.testcases", line = 14, column = 15)
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<ClasspathResourceSelector> selectors = request.getSelectorsByType(ClasspathResourceSelector.class);
 		assertEquals(Optional.of(FilePosition.from(42)), selectors.get(0).getPosition());
@@ -246,8 +242,8 @@ void ignoreClasspathResourcePosition() {
 		@SelectClasspathResource(value = "com.example.testcases", column = 12)
 		@SelectClasspathResource(value = "com.example.testcases", line = 42, column = -12)
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<ClasspathResourceSelector> selectors = request.getSelectorsByType(ClasspathResourceSelector.class);
 		assertEquals(Optional.empty(), selectors.get(0).getPosition());
@@ -259,8 +255,8 @@ class Suite {
 	void selectDirectories() {
 		@SelectDirectories("path/to/root")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<DirectorySelector> selectors = request.getSelectorsByType(DirectorySelector.class);
 		assertEquals(Paths.get("path/to/root"), exactlyOne(selectors).getPath());
@@ -270,8 +266,8 @@ class Suite {
 	void selectDirectoriesFiltersEmptyPaths() {
 		@SelectDirectories("")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		assertTrue(request.getSelectorsByType(DirectorySelector.class).isEmpty());
 	}
@@ -280,8 +276,8 @@ class Suite {
 	void selectFile() {
 		@SelectFile("path/to/root")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<FileSelector> selectors = request.getSelectorsByType(FileSelector.class);
 		assertEquals(Paths.get("path/to/root"), exactlyOne(selectors).getPath());
@@ -292,8 +288,8 @@ void selectFilePosition() {
 		@SelectFile(value = "path/to/root", line = 42)
 		@SelectFile(value = "path/to/root", line = 14, column = 15)
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<FileSelector> selectors = request.getSelectorsByType(FileSelector.class);
 		assertEquals(Optional.of(FilePosition.from(42)), selectors.get(0).getPosition());
@@ -306,8 +302,8 @@ void ignoreInvalidFilePosition() {
 		@SelectFile(value = "path/to/root", column = 12)
 		@SelectFile(value = "path/to/root", line = 42, column = -12)
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<FileSelector> selectors = request.getSelectorsByType(FileSelector.class);
 		assertEquals(Optional.empty(), selectors.get(0).getPosition());
@@ -319,8 +315,8 @@ class Suite {
 	void selectModules() {
 		@SelectModules("com.example.testcases")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<ModuleSelector> selectors = request.getSelectorsByType(ModuleSelector.class);
 		assertEquals("com.example.testcases", exactlyOne(selectors).getModuleName());
@@ -330,8 +326,8 @@ class Suite {
 	void selectUris() {
 		@SelectUris("path/to/root")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<UriSelector> selectors = request.getSelectorsByType(UriSelector.class);
 		assertEquals(URI.create("path/to/root"), exactlyOne(selectors).getUri());
@@ -341,8 +337,8 @@ class Suite {
 	void selectUrisFiltersEmptyUris() {
 		@SelectUris("")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		assertTrue(request.getSelectorsByType(UriSelector.class).isEmpty());
 	}
@@ -351,8 +347,8 @@ class Suite {
 	void selectPackages() {
 		@SelectPackages("com.example.testcases")
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<PackageSelector> selectors = request.getSelectorsByType(PackageSelector.class);
 		assertEquals("com.example.testcases", exactlyOne(selectors).getPackageName());
@@ -361,15 +357,14 @@ class Suite {
 	@SelectPackages("com.example.testcases")
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface Meta {
-
 	}
 
 	@Test
 	void metaAnnotations() {
 		@Meta
 		class Suite {
-
 		}
+
 		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
 		List<PackageSelector> pSelectors = request.getSelectorsByType(PackageSelector.class);
 		assertEquals("com.example.testcases", exactlyOne(pSelectors).getPackageName());

From 3dce5849243fca6df74c154502eb6b3e1423daa8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 11 Aug 2021 16:17:15 +0200
Subject: [PATCH 0424/1433] Always include classes selected via @SelectClasses
 in suites

Prior to this commit, if a @Suite class running via the SuiteTestEngine
or a suite class running via the JUnitPlatform Runner used
@SelectClasses (without using a corresponding @IncludeClassNamePatterns
declaration for custom class name patterns) to explicitly select a
class whose name did not match the default class name include patterns,
the selected class was filtered out and never executed with the suite.

This commit ensures that classes selected via @SelectClasses are always
included in the suite by revising the implementation of
SuiteLauncherDiscoveryRequestBuilder so that it tracks classes selected
via @SelectClasses and automatically adds them to the
IncludeClassNameFilter used by the suite.

Fixes: #2412
See also: #2683
---
 .../release-notes/release-notes-5.8.0-M2.adoc |   4 +-
 .../SuiteLauncherDiscoveryRequestBuilder.java |  66 ++++++++----
 .../runner/JUnitPlatformRunnerTests.java      | 101 ++++++++++++------
 .../engine/testsuites/MultipleSuite.java      |   2 -
 .../engine/testsuites/SelectClassesSuite.java |   2 -
 .../testsuites/SuiteDisplayNameSuite.java     |   2 -
 6 files changed, 116 insertions(+), 61 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 1a78f6c0a1a6..ad4576ee1d83 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -22,7 +22,9 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Classes explicitly selected via `@SelectClasses` are now always included in the test
+  suite. This applies to `@Suite` classes running via the `SuiteTestEngine` and suite
+  classes running via the `JUnitPlatform` `Runner`.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index fef36d67b3e2..8386f48e923d 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -18,11 +18,14 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
 import org.apiguardian.api.API.Status;
@@ -31,6 +34,7 @@
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.engine.Filter;
 import org.junit.platform.engine.discovery.ClassNameFilter;
+import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.PackageNameFilter;
 import org.junit.platform.launcher.EngineFilter;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
@@ -61,6 +65,7 @@
 public final class SuiteLauncherDiscoveryRequestBuilder {
 
 	private final LauncherDiscoveryRequestBuilder delegate = LauncherDiscoveryRequestBuilder.request();
+	private final List<String> selectedClassNames = new ArrayList<>();
 	private boolean includeClassNamePatternsUsed;
 	private boolean filterStandardClassNamePatterns = false;
 
@@ -97,63 +102,65 @@ public LauncherDiscoveryRequestBuilder configurationParameters(Map<String, Strin
 		return delegate.configurationParameters(configurationParameters);
 	}
 
-	public SuiteLauncherDiscoveryRequestBuilder suite(AnnotatedElement suite) {
-		Preconditions.notNull(suite, "Test class must not be null");
+	public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
+		Preconditions.notNull(suiteClass, "Suite class must not be null");
 
-		// Annotations in alphabetical order
+		// Annotations in alphabetical order (except @SelectClasses)
 		// @formatter:off
-		findRepeatableAnnotations(suite, ConfigurationParameter.class)
+		findRepeatableAnnotations(suiteClass, ConfigurationParameter.class)
 				.forEach(configuration -> configurationParameter(configuration.key(), configuration.value()));
-		findAnnotationValues(suite, ExcludeClassNamePatterns.class, ExcludeClassNamePatterns::value)
+		findAnnotationValues(suiteClass, ExcludeClassNamePatterns.class, ExcludeClassNamePatterns::value)
 				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
 				.map(ClassNameFilter::excludeClassNamePatterns)
 				.ifPresent(this::filters);
-		findAnnotationValues(suite, ExcludeEngines.class, ExcludeEngines::value)
+		findAnnotationValues(suiteClass, ExcludeEngines.class, ExcludeEngines::value)
 				.map(EngineFilter::excludeEngines)
 				.ifPresent(this::filters);
-		findAnnotationValues(suite, ExcludePackages.class, ExcludePackages::value)
+		findAnnotationValues(suiteClass, ExcludePackages.class, ExcludePackages::value)
 				.map(PackageNameFilter::excludePackageNames)
 				.ifPresent(this::filters);
-		findAnnotationValues(suite, ExcludeTags.class, ExcludeTags::value)
+		findAnnotationValues(suiteClass, ExcludeTags.class, ExcludeTags::value)
 				.map(TagFilter::excludeTags)
 				.ifPresent(this::filters);
-		findAnnotationValues(suite, IncludeClassNamePatterns.class, IncludeClassNamePatterns::value)
+		// Process @SelectClasses before @IncludeClassNamePatterns, since the names
+		// of selected classes get automatically added to the include filter.
+		findAnnotationValues(suiteClass, SelectClasses.class, SelectClasses::value)
+				.map(this::selectClasses)
+				.ifPresent(this::selectors);
+		findAnnotationValues(suiteClass, IncludeClassNamePatterns.class, IncludeClassNamePatterns::value)
 				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
-				.map(ClassNameFilter::includeClassNamePatterns)
+				.map(this::createIncludeClassNameFilter)
 				.ifPresent(filters -> {
 					includeClassNamePatternsUsed = true;
 					filters(filters);
 				});
-		findAnnotationValues(suite, IncludeEngines.class, IncludeEngines::value)
+		findAnnotationValues(suiteClass, IncludeEngines.class, IncludeEngines::value)
 				.map(EngineFilter::includeEngines)
 				.ifPresent(this::filters);
-		findAnnotationValues(suite, IncludePackages.class, IncludePackages::value)
+		findAnnotationValues(suiteClass, IncludePackages.class, IncludePackages::value)
 				.map(PackageNameFilter::includePackageNames)
 				.ifPresent(this::filters);
-		findAnnotationValues(suite, IncludeTags.class, IncludeTags::value)
+		findAnnotationValues(suiteClass, IncludeTags.class, IncludeTags::value)
 				.map(TagFilter::includeTags)
 				.ifPresent(this::filters);
-		findAnnotationValues(suite, SelectClasses.class, SelectClasses::value)
-				.map(AdditionalDiscoverySelectors::selectClasses)
-				.ifPresent(this::selectors);
-		findRepeatableAnnotations(suite, SelectClasspathResource.class)
+		findRepeatableAnnotations(suiteClass, SelectClasspathResource.class)
 				.stream()
 				.map(annotation -> selectClasspathResource(annotation.value(), annotation.line(), annotation.column()))
 				.forEach(this::selectors);
-		findAnnotationValues(suite, SelectDirectories.class, SelectDirectories::value)
+		findAnnotationValues(suiteClass, SelectDirectories.class, SelectDirectories::value)
 				.map(AdditionalDiscoverySelectors::selectDirectories)
 				.ifPresent(this::selectors);
-		findRepeatableAnnotations(suite, SelectFile.class)
+		findRepeatableAnnotations(suiteClass, SelectFile.class)
 				.stream()
 				.map(annotation -> selectFile(annotation.value(), annotation.line(), annotation.column()))
 				.forEach(this::selectors);
-		findAnnotationValues(suite, SelectModules.class, SelectModules::value)
+		findAnnotationValues(suiteClass, SelectModules.class, SelectModules::value)
 				.map(AdditionalDiscoverySelectors::selectModules)
 				.ifPresent(this::selectors);
-		findAnnotationValues(suite, SelectUris.class, SelectUris::value)
+		findAnnotationValues(suiteClass, SelectUris.class, SelectUris::value)
 				.map(AdditionalDiscoverySelectors::selectUris)
 				.ifPresent(this::selectors);
-		findAnnotationValues(suite, SelectPackages.class, SelectPackages::value)
+		findAnnotationValues(suiteClass, SelectPackages.class, SelectPackages::value)
 				.map(AdditionalDiscoverySelectors::selectPackages)
 				.ifPresent(this::selectors);
 		// @formatter:on
@@ -162,11 +169,24 @@ public SuiteLauncherDiscoveryRequestBuilder suite(AnnotatedElement suite) {
 
 	public LauncherDiscoveryRequest build() {
 		if (filterStandardClassNamePatterns && !includeClassNamePatternsUsed) {
-			delegate.filters(ClassNameFilter.includeClassNamePatterns(STANDARD_INCLUDE_PATTERN));
+			delegate.filters(createIncludeClassNameFilter(STANDARD_INCLUDE_PATTERN));
 		}
 		return delegate.build();
 	}
 
+	private List<ClassSelector> selectClasses(Class<?>... classes) {
+		Arrays.stream(classes).map(Class::getName).distinct().forEach(this.selectedClassNames::add);
+		return AdditionalDiscoverySelectors.selectClasses(classes);
+	}
+
+	private ClassNameFilter createIncludeClassNameFilter(String... patterns) {
+		String[] combinedPatterns = Stream.concat(//
+			this.selectedClassNames.stream().map(Pattern::quote), //
+			Arrays.stream(patterns)//
+		).toArray(String[]::new);
+		return ClassNameFilter.includeClassNamePatterns(combinedPatterns);
+	}
+
 	private static <A extends Annotation, V> Optional<V[]> findAnnotationValues(AnnotatedElement element,
 			Class<A> annotationType, Function<A, V[]> valueExtractor) {
 		return findAnnotation(element, annotationType).map(valueExtractor).filter(values -> values.length > 0);
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index bcecf702374f..169506de2504 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -17,7 +17,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement;
 import static org.junit.platform.engine.TestExecutionResult.successful;
@@ -46,6 +45,7 @@
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.EngineDiscoveryRequest;
 import org.junit.platform.engine.ExecutionRequest;
+import org.junit.platform.engine.Filter;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.TestExecutionResult;
@@ -125,6 +125,37 @@ class TestCase {
 			assertEquals(Byte.class, selectors.get(1).getJavaClass());
 		}
 
+		@Test
+		void updatesIncludeClassNameFilterWhenSelectClassesAnnotationIsPresent() {
+
+			@SelectClasses({ Short.class, Byte.class })
+			class TestCase {
+			}
+
+			var request = instantiateRunnerAndCaptureGeneratedRequest(TestCase.class);
+
+			var filters = request.getFiltersByType(ClassNameFilter.class);
+			assertThat(filters).hasSize(1);
+
+			var filter = filters.get(0);
+
+			// Excluded by default
+			assertExcludes(filter, "example.MyClass");
+			assertExcludes(filter, "example.MyTestClass");
+			assertExcludes(filter, "example.Short");
+			assertExcludes(filter, "example.Byte");
+
+			// Included due to ClassNameFilter.STANDARD_INCLUDE_PATTERN
+			assertIncludes(filter, "TestClass");
+			assertIncludes(filter, "example.TestClass");
+			assertIncludes(filter, "example.MyTests");
+			assertIncludes(filter, "example.MyTest");
+
+			// Included due to @SelectClasses({ Short.class, Byte.class })
+			assertIncludes(filter, Short.class.getName());
+			assertIncludes(filter, Byte.class.getName());
+		}
+
 		@Test
 		void requestsPackageSelectorsWhenPackagesAnnotationIsPresent() {
 
@@ -153,9 +184,9 @@ class TestCase {
 			assertThat(filters).hasSize(1);
 
 			var filter = filters.get(0);
-			assertTrue(filter.apply("includedpackage1.TestClass").included());
-			assertTrue(filter.apply("includedpackage2.TestClass").included());
-			assertTrue(filter.apply("excludedpackage1.TestClass").excluded());
+			assertIncludes(filter, "includedpackage1.TestClass");
+			assertIncludes(filter, "includedpackage2.TestClass");
+			assertExcludes(filter, "excludedpackage1.TestClass");
 		}
 
 		@Test
@@ -171,9 +202,9 @@ class TestCase {
 			assertThat(filters).hasSize(1);
 
 			var filter = filters.get(0);
-			assertTrue(filter.apply("includedpackage1.TestClass").included());
-			assertTrue(filter.apply("excludedpackage1.TestClass").excluded());
-			assertTrue(filter.apply("excludedpackage2.TestClass").excluded());
+			assertIncludes(filter, "includedpackage1.TestClass");
+			assertExcludes(filter, "excludedpackage1.TestClass");
+			assertExcludes(filter, "excludedpackage2.TestClass");
 		}
 
 		@Test
@@ -189,9 +220,9 @@ class TestCase {
 			assertThat(filters).hasSize(1);
 
 			var filter = filters.get(0);
-			assertTrue(filter.apply(testDescriptorWithTags("foo")).included());
-			assertTrue(filter.apply(testDescriptorWithTags("bar")).included());
-			assertTrue(filter.apply(testDescriptorWithTags("baz")).excluded());
+			assertIncludes(filter, testDescriptorWithTags("foo"));
+			assertIncludes(filter, testDescriptorWithTags("bar"));
+			assertExcludes(filter, testDescriptorWithTags("baz"));
 		}
 
 		@Test
@@ -207,9 +238,9 @@ class TestCase {
 			assertThat(filters).hasSize(1);
 
 			var filter = filters.get(0);
-			assertTrue(filter.apply(testDescriptorWithTags("foo")).excluded());
-			assertTrue(filter.apply(testDescriptorWithTags("bar")).excluded());
-			assertTrue(filter.apply(testDescriptorWithTags("baz")).included());
+			assertExcludes(filter, testDescriptorWithTags("foo"));
+			assertExcludes(filter, testDescriptorWithTags("bar"));
+			assertIncludes(filter, testDescriptorWithTags("baz"));
 		}
 
 		@Test
@@ -225,11 +256,11 @@ class TestCase {
 			assertThat(filters).hasSize(1);
 
 			var filter = filters.get(0);
-			assertTrue(filter.apply(testDescriptorWithTags("foo")).included());
-			assertTrue(filter.apply(testDescriptorWithTags("foo", "any_other_tag")).included());
-			assertTrue(filter.apply(testDescriptorWithTags("foo", "bar")).excluded());
-			assertTrue(filter.apply(testDescriptorWithTags("bar")).excluded());
-			assertTrue(filter.apply(testDescriptorWithTags("bar", "any_other_tag")).excluded());
+			assertIncludes(filter, testDescriptorWithTags("foo"));
+			assertIncludes(filter, testDescriptorWithTags("foo", "any_other_tag"));
+			assertExcludes(filter, testDescriptorWithTags("foo", "bar"));
+			assertExcludes(filter, testDescriptorWithTags("bar"));
+			assertExcludes(filter, testDescriptorWithTags("bar", "any_other_tag"));
 		}
 
 		@Test
@@ -245,11 +276,11 @@ class TestCase {
 			assertThat(filters).hasSize(1);
 
 			var filter = filters.get(0);
-			assertTrue(filter.apply(testDescriptorWithTags("foo")).excluded());
-			assertTrue(filter.apply(testDescriptorWithTags("foo", "any_other_tag")).excluded());
-			assertTrue(filter.apply(testDescriptorWithTags("foo", "bar")).included());
-			assertTrue(filter.apply(testDescriptorWithTags("bar")).included());
-			assertTrue(filter.apply(testDescriptorWithTags("bar", "any_other_tag")).included());
+			assertExcludes(filter, testDescriptorWithTags("foo"));
+			assertExcludes(filter, testDescriptorWithTags("foo", "any_other_tag"));
+			assertIncludes(filter, testDescriptorWithTags("foo", "bar"));
+			assertIncludes(filter, testDescriptorWithTags("bar"));
+			assertIncludes(filter, testDescriptorWithTags("bar", "any_other_tag"));
 		}
 
 		@Test
@@ -271,16 +302,16 @@ class TestCase {
 			assertThat(filters).hasSize(2);
 
 			var includeFilter = filters.get(1);
-			assertTrue(includeFilter.apply(fooEngine).included());
-			assertTrue(includeFilter.apply(barEngine).included());
-			assertTrue(includeFilter.apply(bazEngine).included());
-			assertTrue(includeFilter.apply(quuxEngine).excluded());
+			assertIncludes(includeFilter, fooEngine);
+			assertIncludes(includeFilter, barEngine);
+			assertIncludes(includeFilter, bazEngine);
+			assertExcludes(includeFilter, quuxEngine);
 
 			var excludeFilter = filters.get(0);
-			assertTrue(excludeFilter.apply(fooEngine).included());
-			assertTrue(excludeFilter.apply(barEngine).excluded());
-			assertTrue(excludeFilter.apply(bazEngine).included());
-			assertTrue(excludeFilter.apply(quuxEngine).excluded());
+			assertIncludes(excludeFilter, fooEngine);
+			assertExcludes(excludeFilter, barEngine);
+			assertIncludes(excludeFilter, bazEngine);
+			assertExcludes(excludeFilter, quuxEngine);
 		}
 
 		@Test
@@ -457,6 +488,14 @@ void convertsTestIdentifiersIntoDescriptions() {
 			assertEquals(testDescription("[root:test2b]"), testDescriptions.get(1));
 		}
 
+		private static <T> void assertIncludes(Filter<T> filter, T included) {
+			assertThat(filter.apply(included).included()).isTrue();
+		}
+
+		private static <T> void assertExcludes(Filter<T> filter, T excluded) {
+			assertThat(filter.apply(excluded).excluded()).isTrue();
+		}
+
 	}
 
 	@Nested
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
index 3fcfd54292e7..52386804a2d0 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.suite.engine.testsuites;
 
-import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.engine.testcases.MultipleTestsTestCase;
@@ -19,7 +18,6 @@
  * @since 1.8
  */
 @Suite
-@IncludeClassNamePatterns(".*TestCase$")
 @SelectClasses(MultipleTestsTestCase.class)
 public class MultipleSuite {
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
index 98007c744b41..49f7ee50ea34 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.suite.engine.testsuites;
 
-import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
@@ -19,7 +18,6 @@
  * @since 1.8
  */
 @Suite
-@IncludeClassNamePatterns(".*TestCase$")
 @SelectClasses(SingleTestTestCase.class)
 public class SelectClassesSuite {
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
index e91af825b0f1..33f107858f26 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.suite.engine.testsuites;
 
-import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.api.SuiteDisplayName;
@@ -20,7 +19,6 @@
  * @since 1.8
  */
 @Suite
-@IncludeClassNamePatterns(".*TestCase$")
 @SelectClasses(SingleTestTestCase.class)
 @SuiteDisplayName("Suite Display Name")
 public class SuiteDisplayNameSuite {

From b417654e3a8e3467e99cc14d1d51130e9c7558dc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 12 Aug 2021 15:11:37 +0200
Subject: [PATCH 0425/1433] Introduce unit tests for
 AnnotationUtils.findAnnotation(Class,Class,boolean)

---
 .../commons/util/AnnotationUtilsTests.java    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
index 6f7e2cf00747..b41391849404 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
@@ -143,6 +143,32 @@ void findAnnotationMetaPresentOnOptionalMethod() throws Exception {
 		assertThat(findAnnotation(Optional.of(method), Annotation1.class)).isPresent();
 	}
 
+	@Test
+	void findAnnotationDirectlyPresentOnEnclosingClass() throws Exception {
+		Class<?> clazz = Annotation1Class.InnerClass.class;
+		assertThat(findAnnotation(clazz, Annotation1.class, false)).isNotPresent();
+		assertThat(findAnnotation(clazz, Annotation1.class, true)).isPresent();
+
+		clazz = Annotation1Class.InnerClass.InnerInnerClass.class;
+		assertThat(findAnnotation(clazz, Annotation1.class, false)).isNotPresent();
+		assertThat(findAnnotation(clazz, Annotation1.class, true)).isPresent();
+
+		clazz = Annotation1Class.NestedClass.class;
+		assertThat(findAnnotation(clazz, Annotation1.class, false)).isNotPresent();
+		assertThat(findAnnotation(clazz, Annotation1.class, true)).isNotPresent();
+	}
+
+	@Test
+	void findAnnotationMetaPresentOnEnclosingClass() throws Exception {
+		Class<?> clazz = ComposedAnnotationClass.InnerClass.class;
+		assertThat(findAnnotation(clazz, Annotation1.class, false)).isNotPresent();
+		assertThat(findAnnotation(clazz, Annotation1.class, true)).isPresent();
+
+		clazz = ComposedAnnotationClass.InnerClass.InnerInnerClass.class;
+		assertThat(findAnnotation(clazz, Annotation1.class, false)).isNotPresent();
+		assertThat(findAnnotation(clazz, Annotation1.class, true)).isPresent();
+	}
+
 	@Test
 	void isAnnotatedForClassWithoutAnnotation() {
 		assertFalse(isAnnotated(Annotation1Class.class, Annotation2.class));
@@ -655,6 +681,12 @@ static class AnnotationWithDefaultValueClass {
 
 	@Annotation1
 	static class Annotation1Class {
+		class InnerClass {
+			class InnerInnerClass {
+			}
+		}
+		static class NestedClass {
+		}
 	}
 
 	@Annotation2
@@ -678,6 +710,11 @@ static class ComposedAnnotationClass {
 		@ComposedAnnotation
 		void method() {
 		}
+
+		class InnerClass {
+			class InnerInnerClass {
+			}
+		}
 	}
 
 	@InheritedComposedAnnotation

From 3f2d4e115a9d3f67083d5ebe6b07e091183ddad5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 12 Aug 2021 15:17:09 +0200
Subject: [PATCH 0426/1433] Introduce AnnotationSupport.findAnnotation() that
 searches enclosing classes

This commit introduces a new findAnnotation(Class,Class,SearchOption)
method in AnnotationSupport that performs the same search algorithm as
findAnnotation(AnnotatedElement,Class) but also searches the enclosing
class hierarchy for inner classes if the INCLUDE_ENCLOSING_CLASSES
SearchOption is specified.

Closes #2649
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  6 +++
 .../commons/support/AnnotationSupport.java    | 38 ++++++++++++++++
 .../commons/support/SearchOption.java         | 43 +++++++++++++++++++
 .../support/AnnotationSupportTests.java       | 38 +++++++++++++++-
 4 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index ad4576ee1d83..dd3938267e69 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -32,6 +32,12 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* New `findAnnotation(Class,Class,SearchOption)` method in `AnnotationSupport` that
+  performs the same search algorithm as `findAnnotation(AnnotatedElement,Class)` but also
+  searches the enclosing class hierarchy for inner classes if the
+  `INCLUDE_ENCLOSING_CLASSES` `SearchOption` is specified. This new method can be used by
+  extension authors to find annotations on enclosing classes for JUnit Jupiter `@Nested`
+  test classes.
 * New `ClassSource.from(URI)` static factory method for creating a `ClassSource` from a
   URI using the `class` scheme and optional query parameters specifying the line number
   and column number. This is analogous to the existing `ClasspathResourceSource.from(URI)`
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
index 315e458c793d..b0e922e40c04 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.commons.support;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
 
 import java.lang.annotation.Annotation;
@@ -126,6 +127,43 @@ public static <A extends Annotation> Optional<A> findAnnotation(AnnotatedElement
 		return AnnotationUtils.findAnnotation(element, annotationType);
 	}
 
+	/**
+	 * Find the first annotation of the specified type that is either
+	 * <em>directly present</em>, <em>meta-present</em>, or <em>indirectly
+	 * present</em> on the supplied class.
+	 *
+	 * <p>If the annotation is neither <em>directly present</em> nor <em>meta-present</em>
+	 * on the class, this method will additionally search on interfaces implemented
+	 * by the class before searching for an annotation that is <em>indirectly present</em>
+	 * on the class (i.e., within the class inheritance hierarchy).
+	 *
+	 * <p>If the annotation still has not been found, this method will optionally
+	 * search recursively through the enclosing class hierarchy if
+	 * {@link SearchOption#INCLUDE_ENCLOSING_CLASSES} is specified.
+	 *
+	 * <p>If {@link SearchOption#DEFAULT} is specified, this method has the same
+	 * semantics as {@link #findAnnotation(AnnotatedElement, Class)}.
+	 *
+	 * @param <A> the annotation type
+	 * @param clazz the class on which to search for the annotation; may be {@code null}
+	 * @param annotationType the annotation type to search for; never {@code null}
+	 * @param searchOption the {@code SearchOption} to use; never {@code null}
+	 * @return an {@code Optional} containing the annotation; never {@code null} but
+	 * potentially empty
+	 * @since 1.8
+	 * @see SearchOption
+	 * @see #findAnnotation(AnnotatedElement, Class)
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	public static <A extends Annotation> Optional<A> findAnnotation(Class<?> clazz, Class<A> annotationType,
+			SearchOption searchOption) {
+
+		Preconditions.notNull(searchOption, "SearchOption must not be null");
+
+		return AnnotationUtils.findAnnotation(clazz, annotationType,
+			searchOption == SearchOption.INCLUDE_ENCLOSING_CLASSES);
+	}
+
 	/**
 	 * Find all <em>repeatable</em> {@linkplain Annotation annotations} of the
 	 * supplied {@code annotationType} that are either <em>present</em>,
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
new file mode 100644
index 000000000000..6a5351a4be8e
--- /dev/null
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.commons.support;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+
+/**
+ * Search options for finding an annotation within a class hierarchy.
+ *
+ * @since 1.8
+ * @see #DEFAULT
+ * @see #INCLUDE_ENCLOSING_CLASSES
+ */
+@API(status = EXPERIMENTAL, since = "1.8")
+public enum SearchOption {
+
+	/**
+	 * Search the inheritance hierarchy (i.e., the current class, implemented
+	 * interfaces, and superclasses), but do not search on enclosing classes.
+	 *
+	 * @see Class#getSuperclass()
+	 * @see Class#getInterfaces()
+	 */
+	DEFAULT,
+
+	/**
+	 * Search the inheritance hierarchy as with the {@link #DEFAULT} search option
+	 * but also search the {@linkplain Class#getEnclosingClass() enclosing class}
+	 * hierarchy for <em>inner classes</em> (i.e., a non-static member classes).
+	 */
+	INCLUDE_ENCLOSING_CLASSES;
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
index bb68f22feeac..438136b48240 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
@@ -57,7 +57,7 @@ void isAnnotatedDelegates() {
 	}
 
 	@Test
-	void findAnnotationPreconditions() {
+	void findAnnotationOnElementPreconditions() {
 		var optional = Optional.of(Probe.class);
 		assertPreconditionViolationException("annotationType", () -> AnnotationSupport.findAnnotation(optional, null));
 		assertPreconditionViolationException("annotationType",
@@ -65,7 +65,7 @@ void findAnnotationPreconditions() {
 	}
 
 	@Test
-	void findAnnotationDelegates() {
+	void findAnnotationOnElementDelegates() {
 		var element = Probe.class;
 		var optional = Optional.of(element);
 
@@ -80,6 +80,37 @@ void findAnnotationDelegates() {
 			AnnotationSupport.findAnnotation(element, Override.class));
 	}
 
+	@Test
+	void findAnnotationOnClassPreconditions() {
+		assertPreconditionViolationException("annotationType",
+			() -> AnnotationSupport.findAnnotation(Probe.class, null, SearchOption.INCLUDE_ENCLOSING_CLASSES));
+		assertPreconditionViolationException("SearchOption",
+			() -> AnnotationSupport.findAnnotation(Probe.class, Override.class, null));
+	}
+
+	@Test
+	void findAnnotationOnClassDelegates() {
+		Class<?> clazz = Probe.class;
+		assertEquals(AnnotationUtils.findAnnotation(clazz, Tag.class, false),
+			AnnotationSupport.findAnnotation(clazz, Tag.class, SearchOption.DEFAULT));
+		assertEquals(AnnotationUtils.findAnnotation(clazz, Tag.class, true),
+			AnnotationSupport.findAnnotation(clazz, Tag.class, SearchOption.INCLUDE_ENCLOSING_CLASSES));
+		assertEquals(AnnotationUtils.findAnnotation(clazz, Override.class, false),
+			AnnotationSupport.findAnnotation(clazz, Override.class, SearchOption.DEFAULT));
+		assertEquals(AnnotationUtils.findAnnotation(clazz, Override.class, true),
+			AnnotationSupport.findAnnotation(clazz, Override.class, SearchOption.INCLUDE_ENCLOSING_CLASSES));
+
+		clazz = Probe.InnerClass.class;
+		assertEquals(AnnotationUtils.findAnnotation(clazz, Tag.class, false),
+			AnnotationSupport.findAnnotation(clazz, Tag.class, SearchOption.DEFAULT));
+		assertEquals(AnnotationUtils.findAnnotation(clazz, Tag.class, true),
+			AnnotationSupport.findAnnotation(clazz, Tag.class, SearchOption.INCLUDE_ENCLOSING_CLASSES));
+		assertEquals(AnnotationUtils.findAnnotation(clazz, Override.class, false),
+			AnnotationSupport.findAnnotation(clazz, Override.class, SearchOption.DEFAULT));
+		assertEquals(AnnotationUtils.findAnnotation(clazz, Override.class, true),
+			AnnotationSupport.findAnnotation(clazz, Override.class, SearchOption.INCLUDE_ENCLOSING_CLASSES));
+	}
+
 	@Test
 	void findPublicAnnotatedFieldsPreconditions() {
 		assertPreconditionViolationException("Class",
@@ -270,6 +301,9 @@ void aMethod() {
 		void bMethod() {
 		}
 
+		class InnerClass {
+		}
+
 	}
 
 	static class Fields {

From cf0d396a03a76fedf46d989ae4026b3aa957bd59 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 09:44:41 +0200
Subject: [PATCH 0427/1433] Revert "Add identifier element to `TempDir`
 annotation"

This reverts commit bdaf1d2182f2ff2d1ed5889503d91baa6c0c7f85.
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  2 -
 .../asciidoc/user-guide/writing-tests.adoc    |  9 --
 .../test/java/example/TempDirectoryDemo.java  | 12 ---
 .../org/junit/jupiter/api/io/TempDir.java     | 46 ++++-----
 .../engine/extension/TempDirectory.java       | 12 +--
 .../engine/extension/TempDirectoryTests.java  | 99 -------------------
 6 files changed, 22 insertions(+), 158 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index dd3938267e69..d42478117bfc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -80,8 +80,6 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* `@TempDir` now supports creating multiple temporary directories via an identifier
-  specified on the annotation (e.g. `@TempDir("a")` and `@TempDir("b")`).
 * New `named()` static factory method in the `Named` interface that serves as an _alias_
   for `Named.of()`. `named()` is intended to be used via `import static`.
 * New `class` URI scheme for dynamic test sources. This allows tests to be located using
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 92512297e65b..5af0fe689035 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2197,15 +2197,6 @@ its content.
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_parameter_injection]
 ----
 
-You can inject multiple temporary directories by specifying explicit identifiers via the
-annotation parameter.
-
-[source,java,indent=0]
-.A test method that requires multiple temporary directories
-----
-include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_multiple_directories]
-----
-
 WARNING: `@TempDir` is not supported on constructor parameters. If you wish to retain a
 single reference to a temp directory across lifecycle methods and the current test method,
 please use field injection, by annotating a non-private instance field with `@TempDir`.
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index 4eadfcb4a885..217977408229 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -35,18 +35,6 @@ void writeItemsToFile(@TempDir Path tempDir) throws IOException {
 	}
 	// end::user_guide_parameter_injection[]
 
-	// tag::user_guide_multiple_directories[]
-	@Test
-	void copyFileFromSourceToTarget(@TempDir("from") Path source, @TempDir("to") Path target) throws IOException {
-		Path sourceFile = source.resolve("test.txt");
-
-		new ListWriter(sourceFile).write("a", "b", "c");
-		Path targetFile = Files.copy(sourceFile, target.resolve("test.txt"));
-
-		assertEquals(singletonList("a,b,c"), Files.readAllLines(targetFile));
-	}
-	// end::user_guide_multiple_directories[]
-
 	static
 	// tag::user_guide_field_injection[]
 	class SharedTempDirectoryDemo {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index ddd1ff2431af..3d9bf2f1ce7b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -30,20 +30,16 @@
  * or a parameter in a lifecycle method or test method of type {@link Path} or
  * {@link File} that should be resolved into a temporary directory.
  *
- * <p>Multiple temporary directories can be created by supplying different
- * {@linkplain #value identifiers} on the annotation.
- *
  * <p>Please note that {@code @TempDir} is not supported on constructor
  * parameters. Please use field injection instead, by annotating a non-private
  * instance field with {@code @TempDir}.
  *
  * <h3>Temporary Directory Creation</h3>
  *
- * <p>The temporary directory with the supplied {@linkplain #value identifier}
- * is only created if a field in a test class or a parameter in a lifecycle
- * method or test method is annotated with {@code @TempDir}. If the field type
- * or parameter type is neither {@link Path} nor {@link File} or if the
- * temporary directory cannot be created, an
+ * <p>The temporary directory is only created if a field in a test class or a
+ * parameter in a lifecycle method or test method is annotated with
+ * {@code @TempDir}. If the field type or parameter type is neither {@link Path}
+ * nor {@link File} or if the temporary directory cannot be created, an
  * {@link ExtensionConfigurationException} or a
  * {@link ParameterResolutionException} will be thrown as appropriate. In
  * addition, a {@code ParameterResolutionException} will be thrown for a
@@ -52,25 +48,23 @@
  * <h3>Temporary Directory Scope</h3>
  *
  * <p>The scope of the temporary directory depends on where the first
- * {@code @TempDir} annotation with the supplied {@linkplain #value identifier}
- * is encountered when executing a test class. The temporary directory with that
- * identifier will be shared by all tests in a class when the annotation is
- * present with the same identifier on a {@code static} field or on a parameter
- * of a {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method. Otherwise –
+ * {@code @TempDir} annotation is encountered when executing a test class. The
+ * temporary directory will be shared by all tests in a class when the
+ * annotation is present on a {@code static} field or on a parameter of a
+ * {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method. Otherwise &mdash;
  * for example, when {@code @TempDir} is only used on instance fields or on
- * parameters in test, {@link org.junit.jupiter.api.BeforeEach @BeforeEach}, or
- * {@link org.junit.jupiter.api.AfterEach @AfterEach} methods – each test will
- * use its own temporary directory.
+ * parameters in test, {@link org.junit.jupiter.api.BeforeEach @BeforeEach},
+ * or {@link org.junit.jupiter.api.AfterEach @AfterEach} methods &mdash; each test
+ * will use its own temporary directory.
  *
  * <h3>Temporary Directory Deletion</h3>
  *
- * <p>When the end of the scope of a temporary directory with a certain
- * {@linkplain #value identifier} is reached, i.e. when the test method or class
- * has finished execution, JUnit will attempt to recursively delete all files
- * and directories in the temporary directory and, finally, the temporary
- * directory itself. In case deletion of a file or directory fails, an
- * {@link IOException} will be thrown that will cause the test or test class to
- * fail.
+ * <p>When the end of the scope of a temporary directory is reached, i.e. when
+ * the test method or class has finished execution, JUnit will attempt to
+ * recursively delete all files and directories in the temporary directory
+ * and, finally, the temporary directory itself. In case deletion of a file or
+ * directory fails, an {@link IOException} will be thrown that will cause the
+ * test or test class to fail.
  *
  * @since 5.4
  */
@@ -79,10 +73,4 @@
 @Documented
 @API(status = EXPERIMENTAL, since = "5.4")
 public @interface TempDir {
-	/**
-	 * The identifier of the temporary directory.
-	 *
-	 * @since 5.8
-	 */
-	String value() default "";
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 0b4f8481426b..1ce055970857 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -13,7 +13,6 @@
 import static java.nio.file.FileVisitResult.CONTINUE;
 import static java.util.stream.Collectors.joining;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
-import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.ReflectionUtils.isPrivate;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
 
@@ -61,6 +60,7 @@
 class TempDirectory implements BeforeAllCallback, BeforeEachCallback, ParameterResolver {
 
 	private static final Namespace NAMESPACE = Namespace.create(TempDirectory.class);
+	private static final String KEY = "temp.dir";
 	private static final String TEMP_DIR_PREFIX = "junit";
 
 	/**
@@ -97,9 +97,8 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 
 		findAnnotatedFields(testClass, TempDir.class, predicate).forEach(field -> {
 			assertValidFieldCandidate(field);
-			String id = findAnnotation(field, TempDir.class).map(TempDir::value).orElse("");
 			try {
-				makeAccessible(field).set(testInstance, getPathOrFile(field.getType(), context, id));
+				makeAccessible(field).set(testInstance, getPathOrFile(field.getType(), context));
 			}
 			catch (Throwable t) {
 				ExceptionUtils.throwAsUncheckedException(t);
@@ -136,8 +135,7 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 		Class<?> parameterType = parameterContext.getParameter().getType();
 		assertSupportedType("parameter", parameterType);
-		String id = parameterContext.findAnnotation(TempDir.class).map(TempDir::value).orElse("");
-		return getPathOrFile(parameterType, extensionContext, id);
+		return getPathOrFile(parameterType, extensionContext);
 	}
 
 	private void assertSupportedType(String target, Class<?> type) {
@@ -147,9 +145,9 @@ private void assertSupportedType(String target, Class<?> type) {
 		}
 	}
 
-	private Object getPathOrFile(Class<?> type, ExtensionContext extensionContext, String id) {
+	private Object getPathOrFile(Class<?> type, ExtensionContext extensionContext) {
 		Path path = extensionContext.getStore(NAMESPACE) //
-				.getOrComputeIfAbsent(id, __ -> createTempDir(), CloseablePath.class) //
+				.getOrComputeIfAbsent(KEY, key -> createTempDir(), CloseablePath.class) //
 				.get();
 
 		return (type == Path.class) ? path : path.toFile();
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
index c9d772765be7..61edbcacca07 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.engine.extension;
 
-import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -72,12 +71,6 @@ void resetStaticVariables() {
 		BaseSeparateTempDirsParameterInjectionTestCase.tempDirs.clear();
 	}
 
-	@Test
-	void supportsMultipleTempDirs() {
-		executeTestsForClass(MultipleTempDirsTestCase.class).allEvents()//
-				.assertStatistics(stats -> stats.started(3).succeeded(3));
-	}
-
 	@Test
 	@DisplayName("does not prevent constructor parameter resolution")
 	void tempDirectoryDoesNotPreventConstructorParameterResolution() {
@@ -1283,96 +1276,4 @@ void nested() {
 			}
 		}
 	}
-
-	static class MultipleTempDirsTestCase {
-
-		@TempDir("a")
-		static Path A;
-		static Path B;
-
-		@BeforeAll
-		static void beforeAll(@TempDir("a") Path dir1, @TempDir("b") Path dir2) {
-			assertEquals(A, requireNonNull(dir1));
-			B = requireNonNull(dir2);
-			assertNotEquals(A, B);
-			assertTrue(Files.exists(A));
-			assertTrue(Files.exists(B));
-		}
-
-		@TempDir("c")
-		Path c;
-		static Path C, D, E;
-
-		@BeforeEach
-		void beforeEach(@TempDir("d") Path dir1, @TempDir("b") Path dir2, @TempDir("c") Path dir3,
-				@TempDir("a") Path dir4) {
-			assertEquals(A, dir4);
-			assertEquals(B, dir2);
-			assertEquals(c, dir3);
-
-			C = requireNonNull(dir3);
-			assertNotEquals(A, C);
-			assertNotEquals(B, C);
-
-			D = requireNonNull(dir1);
-			assertNotEquals(A, D);
-			assertNotEquals(B, D);
-			assertNotEquals(C, D);
-
-			assertTrue(Files.exists(A));
-			assertTrue(Files.exists(B));
-			assertTrue(Files.exists(C));
-			assertTrue(Files.exists(D));
-		}
-
-		@Test
-		void test(@TempDir("c") Path dir1, @TempDir("e") Path dir2, @TempDir("a") Path dir3, @TempDir("d") Path dir4,
-				@TempDir("b") Path dir5) {
-			assertEquals(A, dir3);
-			assertEquals(B, dir5);
-			assertEquals(C, dir1);
-			assertEquals(D, dir4);
-
-			E = requireNonNull(dir2);
-			assertNotEquals(A, E);
-			assertNotEquals(B, E);
-			assertNotEquals(C, E);
-			assertNotEquals(D, E);
-
-			assertTrue(Files.exists(A));
-			assertTrue(Files.exists(B));
-			assertTrue(Files.exists(C));
-			assertTrue(Files.exists(D));
-			assertTrue(Files.exists(E));
-		}
-
-		@AfterEach
-		void afterEach(@TempDir("b") Path dir1, @TempDir("a") Path dir2, @TempDir("c") Path dir3,
-				@TempDir("e") Path dir4, @TempDir("d") Path dir5) {
-			assertEquals(A, dir2);
-			assertEquals(B, dir1);
-			assertEquals(C, dir3);
-			assertEquals(D, dir5);
-			assertEquals(E, dir4);
-
-			assertTrue(Files.exists(A));
-			assertTrue(Files.exists(B));
-			assertTrue(Files.exists(C));
-			assertTrue(Files.exists(D));
-			assertTrue(Files.exists(E));
-		}
-
-		@AfterAll
-		static void afterAll(@TempDir("b") Path dir1, @TempDir("a") Path dir2) {
-			assertEquals(A, dir2);
-			assertEquals(B, dir1);
-
-			assertTrue(Files.exists(A));
-			assertTrue(Files.exists(B));
-
-			assertTrue(Files.notExists(C));
-			assertTrue(Files.notExists(D));
-			assertTrue(Files.notExists(E));
-		}
-	}
 }

From a1bf7cc25e4a3d41f3d923051a830ad44e0b1b0c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 10:01:25 +0200
Subject: [PATCH 0428/1433] Reduce scope of SuppressWarnings annotation

---
 .../jupiter/engine/extension/TempDirectoryTests.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
index 61edbcacca07..ba1a803d9747 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
@@ -58,7 +58,6 @@
  *
  * @since 5.4
  */
-@SuppressWarnings("ALL")
 @DisplayName("TempDirectory extension")
 class TempDirectoryTests extends AbstractJupiterTestEngineTests {
 
@@ -318,7 +317,7 @@ void onlySupportsParametersOfTypePathAndFile() {
 			// @formatter:off
 			TempDirectoryTests.assertSingleFailedTest(results,
 				instanceOf(ParameterResolutionException.class),
-				message(m -> m.matches("Failed to resolve parameter \\[java.lang.String .+\\] in method \\[.+\\]: .+")),
+				message(m -> m.matches("Failed to resolve parameter \\[java.lang.String .+] in method \\[.+]: .+")),
 				cause(
 					instanceOf(ExtensionConfigurationException.class),
 					message("Can only resolve @TempDir parameter of type java.nio.file.Path or java.io.File but was: java.lang.String")));
@@ -499,6 +498,7 @@ static class AnnotationOnInstanceFieldAndBeforeAllMethodParameterWithTestInstanc
 
 	static class AnnotationOnPrivateInstanceFieldTestCase {
 
+		@SuppressWarnings("unused")
 		@TempDir
 		private Path tempDir;
 
@@ -510,6 +510,7 @@ void test() {
 
 	static class AnnotationOnPrivateStaticFieldTestCase {
 
+		@SuppressWarnings("unused")
 		@TempDir
 		private static Path tempDir;
 
@@ -521,6 +522,7 @@ void test() {
 
 	static class AnnotationOnStaticFieldWithUnsupportedTypeTestCase {
 
+		@SuppressWarnings("unused")
 		@TempDir
 		static String tempDir;
 
@@ -532,6 +534,7 @@ void test1() {
 
 	static class AnnotationOnInstanceFieldWithUnsupportedTypeTestCase {
 
+		@SuppressWarnings("unused")
 		@TempDir
 		String tempDir;
 
@@ -576,7 +579,7 @@ static void check(Path tempDir) {
 
 	static class AnnotationOnConstructorParameterTestCase {
 
-		AnnotationOnConstructorParameterTestCase(@TempDir Path tempDir) {
+		AnnotationOnConstructorParameterTestCase(@SuppressWarnings("unused") @TempDir Path tempDir) {
 			// never called
 		}
 
@@ -842,6 +845,7 @@ void createReadOnlyFileInReadOnlyDir(@TempDir File tempDir) throws IOException {
 	}
 
 	// https://github.com/junit-team/junit5/issues/2609
+	@SuppressWarnings("ResultOfMethodCallIgnored")
 	static class NonMintPermissionContentInTempDirectoryDoesNotCauseFailureTestCase {
 
 		@Test
@@ -920,6 +924,7 @@ void createNonEmptyDirectoryWithNonReadableFile(@TempDir Path tempDir) throws IO
 	}
 
 	// https://github.com/junit-team/junit5/issues/2609
+	@SuppressWarnings("ResultOfMethodCallIgnored")
 	static class NonMintTempDirectoryPermissionsDoNotCauseFailureTestCase {
 
 		@Nested

From c9ea23210ebfc4b2fe2840b10855b1dcc21f22d3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 10:31:50 +0200
Subject: [PATCH 0429/1433] Split test case

---
 ...java => TempDirectoryPerContextTests.java} |  21 +-
 .../TempDirectoryPerDeclarationTests.java     | 835 ++++++++++++++++++
 2 files changed, 849 insertions(+), 7 deletions(-)
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/{TempDirectoryTests.java => TempDirectoryPerContextTests.java} (98%)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
similarity index 98%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index ba1a803d9747..7e34ce57ecdb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -54,12 +54,14 @@
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
- * Integration tests for the {@link TempDirectory} extension.
+ * Integration tests for the legacy behavior of the {@link TempDirectory}
+ * extension to create a single temp directory per context, i.e. test class or
+ * method.
  *
  * @since 5.4
  */
-@DisplayName("TempDirectory extension")
-class TempDirectoryTests extends AbstractJupiterTestEngineTests {
+@DisplayName("TempDirectory extension (per context)")
+class TempDirectoryPerContextTests extends AbstractJupiterTestEngineTests {
 
 	@BeforeEach
 	@AfterEach
@@ -135,6 +137,13 @@ void canBeUsedViaStaticFieldInsideNestedTestClasses() {
 				.assertStatistics(stats -> stats.started(2).succeeded(2));
 	}
 
+	@Test
+	@DisplayName("resolves java.io.File injection type")
+	void resolvesFileInstances() {
+		executeTestsForClass(FileInjectionTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+	}
+
 	@Nested
 	@DisplayName("resolves shared temp dir")
 	@TestMethodOrder(OrderAnnotation.class)
@@ -315,7 +324,7 @@ void onlySupportsParametersOfTypePathAndFile() {
 			var results = executeTestsForClass(InvalidTestCase.class);
 
 			// @formatter:off
-			TempDirectoryTests.assertSingleFailedTest(results,
+			TempDirectoryPerContextTests.assertSingleFailedTest(results,
 				instanceOf(ParameterResolutionException.class),
 				message(m -> m.matches("Failed to resolve parameter \\[java.lang.String .+] in method \\[.+]: .+")),
 				cause(
@@ -748,9 +757,7 @@ void wrongParameterType(@SuppressWarnings("unused") @TempDir String ignored) {
 		}
 	}
 
-	@Nested
-	@DisplayName("resolves java.io.File injection type")
-	class FileAndPathInjection {
+	static class FileInjectionTestCase {
 
 		@TempDir
 		File fileTempDir;
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
new file mode 100644
index 000000000000..0c6e53f149f2
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -0,0 +1,835 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.cause;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.assertj.core.api.Condition;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.ExtensionConfigurationException;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.platform.testkit.engine.EngineExecutionResults;
+
+/**
+ * Integration tests for the new behavior of the {@link TempDirectory} extension
+ * to create separate temp directories for each {@link TempDir} declaration.
+ *
+ * @since 5.8
+ */
+@DisplayName("TempDirectory extension (per declaration)")
+class TempDirectoryPerDeclarationTests extends AbstractJupiterTestEngineTests {
+
+	@Test
+	@DisplayName("does not prevent constructor parameter resolution")
+	void tempDirectoryDoesNotPreventConstructorParameterResolution() {
+		executeTestsForClass(TempDirectoryDoesNotPreventConstructorParameterResolutionTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+	}
+
+	@Test
+	@DisplayName("does not prevent user from deleting the temp dir within a test")
+	void tempDirectoryDoesNotPreventUserFromDeletingTempDir() {
+		executeTestsForClass(UserTempDirectoryDeletionDoesNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+	}
+
+	@Test
+	@DisplayName("is capable of removal of a read-only file")
+	void nonWritableFileDoesNotCauseFailure() {
+		executeTestsForClass(NonWritableFileDoesNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+	}
+
+	@Test
+	@DisplayName("is capable of removal of non-executable, non-writable, or non-readable directories and folders")
+	void nonMintPermissionsContentDoesNotCauseFailure() {
+		executeTestsForClass(NonMintPermissionContentInTempDirectoryDoesNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(13).succeeded(13));
+	}
+
+	@Test
+	@DisplayName("is capable of removal when its permissions were been changed")
+	void nonMintPermissionsDoNotCauseFailure() {
+		executeTestsForClass(NonMintTempDirectoryPermissionsDoNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(42).succeeded(42));
+	}
+
+	@Test
+	@DisabledOnOs(OS.WINDOWS)
+	@DisplayName("is capable of removal of a read-only file in a read-only dir")
+	void readOnlyFileInReadOnlyDirDoesNotCauseFailure() {
+		executeTestsForClass(ReadOnlyFileInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+	}
+
+	@Test
+	@DisabledOnOs(OS.WINDOWS)
+	@DisplayName("is capable of removal of a read-only file in a dir in a read-only dir")
+	void readOnlyFileInNestedReadOnlyDirDoesNotCauseFailure() {
+		executeTestsForClass(ReadOnlyFileInDirInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
+	}
+
+	@Test
+	@DisplayName("can be used via instance field inside nested test classes")
+	void canBeUsedViaInstanceFieldInsideNestedTestClasses() {
+		executeTestsForClass(TempDirUsageInsideNestedClassesTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(3).succeeded(3));
+	}
+
+	@Test
+	@DisplayName("can be used via static field inside nested test classes")
+	void canBeUsedViaStaticFieldInsideNestedTestClasses() {
+		executeTestsForClass(StaticTempDirUsageInsideNestedClassTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(2).succeeded(2));
+	}
+
+	@Nested
+	@DisplayName("reports failure")
+	@TestMethodOrder(OrderAnnotation.class)
+	class Failures {
+
+		@Test
+		@DisplayName("when @TempDir is used on private static field")
+		@Order(10)
+		void onlySupportsNonPrivateInstanceFields() {
+			var results = executeTestsForClass(AnnotationOnPrivateStaticFieldTestCase.class);
+
+			assertSingleFailedContainer(results, ExtensionConfigurationException.class, "must not be private");
+		}
+
+		@Test
+		@DisplayName("when @TempDir is used on private instance field")
+		@Order(11)
+		void onlySupportsNonPrivateStaticFields() {
+			var results = executeTestsForClass(AnnotationOnPrivateInstanceFieldTestCase.class);
+
+			assertSingleFailedTest(results, ExtensionConfigurationException.class, "must not be private");
+		}
+
+		@Test
+		@DisplayName("when @TempDir is used on static field of an unsupported type")
+		@Order(20)
+		void onlySupportsStaticFieldsOfTypePathAndFile() {
+			var results = executeTestsForClass(AnnotationOnStaticFieldWithUnsupportedTypeTestCase.class);
+
+			assertSingleFailedContainer(results, ExtensionConfigurationException.class,
+				"Can only resolve @TempDir field of type java.nio.file.Path or java.io.File");
+		}
+
+		@Test
+		@DisplayName("when @TempDir is used on instance field of an unsupported type")
+		@Order(21)
+		void onlySupportsInstanceFieldsOfTypePathAndFile() {
+			var results = executeTestsForClass(AnnotationOnInstanceFieldWithUnsupportedTypeTestCase.class);
+
+			assertSingleFailedTest(results, ExtensionConfigurationException.class,
+				"Can only resolve @TempDir field of type java.nio.file.Path or java.io.File");
+		}
+
+		@Test
+		@DisplayName("when @TempDir is used on parameter of an unsupported type")
+		@Order(22)
+		void onlySupportsParametersOfTypePathAndFile() {
+			var results = executeTestsForClass(InvalidTestCase.class);
+
+			// @formatter:off
+			TempDirectoryPerDeclarationTests.assertSingleFailedTest(results,
+				instanceOf(ParameterResolutionException.class),
+				message(m -> m.matches("Failed to resolve parameter \\[java.lang.String .+] in method \\[.+]: .+")),
+				cause(
+					instanceOf(ExtensionConfigurationException.class),
+					message("Can only resolve @TempDir parameter of type java.nio.file.Path or java.io.File but was: java.lang.String")));
+			// @formatter:on
+		}
+
+		@Test
+		@DisplayName("when @TempDir is used on constructor parameter")
+		@Order(30)
+		void doesNotSupportTempDirAnnotationOnConstructorParameter() {
+			var results = executeTestsForClass(AnnotationOnConstructorParameterTestCase.class);
+
+			assertSingleFailedTest(results, ParameterResolutionException.class,
+				"@TempDir is not supported on constructor parameters. Please use field injection instead.");
+		}
+
+		@Test
+		@DisplayName("when @TempDir is used on constructor parameter with @TestInstance(PER_CLASS)")
+		@Order(31)
+		void doesNotSupportTempDirAnnotationOnConstructorParameterWithTestInstancePerClass() {
+			var results = executeTestsForClass(AnnotationOnConstructorParameterWithTestInstancePerClassTestCase.class);
+
+			assertSingleFailedContainer(results, ParameterResolutionException.class,
+				"@TempDir is not supported on constructor parameters. Please use field injection instead.");
+		}
+
+	}
+
+	private static void assertSingleFailedContainer(EngineExecutionResults results, Class<? extends Throwable> clazz,
+			String message) {
+
+		assertSingleFailedContainer(results, instanceOf(clazz), message(actual -> actual.contains(message)));
+	}
+
+	@SafeVarargs
+	@SuppressWarnings("varargs")
+	private static void assertSingleFailedContainer(EngineExecutionResults results,
+			Condition<Throwable>... conditions) {
+
+		results.containerEvents()//
+				.assertStatistics(stats -> stats.started(2).failed(1).succeeded(1))//
+				.assertThatEvents().haveExactly(1, finishedWithFailure(conditions));
+	}
+
+	private static void assertSingleFailedTest(EngineExecutionResults results, Class<? extends Throwable> clazz,
+			String message) {
+
+		assertSingleFailedTest(results, instanceOf(clazz), message(actual -> actual.contains(message)));
+	}
+
+	@SafeVarargs
+	@SuppressWarnings("varargs")
+	private static void assertSingleFailedTest(EngineExecutionResults results, Condition<Throwable>... conditions) {
+		results.testEvents().assertStatistics(stats -> stats.started(1).failed(1).succeeded(0));
+		results.testEvents().assertThatEvents().haveExactly(1, finishedWithFailure(conditions));
+	}
+
+	// -------------------------------------------------------------------------
+
+	static class AnnotationOnPrivateInstanceFieldTestCase {
+
+		@SuppressWarnings("unused")
+		@TempDir
+		private Path tempDir;
+
+		@Test
+		void test() {
+		}
+
+	}
+
+	static class AnnotationOnPrivateStaticFieldTestCase {
+
+		@SuppressWarnings("unused")
+		@TempDir
+		private static Path tempDir;
+
+		@Test
+		void test() {
+		}
+
+	}
+
+	static class AnnotationOnStaticFieldWithUnsupportedTypeTestCase {
+
+		@SuppressWarnings("unused")
+		@TempDir
+		static String tempDir;
+
+		@Test
+		void test1() {
+		}
+
+	}
+
+	static class AnnotationOnInstanceFieldWithUnsupportedTypeTestCase {
+
+		@SuppressWarnings("unused")
+		@TempDir
+		String tempDir;
+
+		@Test
+		void test1() {
+		}
+
+	}
+
+	static class AnnotationOnConstructorParameterTestCase {
+
+		AnnotationOnConstructorParameterTestCase(@SuppressWarnings("unused") @TempDir Path tempDir) {
+			// never called
+		}
+
+		@Test
+		void test() {
+			// never called
+		}
+
+	}
+
+	@TestInstance(PER_CLASS)
+	static class AnnotationOnConstructorParameterWithTestInstancePerClassTestCase
+			extends AnnotationOnConstructorParameterTestCase {
+
+		AnnotationOnConstructorParameterWithTestInstancePerClassTestCase(@TempDir Path tempDir) {
+			super(tempDir);
+		}
+	}
+
+	static class InvalidTestCase {
+
+		@Test
+		void wrongParameterType(@SuppressWarnings("unused") @TempDir String ignored) {
+			fail("this should never be called");
+		}
+	}
+
+	@Nested
+	@DisplayName("resolves java.io.File injection type")
+	class FileAndPathInjection {
+
+		@TempDir
+		File fileTempDir;
+
+		@TempDir
+		Path pathTempDir;
+
+		@Test
+		@DisplayName("and injected File and Path reference the same temp directory")
+		void checkFile(@TempDir File tempDir, @TempDir Path ref) {
+			assertNotNull(tempDir);
+			assertNotNull(ref);
+			assertNotNull(this.fileTempDir);
+			assertNotNull(this.pathTempDir);
+		}
+
+	}
+
+	// https://github.com/junit-team/junit5/issues/1748
+	static class TempDirectoryDoesNotPreventConstructorParameterResolutionTestCase {
+
+		TempDirectoryDoesNotPreventConstructorParameterResolutionTestCase(TestInfo testInfo) {
+			assertNotNull(testInfo);
+		}
+
+		@Test
+		void test() {
+		}
+
+	}
+
+	// https://github.com/junit-team/junit5/issues/1801
+	static class UserTempDirectoryDeletionDoesNotCauseFailureTestCase {
+
+		@Test
+		void deleteTempDir(@TempDir Path tempDir) throws IOException {
+			Files.delete(tempDir);
+			assertThat(tempDir).doesNotExist();
+		}
+
+	}
+
+	// https://github.com/junit-team/junit5/issues/2046
+	static class NonWritableFileDoesNotCauseFailureTestCase {
+
+		@Test
+		void createReadonlyFile(@TempDir Path tempDir) throws IOException {
+			// Removal of setWritable(false) files might fail (e.g. for Windows)
+			// The test verifies that @TempDir is capable of removing of such files
+			var path = Files.write(tempDir.resolve("test.txt"), new byte[0]);
+			assumeTrue(path.toFile().setWritable(false),
+				() -> "Unable to set file " + path + " readonly via .toFile().setWritable(false)");
+		}
+
+	}
+
+	// https://github.com/junit-team/junit5/issues/2171
+	static class ReadOnlyFileInReadOnlyDirDoesNotCauseFailureTestCase {
+
+		@Test
+		void createReadOnlyFileInReadOnlyDir(@TempDir File tempDir) throws IOException {
+			File file = tempDir.toPath().resolve("file").toFile();
+			assumeTrue(file.createNewFile());
+			assumeTrue(tempDir.setReadOnly());
+			assumeTrue(file.setReadOnly());
+		}
+
+	}
+
+	// https://github.com/junit-team/junit5/issues/2171
+	static class ReadOnlyFileInDirInReadOnlyDirDoesNotCauseFailureTestCase {
+
+		@Test
+		void createReadOnlyFileInReadOnlyDir(@TempDir File tempDir) throws IOException {
+			File file = tempDir.toPath().resolve("dir").resolve("file").toFile();
+			assumeTrue(file.getParentFile().mkdirs());
+			assumeTrue(file.createNewFile());
+			assumeTrue(tempDir.setReadOnly());
+			assumeTrue(file.getParentFile().setReadOnly());
+			assumeTrue(file.setReadOnly());
+		}
+
+	}
+
+	// https://github.com/junit-team/junit5/issues/2609
+	@SuppressWarnings("ResultOfMethodCallIgnored")
+	static class NonMintPermissionContentInTempDirectoryDoesNotCauseFailureTestCase {
+
+		@Test
+		void createFile(@TempDir Path tempDir) throws IOException {
+			Files.createFile(tempDir.resolve("test-file.txt")).toFile();
+		}
+
+		@Test
+		void createFolder(@TempDir Path tempDir) throws IOException {
+			Files.createFile(tempDir.resolve("test-file.txt")).toFile();
+		}
+
+		@Test
+		void createNonWritableFile(@TempDir Path tempDir) throws IOException {
+			Files.createFile(tempDir.resolve("test-file.txt")).toFile().setWritable(false);
+		}
+
+		@Test
+		void createNonReadableFile(@TempDir Path tempDir) throws IOException {
+			Files.createFile(tempDir.resolve("test-file.txt")).toFile().setReadable(false);
+		}
+
+		@Test
+		void createNonWritableDirectory(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setWritable(false);
+		}
+
+		@Test
+		void createNonReadableDirectory(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setReadable(false);
+		}
+
+		@Test
+		void createNonExecutableDirectory(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setExecutable(false);
+		}
+
+		@Test
+		void createNonEmptyNonWritableDirectory(@TempDir Path tempDir) throws IOException {
+			Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+			subDir.toFile().setWritable(false);
+		}
+
+		@Test
+		void createNonEmptyNonReadableDirectory(@TempDir Path tempDir) throws IOException {
+			Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+			subDir.toFile().setReadable(false);
+		}
+
+		@Test
+		void createNonEmptyNonExecutableDirectory(@TempDir Path tempDir) throws IOException {
+			Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+			subDir.toFile().setExecutable(false);
+		}
+
+		@Test
+		void createNonEmptyDirectory(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+		}
+
+		@Test
+		void createNonEmptyDirectoryWithNonWritableFile(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setWritable(false);
+		}
+
+		@Test
+		void createNonEmptyDirectoryWithNonReadableFile(@TempDir Path tempDir) throws IOException {
+			Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setReadable(false);
+		}
+	}
+
+	// https://github.com/junit-team/junit5/issues/2609
+	@SuppressWarnings("ResultOfMethodCallIgnored")
+	static class NonMintTempDirectoryPermissionsDoNotCauseFailureTestCase {
+
+		@Nested
+		class NonWritable {
+
+			@Test
+			void makeEmptyTempDirectoryNonWritable(@TempDir Path tempDir) {
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithFileNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt"));
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithEmptyFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFileNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFileNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setWritable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setReadable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonExecutableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setExecutable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonReadableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setReadable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonWritableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setWritable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonExecutableFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setExecutable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderNonWritable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonWritableFileNonWritable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setWritable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonReadableFileNonWritable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setWritable(false);
+			}
+		}
+
+		@Nested
+		class NonReadable {
+
+			@Test
+			void makeEmptyTempDirectoryNonReadable(@TempDir Path tempDir) {
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithFileNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt"));
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithEmptyFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFileNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFileNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setWritable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setReadable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonExecutableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setExecutable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonWritableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setWritable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonReadableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setReadable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonExecutableFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setExecutable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderNonReadable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonWritableFileNonReadable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setReadable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonReadableFileNonReadable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setReadable(false);
+			}
+		}
+
+		@Nested
+		class NonExecutable {
+
+			@Test
+			void makeEmptyTempDirectoryNonExecutable(@TempDir Path tempDir) {
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithFileNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt"));
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithEmptyFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFileNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFileNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createFile(tempDir.resolve("test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonWritableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setWritable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonReadableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setReadable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonExecutableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir")).toFile().setExecutable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonWritableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setWritable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonReadableFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setReadable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyNonExecutableFolderNonExecutable(@TempDir Path tempDir)
+					throws IOException {
+				Path subDir = Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				subDir.toFile().setExecutable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderNonExecutable(@TempDir Path tempDir) throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt"));
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonWritableFileNonExecutable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setWritable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+
+			@Test
+			void makeTempDirectoryWithNonEmptyFolderContainingNonReadableFileNonExecutable(@TempDir Path tempDir)
+					throws IOException {
+				Files.createDirectory(tempDir.resolve("test-sub-dir"));
+				Files.createFile(tempDir.resolve("test-sub-dir/test-file.txt")).toFile().setReadable(false);
+				tempDir.toFile().setExecutable(false);
+			}
+		}
+	}
+
+	// https://github.com/junit-team/junit5/issues/2079
+	static class TempDirUsageInsideNestedClassesTestCase {
+
+		@TempDir
+		File tempDir;
+
+		@Test
+		void topLevel() {
+			assertNotNull(tempDir);
+			assertTrue(tempDir.exists());
+		}
+
+		@Nested
+		class NestedTestClass {
+
+			@Test
+			void nested() {
+				assertNotNull(tempDir);
+				assertTrue(tempDir.exists());
+			}
+
+			@Nested
+			class EvenDeeperNestedTestClass {
+
+				@Test
+				void deeplyNested() {
+					assertNotNull(tempDir);
+					assertTrue(tempDir.exists());
+				}
+			}
+		}
+	}
+
+	static class StaticTempDirUsageInsideNestedClassTestCase {
+
+		@TempDir
+		static File tempDir;
+
+		static File initialTempDir;
+
+		@Test
+		void topLevel() {
+			assertNotNull(tempDir);
+			assertTrue(tempDir.exists());
+			initialTempDir = tempDir;
+		}
+
+		@Nested
+		class NestedTestClass {
+
+			@Test
+			void nested() {
+				assertNotNull(tempDir);
+				assertTrue(tempDir.exists());
+				assertSame(initialTempDir, tempDir);
+			}
+		}
+	}
+}

From cabff27dc34c0ac42707e59701ecae0b56f319df Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 12:10:03 +0200
Subject: [PATCH 0430/1433] Change TempDir to create a separate dir per
 declaration

---
 .../api/extension/ExtensionContext.java       |  24 ++-
 .../org/junit/jupiter/engine/Constants.java   |  18 ++-
 .../config/CachingJupiterConfiguration.java   |   6 +
 .../config/DefaultJupiterConfiguration.java   |   8 +
 .../engine/config/JupiterConfiguration.java   |   3 +
 .../engine/config/TempDirBehavior.java        |  27 ++++
 .../extension/MutableExtensionRegistry.java   |  20 ++-
 .../engine/extension/TempDirectory.java       |  21 ++-
 .../TempDirectoryPerContextTests.java         |  14 ++
 .../TempDirectoryPerDeclarationTests.java     | 146 ++++++++++++++++++
 10 files changed, 269 insertions(+), 18 deletions(-)
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/TempDirBehavior.java

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index 40e5d1eefba8..282f6f797f6b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -647,13 +647,13 @@ class Namespace {
 		public static Namespace create(Object... parts) {
 			Preconditions.notEmpty(parts, "parts array must not be null or empty");
 			Preconditions.containsNoNullElements(parts, "individual parts must not be null");
-			return new Namespace(parts);
+			return new Namespace(new ArrayList<>(Arrays.asList(parts)));
 		}
 
-		private final List<?> parts;
+		private final List<Object> parts;
 
-		private Namespace(Object... parts) {
-			this.parts = new ArrayList<>(Arrays.asList(parts));
+		private Namespace(List<Object> parts) {
+			this.parts = parts;
 		}
 
 		@Override
@@ -673,6 +673,22 @@ public int hashCode() {
 			return this.parts.hashCode();
 		}
 
+		/**
+		 * Create a new namespace by appending the supplied {@code parts} to the
+		 * existing sequence of parts in this namespace.
+		 *
+		 * @return new namespace; never {@code null}
+		 * @since 5.8
+		 */
+		@API(status = EXPERIMENTAL, since = "5.8")
+		public Namespace append(Object... parts) {
+			Preconditions.notEmpty(parts, "parts array must not be null or empty");
+			Preconditions.containsNoNullElements(parts, "individual parts must not be null");
+			ArrayList<Object> newParts = new ArrayList<>(this.parts.size() + parts.length);
+			newParts.addAll(this.parts);
+			Collections.addAll(newParts, parts);
+			return new Namespace(newParts);
+		}
 	}
 
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 9c2c92bd1b78..08e05658c761 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.engine;
 
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.engine.support.hierarchical.DefaultParallelExecutionConfigurationStrategy.CONFIG_CUSTOM_CLASS_PROPERTY_NAME;
@@ -442,7 +443,7 @@ public final class Constants {
 	 * <li>{@code disabled_on_debug}: disables timeouts while debugging
 	 * </ul>
 	 *
-	 * <p>If not specified, the default is {@code "enabled"}.
+	 * <p>If not specified, the default is {@code enabled}.
 	 *
 	 * @since 5.6
 	 */
@@ -474,6 +475,21 @@ public final class Constants {
 	@API(status = EXPERIMENTAL, since = "5.8")
 	public static final String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME;
 
+	/**
+	 * Property name used to set the behavior for {@link org.junit.jupiter.api.io.TempDir}: {@value}
+	 *
+	 * <h3>Supported Values</h3>
+	 * <ul>
+	 * <li>{@code "per_context"}: enables timeouts
+	 * <li>{@code "per_declaration"}: disables timeouts
+	 * </ul>
+	 *
+	 * <p>If not specified, the default is {@code per_declaration}.
+	 */
+	@Deprecated
+	@API(status = DEPRECATED, since = "5.8")
+	public static final String TEMP_DIR_BEHAVIOR_PROPERTY_NAME = JupiterConfiguration.TEMP_DIR_BEHAVIOR_PROPERTY_NAME;
+
 	private Constants() {
 		/* no-op */
 	}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index c77626266284..3c510a784528 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -107,4 +107,10 @@ public Optional<ClassOrderer> getDefaultTestClassOrderer() {
 			key -> delegate.getDefaultTestClassOrderer());
 	}
 
+	@Override
+	public TempDirBehavior getTempDirBehavior() {
+		return (TempDirBehavior) cache.computeIfAbsent(TEMP_DIR_BEHAVIOR_PROPERTY_NAME,
+			key -> delegate.getTempDirBehavior());
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index f8823892a5d7..e57b17a77611 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -50,6 +50,9 @@ public class DefaultJupiterConfiguration implements JupiterConfiguration {
 	private static final InstantiatingConfigurationParameterConverter<ClassOrderer> classOrdererConverter = //
 		new InstantiatingConfigurationParameterConverter<>(ClassOrderer.class, "class orderer");
 
+	private static final EnumConfigurationParameterConverter<TempDirBehavior> tempDirBehaviorConverter = //
+		new EnumConfigurationParameterConverter<>(TempDirBehavior.class, "@TempDir behavior");
+
 	private final ConfigurationParameters configurationParameters;
 
 	public DefaultJupiterConfiguration(ConfigurationParameters configurationParameters) {
@@ -117,4 +120,9 @@ public Optional<ClassOrderer> getDefaultTestClassOrderer() {
 		return classOrdererConverter.get(configurationParameters, DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME);
 	}
 
+	@Override
+	public TempDirBehavior getTempDirBehavior() {
+		return tempDirBehaviorConverter.get(configurationParameters, TEMP_DIR_BEHAVIOR_PROPERTY_NAME,
+			TempDirBehavior.PER_DECLARATION);
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index 2259d96739b1..cb630cc178cb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -41,6 +41,7 @@ public interface JupiterConfiguration {
 	String DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME = "junit.jupiter.displayname.generator.default";
 	String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = "junit.jupiter.testmethod.order.default";
 	String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = "junit.jupiter.testclass.order.default";
+	String TEMP_DIR_BEHAVIOR_PROPERTY_NAME = "junit.jupiter.tempdir.behavior";
 
 	String DEFAULT_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.default";
 	String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testable.method.default";
@@ -76,4 +77,6 @@ public interface JupiterConfiguration {
 
 	Optional<ClassOrderer> getDefaultTestClassOrderer();
 
+	TempDirBehavior getTempDirBehavior();
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/TempDirBehavior.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/TempDirBehavior.java
new file mode 100644
index 000000000000..3bc942c6ebc7
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/TempDirBehavior.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.config;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import org.apiguardian.api.API;
+
+/**
+ * @since 5.8
+ */
+@API(status = INTERNAL, since = "5.8")
+public enum TempDirBehavior {
+
+	PER_CONTEXT,
+
+	PER_DECLARATION
+
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 58432a0206de..48486c104a7a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
@@ -47,13 +48,14 @@ public class MutableExtensionRegistry implements ExtensionRegistry, ExtensionReg
 
 	private static final Logger logger = LoggerFactory.getLogger(MutableExtensionRegistry.class);
 
-	private static final List<Extension> DEFAULT_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(//
-		new DisabledCondition(), //
-		new TempDirectory(), //
-		new TimeoutExtension(), //
-		new RepeatedTestExtension(), //
-		new TestInfoParameterResolver(), //
-		new TestReporterParameterResolver()));
+	private static final List<Function<JupiterConfiguration, Extension>> DEFAULT_EXTENSION_CREATORS = Collections.unmodifiableList(
+		Arrays.asList(//
+			__ -> new DisabledCondition(), //
+			configuration -> new TempDirectory(configuration.getTempDirBehavior()), //
+			__ -> new TimeoutExtension(), //
+			__ -> new RepeatedTestExtension(), //
+			__ -> new TestInfoParameterResolver(), //
+			__ -> new TestReporterParameterResolver()));
 
 	/**
 	 * Factory for creating and populating a new root registry with the default
@@ -71,7 +73,9 @@ public class MutableExtensionRegistry implements ExtensionRegistry, ExtensionReg
 	public static MutableExtensionRegistry createRegistryWithDefaultExtensions(JupiterConfiguration configuration) {
 		MutableExtensionRegistry extensionRegistry = new MutableExtensionRegistry(null);
 
-		DEFAULT_EXTENSIONS.forEach(extensionRegistry::registerDefaultExtension);
+		DEFAULT_EXTENSION_CREATORS.stream() //
+				.map(creator -> creator.apply(configuration)) //
+				.forEach(extensionRegistry::registerDefaultExtension);
 
 		if (configuration.isExtensionAutoDetectionEnabled()) {
 			registerAutoDetectedExtensions(extensionRegistry);
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 1ce055970857..5b3d0a0f0d39 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -18,6 +18,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Parameter;
@@ -43,6 +44,7 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.engine.config.TempDirBehavior;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
@@ -63,6 +65,12 @@ class TempDirectory implements BeforeAllCallback, BeforeEachCallback, ParameterR
 	private static final String KEY = "temp.dir";
 	private static final String TEMP_DIR_PREFIX = "junit";
 
+	private final TempDirBehavior behavior;
+
+	TempDirectory(TempDirBehavior behavior) {
+		this.behavior = behavior;
+	}
+
 	/**
 	 * Perform field injection for non-private, {@code static} fields (i.e.,
 	 * class fields) of type {@link Path} or {@link File} that are annotated with
@@ -98,7 +106,7 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 		findAnnotatedFields(testClass, TempDir.class, predicate).forEach(field -> {
 			assertValidFieldCandidate(field);
 			try {
-				makeAccessible(field).set(testInstance, getPathOrFile(field.getType(), context));
+				makeAccessible(field).set(testInstance, getPathOrFile(field, field.getType(), context));
 			}
 			catch (Throwable t) {
 				ExceptionUtils.throwAsUncheckedException(t);
@@ -135,7 +143,7 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 		Class<?> parameterType = parameterContext.getParameter().getType();
 		assertSupportedType("parameter", parameterType);
-		return getPathOrFile(parameterType, extensionContext);
+		return getPathOrFile(parameterContext.getParameter(), parameterType, extensionContext);
 	}
 
 	private void assertSupportedType(String target, Class<?> type) {
@@ -145,9 +153,12 @@ private void assertSupportedType(String target, Class<?> type) {
 		}
 	}
 
-	private Object getPathOrFile(Class<?> type, ExtensionContext extensionContext) {
-		Path path = extensionContext.getStore(NAMESPACE) //
-				.getOrComputeIfAbsent(KEY, key -> createTempDir(), CloseablePath.class) //
+	private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, ExtensionContext extensionContext) {
+		Namespace namespace = behavior == TempDirBehavior.PER_DECLARATION //
+				? NAMESPACE.append(sourceElement) //
+				: NAMESPACE;
+		Path path = extensionContext.getStore(namespace) //
+				.getOrComputeIfAbsent(KEY, __ -> createTempDir(), CloseablePath.class) //
 				.get();
 
 		return (type == Path.class) ? path : path.toFile();
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index 7e34ce57ecdb..deb21523afb5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -19,6 +19,8 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.cause;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
@@ -51,6 +53,8 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.jupiter.engine.Constants;
+import org.junit.jupiter.engine.config.TempDirBehavior;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
@@ -63,6 +67,16 @@
 @DisplayName("TempDirectory extension (per context)")
 class TempDirectoryPerContextTests extends AbstractJupiterTestEngineTests {
 
+	@SuppressWarnings("deprecation")
+	@Override
+	protected EngineExecutionResults executeTestsForClass(Class<?> testClass) {
+		return executeTests(request() //
+				.selectors(selectClass(testClass)) //
+				.configurationParameter(Constants.TEMP_DIR_BEHAVIOR_PROPERTY_NAME,
+					TempDirBehavior.PER_CONTEXT.toString()) //
+				.build());
+	}
+
 	@BeforeEach
 	@AfterEach
 	void resetStaticVariables() {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 0c6e53f149f2..4fba983e22e2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -16,7 +16,10 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.cause;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
@@ -26,13 +29,24 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Stream;
 
 import org.assertj.core.api.Condition;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -42,6 +56,7 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.jupiter.engine.Constants;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
@@ -53,6 +68,59 @@
 @DisplayName("TempDirectory extension (per declaration)")
 class TempDirectoryPerDeclarationTests extends AbstractJupiterTestEngineTests {
 
+	@BeforeEach
+	@AfterEach
+	void resetStaticVariables() {
+		AllPossibleDeclarationLocationsTestCase.tempDirs.clear();
+	}
+
+	@TestFactory
+	@DisplayName("resolves separate temp dirs for each annotation declaration")
+	Stream<DynamicTest> resolvesSeparateTempDirsForEachAnnotationDeclaration() {
+		return Arrays.stream(TestInstance.Lifecycle.values()).map(
+			lifecycle -> dynamicTest("with " + lifecycle + " lifecycle", () -> {
+
+				var results = executeTests(request() //
+						.selectors(selectClass(AllPossibleDeclarationLocationsTestCase.class)) //
+						.configurationParameter(Constants.DEFAULT_TEST_INSTANCE_LIFECYCLE_PROPERTY_NAME,
+							lifecycle.toString()).build());
+
+				results.containerEvents().assertStatistics(stats -> stats.started(2).succeeded(2));
+				results.testEvents().assertStatistics(stats -> stats.started(2).succeeded(2));
+
+				assertThat(AllPossibleDeclarationLocationsTestCase.tempDirs).hasSize(3);
+
+				var classTempDirs = AllPossibleDeclarationLocationsTestCase.tempDirs.get("class");
+				assertThat(classTempDirs).containsOnlyKeys("staticField1", "staticField2", "beforeAll1", "beforeAll2",
+					"afterAll1", "afterAll2");
+				assertThat(classTempDirs.values()).hasSize(6).doesNotHaveDuplicates();
+
+				var testATempDirs = AllPossibleDeclarationLocationsTestCase.tempDirs.get("testA");
+				assertThat(testATempDirs).containsOnlyKeys("staticField1", "staticField2", "instanceField1",
+					"instanceField2", "beforeEach1", "beforeEach2", "test1", "test2", "afterEach1", "afterEach2");
+				assertThat(testATempDirs.values()).hasSize(10).doesNotHaveDuplicates();
+
+				var testBTempDirs = AllPossibleDeclarationLocationsTestCase.tempDirs.get("testB");
+				assertThat(testBTempDirs).containsOnlyKeys("staticField1", "staticField2", "instanceField1",
+					"instanceField2", "beforeEach1", "beforeEach2", "test1", "test2", "afterEach1", "afterEach2");
+				assertThat(testBTempDirs.values()).hasSize(10).doesNotHaveDuplicates();
+
+				assertThat(testATempDirs.get("staticField1")).isEqualTo(classTempDirs.get("staticField1"));
+				assertThat(testBTempDirs.get("staticField1")).isEqualTo(classTempDirs.get("staticField1"));
+				assertThat(testATempDirs.get("staticField2")).isEqualTo(classTempDirs.get("staticField2"));
+				assertThat(testBTempDirs.get("staticField2")).isEqualTo(classTempDirs.get("staticField2"));
+
+				assertThat(testATempDirs.get("instanceField1")).isNotEqualTo(testBTempDirs.get("instanceField1"));
+				assertThat(testATempDirs.get("instanceField2")).isNotEqualTo(testBTempDirs.get("instanceField2"));
+				assertThat(testATempDirs.get("beforeEach1")).isNotEqualTo(testBTempDirs.get("beforeEach1"));
+				assertThat(testATempDirs.get("beforeEach2")).isNotEqualTo(testBTempDirs.get("beforeEach2"));
+				assertThat(testATempDirs.get("test1")).isNotEqualTo(testBTempDirs.get("test1"));
+				assertThat(testATempDirs.get("test2")).isNotEqualTo(testBTempDirs.get("test2"));
+				assertThat(testATempDirs.get("afterEach1")).isNotEqualTo(testBTempDirs.get("afterEach1"));
+				assertThat(testATempDirs.get("afterEach2")).isNotEqualTo(testBTempDirs.get("afterEach2"));
+			}));
+	}
+
 	@Test
 	@DisplayName("does not prevent constructor parameter resolution")
 	void tempDirectoryDoesNotPreventConstructorParameterResolution() {
@@ -832,4 +900,82 @@ void nested() {
 			}
 		}
 	}
+
+	@DisplayName("class")
+	static class AllPossibleDeclarationLocationsTestCase {
+
+		static final Map<String, Map<String, Path>> tempDirs = new HashMap<>();
+
+		@TempDir
+		static Path staticField1;
+
+		@TempDir
+		static Path staticField2;
+
+		@TempDir
+		Path instanceField1;
+
+		@TempDir
+		Path instanceField2;
+
+		@BeforeAll
+		static void beforeAll(@TempDir Path param1, @TempDir Path param2, TestInfo testInfo) {
+			getTempDirs(testInfo).putAll(Map.of( //
+				"staticField1", staticField1, //
+				"staticField2", staticField2, //
+				"beforeAll1", param1, //
+				"beforeAll2", param2 //
+			));
+		}
+
+		@BeforeEach
+		void beforeEach(@TempDir Path param1, @TempDir Path param2, TestInfo testInfo) {
+			getTempDirs(testInfo).putAll(Map.of( //
+				"staticField1", staticField1, //
+				"staticField2", staticField2, //
+				"instanceField1", instanceField1, //
+				"instanceField2", instanceField2, //
+				"beforeEach1", param1, //
+				"beforeEach2", param2 //
+			));
+		}
+
+		@Test
+		@DisplayName("testA")
+		void testA(@TempDir Path param1, @TempDir Path param2, TestInfo testInfo) {
+			getTempDirs(testInfo).putAll(Map.of( //
+				"test1", param1, //
+				"test2", param2 //
+			));
+		}
+
+		@Test
+		@DisplayName("testB")
+		void testB(@TempDir Path param1, @TempDir Path param2, TestInfo testInfo) {
+			getTempDirs(testInfo).putAll(Map.of( //
+				"test1", param1, //
+				"test2", param2 //
+			));
+		}
+
+		@AfterEach
+		void afterEach(@TempDir Path param1, @TempDir Path param2, TestInfo testInfo) {
+			getTempDirs(testInfo).putAll(Map.of( //
+				"afterEach1", param1, //
+				"afterEach2", param2 //
+			));
+		}
+
+		@AfterAll
+		static void afterAll(@TempDir Path param1, @TempDir Path param2, TestInfo testInfo) {
+			getTempDirs(testInfo).putAll(Map.of( //
+				"afterAll1", param1, //
+				"afterAll2", param2 //
+			));
+		}
+
+		private static Map<String, Path> getTempDirs(TestInfo testInfo) {
+			return tempDirs.computeIfAbsent(testInfo.getDisplayName(), __ -> new LinkedHashMap<>());
+		}
+	}
 }

From dd24681196eddb820227f1c18e3fabc360480205 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 12:13:51 +0200
Subject: [PATCH 0431/1433] Add to release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index d42478117bfc..dab61b628270 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -80,6 +80,10 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* `@TempDir` can now be used to create multiple temporary directories. Instead of creating
+  a single temporary directory per context (i.e. test class or method) every declaration
+  of the `@TempDir` annotation on a field or method parameter now results in a separate
+  temporary directory.
 * New `named()` static factory method in the `Named` interface that serves as an _alias_
   for `Named.of()`. `named()` is intended to be used via `import static`.
 * New `class` URI scheme for dynamic test sources. This allows tests to be located using

From f69767915bee6aa6a0f148e974c62cbc5d55262c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 12:50:19 +0200
Subject: [PATCH 0432/1433] Document in user guide

---
 .../src/docs/asciidoc/user-guide/writing-tests.adoc  |  8 ++++++++
 .../src/test/java/example/TempDirectoryDemo.java     | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 5af0fe689035..34e4fbe9cec4 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2197,6 +2197,14 @@ its content.
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_parameter_injection]
 ----
 
+You can inject multiple temporary directories by specifying multiple annotated parameters.
+
+[source,java,indent=0]
+.A test method that requires multiple temporary directories
+----
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_multiple_directories]
+----
+
 WARNING: `@TempDir` is not supported on constructor parameters. If you wish to retain a
 single reference to a temp directory across lifecycle methods and the current test method,
 please use field injection, by annotating a non-private instance field with `@TempDir`.
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index 217977408229..da376260f3eb 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -35,6 +35,18 @@ void writeItemsToFile(@TempDir Path tempDir) throws IOException {
 	}
 	// end::user_guide_parameter_injection[]
 
+	// tag::user_guide_multiple_directories[]
+	@Test
+	void copyFileFromSourceToTarget(@TempDir Path source, @TempDir Path target) throws IOException {
+		Path sourceFile = source.resolve("test.txt");
+		new ListWriter(sourceFile).write("a", "b", "c");
+
+		Path targetFile = Files.copy(sourceFile, target.resolve("test.txt"));
+
+		assertEquals(singletonList("a,b,c"), Files.readAllLines(targetFile));
+	}
+	// end::user_guide_multiple_directories[]
+
 	static
 	// tag::user_guide_field_injection[]
 	class SharedTempDirectoryDemo {

From 953daaf92b6320a41089218a65f47e56695f7298 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 14:58:42 +0200
Subject: [PATCH 0433/1433] Rename TempDirBehavior to TempDirectory.Scope

---
 .../org/junit/jupiter/engine/Constants.java   | 14 +++++----
 .../config/CachingJupiterConfiguration.java   |  6 ----
 .../config/DefaultJupiterConfiguration.java   |  8 -----
 .../EnumConfigurationParameterConverter.java  | 30 +++++++++++++------
 .../engine/config/JupiterConfiguration.java   |  4 +--
 .../engine/config/TempDirBehavior.java        | 27 -----------------
 .../extension/MutableExtensionRegistry.java   | 20 +++++--------
 .../engine/extension/TempDirectory.java       | 28 ++++++++++++-----
 .../TempDirectoryPerContextTests.java         |  5 ++--
 9 files changed, 61 insertions(+), 81 deletions(-)
 delete mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/TempDirBehavior.java

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 08e05658c761..23110828d3d1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -459,7 +459,7 @@ public final class Constants {
 	 * implement {@link org.junit.jupiter.api.MethodOrderer}.
 	 *
 	 * <p>If not specified, test methods will be ordered using an algorithm that
-	 * is deterministic but intentionally nonobvious.
+	 * is deterministic but intentionally non-obvious.
 	 */
 	@API(status = EXPERIMENTAL, since = "5.7")
 	public static final String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME;
@@ -476,19 +476,23 @@ public final class Constants {
 	public static final String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME;
 
 	/**
-	 * Property name used to set the behavior for {@link org.junit.jupiter.api.io.TempDir}: {@value}
+	 * Property name used to set the scope of temporary directories created via
+	 * {@link org.junit.jupiter.api.io.TempDir @TempDir} annotation: {@value}
 	 *
 	 * <h3>Supported Values</h3>
 	 * <ul>
-	 * <li>{@code "per_context"}: enables timeouts
-	 * <li>{@code "per_declaration"}: disables timeouts
+	 * <li>{@code per_context}: creates a single temporary directory for the
+	 * entire test class or method, depending on where it's first declared
+	 * <li>{@code per_declaration}: creates separate temporary directories for
+	 * each declaration site of the {@code @TempDir} annotation.
 	 * </ul>
 	 *
 	 * <p>If not specified, the default is {@code per_declaration}.
 	 */
+	@SuppressWarnings("DeprecatedIsStillUsed")
 	@Deprecated
 	@API(status = DEPRECATED, since = "5.8")
-	public static final String TEMP_DIR_BEHAVIOR_PROPERTY_NAME = JupiterConfiguration.TEMP_DIR_BEHAVIOR_PROPERTY_NAME;
+	public static final String TEMP_DIR_SCOPE_PROPERTY_NAME = JupiterConfiguration.TEMP_DIR_SCOPE_PROPERTY_NAME;
 
 	private Constants() {
 		/* no-op */
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index 3c510a784528..c77626266284 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -107,10 +107,4 @@ public Optional<ClassOrderer> getDefaultTestClassOrderer() {
 			key -> delegate.getDefaultTestClassOrderer());
 	}
 
-	@Override
-	public TempDirBehavior getTempDirBehavior() {
-		return (TempDirBehavior) cache.computeIfAbsent(TEMP_DIR_BEHAVIOR_PROPERTY_NAME,
-			key -> delegate.getTempDirBehavior());
-	}
-
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index e57b17a77611..f8823892a5d7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -50,9 +50,6 @@ public class DefaultJupiterConfiguration implements JupiterConfiguration {
 	private static final InstantiatingConfigurationParameterConverter<ClassOrderer> classOrdererConverter = //
 		new InstantiatingConfigurationParameterConverter<>(ClassOrderer.class, "class orderer");
 
-	private static final EnumConfigurationParameterConverter<TempDirBehavior> tempDirBehaviorConverter = //
-		new EnumConfigurationParameterConverter<>(TempDirBehavior.class, "@TempDir behavior");
-
 	private final ConfigurationParameters configurationParameters;
 
 	public DefaultJupiterConfiguration(ConfigurationParameters configurationParameters) {
@@ -120,9 +117,4 @@ public Optional<ClassOrderer> getDefaultTestClassOrderer() {
 		return classOrdererConverter.get(configurationParameters, DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME);
 	}
 
-	@Override
-	public TempDirBehavior getTempDirBehavior() {
-		return tempDirBehaviorConverter.get(configurationParameters, TEMP_DIR_BEHAVIOR_PROPERTY_NAME,
-			TempDirBehavior.PER_DECLARATION);
-	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
index 47cfb8bad03b..8bb37ee492d8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
@@ -10,8 +10,13 @@
 
 package org.junit.jupiter.engine.config;
 
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.util.Locale;
 import java.util.Optional;
+import java.util.function.Function;
 
+import org.apiguardian.api.API;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.Preconditions;
@@ -20,14 +25,15 @@
 /**
  * @since 5.4
  */
-class EnumConfigurationParameterConverter<E extends Enum<E>> {
+@API(status = INTERNAL, since = "5.8")
+public class EnumConfigurationParameterConverter<E extends Enum<E>> {
 
 	private static final Logger logger = LoggerFactory.getLogger(EnumConfigurationParameterConverter.class);
 
 	private final Class<E> enumType;
 	private final String enumDisplayName;
 
-	EnumConfigurationParameterConverter(Class<E> enumType, String enumDisplayName) {
+	public EnumConfigurationParameterConverter(Class<E> enumType, String enumDisplayName) {
 		this.enumType = enumType;
 		this.enumDisplayName = enumDisplayName;
 	}
@@ -35,15 +41,21 @@ class EnumConfigurationParameterConverter<E extends Enum<E>> {
 	E get(ConfigurationParameters configParams, String key, E defaultValue) {
 		Preconditions.notNull(configParams, "ConfigurationParameters must not be null");
 
-		Optional<String> optional = configParams.get(key);
-		String constantName = null;
-		if (optional.isPresent()) {
+		return get(key, configParams::get, defaultValue);
+	}
+
+	public E get(String key, Function<String, Optional<String>> lookup, E defaultValue) {
+
+		Optional<String> value = lookup.apply(key);
+
+		if (value.isPresent()) {
+			String constantName = null;
 			try {
-				constantName = optional.get().trim().toUpperCase();
-				E value = Enum.valueOf(enumType, constantName);
+				constantName = value.get().trim().toUpperCase(Locale.ROOT);
+				E result = Enum.valueOf(enumType, constantName);
 				logger.info(() -> String.format("Using %s '%s' set via the '%s' configuration parameter.",
-					enumDisplayName, value, key));
-				return value;
+					enumDisplayName, result, key));
+				return result;
 			}
 			catch (Exception ex) {
 				// local copy necessary for use in lambda expression
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index cb630cc178cb..ce1c9670475a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -41,7 +41,7 @@ public interface JupiterConfiguration {
 	String DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME = "junit.jupiter.displayname.generator.default";
 	String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = "junit.jupiter.testmethod.order.default";
 	String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = "junit.jupiter.testclass.order.default";
-	String TEMP_DIR_BEHAVIOR_PROPERTY_NAME = "junit.jupiter.tempdir.behavior";
+	String TEMP_DIR_SCOPE_PROPERTY_NAME = "junit.jupiter.tempdir.scope";
 
 	String DEFAULT_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.default";
 	String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testable.method.default";
@@ -77,6 +77,4 @@ public interface JupiterConfiguration {
 
 	Optional<ClassOrderer> getDefaultTestClassOrderer();
 
-	TempDirBehavior getTempDirBehavior();
-
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/TempDirBehavior.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/TempDirBehavior.java
deleted file mode 100644
index 3bc942c6ebc7..000000000000
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/TempDirBehavior.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2015-2021 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.engine.config;
-
-import static org.apiguardian.api.API.Status.INTERNAL;
-
-import org.apiguardian.api.API;
-
-/**
- * @since 5.8
- */
-@API(status = INTERNAL, since = "5.8")
-public enum TempDirBehavior {
-
-	PER_CONTEXT,
-
-	PER_DECLARATION
-
-}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 48486c104a7a..58432a0206de 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
@@ -48,14 +47,13 @@ public class MutableExtensionRegistry implements ExtensionRegistry, ExtensionReg
 
 	private static final Logger logger = LoggerFactory.getLogger(MutableExtensionRegistry.class);
 
-	private static final List<Function<JupiterConfiguration, Extension>> DEFAULT_EXTENSION_CREATORS = Collections.unmodifiableList(
-		Arrays.asList(//
-			__ -> new DisabledCondition(), //
-			configuration -> new TempDirectory(configuration.getTempDirBehavior()), //
-			__ -> new TimeoutExtension(), //
-			__ -> new RepeatedTestExtension(), //
-			__ -> new TestInfoParameterResolver(), //
-			__ -> new TestReporterParameterResolver()));
+	private static final List<Extension> DEFAULT_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(//
+		new DisabledCondition(), //
+		new TempDirectory(), //
+		new TimeoutExtension(), //
+		new RepeatedTestExtension(), //
+		new TestInfoParameterResolver(), //
+		new TestReporterParameterResolver()));
 
 	/**
 	 * Factory for creating and populating a new root registry with the default
@@ -73,9 +71,7 @@ public class MutableExtensionRegistry implements ExtensionRegistry, ExtensionReg
 	public static MutableExtensionRegistry createRegistryWithDefaultExtensions(JupiterConfiguration configuration) {
 		MutableExtensionRegistry extensionRegistry = new MutableExtensionRegistry(null);
 
-		DEFAULT_EXTENSION_CREATORS.stream() //
-				.map(creator -> creator.apply(configuration)) //
-				.forEach(extensionRegistry::registerDefaultExtension);
+		DEFAULT_EXTENSIONS.forEach(extensionRegistry::registerDefaultExtension);
 
 		if (configuration.isExtensionAutoDetectionEnabled()) {
 			registerAutoDetectedExtensions(extensionRegistry);
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 5b3d0a0f0d39..3b183431267c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -12,6 +12,7 @@
 
 import static java.nio.file.FileVisitResult.CONTINUE;
 import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.engine.config.JupiterConfiguration.TEMP_DIR_SCOPE_PROPERTY_NAME;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
 import static org.junit.platform.commons.util.ReflectionUtils.isPrivate;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
@@ -44,7 +45,7 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.io.TempDir;
-import org.junit.jupiter.engine.config.TempDirBehavior;
+import org.junit.jupiter.engine.config.EnumConfigurationParameterConverter;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
@@ -65,12 +66,6 @@ class TempDirectory implements BeforeAllCallback, BeforeEachCallback, ParameterR
 	private static final String KEY = "temp.dir";
 	private static final String TEMP_DIR_PREFIX = "junit";
 
-	private final TempDirBehavior behavior;
-
-	TempDirectory(TempDirBehavior behavior) {
-		this.behavior = behavior;
-	}
-
 	/**
 	 * Perform field injection for non-private, {@code static} fields (i.e.,
 	 * class fields) of type {@link Path} or {@link File} that are annotated with
@@ -154,7 +149,7 @@ private void assertSupportedType(String target, Class<?> type) {
 	}
 
 	private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, ExtensionContext extensionContext) {
-		Namespace namespace = behavior == TempDirBehavior.PER_DECLARATION //
+		Namespace namespace = getScope(extensionContext) == Scope.PER_DECLARATION //
 				? NAMESPACE.append(sourceElement) //
 				: NAMESPACE;
 		Path path = extensionContext.getStore(namespace) //
@@ -164,6 +159,15 @@ private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, Exte
 		return (type == Path.class) ? path : path.toFile();
 	}
 
+	private Scope getScope(ExtensionContext context) {
+		return context.getRoot().getStore(NAMESPACE).getOrComputeIfAbsent( //
+			Scope.class, //
+			__ -> new EnumConfigurationParameterConverter<>(Scope.class, "@TempDir scope") //
+					.get(TEMP_DIR_SCOPE_PROPERTY_NAME, context::getConfigurationParameter, Scope.PER_DECLARATION), //
+			Scope.class //
+		);
+	}
+
 	private static CloseablePath createTempDir() {
 		try {
 			return new CloseablePath(Files.createTempDirectory(TEMP_DIR_PREFIX));
@@ -306,4 +310,12 @@ private Path relativizeSafely(Path path) {
 		}
 	}
 
+	enum Scope {
+
+		PER_CONTEXT,
+
+		PER_DECLARATION
+
+	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index deb21523afb5..a5a81b610821 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -54,7 +54,6 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.Constants;
-import org.junit.jupiter.engine.config.TempDirBehavior;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
@@ -72,8 +71,8 @@ class TempDirectoryPerContextTests extends AbstractJupiterTestEngineTests {
 	protected EngineExecutionResults executeTestsForClass(Class<?> testClass) {
 		return executeTests(request() //
 				.selectors(selectClass(testClass)) //
-				.configurationParameter(Constants.TEMP_DIR_BEHAVIOR_PROPERTY_NAME,
-					TempDirBehavior.PER_CONTEXT.toString()) //
+				.configurationParameter(Constants.TEMP_DIR_SCOPE_PROPERTY_NAME,
+					TempDirectory.Scope.PER_CONTEXT.toString()) //
 				.build());
 	}
 

From 6003edf34e7498fb86318be448eecedf36ca610c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 14:58:55 +0200
Subject: [PATCH 0434/1433] Document configuration parameter

---
 .../release-notes/release-notes-5.8.0-M2.adoc      |  4 +++-
 .../docs/asciidoc/user-guide/writing-tests.adoc    | 14 ++++++++++----
 .../src/test/java/example/TempDirectoryDemo.java   |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index dab61b628270..32594b6d8d98 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -83,7 +83,9 @@ on GitHub.
 * `@TempDir` can now be used to create multiple temporary directories. Instead of creating
   a single temporary directory per context (i.e. test class or method) every declaration
   of the `@TempDir` annotation on a field or method parameter now results in a separate
-  temporary directory.
+  temporary directory. To revert to the old behavior of using a single temporary directory
+  for the entire test class or method (depending on which level the annotation is used),
+  you can set the `junit.jupiter.tempdir.scope` configuration parameter to `per_context`.
 * New `named()` static factory method in the `Named` interface that serves as an _alias_
   for `Named.of()`. `named()` is intended to be used via `import static`.
 * New `class` URI scheme for dynamic test sources. This allows tests to be located using
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 34e4fbe9cec4..8cbc3e9fd74d 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2205,13 +2205,19 @@ You can inject multiple temporary directories by specifying multiple annotated p
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_multiple_directories]
 ----
 
-WARNING: `@TempDir` is not supported on constructor parameters. If you wish to retain a
-single reference to a temp directory across lifecycle methods and the current test method,
-please use field injection, by annotating a non-private instance field with `@TempDir`.
+WARNING: To revert to the old behavior of using a single temporary directory for the
+entire test class or method (depending on which level the annotation is used), you can set
+the `junit.jupiter.tempdir.scope` configuration parameter to `per_context`. However,
+please note that this option is deprecated and will be removed in a future release.
+
+`@TempDir` is not supported on constructor parameters. If you wish to retain a single
+reference to a temp directory across lifecycle methods and the current test method, please
+use field injection, by annotating a non-private instance field with `@TempDir`.
 
 The following example stores a _shared_ temporary directory in a `static` field. This
 allows the same `sharedTempDir` to be used in all lifecycle methods and test methods of
-the test class.
+the test class. For better isolation, you should use an instance field so that each test
+method uses a separate directory.
 
 [source,java,indent=0]
 .A test class that shares a temporary directory across test methods
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index da376260f3eb..1daba23a28e0 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -12,6 +12,7 @@
 
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -43,6 +44,7 @@ void copyFileFromSourceToTarget(@TempDir Path source, @TempDir Path target) thro
 
 		Path targetFile = Files.copy(sourceFile, target.resolve("test.txt"));
 
+		assertNotEquals(sourceFile, targetFile);
 		assertEquals(singletonList("a,b,c"), Files.readAllLines(targetFile));
 	}
 	// end::user_guide_multiple_directories[]

From 2653004466f15606474de594ebaedb6b42eabd83 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Aug 2021 15:14:56 +0200
Subject: [PATCH 0435/1433] Document scope in Javadoc

---
 .../org/junit/jupiter/api/io/TempDir.java     | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 3d9bf2f1ce7b..33ca4dc2ce17 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -34,7 +34,7 @@
  * parameters. Please use field injection instead, by annotating a non-private
  * instance field with {@code @TempDir}.
  *
- * <h3>Temporary Directory Creation</h3>
+ * <h3>Creation</h3>
  *
  * <p>The temporary directory is only created if a field in a test class or a
  * parameter in a lifecycle method or test method is annotated with
@@ -45,19 +45,29 @@
  * addition, a {@code ParameterResolutionException} will be thrown for a
  * constructor parameter annotated with {@code @TempDir}.
  *
- * <h3>Temporary Directory Scope</h3>
+ * <h3>Scope</h3>
  *
- * <p>The scope of the temporary directory depends on where the first
- * {@code @TempDir} annotation is encountered when executing a test class. The
- * temporary directory will be shared by all tests in a class when the
- * annotation is present on a {@code static} field or on a parameter of a
- * {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method. Otherwise &mdash;
- * for example, when {@code @TempDir} is only used on instance fields or on
- * parameters in test, {@link org.junit.jupiter.api.BeforeEach @BeforeEach},
- * or {@link org.junit.jupiter.api.AfterEach @AfterEach} methods &mdash; each test
+ * <p>By default, a separate temporary directory is created for every
+ * declaration of the {@code @TempDir} annotation. If you want to share a
+ * temporary directory across all tests in a test class, you should declare the
+ * annotation on a {@code static} field or on a parameter of a
+ * {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method.
+ *
+ * <h4>Old behavior</h4>
+ * <p>You can revert to the old behavior of using a single temporary directory
+ * by setting the {@code junit.jupiter.tempdir.scope} configuration parameter to
+ * {@code per_context}. In that case, the scope of the temporary directory
+ * depends on where the first {@code @TempDir} annotation is encountered when
+ * executing a test class. The temporary directory will be shared by all tests
+ * in a class when the annotation is present on a {@code static} field or on a
+ * parameter of a {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method.
+ * Otherwise &mdash; for example, when {@code @TempDir} is only used on instance
+ * fields or on parameters in test,
+ * {@link org.junit.jupiter.api.BeforeEach @BeforeEach}, or
+ * {@link org.junit.jupiter.api.AfterEach @AfterEach} methods &mdash; each test
  * will use its own temporary directory.
  *
- * <h3>Temporary Directory Deletion</h3>
+ * <h3>Deletion</h3>
  *
  * <p>When the end of the scope of a temporary directory is reached, i.e. when
  * the test method or class has finished execution, JUnit will attempt to

From 6a0dd8bc8cf924c8da5bfb5388dbf427001e3264 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 10:06:38 +0200
Subject: [PATCH 0436/1433] Use temp dir in constructor resolution test case

---
 .../engine/extension/TempDirectoryPerDeclarationTests.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 4fba983e22e2..c4f8b848253c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -400,12 +400,16 @@ void checkFile(@TempDir File tempDir, @TempDir Path ref) {
 	// https://github.com/junit-team/junit5/issues/1748
 	static class TempDirectoryDoesNotPreventConstructorParameterResolutionTestCase {
 
+		@TempDir
+		Path tempDir;
+
 		TempDirectoryDoesNotPreventConstructorParameterResolutionTestCase(TestInfo testInfo) {
 			assertNotNull(testInfo);
 		}
 
 		@Test
 		void test() {
+			assertNotNull(tempDir);
 		}
 
 	}

From aaacd9d48dbdf9a2117c5e31b6a466b9d63556c6 Mon Sep 17 00:00:00 2001
From: Bernd Farka <bernd.farka@dynatrace.com>
Date: Thu, 8 Jul 2021 07:27:46 +0200
Subject: [PATCH 0437/1433] Report exceptions thrown by CloseableResource as
 suppressed exceptions

In case of a previous failures, exceptions thrown from
`CloseableResource` instances are reported as suppressed exceptions.

Closes #2662.
---
 .../descriptor/TestMethodTestDescriptor.java  |  2 +-
 .../CloseableResourceIntegrationTests.java    | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
index e5ca8e640dab..ced917880313 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -145,7 +145,7 @@ public void cleanUp(JupiterEngineExecutionContext context) throws Exception {
 		if (isPerMethodLifecycle(context) && context.getExtensionContext().getTestInstance().isPresent()) {
 			invokeTestInstancePreDestroyCallbacks(context);
 		}
-		super.cleanUp(context);
+		context.getThrowableCollector().execute(() -> super.cleanUp(context));
 		context.getThrowableCollector().assertEmpty();
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
index 4ca92ed4252a..0306530849c9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
@@ -10,12 +10,17 @@
 
 package org.junit.jupiter.api.extension;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.platform.testkit.engine.EventConditions.reportEntry;
 
 import java.util.Map;
 
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.testkit.engine.EventType;
+import org.junit.platform.testkit.engine.Events;
 
 public class CloseableResourceIntegrationTests extends AbstractJupiterTestEngineTests {
 
@@ -43,4 +48,49 @@ private ExtensionContext.Store.CloseableResource reportEntryOnClose(ExtensionCon
 			return () -> extensionContext.publishReportEntry(Map.of(key, "closed"));
 		}
 	}
+
+
+	@Test
+	void testExceptionInOnCloseableResource() {
+		executeTestsForClass(ExceptionInCloseableResourceTestCase.class).testEvents()
+				.assertThatEvents()
+				.anySatisfy(e -> {
+					assertThat(e.getType()).isEqualTo(EventType.FINISHED);
+					TestExecutionResult result = e.getPayload(TestExecutionResult.class).get();
+					assertThat(result.getStatus()).isEqualTo(TestExecutionResult.Status.FAILED);
+					assertThat(result.getThrowable()).isPresent()
+							.hasValueSatisfying(t -> assertThat(t)
+									.hasMessageContaining("Exception in Test.")
+									.isInstanceOf(RuntimeException.class)
+							);
+					assertThat(result.getThrowable().get().getSuppressed())
+							.hasSize(1)
+							.anySatisfy(t -> assertThat(t).hasMessageContaining("Exception in onClose"));
+				});
+	}
+
+
+	@ExtendWith(ThrowingOnCloseExtension.class)
+	static class ExceptionInCloseableResourceTestCase {
+
+		@Test
+		void test() {
+			throw new RuntimeException("Exception in Test.");
+		}
+
+	}
+
+
+	static class ThrowingOnCloseExtension implements BeforeEachCallback {
+
+		private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(ThrowingOnCloseExtension.class);
+
+		@Override
+		public void beforeEach(ExtensionContext context) {
+			context.getStore(NAMESPACE).put("throwingResource", (ExtensionContext.Store.CloseableResource) () -> {
+				throw new RuntimeException("Exception in onClose");
+			});
+		}
+	}
+
 }

From abb40ca373218374a41ba11a8fff24c850c1b5a1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 10:26:47 +0200
Subject: [PATCH 0438/1433] Simplify test

---
 .../CloseableResourceIntegrationTests.java    | 45 +++++++------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
index 0306530849c9..d12538ab6351 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
@@ -10,17 +10,18 @@
 
 package org.junit.jupiter.api.extension;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL;
+import static org.junit.platform.testkit.engine.EventConditions.event;
+import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
 import static org.junit.platform.testkit.engine.EventConditions.reportEntry;
+import static org.junit.platform.testkit.engine.EventConditions.test;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.suppressed;
 
 import java.util.Map;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
-import org.junit.platform.engine.TestExecutionResult;
-import org.junit.platform.testkit.engine.EventType;
-import org.junit.platform.testkit.engine.Events;
 
 public class CloseableResourceIntegrationTests extends AbstractJupiterTestEngineTests {
 
@@ -37,7 +38,7 @@ void closesCloseableResourcesInReverseInsertOrder() {
 	static class TestCase {
 		@Test
 		void closesCloseableResourcesInExtensionContext(ExtensionContext extensionContext) {
-			ExtensionContext.Store store = extensionContext.getStore(ExtensionContext.Namespace.GLOBAL);
+			ExtensionContext.Store store = extensionContext.getStore(GLOBAL);
 			store.put("foo", reportEntryOnClose(extensionContext, "1"));
 			store.put("bar", reportEntryOnClose(extensionContext, "2"));
 			store.put("baz", reportEntryOnClose(extensionContext, "3"));
@@ -49,45 +50,31 @@ private ExtensionContext.Store.CloseableResource reportEntryOnClose(ExtensionCon
 		}
 	}
 
-
 	@Test
-	void testExceptionInOnCloseableResource() {
-		executeTestsForClass(ExceptionInCloseableResourceTestCase.class).testEvents()
-				.assertThatEvents()
-				.anySatisfy(e -> {
-					assertThat(e.getType()).isEqualTo(EventType.FINISHED);
-					TestExecutionResult result = e.getPayload(TestExecutionResult.class).get();
-					assertThat(result.getStatus()).isEqualTo(TestExecutionResult.Status.FAILED);
-					assertThat(result.getThrowable()).isPresent()
-							.hasValueSatisfying(t -> assertThat(t)
-									.hasMessageContaining("Exception in Test.")
-									.isInstanceOf(RuntimeException.class)
-							);
-					assertThat(result.getThrowable().get().getSuppressed())
-							.hasSize(1)
-							.anySatisfy(t -> assertThat(t).hasMessageContaining("Exception in onClose"));
-				});
+	void exceptionsDuringCloseAreReportedAsSuppressed() {
+		executeTestsForClass(ExceptionInCloseableResourceTestCase.class).testEvents() //
+				.assertEventsMatchLoosely(event( //
+					test(), //
+					finishedWithFailure( //
+						message("Exception in test"), //
+						suppressed(0, message("Exception in onClose")))));
 	}
 
-
 	@ExtendWith(ThrowingOnCloseExtension.class)
 	static class ExceptionInCloseableResourceTestCase {
 
 		@Test
 		void test() {
-			throw new RuntimeException("Exception in Test.");
+			throw new RuntimeException("Exception in test");
 		}
 
 	}
 
-
 	static class ThrowingOnCloseExtension implements BeforeEachCallback {
 
-		private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(ThrowingOnCloseExtension.class);
-
 		@Override
 		public void beforeEach(ExtensionContext context) {
-			context.getStore(NAMESPACE).put("throwingResource", (ExtensionContext.Store.CloseableResource) () -> {
+			context.getStore(GLOBAL).put("throwingResource", (ExtensionContext.Store.CloseableResource) () -> {
 				throw new RuntimeException("Exception in onClose");
 			});
 		}

From 1e5a9d1921838c8c2a9f3207ab5e1b6a3cbac617 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 10:36:26 +0200
Subject: [PATCH 0439/1433] Document #2582 in release notes

Resolves #2582.
---
 .../src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 32594b6d8d98..2036b3d8be25 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -73,6 +73,8 @@ on GitHub.
 * The `TypedArgumentConverter` base class now supports conversion to a primitive type if
   the configured target type is a wrapper for the target primitive type, including
   primitive widening support -- for example, from `Integer` to `int` or `long`.
+* Exceptions thrown from instances of `CloseableResource` no longer hide test failures but
+  are instead reported as suppressed exceptions.
 
 ==== Deprecations and Breaking Changes
 

From 0a3851dee56430b17ebb2cf5a13725b7bd068183 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 12:08:08 +0200
Subject: [PATCH 0440/1433] Add support for private TempDir fields

Resolves #2687.
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  5 ++-
 .../asciidoc/user-guide/writing-tests.adoc    |  8 ++--
 .../org/junit/jupiter/api/io/TempDir.java     |  8 ++--
 .../engine/extension/TempDirectory.java       | 10 +----
 .../TempDirectoryPerContextTests.java         | 43 +++++++++++--------
 .../TempDirectoryPerDeclarationTests.java     | 43 +++++++++++--------
 6 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 2036b3d8be25..71c43d0733e9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -88,12 +88,13 @@ on GitHub.
   temporary directory. To revert to the old behavior of using a single temporary directory
   for the entire test class or method (depending on which level the annotation is used),
   you can set the `junit.jupiter.tempdir.scope` configuration parameter to `per_context`.
+* `@TempDir` cleanup resets readable and executable permissions of the root temporary
+  directory and any contained directories instead of failing to delete them.
+* `@TempDir` fields may now be private.
 * New `named()` static factory method in the `Named` interface that serves as an _alias_
   for `Named.of()`. `named()` is intended to be used via `import static`.
 * New `class` URI scheme for dynamic test sources. This allows tests to be located using
   the information available in a `StackTraceElement`.
-* `@TempDir` cleanup resets readable and executable permissions of the root temporary
-  directory and any contained directories instead of failing to delete them.
 * New `assertThrowsExactly` method which is a more strict version of `assertThrows`
   that allows you to assert that the thrown exception has the exact specified class.
 * New `autoCloseArguments` attribute in `@ParameterizedTest` to close `AutoCloseable`
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 8cbc3e9fd74d..3ccc4899c2a8 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2183,9 +2183,9 @@ can improve and eventually <<api-evolution, promote>> this feature.
 
 The built-in `{TempDirectory}` extension is used to create and clean up a temporary
 directory for an individual test or all tests in a test class. It is registered by
-default. To use it, annotate a non-private field of type `java.nio.file.Path` or
-`java.io.File` with `{TempDir}` or add a parameter of type `java.nio.file.Path` or
-`java.io.File` annotated with `@TempDir` to a lifecycle method or test method.
+default. To use it, annotate a field of type `java.nio.file.Path` or `java.io.File` with
+`{TempDir}` or add a parameter of type `java.nio.file.Path` or `java.io.File` annotated
+with `@TempDir` to a lifecycle method or test method.
 
 For example, the following test declares a parameter annotated with `@TempDir` for a
 single test method, creates and writes to a file in the temporary directory, and checks
@@ -2212,7 +2212,7 @@ please note that this option is deprecated and will be removed in a future relea
 
 `@TempDir` is not supported on constructor parameters. If you wish to retain a single
 reference to a temp directory across lifecycle methods and the current test method, please
-use field injection, by annotating a non-private instance field with `@TempDir`.
+use field injection by annotating an instance field with `@TempDir`.
 
 The following example stores a _shared_ temporary directory in a `static` field. This
 allows the same `sharedTempDir` to be used in all lifecycle methods and test methods of
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 33ca4dc2ce17..142e75fbea99 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -26,13 +26,13 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 
 /**
- * {@code @TempDir} can be used to annotate a non-private field in a test class
- * or a parameter in a lifecycle method or test method of type {@link Path} or
+ * {@code @TempDir} can be used to annotate a field in a test class or a
+ * parameter in a lifecycle method or test method of type {@link Path} or
  * {@link File} that should be resolved into a temporary directory.
  *
  * <p>Please note that {@code @TempDir} is not supported on constructor
- * parameters. Please use field injection instead, by annotating a non-private
- * instance field with {@code @TempDir}.
+ * parameters. Please use field injection instead by annotating an instance
+ * field with {@code @TempDir}.
  *
  * <h3>Creation</h3>
  *
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 3b183431267c..6dd22e739e18 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -14,7 +14,6 @@
 import static java.util.stream.Collectors.joining;
 import static org.junit.jupiter.engine.config.JupiterConfiguration.TEMP_DIR_SCOPE_PROPERTY_NAME;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
-import static org.junit.platform.commons.util.ReflectionUtils.isPrivate;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
 
 import java.io.File;
@@ -99,7 +98,7 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 			Predicate<Field> predicate) {
 
 		findAnnotatedFields(testClass, TempDir.class, predicate).forEach(field -> {
-			assertValidFieldCandidate(field);
+			assertSupportedType("field", field.getType());
 			try {
 				makeAccessible(field).set(testInstance, getPathOrFile(field, field.getType(), context));
 			}
@@ -109,13 +108,6 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 		});
 	}
 
-	private void assertValidFieldCandidate(Field field) {
-		assertSupportedType("field", field.getType());
-		if (isPrivate(field)) {
-			throw new ExtensionConfigurationException("@TempDir field [" + field + "] must not be private.");
-		}
-	}
-
 	/**
 	 * Determine if the {@link Parameter} in the supplied {@link ParameterContext}
 	 * is annotated with {@link TempDir @TempDir}.
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index a5a81b610821..b1e34bef4f64 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -292,24 +292,6 @@ void resolvesSeparateTempDirWhenAnnotationIsUsedOnAfterAllMethodParameterOnly()
 	@TestMethodOrder(OrderAnnotation.class)
 	class Failures {
 
-		@Test
-		@DisplayName("when @TempDir is used on private static field")
-		@Order(10)
-		void onlySupportsNonPrivateInstanceFields() {
-			var results = executeTestsForClass(AnnotationOnPrivateStaticFieldTestCase.class);
-
-			assertSingleFailedContainer(results, ExtensionConfigurationException.class, "must not be private");
-		}
-
-		@Test
-		@DisplayName("when @TempDir is used on private instance field")
-		@Order(11)
-		void onlySupportsNonPrivateStaticFields() {
-			var results = executeTestsForClass(AnnotationOnPrivateInstanceFieldTestCase.class);
-
-			assertSingleFailedTest(results, ExtensionConfigurationException.class, "must not be private");
-		}
-
 		@Test
 		@DisplayName("when @TempDir is used on static field of an unsupported type")
 		@Order(20)
@@ -368,6 +350,29 @@ void doesNotSupportTempDirAnnotationOnConstructorParameterWithTestInstancePerCla
 
 	}
 
+	@Nested
+	@DisplayName("supports @TempDir")
+	@TestMethodOrder(OrderAnnotation.class)
+	class PrivateFields {
+
+		@Test
+		@DisplayName("on private static field")
+		@Order(10)
+		void supportsPrivateInstanceFields() {
+			executeTestsForClass(AnnotationOnPrivateStaticFieldTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("on private instance field")
+		@Order(11)
+		void supportsPrivateStaticFields() {
+			executeTestsForClass(AnnotationOnPrivateInstanceFieldTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+	}
+
 	private static void assertSingleFailedContainer(EngineExecutionResults results, Class<? extends Throwable> clazz,
 			String message) {
 
@@ -526,6 +531,7 @@ static class AnnotationOnPrivateInstanceFieldTestCase {
 
 		@Test
 		void test() {
+			assertTrue(Files.exists(tempDir));
 		}
 
 	}
@@ -538,6 +544,7 @@ static class AnnotationOnPrivateStaticFieldTestCase {
 
 		@Test
 		void test() {
+			assertTrue(Files.exists(tempDir));
 		}
 
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index c4f8b848253c..7bc8a5e9a500 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -191,24 +191,6 @@ void canBeUsedViaStaticFieldInsideNestedTestClasses() {
 	@TestMethodOrder(OrderAnnotation.class)
 	class Failures {
 
-		@Test
-		@DisplayName("when @TempDir is used on private static field")
-		@Order(10)
-		void onlySupportsNonPrivateInstanceFields() {
-			var results = executeTestsForClass(AnnotationOnPrivateStaticFieldTestCase.class);
-
-			assertSingleFailedContainer(results, ExtensionConfigurationException.class, "must not be private");
-		}
-
-		@Test
-		@DisplayName("when @TempDir is used on private instance field")
-		@Order(11)
-		void onlySupportsNonPrivateStaticFields() {
-			var results = executeTestsForClass(AnnotationOnPrivateInstanceFieldTestCase.class);
-
-			assertSingleFailedTest(results, ExtensionConfigurationException.class, "must not be private");
-		}
-
 		@Test
 		@DisplayName("when @TempDir is used on static field of an unsupported type")
 		@Order(20)
@@ -267,6 +249,29 @@ void doesNotSupportTempDirAnnotationOnConstructorParameterWithTestInstancePerCla
 
 	}
 
+	@Nested
+	@DisplayName("supports @TempDir")
+	@TestMethodOrder(OrderAnnotation.class)
+	class PrivateFields {
+
+		@Test
+		@DisplayName("on private static field")
+		@Order(10)
+		void supportsPrivateInstanceFields() {
+			executeTestsForClass(AnnotationOnPrivateStaticFieldTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("on private instance field")
+		@Order(11)
+		void supportsPrivateStaticFields() {
+			executeTestsForClass(AnnotationOnPrivateInstanceFieldTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+	}
+
 	private static void assertSingleFailedContainer(EngineExecutionResults results, Class<? extends Throwable> clazz,
 			String message) {
 
@@ -306,6 +311,7 @@ static class AnnotationOnPrivateInstanceFieldTestCase {
 
 		@Test
 		void test() {
+			assertTrue(Files.exists(tempDir));
 		}
 
 	}
@@ -318,6 +324,7 @@ static class AnnotationOnPrivateStaticFieldTestCase {
 
 		@Test
 		void test() {
+			assertTrue(Files.exists(tempDir));
 		}
 
 	}

From 8107424d80da91d530021e76964064397e8571cd Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <rien.korstanje@gmail.com>
Date: Sun, 16 May 2021 20:10:37 +0200
Subject: [PATCH 0441/1433] Discover suite tests using parent configuration
 parameters

From a practical perspective the expectation is that a `@Suite` annotated class
uses the same configuration parameters when discovering tests as the discovery
request used to discover the suite.

For example:

When executing a suite with the the `ConsoleLauncher` and providing a
configuration via `--config=key=value` should have the same effect as
configuring this value implicitly as an environment variable via
`-Dvalue=key`. However when suites are involved this is not the case. Rather
implicit variables are considered while explicit values are ignored.

This surprising to say the least.

This behaviour occurs because the `junit-platform-suite-engine` creates a new
discovery request - and this includes the implicit configuration by default.
There is also a use case where the suite should neither inherit configuration
nor use any implicit configuration values. (e.g. the execution of tcks  #2594).

This PR changes the `junit-platform-suite-engine` so as to only discover tests
using the explicitly provided parameters and the parameters from the discovery
request used to discover the the suite engine.

This behaviour can be disabled by `@DisableParentConfigurationParameters`. If
disabled, only the explicitly provided parameters will be used.

This also means that a suite will never use implicit parameters (unless of
course the parent discovery request used them).
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  4 +-
 .../core/LauncherConfigurationParameters.java | 33 +++++++++++
 .../core/LauncherDiscoveryRequestBuilder.java | 18 +++++-
 .../suite/api/ConfigurationParameter.java     |  1 +
 .../DisableParentConfigurationParameters.java | 44 ++++++++++++++
 .../org/junit/platform/suite/api/Suite.java   | 10 ++++
 .../SuiteLauncherDiscoveryRequestBuilder.java | 53 +++++++++++++----
 .../suite/engine/ClassSelectorResolver.java   | 10 +++-
 .../engine/DiscoverySelectorResolver.java     |  5 +-
 .../suite/engine/SuiteTestDescriptor.java     |  7 ++-
 .../LauncherConfigurationParametersTests.java | 40 +++++++++++++
 ...eLauncherDiscoveryRequestBuilderTests.java | 57 +++++++++++++++++++
 .../engine/SuiteTestDescriptorTests.java      | 23 +++++++-
 13 files changed, 285 insertions(+), 20 deletions(-)
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 71c43d0733e9..c5d585866f17 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -114,4 +114,6 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* Suites executed by the `junit-platform-suite` module will inherit the
+  configuration parameters from the parent discovery request. This behaviour can
+  be disabled by the `DisableParentConfigurationParameters` annotation.
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
index ba9dff7de319..9ef7f69b1ddc 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
@@ -86,6 +86,7 @@ static final class Builder {
 		private final Map<String, String> explicitParameters = new HashMap<>();
 		private boolean implicitProvidersEnabled = true;
 		private String configFileName = ConfigurationParameters.CONFIG_FILE_NAME;
+		private ConfigurationParameters parentConfigurationParameters;
 
 		private Builder() {
 		}
@@ -107,11 +108,22 @@ Builder configFileName(String configFileName) {
 			return this;
 		}
 
+		Builder parentConfigurationParameters(ConfigurationParameters parameters) {
+			Preconditions.notNull(parameters, "parent configuration parameters must not be null");
+			this.parentConfigurationParameters = parameters;
+			return this;
+		}
+
 		LauncherConfigurationParameters build() {
 			List<ParameterProvider> parameterProviders = new ArrayList<>();
 			if (!explicitParameters.isEmpty()) {
 				parameterProviders.add(ParameterProvider.explicit(explicitParameters));
 			}
+
+			if (parentConfigurationParameters != null) {
+				parameterProviders.add(ParameterProvider.inherited(parentConfigurationParameters));
+			}
+
 			if (implicitProvidersEnabled) {
 				parameterProviders.add(ParameterProvider.systemProperties());
 				parameterProviders.add(ParameterProvider.propertiesFile(configFileName));
@@ -186,6 +198,27 @@ public String toString() {
 			};
 		}
 
+		static ParameterProvider inherited(ConfigurationParameters configParams) {
+			return new ParameterProvider() {
+				@Override
+				public String getValue(String key) {
+					return configParams.get(key).orElse(null);
+				}
+
+				@Override
+				public int size() {
+					return configParams.size();
+				}
+
+				@Override
+				public String toString() {
+					ToStringBuilder builder = new ToStringBuilder("inherited");
+					builder.append("parent", configParams);
+					return builder.toString();
+				}
+			};
+		}
+
 	}
 
 	private static Properties loadClasspathResource(String configFileName) {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 5f4a563d119c..2303538d8529 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -30,6 +30,7 @@
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.PostDiscoveryFilter;
+import org.junit.platform.launcher.core.LauncherConfigurationParameters.Builder;
 import org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners;
 
 /**
@@ -101,6 +102,7 @@ public final class LauncherDiscoveryRequestBuilder {
 	private final Map<String, String> configurationParameters = new HashMap<>();
 	private final List<LauncherDiscoveryListener> discoveryListeners = new ArrayList<>();
 	private boolean implicitConfigurationParametersEnabled = true;
+	private ConfigurationParameters parentConfigurationParameters;
 
 	/**
 	 * Create a new {@code LauncherDiscoveryRequestBuilder}.
@@ -198,6 +200,11 @@ public LauncherDiscoveryRequestBuilder configurationParameters(Map<String, Strin
 		return this;
 	}
 
+	public void parentConfigurationParameters(ConfigurationParameters configurationParameters) {
+		Preconditions.notNull(configurationParameters, "parent configuration parameters must not be null");
+		this.parentConfigurationParameters = configurationParameters;
+	}
+
 	/**
 	 * Add all of the supplied discovery listeners to the request.
 	 *
@@ -269,10 +276,15 @@ public LauncherDiscoveryRequest build() {
 	}
 
 	private LauncherConfigurationParameters buildLauncherConfigurationParameters() {
-		return LauncherConfigurationParameters.builder() //
+		Builder builder = LauncherConfigurationParameters.builder() //
 				.explicitParameters(this.configurationParameters) //
-				.enableImplicitProviders(this.implicitConfigurationParametersEnabled) //
-				.build();
+				.enableImplicitProviders(this.implicitConfigurationParametersEnabled);
+
+		if (parentConfigurationParameters != null) {
+			builder.parentConfigurationParameters(this.parentConfigurationParameters);
+		}
+
+		return builder.build();
 	}
 
 	private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationParameters configurationParameters) {
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
index 9d0e9497d212..185df0b1b905 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
@@ -28,6 +28,7 @@
  * a test suite on the JUnit Platform.
  *
  * @since 1.8
+ * @see DisableParentConfigurationParameters
  * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
  * @see org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder#configurationParameter(String, String)
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
new file mode 100644
index 000000000000..cf2aefa8a88f
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+import org.apiguardian.api.API.Status;
+
+/**
+ * Disable parent configuration parameters.
+ *
+ * <p>By default a suite discovers tests using the configuration parameters
+ * explicitly configured by {@link ConfigurationParameter @ConfigurationParameter}
+ * and the configuration parameters from the discovery request that discovered
+ * the suite.
+ *
+ * <p>Annotating a suite with this annotation disables the latter source so
+ * that only explicit configuration parameters are taken into account.
+ *
+ * @see ConfigurationParameter
+ * @see Suite
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = Status.EXPERIMENTAL, since = "1.8")
+public @interface DisableParentConfigurationParameters {
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
index 214bc17b8543..c8e10b8c1e80 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
@@ -35,6 +35,14 @@
  * org.junit.platform.engine.discovery.ClassNameFilter#STANDARD_INCLUDE_PATTERN
  * ClassNameFilter#STANDARD_INCLUDE_PATTERN}).
  *
+ * <p>By default a suite discovers tests using the configuration parameters
+ * explicitly configured by {@link ConfigurationParameter @ConfigurationParameter}
+ * and the configuration parameters from the discovery request that discovered
+ * the suite. Annotating a suite with
+ * {@link DisableParentConfigurationParameters @DisableParentConfigurationParameters}
+ * annotation disables the latter as a source of parameters so that only explicit
+ * configuration parameters are taken into account.
+ *
  * @since 1.8
  * @see SelectClasses
  * @see SelectClasspathResource
@@ -53,7 +61,9 @@
  * @see ExcludeTags
  * @see SuiteDisplayName
  * @see ConfigurationParameter
+ * @see DisableParentConfigurationParameters
  * @see org.junit.platform.launcher.LauncherDiscoveryRequest
+ * @see org.junit.platform.launcher.LauncherDiscoveryRequestBuilder
  * @see org.junit.platform.launcher.Launcher
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index 8386f48e923d..c84df76a8aed 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -31,6 +31,7 @@
 import org.apiguardian.api.API.Status;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.StringUtils;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.engine.Filter;
 import org.junit.platform.engine.discovery.ClassNameFilter;
@@ -41,6 +42,7 @@
 import org.junit.platform.launcher.TagFilter;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.suite.api.ConfigurationParameter;
+import org.junit.platform.suite.api.DisableParentConfigurationParameters;
 import org.junit.platform.suite.api.ExcludeClassNamePatterns;
 import org.junit.platform.suite.api.ExcludeEngines;
 import org.junit.platform.suite.api.ExcludePackages;
@@ -68,6 +70,8 @@ public final class SuiteLauncherDiscoveryRequestBuilder {
 	private final List<String> selectedClassNames = new ArrayList<>();
 	private boolean includeClassNamePatternsUsed;
 	private boolean filterStandardClassNamePatterns = false;
+	private ConfigurationParameters parentConfigurationParameters;
+	private boolean enableParentConfigurationParameters = true;
 
 	private SuiteLauncherDiscoveryRequestBuilder() {
 	}
@@ -82,24 +86,45 @@ public SuiteLauncherDiscoveryRequestBuilder filterStandardClassNamePatterns(
 		return this;
 	}
 
-	public LauncherDiscoveryRequestBuilder selectors(DiscoverySelector... selectors) {
-		return delegate.selectors(selectors);
+	public SuiteLauncherDiscoveryRequestBuilder selectors(DiscoverySelector... selectors) {
+		delegate.selectors(selectors);
+		return this;
 	}
 
-	public LauncherDiscoveryRequestBuilder selectors(List<? extends DiscoverySelector> selectors) {
-		return delegate.selectors(selectors);
+	public SuiteLauncherDiscoveryRequestBuilder selectors(List<? extends DiscoverySelector> selectors) {
+		delegate.selectors(selectors);
+		return this;
 	}
 
-	public LauncherDiscoveryRequestBuilder filters(Filter<?>... filters) {
-		return delegate.filters(filters);
+	public SuiteLauncherDiscoveryRequestBuilder filters(Filter<?>... filters) {
+		delegate.filters(filters);
+		return this;
 	}
 
-	public LauncherDiscoveryRequestBuilder configurationParameter(String key, String value) {
-		return delegate.configurationParameter(key, value);
+	public SuiteLauncherDiscoveryRequestBuilder configurationParameter(String key, String value) {
+		delegate.configurationParameter(key, value);
+		return this;
 	}
 
-	public LauncherDiscoveryRequestBuilder configurationParameters(Map<String, String> configurationParameters) {
-		return delegate.configurationParameters(configurationParameters);
+	public SuiteLauncherDiscoveryRequestBuilder configurationParameters(Map<String, String> configurationParameters) {
+		delegate.configurationParameters(configurationParameters);
+		return this;
+	}
+
+	public SuiteLauncherDiscoveryRequestBuilder parentConfigurationParameters(
+			ConfigurationParameters parentConfigurationParameters) {
+		this.parentConfigurationParameters = parentConfigurationParameters;
+		return this;
+	}
+
+	public SuiteLauncherDiscoveryRequestBuilder enableImplicitConfigurationParameters(boolean enabled) {
+		delegate.enableImplicitConfigurationParameters(enabled);
+		return this;
+	}
+
+	public SuiteLauncherDiscoveryRequestBuilder enableParentConfigurationParameters(boolean enabled) {
+		this.enableParentConfigurationParameters = enabled;
+		return this;
 	}
 
 	public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
@@ -109,6 +134,9 @@ public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
 		// @formatter:off
 		findRepeatableAnnotations(suiteClass, ConfigurationParameter.class)
 				.forEach(configuration -> configurationParameter(configuration.key(), configuration.value()));
+		findAnnotation(suiteClass, DisableParentConfigurationParameters.class)
+				.map(disableParentConfigurationParameters -> false)
+				.ifPresent(this::enableParentConfigurationParameters);
 		findAnnotationValues(suiteClass, ExcludeClassNamePatterns.class, ExcludeClassNamePatterns::value)
 				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
 				.map(ClassNameFilter::excludeClassNamePatterns)
@@ -171,6 +199,11 @@ public LauncherDiscoveryRequest build() {
 		if (filterStandardClassNamePatterns && !includeClassNamePatternsUsed) {
 			delegate.filters(createIncludeClassNameFilter(STANDARD_INCLUDE_PATTERN));
 		}
+
+		if (enableParentConfigurationParameters && parentConfigurationParameters != null) {
+			delegate.parentConfigurationParameters(parentConfigurationParameters);
+		}
+
 		return delegate.build();
 	}
 
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
index 87e08b4bf98a..5f610a5943df 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
@@ -17,6 +17,7 @@
 import java.util.function.Predicate;
 
 import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.UniqueId.Segment;
@@ -33,10 +34,13 @@ final class ClassSelectorResolver implements SelectorResolver {
 
 	private final Predicate<String> classNameFilter;
 	private final SuiteEngineDescriptor suiteEngineDescriptor;
+	private final ConfigurationParameters configurationParameters;
 
-	ClassSelectorResolver(Predicate<String> classNameFilter, SuiteEngineDescriptor suiteEngineDescriptor) {
+	ClassSelectorResolver(Predicate<String> classNameFilter, SuiteEngineDescriptor suiteEngineDescriptor,
+			ConfigurationParameters configurationParameters) {
 		this.classNameFilter = classNameFilter;
 		this.suiteEngineDescriptor = suiteEngineDescriptor;
+		this.configurationParameters = configurationParameters;
 	}
 
 	@Override
@@ -88,9 +92,9 @@ private static Resolution toResolution(Optional<SuiteTestDescriptor> suite) {
 		return suite.map(Match::exact).map(Resolution::match).orElseGet(Resolution::unresolved);
 	}
 
-	private static Optional<SuiteTestDescriptor> newSuiteDescriptor(Class<?> suiteClass, TestDescriptor parent) {
+	private Optional<SuiteTestDescriptor> newSuiteDescriptor(Class<?> suiteClass, TestDescriptor parent) {
 		UniqueId id = parent.getUniqueId().append(SuiteTestDescriptor.SEGMENT_TYPE, suiteClass.getName());
-		return Optional.of(new SuiteTestDescriptor(id, suiteClass));
+		return Optional.of(new SuiteTestDescriptor(id, suiteClass, configurationParameters));
 	}
 
 }
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
index 9f32c9e004dd..6dfc44afe8ee 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
@@ -22,7 +22,10 @@ final class DiscoverySelectorResolver {
 	// @formatter:off
 	private static final EngineDiscoveryRequestResolver<SuiteEngineDescriptor> resolver = EngineDiscoveryRequestResolver.<SuiteEngineDescriptor>builder()
 			.addClassContainerSelectorResolver(new IsSuiteClass())
-			.addSelectorResolver(context -> new ClassSelectorResolver(context.getClassNameFilter(), context.getEngineDescriptor()))
+			.addSelectorResolver(context -> new ClassSelectorResolver(
+					context.getClassNameFilter(),
+					context.getEngineDescriptor(),
+					context.getDiscoveryRequest().getConfigurationParameters()))
 			.build();
 	// @formatter:on
 
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index c013381beb02..cd0a001be465 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -20,6 +20,7 @@
 import org.junit.platform.commons.util.AnnotationUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.StringUtils;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
@@ -48,12 +49,14 @@ final class SuiteTestDescriptor extends AbstractTestDescriptor {
 	static final String SEGMENT_TYPE = "suite";
 
 	private final SuiteLauncherDiscoveryRequestBuilder discoveryRequestBuilder = request();
+	private final ConfigurationParameters configurationParameters;
 
 	private LauncherDiscoveryResult launcherDiscoveryResult;
 	private SuiteLauncher launcher;
 
-	SuiteTestDescriptor(UniqueId id, Class<?> suiteClass) {
+	SuiteTestDescriptor(UniqueId id, Class<?> suiteClass, ConfigurationParameters configurationParameters) {
 		super(requireNoCycles(id), getSuiteDisplayName(suiteClass), ClassSource.from(suiteClass));
+		this.configurationParameters = configurationParameters;
 	}
 
 	private static UniqueId requireNoCycles(UniqueId id) {
@@ -94,6 +97,8 @@ void discover() {
 		// @formatter:off
 		LauncherDiscoveryRequest request = discoveryRequestBuilder
 				.filterStandardClassNamePatterns(true)
+				.enableImplicitConfigurationParameters(false)
+				.parentConfigurationParameters(configurationParameters)
 				.build();
 		// @formatter:on
 		this.launcher = SuiteLauncher.create();
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
index b380b4db7c7f..486191c0ab73 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
@@ -37,6 +37,7 @@ class LauncherConfigurationParametersTests {
 
 	private static final String CONFIG_FILE_NAME = "test-junit-platform.properties";
 	private static final String KEY = LauncherConfigurationParametersTests.class.getName();
+	private static final String INHERITED_PARAM = "parent config param";
 	private static final String CONFIG_PARAM = "explicit config param";
 	private static final String CONFIG_FILE = "from config file";
 	private static final String SYSTEM_PROPERTY = "system property";
@@ -93,6 +94,15 @@ void configFile() {
 		assertThat(configParams.toString()).contains(CONFIG_FILE);
 	}
 
+	@Test
+	void inherited() {
+		ConfigurationParameters configParams = fromMapAndParent( //
+			Map.of(), //
+			Map.of(KEY, INHERITED_PARAM));
+		assertThat(configParams.get(KEY)).contains(INHERITED_PARAM);
+		assertThat(configParams.toString()).contains(KEY);
+	}
+
 	@Test
 	void explicitConfigParamOverridesSystemProperty() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
@@ -108,6 +118,16 @@ void explicitConfigParamOverridesConfigFile() {
 		assertThat(configParams.toString()).contains(CONFIG_PARAM);
 	}
 
+	@Test
+	void explicitConfigParamOverridesInheritedProperty() {
+		System.setProperty(KEY, SYSTEM_PROPERTY);
+		ConfigurationParameters configParams = fromMapAndParent( //
+			Map.of(KEY, CONFIG_PARAM), //
+			Map.of(KEY, INHERITED_PARAM));
+		assertThat(configParams.get(KEY)).contains(CONFIG_PARAM);
+		assertThat(configParams.toString()).contains(CONFIG_PARAM);
+	}
+
 	@Test
 	void systemPropertyOverridesConfigFile() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
@@ -116,6 +136,14 @@ void systemPropertyOverridesConfigFile() {
 		assertThat(configParams.toString()).contains(CONFIG_FILE);
 	}
 
+	@Test
+	void inheritedPropertyOverridesSystemProperty() {
+		System.setProperty(KEY, SYSTEM_PROPERTY);
+		ConfigurationParameters configParams = fromMapAndParent(Map.of(), Map.of(KEY, INHERITED_PARAM));
+		assertThat(configParams.get(KEY)).contains(INHERITED_PARAM);
+		assertThat(configParams.toString()).contains(KEY);
+	}
+
 	@Test
 	void getValueInExtensionContext() {
 		var request = LauncherDiscoveryRequestBuilder.request() //
@@ -162,6 +190,18 @@ private static LauncherConfigurationParameters fromMapAndFile(Map<String, String
 				.build();
 	}
 
+	private static LauncherConfigurationParameters fromMapAndParent(Map<String, String> map,
+			Map<String, String> inherited) {
+		var parameters = LauncherConfigurationParameters.builder() //
+				.explicitParameters(inherited) //
+				.build();
+
+		return LauncherConfigurationParameters.builder() //
+				.explicitParameters(map) //
+				.parentConfigurationParameters(parameters) //
+				.build();
+	}
+
 	private static class Mutator implements TestInstancePostProcessor {
 		@Override
 		public void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception {
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index 6de3d3ba2baa..aa3f878f9f84 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -20,6 +20,7 @@
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -44,6 +45,7 @@
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.PostDiscoveryFilter;
 import org.junit.platform.suite.api.ConfigurationParameter;
+import org.junit.platform.suite.api.DisableParentConfigurationParameters;
 import org.junit.platform.suite.api.ExcludeClassNamePatterns;
 import org.junit.platform.suite.api.ExcludeEngines;
 import org.junit.platform.suite.api.ExcludePackages;
@@ -370,6 +372,37 @@ class Suite {
 		assertEquals("com.example.testcases", exactlyOne(pSelectors).getPackageName());
 	}
 
+	@Test
+	void enableParentConfigurationParametersByDefault() {
+		class Suite {
+
+		}
+		// @formatter:off
+		var configuration = new ParentConfigurationParameters("parent", "parent parameters were used");
+		var request = builder.suite(Suite.class)
+				.parentConfigurationParameters(configuration)
+				.build();
+		// @formatter:on
+		var configurationParameters = request.getConfigurationParameters();
+		assertEquals(Optional.of("parent parameters were used"), configurationParameters.get("parent"));
+	}
+
+	@Test
+	void disableParentConfigurationParameters() {
+		@DisableParentConfigurationParameters
+		class Suite {
+
+		}
+		// @formatter:off
+		var configuration = new ParentConfigurationParameters("parent", "parent parameters were used");
+		var request = builder.suite(Suite.class)
+				.parentConfigurationParameters(configuration)
+				.build();
+		// @formatter:on
+		var configurationParameters = request.getConfigurationParameters();
+		assertEquals(Optional.empty(), configurationParameters.get("parent"));
+	}
+
 	private static <T> T exactlyOne(List<T> list) {
 		assertEquals(1, list.size());
 		return list.get(0);
@@ -392,4 +425,28 @@ public Set<TestTag> getTags() {
 
 	}
 
+	private static class ParentConfigurationParameters implements ConfigurationParameters {
+		private final Map<String, String> map;
+
+		public ParentConfigurationParameters(String key, String value) {
+			this.map = Map.of(key, value);
+		}
+
+		@Override
+		public Optional<String> get(String key) {
+			return Optional.ofNullable(map.get(key));
+		}
+
+		@Override
+		public Optional<Boolean> getBoolean(String key) {
+			return Optional.empty();
+		}
+
+		@Override
+		public int size() {
+			return map.size();
+		}
+
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index 620e0a0b6651..a7e4b3e69fb0 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -16,6 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.Optional;
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
@@ -24,6 +25,7 @@
 import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
@@ -41,7 +43,8 @@ class SuiteTestDescriptorTests {
 	UniqueId testClassId = jupiterEngineId.append(ClassTestDescriptor.SEGMENT_TYPE, SingleTestTestCase.class.getName());
 	UniqueId methodId = testClassId.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
 
-	SuiteTestDescriptor suite = new SuiteTestDescriptor(suiteId, Object.class);
+	ConfigurationParameters configurationParameters = new EmptyConfigurationParameters();
+	SuiteTestDescriptor suite = new SuiteTestDescriptor(suiteId, Object.class, configurationParameters);
 
 	@Test
 	void suiteIsEmptyBeforeDiscovery() {
@@ -96,4 +99,22 @@ void suitesMayNotContainACycle() {
 			exception.getCause().getCause().getCause().getMessage());
 	}
 
+	private static class EmptyConfigurationParameters implements ConfigurationParameters {
+		@Override
+		public Optional<String> get(String key) {
+			return Optional.empty();
+		}
+
+		@Override
+		public Optional<Boolean> getBoolean(String key) {
+			return Optional.empty();
+		}
+
+		@Override
+		public int size() {
+			return 0;
+		}
+
+	}
+
 }

From 38bccf46c3c9f9e079ef2816c6edd6a77ea9bf84 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 11:06:09 +0200
Subject: [PATCH 0442/1433] Polishing

---
 .../release-notes/release-notes-5.8.0-M2.adoc |  4 +--
 .../core/LauncherDiscoveryRequestBuilder.java | 35 ++++++++++++++-----
 .../SuiteLauncherDiscoveryRequestBuilder.java |  8 +----
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index c5d585866f17..059d6447ead3 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -114,6 +114,6 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* Suites executed by the `junit-platform-suite` module will inherit the
+* Suites executed by the `junit-platform-suite` module will now inherit the
   configuration parameters from the parent discovery request. This behaviour can
-  be disabled by the `DisableParentConfigurationParameters` annotation.
+  be disabled via the `@DisableParentConfigurationParameters` annotation.
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 2303538d8529..d9e7ce3a2c52 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -11,6 +11,7 @@
 package org.junit.platform.launcher.core;
 
 import static org.apiguardian.api.API.Status.DEPRECATED;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.ArrayList;
@@ -110,19 +111,15 @@ public final class LauncherDiscoveryRequestBuilder {
 	 * @return a new builder
 	 */
 	public static LauncherDiscoveryRequestBuilder request() {
-		return new LauncherDiscoveryRequestBuilder(null);
+		return new LauncherDiscoveryRequestBuilder();
 	}
 
 	/**
 	 * @deprecated Use {@link #request()}
 	 */
-	@API(status = DEPRECATED, since = "5.8")
+	@API(status = DEPRECATED, since = "1.8")
 	@Deprecated
 	public LauncherDiscoveryRequestBuilder() {
-		this(null);
-	}
-
-	private LauncherDiscoveryRequestBuilder(@SuppressWarnings("unused") Object ignored) {
 	}
 
 	/**
@@ -200,9 +197,27 @@ public LauncherDiscoveryRequestBuilder configurationParameters(Map<String, Strin
 		return this;
 	}
 
-	public void parentConfigurationParameters(ConfigurationParameters configurationParameters) {
+	/**
+	 * Set the parent configuration parameters to use for the request.
+	 *
+	 * <p>Any explicit configuration parameters configured via
+	 * {@link #configurationParameter(String, String)} or
+	 * {@link #configurationParameters(Map)} takes precedence over the supplied
+	 * configuration parameters.
+	 *
+	 * @param configurationParameters the parent instance to be used for looking
+	 * up configuration parameters that have not been explicitly configured;
+	 * never {@code null}
+	 * @see #configurationParameter(String, String)
+	 * @see #configurationParameters(Map)
+	 * @since 1.8
+	 */
+	@API(status = EXPERIMENTAL, since = "1.8")
+	public LauncherDiscoveryRequestBuilder parentConfigurationParameters(
+			ConfigurationParameters configurationParameters) {
 		Preconditions.notNull(configurationParameters, "parent configuration parameters must not be null");
 		this.parentConfigurationParameters = configurationParameters;
+		return this;
 	}
 
 	/**
@@ -220,8 +235,9 @@ public void parentConfigurationParameters(ConfigurationParameters configurationP
 	 * @see LauncherDiscoveryListener
 	 * @see LauncherDiscoveryListeners
 	 * @see LauncherDiscoveryRequestBuilder#DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME
+	 * @since 1.6
 	 */
-	@API(status = API.Status.EXPERIMENTAL, since = "1.6")
+	@API(status = EXPERIMENTAL, since = "1.6")
 	public LauncherDiscoveryRequestBuilder listeners(LauncherDiscoveryListener... listeners) {
 		Preconditions.notNull(listeners, "discovery listener array must not be null");
 		Preconditions.containsNoNullElements(listeners, "individual discovery listeners must not be null");
@@ -240,8 +256,9 @@ public LauncherDiscoveryRequestBuilder listeners(LauncherDiscoveryListener... li
 	 *
 	 * @see #configurationParameter(String, String)
 	 * @see #configurationParameters(Map)
+	 * @since 1.7
 	 */
-	@API(status = API.Status.EXPERIMENTAL, since = "1.7")
+	@API(status = EXPERIMENTAL, since = "1.7")
 	public LauncherDiscoveryRequestBuilder enableImplicitConfigurationParameters(boolean enabled) {
 		this.implicitConfigurationParametersEnabled = enabled;
 		return this;
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index c84df76a8aed..eaca285e7826 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -122,11 +122,6 @@ public SuiteLauncherDiscoveryRequestBuilder enableImplicitConfigurationParameter
 		return this;
 	}
 
-	public SuiteLauncherDiscoveryRequestBuilder enableParentConfigurationParameters(boolean enabled) {
-		this.enableParentConfigurationParameters = enabled;
-		return this;
-	}
-
 	public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
 		Preconditions.notNull(suiteClass, "Suite class must not be null");
 
@@ -135,8 +130,7 @@ public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
 		findRepeatableAnnotations(suiteClass, ConfigurationParameter.class)
 				.forEach(configuration -> configurationParameter(configuration.key(), configuration.value()));
 		findAnnotation(suiteClass, DisableParentConfigurationParameters.class)
-				.map(disableParentConfigurationParameters -> false)
-				.ifPresent(this::enableParentConfigurationParameters);
+				.ifPresent(__ -> enableParentConfigurationParameters = false);
 		findAnnotationValues(suiteClass, ExcludeClassNamePatterns.class, ExcludeClassNamePatterns::value)
 				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
 				.map(ClassNameFilter::excludeClassNamePatterns)

From 47d4211c86eb1b5d7a283b44b94b1aa4434d647d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 17:48:49 +0200
Subject: [PATCH 0443/1433] Improve documentation on tags in User Guide

The syntax rules are now defined in a Jupiter-independent "Tags" section
in the "Running Tests" chapter which now also introduces tags as a
Platform concept.

Resolves #2564.
---
 .../user-guide/migration-from-junit4.adoc     |  4 +-
 .../asciidoc/user-guide/running-tests.adoc    | 41 +++++++++++++++++--
 .../asciidoc/user-guide/writing-tests.adoc    | 22 ++--------
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
index 9f939692c1cf..1daf9302be87 100644
--- a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
@@ -30,8 +30,8 @@ find out how this is done with Gradle and Maven.
 ==== Categories Support
 
 For test classes or methods that are annotated with `@Category`, the _JUnit Vintage test
-engine_ exposes the category's fully qualified class name as a tag of the corresponding
-test identifier. For example, if a test method is annotated with
+engine_ exposes the category's fully qualified class name as a <<running-tests-tags, tag>>
+of the corresponding test identifier. For example, if a test method is annotated with
 `@Category(Example.class)`, it will be tagged with `"com.acme.Example"`. Similar to the
 `Categories` runner in JUnit 4, this information can be used to filter the discovered
 tests before executing them (see <<running-tests>> for details).
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index ce4c4c866b02..8fe96b0ff706 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -141,7 +141,8 @@ test {
 }
 ----
 
-Filtering by tags or engines is also supported:
+Filtering by <<running-tests-tags, tags>>,
+<<running-tests-tag-expressions, tag expressions>>, or engines is also supported:
 
 [source,groovy,indent=0]
 [subs=attributes+]
@@ -378,8 +379,9 @@ documentation for Maven Surefire for details.
 [[running-tests-build-maven-filter-tags]]
 ===== Filtering by Tags
 
-You can filter tests by tags or <<running-tests-tag-expressions, tag expressions>> using
-the following configuration properties.
+You can filter tests by <<running-tests-tags, tags>> or
+<<running-tests-tag-expressions, tag expressions>> using the following configuration
+properties.
 
 - to include _tags_ or _tag expressions_, use `groups`.
 - to exclude _tags_ or _tag expressions_, use `excludedGroups`.
@@ -763,8 +765,39 @@ Examples:
 - `org.example.MyCustomImpl, org.example.TheirCustomImpl`: matches candidate classes whose
   FQCN is exactly `org.example.MyCustomImpl` or `org.example.TheirCustomImpl`.
 
+[[running-tests-tags]]
+=== Tags
+
+Tags are a JUnit Platform concept for marking and filtering tests. The programming model
+for adding tags to containers and tests is defined by the testing framework. For example,
+in JUnit Jupiter based tests, the `@Tag` annotation (see
+<<writing-tests-tagging-and-filtering>>) should be used. For JUnit 4 based tests, the
+Vintage engine maps `@Category` annotations to tags (see
+<<migrating-from-junit4-categories-support>>). Other testing frameworks may define their
+own annotation or other means for users to specify tags.
+
+[[running-tests-tag-syntax-rules]]
+==== Syntax Rules for Tags
+
+Regardless how a tag is specified, the JUnit Platform enforces the following rules:
+
+* A tag must not be `null` or _blank_.
+* A _trimmed_ tag must not contain whitespace.
+* A _trimmed_ tag must not contain ISO control characters.
+* A _trimmed_ tag must not contain any of the following _reserved characters_.
+- `,`: _comma_
+- `(`: _left parenthesis_
+- `)`: _right parenthesis_
+- `&`: _ampersand_
+- `|`: _vertical bar_
+- `!`: _exclamation point_
+
+NOTE: In the above context, "trimmed" means that leading and trailing whitespace
+characters have been removed.
+
 [[running-tests-tag-expressions]]
-=== Tag Expressions
+==== Tag Expressions
+
 Tag expressions are boolean expressions with the operators `!`, `&` and `|`. In addition,
 `(` and `)` can be used to adjust for operator precedence.
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 3ccc4899c2a8..8d5fda60c584 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -501,25 +501,9 @@ must always be `static`. Condition methods located in external classes must also
 === Tagging and Filtering
 
 Test classes and methods can be tagged via the `@Tag` annotation. Those tags can later be
-used to filter <<running-tests,test discovery and execution>>.
-
-TIP: See also: <<running-tests-tag-expressions>>
-
-==== Syntax Rules for Tags
-
-* A tag must not be `null` or _blank_.
-* A _trimmed_ tag must not contain whitespace.
-* A _trimmed_ tag must not contain ISO control characters.
-* A _trimmed_ tag must not contain any of the following _reserved characters_.
-  - `,`: _comma_
-  - `(`: _left parenthesis_
-  - `)`: _right parenthesis_
-  - `&`: _ampersand_
-  - `|`: _vertical bar_
-  - `!`: _exclamation point_
-
-NOTE: In the above context, "trimmed" means that leading and trailing whitespace
-characters have been removed.
+used to filter <<running-tests, test discovery and execution>>. Please refer to the
+<<running-tests-tags>> section for more information about tag support in the JUnit
+Platform.
 
 [source,java,indent=0]
 ----

From 718d730725be4828b8cdcb794c4aa31d15607360 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 18:34:48 +0200
Subject: [PATCH 0444/1433] Upgradle to 7.2-rc-3

---
 .../kotlin-library-conventions.gradle.kts     |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 gradlew                                       | 257 +++++++++++-------
 3 files changed, 156 insertions(+), 107 deletions(-)

diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index dccb39c91d35..1b05c6e0fd4f 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -10,6 +10,6 @@ tasks.withType<KotlinCompile>().configureEach {
 		jvmTarget = "1.8"
 		apiVersion = "1.3"
 		languageVersion = "1.3"
-		allWarningsAsErrors = true
+		allWarningsAsErrors = false
 	}
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2957f4374467..9c4a49d3172f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bf8b869948901d422e9bb7d1fa61da6a6e19411baa7ad6ee929073df85d6365d
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionSha256Sum=12215a4146ab05309893c24fb7d0c32366ab6b548e2de84185d781ec639a6283
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882ed572..1b6c787337ff 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

From c8f45dedee4bfa8499807e4b08823cd6915a7b84 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Mon, 16 Aug 2021 19:57:10 +0200
Subject: [PATCH 0445/1433] Reduce info logging noise

Prior to this commit code in JUnit logged messages via its internal
Logging Facade at information level. When a user, a framework, or
a tool running JUnit-based tests doesn't explicitly configure logging,
the default Java Util Logging frameworks is used, which in turn emits
message via `System.err`. Since those messages then appear on some
environments red color, they are confusing and somewhat distracting.

This commit replaces all calls of `Logger.info()` to their `config()`
variants.

Closes #2664
---
 .../src/main/java/org/junit/jupiter/api/ClassOrderer.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodOrderer.java    | 2 +-
 .../engine/config/EnumConfigurationParameterConverter.java    | 2 +-
 .../config/InstantiatingConfigurationParameterConverter.java  | 2 +-
 .../InstantiatingConfigurationParameterConverterTests.java    | 4 ++--
 .../platform/launcher/core/EngineDiscoveryOrchestrator.java   | 2 +-
 .../launcher/core/LauncherConfigurationParameters.java        | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 2eb44412265e..b19c9dafeb0d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -183,7 +183,7 @@ class Random implements ClassOrderer {
 
 		static {
 			DEFAULT_SEED = System.nanoTime();
-			logger.info(() -> "ClassOrderer.Random default seed: " + DEFAULT_SEED);
+			logger.config(() -> "ClassOrderer.Random default seed: " + DEFAULT_SEED);
 		}
 
 		/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 35876db10e3d..cf30f07a797c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -253,7 +253,7 @@ class Random implements MethodOrderer {
 
 		static {
 			DEFAULT_SEED = System.nanoTime();
-			logger.info(() -> "MethodOrderer.Random default seed: " + DEFAULT_SEED);
+			logger.config(() -> "MethodOrderer.Random default seed: " + DEFAULT_SEED);
 		}
 
 		/**
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
index 8bb37ee492d8..8c9ad3fe9ad6 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
@@ -53,7 +53,7 @@ public E get(String key, Function<String, Optional<String>> lookup, E defaultVal
 			try {
 				constantName = value.get().trim().toUpperCase(Locale.ROOT);
 				E result = Enum.valueOf(enumType, constantName);
-				logger.info(() -> String.format("Using %s '%s' set via the '%s' configuration parameter.",
+				logger.config(() -> String.format("Using %s '%s' set via the '%s' configuration parameter.",
 					enumDisplayName, result, key));
 				return result;
 			}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
index f94e63a96e8d..393eecd54d6d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
@@ -60,7 +60,7 @@ private void logFailureMessage(String className, String key, Exception cause) {
 	}
 
 	private void logSuccessMessage(String className, String key) {
-		logger.info(() -> String.format("Using default %s '%s' set via the '%s' configuration parameter.", name,
+		logger.config(() -> String.format("Using default %s '%s' set via the '%s' configuration parameter.", name,
 			className, key));
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
index 8577f372197a..79af28e20ce5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
@@ -46,7 +46,7 @@ void shouldInstantiateConfiguredClass(LogRecordListener listener) {
 		DisplayNameGenerator displayNameGenerator = converter.get(configurationParameters, KEY).orElseThrow();
 
 		assertThat(displayNameGenerator).isInstanceOf(CustomDisplayNameGenerator.class);
-		assertExpectedLogMessage(listener, Level.INFO,
+		assertExpectedLogMessage(listener, Level.CONFIG,
 			"Using default display name generator "
 					+ "'org.junit.jupiter.engine.descriptor.CustomDisplayNameGenerator' set via the "
 					+ "'junit.jupiter.displayname.generator.default' configuration parameter.");
@@ -87,7 +87,7 @@ void shouldTrimAndInstantiateConfiguredClass(LogRecordListener listener) {
 		DisplayNameGenerator displayNameGenerator = converter.get(configurationParameters, KEY).orElseThrow();
 
 		assertThat(displayNameGenerator).isInstanceOf(CustomDisplayNameGenerator.class);
-		assertExpectedLogMessage(listener, Level.INFO,
+		assertExpectedLogMessage(listener, Level.CONFIG,
 			"Using default display name generator "
 					+ "'org.junit.jupiter.engine.descriptor.CustomDisplayNameGenerator' set via the "
 					+ "'junit.jupiter.displayname.generator.default' configuration parameter.");
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index a2571030be64..541eb8cdffc2 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -195,7 +195,7 @@ private void logTestDescriptorExclusionReasons(Map<String, List<TestDescriptor>>
 			String displayNames = testDescriptors.stream().map(TestDescriptor::getDisplayName).collect(joining(", "));
 			long containerCount = testDescriptors.stream().filter(TestDescriptor::isContainer).count();
 			long methodCount = testDescriptors.stream().filter(TestDescriptor::isTest).count();
-			logger.info(() -> String.format("%d containers and %d tests were %s", containerCount, methodCount,
+			logger.config(() -> String.format("%d containers and %d tests were %s", containerCount, methodCount,
 				exclusionReason));
 			logger.debug(
 				() -> String.format("The following containers and tests were %s: %s", exclusionReason, displayNames));
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
index 9ef7f69b1ddc..2de4180eb6d2 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
@@ -236,7 +236,7 @@ private static Properties loadClasspathResource(String configFileName) {
 				}
 
 				URL configFileUrl = resources.iterator().next(); // same as List#get(0)
-				logger.info(() -> String.format(
+				logger.config(() -> String.format(
 					"Loading JUnit Platform configuration parameters from classpath resource [%s].", configFileUrl));
 				URLConnection urlConnection = configFileUrl.openConnection();
 				urlConnection.setUseCaches(false);

From 56266d32c41dbe05af2ebd0ffd0d36866bc63293 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Tue, 17 Aug 2021 10:13:41 +0200
Subject: [PATCH 0446/1433] Add note about logging improvements

See #2664 and linked PR for details
---
 .../src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 059d6447ead3..0b4a84b0e432 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -15,6 +15,8 @@ on GitHub.
 
 * The API Guardian dependency is now exported as a compile-only dependency for consuming
   Gradle projects.
+* Logging messages are no longer issued at `INFO` level in order to lower the "textual
+  noise" on the console when Java's Util Logging is used in its default configuration.
 
 
 [[release-notes-5.8.0-M2-junit-platform]]

From 3f605f18c413322a2015e316b456c4e0e4906394 Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Tue, 17 Aug 2021 10:31:30 +0200
Subject: [PATCH 0447/1433] Inline lambdas passed to assertDoesNotThrows to
 support suspending functions (#2684)

This commit adds support for suspending functions when `assertDoesNotThrow` is called from Kotlin.

Closes #2674.
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  1 +
 .../org/junit/jupiter/api/Assertions.kt       | 21 +++++--
 .../jupiter/api/KotlinAssertionsTests.kt      | 57 +++++++++++++++++++
 3 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 0b4a84b0e432..972ec640c00e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -84,6 +84,7 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* `assertDoesNotThrow` now supports suspending functions when called from Kotlin.
 * `@TempDir` can now be used to create multiple temporary directories. Instead of creating
   a single temporary directory per context (i.e. test class or method) every declaration
   of the `@TempDir` annotation on a field or method parameter now results in a separate
diff --git a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
index bf9609943877..20b4d7b2cf81 100644
--- a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
+++ b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
@@ -158,8 +158,8 @@ inline fun <reified T : Throwable> assertThrows(noinline message: () -> String,
  * @param R the result type of the [executable]
  */
 @API(status = EXPERIMENTAL, since = "5.5")
-fun <R> assertDoesNotThrow(executable: () -> R): R =
-    Assertions.assertDoesNotThrow(ThrowingSupplier(executable))
+inline fun <R> assertDoesNotThrow(executable: () -> R): R =
+    Assertions.assertDoesNotThrow(evaluateAndWrap(executable))
 
 /**
  * Example usage:
@@ -172,7 +172,7 @@ fun <R> assertDoesNotThrow(executable: () -> R): R =
  * @param R the result type of the [executable]
  */
 @API(status = EXPERIMENTAL, since = "5.5")
-fun <R> assertDoesNotThrow(message: String, executable: () -> R): R =
+inline fun <R> assertDoesNotThrow(message: String, executable: () -> R): R =
     assertDoesNotThrow({ message }, executable)
 
 /**
@@ -186,8 +186,19 @@ fun <R> assertDoesNotThrow(message: String, executable: () -> R): R =
  * @param R the result type of the [executable]
  */
 @API(status = EXPERIMENTAL, since = "5.5")
-fun <R> assertDoesNotThrow(message: () -> String, executable: () -> R): R =
-    Assertions.assertDoesNotThrow(ThrowingSupplier(executable), Supplier(message))
+inline fun <R> assertDoesNotThrow(noinline message: () -> String, executable: () -> R): R =
+    Assertions.assertDoesNotThrow(
+        evaluateAndWrap(executable),
+        Supplier(message)
+    )
+
+@PublishedApi
+internal inline fun <R> evaluateAndWrap(executable: () -> R): ThrowingSupplier<R> = try {
+    val result = executable()
+    ThrowingSupplier { result }
+} catch (throwable: Throwable) {
+    ThrowingSupplier { throw throwable }
+}
 
 /**
  * Example usage:
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
index d90a1e11ca2f..54b00e372d29 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
@@ -75,13 +75,31 @@ class KotlinAssertionsTests {
                 val actual = assertDoesNotThrow { 1 }
                 assertEquals(1, actual)
             },
+            dynamicTest("for no arguments variant (suspended)") {
+                runBlocking {
+                    val actual = assertDoesNotThrow { suspend { 1 }() }
+                    assertEquals(1, actual)
+                }
+            },
             dynamicTest("for message variant") {
                 val actual = assertDoesNotThrow("message") { 2 }
                 assertEquals(2, actual)
             },
+            dynamicTest("for message variant (suspended)") {
+                runBlocking {
+                    val actual = assertDoesNotThrow("message") { suspend { 2 }() }
+                    assertEquals(2, actual)
+                }
+            },
             dynamicTest("for message supplier variant") {
                 val actual = assertDoesNotThrow({ "message" }) { 3 }
                 assertEquals(3, actual)
+            },
+            dynamicTest("for message supplier variant (suspended)") {
+                runBlocking {
+                    val actual = assertDoesNotThrow({ "message" }) { suspend { 3 }() }
+                    assertEquals(3, actual)
+                }
             }
         )),
         dynamicContainer("fails when an exception is thrown", Stream.of(
@@ -94,6 +112,19 @@ class KotlinAssertionsTests {
                 assertMessageEquals(exception,
                     "Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
             },
+            dynamicTest("for no arguments variant (suspended)") {
+                runBlocking {
+                    val exception = assertThrows<AssertionError> {
+                        assertDoesNotThrow {
+                            suspend { fail("fail") }()
+                        }
+                    }
+                    assertMessageEquals(
+                        exception,
+                        "Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
+                    )
+                }
+            },
             dynamicTest("for message variant") {
                 val exception = assertThrows<AssertionError> {
                     assertDoesNotThrow("Does not throw") {
@@ -103,6 +134,19 @@ class KotlinAssertionsTests {
                 assertMessageEquals(exception,
                     "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
             },
+            dynamicTest("for message variant (suspended)") {
+                runBlocking {
+                    val exception = assertThrows<AssertionError> {
+                        assertDoesNotThrow("Does not throw") {
+                            suspend { fail("fail") }()
+                        }
+                    }
+                    assertMessageEquals(
+                        exception,
+                        "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
+                    )
+                }
+            },
             dynamicTest("for message supplier variant") {
                 val exception = assertThrows<AssertionError> {
                     assertDoesNotThrow({ "Does not throw" }) {
@@ -111,6 +155,19 @@ class KotlinAssertionsTests {
                 }
                 assertMessageEquals(exception,
                     "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
+            },
+            dynamicTest("for message supplier variant (suspended)") {
+                runBlocking {
+                    val exception = assertThrows<AssertionError> {
+                        assertDoesNotThrow({ "Does not throw" }) {
+                            suspend { fail("fail") }()
+                        }
+                    }
+                    assertMessageEquals(
+                        exception,
+                        "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
+                    )
+                }
             }
         ))
     )

From d1beb9fac3d69585d0a3761b9e189339f74949d6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 1 Aug 2021 15:33:40 +0200
Subject: [PATCH 0448/1433] Support extension registration via constructor &
 method params

Issue: #864
---
 .../descriptor/ClassBasedTestDescriptor.java  |  20 +-
 .../engine/descriptor/ExtensionUtils.java     |  44 +-
 .../descriptor/TestMethodTestDescriptor.java  |   6 +-
 .../execution/DefaultParameterContext.java    |  56 +-
 .../engine/extension/ExtensionRegistrar.java  |  12 +
 .../extension/MutableExtensionRegistry.java   |  12 +-
 ...gistrationViaParametersAndFieldsTests.java | 551 ++++++++++++++++++
 .../commons/util/AnnotationUtils.java         |  77 +++
 8 files changed, 709 insertions(+), 69 deletions(-)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index da6f15e851c0..cd71b2b9d5ef 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -13,6 +13,8 @@
 import static java.util.stream.Collectors.joining;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.jupiter.engine.descriptor.ExtensionUtils.populateNewExtensionRegistryFromExtendWithAnnotation;
+import static org.junit.jupiter.engine.descriptor.ExtensionUtils.registerExtensionsFromConstructorParameters;
+import static org.junit.jupiter.engine.descriptor.ExtensionUtils.registerExtensionsFromExecutableParameters;
 import static org.junit.jupiter.engine.descriptor.ExtensionUtils.registerExtensionsFromFields;
 import static org.junit.jupiter.engine.descriptor.LifecycleMethodUtils.findAfterAllMethods;
 import static org.junit.jupiter.engine.descriptor.LifecycleMethodUtils.findAfterEachMethods;
@@ -152,6 +154,16 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		// one factory registered per class).
 		this.testInstanceFactory = resolveTestInstanceFactory(registry);
 
+		if (this.testInstanceFactory == null) {
+			registerExtensionsFromConstructorParameters(registry, this.testClass);
+		}
+
+		this.beforeAllMethods = findBeforeAllMethods(this.testClass, this.lifecycle == Lifecycle.PER_METHOD);
+		this.afterAllMethods = findAfterAllMethods(this.testClass, this.lifecycle == Lifecycle.PER_METHOD);
+
+		this.beforeAllMethods.forEach(method -> registerExtensionsFromExecutableParameters(registry, method));
+		this.afterAllMethods.forEach(method -> registerExtensionsFromExecutableParameters(registry, method));
+
 		registerBeforeEachMethodAdapters(registry);
 		registerAfterEachMethodAdapters(registry);
 
@@ -159,9 +171,6 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		ClassExtensionContext extensionContext = new ClassExtensionContext(context.getExtensionContext(),
 			context.getExecutionListener(), this, this.lifecycle, context.getConfiguration(), throwableCollector);
 
-		this.beforeAllMethods = findBeforeAllMethods(this.testClass, this.lifecycle == Lifecycle.PER_METHOD);
-		this.afterAllMethods = findAfterAllMethods(this.testClass, this.lifecycle == Lifecycle.PER_METHOD);
-
 		// @formatter:off
 		return context.extend()
 				.withTestInstancesProvider(testInstancesProvider(context, extensionContext))
@@ -468,7 +477,10 @@ private void registerAfterEachMethodAdapters(ExtensionRegistrar registrar) {
 	private void registerMethodsAsExtensions(List<Method> methods, ExtensionRegistrar registrar,
 			Function<Method, Extension> extensionSynthesizer) {
 
-		methods.forEach(method -> registrar.registerSyntheticExtension(extensionSynthesizer.apply(method), method));
+		methods.forEach(method -> {
+			registerExtensionsFromExecutableParameters(registrar, method);
+			registrar.registerSyntheticExtension(extensionSynthesizer.apply(method), method);
+		});
 	}
 
 	private BeforeEachMethodAdapter synthesizeBeforeEachMethodAdapter(Method method) {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 0c1ed17525ef..951a3cb4afb3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -14,15 +14,19 @@
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.AnnotationUtils.findRepeatableAnnotations;
+import static org.junit.platform.commons.util.ReflectionUtils.getDeclaredConstructor;
 import static org.junit.platform.commons.util.ReflectionUtils.isNotPrivate;
 import static org.junit.platform.commons.util.ReflectionUtils.tryToReadFieldValue;
 
 import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 
 import org.junit.jupiter.api.Order;
@@ -78,7 +82,7 @@ static MutableExtensionRegistry populateNewExtensionRegistryFromExtendWithAnnota
 	}
 
 	/**
-	 * Register extensions in the supplied registry from fields in the supplied
+	 * Register extensions using the supplied registrar from fields in the supplied
 	 * class that are annotated with {@link RegisterExtension @RegisterExtension}.
 	 *
 	 * <p>The extensions will be sorted according to {@link Order @Order} semantics
@@ -115,6 +119,44 @@ static void registerExtensionsFromFields(ExtensionRegistrar registrar, Class<?>
 		});
 	}
 
+	/**
+	 * Register extensions using the supplied registrar from parameters in the
+	 * declared constructor of the supplied class that are annotated with
+	 * {@link ExtendWith @ExtendWith}.
+	 *
+	 * @param registrar the registrar with which to register the extensions; never {@code null}
+	 * @param clazz the class in which to find the declared constructor; never {@code null}
+	 * @since 5.8
+	 */
+	static void registerExtensionsFromConstructorParameters(ExtensionRegistrar registrar, Class<?> clazz) {
+		registerExtensionsFromExecutableParameters(registrar, getDeclaredConstructor(clazz));
+	}
+
+	/**
+	 * Register extensions using the supplied registrar from parameters in the
+	 * supplied {@link Executable} (i.e., a {@link java.lang.reflect.Constructor}
+	 * or {@link java.lang.reflect.Method}) that are annotated with{@link ExtendWith @ExtendWith}.
+	 *
+	 * @param registrar the registrar with which to register the extensions; never {@code null}
+	 * @param executable the constructor or method whose parameters should be searched; never {@code null}
+	 * @since 5.8
+	 */
+	static void registerExtensionsFromExecutableParameters(ExtensionRegistrar registrar, Executable executable) {
+		Preconditions.notNull(registrar, "ExtensionRegistrar must not be null");
+		Preconditions.notNull(executable, "Executable must not be null");
+
+		AtomicInteger index = new AtomicInteger();
+
+		// @formatter:off
+		Arrays.stream(executable.getParameters())
+				.map(parameter -> findRepeatableAnnotations(parameter, index.getAndIncrement(), ExtendWith.class))
+				.flatMap(Collection::stream)
+				.map(ExtendWith::value)
+				.flatMap(Arrays::stream)
+				.forEach(registrar::registerExtension);
+		// @formatter:on
+	}
+
 	/**
 	 * @since 5.4
 	 */
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
index ced917880313..a6bd1aea309e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -12,6 +12,7 @@
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.jupiter.engine.descriptor.ExtensionUtils.populateNewExtensionRegistryFromExtendWithAnnotation;
+import static org.junit.jupiter.engine.descriptor.ExtensionUtils.registerExtensionsFromExecutableParameters;
 import static org.junit.jupiter.engine.support.JupiterThrowableCollectorFactory.createThrowableCollector;
 
 import java.lang.reflect.Method;
@@ -113,7 +114,10 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 	}
 
 	protected MutableExtensionRegistry populateNewExtensionRegistry(JupiterEngineExecutionContext context) {
-		return populateNewExtensionRegistryFromExtendWithAnnotation(context.getExtensionRegistry(), getTestMethod());
+		MutableExtensionRegistry registry = populateNewExtensionRegistryFromExtendWithAnnotation(
+			context.getExtensionRegistry(), getTestMethod());
+		registerExtensionsFromExecutableParameters(registry, getTestMethod());
+		return registry;
 	}
 
 	@Override
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
index 9ee48c40ae02..4a2d81cad101 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
@@ -10,12 +10,7 @@
 
 package org.junit.jupiter.engine.execution;
 
-import static org.junit.platform.commons.util.ReflectionUtils.isInnerClass;
-
 import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Executable;
 import java.lang.reflect.Parameter;
 import java.util.List;
 import java.util.Optional;
@@ -58,62 +53,17 @@ public Optional<Object> getTarget() {
 
 	@Override
 	public boolean isAnnotated(Class<? extends Annotation> annotationType) {
-		return AnnotationUtils.isAnnotated(getEffectiveAnnotatedParameter(), annotationType);
+		return AnnotationUtils.isAnnotated(this.parameter, this.index, annotationType);
 	}
 
 	@Override
 	public <A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType) {
-		return AnnotationUtils.findAnnotation(getEffectiveAnnotatedParameter(), annotationType);
+		return AnnotationUtils.findAnnotation(this.parameter, this.index, annotationType);
 	}
 
 	@Override
 	public <A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType) {
-		return AnnotationUtils.findRepeatableAnnotations(getEffectiveAnnotatedParameter(), annotationType);
-	}
-
-	/**
-	 * Due to a bug in {@code javac} on JDK versions prior to JDK 9, looking up
-	 * annotations directly on a {@link Parameter} will fail for inner class
-	 * constructors.
-	 *
-	 * <h4>Bug in {@code javac} on JDK versions prior to JDK 9</h4>
-	 *
-	 * <p>The parameter annotations array in the compiled byte code for the user's
-	 * test class excludes an entry for the implicit <em>enclosing instance</em>
-	 * parameter for an inner class constructor.
-	 *
-	 * <h4>Workaround</h4>
-	 *
-	 * <p>JUnit provides a workaround for this off-by-one error by helping extension
-	 * authors to access annotations on the preceding {@link Parameter} object (i.e.,
-	 * {@code index - 1}). The {@linkplain #getIndex() current index} must never be
-	 * zero in such situations since JUnit Jupiter should never ask a
-	 * {@code ParameterResolver} to resolve a parameter for the implicit <em>enclosing
-	 * instance</em> parameter.
-	 *
-	 * <h4>WARNING</h4>
-	 *
-	 * <p>The {@code AnnotatedElement} returned by this method should never be cast and
-	 * treated as a {@code Parameter} since the metadata (e.g., {@link Parameter#getName()},
-	 * {@link Parameter#getType()}, etc.) will not match those for the declared parameter
-	 * at the given index in an inner class constructor.
-	 *
-	 * @return the actual {@code Parameter} for this context, or the <em>effective</em>
-	 * {@code Parameter} if the aforementioned bug is detected
-	 */
-	private AnnotatedElement getEffectiveAnnotatedParameter() {
-		Executable executable = getDeclaringExecutable();
-
-		if (executable instanceof Constructor && isInnerClass(executable.getDeclaringClass())
-				&& executable.getParameterAnnotations().length == executable.getParameterCount() - 1) {
-
-			Preconditions.condition(this.index != 0,
-				"A ParameterContext should never be created for parameter index 0 in an inner class constructor");
-
-			return executable.getParameters()[this.index - 1];
-		}
-
-		return this.parameter;
+		return AnnotationUtils.findRepeatableAnnotations(this.parameter, this.index, annotationType);
 	}
 
 	@Override
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
index cf4908dab321..3d6815c3d316 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
@@ -23,6 +23,18 @@
 @API(status = INTERNAL, since = "5.5")
 public interface ExtensionRegistrar {
 
+	/**
+	 * Instantiate an extension of the given type using its default constructor
+	 * and register it in the registry.
+	 *
+	 * <p>A new {@link Extension} should not be registered if an extension of the
+	 * given type already exists in the registry or a parent registry.
+	 *
+	 * @param extensionType the type of extension to register
+	 * @since 5.8
+	 */
+	void registerExtension(Class<? extends Extension> extensionType);
+
 	/**
 	 * Register the supplied {@link Extension}, without checking if an extension
 	 * of that type has already been registered.
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 58432a0206de..b7eed9ae951c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -139,16 +139,8 @@ private <E extends Extension> Stream<E> streamLocal(Class<E> extensionType) {
 		// @formatter:on
 	}
 
-	/**
-	 * Instantiate an extension of the given type using its default constructor
-	 * and register it in this registry.
-	 *
-	 * <p>A new {@link Extension} will not be registered if an extension of the
-	 * given type already exists in this registry or a parent registry.
-	 *
-	 * @param extensionType the type of extension to register
-	 */
-	void registerExtension(Class<? extends Extension> extensionType) {
+	@Override
+	public void registerExtension(Class<? extends Extension> extensionType) {
 		if (!isAlreadyRegistered(extensionType)) {
 			registerLocalExtension(ReflectionUtils.newInstance(extensionType));
 		}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
new file mode 100644
index 000000000000..72f6377dd315
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -0,0 +1,551 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.jupiter.engine.execution.injection.sample.LongParameterResolver;
+
+/**
+ * Integration tests that verify support for extension registration via
+ * {@link ExtendWith @ExtendWith} on annotations on parameters and fields.
+ *
+ * @since 5.8
+ */
+class ExtensionRegistrationViaParametersAndFieldsTests extends AbstractJupiterTestEngineTests {
+
+	static final List<String> instantiationSequence = new ArrayList<>();
+
+	@Test
+	void constructorParameter() {
+		assertOneTestSucceeded(ConstructorParameterTestCase.class);
+	}
+
+	@Test
+	void constructorParameterForNestedTestClass() {
+		assertOneTestSucceeded(NestedConstructorParameterTestCase.class);
+	}
+
+	@Test
+	void beforeAllMethodParameter() {
+		assertOneTestSucceeded(BeforeAllParameterTestCase.class);
+	}
+
+	@Test
+	void afterAllMethodParameter() {
+		assertOneTestSucceeded(AfterAllParameterTestCase.class);
+	}
+
+	@Test
+	void beforeEachMethodParameter() {
+		assertOneTestSucceeded(BeforeEachParameterTestCase.class);
+	}
+
+	@Test
+	void afterEachMethodParameter() {
+		assertOneTestSucceeded(AfterEachParameterTestCase.class);
+	}
+
+	@Test
+	void testMethodParameter() {
+		assertOneTestSucceeded(TestMethodParameterTestCase.class);
+	}
+
+	@Test
+	void testFactoryMethodParameter() {
+		assertTestsSucceeded(TestFactoryMethodParameterTestCase.class, 2);
+	}
+
+	@Test
+	void testTemplateMethodParameter() {
+		assertTestsSucceeded(TestTemplateMethodParameterTestCase.class, 2);
+	}
+
+	@Test
+	void registrationOrder() {
+		instantiationSequence.clear();
+
+		assertOneTestSucceeded(AllInOneTestCase.class);
+		assertThat(instantiationSequence).containsExactly("ConstructorParameter", "BeforeAllParameter",
+			"AfterAllParameter", "BeforeEachParameter", "AfterEachParameter", "TestParameter");
+	}
+
+	private void assertOneTestSucceeded(Class<?> testClass) {
+		assertTestsSucceeded(testClass, 1);
+	}
+
+	private void assertTestsSucceeded(Class<?> testClass, int expected) {
+		executeTestsForClass(testClass).testEvents().assertStatistics(
+			stats -> stats.started(expected).succeeded(expected).skipped(0).aborted(0).failed(0));
+	}
+
+	// -------------------------------------------------------------------
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the constructor
+	 * and then used for lifecycle and test methods.
+	 */
+	@ExtendWith(LongParameterResolver.class)
+	static class ConstructorParameterTestCase {
+
+		ConstructorParameterTestCase(@MagicParameter("constructor") String text) {
+			assertThat(text).isEqualTo("ConstructorParameterTestCase-0-constructor");
+		}
+
+		@BeforeEach
+		void beforeEach(String text, TestInfo testInfo) {
+			assertThat(text).isEqualTo("beforeEach-0-enigma");
+			assertThat(testInfo).isNotNull();
+		}
+
+		@Test
+		void test(TestInfo testInfo, String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("test-1-enigma");
+		}
+
+		/**
+		 * Redeclaring {@code @MagicParameter} should not result in a
+		 * {@link ParameterResolutionException}.
+		 */
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-method");
+		}
+
+	}
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the constructor
+	 * and then used for lifecycle and test methods.
+	 */
+	@Nested
+	@ExtendWith(LongParameterResolver.class)
+	class NestedConstructorParameterTestCase {
+
+		NestedConstructorParameterTestCase(@MagicParameter("constructor") String text) {
+			// Index is 1 instead of 0, since constructors for non-static nested classes
+			// receive a reference to the enclosing instance as the first argument: this$0
+			assertThat(text).isEqualTo("NestedConstructorParameterTestCase-1-constructor");
+		}
+
+		@BeforeEach
+		void beforeEach(String text, TestInfo testInfo) {
+			assertThat(text).isEqualTo("beforeEach-0-enigma");
+			assertThat(testInfo).isNotNull();
+		}
+
+		@Test
+		void test(TestInfo testInfo, String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("test-1-enigma");
+		}
+
+		/**
+		 * Redeclaring {@code @MagicParameter} should not result in a
+		 * {@link ParameterResolutionException}.
+		 */
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-method");
+		}
+
+	}
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @BeforeAll}
+	 * method and then used for other lifecycle methods and test methods.
+	 */
+	@ExtendWith(LongParameterResolver.class)
+	static class BeforeAllParameterTestCase {
+
+		@BeforeAll
+		static void beforeAll(@MagicParameter("method") String text, TestInfo testInfo) {
+			assertThat(text).isEqualTo("beforeAll-0-method");
+			assertThat(testInfo).isNotNull();
+		}
+
+		@BeforeEach
+		void beforeEach(String text, TestInfo testInfo) {
+			assertThat(text).isEqualTo("beforeEach-0-enigma");
+			assertThat(testInfo).isNotNull();
+		}
+
+		@Test
+		void test(TestInfo testInfo, String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("test-1-enigma");
+		}
+
+		/**
+		 * Redeclaring {@code @MagicParameter} should not result in a
+		 * {@link ParameterResolutionException}.
+		 */
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-method");
+		}
+
+		@AfterAll
+		static void afterAll(String text, TestInfo testInfo) {
+			assertThat(text).isEqualTo("afterAll-0-enigma");
+			assertThat(testInfo).isNotNull();
+		}
+
+	}
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @AfterAll} method.
+	 */
+	@ExtendWith(LongParameterResolver.class)
+	static class AfterAllParameterTestCase {
+
+		@Test
+		void test(TestInfo testInfo, String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("test-1-enigma");
+		}
+
+		@AfterAll
+		static void afterAll(Long number, TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterAll-2-method");
+		}
+
+	}
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @BeforeEach}
+	 * method and then used for other lifecycle methods and test methods.
+	 */
+	@ExtendWith(LongParameterResolver.class)
+	static class BeforeEachParameterTestCase {
+
+		@BeforeEach
+		void beforeEach(@MagicParameter("method") String text, TestInfo testInfo) {
+			assertThat(text).isEqualTo("beforeEach-0-method");
+			assertThat(testInfo).isNotNull();
+		}
+
+		@Test
+		void test(TestInfo testInfo, String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("test-1-enigma");
+		}
+
+		/**
+		 * Redeclaring {@code @MagicParameter} should not result in a
+		 * {@link ParameterResolutionException}.
+		 */
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-method");
+		}
+
+	}
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @AfterEach} method.
+	 */
+	@ExtendWith(LongParameterResolver.class)
+	static class AfterEachParameterTestCase {
+
+		@Test
+		void test() {
+		}
+
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-method");
+		}
+
+	}
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @Test}
+	 * method and then used for after-each lifecycle methods.
+	 */
+	@ExtendWith(LongParameterResolver.class)
+	static class TestMethodParameterTestCase {
+
+		@Test
+		void test(TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("test-1-method");
+		}
+
+		/**
+		 * Redeclaring {@code @MagicParameter} should not result in a
+		 * {@link ParameterResolutionException}.
+		 */
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-enigma");
+		}
+
+	}
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @TestFactory}
+	 * method and then used for after-each lifecycle methods.
+	 */
+	@ExtendWith(LongParameterResolver.class)
+	static class TestFactoryMethodParameterTestCase {
+
+		@TestFactory
+		Stream<DynamicTest> testFactory(TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("testFactory-1-method");
+
+			return IntStream.of(2, 4).mapToObj(num -> dynamicTest("" + num, () -> assertTrue(num % 2 == 0)));
+		}
+
+		/**
+		 * Redeclaring {@code @MagicParameter} should not result in a
+		 * {@link ParameterResolutionException}.
+		 */
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-enigma");
+		}
+
+	}
+
+	/**
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @TestTemplate}
+	 * method and then used for after-each lifecycle methods.
+	 */
+	@ExtendWith(LongParameterResolver.class)
+	static class TestTemplateMethodParameterTestCase {
+
+		@TestTemplate
+		@ExtendWith(TwoInvocationsContextProvider.class)
+		void testTemplate(TestInfo testInfo, @MagicParameter("method") String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("testTemplate-1-method");
+		}
+
+		/**
+		 * Redeclaring {@code @MagicParameter} should not result in a
+		 * {@link ParameterResolutionException}.
+		 */
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-enigma");
+		}
+
+	}
+
+	private static class TwoInvocationsContextProvider implements TestTemplateInvocationContextProvider {
+
+		@Override
+		public boolean supportsTestTemplate(ExtensionContext context) {
+			return true;
+		}
+
+		@Override
+		public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(ExtensionContext context) {
+			return Stream.of(emptyTestTemplateInvocationContext(), emptyTestTemplateInvocationContext());
+		}
+
+		private static TestTemplateInvocationContext emptyTestTemplateInvocationContext() {
+			return new TestTemplateInvocationContext() {
+			};
+		}
+	}
+
+	static class AllInOneTestCase {
+
+		AllInOneTestCase(@ConstructorParameter String text) {
+			assertThat(text).isNotNull();
+		}
+
+		@BeforeAll
+		static void beforeAll(@BeforeAllParameter String text) {
+			assertThat(text).isNotNull();
+		}
+
+		@BeforeEach
+		void beforeEach(@BeforeEachParameter String text) {
+			assertThat(text).isNotNull();
+		}
+
+		@Test
+		void test(@TestParameter String text) {
+			assertThat(text).isNotNull();
+		}
+
+		@AfterEach
+		void afterEach(@AfterEachParameter String text) {
+			assertThat(text).isNotNull();
+		}
+
+		@AfterAll
+		static void afterAll(@AfterAllParameter String text) {
+			assertThat(text).isNotNull();
+		}
+
+	}
+
+}
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(MagicParameter.Extension.class)
+@interface MagicParameter {
+
+	String value();
+
+	class Extension implements ParameterResolver {
+
+		@Override
+		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+			return parameterContext.getParameter().getType() == String.class;
+		}
+
+		@Override
+		public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+			String text = parameterContext.findAnnotation(MagicParameter.class)//
+					.map(MagicParameter::value)//
+					.orElse("enigma");
+			Executable declaringExecutable = parameterContext.getDeclaringExecutable();
+			String name = declaringExecutable instanceof Constructor
+					? declaringExecutable.getDeclaringClass().getSimpleName()
+					: declaringExecutable.getName();
+			return String.format("%s-%d-%s", name, parameterContext.getIndex(), text);
+		}
+	}
+}
+
+@SuppressWarnings("unused")
+class BaseExtension<T extends Annotation> implements ParameterResolver {
+
+	private final Class<T> annotationType;
+
+	@SuppressWarnings("unchecked")
+	BaseExtension() {
+		Type genericSuperclass = getClass().getGenericSuperclass();
+		this.annotationType = (Class<T>) ((ParameterizedType) genericSuperclass).getActualTypeArguments()[0];
+
+		ExtensionRegistrationViaParametersAndFieldsTests.instantiationSequence//
+				.add(getClass().getEnclosingClass().getSimpleName());
+	}
+
+	@Override
+	public final boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		return parameterContext.isAnnotated(this.annotationType)
+				&& parameterContext.getParameter().getType() == String.class;
+	}
+
+	@Override
+	public final Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		return "enigma";
+	}
+}
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(ConstructorParameter.Extension.class)
+@interface ConstructorParameter {
+	class Extension extends BaseExtension<ConstructorParameter> {
+	}
+}
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(BeforeAllParameter.Extension.class)
+@interface BeforeAllParameter {
+	class Extension extends BaseExtension<BeforeAllParameter> {
+	}
+}
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(AfterAllParameter.Extension.class)
+@interface AfterAllParameter {
+	class Extension extends BaseExtension<AfterAllParameter> {
+	}
+}
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(BeforeEachParameter.Extension.class)
+@interface BeforeEachParameter {
+	class Extension extends BaseExtension<BeforeEachParameter> {
+	}
+}
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(AfterEachParameter.Extension.class)
+@interface AfterEachParameter {
+	class Extension extends BaseExtension<AfterEachParameter> {
+	}
+}
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(TestParameter.Extension.class)
+@interface TestParameter {
+	class Extension extends BaseExtension<TestParameter> {
+	}
+}
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
index 849b12d85dcd..fd6bde1e937a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
@@ -19,8 +19,11 @@
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Repeatable;
 import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -78,6 +81,14 @@ public static boolean isAnnotated(Optional<? extends AnnotatedElement> element,
 		return findAnnotation(element, annotationType).isPresent();
 	}
 
+	/**
+	 * @since 1.8
+	 * @see #findAnnotation(Parameter, int, Class)
+	 */
+	public static boolean isAnnotated(Parameter parameter, int index, Class<? extends Annotation> annotationType) {
+		return findAnnotation(parameter, index, annotationType).isPresent();
+	}
+
 	/**
 	 * Determine if an annotation of {@code annotationType} is either
 	 * <em>present</em> or <em>meta-present</em> on the supplied
@@ -107,6 +118,16 @@ public static <A extends Annotation> Optional<A> findAnnotation(Optional<? exten
 		return findAnnotation(element.get(), annotationType);
 	}
 
+	/**
+	 * @since 1.8
+	 * @see #findAnnotation(AnnotatedElement, Class)
+	 */
+	public static <A extends Annotation> Optional<A> findAnnotation(Parameter parameter, int index,
+			Class<A> annotationType) {
+
+		return findAnnotation(getEffectiveAnnotatedParameter(parameter, index), annotationType);
+	}
+
 	/**
 	 * @see org.junit.platform.commons.support.AnnotationSupport#findAnnotation(AnnotatedElement, Class)
 	 */
@@ -237,6 +258,16 @@ public static <A extends Annotation> List<A> findRepeatableAnnotations(Optional<
 		return findRepeatableAnnotations(element.get(), annotationType);
 	}
 
+	/**
+	 * @since 1.8
+	 * @see #findRepeatableAnnotations(AnnotatedElement, Class)
+	 */
+	public static <A extends Annotation> List<A> findRepeatableAnnotations(Parameter parameter, int index,
+			Class<A> annotationType) {
+
+		return findRepeatableAnnotations(getEffectiveAnnotatedParameter(parameter, index), annotationType);
+	}
+
 	/**
 	 * @see org.junit.platform.commons.support.AnnotationSupport#findRepeatableAnnotations(AnnotatedElement, Class)
 	 */
@@ -357,6 +388,52 @@ private static boolean isRepeatableAnnotationContainer(Class<? extends Annotatio
 		});
 	}
 
+	/**
+	 * Due to a bug in {@code javac} on JDK versions prior to JDK 9, looking up
+	 * annotations directly on a {@link Parameter} will fail for inner class
+	 * constructors.
+	 *
+	 * <h4>Bug in {@code javac} on JDK versions prior to JDK 9</h4>
+	 *
+	 * <p>The parameter annotations array in the compiled byte code for the user's
+	 * class excludes an entry for the implicit <em>enclosing instance</em>
+	 * parameter for an inner class constructor.
+	 *
+	 * <h4>Workaround</h4>
+	 *
+	 * <p>This method provides a workaround for this off-by-one error by helping
+	 * JUnit maintainers and extension authors to access annotations on the preceding
+	 * {@link Parameter} object (i.e., {@code index - 1}). The {@code index} must
+	 * never be zero in such situations since this method should never attempt to
+	 * resolve an effective parameter for the implicit <em>enclosing instance</em>
+	 * parameter.
+	 *
+	 * <h4>WARNING</h4>
+	 *
+	 * <p>The {@code AnnotatedElement} returned by this method should never be cast and
+	 * treated as a {@code Parameter} since the metadata (e.g., {@link Parameter#getName()},
+	 * {@link Parameter#getType()}, etc.) will not match those for the declared parameter
+	 * at the given index in an inner class constructor.
+	 *
+	 * @return the supplied {@code Parameter}, or the <em>effective</em> {@code Parameter}
+	 * if the aforementioned bug is detected
+	 * @since 1.8
+	 */
+	private static AnnotatedElement getEffectiveAnnotatedParameter(Parameter parameter, int index) {
+		Preconditions.notNull(parameter, "Parameter must not be null");
+		Executable executable = parameter.getDeclaringExecutable();
+
+		if (executable instanceof Constructor && isInnerClass(executable.getDeclaringClass())
+				&& executable.getParameterAnnotations().length == executable.getParameterCount() - 1) {
+
+			Preconditions.condition(index != 0, "Parameter index must not be 0 for an inner class constructor");
+
+			return executable.getParameters()[index - 1];
+		}
+
+		return parameter;
+	}
+
 	/**
 	 * @see org.junit.platform.commons.support.AnnotationSupport#findPublicAnnotatedFields(Class, Class, Class)
 	 */

From 5c4d39468616fe066f6bf05b7a848739f07a9ab0 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 1 Aug 2021 20:19:28 +0200
Subject: [PATCH 0449/1433] Support extension registration via @ExtendWith on
 fields

Issue: #864
---
 .../descriptor/ClassBasedTestDescriptor.java  |   8 +-
 .../engine/descriptor/ExtensionUtils.java     |  34 ++-
 ...gistrationViaParametersAndFieldsTests.java | 242 ++++++++++++++++--
 3 files changed, 244 insertions(+), 40 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index cd71b2b9d5ef..2eb71183bd28 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -162,10 +162,14 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		this.afterAllMethods = findAfterAllMethods(this.testClass, this.lifecycle == Lifecycle.PER_METHOD);
 
 		this.beforeAllMethods.forEach(method -> registerExtensionsFromExecutableParameters(registry, method));
-		this.afterAllMethods.forEach(method -> registerExtensionsFromExecutableParameters(registry, method));
-
+		// Since registerBeforeEachMethodAdapters() and registerAfterEachMethodAdapters() also
+		// invoke registerExtensionsFromExecutableParameters(), we invoke those methods before
+		// invoking registerExtensionsFromExecutableParameters() for @BeforeAll methods,
+		// thereby ensuring proper registration order for extensions registered via @ExtendWith
+		// on parameters in lifecycle methods.
 		registerBeforeEachMethodAdapters(registry);
 		registerAfterEachMethodAdapters(registry);
+		this.afterAllMethods.forEach(method -> registerExtensionsFromExecutableParameters(registry, method));
 
 		ThrowableCollector throwableCollector = createThrowableCollector();
 		ClassExtensionContext extensionContext = new ClassExtensionContext(context.getExtensionContext(),
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 951a3cb4afb3..f662543f9e44 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -11,9 +11,11 @@
 package org.junit.jupiter.engine.descriptor;
 
 import static java.util.stream.Collectors.toList;
-import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.AnnotationUtils.findRepeatableAnnotations;
+import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
+import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.TOP_DOWN;
+import static org.junit.platform.commons.util.ReflectionUtils.findFields;
 import static org.junit.platform.commons.util.ReflectionUtils.getDeclaredConstructor;
 import static org.junit.platform.commons.util.ReflectionUtils.isNotPrivate;
 import static org.junit.platform.commons.util.ReflectionUtils.tryToReadFieldValue;
@@ -99,24 +101,34 @@ static void registerExtensionsFromFields(ExtensionRegistrar registrar, Class<?>
 
 		Predicate<Field> predicate = (instance == null ? ReflectionUtils::isStatic : ReflectionUtils::isNotStatic);
 
-		// Ensure that the list is modifiable, since findAnnotatedFields() returns an unmodifiable list.
-		List<Field> fields = new ArrayList<>(findAnnotatedFields(clazz, RegisterExtension.class, predicate));
+		// Ensure that the list is modifiable, since findFields() returns an unmodifiable list.
+		List<Field> fields = new ArrayList<>(findFields(clazz, predicate, TOP_DOWN));
 
 		// Sort fields based on @Order.
 		fields.sort(orderComparator);
 
+		// @formatter:off
 		fields.forEach(field -> {
-			Preconditions.condition(isNotPrivate(field),
-				() -> String.format(
+			findRepeatableAnnotations(field, ExtendWith.class).stream()
+				.map(ExtendWith::value)
+				.flatMap(Arrays::stream)
+				.forEach(registrar::registerExtension);
+		});
+
+		fields.stream()
+			.filter(field -> isAnnotated(field, RegisterExtension.class))
+			.forEach(field -> {
+				Preconditions.condition(isNotPrivate(field), () -> String.format(
 					"Failed to register extension via @RegisterExtension field [%s]: field must not be private.",
 					field));
-			tryToReadFieldValue(field, instance).ifSuccess(value -> {
-				Preconditions.condition(value instanceof Extension, () -> String.format(
-					"Failed to register extension via @RegisterExtension field [%s]: field value's type [%s] must implement an [%s] API.",
-					field, (value != null ? value.getClass().getName() : null), Extension.class.getName()));
-				registrar.registerExtension((Extension) value, field);
+				tryToReadFieldValue(field, instance).ifSuccess(value -> {
+					Preconditions.condition(value instanceof Extension, () -> String.format(
+						"Failed to register extension via @RegisterExtension field [%s]: field value's type [%s] must implement an [%s] API.",
+						field, (value != null ? value.getClass().getName() : null), Extension.class.getName()));
+					registrar.registerExtension((Extension) value, field);
+				});
 			});
-		});
+		// @formatter:on
 	}
 
 	/**
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index 72f6377dd315..8de7c199198f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -10,9 +10,12 @@
 
 package org.junit.jupiter.engine.extension;
 
+import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
+import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -21,10 +24,13 @@
 import java.lang.annotation.Target;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
+import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
@@ -37,7 +43,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
@@ -45,8 +55,12 @@
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
+import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.execution.injection.sample.LongParameterResolver;
+import org.junit.platform.commons.logging.LogRecordListener;
+import org.junit.platform.commons.util.ExceptionUtils;
+import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
  * Integration tests that verify support for extension registration via
@@ -56,8 +70,6 @@
  */
 class ExtensionRegistrationViaParametersAndFieldsTests extends AbstractJupiterTestEngineTests {
 
-	static final List<String> instantiationSequence = new ArrayList<>();
-
 	@Test
 	void constructorParameter() {
 		assertOneTestSucceeded(ConstructorParameterTestCase.class);
@@ -104,12 +116,43 @@ void testTemplateMethodParameter() {
 	}
 
 	@Test
-	void registrationOrder() {
-		instantiationSequence.clear();
+	void staticField() {
+		assertOneTestSucceeded(StaticFieldTestCase.class);
+	}
+
+	@Test
+	void instanceField() {
+		assertOneTestSucceeded(InstanceFieldTestCase.class);
+	}
 
-		assertOneTestSucceeded(AllInOneTestCase.class);
-		assertThat(instantiationSequence).containsExactly("ConstructorParameter", "BeforeAllParameter",
-			"AfterAllParameter", "BeforeEachParameter", "AfterEachParameter", "TestParameter");
+	@Test
+	void fieldsWithTestInstancePerClass() {
+		assertOneTestSucceeded(TestInstancePerClassFieldTestCase.class);
+	}
+
+	@Test
+	@TrackLogRecords
+	void registrationOrder(LogRecordListener listener) {
+		assertOneTestSucceeded(AllInOneWithTestInstancePerMethodTestCase.class);
+		assertThat(getRegisteredLocalExtensions(listener))//
+				.containsExactly("StaticField", "ConstructorParameter", "BeforeAllParameter", "BeforeEachParameter",
+					"AfterEachParameter", "AfterAllParameter", "TestParameter", "InstanceField");
+
+		listener.clear();
+		assertOneTestSucceeded(AllInOneWithTestInstancePerClassTestCase.class);
+		assertThat(getRegisteredLocalExtensions(listener))//
+				.containsExactly("StaticField", "ConstructorParameter", "BeforeAllParameter", "BeforeEachParameter",
+					"AfterEachParameter", "AfterAllParameter", "InstanceField", "TestParameter");
+	}
+
+	private List<String> getRegisteredLocalExtensions(LogRecordListener listener) {
+		// @formatter:off
+		return listener.stream(MutableExtensionRegistry.class, Level.FINER)
+			.map(LogRecord::getMessage)
+			.filter(message -> message.contains("local extension"))
+			.map(message -> message.substring(message.lastIndexOf('.') + 1, message.indexOf("$")))
+			.collect(toList());
+		// @formatter:on
 	}
 
 	private void assertOneTestSucceeded(Class<?> testClass) {
@@ -413,39 +456,130 @@ private static TestTemplateInvocationContext emptyTestTemplateInvocationContext(
 		}
 	}
 
-	static class AllInOneTestCase {
+	/**
+	 * The {@link MagicField.Extension} is registered via a static field.
+	 */
+	static class StaticFieldTestCase {
 
-		AllInOneTestCase(@ConstructorParameter String text) {
-			assertThat(text).isNotNull();
+		@MagicField
+		static String staticField1;
+
+		@MagicField
+		static String staticField2;
+
+		@BeforeAll
+		static void beforeAll() {
+			assertThat(staticField1).isEqualTo("beforeAll - staticField1");
+			assertThat(staticField2).isEqualTo("beforeAll - staticField2");
+		}
+
+		@Test
+		void test() {
+			assertThat(staticField1).isEqualTo("beforeAll - staticField1");
+			assertThat(staticField2).isEqualTo("beforeAll - staticField2");
+		}
+	}
+
+	/**
+	 * The {@link MagicField.Extension} is registered via an instance field.
+	 */
+	static class InstanceFieldTestCase {
+
+		@MagicField
+		String instanceField1;
+
+		@MagicField
+		String instanceField2;
+
+		@Test
+		void test() {
+			assertThat(instanceField1).isEqualTo("beforeEach - instanceField1");
+			assertThat(instanceField2).isEqualTo("beforeEach - instanceField2");
+		}
+	}
+
+	/**
+	 * The {@link MagicField.Extension} is registered via a static field and
+	 * an instance field.
+	 */
+	@TestInstance(Lifecycle.PER_CLASS)
+	static class TestInstancePerClassFieldTestCase {
+
+		@MagicField
+		static String staticField;
+
+		@MagicField
+		String instanceField;
+
+		@BeforeAll
+		void beforeAll() {
+			assertThat(staticField).isEqualTo("beforeAll - staticField");
+			assertThat(instanceField).isNull();
+		}
+
+		@Test
+		void test() {
+			assertThat(staticField).isEqualTo("beforeAll - staticField");
+			assertThat(instanceField).isEqualTo("beforeEach - instanceField");
+		}
+	}
+
+	@TestInstance(Lifecycle.PER_METHOD)
+	static class AllInOneWithTestInstancePerMethodTestCase {
+
+		@StaticField
+		static String staticField;
+
+		@InstanceField
+		String instanceField;
+
+		AllInOneWithTestInstancePerMethodTestCase(@ConstructorParameter String text) {
+			assertThat(text).isEqualTo("enigma");
 		}
 
 		@BeforeAll
 		static void beforeAll(@BeforeAllParameter String text) {
-			assertThat(text).isNotNull();
+			assertThat(text).isEqualTo("enigma");
+			assertThat(staticField).isEqualTo("beforeAll - staticField");
 		}
 
 		@BeforeEach
 		void beforeEach(@BeforeEachParameter String text) {
-			assertThat(text).isNotNull();
+			assertThat(text).isEqualTo("enigma");
+			assertThat(staticField).isEqualTo("beforeAll - staticField");
+			assertThat(instanceField).isEqualTo("beforeEach - instanceField");
 		}
 
 		@Test
 		void test(@TestParameter String text) {
-			assertThat(text).isNotNull();
+			assertThat(text).isEqualTo("enigma");
+			assertThat(staticField).isEqualTo("beforeAll - staticField");
+			assertThat(instanceField).isEqualTo("beforeEach - instanceField");
 		}
 
 		@AfterEach
 		void afterEach(@AfterEachParameter String text) {
-			assertThat(text).isNotNull();
+			assertThat(text).isEqualTo("enigma");
+			assertThat(staticField).isEqualTo("beforeAll - staticField");
+			assertThat(instanceField).isEqualTo("beforeEach - instanceField");
 		}
 
 		@AfterAll
 		static void afterAll(@AfterAllParameter String text) {
-			assertThat(text).isNotNull();
+			assertThat(text).isEqualTo("enigma");
+			assertThat(staticField).isEqualTo("beforeAll - staticField");
 		}
 
 	}
 
+	@TestInstance(Lifecycle.PER_CLASS)
+	static class AllInOneWithTestInstancePerClassTestCase extends AllInOneWithTestInstancePerMethodTestCase {
+
+		AllInOneWithTestInstancePerClassTestCase(@ConstructorParameter String text) {
+			super(text);
+		}
+	}
+
 }
 
 @Target(ElementType.PARAMETER)
@@ -477,17 +611,14 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 }
 
 @SuppressWarnings("unused")
-class BaseExtension<T extends Annotation> implements ParameterResolver {
+class BaseParameterExtension<T extends Annotation> implements ParameterResolver {
 
 	private final Class<T> annotationType;
 
 	@SuppressWarnings("unchecked")
-	BaseExtension() {
+	BaseParameterExtension() {
 		Type genericSuperclass = getClass().getGenericSuperclass();
 		this.annotationType = (Class<T>) ((ParameterizedType) genericSuperclass).getActualTypeArguments()[0];
-
-		ExtensionRegistrationViaParametersAndFieldsTests.instantiationSequence//
-				.add(getClass().getEnclosingClass().getSimpleName());
 	}
 
 	@Override
@@ -506,7 +637,7 @@ public final Object resolveParameter(ParameterContext parameterContext, Extensio
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(ConstructorParameter.Extension.class)
 @interface ConstructorParameter {
-	class Extension extends BaseExtension<ConstructorParameter> {
+	class Extension extends BaseParameterExtension<ConstructorParameter> {
 	}
 }
 
@@ -514,7 +645,7 @@ class Extension extends BaseExtension<ConstructorParameter> {
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(BeforeAllParameter.Extension.class)
 @interface BeforeAllParameter {
-	class Extension extends BaseExtension<BeforeAllParameter> {
+	class Extension extends BaseParameterExtension<BeforeAllParameter> {
 	}
 }
 
@@ -522,7 +653,7 @@ class Extension extends BaseExtension<BeforeAllParameter> {
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(AfterAllParameter.Extension.class)
 @interface AfterAllParameter {
-	class Extension extends BaseExtension<AfterAllParameter> {
+	class Extension extends BaseParameterExtension<AfterAllParameter> {
 	}
 }
 
@@ -530,7 +661,7 @@ class Extension extends BaseExtension<AfterAllParameter> {
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(BeforeEachParameter.Extension.class)
 @interface BeforeEachParameter {
-	class Extension extends BaseExtension<BeforeEachParameter> {
+	class Extension extends BaseParameterExtension<BeforeEachParameter> {
 	}
 }
 
@@ -538,7 +669,7 @@ class Extension extends BaseExtension<BeforeEachParameter> {
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(AfterEachParameter.Extension.class)
 @interface AfterEachParameter {
-	class Extension extends BaseExtension<AfterEachParameter> {
+	class Extension extends BaseParameterExtension<AfterEachParameter> {
 	}
 }
 
@@ -546,6 +677,63 @@ class Extension extends BaseExtension<AfterEachParameter> {
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(TestParameter.Extension.class)
 @interface TestParameter {
-	class Extension extends BaseExtension<TestParameter> {
+	class Extension extends BaseParameterExtension<TestParameter> {
+	}
+}
+
+class BaseFieldExtension<T extends Annotation> implements BeforeAllCallback, BeforeEachCallback {
+
+	private final Class<T> annotationType;
+
+	@SuppressWarnings("unchecked")
+	BaseFieldExtension() {
+		Type genericSuperclass = getClass().getGenericSuperclass();
+		this.annotationType = (Class<T>) ((ParameterizedType) genericSuperclass).getActualTypeArguments()[0];
+	}
+
+	@Override
+	public final void beforeAll(ExtensionContext context) throws Exception {
+		injectFields("beforeAll", context.getRequiredTestClass(), null, ReflectionUtils::isStatic);
+	}
+
+	@Override
+	public final void beforeEach(ExtensionContext context) throws Exception {
+		injectFields("beforeEach", context.getRequiredTestClass(), context.getRequiredTestInstance(),
+			ReflectionUtils::isNotStatic);
+	}
+
+	private void injectFields(String trigger, Class<?> testClass, Object instance, Predicate<Field> predicate) {
+		findAnnotatedFields(testClass, this.annotationType, predicate).forEach(field -> {
+			try {
+				makeAccessible(field).set(instance, trigger + " - " + field.getName());
+			}
+			catch (Throwable t) {
+				ExceptionUtils.throwAsUncheckedException(t);
+			}
+		});
+	}
+}
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(MagicField.Extension.class)
+@interface MagicField {
+	class Extension extends BaseFieldExtension<MagicField> {
+	}
+}
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(InstanceField.Extension.class)
+@interface InstanceField {
+	class Extension extends BaseFieldExtension<InstanceField> {
+	}
+}
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(StaticField.Extension.class)
+@interface StaticField {
+	class Extension extends BaseFieldExtension<StaticField> {
 	}
 }

From a197a3dd4d19bcb83bffa90d424f955b69a62a31 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 2 Aug 2021 18:11:54 +0200
Subject: [PATCH 0450/1433] Test extension registration for double @Nested
 constructor parameter

Issue: #864
---
 ...gistrationViaParametersAndFieldsTests.java | 43 +++++++++++++++++--
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index 8de7c199198f..442425ce2b12 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -77,7 +77,7 @@ void constructorParameter() {
 
 	@Test
 	void constructorParameterForNestedTestClass() {
-		assertOneTestSucceeded(NestedConstructorParameterTestCase.class);
+		assertTestsSucceeded(NestedConstructorParameterTestCase.class, 2);
 	}
 
 	@Test
@@ -210,10 +210,11 @@ void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String
 	@ExtendWith(LongParameterResolver.class)
 	class NestedConstructorParameterTestCase {
 
-		NestedConstructorParameterTestCase(@MagicParameter("constructor") String text) {
-			// Index is 1 instead of 0, since constructors for non-static nested classes
+		NestedConstructorParameterTestCase(TestInfo testInfo, @MagicParameter("constructor") String text) {
+			assertThat(testInfo).isNotNull();
+			// Index is 2 instead of 1, since constructors for non-static nested classes
 			// receive a reference to the enclosing instance as the first argument: this$0
-			assertThat(text).isEqualTo("NestedConstructorParameterTestCase-1-constructor");
+			assertThat(text).isEqualTo("NestedConstructorParameterTestCase-2-constructor");
 		}
 
 		@BeforeEach
@@ -239,6 +240,40 @@ void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String
 			assertThat(text).isEqualTo("afterEach-2-method");
 		}
 
+		@Nested
+		class DoublyNestedConstructorParameterTestCase {
+
+			DoublyNestedConstructorParameterTestCase(TestInfo testInfo, String text) {
+				assertThat(testInfo).isNotNull();
+				// Index is 2 instead of 1, since constructors for non-static nested classes
+				// receive a reference to the enclosing instance as the first argument: this$0
+				assertThat(text).isEqualTo("DoublyNestedConstructorParameterTestCase-2-enigma");
+			}
+
+			@BeforeEach
+			void beforeEach(String text, TestInfo testInfo) {
+				assertThat(text).isEqualTo("beforeEach-0-enigma");
+				assertThat(testInfo).isNotNull();
+			}
+
+			@Test
+			void test(TestInfo testInfo, String text) {
+				assertThat(testInfo).isNotNull();
+				assertThat(text).isEqualTo("test-1-enigma");
+			}
+
+			/**
+			 * Redeclaring {@code @MagicParameter} should not result in a
+			 * {@link ParameterResolutionException}.
+			 */
+			@AfterEach
+			void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String text) {
+				assertThat(number).isEqualTo(42L);
+				assertThat(testInfo).isNotNull();
+				assertThat(text).isEqualTo("afterEach-2-method");
+			}
+		}
+
 	}
 
 	/**

From 08e15c18fe70c9d5b67d15f3c6157a759df473c5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 2 Aug 2021 18:35:37 +0200
Subject: [PATCH 0451/1433] Update Javadoc for
 ExtensionUtils.registerExtensionsFromFields()

Issue: #864
---
 .../org/junit/jupiter/engine/descriptor/ExtensionUtils.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index f662543f9e44..39a17bce464d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -85,7 +85,8 @@ static MutableExtensionRegistry populateNewExtensionRegistryFromExtendWithAnnota
 
 	/**
 	 * Register extensions using the supplied registrar from fields in the supplied
-	 * class that are annotated with {@link RegisterExtension @RegisterExtension}.
+	 * class that are meta-annotated with {@link ExtendWith @ExtendWith} or
+	 * annotated with {@link RegisterExtension @RegisterExtension}.
 	 *
 	 * <p>The extensions will be sorted according to {@link Order @Order} semantics
 	 * prior to registration.

From 89dd293ccc6f38f7c8cdf723f633ee5254beb21d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 2 Aug 2021 19:29:42 +0200
Subject: [PATCH 0452/1433] Test implicit vs. explicit extension registration
 order for fields

This commit introduces extensions registered explicitly via
@RegisterExtension to verify the respective ordering with extensions
registered implicitly via @ExtendWith on fields.

Issue: #864
---
 ...gistrationViaParametersAndFieldsTests.java | 71 +++++++++++++++++--
 1 file changed, 66 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index 442425ce2b12..0346fa8890ee 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -40,6 +40,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.TestInfo;
@@ -49,10 +50,12 @@
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
@@ -135,14 +138,38 @@ void fieldsWithTestInstancePerClass() {
 	void registrationOrder(LogRecordListener listener) {
 		assertOneTestSucceeded(AllInOneWithTestInstancePerMethodTestCase.class);
 		assertThat(getRegisteredLocalExtensions(listener))//
-				.containsExactly("StaticField", "ConstructorParameter", "BeforeAllParameter", "BeforeEachParameter",
-					"AfterEachParameter", "AfterAllParameter", "TestParameter", "InstanceField");
+				.containsExactly(//
+					"StaticField", // @ExtendWith on static field
+					"ClassLevelExtension1", // @RegisterExtension on static field
+					"ClassLevelExtension2", // @RegisterExtension on static field
+					"ConstructorParameter", // @ExtendWith on parameter in constructor
+					"BeforeAllParameter", // @ExtendWith on parameter in static @BeforeAll method
+					"BeforeEachParameter", // @ExtendWith on parameter in @BeforeEach method
+					"AfterEachParameter", // @ExtendWith on parameter in @AfterEach method
+					"AfterAllParameter", // @ExtendWith on parameter in static @AfterAll method
+					"TestParameter", // @ExtendWith on parameter in @Test method
+					"InstanceField", // @ExtendWith on instance field
+					"InstanceLevelExtension1", // @RegisterExtension on instance field
+					"InstanceLevelExtension2"// @RegisterExtension on instance field
+				);
 
 		listener.clear();
 		assertOneTestSucceeded(AllInOneWithTestInstancePerClassTestCase.class);
 		assertThat(getRegisteredLocalExtensions(listener))//
-				.containsExactly("StaticField", "ConstructorParameter", "BeforeAllParameter", "BeforeEachParameter",
-					"AfterEachParameter", "AfterAllParameter", "InstanceField", "TestParameter");
+				.containsExactly(//
+					"StaticField", // @ExtendWith on static field
+					"ClassLevelExtension1", // @RegisterExtension on static field
+					"ClassLevelExtension2", // @RegisterExtension on static field
+					"ConstructorParameter", // @ExtendWith on parameter in constructor
+					"BeforeAllParameter", // @ExtendWith on parameter in static @BeforeAll method
+					"BeforeEachParameter", // @ExtendWith on parameter in @BeforeEach method
+					"AfterEachParameter", // @ExtendWith on parameter in @AfterEach method
+					"AfterAllParameter", // @ExtendWith on parameter in static @AfterAll method
+					"InstanceField", // @ExtendWith on instance field
+					"InstanceLevelExtension1", // @RegisterExtension on instance field
+					"InstanceLevelExtension2", // @RegisterExtension on instance field
+					"TestParameter" // @ExtendWith on parameter in @Test method
+				);
 	}
 
 	private List<String> getRegisteredLocalExtensions(LogRecordListener listener) {
@@ -150,7 +177,13 @@ private List<String> getRegisteredLocalExtensions(LogRecordListener listener) {
 		return listener.stream(MutableExtensionRegistry.class, Level.FINER)
 			.map(LogRecord::getMessage)
 			.filter(message -> message.contains("local extension"))
-			.map(message -> message.substring(message.lastIndexOf('.') + 1, message.indexOf("$")))
+			.map(message -> {
+				message = message.replaceAll("from source .+", "");
+				int indexOfDollarSign = message.indexOf("$");
+				int indexOfAtSign = message.indexOf("@");
+				int endIndex = (indexOfDollarSign > 1 ? indexOfDollarSign : indexOfAtSign);
+				return message.substring(message.lastIndexOf('.') + 1, endIndex);
+			})
 			.collect(toList());
 		// @formatter:on
 	}
@@ -568,6 +601,22 @@ static class AllInOneWithTestInstancePerMethodTestCase {
 		@InstanceField
 		String instanceField;
 
+		@RegisterExtension
+		@Order(1)
+		static Extension classLevelExtension1 = new ClassLevelExtension1();
+
+		@RegisterExtension
+		@Order(2)
+		static Extension classLevelExtension2 = new ClassLevelExtension2();
+
+		@RegisterExtension
+		@Order(1)
+		Extension instanceLevelExtension1 = new InstanceLevelExtension1();
+
+		@RegisterExtension
+		@Order(2)
+		Extension instanceLevelExtension2 = new InstanceLevelExtension2();
+
 		AllInOneWithTestInstancePerMethodTestCase(@ConstructorParameter String text) {
 			assertThat(text).isEqualTo("enigma");
 		}
@@ -772,3 +821,15 @@ class Extension extends BaseFieldExtension<InstanceField> {
 	class Extension extends BaseFieldExtension<StaticField> {
 	}
 }
+
+class ClassLevelExtension1 implements Extension {
+}
+
+class ClassLevelExtension2 implements Extension {
+}
+
+class InstanceLevelExtension1 implements Extension {
+}
+
+class InstanceLevelExtension2 implements Extension {
+}

From 5fa36d1762fddf6be8c6eebc30e4bfa25ed8827a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 3 Aug 2021 17:00:38 +0200
Subject: [PATCH 0453/1433] Polishing

Issue: #864
---
 .../descriptor/ClassBasedTestDescriptor.java  |  2 +-
 .../engine/descriptor/ExtensionUtils.java     |  3 +-
 ...gistrationViaParametersAndFieldsTests.java | 33 ++++++++++---------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index 2eb71183bd28..91039207877d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -164,7 +164,7 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		this.beforeAllMethods.forEach(method -> registerExtensionsFromExecutableParameters(registry, method));
 		// Since registerBeforeEachMethodAdapters() and registerAfterEachMethodAdapters() also
 		// invoke registerExtensionsFromExecutableParameters(), we invoke those methods before
-		// invoking registerExtensionsFromExecutableParameters() for @BeforeAll methods,
+		// invoking registerExtensionsFromExecutableParameters() for @AfterAll methods,
 		// thereby ensuring proper registration order for extensions registered via @ExtendWith
 		// on parameters in lifecycle methods.
 		registerBeforeEachMethodAdapters(registry);
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 39a17bce464d..3d866805b7ce 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -148,7 +148,8 @@ static void registerExtensionsFromConstructorParameters(ExtensionRegistrar regis
 	/**
 	 * Register extensions using the supplied registrar from parameters in the
 	 * supplied {@link Executable} (i.e., a {@link java.lang.reflect.Constructor}
-	 * or {@link java.lang.reflect.Method}) that are annotated with{@link ExtendWith @ExtendWith}.
+	 * or {@link java.lang.reflect.Method}) that are meta-annotated with
+	 * {@link ExtendWith @ExtendWith}.
 	 *
 	 * @param registrar the registrar with which to register the extensions; never {@code null}
 	 * @param executable the constructor or method whose parameters should be searched; never {@code null}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index 0346fa8890ee..4c4509706029 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -354,7 +354,10 @@ static void afterAll(String text, TestInfo testInfo) {
 	}
 
 	/**
-	 * The {@link MagicParameter.Extension} is first registered for the {@code @AfterAll} method.
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @AfterAll}
+	 * method, but that registration occurs before the test method is invoked, which
+	 * allows the string parameters in the after-each and test methods to be resolved
+	 * by the {@link MagicParameter.Extension} as well.
 	 */
 	@ExtendWith(LongParameterResolver.class)
 	static class AfterAllParameterTestCase {
@@ -365,6 +368,13 @@ void test(TestInfo testInfo, String text) {
 			assertThat(text).isEqualTo("test-1-enigma");
 		}
 
+		@AfterEach
+		void afterEach(Long number, TestInfo testInfo, String text) {
+			assertThat(number).isEqualTo(42L);
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("afterEach-2-enigma");
+		}
+
 		@AfterAll
 		static void afterAll(Long number, TestInfo testInfo, @MagicParameter("method") String text) {
 			assertThat(number).isEqualTo(42L);
@@ -407,13 +417,18 @@ void afterEach(Long number, TestInfo testInfo, @MagicParameter("method") String
 	}
 
 	/**
-	 * The {@link MagicParameter.Extension} is first registered for the {@code @AfterEach} method.
+	 * The {@link MagicParameter.Extension} is first registered for the {@code @AfterEach}
+	 * method, but that registration occurs before the test method is invoked, which
+	 * allows the test method's parameter to be resolved by the {@link MagicParameter.Extension}
+	 * as well.
 	 */
 	@ExtendWith(LongParameterResolver.class)
 	static class AfterEachParameterTestCase {
 
 		@Test
-		void test() {
+		void test(TestInfo testInfo, String text) {
+			assertThat(testInfo).isNotNull();
+			assertThat(text).isEqualTo("test-1-enigma");
 		}
 
 		@AfterEach
@@ -438,10 +453,6 @@ void test(TestInfo testInfo, @MagicParameter("method") String text) {
 			assertThat(text).isEqualTo("test-1-method");
 		}
 
-		/**
-		 * Redeclaring {@code @MagicParameter} should not result in a
-		 * {@link ParameterResolutionException}.
-		 */
 		@AfterEach
 		void afterEach(Long number, TestInfo testInfo, String text) {
 			assertThat(number).isEqualTo(42L);
@@ -466,10 +477,6 @@ Stream<DynamicTest> testFactory(TestInfo testInfo, @MagicParameter("method") Str
 			return IntStream.of(2, 4).mapToObj(num -> dynamicTest("" + num, () -> assertTrue(num % 2 == 0)));
 		}
 
-		/**
-		 * Redeclaring {@code @MagicParameter} should not result in a
-		 * {@link ParameterResolutionException}.
-		 */
 		@AfterEach
 		void afterEach(Long number, TestInfo testInfo, String text) {
 			assertThat(number).isEqualTo(42L);
@@ -493,10 +500,6 @@ void testTemplate(TestInfo testInfo, @MagicParameter("method") String text) {
 			assertThat(text).isEqualTo("testTemplate-1-method");
 		}
 
-		/**
-		 * Redeclaring {@code @MagicParameter} should not result in a
-		 * {@link ParameterResolutionException}.
-		 */
 		@AfterEach
 		void afterEach(Long number, TestInfo testInfo, String text) {
 			assertThat(number).isEqualTo(42L);

From 4ae957dcb84163c6e36d4b6438346da5daa7e75b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 4 Aug 2021 15:46:45 +0200
Subject: [PATCH 0454/1433] Remove code duplication in ExtensionUtils

Issue: #864
---
 .../engine/descriptor/ExtensionUtils.java     | 39 ++++++++++---------
 .../extension/MutableExtensionRegistry.java   |  2 +-
 .../extension/ExtensionRegistryTests.java     | 12 +++---
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 3d866805b7ce..dab0d31d329a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.engine.descriptor;
 
-import static java.util.stream.Collectors.toList;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.AnnotationUtils.findRepeatableAnnotations;
 import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
@@ -25,11 +24,11 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -73,14 +72,7 @@ static MutableExtensionRegistry populateNewExtensionRegistryFromExtendWithAnnota
 		Preconditions.notNull(parentRegistry, "Parent ExtensionRegistry must not be null");
 		Preconditions.notNull(annotatedElement, "AnnotatedElement must not be null");
 
-		// @formatter:off
-		List<Class<? extends Extension>> extensionTypes = findRepeatableAnnotations(annotatedElement, ExtendWith.class).stream()
-				.map(ExtendWith::value)
-				.flatMap(Arrays::stream)
-				.collect(toList());
-		// @formatter:on
-
-		return MutableExtensionRegistry.createRegistryFrom(parentRegistry, extensionTypes);
+		return MutableExtensionRegistry.createRegistryFrom(parentRegistry, streamExtensionTypes(annotatedElement));
 	}
 
 	/**
@@ -109,12 +101,9 @@ static void registerExtensionsFromFields(ExtensionRegistrar registrar, Class<?>
 		fields.sort(orderComparator);
 
 		// @formatter:off
-		fields.forEach(field -> {
-			findRepeatableAnnotations(field, ExtendWith.class).stream()
-				.map(ExtendWith::value)
-				.flatMap(Arrays::stream)
-				.forEach(registrar::registerExtension);
-		});
+		fields.stream()
+			.flatMap(ExtensionUtils::streamExtensionTypes)
+			.forEach(registrar::registerExtension);
 
 		fields.stream()
 			.filter(field -> isAnnotated(field, RegisterExtension.class))
@@ -164,13 +153,25 @@ static void registerExtensionsFromExecutableParameters(ExtensionRegistrar regist
 		// @formatter:off
 		Arrays.stream(executable.getParameters())
 				.map(parameter -> findRepeatableAnnotations(parameter, index.getAndIncrement(), ExtendWith.class))
-				.flatMap(Collection::stream)
-				.map(ExtendWith::value)
-				.flatMap(Arrays::stream)
+				.flatMap(ExtensionUtils::streamExtensionTypes)
 				.forEach(registrar::registerExtension);
 		// @formatter:on
 	}
 
+	/**
+	 * @since 5.8
+	 */
+	private static Stream<Class<? extends Extension>> streamExtensionTypes(AnnotatedElement annotatedElement) {
+		return streamExtensionTypes(findRepeatableAnnotations(annotatedElement, ExtendWith.class));
+	}
+
+	/**
+	 * @since 5.8
+	 */
+	private static Stream<Class<? extends Extension>> streamExtensionTypes(List<ExtendWith> extendWithAnnotations) {
+		return extendWithAnnotations.stream().map(ExtendWith::value).flatMap(Arrays::stream);
+	}
+
 	/**
 	 * @since 5.4
 	 */
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index b7eed9ae951c..6a739ca3958a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -95,7 +95,7 @@ private static void registerAutoDetectedExtensions(MutableExtensionRegistry exte
 	 * @return a new {@code ExtensionRegistry}; never {@code null}
 	 */
 	public static MutableExtensionRegistry createRegistryFrom(MutableExtensionRegistry parentRegistry,
-			List<Class<? extends Extension>> extensionTypes) {
+			Stream<Class<? extends Extension>> extensionTypes) {
 
 		Preconditions.notNull(parentRegistry, "parentRegistry must not be null");
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
index 54856358ffbf..8a9883df634b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
@@ -10,9 +10,6 @@
 
 package org.junit.jupiter.engine.extension;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -23,6 +20,7 @@
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -104,12 +102,12 @@ void extensionsAreInheritedFromParent() {
 		MutableExtensionRegistry parent = registry;
 		parent.registerExtension(MyExtension.class);
 
-		MutableExtensionRegistry child = createRegistryFrom(parent, singletonList(YourExtension.class));
+		MutableExtensionRegistry child = createRegistryFrom(parent, Stream.of(YourExtension.class));
 		assertExtensionRegistered(child, MyExtension.class);
 		assertExtensionRegistered(child, YourExtension.class);
 		assertEquals(2, countExtensions(child, MyExtensionApi.class));
 
-		ExtensionRegistry grandChild = createRegistryFrom(child, emptyList());
+		ExtensionRegistry grandChild = createRegistryFrom(child, Stream.empty());
 		assertExtensionRegistered(grandChild, MyExtension.class);
 		assertExtensionRegistered(grandChild, YourExtension.class);
 		assertEquals(2, countExtensions(grandChild, MyExtensionApi.class));
@@ -121,12 +119,12 @@ void registeringSameExtensionImplementationInParentAndChildDoesNotResultInDuplic
 		parent.registerExtension(MyExtension.class);
 		assertEquals(1, countExtensions(parent, MyExtensionApi.class));
 
-		MutableExtensionRegistry child = createRegistryFrom(parent, asList(MyExtension.class, YourExtension.class));
+		MutableExtensionRegistry child = createRegistryFrom(parent, Stream.of(MyExtension.class, YourExtension.class));
 		assertExtensionRegistered(child, MyExtension.class);
 		assertExtensionRegistered(child, YourExtension.class);
 		assertEquals(2, countExtensions(child, MyExtensionApi.class));
 
-		ExtensionRegistry grandChild = createRegistryFrom(child, asList(MyExtension.class, YourExtension.class));
+		ExtensionRegistry grandChild = createRegistryFrom(child, Stream.of(MyExtension.class, YourExtension.class));
 		assertExtensionRegistered(grandChild, MyExtension.class);
 		assertExtensionRegistered(grandChild, YourExtension.class);
 		assertEquals(2, countExtensions(grandChild, MyExtensionApi.class));

From 3480fc80bb2bda415f875b1ac0de8b671d332b1d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 6 Aug 2021 14:41:10 +0200
Subject: [PATCH 0455/1433] Allow @RegisterExtension fields to be private

Prior to this commit, an exception was thrown if a @RegisterExtension
field was declared private.

This commit removes this restriction.

Closes #2688
See #864, #2680
---
 .../docs/asciidoc/user-guide/extensions.adoc    | 10 +++++-----
 .../api/extension/RegisterExtension.java        |  4 ++--
 .../engine/descriptor/ExtensionUtils.java       |  4 ----
 ...RegistrationViaParametersAndFieldsTests.java |  8 ++++----
 .../ProgrammaticExtensionRegistrationTests.java | 17 ++++++-----------
 5 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index b31110332c12..e0b956fe93fa 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -125,8 +125,8 @@ registered last and _after_ callback extensions to be registered first, relative
 programmatically registered extensions.
 ====
 
-NOTE: `@RegisterExtension` fields must not be `private` or `null` (at evaluation time) but
-may be either `static` or non-static.
+NOTE: `@RegisterExtension` fields must not be `null` (at evaluation time) but may be
+either `static` or non-static.
 
 [[extensions-registration-programmatic-static-fields]]
 ===== Static Fields
@@ -159,9 +159,9 @@ include::{testDir}/example/registration/WebServerDemo.java[tags=user_guide]
 
 The Kotlin programming language does not have the concept of a `static` field. However,
 the compiler can be instructed to generate static fields using annotations. Since, as
-stated earlier, `@RegisterExtension` fields must not be `private` nor `null`, one
-**cannot** use the `@JvmStatic` annotation in Kotlin as it generates `private` fields.
-Rather, the `@JvmField` annotation must be used.
+stated earlier, `@RegisterExtension` fields must not be `null`, one **cannot** use the
+`@JvmStatic` annotation in Kotlin as it generates `private` fields. Rather, the
+`@JvmField` annotation must be used.
 
 The following example is a version of the `WebServerDemo` from the previous section that
 has been ported to Kotlin.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
index dfd3ef157c8b..55977b63b7c1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
@@ -30,8 +30,8 @@
  * to pass arguments to the extension's constructor, {@code static} factory
  * method, or builder API.
  *
- * <p>{@code @RegisterExtension} fields must not be {@code private} or
- * {@code null} (when evaluated) but may be either {@code static} or non-static.
+ * <p>{@code @RegisterExtension} fields must not be {@code null} (when evaluated)
+ * but may be either {@code static} or non-static.
  *
  * <h3>Static Fields</h3>
  *
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index dab0d31d329a..748ffecae470 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -16,7 +16,6 @@
 import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.TOP_DOWN;
 import static org.junit.platform.commons.util.ReflectionUtils.findFields;
 import static org.junit.platform.commons.util.ReflectionUtils.getDeclaredConstructor;
-import static org.junit.platform.commons.util.ReflectionUtils.isNotPrivate;
 import static org.junit.platform.commons.util.ReflectionUtils.tryToReadFieldValue;
 
 import java.lang.reflect.AnnotatedElement;
@@ -108,9 +107,6 @@ static void registerExtensionsFromFields(ExtensionRegistrar registrar, Class<?>
 		fields.stream()
 			.filter(field -> isAnnotated(field, RegisterExtension.class))
 			.forEach(field -> {
-				Preconditions.condition(isNotPrivate(field), () -> String.format(
-					"Failed to register extension via @RegisterExtension field [%s]: field must not be private.",
-					field));
 				tryToReadFieldValue(field, instance).ifSuccess(value -> {
 					Preconditions.condition(value instanceof Extension, () -> String.format(
 						"Failed to register extension via @RegisterExtension field [%s]: field value's type [%s] must implement an [%s] API.",
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index 4c4509706029..f3980b87059e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -533,7 +533,7 @@ private static TestTemplateInvocationContext emptyTestTemplateInvocationContext(
 	static class StaticFieldTestCase {
 
 		@MagicField
-		static String staticField1;
+		private static String staticField1;
 
 		@MagicField
 		static String staticField2;
@@ -560,7 +560,7 @@ static class InstanceFieldTestCase {
 		String instanceField1;
 
 		@MagicField
-		String instanceField2;
+		private String instanceField2;
 
 		@Test
 		void test() {
@@ -606,7 +606,7 @@ static class AllInOneWithTestInstancePerMethodTestCase {
 
 		@RegisterExtension
 		@Order(1)
-		static Extension classLevelExtension1 = new ClassLevelExtension1();
+		private static Extension classLevelExtension1 = new ClassLevelExtension1();
 
 		@RegisterExtension
 		@Order(2)
@@ -614,7 +614,7 @@ static class AllInOneWithTestInstancePerMethodTestCase {
 
 		@RegisterExtension
 		@Order(1)
-		Extension instanceLevelExtension1 = new InstanceLevelExtension1();
+		private Extension instanceLevelExtension1 = new InstanceLevelExtension1();
 
 		@RegisterExtension
 		@Order(2)
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
index 29fcadc9385c..6c9588992562 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
@@ -167,8 +167,7 @@ void classLevelWithFieldThatDoesNotImplementAnExtensionApi() {
 	@Test
 	void instanceLevelWithPrivateField() {
 		Class<?> testClass = InstanceLevelExtensionRegistrationWithPrivateFieldTestCase.class;
-		executeTestsForClass(testClass).testEvents().assertThatEvents().haveExactly(1, finishedWithFailure(
-			instanceOf(PreconditionViolationException.class), message(expectedNotPrivateMessage(testClass))));
+		executeTestsForClass(testClass).testEvents().assertStatistics(stats -> stats.succeeded(1));
 	}
 
 	/**
@@ -177,8 +176,7 @@ void instanceLevelWithPrivateField() {
 	@Test
 	void classLevelWithPrivateField() {
 		Class<?> testClass = ClassLevelExtensionRegistrationWithPrivateFieldTestCase.class;
-		executeTestsForClass(testClass).containerEvents().assertThatEvents().haveExactly(1, finishedWithFailure(
-			instanceOf(PreconditionViolationException.class), message(expectedNotPrivateMessage(testClass))));
+		executeTestsForClass(testClass).testEvents().assertStatistics(stats -> stats.succeeded(1));
 	}
 
 	@Test
@@ -219,11 +217,6 @@ void classLevelWithNonExtensionFieldValue() {
 			instanceOf(PreconditionViolationException.class), message(expectedMessage(testClass, String.class))));
 	}
 
-	private String expectedNotPrivateMessage(Class<?> testClass) {
-		return "Failed to register extension via @RegisterExtension field [" + field(testClass)
-				+ "]: field must not be private.";
-	}
-
 	private String expectedMessage(Class<?> testClass, Class<?> valueType) {
 		return "Failed to register extension via @RegisterExtension field [" + field(testClass)
 				+ "]: field value's type [" + (valueType != null ? valueType.getName() : null) + "] must implement an ["
@@ -602,14 +595,16 @@ void test() {
 	static class InstanceLevelExtensionRegistrationWithPrivateFieldTestCase extends AbstractTestCase {
 
 		@RegisterExtension
-		private Extension extension;
+		private Extension extension = new Extension() {
+		};
 
 	}
 
 	static class ClassLevelExtensionRegistrationWithPrivateFieldTestCase extends AbstractTestCase {
 
 		@RegisterExtension
-		private static Extension extension;
+		private static Extension extension = new Extension() {
+		};
 
 	}
 

From cc9690bd9581c10443d70367d8493c0f1bb9f1f4 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 6 Aug 2021 15:12:57 +0200
Subject: [PATCH 0456/1433] Allow @ExtendWith to be declared directly on fields
 and parameters

Prior to this commit, @ExtendWith could only be declared on types (i.e.,
classes, interfaces, annotations) and methods.

@ExtendWith can now be declared directly on fields and parameters as well.

See #864, #2680
---
 .../docs/asciidoc/user-guide/extensions.adoc  |  6 +-
 .../jupiter/api/extension/ExtendWith.java     | 10 ++-
 ...gistrationViaParametersAndFieldsTests.java | 87 ++++++++++++++-----
 3 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index e0b956fe93fa..a0addd083ed5 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -21,8 +21,10 @@ Java's <<extensions-registration-automatic,`ServiceLoader`>> mechanism.
 
 Developers can register one or more extensions _declaratively_ by annotating a test
 interface, test class, test method, or custom _<<writing-tests-meta-annotations,composed
-annotation>>_ with `@ExtendWith(...)` and supplying class references for the extensions
-to register.
+annotation>>_ with `@ExtendWith(...)` and supplying class references for the extensions to
+register. As of JUnit Jupiter 5.8, `@ExtendWith` may also be declared on fields and on
+parameters in test class constructors, in test methods, and in `@BeforeAll`, `@AfterAll`,
+`@BeforeEach`, and `@AfterEach` lifecycle methods.
 
 For example, to register a custom `RandomParametersExtension` for a particular test
 method, you would annotate the test method as follows.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
index 3139e3832d77..ed1d5764ef26 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
@@ -24,8 +24,12 @@
 
 /**
  * {@code @ExtendWith} is a {@linkplain Repeatable repeatable} annotation
- * that is used to register {@linkplain Extension extensions} for the
- * annotated test class or test method.
+ * that is used to register {@linkplain Extension extensions} for the annotated
+ * test class, test interface, test method, field, or parameter.
+ *
+ * <p>Annotated parameters are supported in test class constructors, in test
+ * methods, and in {@code @BeforeAll}, {@code @AfterAll}, {@code @BeforeEach},
+ * and {@code @AfterEach} lifecycle methods.
  *
  * <h3>Supported Extension APIs</h3>
  * <ul>
@@ -49,7 +53,7 @@
  * @see RegisterExtension
  * @see Extension
  */
-@Target({ ElementType.TYPE, ElementType.METHOD })
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index f3980b87059e..e090ad099392 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -139,7 +139,8 @@ void registrationOrder(LogRecordListener listener) {
 		assertOneTestSucceeded(AllInOneWithTestInstancePerMethodTestCase.class);
 		assertThat(getRegisteredLocalExtensions(listener))//
 				.containsExactly(//
-					"StaticField", // @ExtendWith on static field
+					"StaticField1", // @ExtendWith on static field
+					"StaticField2", // @ExtendWith on static field
 					"ClassLevelExtension1", // @RegisterExtension on static field
 					"ClassLevelExtension2", // @RegisterExtension on static field
 					"ConstructorParameter", // @ExtendWith on parameter in constructor
@@ -148,7 +149,8 @@ void registrationOrder(LogRecordListener listener) {
 					"AfterEachParameter", // @ExtendWith on parameter in @AfterEach method
 					"AfterAllParameter", // @ExtendWith on parameter in static @AfterAll method
 					"TestParameter", // @ExtendWith on parameter in @Test method
-					"InstanceField", // @ExtendWith on instance field
+					"InstanceField1", // @ExtendWith on instance field
+					"InstanceField2", // @ExtendWith on instance field
 					"InstanceLevelExtension1", // @RegisterExtension on instance field
 					"InstanceLevelExtension2"// @RegisterExtension on instance field
 				);
@@ -157,7 +159,8 @@ void registrationOrder(LogRecordListener listener) {
 		assertOneTestSucceeded(AllInOneWithTestInstancePerClassTestCase.class);
 		assertThat(getRegisteredLocalExtensions(listener))//
 				.containsExactly(//
-					"StaticField", // @ExtendWith on static field
+					"StaticField1", // @ExtendWith on static field
+					"StaticField2", // @ExtendWith on static field
 					"ClassLevelExtension1", // @RegisterExtension on static field
 					"ClassLevelExtension2", // @RegisterExtension on static field
 					"ConstructorParameter", // @ExtendWith on parameter in constructor
@@ -165,7 +168,8 @@ void registrationOrder(LogRecordListener listener) {
 					"BeforeEachParameter", // @ExtendWith on parameter in @BeforeEach method
 					"AfterEachParameter", // @ExtendWith on parameter in @AfterEach method
 					"AfterAllParameter", // @ExtendWith on parameter in static @AfterAll method
-					"InstanceField", // @ExtendWith on instance field
+					"InstanceField1", // @ExtendWith on instance field
+					"InstanceField2", // @ExtendWith on instance field
 					"InstanceLevelExtension1", // @RegisterExtension on instance field
 					"InstanceLevelExtension2", // @RegisterExtension on instance field
 					"TestParameter" // @ExtendWith on parameter in @Test method
@@ -598,11 +602,19 @@ void test() {
 	@TestInstance(Lifecycle.PER_METHOD)
 	static class AllInOneWithTestInstancePerMethodTestCase {
 
-		@StaticField
-		static String staticField;
+		@StaticField1
+		static String staticField1;
 
-		@InstanceField
-		String instanceField;
+		@StaticField2
+		@ExtendWith(StaticField2.Extension.class)
+		static String staticField2;
+
+		@InstanceField1
+		String instanceField1;
+
+		@InstanceField2
+		@ExtendWith(InstanceField2.Extension.class)
+		String instanceField2;
 
 		@RegisterExtension
 		@Order(1)
@@ -625,36 +637,44 @@ static class AllInOneWithTestInstancePerMethodTestCase {
 		}
 
 		@BeforeAll
-		static void beforeAll(@BeforeAllParameter String text) {
+		static void beforeAll(@ExtendWith(BeforeAllParameter.Extension.class) @BeforeAllParameter String text) {
 			assertThat(text).isEqualTo("enigma");
-			assertThat(staticField).isEqualTo("beforeAll - staticField");
+			assertThat(staticField1).isEqualTo("beforeAll - staticField1");
+			assertThat(staticField2).isEqualTo("beforeAll - staticField2");
 		}
 
 		@BeforeEach
 		void beforeEach(@BeforeEachParameter String text) {
 			assertThat(text).isEqualTo("enigma");
-			assertThat(staticField).isEqualTo("beforeAll - staticField");
-			assertThat(instanceField).isEqualTo("beforeEach - instanceField");
+			assertThat(staticField1).isEqualTo("beforeAll - staticField1");
+			assertThat(staticField2).isEqualTo("beforeAll - staticField2");
+			assertThat(instanceField1).isEqualTo("beforeEach - instanceField1");
+			assertThat(instanceField2).isEqualTo("beforeEach - instanceField2");
 		}
 
 		@Test
 		void test(@TestParameter String text) {
 			assertThat(text).isEqualTo("enigma");
-			assertThat(staticField).isEqualTo("beforeAll - staticField");
-			assertThat(instanceField).isEqualTo("beforeEach - instanceField");
+			assertThat(staticField1).isEqualTo("beforeAll - staticField1");
+			assertThat(staticField2).isEqualTo("beforeAll - staticField2");
+			assertThat(instanceField1).isEqualTo("beforeEach - instanceField1");
+			assertThat(instanceField2).isEqualTo("beforeEach - instanceField2");
 		}
 
 		@AfterEach
 		void afterEach(@AfterEachParameter String text) {
 			assertThat(text).isEqualTo("enigma");
-			assertThat(staticField).isEqualTo("beforeAll - staticField");
-			assertThat(instanceField).isEqualTo("beforeEach - instanceField");
+			assertThat(staticField1).isEqualTo("beforeAll - staticField1");
+			assertThat(staticField2).isEqualTo("beforeAll - staticField2");
+			assertThat(instanceField1).isEqualTo("beforeEach - instanceField1");
+			assertThat(instanceField2).isEqualTo("beforeEach - instanceField2");
 		}
 
 		@AfterAll
 		static void afterAll(@AfterAllParameter String text) {
 			assertThat(text).isEqualTo("enigma");
-			assertThat(staticField).isEqualTo("beforeAll - staticField");
+			assertThat(staticField1).isEqualTo("beforeAll - staticField1");
+			assertThat(staticField2).isEqualTo("beforeAll - staticField2");
 		}
 
 	}
@@ -730,7 +750,8 @@ class Extension extends BaseParameterExtension<ConstructorParameter> {
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-@ExtendWith(BeforeAllParameter.Extension.class)
+// Intentionally NOT annotated as follows
+// @ExtendWith(BeforeAllParameter.Extension.class)
 @interface BeforeAllParameter {
 	class Extension extends BaseParameterExtension<BeforeAllParameter> {
 	}
@@ -811,17 +832,35 @@ class Extension extends BaseFieldExtension<MagicField> {
 
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-@ExtendWith(InstanceField.Extension.class)
-@interface InstanceField {
-	class Extension extends BaseFieldExtension<InstanceField> {
+@ExtendWith(InstanceField1.Extension.class)
+@interface InstanceField1 {
+	class Extension extends BaseFieldExtension<InstanceField1> {
+	}
+}
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+// Intentionally NOT annotated as follows
+// @ExtendWith(InstanceField2.Extension.class)
+@interface InstanceField2 {
+	class Extension extends BaseFieldExtension<InstanceField2> {
+	}
+}
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(StaticField1.Extension.class)
+@interface StaticField1 {
+	class Extension extends BaseFieldExtension<StaticField1> {
 	}
 }
 
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-@ExtendWith(StaticField.Extension.class)
-@interface StaticField {
-	class Extension extends BaseFieldExtension<StaticField> {
+// Intentionally NOT annotated as follows
+// @ExtendWith(StaticField2.Extension.class)
+@interface StaticField2 {
+	class Extension extends BaseFieldExtension<StaticField2> {
 	}
 }
 

From f149ad675da45f0e951b2b1951d6c2fcda73cf1d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 6 Aug 2021 15:45:37 +0200
Subject: [PATCH 0457/1433] Allow @RegisterExtension/@ExtendWith fields to be
 sorted relative to each other

Prior to this commit, @ExtendWith fields and @RegisterExtension fields
were sorted using @Order, but extensions registered via @ExtendWith fields
were always registered first (before extensions registered via
@RegisterExtension fields).

This commit ensures that @RegisterExtension fields and @ExtendWith fields
are sorted via @Order relative to each other.

See #864, #2680
---
 .../engine/descriptor/ExtensionUtils.java     | 39 ++++++++-----------
 ...gistrationViaParametersAndFieldsTests.java | 38 +++++++++---------
 2 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 748ffecae470..9dd2c1542b56 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -21,7 +21,6 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -93,28 +92,24 @@ static void registerExtensionsFromFields(ExtensionRegistrar registrar, Class<?>
 
 		Predicate<Field> predicate = (instance == null ? ReflectionUtils::isStatic : ReflectionUtils::isNotStatic);
 
-		// Ensure that the list is modifiable, since findFields() returns an unmodifiable list.
-		List<Field> fields = new ArrayList<>(findFields(clazz, predicate, TOP_DOWN));
-
-		// Sort fields based on @Order.
-		fields.sort(orderComparator);
-
-		// @formatter:off
-		fields.stream()
-			.flatMap(ExtensionUtils::streamExtensionTypes)
-			.forEach(registrar::registerExtension);
-
-		fields.stream()
-			.filter(field -> isAnnotated(field, RegisterExtension.class))
-			.forEach(field -> {
-				tryToReadFieldValue(field, instance).ifSuccess(value -> {
-					Preconditions.condition(value instanceof Extension, () -> String.format(
-						"Failed to register extension via @RegisterExtension field [%s]: field value's type [%s] must implement an [%s] API.",
-						field, (value != null ? value.getClass().getName() : null), Extension.class.getName()));
-					registrar.registerExtension((Extension) value, field);
+		findFields(clazz, predicate, TOP_DOWN).stream()//
+				.sorted(orderComparator)//
+				.forEach(field -> {
+					List<ExtendWith> extendWithAnnotations = findRepeatableAnnotations(field, ExtendWith.class);
+					boolean isExtendWithPresent = !extendWithAnnotations.isEmpty();
+					boolean isRegisterExtensionPresent = isAnnotated(field, RegisterExtension.class);
+					if (isExtendWithPresent) {
+						streamExtensionTypes(extendWithAnnotations).forEach(registrar::registerExtension);
+					}
+					if (isRegisterExtensionPresent) {
+						tryToReadFieldValue(field, instance).ifSuccess(value -> {
+							Preconditions.condition(value instanceof Extension, () -> String.format(
+								"Failed to register extension via @RegisterExtension field [%s]: field value's type [%s] must implement an [%s] API.",
+								field, (value != null ? value.getClass().getName() : null), Extension.class.getName()));
+							registrar.registerExtension((Extension) value, field);
+						});
+					}
 				});
-			});
-		// @formatter:on
 	}
 
 	/**
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index e090ad099392..4534aaba9b3a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -139,39 +139,39 @@ void registrationOrder(LogRecordListener listener) {
 		assertOneTestSucceeded(AllInOneWithTestInstancePerMethodTestCase.class);
 		assertThat(getRegisteredLocalExtensions(listener))//
 				.containsExactly(//
-					"StaticField1", // @ExtendWith on static field
+					"ClassLevelExtension2", // @RegisterExtension on static field
 					"StaticField2", // @ExtendWith on static field
 					"ClassLevelExtension1", // @RegisterExtension on static field
-					"ClassLevelExtension2", // @RegisterExtension on static field
+					"StaticField1", // @ExtendWith on static field
 					"ConstructorParameter", // @ExtendWith on parameter in constructor
 					"BeforeAllParameter", // @ExtendWith on parameter in static @BeforeAll method
 					"BeforeEachParameter", // @ExtendWith on parameter in @BeforeEach method
 					"AfterEachParameter", // @ExtendWith on parameter in @AfterEach method
 					"AfterAllParameter", // @ExtendWith on parameter in static @AfterAll method
 					"TestParameter", // @ExtendWith on parameter in @Test method
-					"InstanceField1", // @ExtendWith on instance field
-					"InstanceField2", // @ExtendWith on instance field
 					"InstanceLevelExtension1", // @RegisterExtension on instance field
-					"InstanceLevelExtension2"// @RegisterExtension on instance field
+					"InstanceField1", // @ExtendWith on instance field
+					"InstanceLevelExtension2", // @RegisterExtension on instance field
+					"InstanceField2" // @ExtendWith on instance field
 				);
 
 		listener.clear();
 		assertOneTestSucceeded(AllInOneWithTestInstancePerClassTestCase.class);
 		assertThat(getRegisteredLocalExtensions(listener))//
 				.containsExactly(//
-					"StaticField1", // @ExtendWith on static field
+					"ClassLevelExtension2", // @RegisterExtension on static field
 					"StaticField2", // @ExtendWith on static field
 					"ClassLevelExtension1", // @RegisterExtension on static field
-					"ClassLevelExtension2", // @RegisterExtension on static field
+					"StaticField1", // @ExtendWith on static field
 					"ConstructorParameter", // @ExtendWith on parameter in constructor
 					"BeforeAllParameter", // @ExtendWith on parameter in static @BeforeAll method
 					"BeforeEachParameter", // @ExtendWith on parameter in @BeforeEach method
 					"AfterEachParameter", // @ExtendWith on parameter in @AfterEach method
 					"AfterAllParameter", // @ExtendWith on parameter in static @AfterAll method
-					"InstanceField1", // @ExtendWith on instance field
-					"InstanceField2", // @ExtendWith on instance field
 					"InstanceLevelExtension1", // @RegisterExtension on instance field
+					"InstanceField1", // @ExtendWith on instance field
 					"InstanceLevelExtension2", // @RegisterExtension on instance field
+					"InstanceField2", // @ExtendWith on instance field
 					"TestParameter" // @ExtendWith on parameter in @Test method
 				);
 	}
@@ -603,33 +603,35 @@ void test() {
 	static class AllInOneWithTestInstancePerMethodTestCase {
 
 		@StaticField1
+		@Order(Integer.MAX_VALUE)
 		static String staticField1;
 
 		@StaticField2
 		@ExtendWith(StaticField2.Extension.class)
+		@Order(3)
 		static String staticField2;
 
+		@RegisterExtension
+		private static Extension classLevelExtension1 = new ClassLevelExtension1();
+
+		@RegisterExtension
+		@Order(1)
+		static Extension classLevelExtension2 = new ClassLevelExtension2();
+
 		@InstanceField1
+		@Order(2)
 		String instanceField1;
 
 		@InstanceField2
 		@ExtendWith(InstanceField2.Extension.class)
 		String instanceField2;
 
-		@RegisterExtension
-		@Order(1)
-		private static Extension classLevelExtension1 = new ClassLevelExtension1();
-
-		@RegisterExtension
-		@Order(2)
-		static Extension classLevelExtension2 = new ClassLevelExtension2();
-
 		@RegisterExtension
 		@Order(1)
 		private Extension instanceLevelExtension1 = new InstanceLevelExtension1();
 
 		@RegisterExtension
-		@Order(2)
+		@Order(3)
 		Extension instanceLevelExtension2 = new InstanceLevelExtension2();
 
 		AllInOneWithTestInstancePerMethodTestCase(@ConstructorParameter String text) {

From e4804cba6ef66b9742e0197d060ca50e879d9b80 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 9 Aug 2021 17:01:05 +0200
Subject: [PATCH 0458/1433] Disallow duplicate registration via
 @RegisterExtension and @ExtendWith

Prior to this commit, @ExtendWith and @RegisterExtension could be
declared on a field to register duplicate extensions of the same time,
but that scenario likely does not make sense.

This commit ensures that @RegisterExtension and @ExtendWith cannot be
used to register an extension of the same type for a given field, by
throwing a PreconditionViolationException if the user attempts to do so.

See #2680
---
 .../engine/descriptor/ExtensionUtils.java     | 19 +++++--
 ...gistrationViaParametersAndFieldsTests.java | 51 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 9dd2c1542b56..9e73e91b6eba 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.engine.descriptor;
 
+import static java.util.stream.Collectors.toList;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.AnnotationUtils.findRepeatableAnnotations;
 import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
@@ -95,17 +96,29 @@ static void registerExtensionsFromFields(ExtensionRegistrar registrar, Class<?>
 		findFields(clazz, predicate, TOP_DOWN).stream()//
 				.sorted(orderComparator)//
 				.forEach(field -> {
-					List<ExtendWith> extendWithAnnotations = findRepeatableAnnotations(field, ExtendWith.class);
-					boolean isExtendWithPresent = !extendWithAnnotations.isEmpty();
+					List<Class<? extends Extension>> extensionTypes = streamExtensionTypes(field).collect(toList());
+					boolean isExtendWithPresent = !extensionTypes.isEmpty();
 					boolean isRegisterExtensionPresent = isAnnotated(field, RegisterExtension.class);
 					if (isExtendWithPresent) {
-						streamExtensionTypes(extendWithAnnotations).forEach(registrar::registerExtension);
+						extensionTypes.forEach(registrar::registerExtension);
 					}
 					if (isRegisterExtensionPresent) {
 						tryToReadFieldValue(field, instance).ifSuccess(value -> {
 							Preconditions.condition(value instanceof Extension, () -> String.format(
 								"Failed to register extension via @RegisterExtension field [%s]: field value's type [%s] must implement an [%s] API.",
 								field, (value != null ? value.getClass().getName() : null), Extension.class.getName()));
+
+							if (isExtendWithPresent) {
+								Class<?> valueType = value.getClass();
+								extensionTypes.forEach(extensionType -> {
+									Preconditions.condition(!extensionType.equals(valueType),
+										() -> String.format("Failed to register extension via field [%s]. "
+												+ "The field registers an extension of type [%s] via @RegisterExtension and @ExtendWith, "
+												+ "but only one registration of a given extension type is permitted.",
+											field, valueType.getName()));
+								});
+							}
+
 							registrar.registerExtension((Extension) value, field);
 						});
 					}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index 4534aaba9b3a..670f679f917b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -16,6 +16,9 @@
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
+import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -61,13 +64,14 @@
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.execution.injection.sample.LongParameterResolver;
+import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.logging.LogRecordListener;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
  * Integration tests that verify support for extension registration via
- * {@link ExtendWith @ExtendWith} on annotations on parameters and fields.
+ * {@link ExtendWith @ExtendWith} on parameters and fields.
  *
  * @since 5.8
  */
@@ -133,6 +137,26 @@ void fieldsWithTestInstancePerClass() {
 		assertOneTestSucceeded(TestInstancePerClassFieldTestCase.class);
 	}
 
+	@Test
+	@TrackLogRecords
+	void multipleRegistrationsViaField(LogRecordListener listener) {
+		assertOneTestSucceeded(MultipleRegistrationsViaFieldTestCase.class);
+		assertThat(getRegisteredLocalExtensions(listener)).containsExactly("LongParameterResolver", "DummyExtension");
+	}
+
+	@Test
+	void duplicateRegistrationViaField() {
+		Class<?> testClass = DuplicateRegistrationViaFieldTestCase.class;
+		String expectedMessage = "Failed to register extension via field "
+				+ "[org.junit.jupiter.api.extension.Extension "
+				+ "org.junit.jupiter.engine.extension.ExtensionRegistrationViaParametersAndFieldsTests$DuplicateRegistrationViaFieldTestCase.dummy]. "
+				+ "The field registers an extension of type [org.junit.jupiter.engine.extension.DummyExtension] "
+				+ "via @RegisterExtension and @ExtendWith, but only one registration of a given extension type is permitted.";
+
+		executeTestsForClass(testClass).testEvents().assertThatEvents().haveExactly(1,
+			finishedWithFailure(instanceOf(PreconditionViolationException.class), message(expectedMessage)));
+	}
+
 	@Test
 	@TrackLogRecords
 	void registrationOrder(LogRecordListener listener) {
@@ -531,6 +555,28 @@ private static TestTemplateInvocationContext emptyTestTemplateInvocationContext(
 		}
 	}
 
+	static class MultipleRegistrationsViaFieldTestCase {
+
+		@ExtendWith(LongParameterResolver.class)
+		@RegisterExtension
+		Extension dummy = new DummyExtension();
+
+		@Test
+		void test() {
+		}
+	}
+
+	static class DuplicateRegistrationViaFieldTestCase {
+
+		@ExtendWith(DummyExtension.class)
+		@RegisterExtension
+		Extension dummy = new DummyExtension();
+
+		@Test
+		void test() {
+		}
+	}
+
 	/**
 	 * The {@link MagicField.Extension} is registered via a static field.
 	 */
@@ -791,6 +837,9 @@ class Extension extends BaseParameterExtension<TestParameter> {
 	}
 }
 
+class DummyExtension implements Extension {
+}
+
 class BaseFieldExtension<T extends Annotation> implements BeforeAllCallback, BeforeEachCallback {
 
 	private final Class<T> annotationType;

From b8e44fac9d525303792bd20f864916fc836c4318 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 9 Aug 2021 18:03:26 +0200
Subject: [PATCH 0459/1433] Document support for @ExtendWith on parameters and
 fields

Issue: #864
---
 .../release-notes/release-notes-5.8.0-M2.adoc |  21 ++-
 .../docs/asciidoc/user-guide/extensions.adoc  | 135 +++++++++++++-----
 .../registration/KotlinWebServerDemo.kt       |   2 +-
 .../jupiter/api/extension/ExtendWith.java     |  35 ++++-
 .../api/extension/RegisterExtension.java      |   4 +-
 .../engine/descriptor/ExtensionUtils.java     |   6 +-
 6 files changed, 153 insertions(+), 50 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
index 972ec640c00e..4c9cbdd43cef 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
@@ -58,6 +58,9 @@ on GitHub.
 * Generating Java Flight Recorder events via module `org.junit.platform.jfr` is now also
   supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
   <<../user-guide/index.adoc#running-tests, Flight Recorder Support>> for details.
+* Suites executed by the `junit-platform-suite` module will now inherit the configuration
+  parameters from the parent discovery request. This behavior can be disabled via the
+  `@DisableParentConfigurationParameters` annotation.
 
 
 [[release-notes-5.8.0-M2-junit-jupiter]]
@@ -84,7 +87,11 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* `assertDoesNotThrow` now supports suspending functions when called from Kotlin.
+* New `assertThrowsExactly()` method in `Assertions` which is a more strict version of
+  `assertThrows()` that allows you to assert that the exception thrown is of the exact
+  type specified.
+* `assertDoesNotThrow()` in `Assertions` now supports suspending functions when called
+  from Kotlin.
 * `@TempDir` can now be used to create multiple temporary directories. Instead of creating
   a single temporary directory per context (i.e. test class or method) every declaration
   of the `@TempDir` annotation on a field or method parameter now results in a separate
@@ -93,13 +100,15 @@ on GitHub.
   you can set the `junit.jupiter.tempdir.scope` configuration parameter to `per_context`.
 * `@TempDir` cleanup resets readable and executable permissions of the root temporary
   directory and any contained directories instead of failing to delete them.
-* `@TempDir` fields may now be private.
+* `@TempDir` fields may now be `private`.
+* `@ExtendWith` may now be used to register extensions declaratively via fields or
+  parameters in test class constructors, test methods, and lifecycle methods. See
+  <<../user-guide/index.adoc#extensions-registration-declarative, Declarative Extension
+  Registration>> for details.
 * New `named()` static factory method in the `Named` interface that serves as an _alias_
   for `Named.of()`. `named()` is intended to be used via `import static`.
 * New `class` URI scheme for dynamic test sources. This allows tests to be located using
   the information available in a `StackTraceElement`.
-* New `assertThrowsExactly` method which is a more strict version of `assertThrows`
-  that allows you to assert that the thrown exception has the exact specified class.
 * New `autoCloseArguments` attribute in `@ParameterizedTest` to close `AutoCloseable`
   arguments at the end of the test. This attribute defaults to true.
 
@@ -117,6 +126,4 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* Suites executed by the `junit-platform-suite` module will now inherit the
-  configuration parameters from the parent discovery request. This behaviour can
-  be disabled via the `@DisableParentConfigurationParameters` annotation.
+* ❓
diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index a0addd083ed5..c2f1773be259 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -22,28 +22,31 @@ Java's <<extensions-registration-automatic,`ServiceLoader`>> mechanism.
 Developers can register one or more extensions _declaratively_ by annotating a test
 interface, test class, test method, or custom _<<writing-tests-meta-annotations,composed
 annotation>>_ with `@ExtendWith(...)` and supplying class references for the extensions to
-register. As of JUnit Jupiter 5.8, `@ExtendWith` may also be declared on fields and on
+register. As of JUnit Jupiter 5.8, `@ExtendWith` may also be declared on fields or on
 parameters in test class constructors, in test methods, and in `@BeforeAll`, `@AfterAll`,
 `@BeforeEach`, and `@AfterEach` lifecycle methods.
 
-For example, to register a custom `RandomParametersExtension` for a particular test
-method, you would annotate the test method as follows.
+For example, to register a `WebServerExtension` for a particular test method, you would
+annotate the test method as follows. We assume the `WebServerExtension` starts a local web
+server and injects the server's URL into parameters annotated with `@WebServerUrl`.
 
 [source,java,indent=0]
 ----
-@ExtendWith(RandomParametersExtension.class)
 @Test
-void test(@Random int i) {
-	// ...
+@ExtendWith(WebServerExtension.class)
+void getProductList(@WebServerUrl String serverUrl) {
+	WebClient webClient = new WebClient();
+	// Use WebClient to connect to web server using serverUrl and verify response
+	assertEquals(200, webClient.get(serverUrl + "/products").getResponseStatus());
 }
 ----
 
-To register a custom `RandomParametersExtension` for all tests in a particular class and
-its subclasses, you would annotate the test class as follows.
+To register the `WebServerExtension` for all tests in a particular class and its
+subclasses, you would annotate the test class as follows.
 
 [source,java,indent=0]
 ----
-@ExtendWith(RandomParametersExtension.class)
+@ExtendWith(WebServerExtension.class)
 class MyTests {
 	// ...
 }
@@ -73,15 +76,16 @@ class MySecondTests {
 [TIP]
 .Extension Registration Order
 ====
-Extensions registered declaratively via `@ExtendWith` will be executed in the order in
-which they are declared in the source code. For example, the execution of tests in both
-`MyFirstTests` and `MySecondTests` will be extended by the `DatabaseExtension` and
-`WebServerExtension`, **in exactly that order**.
+Extensions registered declaratively via `@ExtendWith` at the class level, method level, or
+parameter level will be executed in the order in which they are declared in the source
+code. For example, the execution of tests in both `MyFirstTests` and `MySecondTests` will
+be extended by the `DatabaseExtension` and `WebServerExtension`, **in exactly that order**.
 ====
 
 If you wish to combine multiple extensions in a reusable way, you can define a custom
 _<<writing-tests-meta-annotations,composed annotation>>_ and use `@ExtendWith` as a
-_meta-annotation_:
+_meta-annotation_ as in the following code listing. Then `@DatabaseAndWebServerExtension`
+can be used in place of `@ExtendWith({ DatabaseExtension.class, WebServerExtension.class })`.
 
 [source,java,indent=0]
 ----
@@ -92,6 +96,64 @@ public @interface DatabaseAndWebServerExtension {
 }
 ----
 
+The above examples demonstrate how `@ExtendWith` can be applied at the class level or at
+the method level; however, for certain use cases it makes sense for an extension to be
+registered declaratively at the field or parameter level. Consider a
+`RandomNumberExtension` that generates random numbers that can be injected into a field or
+via a parameter in a constructor, test method, or lifecycle method. If the extension
+provides a `@Random` annotation that is meta-annotated with
+`@ExtendWith(RandomNumberExtension.class)` (see listing below), the extension can be used
+transparently as in the following `RandomNumberTests` example.
+
+[source,java,indent=0]
+----
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(RandomNumberExtension.class)
+public @interface Random {
+}
+----
+
+[source,java,indent=0]
+----
+class RandomNumberTests {
+
+	// use random number field in test methods and @BeforeEach
+	// or @AfterEach lifecycle methods
+	@Random
+	private int randomNumber1;
+
+	RandomNumberTests(@Random int randomNumber2) {
+		// use random number in constructor
+	}
+
+	@BeforeEach
+	void beforeEach(@Random int randomNumber3) {
+		// use random number in @BeforeEach method
+	}
+
+	@Test
+	void test(@Random int randomNumber4) {
+		// use random number in test method
+	}
+}
+----
+
+[TIP]
+.Extension Registration Order for `@ExtendWith` on Fields
+====
+Extensions registered declaratively via `@ExtendWith` on fields will be ordered relative
+to `@RegisterExtension` fields and other `@ExtendWith` fields using an algorithm that is
+deterministic but intentionally nonobvious. However, `@ExtendWith` fields can be ordered
+using the `@Order` annotation. See the <<extensions-registration-programmatic-order,
+Extension Registration Order>> tip for `@RegisterExtension` fields for details.
+====
+
+NOTE: `@ExtendWith` fields may be either `static` or non-static. The documentation on
+<<extensions-registration-programmatic-static-fields, Static Fields>> and
+<<extensions-registration-programmatic-instance-fields, Instance Fields>> for
+`@RegisterExtension` fields also applies to `@ExtendWith` fields.
+
 [[extensions-registration-programmatic]]
 ==== Programmatic Extension Registration
 
@@ -108,23 +170,23 @@ extension's constructor, a static factory method, or a builder API.
 [TIP]
 .Extension Registration Order
 ====
-By default, extensions registered programmatically via `@RegisterExtension` will be
-ordered using an algorithm that is deterministic but intentionally nonobvious. This
-ensures that subsequent runs of a test suite execute extensions in the same order, thereby
-allowing for repeatable builds. However, there are times when extensions need to be
-registered in an explicit order. To achieve that, annotate `@RegisterExtension` fields
-with `{Order}`.
-
-Any `@RegisterExtension` field not annotated with `@Order` will be ordered using the
-_default_ order which has a value of `Integer.MAX_VALUE / 2`. This allows `@Order`
-annotated extension fields to be explicitly ordered before or after non-annotated
-extension fields. Extensions with an explicit order value less than the default order
-value will be registered before non-annotated extensions. Similarly, extensions with an
-explicit order value greater than the default order value will be registered after
-non-annotated extensions. For example, assigning an extension an explicit order value that
-is greater than the default order value allows _before_ callback extensions to be
-registered last and _after_ callback extensions to be registered first, relative to other
-programmatically registered extensions.
+By default, extensions registered programmatically via `@RegisterExtension` or
+declaratively via `@ExtendWith` on fields will be ordered using an algorithm that is
+deterministic but intentionally nonobvious. This ensures that subsequent runs of a test
+suite execute extensions in the same order, thereby allowing for repeatable builds.
+However, there are times when extensions need to be registered in an explicit order. To
+achieve that, annotate `@RegisterExtension` fields or `@ExtendWith` fields with `{Order}`.
+
+Any `@RegisterExtension` field or `@ExtendWith` field not annotated with `@Order` will be
+ordered using the _default_ order which has a value of `Integer.MAX_VALUE / 2`. This
+allows `@Order` annotated extension fields to be explicitly ordered before or after
+non-annotated extension fields. Extensions with an explicit order value less than the
+default order value will be registered before non-annotated extensions. Similarly,
+extensions with an explicit order value greater than the default order value will be
+registered after non-annotated extensions. For example, assigning an extension an explicit
+order value that is greater than the default order value allows _before_ callback
+extensions to be registered last and _after_ callback extensions to be registered first,
+relative to other programmatically registered extensions.
 ====
 
 NOTE: `@RegisterExtension` fields must not be `null` (at evaluation time) but may be
@@ -151,19 +213,18 @@ lifecycle methods annotated with `@BeforeAll` or `@AfterAll` as well as `@Before
 `server` field if necessary.
 
 [source,java,indent=0]
-.An extension registered via a static field
+.Registering an extension via a static field in Java
 ----
 include::{testDir}/example/registration/WebServerDemo.java[tags=user_guide]
 ----
 
 [[extensions-registration-programmatic-static-fields-kotlin]]
-===== Static Fields in Kotlin
+====== Static Fields in Kotlin
 
 The Kotlin programming language does not have the concept of a `static` field. However,
-the compiler can be instructed to generate static fields using annotations. Since, as
-stated earlier, `@RegisterExtension` fields must not be `null`, one **cannot** use the
-`@JvmStatic` annotation in Kotlin as it generates `private` fields. Rather, the
-`@JvmField` annotation must be used.
+the compiler can be instructed to generate a `private static` field using the `@JvmStatic`
+annotation in Kotlin. If you want the Kotlin compiler to generate a `public static` field,
+you can use the `@JvmField` annotation instead.
 
 The following example is a version of the `WebServerDemo` from the previous section that
 has been ported to Kotlin.
diff --git a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
index 84b0d2a70213..6448a2baedfd 100644
--- a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
+++ b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
@@ -17,7 +17,7 @@ import org.junit.jupiter.api.extension.RegisterExtension
 class KotlinWebServerDemo {
 
     companion object {
-        @JvmField
+        @JvmStatic
         @RegisterExtension
         val server = WebServerExtension.builder()
                 .enableSecurity(false)
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
index ed1d5764ef26..ced0f065fd1a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
@@ -25,13 +25,46 @@
 /**
  * {@code @ExtendWith} is a {@linkplain Repeatable repeatable} annotation
  * that is used to register {@linkplain Extension extensions} for the annotated
- * test class, test interface, test method, field, or parameter.
+ * test class, test interface, test method, parameter, or field.
  *
  * <p>Annotated parameters are supported in test class constructors, in test
  * methods, and in {@code @BeforeAll}, {@code @AfterAll}, {@code @BeforeEach},
  * and {@code @AfterEach} lifecycle methods.
  *
+ * <p>{@code @ExtendWith} fields may be either {@code static} or non-static.
+ *
+ * <h3>Inheritance</h3>
+ *
+ * <p>{@code @ExtendWith} fields are inherited from superclasses as long as they
+ * are not <em>hidden</em> or <em>overridden</em>. Furthermore, {@code @ExtendWith}
+ * fields from superclasses will be registered before {@code @ExtendWith} fields
+ * in subclasses.
+ *
+ * <h3>Registration Order</h3>
+ *
+ * <p>When {@code @ExtendWith} is present on a test class, test interface, or
+ * test method or on a parameter in a test method or lifecycle method, the
+ * corresponding extensions will be registered in the order in which the
+ * {@code @ExtendWith} annotations are discovered. For example, if a test class
+ * is annotated with {@code @ExtendWith(A.class)} and then with
+ * {@code @ExtendWith(B.class)}, extension {@code A} will be registered before
+ * extension {@code B}.
+ *
+ * <p>By default, if multiple extensions are registered on fields via
+ * {@code @ExtendWith}, they will be ordered using an algorithm that is
+ * deterministic but intentionally nonobvious. This ensures that subsequent runs
+ * of a test suite execute extensions in the same order, thereby allowing for
+ * repeatable builds. However, there are times when extensions need to be
+ * registered in an explicit order. To achieve that, you can annotate
+ * {@code @ExtendWith} fields with {@link org.junit.jupiter.api.Order @Order}.
+ * Any {@code @ExtendWith} field not annotated with {@code @Order} will be
+ * ordered using the {@link org.junit.jupiter.api.Order#DEFAULT default} order
+ * value. Note that {@code @RegisterExtension} fields can also be ordered with
+ * {@code @Order}, relative to {@code @ExtendWith} fields and other
+ * {@code @RegisterExtension} fields.
+ *
  * <h3>Supported Extension APIs</h3>
+ *
  * <ul>
  * <li>{@link ExecutionCondition}</li>
  * <li>{@link InvocationInterceptor}</li>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
index 55977b63b7c1..16837b7c77ee 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
@@ -81,7 +81,9 @@
  * {@code @RegisterExtension} fields with {@link org.junit.jupiter.api.Order @Order}.
  * Any {@code @RegisterExtension} field not annotated with {@code @Order} will be
  * ordered using the {@link org.junit.jupiter.api.Order#DEFAULT default} order
- * value.
+ * value. Note that {@code @ExtendWith} fields can also be ordered with
+ * {@code @Order}, relative to {@code @RegisterExtension} fields and other
+ * {@code @ExtendWith} fields.
  *
  * <h3>Example Usage</h3>
  *
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 9e73e91b6eba..ad6a8e4086c0 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -76,8 +76,8 @@ static MutableExtensionRegistry populateNewExtensionRegistryFromExtendWithAnnota
 
 	/**
 	 * Register extensions using the supplied registrar from fields in the supplied
-	 * class that are meta-annotated with {@link ExtendWith @ExtendWith} or
-	 * annotated with {@link RegisterExtension @RegisterExtension}.
+	 * class that are annotated with {@link ExtendWith @ExtendWith} or
+	 * {@link RegisterExtension @RegisterExtension}.
 	 *
 	 * <p>The extensions will be sorted according to {@link Order @Order} semantics
 	 * prior to registration.
@@ -141,7 +141,7 @@ static void registerExtensionsFromConstructorParameters(ExtensionRegistrar regis
 	/**
 	 * Register extensions using the supplied registrar from parameters in the
 	 * supplied {@link Executable} (i.e., a {@link java.lang.reflect.Constructor}
-	 * or {@link java.lang.reflect.Method}) that are meta-annotated with
+	 * or {@link java.lang.reflect.Method}) that are annotated with
 	 * {@link ExtendWith @ExtendWith}.
 	 *
 	 * @param registrar the registrar with which to register the extensions; never {@code null}

From ffebb548c8d977badd5ba0d533c39146972aa06b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 17 Aug 2021 11:15:14 +0200
Subject: [PATCH 0460/1433] Prepare release notes for 5.8 RC1

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +-
 ...0-M2.adoc => release-notes-5.8.0-RC1.adoc} | 34 +++++--------------
 2 files changed, 9 insertions(+), 27 deletions(-)
 rename documentation/src/docs/asciidoc/release-notes/{release-notes-5.8.0-M2.adoc => release-notes-5.8.0-RC1.adoc} (91%)

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 930b50d525af..8ea53bde1386 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,7 +16,7 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
-include::{basedir}/release-notes-5.8.0-M2.adoc[]
+include::{basedir}/release-notes-5.8.0-RC1.adoc[]
 
 include::{basedir}/release-notes-5.8.0-M1.adoc[]
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
similarity index 91%
rename from documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
rename to documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
index 4c9cbdd43cef..3fadee3de95d 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
@@ -1,16 +1,16 @@
-[[release-notes-5.8.0-M2]]
-== 5.8.0-M2
+[[release-notes-5.8.0-RC1]]
+== 5.8.0-RC1
 
 *Date of Release:* ❓
 
 *Scope:* ❓
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/55?closed=1+[5.8 M2] milestone page in the JUnit repository
+link:{junit5-repo}+/milestone/55?closed=1+[5.8 RC1] milestone page in the JUnit repository
 on GitHub.
 
 
-[[release-notes-5.8.0-M2-general-improvements]]
+[[release-notes-5.8.0-RC1-general-improvements]]
 === General improvements
 
 * The API Guardian dependency is now exported as a compile-only dependency for consuming
@@ -19,7 +19,7 @@ on GitHub.
   noise" on the console when Java's Util Logging is used in its default configuration.
 
 
-[[release-notes-5.8.0-M2-junit-platform]]
+[[release-notes-5.8.0-RC1-junit-platform]]
 === JUnit Platform
 
 ==== Bug Fixes
@@ -28,10 +28,6 @@ on GitHub.
   suite. This applies to `@Suite` classes running via the `SuiteTestEngine` and suite
   classes running via the `JUnitPlatform` `Runner`.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * New `findAnnotation(Class,Class,SearchOption)` method in `AnnotationSupport` that
@@ -63,7 +59,7 @@ on GitHub.
   `@DisableParentConfigurationParameters` annotation.
 
 
-[[release-notes-5.8.0-M2-junit-jupiter]]
+[[release-notes-5.8.0-RC1-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -81,10 +77,6 @@ on GitHub.
 * Exceptions thrown from instances of `CloseableResource` no longer hide test failures but
   are instead reported as suppressed exceptions.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * New `assertThrowsExactly()` method in `Assertions` which is a more strict version of
@@ -113,17 +105,7 @@ on GitHub.
   arguments at the end of the test. This attribute defaults to true.
 
 
-[[release-notes-5.8.0-M2-junit-vintage]]
+[[release-notes-5.8.0-RC1-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes

From 44e2a3c747d03f3e293ec9a984fb37d4747e7d0f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 17 Aug 2021 11:31:56 +0200
Subject: [PATCH 0461/1433] Prepare scope for release notes for 5.8 RC1

---
 .../asciidoc/release-notes/release-notes-5.8.0-RC1.adoc   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
index 3fadee3de95d..ebe1093d775e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
@@ -5,6 +5,14 @@
 
 *Scope:* ❓
 
+* Improvements to the `SuiteTestEngine`
+* New `UniqueIdTrackingListener`
+* Java Flight Recorder support on Java 8 Update 262 or higher
+* `@TempDir` can be used to create multiple temporary directories
+* Extension registration via `@ExtendWith` on fields and parameters
+* Auto-close support for arguments in `@ParameterizedTest` methods
+* Numerous bug fixes
+
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/55?closed=1+[5.8 RC1] milestone page in the JUnit repository
 on GitHub.

From c2783ac9d567ddff8b91a3799b5632181e43ac1e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 17 Aug 2021 19:19:33 +0200
Subject: [PATCH 0462/1433] Upgradle to 7.2

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9c4a49d3172f..a2e01c0dffec 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=12215a4146ab05309893c24fb7d0c32366ab6b548e2de84185d781ec639a6283
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-3-bin.zip
+distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From f79262d889c03a0adb66055489001cab0054af9d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 17 Aug 2021 19:32:15 +0200
Subject: [PATCH 0463/1433] Release 5.8.0-RC1

---
 README.md                                                   | 2 +-
 .../asciidoc/release-notes/release-notes-5.8.0-RC1.adoc     | 4 ++--
 gradle.properties                                           | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 17219faed989..cf9364b3aa8f 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 ## Latest Releases
 
 - General Availability (GA): [JUnit 5.7.2](https://github.com/junit-team/junit5/releases/tag/r5.7.2) (May 15, 2021)
-- Preview (Milestone/Release Candidate): [JUnit 5.8.0-M1](https://github.com/junit-team/junit5/releases/tag/r5.8.0-M1) (February 11, 2021)
+- Preview (Milestone/Release Candidate): [JUnit 5.8.0-RC1](https://github.com/junit-team/junit5/releases/tag/r5.8.0-RC1) (August 17, 2021)
 
 ## Documentation
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
index ebe1093d775e..c3622e9dd349 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
@@ -1,9 +1,9 @@
 [[release-notes-5.8.0-RC1]]
 == 5.8.0-RC1
 
-*Date of Release:* ❓
+*Date of Release:* August 17, 2021
 
-*Scope:* ❓
+*Scope:*
 
 * Improvements to the `SuiteTestEngine`
 * New `UniqueIdTrackingListener`
diff --git a/gradle.properties b/gradle.properties
index b9157a3889a9..52f01499d5de 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.8.0-SNAPSHOT
+version         = 5.8.0-RC1
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.8.0-SNAPSHOT
+platformVersion = 1.8.0-RC1
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.8.0-SNAPSHOT
+vintageVersion  = 5.8.0-RC1
 
 defaultBuiltBy  = JUnit Team
 

From 7c38e75f12ae8a9872a21d1aea893f5ea9dc27dc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 17 Aug 2021 19:59:26 +0200
Subject: [PATCH 0464/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 52f01499d5de..b9157a3889a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.8.0-RC1
+version         = 5.8.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.8.0-RC1
+platformVersion = 1.8.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.8.0-RC1
+vintageVersion  = 5.8.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From cd0469e4ef3c18dca1f359ca25ddcee8337a20fe Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 18 Aug 2021 08:52:04 +0200
Subject: [PATCH 0465/1433] Declare UniqueIdTrackingListener in module
 descriptor

---
 .../src/module/org.junit.platform.launcher/module-info.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
index b7484c8df876..c282e53ff809 100644
--- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
+++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
@@ -35,4 +35,7 @@
 	uses org.junit.platform.launcher.LauncherSessionListener;
 	uses org.junit.platform.launcher.PostDiscoveryFilter;
 	uses org.junit.platform.launcher.TestExecutionListener;
+
+	provides org.junit.platform.launcher.TestExecutionListener
+			with org.junit.platform.launcher.listeners.UniqueIdTrackingListener;
 }

From 45d986b6678845ec599ea2cdd5f15c3fabd71456 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 18 Aug 2021 14:40:30 +0200
Subject: [PATCH 0466/1433] Fix JarDescribeModuleTests

---
 .../jar-describe-module/junit-platform-launcher.expected.txt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
index d643d8067969..d0f71d1b6631 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
@@ -13,3 +13,4 @@ uses org.junit.platform.launcher.LauncherDiscoveryListener
 uses org.junit.platform.launcher.LauncherSessionListener
 uses org.junit.platform.launcher.PostDiscoveryFilter
 uses org.junit.platform.launcher.TestExecutionListener
+provides org.junit.platform.launcher.TestExecutionListener with org.junit.platform.launcher.listeners.UniqueIdTrackingListener

From f43e82e06f6620f1a62d48a4dd466732257d8e9e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 18 Aug 2021 15:28:30 +0200
Subject: [PATCH 0467/1433] Create 5.8 GA release notes from template

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.8.0.adoc    | 66 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 8ea53bde1386..64d079e984a0 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.8.0.adoc[]
+
 include::{basedir}/release-notes-5.8.0-RC1.adoc[]
 
 include::{basedir}/release-notes-5.8.0-M1.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
new file mode 100644
index 000000000000..f1f2d78b6ee1
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -0,0 +1,66 @@
+[[release-notes-5.8.0]]
+== 5.8.0
+
+*Date of Release:* September ❓, 2021
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/51?closed=1+[5.8 M1],
+link:{junit5-repo}+/milestone/55?closed=1+[5.8 RC1], and
+link:{junit5-repo}+/milestone/57?closed=1+[5.8 GA] milestone pages in the JUnit repository
+on GitHub.
+
+
+[[release-notes-5.8.0-overall-improvements]]
+=== Overall Improvements
+
+* ❓
+
+
+[[release-notes-5.8.0-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.8.0-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.8.0-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From de8a415e729f3beb59b777e1341ddbbe12540a5c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 18 Aug 2021 15:43:58 +0200
Subject: [PATCH 0468/1433] Add suppressed exceptions when creating
 MultipleFailuresError in Vintage

Prior to this commit, if a JUnit 4 based test threw an
org.junit.runners.model.MultipleFailureException that contained
multiple failures, the TestRun class in the VintageTestEngine created
an org.opentest4j.MultipleFailuresError that contained the multiple
exceptions as "failures", but it did not contain those exceptions as
suppressed exceptions. Consequently, the stack traces for those
exceptions were lost, making it harder for users to deduce the cause of
the test failure.

This commit fixes this by adding all exceptions as suppressed
exceptions when creating a MultipleFailuresError.

Fixes #2693
---
 .../docs/asciidoc/release-notes/release-notes-5.8.0.adoc  | 7 ++++++-
 .../java/org/junit/vintage/engine/execution/TestRun.java  | 4 +++-
 .../vintage/engine/VintageTestEngineExecutionTests.java   | 8 ++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index f1f2d78b6ee1..07978c3772c1 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -55,7 +55,12 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* If multiple exceptions are registered as failures for a JUnit 4 based test -- for
+  example, if the `ErrorCollector` rule throws an
+  `org.junit.runners.model.MultipleFailureException` -- all of those failures are now
+  added as _suppressed exceptions_ in the `org.opentest4j.MultipleFailuresError` created
+  by the `VintageTestEngine`. This allows users to analyze the stack trace of each failure
+  when such a test fails.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
index 6ec2a8736755..319a372d4b33 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
@@ -193,7 +193,9 @@ TestExecutionResult getStoredResultOrSuccessful(TestDescriptor testDescriptor) {
 				.map(Optional::get)
 				.collect(toList());
 		// @formatter:on
-		return failed(new MultipleFailuresError("", failures));
+		MultipleFailuresError multipleFailuresError = new MultipleFailuresError("", failures);
+		failures.forEach(multipleFailuresError::addSuppressed);
+		return failed(multipleFailuresError);
 	}
 
 	private static class VintageDescriptors {
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
index e32766a31a97..b2da79d14b9d 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
@@ -632,9 +632,13 @@ void executesJUnit4TestCaseWithErrorCollectorStoringMultipleFailures() {
 			event(container(testClass), started()), //
 			event(test("example"), started()), //
 			event(test("example"), //
-				finishedWithFailure(instanceOf(MultipleFailuresError.class), //
+				finishedWithFailure(//
+					instanceOf(MultipleFailuresError.class), //
 					new Condition<>(throwable -> ((MultipleFailuresError) throwable).getFailures().size() == 3,
-						"Must contain multiple errors (3)"))), //
+						"MultipleFailuresError must contain 3 failures"), //
+					new Condition<>(throwable -> ((MultipleFailuresError) throwable).getSuppressed().length == 3,
+						"MultipleFailuresError must contain 3 suppressed exceptions")//
+				)), //
 			event(container(testClass), finishedSuccessfully()), //
 			event(engine(), finishedSuccessfully()));
 	}

From a790a57bec21746de1e9bec1f9cba154054f3955 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 18 Aug 2021 15:54:38 +0200
Subject: [PATCH 0469/1433] Add scope to 5.8 GA release notes

---
 .../asciidoc/release-notes/release-notes-5.8.0.adoc  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index 07978c3772c1..d8168f5de9b9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -5,6 +5,18 @@
 
 *Scope:* ❓
 
+* Declarative test suites via `@Suite` classes
+* `LauncherSession` and accompanying listener
+* New `UniqueIdTrackingListener`
+* More fine-grained Java Flight Recorder events
+* Java Flight Recorder support on Java 8 Update 262 or higher
+* Test class ordering
+* `@TempDir` can be used to create multiple temporary directories
+* Extension registration via `@ExtendWith` on fields and parameters
+* Auto-close support for arguments in `@ParameterizedTest` methods
+* Memory and performance optimizations
+* Numerous bug fixes and minor improvements
+
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/51?closed=1+[5.8 M1],
 link:{junit5-repo}+/milestone/55?closed=1+[5.8 RC1], and

From 65ed18c7ddbee3c948f907921b54ddb1929914f5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 18 Aug 2021 16:32:10 +0200
Subject: [PATCH 0470/1433] Prune Release Notes for 5.8 GA

Closes #2694
---
 .../docs/asciidoc/release-notes/index.adoc    |   4 -
 .../release-notes/release-notes-5.8.0-M1.adoc | 101 --------------
 .../release-notes-5.8.0-RC1.adoc              | 119 ----------------
 .../release-notes/release-notes-5.8.0.adoc    | 132 ++++++++++++++++--
 4 files changed, 120 insertions(+), 236 deletions(-)
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 64d079e984a0..e6596b595929 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -18,10 +18,6 @@ include::{includedir}/link-attributes.adoc[]
 
 include::{basedir}/release-notes-5.8.0.adoc[]
 
-include::{basedir}/release-notes-5.8.0-RC1.adoc[]
-
-include::{basedir}/release-notes-5.8.0-M1.adoc[]
-
 include::{basedir}/release-notes-5.7.2.adoc[]
 
 include::{basedir}/release-notes-5.7.1.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
deleted file mode 100644
index 912bb36b1b95..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ /dev/null
@@ -1,101 +0,0 @@
-[[release-notes-5.8.0-M1]]
-== 5.8.0-M1
-
-*Date of Release:* February 11, 2021
-
-*Scope:*
-
-* Declarative test suites
-* Test class ordering
-* `LauncherSession` and accompanying listener
-* More fine-grained JFR events
-* Memory and performance optimizations
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/51?closed=1+[5.8 M1] milestone page in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.8.0-M1-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* `SummaryGeneratingListener` is now thread-safe and can handle concurrently failing tests.
-
-==== Deprecations and Breaking Changes
-
-* For consistency with the rest of the JUnit Platform, the experimental
-  `LauncherDiscoveryListener` is now an interface instead of an abstract class.
-
-==== New Features and Improvements
-
-* New `test(Condition<Event>)` and `nestedContainer(Class<?>, Condition<Event>)` methods
-  in `EventConditions` that allow you to provide conditions for matching against test and
-  nested container events when using the `EngineTestKit`. For example,
-  `test(displayName("my test"))` can be used to match against a test whose display name is
-  `my test`.
-* The `junit-platform-jfr` module now reports execution events for containers -- for
-  example, test classes.
-* The `junit-platform-jfr` module now reports test discovery events for the launcher and
-  registered test engines.
-* Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
-  `{ServiceLoader}` mechanism.
-* Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
-* Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
-  longer store `String` representations of unique IDs.
-* Tools that make multiple calls to the `Launcher` API should now create a
-  `LauncherSession` in order to allow for executing global setup and teardown code exactly
-  once via the new `LauncherSessionListener` interface that can be registered via Java’s
-  `{ServiceLoader}` mechanism.
-* New `junit-platform-suite-engine` to execute declarative test suites using the JUnit
-  Platform Launcher.
-* Additional selectors in the suite API in the `junit-platform-suite-api` module.
-
-
-[[release-notes-5.8.0-M1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Deprecations and Breaking Changes
-
-* `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, ExtensionContext)` has
-  been deprecated in favor of
-  `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, DynamicTestInvocationContext, ExtensionContext)`
-  that provides access to the dynamic test executable via
-  `DynamicTestInvocationContext.getExecutable()`.
-
-==== New Features and Improvements
-
-* Top-level test classes can now be ordered by passing the fully-qualified name of a class
-  implementing `ClassOrderer` as the value of the new
-  `junit.jupiter.testclass.order.default` configuration parameter.
-* New `assertInstanceOf()` methods which produce better error messages comparable to those
-  produced by `assertThrows`. These new methods serve as a replacement for
-  `assertTrue(obj instanceof X)`.
-* `assertNull()` failure messages now include the actual object's type if the `toString()`
-  implementation for the actual object returns `null` or `"null"`. This avoids the
-  generation of confusing failure messages such as `expected <null> but was <null>`.
-* Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
-  underscores as in some JVM languages, to improve readability of long numbers like
-  `700_000_000`.
-* CSV rows provided via `@CsvSource` may now start with a number sign (`#`).
-* New `ignoreLeadingAndTrailingWhitespace` attributes in `@CsvSource` and `@CsvFileSource`
-  (set to `true` by default) to control whether or not to trim whitespace.
-* Dynamic tests now require less memory thanks to a number of improvements to internal
-  data structures.
-* Documented constant values in `org.junit.jupiter.api.parallel.Resources`.
-* In parameterized tests with `@MethodSource` or `@ArgumentSource`, arguments can now have
-  optional names (supplied via the new `Named` API). When the argument is included in the
-  display name of an iteration, this name will be used instead of the value.
-* `DynamicTests.stream()` can now consume `Named` input and will use each name-value pair
-  as the display name and value for each generated dynamic test (see
-  <<../user-guide/index.adoc#writing-tests-dynamic-tests-examples,User Guide>> for details).
-
-
-[[release-notes-5.8.0-M1-junit-vintage]]
-=== JUnit Vintage
-
-==== New Features and Improvements
-
-* The JUnit Vintage engine now requires less memory and allows for earlier garbage
-  collection thanks to a number of improvements to internal data structures.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
deleted file mode 100644
index c3622e9dd349..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-RC1.adoc
+++ /dev/null
@@ -1,119 +0,0 @@
-[[release-notes-5.8.0-RC1]]
-== 5.8.0-RC1
-
-*Date of Release:* August 17, 2021
-
-*Scope:*
-
-* Improvements to the `SuiteTestEngine`
-* New `UniqueIdTrackingListener`
-* Java Flight Recorder support on Java 8 Update 262 or higher
-* `@TempDir` can be used to create multiple temporary directories
-* Extension registration via `@ExtendWith` on fields and parameters
-* Auto-close support for arguments in `@ParameterizedTest` methods
-* Numerous bug fixes
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/55?closed=1+[5.8 RC1] milestone page in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.8.0-RC1-general-improvements]]
-=== General improvements
-
-* The API Guardian dependency is now exported as a compile-only dependency for consuming
-  Gradle projects.
-* Logging messages are no longer issued at `INFO` level in order to lower the "textual
-  noise" on the console when Java's Util Logging is used in its default configuration.
-
-
-[[release-notes-5.8.0-RC1-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* Classes explicitly selected via `@SelectClasses` are now always included in the test
-  suite. This applies to `@Suite` classes running via the `SuiteTestEngine` and suite
-  classes running via the `JUnitPlatform` `Runner`.
-
-==== New Features and Improvements
-
-* New `findAnnotation(Class,Class,SearchOption)` method in `AnnotationSupport` that
-  performs the same search algorithm as `findAnnotation(AnnotatedElement,Class)` but also
-  searches the enclosing class hierarchy for inner classes if the
-  `INCLUDE_ENCLOSING_CLASSES` `SearchOption` is specified. This new method can be used by
-  extension authors to find annotations on enclosing classes for JUnit Jupiter `@Nested`
-  test classes.
-* New `ClassSource.from(URI)` static factory method for creating a `ClassSource` from a
-  URI using the `class` scheme and optional query parameters specifying the line number
-  and column number. This is analogous to the existing `ClasspathResourceSource.from(URI)`
-  factory method.
-* New `getConfigurationParameters()` method in the `TestPlan` which allows a
-  `TestExecutionListener` to access
-  <<../user-guide/index.adoc#running-tests-config-params, configuration parameters>>. See
-  <<../user-guide/index.adoc#launcher-api-listeners-config, Configuring an Execution
-  Listener>> for details.
-* New `UniqueIdTrackingListener` which is a `TestExecutionListener` that tracks the unique
-  IDs of all tests that were skipped or executed during the `TestPlan` and generates a
-  file containing the unique IDs. The generated file can be used to rerun those tests --
-  for example, in order to run the same set of tests executed on the JVM subsequently
-  within a GraalVM native image. See the Javadoc for `{UniqueIdTrackingListener}` for
-  details.
-* Generating Java Flight Recorder events via module `org.junit.platform.jfr` is now also
-  supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
-  <<../user-guide/index.adoc#running-tests, Flight Recorder Support>> for details.
-* Suites executed by the `junit-platform-suite` module will now inherit the configuration
-  parameters from the parent discovery request. This behavior can be disabled via the
-  `@DisableParentConfigurationParameters` annotation.
-
-
-[[release-notes-5.8.0-RC1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* `@DisplayNameGeneration` and `@IndicativeSentencesGeneration` are now only inherited
-  from enclosing classes if the current class is a `@Nested` test class.
-* The `IndicativeSentences` `DisplayNameGenerator` no longer includes the display name of
-  the enclosing class when generating an _indicative sentence_ if the enclosing class is
-  not configured to use the `IndicativeSentences` display name generator as well.
-* The `TypedArgumentConverter` base class now supports the conversion of a `null` source
-  value in parameterized tests.
-* The `TypedArgumentConverter` base class now supports conversion to a primitive type if
-  the configured target type is a wrapper for the target primitive type, including
-  primitive widening support -- for example, from `Integer` to `int` or `long`.
-* Exceptions thrown from instances of `CloseableResource` no longer hide test failures but
-  are instead reported as suppressed exceptions.
-
-==== New Features and Improvements
-
-* New `assertThrowsExactly()` method in `Assertions` which is a more strict version of
-  `assertThrows()` that allows you to assert that the exception thrown is of the exact
-  type specified.
-* `assertDoesNotThrow()` in `Assertions` now supports suspending functions when called
-  from Kotlin.
-* `@TempDir` can now be used to create multiple temporary directories. Instead of creating
-  a single temporary directory per context (i.e. test class or method) every declaration
-  of the `@TempDir` annotation on a field or method parameter now results in a separate
-  temporary directory. To revert to the old behavior of using a single temporary directory
-  for the entire test class or method (depending on which level the annotation is used),
-  you can set the `junit.jupiter.tempdir.scope` configuration parameter to `per_context`.
-* `@TempDir` cleanup resets readable and executable permissions of the root temporary
-  directory and any contained directories instead of failing to delete them.
-* `@TempDir` fields may now be `private`.
-* `@ExtendWith` may now be used to register extensions declaratively via fields or
-  parameters in test class constructors, test methods, and lifecycle methods. See
-  <<../user-guide/index.adoc#extensions-registration-declarative, Declarative Extension
-  Registration>> for details.
-* New `named()` static factory method in the `Named` interface that serves as an _alias_
-  for `Named.of()`. `named()` is intended to be used via `import static`.
-* New `class` URI scheme for dynamic test sources. This allows tests to be located using
-  the information available in a `StackTraceElement`.
-* New `autoCloseArguments` attribute in `@ParameterizedTest` to close `AutoCloseable`
-  arguments at the end of the test. This attribute defaults to true.
-
-
-[[release-notes-5.8.0-RC1-junit-vintage]]
-=== JUnit Vintage
-
-No changes
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index d8168f5de9b9..afef7c9b2895 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -27,7 +27,10 @@ on GitHub.
 [[release-notes-5.8.0-overall-improvements]]
 === Overall Improvements
 
-* ❓
+* The API Guardian dependency is now exported as a compile-only dependency for consuming
+  Gradle projects.
+* Logging messages are no longer issued at `INFO` level in order to lower the "textual
+  noise" on the console when Java's Util Logging is used in its default configuration.
 
 
 [[release-notes-5.8.0-junit-platform]]
@@ -35,15 +38,63 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Classes explicitly selected via `@SelectClasses` are now always included in the test
+  suite. This applies to `@Suite` classes running via the `SuiteTestEngine` and suite
+  classes running via the `JUnitPlatform` `Runner`.
+* `SummaryGeneratingListener` is now thread-safe and can handle concurrently failing tests.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* For consistency with the rest of the JUnit Platform, the experimental
+  `LauncherDiscoveryListener` is now an interface instead of an abstract class.
 
 ==== New Features and Improvements
 
-* ❓
+* New `junit-platform-suite-engine` module to execute declarative test suites on the JUnit
+  Platform.
+* Additional selectors in the suite API in the `junit-platform-suite-api` module.
+* New `UniqueIdTrackingListener` which is a `TestExecutionListener` that tracks the unique
+  IDs of all tests that were skipped or executed during the `TestPlan` and generates a
+  file containing the unique IDs. The generated file can be used to rerun those tests --
+  for example, in order to run the same set of tests executed on the JVM subsequently
+  within a GraalVM native image. See the Javadoc for `{UniqueIdTrackingListener}` for
+  details.
+* New `findAnnotation(Class,Class,SearchOption)` method in `AnnotationSupport` that
+  performs the same search algorithm as `findAnnotation(AnnotatedElement,Class)` but also
+  searches the enclosing class hierarchy for inner classes if the
+  `INCLUDE_ENCLOSING_CLASSES` `SearchOption` is specified. This new method can be used by
+  extension authors to find annotations on enclosing classes for JUnit Jupiter `@Nested`
+  test classes.
+* New `test(Condition<Event>)` and `nestedContainer(Class<?>, Condition<Event>)` methods
+  in `EventConditions` that allow you to provide conditions for matching against test and
+  nested container events when using the `EngineTestKit`. For example,
+  `test(displayName("my test"))` can be used to match against a test whose display name is
+  `my test`.
+* Generating Java Flight Recorder events via the `junit-platform-jfr` module is now also
+  supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
+  <<../user-guide/index.adoc#running-tests, Flight Recorder Support>> for details.
+* The `junit-platform-jfr` module now reports execution events for containers -- for
+  example, test classes.
+* The `junit-platform-jfr` module now reports test discovery events for the launcher and
+  registered test engines.
+* New `ClassSource.from(URI)` static factory method for creating a `ClassSource` from a
+  URI using the `class` scheme and optional query parameters specifying the line number
+  and column number. This is analogous to the existing `ClasspathResourceSource.from(URI)`
+  factory method.
+* New `getConfigurationParameters()` method in the `TestPlan` which allows a
+  `TestExecutionListener` to access
+  <<../user-guide/index.adoc#running-tests-config-params, configuration parameters>>. See
+  <<../user-guide/index.adoc#launcher-api-listeners-config, Configuring an Execution
+  Listener>> for details.
+* Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
+  `{ServiceLoader}` mechanism.
+* Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
+* Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
+  longer store `String` representations of unique IDs.
+* Tools that make multiple calls to the `Launcher` API should now create a
+  `LauncherSession` in order to allow for executing global setup and teardown code exactly
+  once via the new `LauncherSessionListener` interface that can be registered via Java’s
+  `{ServiceLoader}` mechanism.
 
 
 [[release-notes-5.8.0-junit-jupiter]]
@@ -51,15 +102,75 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* `@DisplayNameGeneration` and `@IndicativeSentencesGeneration` are now only inherited
+  from enclosing classes if the current class is a `@Nested` test class.
+* The `IndicativeSentences` `DisplayNameGenerator` no longer includes the display name of
+  the enclosing class when generating an _indicative sentence_ if the enclosing class is
+  not configured to use the `IndicativeSentences` display name generator as well.
+* The `TypedArgumentConverter` base class now supports the conversion of a `null` source
+  value in parameterized tests.
+* The `TypedArgumentConverter` base class now supports conversion to a primitive type if
+  the configured target type is a wrapper for the target primitive type, including
+  primitive widening support -- for example, from `Integer` to `int` or `long`.
+* Exceptions thrown from instances of `CloseableResource` no longer hide test failures but
+  are instead reported as suppressed exceptions.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, ExtensionContext)` has
+  been deprecated in favor of
+  `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, DynamicTestInvocationContext, ExtensionContext)`
+  that provides access to the dynamic test executable via
+  `DynamicTestInvocationContext.getExecutable()`.
 
 ==== New Features and Improvements
 
-* ❓
+* Top-level test classes can now be ordered by passing the fully-qualified name of a class
+  implementing `ClassOrderer` as the value of the new
+  `junit.jupiter.testclass.order.default` configuration parameter.
+* `@ExtendWith` may now be used to register extensions declaratively via fields or
+  parameters in test class constructors, test methods, and lifecycle methods. See
+  <<../user-guide/index.adoc#extensions-registration-declarative, Declarative Extension
+  Registration>> for details.
+* New `assertThrowsExactly()` method in `Assertions` which is a more strict version of
+  `assertThrows()` that allows you to assert that the exception thrown is of the exact
+  type specified.
+* `assertDoesNotThrow()` in `Assertions` now supports suspending functions when called
+  from Kotlin.
+* New `assertInstanceOf()` methods which produce better error messages comparable to those
+  produced by `assertThrows`. These new methods serve as a replacement for
+  `assertTrue(obj instanceof X)`.
+* `assertNull()` failure messages now include the actual object's type if the `toString()`
+  implementation for the actual object returns `null` or `"null"`. This avoids the
+  generation of confusing failure messages such as `expected <null> but was <null>`.
+* `@TempDir` can now be used to create multiple temporary directories. Instead of creating
+  a single temporary directory per context (i.e. test class or method) every declaration
+  of the `@TempDir` annotation on a field or method parameter now results in a separate
+  temporary directory. To revert to the old behavior of using a single temporary directory
+  for the entire test class or method (depending on which level the annotation is used),
+  you can set the `junit.jupiter.tempdir.scope` configuration parameter to `per_context`.
+* `@TempDir` cleanup resets readable and executable permissions of the root temporary
+  directory and any contained directories instead of failing to delete them.
+* `@TempDir` fields may now be `private`.
+* `DynamicTests.stream()` can now consume `Named` input and will use each name-value pair
+  as the display name and value for each generated dynamic test (see
+  <<../user-guide/index.adoc#writing-tests-dynamic-tests-examples,User Guide>> for details).
+* New `class` URI scheme for dynamic test sources. This allows tests to be located using
+  the information available in a `StackTraceElement`.
+* Dynamic tests now require less memory thanks to a number of improvements to internal
+  data structures.
+* New `autoCloseArguments` attribute in `@ParameterizedTest` to close `AutoCloseable`
+  arguments at the end of the test. This attribute defaults to true.
+* Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
+  underscores as in some JVM languages, to improve readability of long numbers like
+  `700_000_000`.
+* CSV rows provided via `@CsvSource` may now start with a number sign (`#`).
+* New `ignoreLeadingAndTrailingWhitespace` attributes in `@CsvSource` and `@CsvFileSource`
+  (set to `true` by default) to control whether or not to trim whitespace.
+* In parameterized tests using `@MethodSource` or `@ArgumentSource`, arguments can now have
+  optional names (supplied via the new `Named` API). When the argument is included in the
+  display name of an invocation, this name will be used instead of the value.
+* Documented constant values in `org.junit.jupiter.api.parallel.Resources`.
 
 
 [[release-notes-5.8.0-junit-vintage]]
@@ -74,10 +185,7 @@ on GitHub.
   by the `VintageTestEngine`. This allows users to analyze the stack trace of each failure
   when such a test fails.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
-* ❓
+* The JUnit Vintage engine now requires less memory and allows for earlier garbage
+  collection thanks to a number of improvements to internal data structures.

From 53393765da848c1719f31379d01332194bcffd32 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 18 Aug 2021 16:35:10 +0200
Subject: [PATCH 0471/1433] Document #2688 in 5.8 GA release notes

---
 .../src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index afef7c9b2895..b4d8b85f1513 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -132,6 +132,7 @@ on GitHub.
   parameters in test class constructors, test methods, and lifecycle methods. See
   <<../user-guide/index.adoc#extensions-registration-declarative, Declarative Extension
   Registration>> for details.
+* `@RegisterExtension` fields may now be `private`.
 * New `assertThrowsExactly()` method in `Assertions` which is a more strict version of
   `assertThrows()` that allows you to assert that the exception thrown is of the exact
   type specified.

From 27b9841d5b5a64ec6aabd670d495e233f7d93f2e Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Thu, 19 Aug 2021 08:22:53 +0200
Subject: [PATCH 0472/1433] Declare a compile-only dependence on module
 `org.apiguardian.api`

---
 .../src/module/org.junit.jupiter.api/module-info.java           | 2 +-
 .../src/module/org.junit.jupiter.engine/module-info.java        | 2 +-
 .../module/org.junit.jupiter.migrationsupport/module-info.java  | 2 +-
 .../src/module/org.junit.jupiter.params/module-info.java        | 2 +-
 .../src/module/org.junit.platform.commons/module-info.java      | 2 +-
 .../src/module/org.junit.platform.console/module-info.java      | 2 +-
 .../src/module/org.junit.platform.engine/module-info.java       | 2 +-
 .../src/module/org.junit.platform.jfr/module-info.java          | 2 +-
 .../src/module/org.junit.platform.launcher/module-info.java     | 2 +-
 .../src/module/org.junit.platform.reporting/module-info.java    | 2 +-
 .../src/module/org.junit.platform.runner/module-info.java       | 2 +-
 .../src/module/org.junit.platform.suite.api/module-info.java    | 2 +-
 .../module/org.junit.platform.suite.commons/module-info.java    | 2 +-
 .../src/module/org.junit.platform.suite.engine/module-info.java | 2 +-
 .../src/module/org.junit.platform.testkit/module-info.java      | 2 +-
 .../src/module/org.junit.vintage.engine/module-info.java        | 2 +-
 .../projects/jar-describe-module/junit-jupiter-api.expected.txt | 2 +-
 .../jar-describe-module/junit-jupiter-engine.expected.txt       | 2 +-
 .../junit-jupiter-migrationsupport.expected.txt                 | 2 +-
 .../jar-describe-module/junit-jupiter-params.expected.txt       | 2 +-
 .../jar-describe-module/junit-platform-commons.expected.txt     | 2 +-
 .../jar-describe-module/junit-platform-console.expected.txt     | 2 +-
 .../jar-describe-module/junit-platform-engine.expected.txt      | 2 +-
 .../jar-describe-module/junit-platform-jfr.expected.txt         | 2 +-
 .../jar-describe-module/junit-platform-launcher.expected.txt    | 2 +-
 .../jar-describe-module/junit-platform-reporting.expected.txt   | 2 +-
 .../jar-describe-module/junit-platform-runner.expected.txt      | 2 +-
 .../jar-describe-module/junit-platform-suite-api.expected.txt   | 2 +-
 .../junit-platform-suite-commons.expected.txt                   | 2 +-
 .../junit-platform-suite-engine.expected.txt                    | 2 +-
 .../jar-describe-module/junit-platform-testkit.expected.txt     | 2 +-
 .../jar-describe-module/junit-vintage-engine.expected.txt       | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
index ad1578b8243a..b6856c78a11e 100644
--- a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
+++ b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
@@ -12,7 +12,7 @@
  * Defines JUnit Jupiter API for writing tests.
  */
 module org.junit.jupiter.api {
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires transitive org.junit.platform.commons;
 	requires transitive org.opentest4j;
 
diff --git a/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java b/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
index 69b7097993bf..51b22b50ce05 100644
--- a/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
+++ b/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
@@ -17,7 +17,7 @@
  * @provides org.junit.platform.engine.TestEngine
  */
 module org.junit.jupiter.engine {
-	requires org.apiguardian.api;
+	requires static org.apiguardian.api;
 	requires org.junit.jupiter.api;
 	requires org.junit.platform.commons;
 	requires org.junit.platform.engine;
diff --git a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
index c33255747653..3ace009eb0ab 100644
--- a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
+++ b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
@@ -15,7 +15,7 @@
  */
 module org.junit.jupiter.migrationsupport {
 	requires transitive junit; // 4
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires transitive org.junit.jupiter.api;
 	requires org.junit.platform.commons;
 
diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
index c690245aab51..7f3ea0550c58 100644
--- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
+++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
@@ -14,7 +14,7 @@
  * @since 5.0
  */
 module org.junit.jupiter.params {
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires transitive org.junit.jupiter.api;
 	requires transitive org.junit.platform.commons;
 
diff --git a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
index c1bcc1b22550..f33ffd314feb 100644
--- a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
+++ b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
@@ -16,7 +16,7 @@
 module org.junit.platform.commons {
 	requires java.logging;
 	requires java.management; // needed by RuntimeUtils to determine input arguments
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 
 	exports org.junit.platform.commons;
 	exports org.junit.platform.commons.annotation;
diff --git a/junit-platform-console/src/module/org.junit.platform.console/module-info.java b/junit-platform-console/src/module/org.junit.platform.console/module-info.java
index eddd184b22c3..08d28b434f50 100644
--- a/junit-platform-console/src/module/org.junit.platform.console/module-info.java
+++ b/junit-platform-console/src/module/org.junit.platform.console/module-info.java
@@ -15,7 +15,7 @@
  * @provides java.util.spi.ToolProvider
  */
 module org.junit.platform.console {
-	requires org.apiguardian.api;
+	requires static org.apiguardian.api;
 	requires org.junit.platform.commons;
 	requires org.junit.platform.engine;
 	requires org.junit.platform.launcher;
diff --git a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
index 2f3f4528c0d0..0b6336c6becf 100644
--- a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
+++ b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
@@ -17,7 +17,7 @@
  * @since 1.0
  */
 module org.junit.platform.engine {
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires transitive org.junit.platform.commons;
 	requires transitive org.opentest4j;
 
diff --git a/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java b/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
index f79379168925..61aad3ec42a6 100644
--- a/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
+++ b/junit-platform-jfr/src/module/org.junit.platform.jfr/module-info.java
@@ -21,7 +21,7 @@
  */
 module org.junit.platform.jfr {
 	requires jdk.jfr;
-	requires org.apiguardian.api;
+	requires static org.apiguardian.api;
 	requires org.junit.platform.engine;
 	requires org.junit.platform.launcher;
 
diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
index c282e53ff809..9501caff5a6a 100644
--- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
+++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
@@ -21,7 +21,7 @@
  */
 module org.junit.platform.launcher {
 	requires transitive java.logging;
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires transitive org.junit.platform.commons;
 	requires transitive org.junit.platform.engine;
 
diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
index f452446933a1..b6240681922f 100644
--- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
@@ -15,7 +15,7 @@
  */
 module org.junit.platform.reporting {
 	requires java.xml;
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires org.junit.platform.commons;
 	requires transitive org.junit.platform.engine;
 	requires transitive org.junit.platform.launcher;
diff --git a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
index fcbf296ecc9b..47edeb10e7fd 100644
--- a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
+++ b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
@@ -16,7 +16,7 @@
  */
 module org.junit.platform.runner {
 	requires transitive junit; // 4
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires transitive org.junit.platform.launcher;
 	requires transitive org.junit.platform.suite.api;
 	requires org.junit.platform.suite.commons;
diff --git a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
index c65659ee0833..9af8daea9d71 100644
--- a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
+++ b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
@@ -14,7 +14,7 @@
  * @since 1.0
  */
 module org.junit.platform.suite.api {
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires transitive org.junit.platform.commons;
 
 	exports org.junit.platform.suite.api;
diff --git a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
index 9fc4a5293162..b810efc7f0ec 100644
--- a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
+++ b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
@@ -14,7 +14,7 @@
  * @since 1.8
  */
 module org.junit.platform.suite.commons {
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires org.junit.platform.suite.api;
 	requires org.junit.platform.commons;
 	requires org.junit.platform.engine;
diff --git a/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java b/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
index a5c077e99461..f98845cb91ff 100644
--- a/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
+++ b/junit-platform-suite-engine/src/module/org.junit.platform.suite.engine/module-info.java
@@ -16,7 +16,7 @@
  * @provides org.junit.platform.engine.TestEngine
  */
 module org.junit.platform.suite.engine {
-	requires org.apiguardian.api;
+	requires static org.apiguardian.api;
 	requires org.junit.platform.suite.api;
 	requires org.junit.platform.suite.commons;
 	requires org.junit.platform.commons;
diff --git a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
index ea99b0e8ff92..c0ae31818be7 100644
--- a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
+++ b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
@@ -15,7 +15,7 @@
  * @uses org.junit.platform.engine.TestEngine
  */
 module org.junit.platform.testkit {
-	requires transitive org.apiguardian.api;
+	requires static transitive org.apiguardian.api;
 	requires transitive org.assertj.core;
 	requires org.junit.platform.commons;
 	requires transitive org.junit.platform.engine;
diff --git a/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java b/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
index 0baad6dbff1e..17062be5d548 100644
--- a/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
+++ b/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
@@ -17,7 +17,7 @@
  */
 module org.junit.vintage.engine {
 	requires junit; // 4
-	requires org.apiguardian.api;
+	requires static org.apiguardian.api;
 	requires org.junit.platform.engine;
 
 	provides org.junit.platform.engine.TestEngine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
index 03c16e3a7fb9..0b4810a6cc60 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
@@ -6,7 +6,7 @@ exports org.junit.jupiter.api.function
 exports org.junit.jupiter.api.io
 exports org.junit.jupiter.api.parallel
 requires java.base mandated
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.platform.commons transitive
 requires org.opentest4j transitive
 qualified opens org.junit.jupiter.api.condition to org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
index d8cd4a2c24a5..5c637457863f 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
@@ -1,6 +1,6 @@
 org.junit.jupiter.engine@${jupiterVersion} jar:file:.+/junit-jupiter-engine-\d.+\.jar..module-info\.class
 requires java.base mandated
-requires org.apiguardian.api
+requires org.apiguardian.api static
 requires org.junit.jupiter.api
 requires org.junit.platform.commons
 requires org.junit.platform.engine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
index a96ffb5c0185..747125710426 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
@@ -6,6 +6,6 @@ exports org.junit.jupiter.migrationsupport.rules.adapter
 exports org.junit.jupiter.migrationsupport.rules.member
 requires java.base mandated
 requires junit transitive
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.jupiter.api transitive
 requires org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
index 341c529915dc..05e8b8ac4675 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
@@ -5,7 +5,7 @@ exports org.junit.jupiter.params.converter
 exports org.junit.jupiter.params.provider
 exports org.junit.jupiter.params.support
 requires java.base mandated
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.jupiter.api transitive
 requires org.junit.platform.commons transitive
 qualified opens org.junit.jupiter.params to org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
index 12c846de99a2..5c0c9b44e4ef 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-commons.expected.txt
@@ -6,6 +6,6 @@ exports org.junit.platform.commons.support
 requires java.base mandated
 requires java.logging
 requires java.management
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 qualified exports org.junit.platform.commons.logging to org.junit.jupiter.api org.junit.jupiter.engine org.junit.jupiter.migrationsupport org.junit.jupiter.params org.junit.platform.console org.junit.platform.engine org.junit.platform.launcher org.junit.platform.reporting org.junit.platform.runner org.junit.platform.suite.api org.junit.platform.suite.engine org.junit.platform.testkit org.junit.vintage.engine
 qualified exports org.junit.platform.commons.util to org.junit.jupiter.api org.junit.jupiter.engine org.junit.jupiter.migrationsupport org.junit.jupiter.params org.junit.platform.console org.junit.platform.engine org.junit.platform.launcher org.junit.platform.reporting org.junit.platform.runner org.junit.platform.suite.api org.junit.platform.suite.commons org.junit.platform.suite.engine org.junit.platform.testkit org.junit.vintage.engine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
index 872aface24f4..4324e45eccfe 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
@@ -1,6 +1,6 @@
 org.junit.platform.console@${platformVersion} jar:file:.+/junit-platform-console-\d.+\.jar..module-info\.class
 requires java.base mandated
-requires org.apiguardian.api
+requires org.apiguardian.api static
 requires org.junit.platform.commons
 requires org.junit.platform.engine
 requires org.junit.platform.launcher
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
index 1db8ec2099e2..d6f69626900a 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
@@ -8,6 +8,6 @@ exports org.junit.platform.engine.support.discovery
 exports org.junit.platform.engine.support.filter
 exports org.junit.platform.engine.support.hierarchical
 requires java.base mandated
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.platform.commons transitive
 requires org.opentest4j transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
index 688eb980e7d5..10bec3decdaf 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-jfr.expected.txt
@@ -1,7 +1,7 @@
 org.junit.platform.jfr@${platformVersion} jar:file:.+/junit-platform-jfr-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires jdk.jfr
-requires org.apiguardian.api
+requires org.apiguardian.api static
 requires org.junit.platform.engine
 requires org.junit.platform.launcher
 provides org.junit.platform.launcher.LauncherDiscoveryListener with org.junit.platform.jfr.FlightRecordingDiscoveryListener
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
index d0f71d1b6631..1461169b0fee 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
@@ -5,7 +5,7 @@ exports org.junit.platform.launcher.listeners
 exports org.junit.platform.launcher.listeners.discovery
 requires java.base mandated
 requires java.logging transitive
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.platform.commons transitive
 requires org.junit.platform.engine transitive
 uses org.junit.platform.engine.TestEngine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
index 71c474d193ff..97d05754aa07 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
@@ -3,7 +3,7 @@ exports org.junit.platform.reporting.legacy
 exports org.junit.platform.reporting.legacy.xml
 requires java.base mandated
 requires java.xml
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine transitive
 requires org.junit.platform.launcher transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
index a9da89b60b64..ee4ae1791204 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-runner.expected.txt
@@ -2,7 +2,7 @@ org.junit.platform.runner@${platformVersion} jar:file:.+/junit-platform-runner-\
 exports org.junit.platform.runner
 requires java.base mandated
 requires junit transitive
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.platform.launcher transitive
 requires org.junit.platform.suite.api transitive
 requires org.junit.platform.suite.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
index 3d1a3db0ea4d..5e3da71afa28 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
@@ -1,5 +1,5 @@
 org.junit.platform.suite.api@${platformVersion} jar:file:.+/junit-platform-suite-api-\d.+\.jar..module-info\.class
 exports org.junit.platform.suite.api
 requires java.base mandated
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.platform.commons transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
index 5f099abb5ff3..493962b6b97d 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-commons.expected.txt
@@ -1,6 +1,6 @@
 org.junit.platform.suite.commons@${platformVersion} jar:file:.+/junit-platform-suite-commons-\d.+\.jar..module-info\.class
 requires java.base mandated
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine
 requires org.junit.platform.launcher transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
index 5a1d3ef28734..4a5694586dd4 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
@@ -1,6 +1,6 @@
 org.junit.platform.suite.engine@${platformVersion} jar:file:.+/junit-platform-suite-engine-\d.+\.jar..module-info\.class
 requires java.base mandated
-requires org.apiguardian.api
+requires org.apiguardian.api static
 requires org.junit.platform.commons
 requires org.junit.platform.engine
 requires org.junit.platform.launcher
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
index 65fdb5f7accc..2ad3e8d1c77b 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
@@ -1,7 +1,7 @@
 org.junit.platform.testkit@${platformVersion} jar:file:.+/junit-platform-testkit-\d.+\.jar..module-info\.class
 exports org.junit.platform.testkit.engine
 requires java.base mandated
-requires org.apiguardian.api transitive
+requires org.apiguardian.api static transitive
 requires org.assertj.core transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
index d205b2aea88c..854b4981242a 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
@@ -1,7 +1,7 @@
 org.junit.vintage.engine@${vintageVersion} jar:file:.+/junit-vintage-engine-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires junit
-requires org.apiguardian.api
+requires org.apiguardian.api static
 requires org.junit.platform.engine
 provides org.junit.platform.engine.TestEngine with org.junit.vintage.engine.VintageTestEngine
 contains org.junit.vintage.engine

From ef5a0d60c890cf8e87269057233683112b052964 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 27 Aug 2021 15:11:02 +0200
Subject: [PATCH 0473/1433] Avoid using Stream.peek() for required side effects

Issue: #2700
---
 .../src/main/java/org/junit/jupiter/api/AssertAll.java      | 2 +-
 .../engine/descriptor/DynamicContainerTestDescriptor.java   | 6 ++++--
 .../org/junit/jupiter/engine/extension/TempDirectory.java   | 5 +++--
 .../junit/jupiter/params/ParameterizedTestExtension.java    | 6 ++++--
 .../main/java/org/junit/platform/launcher/EngineFilter.java | 3 +--
 .../java/org/junit/platform/testkit/engine/Assertions.java  | 2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
index ca2c7412cde9..b083e3274320 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
@@ -62,8 +62,8 @@ static void assertAll(String heading, Stream<Executable> executables) {
 		Preconditions.notNull(executables, "executables stream must not be null");
 
 		List<Throwable> failures = executables //
-				.peek(executable -> Preconditions.notNull(executable, "individual executables must not be null"))//
 				.map(executable -> {
+					Preconditions.notNull(executable, "individual executables must not be null");
 					try {
 						executable.execute();
 						return null;
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
index 9d9cfca10bca..38b828d13f25 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
@@ -58,8 +58,10 @@ public JupiterEngineExecutionContext execute(JupiterEngineExecutionContext conte
 		AtomicInteger index = new AtomicInteger(1);
 		try (Stream<? extends DynamicNode> children = dynamicContainer.getChildren()) {
 			// @formatter:off
-			children.peek(child -> Preconditions.notNull(child, "individual dynamic node must not be null"))
-					.map(child -> toDynamicDescriptor(index.getAndIncrement(), child))
+			children.map(child -> {
+						Preconditions.notNull(child, "individual dynamic node must not be null");
+						return toDynamicDescriptor(index.getAndIncrement(), child);
+					})
 					.filter(Optional::isPresent)
 					.map(Optional::get)
 					.forEachOrdered(dynamicTestExecutor::execute);
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 6dd22e739e18..8849f2bacb2e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -272,7 +272,7 @@ private static void resetPermissions(Path path) {
 		private IOException createIOExceptionWithAttachedFailures(SortedMap<Path, IOException> failures) {
 			// @formatter:off
 			String joinedPaths = failures.keySet().stream()
-					.peek(this::tryToDeleteOnExit)
+					.map(this::tryToDeleteOnExit)
 					.map(this::relativizeSafely)
 					.map(String::valueOf)
 					.collect(joining(", "));
@@ -284,12 +284,13 @@ private IOException createIOExceptionWithAttachedFailures(SortedMap<Path, IOExce
 			return exception;
 		}
 
-		private void tryToDeleteOnExit(Path path) {
+		private Path tryToDeleteOnExit(Path path) {
 			try {
 				path.toFile().deleteOnExit();
 			}
 			catch (UnsupportedOperationException ignore) {
 			}
+			return path;
 		}
 
 		private Path relativizeSafely(Path path) {
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
index ec6aac46ba5f..024f06b9b398 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -90,8 +90,10 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 				.flatMap(provider -> arguments(provider, extensionContext))
 				.map(Arguments::get)
 				.map(arguments -> consumedArguments(arguments, methodContext))
-				.map(arguments -> createInvocationContext(formatter, methodContext, arguments))
-				.peek(invocationContext -> invocationCount.incrementAndGet())
+				.map(arguments -> {
+					invocationCount.incrementAndGet();
+					return createInvocationContext(formatter, methodContext, arguments);
+				})
 				.onClose(() ->
 						Preconditions.condition(invocationCount.get() > 0,
 								"Configuration error: You must configure at least one set of arguments for this @ParameterizedTest"));
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
index 53eada499f6e..1580447e0f73 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
@@ -138,9 +138,8 @@ private static List<String> validateAndTrim(List<String> engineIds) {
 
 		// @formatter:off
 		return engineIds.stream()
+				.map(id -> Preconditions.notBlank(id, "engine ID must not be null or blank").trim())
 				.distinct()
-				.peek(id -> Preconditions.notBlank(id, "engine ID must not be null or blank"))
-				.map(String::trim)
 				.collect(toList());
 		// @formatter:on
 	}
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
index a66ad615bd23..6c81b6e76c92 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
@@ -38,8 +38,8 @@ static void assertAll(String heading, Stream<Executable> executables) {
 		Preconditions.notNull(executables, "executables stream must not be null");
 
 		List<Throwable> failures = executables //
-				.peek(executable -> Preconditions.notNull(executable, "individual executables must not be null"))//
 				.map(executable -> {
+					Preconditions.notNull(executable, "individual executables must not be null");
 					try {
 						executable.execute();
 						return null;

From 62aa9c75ab6eca1890ba13ab3e17b91923e703d5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 27 Aug 2021 15:56:09 +0200
Subject: [PATCH 0474/1433] Avoid using Stream.peek() for required side effects
 in TestRuleSupport

Closes: #2700
---
 .../rules/TestRuleSupport.java                | 71 +++++++++++--------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
index 1ac9f65b7b2d..6848d1b7cebd 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
@@ -18,13 +18,11 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 
 import org.junit.Rule;
 import org.junit.jupiter.api.extension.AfterEachCallback;
@@ -45,9 +43,6 @@
  */
 class TestRuleSupport implements BeforeEachCallback, TestExecutionExceptionHandler, AfterEachCallback {
 
-	private static final Consumer<List<TestRuleAnnotatedMember>> NO_OP = members -> {
-	};
-
 	private final Class<? extends TestRule> ruleType;
 	private final Function<TestRuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator;
 
@@ -95,21 +90,13 @@ private List<Field> findAnnotatedFields(Object testInstance) {
 
 	@Override
 	public void beforeEach(ExtensionContext context) {
-		invokeAppropriateMethodOnRuleAnnotatedMembers(context, NO_OP, GenericBeforeAndAfterAdvice::before);
+		invokeAppropriateMethodOnRuleAnnotatedMembers(context, false, GenericBeforeAndAfterAdvice::before);
 	}
 
-	@SuppressWarnings("ConstantConditions")
 	@Override
 	public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
-		long numRuleAnnotatedMembers = invokeAppropriateMethodOnRuleAnnotatedMembers(context, Collections::reverse,
-			advice -> {
-				try {
-					advice.handleTestExecutionException(throwable);
-				}
-				catch (Throwable t) {
-					throw ExceptionUtils.throwAsUncheckedException(t);
-				}
-			});
+		int numRuleAnnotatedMembers = invokeAppropriateMethodOnRuleAnnotatedMembers(context, true,
+			advice -> advice.handleTestExecutionException(throwable));
 
 		// If no appropriate @Rule annotated members were discovered, we then
 		// have to rethrow the exception in order not to silently swallow it.
@@ -121,35 +108,61 @@ public void handleTestExecutionException(ExtensionContext context, Throwable thr
 
 	@Override
 	public void afterEach(ExtensionContext context) {
-		invokeAppropriateMethodOnRuleAnnotatedMembers(context, Collections::reverse,
-			GenericBeforeAndAfterAdvice::after);
+		invokeAppropriateMethodOnRuleAnnotatedMembers(context, true, GenericBeforeAndAfterAdvice::after);
 	}
 
 	/**
 	 * @return the number of appropriate rule-annotated members that were discovered
 	 */
-	private long invokeAppropriateMethodOnRuleAnnotatedMembers(ExtensionContext context,
-			Consumer<List<TestRuleAnnotatedMember>> ordering, Consumer<GenericBeforeAndAfterAdvice> methodCaller) {
+	private int invokeAppropriateMethodOnRuleAnnotatedMembers(ExtensionContext context, boolean reverseOrder,
+			AdviceInvoker adviceInvoker) {
+
+		List<TestRuleAnnotatedMember> ruleAnnotatedMembers = getRuleAnnotatedMembers(context);
+		if (reverseOrder) {
+			Collections.reverse(ruleAnnotatedMembers);
+		}
+
+		AtomicInteger counter = new AtomicInteger();
+
 		// @formatter:off
-		return Stream.of(getRuleAnnotatedMembers(context))
-				.map(ArrayList::new)
-				.peek(ordering)
-				.flatMap(Collection::stream)
+		ruleAnnotatedMembers.stream()
 				.filter(annotatedMember -> this.ruleType.isInstance(annotatedMember.getTestRule()))
 				.map(this.adapterGenerator)
-				.peek(methodCaller)
-				.count();
+				.forEach(advice -> {
+					adviceInvoker.invokeAndMaskCheckedExceptions(advice);
+					counter.incrementAndGet();
+				});
 		// @formatter:on
+
+		return counter.get();
 	}
 
+	/**
+	 * @return a modifiable copy of the list of rule-annotated members
+	 */
 	@SuppressWarnings("unchecked")
 	private List<TestRuleAnnotatedMember> getRuleAnnotatedMembers(ExtensionContext context) {
 		Object testInstance = context.getRequiredTestInstance();
 		Namespace namespace = Namespace.create(TestRuleSupport.class, context.getRequiredTestClass());
 		// @formatter:off
-		return context.getStore(namespace)
-				.getOrComputeIfAbsent("rule-annotated-members", key -> findRuleAnnotatedMembers(testInstance), List.class);
+		return new ArrayList<>(context.getStore(namespace)
+				.getOrComputeIfAbsent("rule-annotated-members", key -> findRuleAnnotatedMembers(testInstance), List.class));
 		// @formatter:on
 	}
 
+	@FunctionalInterface
+	private interface AdviceInvoker {
+
+		default void invokeAndMaskCheckedExceptions(GenericBeforeAndAfterAdvice advice) {
+			try {
+				invoke(advice);
+			}
+			catch (Throwable t) {
+				throw ExceptionUtils.throwAsUncheckedException(t);
+			}
+		}
+
+		void invoke(GenericBeforeAndAfterAdvice advice) throws Throwable;
+	}
+
 }

From 4932bd9d193585223659e00ee9c092cf7f317ceb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 27 Aug 2021 16:47:56 +0200
Subject: [PATCH 0475/1433] Upgrade to com.gradle.enterprise.test-distribution
 2.1.1

---
 settings.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 59565f570d24..270c54ed5183 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,11 +3,10 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.6.2"
-		id("com.gradle.enterprise.test-distribution") version "2.1.1-rc-2"
+		id("com.gradle.enterprise.test-distribution") version "2.1.1"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"

From 0e898bc57aeae1ce01621d57f1891ac5767adf6d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 27 Aug 2021 16:54:56 +0200
Subject: [PATCH 0476/1433] Upgrade to com.gradle.enterprise.test-distribution
 2.1.1 - round 2

---
 buildSrc/build.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9a84ede1f267..863aec0863ab 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
-	maven(url = "https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local/")
 }
 
 dependencies {
@@ -15,7 +14,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1-rc-2")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1")
 }
 
 tasks.withType<KotlinCompile>().configureEach {

From 57aecc83db124daad2b3fea2518ecc8786e8171c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 28 Aug 2021 16:23:59 +0200
Subject: [PATCH 0477/1433] Abort early in AbstractOrderingVisitor if there are
 no children to order

---
 .../engine/discovery/AbstractOrderingVisitor.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
index 02e553450ab6..1b61fbdd9b3e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
@@ -54,16 +54,21 @@ protected <T extends TestDescriptor, D extends AbstractAnnotatedElementDescripto
 
 		Set<? extends TestDescriptor> children = parentTestDescriptor.getChildren();
 
-		List<TestDescriptor> nonMatchingTestDescriptors = children.stream()//
-				.filter(childTestDescriptor -> !(matchingChildrenType.isAssignableFrom(childTestDescriptor.getClass())))//
-				.collect(Collectors.toList());
-
 		List<D> matchingDescriptorWrappers = children.stream()//
 				.filter(matchingChildrenType::isInstance)//
 				.map(matchingChildrenType::cast)//
 				.map(descriptorWrapperBuilder)//
 				.collect(toCollection(ArrayList::new));
 
+		// If there are no children to order, abort early.
+		if (matchingDescriptorWrappers.isEmpty()) {
+			return;
+		}
+
+		List<TestDescriptor> nonMatchingTestDescriptors = children.stream()//
+				.filter(childTestDescriptor -> !(matchingChildrenType.isAssignableFrom(childTestDescriptor.getClass())))//
+				.collect(Collectors.toList());
+
 		// Make a local copy for later validation
 		Set<D> originalDescriptors = new LinkedHashSet<>(matchingDescriptorWrappers);
 

From a2c5f8688771177523ccd33dbe37734b6c844e20 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 28 Aug 2021 16:32:27 +0200
Subject: [PATCH 0478/1433] Polishing

---
 .../InstantiatingConfigurationParameterConverter.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
index 393eecd54d6d..13b707698897 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
@@ -37,15 +37,15 @@ Optional<T> get(ConfigurationParameters configurationParameters, String key) {
 		return configurationParameters.get(key)
 				.map(String::trim)
 				.filter(className -> !className.isEmpty())
-				.flatMap(className -> instantiateGenerator(className, key));
+				.flatMap(className -> newInstance(className, key));
 		// @formatter:on
 	}
 
-	private Optional<T> instantiateGenerator(String className, String key) {
+	private Optional<T> newInstance(String className, String key) {
 		// @formatter:off
 		return ReflectionUtils.tryToLoadClass(className)
 				.andThenTry(ReflectionUtils::newInstance)
-				.andThenTry(clazz::cast)
+				.andThenTry(this.clazz::cast)
 				.ifSuccess(generator -> logSuccessMessage(className, key))
 				.ifFailure(cause -> logFailureMessage(className, key, cause))
 				.toOptional();
@@ -56,11 +56,11 @@ private void logFailureMessage(String className, String key, Exception cause) {
 		logger.warn(cause,
 			() -> String.format("Failed to load default %s class '%s' set via the '%s' configuration parameter."
 					+ " Falling back to default behavior.",
-				name, className, key));
+				this.name, className, key));
 	}
 
 	private void logSuccessMessage(String className, String key) {
-		logger.config(() -> String.format("Using default %s '%s' set via the '%s' configuration parameter.", name,
+		logger.config(() -> String.format("Using default %s '%s' set via the '%s' configuration parameter.", this.name,
 			className, key));
 	}
 

From 2dce16d8cfc507e14f4376566ffb8baabb301b3e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 28 Aug 2021 17:12:32 +0200
Subject: [PATCH 0479/1433] Allow @Nested test classes to be ordered

PR #2488 introduced support for ordering top-level test classes but
did not provide support for ordering @Nested test classes.

This commit adds support for ordering @Nested test classes.

See: #2699
---
 .../release-notes/release-notes-5.8.0.adoc    |  2 +-
 .../asciidoc/user-guide/writing-tests.adoc    | 13 ++-
 .../org/junit/jupiter/api/ClassOrderer.java   | 13 ++-
 .../org/junit/jupiter/api/MethodOrderer.java  |  1 +
 .../discovery/AbstractOrderingVisitor.java    |  6 ++
 .../src/test/java/example/B_TestCase.java     |  4 +-
 .../engine/extension/OrderedClassTests.java   | 99 ++++++++++++++-----
 7 files changed, 102 insertions(+), 36 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index b4d8b85f1513..cd803dd8a1df 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -125,7 +125,7 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* Top-level test classes can now be ordered by passing the fully-qualified name of a class
+* Test classes can now be ordered by passing the fully-qualified name of a class
   implementing `ClassOrderer` as the value of the new
   `junit.jupiter.testclass.order.default` configuration parameter.
 * `@ExtendWith` may now be used to register extensions declaratively via fields or
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 8d5fda60c584..35883af88787 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -590,9 +590,9 @@ order.
 
 For example:
 
-* previously failed tests and faster tests first: fail fast
-* with parallelism enabled, longer tests first: shortest test execution duration
-* etc.
+* Previously failed tests and faster tests first: fail fast
+* With parallelism enabled, longer tests first: shortest test execution duration
+* Other use cases
 
 You can use the `junit.jupiter.testclass.order.default` <<running-tests-config-params,
 configuration parameter>> to specify the fully qualified class name of the
@@ -623,6 +623,13 @@ junit.jupiter.testclass.order.default = \
     org.junit.jupiter.api.ClassOrderer$OrderAnnotation
 ----
 
+The configured `ClassOrderer` will be applied to all top-level test classes (including
+`static` nested test classes) and `@Nested` test classes.
+
+NOTE: Top-level test classes will be ordered relative to each other; whereas, `@Nested`
+test classes will be ordered relative to other `@Nested` test classes sharing the same
+_enclosing class_.
+
 [[writing-tests-test-instance-lifecycle]]
 === Test Instance Lifecycle
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index b19c9dafeb0d..2e86ad1b2957 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -22,13 +22,17 @@
 import org.junit.platform.commons.logging.LoggerFactory;
 
 /**
- * {@code ClassOrderer} defines the API for ordering the <em>top-level test
- * classes</em>, without considering nested test classes.
+ * {@code ClassOrderer} defines the API for ordering top-level test classes and
+ * {@link Nested @Nested} test classes.
  *
  * <p>In this context, the term "test class" refers to any class containing methods
  * annotated with {@code @Test}, {@code @RepeatedTest}, {@code @ParameterizedTest},
- * {@code @TestFactory}, or {@code @TestTemplate}. {@link Nested @Nested} test
- * classes cannot be ordered by a {@code ClassOrderer}.
+ * {@code @TestFactory}, or {@code @TestTemplate}.
+ *
+ * <p>Top-level test classes will be ordered relative to each other; whereas,
+ * {@code @Nested} test classes will be ordered relative to other {@code @Nested}
+ * test classes sharing the same {@linkplain Class#getEnclosingClass() enclosing
+ * class}.
  *
  * <h4>Built-in Implementations</h4>
  *
@@ -45,6 +49,7 @@
  * @since 5.8
  * @see ClassOrdererContext
  * @see #orderClasses(ClassOrdererContext)
+ * @see MethodOrderer
  */
 @API(status = EXPERIMENTAL, since = "5.8")
 public interface ClassOrderer {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index cf30f07a797c..21664ed00778 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -49,6 +49,7 @@
  * @see TestMethodOrder
  * @see MethodOrdererContext
  * @see #orderMethods(MethodOrdererContext)
+ * @see ClassOrderer
  */
 @API(status = STABLE, since = "5.7")
 public interface MethodOrderer {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
index 1b61fbdd9b3e..da18303d4882 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
@@ -93,6 +93,12 @@ else if (difference < 0) {
 				.forEach(parentTestDescriptor::removeChild);
 		Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
 				.forEach(parentTestDescriptor::addChild);
+
+		// Recurse through the children in order to support ordering for @Nested test classes.
+		matchingDescriptorWrappers.forEach(annotatedElementDescriptor -> {
+			orderChildrenTestDescriptors(annotatedElementDescriptor.getTestDescriptor(), matchingChildrenType,
+				descriptorWrapperBuilder, orderingAction, descriptorsAddedLogger, descriptorsRemovedLogger);
+		});
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/example/B_TestCase.java b/junit-jupiter-engine/src/test/java/example/B_TestCase.java
index 7112e67930ea..e0369be5676e 100644
--- a/junit-jupiter-engine/src/test/java/example/B_TestCase.java
+++ b/junit-jupiter-engine/src/test/java/example/B_TestCase.java
@@ -10,7 +10,7 @@
 
 package example;
 
-import java.util.Set;
+import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -21,7 +21,7 @@
  */
 public class B_TestCase {
 
-	public static Set<String> callSequence;
+	public static List<String> callSequence;
 
 	@BeforeEach
 	void trackInvocations(TestInfo testInfo) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
index d207291cceba..0470c47510c8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
@@ -14,36 +14,41 @@
 import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.List;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
+import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.junit.platform.testkit.engine.Events;
 
 /**
+ * Integration tests for {@link ClassOrderer} support.
+ *
  * @since 5.8
  */
 class OrderedClassTests {
 
-	private static final Set<String> callSequence = Collections.synchronizedSet(new LinkedHashSet<>());
+	private static final List<String> callSequence = Collections.synchronizedList(new ArrayList<>());
 
 	@BeforeEach
+	@AfterEach
 	void clearCallSequence() {
 		callSequence.clear();
 	}
 
 	@Test
 	void className() {
-		var tests = executeTests(ClassOrderer.ClassName.class);
-
-		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+		executeTests(ClassOrderer.ClassName.class)//
+				.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
 		assertThat(callSequence)//
 				.containsExactly("A_TestCase", "B_TestCase", "C_TestCase");
@@ -55,16 +60,10 @@ void classNameAcrossPackages() {
 			example.B_TestCase.callSequence = callSequence;
 
 			// @formatter:off
-			var tests = EngineTestKit
-				.engine("junit-jupiter")
-				.configurationParameter(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, ClassOrderer.ClassName.class.getName())
-				.selectors(selectClass(B_TestCase.class), selectClass(example.B_TestCase.class))
-				.execute()
-				.testEvents();
+			executeTests(ClassOrderer.ClassName.class, selectClass(B_TestCase.class), selectClass(example.B_TestCase.class))
+					.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 			// @formatter:on
 
-			tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
-
 			assertThat(callSequence)//
 					.containsExactly("example.B_TestCase", "B_TestCase");
 		}
@@ -75,9 +74,8 @@ void classNameAcrossPackages() {
 
 	@Test
 	void displayName() {
-		var tests = executeTests(ClassOrderer.DisplayName.class);
-
-		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+		executeTests(ClassOrderer.DisplayName.class)//
+				.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
 		assertThat(callSequence)//
 				.containsExactly("C_TestCase", "B_TestCase", "A_TestCase");
@@ -85,27 +83,38 @@ void displayName() {
 
 	@Test
 	void orderAnnotation() {
-		var tests = executeTests(ClassOrderer.OrderAnnotation.class);
-
-		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+		executeTests(ClassOrderer.OrderAnnotation.class)//
+				.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
 		assertThat(callSequence)//
 				.containsExactly("A_TestCase", "C_TestCase", "B_TestCase");
 	}
 
 	@Test
-	void random() {
-		var tests = executeTests(ClassOrderer.Random.class);
+	void orderAnnotationOnNestedTestClasses() {
+		executeTests(ClassOrderer.OrderAnnotation.class, selectClass(Outer.class))//
+				.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
-		tests.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+		assertThat(callSequence)//
+				.containsExactly("Inner2", "Inner1", "Inner0", "Inner3");
+	}
+
+	@Test
+	void random() {
+		executeTests(ClassOrderer.Random.class)//
+				.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 	}
 
 	private Events executeTests(Class<? extends ClassOrderer> classOrderer) {
+		return executeTests(classOrderer, selectClass(A_TestCase.class), selectClass(B_TestCase.class),
+			selectClass(C_TestCase.class));
+	}
+
+	private Events executeTests(Class<? extends ClassOrderer> classOrderer, DiscoverySelector... selectors) {
 		// @formatter:off
-		return EngineTestKit
-			.engine("junit-jupiter")
+		return EngineTestKit.engine("junit-jupiter")
 			.configurationParameter(DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, classOrderer.getName())
-			.selectors(selectClass(A_TestCase.class), selectClass(B_TestCase.class), selectClass(C_TestCase.class))
+			.selectors(selectors)
 			.execute()
 			.testEvents();
 		// @formatter:on
@@ -138,4 +147,42 @@ static class B_TestCase extends BaseTestCase {
 	static class C_TestCase extends BaseTestCase {
 	}
 
+	static class Outer {
+
+		@Nested
+		class Inner0 {
+			@Test
+			void test() {
+				callSequence.add(getClass().getSimpleName());
+			}
+		}
+
+		@Nested
+		@Order(2)
+		class Inner1 {
+			@Test
+			void test() {
+				callSequence.add(getClass().getSimpleName());
+			}
+		}
+
+		@Nested
+		@Order(1)
+		class Inner2 {
+			@Test
+			void test() {
+				callSequence.add(getClass().getSimpleName());
+			}
+		}
+
+		@Nested
+		@Order(Integer.MAX_VALUE)
+		class Inner3 {
+			@Test
+			void test() {
+				callSequence.add(getClass().getSimpleName());
+			}
+		}
+	}
+
 }

From 787fbbf96e06d6a93774f67020982f0c912c7783 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 29 Aug 2021 15:17:00 +0200
Subject: [PATCH 0480/1433] Introduce @TestClassOrder for ordering @Nested test
 classes

This commit builds on the previous commit by introducing a new
@TestClassOrder annotation that can be used to configure a ClassOrderer
for @Nested test classes.

A @TestClassOrder declaration always overrides a globally configured
ClassOrderer.

See: #2699
---
 .../org/junit/jupiter/api/ClassOrderer.java   |   7 +
 .../java/org/junit/jupiter/api/Nested.java    |   4 +
 .../java/org/junit/jupiter/api/Order.java     |   6 +-
 .../org/junit/jupiter/api/TestClassOrder.java |  85 ++++++++++
 .../junit/jupiter/api/TestMethodOrder.java    |   1 +
 .../discovery/AbstractOrderingVisitor.java    | 155 +++++++++++++-----
 .../discovery/ClassOrderingVisitor.java       |  69 ++++++--
 .../discovery/MethodOrderingVisitor.java      |  34 ++--
 .../engine/extension/OrderedClassTests.java   |  88 +++++++++-
 9 files changed, 376 insertions(+), 73 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 2e86ad1b2957..75a1c3c993d8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -34,6 +34,12 @@
  * test classes sharing the same {@linkplain Class#getEnclosingClass() enclosing
  * class}.
  *
+ * <p>A {@link ClassOrderer} can be configured <em>globally</em> for the entire
+ * test suite via the {@code junit.jupiter.testclass.order.default} configuration
+ * parameter (see the User Guide for details) or <em>locally</em> for
+ * {@link Nested @Nested} test classes via the {@link TestClassOrder @TestClassOrder}
+ * annotation.
+ *
  * <h4>Built-in Implementations</h4>
  *
  * <p>JUnit Jupiter provides the following built-in {@code ClassOrderer}
@@ -47,6 +53,7 @@
  * </ul>
  *
  * @since 5.8
+ * @see TestClassOrder
  * @see ClassOrdererContext
  * @see #orderClasses(ClassOrdererContext)
  * @see MethodOrderer
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
index d22db68298c4..28c4edaf7294 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
@@ -28,6 +28,9 @@
  * enclosing class}. The enclosing class may be a top-level test class or
  * another {@code @Nested} test class, and nesting can be arbitrarily deep.
  *
+ * <p>{@code @Nested} test classes may be ordered via
+ * {@link TestClassOrder @TestClassOrder} or a global {@link ClassOrderer}.
+ *
  * <h3>Test Instance Lifecycle</h3>
  *
  * <ul>
@@ -41,6 +44,7 @@
  * @since 5.0
  * @see Test
  * @see TestInstance
+ * @see TestClassOrder
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
index 6971f5a39d8c..223c1c06117d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
@@ -27,11 +27,12 @@
  * of the same category.
  *
  * <p>When used with
- * {@link org.junit.jupiter.api.extension.RegisterExtension @RegisterExtension},
+ * {@link org.junit.jupiter.api.extension.RegisterExtension @RegisterExtension} or
+ * {@link org.junit.jupiter.api.extension.ExtendWith @ExtendWith},
  * the category applies to <em>extension fields</em>. When used with
  * {@link MethodOrderer.OrderAnnotation}, the category applies to <em>test methods</em>.
  * When used with {@link ClassOrderer.OrderAnnotation}, the category applies to
- * top-level <em>test classes</em>.
+ * <em>test classes</em>.
  *
  * <p>If {@code @Order} is not explicitly declared on an element, the
  * {@link #DEFAULT} order value will be assigned to the element.
@@ -40,6 +41,7 @@
  * @see MethodOrderer.OrderAnnotation
  * @see ClassOrderer.OrderAnnotation
  * @see org.junit.jupiter.api.extension.RegisterExtension @RegisterExtension
+ * @see org.junit.jupiter.api.extension.ExtendWith @ExtendWith
  */
 @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
new file mode 100644
index 000000000000..41e7354e2eed
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code @TestClassOrder} is a type-level annotation that is used to configure
+ * a {@link #value ClassOrderer} for the {@link Nested @Nested} test classes of
+ * the annotated test class.
+ *
+ * <p>If {@code @TestClassOrder} is not explicitly declared on a test class,
+ * inherited from a parent class, declared on a test interface implemented by
+ * a test class, or inherited from an {@linkplain Class#getEnclosingClass() enclosing
+ * class}, {@code @Nested} test classes will be executed in arbitrary order.
+ *
+ * <p>As an alternative to {@code @TestClassOrder}, a global {@link ClassOrderer}
+ * can be configured for the entire test suite via the
+ * {@code junit.jupiter.testclass.order.default} configuration parameter. See
+ * the User Guide for details. Note, however, that a {@code @TestClassOrder}
+ * declaration always overrides a global {@code ClassOrderer}.
+ *
+ * <h4>Example Usage</h4>
+ *
+ * <p>The following demonstrates how to guarantee that {@code @Nested} test classes
+ * are executed in the order specified via the {@link Order @Order} annotation.
+ *
+ * <pre class="code">
+ * {@literal @}TestClassOrder(ClassOrderer.OrderAnnotation.class)
+ * class OrderedNestedTests {
+ *
+ *     {@literal @}Nested
+ *     {@literal @}Order(1)
+ *     class PrimaryTests() {
+ *         // {@literal @}Test methods ...
+ *     }
+ *
+ *     {@literal @}Nested
+ *     {@literal @}Order(2)
+ *     class SecondaryTests() {
+ *         // {@literal @}Test methods ...
+ *     }
+ * }
+ * </pre>
+ *
+ * @since 5.8
+ * @see ClassOrderer
+ * @see TestMethodOrder
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@API(status = EXPERIMENTAL, since = "5.8")
+public @interface TestClassOrder {
+
+	/**
+	 * The {@link ClassOrderer} to use.
+	 *
+	 * @see ClassOrderer
+	 * @see ClassOrderer.MethodName
+	 * @see ClassOrderer.DisplayName
+	 * @see ClassOrderer.OrderAnnotation
+	 * @see ClassOrderer.Random
+	 */
+	Class<? extends ClassOrderer> value();
+
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
index 2cad2ec58e12..6dcb568bbdb7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
@@ -60,6 +60,7 @@
  *
  * @since 5.4
  * @see MethodOrderer
+ * @see TestClassOrder
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
index da18303d4882..17e3b42d2a6e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
@@ -18,87 +18,160 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.IntFunction;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.UnrecoverableExceptions;
 import org.junit.platform.engine.TestDescriptor;
 
-class AbstractOrderingVisitor {
+abstract class AbstractOrderingVisitor<PARENT extends TestDescriptor, CHILD extends TestDescriptor, ELEMENT extends AbstractAnnotatedElementDescriptor<?>> {
 
 	private static final Logger logger = LoggerFactory.getLogger(AbstractOrderingVisitor.class);
 
-	@SuppressWarnings({ "unchecked" })
-	protected <T extends TestDescriptor> void doWithMatchingDescriptor(Class<T> descriptorSubType,
-			TestDescriptor testDescriptor, Consumer<T> action, Function<T, String> errorMessageBuilder) {
+	@SuppressWarnings("unchecked")
+	protected void doWithMatchingDescriptor(Class<PARENT> parentTestDescriptorType, TestDescriptor testDescriptor,
+			Consumer<PARENT> action, Function<PARENT, String> errorMessageBuilder) {
 
-		if (descriptorSubType.isAssignableFrom(testDescriptor.getClass())) {
-			T specificTestDescriptor = (T) testDescriptor;
+		if (parentTestDescriptorType.isInstance(testDescriptor)) {
+			PARENT parentTestDescriptor = (PARENT) testDescriptor;
 			try {
-				action.accept(specificTestDescriptor);
+				action.accept(parentTestDescriptor);
 			}
 			catch (Throwable t) {
 				UnrecoverableExceptions.rethrowIfUnrecoverable(t);
-				logger.error(t, () -> errorMessageBuilder.apply(specificTestDescriptor));
+				logger.error(t, () -> errorMessageBuilder.apply(parentTestDescriptor));
 			}
 		}
 	}
 
-	protected <T extends TestDescriptor, D extends AbstractAnnotatedElementDescriptor<?>> void orderChildrenTestDescriptors(
-			TestDescriptor parentTestDescriptor, Class<T> matchingChildrenType, Function<T, D> descriptorWrapperBuilder,
-			Consumer<List<D>> orderingAction, IntFunction<String> descriptorsAddedLogger,
-			IntFunction<String> descriptorsRemovedLogger) {
+	protected void orderChildrenTestDescriptors(TestDescriptor parentTestDescriptor, Class<CHILD> matchingChildrenType,
+			Function<CHILD, ELEMENT> elementDescriptorFactory, ElementDescriptorOrderer elementDescriptorOrderer) {
 
 		Set<? extends TestDescriptor> children = parentTestDescriptor.getChildren();
 
-		List<D> matchingDescriptorWrappers = children.stream()//
+		List<ELEMENT> matchingElementDescriptors = children.stream()//
 				.filter(matchingChildrenType::isInstance)//
 				.map(matchingChildrenType::cast)//
-				.map(descriptorWrapperBuilder)//
+				.map(elementDescriptorFactory)//
 				.collect(toCollection(ArrayList::new));
 
 		// If there are no children to order, abort early.
-		if (matchingDescriptorWrappers.isEmpty()) {
+		if (matchingElementDescriptors.isEmpty()) {
 			return;
 		}
 
-		List<TestDescriptor> nonMatchingTestDescriptors = children.stream()//
-				.filter(childTestDescriptor -> !(matchingChildrenType.isAssignableFrom(childTestDescriptor.getClass())))//
-				.collect(Collectors.toList());
+		if (elementDescriptorOrderer.canOrderDescriptors()) {
+			List<TestDescriptor> nonMatchingTestDescriptors = children.stream()//
+					.filter(childTestDescriptor -> !matchingChildrenType.isInstance(childTestDescriptor))//
+					.collect(Collectors.toList());
 
-		// Make a local copy for later validation
-		Set<D> originalDescriptors = new LinkedHashSet<>(matchingDescriptorWrappers);
+			// Make a local copy for later validation
+			Set<ELEMENT> originalDescriptors = new LinkedHashSet<>(matchingElementDescriptors);
 
-		orderingAction.accept(matchingDescriptorWrappers);
+			elementDescriptorOrderer.orderDescriptors(matchingElementDescriptors);
 
-		int difference = matchingDescriptorWrappers.size() - originalDescriptors.size();
+			int difference = matchingElementDescriptors.size() - originalDescriptors.size();
+			if (difference > 0) {
+				elementDescriptorOrderer.logDescriptorsAddedWarning(difference);
+			}
+			else if (difference < 0) {
+				elementDescriptorOrderer.logDescriptorsRemovedWarning(difference);
+			}
+
+			Set<TestDescriptor> sortedTestDescriptors = matchingElementDescriptors.stream()//
+					.filter(originalDescriptors::contains)//
+					.map(AbstractAnnotatedElementDescriptor::getTestDescriptor)//
+					.collect(toCollection(LinkedHashSet::new));
+
+			// There is currently no way to removeAll or addAll children at once, so we
+			// first remove them all and then add them all back.
+			Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
+					.forEach(parentTestDescriptor::removeChild);
+
+			// If we are sorting children of type ClassBasedTestDescriptor, that means we
+			// are sorting @Nested test classes. In that case, the nonMatchingTestDescriptors
+			// are local test methods which must be executed before tests in @Nested test
+			// classes. So we add the test methods before adding the @Nested test classes.
+			if (matchingChildrenType == ClassBasedTestDescriptor.class) {
+				Stream.concat(nonMatchingTestDescriptors.stream(), sortedTestDescriptors.stream())//
+						.forEach(parentTestDescriptor::addChild);
+			}
+			// Otherwise, we add the sorted descriptors before the non-matching descriptors,
+			// which is the case when we are sorting test methods. In other words, local
+			// test methods always get added before @Nested test classes.
+			else {
+				Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
+						.forEach(parentTestDescriptor::addChild);
+			}
+		}
+
+		// Recurse through the children in order to support ordering for @Nested test classes.
+		matchingElementDescriptors.forEach(annotatedElementDescriptor -> {
+			TestDescriptor newParentTestDescriptor = annotatedElementDescriptor.getTestDescriptor();
+			ElementDescriptorOrderer newElementDescriptorOrderer = getElementDescriptorOrderer(elementDescriptorOrderer,
+				annotatedElementDescriptor);
+
+			orderChildrenTestDescriptors(newParentTestDescriptor, matchingChildrenType, elementDescriptorFactory,
+				newElementDescriptorOrderer);
+		});
+	}
+
+	/**
+	 * Get the {@link ElementDescriptorOrderer} for the supplied {@link AbstractAnnotatedElementDescriptor}.
+	 *
+	 * <p>The default implementation returns the supplied {@code ElementDescriptorOrderer}.
+	 *
+	 * @return a new {@code ElementDescriptorOrderer} or the one supplied as an argument
+	 */
+	protected ElementDescriptorOrderer getElementDescriptorOrderer(
+			ElementDescriptorOrderer inheritedElementDescriptorOrderer,
+			AbstractAnnotatedElementDescriptor<?> annotatedElementDescriptor) {
+
+		return inheritedElementDescriptorOrderer;
+	}
+
+	protected class ElementDescriptorOrderer {
 
-		if (difference > 0) {
-			logger.warn(() -> descriptorsAddedLogger.apply(difference));
+		private final Consumer<List<ELEMENT>> orderingAction;
+
+		private final MessageGenerator descriptorsAddedMessageGenerator;
+
+		private final MessageGenerator descriptorsRemovedMessageGenerator;
+
+		ElementDescriptorOrderer(Consumer<List<ELEMENT>> orderingAction,
+				MessageGenerator descriptorsAddedMessageGenerator,
+				MessageGenerator descriptorsRemovedMessageGenerator) {
+
+			this.orderingAction = orderingAction;
+			this.descriptorsAddedMessageGenerator = descriptorsAddedMessageGenerator;
+			this.descriptorsRemovedMessageGenerator = descriptorsRemovedMessageGenerator;
+		}
+
+		private boolean canOrderDescriptors() {
+			return this.orderingAction != null;
+		}
+
+		private void orderDescriptors(List<ELEMENT> elements) {
+			this.orderingAction.accept(elements);
 		}
-		else if (difference < 0) {
-			logger.warn(() -> descriptorsRemovedLogger.apply(difference));
+
+		private void logDescriptorsAddedWarning(int number) {
+			logger.warn(() -> this.descriptorsAddedMessageGenerator.generateMessage(number));
 		}
 
-		Set<TestDescriptor> sortedTestDescriptors = matchingDescriptorWrappers.stream()//
-				.filter(originalDescriptors::contains)//
-				.map(AbstractAnnotatedElementDescriptor::getTestDescriptor)//
-				.collect(toCollection(LinkedHashSet::new));
+		private void logDescriptorsRemovedWarning(int number) {
+			logger.warn(() -> this.descriptorsRemovedMessageGenerator.generateMessage(Math.abs(number)));
+		}
 
-		// Currently no way to removeAll or addAll children at once.
-		Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
-				.forEach(parentTestDescriptor::removeChild);
-		Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
-				.forEach(parentTestDescriptor::addChild);
+	}
 
-		// Recurse through the children in order to support ordering for @Nested test classes.
-		matchingDescriptorWrappers.forEach(annotatedElementDescriptor -> {
-			orderChildrenTestDescriptors(annotatedElementDescriptor.getTestDescriptor(), matchingChildrenType,
-				descriptorWrapperBuilder, orderingAction, descriptorsAddedLogger, descriptorsRemovedLogger);
-		});
+	@FunctionalInterface
+	protected interface MessageGenerator {
+
+		String generateMessage(int number);
 	}
 
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
index 8114ea544ad6..ecd90f929ce5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
@@ -10,42 +10,79 @@
 
 package org.junit.jupiter.engine.discovery;
 
+import java.lang.reflect.AnnotatedElement;
+import java.util.List;
+import java.util.function.Consumer;
+
 import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.api.TestClassOrder;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
 import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
+import org.junit.platform.commons.util.AnnotationUtils;
+import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.engine.TestDescriptor;
 
 /**
  * @since 5.8
  */
-class ClassOrderingVisitor extends AbstractOrderingVisitor implements TestDescriptor.Visitor {
+class ClassOrderingVisitor
+		extends AbstractOrderingVisitor<JupiterEngineDescriptor, ClassBasedTestDescriptor, DefaultClassDescriptor>
+		implements TestDescriptor.Visitor {
 
 	private final JupiterConfiguration configuration;
 
-	public ClassOrderingVisitor(JupiterConfiguration configuration) {
+	ClassOrderingVisitor(JupiterConfiguration configuration) {
 		this.configuration = configuration;
 	}
 
 	@Override
 	public void visit(TestDescriptor testDescriptor) {
-		this.configuration.getDefaultTestClassOrderer().ifPresent(testClassOrderer -> {
-			doWithMatchingDescriptor(JupiterEngineDescriptor.class, testDescriptor,
-				descriptor -> orderContainedClasses(descriptor, testClassOrderer),
-				descriptor -> "Failed to order classes");
-		});
+		ClassOrderer globalClassOrderer = this.configuration.getDefaultTestClassOrderer().orElse(null);
+		doWithMatchingDescriptor(JupiterEngineDescriptor.class, testDescriptor,
+			descriptor -> orderContainedClasses(descriptor, globalClassOrderer),
+			descriptor -> "Failed to order classes");
 	}
 
 	private void orderContainedClasses(JupiterEngineDescriptor jupiterEngineDescriptor, ClassOrderer classOrderer) {
-		orderChildrenTestDescriptors(jupiterEngineDescriptor, ClassBasedTestDescriptor.class,
-			DefaultClassDescriptor::new,
-			descriptorWrappers -> classOrderer.orderClasses(
-				new DefaultClassOrdererContext(descriptorWrappers, this.configuration)),
-			difference -> String.format("ClassOrderer [%s] added %s ClassDescriptor(s) which will be ignored.",
-				classOrderer.getClass().getName(), difference),
-			difference -> String.format(
-				"ClassOrderer [%s] removed %s ClassDescriptor(s) which will be retained with arbitrary ordering.",
-				classOrderer.getClass().getName(), -difference));
+		orderChildrenTestDescriptors(//
+			jupiterEngineDescriptor, //
+			ClassBasedTestDescriptor.class, //
+			DefaultClassDescriptor::new, //
+			createElementDescriptorOrderer(classOrderer));
+	}
+
+	@Override
+	protected ElementDescriptorOrderer getElementDescriptorOrderer(
+			ElementDescriptorOrderer inheritedElementDescriptorOrderer,
+			AbstractAnnotatedElementDescriptor<?> annotatedElementDescriptor) {
+
+		AnnotatedElement annotatedElement = annotatedElementDescriptor.getAnnotatedElement();
+		return AnnotationUtils.findAnnotation(annotatedElement, TestClassOrder.class)//
+				.map(TestClassOrder::value)//
+				.<ClassOrderer> map(ReflectionUtils::newInstance)//
+				.map(this::createElementDescriptorOrderer)//
+				.orElse(inheritedElementDescriptorOrderer);
+	}
+
+	private ElementDescriptorOrderer createElementDescriptorOrderer(ClassOrderer classOrderer) {
+		Consumer<List<DefaultClassDescriptor>> orderingAction = classOrderer == null ? null : //
+				classDescriptors -> classOrderer.orderClasses(
+					new DefaultClassOrdererContext(classDescriptors, this.configuration));
+
+		MessageGenerator descriptorsAddedMessageGenerator = number -> String.format(
+			"ClassOrderer [%s] added %s ClassDescriptor(s) which will be ignored.", nullSafeToString(classOrderer),
+			number);
+		MessageGenerator descriptorsRemovedMessageGenerator = number -> String.format(
+			"ClassOrderer [%s] removed %s ClassDescriptor(s) which will be retained with arbitrary ordering.",
+			nullSafeToString(classOrderer), number);
+
+		return new ElementDescriptorOrderer(orderingAction, descriptorsAddedMessageGenerator,
+			descriptorsRemovedMessageGenerator);
+	}
+
+	private static String nullSafeToString(ClassOrderer classOrderer) {
+		return (classOrderer != null ? classOrderer.getClass().getName() : "<unknown>");
 	}
 
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
index 056114630ef2..3fba04c7fcf8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
@@ -12,7 +12,9 @@
 
 import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation;
 
+import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -26,7 +28,9 @@
 /**
  * @since 5.5
  */
-class MethodOrderingVisitor extends AbstractOrderingVisitor implements TestDescriptor.Visitor {
+class MethodOrderingVisitor
+		extends AbstractOrderingVisitor<ClassBasedTestDescriptor, MethodBasedTestDescriptor, DefaultMethodDescriptor>
+		implements TestDescriptor.Visitor {
 
 	private final JupiterConfiguration configuration;
 
@@ -51,16 +55,24 @@ private void orderContainedMethods(ClassBasedTestDescriptor classBasedTestDescri
 				.map(Optional::of)//
 				.orElseGet(configuration::getDefaultTestMethodOrderer)//
 				.ifPresent(methodOrderer -> {
-					orderChildrenTestDescriptors(classBasedTestDescriptor, MethodBasedTestDescriptor.class,
-						DefaultMethodDescriptor::new,
-						descriptorWrappers -> methodOrderer.orderMethods(
-							new DefaultMethodOrdererContext(descriptorWrappers, testClass, this.configuration)),
-						difference -> String.format(
-							"MethodOrderer [%s] added %s MethodDescriptor(s) for test class [%s] which will be ignored.",
-							methodOrderer.getClass().getName(), difference, testClass.getName()),
-						difference -> String.format(
-							"MethodOrderer [%s] removed %s MethodDescriptor(s) for test class [%s] which will be retained with arbitrary ordering.",
-							methodOrderer.getClass().getName(), -difference, testClass.getName()));
+
+					Consumer<List<DefaultMethodDescriptor>> orderingAction = methodDescriptors -> methodOrderer.orderMethods(
+						new DefaultMethodOrdererContext(methodDescriptors, testClass, this.configuration));
+
+					MessageGenerator descriptorsAddedMessageGenerator = number -> String.format(
+						"MethodOrderer [%s] added %s MethodDescriptor(s) for test class [%s] which will be ignored.",
+						methodOrderer.getClass().getName(), number, testClass.getName());
+					MessageGenerator descriptorsRemovedMessageGenerator = number -> String.format(
+						"MethodOrderer [%s] removed %s MethodDescriptor(s) for test class [%s] which will be retained with arbitrary ordering.",
+						methodOrderer.getClass().getName(), number, testClass.getName());
+
+					ElementDescriptorOrderer elementDescriptorOrderer = new ElementDescriptorOrderer(orderingAction,
+						descriptorsAddedMessageGenerator, descriptorsRemovedMessageGenerator);
+
+					orderChildrenTestDescriptors(classBasedTestDescriptor, //
+						MethodBasedTestDescriptor.class, //
+						DefaultMethodDescriptor::new, //
+						elementDescriptorOrderer);
 
 					// Note: MethodOrderer#getDefaultExecutionMode() is guaranteed
 					// to be invoked after MethodOrderer#orderMethods().
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
index 0470c47510c8..78288a0b629b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
@@ -11,12 +11,15 @@
 package org.junit.jupiter.engine.extension;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -25,7 +28,10 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestClassOrder;
 import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.fixtures.TrackLogRecords;
+import org.junit.platform.commons.logging.LogRecordListener;
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.junit.platform.testkit.engine.Events;
@@ -91,14 +97,32 @@ void orderAnnotation() {
 	}
 
 	@Test
-	void orderAnnotationOnNestedTestClasses() {
-		executeTests(ClassOrderer.OrderAnnotation.class, selectClass(Outer.class))//
+	void orderAnnotationOnNestedTestClassesWithGlobalConfig() {
+		executeTests(ClassOrderer.OrderAnnotation.class, selectClass(OuterWithGlobalConfig.class))//
 				.assertStatistics(stats -> stats.succeeded(callSequence.size()));
 
 		assertThat(callSequence)//
 				.containsExactly("Inner2", "Inner1", "Inner0", "Inner3");
 	}
 
+	@Test
+	@TrackLogRecords
+	void orderAnnotationOnNestedTestClassesWithLocalConfig(LogRecordListener listener) {
+		executeTests(ClassOrderer.class, selectClass(OuterWithLocalConfig.class))//
+				.assertStatistics(stats -> stats.succeeded(callSequence.size()));
+
+		// Ensure that supplying the ClassOrderer interface instead of an implementation
+		// class results in a WARNING log message. This also lets us know the local
+		// config is used.
+		assertTrue(listener.stream(Level.WARNING)//
+				.map(LogRecord::getMessage)//
+				.anyMatch(m -> m.startsWith(
+					"Failed to load default class orderer class 'org.junit.jupiter.api.ClassOrderer'")));
+
+		assertThat(callSequence)//
+				.containsExactly("Inner2", "Inner1", "Inner1Inner1", "Inner1Inner0", "Inner0", "Inner3");
+	}
+
 	@Test
 	void random() {
 		executeTests(ClassOrderer.Random.class)//
@@ -147,7 +171,7 @@ static class B_TestCase extends BaseTestCase {
 	static class C_TestCase extends BaseTestCase {
 	}
 
-	static class Outer {
+	static class OuterWithGlobalConfig {
 
 		@Nested
 		class Inner0 {
@@ -185,4 +209,62 @@ void test() {
 		}
 	}
 
+	@TestClassOrder(ClassOrderer.OrderAnnotation.class)
+	static class OuterWithLocalConfig {
+
+		@Nested
+		class Inner0 {
+			@Test
+			void test() {
+				callSequence.add(getClass().getSimpleName());
+			}
+		}
+
+		@Nested
+		@Order(2)
+		class Inner1 {
+
+			@Test
+			void test() {
+				callSequence.add(getClass().getSimpleName());
+			}
+
+			@Nested
+			@Order(2)
+			class Inner1Inner0 {
+				@Test
+				void test() {
+					callSequence.add(getClass().getSimpleName());
+				}
+			}
+
+			@Nested
+			@Order(1)
+			class Inner1Inner1 {
+				@Test
+				void test() {
+					callSequence.add(getClass().getSimpleName());
+				}
+			}
+		}
+
+		@Nested
+		@Order(1)
+		class Inner2 {
+			@Test
+			void test() {
+				callSequence.add(getClass().getSimpleName());
+			}
+		}
+
+		@Nested
+		@Order(Integer.MAX_VALUE)
+		class Inner3 {
+			@Test
+			void test() {
+				callSequence.add(getClass().getSimpleName());
+			}
+		}
+	}
+
 }

From 044b3aabd983af71b8238c8a8a6d48ee4fe8d708 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 30 Aug 2021 16:11:39 +0200
Subject: [PATCH 0481/1433] Polish ClassOrderer support

See: #2699
---
 .../org/junit/jupiter/api/TestClassOrder.java |  6 +-
 ...> AbstractAnnotatedDescriptorWrapper.java} |  9 +-
 .../discovery/AbstractOrderingVisitor.java    | 96 +++++++++++--------
 .../discovery/ClassOrderingVisitor.java       | 21 ++--
 .../discovery/DefaultClassDescriptor.java     |  2 +-
 .../discovery/DefaultMethodDescriptor.java    |  2 +-
 .../DefaultMethodOrdererContext.java          |  4 +-
 .../discovery/MethodOrderingVisitor.java      |  9 +-
 8 files changed, 81 insertions(+), 68 deletions(-)
 rename junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/{AbstractAnnotatedElementDescriptor.java => AbstractAnnotatedDescriptorWrapper.java} (88%)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
index 41e7354e2eed..e1824954425a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
@@ -48,13 +48,13 @@
  *
  *     {@literal @}Nested
  *     {@literal @}Order(1)
- *     class PrimaryTests() {
+ *     class PrimaryTests {
  *         // {@literal @}Test methods ...
  *     }
  *
  *     {@literal @}Nested
  *     {@literal @}Order(2)
- *     class SecondaryTests() {
+ *     class SecondaryTests {
  *         // {@literal @}Test methods ...
  *     }
  * }
@@ -75,7 +75,7 @@
 	 * The {@link ClassOrderer} to use.
 	 *
 	 * @see ClassOrderer
-	 * @see ClassOrderer.MethodName
+	 * @see ClassOrderer.ClassName
 	 * @see ClassOrderer.DisplayName
 	 * @see ClassOrderer.OrderAnnotation
 	 * @see ClassOrderer.Random
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
similarity index 88%
rename from junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java
rename to junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
index 3ec0e6a7c57a..1b053457af8a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedElementDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
@@ -20,19 +20,22 @@
 import org.junit.platform.engine.TestDescriptor;
 
 /**
+ * Abstract base class for wrappers for test descriptors based on annotated
+ * elements.
+ *
  * @since 5.8
  */
-abstract class AbstractAnnotatedElementDescriptor<E extends AnnotatedElement> {
+abstract class AbstractAnnotatedDescriptorWrapper<E extends AnnotatedElement> {
 
 	private final TestDescriptor testDescriptor;
 	private final E annotatedElement;
 
-	AbstractAnnotatedElementDescriptor(TestDescriptor testDescriptor, E annotatedElement) {
+	AbstractAnnotatedDescriptorWrapper(TestDescriptor testDescriptor, E annotatedElement) {
 		this.testDescriptor = testDescriptor;
 		this.annotatedElement = annotatedElement;
 	}
 
-	protected E getAnnotatedElement() {
+	E getAnnotatedElement() {
 		return this.annotatedElement;
 	}
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
index 17e3b42d2a6e..447f9c432a1b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
@@ -27,7 +27,17 @@
 import org.junit.platform.commons.util.UnrecoverableExceptions;
 import org.junit.platform.engine.TestDescriptor;
 
-abstract class AbstractOrderingVisitor<PARENT extends TestDescriptor, CHILD extends TestDescriptor, ELEMENT extends AbstractAnnotatedElementDescriptor<?>> {
+/**
+ * Abstract base class for {@linkplain TestDescriptor.Visitor visitors} that
+ * order children nodes.
+ *
+ * @param <PARENT> the parent container type to search in for matching children
+ * @param <CHILD> the type of children (containers or tests) to order
+ * @param <WRAPPER> the wrapper type for the children to order
+ * @since 5.8
+ */
+abstract class AbstractOrderingVisitor<PARENT extends TestDescriptor, CHILD extends TestDescriptor, WRAPPER extends AbstractAnnotatedDescriptorWrapper<?>>
+		implements TestDescriptor.Visitor {
 
 	private static final Logger logger = LoggerFactory.getLogger(AbstractOrderingVisitor.class);
 
@@ -48,100 +58,102 @@ protected void doWithMatchingDescriptor(Class<PARENT> parentTestDescriptorType,
 	}
 
 	protected void orderChildrenTestDescriptors(TestDescriptor parentTestDescriptor, Class<CHILD> matchingChildrenType,
-			Function<CHILD, ELEMENT> elementDescriptorFactory, ElementDescriptorOrderer elementDescriptorOrderer) {
+			Function<CHILD, WRAPPER> descriptorWrapperFactory, DescriptorWrapperOrderer descriptorWrapperOrderer) {
 
 		Set<? extends TestDescriptor> children = parentTestDescriptor.getChildren();
 
-		List<ELEMENT> matchingElementDescriptors = children.stream()//
+		List<WRAPPER> matchingDescriptorWrappers = children.stream()//
 				.filter(matchingChildrenType::isInstance)//
 				.map(matchingChildrenType::cast)//
-				.map(elementDescriptorFactory)//
+				.map(descriptorWrapperFactory)//
 				.collect(toCollection(ArrayList::new));
 
 		// If there are no children to order, abort early.
-		if (matchingElementDescriptors.isEmpty()) {
+		if (matchingDescriptorWrappers.isEmpty()) {
 			return;
 		}
 
-		if (elementDescriptorOrderer.canOrderDescriptors()) {
+		if (descriptorWrapperOrderer.canOrderWrappers()) {
 			List<TestDescriptor> nonMatchingTestDescriptors = children.stream()//
 					.filter(childTestDescriptor -> !matchingChildrenType.isInstance(childTestDescriptor))//
 					.collect(Collectors.toList());
 
 			// Make a local copy for later validation
-			Set<ELEMENT> originalDescriptors = new LinkedHashSet<>(matchingElementDescriptors);
+			Set<WRAPPER> originalWrappers = new LinkedHashSet<>(matchingDescriptorWrappers);
 
-			elementDescriptorOrderer.orderDescriptors(matchingElementDescriptors);
+			descriptorWrapperOrderer.orderWrappers(matchingDescriptorWrappers);
 
-			int difference = matchingElementDescriptors.size() - originalDescriptors.size();
+			int difference = matchingDescriptorWrappers.size() - originalWrappers.size();
 			if (difference > 0) {
-				elementDescriptorOrderer.logDescriptorsAddedWarning(difference);
+				descriptorWrapperOrderer.logDescriptorsAddedWarning(difference);
 			}
 			else if (difference < 0) {
-				elementDescriptorOrderer.logDescriptorsRemovedWarning(difference);
+				descriptorWrapperOrderer.logDescriptorsRemovedWarning(difference);
 			}
 
-			Set<TestDescriptor> sortedTestDescriptors = matchingElementDescriptors.stream()//
-					.filter(originalDescriptors::contains)//
-					.map(AbstractAnnotatedElementDescriptor::getTestDescriptor)//
+			Set<TestDescriptor> orderedTestDescriptors = matchingDescriptorWrappers.stream()//
+					.filter(originalWrappers::contains)//
+					.map(AbstractAnnotatedDescriptorWrapper::getTestDescriptor)//
 					.collect(toCollection(LinkedHashSet::new));
 
 			// There is currently no way to removeAll or addAll children at once, so we
 			// first remove them all and then add them all back.
-			Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
+			Stream.concat(orderedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
 					.forEach(parentTestDescriptor::removeChild);
 
-			// If we are sorting children of type ClassBasedTestDescriptor, that means we
-			// are sorting @Nested test classes. In that case, the nonMatchingTestDescriptors
-			// are local test methods which must be executed before tests in @Nested test
-			// classes. So we add the test methods before adding the @Nested test classes.
+			// If we are ordering children of type ClassBasedTestDescriptor, that means we
+			// are ordering top-level classes or @Nested test classes. Thus, the
+			// nonMatchingTestDescriptors list is either empty (for top-level classes) or
+			// contains only local test methods (for @Nested classes) which must be executed
+			// before tests in @Nested test classes. So we add the test methods before adding
+			// the @Nested test classes.
 			if (matchingChildrenType == ClassBasedTestDescriptor.class) {
-				Stream.concat(nonMatchingTestDescriptors.stream(), sortedTestDescriptors.stream())//
+				Stream.concat(nonMatchingTestDescriptors.stream(), orderedTestDescriptors.stream())//
 						.forEach(parentTestDescriptor::addChild);
 			}
-			// Otherwise, we add the sorted descriptors before the non-matching descriptors,
-			// which is the case when we are sorting test methods. In other words, local
+			// Otherwise, we add the ordered descriptors before the non-matching descriptors,
+			// which is the case when we are ordering test methods. In other words, local
 			// test methods always get added before @Nested test classes.
 			else {
-				Stream.concat(sortedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
+				Stream.concat(orderedTestDescriptors.stream(), nonMatchingTestDescriptors.stream())//
 						.forEach(parentTestDescriptor::addChild);
 			}
 		}
 
 		// Recurse through the children in order to support ordering for @Nested test classes.
-		matchingElementDescriptors.forEach(annotatedElementDescriptor -> {
-			TestDescriptor newParentTestDescriptor = annotatedElementDescriptor.getTestDescriptor();
-			ElementDescriptorOrderer newElementDescriptorOrderer = getElementDescriptorOrderer(elementDescriptorOrderer,
-				annotatedElementDescriptor);
+		matchingDescriptorWrappers.forEach(descriptorWrapper -> {
+			TestDescriptor newParentTestDescriptor = descriptorWrapper.getTestDescriptor();
+			DescriptorWrapperOrderer newDescriptorWrapperOrderer = getDescriptorWrapperOrderer(descriptorWrapperOrderer,
+				descriptorWrapper);
 
-			orderChildrenTestDescriptors(newParentTestDescriptor, matchingChildrenType, elementDescriptorFactory,
-				newElementDescriptorOrderer);
+			orderChildrenTestDescriptors(newParentTestDescriptor, matchingChildrenType, descriptorWrapperFactory,
+				newDescriptorWrapperOrderer);
 		});
 	}
 
 	/**
-	 * Get the {@link ElementDescriptorOrderer} for the supplied {@link AbstractAnnotatedElementDescriptor}.
+	 * Get the {@link DescriptorWrapperOrderer} for the supplied {@link AbstractAnnotatedDescriptorWrapper}.
 	 *
-	 * <p>The default implementation returns the supplied {@code ElementDescriptorOrderer}.
+	 * <p>The default implementation returns the supplied {@code DescriptorWrapperOrderer}.
 	 *
-	 * @return a new {@code ElementDescriptorOrderer} or the one supplied as an argument
+	 * @return a new {@code DescriptorWrapperOrderer} or the one supplied as an argument
 	 */
-	protected ElementDescriptorOrderer getElementDescriptorOrderer(
-			ElementDescriptorOrderer inheritedElementDescriptorOrderer,
-			AbstractAnnotatedElementDescriptor<?> annotatedElementDescriptor) {
+	protected DescriptorWrapperOrderer getDescriptorWrapperOrderer(
+			DescriptorWrapperOrderer inheritedDescriptorWrapperOrderer,
+			AbstractAnnotatedDescriptorWrapper<?> descriptorWrapper) {
 
-		return inheritedElementDescriptorOrderer;
+		return inheritedDescriptorWrapperOrderer;
 	}
 
-	protected class ElementDescriptorOrderer {
+	protected class DescriptorWrapperOrderer {
 
-		private final Consumer<List<ELEMENT>> orderingAction;
+		private final Consumer<List<WRAPPER>> orderingAction;
 
 		private final MessageGenerator descriptorsAddedMessageGenerator;
 
 		private final MessageGenerator descriptorsRemovedMessageGenerator;
 
-		ElementDescriptorOrderer(Consumer<List<ELEMENT>> orderingAction,
+		DescriptorWrapperOrderer(Consumer<List<WRAPPER>> orderingAction,
 				MessageGenerator descriptorsAddedMessageGenerator,
 				MessageGenerator descriptorsRemovedMessageGenerator) {
 
@@ -150,12 +162,12 @@ protected class ElementDescriptorOrderer {
 			this.descriptorsRemovedMessageGenerator = descriptorsRemovedMessageGenerator;
 		}
 
-		private boolean canOrderDescriptors() {
+		private boolean canOrderWrappers() {
 			return this.orderingAction != null;
 		}
 
-		private void orderDescriptors(List<ELEMENT> elements) {
-			this.orderingAction.accept(elements);
+		private void orderWrappers(List<WRAPPER> wrappers) {
+			this.orderingAction.accept(wrappers);
 		}
 
 		private void logDescriptorsAddedWarning(int number) {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
index ecd90f929ce5..9df0c8e59a44 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
@@ -27,8 +27,7 @@
  * @since 5.8
  */
 class ClassOrderingVisitor
-		extends AbstractOrderingVisitor<JupiterEngineDescriptor, ClassBasedTestDescriptor, DefaultClassDescriptor>
-		implements TestDescriptor.Visitor {
+		extends AbstractOrderingVisitor<JupiterEngineDescriptor, ClassBasedTestDescriptor, DefaultClassDescriptor> {
 
 	private final JupiterConfiguration configuration;
 
@@ -49,23 +48,23 @@ private void orderContainedClasses(JupiterEngineDescriptor jupiterEngineDescript
 			jupiterEngineDescriptor, //
 			ClassBasedTestDescriptor.class, //
 			DefaultClassDescriptor::new, //
-			createElementDescriptorOrderer(classOrderer));
+			createDescriptorWrapperOrderer(classOrderer));
 	}
 
 	@Override
-	protected ElementDescriptorOrderer getElementDescriptorOrderer(
-			ElementDescriptorOrderer inheritedElementDescriptorOrderer,
-			AbstractAnnotatedElementDescriptor<?> annotatedElementDescriptor) {
+	protected DescriptorWrapperOrderer getDescriptorWrapperOrderer(
+			DescriptorWrapperOrderer inheritedDescriptorWrapperOrderer,
+			AbstractAnnotatedDescriptorWrapper<?> descriptorWrapper) {
 
-		AnnotatedElement annotatedElement = annotatedElementDescriptor.getAnnotatedElement();
+		AnnotatedElement annotatedElement = descriptorWrapper.getAnnotatedElement();
 		return AnnotationUtils.findAnnotation(annotatedElement, TestClassOrder.class)//
 				.map(TestClassOrder::value)//
 				.<ClassOrderer> map(ReflectionUtils::newInstance)//
-				.map(this::createElementDescriptorOrderer)//
-				.orElse(inheritedElementDescriptorOrderer);
+				.map(this::createDescriptorWrapperOrderer)//
+				.orElse(inheritedDescriptorWrapperOrderer);
 	}
 
-	private ElementDescriptorOrderer createElementDescriptorOrderer(ClassOrderer classOrderer) {
+	private DescriptorWrapperOrderer createDescriptorWrapperOrderer(ClassOrderer classOrderer) {
 		Consumer<List<DefaultClassDescriptor>> orderingAction = classOrderer == null ? null : //
 				classDescriptors -> classOrderer.orderClasses(
 					new DefaultClassOrdererContext(classDescriptors, this.configuration));
@@ -77,7 +76,7 @@ private ElementDescriptorOrderer createElementDescriptorOrderer(ClassOrderer cla
 			"ClassOrderer [%s] removed %s ClassDescriptor(s) which will be retained with arbitrary ordering.",
 			nullSafeToString(classOrderer), number);
 
-		return new ElementDescriptorOrderer(orderingAction, descriptorsAddedMessageGenerator,
+		return new DescriptorWrapperOrderer(orderingAction, descriptorsAddedMessageGenerator,
 			descriptorsRemovedMessageGenerator);
 	}
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
index dd3baa5b1cb5..e9e13f7c242d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
@@ -20,7 +20,7 @@
  *
  * @since 5.8
  */
-class DefaultClassDescriptor extends AbstractAnnotatedElementDescriptor<Class<?>> implements ClassDescriptor {
+class DefaultClassDescriptor extends AbstractAnnotatedDescriptorWrapper<Class<?>> implements ClassDescriptor {
 
 	DefaultClassDescriptor(ClassBasedTestDescriptor testDescriptor) {
 		super(testDescriptor, testDescriptor.getTestClass());
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
index 13aeed85efb8..6bf6042eb449 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
@@ -22,7 +22,7 @@
  *
  * @since 5.4
  */
-class DefaultMethodDescriptor extends AbstractAnnotatedElementDescriptor<Method> implements MethodDescriptor {
+class DefaultMethodDescriptor extends AbstractAnnotatedDescriptorWrapper<Method> implements MethodDescriptor {
 
 	DefaultMethodDescriptor(MethodBasedTestDescriptor testDescriptor) {
 		super(testDescriptor, testDescriptor.getTestMethod());
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
index be873d0a63d7..7cb195f11ecd 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
@@ -29,11 +29,11 @@ class DefaultMethodOrdererContext implements MethodOrdererContext {
 	private final List<? extends MethodDescriptor> methodDescriptors;
 	private final JupiterConfiguration configuration;
 
-	DefaultMethodOrdererContext(List<? extends MethodDescriptor> methodDescriptors, Class<?> testClass,
+	DefaultMethodOrdererContext(Class<?> testClass, List<? extends MethodDescriptor> methodDescriptors,
 			JupiterConfiguration configuration) {
 
-		this.methodDescriptors = methodDescriptors;
 		this.testClass = testClass;
+		this.methodDescriptors = methodDescriptors;
 		this.configuration = configuration;
 	}
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
index 3fba04c7fcf8..599a34e50f47 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
@@ -29,8 +29,7 @@
  * @since 5.5
  */
 class MethodOrderingVisitor
-		extends AbstractOrderingVisitor<ClassBasedTestDescriptor, MethodBasedTestDescriptor, DefaultMethodDescriptor>
-		implements TestDescriptor.Visitor {
+		extends AbstractOrderingVisitor<ClassBasedTestDescriptor, MethodBasedTestDescriptor, DefaultMethodDescriptor> {
 
 	private final JupiterConfiguration configuration;
 
@@ -57,7 +56,7 @@ private void orderContainedMethods(ClassBasedTestDescriptor classBasedTestDescri
 				.ifPresent(methodOrderer -> {
 
 					Consumer<List<DefaultMethodDescriptor>> orderingAction = methodDescriptors -> methodOrderer.orderMethods(
-						new DefaultMethodOrdererContext(methodDescriptors, testClass, this.configuration));
+						new DefaultMethodOrdererContext(testClass, methodDescriptors, this.configuration));
 
 					MessageGenerator descriptorsAddedMessageGenerator = number -> String.format(
 						"MethodOrderer [%s] added %s MethodDescriptor(s) for test class [%s] which will be ignored.",
@@ -66,13 +65,13 @@ private void orderContainedMethods(ClassBasedTestDescriptor classBasedTestDescri
 						"MethodOrderer [%s] removed %s MethodDescriptor(s) for test class [%s] which will be retained with arbitrary ordering.",
 						methodOrderer.getClass().getName(), number, testClass.getName());
 
-					ElementDescriptorOrderer elementDescriptorOrderer = new ElementDescriptorOrderer(orderingAction,
+					DescriptorWrapperOrderer descriptorWrapperOrderer = new DescriptorWrapperOrderer(orderingAction,
 						descriptorsAddedMessageGenerator, descriptorsRemovedMessageGenerator);
 
 					orderChildrenTestDescriptors(classBasedTestDescriptor, //
 						MethodBasedTestDescriptor.class, //
 						DefaultMethodDescriptor::new, //
-						elementDescriptorOrderer);
+						descriptorWrapperOrderer);
 
 					// Note: MethodOrderer#getDefaultExecutionMode() is guaranteed
 					// to be invoked after MethodOrderer#orderMethods().

From 8febbfb33ec85340fe61eb57cf756577cb60a0c5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 30 Aug 2021 16:14:57 +0200
Subject: [PATCH 0482/1433] Document @TestClassOrder support

Closes: #2699
---
 .../src/docs/asciidoc/link-attributes.adoc    |  1 +
 .../release-notes/release-notes-5.8.0.adoc    |  6 ++-
 .../asciidoc/user-guide/writing-tests.adoc    | 52 +++++++++++++------
 .../example/OrderedNestedTestClassesDemo.java | 41 +++++++++++++++
 4 files changed, 83 insertions(+), 17 deletions(-)
 create mode 100644 documentation/src/test/java/example/OrderedNestedTestClassesDemo.java

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 68d61bc1bbd1..3cc23413cee2 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -79,6 +79,7 @@ endif::[]
 :Order:                                      {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/Order.html[@Order]
 :RepetitionInfo:                             {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/RepetitionInfo.html[RepetitionInfo]
 :TestInfo:                                   {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/TestInfo.html[TestInfo]
+:TestClassOrder:                             {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/TestClassOrder.html[@TestClassOrder]
 :TestMethodOrder:                            {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/TestMethodOrder.html[@TestMethodOrder]
 :TestReporter:                               {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/TestReporter.html[TestReporter]
 :TestTemplate:                               {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/TestTemplate.html[@TestTemplate]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index cd803dd8a1df..0321a8da3211 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -125,9 +125,11 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* Test classes can now be ordered by passing the fully-qualified name of a class
-  implementing `ClassOrderer` as the value of the new
+* Test classes can now be ordered _globally_ by supplying the fully-qualified name of a
+  class implementing the `ClassOrderer` API as the value of the new
   `junit.jupiter.testclass.order.default` configuration parameter.
+* `@Nested` test classes can be ordered _locally_ via the new `@TestClassOrder` annotation
+  in which a `ClassOrderer` can be specified.
 * `@ExtendWith` may now be used to register extensions declaratively via fields or
   parameters in test class constructors, test methods, and lifecycle methods. See
   <<../user-guide/index.adoc#extensions-registration-declarative, Declarative Extension
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 35883af88787..764ff932379b 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -29,7 +29,8 @@ in the `junit-jupiter-api` module.
 | `@RepeatedTest`          | Denotes that a method is a test template for a <<writing-tests-repeated-tests, repeated test>>. Such methods are _inherited_ unless they are _overridden_.
 | `@TestFactory`           | Denotes that a method is a test factory for <<writing-tests-dynamic-tests, dynamic tests>>. Such methods are _inherited_ unless they are _overridden_.
 | `@TestTemplate`          | Denotes that a method is a <<writing-tests-test-templates, template for test cases>> designed to be invoked multiple times depending on the number of invocation contexts returned by the registered <<extensions-test-templates, providers>>. Such methods are _inherited_ unless they are _overridden_.
-| `@TestMethodOrder`       | Used to configure the <<writing-tests-test-execution-order, test method execution order>> for the annotated test class; similar to JUnit 4's `@FixMethodOrder`. Such annotations are _inherited_.
+| `@TestClassOrder`        | Used to configure the <<writing-tests-test-execution-order-classes, test class execution order>> for `@Nested` test classes in the annotated test class. Such annotations are _inherited_.
+| `@TestMethodOrder`       | Used to configure the <<writing-tests-test-execution-order-methods, test method execution order>> for the annotated test class; similar to JUnit 4's `@FixMethodOrder`. Such annotations are _inherited_.
 | `@TestInstance`          | Used to configure the <<writing-tests-test-instance-lifecycle, test instance lifecycle>> for the annotated test class. Such annotations are _inherited_.
 | `@DisplayName`           | Declares a custom <<writing-tests-display-names,display name>> for the test class or test method. Such annotations are not _inherited_.
 | `@DisplayNameGeneration` | Declares a custom <<writing-tests-display-name-generator,display name generator>> for the test class. Such annotations are _inherited_.
@@ -524,6 +525,7 @@ repeatable builds.
 NOTE: See <<writing-tests-classes-and-methods>> for a definition of _test method_ and
 _test class_.
 
+[[writing-tests-test-execution-order-methods]]
 ==== Method Order
 
 Although true _unit tests_ typically should not rely on the order in which they are
@@ -560,7 +562,7 @@ order specified via the `@Order` annotation.
 include::{testDir}/example/OrderedTestsDemo.java[tags=user_guide]
 ----
 
-[[writing-tests-test-execution-order-default]]
+[[writing-tests-test-execution-order-methods-default]]
 ===== Setting the Default Method Orderer
 
 You can use the `junit.jupiter.testmethod.order.default` <<running-tests-config-params,
@@ -583,30 +585,33 @@ junit.jupiter.testmethod.order.default = \
 Similarly, you can specify the fully qualified name of any custom class that implements
 `MethodOrderer`.
 
+[[writing-tests-test-execution-order-classes]]
 ==== Class Order
 
-For build optimization purposes, it can be helpful to run _test classes_ in a specific
-order.
+Although test classes typically should not rely on the order in which they are executed,
+there are times when it is desirable to enforce a specific test class execution order. You
+may wish to execute test classes in a random order to ensure there are no accidental
+dependencies between test classes, or you may wish to order test classes to optimize build
+time as outlined in the following scenarios.
 
-For example:
+* Run previously failing tests and faster tests first: "fail fast" mode
+* With parallel execution enabled, run longer tests first: "shortest test plan execution
+  duration" mode
+* Various other use cases
 
-* Previously failed tests and faster tests first: fail fast
-* With parallelism enabled, longer tests first: shortest test execution duration
-* Other use cases
-
-You can use the `junit.jupiter.testclass.order.default` <<running-tests-config-params,
-configuration parameter>> to specify the fully qualified class name of the
-`{ClassOrderer}` you would like to use. The supplied class must implement the
-`ClassOrderer` interface.
+To configure test class execution order _globally_ for the entire test suite, use the
+`junit.jupiter.testclass.order.default` <<running-tests-config-params, configuration
+parameter>> to specify the fully qualified class name of the `{ClassOrderer}` you would
+like to use. The supplied class must implement the `ClassOrderer` interface.
 
 You can implement your own custom `ClassOrderer` or use one of the following built-in
 `ClassOrderer` implementations.
 
+* `{ClassOrderer_ClassName}`: sorts test classes _alphanumerically_ based on their fully
+  qualified class names
 * `{ClassOrderer_DisplayName}`: sorts test classes _alphanumerically_ based on their
   display names (see <<writing-tests-display-name-generator-precedence-rules, display name
   generation precedence rules>>)
-* `{ClassOrderer_ClassName}`: sorts test classes _alphanumerically_ based on their fully
-  qualified class names
 * `{ClassOrderer_OrderAnnotation}`: sorts test classes _numerically_ based on values
   specified via the `{Order}` annotation
 * `{ClassOrderer_Random}`: orders test classes _pseudo-randomly_ and supports
@@ -630,6 +635,23 @@ NOTE: Top-level test classes will be ordered relative to each other; whereas, `@
 test classes will be ordered relative to other `@Nested` test classes sharing the same
 _enclosing class_.
 
+To configure test class execution order _locally_ for `@Nested` test classes, declare the
+`{TestClassOrder}` annotation on the enclosing class for the `@Nested` test classes you
+want to order, and supply a class reference to the `ClassOrderer` implementation you would
+like to use directly in the `@TestClassOrder` annotation. The configured `ClassOrderer`
+will be applied recursively to `@Nested` test classes and their `@Nested` test classes.
+Note that a local `@TestClassOrder` declaration always overrides an inherited
+`@TestClassOrder` declaration or a `ClassOrderer` configured globally via the
+`junit.jupiter.testclass.order.default` configuration parameter.
+
+The following example demonstrates how to guarantee that `@Nested` test classes are
+executed in the order specified via the `@Order` annotation.
+
+[source,java,indent=0]
+----
+include::{testDir}/example/OrderedNestedTestClassesDemo.java[tags=user_guide]
+----
+
 [[writing-tests-test-instance-lifecycle]]
 === Test Instance Lifecycle
 
diff --git a/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java b/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java
new file mode 100644
index 000000000000..3565feb52873
--- /dev/null
+++ b/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example;
+
+// tag::user_guide[]
+import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestClassOrder;
+
+@TestClassOrder(ClassOrderer.OrderAnnotation.class)
+class OrderedNestedTestClassesDemo {
+
+	@Nested
+	@Order(1)
+	class PrimaryTests {
+
+		@Test
+		void test1() {
+		}
+	}
+
+	@Nested
+	@Order(2)
+	class SecondaryTests {
+
+		@Test
+		void test2() {
+		}
+	}
+}
+//end::user_guide[]

From 19c5be59c0424750cfde19ee33b1bbd1def8b500 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 30 Aug 2021 18:15:52 +0200
Subject: [PATCH 0483/1433] Update Javadoc for custom disabled reasons in
 condition annotations

---
 .../junit/jupiter/api/condition/DisabledForJreRange.java | 9 ++++++++-
 .../java/org/junit/jupiter/api/condition/DisabledIf.java | 6 +++++-
 .../api/condition/DisabledIfEnvironmentVariable.java     | 9 ++++++++-
 .../jupiter/api/condition/DisabledIfSystemProperty.java  | 9 ++++++++-
 .../org/junit/jupiter/api/condition/DisabledOnJre.java   | 9 ++++++++-
 .../org/junit/jupiter/api/condition/DisabledOnOs.java    | 9 ++++++++-
 .../junit/jupiter/api/condition/EnabledForJreRange.java  | 9 ++++++++-
 .../java/org/junit/jupiter/api/condition/EnabledIf.java  | 6 +++++-
 .../api/condition/EnabledIfEnvironmentVariable.java      | 9 ++++++++-
 .../jupiter/api/condition/EnabledIfSystemProperty.java   | 9 ++++++++-
 .../org/junit/jupiter/api/condition/EnabledOnJre.java    | 9 ++++++++-
 .../org/junit/jupiter/api/condition/EnabledOnOs.java     | 9 ++++++++-
 .../jupiter/api/extension/ConditionEvaluationResult.java | 4 +++-
 13 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
index d2266bdcdb73..093f3deddf26 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
@@ -96,8 +96,15 @@
 	JRE max() default JRE.OTHER;
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
index cfd13aa5db83..ba8af2b2277f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
@@ -84,7 +84,11 @@
 	String value();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
 	 */
 	String disabledReason() default "";
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
index 0c1a5f0e9a60..30657ff96ee0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
@@ -92,8 +92,15 @@
 	String matches();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
index ddbcd6ce5d95..16acc56e6efd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
@@ -92,8 +92,15 @@
 	String matches();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
index 268c67019006..2e7acfa3adaa 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
@@ -80,8 +80,15 @@
 	JRE[] value();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index 6bf37171846a..00c8d0f9a6b8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -80,8 +80,15 @@
 	OS[] value();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
index 7df3a0310362..13e237bea7a9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
@@ -96,8 +96,15 @@
 	JRE max() default JRE.OTHER;
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
index e546733e7a4a..303e83a5c96e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
@@ -84,7 +84,11 @@
 	String value();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
 	 */
 	String disabledReason() default "";
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
index cb8a5c6d119c..980c667becd7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
@@ -91,8 +91,15 @@
 	String matches();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
index e4fa31447d15..345cf5b78bfc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
@@ -91,8 +91,15 @@
 	String matches();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
index 12dc4091138a..3e1d4fc12f64 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
@@ -80,7 +80,14 @@
 	JRE[] value();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index f4000c3c5673..e043b0c512e4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -80,8 +80,15 @@
 	OS[] value();
 
 	/**
-	 * Reason to provide if the test of container ends up being disabled.
+	 * Custom reason to provide if the test or container is disabled.
+	 *
+	 * <p>If a custom reason is supplied, it will be combined with the default
+	 * reason for this annotation. If a custom reason is not supplied, the default
+	 * reason will be used.
+	 *
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	String disabledReason() default "";
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
index 72ee94bfbadf..aefd501eec34 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
@@ -19,7 +19,7 @@
 import org.junit.platform.commons.util.ToStringBuilder;
 
 /**
- * The result of evaluating an {@linkplain ExecutionCondition}.
+ * The result of evaluating an {@link ExecutionCondition}.
  *
  * @since 5.0
  */
@@ -53,7 +53,9 @@ public static ConditionEvaluationResult disabled(String reason) {
 	 * @param reason the default reason why the container or test should be disabled
 	 * @param customReason the custom reason why the container or test should be disabled
 	 * @return a disabled {@code ConditionEvaluationResult} with the given reasons
+	 * @since 5.7
 	 */
+	@API(status = STABLE, since = "5.7")
 	public static ConditionEvaluationResult disabled(String reason, String customReason) {
 		if (StringUtils.isBlank(customReason)) {
 			return disabled(reason);

From 67ad2a445d20491a0a48c005c9178126dec0c8f6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 30 Aug 2021 19:26:32 +0200
Subject: [PATCH 0484/1433] Polish @DisableParentConfigurationParameters

---
 .../suite/api/DisableParentConfigurationParameters.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
index cf2aefa8a88f..48f116a35582 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
@@ -24,13 +24,14 @@
  * Disable parent configuration parameters.
  *
  * <p>By default a suite discovers tests using the configuration parameters
- * explicitly configured by {@link ConfigurationParameter @ConfigurationParameter}
- * and the configuration parameters from the discovery request that discovered
- * the suite.
+ * explicitly configured via {@link ConfigurationParameter @ConfigurationParameter}
+ * and the configuration parameters from the discovery request that was used to
+ * discover the suite.
  *
  * <p>Annotating a suite with this annotation disables the latter source so
  * that only explicit configuration parameters are taken into account.
  *
+ * @since 1.8
  * @see ConfigurationParameter
  * @see Suite
  */
@@ -40,5 +41,4 @@
 @Documented
 @API(status = Status.EXPERIMENTAL, since = "1.8")
 public @interface DisableParentConfigurationParameters {
-
 }

From 0ba4d0bff5bdcb4384c58bd101a19b228e30d91e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 2 Sep 2021 13:41:51 +0200
Subject: [PATCH 0485/1433] Polish DynamicTestsDemo

---
 .../src/test/java/example/DynamicTestsDemo.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/documentation/src/test/java/example/DynamicTestsDemo.java b/documentation/src/test/java/example/DynamicTestsDemo.java
index f93a60aef728..df23a28a57ea 100644
--- a/documentation/src/test/java/example/DynamicTestsDemo.java
+++ b/documentation/src/test/java/example/DynamicTestsDemo.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.DynamicContainer.dynamicContainer;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.junit.jupiter.api.Named.named;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -156,17 +157,15 @@ Stream<DynamicTest> dynamicTestsFromStreamFactoryMethod() {
 	Stream<DynamicTest> dynamicTestsFromStreamFactoryMethodWithNames() {
 		// Stream of palindromes to check
 		Stream<Named<String>> inputStream = Stream.of(
-				Named.of("racecar is a palindrome", "racecar"),
-				Named.of("radar is also a palindrome", "radar"),
-				Named.of("mom also seems to be a palindrome", "mom"),
-				Named.of("dad is yet another palindrome", "dad")
-		);
-
-		// Executes tests based on the current input value.
-		ThrowingConsumer<String> testExecutor = text -> assertTrue(isPalindrome(text));
+				named("racecar is a palindrome", "racecar"),
+				named("radar is also a palindrome", "radar"),
+				named("mom also seems to be a palindrome", "mom"),
+				named("dad is yet another palindrome", "dad")
+			);
 
 		// Returns a stream of dynamic tests.
-		return DynamicTest.stream(inputStream, testExecutor);
+		return DynamicTest.stream(inputStream,
+			text -> assertTrue(isPalindrome(text)));
 	}
 
 	@TestFactory

From 1e9703a099e1169e09929d7d6c2a1f2cc15c22ae Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 2 Sep 2021 13:49:21 +0200
Subject: [PATCH 0486/1433] Support @Nested test class constructors with
 arguments on JDK 8 again

The recently added support for registering extensions via @ExtendWith
on parameters introduced a regression for @Nested test classes whose
constructors accept arguments. Namely, a PreconditionViolationException
is now thrown stating the following.

Parameter index must not be 0 for an inner class constructor

Note, however, that this regression only applies to @Nested test classes
compiled with JDK 8, due to a bug in javac in JDK 8.

This commit fixes this regression by effectively not searching for
annotations on the parameter for the implicit enclosing instance when
the JDK 8 bug is detected.

Fixes: #2704
---
 .../platform/commons/util/AnnotationUtils.java  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
index fd6bde1e937a..44142512f380 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
@@ -403,20 +403,21 @@ private static boolean isRepeatableAnnotationContainer(Class<? extends Annotatio
 	 *
 	 * <p>This method provides a workaround for this off-by-one error by helping
 	 * JUnit maintainers and extension authors to access annotations on the preceding
-	 * {@link Parameter} object (i.e., {@code index - 1}). The {@code index} must
-	 * never be zero in such situations since this method should never attempt to
-	 * resolve an effective parameter for the implicit <em>enclosing instance</em>
-	 * parameter.
+	 * {@link Parameter} object (i.e., {@code index - 1}). If the supplied
+	 * {@code index} is zero in such situations this method will return {@code null}
+	 * since the parameter for the implicit <em>enclosing instance</em> will never
+	 * be annotated.
 	 *
 	 * <h4>WARNING</h4>
 	 *
 	 * <p>The {@code AnnotatedElement} returned by this method should never be cast and
 	 * treated as a {@code Parameter} since the metadata (e.g., {@link Parameter#getName()},
 	 * {@link Parameter#getType()}, etc.) will not match those for the declared parameter
-	 * at the given index in an inner class constructor.
+	 * at the given index in an inner class constructor for code compiled with JDK 8.
 	 *
 	 * @return the supplied {@code Parameter}, or the <em>effective</em> {@code Parameter}
-	 * if the aforementioned bug is detected
+	 * if the aforementioned bug is detected, or {@code null} if the bug is detected and
+	 * the supplied {@code index} is {@code 0}
 	 * @since 1.8
 	 */
 	private static AnnotatedElement getEffectiveAnnotatedParameter(Parameter parameter, int index) {
@@ -426,7 +427,9 @@ private static AnnotatedElement getEffectiveAnnotatedParameter(Parameter paramet
 		if (executable instanceof Constructor && isInnerClass(executable.getDeclaringClass())
 				&& executable.getParameterAnnotations().length == executable.getParameterCount() - 1) {
 
-			Preconditions.condition(index != 0, "Parameter index must not be 0 for an inner class constructor");
+			if (index == 0) {
+				return null;
+			}
 
 			return executable.getParameters()[index - 1];
 		}

From 1f9e1b700ba21dec3843cb9056a69742a60be1ed Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 2 Sep 2021 14:50:06 +0200
Subject: [PATCH 0487/1433] Use compiled code for RandomNumberExtension demo

---
 .../docs/asciidoc/user-guide/extensions.adoc  | 30 ++------------
 .../test/java/example/extensions/Random.java  | 26 ++++++++++++
 .../example/extensions/RandomNumberDemo.java  | 41 +++++++++++++++++++
 .../extensions/RandomNumberExtension.java     | 39 ++++++++++++++++++
 4 files changed, 109 insertions(+), 27 deletions(-)
 create mode 100644 documentation/src/test/java/example/extensions/Random.java
 create mode 100644 documentation/src/test/java/example/extensions/RandomNumberDemo.java
 create mode 100644 documentation/src/test/java/example/extensions/RandomNumberExtension.java

diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index c2f1773be259..52777870bedc 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -103,40 +103,16 @@ registered declaratively at the field or parameter level. Consider a
 via a parameter in a constructor, test method, or lifecycle method. If the extension
 provides a `@Random` annotation that is meta-annotated with
 `@ExtendWith(RandomNumberExtension.class)` (see listing below), the extension can be used
-transparently as in the following `RandomNumberTests` example.
+transparently as in the following `RandomNumberDemo` example.
 
 [source,java,indent=0]
 ----
-@Target({ ElementType.FIELD, ElementType.PARAMETER })
-@Retention(RetentionPolicy.RUNTIME)
-@ExtendWith(RandomNumberExtension.class)
-public @interface Random {
-}
+include::{testDir}/example/extensions/Random.java[tags=user_guide]
 ----
 
 [source,java,indent=0]
 ----
-class RandomNumberTests {
-
-	// use random number field in test methods and @BeforeEach
-	// or @AfterEach lifecycle methods
-	@Random
-	private int randomNumber1;
-
-	RandomNumberTests(@Random int randomNumber2) {
-		// use random number in constructor
-	}
-
-	@BeforeEach
-	void beforeEach(@Random int randomNumber3) {
-		// use random number in @BeforeEach method
-	}
-
-	@Test
-	void test(@Random int randomNumber4) {
-		// use random number in test method
-	}
-}
+include::{testDir}/example/extensions/RandomNumberDemo.java[tags=user_guide]
 ----
 
 [TIP]
diff --git a/documentation/src/test/java/example/extensions/Random.java b/documentation/src/test/java/example/extensions/Random.java
new file mode 100644
index 000000000000..81a2dc7ee0d8
--- /dev/null
+++ b/documentation/src/test/java/example/extensions/Random.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example.extensions;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+//tag::user_guide[]
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(RandomNumberExtension.class)
+public @interface Random {
+}
+//end::user_guide[]
diff --git a/documentation/src/test/java/example/extensions/RandomNumberDemo.java b/documentation/src/test/java/example/extensions/RandomNumberDemo.java
new file mode 100644
index 000000000000..0b8656a99c3e
--- /dev/null
+++ b/documentation/src/test/java/example/extensions/RandomNumberDemo.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example.extensions;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+@Disabled("RandomNumberExtension has not been implemented")
+//tag::user_guide[]
+class RandomNumberDemo {
+
+	// use random number field in test methods and @BeforeEach
+	// or @AfterEach lifecycle methods
+	@Random
+	private int randomNumber1;
+
+	RandomNumberDemo(@Random int randomNumber2) {
+		// use random number in constructor
+	}
+
+	@BeforeEach
+	void beforeEach(@Random int randomNumber3) {
+		// use random number in @BeforeEach method
+	}
+
+	@Test
+	void test(@Random int randomNumber4) {
+		// use random number in test method
+	}
+
+}
+//end::user_guide[]
diff --git a/documentation/src/test/java/example/extensions/RandomNumberExtension.java b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
new file mode 100644
index 000000000000..598582725319
--- /dev/null
+++ b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example.extensions;
+
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolver;
+
+class RandomNumberExtension implements BeforeAllCallback, BeforeEachCallback, ParameterResolver {
+
+	@Override
+	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		return false;
+	}
+
+	@Override
+	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		return null;
+	}
+
+	@Override
+	public void beforeAll(ExtensionContext context) {
+	}
+
+	@Override
+	public void beforeEach(ExtensionContext context) {
+	}
+
+}

From d25b650ec2c3e781762a2573243a90f137c38201 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 6 Sep 2021 17:07:58 +0200
Subject: [PATCH 0488/1433] Update Javadoc for random seed log level

See #2664
---
 .../src/main/java/org/junit/jupiter/api/ClassOrderer.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodOrderer.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 75a1c3c993d8..3a729f911dcd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -171,7 +171,7 @@ private static int getOrder(ClassDescriptor descriptor) {
 	 * <p>By default, the random <em>seed</em> used for ordering classes is the
 	 * value returned by {@link System#nanoTime()} during static initialization
 	 * of this class. In order to support repeatable builds, the value of the
-	 * default random seed is logged at {@code INFO} level. In addition, a
+	 * default random seed is logged at {@code CONFIG} level. In addition, a
 	 * custom seed (potentially the default seed from the previous test plan
 	 * execution) may be specified via the {@link Random#RANDOM_SEED_PROPERTY_NAME
 	 * junit.jupiter.execution.class.order.random.seed} <em>configuration parameter</em>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 21664ed00778..3443eb20d584 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -230,7 +230,7 @@ private static int getOrder(MethodDescriptor descriptor) {
 	 * <p>By default, the random <em>seed</em> used for ordering methods is the
 	 * value returned by {@link System#nanoTime()} during static initialization
 	 * of this class. In order to support repeatable builds, the value of the
-	 * default random seed is logged at {@code INFO} level. In addition, a
+	 * default random seed is logged at {@code CONFIG} level. In addition, a
 	 * custom seed (potentially the default seed from the previous test plan
 	 * execution) may be specified via the {@link Random#RANDOM_SEED_PROPERTY_NAME
 	 * junit.jupiter.execution.order.random.seed} <em>configuration parameter</em>

From 3ad2d8cad815a924996e4862dd9cfd1d8e21bca5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 9 Sep 2021 14:42:23 +0200
Subject: [PATCH 0489/1433] Polishing

---
 .../main/java/org/junit/platform/launcher/LauncherSession.java | 3 ++-
 .../java/org/junit/platform/suite/api/SuiteDisplayName.java    | 2 +-
 .../org/junit/platform/launcher/core/LauncherSessionTests.java | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
index 144bbd05572d..9a3d3bd2a300 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
@@ -32,7 +32,7 @@ public interface LauncherSession extends AutoCloseable {
 	 * Get the {@link Launcher} associated with this session.
 	 *
 	 * <p>Any call to the launcher returned by this method after the session has
-	 * been closed, will throw an exception.
+	 * been closed will throw an exception.
 	 */
 	Launcher getLauncher();
 
@@ -46,4 +46,5 @@ public interface LauncherSession extends AutoCloseable {
 	 */
 	@Override
 	void close();
+
 }
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
index f63baa5d1edb..f1c06f188542 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
@@ -34,7 +34,7 @@
  *
  * <h4>JUnit 5 Suite Support</h4>
  * <p>Test suites can be run on the JUnit Platform in a JUnit 5 environment via
- * the {@code junit-platform-suite} engine.
+ * the {@code junit-platform-suite-engine} module.
  *
  * @since 1.1
  * @see Suite
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
index e4c3523e489a..30ce2c9fb208 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
@@ -103,4 +103,5 @@ void closedSessionCannotBeUsed() {
 		assertThrows(PreconditionViolationException.class, () -> launcher.execute(testPlan));
 		assertThrows(PreconditionViolationException.class, () -> launcher.execute(request));
 	}
+
 }

From 8ac3dfbc5fbef433a98684a4ca958fad91c1f0f4 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 9 Sep 2021 15:29:52 +0200
Subject: [PATCH 0490/1433] Deprecate the JUnitPlatform runner in favor of
 @Suite support

Closes #2712
---
 .../release-notes/release-notes-5.8.0.adoc    |  5 ++++-
 .../asciidoc/user-guide/running-tests.adoc    | 22 +++++++++++++++++--
 .../java/example/DocumentationTestSuite.java  |  7 +++---
 .../java/example/JUnitPlatformClassDemo.java  |  6 +++--
 .../java/example/JUnitPlatformSuiteDemo.java  |  4 ++--
 .../junit-jupiter-engine.gradle.kts           |  3 ++-
 .../org/junit/jupiter/JupiterTestSuite.java   |  7 +++---
 .../junit-jupiter-migrationsupport.gradle.kts |  2 +-
 .../JupiterMigrationSupportTestSuite.java     |  7 +++---
 .../junit-jupiter-params.gradle.kts           |  2 +-
 .../params/ParameterizedTestSuite.java        |  7 +++---
 .../junit/platform/runner/JUnitPlatform.java  |  8 +++++--
 .../junit-vintage-engine.gradle.kts           |  2 +-
 .../engine/VintageTestEngineTestSuite.java    |  7 +++---
 .../TestCaseRunWithJUnitPlatformRunner.java   |  1 +
 .../platform/JUnitPlatformTestSuite.java      |  7 +++---
 .../runner/JUnitPlatformRunnerTests.java      |  1 +
 17 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index 0321a8da3211..78f1bc62ae42 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -3,7 +3,7 @@
 
 *Date of Release:* September ❓, 2021
 
-*Scope:* ❓
+*Scope:*
 
 * Declarative test suites via `@Suite` classes
 * `LauncherSession` and accompanying listener
@@ -45,6 +45,9 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
+* The `JUnitPlatform` runner has been deprecated in favor of the new `@Suite` support. See
+  the warning in <<../user-guide/index.adoc#running-tests-junit-platform-runner, Using
+  JUnit 4 to run the JUnit Platform>> for details.
 * For consistency with the rest of the JUnit Platform, the experimental
   `LauncherDiscoveryListener` is now an interface instead of an abstract class.
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 8fe96b0ff706..ea1f7f9abc19 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -604,6 +604,25 @@ subject to expansion.
 [[running-tests-junit-platform-runner]]
 === Using JUnit 4 to run the JUnit Platform
 
+[WARNING]
+.The `JUnitPlatform` runner has been deprecated
+====
+The `JUnitPlatform` runner was developed by the JUnit team as an interim solution for
+running test suites and tests on the JUnit Platform in a JUnit 4 environment.
+
+In recent years, all mainstream build tools and IDEs provide built-in support for running
+tests directly on the JUnit Platform.
+
+In addition, the introduction of `@Suite` support provided by the
+`junit-platform-suite-engine` module makes the `JUnitPlatform` runner obsolete. See
+<<junit-platform-suite-engine>> for details.
+
+The `JUnitPlatform` runner has therefore been deprecated in JUnit Platform 1.8 and will be
+removed in JUnit Platform 2.0.
+
+If you are using the `JUnitPlatform` runner, please migrate to the `@Suite` support.
+====
+
 The `JUnitPlatform` runner is a JUnit 4 based `Runner` which enables you to run any test
 whose programming model is supported on the JUnit Platform in a JUnit 4 environment --
 for example, a JUnit Jupiter test class.
@@ -613,8 +632,7 @@ build systems that support JUnit 4 but do not yet support the JUnit Platform dir
 
 NOTE: Since the JUnit Platform has features that JUnit 4 does not have, the runner is
 only able to support a subset of the JUnit Platform functionality, especially with regard
-to reporting (see <<running-tests-junit-platform-runner-technical-names>>). But for the
-time being the `JUnitPlatform` runner is an easy way to get started.
+to reporting (see <<running-tests-junit-platform-runner-technical-names>>).
 
 [[running-tests-junit-platform-runner-setup]]
 ==== Setup
diff --git a/documentation/src/test/java/example/DocumentationTestSuite.java b/documentation/src/test/java/example/DocumentationTestSuite.java
index c068a7d5b41d..d430a6618158 100644
--- a/documentation/src/test/java/example/DocumentationTestSuite.java
+++ b/documentation/src/test/java/example/DocumentationTestSuite.java
@@ -10,11 +10,10 @@
 
 package example;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.ExcludeTags;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * <h3>Logging Configuration</h3>
@@ -29,9 +28,9 @@
  *
  * @since 5.0
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("example")
 @IncludeClassNamePatterns(".+(Tests|Demo)$")
 @ExcludeTags("exclude")
-public class DocumentationTestSuite {
+class DocumentationTestSuite {
 }
diff --git a/documentation/src/test/java/example/JUnitPlatformClassDemo.java b/documentation/src/test/java/example/JUnitPlatformClassDemo.java
index 8dbfaa25d678..a4b01f67be04 100644
--- a/documentation/src/test/java/example/JUnitPlatformClassDemo.java
+++ b/documentation/src/test/java/example/JUnitPlatformClassDemo.java
@@ -14,10 +14,12 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
+//end::user_guide[]
+@SuppressWarnings("deprecation")
+//tag::user_guide[]
+@RunWith(org.junit.platform.runner.JUnitPlatform.class)
 public class JUnitPlatformClassDemo {
 
 	@Test
diff --git a/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java b/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
index 5c9a4d0030d0..9a572b28b9cc 100644
--- a/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
+++ b/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
@@ -11,15 +11,15 @@
 package example;
 
 //tag::user_guide[]
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.SuiteDisplayName;
 import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
+@RunWith(org.junit.platform.runner.JUnitPlatform.class)
 @SuiteDisplayName("JUnit Platform Suite Demo")
 @SelectPackages("example")
 //end::user_guide[]
+@SuppressWarnings("deprecation")
 @org.junit.platform.suite.api.ExcludeTags("exclude")
 //tag::user_guide[]
 public class JUnitPlatformSuiteDemo {
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index e3cf2f0d363e..c0902dca8f8f 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -17,10 +17,11 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	testImplementation(projects.junitPlatformLauncher)
-	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
 	testImplementation(testFixtures(projects.junitPlatformCommons))
 	testImplementation(kotlin("stdlib"))
+	testImplementation(libs.junit4)
 	testImplementation(libs.kotlinx.coroutines)
 	testImplementation(libs.groovy3)
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
index 3847801ae13f..6c03f9db17b1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
@@ -10,11 +10,10 @@
 
 package org.junit.jupiter;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Test suite for the JUnit Jupiter programming model, extension model, and
@@ -32,9 +31,9 @@
  *
  * @since 5.0
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("org.junit.jupiter")
 @IncludeClassNamePatterns(".*Tests?")
 @IncludeEngines("junit-jupiter")
-public class JupiterTestSuite {
+class JupiterTestSuite {
 }
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index 4004620a5992..81e531eb3f3d 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 
 	testImplementation(projects.junitJupiterEngine)
 	testImplementation(projects.junitPlatformLauncher)
-	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
 }
 
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
index bb1d88cbc220..45230eedb7f3 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
@@ -10,11 +10,10 @@
 
 package org.junit.jupiter.migrationsupport;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Test suite for JUnit Jupiter migration support.
@@ -31,9 +30,9 @@
  *
  * @since 5.0
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("org.junit.jupiter.migrationsupport")
 @IncludeClassNamePatterns(".*Tests?")
 @IncludeEngines("junit-jupiter")
-public class JupiterMigrationSupportTestSuite {
+class JupiterMigrationSupportTestSuite {
 }
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 54f37c90dc81..09bdc726b811 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 	testImplementation(projects.junitPlatformTestkit)
 	testImplementation(projects.junitJupiterEngine)
 	testImplementation(projects.junitPlatformLauncher)
-	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformSuiteEngine)
 
 	compileOnly(kotlin("stdlib"))
 	testImplementation(kotlin("stdlib"))
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
index e3c872925cf6..b8c65a31bbb0 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
@@ -10,11 +10,10 @@
 
 package org.junit.jupiter.params;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Test suite for JUnit Jupiter parameterized test support.
@@ -31,9 +30,9 @@
  *
  * @since 5.0
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("org.junit.jupiter.params")
 @IncludeClassNamePatterns(".*Tests?")
 @IncludeEngines("junit-jupiter")
-public class ParameterizedTestSuite {
+class ParameterizedTestSuite {
 }
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index adc47426c3cd..1a9823ad6643 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -11,7 +11,7 @@
 package org.junit.platform.runner;
 
 import static java.util.stream.Collectors.toList;
-import static org.apiguardian.api.API.Status.STABLE;
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder.request;
@@ -45,6 +45,7 @@
 import org.junit.platform.suite.api.SelectModules;
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.SelectUris;
+import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.api.SuiteDisplayName;
 import org.junit.platform.suite.api.UseTechnicalNames;
 import org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder;
@@ -105,8 +106,11 @@
  * @see SuiteDisplayName
  * @see UseTechnicalNames
  * @see ConfigurationParameter
+ * @deprecated since 1.8, in favor of the {@link Suite @Suite} support provided by
+ * the {@code junit-platform-suite-engine} module; to be removed in JUnit Platform 2.0
  */
-@API(status = STABLE, since = "1.0")
+@API(status = DEPRECATED, since = "1.8")
+@Deprecated
 public class JUnitPlatform extends Runner implements Filterable {
 
 	// @formatter:off
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 0cb2a01717cb..ef284503944d 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 	testFixturesImplementation(projects.junitPlatformRunner)
 
 	testImplementation(projects.junitPlatformLauncher)
-	testImplementation(projects.junitPlatformRunner)
+	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
 }
 
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
index 80064e4e133e..45d70d344949 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
@@ -10,11 +10,10 @@
 
 package org.junit.vintage.engine;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Test suite for the {@link VintageTestEngine}.
@@ -31,9 +30,9 @@
  *
  * @since 4.12
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("org.junit.vintage.engine")
 @IncludeClassNamePatterns(".*Tests?")
 @IncludeEngines("junit-jupiter")
-public class VintageTestEngineTestSuite {
+class VintageTestEngineTestSuite {
 }
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
index 99596696558d..e7a8a2dc59cf 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
@@ -17,6 +17,7 @@
 /**
  * @since 4.12
  */
+@SuppressWarnings("deprecation")
 @RunWith(JUnitPlatform.class)
 @SelectClasses(PlainJUnit4TestCaseWithSingleTestWhichFails.class)
 public class TestCaseRunWithJUnitPlatformRunner {
diff --git a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
index d634d52c9f8b..6900d12e7bc9 100644
--- a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
@@ -10,11 +10,10 @@
 
 package org.junit.platform;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Test suite for the JUnit Platform.
@@ -31,9 +30,9 @@
  *
  * @since 1.0
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("org.junit.platform")
 @IncludeClassNamePatterns(".*Tests?")
 @IncludeEngines("junit-jupiter")
-public class JUnitPlatformTestSuite {
+class JUnitPlatformTestSuite {
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index 169506de2504..b2491e7913fc 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -91,6 +91,7 @@
  * @since 1.0
  */
 @Tag("junit4")
+@SuppressWarnings("deprecation")
 class JUnitPlatformRunnerTests {
 
 	@Nested

From d88676a83729b4dc1dfaacf27c5374632ed02f6f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 9 Sep 2021 16:32:59 +0200
Subject: [PATCH 0491/1433] Polishing

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf9364b3aa8f..96992d7a50e3 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ label are specifically targeted for community contributions.
 
 ## Getting Help
 
-Ask JUnit 5 related questions on [StackOverflow] or chat with the team and the community on [Gitter].
+Ask JUnit 5 related questions on [StackOverflow] or chat with the community on [Gitter].
 
 ## Continuous Integration Builds
 

From af8ab22d9b24dd44f25e37942e0d0e1c2bd6945f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 9 Sep 2021 16:45:17 +0200
Subject: [PATCH 0492/1433] Polish suite documentation

---
 .../src/docs/asciidoc/user-guide/appendix.adoc    | 15 +++++++++------
 .../platform/suite/commons/package-info.java      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/appendix.adoc b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
index afd8a372d591..33739280750d 100644
--- a/documentation/src/docs/asciidoc/user-guide/appendix.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
@@ -4,7 +4,8 @@
 [[reproducible-builds]]
 === Reproducible Builds
 
-Starting with version 5.7, JUnit 5 aims for its non-javadoc JARs to be https://reproducible-builds.org/[reproducible]
+Starting with version 5.7, JUnit 5 aims for its non-javadoc JARs to be
+https://reproducible-builds.org/[reproducible].
 
 Under identical build conditions, such as Java version, repeated builds should provide the
 same output byte-for-byte.
@@ -54,14 +55,16 @@ artifacts are deployed to Sonatype's {snapshot-repo}[snapshots repository] under
     environment. See <<running-tests-junit-platform-runner>> for details.
   `junit-platform-suite`::
     JUnit Platform Suite artifact that transitively pulls in dependencies on
-    `junit-platform-suite-api`, `junit-platform-suite-engine` for simplified
-    dependency management in build tools such as Gradle and Maven.
+    `junit-platform-suite-api` and `junit-platform-suite-engine` for simplified dependency
+	management in build tools such as Gradle and Maven.
   `junit-platform-suite-api`::
     Annotations for configuring test suites on the JUnit Platform. Supported by the
-    <<junit-platform-suite-engine,JUnit Platform Suite Engine>> and
-    <<running-tests-junit-platform-runner,JUnitPlatform runner>>.
+    <<junit-platform-suite-engine, JUnit Platform Suite Engine>> and the
+    <<running-tests-junit-platform-runner, JUnitPlatform runner>>.
+  `junit-platform-suite-commons`::
+    Common support utilities for executing test suites on the JUnit Platform.
   `junit-platform-suite-engine`::
-    Engine to execute suites on the JUnit Platform. See
+    Engine that executes test suites on the JUnit Platform; only required at runtime. See
     <<junit-platform-suite-engine,JUnit Platform Suite Engine>> for details.
   `junit-platform-testkit`::
      Provides support for executing a test plan for a given `TestEngine` and then
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
index a35d7d91a9a7..f087359b5768 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Common APIs and support utilities for the JUnit Platform Suite.
+ * Common support utilities for executing test suites on the JUnit Platform.
  *
  * <h3>DISCLAIMER</h3>
  *

From af7dc3cb5163c12fe28ae5db7d3ca80ca39af41d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 9 Sep 2021 16:52:45 +0200
Subject: [PATCH 0493/1433] Extract JUnit 4 into its own package in the
 Dependency Diagram

---
 documentation/src/docs/asciidoc/user-guide/appendix.adoc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/appendix.adoc b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
index 33739280750d..d92194fd2b79 100644
--- a/documentation/src/docs/asciidoc/user-guide/appendix.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/appendix.adoc
@@ -149,7 +149,6 @@ package org.junit.jupiter {
 
 package org.junit.vintage {
     [junit-vintage-engine] as vintage_engine
-    [junit:junit] as junit4
 }
 
 package org.junit.platform {
@@ -167,6 +166,10 @@ package org.junit.platform {
     [junit-platform-testkit] as testkit
 }
 
+package "JUnit 4" {
+    [junit:junit] as junit4
+}
+
 package org.opentest4j {
     [opentest4j]
 }

From 75538a7262f8fe44a085d061d37be8f3792eb241 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 10 Sep 2021 15:11:58 +0200
Subject: [PATCH 0494/1433] Document that autoCloseArguments in
 @ParameterizedTest is a potentially breaking change

Closes #2706
---
 .../release-notes/release-notes-5.8.0.adoc      | 11 +++++++++--
 .../docs/asciidoc/user-guide/writing-tests.adoc | 17 ++++++++++++++---
 .../junit/jupiter/params/ParameterizedTest.java | 14 +++++++++++---
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index 78f1bc62ae42..38c7960a45c0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -120,6 +120,12 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
+* The new `autoCloseArguments` feature in `@ParameterizedTest` may potentially be a
+  breaking change for existing parameterized test methods if an argument that implements
+  `java.lang.AutoCloseable` is reused for multiple invocations of the same parameterized
+  test method. If your parameterized test methods start to fail when you upgrade to JUnit
+  Jupiter 5.8, you can disable this feature by declaring
+  `@ParameterizedTest(autoCloseArguments = false)`.
 * `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, ExtensionContext)` has
   been deprecated in favor of
   `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, DynamicTestInvocationContext, ExtensionContext)`
@@ -165,8 +171,9 @@ on GitHub.
   the information available in a `StackTraceElement`.
 * Dynamic tests now require less memory thanks to a number of improvements to internal
   data structures.
-* New `autoCloseArguments` attribute in `@ParameterizedTest` to close `AutoCloseable`
-  arguments at the end of the test. This attribute defaults to true.
+* New `autoCloseArguments` attribute in `@ParameterizedTest` to close
+  `java.lang.AutoCloseable` arguments after each invocation of the parameterized test
+  method. This attribute defaults to `true`.
 * Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
   underscores as in some JVM languages, to improve readability of long numbers like
   `700_000_000`.
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 764ff932379b..5f7d1472c356 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1118,9 +1118,20 @@ parameterized method at the same index in the method's formal parameter list. An
 _aggregator_ is any parameter of type `ArgumentsAccessor` or any parameter annotated with
 `@AggregateWith`.
 
-NOTE: Arguments of type `AutoCloseable` will be closed once `@AfterEach` methods and
-`AfterEachCallback` implementations have been called. To prevent this from happening, set
-the `autoCloseArguments` attribute in `@ParameterizedTest` to `false`.
+[NOTE]
+.AutoCloseable arguments
+====
+Arguments that implement `java.lang.AutoCloseable` (or `java.io.Closeable` which extends
+`java.lang.AutoCloseable`) will be automatically closed after `@AfterEach` methods and
+`AfterEachCallback` extensions have been called for the current parameterized test
+invocation.
+
+To prevent this from happening, set the `autoCloseArguments` attribute in
+`@ParameterizedTest` to `false`. Specifically, if an argument that implements
+`AutoCloseable` is reused for multiple invocations of the same parameterized test method,
+you must annotate the method with `@ParameterizedTest(autoCloseArguments = false)` to
+ensure that the argument is not closed between invocations.
+====
 
 [[writing-tests-parameterized-tests-sources]]
 ==== Sources of Arguments
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index 40e1ff324217..5ce0e51d089a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -209,9 +209,17 @@
 	String name() default "{default_display_name}";
 
 	/**
-	 * If true, all arguments of the parameterized test implementing {@link AutoCloseable}
-	 * will be closed after {@code @AfterEach} methods and {@code AfterEachCallbacks}
-	 * have been called.
+	 * Configure whether all arguments of the parameterized test that implement {@link AutoCloseable}
+	 * will be closed after {@link org.junit.jupiter.api.AfterEach @AfterEach} methods
+	 * and {@link org.junit.jupiter.api.extension.AfterEachCallback AfterEachCallback}
+	 * extensions have been called for the current parameterized test invocation.
+	 *
+	 * <p>Defaults to {@code true}.
+	 *
+	 * <p><strong>WARNING</strong>: if an argument that implements {@code AutoCloseable}
+	 * is reused for multiple invocations of the same parameterized test method,
+	 * you must set {@code autoCloseArguments} to {@code false} to ensure that
+	 * the argument is not closed between invocations.
 	 *
 	 * @since 5.8
 	 * @see java.lang.AutoCloseable

From 0bd6feb4910cbf0a4facbbeeddd06ce6318d179d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 10 Sep 2021 15:21:09 +0200
Subject: [PATCH 0495/1433] Remove link to package private class in Javadoc

---
 .../main/java/org/junit/jupiter/params/ParameterizedTest.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index 5ce0e51d089a..cd4e5ed21bce 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -223,7 +223,6 @@
 	 *
 	 * @since 5.8
 	 * @see java.lang.AutoCloseable
-	 * @see ParameterizedTestParameterResolver
 	 */
 	@API(status = EXPERIMENTAL, since = "5.8")
 	boolean autoCloseArguments() default true;

From efb980c4e9b24f0639f62ed91835ebf2f7b921e1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 10 Sep 2021 15:42:58 +0200
Subject: [PATCH 0496/1433] Polishing

---
 .../params/ParameterizedTestParameterResolver.java       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
index 841fab711d21..69f498215046 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
@@ -86,11 +86,11 @@ public void afterTestExecution(ExtensionContext context) {
 		Store store = context.getStore(NAMESPACE);
 		AtomicInteger argumentIndex = new AtomicInteger();
 
-		Arrays.stream(arguments) //
+		Arrays.stream(this.arguments) //
 				.filter(AutoCloseable.class::isInstance) //
 				.map(AutoCloseable.class::cast) //
 				.map(CloseableArgument::new) //
-				.forEach(closeable -> store.put("closeableArgument" + argumentIndex.getAndIncrement(), closeable));
+				.forEach(closeable -> store.put("closeableArgument#" + argumentIndex.incrementAndGet(), closeable));
 	}
 
 	private static class CloseableArgument implements Store.CloseableResource {
@@ -103,17 +103,16 @@ private static class CloseableArgument implements Store.CloseableResource {
 
 		@Override
 		public void close() throws Throwable {
-			autoCloseable.close();
+			this.autoCloseable.close();
 		}
 
 	}
 
-	@SuppressWarnings("unchecked")
 	private Object[] extractPayloads(Object[] arguments) {
 		return Arrays.stream(arguments) //
 				.map(argument -> {
 					if (argument instanceof Named) {
-						return ((Named<Object>) argument).getPayload();
+						return ((Named<?>) argument).getPayload();
 					}
 					return argument;
 				}) //

From fa021ed31335335ae64fb5dc8f3c94e4c59aa775 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 11 Sep 2021 10:56:30 +0200
Subject: [PATCH 0497/1433] Document published dependency scope change as
 potentially breaking

Resolves #2705.
---
 .../release-notes/release-notes-5.8.0.adoc    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index 38c7960a45c0..7b8c4497caba 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -27,8 +27,25 @@ on GitHub.
 [[release-notes-5.8.0-overall-improvements]]
 === Overall Improvements
 
+==== Deprecations and Breaking Changes
+
+* Since the API Guardian dependency is no longer exported as a runtime but as a
+  compile-only dependency to consuming Gradle projects, Gradle builds that define their own
+  https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:what-are-dependency-configurations[dependency configurations]
+  may be affected. For example, if the custom configuration is used to manipulate a source
+  set's classpath directly, dependency attributes needed for Gradle's variant-aware
+  dependency management are dropped and API Guardian is missing from the compile
+  classpath. In that case, the Java compiler emits warnings which -- depending on your
+  configured options -- may cause the build to fail. The solution is to avoid manipulating
+  a source set's classpath directly. Instead, its dependency configurations should extend
+  from your custom configuration. An example of such a change can be seen in
+  https://github.com/spring-projects/spring-framework/commit/d23afea168b8360d08bf296ac2189239ab9db7fc[this commit]
+  to the Spring Framework repository.
+
+==== New Features and Improvements
+
 * The API Guardian dependency is now exported as a compile-only dependency for consuming
-  Gradle projects.
+  Gradle projects and no longer required at runtime when running on the module path.
 * Logging messages are no longer issued at `INFO` level in order to lower the "textual
   noise" on the console when Java's Util Logging is used in its default configuration.
 

From 439084d2fd72d6f891d09847d6c5f26de26e4b0b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 11 Sep 2021 15:20:57 +0200
Subject: [PATCH 0498/1433] Polish documentation for 5.8 GA

---
 .../release-notes/release-notes-5.8.0.adoc    | 26 ++++++++------
 .../junit-platform-suite-engine.adoc          | 35 +++++++++++--------
 .../asciidoc/user-guide/running-tests.adoc    |  2 ++
 .../src/test/java/example/SuiteDemo.java      |  4 ++-
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index 7b8c4497caba..5582025143bc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -29,12 +29,12 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* Since the API Guardian dependency is no longer exported as a runtime but as a
+* Since the API Guardian dependency is no longer exported as a runtime but rather as a
   compile-only dependency to consuming Gradle projects, Gradle builds that define their own
   https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:what-are-dependency-configurations[dependency configurations]
   may be affected. For example, if the custom configuration is used to manipulate a source
   set's classpath directly, dependency attributes needed for Gradle's variant-aware
-  dependency management are dropped and API Guardian is missing from the compile
+  dependency management are dropped, and API Guardian is missing from the compile
   classpath. In that case, the Java compiler emits warnings which -- depending on your
   configured options -- may cause the build to fail. The solution is to avoid manipulating
   a source set's classpath directly. Instead, its dependency configurations should extend
@@ -71,8 +71,11 @@ on GitHub.
 ==== New Features and Improvements
 
 * New `junit-platform-suite-engine` module to execute declarative test suites on the JUnit
-  Platform.
-* Additional selectors in the suite API in the `junit-platform-suite-api` module.
+  Platform. See <<../user-guide/index.adoc#junit-platform-suite-engine, JUnit Platform
+  Suite Engine>> for details.
+* Additional selectors in the suite API in the `junit-platform-suite-api` module. See the
+  Javadoc of the `{suite-api-package}` package for a full list of supported annotations
+  and further details.
 * New `UniqueIdTrackingListener` which is a `TestExecutionListener` that tracks the unique
   IDs of all tests that were skipped or executed during the `TestPlan` and generates a
   file containing the unique IDs. The generated file can be used to rerun those tests --
@@ -90,12 +93,13 @@ on GitHub.
   nested container events when using the `EngineTestKit`. For example,
   `test(displayName("my test"))` can be used to match against a test whose display name is
   `my test`.
-* Generating Java Flight Recorder events via the `junit-platform-jfr` module is now also
-  supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
-  <<../user-guide/index.adoc#running-tests, Flight Recorder Support>> for details.
-* The `junit-platform-jfr` module now reports execution events for containers -- for
+* Generating Java Flight Recorder (JFR) events via the `junit-platform-jfr` module is now
+  also supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
+  <<../user-guide/index.adoc#running-tests-listeners-flight-recorder, Flight Recorder
+  Support>> for details.
+* The `junit-platform-jfr` module now publishes execution events for containers -- for
   example, test classes.
-* The `junit-platform-jfr` module now reports test discovery events for the launcher and
+* The `junit-platform-jfr` module now publishes test discovery events for the launcher and
   registered test engines.
 * New `ClassSource.from(URI)` static factory method for creating a `ClassSource` from a
   URI using the `class` scheme and optional query parameters specifying the line number
@@ -153,7 +157,9 @@ on GitHub.
 
 * Test classes can now be ordered _globally_ by supplying the fully-qualified name of a
   class implementing the `ClassOrderer` API as the value of the new
-  `junit.jupiter.testclass.order.default` configuration parameter.
+  `junit.jupiter.testclass.order.default` configuration parameter. See
+  <<../user-guide/index.adoc#writing-tests-test-execution-order-classes, Class Order>> for
+  details.
 * `@Nested` test classes can be ordered _locally_ via the new `@TestClassOrder` annotation
   in which a `ClassOrderer` can be specified.
 * `@ExtendWith` may now be used to register extensions declaratively via fields or
diff --git a/documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc b/documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc
index f22c96a40031..18be01cd9091 100644
--- a/documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc
@@ -1,25 +1,29 @@
 [[junit-platform-suite-engine]]
 === JUnit Platform Suite Engine
 
-The JUnit Platform supports declarative definition and execution of suites of tests from
-_any_ test engine using the Junit Platform.
+The JUnit Platform supports the declarative definition and execution of suites of tests
+from _any_ test engine using the JUnit Platform.
 
+[[junit-platform-suite-engine-setup]]
 ==== Setup
 
-In addition to _at least one_ other test engine, you need the following artifacts and
-their dependencies on the classpath. See <<dependency-metadata>> for details regarding
-group IDs, artifact IDs, and versions.
+In addition to the `junit-platform-suite-api` and `junit-platform-suite-engine` artifacts,
+you need _at least one_ other test engine and its dependencies on the classpath. See
+<<dependency-metadata>> for details regarding group IDs, artifact IDs, and versions.
 
-===== Explicit Dependencies
+[[junit-platform-suite-engine-setup-required-dependencies]]
+===== Required Dependencies
 
-* `junit-platform-suite-api` in _test_ scope
+* `junit-platform-suite-api` in _test_ scope: artifact containing annotations needed to
+  configure a test suite
 * `junit-platform-suite-engine` in _test runtime_ scope: implementation of the
-                                `TestEngine` API for the declarative Junit Platform
-                                Suites
+  `TestEngine` API for declarative test suites
 
-NOTE: Both dependencies are aggregated in `junit-platform-suite` which can be used in
-_test_ scope.
+NOTE: Both of the required dependencies are aggregated in the `junit-platform-suite`
+artifact which can be declard in _test_ scope instead of declaring explicit dependencies
+on `junit-platform-suite-api` and `junit-platform-suite-engine`.
 
+[[junit-platform-suite-engine-setup-transitive-dependencies]]
 ===== Transitive Dependencies
 
 * `junit-platform-suite-commons` in _test_ scope
@@ -28,7 +32,8 @@ _test_ scope.
 * `junit-platform-commons` in _test_ scope
 * `opentest4j` in _test_ scope
 
-==== Test Suite
+[[junit-platform-suite-engine-example]]
+==== @Suite Example
 
 By annotating a class with `@Suite` it is marked as a test suite on the JUnit Platform.
 As seen in the following example, selector and filter annotations can then be used to
@@ -40,6 +45,6 @@ include::{testDir}/example/SuiteDemo.java[tags=user_guide]
 ----
 
 .Additional Configuration Options
-NOTE: There are more configuration options for discovering and filtering tests than just
-`@SelectPackages`. Please consult the Javadoc of the `{suite-api-package}` package for
-further details.
+NOTE: There are numerous configuration options for discovering and filtering tests in a
+test suite. Please consult the Javadoc of the `{suite-api-package}` package for a full
+list of supported annotations and further details.
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index ea1f7f9abc19..ca81e93082ee 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -640,6 +640,7 @@ to reporting (see <<running-tests-junit-platform-runner-technical-names>>).
 You need the following artifacts and their dependencies on the classpath. See
 <<dependency-metadata>> for details regarding group IDs, artifact IDs, and versions.
 
+[[running-tests-junit-platform-runner-setup-explicit-dependencies]]
 ===== Explicit Dependencies
 
 * `junit-platform-runner` in _test_ scope: location of the `JUnitPlatform` runner
@@ -649,6 +650,7 @@ You need the following artifacts and their dependencies on the classpath. See
 * `junit-jupiter-engine` in _test runtime_ scope: implementation of the `TestEngine` API
   for JUnit Jupiter
 
+[[running-tests-junit-platform-runner-setup-transitive-dependencies]]
 ===== Transitive Dependencies
 
 * `junit-platform-suite-api` in _test_ scope
diff --git a/documentation/src/test/java/example/SuiteDemo.java b/documentation/src/test/java/example/SuiteDemo.java
index 278b662715b8..57201559ac96 100644
--- a/documentation/src/test/java/example/SuiteDemo.java
+++ b/documentation/src/test/java/example/SuiteDemo.java
@@ -11,6 +11,7 @@
 package example;
 
 //tag::user_guide[]
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.api.SuiteDisplayName;
@@ -18,9 +19,10 @@
 @Suite
 @SuiteDisplayName("JUnit Platform Suite Demo")
 @SelectPackages("example")
+@IncludeClassNamePatterns(".*Tests")
 //end::user_guide[]
 @org.junit.platform.suite.api.ExcludeTags("exclude")
 //tag::user_guide[]
-public class SuiteDemo {
+class SuiteDemo {
 }
 //end::user_guide[]

From b6dff0d53e6fdc9036d4a35b84fa76ef16e6b0fd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 12 Sep 2021 18:08:27 +0200
Subject: [PATCH 0499/1433] Add LauncherSessionListener example to user guide

---
 .../asciidoc/user-guide/launcher-api.adoc     | 46 +++++++++-
 .../session/GlobalSetupTeardownListener.java  | 83 +++++++++++++++++++
 .../test/java/example/session/HttpTests.java  | 35 ++++++++
 ....platform.launcher.LauncherSessionListener |  1 +
 4 files changed, 161 insertions(+), 4 deletions(-)
 create mode 100644 documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
 create mode 100644 documentation/src/test/java/example/session/HttpTests.java
 create mode 100644 documentation/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener

diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index 63a22848b6d0..def262aec5a4 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -130,10 +130,48 @@ programmatically via the `{LauncherConfig}` that is passed to the `{LauncherFact
 they can be discovered at runtime via Java's `{ServiceLoader}` mechanism and automatically
 registered with `LauncherSession` (unless automatic registration is disabled.)
 
-For example, an `example.CustomLauncherSessionListener` class implementing
-`LauncherSessionListener` and declared within the
-`/META-INF/services/org.junit.platform.launcher.LauncherSessionListener` file is loaded
-and registered automatically.
+A `{LauncherSessionListener}` is well suited for implementing once-per-JVM setup/teardown
+behavior since it's called before the first and after the last test in a launcher session,
+respectively. The scope of a launcher session depends on the used IDE or build tool but
+usually corresponds to the lifecycle of the test JVM. A custom listener that starts an
+HTTP server before executing the first test and stops it after the last test has been
+executed, could look like this:
+
+[source,java]
+.src/test/java/example/session/GlobalSetupTeardownListener.java
+----
+package example.session;
+
+include::{testDir}/example/session/GlobalSetupTeardownListener.java[tags=user_guide]
+----
+<1> Start the HTTP server
+<2> Export its dynamic port as a system property for consumption by tests
+<3> Stop the HTTP server
+
+This sample uses the HTTP server implementation from the jdk.httpserver module that comes
+with the JDK but would work similarly with any other server or resource. In order for the
+listener to be picked up by JUnit Platform, you need to register it as a service by adding
+a resource file with the following name and contents to your test runtime classpath (e.g.
+by adding the file to `src/test/resources`):
+
+[source]
+.src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
+----
+include::{testResourcesDir}/META-INF/services/org.junit.platform.launcher.LauncherSessionListener[]
+----
+
+You can now use the resource from your test:
+
+[source,java]
+.src/test/java/example/session/HttpTests.java
+----
+package example.session;
+
+include::{testDir}/example/session/HttpTests.java[tags=user_guide]
+----
+<1> Read the port of the server from the system property set by the listener
+<2> Send a request to the server
+<3> Check the status code of the response
 
 [[launcher-api-launcher-discovery-listeners-custom]]
 ==== Registering a LauncherDiscoveryListener
diff --git a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
new file mode 100644
index 000000000000..9039f683b2a9
--- /dev/null
+++ b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example.session;
+
+//tag::user_guide[]
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.InetSocketAddress;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import com.sun.net.httpserver.HttpServer;
+
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
+
+public class GlobalSetupTeardownListener implements LauncherSessionListener {
+
+	private Fixture fixture;
+
+	@Override
+	public void launcherSessionOpened(LauncherSession session) {
+		// Avoid setup for test discovery by delaying it until tests are about to be executed
+		session.getLauncher().registerTestExecutionListeners(new TestExecutionListener() {
+			@Override
+			public void testPlanExecutionStarted(TestPlan testPlan) {
+				if (fixture == null) {
+					fixture = new Fixture();
+					fixture.setUp();
+				}
+			}
+		});
+	}
+
+	@Override
+	public void launcherSessionClosed(LauncherSession session) {
+		if (fixture != null) {
+			fixture.tearDown();
+			fixture = null;
+		}
+	}
+
+	static class Fixture {
+
+		private HttpServer server;
+		private ExecutorService executorService;
+
+		void setUp() {
+			try {
+				server = HttpServer.create(new InetSocketAddress(0), 0);
+			}
+			catch (IOException e) {
+				throw new UncheckedIOException("Failed to start HTTP server", e);
+			}
+			server.createContext("/test", exchange -> {
+				exchange.sendResponseHeaders(204, -1);
+				exchange.close();
+			});
+			executorService = Executors.newCachedThreadPool();
+			server.setExecutor(executorService);
+			server.start(); // <1>
+			int port = server.getAddress().getPort();
+			System.setProperty("http.server.port", String.valueOf(port)); // <2>
+		}
+
+		void tearDown() {
+			server.stop(0); // <3>
+			executorService.shutdownNow();
+		}
+	}
+
+}
+//end::user_guide[]
diff --git a/documentation/src/test/java/example/session/HttpTests.java b/documentation/src/test/java/example/session/HttpTests.java
new file mode 100644
index 000000000000..de6f806510d8
--- /dev/null
+++ b/documentation/src/test/java/example/session/HttpTests.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example.session;
+
+//tag::user_guide[]
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.junit.jupiter.api.Test;
+
+class HttpTests {
+
+	@Test
+	void respondsWith204() throws Exception {
+		String port = System.getProperty("http.server.port"); // <1>
+		URL url = new URL("http://localhost:" + port + "/test");
+
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.setRequestMethod("GET");
+		int responseCode = connection.getResponseCode(); // <2>
+
+		assertEquals(204, responseCode); // <3>
+	}
+}
+//end::user_guide[]
diff --git a/documentation/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/documentation/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 000000000000..f6d297627eeb
--- /dev/null
+++ b/documentation/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+example.session.GlobalSetupTeardownListener

From 6c0bf0229a552c926d584fea7c5b2826d464ca21 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Sun, 12 Sep 2021 19:47:32 +0200
Subject: [PATCH 0500/1433] Fix modular user guide tests by reading module
 `jdk.httpserver`

---
 .../platform/tooling/support/tests/ModularUserGuideTests.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index d573651817dc..ecedbf1569c1 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -53,6 +53,7 @@ class ModularUserGuideTests {
 		"  requires java.desktop;", //
 		"  requires java.logging;", //
 		"  requires java.scripting;", //
+		"  requires jdk.httpserver;", //
 		"}", //
 		"" //
 	);
@@ -166,7 +167,7 @@ void runTestsFromUserGuideWithinModularBoundaries(@TempDir Path temp) throws Exc
 		var args = compile(temp, out, err);
 		// args.forEach(System.out::println);
 
-		assertTrue(err.toString().isBlank(), () -> err.toString() + "\n\n" + String.join("\n", args));
+		assertTrue(err.toString().isBlank(), () -> err + "\n\n" + String.join("\n", args));
 		var listing = Helper.treeWalk(temp);
 		assertLinesMatch(List.of( //
 			"destination", //

From d36ea28cf16b59db91499d8c63fd4d409c0b9900 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 12 Sep 2021 20:28:09 +0200
Subject: [PATCH 0501/1433] Declare service in module descriptor

---
 .../platform/tooling/support/tests/ModularUserGuideTests.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index ecedbf1569c1..106fbfd2c620 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -54,6 +54,9 @@ class ModularUserGuideTests {
 		"  requires java.logging;", //
 		"  requires java.scripting;", //
 		"  requires jdk.httpserver;", //
+		//
+		"  provides org.junit.platform.launcher.LauncherSessionListener", //
+		"    with example.session.GlobalSetupTeardownListener;", //
 		"}", //
 		"" //
 	);

From fa7405528ecdf5a274b050d117ffb2738df0c426 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 12 Sep 2021 20:34:33 +0200
Subject: [PATCH 0502/1433] Use text block

---
 .../support/tests/ModularUserGuideTests.java  | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index 106fbfd2c620..1245ca21828a 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -37,33 +37,32 @@
  */
 class ModularUserGuideTests {
 
-	private static final List<String> DOCUMENTATION_MODULE_DESCRIPTOR = List.of( //
-		"open module documentation {", //
-		"  exports example.testkit;", // just here to ensure documentation example sources are compiled
-		//
-		"  requires org.junit.jupiter.api;", //
-		"  requires org.junit.jupiter.migrationsupport;", //
-		"  requires org.junit.jupiter.params;", //
-		//
-		"  requires org.junit.platform.engine;", //
-		"  requires org.junit.platform.reporting;", //
-		"  requires org.junit.platform.runner;", //
-		"  requires org.junit.platform.testkit;", //
-		//
-		"  requires java.desktop;", //
-		"  requires java.logging;", //
-		"  requires java.scripting;", //
-		"  requires jdk.httpserver;", //
-		//
-		"  provides org.junit.platform.launcher.LauncherSessionListener", //
-		"    with example.session.GlobalSetupTeardownListener;", //
-		"}", //
-		"" //
-	);
+	private static final String DOCUMENTATION_MODULE_DESCRIPTOR = """
+			open module documentation {
+			  exports example.testkit; // just here to ensure documentation example sources are compiled
+
+			  requires org.junit.jupiter.api;
+			  requires org.junit.jupiter.migrationsupport;
+			  requires org.junit.jupiter.params;
+
+			  requires org.junit.platform.engine;
+			  requires org.junit.platform.reporting;
+			  requires org.junit.platform.runner;
+			  requires org.junit.platform.testkit;
+
+			  requires java.desktop;
+			  requires java.logging;
+			  requires java.scripting;
+			  requires jdk.httpserver;
+
+			  provides org.junit.platform.launcher.LauncherSessionListener
+			    with example.session.GlobalSetupTeardownListener;
+			}
+			""";
 
 	private static List<String> compile(Path temp, Writer out, Writer err) throws Exception {
 		var documentation = Files.createDirectories(temp.resolve("src/documentation"));
-		Files.write(documentation.resolve("module-info.java"), DOCUMENTATION_MODULE_DESCRIPTOR);
+		Files.writeString(documentation.resolve("module-info.java"), DOCUMENTATION_MODULE_DESCRIPTOR);
 
 		var args = new ArrayList<String>();
 		args.add("-Xlint"); // enable all default warnings

From 709fd6e1d6d311a5950e0a957283ac37530e41fd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 12 Sep 2021 20:44:14 +0200
Subject: [PATCH 0503/1433] Release 5.8

---
 README.md                                                   | 4 ++--
 .../docs/asciidoc/release-notes/release-notes-5.8.0.adoc    | 2 +-
 gradle.properties                                           | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 96992d7a50e3..18256252f8c3 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.7.2](https://github.com/junit-team/junit5/releases/tag/r5.7.2) (May 15, 2021)
-- Preview (Milestone/Release Candidate): [JUnit 5.8.0-RC1](https://github.com/junit-team/junit5/releases/tag/r5.8.0-RC1) (August 17, 2021)
+- General Availability (GA): [JUnit 5.8.0](https://github.com/junit-team/junit5/releases/tag/r5.8.0) (September 12, 2021)
+- Preview (Milestone/Release Candidate): n/a
 
 ## Documentation
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index 5582025143bc..5b07f5f6017e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.8.0]]
 == 5.8.0
 
-*Date of Release:* September ❓, 2021
+*Date of Release:* September 12, 2021
 
 *Scope:*
 
diff --git a/gradle.properties b/gradle.properties
index b9157a3889a9..5d3d26a3f6be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.8.0-SNAPSHOT
+version         = 5.8.0
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.8.0-SNAPSHOT
+platformVersion = 1.8.0
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.8.0-SNAPSHOT
+vintageVersion  = 5.8.0
 
 defaultBuiltBy  = JUnit Team
 

From ed3d84d0db3807ae4065221c47d10448ea60e74b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 12 Sep 2021 21:05:59 +0200
Subject: [PATCH 0504/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5d3d26a3f6be..5cd0682dc472 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.8.0
+version         = 5.9.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.8.0
+platformVersion = 1.9.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.8.0
+vintageVersion  = 5.9.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From a3412bad0037fa75bcd66f95179cd66a420f9148 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Sep 2021 13:43:45 +0200
Subject: [PATCH 0505/1433] Use setup-java's Gradle cache

---
 .github/workflows/codeql-analysis.yml    | 10 +---
 .github/workflows/cross-version.yml      | 17 +-----
 .github/workflows/main.yml               | 71 ++----------------------
 .github/workflows/reproducible-build.yml | 10 +---
 4 files changed, 8 insertions(+), 100 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e9cc12327a72..434217b40eda 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,20 +23,12 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: Cache Gradle wrapper and dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          /root/.gradle/caches/
-          /root/.gradle/wrapper/dists
-        key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-        restore-keys: |
-          test-${{ runner.os }}-gradle-
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
         java-version: '11'
+        cache: 'gradle'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index d24ce34fdc11..533e98048ee1 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -25,22 +25,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - name: Cache Gradle wrapper and dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            /root/.gradle/caches/
-            /root/.gradle/wrapper/dists
-          key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-          restore-keys: |
-            test-${{ runner.os }}-gradle-
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: /root/.m2/repository
-          key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            test-${{ runner.os }}-maven-
       - name: Set up JDK 8
         uses: actions/setup-java@v2
         with:
@@ -68,6 +52,7 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: '11'
+          cache: 'gradle'
       - name: Test
         env:
           ORG_GRADLE_PROJECT_enableTestDistribution: true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1664e6b023e5..1c96bcbb57fa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,22 +23,6 @@ jobs:
       with:
         # Codecov needs fetch-depth > 1
         fetch-depth: 2
-    - name: Cache Gradle wrapper and dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          /root/.gradle/caches/
-          /root/.gradle/wrapper/dists
-        key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-        restore-keys: |
-          test-${{ runner.os }}-gradle-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: /root/.m2/repository
-        key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          test-${{ runner.os }}-maven-
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
@@ -60,6 +44,7 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: '11'
+        cache: 'gradle'
     - name: Test and coverage
       env:
         ORG_GRADLE_PROJECT_enableTestDistribution: true
@@ -82,22 +67,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Cache Gradle wrapper and dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches/
-          ~/.gradle/wrapper/dists
-        key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-        restore-keys: |
-          test-${{ runner.os }}-gradle-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          test-${{ runner.os }}-maven-
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
@@ -119,6 +88,7 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: '11'
+        cache: 'gradle'
     - name: Test
       shell: bash
       run: |
@@ -134,22 +104,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Cache Gradle wrapper and dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches/
-          ~/.gradle/wrapper/dists
-        key: test-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-        restore-keys: |
-          test-${{ runner.os }}-gradle-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: test-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          test-${{ runner.os }}-maven-
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
@@ -171,6 +125,7 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: '11'
+        cache: 'gradle'
     - name: 'Test'
       run: |
         ./gradlew --version
@@ -186,15 +141,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Cache Gradle wrapper and dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches/
-          ~/.gradle/wrapper/dists
-        key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-        restore-keys: |
-          assemble-${{ runner.os }}-gradle-
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
@@ -208,6 +154,7 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: '11'
+        cache: 'gradle'
     - name: Publish
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
@@ -225,15 +172,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Cache Gradle wrapper and dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches/
-          ~/.gradle/wrapper/dists
-        key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-        restore-keys: |
-          assemble-${{ runner.os }}-gradle-
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
@@ -247,6 +185,7 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: '11'
+        cache: 'gradle'
     - name: Install Graphviz
       run: |
         sudo apt-get update
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index e74632fe7d7b..8242d859e985 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -20,15 +20,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Cache Gradle wrapper and dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.gradle/caches/
-          ~/.gradle/wrapper/dists
-        key: assemble-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle.properties', 'gradle/**', 'buildSrc/src/main/**') }}
-        restore-keys: |
-          assemble-${{ runner.os }}-gradle-
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
@@ -42,6 +33,7 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: '11'
+        cache: 'gradle'
     - name: Build and compare checksums
       shell: bash
       run: |

From 87afeedc20a72a404d30d11bc412562ae8a2c70a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Sep 2021 13:45:20 +0200
Subject: [PATCH 0506/1433] Switch from Adopt to Temurin JDK distribution

---
 .github/workflows/codeql-analysis.yml    |  2 +-
 .github/workflows/cross-version.yml      |  4 ++--
 .github/workflows/main.yml               | 26 ++++++++++++------------
 .github/workflows/reproducible-build.yml |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 434217b40eda..90ee694cea43 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Initialize CodeQL
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 533e98048ee1..ad346535edbe 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up JDK 8
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '8'
       - name: Prepare JDK8 env var
         shell: bash
@@ -50,7 +50,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '11'
           cache: 'gradle'
       - name: Test
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1c96bcbb57fa..02de5906570d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
     - name: Prepare JDK8 env var
       shell: bash
@@ -34,7 +34,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -42,7 +42,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Test and coverage
@@ -70,7 +70,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
     - name: Prepare JDK8 env var
       shell: bash
@@ -78,7 +78,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -86,7 +86,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Test
@@ -107,7 +107,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '8'
     - name: Prepare JDK8 env var
       shell: bash
@@ -115,7 +115,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -123,7 +123,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: 'Test'
@@ -144,7 +144,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -152,7 +152,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Publish
@@ -175,7 +175,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -183,7 +183,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Install Graphviz
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 8242d859e985..ead579aa6094 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up JDK 16
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '16'
     - name: Prepare JDK16 env var
       shell: bash
@@ -31,7 +31,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'temurin'
         java-version: '11'
         cache: 'gradle'
     - name: Build and compare checksums

From 0a35c6f847e70ce15fc4bc45e848ce8d230ab603 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Sep 2021 17:11:33 +0200
Subject: [PATCH 0507/1433] Create initial release notes for 5.8.1 from
 template

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.8.1.adoc    | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index e6596b595929..3917b6a8af7a 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.8.1.adoc[]
+
 include::{basedir}/release-notes-5.8.0.adoc[]
 
 include::{basedir}/release-notes-5.7.2.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
new file mode 100644
index 000000000000..e4d047f44654
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.8.1]]
+== 5.8.1
+
+*Date of Release:* ❓
+
+*Scope:* Bug fixes since 5.8.0
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/59?closed=1+[5.8.1] milestone page in the JUnit repository on
+GitHub.
+
+
+[[release-notes-5.8.1-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.8.1-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.8.1-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From 7bb8dc05db493d58fb9e4c3823075d29cdb571be Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 18:37:06 +0200
Subject: [PATCH 0508/1433] Add JDK 18 build

---
 .github/workflows/cross-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index ad346535edbe..e170649a9aca 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -18,7 +18,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [17]
+        jdk: [17, 18]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:

From 6e2eebeff08d2dc31a40b94cfb21e500de81fb03 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 Aug 2021 18:45:52 +0200
Subject: [PATCH 0509/1433] Configure JDK18 env var for looking up toolchain

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5cd0682dc472..93234fd6c644 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17
+org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17,JDK18
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true

From a295157c098d0b4419983ef1c6731ff5eb27b6a0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Sep 2021 17:01:55 +0200
Subject: [PATCH 0510/1433] Update to Groovy 4.0.0-beta-1

---
 gradle/libs.versions.toml                                       | 2 +-
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts            | 2 +-
 platform-tests/platform-tests.gradle.kts                        | 2 +-
 .../platform-tooling-support-tests.gradle.kts                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3ce0c7890254..94461cb88819 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.106" }
 commons-io = { module = "commons-io:commons-io", version = "2.9.0" }
-groovy3 = { module = "org.codehaus.groovy:groovy", version = "3.0.8" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.0-beta-1" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit", version = "1.0.0.Alpha1" }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index c0902dca8f8f..5ab39a989c19 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 	testImplementation(kotlin("stdlib"))
 	testImplementation(libs.junit4)
 	testImplementation(libs.kotlinx.coroutines)
-	testImplementation(libs.groovy3)
+	testImplementation(libs.groovy4)
 }
 
 tasks {
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 4f530f4e6963..0ae45babf9e1 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
 
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(projects.junitVintageEngine)
-	testRuntimeOnly(libs.groovy3) {
+	testRuntimeOnly(libs.groovy4) {
 		because("`ReflectionUtilsTests.findNestedClassesWithInvalidNestedClassFile` needs it")
 	}
 
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index f0a690733035..ce3adfa4bfc3 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 	testImplementation(libs.apiguardian) {
 		because("we validate that public classes are annotated")
 	}
-	testImplementation(libs.groovy3) {
+	testImplementation(libs.groovy4) {
 		because("it provides convenience methods to handle process output")
 	}
 	testImplementation(libs.bnd) {

From c02f03035d82028861817de5e479d5504379c884 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Sep 2021 17:02:56 +0200
Subject: [PATCH 0511/1433] Add JRE.JAVA_18 constant

---
 .../release-notes/release-notes-5.8.1.adoc       |  2 +-
 .../org/junit/jupiter/api/condition/JRE.java     | 12 +++++++++++-
 .../DisabledForJreRangeConditionTests.java       |  3 ++-
 .../DisabledForJreRangeIntegrationTests.java     |  3 ++-
 .../condition/DisabledOnJreConditionTests.java   | 12 +++++++++++-
 .../condition/DisabledOnJreIntegrationTests.java | 12 ++++++++++--
 .../EnabledForJreRangeConditionTests.java        |  3 ++-
 .../EnabledForJreRangeIntegrationTests.java      |  5 +++--
 .../condition/EnabledOnJreConditionTests.java    | 12 +++++++++++-
 .../condition/EnabledOnJreIntegrationTests.java  | 16 ++++++++++++++--
 10 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index e4d047f44654..7a150b4359b0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -39,7 +39,7 @@ GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* `JAVA_18` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-5.8.1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index 200a2df181c6..ba5169de9dbd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -114,11 +114,19 @@ public enum JRE {
 	@API(status = STABLE, since = "5.7.1")
 	JAVA_17,
 
+	/**
+	 * Java 18.
+	 *
+	 * @since 5.8.1
+	 */
+	@API(status = STABLE, since = "5.8.1")
+	JAVA_18,
+
 	/**
 	 * A JRE version other than {@link #JAVA_8}, {@link #JAVA_9},
 	 * {@link #JAVA_10}, {@link #JAVA_11}, {@link #JAVA_12},
 	 * {@link #JAVA_13}, {@link #JAVA_14}, {@link #JAVA_15},
-	 * {@link #JAVA_16}, or {@link #JAVA_17}.
+	 * {@link #JAVA_16}, {@link #JAVA_17}, or {@link #JAVA_18}.
 	 */
 	OTHER;
 
@@ -166,6 +174,8 @@ private static JRE determineCurrentVersion() {
 					return JAVA_16;
 				case 17:
 					return JAVA_17;
+				case 18:
+					return JAVA_18;
 				default:
 					return OTHER;
 			}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index 3cc2162017b0..d8bc38de16ea 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -119,7 +120,7 @@ void javaMin10() {
 	void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index da27aa6b4a25..93b8e7d55085 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -86,7 +87,7 @@ void javaMin10() {
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17());
+				|| onJava15() || onJava16() || onJava17() || onJava18());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index c0428d3e80b5..f0f65ab91378 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -166,6 +167,15 @@ void java17() {
 		assertDisabledOnCurrentJreIf(onJava17());
 	}
 
+	/**
+	 * @see DisabledOnJreIntegrationTests#java18()
+	 */
+	@Test
+	void java18() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(onJava18());
+	}
+
 	/**
 	 * @see DisabledOnJreIntegrationTests#other()
 	 */
@@ -173,7 +183,7 @@ void java17() {
 	void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 3cabc869504e..8414b1bc98e0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -31,6 +32,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 import static org.junit.jupiter.api.condition.JRE.JAVA_16;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
+import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -58,7 +60,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@DisabledOnJre(value = { JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17,
-			OTHER }, disabledReason = "Disabled on every JRE")
+			JAVA_18, OTHER }, disabledReason = "Disabled on every JRE")
 	void disabledOnAllJavaVersions() {
 		fail("should be disabled");
 	}
@@ -123,11 +125,17 @@ void java17() {
 		assertFalse(onJava17());
 	}
 
+	@Test
+	@DisabledOnJre(JAVA_18)
+	void java18() {
+		assertFalse(onJava18());
+	}
+
 	@Test
 	@DisabledOnJre(OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17());
+				|| onJava15() || onJava16() || onJava17() || onJava18());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 7f70a1b3937b..7d908f768c08 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -119,7 +120,7 @@ void javaMin10() {
 	void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18()));
 	}
 
 	private void assertEnabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index 241eadb79aeb..4416a28699cb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -83,7 +84,7 @@ void javaMax12() {
 	@EnabledForJreRange(min = JAVA_10)
 	void javaMin10() {
 		assertTrue(onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15() || onJava16()
-				|| onJava17());
+				|| onJava17() || onJava18());
 		assertFalse(onJava9());
 	}
 
@@ -91,7 +92,7 @@ void javaMin10() {
 	@EnabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17());
+				|| onJava15() || onJava16() || onJava17() || onJava18());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index abe24fa05d10..a782b07728a0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -165,6 +166,15 @@ void java17() {
 		assertEnabledOnCurrentJreIf(onJava17());
 	}
 
+	/**
+	 * @see EnabledOnJreIntegrationTests#java18()
+	 */
+	@Test
+	void java18() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(onJava18());
+	}
+
 	/**
 	 * @see EnabledOnJreIntegrationTests#other()
 	 */
@@ -172,7 +182,7 @@ void java17() {
 	void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18()));
 		assertCustomDisabledReasonIs("Disabled on almost every JRE");
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index f170cad98c91..f1a9bbd430c9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 import static org.junit.jupiter.api.condition.JRE.JAVA_16;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
+import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -48,7 +49,8 @@ void missingJreDeclaration() {
 	}
 
 	@Test
-	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17, OTHER })
+	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17, JAVA_18,
+			OTHER })
 	void enabledOnAllJavaVersions() {
 	}
 
@@ -112,11 +114,17 @@ void java17() {
 		assertTrue(onJava17());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_18)
+	void java18() {
+		assertTrue(onJava18());
+	}
+
 	@Test
 	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17());
+				|| onJava15() || onJava16() || onJava17() || onJava18());
 	}
 
 	static boolean onJava8() {
@@ -159,4 +167,8 @@ static boolean onJava17() {
 		return JAVA_VERSION.startsWith("17");
 	}
 
+	static boolean onJava18() {
+		return JAVA_VERSION.startsWith("18");
+	}
+
 }

From 2affa2a69c6668ec78e3ad48b4656f96a38e73b3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Sep 2021 17:05:56 +0200
Subject: [PATCH 0512/1433] Disable test that fails from ModularUserGuideTests
 for now

---
 .../test/java/example/testkit/EngineTestKitAllEventsDemo.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
index 6090550547fe..713fb68a86e2 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
@@ -13,6 +13,7 @@
 // @formatter:off
 // tag::user_guide[]
 
+import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.testkit.engine.EventConditions.abortedWithReason;
 import static org.junit.platform.testkit.engine.EventConditions.container;
@@ -32,12 +33,14 @@
 import example.ExampleTestCase;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.opentest4j.TestAbortedException;
 
 class EngineTestKitAllEventsDemo {
 
 	@Test
+	@DisabledOnJre(JAVA_18) // https://github.com/assertj/assertj-core/issues/2340
 	void verifyAllJupiterEvents() {
 		Writer writer = // create a java.io.Writer for debug output
 		// end::user_guide[]

From e4b6cdb9a617e88c5fdce509bdbac9f284644266 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 12:49:40 +0200
Subject: [PATCH 0513/1433] Upgrade to nohttp 0.0.10

This upgrade avoids warnings about the following on Gradle 7.1+.

- The Report.destination property has been deprecated.
- The JavaExec.main property has been deprecated.
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 270c54ed5183..721b2e389bb3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,7 +17,7 @@ pluginManagement {
 		id("org.asciidoctor.jvm.convert") version "3.3.2"
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"
 		id("me.champeau.jmh") version "0.6.5"
-		id("io.spring.nohttp") version "0.0.8"
+		id("io.spring.nohttp") version "0.0.10"
 		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 	}
 }

From 90f67a0fd15b69eadd09b76132f9f96df22da91d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 12:54:40 +0200
Subject: [PATCH 0514/1433] Avoid usage of deprecated Gradle API in
 documentation.gradle.kts

This upgrade avoids the warning about the following on Gradle 7.1+.

- The JavaExecHandleBuilder.setMain(String) method has been deprecated.
---
 documentation/documentation.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 49933ca367f8..9b29223f4a09 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -117,7 +117,7 @@ tasks {
 			val output = ByteArrayOutputStream()
 			val result = javaexec {
 				classpath = runtimeClasspath
-				main = "org.junit.platform.console.ConsoleLauncher"
+				mainClass.set("org.junit.platform.console.ConsoleLauncher")
 				args("--scan-classpath")
 				args("--include-classname", ".*Tests")
 				args("--include-classname", ".*Demo")

From 616a56879235bfc6c4c17d4d5e2fd09006f1b493 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Wed, 15 Sep 2021 13:01:39 +0200
Subject: [PATCH 0515/1433] Provide access to the current ExecutionMode in
 ExtensionContext (#2707)

Resolves #2396
---
 .../release-notes/release-notes-5.8.1.adoc    |  1 +
 .../api/extension/ExtensionContext.java       | 12 +++++++++++
 .../descriptor/AbstractExtensionContext.java  | 20 +++++++++++++++++++
 .../descriptor/ClassExtensionContext.java     |  6 ++++++
 .../descriptor/DynamicExtensionContext.java   |  7 +++++++
 .../JupiterEngineExtensionContext.java        |  6 ++++++
 .../descriptor/MethodExtensionContext.java    |  5 +++++
 .../TestTemplateExtensionContext.java         |  6 ++++++
 .../descriptor/ExtensionContextTests.java     | 10 +++++++---
 .../ParameterizedTestExtensionTests.java      |  6 ++++++
 10 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index 7a150b4359b0..e9d95694c82c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -40,6 +40,7 @@ GitHub.
 ==== New Features and Improvements
 
 * `JAVA_18` has been added to the `JRE` enum for use with JRE-based execution conditions.
+* The current test or container's `ExecutionMode` is now accessible from `ExtensionContext`.
 
 
 [[release-notes-5.8.1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index 282f6f797f6b..8f110c1a2a92 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -26,6 +26,7 @@
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.support.ReflectionSupport;
 import org.junit.platform.commons.util.Preconditions;
@@ -383,6 +384,17 @@ default void publishReportEntry(String value) {
 	 */
 	Store getStore(Namespace namespace);
 
+	/**
+	 * Get the {@link ExecutionMode} associated with the current test or container.
+	 *
+	 * @return the {@code ExecutionMode} of the test; never {@code null}
+	 *
+	 * @see org.junit.jupiter.api.parallel.ExecutionMode {@code @ExecutionMode}
+	 * @since 5.8.1
+	 */
+	@API(status = STABLE, since = "5.8.1")
+	ExecutionMode getExecutionMode();
+
 	/**
 	 * {@code Store} provides methods for extensions to save and retrieve data.
 	 */
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
index be4ad4f37a77..fa5740db5870 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
@@ -21,14 +21,17 @@
 import java.util.function.Function;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
+import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestTag;
 import org.junit.platform.engine.reporting.ReportEntry;
+import org.junit.platform.engine.support.hierarchical.Node;
 
 /**
  * @since 5.0
@@ -127,4 +130,21 @@ public Optional<String> getConfigurationParameter(String key) {
 	public <V> Optional<V> getConfigurationParameter(String key, Function<String, V> transformer) {
 		return this.configuration.getRawConfigurationParameter(key, transformer);
 	}
+
+	@Override
+	public ExecutionMode getExecutionMode() {
+		return toJupiterExecutionMode(getPlatformExecutionMode());
+	}
+
+	protected abstract Node.ExecutionMode getPlatformExecutionMode();
+
+	private ExecutionMode toJupiterExecutionMode(Node.ExecutionMode mode) {
+		switch (mode) {
+			case CONCURRENT:
+				return ExecutionMode.CONCURRENT;
+			case SAME_THREAD:
+				return ExecutionMode.SAME_THREAD;
+		}
+		throw new JUnitException("Unknown ExecutionMode: " + mode);
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
index 09a9127fff8a..d45d4f1a4d67 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.support.hierarchical.Node;
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
 
 /**
@@ -93,4 +94,9 @@ public Optional<Throwable> getExecutionException() {
 		return Optional.ofNullable(this.throwableCollector.getThrowable());
 	}
 
+	@Override
+	protected Node.ExecutionMode getPlatformExecutionMode() {
+		return getTestDescriptor().getExecutionMode();
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
index 8d2c7b950bc3..47361d42cdb7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.support.hierarchical.Node;
 
 class DynamicExtensionContext extends AbstractExtensionContext<DynamicNodeTestDescriptor> {
 
@@ -61,4 +62,10 @@ public Optional<Method> getTestMethod() {
 	public Optional<Throwable> getExecutionException() {
 		return Optional.empty();
 	}
+
+	@Override
+	protected Node.ExecutionMode getPlatformExecutionMode() {
+		return getTestDescriptor().getExecutionMode();
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
index b6f98d4b1fad..18e3afae9bd3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.support.hierarchical.Node;
 
 /**
  * @since 5.0
@@ -65,4 +66,9 @@ public Optional<Throwable> getExecutionException() {
 		return Optional.empty();
 	}
 
+	@Override
+	protected Node.ExecutionMode getPlatformExecutionMode() {
+		return getTestDescriptor().getExecutionMode();
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
index c7d291b69c0a..abf25e91af35 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.support.hierarchical.Node;
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
 
 /**
@@ -78,4 +79,8 @@ public Optional<Throwable> getExecutionException() {
 		return Optional.ofNullable(this.throwableCollector.getThrowable());
 	}
 
+	@Override
+	protected Node.ExecutionMode getPlatformExecutionMode() {
+		return getTestDescriptor().getExecutionMode();
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
index 6dc49084b922..a5e875cb8634 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.support.hierarchical.Node;
 
 /**
  * @since 5.0
@@ -70,4 +71,9 @@ public Optional<Throwable> getExecutionException() {
 		return Optional.empty();
 	}
 
+	@Override
+	protected Node.ExecutionMode getPlatformExecutionMode() {
+		return getTestDescriptor().getExecutionMode();
+	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
index c8df68ee224d..4d8290b31faf 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
@@ -64,6 +64,7 @@ public class ExtensionContextTests {
 	void setUp() {
 		when(configuration.getDefaultDisplayNameGenerator()).thenReturn(new DisplayNameGenerator.Standard());
 		when(configuration.getDefaultExecutionMode()).thenReturn(ExecutionMode.SAME_THREAD);
+		when(configuration.getDefaultClassesExecutionMode()).thenReturn(ExecutionMode.SAME_THREAD);
 	}
 
 	@Test
@@ -85,7 +86,8 @@ void fromJupiterEngineDescriptor() {
 			() -> assertThrows(PreconditionViolationException.class, () -> engineContext.getRequiredTestMethod()),
 			() -> assertThat(engineContext.getDisplayName()).isEqualTo(engineTestDescriptor.getDisplayName()),
 			() -> assertThat(engineContext.getParent()).isEmpty(),
-			() -> assertThat(engineContext.getRoot()).isSameAs(engineContext)
+			() -> assertThat(engineContext.getRoot()).isSameAs(engineContext),
+			() -> assertThat(engineContext.getExecutionMode()).isEqualTo(ExecutionMode.SAME_THREAD)
 		);
 		// @formatter:on
 	}
@@ -109,7 +111,8 @@ void fromClassTestDescriptor() {
 			() -> assertThrows(PreconditionViolationException.class, () -> outerExtensionContext.getRequiredTestInstance()),
 			() -> assertThrows(PreconditionViolationException.class, () -> outerExtensionContext.getRequiredTestMethod()),
 			() -> assertThat(outerExtensionContext.getDisplayName()).isEqualTo(outerClassDescriptor.getDisplayName()),
-			() -> assertThat(outerExtensionContext.getParent()).isEmpty()
+			() -> assertThat(outerExtensionContext.getParent()).isEmpty(),
+			() -> assertThat(outerExtensionContext.getExecutionMode()).isEqualTo(ExecutionMode.SAME_THREAD)
 		);
 		// @formatter:on
 
@@ -175,7 +178,8 @@ void fromMethodTestDescriptor() {
 			() -> assertThat(methodExtensionContext.getRequiredTestMethod()).isEqualTo(testMethod),
 			() -> assertThat(methodExtensionContext.getDisplayName()).isEqualTo(methodTestDescriptor.getDisplayName()),
 			() -> assertThat(methodExtensionContext.getParent()).contains(classExtensionContext),
-			() -> assertThat(methodExtensionContext.getRoot()).isSameAs(engineExtensionContext)
+			() -> assertThat(methodExtensionContext.getRoot()).isSameAs(engineExtensionContext),
+			() -> assertThat(methodExtensionContext.getExecutionMode()).isEqualTo(ExecutionMode.SAME_THREAD)
 		);
 		// @formatter:on
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index f83ddcc68a8c..cde9ded51cb7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -32,6 +32,7 @@
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 import org.junit.jupiter.params.provider.Arguments;
@@ -266,6 +267,11 @@ public void publishReportEntry(Map<String, String> map) {
 			public Store getStore(Namespace namespace) {
 				return new NamespaceAwareStore(store, namespace);
 			}
+
+			@Override
+			public ExecutionMode getExecutionMode() {
+				return ExecutionMode.SAME_THREAD;
+			}
 		};
 	}
 

From cc646f8d3e689fd03b468ce9780cfcb3aa0ac588 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 16 Sep 2021 17:50:48 +0200
Subject: [PATCH 0516/1433] Update Gradle Enterprise plugins

---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 721b2e389bb3..7aa3a43799da 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,9 +5,9 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.6.2"
-		id("com.gradle.enterprise.test-distribution") version "2.1.1"
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.3"
+		id("com.gradle.enterprise") version "3.7"
+		id("com.gradle.enterprise.test-distribution") version "2.2"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"
 		id("com.diffplug.spotless") version "5.12.5"

From fed193a70d851ad52691171cd20612b91b587ab5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 16 Sep 2021 17:52:25 +0200
Subject: [PATCH 0517/1433] Fix broken Javadoc reference and enable doclint

---
 documentation/documentation.gradle.kts                          | 2 +-
 .../src/main/java/org/junit/platform/suite/api/Suite.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 9b29223f4a09..8d91de0ece6b 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -281,7 +281,7 @@ tasks {
 
 			this as StandardJavadocDocletOptions
 			splitIndex(true)
-			addBooleanOption("Xdoclint:none", true)
+			addBooleanOption("Xdoclint:reference", true)
 			addBooleanOption("html5", true)
 			addMultilineStringsOption("tag").value = listOf(
 					"apiNote:a:API Note:",
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
index c8e10b8c1e80..cb55b72b6bd5 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
@@ -63,7 +63,7 @@
  * @see ConfigurationParameter
  * @see DisableParentConfigurationParameters
  * @see org.junit.platform.launcher.LauncherDiscoveryRequest
- * @see org.junit.platform.launcher.LauncherDiscoveryRequestBuilder
+ * @see org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
  * @see org.junit.platform.launcher.Launcher
  */
 @Retention(RetentionPolicy.RUNTIME)

From 593f0d177ad06fe956849ac797c9698f6fe80d6c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 16 Sep 2021 18:01:37 +0200
Subject: [PATCH 0518/1433] Enable more Javadoc doclint checks

---
 documentation/documentation.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 8d91de0ece6b..2683f7d04316 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -281,7 +281,7 @@ tasks {
 
 			this as StandardJavadocDocletOptions
 			splitIndex(true)
-			addBooleanOption("Xdoclint:reference", true)
+			addBooleanOption("Xdoclint:all,-accessibility,-missing", true)
 			addBooleanOption("html5", true)
 			addMultilineStringsOption("tag").value = listOf(
 					"apiNote:a:API Note:",

From 1eb1363da5a2ad2906e41c5e7b0973a694fc3f81 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 16 Sep 2021 18:01:47 +0200
Subject: [PATCH 0519/1433] Resolve Gradle deprecation warning

---
 documentation/documentation.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 2683f7d04316..8f3af1a8b317 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -143,14 +143,14 @@ tasks {
 
 	val generateConsoleLauncherOptions by registering(JavaExec::class) {
 		classpath = sourceSets["test"].runtimeClasspath
-		main = "org.junit.platform.console.ConsoleLauncher"
+		mainClass.set("org.junit.platform.console.ConsoleLauncher")
 		args("--help", "--disable-banner")
 		redirectOutput(consoleLauncherOptionsFile)
 	}
 
 	val generateExperimentalApisTable by registering(JavaExec::class) {
 		classpath = sourceSets["test"].runtimeClasspath
-		main = "org.junit.api.tools.ApiReportGenerator"
+		mainClass.set("org.junit.api.tools.ApiReportGenerator")
 		jvmArgumentProviders += ClasspathSystemPropertyProvider("api.classpath", apiReport)
 		args("EXPERIMENTAL")
 		redirectOutput(experimentalApisTableFile)
@@ -158,7 +158,7 @@ tasks {
 
 	val generateDeprecatedApisTable by registering(JavaExec::class) {
 		classpath = sourceSets["test"].runtimeClasspath
-		main = "org.junit.api.tools.ApiReportGenerator"
+		mainClass.set("org.junit.api.tools.ApiReportGenerator")
 		jvmArgumentProviders += ClasspathSystemPropertyProvider("api.classpath", apiReport)
 		args("DEPRECATED")
 		redirectOutput(deprecatedApisTableFile)

From ab91893aae45eda93a10559ce39dad2d9580bd30 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 17 Sep 2021 21:40:00 +0200
Subject: [PATCH 0520/1433] Relax version constraint on JUnit 4

Fixes #2722.
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 94461cb88819..a4c72067e6f9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ jfrunit = { module = "org.moditect.jfrunit:jfrunit", version = "1.0.0.Alpha1" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "1.6.2" }
-junit4 = { module = "junit:junit", version = { strictly = "[4.12,)", prefer = "4.13.2" } }
+junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.13.2" } }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }

From 07ed27f1c87669034ca2aa72d3562567362a631b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 17 Sep 2021 21:58:37 +0200
Subject: [PATCH 0521/1433] Add #2722 to release notes

---
 .../src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index e9d95694c82c..aa84ee50e9da 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -48,7 +48,8 @@ GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Relaxed version constraint in published Gradle Module Metadata to allow downgrading the
+  `junit:junit` dependency from 4.13.2.
 
 ==== Deprecations and Breaking Changes
 

From 0a3abc4cde096247bc95a1d148f3344fd0666c8a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 18 Sep 2021 16:47:01 +0200
Subject: [PATCH 0522/1433] Make ReflectionSupport.findNestedClasses
 thread-safe

ReflectionSupport.findNestedClasses(..)` is now thread-safe with regard
to cycle detection.

Closes #2715
---
 .../release-notes/release-notes-5.8.1.adoc         |  3 ++-
 .../platform/commons/util/ReflectionUtils.java     |  4 ++--
 .../commons/util/ReflectionUtilsTests.java         | 14 +++++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index aa84ee50e9da..f0d11ec07de0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -23,7 +23,8 @@ GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* `ReflectionSupport.findNestedClasses(..)` is now thread-safe with regard to cycle
+  detection.
 
 
 [[release-notes-5.8.1-junit-jupiter]]
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index e359120257b6..449d48a13744 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -41,13 +41,13 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -130,7 +130,7 @@ public enum HierarchyTraversalMode {
 	 * @since 1.6
 	 * @see #detectInnerClassCycle(Class)
 	 */
-	private static final Set<String> noCyclesDetectedCache = new HashSet<>();
+	private static final Set<String> noCyclesDetectedCache = ConcurrentHashMap.newKeySet();
 
 	/**
 	 * Internal cache of common class names mapped to their types.
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 08fc346820db..0d2e2e60fb43 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -45,6 +45,7 @@
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -787,11 +788,14 @@ void findNestedClassesWithSeeminglyRecursiveHierarchies() {
 	 */
 	@Test
 	void findNestedClassesWithRecursiveHierarchies() {
-		assertNestedCycle(OuterClass.class, InnerClass.class, OuterClass.class);
-		assertNestedCycle(StaticNestedClass.class, InnerClass.class, OuterClass.class);
-		assertNestedCycle(RecursiveInnerClass.class, OuterClass.class);
-		assertNestedCycle(RecursiveInnerInnerClass.class, OuterClass.class);
-		assertNestedCycle(InnerClass.class, RecursiveInnerInnerClass.class, OuterClass.class);
+		Runnable runnable1 = () -> assertNestedCycle(OuterClass.class, InnerClass.class, OuterClass.class);
+		Runnable runnable2 = () -> assertNestedCycle(StaticNestedClass.class, InnerClass.class, OuterClass.class);
+		Runnable runnable3 = () -> assertNestedCycle(RecursiveInnerClass.class, OuterClass.class);
+		Runnable runnable4 = () -> assertNestedCycle(RecursiveInnerInnerClass.class, OuterClass.class);
+		Runnable runnable5 = () -> assertNestedCycle(InnerClass.class, RecursiveInnerInnerClass.class,
+			OuterClass.class);
+		Stream.of(runnable1, runnable1, runnable1, runnable2, runnable2, runnable2, runnable3, runnable3, runnable3,
+			runnable4, runnable4, runnable4, runnable5, runnable5, runnable5).parallel().forEach(Runnable::run);
 	}
 
 	private static List<Class<?>> findNestedClasses(Class<?> clazz) {

From 2e678d6c6529f2bc83c4ece1a3da63a1c35f6d4b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 18 Sep 2021 21:56:57 +0200
Subject: [PATCH 0523/1433] Polishing 5.8.1 release notes

---
 .../src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index f0d11ec07de0..494441237f53 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -41,7 +41,8 @@ GitHub.
 ==== New Features and Improvements
 
 * `JAVA_18` has been added to the `JRE` enum for use with JRE-based execution conditions.
-* The current test or container's `ExecutionMode` is now accessible from `ExtensionContext`.
+* The `ExecutionMode` for the current test or container is now accessible via the
+  `ExtensionContext`.
 
 
 [[release-notes-5.8.1-junit-vintage]]

From 079ba92684927f20db342c5952ec624aba4e4815 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 19 Sep 2021 18:21:14 +0200
Subject: [PATCH 0524/1433] Deprecate @UseTechnicalNames

The JUnitPlatform runner was deprecated in 5.8.0.

This commit deprecates the @UseTechnicalNames annotation, since
@UseTechnicalNames is only used by the JUnitPlatform runner.

Closes #2720
---
 .../docs/asciidoc/release-notes/release-notes-5.8.1.adoc   | 5 ++++-
 .../src/docs/asciidoc/user-guide/running-tests.adoc        | 4 ++--
 .../main/java/org/junit/platform/runner/JUnitPlatform.java | 3 +--
 .../org/junit/platform/runner/JUnitPlatformTestTree.java   | 4 ++--
 .../org/junit/platform/suite/api/UseTechnicalNames.java    | 7 +++++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index 494441237f53..5dac02309d22 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -19,7 +19,10 @@ GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* `@UseTechnicalNames` has been deprecated in favor of the new `@Suite` support which does
+  not require the use of technical names. See the warning in
+  <<../user-guide/index.adoc#running-tests-junit-platform-runner, Using JUnit 4 to run the
+  JUnit Platform>> for details.
 
 ==== New Features and Improvements
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index ca81e93082ee..f72a7bdd5d0a 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -617,8 +617,8 @@ In addition, the introduction of `@Suite` support provided by the
 `junit-platform-suite-engine` module makes the `JUnitPlatform` runner obsolete. See
 <<junit-platform-suite-engine>> for details.
 
-The `JUnitPlatform` runner has therefore been deprecated in JUnit Platform 1.8 and will be
-removed in JUnit Platform 2.0.
+The `JUnitPlatform` runner and `@UseTechnicalNames` annotation have therefore been
+deprecated in JUnit Platform 1.8 and will be removed in JUnit Platform 2.0.
 
 If you are using the `JUnitPlatform` runner, please migrate to the `@Suite` support.
 ====
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index 1a9823ad6643..c01f4ed55d2c 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -47,7 +47,6 @@
 import org.junit.platform.suite.api.SelectUris;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.api.SuiteDisplayName;
-import org.junit.platform.suite.api.UseTechnicalNames;
 import org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
@@ -104,7 +103,7 @@
  * @see IncludeTags
  * @see ExcludeTags
  * @see SuiteDisplayName
- * @see UseTechnicalNames
+ * @see org.junit.platform.suite.api.UseTechnicalNames UseTechnicalNames
  * @see ConfigurationParameter
  * @deprecated since 1.8, in favor of the {@link Suite @Suite} support provided by
  * the {@code junit-platform-suite-engine} module; to be removed in JUnit Platform 2.0
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
index 631dab46556a..dae56a23aad7 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
@@ -30,7 +30,6 @@
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.suite.api.SuiteDisplayName;
-import org.junit.platform.suite.api.UseTechnicalNames;
 import org.junit.runner.Description;
 import org.junit.runner.manipulation.Filter;
 
@@ -54,8 +53,9 @@ public TestPlan getTestPlan() {
 		return testPlan;
 	}
 
+	@SuppressWarnings("deprecation")
 	private static boolean useTechnicalNames(Class<?> testClass) {
-		return testClass.isAnnotationPresent(UseTechnicalNames.class);
+		return testClass.isAnnotationPresent(org.junit.platform.suite.api.UseTechnicalNames.class);
 	}
 
 	Description getSuiteDescription() {
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
index 32ede2d0aa3a..cef0ab2cb37e 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.suite.api;
 
-import static org.apiguardian.api.API.Status.MAINTAINED;
+import static org.apiguardian.api.API.Status.DEPRECATED;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -43,11 +43,14 @@
  *
  * @since 1.0
  * @see org.junit.platform.runner.JUnitPlatform
+ * @deprecated since 1.8, in favor of the {@link Suite @Suite} support provided by
+ * the {@code junit-platform-suite-engine} module; to be removed in JUnit Platform 2.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = MAINTAINED, since = "1.0")
+@API(status = DEPRECATED, since = "1.8")
+@Deprecated
 public @interface UseTechnicalNames {
 }

From bcd425046e7f601698667a6c234110c397f42e13 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 19 Sep 2021 19:29:32 +0300
Subject: [PATCH 0525/1433] Introduce support for text blocks in @CsvSource

@CsvSource allows users to provide CSV content as an array of strings,
where each string represents a line in a CSV file.

With the introduction of support for text blocks as a first-class
language feature in recent JDKs (preview feature in Java SE 15), we can
improve the user experience with @CsvSource by allowing the user to
provide a text block instead of an array of strings.

This commit introduces a new textBlock attribute in @CsvSource that
allows users to take advantage of the text block support in their
programming language.

Given the following parameterized test using a text block...

@ParameterizedTest
@CsvSource(textBlock = """
	apple,         1
	banana,        2
	'lemon, lime', 0xF1
	strawberry,    700_000
""")
void csvSourceWithTextBlock(String fruit, int rank) {
	System.out.println(fruit + " : " + rank);
}

... the output is:

apple : 1
banana : 2
lemon, lime : 241
strawberry : 700000

Closes #2721
---
 .../release-notes/release-notes-5.8.1.adoc    |  4 ++
 .../asciidoc/user-guide/writing-tests.adoc    | 37 ++++++++---
 .../params/provider/CsvArgumentsProvider.java | 16 ++++-
 .../jupiter/params/provider/CsvSource.java    | 66 +++++++++++++++++--
 .../ParameterizedTestIntegrationTests.java    | 26 ++++++++
 .../provider/CsvArgumentsProviderTests.java   | 44 ++++++++++++-
 .../provider/MockCsvAnnotationBuilder.java    |  7 ++
 7 files changed, 186 insertions(+), 14 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index 5dac02309d22..b19929b5ebb2 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -44,6 +44,10 @@ GitHub.
 ==== New Features and Improvements
 
 * `JAVA_18` has been added to the `JRE` enum for use with JRE-based execution conditions.
+* CSV content in `@CsvSource` can now be supplied as a _text block_ instead of an array of
+  strings. See the
+  <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvSource, User
+  Guide>> for details and an example.
 * The `ExecutionMode` for the current test or container is now accessible via the
   `ExtensionContext`.
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 5f7d1472c356..d5a54c0e3178 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1330,14 +1330,34 @@ include::{testDir}/example/ExternalMethodSourceDemo.java[tags=external_MethodSou
 [[writing-tests-parameterized-tests-sources-CsvSource]]
 ===== @CsvSource
 
-`@CsvSource` allows you to express argument lists as comma-separated values (i.e.,
-`String` literals).
+`@CsvSource` allows you to express argument lists as comma-separated values (i.e., CSV
+`String` literals). Each string provided via the `value` attribute in `@CsvSource`
+represents a CSV line and results in one invocation of the parameterized test.
 
 [source,java,indent=0]
 ----
 include::{testDir}/example/ParameterizedTestDemo.java[tags=CsvSource_example]
 ----
 
+If the programming language you are using supports _text blocks_ -- for example, Java SE
+15 or higher -- you can alternatively use the `textBlock` attribute of `@CsvSource`. Each
+line within a text block represents a CSV line and results in one invocation of the
+parameterized test. Using a text block, the previous example can be implemented as follows.
+
+[source,java,indent=0]
+----
+@ParameterizedTest
+@CsvSource(textBlock = """
+	apple,         1
+	banana,        2
+	'lemon, lime', 0xF1
+	strawberry,    700_000
+""")
+void testWithCsvSource(String fruit, int rank) {
+	// ...
+}
+----
+
 The default delimiter is a comma (`,`), but you can use another character by setting the
 `delimiter` attribute. Alternatively, the `delimiterString` attribute allows you to use a
 `String` delimiter instead of a single character. However, both delimiter attributes
@@ -1354,8 +1374,8 @@ reference is a primitive type.
 NOTE: An _unquoted_ empty value will always be converted to a `null` reference regardless
 of any custom values configured via the `nullValues` attribute.
 
-Unless it starts with a quote character, leading and trailing whitespaces of a
-CSV column are trimmed by default. This behavior can be changed by setting the
+Unless it starts with a quote character, leading and trailing whitespace in a CSV column
+is trimmed by default. This behavior can be changed by setting the
 `ignoreLeadingAndTrailingWhitespace` attribute to `true`.
 
 [cols="50,50"]
@@ -1373,8 +1393,9 @@ CSV column are trimmed by default. This behavior can be changed by setting the
 [[writing-tests-parameterized-tests-sources-CsvFileSource]]
 ===== @CsvFileSource
 
-`@CsvFileSource` lets you use CSV files from the classpath or the local file system. Each
-line from a CSV file results in one invocation of the parameterized test.
+`@CsvFileSource` lets you use comma-separated value (CSV) files from the classpath or the
+local file system. Each line from a CSV file results in one invocation of the
+parameterized test.
 
 The default delimiter is a comma (`,`), but you can use another character by setting the
 `delimiter` attribute. Alternatively, the `delimiterString` attribute allows you to use a
@@ -1407,8 +1428,8 @@ reference is a primitive type.
 NOTE: An _unquoted_ empty value will always be converted to a `null` reference regardless
 of any custom values configured via the `nullValues` attribute.
 
-Unless it starts with a quote character, leading and trailing whitespaces of a
-CSV column are trimmed by default. This behavior can be changed by setting the
+Unless it starts with a quote character, leading and trailing whitespace in a CSV column
+is trimmed by default. This behavior can be changed by setting the
 `ignoreLeadingAndTrailingWhitespace` attribute to `true`.
 
 [[writing-tests-parameterized-tests-sources-ArgumentsSource]]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 863a68eace1f..16b5d4206bcd 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -17,6 +17,7 @@
 import java.util.Arrays;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import com.univocity.parsers.csv.CsvParser;
@@ -32,6 +33,8 @@
  */
 class CsvArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<CsvSource> {
 
+	private static final Pattern NEW_LINE_REGEX = Pattern.compile("\\n");
+
 	private static final String LINE_SEPARATOR = "\n";
 
 	private CsvSource annotation;
@@ -47,9 +50,20 @@ public void accept(CsvSource annotation) {
 
 	@Override
 	public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+		Preconditions.condition(this.annotation.value().length > 0 ^ !this.annotation.textBlock().isEmpty(),
+			() -> "@CsvSource must be declared with either `value` or `textBlock` but not both");
+
+		String[] lines;
+		if (!this.annotation.textBlock().isEmpty()) {
+			lines = NEW_LINE_REGEX.split(this.annotation.textBlock(), 0);
+		}
+		else {
+			lines = this.annotation.value();
+		}
+
 		AtomicLong index = new AtomicLong(0);
 		// @formatter:off
-		return Arrays.stream(this.annotation.value())
+		return Arrays.stream(lines)
 				.map(line -> parseLine(index.getAndIncrement(), line))
 				.map(Arguments::of);
 		// @formatter:on
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index eb7c6f18be66..1cfe4cdda1c8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -22,9 +22,9 @@
 import org.apiguardian.api.API;
 
 /**
- * {@code @CsvSource} is an {@link ArgumentsSource} which reads
- * comma-separated values (CSV) from one or more supplied
- * {@linkplain #value CSV lines}.
+ * {@code @CsvSource} is an {@link ArgumentsSource} which reads comma-separated
+ * values (CSV) from one or more CSV lines supplied via the {@link #value}
+ * attribute or {@link #textBlock} attribute.
  *
  * <p>The column delimiter (defaults to comma) can be customized with either
  * {@link #delimiter()} or {@link #delimiterString()}.
@@ -51,8 +51,65 @@
 	 * the specified {@link #delimiter} or {@link #delimiterString}. Any line
 	 * beginning with a {@code #} symbol will be interpreted as a comment and will
 	 * be ignored.
+	 *
+	 * <p>Defaults to an empty array. You therefore must supply CSV content
+	 * via this attribute or the {@link #textBlock} attribute.
+	 *
+	 * <p>If <em>text block</em> syntax is supported by your programming language,
+	 * you may find it more convenient to declare your CSV content via the
+	 * {@link #textBlock} attribute.
+	 *
+	 * <h4>Example</h4>
+	 * <pre class="code">
+	 * {@literal @}ParameterizedTest
+	 * {@literal @}CsvSource({
+	 *     "apple,         1",
+	 *     "banana,        2",
+	 *     "'lemon, lime', 0xF1",
+	 *     "strawberry,    700_000",
+	 * })
+	 * void test(String fruit, int rank) {
+	 *     // ...
+	 * }</pre>
+	 *
+	 * @see #textBlock
 	 */
-	String[] value();
+	String[] value() default {};
+
+	/**
+	 * The CSV lines to use as the source of arguments, supplied as a single
+	 * <em>text block</em>; must not be empty.
+	 *
+	 * <p>Each line in the text block corresponds to a line in a CSV file and will
+	 * be split using the specified {@link #delimiter} or {@link #delimiterString}.
+	 * Any line beginning with a {@code #} symbol will be interpreted as a comment
+	 * and will be ignored.
+	 *
+	 * <p>Defaults to an empty string. You therefore must supply CSV content
+	 * via this attribute or the {@link #value} attribute.
+	 *
+	 * <p>Text block syntax is supported by various languages on the JVM
+	 * including Java SE 15 or higher. If text blocks are not supported, you
+	 * should declare your CSV content via the {@link #value} attribute.
+	 *
+	 * <h4>Example</h4>
+	 * <pre class="code">
+	 * {@literal @}ParameterizedTest
+	 * {@literal @}CsvSource(textBlock = """
+	 *     apple,         1
+	 *     banana,        2
+	 *     'lemon, lime', 0xF1
+	 *     strawberry,    700_000
+	 * """)
+	 * void test(String fruit, int rank) {
+	 *     // ...
+	 * }</pre>
+	 *
+	 * @since 5.8.1
+	 * @see #value
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8.1")
+	String textBlock() default "";
 
 	/**
 	 * The column delimiter character to use when reading the {@linkplain #value lines}.
@@ -128,4 +185,5 @@
 	 */
 	@API(status = EXPERIMENTAL, since = "5.8")
 	boolean ignoreLeadingAndTrailingWhitespace() default true;
+
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 737877422c46..364f0992b1f1 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -90,6 +90,32 @@
  */
 class ParameterizedTestIntegrationTests {
 
+	@ParameterizedTest
+	@CsvSource(textBlock = """
+				apple,         1
+				banana,        2
+				'lemon, lime', 0xF1
+				strawberry,    700_000
+			""")
+	void executesLinesFromTextBlock(String fruit, int rank) {
+		switch (fruit) {
+			case "apple":
+				assertThat(rank).isEqualTo(1);
+				break;
+			case "banana":
+				assertThat(rank).isEqualTo(2);
+				break;
+			case "lemon, lime":
+				assertThat(rank).isEqualTo(241);
+				break;
+			case "strawberry":
+				assertThat(rank).isEqualTo(700_000);
+				break;
+			default:
+				fail("Unexpected fruit : " + fruit);
+		}
+	}
+
 	@Test
 	void executesWithSingleArgumentsProviderWithMultipleInvocations() {
 		var results = execute("testWithTwoSingleStringArgumentsProvider", String.class);
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index d0a876a17cb9..4ba60b8ffb28 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -26,7 +26,7 @@
 class CsvArgumentsProviderTests {
 
 	@Test
-	void throwsExceptionOnInvalidCsv() {
+	void throwsExceptionForInvalidCsv() {
 		var annotation = csvSource("foo", "bar", "");
 
 		assertThatExceptionOfType(JUnitException.class)//
@@ -34,6 +34,27 @@ void throwsExceptionOnInvalidCsv() {
 				.withMessage("Line at index 2 contains invalid CSV: \"\"");
 	}
 
+	@Test
+	void throwsExceptionIfNeitherValueNorTextBlockIsDeclared() {
+		var annotation = csvSource().build();
+
+		assertThatExceptionOfType(PreconditionViolationException.class)//
+				.isThrownBy(() -> provideArguments(annotation))//
+				.withMessage("@CsvSource must be declared with either `value` or `textBlock` but not both");
+	}
+
+	@Test
+	void throwsExceptionIfValueAndTextBlockAreDeclared() {
+		var annotation = csvSource().lines("foo").textBlock("""
+				bar
+				baz
+				""").build();
+
+		assertThatExceptionOfType(PreconditionViolationException.class)//
+				.isThrownBy(() -> provideArguments(annotation))//
+				.withMessage("@CsvSource must be declared with either `value` or `textBlock` but not both");
+	}
+
 	@Test
 	void providesSingleArgument() {
 		var annotation = csvSource("foo");
@@ -43,6 +64,15 @@ void providesSingleArgument() {
 		assertThat(arguments).containsExactly(array("foo"));
 	}
 
+	@Test
+	void providesSingleArgumentFromTextBlock() {
+		var annotation = csvSource().textBlock("foo").build();
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("foo"));
+	}
+
 	@Test
 	void providesMultipleArguments() {
 		var annotation = csvSource("foo", "bar");
@@ -52,6 +82,18 @@ void providesMultipleArguments() {
 		assertThat(arguments).containsExactly(array("foo"), array("bar"));
 	}
 
+	@Test
+	void providesMultipleArgumentsFromTextBlock() {
+		var annotation = csvSource().textBlock("""
+				foo
+				bar
+				""").build();
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("foo"), array("bar"));
+	}
+
 	@Test
 	void splitsAndTrimsArguments() {
 		var annotation = csvSource(" foo , bar ");
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index 097caa0a9cdc..5c5605fcd5e6 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -83,6 +83,7 @@ B ignoreLeadingAndTrailingWhitespace(boolean ignoreLeadingAndTrailingWhitespace)
 	static class MockCsvSourceBuilder extends MockCsvAnnotationBuilder<CsvSource, MockCsvSourceBuilder> {
 
 		private String[] lines = new String[0];
+		private String textBlock = "";
 
 		@Override
 		protected MockCsvSourceBuilder getSelf() {
@@ -94,6 +95,11 @@ MockCsvSourceBuilder lines(String... lines) {
 			return this;
 		}
 
+		MockCsvSourceBuilder textBlock(String textBlock) {
+			this.textBlock = textBlock;
+			return this;
+		}
+
 		@Override
 		CsvSource build() {
 			var annotation = mock(CsvSource.class);
@@ -108,6 +114,7 @@ CsvSource build() {
 
 			// @CsvSource
 			when(annotation.value()).thenReturn(this.lines);
+			when(annotation.textBlock()).thenReturn(this.textBlock);
 
 			return annotation;
 		}

From 92aedbb8f899e291ffc5754e29d88798f4a87942 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 19 Sep 2021 18:40:23 +0200
Subject: [PATCH 0526/1433] Prepare 5.8.1 release notes

---
 .../release-notes/release-notes-5.8.1.adoc    | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index b19929b5ebb2..821182b8e7ea 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -1,9 +1,14 @@
 [[release-notes-5.8.1]]
 == 5.8.1
 
-*Date of Release:* ❓
+*Date of Release:* September ❓, 2021
 
-*Scope:* Bug fixes since 5.8.0
+*Scope:*
+
+* JDK 17 support for _text blocks_ in `@CsvSource`
+* JDK 18 support in the `JRE` enum
+* Access to the `ExecutionMode` in the `ExtensionContext`
+* Minor bug fixes and enhancements since 5.8.0
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/59?closed=1+[5.8.1] milestone page in the JUnit repository on
@@ -13,10 +18,6 @@ GitHub.
 [[release-notes-5.8.1-junit-platform]]
 === JUnit Platform
 
-==== Bug Fixes
-
-* ❓
-
 ==== Deprecations and Breaking Changes
 
 * `@UseTechnicalNames` has been deprecated in favor of the new `@Suite` support which does
@@ -33,14 +34,6 @@ GitHub.
 [[release-notes-5.8.1-junit-jupiter]]
 === JUnit Jupiter
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * `JAVA_18` has been added to the `JRE` enum for use with JRE-based execution conditions.
@@ -59,11 +52,3 @@ GitHub.
 
 * Relaxed version constraint in published Gradle Module Metadata to allow downgrading the
   `junit:junit` dependency from 4.13.2.
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓

From 293f8c9664391b14f44cc4681b01fa584a12c7d4 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 19 Sep 2021 18:50:04 +0200
Subject: [PATCH 0527/1433] Polish 5.8.1 release notes

---
 .../src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index 821182b8e7ea..e12d283c334c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -5,8 +5,8 @@
 
 *Scope:*
 
-* JDK 17 support for _text blocks_ in `@CsvSource`
-* JDK 18 support in the `JRE` enum
+* Support for _text blocks_ in `@CsvSource`
+* Java 18 support in the `JRE` enum
 * Access to the `ExecutionMode` in the `ExtensionContext`
 * Minor bug fixes and enhancements since 5.8.0
 

From 3ceb782792fb62ad2f7fad519c0b49d23ebc30a6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 20 Sep 2021 13:11:27 +0200
Subject: [PATCH 0528/1433] Add missing public constructor

---
 .../platform/launcher/listeners/UniqueIdTrackingListener.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index 90b1f5b0733e..d3dd27aefa2a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -134,6 +134,10 @@ public class UniqueIdTrackingListener implements TestExecutionListener {
 
 	private boolean enabled;
 
+	public UniqueIdTrackingListener() {
+		// to avoid missing-explicit-ctor warning
+	}
+
 	@Override
 	public void testPlanExecutionStarted(TestPlan testPlan) {
 		this.enabled = testPlan.getConfigurationParameters().getBoolean(LISTENER_ENABLED_PROPERTY_NAME).orElse(false);

From 51027af895c363c34dac55973b1e6ab8208da467 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 20 Sep 2021 13:11:45 +0200
Subject: [PATCH 0529/1433] Update AssertJ

---
 .../test/java/example/testkit/EngineTestKitAllEventsDemo.java  | 3 ---
 gradle/libs.versions.toml                                      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
index 713fb68a86e2..6090550547fe 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
@@ -13,7 +13,6 @@
 // @formatter:off
 // tag::user_guide[]
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.testkit.engine.EventConditions.abortedWithReason;
 import static org.junit.platform.testkit.engine.EventConditions.container;
@@ -33,14 +32,12 @@
 import example.ExampleTestCase;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.opentest4j.TestAbortedException;
 
 class EngineTestKitAllEventsDemo {
 
 	@Test
-	@DisabledOnJre(JAVA_18) // https://github.com/assertj/assertj-core/issues/2340
 	void verifyAllJupiterEvents() {
 		Writer writer = // create a java.io.Writer for debug output
 		// end::user_guide[]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a4c72067e6f9..ff378eb24ad0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
-assertj = "3.20.2"
+assertj = "3.21.0"
 checkstyle = "8.36.2"
 jacoco = "0.8.7"
 jmh = "1.32"

From 2bc960e5ee5e006d9ec89f8f1da5114630f8f23b Mon Sep 17 00:00:00 2001
From: Christian Femers <coleoptera.femers@t-online.de>
Date: Tue, 21 Sep 2021 12:52:17 +0200
Subject: [PATCH 0530/1433] Fix unintended exceptions in assertLinesMatch

This commit adds tests for fast-forward lines surrounded by spaces.
This commit also adds a test for limited, non-terminal fast-forward exceeding
actual lines.

Prior to this commit, isFastForwardLine and parseFastForwardLimit currently
didn't match each other in how they handle spaces on the outside of the
fast-forward markers.

> isFastForwardLine allows them and will detect " >> 2 >> " as a
> fast-forward line, but parseFastForwardLimit does not handle the spaces
> correctly. It only trims the line that substring(int, int) is invoked on
> and does not do so when determining the end index based on the string
> length.
> This can lead to an IndexOutOfBoundsException being thrown for strings
> with three or more surrounding spaces, like "  >> 2 >> ". Strings with
> one or two surround spaces, like " >> 2 >> ", are treated like an
> unlimited fast-forward.

Now, a trimmed line is passed to parseFastForwardLimit before any further
usage. This implementation is analogous to the implementation in
isFastForwardLine that reassigns the trimmed line to the parameter.

Also, an NoSuchElementException is prevented when fast-forward exceeds
the number of actual lines.
---
 .../release-notes/release-notes-5.8.1.adoc    |  8 ++++++++
 .../junit/jupiter/api/AssertLinesMatch.java   |  9 +++++++--
 .../api/AssertLinesMatchAssertionsTests.java  | 20 +++++++++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index e12d283c334c..8357ebab4dda 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -34,6 +34,14 @@ GitHub.
 [[release-notes-5.8.1-junit-jupiter]]
 === JUnit Jupiter
 
+==== Bug Fixes
+
+* `assertLinesMatch()` in `Assertions` no longer fails with a `NoSuchElementException` if
+  a limited fast-forward followed by at least one more expected line exceeds the remaining
+  actual lines.
+* `assertLinesMatch()` in `Assertions` now handles fast-forwards with leading and trailing
+  spaces correctly and no longer throws an `IndexOutOfBoundsException`.
+
 ==== New Features and Improvements
 
 * `JAVA_18` has been added to the `JRE` enum for use with JRE-based execution conditions.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
index f6eadb91807d..eb580b75b15f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
@@ -136,10 +136,10 @@ void assertLinesMatchWithFastForward() {
 				// fast-forward marker found in expected line: fast-forward actual line...
 				if (isFastForwardLine(expectedLine)) {
 					int fastForwardLimit = parseFastForwardLimit(expectedLine);
+					int actualRemaining = actualDeque.size();
 
 					// trivial case: fast-forward marker was in last expected line
 					if (expectedDeque.isEmpty()) {
-						int actualRemaining = actualDeque.size();
 						// no limit given or perfect match? we're done.
 						if (fastForwardLimit == Integer.MAX_VALUE || fastForwardLimit == actualRemaining) {
 							return;
@@ -150,6 +150,10 @@ void assertLinesMatchWithFastForward() {
 
 					// fast-forward limit was given: use it
 					if (fastForwardLimit != Integer.MAX_VALUE) {
+						if (actualRemaining < fastForwardLimit) {
+							fail("fast-forward(%d) error: not enough actual lines remaining (%s)", fastForwardLimit,
+								actualRemaining);
+						}
 						// fast-forward now: actualDeque.pop(fastForwardLimit)
 						for (int i = 0; i < fastForwardLimit; i++) {
 							actualDeque.pop();
@@ -202,7 +206,8 @@ static boolean isFastForwardLine(String line) {
 	}
 
 	static int parseFastForwardLimit(String fastForwardLine) {
-		String text = fastForwardLine.trim().substring(2, fastForwardLine.length() - 2).trim();
+		fastForwardLine = fastForwardLine.trim();
+		String text = fastForwardLine.substring(2, fastForwardLine.length() - 2).trim();
 		try {
 			int limit = Integer.parseInt(text);
 			condition(limit > 0, () -> format("fast-forward(%d) limit must be greater than zero", limit));
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
index eb6228663df1..bf8f31289a7f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
@@ -164,6 +164,19 @@ void assertLinesMatchUsingFastForwardMarkerWithTooHighLimitFails() {
 		assertError(error, "terminal fast-forward(100) error: fast-forward(2) expected", expected, actual);
 	}
 
+	@Test
+	void assertLinesMatchUsingFastForwardMarkerWithTooHighLimitAndFollowingLineFails() {
+		/*
+		 * It is important here that the line counts are expected <= actual, that the
+		 * fast-forward exceeds the available actual lines and that it is not a
+		 * terminal fast-forward.
+		 */
+		var expected = List.of("first line", ">> 3 >>", "not present");
+		var actual = List.of("first line", "first skipped", "second skipped");
+		var error = assertThrows(AssertionFailedError.class, () -> assertLinesMatch(expected, actual));
+		assertError(error, "fast-forward(3) error: not enough actual lines remaining (2)", expected, actual);
+	}
+
 	@Test
 	void assertLinesMatchUsingFastForwardMarkerWithoutMatchingNextLineFails() {
 		var expected = List.of("first line", ">> fails, because next line is >>", "not present");
@@ -187,7 +200,8 @@ void assertLinesMatchIsFastForwardLine() {
 			() -> assertTrue(isFastForwardLine(">> stacktrace >>")),
 			() -> assertTrue(isFastForwardLine(">> single line, non Integer.parse()-able comment >>")),
 			() -> assertTrue(isFastForwardLine(">>9>>")), () -> assertTrue(isFastForwardLine(">> 9 >>")),
-			() -> assertTrue(isFastForwardLine(">> -9 >>")));
+			() -> assertTrue(isFastForwardLine(">> -9 >>")), () -> assertTrue(isFastForwardLine(" >> 9 >> ")),
+			() -> assertTrue(isFastForwardLine("  >> 9 >>  ")));
 	}
 
 	@Test
@@ -198,7 +212,9 @@ void assertLinesMatchParseFastForwardLimit() {
 			() -> assertEquals(Integer.MAX_VALUE, parseFastForwardLimit(">> stacktrace >>")),
 			() -> assertEquals(Integer.MAX_VALUE, parseFastForwardLimit(">> non Integer.parse()-able comment >>")),
 			() -> assertEquals(9, parseFastForwardLimit(">>9>>")),
-			() -> assertEquals(9, parseFastForwardLimit(">> 9 >>")));
+			() -> assertEquals(9, parseFastForwardLimit(">> 9 >>")),
+			() -> assertEquals(9, parseFastForwardLimit(" >> 9 >> ")),
+			() -> assertEquals(9, parseFastForwardLimit("  >> 9 >>  ")));
 		Throwable error = assertThrows(PreconditionViolationException.class, () -> parseFastForwardLimit(">>0>>"));
 		assertMessageEquals(error, "fast-forward(0) limit must be greater than zero");
 		error = assertThrows(PreconditionViolationException.class, () -> parseFastForwardLimit(">>-1>>"));

From 78e12cf8f44f283292e6354122593f32441db257 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Tue, 21 Sep 2021 18:31:17 +0200
Subject: [PATCH 0531/1433] Create release notes for 5.9.0-M1

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.9.0-M1.adoc | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 3917b6a8af7a..aa7fc1fee5d5 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.9.0-M1.adoc[]
+
 include::{basedir}/release-notes-5.8.1.adoc[]
 
 include::{basedir}/release-notes-5.8.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
new file mode 100644
index 000000000000..e2535a0aba92
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.9.0-M1️]]
+== 5.9.0-M1️
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/5.9.0-M1️?closed=1+[5.9 M1️] milestone page in the JUnit repository on
+GitHub.
+
+
+[[release-notes-5.9.0-M1️-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.0-M1️-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.0-M1️-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From c997035ca6d49606ceb1e3536ddec55e395d8e72 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 22 Sep 2021 20:25:33 +0200
Subject: [PATCH 0532/1433] Release 5.8.1

---
 README.md                                                       | 2 +-
 .../src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 18256252f8c3..36c6fb2796f1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.8.0](https://github.com/junit-team/junit5/releases/tag/r5.8.0) (September 12, 2021)
+- General Availability (GA): [JUnit 5.8.1](https://github.com/junit-team/junit5/releases/tag/r5.8.1) (September 22, 2021)
 - Preview (Milestone/Release Candidate): n/a
 
 ## Documentation
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
index 8357ebab4dda..8a54b4f541d9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.8.1]]
 == 5.8.1
 
-*Date of Release:* September ❓, 2021
+*Date of Release:* September 22, 2021
 
 *Scope:*
 

From 17ea54641fc8e3a116fc1de60abd44f9bebc8495 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 24 Sep 2021 19:45:00 +0200
Subject: [PATCH 0533/1433] Update Checkstyle and fix previously undetected
 violations

---
 gradle/libs.versions.toml                     |  2 +-
 .../org/junit/jupiter/api/TestReporter.java   |  2 +-
 .../api/extension/ExtensionContext.java       | 18 ++++++-------
 ...ecycleMethodExecutionExceptionHandler.java |  2 +-
 .../TestExecutionExceptionHandler.java        |  2 +-
 ...TestTemplateInvocationContextProvider.java |  2 +-
 .../api/function/ThrowingConsumer.java        |  2 +-
 .../api/function/ThrowingSupplier.java        |  2 +-
 .../api/parallel/ResourceAccessMode.java      |  2 +-
 .../junit/jupiter/api/parallel/Resources.java |  2 +-
 .../org/junit/jupiter/engine/Constants.java   | 26 +++++++++----------
 .../commons/support/ModifierSupport.java      |  8 +++---
 .../junit/platform/commons/util/LruCache.java |  2 +-
 .../commons/util/ReflectionUtils.java         | 10 +++----
 .../engine/ConfigurationParameters.java       |  4 +--
 .../engine/EngineDiscoveryListener.java       |  2 +-
 .../engine/EngineDiscoveryRequest.java        |  2 +-
 .../platform/engine/ExecutionRequest.java     |  2 +-
 .../junit/platform/engine/TestDescriptor.java |  2 +-
 .../org/junit/platform/engine/TestEngine.java |  2 +-
 .../org/junit/platform/engine/UniqueId.java   |  2 +-
 .../EngineDiscoveryRequestResolver.java       |  2 +-
 .../support/discovery/SelectorResolver.java   |  6 ++---
 .../hierarchical/ExclusiveResource.java       |  2 +-
 ...inPoolHierarchicalTestExecutorService.java |  2 +-
 .../hierarchical/HierarchicalTestEngine.java  |  4 +--
 .../HierarchicalTestExecutorService.java      |  2 +-
 .../engine/support/hierarchical/Node.java     |  2 +-
 .../OpenTest4JAwareThrowableCollector.java    |  2 +-
 .../ParallelExecutionConfiguration.java       |  3 +--
 ...arallelExecutionConfigurationStrategy.java |  2 +-
 .../support/hierarchical/ResourceLock.java    |  3 +--
 .../jfr/FlightRecordingDiscoveryListener.java |  2 +-
 .../jfr/FlightRecordingExecutionListener.java |  2 +-
 .../platform/launcher/LauncherConstants.java  |  2 +-
 .../launcher/LauncherDiscoveryListener.java   |  2 +-
 .../platform/launcher/LauncherSession.java    |  2 +-
 .../launcher/LauncherSessionListener.java     |  2 +-
 .../launcher/core/LauncherConfig.java         |  2 +-
 .../core/LauncherDiscoveryRequestBuilder.java |  6 ++---
 .../launcher/core/LauncherFactory.java        |  6 ++---
 .../listeners/TestExecutionSummary.java       |  2 +-
 .../junit/platform/testkit/engine/Events.java |  4 +--
 43 files changed, 78 insertions(+), 82 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ff378eb24ad0..93eaf85d38a8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
 assertj = "3.21.0"
-checkstyle = "8.36.2"
+checkstyle = "9.0"
 jacoco = "0.8.7"
 jmh = "1.32"
 junit4 = "4.13.2"
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
index a309c33fe095..28a6501f526c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
@@ -68,9 +68,9 @@ default void publishEntry(String key, String value) {
 	 * argument as the value.
 	 *
 	 * @param value the value to be published; never {@code null} or blank
+	 * @since 5.3
 	 * @see #publishEntry(Map)
 	 * @see #publishEntry(String, String)
-	 * @since 5.3
 	 */
 	@API(status = STABLE, since = "5.3")
 	default void publishEntry(String value) {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index 8f110c1a2a92..fa2a5c5e1bf0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -149,8 +149,8 @@ default Class<?> getRequiredTestClass() {
 	 *
 	 * @return an {@code Optional} containing the test instance {@code Lifecycle};
 	 * never {@code null} but potentially empty
-	 * @see org.junit.jupiter.api.TestInstance {@code @TestInstance}
 	 * @since 5.1
+	 * @see org.junit.jupiter.api.TestInstance {@code @TestInstance}
 	 */
 	@API(status = STABLE, since = "5.1")
 	Optional<Lifecycle> getTestInstanceLifecycle();
@@ -193,9 +193,8 @@ default Object getRequiredTestInstance() {
 	 *
 	 * @return an {@code Optional} containing the test instances; never
 	 * {@code null} but potentially empty
-	 * @see #getRequiredTestInstances()
-	 *
 	 * @since 5.4
+	 * @see #getRequiredTestInstances()
 	 */
 	@API(status = STABLE, since = "5.7")
 	Optional<TestInstances> getTestInstances();
@@ -210,7 +209,6 @@ default Object getRequiredTestInstance() {
 	 * @return the test instances; never {@code null}
 	 * @throws PreconditionViolationException if the test instances are not present
 	 * in this {@code ExtensionContext}
-	 *
 	 * @since 5.4
 	 */
 	@API(status = STABLE, since = "5.7")
@@ -286,9 +284,9 @@ default Method getRequiredTestMethod() {
 	 * @return an {@code Optional} containing the value; never {@code null}
 	 * but potentially empty
 	 *
+	 * @since 5.1
 	 * @see System#getProperty(String)
 	 * @see org.junit.platform.engine.ConfigurationParameters
-	 * @since 5.1
 	 */
 	@API(status = STABLE, since = "5.1")
 	Optional<String> getConfigurationParameter(String key);
@@ -311,9 +309,9 @@ default Method getRequiredTestMethod() {
 	 * @return an {@code Optional} containing the value; never {@code null}
 	 * but potentially empty
 	 *
+	 * @since 5.7
 	 * @see System#getProperty(String)
 	 * @see org.junit.platform.engine.ConfigurationParameters
-	 * @since 5.7
 	 */
 	@API(status = EXPERIMENTAL, since = "5.7")
 	<T> Optional<T> getConfigurationParameter(String key, Function<String, T> transformer);
@@ -357,10 +355,10 @@ default void publishReportEntry(String key, String value) {
 	 * argument as the value.
 	 *
 	 * @param value the value to be published; never {@code null} or blank
+	 * @since 5.3
 	 * @see #publishReportEntry(Map)
 	 * @see #publishReportEntry(String, String)
 	 * @see org.junit.platform.engine.EngineExecutionListener#reportingEntryPublished
-	 * @since 5.3
 	 */
 	@API(status = STABLE, since = "5.3")
 	default void publishReportEntry(String value) {
@@ -389,8 +387,8 @@ default void publishReportEntry(String value) {
 	 *
 	 * @return the {@code ExecutionMode} of the test; never {@code null}
 	 *
-	 * @see org.junit.jupiter.api.parallel.ExecutionMode {@code @ExecutionMode}
 	 * @since 5.8.1
+	 * @see org.junit.jupiter.api.parallel.ExecutionMode {@code @ExecutionMode}
 	 */
 	@API(status = STABLE, since = "5.8.1")
 	ExecutionMode getExecutionMode();
@@ -477,8 +475,8 @@ interface CloseableResource {
 		 * @param defaultValue the default value
 		 * @param <V> the value type
 		 * @return the value; potentially {@code null}
-		 * @see #get(Object, Class)
 		 * @since 5.5
+		 * @see #get(Object, Class)
 		 */
 		@API(status = STABLE, since = "5.5")
 		default <V> V getOrDefault(Object key, Class<V> requiredType, V defaultValue) {
@@ -511,10 +509,10 @@ default <V> V getOrDefault(Object key, Class<V> requiredType, V defaultValue) {
 		 * @param type the type of object to retrieve; never {@code null}
 		 * @param <V> the key and value type
 		 * @return the object; never {@code null}
+		 * @since 5.1
 		 * @see #getOrComputeIfAbsent(Object, Function)
 		 * @see #getOrComputeIfAbsent(Object, Function, Class)
 		 * @see CloseableResource
-		 * @since 5.1
 		 */
 		@API(status = STABLE, since = "5.1")
 		default <V> V getOrComputeIfAbsent(Class<V> type) {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
index 0fc8a00f7c3d..64f68570635a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
@@ -50,8 +50,8 @@
  * {@code LifecycleMethodExecutionExceptionHandler} (if there is one) will be
  * invoked with any {@link Throwable} thrown by the previous handler.
  *
- * @see TestExecutionExceptionHandler
  * @since 5.5
+ * @see TestExecutionExceptionHandler
  */
 @API(status = EXPERIMENTAL, since = "5.5")
 public interface LifecycleMethodExecutionExceptionHandler extends Extension {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
index 521f7c579ad1..87d4708bade1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
@@ -30,8 +30,8 @@
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
- * @see LifecycleMethodExecutionExceptionHandler
  * @since 5.0
+ * @see LifecycleMethodExecutionExceptionHandler
  */
 @FunctionalInterface
 @API(status = STABLE, since = "5.0")
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
index 73591bb1b689..8ccd4442cbd1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
@@ -46,9 +46,9 @@
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
+ * @since 5.0
  * @see org.junit.jupiter.api.TestTemplate
  * @see TestTemplateInvocationContext
- * @since 5.0
  */
 @API(status = STABLE, since = "5.0")
 public interface TestTemplateInvocationContextProvider extends Extension {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
index 5584648de6ff..a1fad0dcb91f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
@@ -32,8 +32,8 @@
  * explicitly throw a {@code Throwable}. In order to support such specialized
  * use cases, {@link #accept} is declared to throw {@code Throwable}.
  *
- * @since 5.0
  * @param <T> the type of argument consumed
+ * @since 5.0
  * @see java.util.function.Consumer
  * @see org.junit.jupiter.api.DynamicTest#stream
  * @see Executable
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
index 857c53086a76..8cc6ff53ac94 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
@@ -32,8 +32,8 @@
  * explicitly throw a {@code Throwable}. In order to support such specialized
  * use cases, {@link #get} is declared to throw {@code Throwable}.
  *
- * @since 5.0
  * @param <T> the type of argument supplied
+ * @since 5.0
  * @see java.util.function.Supplier
  * @see org.junit.jupiter.api.Assertions#assertTimeout(java.time.Duration, ThrowingSupplier)
  * @see org.junit.jupiter.api.Assertions#assertTimeoutPreemptively(java.time.Duration, ThrowingSupplier)
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
index 042dc334849a..bf60cda457d4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
@@ -17,8 +17,8 @@
 /**
  * The access mode required by a test class or method for a given resource.
  *
- * @see ResourceLock
  * @since 5.3
+ * @see ResourceLock
  */
 @API(status = EXPERIMENTAL, since = "5.3")
 public enum ResourceAccessMode {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
index cf99b6205af3..99cf25d6231f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
@@ -17,8 +17,8 @@
 /**
  * Common resource names for synchronizing test execution.
  *
- * @see ResourceLock
  * @since 5.3
+ * @see ResourceLock
  */
 @API(status = EXPERIMENTAL, since = "5.3")
 public class Resources {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 23110828d3d1..8823c58f8dec 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -43,8 +43,8 @@
  * <tr><td> {@code 42 d}  </td><td> {@code @Timeout(value = 42, unit = DAYS)}         </td></tr>
  * </table>
  *
- * @see org.junit.platform.engine.ConfigurationParameters
  * @since 5.0
+ * @see org.junit.platform.engine.ConfigurationParameters
  */
 @API(status = STABLE, since = "5.0")
 public final class Constants {
@@ -152,9 +152,9 @@ public final class Constants {
 	 * <p>If not specified, the default is "same_thread" which corresponds to
 	 * {@code @Execution(ExecutionMode.SAME_THREAD)}.
 	 *
+	 * @since 5.4
 	 * @see org.junit.jupiter.api.parallel.Execution
 	 * @see org.junit.jupiter.api.parallel.ExecutionMode
-	 * @since 5.4
 	 */
 	@API(status = EXPERIMENTAL, since = "5.4")
 	public static final String DEFAULT_PARALLEL_EXECUTION_MODE = JupiterConfiguration.DEFAULT_EXECUTION_MODE_PROPERTY_NAME;
@@ -173,9 +173,9 @@ public final class Constants {
 	 * <p>If not specified, it will be resolved into the same value as
 	 * {@link #DEFAULT_PARALLEL_EXECUTION_MODE}.
 	 *
+	 * @since 5.4
 	 * @see org.junit.jupiter.api.parallel.Execution
 	 * @see org.junit.jupiter.api.parallel.ExecutionMode
-	 * @since 5.4
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME = JupiterConfiguration.DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME;
@@ -243,8 +243,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TIMEOUT_PROPERTY_NAME;
@@ -262,8 +262,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -283,8 +283,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -304,8 +304,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -325,8 +325,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -344,8 +344,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -364,8 +364,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -384,8 +384,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -404,8 +404,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -424,8 +424,8 @@ public final class Constants {
 	 * <p>Please refer to the <a href="#supported-values-timeouts">class
 	 * description</a> for the definition of supported values.
 	 *
-	 * @see org.junit.jupiter.api.Timeout
 	 * @since 5.5
+	 * @see org.junit.jupiter.api.Timeout
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
 	public static final String DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
index 7e290e53cece..493ac12f5e5b 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
@@ -191,8 +191,8 @@ public static boolean isNotStatic(Member member) {
 	 *
 	 * @param clazz the class to check; never {@code null}
 	 * @return {@code true} if the class is {@code final}
-	 * @see java.lang.reflect.Modifier#isFinal(int)
 	 * @since 1.5
+	 * @see java.lang.reflect.Modifier#isFinal(int)
 	 */
 	@API(status = MAINTAINED, since = "1.5")
 	public static boolean isFinal(Class<?> clazz) {
@@ -204,8 +204,8 @@ public static boolean isFinal(Class<?> clazz) {
 	 *
 	 * @param clazz the class to check; never {@code null}
 	 * @return {@code true} if the class is not {@code final}
-	 * @see java.lang.reflect.Modifier#isFinal(int)
 	 * @since 1.5
+	 * @see java.lang.reflect.Modifier#isFinal(int)
 	 */
 	@API(status = MAINTAINED, since = "1.5")
 	public static boolean isNotFinal(Class<?> clazz) {
@@ -217,8 +217,8 @@ public static boolean isNotFinal(Class<?> clazz) {
 	 *
 	 * @param member the member to check; never {@code null}
 	 * @return {@code true} if the member is {@code final}
-	 * @see java.lang.reflect.Modifier#isFinal(int)
 	 * @since 1.5
+	 * @see java.lang.reflect.Modifier#isFinal(int)
 	 */
 	@API(status = MAINTAINED, since = "1.5")
 	public static boolean isFinal(Member member) {
@@ -230,8 +230,8 @@ public static boolean isFinal(Member member) {
 	 *
 	 * @param member the member to check; never {@code null}
 	 * @return {@code true} if the member is not {@code final}
-	 * @see java.lang.reflect.Modifier#isFinal(int)
 	 * @since 1.5
+	 * @see java.lang.reflect.Modifier#isFinal(int)
 	 */
 	@API(status = MAINTAINED, since = "1.5")
 	public static boolean isNotFinal(Member member) {
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
index e814fcbb8f6d..e25db1d173da 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
@@ -22,9 +22,9 @@
  *
  * <p>This class is not thread-safe.
  *
- * @since 1.6
  * @param <K> the type of keys maintained by this cache
  * @param <V> the type of values maintained by this cache
+ * @since 1.6
  */
 @API(status = INTERNAL, since = "1.6")
 public class LruCache<K, V> extends LinkedHashMap<K, V> {
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 449d48a13744..c44510751799 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -585,9 +585,9 @@ public static <T> Optional<Object> readFieldValue(Class<T> clazz, String fieldNa
 	 * @param fieldName the name of the field; never {@code null} or empty
 	 * @param instance the instance from where the value is to be read; may
 	 * be {@code null} for a static field
+	 * @since 1.4
 	 * @see #tryToReadFieldValue(Field)
 	 * @see #tryToReadFieldValue(Field, Object)
-	 * @since 1.4
 	 */
 	@API(status = INTERNAL, since = "1.4")
 	public static <T> Try<Object> tryToReadFieldValue(Class<T> clazz, String fieldName, T instance) {
@@ -626,9 +626,9 @@ public static Optional<Object> readFieldValue(Field field) {
 	 * is returned that contains the corresponding exception.
 	 *
 	 * @param field the field to read; never {@code null}
+	 * @since 1.4
 	 * @see #tryToReadFieldValue(Field, Object)
 	 * @see #tryToReadFieldValue(Class, String, Object)
-	 * @since 1.4
 	 */
 	@API(status = INTERNAL, since = "1.4")
 	public static Try<Object> tryToReadFieldValue(Field field) {
@@ -658,9 +658,9 @@ public static Optional<Object> readFieldValue(Field field, Object instance) {
 	}
 
 	/**
+	 * @since 1.4
 	 * @see org.junit.platform.commons.support.ReflectionSupport#tryToReadFieldValue(Field, Object)
 	 * @see #tryToReadFieldValue(Class, String, Object)
-	 * @since 1.4
 	 */
 	@API(status = INTERNAL, since = "1.4")
 	public static Try<Object> tryToReadFieldValue(Field field, Object instance) {
@@ -740,8 +740,8 @@ public static Optional<Class<?>> loadClass(String name) {
 	}
 
 	/**
-	 * @see org.junit.platform.commons.support.ReflectionSupport#tryToLoadClass(String)
 	 * @since 1.4
+	 * @see org.junit.platform.commons.support.ReflectionSupport#tryToLoadClass(String)
 	 */
 	@API(status = INTERNAL, since = "1.4")
 	public static Try<Class<?>> tryToLoadClass(String name) {
@@ -776,8 +776,8 @@ public static Optional<Class<?>> loadClass(String name, ClassLoader classLoader)
 	 *
 	 * @param name the name of the class to load; never {@code null} or blank
 	 * @param classLoader the {@code ClassLoader} to use; never {@code null}
-	 * @see #tryToLoadClass(String)
 	 * @since 1.4
+	 * @see #tryToLoadClass(String)
 	 */
 	@API(status = INTERNAL, since = "1.4")
 	public static Try<Class<?>> tryToLoadClass(String name, ClassLoader classLoader) {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
index e7fa8419af76..eda17ddf8d00 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
@@ -30,10 +30,10 @@
  * implementations of the {@link org.junit.platform.launcher.TestExecutionListener}
  * API via the {@link org.junit.platform.launcher.TestPlan}.
  *
+ * @since 1.0
  * @see TestEngine
  * @see EngineDiscoveryRequest
  * @see ExecutionRequest
- * @since 1.0
  */
 @API(status = STABLE, since = "1.0")
 public interface ConfigurationParameters {
@@ -109,10 +109,10 @@ public interface ConfigurationParameters {
 	 * @return an {@code Optional} containing the value; never {@code null}
 	 * but potentially empty
 	 *
+	 * @since 1.3
 	 * @see #getBoolean(String)
 	 * @see System#getProperty(String)
 	 * @see #CONFIG_FILE_NAME
-	 * @since 1.3
 	 */
 	@API(status = STABLE, since = "1.3")
 	default <T> Optional<T> get(String key, Function<String, T> transformer) {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
index cc825f64822c..a3b089911b20 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
@@ -26,8 +26,8 @@
  * each {@link TestEngine} during test discovery. However, since this interface
  * was only added in 1.6, older engines might not yet do so.
  *
- * @see EngineDiscoveryRequest#getDiscoveryListener()
  * @since 1.6
+ * @see EngineDiscoveryRequest#getDiscoveryListener()
  */
 @API(status = EXPERIMENTAL, since = "1.6")
 public interface EngineDiscoveryListener {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
index 50a95877a082..71c7800f861f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
@@ -30,12 +30,12 @@
  * <p>In addition, the supplied {@linkplain ConfigurationParameters
  * configuration parameters} can be used to influence the discovery process.
  *
+ * @since 1.0
  * @see TestEngine
  * @see TestDescriptor
  * @see DiscoverySelector
  * @see DiscoveryFilter
  * @see ConfigurationParameters
- * @since 1.0
  */
 @API(status = STABLE, since = "1.0")
 public interface EngineDiscoveryRequest {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
index ee6654f57b90..be8675d3d452 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
@@ -24,8 +24,8 @@
  * {@link ConfigurationParameters} that the engine may use to influence test
  * execution.
  *
- * @see TestEngine
  * @since 1.0
+ * @see TestEngine
  */
 @API(status = STABLE, since = "1.0")
 public class ExecutionRequest {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
index 3e78954e9994..d65eeab0eefc 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
@@ -24,8 +24,8 @@
  * Mutable descriptor for a test or container that has been discovered by a
  * {@link TestEngine}.
  *
- * @see TestEngine
  * @since 1.0
+ * @see TestEngine
  */
 @API(status = STABLE, since = "1.0")
 public interface TestDescriptor {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
index 0bd69e6a0927..a4959ca3207d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
@@ -39,10 +39,10 @@
  * Jupiter are meta-annotated with {@code @Testable}. Consult the Javadoc for
  * {@code @Testable} for further details.
  *
+ * @since 1.0
  * @see org.junit.platform.engine.EngineDiscoveryRequest
  * @see org.junit.platform.engine.ExecutionRequest
  * @see org.junit.platform.commons.annotation.Testable
- * @since 1.0
  */
 @API(status = STABLE, since = "1.0")
 public interface TestEngine {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index 8e601904a0da..8610bcba6077 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -203,9 +203,9 @@ public boolean hasPrefix(UniqueId potentialPrefix) {
 	 *
 	 * <p>This {@code UniqueId} will not be modified.
 	 *
+	 * @return a new {@code UniqueId}; never {@code null}
 	 * @throws org.junit.platform.commons.PreconditionViolationException
 	 * if this {@code UniqueId} contains a single segment
-	 * @return a new {@code UniqueId}; never {@code null}
 	 * @since 1.5
 	 */
 	@API(status = STABLE, since = "1.5")
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
index 2deb3e563621..ea346c856227 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
@@ -44,9 +44,9 @@
  * {@link org.junit.platform.engine.DiscoverySelector DiscoverySelectors}.
  *
  * @param <T> the type of the engine's descriptor
+ * @since 1.5
  * @see #builder()
  * @see #resolve(EngineDiscoveryRequest, TestDescriptor)
- * @since 1.5
  */
 @API(status = EXPERIMENTAL, since = "1.5")
 public class EngineDiscoveryRequestResolver<T extends TestDescriptor> {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
index 487339c4f59e..3463d329b793 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
@@ -331,8 +331,8 @@ default Resolution resolve(DiscoverySelector selector, Context context) {
 	 * adding a filter and returning a {@linkplain Match#partial(TestDescriptor)
 	 * partial match}).
 	 *
-	 * @see SelectorResolver
 	 * @since 1.5
+	 * @see SelectorResolver
 	 */
 	@API(status = EXPERIMENTAL, since = "1.5")
 	interface Context {
@@ -422,8 +422,8 @@ <T extends TestDescriptor> Optional<T> addToParent(Supplier<DiscoverySelector> p
 	 * {@linkplain #match match} or multiple {@linkplain #matches}, or a set of
 	 * {@linkplain #selectors selectors}.
 	 *
-	 * @see SelectorResolver
 	 * @since 1.5
+	 * @see SelectorResolver
 	 */
 	@API(status = EXPERIMENTAL, since = "1.5")
 	class Resolution {
@@ -540,10 +540,10 @@ public Set<? extends DiscoverySelector> getSelectors() {
 	 * TestDescriptor} with the same {@linkplain TestDescriptor#getUniqueId()
 	 * unique ID}.
 	 *
+	 * @since 1.5
 	 * @see SelectorResolver
 	 * @see Resolution#match(Match)
 	 * @see Resolution#matches(Set)
-	 * @since 1.5
 	 */
 	@API(status = EXPERIMENTAL, since = "1.5")
 	class Match {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
index 70ac97b25fb9..44f22594865b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
@@ -24,8 +24,8 @@
  * An exclusive resource identified by a key with a lock mode that is used to
  * synchronize access to shared resources when executing nodes in parallel.
  *
- * @see Node#getExecutionMode()
  * @since 1.3
+ * @see Node#getExecutionMode()
  */
 @API(status = EXPERIMENTAL, since = "1.3")
 public class ExclusiveResource {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
index 063bb3669424..43584100ab3c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
@@ -40,9 +40,9 @@
  * {@linkplain HierarchicalTestExecutorService executor service} that executes
  * {@linkplain TestTask test tasks} with the configured parallelism.
  *
+ * @since 1.3
  * @see ForkJoinPool
  * @see DefaultParallelExecutionConfigurationStrategy
- * @since 1.3
  */
 @API(status = EXPERIMENTAL, since = "1.3")
 public class ForkJoinPoolHierarchicalTestExecutorService implements HierarchicalTestExecutorService {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
index 9936ea514dc5..8156f42d4332 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
@@ -71,9 +71,9 @@ public final void execute(ExecutionRequest request) {
 	 * {@link SameThreadHierarchicalTestExecutorService}.
 	 *
 	 * @param request the request about to be executed
+	 * @since 1.3
 	 * @see ForkJoinPoolHierarchicalTestExecutorService
 	 * @see SameThreadHierarchicalTestExecutorService
-	 * @since 1.3
 	 */
 	@API(status = EXPERIMENTAL, since = "1.3")
 	protected HierarchicalTestExecutorService createExecutorService(ExecutionRequest request) {
@@ -94,9 +94,9 @@ protected HierarchicalTestExecutorService createExecutorService(ExecutionRequest
 	 * {@link OpenTest4JAwareThrowableCollector}.
 	 *
 	 * @param request the request about to be executed
+	 * @since 1.3
 	 * @see OpenTest4JAwareThrowableCollector
 	 * @see ThrowableCollector
-	 * @since 1.3
 	 */
 	@API(status = EXPERIMENTAL, since = "1.3")
 	protected ThrowableCollector.Factory createThrowableCollectorFactory(ExecutionRequest request) {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
index 456efe2389c0..6de559e7c57b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
@@ -22,10 +22,10 @@
 /**
  * A closeable service that executes {@linkplain TestTask test tasks}.
  *
+ * @since 1.3
  * @see HierarchicalTestEngine#createExecutorService(ExecutionRequest)
  * @see SameThreadHierarchicalTestExecutorService
  * @see ForkJoinPoolHierarchicalTestExecutorService
- * @since 1.3
  */
 @API(status = EXPERIMENTAL, since = "1.3")
 public interface HierarchicalTestExecutorService extends AutoCloseable {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
index 5d7817f37bdf..4a6181121d29 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
@@ -298,8 +298,8 @@ interface DynamicTestExecutor {
 		 * @param executionListener the executionListener to be notified; never
 		 * {@code null}
 		 * @return a future to cancel or wait for the execution
-		 * @see EngineExecutionListener#NOOP
 		 * @since 5.7
+		 * @see EngineExecutionListener#NOOP
 		 */
 		@API(status = EXPERIMENTAL, since = "5.7")
 		Future<?> execute(TestDescriptor testDescriptor, EngineExecutionListener executionListener);
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
index 606db4b7e192..26f7832b41e5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
@@ -19,8 +19,8 @@
  * Specialization of {@link ThrowableCollector} that treats instances of
  * {@link TestAbortedException} as <em>aborting</em>.
  *
- * @see ThrowableCollector
  * @since 1.3
+ * @see ThrowableCollector
  */
 @API(status = MAINTAINED, since = "1.3")
 public class OpenTest4JAwareThrowableCollector extends ThrowableCollector {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
index e499ad4495d2..01ba013f7259 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
@@ -24,11 +24,10 @@
  * implementations may use all of the properties in this class or
  * only a subset.
  *
+ * @since 1.3
  * @see ForkJoinPoolHierarchicalTestExecutorService
  * @see ParallelExecutionConfigurationStrategy
  * @see DefaultParallelExecutionConfigurationStrategy
- *
- * @since 1.3
  */
 @API(status = EXPERIMENTAL, since = "1.3")
 public interface ParallelExecutionConfiguration {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
index 6816b3401464..c464babcf8ee 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
@@ -18,8 +18,8 @@
 /**
  * A strategy to use for configuring parallel test execution.
  *
- * @see DefaultParallelExecutionConfigurationStrategy
  * @since 1.3
+ * @see DefaultParallelExecutionConfigurationStrategy
  */
 @API(status = EXPERIMENTAL, since = "1.3")
 public interface ParallelExecutionConfigurationStrategy {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
index 2b7ff304a2ee..6efc57dab609 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
@@ -17,9 +17,8 @@
 /**
  * A lock for a one or more resources.
  *
- * @see HierarchicalTestExecutorService.TestTask#getResourceLock()
- *
  * @since 1.3
+ * @see HierarchicalTestExecutorService.TestTask#getResourceLock()
  */
 @API(status = EXPERIMENTAL, since = "1.3")
 public interface ResourceLock extends AutoCloseable {
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
index c693186daa3f..62ff497696f7 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
@@ -33,8 +33,8 @@
  * A {@link LauncherDiscoveryListener} that generates Java Flight Recorder
  * events.
  *
- * @see <a href="https://openjdk.java.net/jeps/328">JEP 328: Flight Recorder</a>
  * @since 1.8
+ * @see <a href="https://openjdk.java.net/jeps/328">JEP 328: Flight Recorder</a>
  */
 @API(status = EXPERIMENTAL, since = "1.8")
 public class FlightRecordingDiscoveryListener implements LauncherDiscoveryListener {
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
index 170654d6c380..a9db10b0d6b8 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
@@ -35,8 +35,8 @@
  * A {@link TestExecutionListener} that generates Java Flight Recorder
  * events.
  *
- * @see <a href="https://openjdk.java.net/jeps/328">JEP 328: Flight Recorder</a>
  * @since 1.8
+ * @see <a href="https://openjdk.java.net/jeps/328">JEP 328: Flight Recorder</a>
  */
 @API(status = EXPERIMENTAL, since = "1.8")
 public class FlightRecordingExecutionListener implements TestExecutionListener {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index 07715dfd08cc..c48b219da408 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -19,8 +19,8 @@
 /**
  * Collection of constants related to {@link Launcher}.
  *
- * @see org.junit.platform.engine.ConfigurationParameters
  * @since 1.3
+ * @see org.junit.platform.engine.ConfigurationParameters
  */
 @API(status = STABLE, since = "1.7")
 public class LauncherConstants {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index d5b7945b634d..9299f85a2a8d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -33,10 +33,10 @@
  * created via the {@link org.junit.platform.launcher.core.LauncherFactory}
  * during test discovery.
  *
+ * @since 1.6
  * @see org.junit.platform.launcher.listeners.discovery.LauncherDiscoveryListeners
  * @see LauncherDiscoveryRequest#getDiscoveryListener()
  * @see org.junit.platform.launcher.core.LauncherConfig.Builder#addLauncherDiscoveryListeners
- * @since 1.6
  */
 @API(status = EXPERIMENTAL, since = "1.6")
 public interface LauncherDiscoveryListener extends EngineDiscoveryListener {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
index 9a3d3bd2a300..5d4f6c6a13da 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
@@ -20,10 +20,10 @@
  * wishes to repeatedly <em>discover</em> and <em>execute</em> tests using one
  * or more {@linkplain org.junit.platform.engine.TestEngine test engines}.
  *
+ * @since 1.8
  * @see Launcher
  * @see LauncherSessionListener
  * @see LauncherFactory
- * @since 1.8
  */
 @API(status = EXPERIMENTAL, since = "1.8")
 public interface LauncherSession extends AutoCloseable {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
index 2860331013c0..2c4dc0f4cf45 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
@@ -34,10 +34,10 @@
  * <p>The methods declared in this interface are called by the {@link Launcher}
  * or {@link LauncherSession} created via the {@link LauncherFactory}.
  *
+ * @since 1.8
  * @see LauncherSession
  * @see LauncherConfig.Builder#addLauncherSessionListeners
  * @see LauncherFactory
- * @since 1.8
  */
 @API(status = EXPERIMENTAL, since = "1.8")
 public interface LauncherSessionListener {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
index 3238753c3aa2..db0cd5b9d301 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
@@ -45,10 +45,10 @@
  * launcher.execute(discoveryRequest);
  * </pre>
  *
+ * @since 1.3
  * @see #builder()
  * @see Launcher
  * @see LauncherFactory
- * @since 1.3
  */
 @API(status = STABLE, since = "1.7")
 public interface LauncherConfig {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index d9e7ce3a2c52..54f75d52bfd7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -208,9 +208,9 @@ public LauncherDiscoveryRequestBuilder configurationParameters(Map<String, Strin
 	 * @param configurationParameters the parent instance to be used for looking
 	 * up configuration parameters that have not been explicitly configured;
 	 * never {@code null}
+	 * @since 1.8
 	 * @see #configurationParameter(String, String)
 	 * @see #configurationParameters(Map)
-	 * @since 1.8
 	 */
 	@API(status = EXPERIMENTAL, since = "1.8")
 	public LauncherDiscoveryRequestBuilder parentConfigurationParameters(
@@ -232,10 +232,10 @@ public LauncherDiscoveryRequestBuilder parentConfigurationParameters(
 	 * @param listeners the {@code LauncherDiscoveryListeners} to add; never
 	 * {@code null}
 	 * @return this builder for method chaining
+	 * @since 1.6
 	 * @see LauncherDiscoveryListener
 	 * @see LauncherDiscoveryListeners
 	 * @see LauncherDiscoveryRequestBuilder#DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME
-	 * @since 1.6
 	 */
 	@API(status = EXPERIMENTAL, since = "1.6")
 	public LauncherDiscoveryRequestBuilder listeners(LauncherDiscoveryListener... listeners) {
@@ -254,9 +254,9 @@ public LauncherDiscoveryRequestBuilder listeners(LauncherDiscoveryListener... li
 	 * Passing {@code false} to this method, disables the latter two sources so
 	 * that only explicit configuration parameters are taken into account.
 	 *
+	 * @since 1.7
 	 * @see #configurationParameter(String, String)
 	 * @see #configurationParameters(Map)
-	 * @since 1.7
 	 */
 	@API(status = EXPERIMENTAL, since = "1.7")
 	public LauncherDiscoveryRequestBuilder enableImplicitConfigurationParameters(boolean enabled) {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 4aacb959d08c..1c3e536a67f4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -74,8 +74,8 @@ private LauncherFactory() {
 	 * {@linkplain LauncherConfig#DEFAULT default} {@link LauncherConfig}.
 	 *
 	 * @throws PreconditionViolationException if no test engines are detected
-	 * @see #openSession(LauncherConfig)
 	 * @since 1.8
+	 * @see #openSession(LauncherConfig)
 	 */
 	@API(status = EXPERIMENTAL, since = "1.8")
 	public static LauncherSession openSession() throws PreconditionViolationException {
@@ -90,8 +90,8 @@ public static LauncherSession openSession() throws PreconditionViolationExceptio
 	 * {@code null}
 	 * @throws PreconditionViolationException if the supplied configuration is
 	 * {@code null}, or if no test engines are detected
-	 * @see #openSession()
 	 * @since 1.8
+	 * @see #openSession()
 	 */
 	@API(status = EXPERIMENTAL, since = "1.8")
 	public static LauncherSession openSession(LauncherConfig config) throws PreconditionViolationException {
@@ -117,8 +117,8 @@ public static Launcher create() throws PreconditionViolationException {
 	 * @throws PreconditionViolationException if the supplied configuration is
 	 * {@code null}, or if no test engines are detected
 	 * registered
-	 * @see #create()
 	 * @since 1.3
+	 * @see #create()
 	 */
 	@API(status = EXPERIMENTAL, since = "1.3")
 	public static Launcher create(LauncherConfig config) throws PreconditionViolationException {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
index 99a7545e08a2..bb3a4a089187 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
@@ -147,9 +147,9 @@ public interface TestExecutionSummary {
 	 * @param writer the {@code PrintWriter} to which to print; never {@code null}
 	 * @param maxStackTraceLines the maximum number of lines to print for exception
 	 * stack traces; must be a positive value
+	 * @since 1.6
 	 * @see #printTo(PrintWriter)
 	 * @see #printFailuresTo(PrintWriter)
-	 * @since 1.6
 	 */
 	@API(status = MAINTAINED, since = "1.6")
 	default void printFailuresTo(PrintWriter writer, int maxStackTraceLines) {
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
index 7a4e78477585..0815d69d10f5 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
@@ -287,11 +287,11 @@ public final void assertEventsMatchExactly(Condition<? super Event>... condition
 	 * </pre>
 	 *
 	 * @param conditions the conditions to match against; never {@code null}
+	 * @since 1.7
 	 * @see #assertEventsMatchExactly(Condition...)
 	 * @see #assertEventsMatchLooselyInOrder(Condition...)
 	 * @see EventConditions
 	 * @see TestExecutionResultConditions
-	 * @since 1.7
 	 */
 	@SafeVarargs
 	@SuppressWarnings("varargs")
@@ -322,11 +322,11 @@ public final void assertEventsMatchLoosely(Condition<? super Event>... condition
 	 * </pre>
 	 *
 	 * @param conditions the conditions to match against; never {@code null}
+	 * @since 1.7
 	 * @see #assertEventsMatchExactly(Condition...)
 	 * @see #assertEventsMatchLoosely(Condition...)
 	 * @see EventConditions
 	 * @see TestExecutionResultConditions
-	 * @since 1.7
 	 */
 	@SafeVarargs
 	@SuppressWarnings("varargs")

From d654b46d9a8b81c008231f5febb01778465cda05 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 25 Sep 2021 16:59:33 +0200
Subject: [PATCH 0534/1433] Update Spotless

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7aa3a43799da..7e4de913e1a1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,7 +10,7 @@ pluginManagement {
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
 		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"
-		id("com.diffplug.spotless") version "5.12.5"
+		id("com.diffplug.spotless") version "5.15.1"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.0"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From de6f7d153c49ae1c47b6db5a04a5e4ef80e2cc59 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 25 Sep 2021 17:14:08 +0200
Subject: [PATCH 0535/1433] Declare repositories centrally in Gradle settings

---
 build.gradle.kts          |  9 ---------
 buildSrc/build.gradle.kts |  1 -
 settings.gradle.kts       | 11 +++++++++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b20a290e8a05..b027c71de633 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -105,15 +105,6 @@ allprojects {
 			toolVersion = rootProject.libs.versions.jacoco.get()
 		}
 	}
-
-	repositories {
-		mavenCentral()
-		maven(url = "https://oss.sonatype.org/content/repositories/snapshots") {
-			mavenContent {
-				snapshotsOnly()
-			}
-		}
-	}
 }
 
 val clearTempRepoDir by tasks.registering {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 863aec0863ab..7d85575ecda5 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 }
 
 repositories {
-	mavenCentral()
 	gradlePluginPortal()
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7e4de913e1a1..c1e30ecdd242 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,6 +28,17 @@ plugins {
 	id("com.gradle.common-custom-user-data-gradle-plugin")
 }
 
+dependencyResolutionManagement {
+	repositories {
+		mavenCentral()
+		maven(url = "https://oss.sonatype.org/content/repositories/snapshots") {
+			mavenContent {
+				snapshotsOnly()
+			}
+		}
+	}
+}
+
 val gradleEnterpriseServer = "https://ge.junit.org"
 val isCiServer = System.getenv("CI") != null
 val junitBuildCacheUsername: String? by extra

From b772812851b1fe7e4c4c21c4ed623c368ee703c6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 25 Sep 2021 20:50:13 +0200
Subject: [PATCH 0536/1433] Fix link to 5.9 M1 closed issues

---
 .../docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index e2535a0aba92..dfab9a71b030 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -6,8 +6,8 @@
 *Scope:* ❓
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/5.9.0-M1️?closed=1+[5.9 M1️] milestone page in the JUnit repository on
-GitHub.
+link:{junit5-repo}+/milestone/58?closed=1+[5.9 M1️] milestone page in the JUnit repository
+on GitHub.
 
 
 [[release-notes-5.9.0-M1️-junit-platform]]

From 9908a0d6901618583226cbe33705844dfd4c12fc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 25 Sep 2021 21:01:46 +0200
Subject: [PATCH 0537/1433] Use standard '1' character in 5.9 M1 release notes

---
 .../release-notes/release-notes-5.9.0-M1.adoc        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index dfab9a71b030..b209cfec9b0e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -1,16 +1,16 @@
-[[release-notes-5.9.0-M1️]]
-== 5.9.0-M1️
+[[release-notes-5.9.0-M1]]
+== 5.9.0-M1
 
 *Date of Release:* ❓
 
 *Scope:* ❓
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/58?closed=1+[5.9 M1️] milestone page in the JUnit repository
+link:{junit5-repo}+/milestone/58?closed=1+[5.9 M1] milestone page in the JUnit repository
 on GitHub.
 
 
-[[release-notes-5.9.0-M1️-junit-platform]]
+[[release-notes-5.9.0-M1-junit-platform]]
 === JUnit Platform
 
 ==== Bug Fixes
@@ -26,7 +26,7 @@ on GitHub.
 * ❓
 
 
-[[release-notes-5.9.0-M1️-junit-jupiter]]
+[[release-notes-5.9.0-M1-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -42,7 +42,7 @@ on GitHub.
 * ❓
 
 
-[[release-notes-5.9.0-M1️-junit-vintage]]
+[[release-notes-5.9.0-M1-junit-vintage]]
 === JUnit Vintage
 
 ==== Bug Fixes

From ddad14476bcaf4136d6386094e6e4d0e47e591d7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 25 Sep 2021 21:04:24 +0200
Subject: [PATCH 0538/1433] Remove 5.7.x releases from release notes

---
 .../docs/asciidoc/release-notes/index.adoc    |   8 +-
 .../release-notes/release-notes-5.7.0.adoc    |  18 --
 .../release-notes/release-notes-5.7.1.adoc    |  60 -----
 .../release-notes/release-notes-5.7.2.adoc    |  45 ----
 .../release-notes/release-notes-5.8.0.adoc    | 210 +-----------------
 5 files changed, 3 insertions(+), 338 deletions(-)
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index aa7fc1fee5d5..88af865a71a9 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -8,7 +8,7 @@ Stefan Bechtold; Sam Brannen; Johannes Link; Matthias Merdes; Marc Philipp; Juli
 :numbered!:
 //
 
-This document contains the _change log_ for all JUnit 5 releases since 5.7 GA.
+This document contains the _change log_ for all JUnit 5 releases since 5.8 GA.
 
 Please refer to the <<../user-guide/index.adoc#user-guide,User Guide>> for comprehensive
 reference documentation for programmers writing tests, extension authors, and engine
@@ -21,9 +21,3 @@ include::{basedir}/release-notes-5.9.0-M1.adoc[]
 include::{basedir}/release-notes-5.8.1.adoc[]
 
 include::{basedir}/release-notes-5.8.0.adoc[]
-
-include::{basedir}/release-notes-5.7.2.adoc[]
-
-include::{basedir}/release-notes-5.7.1.adoc[]
-
-include::{basedir}/release-notes-5.7.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0.adoc
deleted file mode 100644
index 80cf3cc235ab..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.0.adoc
+++ /dev/null
@@ -1,18 +0,0 @@
-[[release-notes-5.7.0]]
-== 5.7.0
-
-*Date of Release:* September 13, 2020
-
-*Scope:*
-
-* Promotion of experimental features in JUnit Platform and Jupiter
-* Java Flight Recorder support
-* TestKit improvements
-* `@Isolated` tests
-* Configurable default method orderer
-* Custom disabled reasons for all `@Enabled*`/`@Disabled*` annotations
-* Improvements to `assertTimeoutPreemptively()`
-* Improvements to `@CsvFileSource` and `@CsvSource`
-
-For complete details consult the
-https://junit.org/junit5/docs/5.7.0/release-notes/index.html[5.7.0 Release Notes] online.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
deleted file mode 100644
index 6264f0b4234e..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.1.adoc
+++ /dev/null
@@ -1,60 +0,0 @@
-[[release-notes-5.7.1]]
-== 5.7.1
-
-*Date of Release:* February 4, 2021
-
-*Scope:* Bug fixes since 5.7.0
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/52?closed=1+[5.7.1] milestone page in the JUnit repository on
-GitHub.
-
-
-[[release-notes-5.7.1-general-bug-fixes]]
-=== General bug fixes
-
-* For compatibility with `JarInputStream`, all JARs now contain `META-INF/` and
-  `META-INF/MANIFEST.MF` as their first entries again.
-
-
-[[release-notes-5.7.1-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* `StringUtils.nullSafeToString()` now returns `"null"` if the invocation of `toString()`
-  on the supplied object returns `null`. Although this is an internal utility, the effect
-  of this change may be witnessed by end users and test engine or extension authors.
-* Method `scanForClassesInPackage(String)` in `ClasspathScanner` now returns a valid list
-  of class names when the package name is equal to the name of a module on the module path.
-* The legacy XML report now always includes container-level failures (e.g. from
-  `@BeforeAll` Jupiter lifecycle methods).
-
-
-[[release-notes-5.7.1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* If the `toString()` implementation of an argument passed to a `@ParameterizedTest`
-  method returns `null`, the display name formatter for the parameterized test now treats
-  the name of the corresponding argument as `"null"` instead of throwing an exception.
-  This fixes a regression introduced in JUnit Jupiter 5.7.0.
-* Creator functions passed to `ExtensionContext.Store.getOrComputeIfAbsent()` are now only
-  called once even if they throw an exception.
-
-==== New Features and Improvements
-
-* The user guide now explains Nested Tests in more detail.
-* New utility method in `TestInstancePreDestroyCallback` helps to ensure all test
-  instances are processed when used in conjunction with `@Nested` tests.
-* `JAVA_17` has been added to the `JRE` enum for use with JRE-based execution conditions.
-
-
-[[release-notes-5.7.1-junit-vintage]]
-=== JUnit Vintage
-
-==== Bug Fixes
-
-* The legacy reporting name of top-level test classes is now always their fully-qualified
-  class name. Previously, a textual description was returned for JUnit 3 suites.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
deleted file mode 100644
index 6c4ecffb1f23..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.7.2.adoc
+++ /dev/null
@@ -1,45 +0,0 @@
-[[release-notes-5.7.2]]
-== 5.7.2
-
-*Date of Release:* May 15, 2021
-
-*Scope:* Bug fixes since 5.7.1
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/56?closed=1+[5.7.2] milestone page in the JUnit repository on
-GitHub.
-
-
-[[release-notes-5.7.2-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* Method `getRootUrisForPackage()` in class `ClasspathScanner` now returns a valid list of
-  class names when the package name is equal to the name of a module on the module path
-  and when running on Java 8.
-* Direct child descriptors of the engine descriptor now also acquire the global read lock
-  when they require other exclusive resources.
-
-
-[[release-notes-5.7.2-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* Test classes annotated with `@ResourceLock` no longer run in parallel with `@Isolated`
-  ones.
-
-==== New Features and Improvements
-
-* Improved `ExclusiveResource` handling: if a `Node` has only read locks and no read-write
-  locks, then descendants are not forced into `SAME_THREAD` execution and can run
-  concurrently.
-
-
-[[release-notes-5.7.2-junit-vintage]]
-=== JUnit Vintage
-
-==== Bug Fixes
-
-* Fix `NullPointerException` that occurred when using JUnit 3 style `suite()` methods in conjunction with `PostDiscoveryFilters`.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
index 5b07f5f6017e..fc0763c6e355 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
@@ -17,211 +17,5 @@
 * Memory and performance optimizations
 * Numerous bug fixes and minor improvements
 
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/51?closed=1+[5.8 M1],
-link:{junit5-repo}+/milestone/55?closed=1+[5.8 RC1], and
-link:{junit5-repo}+/milestone/57?closed=1+[5.8 GA] milestone pages in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.8.0-overall-improvements]]
-=== Overall Improvements
-
-==== Deprecations and Breaking Changes
-
-* Since the API Guardian dependency is no longer exported as a runtime but rather as a
-  compile-only dependency to consuming Gradle projects, Gradle builds that define their own
-  https://docs.gradle.org/current/userguide/declaring_dependencies.html#sec:what-are-dependency-configurations[dependency configurations]
-  may be affected. For example, if the custom configuration is used to manipulate a source
-  set's classpath directly, dependency attributes needed for Gradle's variant-aware
-  dependency management are dropped, and API Guardian is missing from the compile
-  classpath. In that case, the Java compiler emits warnings which -- depending on your
-  configured options -- may cause the build to fail. The solution is to avoid manipulating
-  a source set's classpath directly. Instead, its dependency configurations should extend
-  from your custom configuration. An example of such a change can be seen in
-  https://github.com/spring-projects/spring-framework/commit/d23afea168b8360d08bf296ac2189239ab9db7fc[this commit]
-  to the Spring Framework repository.
-
-==== New Features and Improvements
-
-* The API Guardian dependency is now exported as a compile-only dependency for consuming
-  Gradle projects and no longer required at runtime when running on the module path.
-* Logging messages are no longer issued at `INFO` level in order to lower the "textual
-  noise" on the console when Java's Util Logging is used in its default configuration.
-
-
-[[release-notes-5.8.0-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* Classes explicitly selected via `@SelectClasses` are now always included in the test
-  suite. This applies to `@Suite` classes running via the `SuiteTestEngine` and suite
-  classes running via the `JUnitPlatform` `Runner`.
-* `SummaryGeneratingListener` is now thread-safe and can handle concurrently failing tests.
-
-==== Deprecations and Breaking Changes
-
-* The `JUnitPlatform` runner has been deprecated in favor of the new `@Suite` support. See
-  the warning in <<../user-guide/index.adoc#running-tests-junit-platform-runner, Using
-  JUnit 4 to run the JUnit Platform>> for details.
-* For consistency with the rest of the JUnit Platform, the experimental
-  `LauncherDiscoveryListener` is now an interface instead of an abstract class.
-
-==== New Features and Improvements
-
-* New `junit-platform-suite-engine` module to execute declarative test suites on the JUnit
-  Platform. See <<../user-guide/index.adoc#junit-platform-suite-engine, JUnit Platform
-  Suite Engine>> for details.
-* Additional selectors in the suite API in the `junit-platform-suite-api` module. See the
-  Javadoc of the `{suite-api-package}` package for a full list of supported annotations
-  and further details.
-* New `UniqueIdTrackingListener` which is a `TestExecutionListener` that tracks the unique
-  IDs of all tests that were skipped or executed during the `TestPlan` and generates a
-  file containing the unique IDs. The generated file can be used to rerun those tests --
-  for example, in order to run the same set of tests executed on the JVM subsequently
-  within a GraalVM native image. See the Javadoc for `{UniqueIdTrackingListener}` for
-  details.
-* New `findAnnotation(Class,Class,SearchOption)` method in `AnnotationSupport` that
-  performs the same search algorithm as `findAnnotation(AnnotatedElement,Class)` but also
-  searches the enclosing class hierarchy for inner classes if the
-  `INCLUDE_ENCLOSING_CLASSES` `SearchOption` is specified. This new method can be used by
-  extension authors to find annotations on enclosing classes for JUnit Jupiter `@Nested`
-  test classes.
-* New `test(Condition<Event>)` and `nestedContainer(Class<?>, Condition<Event>)` methods
-  in `EventConditions` that allow you to provide conditions for matching against test and
-  nested container events when using the `EngineTestKit`. For example,
-  `test(displayName("my test"))` can be used to match against a test whose display name is
-  `my test`.
-* Generating Java Flight Recorder (JFR) events via the `junit-platform-jfr` module is now
-  also supported on Java 8 Update 262 or higher, in addition to Java 11 or later. See
-  <<../user-guide/index.adoc#running-tests-listeners-flight-recorder, Flight Recorder
-  Support>> for details.
-* The `junit-platform-jfr` module now publishes execution events for containers -- for
-  example, test classes.
-* The `junit-platform-jfr` module now publishes test discovery events for the launcher and
-  registered test engines.
-* New `ClassSource.from(URI)` static factory method for creating a `ClassSource` from a
-  URI using the `class` scheme and optional query parameters specifying the line number
-  and column number. This is analogous to the existing `ClasspathResourceSource.from(URI)`
-  factory method.
-* New `getConfigurationParameters()` method in the `TestPlan` which allows a
-  `TestExecutionListener` to access
-  <<../user-guide/index.adoc#running-tests-config-params, configuration parameters>>. See
-  <<../user-guide/index.adoc#launcher-api-listeners-config, Configuring an Execution
-  Listener>> for details.
-* Custom `LauncherDiscoveryListener` implementations can now be registered via Java’s
-  `{ServiceLoader}` mechanism.
-* Documented constant value of `ExclusiveResource.GLOBAL_KEY`.
-* Instances of `TestIdentifier` and `UniqueId` now retain less memory because they no
-  longer store `String` representations of unique IDs.
-* Tools that make multiple calls to the `Launcher` API should now create a
-  `LauncherSession` in order to allow for executing global setup and teardown code exactly
-  once via the new `LauncherSessionListener` interface that can be registered via Java’s
-  `{ServiceLoader}` mechanism.
-
-
-[[release-notes-5.8.0-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* `@DisplayNameGeneration` and `@IndicativeSentencesGeneration` are now only inherited
-  from enclosing classes if the current class is a `@Nested` test class.
-* The `IndicativeSentences` `DisplayNameGenerator` no longer includes the display name of
-  the enclosing class when generating an _indicative sentence_ if the enclosing class is
-  not configured to use the `IndicativeSentences` display name generator as well.
-* The `TypedArgumentConverter` base class now supports the conversion of a `null` source
-  value in parameterized tests.
-* The `TypedArgumentConverter` base class now supports conversion to a primitive type if
-  the configured target type is a wrapper for the target primitive type, including
-  primitive widening support -- for example, from `Integer` to `int` or `long`.
-* Exceptions thrown from instances of `CloseableResource` no longer hide test failures but
-  are instead reported as suppressed exceptions.
-
-==== Deprecations and Breaking Changes
-
-* The new `autoCloseArguments` feature in `@ParameterizedTest` may potentially be a
-  breaking change for existing parameterized test methods if an argument that implements
-  `java.lang.AutoCloseable` is reused for multiple invocations of the same parameterized
-  test method. If your parameterized test methods start to fail when you upgrade to JUnit
-  Jupiter 5.8, you can disable this feature by declaring
-  `@ParameterizedTest(autoCloseArguments = false)`.
-* `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, ExtensionContext)` has
-  been deprecated in favor of
-  `InvocationInterceptor.interceptDynamicTest(Invocation<Void>, DynamicTestInvocationContext, ExtensionContext)`
-  that provides access to the dynamic test executable via
-  `DynamicTestInvocationContext.getExecutable()`.
-
-==== New Features and Improvements
-
-* Test classes can now be ordered _globally_ by supplying the fully-qualified name of a
-  class implementing the `ClassOrderer` API as the value of the new
-  `junit.jupiter.testclass.order.default` configuration parameter. See
-  <<../user-guide/index.adoc#writing-tests-test-execution-order-classes, Class Order>> for
-  details.
-* `@Nested` test classes can be ordered _locally_ via the new `@TestClassOrder` annotation
-  in which a `ClassOrderer` can be specified.
-* `@ExtendWith` may now be used to register extensions declaratively via fields or
-  parameters in test class constructors, test methods, and lifecycle methods. See
-  <<../user-guide/index.adoc#extensions-registration-declarative, Declarative Extension
-  Registration>> for details.
-* `@RegisterExtension` fields may now be `private`.
-* New `assertThrowsExactly()` method in `Assertions` which is a more strict version of
-  `assertThrows()` that allows you to assert that the exception thrown is of the exact
-  type specified.
-* `assertDoesNotThrow()` in `Assertions` now supports suspending functions when called
-  from Kotlin.
-* New `assertInstanceOf()` methods which produce better error messages comparable to those
-  produced by `assertThrows`. These new methods serve as a replacement for
-  `assertTrue(obj instanceof X)`.
-* `assertNull()` failure messages now include the actual object's type if the `toString()`
-  implementation for the actual object returns `null` or `"null"`. This avoids the
-  generation of confusing failure messages such as `expected <null> but was <null>`.
-* `@TempDir` can now be used to create multiple temporary directories. Instead of creating
-  a single temporary directory per context (i.e. test class or method) every declaration
-  of the `@TempDir` annotation on a field or method parameter now results in a separate
-  temporary directory. To revert to the old behavior of using a single temporary directory
-  for the entire test class or method (depending on which level the annotation is used),
-  you can set the `junit.jupiter.tempdir.scope` configuration parameter to `per_context`.
-* `@TempDir` cleanup resets readable and executable permissions of the root temporary
-  directory and any contained directories instead of failing to delete them.
-* `@TempDir` fields may now be `private`.
-* `DynamicTests.stream()` can now consume `Named` input and will use each name-value pair
-  as the display name and value for each generated dynamic test (see
-  <<../user-guide/index.adoc#writing-tests-dynamic-tests-examples,User Guide>> for details).
-* New `class` URI scheme for dynamic test sources. This allows tests to be located using
-  the information available in a `StackTraceElement`.
-* Dynamic tests now require less memory thanks to a number of improvements to internal
-  data structures.
-* New `autoCloseArguments` attribute in `@ParameterizedTest` to close
-  `java.lang.AutoCloseable` arguments after each invocation of the parameterized test
-  method. This attribute defaults to `true`.
-* Numeric literals used with `@CsvSource` or `CsvFileSource` can now be expressed using
-  underscores as in some JVM languages, to improve readability of long numbers like
-  `700_000_000`.
-* CSV rows provided via `@CsvSource` may now start with a number sign (`#`).
-* New `ignoreLeadingAndTrailingWhitespace` attributes in `@CsvSource` and `@CsvFileSource`
-  (set to `true` by default) to control whether or not to trim whitespace.
-* In parameterized tests using `@MethodSource` or `@ArgumentSource`, arguments can now have
-  optional names (supplied via the new `Named` API). When the argument is included in the
-  display name of an invocation, this name will be used instead of the value.
-* Documented constant values in `org.junit.jupiter.api.parallel.Resources`.
-
-
-[[release-notes-5.8.0-junit-vintage]]
-=== JUnit Vintage
-
-==== Bug Fixes
-
-* If multiple exceptions are registered as failures for a JUnit 4 based test -- for
-  example, if the `ErrorCollector` rule throws an
-  `org.junit.runners.model.MultipleFailureException` -- all of those failures are now
-  added as _suppressed exceptions_ in the `org.opentest4j.MultipleFailuresError` created
-  by the `VintageTestEngine`. This allows users to analyze the stack trace of each failure
-  when such a test fails.
-
-==== New Features and Improvements
-
-* The JUnit Vintage engine now requires less memory and allows for earlier garbage
-  collection thanks to a number of improvements to internal data structures.
+For complete details consult the
+https://junit.org/junit5/docs/5.8.0/release-notes/index.html[5.8.0 Release Notes] online.

From 99162b152c28f0fa88ce40f860257c5be0182ec7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 15:09:39 +0200
Subject: [PATCH 0539/1433] Simplify JaCoCo aggregation setup

---
 build.gradle.kts | 118 +++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 61 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b027c71de633..8a56bd7b9dee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -79,7 +79,6 @@ val jacocoTestProjects = listOf(
 		projects.junitJupiterEngine,
 		projects.junitJupiterMigrationsupport,
 		projects.junitJupiterParams,
-		projects.junitPlatformRunner,
 		projects.junitVintageEngine,
 		projects.platformTests
 ).map { it.dependencyProject }
@@ -98,12 +97,10 @@ allprojects {
 	apply(plugin = "eclipse")
 	apply(plugin = "idea")
 	apply(plugin = "com.diffplug.spotless")
+	apply(plugin = "jacoco")
 
-	if (enableJaCoCo) {
-		apply(plugin = "jacoco")
-		configure<JacocoPluginExtension> {
-			toolVersion = rootProject.libs.versions.jacoco.get()
-		}
+	configure<JacocoPluginExtension> {
+		toolVersion = rootProject.libs.versions.jacoco.get()
 	}
 }
 
@@ -165,41 +162,43 @@ subprojects {
 		}
 
 		afterEvaluate {
-			if (enableJaCoCo) {
-				if (project in jacocoCoveredProjects) {
-					val jarTask = (tasks.findByName("shadowJar") ?: tasks["jar"]) as Jar
-					val extractJar by tasks.registering(Copy::class) {
-						from(zipTree(jarTask.archiveFile))
-						into(jacocoClassesDir)
-						include("**/*.class")
-						// don't report coverage for shadowed classes
-						exclude("**/shadow/**")
-						// don't version-specific classes of MR JARs
-						exclude("META-INF/versions/**")
-						includeEmptyDirs = false
-						onlyIf { jarTask.enabled }
+			if (project in jacocoCoveredProjects) {
+				val jarTask = (tasks.findByName("shadowJar") ?: tasks["jar"]) as Jar
+				val extractJar by tasks.registering(Copy::class) {
+					from(zipTree(jarTask.archiveFile))
+					into(jacocoClassesDir)
+					include("**/*.class")
+					// don't report coverage for shadowed classes
+					exclude("**/shadow/**")
+					// don't version-specific classes of MR JARs
+					exclude("META-INF/versions/**")
+					includeEmptyDirs = false
+					onlyIf { jarTask.enabled }
+				}
+				jarTask.finalizedBy(extractJar)
+			}
+			if (project in jacocoTestProjects) {
+				tasks.named<Test>("test") {
+					configure<JacocoTaskExtension> {
+						enabled = enableJaCoCo
 					}
-					jarTask.finalizedBy(extractJar)
+					finalizedBy("jacocoTestReport")
 				}
-				if (project in jacocoTestProjects) {
-					tasks.named<Test>("test") {
-						finalizedBy("jacocoTestReport")
+				tasks.named<JacocoReport>("jacocoTestReport") {
+					enabled = enableJaCoCo
+					dependsOn("test")
+					reports {
+						html.required.set(true)
+						xml.required.set(true)
+						csv.required.set(false)
 					}
-					tasks.named<JacocoReport>("jacocoTestReport").configure {
-						dependsOn("test")
-						reports {
-							html.isEnabled = true
-							xml.isEnabled = true
-							csv.isEnabled = false
+					jacocoCoveredProjects.forEach {
+						dependsOn(it.tasks.named("extractJar"))
+						it.pluginManager.withPlugin("java") {
+							sourceDirectories.setFrom(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
 						}
-						jacocoCoveredProjects.forEach {
-							dependsOn(it.tasks.named("extractJar"))
-							it.pluginManager.withPlugin("java") {
-								sourceDirectories.setFrom(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
-							}
-						}
-						classDirectories.setFrom(files(jacocoClassesDir))
 					}
+					classDirectories.setFrom(files(jacocoClassesDir))
 				}
 			}
 		}
@@ -254,8 +253,8 @@ rootProject.apply {
 				componentSelection {
 					all {
 						val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea")
-								.map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
-								.any { it.matches(candidate.version) }
+							.map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
+							.any { it.matches(candidate.version) }
 						if (rejected) {
 							reject("Release candidate")
 						}
@@ -265,30 +264,27 @@ rootProject.apply {
 		}
 	}
 
-	if (enableJaCoCo) {
-		tasks {
-			val jacocoMerge by registering(JacocoMerge::class) {
-				subprojects.filter { it in jacocoTestProjects }
-						.forEach { subproj ->
-							executionData(fileTree("dir" to "${subproj.buildDir}/jacoco", "include" to "*.exec"))
-							dependsOn(subproj.tasks.withType<Test>())
-						}
+	val jacocoRootReport by tasks.registering(JacocoReport::class) {
+		enabled = enableJaCoCo
+		jacocoCoveredProjects.forEach {
+			dependsOn(it.tasks.named("extractJar"))
+			it.pluginManager.withPlugin("java") {
+				sourceDirectories.from(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
 			}
-			register<JacocoReport>("jacocoRootReport") {
-				dependsOn(jacocoMerge)
-				jacocoCoveredProjects.forEach {
-					dependsOn(it.tasks.named("extractJar"))
-					it.pluginManager.withPlugin("java") {
-						sourceDirectories.from(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
-					}
-				}
-				classDirectories.from(files(jacocoClassesDir))
-				executionData(jacocoMerge.get().destinationFile)
-				reports {
-					html.isEnabled = true
-					xml.isEnabled = true
-					csv.isEnabled = false
-				}
+		}
+		classDirectories.from(files(jacocoClassesDir))
+		reports {
+			html.required.set(true)
+			xml.required.set(true)
+			csv.required.set(false)
+		}
+	}
+
+	afterEvaluate {
+		jacocoRootReport {
+			jacocoTestProjects.forEach {
+				executionData(it.tasks.withType<Test>().map { task -> task.the<JacocoTaskExtension>().destinationFile })
+				dependsOn(it.tasks.withType<Test>())
 			}
 		}
 	}

From b3a10809c3be41afe00b4fee50f04d3b33f7f552 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 15:44:45 +0200
Subject: [PATCH 0540/1433] Extract JaCoCo subproject setup into separate build
 script

---
 build.gradle.kts                              | 53 +------------------
 .../kotlin/jacoco-base-conventions.gradle.kts | 21 ++++++++
 .../kotlin/jacoco-java-conventions.gradle.kts | 38 +++++++++++++
 .../java-library-conventions.gradle.kts       |  1 +
 4 files changed, 62 insertions(+), 51 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/jacoco-base-conventions.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 8a56bd7b9dee..76ca973e44b6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
 	id("com.diffplug.spotless")
 	id("io.spring.nohttp")
 	id("io.github.gradle-nexus.publish-plugin")
+	`jacoco-base-conventions`
 }
 
 val buildTimeAndDate: OffsetDateTime by extra {
@@ -74,7 +75,6 @@ val license by extra(License(
 val tempRepoName by extra("temp")
 val tempRepoDir by extra(file("$buildDir/repo"))
 
-val enableJaCoCo = project.hasProperty("enableJaCoCo")
 val jacocoTestProjects = listOf(
 		projects.junitJupiterEngine,
 		projects.junitJupiterMigrationsupport,
@@ -83,7 +83,7 @@ val jacocoTestProjects = listOf(
 		projects.platformTests
 ).map { it.dependencyProject }
 val jacocoCoveredProjects = modularProjects
-val jacocoClassesDir = file("$buildDir/jacoco/classes")
+val jacocoClassesDir by extra(file("$buildDir/jacoco/classes"))
 
 nexusPublishing {
 	packageGroup.set("org.junit")
@@ -93,15 +93,9 @@ nexusPublishing {
 }
 
 allprojects {
-
 	apply(plugin = "eclipse")
 	apply(plugin = "idea")
 	apply(plugin = "com.diffplug.spotless")
-	apply(plugin = "jacoco")
-
-	configure<JacocoPluginExtension> {
-		toolVersion = rootProject.libs.versions.jacoco.get()
-	}
 }
 
 val clearTempRepoDir by tasks.registering {
@@ -160,48 +154,6 @@ subprojects {
 				endWithNewline()
 			}
 		}
-
-		afterEvaluate {
-			if (project in jacocoCoveredProjects) {
-				val jarTask = (tasks.findByName("shadowJar") ?: tasks["jar"]) as Jar
-				val extractJar by tasks.registering(Copy::class) {
-					from(zipTree(jarTask.archiveFile))
-					into(jacocoClassesDir)
-					include("**/*.class")
-					// don't report coverage for shadowed classes
-					exclude("**/shadow/**")
-					// don't version-specific classes of MR JARs
-					exclude("META-INF/versions/**")
-					includeEmptyDirs = false
-					onlyIf { jarTask.enabled }
-				}
-				jarTask.finalizedBy(extractJar)
-			}
-			if (project in jacocoTestProjects) {
-				tasks.named<Test>("test") {
-					configure<JacocoTaskExtension> {
-						enabled = enableJaCoCo
-					}
-					finalizedBy("jacocoTestReport")
-				}
-				tasks.named<JacocoReport>("jacocoTestReport") {
-					enabled = enableJaCoCo
-					dependsOn("test")
-					reports {
-						html.required.set(true)
-						xml.required.set(true)
-						csv.required.set(false)
-					}
-					jacocoCoveredProjects.forEach {
-						dependsOn(it.tasks.named("extractJar"))
-						it.pluginManager.withPlugin("java") {
-							sourceDirectories.setFrom(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
-						}
-					}
-					classDirectories.setFrom(files(jacocoClassesDir))
-				}
-			}
-		}
 	}
 
 	pluginManager.withPlugin("maven-publish") {
@@ -265,7 +217,6 @@ rootProject.apply {
 	}
 
 	val jacocoRootReport by tasks.registering(JacocoReport::class) {
-		enabled = enableJaCoCo
 		jacocoCoveredProjects.forEach {
 			dependsOn(it.tasks.named("extractJar"))
 			it.pluginManager.withPlugin("java") {
diff --git a/buildSrc/src/main/kotlin/jacoco-base-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-base-conventions.gradle.kts
new file mode 100644
index 000000000000..1f4f36fd3d9c
--- /dev/null
+++ b/buildSrc/src/main/kotlin/jacoco-base-conventions.gradle.kts
@@ -0,0 +1,21 @@
+plugins {
+	jacoco
+}
+
+val enableJaCoCo = project.hasProperty("enableJaCoCo")
+
+jacoco {
+	val libs = project.extensions["libs"] as VersionCatalog
+	toolVersion = libs.findVersion("jacoco").get().requiredVersion
+}
+
+tasks {
+	withType<Test>().configureEach {
+		configure<JacocoTaskExtension> {
+			enabled = enableJaCoCo
+		}
+	}
+	withType<JacocoReport>().configureEach {
+		enabled = enableJaCoCo
+	}
+}
diff --git a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
new file mode 100644
index 000000000000..aa3e238d108f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
@@ -0,0 +1,38 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+	`java-library`
+	id("jacoco-base-conventions")
+}
+
+val jacocoClassesDir: File by rootProject.extra
+
+val extractJar by tasks.registering(Copy::class) {
+	from(zipTree(tasks.jar.map { it.archiveFile }))
+	into(jacocoClassesDir)
+	include("**/*.class")
+	// don't version-specific classes of MR JARs
+	exclude("META-INF/versions/**")
+	includeEmptyDirs = false
+	onlyIf { tasks.jar.get().enabled }
+}
+
+tasks.jar {
+	finalizedBy(extractJar)
+}
+
+tasks.named<JacocoReport>("jacocoTestReport") {
+	enabled = false
+}
+
+pluginManager.withPlugin("com.github.johnrengelman.shadow") {
+	val shadowJar by tasks.existing(ShadowJar::class) {
+		finalizedBy(extractJar)
+	}
+	extractJar {
+		from(zipTree(shadowJar.map { it.archiveFile }))
+		// don't report coverage for shadowed classes
+		exclude("**/shadow/**")
+		onlyIf { shadowJar.get().enabled }
+	}
+}
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index e26140159719..ee11e7253790 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 	idea
 	checkstyle
 	id("java-toolchain-conventions")
+	id("jacoco-java-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra

From e05c12a4a6d1a23f8eafdd7bd7aef725d289ba71 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 16:56:38 +0200
Subject: [PATCH 0541/1433] Merge the two JaCoCo convention plugins

---
 build.gradle.kts                              |  2 +-
 .../kotlin/jacoco-base-conventions.gradle.kts | 21 -------
 .../main/kotlin/jacoco-conventions.gradle.kts | 61 +++++++++++++++++++
 .../kotlin/jacoco-java-conventions.gradle.kts | 38 ------------
 .../java-library-conventions.gradle.kts       |  2 +-
 5 files changed, 63 insertions(+), 61 deletions(-)
 delete mode 100644 buildSrc/src/main/kotlin/jacoco-base-conventions.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
 delete mode 100644 buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 76ca973e44b6..ed42426b31b1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 	id("com.diffplug.spotless")
 	id("io.spring.nohttp")
 	id("io.github.gradle-nexus.publish-plugin")
-	`jacoco-base-conventions`
+	`jacoco-conventions`
 }
 
 val buildTimeAndDate: OffsetDateTime by extra {
diff --git a/buildSrc/src/main/kotlin/jacoco-base-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-base-conventions.gradle.kts
deleted file mode 100644
index 1f4f36fd3d9c..000000000000
--- a/buildSrc/src/main/kotlin/jacoco-base-conventions.gradle.kts
+++ /dev/null
@@ -1,21 +0,0 @@
-plugins {
-	jacoco
-}
-
-val enableJaCoCo = project.hasProperty("enableJaCoCo")
-
-jacoco {
-	val libs = project.extensions["libs"] as VersionCatalog
-	toolVersion = libs.findVersion("jacoco").get().requiredVersion
-}
-
-tasks {
-	withType<Test>().configureEach {
-		configure<JacocoTaskExtension> {
-			enabled = enableJaCoCo
-		}
-	}
-	withType<JacocoReport>().configureEach {
-		enabled = enableJaCoCo
-	}
-}
diff --git a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
new file mode 100644
index 000000000000..3f8b634041fc
--- /dev/null
+++ b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
@@ -0,0 +1,61 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+	jacoco
+}
+
+val enableJaCoCo = project.hasProperty("enableJaCoCo")
+
+jacoco {
+	val libs = project.extensions["libs"] as VersionCatalog
+	toolVersion = libs.findVersion("jacoco").get().requiredVersion
+}
+
+tasks {
+	withType<Test>().configureEach {
+		configure<JacocoTaskExtension> {
+			enabled = enableJaCoCo
+		}
+	}
+	withType<JacocoReport>().configureEach {
+		enabled = enableJaCoCo
+	}
+}
+
+pluginManager.withPlugin("java") {
+
+	val jacocoClassesDir: File by rootProject.extra
+
+	val jar by tasks.existing(Jar::class)
+
+	val extractJar by tasks.registering(Copy::class) {
+		from(zipTree(jar.map { it.archiveFile }))
+		into(jacocoClassesDir)
+		include("**/*.class")
+		// don't version-specific classes of MR JARs
+		exclude("META-INF/versions/**")
+		includeEmptyDirs = false
+		onlyIf { jar.get().enabled }
+	}
+
+	jar {
+		finalizedBy(extractJar)
+	}
+
+	tasks.named<JacocoReport>("jacocoTestReport") {
+		enabled = false
+	}
+
+	pluginManager.withPlugin("com.github.johnrengelman.shadow") {
+
+		val shadowJar by tasks.existing(ShadowJar::class) {
+			finalizedBy(extractJar)
+		}
+		extractJar {
+			from(zipTree(shadowJar.map { it.archiveFile }))
+			// don't report coverage for shadowed classes
+			exclude("**/shadow/**")
+			onlyIf { shadowJar.get().enabled }
+		}
+	}
+}
diff --git a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
deleted file mode 100644
index aa3e238d108f..000000000000
--- a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
+++ /dev/null
@@ -1,38 +0,0 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-plugins {
-	`java-library`
-	id("jacoco-base-conventions")
-}
-
-val jacocoClassesDir: File by rootProject.extra
-
-val extractJar by tasks.registering(Copy::class) {
-	from(zipTree(tasks.jar.map { it.archiveFile }))
-	into(jacocoClassesDir)
-	include("**/*.class")
-	// don't version-specific classes of MR JARs
-	exclude("META-INF/versions/**")
-	includeEmptyDirs = false
-	onlyIf { tasks.jar.get().enabled }
-}
-
-tasks.jar {
-	finalizedBy(extractJar)
-}
-
-tasks.named<JacocoReport>("jacocoTestReport") {
-	enabled = false
-}
-
-pluginManager.withPlugin("com.github.johnrengelman.shadow") {
-	val shadowJar by tasks.existing(ShadowJar::class) {
-		finalizedBy(extractJar)
-	}
-	extractJar {
-		from(zipTree(shadowJar.map { it.archiveFile }))
-		// don't report coverage for shadowed classes
-		exclude("**/shadow/**")
-		onlyIf { shadowJar.get().enabled }
-	}
-}
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index ee11e7253790..c3d0ccba1b77 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 	idea
 	checkstyle
 	id("java-toolchain-conventions")
-	id("jacoco-java-conventions")
+	id("jacoco-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra

From ecd7b2f3dd4aea2d42fdfdec6d5f10568415af81 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 17:06:44 +0200
Subject: [PATCH 0542/1433] Extract build-metadata into pre-compiled script
 plugin

---
 build.gradle.kts                              | 30 +----------------
 buildSrc/build.gradle.kts                     |  1 +
 .../src/main/kotlin/build-metadata.gradle.kts | 33 +++++++++++++++++++
 settings.gradle.kts                           |  1 -
 4 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/build-metadata.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index ed42426b31b1..8d22e522c5a2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,40 +1,12 @@
-import java.time.OffsetDateTime
-import java.time.Instant
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-
 plugins {
-	id("net.nemerosa.versioning")
 	id("com.github.ben-manes.versions") // gradle dependencyUpdates
 	id("com.diffplug.spotless")
 	id("io.spring.nohttp")
 	id("io.github.gradle-nexus.publish-plugin")
+	`build-metadata`
 	`jacoco-conventions`
 }
 
-val buildTimeAndDate: OffsetDateTime by extra {
-
-	// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against
-	// in order to achieve reproducible builds
-	//
-	// More details - https://reproducible-builds.org/docs/source-date-epoch/
-
-	if (System.getenv().containsKey("SOURCE_DATE_EPOCH")) {
-
-		val sourceDateEpoch = System.getenv("SOURCE_DATE_EPOCH").toLong()
-
-		Instant.ofEpochSecond(sourceDateEpoch).atOffset(ZoneOffset.UTC)
-
-	} else {
-		OffsetDateTime.now()
-	}
-}
-
-val buildDate: String by extra { DateTimeFormatter.ISO_LOCAL_DATE.format(buildTimeAndDate) }
-val buildTime: String by extra { DateTimeFormatter.ofPattern("HH:mm:ss.SSSZ").format(buildTimeAndDate) }
-val buildRevision: String by extra { versioning.info.commit }
-val builtByValue by extra { project.findProperty("builtBy") ?: project.property("defaultBuiltBy") }
-
 val platformProjects by extra(listOf(
 		projects.junitPlatformCommons,
 		projects.junitPlatformConsole,
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 7d85575ecda5..62b5493f1e70 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
 	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
+	implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1")
 }
diff --git a/buildSrc/src/main/kotlin/build-metadata.gradle.kts b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
new file mode 100644
index 000000000000..8273c7d9a4a5
--- /dev/null
+++ b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
@@ -0,0 +1,33 @@
+import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.invoke
+import java.time.Instant
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+
+plugins {
+	id("net.nemerosa.versioning")
+}
+
+val buildTimeAndDate: OffsetDateTime by extra {
+
+	// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against
+	// in order to achieve reproducible builds
+	//
+	// More details - https://reproducible-builds.org/docs/source-date-epoch/
+
+	if (System.getenv().containsKey("SOURCE_DATE_EPOCH")) {
+
+		val sourceDateEpoch = System.getenv("SOURCE_DATE_EPOCH").toLong()
+
+		Instant.ofEpochSecond(sourceDateEpoch).atOffset(ZoneOffset.UTC)
+
+	} else {
+		OffsetDateTime.now()
+	}
+}
+
+val buildDate: String by extra { DateTimeFormatter.ISO_LOCAL_DATE.format(buildTimeAndDate) }
+val buildTime: String by extra { DateTimeFormatter.ofPattern("HH:mm:ss.SSSZ").format(buildTimeAndDate) }
+val buildRevision: String by extra { versioning.info.commit }
+val builtByValue by extra { project.findProperty("builtBy") ?: project.property("defaultBuiltBy") }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c1e30ecdd242..17017644fa4d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,6 @@ pluginManagement {
 		id("com.gradle.enterprise") version "3.7"
 		id("com.gradle.enterprise.test-distribution") version "2.2"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
-		id("net.nemerosa.versioning") version "2.14.0"
 		id("com.github.ben-manes.versions") version "0.39.0"
 		id("com.diffplug.spotless") version "5.15.1"
 		id("org.ajoberstar.git-publish") version "3.0.0"

From ed3726d9c79f0e989303bed80846e33d56bd83c1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 17:27:59 +0200
Subject: [PATCH 0543/1433] Extract Spotless setup into separate build script

---
 build.gradle.kts                              | 52 +-----------------
 buildSrc/build.gradle.kts                     |  5 +-
 .../main/kotlin/base-conventions.gradle.kts   |  6 +++
 .../java-library-conventions.gradle.kts       |  3 +-
 .../kotlin/publishing-conventions.gradle.kts  |  1 +
 .../kotlin/spotless-conventions.gradle.kts    | 54 +++++++++++++++++++
 junit-bom/junit-bom.gradle.kts                |  1 -
 settings.gradle.kts                           |  1 -
 8 files changed, 66 insertions(+), 57 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/base-conventions.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/spotless-conventions.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 8d22e522c5a2..211552ada97d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
 	id("com.github.ben-manes.versions") // gradle dependencyUpdates
-	id("com.diffplug.spotless")
 	id("io.spring.nohttp")
 	id("io.github.gradle-nexus.publish-plugin")
+	`base-conventions`
 	`build-metadata`
 	`jacoco-conventions`
 }
@@ -64,12 +64,6 @@ nexusPublishing {
 	}
 }
 
-allprojects {
-	apply(plugin = "eclipse")
-	apply(plugin = "idea")
-	apply(plugin = "com.diffplug.spotless")
-}
-
 val clearTempRepoDir by tasks.registering {
 	doFirst {
 		tempRepoDir.deleteRecursively()
@@ -99,35 +93,6 @@ subprojects {
 		fileMode = Integer.parseInt("0644", 8)
 	}
 
-	pluginManager.withPlugin("java") {
-
-		spotless {
-			val headerFile = license.headerFile
-			val importOrderConfigFile = rootProject.file("src/eclipse/junit-eclipse.importorder")
-			val javaFormatterConfigFile = rootProject.file("src/eclipse/junit-eclipse-formatter-settings.xml")
-
-			java {
-				licenseHeaderFile(headerFile, "(package|import|open|module) ")
-				importOrderFile(importOrderConfigFile)
-				eclipse().configFile(javaFormatterConfigFile)
-				if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_15)) {
-					// Doesn't work with Java 15 text blocks, see https://github.com/diffplug/spotless/issues/713
-					removeUnusedImports()
-				}
-				trimTrailingWhitespace()
-				endWithNewline()
-			}
-
-			kotlin {
-				targetExclude("**/src/test/resources/**")
-				ktlint(libs.versions.ktlint.get())
-				licenseHeaderFile(headerFile)
-				trimTrailingWhitespace()
-				endWithNewline()
-			}
-		}
-	}
-
 	pluginManager.withPlugin("maven-publish") {
 		configure<PublishingExtension> {
 			repositories {
@@ -150,21 +115,6 @@ subprojects {
 rootProject.apply {
 	description = "JUnit 5"
 
-	spotless {
-		format("misc") {
-			target("**/*.gradle", "**/*.gradle.kts", "**/*.gitignore")
-			targetExclude("**/build/**")
-			indentWithTabs()
-			trimTrailingWhitespace()
-			endWithNewline()
-		}
-		format("documentation") {
-			target("**/*.adoc", "**/*.md")
-			trimTrailingWhitespace()
-			endWithNewline()
-		}
-	}
-
 	nohttp {
 		// Must cast, since `source` is only exposed as a FileTree
 		(source as ConfigurableFileTree).exclude("buildSrc/build/generated-sources/**")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 62b5493f1e70..a596b8cee974 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,8 +11,9 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
-	implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
-	implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:5.15.1")
+    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
+    implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1")
 }
diff --git a/buildSrc/src/main/kotlin/base-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-conventions.gradle.kts
new file mode 100644
index 000000000000..2a3842333d33
--- /dev/null
+++ b/buildSrc/src/main/kotlin/base-conventions.gradle.kts
@@ -0,0 +1,6 @@
+plugins {
+    eclipse
+    idea
+    id("java-toolchain-conventions")
+    id("spotless-conventions")
+}
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index c3d0ccba1b77..ea720a953188 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -6,8 +6,7 @@ plugins {
 	eclipse
 	idea
 	checkstyle
-	id("java-toolchain-conventions")
-	id("jacoco-conventions")
+	id("base-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index 1acbaf8e5841..4ae2fca3c29d 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
 	`maven-publish`
 	signing
+	id("base-conventions")
 }
 
 val isSnapshot = project.version.toString().contains("SNAPSHOT")
diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
new file mode 100644
index 000000000000..42f9fd792745
--- /dev/null
+++ b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
@@ -0,0 +1,54 @@
+import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.provideDelegate
+
+plugins {
+    id("com.diffplug.spotless")
+}
+
+val license: License by rootProject.extra
+
+spotless {
+
+    format("misc") {
+        target("*.gradle", "*.gradle.kts", "*.gitignore")
+        indentWithTabs()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+
+    format("documentation") {
+        target("*.adoc", "*.md", "src/**/*.adoc", "src/**/*.md")
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+
+    pluginManager.withPlugin("java") {
+
+        val importOrderConfigFile = rootProject.file("src/eclipse/junit-eclipse.importorder")
+        val javaFormatterConfigFile = rootProject.file("src/eclipse/junit-eclipse-formatter-settings.xml")
+
+        java {
+            licenseHeaderFile(license.headerFile, "(package|import|open|module) ")
+            importOrderFile(importOrderConfigFile)
+            eclipse().configFile(javaFormatterConfigFile)
+            if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_15)) {
+                // Doesn't work with Java 15 text blocks, see https://github.com/diffplug/spotless/issues/713
+                removeUnusedImports()
+            }
+            trimTrailingWhitespace()
+            endWithNewline()
+        }
+    }
+
+    pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
+        kotlin {
+            targetExclude("**/src/test/resources/**")
+            val libs = project.extensions["libs"] as VersionCatalog
+            ktlint(libs.findVersion("ktlint").get().requiredVersion)
+            licenseHeaderFile(license.headerFile)
+            trimTrailingWhitespace()
+            endWithNewline()
+        }
+    }
+}
+
diff --git a/junit-bom/junit-bom.gradle.kts b/junit-bom/junit-bom.gradle.kts
index 4a7a327a1789..fae23ee37eab 100644
--- a/junit-bom/junit-bom.gradle.kts
+++ b/junit-bom/junit-bom.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
 	`java-platform`
-	`java-toolchain-conventions`
 	`publishing-conventions`
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 17017644fa4d..4db7cb552d7b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,7 +9,6 @@ pluginManagement {
 		id("com.gradle.enterprise.test-distribution") version "2.2"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
 		id("com.github.ben-manes.versions") version "0.39.0"
-		id("com.diffplug.spotless") version "5.15.1"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.0"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From 3936325f04a67b48347294b6052c818c376a997a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 17:39:45 +0200
Subject: [PATCH 0544/1433] Extract dependency-update-check plugin

---
 build.gradle.kts                              | 20 +-----------------
 buildSrc/build.gradle.kts                     |  1 +
 .../kotlin/dependency-update-check.gradle.kts | 21 +++++++++++++++++++
 settings.gradle.kts                           |  1 -
 4 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/dependency-update-check.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 211552ada97d..1501204efbc7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
-	id("com.github.ben-manes.versions") // gradle dependencyUpdates
 	id("io.spring.nohttp")
 	id("io.github.gradle-nexus.publish-plugin")
 	`base-conventions`
 	`build-metadata`
+	`dependency-update-check`
 	`jacoco-conventions`
 }
 
@@ -120,24 +120,6 @@ rootProject.apply {
 		(source as ConfigurableFileTree).exclude("buildSrc/build/generated-sources/**")
 	}
 
-	tasks {
-		dependencyUpdates {
-			checkConstraints = true
-			resolutionStrategy {
-				componentSelection {
-					all {
-						val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea")
-							.map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
-							.any { it.matches(candidate.version) }
-						if (rejected) {
-							reject("Release candidate")
-						}
-					}
-				}
-			}
-		}
-	}
-
 	val jacocoRootReport by tasks.registering(JacocoReport::class) {
 		jacocoCoveredProjects.forEach {
 			dependsOn(it.tasks.named("extractJar"))
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index a596b8cee974..f9d82f37090e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:5.15.1")
+    implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
diff --git a/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts b/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts
new file mode 100644
index 000000000000..bf6c679ae18a
--- /dev/null
+++ b/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts
@@ -0,0 +1,21 @@
+import org.gradle.kotlin.dsl.resolutionStrategy
+
+plugins {
+    id("com.github.ben-manes.versions")
+}
+
+tasks.dependencyUpdates {
+    checkConstraints = true
+    resolutionStrategy {
+        componentSelection {
+            all {
+                val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea")
+                    .map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
+                    .any { it.matches(candidate.version) }
+                if (rejected) {
+                    reject("Release candidate")
+                }
+            }
+        }
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4db7cb552d7b..60cb61fff419 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,6 @@ pluginManagement {
 		id("com.gradle.enterprise") version "3.7"
 		id("com.gradle.enterprise.test-distribution") version "2.2"
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
-		id("com.github.ben-manes.versions") version "0.39.0"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.0"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From dedba5abf2e1038c0a97fefe7de77c66b2e94686 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 17:42:40 +0200
Subject: [PATCH 0545/1433] Use same version of test-distribution plugin in
 buildSrc

---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index f9d82f37090e..23d2343fff13 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.1.1")
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2") // keep in sync with root settings.gradle.kts
 }
 
 tasks.withType<KotlinCompile>().configureEach {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 60cb61fff419..6cc36ab6642e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.7"
-		id("com.gradle.enterprise.test-distribution") version "2.2"
+		id("com.gradle.enterprise.test-distribution") version "2.2" // keep in sync with buildSrc/buiild.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.0"

From 4d2258c623ebb05f02f7b1cd378a9d44bb2f6671 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 17:58:14 +0200
Subject: [PATCH 0546/1433] Extract temp-maven-repo plugin

---
 build.gradle.kts                              | 28 +----------------
 .../main/kotlin/temp-maven-repo.gradle.kts    | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 27 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 1501204efbc7..82dc52464aa0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 	`build-metadata`
 	`dependency-update-check`
 	`jacoco-conventions`
+	`temp-maven-repo`
 }
 
 val platformProjects by extra(listOf(
@@ -44,9 +45,6 @@ val license by extra(License(
 		headerFile = file("src/spotless/eclipse-public-license-2.0.java")
 ))
 
-val tempRepoName by extra("temp")
-val tempRepoDir by extra(file("$buildDir/repo"))
-
 val jacocoTestProjects = listOf(
 		projects.junitJupiterEngine,
 		projects.junitJupiterMigrationsupport,
@@ -64,12 +62,6 @@ nexusPublishing {
 	}
 }
 
-val clearTempRepoDir by tasks.registering {
-	doFirst {
-		tempRepoDir.deleteRecursively()
-	}
-}
-
 subprojects {
 
 	when (project) {
@@ -92,24 +84,6 @@ subprojects {
 		dirMode = Integer.parseInt("0755", 8)
 		fileMode = Integer.parseInt("0644", 8)
 	}
-
-	pluginManager.withPlugin("maven-publish") {
-		configure<PublishingExtension> {
-			repositories {
-				repositories {
-					maven {
-						name = tempRepoName
-						url = uri(tempRepoDir)
-					}
-				}
-			}
-		}
-		tasks.withType<PublishToMavenRepository>().configureEach {
-			if (name.endsWith("To${tempRepoName.capitalize()}Repository")) {
-				dependsOn(clearTempRepoDir)
-			}
-		}
-	}
 }
 
 rootProject.apply {
diff --git a/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts b/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
new file mode 100644
index 000000000000..fe02bf33becc
--- /dev/null
+++ b/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
@@ -0,0 +1,30 @@
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
+import org.gradle.kotlin.dsl.*
+
+val tempRepoName by extra("temp")
+val tempRepoDir by extra(file("$buildDir/repo"))
+
+val clearTempRepoDir by tasks.registering {
+    doFirst {
+        tempRepoDir.deleteRecursively()
+    }
+}
+
+subprojects {
+    pluginManager.withPlugin("maven-publish") {
+        configure<PublishingExtension>() {
+            repositories {
+                maven {
+                    name = tempRepoName
+                    url = uri(tempRepoDir)
+                }
+            }
+        }
+        tasks.withType<PublishToMavenRepository>().configureEach {
+            if (name.endsWith("To${tempRepoName.capitalize()}Repository")) {
+                dependsOn(clearTempRepoDir)
+            }
+        }
+    }
+}

From 4da513bdf60b7b30e72ae01c059c717272519d19 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Sep 2021 18:14:50 +0200
Subject: [PATCH 0547/1433] Simplify root build script

---
 build.gradle.kts                              | 98 +++++++------------
 .../java-library-conventions.gradle.kts       |  7 ++
 .../kotlin/publishing-conventions.gradle.kts  | 18 ++++
 3 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 82dc52464aa0..cce12d0ae060 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,6 +8,14 @@ plugins {
 	`temp-maven-repo`
 }
 
+description = "JUnit 5"
+
+val license by extra(License(
+	name = "Eclipse Public License v2.0",
+	url = uri("https://www.eclipse.org/legal/epl-v20.html"),
+	headerFile = file("src/spotless/eclipse-public-license-2.0.java")
+))
+
 val platformProjects by extra(listOf(
 		projects.junitPlatformCommons,
 		projects.junitPlatformConsole,
@@ -39,22 +47,6 @@ val vintageProjects by extra(listOf(
 val mavenizedProjects by extra(platformProjects + jupiterProjects + vintageProjects)
 val modularProjects by extra(mavenizedProjects - listOf(projects.junitPlatformConsoleStandalone.dependencyProject))
 
-val license by extra(License(
-		name = "Eclipse Public License v2.0",
-		url = uri("https://www.eclipse.org/legal/epl-v20.html"),
-		headerFile = file("src/spotless/eclipse-public-license-2.0.java")
-))
-
-val jacocoTestProjects = listOf(
-		projects.junitJupiterEngine,
-		projects.junitJupiterMigrationsupport,
-		projects.junitJupiterParams,
-		projects.junitVintageEngine,
-		projects.platformTests
-).map { it.dependencyProject }
-val jacocoCoveredProjects = modularProjects
-val jacocoClassesDir by extra(file("$buildDir/jacoco/classes"))
-
 nexusPublishing {
 	packageGroup.set("org.junit")
 	repositories {
@@ -62,59 +54,39 @@ nexusPublishing {
 	}
 }
 
-subprojects {
-
-	when (project) {
-		in jupiterProjects -> {
-			group = property("jupiterGroup")!!
-		}
-		in platformProjects -> {
-			group = property("platformGroup")!!
-			version = property("platformVersion")!!
-		}
-		in vintageProjects -> {
-			group = property("vintageGroup")!!
-			version = property("vintageVersion")!!
-		}
-	}
-
-	tasks.withType<AbstractArchiveTask>().configureEach {
-		isPreserveFileTimestamps = false
-		isReproducibleFileOrder = true
-		dirMode = Integer.parseInt("0755", 8)
-		fileMode = Integer.parseInt("0644", 8)
-	}
+nohttp {
+	source.exclude("buildSrc/build/generated-sources/**")
 }
 
-rootProject.apply {
-	description = "JUnit 5"
-
-	nohttp {
-		// Must cast, since `source` is only exposed as a FileTree
-		(source as ConfigurableFileTree).exclude("buildSrc/build/generated-sources/**")
-	}
+val jacocoTestProjects = listOf(
+	projects.junitJupiterEngine,
+	projects.junitJupiterMigrationsupport,
+	projects.junitJupiterParams,
+	projects.junitVintageEngine,
+	projects.platformTests
+).map { it.dependencyProject }
+val jacocoClassesDir by extra(file("$buildDir/jacoco/classes"))
 
-	val jacocoRootReport by tasks.registering(JacocoReport::class) {
-		jacocoCoveredProjects.forEach {
-			dependsOn(it.tasks.named("extractJar"))
-			it.pluginManager.withPlugin("java") {
-				sourceDirectories.from(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
-			}
-		}
-		classDirectories.from(files(jacocoClassesDir))
-		reports {
-			html.required.set(true)
-			xml.required.set(true)
-			csv.required.set(false)
+val jacocoRootReport by tasks.registering(JacocoReport::class) {
+	modularProjects.forEach {
+		dependsOn(it.tasks.named("extractJar"))
+		it.pluginManager.withPlugin("java") {
+			sourceDirectories.from(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
 		}
 	}
+	classDirectories.from(files(jacocoClassesDir))
+	reports {
+		html.required.set(true)
+		xml.required.set(true)
+		csv.required.set(false)
+	}
+}
 
-	afterEvaluate {
-		jacocoRootReport {
-			jacocoTestProjects.forEach {
-				executionData(it.tasks.withType<Test>().map { task -> task.the<JacocoTaskExtension>().destinationFile })
-				dependsOn(it.tasks.withType<Test>())
-			}
+afterEvaluate {
+	jacocoRootReport {
+		jacocoTestProjects.forEach {
+			executionData(it.tasks.withType<Test>().map { task -> task.the<JacocoTaskExtension>().destinationFile })
+			dependsOn(it.tasks.withType<Test>())
 		}
 	}
 }
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index ea720a953188..84b3baa86ea0 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -119,6 +119,13 @@ if (project in mavenizedProjects) {
 	}
 }
 
+tasks.withType<AbstractArchiveTask>().configureEach {
+	isPreserveFileTimestamps = false
+	isReproducibleFileOrder = true
+	dirMode = Integer.parseInt("0755", 8)
+	fileMode = Integer.parseInt("0644", 8)
+}
+
 normalization {
 	runtimeClasspath {
 		metaInf {
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index 4ae2fca3c29d..ddf78e3dac10 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -8,6 +8,24 @@ val isSnapshot = project.version.toString().contains("SNAPSHOT")
 val isContinuousIntegrationEnvironment = System.getenv("CI")?.toBoolean() ?: false
 val isJitPackEnvironment = System.getenv("JITPACK")?.toBoolean() ?: false
 
+val jupiterProjects: List<Project> by rootProject
+val platformProjects: List<Project> by rootProject
+val vintageProjects: List<Project> by rootProject
+
+when (project) {
+	in jupiterProjects -> {
+		group = property("jupiterGroup")!!
+	}
+	in platformProjects -> {
+		group = property("platformGroup")!!
+		version = property("platformVersion")!!
+	}
+	in vintageProjects -> {
+		group = property("vintageGroup")!!
+		version = property("vintageVersion")!!
+	}
+}
+
 // ensure project is built successfully before publishing it
 tasks.withType<PublishToMavenRepository>().configureEach {
 	dependsOn(provider {

From 826088ec6a3b602e0717505233aad9f33205aecc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 27 Sep 2021 07:55:44 +0200
Subject: [PATCH 0548/1433] Fix JaCoCo reporting

---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 84b3baa86ea0..4bedfde165ef 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 	idea
 	checkstyle
 	id("base-conventions")
+	id("jacoco-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra

From fd93eeca94479b71ce0d06d61df874a167a3fbf7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 29 Sep 2021 10:11:55 +0200
Subject: [PATCH 0549/1433] Fix seed property name documentation in
 ClassOrderer.Random

Prior to this commit, the class-level Javadoc for ClassOrderer.Random
incorrectly stated that the property name for the random seed was
`junit.jupiter.execution.class.order.random.seed`, but it is actually
`junit.jupiter.execution.order.random.seed`.

This commit fixes the documentation.

Fixes #2731
---
 .../src/main/java/org/junit/jupiter/api/ClassOrderer.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 3a729f911dcd..2bc5dfa71d29 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -174,7 +174,7 @@ private static int getOrder(ClassDescriptor descriptor) {
 	 * default random seed is logged at {@code CONFIG} level. In addition, a
 	 * custom seed (potentially the default seed from the previous test plan
 	 * execution) may be specified via the {@link Random#RANDOM_SEED_PROPERTY_NAME
-	 * junit.jupiter.execution.class.order.random.seed} <em>configuration parameter</em>
+	 * junit.jupiter.execution.order.random.seed} <em>configuration parameter</em>
 	 * which can be supplied via the {@code Launcher} API, build tools (e.g.,
 	 * Gradle and Maven), a JVM system property, or the JUnit Platform configuration
 	 * file (i.e., a file named {@code junit-platform.properties} in the root of

From 7a79a3ef0ccd0ab2201674298e9e52ec570d377f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 29 Sep 2021 10:43:18 +0200
Subject: [PATCH 0550/1433] Enforce JRE in the range of Java 11-15 for Gradle
 build

---
 settings.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6cc36ab6642e..6232569b9a7a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -96,8 +96,8 @@ buildCache {
 }
 
 val javaVersion = JavaVersion.current()
-require(javaVersion.isJava11Compatible) {
-	"The JUnit 5 build requires Java 11 or higher. Currently executing with Java ${javaVersion.majorVersion}."
+require(java.util.EnumSet.range(JavaVersion.VERSION_11, JavaVersion.VERSION_15).contains(javaVersion)) {
+	"The JUnit 5 build requires a JRE in the range of Java 11 to Java 15. Currently executing with Java ${javaVersion.majorVersion}."
 }
 
 rootProject.name = "junit5"

From 105fb62413aba4be8ce1e3dc354d2131ccf5f104 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 13:56:11 +0200
Subject: [PATCH 0551/1433] Update Javadoc for @CsvSource regarding `#`
 comments

This commit updates the Javadoc to reflect changes made in #2528.
---
 .../java/org/junit/jupiter/params/provider/CsvSource.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index 1cfe4cdda1c8..906d75ea85c9 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -48,9 +48,7 @@
 	 * The CSV lines to use as the source of arguments; must not be empty.
 	 *
 	 * <p>Each value corresponds to a line in a CSV file and will be split using
-	 * the specified {@link #delimiter} or {@link #delimiterString}. Any line
-	 * beginning with a {@code #} symbol will be interpreted as a comment and will
-	 * be ignored.
+	 * the specified {@link #delimiter} or {@link #delimiterString}.
 	 *
 	 * <p>Defaults to an empty array. You therefore must supply CSV content
 	 * via this attribute or the {@link #textBlock} attribute.
@@ -82,8 +80,6 @@
 	 *
 	 * <p>Each line in the text block corresponds to a line in a CSV file and will
 	 * be split using the specified {@link #delimiter} or {@link #delimiterString}.
-	 * Any line beginning with a {@code #} symbol will be interpreted as a comment
-	 * and will be ignored.
 	 *
 	 * <p>Defaults to an empty string. You therefore must supply CSV content
 	 * via this attribute or the {@link #value} attribute.

From de699420216459dd7f4333268f1f21091f18d353 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 14:22:33 +0200
Subject: [PATCH 0552/1433] Sync Javadoc and User Guide for @CsvSource and
 @CsvFileSource

---
 .../asciidoc/user-guide/writing-tests.adoc    |  8 ++---
 .../params/provider/CsvFileSource.java        | 30 +++++++++++++++++--
 .../jupiter/params/provider/CsvSource.java    | 25 ++++++++++++++--
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index d5a54c0e3178..bbc74a67c4ba 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1374,8 +1374,8 @@ reference is a primitive type.
 NOTE: An _unquoted_ empty value will always be converted to a `null` reference regardless
 of any custom values configured via the `nullValues` attribute.
 
-Unless it starts with a quote character, leading and trailing whitespace in a CSV column
-is trimmed by default. This behavior can be changed by setting the
+Except within a quoted string, leading and trailing whitespace in a CSV column is trimmed
+by default. This behavior can be changed by setting the
 `ignoreLeadingAndTrailingWhitespace` attribute to `true`.
 
 [cols="50,50"]
@@ -1428,8 +1428,8 @@ reference is a primitive type.
 NOTE: An _unquoted_ empty value will always be converted to a `null` reference regardless
 of any custom values configured via the `nullValues` attribute.
 
-Unless it starts with a quote character, leading and trailing whitespace in a CSV column
-is trimmed by default. This behavior can be changed by setting the
+Except within a quoted string, leading and trailing whitespace in a CSV column is trimmed
+by default. This behavior can be changed by setting the
 `ignoreLeadingAndTrailingWhitespace` attribute to `true`.
 
 [[writing-tests-parameterized-tests-sources-ArgumentsSource]]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 7636b208c18f..4749e8de33d9 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -26,9 +26,33 @@
  * comma-separated value (CSV) files from one or more classpath {@link #resources
  * resources} or {@link #files}.
  *
- * <p>The lines of these CSV files will be provided as arguments to the
- * annotated {@code @ParameterizedTest} method. Any line beginning with a
- * {@code #} symbol will be interpreted as a comment and will be ignored.
+ * <p>The lines of these CSV files will be provided as arguments to the annotated
+ * {@code @ParameterizedTest} method.
+ *
+ * <p>Any line beginning with a {@code #} symbol will be interpreted as a comment
+ * and will be ignored.
+ *
+ * <p>The column delimiter (defaults to comma) can be customized with either
+ * {@link #delimiter} or {@link #delimiterString}.
+ *
+ * <p>In contrast to the syntax used in {@code @CsvSource}, {@code @CsvFileSource}
+ * uses a double quote ({@code "}) as its quote character (see the User Guide for
+ * examples). An empty, quoted value ({@code ""}) results in an empty {@link String}
+ * unless the {@link #emptyValue} attribute is set; whereas, an entirely <em>empty</em>
+ * value is interpreted as a {@code null} reference. By specifying one or more
+ * {@link #nullValues} a custom value can be interpreted as a {@code null} reference
+ * (see the User Guide for an example). An
+ * {@link org.junit.jupiter.params.converter.ArgumentConversionException
+ * ArgumentConversionException} is thrown if the target type of a {@code null}
+ * reference is a primitive type.
+ *
+ * <p>NOTE: An <em>unquoted</em> empty value will always be converted to a
+ * {@code null} reference regardless of any custom values configured via the
+ * {@link #nullValues} attribute.
+ *
+ * <p>Except within a quoted string, leading and trailing whitespace in a CSV
+ * column is trimmed by default. This behavior can be changed by setting the
+ * {@link #ignoreLeadingAndTrailingWhitespace} attribute to {@code true}.
  *
  * @since 5.0
  * @see CsvSource
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index 906d75ea85c9..aec3aec29345 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -26,11 +26,30 @@
  * values (CSV) from one or more CSV lines supplied via the {@link #value}
  * attribute or {@link #textBlock} attribute.
  *
+ * <p>The supplied values will be provided as arguments to the annotated
+ * {@code @ParameterizedTest} method.
+ *
  * <p>The column delimiter (defaults to comma) can be customized with either
- * {@link #delimiter()} or {@link #delimiterString()}.
+ * {@link #delimiter} or {@link #delimiterString}.
+ *
+ * <p>{@code @CsvSource} uses a single quote ({@code '}) as its quote character.
+ * See the {@code 'lemon, lime'} examples in the documentation for the {@link #value}
+ * and {@link #textBlock} attributes. An empty, quoted value ({@code ''}) results
+ * in an empty {@link String} unless the {@link #emptyValue} attribute is set;
+ * whereas, an entirely <em>empty</em> value is interpreted as a {@code null} reference.
+ * By specifying one or more {@link #nullValues} a custom value can be interpreted
+ * as a {@code null} reference (see the User Guide for an example). An
+ * {@link org.junit.jupiter.params.converter.ArgumentConversionException
+ * ArgumentConversionException} is thrown if the target type of a {@code null}
+ * reference is a primitive type.
+ *
+ * <p>NOTE: An <em>unquoted</em> empty value will always be converted to a
+ * {@code null} reference regardless of any custom values configured via the
+ * {@link #nullValues} attribute.
  *
- * <p>The supplied values will be provided as arguments to the
- * annotated {@code @ParameterizedTest} method.
+ * <p>Except within a quoted string, leading and trailing whitespace in a CSV
+ * column is trimmed by default. This behavior can be changed by setting the
+ * {@link #ignoreLeadingAndTrailingWhitespace} attribute to {@code true}.
  *
  * @since 5.0
  * @see CsvFileSource

From ebb890e600bfa120ab5ed19c4007aa4c2a0bbe17 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 2 Oct 2021 15:00:44 +0200
Subject: [PATCH 0553/1433] Disable Jacoco support until #2736 is resolved

Since commit 826088ec6a, all `test` tasks in the build are SKIPPED.

This commit allows `test` tasks to execute again.
---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 4bedfde165ef..2e983566d399 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -7,7 +7,8 @@ plugins {
 	idea
 	checkstyle
 	id("base-conventions")
-	id("jacoco-conventions")
+	// Disable Jacoco until GitHub #2736 issue is resolved.
+	// id("jacoco-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra

From 10f8ceb2117820201c43f6210bda139bf2740060 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 2 Oct 2021 15:40:50 +0200
Subject: [PATCH 0554/1433] Create release notes for 5.8.2

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.8.2.adoc    | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 88af865a71a9..21de9cc49385 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -18,6 +18,8 @@ include::{includedir}/link-attributes.adoc[]
 
 include::{basedir}/release-notes-5.9.0-M1.adoc[]
 
+include::{basedir}/release-notes-5.8.2.adoc[]
+
 include::{basedir}/release-notes-5.8.1.adoc[]
 
 include::{basedir}/release-notes-5.8.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
new file mode 100644
index 000000000000..462dda720437
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.8.2]]
+== 5.8.2
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/60?closed=1+[5.8.2] milestone page in the JUnit repository on
+GitHub.
+
+
+[[release-notes-5.8.2-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.8.2-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.8.2-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From f1cbfbe14a97ff2a3cfa77df48432b180fed83a5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 17:37:16 +0200
Subject: [PATCH 0555/1433] Make quote character in @CsvSource configurable

Prior to this commit, the quote character for quoted strings in
@CsvSource was hard coded to a single quote (') and could not be
changed; however, with the recently added support for text blocks, it
may be desirable to change the quote character to something else.

This commit introduces a new quoteCharacter attribute in @CsvSource
that allows the user to change the quote character. The quoteCharacter
defaults to a single quote for backward compatibility.

Closes #2735
---
 .../release-notes/release-notes-5.8.2.adoc    |  4 +++-
 .../asciidoc/user-guide/writing-tests.adoc    | 15 +++++++-------
 .../params/provider/CsvParserFactory.java     |  3 +--
 .../jupiter/params/provider/CsvSource.java    | 20 +++++++++++++++++--
 .../ParameterizedTestIntegrationTests.java    |  4 ++--
 .../provider/MockCsvAnnotationBuilder.java    |  1 +
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
index 462dda720437..dfed4d1eaaf1 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
@@ -39,7 +39,9 @@ GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* The quote character for _quoted strings_ in `@CsvSource` is now configurable via the new
+  `quoteCharacter` attribute, which defaults to a single quote (`'`) for backward
+  compatibility.
 
 
 [[release-notes-5.8.2-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index bbc74a67c4ba..a2e26e863c94 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1363,13 +1363,14 @@ The default delimiter is a comma (`,`), but you can use another character by set
 `String` delimiter instead of a single character. However, both delimiter attributes
 cannot be set simultaneously.
 
-`@CsvSource` uses a single quote `'` as its quote character. See the `'lemon, lime'` value
-in the example above and in the table below. An empty, quoted value `''` results in an
-empty `String` unless the `emptyValue` attribute is set; whereas, an entirely _empty_
-value is interpreted as a `null` reference. By specifying one or more `nullValues`, a
-custom value can be interpreted as a `null` reference (see the `NIL` example in the table
-below). An `ArgumentConversionException` is thrown if the target type of a `null`
-reference is a primitive type.
+By default, `@CsvSource` uses a single quote `'` as its quote character, but this can be
+changed via the `quoteCharacter` attribute. See the `'lemon, lime'` value in the example
+above and in the table below. An empty, quoted value `''` results in an empty `String`
+unless the `emptyValue` attribute is set; whereas, an entirely _empty_ value is
+interpreted as a `null` reference. By specifying one or more `nullValues`, a custom value
+can be interpreted as a `null` reference (see the `NIL` example in the table below). An
+`ArgumentConversionException` is thrown if the target type of a `null` reference is a
+primitive type.
 
 NOTE: An _unquoted_ empty value will always be converted to a `null` reference regardless
 of any custom values configured via the `nullValues` attribute.
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index 51c4652c04e2..59517d357e0d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -24,7 +24,6 @@ class CsvParserFactory {
 
 	private static final String DEFAULT_DELIMITER = ",";
 	private static final String LINE_SEPARATOR = "\n";
-	private static final char SINGLE_QUOTE = '\'';
 	private static final char DOUBLE_QUOTE = '"';
 	private static final char EMPTY_CHAR = '\0';
 	private static final boolean COMMENT_PROCESSING_FOR_CSV_SOURCE = false;
@@ -32,7 +31,7 @@ class CsvParserFactory {
 
 	static CsvParser createParserFor(CsvSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
-		return createParser(delimiter, LINE_SEPARATOR, SINGLE_QUOTE, annotation.emptyValue(),
+		return createParser(delimiter, LINE_SEPARATOR, annotation.quoteCharacter(), annotation.emptyValue(),
 			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_SOURCE,
 			annotation.ignoreLeadingAndTrailingWhitespace());
 	}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index aec3aec29345..582047531cba 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -32,8 +32,9 @@
  * <p>The column delimiter (defaults to comma) can be customized with either
  * {@link #delimiter} or {@link #delimiterString}.
  *
- * <p>{@code @CsvSource} uses a single quote ({@code '}) as its quote character.
- * See the {@code 'lemon, lime'} examples in the documentation for the {@link #value}
+ * <p>By default, {@code @CsvSource} uses a single quote ({@code '}) as its quote
+ * character, but this can be changed via {@link #quoteCharacter}. See the
+ * {@code 'lemon, lime'} examples in the documentation for the {@link #value}
  * and {@link #textBlock} attributes. An empty, quoted value ({@code ''}) results
  * in an empty {@link String} unless the {@link #emptyValue} attribute is set;
  * whereas, an entirely <em>empty</em> value is interpreted as a {@code null} reference.
@@ -126,6 +127,21 @@
 	@API(status = EXPERIMENTAL, since = "5.8.1")
 	String textBlock() default "";
 
+	/**
+	 * The quote character to use for <em>quoted strings</em>.
+	 *
+	 * <p>Defaults to a single quote ({@code '}).
+	 *
+	 * <p>You may change the quote character to anything that makes sense for
+	 * your use case; however, the primary use case is to allow you to use double
+	 * quotes in {@link #textBlock}.
+	 *
+	 * @since 5.8.2
+	 * @see #textBlock
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8.2")
+	char quoteCharacter() default '\'';
+
 	/**
 	 * The column delimiter character to use when reading the {@linkplain #value lines}.
 	 *
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 364f0992b1f1..5a3ab2c81ffd 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -91,10 +91,10 @@
 class ParameterizedTestIntegrationTests {
 
 	@ParameterizedTest
-	@CsvSource(textBlock = """
+	@CsvSource(quoteCharacter = '"', textBlock = """
 				apple,         1
 				banana,        2
-				'lemon, lime', 0xF1
+				"lemon, lime", 0xF1
 				strawberry,    700_000
 			""")
 	void executesLinesFromTextBlock(String fruit, int rank) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index 5c5605fcd5e6..a51b77ea97b7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -115,6 +115,7 @@ CsvSource build() {
 			// @CsvSource
 			when(annotation.value()).thenReturn(this.lines);
 			when(annotation.textBlock()).thenReturn(this.textBlock);
+			when(annotation.quoteCharacter()).thenReturn('\'');
 
 			return annotation;
 		}

From 1b2bf354c57f0ce3613085f944b308c36d5ce9d5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 27 Sep 2021 09:09:20 +0200
Subject: [PATCH 0556/1433] Upgrade Spotless to 5.15.2

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 23d2343fff13..78e2e412c792 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:5.15.1")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:5.15.2")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")

From 2a829d7cf086fe7747c269f6ddf186226b008645 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 2 Oct 2021 17:07:37 +0200
Subject: [PATCH 0557/1433] Revert "Disable Jacoco support until #2736 is
 resolved"

This reverts commit ebb890e600bfa120ab5ed19c4007aa4c2a0bbe17.
---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 2e983566d399..4bedfde165ef 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -7,8 +7,7 @@ plugins {
 	idea
 	checkstyle
 	id("base-conventions")
-	// Disable Jacoco until GitHub #2736 issue is resolved.
-	// id("jacoco-conventions")
+	id("jacoco-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra

From 522afa95a3c514ef914dfe70e5cc040033f05435 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 2 Oct 2021 17:08:07 +0200
Subject: [PATCH 0558/1433] Re-enable test tasks

Fixes #2736.
---
 buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
index 3f8b634041fc..2dbd7cd5926d 100644
--- a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
@@ -14,7 +14,7 @@ jacoco {
 tasks {
 	withType<Test>().configureEach {
 		configure<JacocoTaskExtension> {
-			enabled = enableJaCoCo
+			isEnabled = enableJaCoCo
 		}
 	}
 	withType<JacocoReport>().configureEach {

From 2d69c7072f621353cef873bc169720232603977a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 3 Oct 2021 15:16:22 +0200
Subject: [PATCH 0559/1433] Add unit tests for custom quote character in
 @CsvSource

See #2735
---
 .../provider/CsvArgumentsProviderTests.java   | 56 ++++++++++++++++++-
 .../provider/MockCsvAnnotationBuilder.java    |  8 ++-
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 4ba60b8ffb28..0b999048fcd7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -141,6 +141,37 @@ void understandsQuotes() {
 		assertThat(arguments).containsExactly(array("foo, bar"));
 	}
 
+	@Test
+	void understandsQuotesInTextBlock() {
+		var annotation = csvSource().textBlock("""
+				'foo, bar'
+				""").build();
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("foo, bar"));
+	}
+
+	@Test
+	void understandsCustomQuotes() {
+		var annotation = csvSource().quoteCharacter('~').lines("~foo, bar~").build();
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("foo, bar"));
+	}
+
+	@Test
+	void understandsCustomQuotesInTextBlock() {
+		var annotation = csvSource().quoteCharacter('"').textBlock("""
+					"foo, bar"
+				""").build();
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("foo, bar"));
+	}
+
 	@Test
 	void understandsEscapeCharacters() {
 		var annotation = csvSource("'foo or ''bar''', baz");
@@ -150,6 +181,15 @@ void understandsEscapeCharacters() {
 		assertThat(arguments).containsExactly(array("foo or 'bar'", "baz"));
 	}
 
+	@Test
+	void understandsEscapeCharactersWithCutomQuoteCharacter() {
+		var annotation = csvSource().quoteCharacter('~').lines("~foo or ~~bar~~~, baz").build();
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("foo or ~bar~", "baz"));
+	}
+
 	@Test
 	void doesNotTrimSpacesInsideQuotes() {
 		var annotation = csvSource("''", "'   '", "'blank '", "' not blank   '");
@@ -275,7 +315,7 @@ void throwsExceptionWhenMaxCharsPerColumnIsNotPositiveNumber() {
 	}
 
 	@Test
-	void doesNotMindSoCalledCommentCharacters() {
+	void ignoresCommentCharacterWhenUsingValueAttribute() {
 		var annotation = csvSource("#foo", "#bar,baz", "baz,#quux");
 
 		var arguments = provideArguments(annotation);
@@ -283,6 +323,20 @@ void doesNotMindSoCalledCommentCharacters() {
 		assertThat(arguments).containsExactly(array("#foo"), array("#bar", "baz"), array("baz", "#quux"));
 	}
 
+	@Test
+	// TODO Update expectations once https://github.com/junit-team/junit5/issues/2734 has been implemented.
+	void ignoresCommentCharacterWhenUsingTextBlockAttribute() {
+		var annotation = csvSource().textBlock("""
+					#foo
+					bar, #baz
+					'#bar', baz
+				""").build();
+
+		var arguments = provideArguments(annotation);
+
+		assertThat(arguments).containsExactly(array("#foo"), array("bar", "#baz"), array("#bar", "baz"));
+	}
+
 	private Stream<Object[]> provideArguments(CsvSource annotation) {
 		var provider = new CsvArgumentsProvider();
 		provider.accept(annotation);
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index a51b77ea97b7..47099b70c7d3 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -84,6 +84,7 @@ static class MockCsvSourceBuilder extends MockCsvAnnotationBuilder<CsvSource, Mo
 
 		private String[] lines = new String[0];
 		private String textBlock = "";
+		private char quoteCharacter = '\'';
 
 		@Override
 		protected MockCsvSourceBuilder getSelf() {
@@ -100,6 +101,11 @@ MockCsvSourceBuilder textBlock(String textBlock) {
 			return this;
 		}
 
+		MockCsvSourceBuilder quoteCharacter(char quoteCharacter) {
+			this.quoteCharacter = quoteCharacter;
+			return this;
+		}
+
 		@Override
 		CsvSource build() {
 			var annotation = mock(CsvSource.class);
@@ -115,7 +121,7 @@ CsvSource build() {
 			// @CsvSource
 			when(annotation.value()).thenReturn(this.lines);
 			when(annotation.textBlock()).thenReturn(this.textBlock);
-			when(annotation.quoteCharacter()).thenReturn('\'');
+			when(annotation.quoteCharacter()).thenReturn(this.quoteCharacter);
 
 			return annotation;
 		}

From 117c6f07af1f36fd5352b577c803f7d738081b13 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 3 Oct 2021 17:46:12 +0200
Subject: [PATCH 0560/1433] Remove outdated workaround for Eclipse IDE

---
 .../junit/jupiter/params/provider/ValueArgumentsProvider.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
index 344c3145d88a..f93db6cd8920 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
@@ -33,8 +33,7 @@ class ValueArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<Va
 	public void accept(ValueSource source) {
 		// @formatter:off
 		List<Object> arrays =
-				// Declaration of <Object> is necessary due to a bug in Eclipse Photon.
-				Stream.<Object> of(
+				Stream.of(
 					source.shorts(),
 					source.bytes(),
 					source.ints(),

From eb679d9359b2370720beb8cf453cd37f65f20e86 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 3 Oct 2021 17:59:07 +0200
Subject: [PATCH 0561/1433] Polishing

---
 .../junit/jupiter/params/provider/CsvArgumentsProvider.java  | 5 +++--
 .../jupiter/params/ParameterizedTestExtensionTests.java      | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 16b5d4206bcd..d7eec343c4ae 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -50,11 +50,12 @@ public void accept(CsvSource annotation) {
 
 	@Override
 	public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-		Preconditions.condition(this.annotation.value().length > 0 ^ !this.annotation.textBlock().isEmpty(),
+		final boolean textBlockDeclared = !this.annotation.textBlock().isEmpty();
+		Preconditions.condition(this.annotation.value().length > 0 ^ textBlockDeclared,
 			() -> "@CsvSource must be declared with either `value` or `textBlock` but not both");
 
 		String[] lines;
-		if (!this.annotation.textBlock().isEmpty()) {
+		if (textBlockDeclared) {
 			lines = NEW_LINE_REGEX.split(this.annotation.textBlock(), 0);
 		}
 		else {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index cde9ded51cb7..994a2e919228 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -103,8 +103,9 @@ void defaultDisplayNameWithEmptyStringInConfigurationIsIllegal() {
 				invocations.incrementAndGet();
 				return Optional.of("");
 			}
-			else
+			else {
 				return Optional.empty();
+			}
 		};
 		var extensionContext = getExtensionContextReturningSingleMethod(new DefaultDisplayNameProviderTestCase(),
 			configurationSupplier);

From 245160bcde80d0354f812adeab369efed971843e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 3 Oct 2021 18:08:18 +0200
Subject: [PATCH 0562/1433] Align index for line in @CsvSource with index in
 display name

Prior to this commit, the index reported for an error in a CSV line
supplied via @CsvSource was 0-based; whereas, the index in the display
name for the CSV line (in the TestTemplateInvocationTestDescriptor
created by the TestTemplateTestDescriptor) was 1-based.

This commit aligns these sets of indexes to be 1-based to avoid
confusion.
---
 .../junit/jupiter/params/provider/CsvArgumentsProvider.java | 6 +++---
 .../jupiter/params/provider/CsvArgumentsProviderTests.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index d7eec343c4ae..84d9840c7034 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -16,7 +16,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -62,10 +62,10 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 			lines = this.annotation.value();
 		}
 
-		AtomicLong index = new AtomicLong(0);
+		AtomicInteger index = new AtomicInteger();
 		// @formatter:off
 		return Arrays.stream(lines)
-				.map(line -> parseLine(index.getAndIncrement(), line))
+				.map(line -> parseLine(index.incrementAndGet(), line))
 				.map(Arguments::of);
 		// @formatter:on
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 0b999048fcd7..5fd80cfed377 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -31,7 +31,7 @@ void throwsExceptionForInvalidCsv() {
 
 		assertThatExceptionOfType(JUnitException.class)//
 				.isThrownBy(() -> provideArguments(annotation).toArray())//
-				.withMessage("Line at index 2 contains invalid CSV: \"\"");
+				.withMessage("Line at index 3 contains invalid CSV: \"\"");
 	}
 
 	@Test

From 75cf728e81e3fd83c6e8ed95a2970f02ab406651 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 4 Oct 2021 11:20:49 +0200
Subject: [PATCH 0563/1433] Simplify CSV ArgumentsProvider implementations

---
 .../params/provider/CsvArgumentsProvider.java | 41 +++++++++++--------
 .../provider/CsvFileArgumentsProvider.java    | 16 ++++----
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 84d9840c7034..6711abd1e48b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -62,34 +62,43 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 			lines = this.annotation.value();
 		}
 
-		AtomicInteger index = new AtomicInteger();
+		AtomicInteger index = new AtomicInteger(1);
 		// @formatter:off
 		return Arrays.stream(lines)
-				.map(line -> parseLine(index.incrementAndGet(), line))
+				.map(line -> parseLine(line, index.getAndIncrement()))
 				.map(Arguments::of);
 		// @formatter:on
 	}
 
-	private String[] parseLine(long index, String line) {
-		String[] parsedLine = null;
+	private String[] parseLine(String line, int index) {
 		try {
-			parsedLine = this.csvParser.parseLine(line + LINE_SEPARATOR);
-			if (parsedLine != null && !this.nullValues.isEmpty()) {
-				for (int i = 0; i < parsedLine.length; i++) {
-					if (this.nullValues.contains(parsedLine[i])) {
-						parsedLine[i] = null;
-					}
-				}
-			}
+			String[] parsedLine = this.csvParser.parseLine(line + LINE_SEPARATOR);
+			Preconditions.notNull(parsedLine,
+				() -> "Line at index " + index + " contains invalid CSV: \"" + line + "\"");
+			processNullValues(parsedLine, this.nullValues);
+			return parsedLine;
 		}
 		catch (Throwable throwable) {
-			handleCsvException(throwable, this.annotation);
+			throw handleCsvException(throwable, this.annotation);
+		}
+	}
+
+	static void processNullValues(String[] csvRecord, Set<String> nullValues) {
+		if (!nullValues.isEmpty()) {
+			for (int i = 0; i < csvRecord.length; i++) {
+				if (nullValues.contains(csvRecord[i])) {
+					csvRecord[i] = null;
+				}
+			}
 		}
-		Preconditions.notNull(parsedLine, () -> "Line at index " + index + " contains invalid CSV: \"" + line + "\"");
-		return parsedLine;
 	}
 
-	static void handleCsvException(Throwable throwable, Annotation annotation) {
+	/**
+	 * @return this method always throws an exception and therefore never
+	 * returns anything; the return type is merely present to allow this
+	 * method to be supplied as the operand in a {@code throw} statement
+	 */
+	static RuntimeException handleCsvException(Throwable throwable, Annotation annotation) {
 		UnrecoverableExceptions.rethrowIfUnrecoverable(throwable);
 		if (throwable instanceof PreconditionViolationException) {
 			throw (PreconditionViolationException) throwable;
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index eb578b9956b1..66b8f2379074 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -15,6 +15,7 @@
 import static java.util.stream.StreamSupport.stream;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.jupiter.params.provider.CsvArgumentsProvider.handleCsvException;
+import static org.junit.jupiter.params.provider.CsvArgumentsProvider.processNullValues;
 import static org.junit.jupiter.params.provider.CsvParserFactory.createParserFor;
 import static org.junit.platform.commons.util.CollectionUtils.toSet;
 
@@ -141,26 +142,23 @@ public Arguments next() {
 		}
 
 		private void advance() {
-			String[] parsedLine = null;
+			String[] csvRecord = null;
 			try {
-				parsedLine = this.csvParser.parseNext();
-				if (parsedLine != null && !this.nullValues.isEmpty()) {
-					for (int i = 0; i < parsedLine.length; i++) {
-						if (this.nullValues.contains(parsedLine[i])) {
-							parsedLine[i] = null;
-						}
-					}
+				csvRecord = this.csvParser.parseNext();
+				if (csvRecord != null) {
+					processNullValues(csvRecord, this.nullValues);
 				}
 			}
 			catch (Throwable throwable) {
 				handleCsvException(throwable, this.annotation);
 			}
 
-			this.nextCsvRecord = parsedLine;
+			this.nextCsvRecord = csvRecord;
 		}
 
 	}
 
+	@FunctionalInterface
 	private interface Source {
 
 		InputStream open(ExtensionContext context);

From 6a799a88c2914a62d9bef07f3483661067546c44 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 4 Oct 2021 16:11:54 +0200
Subject: [PATCH 0564/1433] Consistently refer to CSV records in implementation

This commit helps to improve readability by assisting the reader in
consistently differentiating between lines of text supplied by the
user vs. CSV records representing the result of parsing those lines.
---
 .../jupiter/params/provider/CsvArgumentsProvider.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 6711abd1e48b..1bbf4f637ccf 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -72,11 +72,11 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 
 	private String[] parseLine(String line, int index) {
 		try {
-			String[] parsedLine = this.csvParser.parseLine(line + LINE_SEPARATOR);
-			Preconditions.notNull(parsedLine,
+			String[] csvRecord = this.csvParser.parseLine(line + LINE_SEPARATOR);
+			Preconditions.notNull(csvRecord,
 				() -> "Line at index " + index + " contains invalid CSV: \"" + line + "\"");
-			processNullValues(parsedLine, this.nullValues);
-			return parsedLine;
+			processNullValues(csvRecord, this.nullValues);
+			return csvRecord;
 		}
 		catch (Throwable throwable) {
 			throw handleCsvException(throwable, this.annotation);

From 7a2304f5b673f294e3d07db40cc63d957ac341c1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 24 Sep 2021 16:51:44 +0200
Subject: [PATCH 0565/1433] Use JDK 17 toolchain by default

---
 .github/workflows/cross-version.yml           |  2 +-
 .github/workflows/main.yml                    | 40 +++++++++----------
 .github/workflows/reproducible-build.yml      |  8 ++--
 .../java-toolchain-conventions.gradle.kts     |  2 +-
 .../junit-vintage-engine.gradle.kts           |  2 +-
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index e170649a9aca..1ac8b1b58581 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -18,7 +18,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [17, 18]
+        jdk: [18]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 02de5906570d..cb2ea1b4b047 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,14 +31,14 @@ jobs:
     - name: Prepare JDK8 env var
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
-        java-version: '16'
-    - name: Prepare JDK16 env var
+        java-version: '17'
+    - name: Prepare JDK17 env var
       shell: bash
-      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
@@ -75,14 +75,14 @@ jobs:
     - name: Prepare JDK8 env var
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
-        java-version: '16'
-    - name: Prepare JDK16 env var
+        java-version: '17'
+    - name: Prepare JDK17 env var
       shell: bash
-      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
@@ -112,14 +112,14 @@ jobs:
     - name: Prepare JDK8 env var
       shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
-        java-version: '16'
-    - name: Prepare JDK16 env var
+        java-version: '17'
+    - name: Prepare JDK17 env var
       shell: bash
-      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
@@ -141,14 +141,14 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
-        java-version: '16'
-    - name: Prepare JDK16 env var
+        java-version: '17'
+    - name: Prepare JDK17 env var
       shell: bash
-      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
@@ -172,14 +172,14 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
-        java-version: '16'
-    - name: Prepare JDK16 env var
+        java-version: '17'
+    - name: Prepare JDK17 env var
       shell: bash
-      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index ead579aa6094..e3877d59bc33 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -20,14 +20,14 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
-        java-version: '16'
-    - name: Prepare JDK16 env var
+        java-version: '17'
+    - name: Prepare JDK17 env var
       shell: bash
-      run: echo "JDK16=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index c281cdcd49ad..4c4430aff4e1 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 
 val javaToolchainVersion: String? by project
-val defaultLanguageVersion = JavaLanguageVersion.of(16)
+val defaultLanguageVersion = JavaLanguageVersion.of(17)
 val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: defaultLanguageVersion
 
 project.pluginManager.withPlugin("java") {
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index ef284503944d..6b43121fa7e8 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
 tasks {
 	compileTestFixturesGroovy {
 		javaLauncher.set(project.the<JavaToolchainService>().launcherFor {
-			// Groovy 2.x (used for Spock tests) does not support JDK 16
+			// Groovy 2.x (used for Spock tests) does not support current JDKs
 			languageVersion.set(JavaLanguageVersion.of(11))
 		})
 	}

From e26c79854a6352cd40487e49869edb2c4b214e93 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 24 Sep 2021 16:52:03 +0200
Subject: [PATCH 0566/1433] Remove redundant version declaration

---
 junit-platform-jfr/junit-platform-jfr.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index a821de7bc484..0137a8d00b2e 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -12,7 +12,6 @@ dependencies {
 }
 
 javaLibrary {
-	mainJavaVersion = JavaVersion.VERSION_1_8
 	configureRelease = false
 }
 

From 89a90e883eeb19f4557fee974eb967d912c1cd0c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 24 Sep 2021 16:52:19 +0200
Subject: [PATCH 0567/1433] Compile tests against JDK 17

---
 buildSrc/src/main/kotlin/JavaLibraryExtension.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
index ef33ff62d670..834374bf06c6 100644
--- a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
+++ b/buildSrc/src/main/kotlin/JavaLibraryExtension.kt
@@ -1,8 +1,7 @@
 import org.gradle.api.JavaVersion
 
-@Suppress("UnstableApiUsage")
 open class JavaLibraryExtension {
     var mainJavaVersion: JavaVersion = JavaVersion.VERSION_1_8
-    var testJavaVersion: JavaVersion = JavaVersion.VERSION_16
+    var testJavaVersion: JavaVersion = JavaVersion.VERSION_17
     var configureRelease: Boolean = true
 }

From 7ee54137dc6d41e37215a24ce771d4af61e752b1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 25 Sep 2021 16:59:11 +0200
Subject: [PATCH 0568/1433] Add test case for sealed classes

---
 .../jupiter/engine/SealedClassTests.java      | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java
new file mode 100644
index 000000000000..406dfa59ca78
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Test;
+
+class SealedClassTests extends AbstractJupiterTestEngineTests {
+
+	@Test
+	void sealedTestClassesAreTestClasses() {
+		executeTestsForClass(TestCase.class).testEvents() //
+				.assertStatistics(stats -> stats.finished(2).succeeded(1).failed(1));
+	}
+
+	sealed
+	abstract static class AbstractTestCase
+	permits TestCase
+	{
+
+		@Test
+		void succeedingTest() {
+			assertTrue(true);
+		}
+
+		@Test
+		void failingTest() {
+			fail("always fails");
+		}
+	}
+
+	static final class TestCase extends AbstractTestCase {
+	}
+
+}

From 1b795039942460293de37d5e8a59c3e0aa64e4f6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 13 Oct 2021 21:14:42 +0200
Subject: [PATCH 0569/1433] Use new Codecov GitHub Action (#2745)

The old uploader will be sunset in Feb, 2022.
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cb2ea1b4b047..ea5a105bae32 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
         name: Test Distribution trace files
         path: '**/build/test-results/*/trace.json'
     - name: Upload to Codecov.io
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
 
   windows:
     name: Windows

From 927cee72bf6ad9fb62f8ac0f9d5733128630ae46 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 08:40:40 +0200
Subject: [PATCH 0570/1433] Resolve deprecation warning

---
 .../src/main/kotlin/java-toolchain-conventions.gradle.kts   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index 4c4430aff4e1..19706ca87132 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -8,12 +8,6 @@ project.pluginManager.withPlugin("java") {
 	val extension = the<JavaPluginExtension>()
 	val javaToolchainService = the<JavaToolchainService>()
 	extension.toolchain.languageVersion.set(javaLanguageVersion)
-	val compiler = javaToolchainService.compilerFor(extension.toolchain)
-	tasks.withType<KotlinJvmCompile>().configureEach {
-		doFirst {
-			kotlinOptions.jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
-		}
-	}
 	tasks.withType<JavaExec>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor(extension.toolchain))
 	}

From db02e6e6c61525b8b1a404ab1d6eb4ff29e9b5c9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 08:41:06 +0200
Subject: [PATCH 0571/1433] Upgradle to 7.3-rc-1

---
 buildSrc/src/main/kotlin/ProjectExtensions.kt   | 17 +++++++++++++++--
 .../main/kotlin/jacoco-conventions.gradle.kts   |  3 +--
 .../kotlin/java-library-conventions.gradle.kts  |  3 +--
 .../main/kotlin/junit4-compatibility.gradle.kts |  3 +--
 .../main/kotlin/spotless-conventions.gradle.kts |  3 +--
 .../main/kotlin/testing-conventions.gradle.kts  |  7 +++----
 gradle/wrapper/gradle-wrapper.properties        |  4 ++--
 7 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/buildSrc/src/main/kotlin/ProjectExtensions.kt
index 315126c5bae3..fa3f5c9bc956 100644
--- a/buildSrc/src/main/kotlin/ProjectExtensions.kt
+++ b/buildSrc/src/main/kotlin/ProjectExtensions.kt
@@ -1,6 +1,19 @@
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.extra
-import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.the
 
 val Project.javaModuleName: String
     get() = "org." + this.name.replace('-', '.')
+
+fun Project.requiredVersionFromLibs(name: String) =
+    libsVersionCatalog.findVersion(name).get().requiredVersion
+
+fun Project.dependencyFromLibs(name: String) =
+    libsVersionCatalog.findDependency(name).get()
+
+fun Project.bundleFromLibs(name: String) =
+    libsVersionCatalog.findBundle(name).get()
+
+private val Project.libsVersionCatalog: VersionCatalog
+    get() = the<VersionCatalogsExtension>().named("libs")
diff --git a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
index 2dbd7cd5926d..7e0f5a1410f6 100644
--- a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
@@ -7,8 +7,7 @@ plugins {
 val enableJaCoCo = project.hasProperty("enableJaCoCo")
 
 jacoco {
-	val libs = project.extensions["libs"] as VersionCatalog
-	toolVersion = libs.findVersion("jacoco").get().requiredVersion
+	toolVersion = requiredVersionFromLibs("jacoco")
 }
 
 tasks {
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 4bedfde165ef..160828091654 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -306,8 +306,7 @@ afterEvaluate {
 }
 
 checkstyle {
-	val libs = project.extensions["libs"] as VersionCatalog
-	toolVersion = libs.findVersion("checkstyle").get().requiredVersion
+	toolVersion = requiredVersionFromLibs("checkstyle")
 	configDirectory.set(rootProject.file("src/checkstyle"))
 }
 
diff --git a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts b/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
index 70a5072cb015..89ca169b699e 100644
--- a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
+++ b/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
@@ -13,8 +13,7 @@ dependencies {
 		}
 	}
 	pluginManager.withPlugin("osgi-conventions") {
-		val libs = project.extensions["libs"] as VersionCatalog
-		val junit4Osgi = libs.findVersion("junit4Osgi").get().requiredVersion
+		val junit4Osgi = requiredVersionFromLibs("junit4Osgi")
 		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:${junit4Osgi}")
 	}
 }
diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
index 42f9fd792745..35739461d114 100644
--- a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
@@ -43,8 +43,7 @@ spotless {
     pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
         kotlin {
             targetExclude("**/src/test/resources/**")
-            val libs = project.extensions["libs"] as VersionCatalog
-            ktlint(libs.findVersion("ktlint").get().requiredVersion)
+            ktlint(requiredVersionFromLibs("ktlint"))
             licenseHeaderFile(license.headerFile)
             trimTrailingWhitespace()
             endWithNewline()
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 037f3012856b..85e36632508b 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -50,9 +50,8 @@ tasks.withType<Test>().configureEach {
 }
 
 dependencies {
-	val libs = project.extensions["libs"] as VersionCatalog
-	"testImplementation"(libs.findDependency("assertj").get())
-	"testImplementation"(libs.findDependency("mockito").get())
+	"testImplementation"(dependencyFromLibs("assertj"))
+	"testImplementation"(dependencyFromLibs("mockito"))
 
 	if (!project.name.startsWith("junit-jupiter")) {
 		"testImplementation"(project(":junit-jupiter"))
@@ -62,5 +61,5 @@ dependencies {
 	"testRuntimeOnly"(project(":junit-platform-engine"))
 	"testRuntimeOnly"(project(":junit-platform-jfr"))
 
-	"testRuntimeOnly"(libs.findBundle("log4j").get())
+	"testRuntimeOnly"(bundleFromLibs("log4j"))
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a2e01c0dffec..20bc856eef1b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionSha256Sum=d23a3a902b3c4a8cc6952ff236fb83279a266aec1854b01286ed04788a5d3d9a
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 55518132928101f74f195506a62bf93d2ce0a0d6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 08:41:28 +0200
Subject: [PATCH 0572/1433] Configure Java release to avoid warning

---
 buildSrc/build.gradle.kts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 78e2e412c792..b2282668724c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -19,8 +19,14 @@ dependencies {
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2") // keep in sync with root settings.gradle.kts
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-	kotlinOptions {
-		allWarningsAsErrors = true
+tasks {
+	withType<JavaCompile>().configureEach {
+		options.release.set(8)
+	}
+	withType<KotlinCompile>().configureEach {
+		kotlinOptions {
+			jvmTarget = "1.8"
+			allWarningsAsErrors = true
+		}
 	}
 }

From a2cc0ec769fdeb8f3a374560c2cf738d7196ac1e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 09:31:45 +0200
Subject: [PATCH 0573/1433] Avoid warning when running on "dirty" working copy

---
 buildSrc/src/main/kotlin/build-metadata.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/buildSrc/src/main/kotlin/build-metadata.gradle.kts b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
index 8273c7d9a4a5..434e0c397c6a 100644
--- a/buildSrc/src/main/kotlin/build-metadata.gradle.kts
+++ b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
@@ -9,6 +9,10 @@ plugins {
 	id("net.nemerosa.versioning")
 }
 
+versioning {
+	noWarningOnDirty = true
+}
+
 val buildTimeAndDate: OffsetDateTime by extra {
 
 	// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against

From 19465474a259abe43ff71832992281bf09b009b2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 09:32:31 +0200
Subject: [PATCH 0574/1433] Remove defunct Javadoc config

---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 160828091654..1f85e6b5916c 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -58,11 +58,6 @@ if (project in mavenizedProjects) {
 			(this as StandardJavadocDocletOptions).apply {
 				addBooleanOption("Xdoclint:html,syntax", true)
 				addBooleanOption("html5", true)
-				// Javadoc 13 removed support for `--no-module-directories`
-				// https://bugs.openjdk.java.net/browse/JDK-8215580
-				if (javaVersion.isJava12 && executable == null) {
-					addBooleanOption("-no-module-directories", true)
-				}
 				addMultilineStringsOption("tag").value = listOf(
 						"apiNote:a:API Note:",
 						"implNote:a:Implementation Note:"

From ec5dbf3d63e1fd9e0bc48bbd39673282a4d319ea Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 09:33:40 +0200
Subject: [PATCH 0575/1433] Require JDK 17 to run build

---
 README.md           | 2 +-
 settings.gradle.kts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 36c6fb2796f1..493dea9bd91f 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ so that local builds can reuse task outputs from previous CI builds.
 
 ## Building from Source
 
-You need [JDK 11] to build JUnit 5. [Gradle toolchains] are used to detect and
+You need [JDK 17] to build JUnit 5. [Gradle toolchains] are used to detect and
 potentially download additional JDKs for compilation and test execution.
 
 All modules can be _built_ with the [Gradle Wrapper] using the following command.
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6232569b9a7a..26c96279867d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -96,8 +96,8 @@ buildCache {
 }
 
 val javaVersion = JavaVersion.current()
-require(java.util.EnumSet.range(JavaVersion.VERSION_11, JavaVersion.VERSION_15).contains(javaVersion)) {
-	"The JUnit 5 build requires a JRE in the range of Java 11 to Java 15. Currently executing with Java ${javaVersion.majorVersion}."
+require(javaVersion == JavaVersion.VERSION_17) {
+	"The JUnit 5 build must be executed with Java 17. Currently executing with Java ${javaVersion.majorVersion}."
 }
 
 rootProject.name = "junit5"

From 4a6efc1f627cc05fee0ffb57b634a88dbac84a02 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 09:33:49 +0200
Subject: [PATCH 0576/1433] Avoid Asciidoctor warning

---
 documentation/documentation.gradle.kts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 8f3af1a8b317..29310c87a518 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -216,6 +216,14 @@ tasks {
 				inputs.dir(kotlin.srcDirs.first())
 			}
 		}
+
+		forkOptions {
+			// To avoid warning, see https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/597
+			jvmArgs(
+				"--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
+				"--add-opens", "java.base/java.io=ALL-UNNAMED"
+			)
+		}
 	}
 
 	asciidoctor {

From fb60f58fbb3ed41dc8ce5628c5d36e1747a72de3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 09:34:08 +0200
Subject: [PATCH 0577/1433] Always configure Spotless to remove unused imports

---
 buildSrc/src/main/kotlin/spotless-conventions.gradle.kts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
index 35739461d114..65e1a4aa011b 100644
--- a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
@@ -31,10 +31,7 @@ spotless {
             licenseHeaderFile(license.headerFile, "(package|import|open|module) ")
             importOrderFile(importOrderConfigFile)
             eclipse().configFile(javaFormatterConfigFile)
-            if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_15)) {
-                // Doesn't work with Java 15 text blocks, see https://github.com/diffplug/spotless/issues/713
-                removeUnusedImports()
-            }
+            removeUnusedImports()
             trimTrailingWhitespace()
             endWithNewline()
         }

From 984b67d8598c688641855d51cd597be2ba208910 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 09:34:49 +0200
Subject: [PATCH 0578/1433] Configure Kotlin jvmTarget to be in sync with
 target Java release

---
 .../kotlin/kotlin-library-conventions.gradle.kts    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index 1b05c6e0fd4f..163190944bae 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -7,9 +7,20 @@ plugins {
 
 tasks.withType<KotlinCompile>().configureEach {
 	kotlinOptions {
-		jvmTarget = "1.8"
 		apiVersion = "1.3"
 		languageVersion = "1.3"
 		allWarningsAsErrors = false
 	}
 }
+
+afterEvaluate {
+	val extension = project.the<JavaLibraryExtension>()
+	tasks {
+		withType<KotlinCompile>().configureEach {
+			kotlinOptions.jvmTarget = extension.mainJavaVersion.toString()
+		}
+		named<KotlinCompile>("compileTestKotlin") {
+			kotlinOptions.jvmTarget = extension.testJavaVersion.toString()
+		}
+	}
+}

From ccc7c40b715a54f7e8bf1caaabb7153f78f471bd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 09:38:01 +0200
Subject: [PATCH 0579/1433] Use JDK 17 for CI builds

---
 .github/workflows/codeql-analysis.yml    |  4 +--
 .github/workflows/cross-version.yml      |  4 +--
 .github/workflows/main.yml               | 40 ------------------------
 .github/workflows/reproducible-build.yml |  8 -----
 gradle.properties                        |  2 +-
 5 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 90ee694cea43..b801557fcd33 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,11 +23,11 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
         cache: 'gradle'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 1ac8b1b58581..6c10b911e500 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -47,11 +47,11 @@ jobs:
       - name: 'Prepare JDK${{ matrix.jdk }} env var'
         shell: bash
         run: echo "JDK${{ matrix.jdk }}=$JAVA_HOME" >> $GITHUB_ENV
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           cache: 'gradle'
       - name: Test
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ea5a105bae32..d3a4f423a62b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,14 +36,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-    - name: Prepare JDK17 env var
-      shell: bash
-      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '11'
         cache: 'gradle'
     - name: Test and coverage
       env:
@@ -80,14 +72,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-    - name: Prepare JDK17 env var
-      shell: bash
-      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '11'
         cache: 'gradle'
     - name: Test
       shell: bash
@@ -117,14 +101,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-    - name: Prepare JDK17 env var
-      shell: bash
-      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '11'
         cache: 'gradle'
     - name: 'Test'
       run: |
@@ -146,14 +122,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-    - name: Prepare JDK17 env var
-      shell: bash
-      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '11'
         cache: 'gradle'
     - name: Publish
       env:
@@ -177,14 +145,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-    - name: Prepare JDK17 env var
-      shell: bash
-      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '11'
         cache: 'gradle'
     - name: Install Graphviz
       run: |
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index e3877d59bc33..46e909582c4c 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -25,14 +25,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-    - name: Prepare JDK17 env var
-      shell: bash
-      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '11'
         cache: 'gradle'
     - name: Build and compare checksums
       shell: bash
diff --git a/gradle.properties b/gradle.properties
index 93234fd6c644..5e496378322e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.java.installations.fromEnv=JDK8,JDK16,JDK17,JDK18
+org.gradle.java.installations.fromEnv=JDK8,JDK18
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true

From 982941b74feca0b321e2c5bcae4e7d746b5897a8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 15:53:43 +0200
Subject: [PATCH 0580/1433] Upgrade Kotlin plugin

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 26c96279867d..4797fa96b64f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
 		id("com.gradle.enterprise.test-distribution") version "2.2" // keep in sync with buildSrc/buiild.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
-		kotlin("jvm") version "1.5.0"
+		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "3.3.2"
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"

From bd40774a1355f17398c93f55ca3c842f40faf12b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 15:54:09 +0200
Subject: [PATCH 0581/1433] Use at most JDK 16 as target for Kotlin compilation

---
 buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index 163190944bae..08402295ff04 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -20,7 +20,8 @@ afterEvaluate {
 			kotlinOptions.jvmTarget = extension.mainJavaVersion.toString()
 		}
 		named<KotlinCompile>("compileTestKotlin") {
-			kotlinOptions.jvmTarget = extension.testJavaVersion.toString()
+			// The Kotlin compiler does not yet support JDK 17 and later (see https://kotlinlang.org/docs/compiler-reference.html#jvm-target-version)
+			kotlinOptions.jvmTarget = minOf(JavaVersion.VERSION_16, extension.testJavaVersion).toString()
 		}
 	}
 }

From 2a43a7379a14bc98cd2528aad59dfc76d82b8e69 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 14 Oct 2021 16:06:28 +0200
Subject: [PATCH 0582/1433] Use Java 8 to compile Spock 2.x tests

---
 junit-vintage-engine/junit-vintage-engine.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 6b43121fa7e8..ee7b2955aa42 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -30,7 +30,7 @@ tasks {
 	compileTestFixturesGroovy {
 		javaLauncher.set(project.the<JavaToolchainService>().launcherFor {
 			// Groovy 2.x (used for Spock tests) does not support current JDKs
-			languageVersion.set(JavaLanguageVersion.of(11))
+			languageVersion.set(JavaLanguageVersion.of(8))
 		})
 	}
 	jar {

From e2bc323b48b78ef0d69bc693e5b3e1a79e5d4cad Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 15 Oct 2021 08:09:39 +0200
Subject: [PATCH 0583/1433] Fix JDK link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 493dea9bd91f..0d08b133a8ea 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 [Gradle Wrapper]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:using_wrapper
 [JaCoCo]: https://www.eclemma.org/jacoco/
 [Javadoc]: https://junit.org/junit5/docs/current/api/
-[JDK 11]: https://adoptopenjdk.net/archive.html?variant=openjdk11&jvmVariant=hotspot
+[JDK 17]: https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot
 [Release Notes]: https://junit.org/junit5/docs/current/release-notes/
 [Samples]: https://github.com/junit-team/junit5-samples
 [StackOverflow]: https://stackoverflow.com/questions/tagged/junit5

From 4ddc786728bc3fbc68d6a35d2eeeb63eb3e85609 Mon Sep 17 00:00:00 2001
From: BJ Hargrave <bj@hargrave.dev>
Date: Mon, 18 Oct 2021 07:03:29 -0400
Subject: [PATCH 0584/1433] bnd: Replace use of conventions with extensions
 (#2739)

Co-authored-by: Marc Philipp <marc@gradle.com>
---
 buildSrc/build.gradle.kts                     |  2 +-
 .../main/kotlin/osgi-conventions.gradle.kts   | 47 +++++++------------
 .../junit-jupiter-engine.gradle.kts           |  3 +-
 .../junit-jupiter-migrationsupport.gradle.kts |  4 +-
 ...nit-platform-console-standalone.gradle.kts |  4 +-
 .../junit-platform-runner.gradle.kts          |  4 +-
 .../junit-vintage-engine.gradle.kts           |  4 +-
 7 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b2282668724c..b46b587240ec 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
 	implementation(kotlin("gradle-plugin"))
-	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0")
+	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.0.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:5.15.2")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index bc4197a5e6bd..2ad2fb578893 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -1,5 +1,4 @@
-import aQute.bnd.gradle.BundleTaskConvention
-import aQute.bnd.gradle.FileSetRepositoryConvention
+import aQute.bnd.gradle.BundleTaskExtension
 import aQute.bnd.gradle.Resolve
 
 plugins {
@@ -9,19 +8,19 @@ plugins {
 val importAPIGuardian = "org.apiguardian.*;resolution:=\"optional\""
 
 // This task enhances `jar` and `shadowJar` tasks with the bnd
-// `BundleTaskConvention` convention which allows for generating OSGi
+// `BundleTaskExtension` extension which allows for generating OSGi
 // metadata into the jar
 tasks.withType<Jar>().matching {
 	task: Jar -> task.name == "jar" || task.name == "shadowJar"
 }.configureEach {
-	val btc = BundleTaskConvention(this)
+	val bte = extensions.create<BundleTaskExtension>(BundleTaskExtension.NAME, this)
 
 	extra["importAPIGuardian"] = importAPIGuardian
 
 	// These are bnd instructions necessary for generating OSGi metadata.
 	// We've generalized these so that they are widely applicable limiting
 	// module configurations to special cases.
-	btc.setBnd("""
+	bte.setBnd("""
 			# Set the Bundle-SymbolicName to the archiveBaseName.
 			# We don't use the archiveClassifier which Bnd will use
 			# in the default Bundle-SymbolicName value.
@@ -63,23 +62,15 @@ tasks.withType<Jar>().matching {
 			-export-apiguardian: *;version=${'$'}{versionmask;===;${'$'}{version_cleanup;${'$'}{task.archiveVersion}}}
 		""")
 
-	// Add the convention to the jar task
-	@Suppress("deprecation") // https://github.com/bndtools/bnd/issues/4699
-	convention.plugins["bundle"] = btc
-
-	doLast {
-		// Do the actual work putting OSGi stuff in the jar.
-		btc.buildBundle()
-	}
+	// Do the actual work putting OSGi stuff in the jar.
+	doLast(bte.buildAction())
 }
 
-val osgiPropertiesFile = file("$buildDir/verifyOSGiProperties.bndrun")
-
 // Bnd's Resolve task uses a properties file for its configuration. This
 // task writes out the properties necessary for it to verify the OSGi
 // metadata.
 val osgiProperties by tasks.registering(WriteProperties::class) {
-	outputFile = osgiPropertiesFile
+	setOutputFile(layout.buildDirectory.file("verifyOSGiProperties.bndrun"))
 	property("-standalone", true)
 	project.extensions.getByType(JavaLibraryExtension::class.java).let { javaLibrary ->
 		property("-runee", "JavaSE-${javaLibrary.mainJavaVersion}")
@@ -99,21 +90,17 @@ val osgiVerification by configurations.creating {
 // that its metadata is valid. If the metadata is invalid this task will
 // fail.
 val verifyOSGi by tasks.registering(Resolve::class) {
-	dependsOn(osgiProperties)
-	setBndrun(osgiPropertiesFile)
+	bndrun.fileProvider(osgiProperties.map{ it.outputFile })
+	outputBndrun.set(layout.buildDirectory.file("resolvedOSGiProperties.bndrun"))
 	isReportOptional = false
-	@Suppress("deprecation") // https://github.com/bndtools/bnd/issues/4699
-	withConvention(FileSetRepositoryConvention::class) {
-
-		// By default bnd will use jars found in:
-		// 1. project.sourceSets.main.runtimeClasspath
-		// 2. project.configurations.archives.artifacts.files
-		// to validate the metadata.
-		// This adds jars defined in `osgiVerification` also so that bnd
-		// can use them to validate the metadata without causing those to
-		// end up in the dependencies of those projects.
-		bundles(osgiVerification)
-	}
+	// By default bnd will use jars found in:
+	// 1. project.sourceSets.main.runtimeClasspath
+	// 2. project.configurations.archives.artifacts.files
+	// to validate the metadata.
+	// This adds jars defined in `osgiVerification` also so that bnd
+	// can use them to validate the metadata without causing those to
+	// end up in the dependencies of those projects.
+	bundles(osgiVerification)
 }
 
 tasks.check {
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 5ab39a989c19..ae45480b7141 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -1,4 +1,3 @@
-import aQute.bnd.gradle.BundleTaskConvention
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
@@ -34,7 +33,7 @@ tasks {
 
 tasks {
 	jar {
-		withConvention(BundleTaskConvention::class) {
+		bundle {
 			bnd("""
 				Provide-Capability:\
 					org.junit.platform.engine;\
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index 81e531eb3f3d..a45f765d7fef 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -1,5 +1,3 @@
-import aQute.bnd.gradle.BundleTaskConvention;
-
 plugins {
 	`java-library-conventions`
 	`junit4-compatibility`
@@ -22,7 +20,7 @@ dependencies {
 }
 
 tasks.jar {
-	withConvention(BundleTaskConvention::class) {
+	bundle {
 		bnd("""
 			# Import JUnit4 packages with a version
 			Import-Package: \
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 02853dcc3c56..c7dc424879bb 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -1,5 +1,3 @@
-import aQute.bnd.gradle.BundleTaskConvention;
-
 plugins {
 	`java-library-conventions`
 	`shadow-conventions`
@@ -43,7 +41,7 @@ tasks {
 			into("META-INF")
 		}
 
-		withConvention(BundleTaskConvention::class) {
+		bundle {
 			bnd("""
 				# Customize the imports because this is an aggregate jar
 				Import-Package: \
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index dab2224f84a7..de7c0ed09e54 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -1,5 +1,3 @@
-import aQute.bnd.gradle.BundleTaskConvention;
-
 plugins {
 	`java-library-conventions`
 	`junit4-compatibility`
@@ -22,7 +20,7 @@ dependencies {
 }
 
 tasks.jar {
-	withConvention(BundleTaskConvention::class) {
+	bundle {
 		bnd("""
 			# Import JUnit4 packages with a version
 			Import-Package: \
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index ee7b2955aa42..4ee5a90aa273 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -1,5 +1,3 @@
-import aQute.bnd.gradle.BundleTaskConvention
-
 plugins {
 	`java-library-conventions`
 	`junit4-compatibility`
@@ -34,7 +32,7 @@ tasks {
 		})
 	}
 	jar {
-		withConvention(BundleTaskConvention::class) {
+		bundle {
 			val junit4Min = libs.versions.junit4Min.get()
 			bnd("""
 				# Import JUnit4 packages with a version

From b89ac9b35a47dbe88dce2c13ec182cdf14ea1e30 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 23 Oct 2021 19:56:33 +0200
Subject: [PATCH 0585/1433] Fix typo in @CsvSource Javadoc

---
 .../java/org/junit/jupiter/params/provider/CsvSource.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index 582047531cba..01958dd02949 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -84,7 +84,7 @@
 	 *     "apple,         1",
 	 *     "banana,        2",
 	 *     "'lemon, lime', 0xF1",
-	 *     "strawberry,    700_000",
+	 *     "strawberry,    700_000"
 	 * })
 	 * void test(String fruit, int rank) {
 	 *     // ...
@@ -116,7 +116,7 @@
 	 *     banana,        2
 	 *     'lemon, lime', 0xF1
 	 *     strawberry,    700_000
-	 * """)
+	 *     """)
 	 * void test(String fruit, int rank) {
 	 *     // ...
 	 * }</pre>

From f9c04254ccce511f3bace1b311902fb06e9fa61f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 24 Oct 2021 17:13:56 +0200
Subject: [PATCH 0586/1433] Upgradle to 7.3-rc-2

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 20bc856eef1b..4eb32300a7b7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d23a3a902b3c4a8cc6952ff236fb83279a266aec1854b01286ed04788a5d3d9a
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-1-bin.zip
+distributionSha256Sum=e6a7b81aa2fd2fa05efba3cf7d0c79d629b4d3b189aa4d4b57729933a211af79
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 71ca17748d1fbeb89cf6ecda58ca1c0eb28c61a1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 24 Oct 2021 17:22:09 +0200
Subject: [PATCH 0587/1433] Ignore .sdkmanrc

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index edd18cb0c5e2..e5f0af67bde0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,6 @@ gradle-app.setting
 *.graphml
 coverage.db*
 .metadata
+/.sdkmanrc
 
 checksums*

From 7994e00937f6fa475dbf98650eaaf80f896ccf81 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 24 Oct 2021 17:28:19 +0200
Subject: [PATCH 0588/1433] Remove removeUnusedImports() option causing
 intermittent issues

such as https://ge.junit.org/s/lwaxziyian534/failure#1
---
 buildSrc/src/main/kotlin/spotless-conventions.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
index 65e1a4aa011b..faa4de3df9e4 100644
--- a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
@@ -31,7 +31,6 @@ spotless {
             licenseHeaderFile(license.headerFile, "(package|import|open|module) ")
             importOrderFile(importOrderConfigFile)
             eclipse().configFile(javaFormatterConfigFile)
-            removeUnusedImports()
             trimTrailingWhitespace()
             endWithNewline()
         }

From ba04cd612205066f24c7c9b73e34f7be017e71a0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 24 Oct 2021 18:23:33 +0200
Subject: [PATCH 0589/1433] Use Gradle Build Action (#2750)

Additionally, this commit adds build scan tags to all main builds.
---
 .github/workflows/codeql-analysis.yml         | 14 ++--
 .github/workflows/cross-version.yml           | 17 +++--
 .github/workflows/main.yml                    | 68 ++++++++++++-------
 .github/workflows/reproducible-build.yml      |  8 ++-
 src/checkBuildReproducibility.sh              |  2 +-
 ...ishDocumentationSnapshotOnlyIfNecessary.sh |  2 +-
 6 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b801557fcd33..fc9a52db6a72 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -28,15 +28,19 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-        cache: 'gradle'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
     - name: Build
-      run: |
-        ./gradlew --version
-        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
-        ./gradlew --no-build-cache allMainClasses -PjavaToolchainVersion=11 -Porg.gradle.java.installations.auto-download=false
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          --no-build-cache
+          -Porg.gradle.java.installations.auto-download=false
+          -PjavaToolchainVersion=11
+          -Dscan.tag.CodeQL
+          javaToolchains
+          allMainClasses
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 6c10b911e500..6f066a15cdfa 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -10,6 +10,7 @@ on:
       - '*'
 
 env:
+  ORG_GRADLE_PROJECT_enableTestDistribution: true
   ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
   ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
@@ -52,14 +53,16 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-          cache: 'gradle'
       - name: Test
-        env:
-          ORG_GRADLE_PROJECT_enableTestDistribution: true
-        run: |
-          ./gradlew --version
-          ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
-          ./gradlew --no-parallel -Dplatform.tooling.support.tests.enabled=true -PjavaToolchainVersion=${{ matrix.jdk }} -Porg.gradle.java.installations.auto-download=false build "-Dscan.tag.JDK_${{ matrix.jdk }}"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            -Porg.gradle.java.installations.auto-download=false
+            -PjavaToolchainVersion=${{ matrix.jdk }}
+            -Dplatform.tooling.support.tests.enabled=true
+            -Dscan.tag.JDK_${{ matrix.jdk }}
+            javaToolchains
+            build
       - name: Upload Test Distribution trace files
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d3a4f423a62b..d3a8a8cab0a2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,6 +10,7 @@ on:
       - '*'
 
 env:
+  ORG_GRADLE_PROJECT_enableTestDistribution: true
   ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
   ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
@@ -36,14 +37,17 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-        cache: 'gradle'
     - name: Test and coverage
-      env:
-        ORG_GRADLE_PROJECT_enableTestDistribution: true
-      run: |
-        ./gradlew --version
-        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -PenableJaCoCo -Porg.gradle.java.installations.auto-download=false build jacocoRootReport
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          -Porg.gradle.java.installations.auto-download=false
+          -PenableJaCoCo
+          -Dplatform.tooling.support.tests.enabled=true
+          -Dscan.tag.Linux
+          javaToolchains
+          build
+          jacocoRootReport
     - name: Upload Test Distribution trace files
       uses: actions/upload-artifact@v2
       with:
@@ -72,14 +76,15 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-        cache: 'gradle'
     - name: Test
-      shell: bash
-      run: |
-        ./gradlew --version
-        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.auto-download=false build
-        ./gradlew --stop
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          -Porg.gradle.java.installations.auto-download=false
+          -Dplatform.tooling.support.tests.enabled=true
+          -Dscan.tag.Windows
+          javaToolchains
+          build
 
   mac:
     name: Mac OS
@@ -101,12 +106,15 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-        cache: 'gradle'
-    - name: 'Test'
-      run: |
-        ./gradlew --version
-        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
-        ./gradlew --no-parallel --stacktrace -Dplatform.tooling.support.tests.enabled=true -Porg.gradle.java.installations.auto-download=false build
+    - name: Test
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          -Porg.gradle.java.installations.auto-download=false
+          -Dplatform.tooling.support.tests.enabled=true
+          -Dscan.tag.macOS
+          javaToolchains
+          build
 
   publish_artifacts:
     name: Publish Snapshot Artifacts
@@ -122,14 +130,18 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-        cache: 'gradle'
     - name: Publish
+      uses: gradle/gradle-build-action@v2
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
-      run: |
-        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
-        ./gradlew publish -x check -Porg.gradle.java.installations.auto-download=false
+      with:
+        arguments: |
+          -Porg.gradle.java.installations.auto-download=false
+          -Dscan.tag.Snapshots
+          javaToolchains
+          publish
+          -x check
 
   update_documentation:
     name: Update Snapshot Documentation
@@ -145,13 +157,17 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-        cache: 'gradle'
     - name: Install Graphviz
       run: |
         sudo apt-get update
         sudo apt-get install graphviz
+    - name: Restore Gradle cache and display toolchains
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          -Porg.gradle.java.installations.auto-download=false
+          javaToolchains
     - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       run: ./src/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 46e909582c4c..6b2ace12ef2b 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -25,9 +25,13 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '17'
-        cache: 'gradle'
+    - name: Restore Gradle cache and display toolchains
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          -Porg.gradle.java.installations.auto-download=false
+          javaToolchains
     - name: Build and compare checksums
       shell: bash
       run: |
-        ./gradlew javaToolchains -Porg.gradle.java.installations.auto-download=false
         ./src/checkBuildReproducibility.sh
diff --git a/src/checkBuildReproducibility.sh b/src/checkBuildReproducibility.sh
index 6432c6d242c0..b07275624da1 100755
--- a/src/checkBuildReproducibility.sh
+++ b/src/checkBuildReproducibility.sh
@@ -7,7 +7,7 @@ export SOURCE_DATE_EPOCH=$(date +%s)
 function calculate_checksums() {
     OUTPUT=$1
 
-    ./gradlew --no-build-cache clean assemble --parallel -Porg.gradle.java.installations.auto-download=false
+    ./gradlew --no-build-cache clean assemble --parallel -Porg.gradle.java.installations.auto-download=false -Dscan.tag.Reproducibility
 
     find . -name '*.jar' \
         | grep '/build/libs/' \
diff --git a/src/publishDocumentationSnapshotOnlyIfNecessary.sh b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
index 75f8eaeb3728..ecd0482a2368 100755
--- a/src/publishDocumentationSnapshotOnlyIfNecessary.sh
+++ b/src/publishDocumentationSnapshotOnlyIfNecessary.sh
@@ -58,5 +58,5 @@ else
   echo "Creating and publishing documentation..."
   echo
   cp --force "${current}" "${published}"
-  ./gradlew javaToolchains gitPublishPush -Porg.gradle.java.installations.auto-download=false
+  ./gradlew gitPublishPush -Porg.gradle.java.installations.auto-download=false -Dscan.tag.Documentation
 fi

From 1f2309f6a6283c886e4a7b004ce58c8f4dba598f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 17:23:46 +0200
Subject: [PATCH 0590/1433] Treat text blocks as files in @CsvSource

PR #2721 introduced experimental support for text blocks in @CsvSource;
however, there was room for improvement.

Prior to this commit, a CSV record within a text block could not
contain a new line (\n), even if it was within a quoted string;
whereas, this is supported when using @CsvSource's value attribute. In
addition, comments do not make sense in a single string supplied via
@CsvSource's value attribute, but they do make sense within a text
block.

This commit refines the text block support in @CsvSource by treating
text blocks as complete CSV files, including support for comments
beginning with a `#` symbol as well as support for new lines within
quoted strings.

Closes #2734
---
 .../release-notes/release-notes-5.8.2.adoc    | 10 +-
 .../asciidoc/user-guide/writing-tests.adoc    | 99 +++++++++++++------
 .../params/provider/CsvArgumentsProvider.java | 34 ++++---
 .../params/provider/CsvFileSource.java        | 23 ++---
 .../params/provider/CsvParserFactory.java     |  5 +-
 .../jupiter/params/provider/CsvSource.java    | 62 ++++++++----
 .../ParameterizedTestIntegrationTests.java    | 54 +++++++++-
 .../provider/CsvArgumentsProviderTests.java   | 11 +--
 8 files changed, 212 insertions(+), 86 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
index dfed4d1eaaf1..cd31ac98052f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
@@ -3,7 +3,10 @@
 
 *Date of Release:* ❓
 
-*Scope:* ❓
+*Scope:*
+
+* Text blocks in `@CsvSource` are treated as CSV files
+* Custom quote character support in `@CsvSource`
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/60?closed=1+[5.8.2] milestone page in the JUnit repository on
@@ -39,6 +42,11 @@ GitHub.
 
 ==== New Features and Improvements
 
+* Text blocks in `@CsvSource` are now treated as complete CSV files, including support for
+  comments beginning with a `+++#+++` symbol as well as support for new lines within
+  quoted strings. See the
+  <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvSource, User
+  Guide>> for details and examples.
 * The quote character for _quoted strings_ in `@CsvSource` is now configurable via the new
   `quoteCharacter` attribute, which defaults to a single quote (`'`) for backward
   compatibility.
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index a2e26e863c94..0bc94d85b421 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1332,32 +1332,13 @@ include::{testDir}/example/ExternalMethodSourceDemo.java[tags=external_MethodSou
 
 `@CsvSource` allows you to express argument lists as comma-separated values (i.e., CSV
 `String` literals). Each string provided via the `value` attribute in `@CsvSource`
-represents a CSV line and results in one invocation of the parameterized test.
+represents a CSV record and results in one invocation of the parameterized test.
 
 [source,java,indent=0]
 ----
 include::{testDir}/example/ParameterizedTestDemo.java[tags=CsvSource_example]
 ----
 
-If the programming language you are using supports _text blocks_ -- for example, Java SE
-15 or higher -- you can alternatively use the `textBlock` attribute of `@CsvSource`. Each
-line within a text block represents a CSV line and results in one invocation of the
-parameterized test. Using a text block, the previous example can be implemented as follows.
-
-[source,java,indent=0]
-----
-@ParameterizedTest
-@CsvSource(textBlock = """
-	apple,         1
-	banana,        2
-	'lemon, lime', 0xF1
-	strawberry,    700_000
-""")
-void testWithCsvSource(String fruit, int rank) {
-	// ...
-}
-----
-
 The default delimiter is a comma (`,`), but you can use another character by setting the
 `delimiter` attribute. Alternatively, the `delimiterString` attribute allows you to use a
 `String` delimiter instead of a single character. However, both delimiter attributes
@@ -1391,11 +1372,69 @@ by default. This behavior can be changed by setting the
 | `@CsvSource(value = { " apple , banana" }, ignoreLeadingAndTrailingWhitespace = false)` | `" apple "`, `" banana"`
 |===
 
+If the programming language you are using supports _text blocks_ -- for example, Java SE
+15 or higher -- you can alternatively use the `textBlock` attribute of `@CsvSource`. Each
+record within a text block represents a CSV record and results in one invocation of the
+parameterized test. Using a text block, the previous example can be implemented as follows.
+
+[source,java,indent=0]
+----
+@ParameterizedTest
+@CsvSource(textBlock = """
+	apple,         1
+	banana,        2
+	'lemon, lime', 0xF1
+	strawberry,    700_000
+	""")
+void testWithCsvSource(String fruit, int rank) {
+	// ...
+}
+----
+
+In contrast to CSV records supplied via the `value` attribute, a text block can contain
+comments. Any line beginning with a `+++#+++` symbol will be treated as a comment and
+ignored. Note, however, that the `+++#+++` symbol must be the first character on the line
+without any leading whitespace. It is therefore recommended that the closing text block
+delimiter `"""` be placed either at the end of the last line of input or on the following
+line, left aligned with the rest of the input (as can be seen in the example below which
+demonstrates formatting similar to a table).
+
+[source,java,indent=0]
+----
+@ParameterizedTest
+@CsvSource(delimiter = '|', quoteCharacter = '"', textBlock = """
+	#-----------------------------
+	#    FRUIT     |     RANK
+	#-----------------------------
+	     apple     |      1
+	#-----------------------------
+	     banana    |      2
+	#-----------------------------
+	  "lemon lime" |     0xF1
+	#-----------------------------
+	   strawberry  |    700_000
+	#-----------------------------
+	""")
+void testWithCsvSource(String fruit, int rank) {
+	// ...
+}
+----
+
+[NOTE]
+====
+Java's https://docs.oracle.com/en/java/javase/15/text-blocks/index.html[text block]
+feature automatically removes _incidental whitespace_ when the code is compiled.
+However other JVM languages such as Groovy and Kotlin do not. Thus, if you are using a
+programming language other than Java and your text block contains comments or new lines
+within quoted strings, you will need to ensure that there is no leading whitespace within
+your text block.
+====
+
 [[writing-tests-parameterized-tests-sources-CsvFileSource]]
 ===== @CsvFileSource
 
 `@CsvFileSource` lets you use comma-separated value (CSV) files from the classpath or the
-local file system. Each line from a CSV file results in one invocation of the
+local file system. Each record from a CSV file results in one invocation of the
 parameterized test.
 
 The default delimiter is a comma (`,`), but you can use another character by setting the
@@ -1404,8 +1443,8 @@ The default delimiter is a comma (`,`), but you can use another character by set
 cannot be set simultaneously.
 
 .Comments in CSV files
-NOTE: Any line beginning with a `#` symbol will be interpreted as a comment and will be
-ignored.
+NOTE: Any line beginning with a `+++#+++` symbol will be interpreted as a comment and will
+be ignored.
 
 [source,java,indent=0]
 ----
@@ -1418,13 +1457,13 @@ include::{testDir}/example/ParameterizedTestDemo.java[tags=CsvFileSource_example
 include::{testResourcesDir}/two-column.csv[]
 ----
 
-In contrast to the syntax used in `@CsvSource`, `@CsvFileSource` uses a double quote `"`
-as the quote character. See the `"United States of America"` value in the example above.
-An empty, quoted value `""` results in an empty `String` unless the `emptyValue` attribute
-is set; whereas, an entirely _empty_ value is interpreted as a `null` reference. By
-specifying one or more `nullValues`, a custom value can be interpreted as a `null`
-reference. An `ArgumentConversionException` is thrown if the target type of a `null`
-reference is a primitive type.
+In contrast to the default syntax used in `@CsvSource`, `@CsvFileSource` uses a double
+quote `"` as the quote character. See the `"United States of America"` value in the
+example above. An empty, quoted value `""` results in an empty `String` unless the
+`emptyValue` attribute is set; whereas, an entirely _empty_ value is interpreted as a
+`null` reference. By specifying one or more `nullValues`, a custom value can be
+interpreted as a `null` reference. An `ArgumentConversionException` is thrown if the
+target type of a `null` reference is a primitive type.
 
 NOTE: An _unquoted_ empty value will always be converted to a `null` reference regardless
 of any custom values configured via the `nullValues` attribute.
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 1bbf4f637ccf..a218d1f02b10 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -13,11 +13,12 @@
 import static org.junit.jupiter.params.provider.CsvParserFactory.createParserFor;
 import static org.junit.platform.commons.util.CollectionUtils.toSet;
 
+import java.io.StringReader;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import com.univocity.parsers.csv.CsvParser;
@@ -33,8 +34,6 @@
  */
 class CsvArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<CsvSource> {
 
-	private static final Pattern NEW_LINE_REGEX = Pattern.compile("\\n");
-
 	private static final String LINE_SEPARATOR = "\n";
 
 	private CsvSource annotation;
@@ -54,22 +53,35 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 		Preconditions.condition(this.annotation.value().length > 0 ^ textBlockDeclared,
 			() -> "@CsvSource must be declared with either `value` or `textBlock` but not both");
 
-		String[] lines;
 		if (textBlockDeclared) {
-			lines = NEW_LINE_REGEX.split(this.annotation.textBlock(), 0);
-		}
-		else {
-			lines = this.annotation.value();
+			return parseTextBlock(this.annotation.textBlock()).stream().map(Arguments::of);
 		}
 
-		AtomicInteger index = new AtomicInteger(1);
+		AtomicInteger index = new AtomicInteger(0);
 		// @formatter:off
-		return Arrays.stream(lines)
-				.map(line -> parseLine(line, index.getAndIncrement()))
+		return Arrays.stream(this.annotation.value())
+				.map(line -> parseLine(line, index.incrementAndGet()))
 				.map(Arguments::of);
 		// @formatter:on
 	}
 
+	private List<String[]> parseTextBlock(String textBlock) {
+		try {
+			AtomicInteger index = new AtomicInteger(0);
+			List<String[]> csvRecords = this.csvParser.parseAll(new StringReader(textBlock));
+			for (String[] csvRecord : csvRecords) {
+				index.incrementAndGet();
+				Preconditions.notNull(csvRecord,
+					() -> "Line at index " + index.get() + " contains invalid CSV: \"\"\"\n" + textBlock + "\n\"\"\"");
+				processNullValues(csvRecord, this.nullValues);
+			}
+			return csvRecords;
+		}
+		catch (Throwable throwable) {
+			throw handleCsvException(throwable, this.annotation);
+		}
+	}
+
 	private String[] parseLine(String line, int index) {
 		try {
 			String[] csvRecord = this.csvParser.parseLine(line + LINE_SEPARATOR);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 4749e8de33d9..1c582b2ea45b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -23,19 +23,19 @@
 
 /**
  * {@code @CsvFileSource} is an {@link ArgumentsSource} which is used to load
- * comma-separated value (CSV) files from one or more classpath {@link #resources
- * resources} or {@link #files}.
+ * comma-separated value (CSV) files from one or more classpath {@link #resources}
+ * or {@link #files}.
  *
- * <p>The lines of these CSV files will be provided as arguments to the annotated
- * {@code @ParameterizedTest} method.
+ * <p>The CSV records parsed from these resources and files will be provided as
+ * arguments to the annotated {@code @ParameterizedTest} method.
  *
  * <p>Any line beginning with a {@code #} symbol will be interpreted as a comment
  * and will be ignored.
  *
- * <p>The column delimiter (defaults to comma) can be customized with either
- * {@link #delimiter} or {@link #delimiterString}.
+ * <p>The column delimiter (which defaults to a comma ({@code ,})) can be customized
+ * via either {@link #delimiter} or {@link #delimiterString}.
  *
- * <p>In contrast to the syntax used in {@code @CsvSource}, {@code @CsvFileSource}
+ * <p>In contrast to the default syntax used in {@code @CsvSource}, {@code @CsvFileSource}
  * uses a double quote ({@code "}) as its quote character (see the User Guide for
  * examples). An empty, quoted value ({@code ""}) results in an empty {@link String}
  * unless the {@link #emptyValue} attribute is set; whereas, an entirely <em>empty</em>
@@ -89,7 +89,7 @@
 
 	/**
 	 * The line separator to use when reading the CSV files; must consist of 1
-	 * or 2 characters.
+	 * or 2 characters, typically {@code "\r"}, {@code "\n"}, or {@code "\r\n"}.
 	 *
 	 * <p>Defaults to {@code "\n"}.
 	 */
@@ -159,7 +159,7 @@
 	String[] nullValues() default {};
 
 	/**
-	 * The maximum characters of per CSV column allowed.
+	 * The maximum number of characters allowed per CSV column.
 	 *
 	 * <p>Must be a positive number.
 	 *
@@ -171,8 +171,8 @@
 	int maxCharsPerColumn() default 4096;
 
 	/**
-	 * Identifies whether leading and trailing whitespace characters of
-	 * unquoted CSV columns should be ignored.
+	 * Controls whether leading and trailing whitespace characters of unquoted
+	 * CSV columns should be ignored.
 	 *
 	 * <p>Defaults to {@code true}.
 	 *
@@ -180,4 +180,5 @@
 	 */
 	@API(status = EXPERIMENTAL, since = "5.8")
 	boolean ignoreLeadingAndTrailingWhitespace() default true;
+
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index 59517d357e0d..c55a88e1fca4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -26,14 +26,13 @@ class CsvParserFactory {
 	private static final String LINE_SEPARATOR = "\n";
 	private static final char DOUBLE_QUOTE = '"';
 	private static final char EMPTY_CHAR = '\0';
-	private static final boolean COMMENT_PROCESSING_FOR_CSV_SOURCE = false;
 	private static final boolean COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE = true;
 
 	static CsvParser createParserFor(CsvSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
+		boolean commentProcessingEnabled = !annotation.textBlock().isEmpty();
 		return createParser(delimiter, LINE_SEPARATOR, annotation.quoteCharacter(), annotation.emptyValue(),
-			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_SOURCE,
-			annotation.ignoreLeadingAndTrailingWhitespace());
+			annotation.maxCharsPerColumn(), commentProcessingEnabled, annotation.ignoreLeadingAndTrailingWhitespace());
 	}
 
 	static CsvParser createParserFor(CsvFileSource annotation) {
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index 01958dd02949..40c3ec3d09b8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -23,14 +23,14 @@
 
 /**
  * {@code @CsvSource} is an {@link ArgumentsSource} which reads comma-separated
- * values (CSV) from one or more CSV lines supplied via the {@link #value}
+ * values (CSV) from one or more CSV records supplied via the {@link #value}
  * attribute or {@link #textBlock} attribute.
  *
  * <p>The supplied values will be provided as arguments to the annotated
  * {@code @ParameterizedTest} method.
  *
- * <p>The column delimiter (defaults to comma) can be customized with either
- * {@link #delimiter} or {@link #delimiterString}.
+ * <p>The column delimiter (which defaults to a comma ({@code ,})) can be customized
+ * via either {@link #delimiter} or {@link #delimiterString}.
  *
  * <p>By default, {@code @CsvSource} uses a single quote ({@code '}) as its quote
  * character, but this can be changed via {@link #quoteCharacter}. See the
@@ -52,6 +52,12 @@
  * column is trimmed by default. This behavior can be changed by setting the
  * {@link #ignoreLeadingAndTrailingWhitespace} attribute to {@code true}.
  *
+ * <p>In general, CSV records should not contain explicit newlines ({@code \n})
+ * unless they are placed within quoted strings. Note that CSV records supplied
+ * via {@link #textBlock} will implicitly contain newlines at the end of each
+ * physical line within the text block. Thus, if a CSV column wraps across a
+ * new line in a text block, the column must be a quoted string.
+ *
  * @since 5.0
  * @see CsvFileSource
  * @see org.junit.jupiter.params.provider.ArgumentsSource
@@ -65,14 +71,14 @@
 public @interface CsvSource {
 
 	/**
-	 * The CSV lines to use as the source of arguments; must not be empty.
-	 *
-	 * <p>Each value corresponds to a line in a CSV file and will be split using
-	 * the specified {@link #delimiter} or {@link #delimiterString}.
+	 * The CSV records to use as the source of arguments; must not be empty.
 	 *
 	 * <p>Defaults to an empty array. You therefore must supply CSV content
 	 * via this attribute or the {@link #textBlock} attribute.
 	 *
+	 * <p>Each value corresponds to a record in a CSV file and will be split using
+	 * the specified {@link #delimiter} or {@link #delimiterString}.
+	 *
 	 * <p>If <em>text block</em> syntax is supported by your programming language,
 	 * you may find it more convenient to declare your CSV content via the
 	 * {@link #textBlock} attribute.
@@ -95,12 +101,9 @@
 	String[] value() default {};
 
 	/**
-	 * The CSV lines to use as the source of arguments, supplied as a single
+	 * The CSV records to use as the source of arguments, supplied as a single
 	 * <em>text block</em>; must not be empty.
 	 *
-	 * <p>Each line in the text block corresponds to a line in a CSV file and will
-	 * be split using the specified {@link #delimiter} or {@link #delimiterString}.
-	 *
 	 * <p>Defaults to an empty string. You therefore must supply CSV content
 	 * via this attribute or the {@link #value} attribute.
 	 *
@@ -108,13 +111,33 @@
 	 * including Java SE 15 or higher. If text blocks are not supported, you
 	 * should declare your CSV content via the {@link #value} attribute.
 	 *
+	 * <p>Each record in the text block corresponds to a record in a CSV file and will
+	 * be split using the specified {@link #delimiter} or {@link #delimiterString}.
+	 *
+	 * <p>In contrast to CSV records supplied via {@link #value}, a text block
+	 * can contain comments. Any line beginning with a hash tag ({@code #}) will
+	 * be treated as a comment and ignored. Note, however, that the {@code #}
+	 * symbol must be the first character on the line without any leading
+	 * whitespace. It is therefore recommended that the closing text block
+	 * delimiter {@code """} be placed either at the end of the last line of
+	 * input or on the following line, vertically aligned with the rest of the
+	 * input (as can be seen in the example below).
+	 *
+	 * <p>Java's <a href="https://docs.oracle.com/en/java/javase/15/text-blocks/index.html">text block</a>
+	 * feature automatically removes <em>incidental whitespace</em> when the code
+	 * is compiled. However other JVM languages such as Groovy and Kotlin do not.
+	 * Thus, if you are using a programming language other than Java and your text
+	 * block contains comments or new lines within quoted strings, you will need
+	 * to ensure that there is no leading whitespace within your text block.
+	 *
 	 * <h4>Example</h4>
 	 * <pre class="code">
 	 * {@literal @}ParameterizedTest
-	 * {@literal @}CsvSource(textBlock = """
+	 * {@literal @}CsvSource(quoteCharacter = '"', textBlock = """
+	 *     # FRUIT,       RANK
 	 *     apple,         1
 	 *     banana,        2
-	 *     'lemon, lime', 0xF1
+	 *     "lemon, lime", 0xF1
 	 *     strawberry,    700_000
 	 *     """)
 	 * void test(String fruit, int rank) {
@@ -123,6 +146,7 @@
 	 *
 	 * @since 5.8.1
 	 * @see #value
+	 * @see #quoteCharacter
 	 */
 	@API(status = EXPERIMENTAL, since = "5.8.1")
 	String textBlock() default "";
@@ -143,7 +167,7 @@
 	char quoteCharacter() default '\'';
 
 	/**
-	 * The column delimiter character to use when reading the {@linkplain #value lines}.
+	 * The column delimiter character to use when reading the {@linkplain #value records}.
 	 *
 	 * <p>This is an alternative to {@link #delimiterString} and cannot be
 	 * used in conjunction with {@link #delimiterString}.
@@ -154,7 +178,7 @@
 	char delimiter() default '\0';
 
 	/**
-	 * The column delimiter string to use when reading the {@linkplain #value lines}.
+	 * The column delimiter string to use when reading the {@linkplain #value records}.
 	 *
 	 * <p>This is an alternative to {@link #delimiter} and cannot be used in
 	 * conjunction with {@link #delimiter}.
@@ -167,7 +191,7 @@
 	String delimiterString() default "";
 
 	/**
-	 * The empty value to use when reading the {@linkplain #value lines}.
+	 * The empty value to use when reading the {@linkplain #value records}.
 	 *
 	 * <p>This value replaces quoted empty strings read from the input.
 	 *
@@ -195,7 +219,7 @@
 	String[] nullValues() default {};
 
 	/**
-	 * The maximum characters of per CSV column allowed.
+	 * The maximum number of characters allowed per CSV column.
 	 *
 	 * <p>Must be a positive number.
 	 *
@@ -207,8 +231,8 @@
 	int maxCharsPerColumn() default 4096;
 
 	/**
-	 * Identifies whether leading and trailing whitespace characters of
-	 * unquoted CSV columns should be ignored.
+	 * Controls whether leading and trailing whitespace characters of unquoted
+	 * CSV columns should be ignored.
 	 *
 	 * <p>Defaults to {@code true}.
 	 *
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 5a3ab2c81ffd..9bd67544c79b 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -92,10 +92,21 @@ class ParameterizedTestIntegrationTests {
 
 	@ParameterizedTest
 	@CsvSource(quoteCharacter = '"', textBlock = """
-				apple,         1
-				banana,        2
-				"lemon, lime", 0xF1
-				strawberry,    700_000
+
+
+			# This is a comment preceded by multiple opening blank lines.
+			apple,         1
+			banana,        2
+			# This is a comment pointing out that the next line contains multiple explicit newlines in quoted text.
+			"lemon  \s
+
+
+			\s  lime",         0xF1
+			# The next line is a blank line in the middle of the CSV rows.
+
+			strawberry,    700_000
+			# This is a comment followed by 2 closing blank line.
+
 			""")
 	void executesLinesFromTextBlock(String fruit, int rank) {
 		switch (fruit) {
@@ -105,7 +116,40 @@ void executesLinesFromTextBlock(String fruit, int rank) {
 			case "banana":
 				assertThat(rank).isEqualTo(2);
 				break;
-			case "lemon, lime":
+			case "lemon   \n\n\n   lime":
+				assertThat(rank).isEqualTo(241);
+				break;
+			case "strawberry":
+				assertThat(rank).isEqualTo(700_000);
+				break;
+			default:
+				fail("Unexpected fruit : " + fruit);
+		}
+	}
+
+	@ParameterizedTest
+	@CsvSource(delimiter = '|', quoteCharacter = '"', textBlock = """
+			#-----------------------------
+			#    FRUIT     |     RANK
+			#-----------------------------
+			     apple     |      1
+			#-----------------------------
+			     banana    |      2
+			#-----------------------------
+			  "lemon lime" |     0xF1
+			#-----------------------------
+			   strawberry  |    700_000
+			#-----------------------------
+			""")
+	void executesLinesFromTextBlockUsingPseudoTableFormat(String fruit, int rank) {
+		switch (fruit) {
+			case "apple":
+				assertThat(rank).isEqualTo(1);
+				break;
+			case "banana":
+				assertThat(rank).isEqualTo(2);
+				break;
+			case "lemon lime":
 				assertThat(rank).isEqualTo(241);
 				break;
 			case "strawberry":
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 5fd80cfed377..32fd519baac2 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -324,17 +324,16 @@ void ignoresCommentCharacterWhenUsingValueAttribute() {
 	}
 
 	@Test
-	// TODO Update expectations once https://github.com/junit-team/junit5/issues/2734 has been implemented.
-	void ignoresCommentCharacterWhenUsingTextBlockAttribute() {
+	void honorsCommentCharacterWhenUsingTextBlockAttribute() {
 		var annotation = csvSource().textBlock("""
-					#foo
-					bar, #baz
-					'#bar', baz
+				#foo
+				bar, #baz
+				'#bar', baz
 				""").build();
 
 		var arguments = provideArguments(annotation);
 
-		assertThat(arguments).containsExactly(array("#foo"), array("bar", "#baz"), array("#bar", "baz"));
+		assertThat(arguments).containsExactly(array("bar", "#baz"), array("#bar", "baz"));
 	}
 
 	private Stream<Object[]> provideArguments(CsvSource annotation) {

From 9be7712f9c11cbcc2ea0297d6cc762ff194cc6fa Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 26 Oct 2021 15:08:22 +0200
Subject: [PATCH 0591/1433] Prune 5.8.2 release notes

---
 .../release-notes/release-notes-5.8.2.adoc    | 34 ++-----------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
index cd31ac98052f..b16c00a2c1c1 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.8.2]]
 == 5.8.2
 
-*Date of Release:* ❓
+*Date of Release:* October ❓, 2021
 
 *Scope:*
 
@@ -16,30 +16,12 @@ GitHub.
 [[release-notes-5.8.2-junit-platform]]
 === JUnit Platform
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes.
 
 
 [[release-notes-5.8.2-junit-jupiter]]
 === JUnit Jupiter
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * Text blocks in `@CsvSource` are now treated as complete CSV files, including support for
@@ -55,14 +37,4 @@ GitHub.
 [[release-notes-5.8.2-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes.

From 56afb264e7bf11393ac9325977173b12e98b85ad Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 26 Oct 2021 16:06:20 +0200
Subject: [PATCH 0592/1433] =?UTF-8?q?=F0=9F=8D=92=20=CF=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParameterizedTestIntegrationTests.java    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 9bd67544c79b..2df22f6b62ea 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.params;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -136,12 +137,23 @@ void executesLinesFromTextBlock(String fruit, int rank) {
 			#-----------------------------
 			     banana    |      2
 			#-----------------------------
-			  "lemon lime" |     0xF1
+			     cherry    | 3.1415926535\
+			8979323846\
+			2643383279\
+			5028841971\
+			6939937510\
+			5820974944\
+			5923078164\
+			0628620899\
+			8628034825\
+			3421170679
+			#-----------------------------
+			  "lemon lime" |     99
 			#-----------------------------
 			   strawberry  |    700_000
 			#-----------------------------
 			""")
-	void executesLinesFromTextBlockUsingPseudoTableFormat(String fruit, int rank) {
+	void executesLinesFromTextBlockUsingPseudoTableFormat(String fruit, double rank) {
 		switch (fruit) {
 			case "apple":
 				assertThat(rank).isEqualTo(1);
@@ -149,8 +161,11 @@ void executesLinesFromTextBlockUsingPseudoTableFormat(String fruit, int rank) {
 			case "banana":
 				assertThat(rank).isEqualTo(2);
 				break;
+			case "cherry":
+				assertThat(rank).isCloseTo(Math.PI, within(0.0));
+				break;
 			case "lemon lime":
-				assertThat(rank).isEqualTo(241);
+				assertThat(rank).isEqualTo(99);
 				break;
 			case "strawberry":
 				assertThat(rank).isEqualTo(700_000);

From 3e17b934ad1b9e1d5f443db78b03d6570a4b6627 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 26 Oct 2021 18:17:49 +0200
Subject: [PATCH 0593/1433] Upgrade test-retry plugin for compatibility with
 JDK 17/18

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b46b587240ec..130b14af8b53 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
-	implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
+	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2") // keep in sync with root settings.gradle.kts
 }
 

From b8c26dec535e126c01d89c19fa15fff4908b0103 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 27 Oct 2021 11:08:21 +0200
Subject: [PATCH 0594/1433] Upgradle to 7.3-rc-3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4eb32300a7b7..c14e66cf8ef0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e6a7b81aa2fd2fa05efba3cf7d0c79d629b4d3b189aa4d4b57729933a211af79
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-2-bin.zip
+distributionSha256Sum=d57eb720003db00f85915c48ff4a5ac3c7e8a8a34bd34ced16ca0c7a31c10110
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From d438955d4000b81e455cadbe27e064a4dd238199 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 28 Oct 2021 17:43:21 +0200
Subject: [PATCH 0595/1433] Use switch expressions in
 ParameterizedTestIntegrationTests

---
 .../ParameterizedTestIntegrationTests.java    | 42 +++++--------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 2df22f6b62ea..74c799fcea67 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -111,20 +111,11 @@ class ParameterizedTestIntegrationTests {
 			""")
 	void executesLinesFromTextBlock(String fruit, int rank) {
 		switch (fruit) {
-			case "apple":
-				assertThat(rank).isEqualTo(1);
-				break;
-			case "banana":
-				assertThat(rank).isEqualTo(2);
-				break;
-			case "lemon   \n\n\n   lime":
-				assertThat(rank).isEqualTo(241);
-				break;
-			case "strawberry":
-				assertThat(rank).isEqualTo(700_000);
-				break;
-			default:
-				fail("Unexpected fruit : " + fruit);
+			case "apple" -> assertThat(rank).isEqualTo(1);
+			case "banana" -> assertThat(rank).isEqualTo(2);
+			case "lemon   \n\n\n   lime" -> assertThat(rank).isEqualTo(241);
+			case "strawberry" -> assertThat(rank).isEqualTo(700_000);
+			default -> fail("Unexpected fruit : " + fruit);
 		}
 	}
 
@@ -155,23 +146,12 @@ void executesLinesFromTextBlock(String fruit, int rank) {
 			""")
 	void executesLinesFromTextBlockUsingPseudoTableFormat(String fruit, double rank) {
 		switch (fruit) {
-			case "apple":
-				assertThat(rank).isEqualTo(1);
-				break;
-			case "banana":
-				assertThat(rank).isEqualTo(2);
-				break;
-			case "cherry":
-				assertThat(rank).isCloseTo(Math.PI, within(0.0));
-				break;
-			case "lemon lime":
-				assertThat(rank).isEqualTo(99);
-				break;
-			case "strawberry":
-				assertThat(rank).isEqualTo(700_000);
-				break;
-			default:
-				fail("Unexpected fruit : " + fruit);
+			case "apple" -> assertThat(rank).isEqualTo(1);
+			case "banana" -> assertThat(rank).isEqualTo(2);
+			case "cherry" -> assertThat(rank).isCloseTo(Math.PI, within(0.0));
+			case "lemon lime" -> assertThat(rank).isEqualTo(99);
+			case "strawberry" -> assertThat(rank).isEqualTo(700_000);
+			default -> fail("Unexpected fruit : " + fruit);
 		}
 	}
 

From 26f99c386ba5d91a513b171d86e88339bce0940b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 28 Oct 2021 22:26:21 +0200
Subject: [PATCH 0596/1433] Overhaul Javadoc for @ParameterizedTest

This commit explains where argument names come from when using the
{argumentsWithNames} placeholder.

In addition, this commit actually mentions the name of the
"junit.jupiter.params.displayname.default" configuration parameter.
---
 .../jupiter/params/ParameterizedTest.java     | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index cd4e5ed21bce..93fb6acc8a60 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -158,6 +158,11 @@
 	 * of the current invocation of a {@code @ParameterizedTest} method:
 	 * <code>{argumentsWithNames}</code>
 	 *
+	 * <p>Argument names will be retrieved via the {@link java.lang.reflect.Parameter#getName()}
+	 * API if the byte code contains parameter names &mdash; for example, if
+	 * the code was compiled with the {@code -parameters} command line argument
+	 * for {@code javac}.
+	 *
 	 * @since 5.6
 	 * @see #name
 	 */
@@ -183,10 +188,19 @@
 	 * The display name to be used for individual invocations of the
 	 * parameterized test; never blank or consisting solely of whitespace.
 	 *
-	 * <p> If "{default_display_name}" is returned when invoking name(), we will:
+	 * <p>Defaults to <code>{default_display_name}</code>.
+	 *
+	 * <p>If the default display name flag (<code>{default_display_name}</code>)
+	 * is not overridden, JUnit will:
 	 * <ul>
-	 * <li>Look up the new config param from junit-platform.properties, and if it has been set, use it</li>
-	 * <li>otherwise, we will use the value of the {@link #DEFAULT_DISPLAY_NAME} constant.</li>
+	 * <li>Look up the {@code junit.jupiter.params.displayname.default}
+	 * <em>configuration parameter</em> and use it if available. The configuration
+	 * parameter can be supplied via the {@code Launcher} API, build tools (e.g.,
+	 * Gradle and Maven), a JVM system property, or the JUnit Platform configuration
+	 * file (i.e., a file named {@code junit-platform.properties} in the root of
+	 * the class path). Consult the User Guide for further information.</li>
+	 * <li>Otherwise, the value of the {@link #DEFAULT_DISPLAY_NAME} constant will
+	 * be used.</li>
 	 * </ul>
 	 *
 	 * <h4>Supported placeholders</h4>
@@ -194,16 +208,18 @@
 	 * <li>{@link #DISPLAY_NAME_PLACEHOLDER}</li>
 	 * <li>{@link #INDEX_PLACEHOLDER}</li>
 	 * <li>{@link #ARGUMENTS_PLACEHOLDER}</li>
+	 * <li>{@link #ARGUMENTS_WITH_NAMES_PLACEHOLDER}</li>
 	 * <li><code>{0}</code>, <code>{1}</code>, etc.: an individual argument (0-based)</li>
 	 * </ul>
 	 *
-	 * <p>Note that "{default_display_name}" is a flag rather than a placeholder.
-	 *
 	 * <p>For the latter, you may use {@link java.text.MessageFormat} patterns
 	 * to customize formatting. Please note that the original arguments are
 	 * passed when formatting, regardless of any implicit or explicit argument
 	 * conversions.
 	 *
+	 * <p>Note that <code>{default_display_name}</code> is a flag rather than a
+	 * placeholder.
+	 *
 	 * @see java.text.MessageFormat
 	 */
 	String name() default "{default_display_name}";

From 5fe7b23d37405798aa2c22edc9bc6e5a93e40ee3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 11:49:41 +0200
Subject: [PATCH 0597/1433] Make it possible to debug consoleLauncherTest task

---
 documentation/documentation.gradle.kts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 29310c87a518..3c2ee759639f 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -114,6 +114,7 @@ tasks {
 		outputs.dir(reportsDir)
 		outputs.cacheIf { true }
 		doFirst {
+			val debugging = findProperty("consoleLauncherTestDebug")?.toString()?.toBoolean() ?: false
 			val output = ByteArrayOutputStream()
 			val result = javaexec {
 				classpath = runtimeClasspath
@@ -124,11 +125,14 @@ tasks {
 				args("--exclude-tag", "exclude")
 				args("--reports-dir", reportsDir)
 				systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
-				standardOutput = output
-				errorOutput = output
+				debug = debugging
+				if (!debugging) {
+					standardOutput = output
+					errorOutput = output
+				}
 				isIgnoreExitValue = true
 			}
-			if (result.exitValue != 0) {
+			if (result.exitValue != 0 && !debugging) {
 				System.out.write(output.toByteArray())
 				System.out.flush()
 			}

From 90547670a8e752775c50266cfe498151b15bbc5e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 12:03:29 +0200
Subject: [PATCH 0598/1433] Ensure task is executed on all operating systems

---
 buildSrc/src/main/kotlin/TaskExtensions.kt              | 5 +++++
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 2 +-
 documentation/documentation.gradle.kts                  | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 buildSrc/src/main/kotlin/TaskExtensions.kt

diff --git a/buildSrc/src/main/kotlin/TaskExtensions.kt b/buildSrc/src/main/kotlin/TaskExtensions.kt
new file mode 100644
index 000000000000..7ad4e7ab46cb
--- /dev/null
+++ b/buildSrc/src/main/kotlin/TaskExtensions.kt
@@ -0,0 +1,5 @@
+import org.gradle.api.Task
+import org.gradle.internal.os.OperatingSystem
+
+fun Task.trackOperationSystemAsInput() =
+    inputs.property("os", OperatingSystem.current().familyName)
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 85e36632508b..0fad3034e72d 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -46,7 +46,7 @@ tasks.withType<Test>().configureEach {
 		)
 	}
 	// Track OS as input so that tests are executed on all configured operating systems on CI
-	inputs.property("os", OperatingSystem.current().familyName)
+	trackOperationSystemAsInput()
 }
 
 dependencies {
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 3c2ee759639f..c180bac16acb 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -1,5 +1,6 @@
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
+import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.junit.gradle.exec.ClasspathSystemPropertyProvider
 import org.junit.gradle.javadoc.ModuleSpecificJavadocFileOption
@@ -113,6 +114,10 @@ tasks {
 		val reportsDir = file("$buildDir/test-results")
 		outputs.dir(reportsDir)
 		outputs.cacheIf { true }
+
+		// Track OS as input so that tests are executed on all configured operating systems on CI
+		trackOperationSystemAsInput()
+
 		doFirst {
 			val debugging = findProperty("consoleLauncherTestDebug")?.toString()?.toBoolean() ?: false
 			val output = ByteArrayOutputStream()

From 11da32e72e6efd7039859fdde1a59add4d051a6a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 11:49:55 +0200
Subject: [PATCH 0599/1433] Use loopback address

---
 .../src/docs/asciidoc/user-guide/launcher-api.adoc   | 12 +++++++-----
 .../example/session/GlobalSetupTeardownListener.java |  9 ++++++---
 .../src/test/java/example/session/HttpTests.java     |  9 +++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index def262aec5a4..abcd326e7256 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -145,8 +145,9 @@ package example.session;
 include::{testDir}/example/session/GlobalSetupTeardownListener.java[tags=user_guide]
 ----
 <1> Start the HTTP server
-<2> Export its dynamic port as a system property for consumption by tests
-<3> Stop the HTTP server
+<2> Export its host address as a system property for consumption by tests
+<3> Export its port as a system property for consumption by tests
+<4> Stop the HTTP server
 
 This sample uses the HTTP server implementation from the jdk.httpserver module that comes
 with the JDK but would work similarly with any other server or resource. In order for the
@@ -169,9 +170,10 @@ package example.session;
 
 include::{testDir}/example/session/HttpTests.java[tags=user_guide]
 ----
-<1> Read the port of the server from the system property set by the listener
-<2> Send a request to the server
-<3> Check the status code of the response
+<1> Read the host address of the server from the system property set by the listener
+<2> Read the port of the server from the system property set by the listener
+<3> Send a request to the server
+<4> Check the status code of the response
 
 [[launcher-api-launcher-discovery-listeners-custom]]
 ==== Registering a LauncherDiscoveryListener
diff --git a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
index 9039f683b2a9..fd8bf645e776 100644
--- a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
+++ b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
@@ -11,6 +11,8 @@
 package example.session;
 
 //tag::user_guide[]
+import static java.net.InetAddress.getLoopbackAddress;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.InetSocketAddress;
@@ -57,7 +59,7 @@ static class Fixture {
 
 		void setUp() {
 			try {
-				server = HttpServer.create(new InetSocketAddress(0), 0);
+				server = HttpServer.create(new InetSocketAddress(getLoopbackAddress(), 0), 0);
 			}
 			catch (IOException e) {
 				throw new UncheckedIOException("Failed to start HTTP server", e);
@@ -70,11 +72,12 @@ void setUp() {
 			server.setExecutor(executorService);
 			server.start(); // <1>
 			int port = server.getAddress().getPort();
-			System.setProperty("http.server.port", String.valueOf(port)); // <2>
+			System.setProperty("http.server.host", getLoopbackAddress().getHostAddress()); // <2>
+			System.setProperty("http.server.port", String.valueOf(port)); // <3>
 		}
 
 		void tearDown() {
-			server.stop(0); // <3>
+			server.stop(0); // <4>
 			executorService.shutdownNow();
 		}
 	}
diff --git a/documentation/src/test/java/example/session/HttpTests.java b/documentation/src/test/java/example/session/HttpTests.java
index de6f806510d8..124d54fc48e0 100644
--- a/documentation/src/test/java/example/session/HttpTests.java
+++ b/documentation/src/test/java/example/session/HttpTests.java
@@ -22,14 +22,15 @@ class HttpTests {
 
 	@Test
 	void respondsWith204() throws Exception {
-		String port = System.getProperty("http.server.port"); // <1>
-		URL url = new URL("http://localhost:" + port + "/test");
+		String host = System.getProperty("http.server.host"); // <1>
+		String port = System.getProperty("http.server.port"); // <2>
+		URL url = new URL("http://" + host + ":" + port + "/test");
 
 		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 		connection.setRequestMethod("GET");
-		int responseCode = connection.getResponseCode(); // <2>
+		int responseCode = connection.getResponseCode(); // <3>
 
-		assertEquals(204, responseCode); // <3>
+		assertEquals(204, responseCode); // <4>
 	}
 }
 //end::user_guide[]

From 92296b512c44c24b0eb9beea18e5ceebc4ddc5f6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 13:24:04 +0200
Subject: [PATCH 0600/1433] Suppress/fix compiler warnings on JDK 18

---
 .../src/main/java/org/junit/platform/engine/UniqueId.java    | 4 ++++
 .../main/java/org/junit/platform/engine/UniqueIdFormat.java  | 3 +--
 .../engine/support/descriptor/CompositeTestSource.java       | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index 8610bcba6077..d3c2be240030 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -83,9 +83,13 @@ public static UniqueId root(String segmentType, String value) {
 	}
 
 	private final UniqueIdFormat uniqueIdFormat;
+
+	@SuppressWarnings({ "serial", "RedundantSuppression" }) // always used with serializable implementation (singletonList() or ArrayList)
 	private final List<Segment> segments;
+
 	// lazily computed
 	private transient int hashCode;
+
 	// lazily computed
 	private transient SoftReference<String> toString;
 
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
index 852cd7504f29..dc440834d26e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
@@ -21,7 +21,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -63,7 +62,7 @@ private static String encode(char c) {
 	private final char segmentDelimiter;
 	private final char typeValueSeparator;
 	private final Pattern segmentPattern;
-	private final Map<Character, String> encodedCharacterMap = new HashMap<>();
+	private final HashMap<Character, String> encodedCharacterMap = new HashMap<>();
 
 	UniqueIdFormat(char openSegment, char typeValueSeparator, char closeSegment, char segmentDelimiter) {
 		this.openSegment = openSegment;
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
index 35c2fd648be5..6732adc9697f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
@@ -10,11 +10,11 @@
 
 package org.junit.platform.engine.support.descriptor;
 
+import static java.util.Collections.unmodifiableList;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import org.apiguardian.api.API;
@@ -49,12 +49,13 @@ public static CompositeTestSource from(Collection<? extends TestSource> sources)
 		return new CompositeTestSource(sources);
 	}
 
+	@SuppressWarnings({ "serial", "RedundantSuppression" }) // always used with serializable implementation (unmodifiableList())
 	private final List<TestSource> sources;
 
 	private CompositeTestSource(Collection<? extends TestSource> sources) {
 		Preconditions.notEmpty(sources, "TestSource collection must not be null or empty");
 		Preconditions.containsNoNullElements(sources, "individual TestSources must not be null");
-		this.sources = Collections.unmodifiableList(new ArrayList<>(sources));
+		this.sources = unmodifiableList(new ArrayList<>(sources));
 	}
 
 	/**

From 52b45f64dc6f54aaf38e7033b79981881b5295a8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 14:32:45 +0200
Subject: [PATCH 0601/1433] Avoid starting multiple HTTP servers unnecessarily

---
 documentation/documentation.gradle.kts                      | 1 +
 .../java/example/session/GlobalSetupTeardownListener.java   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index c180bac16acb..4455b23e6b91 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -125,6 +125,7 @@ tasks {
 				classpath = runtimeClasspath
 				mainClass.set("org.junit.platform.console.ConsoleLauncher")
 				args("--scan-classpath")
+				args("--config", "enableHttpServer=true")
 				args("--include-classname", ".*Tests")
 				args("--include-classname", ".*Demo")
 				args("--exclude-tag", "exclude")
diff --git a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
index fd8bf645e776..eb11410018a3 100644
--- a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
+++ b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
@@ -36,6 +36,12 @@ public void launcherSessionOpened(LauncherSession session) {
 		session.getLauncher().registerTestExecutionListeners(new TestExecutionListener() {
 			@Override
 			public void testPlanExecutionStarted(TestPlan testPlan) {
+				//end::user_guide[]
+				if (!testPlan.getConfigurationParameters().getBoolean("enableHttpServer").orElse(false)) {
+					// avoid starting multiple HTTP servers unnecessarily from UsingTheLauncherDemo
+					return;
+				}
+				//tag::user_guide[]
 				if (fixture == null) {
 					fixture = new Fixture();
 					fixture.setUp();

From 2afcf86b707a78bf9623affc1af9891dd55182b1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 15:08:44 +0200
Subject: [PATCH 0602/1433] =?UTF-8?q?Fix=20test=20flakiness=20on=20Windows?=
 =?UTF-8?q?=20=F0=9F=A4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extension/TimeoutExtensionTests.java      | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 7f7b6013240e..522a76b81181 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -32,6 +32,7 @@
 
 import java.time.Duration;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Stream;
 
@@ -273,6 +274,7 @@ Stream<DynamicTest> appliesDefaultTimeoutsFromConfigurationParameters() {
 			DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME, "afterEach()", //
 			DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME, "afterAll()" //
 		).entrySet().stream().map(entry -> dynamicTest("uses " + entry.getKey() + " config param", () -> {
+			PlainTestCase.slowMethod = entry.getValue();
 			EngineExecutionResults results = executeTests(request() //
 					.selectors(selectClass(PlainTestCase.class)) //
 					.configurationParameter(entry.getKey(), "1ns") //
@@ -437,40 +439,49 @@ void methodThatDoesNotThrowInterruptedException() {
 	}
 
 	static class PlainTestCase {
+
+		public static String slowMethod;
+
 		@BeforeAll
 		static void beforeAll() throws Exception {
-			Thread.sleep(10);
+			waitForInterrupt("beforeAll()");
 		}
 
 		@BeforeEach
 		void beforeEach() throws Exception {
-			Thread.sleep(10);
+			waitForInterrupt("beforeEach()");
 		}
 
 		@Test
 		void test() throws Exception {
-			Thread.sleep(10);
+			waitForInterrupt("test()");
 		}
 
 		@RepeatedTest(2)
 		void testTemplate() throws Exception {
-			Thread.sleep(10);
+			waitForInterrupt("testTemplate()");
 		}
 
 		@TestFactory
 		Stream<DynamicTest> testFactory() throws Exception {
-			Thread.sleep(10);
+			waitForInterrupt("testFactory()");
 			return Stream.empty();
 		}
 
 		@AfterEach
 		void afterEach() throws Exception {
-			Thread.sleep(10);
+			waitForInterrupt("afterEach()");
 		}
 
 		@AfterAll
 		static void afterAll() throws Exception {
-			Thread.sleep(10);
+			waitForInterrupt("afterAll()");
+		}
+
+		private static void waitForInterrupt(String methodName) throws InterruptedException {
+			if (methodName.equals(slowMethod)) {
+				new CountDownLatch(1).await();
+			}
 		}
 	}
 

From dfddbfb6eff997537d1bb5e95eb98ea1e5f404e2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 15:15:56 +0200
Subject: [PATCH 0603/1433] Fix ModularUserGuideTests

---
 .../platform/tooling/support/tests/ModularUserGuideTests.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index 1245ca21828a..65da6cfd6805 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -138,6 +138,9 @@ private static void junit(Path temp, Writer out, Writer err) throws Exception {
 
 		command.add("--scan-modules");
 
+		command.add("--config");
+		command.add("enableHttpServer=true");
+
 		command.add("--fail-if-no-tests");
 		command.add("--include-classname");
 		command.add(".*Tests");

From bce973a95afd89e88cdfcf74648144f3f34443ae Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 16:14:07 +0200
Subject: [PATCH 0604/1433] Align Gradle parameters of integration tests

---
 .../tooling/support/tests/GradleKotlinExtensionsTests.java      | 2 +-
 .../java/platform/tooling/support/tests/GradleStarterTests.java | 2 +-
 .../tooling/support/tests/VintageGradleIntegrationTests.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
index 839aa1cf4116..ef8440ae5fba 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -36,7 +36,7 @@ void gradle_wrapper() {
 				.setTool(new GradleWrapper(Request.PROJECTS.resolve("gradle-kotlin-extensions"))) //
 				.setProject("gradle-kotlin-extensions") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
+				.addArguments("build", "--no-daemon", "--stacktrace") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
index 5b39603e2938..c1b70e5ae060 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -38,7 +38,7 @@ void gradle_wrapper() {
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setProject("gradle-starter") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
+				.addArguments("build", "--no-daemon", "--stacktrace") //
 				.setTimeout(Duration.ofMinutes(2)) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index f795bb2dd6b3..8acbce5c3213 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -60,7 +60,7 @@ private Result run(String version) {
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.setProject("vintage") //
 				.setWorkspace("vintage-gradle-" + version) //
-				.addArguments("clean", "test", "--stacktrace") //
+				.addArguments("build", "--no-daemon", "--stacktrace") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
 				.setTimeout(Duration.ofMinutes(2)) //

From ffeb80a9017326c3fb02965328d9b9fa3af80224 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 16:26:16 +0200
Subject: [PATCH 0605/1433] Rename macOS job

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d3a8a8cab0a2..2575b6e9c651 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,7 +87,7 @@ jobs:
           build
 
   mac:
-    name: Mac OS
+    name: macOS
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2

From f2f8d594363d75f113a66710fd24ba658213e1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raymond=20Aug=C3=A9?= <raymond.auge@liferay.com>
Date: Fri, 29 Oct 2021 10:34:56 -0400
Subject: [PATCH 0606/1433] Resolvable.osgi.result (#2654)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows
- junit-jupiter-api & junit-jupiter-params Requires a org.junit.platform.engine=junit-jupiter
- junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter
- junit-vintage-engine Provides org.junit.platform.engine=junit-vintage
- junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher
- junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher

The solution is solvable by consuming junit-jupiter-api & junit-jupiter-params in your tests OR in the case of vintage having @Requirement(namespace = "org.junit.platform.engine", name = "junit-vintage")

Signed-off-by: Raymond Augé <raymond.auge@liferay.com>
---
 .../release-notes/release-notes-5.9.0-M1.adoc    |  2 +-
 junit-jupiter-api/junit-jupiter-api.gradle.kts   | 16 ++++++++++++++++
 .../junit-jupiter-engine.gradle.kts              |  6 ++++++
 .../junit-jupiter-migrationsupport.gradle.kts    |  3 +++
 .../junit-jupiter-params.gradle.kts              | 16 ++++++++++++++++
 junit-jupiter/junit-jupiter.gradle.kts           |  3 +++
 .../junit-platform-console.gradle.kts            |  3 +++
 .../junit-platform-engine.gradle.kts             |  3 +++
 junit-platform-jfr/junit-platform-jfr.gradle.kts |  3 +++
 .../junit-platform-launcher.gradle.kts           | 15 +++++++++++++++
 .../junit-platform-reporting.gradle.kts          |  3 +++
 .../junit-platform-runner.gradle.kts             |  3 +++
 .../junit-platform-suite-api.gradle.kts          |  3 ++-
 .../junit-platform-suite-commons.gradle.kts      |  3 +++
 .../junit-platform-suite-engine.gradle.kts       |  3 +++
 .../junit-platform-suite.gradle.kts              |  3 +++
 .../junit-platform-testkit.gradle.kts            |  3 +++
 .../junit-vintage-engine.gradle.kts              |  6 ++++++
 18 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index b209cfec9b0e..e0d5d1de2d6f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -23,7 +23,7 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at resolution time a fully running set of dependencies are calculated avoiding the need for these to be manually specified.
 
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index a356601ca00b..d28dec7bf358 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -13,4 +13,20 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	compileOnly(kotlin("stdlib"))
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
+}
+
+tasks {
+	jar {
+		bundle {
+			bnd("""
+				Require-Capability:\
+					org.junit.platform.engine;\
+						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${rootProject.property("version")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("version")!!}}})))';\
+						effective:=active
+			""")
+		}
+	}
 }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index ae45480b7141..2d17e2a79ef7 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -23,6 +23,8 @@ dependencies {
 	testImplementation(libs.junit4)
 	testImplementation(libs.kotlinx.coroutines)
 	testImplementation(libs.groovy4)
+
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks {
@@ -39,6 +41,10 @@ tasks {
 					org.junit.platform.engine;\
 						org.junit.platform.engine='junit-jupiter';\
 						version:Version="${'$'}{version_cleanup;${project.version}}"
+				Require-Capability:\
+					org.junit.platform.launcher;\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}}})))';\
+						effective:=active
 			""")
 		}
 	}
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index a45f765d7fef..ff570cc7c87c 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -17,6 +17,9 @@ dependencies {
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks.jar {
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 09bdc726b811..0dc9fe94f11e 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -21,6 +21,22 @@ dependencies {
 
 	compileOnly(kotlin("stdlib"))
 	testImplementation(kotlin("stdlib"))
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
+}
+
+tasks {
+	jar {
+		bundle {
+			bnd("""
+				Require-Capability:\
+					org.junit.platform.engine;\
+						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${rootProject.property("version")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("version")!!}}})))';\
+						effective:=active
+			""")
+		}
+	}
 }
 
 tasks {
diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts
index e453e4325d7c..181698f09437 100644
--- a/junit-jupiter/junit-jupiter.gradle.kts
+++ b/junit-jupiter/junit-jupiter.gradle.kts
@@ -10,4 +10,7 @@ dependencies {
 	api(projects.junitJupiterParams)
 
 	runtimeOnly(projects.junitJupiterEngine)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 04c96ed4c342..7f1d5ac41104 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -14,6 +14,9 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	shadowed(libs.picocli)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks {
diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
index 3c0d77c5cf6c..6c780cea7658 100644
--- a/junit-platform-engine/junit-platform-engine.gradle.kts
+++ b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -13,4 +13,7 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	testImplementation(libs.assertj)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index 0137a8d00b2e..748ea2942e41 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -9,6 +9,9 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 javaLibrary {
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
index 0a154bef093d..d51d0df34677 100644
--- a/junit-platform-launcher/junit-platform-launcher.gradle.kts
+++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -10,4 +10,19 @@ dependencies {
 	api(projects.junitPlatformEngine)
 
 	compileOnlyApi(libs.apiguardian)
+
+	osgiVerification(projects.junitJupiterEngine)
+}
+
+tasks {
+	jar {
+		bundle {
+			bnd("""
+				Provide-Capability:\
+					org.junit.platform.launcher;\
+						org.junit.platform.launcher='junit-platform-launcher';\
+						version:Version="${'$'}{version_cleanup;${project.version}}"
+			""")
+		}
+	}
 }
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index de71c0c576ad..57da6f66bf9e 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -9,4 +9,7 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index de7c0ed09e54..78205ecebbed 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -17,6 +17,9 @@ dependencies {
 
 	testImplementation(testFixtures(projects.junitPlatformEngine))
 	testImplementation(testFixtures(projects.junitPlatformLauncher))
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks.jar {
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
index 416e7cdbdf2b..7be1b0a2a9ce 100644
--- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
+++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -10,5 +10,6 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
-	osgiVerification(projects.junitPlatformCommons)
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 9dcffb8467d3..8f578b0b9c30 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -12,4 +12,7 @@ dependencies {
 
 	implementation(projects.junitPlatformEngine)
 	implementation(projects.junitPlatformSuiteApi)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index e5b737fd6b89..12e7f6746752 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -12,4 +12,7 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	implementation(projects.junitPlatformSuiteCommons)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
index 67ec26ab10a2..8615483d2723 100644
--- a/junit-platform-suite/junit-platform-suite.gradle.kts
+++ b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -8,4 +8,7 @@ dependencies {
 	api(platform(projects.junitBom))
 	api(projects.junitPlatformSuiteApi)
 	implementation(projects.junitPlatformSuiteEngine)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
index 8b5ecf9a1eb7..6a574bcf3882 100644
--- a/junit-platform-testkit/junit-platform-testkit.gradle.kts
+++ b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -11,4 +11,7 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 4ee5a90aa273..0bb61a54d686 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -22,6 +22,8 @@ dependencies {
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
+
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks {
@@ -51,6 +53,10 @@ tasks {
 					org.junit.platform.engine;\
 						org.junit.platform.engine='junit-vintage';\
 						version:Version="${'$'}{version_cleanup;${project.version}}"
+				Require-Capability:\
+					org.junit.platform.launcher;\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}}})))';\
+						effective:=active
 			""")
 		}
 	}

From 8774b2b7799945adc304c3c025bbec6cbd0246d0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 19:18:16 +0200
Subject: [PATCH 0607/1433] Use composite actions to reduce duplication (#2762)

* Add step names
* Archive trace files for all jobs
---
 .github/actions/main-build/action.yml         | 23 +++++
 .github/actions/setup-gradle-jdk/action.yml   | 10 ++
 .github/actions/setup-test-jdk/action.yml     | 13 +++
 .github/workflows/codeql-analysis.yml         |  9 +-
 .github/workflows/cross-version.yml           | 22 ++---
 .../workflows/gradle-wrapper-validation.yml   |  6 +-
 .github/workflows/main.yml                    | 97 ++++---------------
 .github/workflows/reproducible-build.yml      | 10 +-
 8 files changed, 84 insertions(+), 106 deletions(-)
 create mode 100644 .github/actions/main-build/action.yml
 create mode 100644 .github/actions/setup-gradle-jdk/action.yml
 create mode 100644 .github/actions/setup-test-jdk/action.yml

diff --git a/.github/actions/main-build/action.yml b/.github/actions/main-build/action.yml
new file mode 100644
index 000000000000..5e1e48ca02fd
--- /dev/null
+++ b/.github/actions/main-build/action.yml
@@ -0,0 +1,23 @@
+name: Check out, set up JDKs, and run Gradle
+description: Sets up a JDK and env var
+inputs:
+  arguments:
+    required: true
+    description: Gradle arguments
+    default: build
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/setup-test-jdk
+    - uses: ./.github/actions/setup-gradle-jdk
+    - uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          -Porg.gradle.java.installations.auto-download=false
+          -Dplatform.tooling.support.tests.enabled=true
+          javaToolchains
+          ${{ inputs.arguments }}
+    - uses: actions/upload-artifact@v2
+      with:
+        name: Test Distribution trace files (${{ github.job }})
+        path: '**/build/test-results/*/trace.json'
diff --git a/.github/actions/setup-gradle-jdk/action.yml b/.github/actions/setup-gradle-jdk/action.yml
new file mode 100644
index 000000000000..a4ad87a0e174
--- /dev/null
+++ b/.github/actions/setup-gradle-jdk/action.yml
@@ -0,0 +1,10 @@
+name: Set up Gradle JDK
+description: Sets up the JDK required to run Gradle
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 17
diff --git a/.github/actions/setup-test-jdk/action.yml b/.github/actions/setup-test-jdk/action.yml
new file mode 100644
index 000000000000..6d1e25573eaf
--- /dev/null
+++ b/.github/actions/setup-test-jdk/action.yml
@@ -0,0 +1,13 @@
+name: Set up Test JDK
+description: Sets up the JDK required to run platform-tooling-support-tests
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 8
+    - name: Prepare JDK8 env var
+      shell: bash
+      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fc9a52db6a72..9f9df6dccd6b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -21,13 +21,10 @@ jobs:
       matrix:
         language: ['java', 'javascript']
     steps:
-    - name: Checkout repository
+    - name: Check out repository
       uses: actions/checkout@v2
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
+    - name: Set up Gradle JDK
+      uses: ./.github/actions/setup-gradle-jdk
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 6f066a15cdfa..3e7b66195b05 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -23,17 +23,12 @@ jobs:
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out repository
+        uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '8'
-      - name: Prepare JDK8 env var
-        shell: bash
-        run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
+      - name: Set up Test JDK
+        uses: ./.github/actions/setup-test-jdk
       - name: 'Download JDK ${{ matrix.jdk }}'
         id: download-jdk
         uses: sormuras/download-jdk@v1
@@ -48,12 +43,9 @@ jobs:
       - name: 'Prepare JDK${{ matrix.jdk }} env var'
         shell: bash
         run: echo "JDK${{ matrix.jdk }}=$JAVA_HOME" >> $GITHUB_ENV
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Test
+      - name: Set up Gradle JDK
+        uses: ./.github/actions/setup-gradle-jdk
+      - name: Build
         uses: gradle/gradle-build-action@v2
         with:
           arguments: |
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index ba7ceef98a0a..ce98fe801382 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,7 +6,9 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out repository
+        uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - uses: gradle/wrapper-validation-action@v1
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2575b6e9c651..3811cbba66e3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,39 +20,18 @@ jobs:
     name: Linux
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v2
       with:
-        # Codecov needs fetch-depth > 1
-        fetch-depth: 2
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '8'
-    - name: Prepare JDK8 env var
-      shell: bash
-      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Test and coverage
-      uses: gradle/gradle-build-action@v2
+        fetch-depth: 1
+    - name: Build
+      uses: ./.github/actions/main-build
       with:
         arguments: |
-          -Porg.gradle.java.installations.auto-download=false
-          -PenableJaCoCo
-          -Dplatform.tooling.support.tests.enabled=true
           -Dscan.tag.Linux
-          javaToolchains
+          -PenableJaCoCo
           build
           jacocoRootReport
-    - name: Upload Test Distribution trace files
-      uses: actions/upload-artifact@v2
-      with:
-        name: Test Distribution trace files
-        path: '**/build/test-results/*/trace.json'
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v2
 
@@ -60,60 +39,30 @@ jobs:
     name: Windows
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '8'
-    - name: Prepare JDK8 env var
-      shell: bash
-      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Test
-      uses: gradle/gradle-build-action@v2
+    - name: Build
+      uses: ./.github/actions/main-build
       with:
         arguments: |
-          -Porg.gradle.java.installations.auto-download=false
-          -Dplatform.tooling.support.tests.enabled=true
           -Dscan.tag.Windows
-          javaToolchains
           build
 
   mac:
     name: macOS
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '8'
-    - name: Prepare JDK8 env var
-      shell: bash
-      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Test
-      uses: gradle/gradle-build-action@v2
+    - name: Build
+      uses: ./.github/actions/main-build
       with:
         arguments: |
-          -Porg.gradle.java.installations.auto-download=false
-          -Dplatform.tooling.support.tests.enabled=true
           -Dscan.tag.macOS
-          javaToolchains
           build
 
   publish_artifacts:
@@ -122,14 +71,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && (startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main')
     steps:
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
+    - uses: ./.github/actions/setup-gradle-jdk
     - name: Publish
       uses: gradle/gradle-build-action@v2
       env:
@@ -149,14 +95,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
+    - uses: ./.github/actions/setup-gradle-jdk
     - name: Install Graphviz
       run: |
         sudo apt-get update
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 6b2ace12ef2b..3736c6afa0b2 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -17,14 +17,12 @@ jobs:
     name: 'Check build reproducibility'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'temurin'
-        java-version: '17'
+    - name: Set up Gradle JDK
+      uses: ./.github/actions/setup-gradle-jdk
     - name: Restore Gradle cache and display toolchains
       uses: gradle/gradle-build-action@v2
       with:

From 0f2220c062868e89b8f64167ad2b97a02ebb37a7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 19:31:34 +0200
Subject: [PATCH 0608/1433] Update name and description

---
 .github/actions/main-build/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/main-build/action.yml b/.github/actions/main-build/action.yml
index 5e1e48ca02fd..b6c52d149e3c 100644
--- a/.github/actions/main-build/action.yml
+++ b/.github/actions/main-build/action.yml
@@ -1,5 +1,5 @@
-name: Check out, set up JDKs, and run Gradle
-description: Sets up a JDK and env var
+name: Main build
+description: Sets up JDKs and runs Gradle
 inputs:
   arguments:
     required: true

From b4f9059501a2a3327e5b97d08bb677bf7570aa88 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 19:32:23 +0200
Subject: [PATCH 0609/1433] Remove duplication in job names

---
 .github/workflows/main.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3811cbba66e3..269659b840eb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,8 +16,7 @@ env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
-  linux:
-    name: Linux
+  Linux:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
@@ -35,8 +34,7 @@ jobs:
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v2
 
-  windows:
-    name: Windows
+  Windows:
     runs-on: windows-latest
     steps:
     - name: Check out repository
@@ -50,8 +48,7 @@ jobs:
           -Dscan.tag.Windows
           build
 
-  mac:
-    name: macOS
+  macOS:
     runs-on: macos-latest
     steps:
     - name: Check out repository

From e239fd3d88c554a7297f7c7414f2eca8620ef172 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 19:32:51 +0200
Subject: [PATCH 0610/1433] Set step names

---
 .github/workflows/main.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 269659b840eb..fd3dc6234c8c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,7 +72,8 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - uses: ./.github/actions/setup-gradle-jdk
+    - name: Set up Gradle JDK
+      uses: ./.github/actions/setup-gradle-jdk
     - name: Publish
       uses: gradle/gradle-build-action@v2
       env:
@@ -96,7 +97,8 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - uses: ./.github/actions/setup-gradle-jdk
+    - name: Set up Gradle JDK
+      uses: ./.github/actions/setup-gradle-jdk
     - name: Install Graphviz
       run: |
         sudo apt-get update

From 4846399e3248338f8c497c6a0ca910a4bea71066 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 19:33:11 +0200
Subject: [PATCH 0611/1433] Set custom value in build scan for GitHub job

---
 .github/actions/main-build/action.yml | 1 +
 .github/workflows/main.yml            | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/actions/main-build/action.yml b/.github/actions/main-build/action.yml
index b6c52d149e3c..1a572950fd6a 100644
--- a/.github/actions/main-build/action.yml
+++ b/.github/actions/main-build/action.yml
@@ -15,6 +15,7 @@ runs:
         arguments: |
           -Porg.gradle.java.installations.auto-download=false
           -Dplatform.tooling.support.tests.enabled=true
+          "-Dscan.value.GitHub job=${{ github.job }}"
           javaToolchains
           ${{ inputs.arguments }}
     - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd3dc6234c8c..bb7121c2969c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,6 @@ jobs:
       uses: ./.github/actions/main-build
       with:
         arguments: |
-          -Dscan.tag.Linux
           -PenableJaCoCo
           build
           jacocoRootReport
@@ -43,10 +42,6 @@ jobs:
         fetch-depth: 1
     - name: Build
       uses: ./.github/actions/main-build
-      with:
-        arguments: |
-          -Dscan.tag.Windows
-          build
 
   macOS:
     runs-on: macos-latest
@@ -57,10 +52,6 @@ jobs:
         fetch-depth: 1
     - name: Build
       uses: ./.github/actions/main-build
-      with:
-        arguments: |
-          -Dscan.tag.macOS
-          build
 
   publish_artifacts:
     name: Publish Snapshot Artifacts

From 2a6c0ef3383e1b274d6d114221cc5c10f1016291 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Oct 2021 19:45:04 +0200
Subject: [PATCH 0612/1433] Extract run-gradle action

---
 .github/actions/main-build/action.yml       | 10 ++-------
 .github/actions/run-gradle/action.yml       | 25 +++++++++++++++++++++
 .github/actions/setup-gradle-jdk/action.yml | 10 ---------
 .github/actions/setup-test-jdk/action.yml   |  6 ++---
 .github/workflows/codeql-analysis.yml       |  6 +----
 .github/workflows/cross-version.yml         |  7 +-----
 .github/workflows/main.yml                  | 19 ++++------------
 .github/workflows/reproducible-build.yml    |  8 ++-----
 8 files changed, 37 insertions(+), 54 deletions(-)
 create mode 100644 .github/actions/run-gradle/action.yml
 delete mode 100644 .github/actions/setup-gradle-jdk/action.yml

diff --git a/.github/actions/main-build/action.yml b/.github/actions/main-build/action.yml
index 1a572950fd6a..da776ec5c600 100644
--- a/.github/actions/main-build/action.yml
+++ b/.github/actions/main-build/action.yml
@@ -9,15 +9,9 @@ runs:
   using: "composite"
   steps:
     - uses: ./.github/actions/setup-test-jdk
-    - uses: ./.github/actions/setup-gradle-jdk
-    - uses: gradle/gradle-build-action@v2
+    - uses: ./.github/actions/run-gradle
       with:
-        arguments: |
-          -Porg.gradle.java.installations.auto-download=false
-          -Dplatform.tooling.support.tests.enabled=true
-          "-Dscan.value.GitHub job=${{ github.job }}"
-          javaToolchains
-          ${{ inputs.arguments }}
+        arguments: ${{ inputs.arguments }}
     - uses: actions/upload-artifact@v2
       with:
         name: Test Distribution trace files (${{ github.job }})
diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
new file mode 100644
index 000000000000..929f9be181be
--- /dev/null
+++ b/.github/actions/run-gradle/action.yml
@@ -0,0 +1,25 @@
+name: Run Gradle
+description: Sets up Gradle JDKs and runs Gradle
+inputs:
+  arguments:
+    required: true
+    description: Gradle arguments
+    default: build
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-java@v2
+      id: setup-gradle-jdk
+      with:
+        distribution: temurin
+        java-version: 17
+    - uses: gradle/gradle-build-action@v2
+      env:
+        JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
+      with:
+        arguments: |
+          -Porg.gradle.java.installations.auto-download=false
+          -Dplatform.tooling.support.tests.enabled=true
+          "-Dscan.value.GitHub job=${{ github.job }}"
+          javaToolchains
+          ${{ inputs.arguments }}
diff --git a/.github/actions/setup-gradle-jdk/action.yml b/.github/actions/setup-gradle-jdk/action.yml
deleted file mode 100644
index a4ad87a0e174..000000000000
--- a/.github/actions/setup-gradle-jdk/action.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Set up Gradle JDK
-description: Sets up the JDK required to run Gradle
-runs:
-  using: "composite"
-  steps:
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        distribution: temurin
-        java-version: 17
diff --git a/.github/actions/setup-test-jdk/action.yml b/.github/actions/setup-test-jdk/action.yml
index 6d1e25573eaf..8dc70985295b 100644
--- a/.github/actions/setup-test-jdk/action.yml
+++ b/.github/actions/setup-test-jdk/action.yml
@@ -3,11 +3,9 @@ description: Sets up the JDK required to run platform-tooling-support-tests
 runs:
   using: "composite"
   steps:
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
+    - uses: actions/setup-java@v2
       with:
         distribution: temurin
         java-version: 8
-    - name: Prepare JDK8 env var
-      shell: bash
+    - shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9f9df6dccd6b..9a0cb0e47d80 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,21 +23,17 @@ jobs:
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
-    - name: Set up Gradle JDK
-      uses: ./.github/actions/setup-gradle-jdk
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
     - name: Build
-      uses: gradle/gradle-build-action@v2
+      uses: ./.github/actions/run-gradle
       with:
         arguments: |
           --no-build-cache
-          -Porg.gradle.java.installations.auto-download=false
           -PjavaToolchainVersion=11
           -Dscan.tag.CodeQL
-          javaToolchains
           allMainClasses
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 3e7b66195b05..20e5806f08ed 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -43,17 +43,12 @@ jobs:
       - name: 'Prepare JDK${{ matrix.jdk }} env var'
         shell: bash
         run: echo "JDK${{ matrix.jdk }}=$JAVA_HOME" >> $GITHUB_ENV
-      - name: Set up Gradle JDK
-        uses: ./.github/actions/setup-gradle-jdk
       - name: Build
-        uses: gradle/gradle-build-action@v2
+        uses: ./.github/actions/run-gradle
         with:
           arguments: |
-            -Porg.gradle.java.installations.auto-download=false
             -PjavaToolchainVersion=${{ matrix.jdk }}
-            -Dplatform.tooling.support.tests.enabled=true
             -Dscan.tag.JDK_${{ matrix.jdk }}
-            javaToolchains
             build
       - name: Upload Test Distribution trace files
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bb7121c2969c..617842d56cf3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -63,20 +63,13 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up Gradle JDK
-      uses: ./.github/actions/setup-gradle-jdk
     - name: Publish
-      uses: gradle/gradle-build-action@v2
+      uses: ./.github/actions/run-gradle
       env:
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       with:
-        arguments: |
-          -Porg.gradle.java.installations.auto-download=false
-          -Dscan.tag.Snapshots
-          javaToolchains
-          publish
-          -x check
+        arguments: publish -x check
 
   update_documentation:
     name: Update Snapshot Documentation
@@ -88,18 +81,14 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up Gradle JDK
-      uses: ./.github/actions/setup-gradle-jdk
     - name: Install Graphviz
       run: |
         sudo apt-get update
         sudo apt-get install graphviz
     - name: Restore Gradle cache and display toolchains
-      uses: gradle/gradle-build-action@v2
+      uses: ./.github/actions/run-gradle
       with:
-        arguments: |
-          -Porg.gradle.java.installations.auto-download=false
-          javaToolchains
+        arguments: --quiet
     - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 3736c6afa0b2..3a9d1fe3267f 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -21,14 +21,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 1
-    - name: Set up Gradle JDK
-      uses: ./.github/actions/setup-gradle-jdk
     - name: Restore Gradle cache and display toolchains
-      uses: gradle/gradle-build-action@v2
+      uses: ./.github/actions/run-gradle
       with:
-        arguments: |
-          -Porg.gradle.java.installations.auto-download=false
-          javaToolchains
+        arguments: --quiet
     - name: Build and compare checksums
       shell: bash
       run: |

From 2b081134347bf243bc238a09b0aaae8d79e45113 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 12:54:59 +0100
Subject: [PATCH 0613/1433] Remove OSS from integration test project examples

Tests were sometimes flaky when run while snapshots were being
published. Since we currently don't have any snapshot dependencies we
can remove this source of flakiness for the time being.

Resolves #2754.
---
 .../projects/gradle-kotlin-extensions/build.gradle.kts |  1 -
 .../projects/gradle-missing-engine/build.gradle.kts    |  1 -
 .../projects/gradle-starter/build.gradle.kts           |  1 -
 .../projects/java-versions/pom.xml                     | 10 ----------
 .../projects/maven-starter/pom.xml                     | 10 ----------
 .../projects/multi-release-jar/default/pom.xml         | 10 ----------
 .../projects/vintage/build.gradle.kts                  |  1 -
 .../projects/vintage/pom.xml                           | 10 ----------
 8 files changed, 44 deletions(-)

diff --git a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts
index 2247a1f75bb5..c5245e8a531e 100644
--- a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 repositories {
 	maven { url = uri(file(System.getProperty("maven.repo"))) }
 	mavenCentral()
-	maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
 }
 
 // don't use `build` as target to prevent Jenkins picking up
diff --git a/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts
index 978d9ce673e2..29906a0122be 100644
--- a/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts
@@ -28,7 +28,6 @@ platformVersion=$platformVersion
 repositories {
 	maven { url = uri(file(System.getProperty("maven.repo"))) }
 	mavenCentral()
-	maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
 }
 
 dependencies {
diff --git a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
index 5d0ebf16ba41..fc89adfbd7eb 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
@@ -21,7 +21,6 @@ platformVersion=$platformVersion
 repositories {
 	maven { url = uri(file(System.getProperty("maven.repo"))) }
 	mavenCentral()
-	maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
 }
 
 dependencies {
diff --git a/platform-tooling-support-tests/projects/java-versions/pom.xml b/platform-tooling-support-tests/projects/java-versions/pom.xml
index 9e6b754141ae..7123e267d45c 100644
--- a/platform-tooling-support-tests/projects/java-versions/pom.xml
+++ b/platform-tooling-support-tests/projects/java-versions/pom.xml
@@ -58,16 +58,6 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
     </repositories>
 
 </project>
diff --git a/platform-tooling-support-tests/projects/maven-starter/pom.xml b/platform-tooling-support-tests/projects/maven-starter/pom.xml
index f11478c7c552..21259e2fb99f 100644
--- a/platform-tooling-support-tests/projects/maven-starter/pom.xml
+++ b/platform-tooling-support-tests/projects/maven-starter/pom.xml
@@ -65,16 +65,6 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
     </repositories>
 
 </project>
diff --git a/platform-tooling-support-tests/projects/multi-release-jar/default/pom.xml b/platform-tooling-support-tests/projects/multi-release-jar/default/pom.xml
index 910145d08a17..7e5e564dd7c9 100644
--- a/platform-tooling-support-tests/projects/multi-release-jar/default/pom.xml
+++ b/platform-tooling-support-tests/projects/multi-release-jar/default/pom.xml
@@ -65,16 +65,6 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
     </repositories>
 
 </project>
diff --git a/platform-tooling-support-tests/projects/vintage/build.gradle.kts b/platform-tooling-support-tests/projects/vintage/build.gradle.kts
index 8968856e3811..4d691459831f 100644
--- a/platform-tooling-support-tests/projects/vintage/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/vintage/build.gradle.kts
@@ -8,7 +8,6 @@ plugins {
 repositories {
 	maven { url = uri(file(System.getProperty("maven.repo"))) }
 	mavenCentral()
-	maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
 }
 
 dependencies {
diff --git a/platform-tooling-support-tests/projects/vintage/pom.xml b/platform-tooling-support-tests/projects/vintage/pom.xml
index 32c537838847..47a0f145cf89 100644
--- a/platform-tooling-support-tests/projects/vintage/pom.xml
+++ b/platform-tooling-support-tests/projects/vintage/pom.xml
@@ -59,16 +59,6 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
     </repositories>
 
 </project>

From f68148a39bec54520cff295205b20def4b5b0817 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 15:55:28 +0100
Subject: [PATCH 0614/1433] Update Gradle Enterprise plugins

---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 130b14af8b53..cb7d132bbbf2 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.1") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4797fa96b64f..c40ee6eb9042 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,8 +5,8 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.7"
-		id("com.gradle.enterprise.test-distribution") version "2.2" // keep in sync with buildSrc/buiild.gradle.kts
+		id("com.gradle.enterprise") version "3.7.1"
+		id("com.gradle.enterprise.test-distribution") version "2.2.1" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"

From 851c1b29ad5cb418235723d7f462f5dbe7e04f60 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 17:43:55 +0100
Subject: [PATCH 0615/1433] Remove unused import

---
 buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index 19706ca87132..e1e899148ed0 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
-
 val javaToolchainVersion: String? by project
 val defaultLanguageVersion = JavaLanguageVersion.of(17)
 val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: defaultLanguageVersion

From c0c5876a1d82718aee81847d6d0a094861457530 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 17:51:52 +0100
Subject: [PATCH 0616/1433] Fix compiler warning

---
 .../main/java/org/junit/platform/launcher/TestIdentifier.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index 15ab32387a23..fcf9e9428e41 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -301,6 +301,7 @@ private static class SerializedForm implements Serializable {
 		private final String displayName;
 		private final String legacyReportingName;
 		private final TestSource source;
+		@SuppressWarnings({ "serial", "RedundantSuppression" }) // always used with serializable implementation (see TestIdentifier#copyOf())
 		private final Set<TestTag> tags;
 		private final Type type;
 

From 89b75718675b6ef5dfbd1a98ec0e7ddd4845aa9d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 17:54:35 +0100
Subject: [PATCH 0617/1433] Do not cache outputs of compile tasks on EA
 versions of Java

Since new versions often introduce new compiler warnings that need to be
fixed.
---
 buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index e1e899148ed0..c657f937979d 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -9,4 +9,7 @@ project.pluginManager.withPlugin("java") {
 	tasks.withType<JavaExec>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor(extension.toolchain))
 	}
+	tasks.withType<JavaCompile>().configureEach {
+		outputs.cacheIf { javaLanguageVersion == defaultLanguageVersion }
+	}
 }

From 2558fb72bec4857543badc3a6d7f6489f3a4c79f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 18:12:44 +0100
Subject: [PATCH 0618/1433] Archive trace files also for failing builds

---
 .github/actions/main-build/action.yml |  4 ----
 .github/workflows/main.yml            | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/actions/main-build/action.yml b/.github/actions/main-build/action.yml
index da776ec5c600..aa6e501bee3c 100644
--- a/.github/actions/main-build/action.yml
+++ b/.github/actions/main-build/action.yml
@@ -12,7 +12,3 @@ runs:
     - uses: ./.github/actions/run-gradle
       with:
         arguments: ${{ inputs.arguments }}
-    - uses: actions/upload-artifact@v2
-      with:
-        name: Test Distribution trace files (${{ github.job }})
-        path: '**/build/test-results/*/trace.json'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 617842d56cf3..836b15b87ed9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,6 +30,12 @@ jobs:
           -PenableJaCoCo
           build
           jacocoRootReport
+    - name: Archive Test Distribution trace files
+      uses: actions/upload-artifact@v2
+      if: ${{ always() }}
+      with:
+        name: Test Distribution trace files (${{ github.job }})
+        path: '**/build/test-results/*/trace.json'
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v2
 
@@ -42,6 +48,12 @@ jobs:
         fetch-depth: 1
     - name: Build
       uses: ./.github/actions/main-build
+    - name: Archive Test Distribution trace files
+      uses: actions/upload-artifact@v2
+      if: ${{ always() }}
+      with:
+        name: Test Distribution trace files (${{ github.job }})
+        path: '**/build/test-results/*/trace.json'
 
   macOS:
     runs-on: macos-latest
@@ -52,6 +64,12 @@ jobs:
         fetch-depth: 1
     - name: Build
       uses: ./.github/actions/main-build
+    - name: Archive Test Distribution trace files
+      uses: actions/upload-artifact@v2
+      if: ${{ always() }}
+      with:
+        name: Test Distribution trace files (${{ github.job }})
+        path: '**/build/test-results/*/trace.json'
 
   publish_artifacts:
     name: Publish Snapshot Artifacts

From d66f2a954178baf8549816f3a455b46bf3bfe42b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 18:46:37 +0100
Subject: [PATCH 0619/1433] Check that thread is not already interrupted

---
 .../java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index e37209c503df..5e751a59a5ce 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -315,6 +315,7 @@ private void nap() throws InterruptedException {
 
 	private void waitForInterrupt() {
 		try {
+			assertFalse(Thread.interrupted(), "Already interrupted");
 			new CountDownLatch(1).await();
 		}
 		catch (InterruptedException ignore) {

From d3c61f7c1244b583aadba2c2efa2ae4f9b7ed1db Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Sun, 31 Oct 2021 20:30:15 +0100
Subject: [PATCH 0620/1433] Bump Maven plugin versions

Bump Maven plugin versions in integration test project.

Might also resolve issue #2764
---
 .../projects/multi-release-jar/default/pom.xml             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform-tooling-support-tests/projects/multi-release-jar/default/pom.xml b/platform-tooling-support-tests/projects/multi-release-jar/default/pom.xml
index 7e5e564dd7c9..0904feb98643 100644
--- a/platform-tooling-support-tests/projects/multi-release-jar/default/pom.xml
+++ b/platform-tooling-support-tests/projects/multi-release-jar/default/pom.xml
@@ -34,7 +34,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
+                    <version>3.8.1</version>
                     <configuration>
                         <release>11</release>
                     </configuration>
@@ -45,10 +45,13 @@
             <plugin>
                 <groupId>de.sormuras.junit</groupId>
                 <artifactId>junit-platform-maven-plugin</artifactId>
-                <version>1.0.0-M5</version>
+                <version>1.1.5</version>
                 <extensions>true</extensions>
                 <configuration>
                     <executor>JAVA</executor>
+                    <tweaks>
+                        <disableAnsi>true</disableAnsi>
+                    </tweaks>
                 </configuration>
             </plugin>
         </plugins>

From 60ccef2e687a7bdd14dec817a7a44adda22a5aed Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 19:23:50 +0100
Subject: [PATCH 0621/1433] Introduce OS.current()

---
 .../main/java/org/junit/jupiter/api/condition/OS.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
index 4492d9edefb2..82df6bba98e6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api.condition;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Locale;
@@ -78,6 +79,16 @@ public enum OS {
 
 	private static final OS CURRENT_OS = determineCurrentOs();
 
+	/**
+	 * Get the current operating system.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	public static OS current() {
+		return CURRENT_OS;
+	}
+
 	private static OS determineCurrentOs() {
 		return parse(System.getProperty("os.name"));
 	}

From 5961577d0a5fdc177926dc0ec0572d48f972761e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 19:25:39 +0100
Subject: [PATCH 0622/1433] Use longer timeouts to stabilize flaky tests

---
 .../api/AssertTimeoutAssertionsTests.java     | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index 5e751a59a5ce..cf1d8803c9d9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -21,11 +21,14 @@
 import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.condition.OS.WINDOWS;
 
+import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.function.Executable;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.opentest4j.AssertionFailedError;
@@ -37,6 +40,8 @@
  */
 class AssertTimeoutAssertionsTests {
 
+	private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(OS.current() == WINDOWS ? 1000 : 100);
+
 	private static ThreadLocal<AtomicBoolean> changed = ThreadLocal.withInitial(() -> new AtomicBoolean(false));
 
 	private final Executable nix = () -> {
@@ -189,8 +194,8 @@ void assertTimeoutPreemptivelyForExecutableThatThrowsAnAssertionFailedError() {
 	@Test
 	void assertTimeoutPreemptivelyForExecutableThatCompletesAfterTheTimeout() {
 		AssertionFailedError error = assertThrows(AssertionFailedError.class,
-			() -> assertTimeoutPreemptively(ofMillis(10), this::waitForInterrupt));
-		assertMessageEquals(error, "execution timed out after 10 ms");
+			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt));
+		assertMessageEquals(error, "execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
 		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
 		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
 	}
@@ -198,8 +203,9 @@ void assertTimeoutPreemptivelyForExecutableThatCompletesAfterTheTimeout() {
 	@Test
 	void assertTimeoutPreemptivelyWithMessageForExecutableThatCompletesAfterTheTimeout() {
 		AssertionFailedError error = assertThrows(AssertionFailedError.class,
-			() -> assertTimeoutPreemptively(ofMillis(10), this::waitForInterrupt, "Tempus Fugit"));
-		assertMessageEquals(error, "Tempus Fugit ==> execution timed out after 10 ms");
+			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt, "Tempus Fugit"));
+		assertMessageEquals(error,
+			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
 		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
 		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
 	}
@@ -207,8 +213,10 @@ void assertTimeoutPreemptivelyWithMessageForExecutableThatCompletesAfterTheTimeo
 	@Test
 	void assertTimeoutPreemptivelyWithMessageSupplierForExecutableThatCompletesAfterTheTimeout() {
 		AssertionFailedError error = assertThrows(AssertionFailedError.class,
-			() -> assertTimeoutPreemptively(ofMillis(10), this::waitForInterrupt, () -> "Tempus" + " " + "Fugit"));
-		assertMessageEquals(error, "Tempus Fugit ==> execution timed out after 10 ms");
+			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt,
+				() -> "Tempus" + " " + "Fugit"));
+		assertMessageEquals(error,
+			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
 		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
 		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
 	}
@@ -258,12 +266,13 @@ void assertTimeoutPreemptivelyForSupplierThatThrowsAnAssertionFailedError() {
 	@Test
 	void assertTimeoutPreemptivelyForSupplierThatCompletesAfterTheTimeout() {
 		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
-			assertTimeoutPreemptively(ofMillis(10), () -> {
+			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
 				waitForInterrupt();
 				return "Tempus Fugit";
 			});
 		});
-		assertMessageEquals(error, "execution timed out after 10 ms");
+
+		assertMessageEquals(error, "execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
 		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
 		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
 	}
@@ -271,12 +280,14 @@ void assertTimeoutPreemptivelyForSupplierThatCompletesAfterTheTimeout() {
 	@Test
 	void assertTimeoutPreemptivelyWithMessageForSupplierThatCompletesAfterTheTimeout() {
 		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
-			assertTimeoutPreemptively(ofMillis(10), () -> {
+			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
 				waitForInterrupt();
 				return "Tempus Fugit";
 			}, "Tempus Fugit");
 		});
-		assertMessageEquals(error, "Tempus Fugit ==> execution timed out after 10 ms");
+
+		assertMessageEquals(error,
+			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
 		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
 		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
 	}
@@ -284,12 +295,14 @@ void assertTimeoutPreemptivelyWithMessageForSupplierThatCompletesAfterTheTimeout
 	@Test
 	void assertTimeoutPreemptivelyWithMessageSupplierForSupplierThatCompletesAfterTheTimeout() {
 		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
-			assertTimeoutPreemptively(ofMillis(10), () -> {
+			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
 				waitForInterrupt();
 				return "Tempus Fugit";
 			}, () -> "Tempus" + " " + "Fugit");
 		});
-		assertMessageEquals(error, "Tempus Fugit ==> execution timed out after 10 ms");
+
+		assertMessageEquals(error,
+			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
 		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
 		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
 	}

From a1b3e43e9dbbcd63d55729888c02bb158af916d2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 1 Nov 2021 10:21:37 +0100
Subject: [PATCH 0623/1433] Increase tool timeout to reduce flakiness

---
 .../src/main/java/platform/tooling/support/Helper.java       | 3 +++
 .../tooling/support/tests/GradleKotlinExtensionsTests.java   | 5 ++---
 .../tooling/support/tests/GradleMissingEngineTests.java      | 4 ++--
 .../platform/tooling/support/tests/GradleStarterTests.java   | 4 ++--
 .../platform/tooling/support/tests/JavaVersionsTests.java    | 4 ++--
 .../platform/tooling/support/tests/MavenStarterTests.java    | 5 ++---
 .../platform/tooling/support/tests/MultiReleaseJarTests.java | 4 ++--
 .../tooling/support/tests/VintageGradleIntegrationTests.java | 4 ++--
 .../tooling/support/tests/VintageMavenIntegrationTests.java  | 5 ++---
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 34b79040e3c7..453a72cdb676 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -15,6 +15,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -33,6 +34,8 @@
  */
 public class Helper {
 
+	public static final Duration TOOL_TIMEOUT = Duration.ofMinutes(3);
+
 	private static final Path ROOT = Paths.get("..");
 	private static final Path GRADLE_PROPERTIES = ROOT.resolve("gradle.properties");
 	private static final Path SETTINGS_GRADLE = ROOT.resolve("settings.gradle.kts");
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
index ef8440ae5fba..994ae303209d 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -13,8 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import de.sormuras.bartholdy.tool.GradleWrapper;
 
@@ -37,7 +36,7 @@ void gradle_wrapper() {
 				.setProject("gradle-kotlin-extensions") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--stacktrace") //
-				.setTimeout(Duration.ofMinutes(2)) //
+				.setTimeout(TOOL_TIMEOUT) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
 				.run();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
index 0208f6f050b3..0f5ed11d0535 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -13,9 +13,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Paths;
-import java.time.Duration;
 import java.util.List;
 
 import de.sormuras.bartholdy.Tool;
@@ -47,7 +47,7 @@ private void test(Tool gradle) {
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
-				.setTimeout(Duration.ofMinutes(2)).build() //
+				.setTimeout(TOOL_TIMEOUT).build() //
 				.run();
 
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
index c1b70e5ae060..0d5b085c272f 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -14,9 +14,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Paths;
-import java.time.Duration;
 
 import de.sormuras.bartholdy.tool.GradleWrapper;
 
@@ -39,7 +39,7 @@ void gradle_wrapper() {
 				.setProject("gradle-starter") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--stacktrace") //
-				.setTimeout(Duration.ofMinutes(2)) //
+				.setTimeout(TOOL_TIMEOUT) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
 				.run();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
index 7a762022e388..5b9a2d76aa80 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -14,9 +14,9 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Path;
-import java.time.Duration;
 import java.util.List;
 
 import de.sormuras.bartholdy.tool.Java;
@@ -55,7 +55,7 @@ List<String> execute(String version, Path javaHome) {
 				.setWorkspace("java-versions-" + version) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("--debug", "--batch-mode", "verify") //
-				.setTimeout(Duration.ofMinutes(2)) //
+				.setTimeout(TOOL_TIMEOUT) //
 				.setJavaHome(javaHome) //
 				.build().run();
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
index 7ae2cff7b9bc..95e0c8493bac 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -14,8 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import org.junit.jupiter.api.Test;
 import org.opentest4j.TestAbortedException;
@@ -36,7 +35,7 @@ void verifyMavenStarterProject() {
 				.setProject("maven-starter") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("--debug", "--batch-mode", "verify") //
-				.setTimeout(Duration.ofMinutes(2)) //
+				.setTimeout(TOOL_TIMEOUT) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
 				.run();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
index 65c1edcaa0f1..34d0e2a7f53e 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -14,10 +14,10 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.Duration;
 import java.util.List;
 
 import de.sormuras.bartholdy.Result;
@@ -85,7 +85,7 @@ private Result mvn(String variant) {
 				.setProject("multi-release-jar") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("--show-version", "--errors", "--batch-mode", "--file", variant, "test") //
-				.setTimeout(Duration.ofMinutes(2)) //
+				.setTimeout(TOOL_TIMEOUT) //
 				.build() //
 				.run();
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index 8acbce5c3213..ba97fc28478e 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -12,9 +12,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Paths;
-import java.time.Duration;
 
 import de.sormuras.bartholdy.Result;
 import de.sormuras.bartholdy.tool.GradleWrapper;
@@ -63,7 +63,7 @@ private Result run(String version) {
 				.addArguments("build", "--no-daemon", "--stacktrace") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
-				.setTimeout(Duration.ofMinutes(2)) //
+				.setTimeout(TOOL_TIMEOUT) //
 				.build() //
 				.run();
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index cf992c88b3eb..7f2936bc90ad 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -12,8 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-
-import java.time.Duration;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import de.sormuras.bartholdy.Result;
 
@@ -63,7 +62,7 @@ private Result run(String version) {
 				.addArguments("clean", "test", "--debug", "--batch-mode") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
-				.setTimeout(Duration.ofMinutes(2)) //
+				.setTimeout(TOOL_TIMEOUT) //
 				.build() //
 				.run();
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);

From 74a6b4e51c8cf08b5336f23ff56516783c446cc5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 1 Nov 2021 10:50:57 +0100
Subject: [PATCH 0624/1433] Always update snapshots

and remove debug logging as it might leak secrets
---
 .../java/platform/tooling/support/tests/JavaVersionsTests.java | 2 +-
 .../java/platform/tooling/support/tests/MavenStarterTests.java | 2 +-
 .../platform/tooling/support/tests/MultiReleaseJarTests.java   | 3 ++-
 .../tooling/support/tests/VintageMavenIntegrationTests.java    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
index 5b9a2d76aa80..ca545d46368f 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -54,7 +54,7 @@ List<String> execute(String version, Path javaHome) {
 				.setProject("java-versions") //
 				.setWorkspace("java-versions-" + version) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("--debug", "--batch-mode", "verify") //
+				.addArguments("--update-snapshots", "--batch-mode", "verify") //
 				.setTimeout(TOOL_TIMEOUT) //
 				.setJavaHome(javaHome) //
 				.build().run();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
index 95e0c8493bac..55bfe5020d23 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -34,7 +34,7 @@ void verifyMavenStarterProject() {
 				.setTool(Request.maven()) //
 				.setProject("maven-starter") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("--debug", "--batch-mode", "verify") //
+				.addArguments("--update-snapshots", "--batch-mode", "verify") //
 				.setTimeout(TOOL_TIMEOUT) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.build() //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
index 34d0e2a7f53e..a371d9f8a93a 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -84,7 +84,8 @@ private Result mvn(String variant) {
 				.setTool(Request.maven()) //
 				.setProject("multi-release-jar") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("--show-version", "--errors", "--batch-mode", "--file", variant, "test") //
+				.addArguments("--update-snapshots", "--show-version", "--errors", "--batch-mode", "--file", variant,
+					"test") //
 				.setTimeout(TOOL_TIMEOUT) //
 				.build() //
 				.run();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index 7f2936bc90ad..267175b9e285 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -59,7 +59,7 @@ private Result run(String version) {
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
 				.setProject("vintage") //
 				.setWorkspace("vintage-maven-" + version) //
-				.addArguments("clean", "test", "--debug", "--batch-mode") //
+				.addArguments("clean", "test", "--update-snapshots", "--batch-mode") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
 				.setTimeout(TOOL_TIMEOUT) //

From 54f8bd54a17b21f33f4cc56ec1ee50078997727a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 1 Nov 2021 17:19:21 +0100
Subject: [PATCH 0625/1433] Update ArchUnit to 0.22.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 93eaf85d38a8..a356b55c40d9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ surefire = "2.22.2"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.20.1" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.22.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }

From f310f29ac9ecd0faa8a15cebbdbfdcc53eb96d07 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Oct 2021 12:42:49 +0200
Subject: [PATCH 0626/1433] Introduce IterationSelector
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leonard Brünings <lbruenings@gradle.com>
---
 .../jupiter/engine/descriptor/Filterable.java |  2 +
 .../engine/descriptor/IterationFilter.java    | 41 ++++++++++
 .../descriptor/TestFactoryTestDescriptor.java | 15 +++-
 .../TestTemplateTestDescriptor.java           |  6 ++
 .../discovery/MethodSelectorResolver.java     | 32 ++++++--
 .../engine/DynamicNodeGenerationTests.java    | 19 +++++
 .../platform/commons/util/Preconditions.java  | 18 +++++
 .../engine/discovery/DiscoverySelectors.java  |  7 ++
 .../engine/discovery/IterationSelector.java   | 78 +++++++++++++++++++
 .../EngineDiscoveryRequestResolution.java     |  4 +
 .../support/discovery/SelectorResolver.java   |  6 ++
 11 files changed, 220 insertions(+), 8 deletions(-)
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/IterationFilter.java
 create mode 100644 junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
index e39e9e5ca72c..eed122d35a9b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
@@ -27,4 +27,6 @@ public interface Filterable {
 
 	DynamicDescendantFilter getDynamicDescendantFilter();
 
+	IterationFilter getIterationFilter();
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/IterationFilter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/IterationFilter.java
new file mode 100644
index 000000000000..30ec6fd39d67
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/IterationFilter.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.descriptor;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Predicate;
+
+public class IterationFilter implements Predicate<Integer> {
+
+	private final Set<Integer> allowed = new HashSet<>();
+	private Mode mode = Mode.EXPLICIT;
+
+	public void allow(Set<Integer> indices) {
+		if (this.mode == Mode.EXPLICIT) {
+			this.allowed.addAll(indices);
+		}
+	}
+
+	public void allowAll() {
+		this.mode = Mode.ALLOW_ALL;
+		this.allowed.clear();
+	}
+
+	@Override
+	public boolean test(Integer index) {
+		return allowed.isEmpty() || allowed.contains(index);
+	}
+
+	private enum Mode {
+		EXPLICIT, ALLOW_ALL
+	}
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
index d6adeda3ccab..48632b22e5b5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
@@ -61,6 +61,7 @@ public class TestFactoryTestDescriptor extends TestMethodTestDescriptor implemen
 	private static final ExecutableInvoker executableInvoker = new ExecutableInvoker();
 
 	private final DynamicDescendantFilter dynamicDescendantFilter = new DynamicDescendantFilter();
+	private final IterationFilter iterationFilter = new IterationFilter();
 
 	public TestFactoryTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method testMethod,
 			JupiterConfiguration configuration) {
@@ -74,6 +75,11 @@ public DynamicDescendantFilter getDynamicDescendantFilter() {
 		return dynamicDescendantFilter;
 	}
 
+	@Override
+	public IterationFilter getIterationFilter() {
+		return iterationFilter;
+	}
+
 	// --- TestDescriptor ------------------------------------------------------
 
 	@Override
@@ -103,9 +109,12 @@ protected void invokeTestMethod(JupiterEngineExecutionContext context, DynamicTe
 				Iterator<DynamicNode> iterator = dynamicNodeStream.iterator();
 				while (iterator.hasNext()) {
 					DynamicNode dynamicNode = iterator.next();
-					Optional<JupiterTestDescriptor> descriptor = createDynamicDescriptor(this, dynamicNode, index++,
-						defaultTestSource, getDynamicDescendantFilter(), configuration);
-					descriptor.ifPresent(dynamicTestExecutor::execute);
+					if (getIterationFilter().test(index - 1)) {
+						Optional<JupiterTestDescriptor> descriptor = createDynamicDescriptor(this, dynamicNode, index,
+							defaultTestSource, getDynamicDescendantFilter(), configuration);
+						descriptor.ifPresent(dynamicTestExecutor::execute);
+					}
+					index++;
 				}
 			}
 			catch (ClassCastException ex) {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
index 749502ad48ad..a8887a3c2d59 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
@@ -44,6 +44,7 @@ public class TestTemplateTestDescriptor extends MethodBasedTestDescriptor implem
 
 	public static final String SEGMENT_TYPE = "test-template";
 	private final DynamicDescendantFilter dynamicDescendantFilter = new DynamicDescendantFilter();
+	private final IterationFilter iterationFilter = new IterationFilter();
 
 	public TestTemplateTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method templateMethod,
 			JupiterConfiguration configuration) {
@@ -57,6 +58,11 @@ public DynamicDescendantFilter getDynamicDescendantFilter() {
 		return dynamicDescendantFilter;
 	}
 
+	@Override
+	public IterationFilter getIterationFilter() {
+		return iterationFilter;
+	}
+
 	// --- TestDescriptor ------------------------------------------------------
 
 	@Override
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
index d85b3d6afd64..89654e0ac547 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.BiFunction;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -47,6 +48,7 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.engine.discovery.IterationSelector;
 import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.NestedMethodSelector;
 import org.junit.platform.engine.discovery.UniqueIdSelector;
@@ -70,16 +72,18 @@ class MethodSelectorResolver implements SelectorResolver {
 
 	@Override
 	public Resolution resolve(MethodSelector selector, Context context) {
-		return resolve(context, emptyList(), selector.getJavaClass(), selector::getJavaMethod);
+		return resolve(context, emptyList(), selector.getJavaClass(), selector::getJavaMethod, Match::exact);
 	}
 
 	@Override
 	public Resolution resolve(NestedMethodSelector selector, Context context) {
-		return resolve(context, selector.getEnclosingClasses(), selector.getNestedClass(), selector::getMethod);
+		return resolve(context, selector.getEnclosingClasses(), selector.getNestedClass(), selector::getMethod,
+			Match::exact);
 	}
 
 	private Resolution resolve(Context context, List<Class<?>> enclosingClasses, Class<?> testClass,
-			Supplier<Method> methodSupplier) {
+			Supplier<Method> methodSupplier,
+			BiFunction<TestDescriptor, Supplier<Set<? extends DiscoverySelector>>, Match> matchFactory) {
 		if (!testClassPredicate.test(testClass)) {
 			return unresolved();
 		}
@@ -89,7 +93,7 @@ private Resolution resolve(Context context, List<Class<?>> enclosingClasses, Cla
 				.map(methodType -> methodType.resolve(enclosingClasses, testClass, method, context, configuration))
 				.filter(Optional::isPresent)
 				.map(Optional::get)
-				.map(testDescriptor -> Match.exact(testDescriptor, expansionCallback(testDescriptor)))
+				.map(testDescriptor -> matchFactory.apply(testDescriptor, expansionCallback(testDescriptor)))
 				.collect(toSet());
 		// @formatter:on
 		if (matches.size() > 1) {
@@ -131,10 +135,28 @@ public Resolution resolve(UniqueIdSelector selector, Context context) {
 		// @formatter:on
 	}
 
+	@Override
+	public Resolution resolve(IterationSelector selector, Context context) {
+		if (selector.getParentSelector() instanceof MethodSelector) {
+			MethodSelector methodSelector = (MethodSelector) selector.getParentSelector();
+			return resolve(context, emptyList(), methodSelector.getJavaClass(), methodSelector::getJavaMethod,
+				(testDescriptor, childSelectorsSupplier) -> {
+					if (testDescriptor instanceof Filterable) {
+						Filterable filterable = (Filterable) testDescriptor;
+						filterable.getIterationFilter().allow(selector.getIterationIndices());
+					}
+					return Match.partial(testDescriptor, childSelectorsSupplier);
+				});
+		}
+		return unresolved();
+	}
+
 	private Supplier<Set<? extends DiscoverySelector>> expansionCallback(TestDescriptor testDescriptor) {
 		return () -> {
 			if (testDescriptor instanceof Filterable) {
-				((Filterable) testDescriptor).getDynamicDescendantFilter().allowAll();
+				Filterable filterable = (Filterable) testDescriptor;
+				filterable.getDynamicDescendantFilter().allowAll();
+				filterable.getIterationFilter().allowAll();
 			}
 			return emptySet();
 		};
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
index 9ad5a33b6f3f..e2bae19b99b2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.engine.descriptor.TestFactoryTestDescriptor.DYNAMIC_CONTAINER_SEGMENT_TYPE;
 import static org.junit.jupiter.engine.descriptor.TestFactoryTestDescriptor.DYNAMIC_TEST_SEGMENT_TYPE;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectIteration;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
@@ -165,6 +166,24 @@ void singleDynamicTestIsExecutedWhenDiscoveredByUniqueId() {
 			event(engine(), finishedSuccessfully()));
 	}
 
+	@Test
+	void singleDynamicTestIsExecutedWhenDiscoveredByIterationIndex() {
+		var methodSelector = selectMethod(MyDynamicTestCase.class, "dynamicStream");
+
+		EngineExecutionResults executionResults = executeTests(selectIteration(methodSelector, 1));
+
+		executionResults.allEvents().assertEventsMatchExactly( //
+			event(engine(), started()), //
+			event(container(MyDynamicTestCase.class), started()), //
+			event(container("dynamicStream"), started()), //
+			event(dynamicTestRegistered("dynamic-test:#2")), //
+			event(test("dynamic-test:#2", "failingTest"), started()), //
+			event(test("dynamic-test:#2", "failingTest"), finishedWithFailure(message("failing"))), //
+			event(container("dynamicStream"), finishedSuccessfully()), //
+			event(container(MyDynamicTestCase.class), finishedSuccessfully()), //
+			event(engine(), finishedSuccessfully()));
+	}
+
 	@Test
 	void dynamicContainersAreExecutedFromIterable() {
 		EngineExecutionResults executionResults = executeTests(
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
index 96df396aed4e..9dd0a015e051 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.commons.util;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.util.Arrays;
@@ -69,6 +70,23 @@ public static <T> T notNull(T object, Supplier<String> messageSupplier) throws P
 		return object;
 	}
 
+	/**
+	 * Assert that the supplied array is neither {@code null} nor <em>empty</em>.
+	 *
+	 * @param array the array to check
+	 * @param message precondition violation message
+	 * @return the supplied array as a convenience
+	 * @throws PreconditionViolationException if the supplied array is
+	 * {@code null} or <em>empty</em>
+	 * @since 1.9
+	 * @see #condition(boolean, String)
+	 */
+	@API(status = EXPERIMENTAL, since = "1.9")
+	public static int[] notEmpty(int[] array, String message) throws PreconditionViolationException {
+		condition(array != null && array.length > 0, message);
+		return array;
+	}
+
 	/**
 	 * Assert that the supplied array is neither {@code null} nor <em>empty</em>.
 	 *
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index e2f892efdc76..c8477791e3c9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -696,4 +696,11 @@ public static UniqueIdSelector selectUniqueId(String uniqueId) {
 		return new UniqueIdSelector(UniqueId.parse(uniqueId));
 	}
 
+	@API(status = EXPERIMENTAL, since = "1.9")
+	public static IterationSelector selectIteration(DiscoverySelector parentSelector, int... iterationIndices) {
+		Preconditions.notNull(parentSelector, "Parent selector must not be null");
+		Preconditions.notEmpty(iterationIndices, "iteration indices must not be empty");
+		return new IterationSelector(parentSelector, iterationIndices);
+	}
+
 }
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
new file mode 100644
index 000000000000..f63d7ba65d63
--- /dev/null
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.engine.discovery;
+
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toCollection;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.util.ToStringBuilder;
+import org.junit.platform.engine.DiscoverySelector;
+
+@API(status = EXPERIMENTAL, since = "1.9")
+public class IterationSelector implements DiscoverySelector {
+
+	private final DiscoverySelector parentSelector;
+	private final SortedSet<Integer> iterationIndices;
+
+	IterationSelector(DiscoverySelector parentSelector, int... iterationIndices) {
+		this.parentSelector = parentSelector;
+		this.iterationIndices = toSortedSet(iterationIndices);
+	}
+
+	private SortedSet<Integer> toSortedSet(int[] iterationIndices) {
+		return Arrays.stream(iterationIndices) //
+				.boxed() //
+				.collect(collectingAndThen(toCollection(TreeSet::new), Collections::unmodifiableSortedSet));
+	}
+
+	public DiscoverySelector getParentSelector() {
+		return parentSelector;
+	}
+
+	public SortedSet<Integer> getIterationIndices() {
+		return iterationIndices;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		IterationSelector that = (IterationSelector) o;
+		return parentSelector.equals(that.parentSelector) && iterationIndices.equals(that.iterationIndices);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(parentSelector, iterationIndices);
+	}
+
+	@Override
+	public String toString() {
+		// @formatter:off
+		return new ToStringBuilder(this)
+				.append("parentSelector", this.parentSelector)
+				.append("iterationIndices", this.iterationIndices)
+				.toString();
+		// @formatter:on
+	}
+}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
index dcde44dbf9de..cec6d5898936 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
@@ -40,6 +40,7 @@
 import org.junit.platform.engine.discovery.ClasspathRootSelector;
 import org.junit.platform.engine.discovery.DirectorySelector;
 import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.IterationSelector;
 import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.ModuleSelector;
 import org.junit.platform.engine.discovery.NestedClassSelector;
@@ -133,6 +134,9 @@ private Optional<Resolution> resolve(DiscoverySelector selector) {
 			if (selector instanceof ClassSelector) {
 				return resolver.resolve((ClassSelector) selector, context);
 			}
+			if (selector instanceof IterationSelector) {
+				return resolver.resolve((IterationSelector) selector, context);
+			}
 			if (selector instanceof NestedClassSelector) {
 				return resolver.resolve((NestedClassSelector) selector, context);
 			}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
index 3463d329b793..f573ae8280d4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
@@ -29,6 +29,7 @@
 import org.junit.platform.engine.discovery.ClasspathRootSelector;
 import org.junit.platform.engine.discovery.DirectorySelector;
 import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.IterationSelector;
 import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.ModuleSelector;
 import org.junit.platform.engine.discovery.NestedClassSelector;
@@ -298,6 +299,11 @@ default Resolution resolve(UriSelector selector, Context context) {
 		return resolve((DiscoverySelector) selector, context);
 	}
 
+	@API(status = EXPERIMENTAL, since = "1.9")
+	default Resolution resolve(IterationSelector selector, Context context) {
+		return resolve((DiscoverySelector) selector, context);
+	}
+
 	/**
 	 * Resolve the supplied {@link DiscoverySelector} using the supplied
 	 * {@link Context Context}.

From dc6f9127ff0f79d669ac074427a84fdca3d97131 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Oct 2021 14:32:50 +0200
Subject: [PATCH 0627/1433] Allow discovering by unique ID and iteration index
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leonard Brünings <lbruenings@gradle.com>
---
 .../descriptor/DynamicDescendantFilter.java   | 53 +++++++++++++++----
 .../jupiter/engine/descriptor/Filterable.java |  2 -
 .../engine/descriptor/IterationFilter.java    | 41 --------------
 .../descriptor/TestFactoryTestDescriptor.java | 18 ++-----
 .../TestTemplateTestDescriptor.java           |  8 +--
 .../discovery/MethodSelectorResolver.java     |  5 +-
 .../engine/DynamicNodeGenerationTests.java    | 36 ++++++++++++-
 .../DiscoverySelectorResolverTests.java       | 12 ++---
 8 files changed, 93 insertions(+), 82 deletions(-)
 delete mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/IterationFilter.java

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
index 2f75a6178925..c09fd98749ed 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
@@ -14,7 +14,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import java.util.function.Predicate;
+import java.util.function.BiPredicate;
 
 import org.apiguardian.api.API;
 import org.junit.platform.engine.TestDescriptor;
@@ -28,32 +28,67 @@
  * @see Filterable
  */
 @API(status = INTERNAL, since = "5.1")
-public class DynamicDescendantFilter implements Predicate<UniqueId> {
+public class DynamicDescendantFilter implements BiPredicate<UniqueId, Integer> {
 
-	private final Set<UniqueId> allowed = new HashSet<>();
+	private final Set<UniqueId> allowedUniqueIds = new HashSet<>();
+	private final Set<Integer> allowedIndices = new HashSet<>();
 	private Mode mode = Mode.EXPLICIT;
 
-	public void allow(UniqueId uniqueId) {
+	public void allowUniqueIdPrefix(UniqueId uniqueId) {
 		if (this.mode == Mode.EXPLICIT) {
-			this.allowed.add(uniqueId);
+			this.allowedUniqueIds.add(uniqueId);
+		}
+	}
+
+	public void allowIndex(Set<Integer> indices) {
+		if (this.mode == Mode.EXPLICIT) {
+			this.allowedIndices.addAll(indices);
 		}
 	}
 
 	public void allowAll() {
 		this.mode = Mode.ALLOW_ALL;
-		this.allowed.clear();
+		this.allowedUniqueIds.clear();
+		this.allowedIndices.clear();
 	}
 
 	@Override
-	public boolean test(UniqueId uniqueId) {
-		return allowed.isEmpty() || allowed.stream().anyMatch(allowedUniqueId -> isAllowed(uniqueId, allowedUniqueId));
+	public boolean test(UniqueId uniqueId, Integer index) {
+		return isEverythingAllowed() //
+				|| isUniqueIdAllowed(uniqueId) //
+				|| allowedIndices.contains(index);
+	}
+
+	private boolean isEverythingAllowed() {
+		return allowedUniqueIds.isEmpty() && allowedIndices.isEmpty();
+	}
+
+	private boolean isUniqueIdAllowed(UniqueId uniqueId) {
+		return allowedUniqueIds.stream().anyMatch(allowedUniqueId -> isPrefixOrViceVersa(uniqueId, allowedUniqueId));
 	}
 
-	private boolean isAllowed(UniqueId currentUniqueId, UniqueId allowedUniqueId) {
+	private boolean isPrefixOrViceVersa(UniqueId currentUniqueId, UniqueId allowedUniqueId) {
 		return allowedUniqueId.hasPrefix(currentUniqueId) || currentUniqueId.hasPrefix(allowedUniqueId);
 	}
 
+	public DynamicDescendantFilter withoutIndexFiltering() {
+		return new WithoutIndexFiltering();
+	}
+
 	private enum Mode {
 		EXPLICIT, ALLOW_ALL
 	}
+
+	private class WithoutIndexFiltering extends DynamicDescendantFilter {
+
+		@Override
+		public boolean test(UniqueId uniqueId, Integer index) {
+			return isEverythingAllowed() || isUniqueIdAllowed(uniqueId);
+		}
+
+		@Override
+		public DynamicDescendantFilter withoutIndexFiltering() {
+			return this;
+		}
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
index eed122d35a9b..e39e9e5ca72c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
@@ -27,6 +27,4 @@ public interface Filterable {
 
 	DynamicDescendantFilter getDynamicDescendantFilter();
 
-	IterationFilter getIterationFilter();
-
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/IterationFilter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/IterationFilter.java
deleted file mode 100644
index 30ec6fd39d67..000000000000
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/IterationFilter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2015-2021 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.engine.descriptor;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-public class IterationFilter implements Predicate<Integer> {
-
-	private final Set<Integer> allowed = new HashSet<>();
-	private Mode mode = Mode.EXPLICIT;
-
-	public void allow(Set<Integer> indices) {
-		if (this.mode == Mode.EXPLICIT) {
-			this.allowed.addAll(indices);
-		}
-	}
-
-	public void allowAll() {
-		this.mode = Mode.ALLOW_ALL;
-		this.allowed.clear();
-	}
-
-	@Override
-	public boolean test(Integer index) {
-		return allowed.isEmpty() || allowed.contains(index);
-	}
-
-	private enum Mode {
-		EXPLICIT, ALLOW_ALL
-	}
-}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
index 48632b22e5b5..7e4eb642c0eb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
@@ -61,7 +61,6 @@ public class TestFactoryTestDescriptor extends TestMethodTestDescriptor implemen
 	private static final ExecutableInvoker executableInvoker = new ExecutableInvoker();
 
 	private final DynamicDescendantFilter dynamicDescendantFilter = new DynamicDescendantFilter();
-	private final IterationFilter iterationFilter = new IterationFilter();
 
 	public TestFactoryTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method testMethod,
 			JupiterConfiguration configuration) {
@@ -75,11 +74,6 @@ public DynamicDescendantFilter getDynamicDescendantFilter() {
 		return dynamicDescendantFilter;
 	}
 
-	@Override
-	public IterationFilter getIterationFilter() {
-		return iterationFilter;
-	}
-
 	// --- TestDescriptor ------------------------------------------------------
 
 	@Override
@@ -109,11 +103,9 @@ protected void invokeTestMethod(JupiterEngineExecutionContext context, DynamicTe
 				Iterator<DynamicNode> iterator = dynamicNodeStream.iterator();
 				while (iterator.hasNext()) {
 					DynamicNode dynamicNode = iterator.next();
-					if (getIterationFilter().test(index - 1)) {
-						Optional<JupiterTestDescriptor> descriptor = createDynamicDescriptor(this, dynamicNode, index,
-							defaultTestSource, getDynamicDescendantFilter(), configuration);
-						descriptor.ifPresent(dynamicTestExecutor::execute);
-					}
+					Optional<JupiterTestDescriptor> descriptor = createDynamicDescriptor(this, dynamicNode, index,
+						defaultTestSource, getDynamicDescendantFilter(), configuration);
+					descriptor.ifPresent(dynamicTestExecutor::execute);
 					index++;
 				}
 			}
@@ -162,9 +154,9 @@ static Optional<JupiterTestDescriptor> createDynamicDescriptor(JupiterTestDescri
 			DynamicContainer container = (DynamicContainer) node;
 			uniqueId = parent.getUniqueId().append(DYNAMIC_CONTAINER_SEGMENT_TYPE, "#" + index);
 			descriptorCreator = () -> new DynamicContainerTestDescriptor(uniqueId, index, container, source,
-				dynamicDescendantFilter, configuration);
+				dynamicDescendantFilter.withoutIndexFiltering(), configuration);
 		}
-		if (dynamicDescendantFilter.test(uniqueId)) {
+		if (dynamicDescendantFilter.test(uniqueId, index - 1)) {
 			JupiterTestDescriptor descriptor = descriptorCreator.get();
 			descriptor.setParent(parent);
 			return Optional.of(descriptor);
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
index a8887a3c2d59..f7f86b9d4363 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
@@ -44,7 +44,6 @@ public class TestTemplateTestDescriptor extends MethodBasedTestDescriptor implem
 
 	public static final String SEGMENT_TYPE = "test-template";
 	private final DynamicDescendantFilter dynamicDescendantFilter = new DynamicDescendantFilter();
-	private final IterationFilter iterationFilter = new IterationFilter();
 
 	public TestTemplateTestDescriptor(UniqueId uniqueId, Class<?> testClass, Method templateMethod,
 			JupiterConfiguration configuration) {
@@ -58,11 +57,6 @@ public DynamicDescendantFilter getDynamicDescendantFilter() {
 		return dynamicDescendantFilter;
 	}
 
-	@Override
-	public IterationFilter getIterationFilter() {
-		return iterationFilter;
-	}
-
 	// --- TestDescriptor ------------------------------------------------------
 
 	@Override
@@ -133,7 +127,7 @@ private List<TestTemplateInvocationContextProvider> validateProviders(ExtensionC
 	private Optional<TestDescriptor> createInvocationTestDescriptor(TestTemplateInvocationContext invocationContext,
 			int index) {
 		UniqueId uniqueId = getUniqueId().append(TestTemplateInvocationTestDescriptor.SEGMENT_TYPE, "#" + index);
-		if (getDynamicDescendantFilter().test(uniqueId)) {
+		if (getDynamicDescendantFilter().test(uniqueId, index - 1)) {
 			return Optional.of(new TestTemplateInvocationTestDescriptor(uniqueId, getTestClass(), getTestMethod(),
 				invocationContext, index, configuration));
 		}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
index 89654e0ac547..11f12ccae2fe 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
@@ -125,7 +125,7 @@ public Resolution resolve(UniqueIdSelector selector, Context context) {
 							filterable.getDynamicDescendantFilter().allowAll();
 						}
 						else {
-							filterable.getDynamicDescendantFilter().allow(uniqueId);
+							filterable.getDynamicDescendantFilter().allowUniqueIdPrefix(uniqueId);
 						}
 					}
 					return Resolution.match(exactMatch ? Match.exact(testDescriptor) : Match.partial(testDescriptor, expansionCallback(testDescriptor)));
@@ -143,7 +143,7 @@ public Resolution resolve(IterationSelector selector, Context context) {
 				(testDescriptor, childSelectorsSupplier) -> {
 					if (testDescriptor instanceof Filterable) {
 						Filterable filterable = (Filterable) testDescriptor;
-						filterable.getIterationFilter().allow(selector.getIterationIndices());
+						filterable.getDynamicDescendantFilter().allowIndex(selector.getIterationIndices());
 					}
 					return Match.partial(testDescriptor, childSelectorsSupplier);
 				});
@@ -156,7 +156,6 @@ private Supplier<Set<? extends DiscoverySelector>> expansionCallback(TestDescrip
 			if (testDescriptor instanceof Filterable) {
 				Filterable filterable = (Filterable) testDescriptor;
 				filterable.getDynamicDescendantFilter().allowAll();
-				filterable.getIterationFilter().allowAll();
 			}
 			return emptySet();
 		};
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
index e2bae19b99b2..b89248c87941 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
@@ -68,7 +68,7 @@ class DynamicNodeGenerationTests extends AbstractJupiterTestEngineTests {
 	void testFactoryMethodsAreCorrectlyDiscoveredForClassSelector() {
 		LauncherDiscoveryRequest request = request().selectors(selectClass(MyDynamicTestCase.class)).build();
 		TestDescriptor engineDescriptor = discoverTests(request);
-		assertThat(engineDescriptor.getDescendants()).as("# resolved test descriptors").hasSize(12);
+		assertThat(engineDescriptor.getDescendants()).as("# resolved test descriptors").hasSize(13);
 	}
 
 	@Test
@@ -184,6 +184,31 @@ void singleDynamicTestIsExecutedWhenDiscoveredByIterationIndex() {
 			event(engine(), finishedSuccessfully()));
 	}
 
+	@Test
+	void multipleDynamicTestsAreExecutedWhenDiscoveredByIterationIndexAndUniqueId() {
+		UniqueId uniqueId = discoverUniqueId(MyDynamicTestCase.class, "threeTests") //
+				.append(DYNAMIC_TEST_SEGMENT_TYPE, "#3");
+
+		var methodSelector = selectMethod(MyDynamicTestCase.class, "threeTests");
+
+		EngineExecutionResults executionResults = executeTests(selectIteration(methodSelector, 1),
+			selectUniqueId(uniqueId));
+
+		executionResults.allEvents().assertEventsMatchExactly( //
+			event(engine(), started()), //
+			event(container(MyDynamicTestCase.class), started()), //
+			event(container("threeTests"), started()), //
+			event(dynamicTestRegistered("dynamic-test:#2")), //
+			event(test("dynamic-test:#2", "two"), started()), //
+			event(test("dynamic-test:#2", "two"), finishedSuccessfully()), //
+			event(dynamicTestRegistered("dynamic-test:#3")), //
+			event(test("dynamic-test:#3", "three"), started()), //
+			event(test("dynamic-test:#3", "three"), finishedSuccessfully()), //
+			event(container("threeTests"), finishedSuccessfully()), //
+			event(container(MyDynamicTestCase.class), finishedSuccessfully()), //
+			event(engine(), finishedSuccessfully()));
+	}
+
 	@Test
 	void dynamicContainersAreExecutedFromIterable() {
 		EngineExecutionResults executionResults = executeTests(
@@ -494,6 +519,15 @@ DynamicNode singleTest() {
 			return dynamicTest("succeedingTest", () -> assertTrue(true));
 		}
 
+		@TestFactory
+		Stream<DynamicNode> threeTests() {
+			return Stream.of( //
+				dynamicTest("one", () -> assertTrue(true)), //
+				dynamicTest("two", () -> assertTrue(true)), //
+				dynamicTest("three", () -> assertTrue(true)) //
+			);
+		}
+
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
index e191e2e0d5ab..ae2ab6c9dfb8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
@@ -646,8 +646,8 @@ void resolvingDynamicTestByUniqueIdResolvesUpToParentTestFactory() {
 
 		TestDescriptor testFactoryDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		DynamicDescendantFilter dynamicDescendantFilter = getDynamicDescendantFilter(testFactoryDescriptor);
-		assertThat(dynamicDescendantFilter.test(dynamicTestUid)).isTrue();
-		assertThat(dynamicDescendantFilter.test(differentDynamicTestUid)).isFalse();
+		assertThat(dynamicDescendantFilter.test(dynamicTestUid, 42)).isTrue();
+		assertThat(dynamicDescendantFilter.test(differentDynamicTestUid, 42)).isFalse();
 
 		assertAllSelectorsResolved();
 	}
@@ -669,9 +669,9 @@ void resolvingDynamicContainerByUniqueIdResolvesUpToParentTestFactory() {
 
 		TestDescriptor testFactoryDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		DynamicDescendantFilter dynamicDescendantFilter = getDynamicDescendantFilter(testFactoryDescriptor);
-		assertThat(dynamicDescendantFilter.test(dynamicTestUid)).isTrue();
-		assertThat(dynamicDescendantFilter.test(differentDynamicContainerUid)).isFalse();
-		assertThat(dynamicDescendantFilter.test(differentDynamicTestUid)).isFalse();
+		assertThat(dynamicDescendantFilter.test(dynamicTestUid, 42)).isTrue();
+		assertThat(dynamicDescendantFilter.test(differentDynamicContainerUid, 42)).isFalse();
+		assertThat(dynamicDescendantFilter.test(differentDynamicTestUid, 42)).isFalse();
 
 		assertAllSelectorsResolved();
 	}
@@ -689,7 +689,7 @@ void resolvingDynamicTestByUniqueIdAndTestFactoryByMethodSelectorResolvesTestFac
 		TestDescriptor testClassDescriptor = getOnlyElement(engineDescriptor.getChildren());
 		TestDescriptor testFactoryDescriptor = getOnlyElement(testClassDescriptor.getChildren());
 		DynamicDescendantFilter dynamicDescendantFilter = getDynamicDescendantFilter(testFactoryDescriptor);
-		assertThat(dynamicDescendantFilter.test(UniqueId.root("foo", "bar"))).isTrue();
+		assertThat(dynamicDescendantFilter.test(UniqueId.root("foo", "bar"), 42)).isTrue();
 	}
 
 	private DynamicDescendantFilter getDynamicDescendantFilter(TestDescriptor testDescriptor) {

From c8129d5df0fbee466bbfad8390b355b5034bf8f1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Oct 2021 15:04:01 +0200
Subject: [PATCH 0628/1433] Move JupiterUniqueIdBuilder to test fixtures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leonard Brünings <lbruenings@gradle.com>
---
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts            | 1 +
 .../org/junit/jupiter/engine/JupiterTestEngineBasicTests.java   | 2 ++
 .../junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java  | 0
 3 files changed, 3 insertions(+)
 rename junit-jupiter-engine/src/{test => testFixtures}/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java (100%)

diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 2d17e2a79ef7..c0d70b43dabb 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 	`kotlin-library-conventions`
 	`testing-conventions`
 	groovy
+	`java-test-fixtures`
 }
 
 description = "JUnit Jupiter Engine"
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
index e66dd1cec817..45cad81f932c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
@@ -12,6 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -40,6 +41,7 @@ void artifactId() {
 	}
 
 	@Test
+	@Disabled("started failing after introducing java-test-fixtures")
 	void version() {
 		assertEquals("DEVELOPMENT", jupiter.getVersion().get());
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java b/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
similarity index 100%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
rename to junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java

From b4537078de3f2e54efcbff641081a0d79bc5a14b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Oct 2021 15:04:54 +0200
Subject: [PATCH 0629/1433] Add integration test for discovering parameterized
 test invocations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leonard Brünings <lbruenings@gradle.com>
---
 .../discovery/JupiterUniqueIdBuilder.java     |  5 +++++
 .../junit-jupiter-params.gradle.kts           |  1 +
 .../ParameterizedTestIntegrationTests.java    | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java b/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
index 40166e222ff7..8b84bdff2125 100644
--- a/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
+++ b/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.engine.descriptor.NestedClassTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestFactoryTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
+import org.junit.jupiter.engine.descriptor.TestTemplateInvocationTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestTemplateTestDescriptor;
 import org.junit.platform.engine.UniqueId;
 
@@ -54,6 +55,10 @@ public static UniqueId uniqueIdForTestTemplateMethod(Class<?> clazz, String meth
 		return uniqueIdForClass(clazz).append(TestTemplateTestDescriptor.SEGMENT_TYPE, methodPart);
 	}
 
+	public static UniqueId appendTestTemplateInvocationSegment(UniqueId parentId, int index) {
+		return parentId.append(TestTemplateInvocationTestDescriptor.SEGMENT_TYPE, "#" + index);
+	}
+
 	public static UniqueId engineId() {
 		return UniqueId.forEngine(JupiterEngineDescriptor.ENGINE_ID);
 	}
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 0dc9fe94f11e..528ef09c7435 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
 	testImplementation(projects.junitJupiterEngine)
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformSuiteEngine)
+	testImplementation(testFixtures(projects.junitJupiterEngine))
 
 	compileOnly(kotlin("stdlib"))
 	testImplementation(kotlin("stdlib"))
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 74c799fcea67..db4108d4505e 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -16,9 +16,13 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Named.named;
+import static org.junit.jupiter.engine.discovery.JupiterUniqueIdBuilder.appendTestTemplateInvocationSegment;
+import static org.junit.jupiter.engine.discovery.JupiterUniqueIdBuilder.uniqueIdForTestTemplateMethod;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectIteration;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
 import static org.junit.platform.testkit.engine.EventConditions.abortedWithReason;
 import static org.junit.platform.testkit.engine.EventConditions.container;
 import static org.junit.platform.testkit.engine.EventConditions.displayName;
@@ -780,6 +784,18 @@ void closeAutoCloseableArgumentsAfterTest() {
 		assertTrue(AutoCloseableArgument.isClosed);
 	}
 
+	@Test
+	void executesTwoIterationsBasedOnIterationAndUniqueIdSelector() {
+		var methodId = uniqueIdForTestTemplateMethod(TestCase.class, "testWithThreeIterations(int)");
+		var results = execute(selectUniqueId(appendTestTemplateInvocationSegment(methodId, 3)),
+			selectIteration(selectMethod(TestCase.class, "testWithThreeIterations", "int"), 1));
+
+		results.allEvents().assertThatEvents() //
+				.haveExactly(2, event(test(), finishedWithFailure())) //
+				.haveExactly(1, event(test(), displayName("[2] argument=3"), finishedWithFailure())) //
+				.haveExactly(1, event(test(), displayName("[3] argument=5"), finishedWithFailure()));
+	}
+
 	// -------------------------------------------------------------------------
 
 	static class TestCase {
@@ -868,6 +884,11 @@ void testWithAutoCloseableArgument(AutoCloseableArgument autoCloseable) {
 			assertFalse(AutoCloseableArgument.isClosed);
 		}
 
+		@ParameterizedTest
+		@ValueSource(ints = { 2, 3, 5 })
+		void testWithThreeIterations(int argument) {
+			fail("argument: " + argument);
+		}
 	}
 
 	static class NullSourceTestCase {

From db38160f3afe0423c47e35cb8b16aeff9a00e725 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Oct 2021 15:07:18 +0200
Subject: [PATCH 0630/1433] Fix disabled test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leonard Brünings <lbruenings@gradle.com>
---
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts          | 1 +
 .../org/junit/jupiter/engine/JupiterTestEngineBasicTests.java | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index c0d70b43dabb..e15a42bf136e 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -31,6 +31,7 @@ dependencies {
 tasks {
 	test {
 		inputs.dir("src/test/resources").withPathSensitivity(RELATIVE)
+		systemProperty("developmentVersion", version)
 	}
 }
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
index 45cad81f932c..6b4805d371ee 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
@@ -12,7 +12,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -41,9 +40,8 @@ void artifactId() {
 	}
 
 	@Test
-	@Disabled("started failing after introducing java-test-fixtures")
 	void version() {
-		assertEquals("DEVELOPMENT", jupiter.getVersion().get());
+		assertEquals(System.getProperty("developmentVersion"), jupiter.getVersion().get());
 	}
 
 }

From 8381fd07805a3b6eef37ef77c3808f4a93876456 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Oct 2021 15:14:09 +0200
Subject: [PATCH 0631/1433] Improve method name

---
 .../vintage/engine/samples/junit4/ParameterizedTestCase.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
index 0f1c0d339cfa..5fe18fc5da62 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
@@ -27,7 +27,7 @@
 public class ParameterizedTestCase {
 
 	@Parameters(name = "{0}")
-	public static Iterable<String> primes() {
+	public static Iterable<String> parameters() {
 		return List.of("foo", "bar");
 	}
 

From 714edc3e848be6979d88854d9805d17bac7a78ae Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 15:54:10 +0100
Subject: [PATCH 0632/1433] Add --select-iteration option to ConsoleLauncher

---
 .../console/options/AvailableOptions.java     |  86 ++++++----
 .../console/options/CommandLineOptions.java   | 101 +++++++-----
 .../console/options/SelectorConverter.java    | 149 ++++++++++++++++++
 .../tasks/DiscoveryRequestCreator.java        |  66 ++++----
 .../PicocliCommandLineOptionsParserTests.java | 146 ++++++++++-------
 .../tasks/DiscoveryRequestCreatorTests.java   |  63 ++++++--
 6 files changed, 432 insertions(+), 179 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index 5be7162835f5..16f5d0ccd578 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.console.options;
 
-import java.net.URI;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,6 +18,15 @@
 import java.util.Map;
 
 import org.junit.platform.engine.discovery.ClassNameFilter;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.ClasspathResourceSelector;
+import org.junit.platform.engine.discovery.DirectorySelector;
+import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.IterationSelector;
+import org.junit.platform.engine.discovery.MethodSelector;
+import org.junit.platform.engine.discovery.ModuleSelector;
+import org.junit.platform.engine.discovery.PackageSelector;
+import org.junit.platform.engine.discovery.UriSelector;
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
@@ -99,11 +107,11 @@ class AvailableOptions {
 	private boolean scanModulepath2;
 
 	@Option(names = { "-o",
-			"--select-module" }, paramLabel = "NAME", arity = "1", description = "EXPERIMENTAL: Select single module for test discovery. This option can be repeated.")
-	private List<String> selectedModules = new ArrayList<>();
+			"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "EXPERIMENTAL: Select single module for test discovery. This option can be repeated.")
+	private List<ModuleSelector> selectedModules = new ArrayList<>();
 
-	@Option(names = { "--o", "-select-module" }, arity = "1", hidden = true)
-	private List<String> selectedModules2 = new ArrayList<>();
+	@Option(names = { "--o", "-select-module" }, arity = "1", converter = SelectorConverter.Module.class, hidden = true)
+	private List<ModuleSelector> selectedModules2 = new ArrayList<>();
 
 	// --- Selectors -------------------------------------------------------
 
@@ -119,53 +127,64 @@ class AvailableOptions {
 	private List<Path> selectedClasspathEntries2 = new ArrayList<>();
 
 	@Option(names = { "-u",
-			"--select-uri" }, paramLabel = "URI", arity = "1", description = "Select a URI for test discovery. This option can be repeated.")
-	private List<URI> selectedUris = new ArrayList<>();
+			"--select-uri" }, paramLabel = "URI", arity = "1", converter = SelectorConverter.Uri.class, description = "Select a URI for test discovery. This option can be repeated.")
+	private List<UriSelector> selectedUris = new ArrayList<>();
 
-	@Option(names = { "--u", "-select-uri" }, arity = "1", hidden = true)
-	private List<URI> selectedUris2 = new ArrayList<>();
+	@Option(names = { "--u", "-select-uri" }, arity = "1", hidden = true, converter = SelectorConverter.Uri.class)
+	private List<UriSelector> selectedUris2 = new ArrayList<>();
 
 	@Option(names = { "-f",
-			"--select-file" }, paramLabel = "FILE", arity = "1", description = "Select a file for test discovery. This option can be repeated.")
-	private List<String> selectedFiles = new ArrayList<>();
+			"--select-file" }, paramLabel = "FILE", arity = "1", converter = SelectorConverter.File.class, description = "Select a file for test discovery. This option can be repeated.")
+	private List<FileSelector> selectedFiles = new ArrayList<>();
 
-	@Option(names = { "--f", "-select-file" }, arity = "1", hidden = true)
-	private List<String> selectedFiles2 = new ArrayList<>();
+	@Option(names = { "--f", "-select-file" }, arity = "1", hidden = true, converter = SelectorConverter.File.class)
+	private List<FileSelector> selectedFiles2 = new ArrayList<>();
 
 	@Option(names = { "-d",
-			"--select-directory" }, paramLabel = "DIR", arity = "1", description = "Select a directory for test discovery. This option can be repeated.")
-	private List<String> selectedDirectories = new ArrayList<>();
+			"--select-directory" }, paramLabel = "DIR", arity = "1", converter = SelectorConverter.Directory.class, description = "Select a directory for test discovery. This option can be repeated.")
+	private List<DirectorySelector> selectedDirectories = new ArrayList<>();
 
-	@Option(names = { "--d", "-select-directory" }, arity = "1", hidden = true)
-	private List<String> selectedDirectories2 = new ArrayList<>();
+	@Option(names = { "--d",
+			"-select-directory" }, arity = "1", hidden = true, converter = SelectorConverter.Directory.class)
+	private List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
 
 	@Option(names = { "-p",
-			"--select-package" }, paramLabel = "PKG", arity = "1", description = "Select a package for test discovery. This option can be repeated.")
-	private List<String> selectedPackages = new ArrayList<>();
+			"--select-package" }, paramLabel = "PKG", arity = "1", converter = SelectorConverter.Package.class, description = "Select a package for test discovery. This option can be repeated.")
+	private List<PackageSelector> selectedPackages = new ArrayList<>();
 
-	@Option(names = { "--p", "-select-package" }, arity = "1", hidden = true)
-	private List<String> selectedPackages2 = new ArrayList<>();
+	@Option(names = { "--p",
+			"-select-package" }, arity = "1", hidden = true, converter = SelectorConverter.Package.class)
+	private List<PackageSelector> selectedPackages2 = new ArrayList<>();
 
 	@Option(names = { "-c",
-			"--select-class" }, paramLabel = "CLASS", arity = "1", description = "Select a class for test discovery. This option can be repeated.")
-	private List<String> selectedClasses = new ArrayList<>();
+			"--select-class" }, paramLabel = "CLASS", arity = "1", converter = SelectorConverter.Class.class, description = "Select a class for test discovery. This option can be repeated.")
+	private List<ClassSelector> selectedClasses = new ArrayList<>();
 
-	@Option(names = { "--c", "-select-class" }, arity = "1", hidden = true)
-	private List<String> selectedClasses2 = new ArrayList<>();
+	@Option(names = { "--c", "-select-class" }, arity = "1", hidden = true, converter = SelectorConverter.Class.class)
+	private List<ClassSelector> selectedClasses2 = new ArrayList<>();
 
 	@Option(names = { "-m",
-			"--select-method" }, paramLabel = "NAME", arity = "1", description = "Select a method for test discovery. This option can be repeated.")
-	private List<String> selectedMethods = new ArrayList<>();
+			"--select-method" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Method.class, description = "Select a method for test discovery. This option can be repeated.")
+	private List<MethodSelector> selectedMethods = new ArrayList<>();
 
-	@Option(names = { "--m", "-select-method" }, arity = "1", hidden = true)
-	private List<String> selectedMethods2 = new ArrayList<>();
+	@Option(names = { "--m", "-select-method" }, arity = "1", hidden = true, converter = SelectorConverter.Method.class)
+	private List<MethodSelector> selectedMethods2 = new ArrayList<>();
 
 	@Option(names = { "-r",
-			"--select-resource" }, paramLabel = "RESOURCE", arity = "1", description = "Select a classpath resource for test discovery. This option can be repeated.")
-	private List<String> selectedClasspathResources = new ArrayList<>();
+			"--select-resource" }, paramLabel = "RESOURCE", arity = "1", converter = SelectorConverter.ClasspathResource.class, description = "Select a classpath resource for test discovery. This option can be repeated.")
+	private List<ClasspathResourceSelector> selectedClasspathResources = new ArrayList<>();
 
-	@Option(names = { "--r", "-select-resource" }, arity = "1", hidden = true)
-	private List<String> selectedClasspathResources2 = new ArrayList<>();
+	@Option(names = { "--r",
+			"-select-resource" }, arity = "1", hidden = true, converter = SelectorConverter.ClasspathResource.class)
+	private List<ClasspathResourceSelector> selectedClasspathResources2 = new ArrayList<>();
+
+	@Option(names = { "-i",
+			"--select-iteration" }, paramLabel = "TYPE:VALUE[INDEX(..INDEX)?(,INDEX(..INDEX)?)*]", arity = "1", converter = SelectorConverter.Iteration.class, description = "Select iterations for test discovery (e.g. method:com.acme.Foo#m()[1..2]). This option can be repeated.")
+	private List<IterationSelector> selectedIterations = new ArrayList<>();
+
+	@Option(names = { "--i",
+			"-select-iteration" }, arity = "1", hidden = true, converter = SelectorConverter.Iteration.class)
+	private List<IterationSelector> selectedIterations2 = new ArrayList<>();
 
 	// --- Filters ---------------------------------------------------------
 
@@ -315,6 +334,7 @@ CommandLineOptions toCommandLineOptions(ParseResult parseResult) {
 		result.setSelectedClasses(merge(this.selectedClasses, this.selectedClasses2));
 		result.setSelectedMethods(merge(this.selectedMethods, this.selectedMethods2));
 		result.setSelectedClasspathResources(merge(this.selectedClasspathResources, this.selectedClasspathResources2));
+		result.setSelectedIterations(merge(this.selectedIterations, this.selectedIterations2));
 
 		// Filters
 		result.setIncludedClassNamePatterns(merge(this.includeClassNamePatterns, this.includeClassNamePatterns2));
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index c289beb9308f..c325f70ba4d7 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -17,16 +17,25 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
 
-import java.net.URI;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
+import org.junit.platform.engine.DiscoverySelector;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.ClasspathResourceSelector;
+import org.junit.platform.engine.discovery.DirectorySelector;
+import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.IterationSelector;
+import org.junit.platform.engine.discovery.MethodSelector;
+import org.junit.platform.engine.discovery.ModuleSelector;
+import org.junit.platform.engine.discovery.PackageSelector;
+import org.junit.platform.engine.discovery.UriSelector;
 
 /**
  * @since 1.0
@@ -49,15 +58,16 @@ public class CommandLineOptions {
 	private List<Path> selectedClasspathEntries = emptyList();
 
 	private boolean scanModulepath;
-	private List<String> selectedModules = emptyList();
 
-	private List<URI> selectedUris = emptyList();
-	private List<String> selectedFiles = emptyList();
-	private List<String> selectedDirectories = emptyList();
-	private List<String> selectedPackages = emptyList();
-	private List<String> selectedClasses = emptyList();
-	private List<String> selectedMethods = emptyList();
-	private List<String> selectedClasspathResources = emptyList();
+	private List<ModuleSelector> selectedModules = emptyList();
+	private List<UriSelector> selectedUris = emptyList();
+	private List<FileSelector> selectedFiles = emptyList();
+	private List<DirectorySelector> selectedDirectories = emptyList();
+	private List<PackageSelector> selectedPackages = emptyList();
+	private List<ClassSelector> selectedClasses = emptyList();
+	private List<MethodSelector> selectedMethods = emptyList();
+	private List<ClasspathResourceSelector> selectedClasspathResources = emptyList();
+	private List<IterationSelector> selectedIterations = emptyList();
 
 	private List<String> includedClassNamePatterns = singletonList(STANDARD_INCLUDE_PATTERN);
 	private List<String> excludedClassNamePatterns = emptyList();
@@ -156,73 +166,90 @@ public void setSelectedClasspathEntries(List<Path> selectedClasspathEntries) {
 		this.selectedClasspathEntries = selectedClasspathEntries;
 	}
 
-	public List<URI> getSelectedUris() {
-		return this.selectedUris;
+	public List<UriSelector> getSelectedUris() {
+		return selectedUris;
 	}
 
-	public void setSelectedUris(List<URI> selectedUris) {
+	public void setSelectedUris(List<UriSelector> selectedUris) {
 		this.selectedUris = selectedUris;
 	}
 
-	public List<String> getSelectedFiles() {
-		return this.selectedFiles;
+	public List<FileSelector> getSelectedFiles() {
+		return selectedFiles;
 	}
 
-	public void setSelectedFiles(List<String> selectedFiles) {
+	public void setSelectedFiles(List<FileSelector> selectedFiles) {
 		this.selectedFiles = selectedFiles;
 	}
 
-	public List<String> getSelectedDirectories() {
-		return this.selectedDirectories;
+	public List<DirectorySelector> getSelectedDirectories() {
+		return selectedDirectories;
 	}
 
-	public void setSelectedDirectories(List<String> selectedDirectories) {
+	public void setSelectedDirectories(List<DirectorySelector> selectedDirectories) {
 		this.selectedDirectories = selectedDirectories;
 	}
 
-	public List<String> getSelectedModules() {
-		return this.selectedModules;
+	public List<ModuleSelector> getSelectedModules() {
+		return selectedModules;
 	}
 
-	public void setSelectedModules(List<String> selectedModules) {
+	public void setSelectedModules(List<ModuleSelector> selectedModules) {
 		this.selectedModules = selectedModules;
 	}
 
-	public List<String> getSelectedPackages() {
-		return this.selectedPackages;
+	public List<PackageSelector> getSelectedPackages() {
+		return selectedPackages;
 	}
 
-	public void setSelectedPackages(List<String> selectedPackages) {
+	public void setSelectedPackages(List<PackageSelector> selectedPackages) {
 		this.selectedPackages = selectedPackages;
 	}
 
-	public List<String> getSelectedClasses() {
-		return this.selectedClasses;
+	public List<ClassSelector> getSelectedClasses() {
+		return selectedClasses;
 	}
 
-	public void setSelectedClasses(List<String> selectedClasses) {
+	public void setSelectedClasses(List<ClassSelector> selectedClasses) {
 		this.selectedClasses = selectedClasses;
 	}
 
-	public List<String> getSelectedMethods() {
-		return this.selectedMethods;
+	public List<MethodSelector> getSelectedMethods() {
+		return selectedMethods;
 	}
 
-	public void setSelectedMethods(List<String> selectedMethods) {
+	public void setSelectedMethods(List<MethodSelector> selectedMethods) {
 		this.selectedMethods = selectedMethods;
 	}
 
-	public List<String> getSelectedClasspathResources() {
-		return this.selectedClasspathResources;
+	public List<ClasspathResourceSelector> getSelectedClasspathResources() {
+		return selectedClasspathResources;
 	}
 
-	public void setSelectedClasspathResources(List<String> selectedClasspathResources) {
+	public void setSelectedClasspathResources(List<ClasspathResourceSelector> selectedClasspathResources) {
 		this.selectedClasspathResources = selectedClasspathResources;
 	}
 
-	public boolean hasExplicitSelectors() {
-		return Stream.of(selectedUris, selectedFiles, selectedDirectories, selectedPackages, selectedClasses,
-			selectedMethods, selectedClasspathResources).anyMatch(selectors -> !selectors.isEmpty());
+	public List<IterationSelector> getSelectedIterations() {
+		return selectedIterations;
+	}
+
+	public void setSelectedIterations(List<IterationSelector> selectedIterations) {
+		this.selectedIterations = selectedIterations;
+	}
+
+	public List<DiscoverySelector> getExplicitSelectors() {
+		List<DiscoverySelector> selectors = new ArrayList<>();
+		selectors.addAll(getSelectedUris());
+		selectors.addAll(getSelectedFiles());
+		selectors.addAll(getSelectedDirectories());
+		selectors.addAll(getSelectedModules());
+		selectors.addAll(getSelectedPackages());
+		selectors.addAll(getSelectedClasses());
+		selectors.addAll(getSelectedMethods());
+		selectors.addAll(getSelectedClasspathResources());
+		selectors.addAll(getSelectedIterations());
+		return selectors;
 	}
 
 	public List<String> getIncludedClassNamePatterns() {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
new file mode 100644
index 000000000000..dc2ead117104
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathResource;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectDirectory;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectFile;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectIteration;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectModule;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUri;
+
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.IntStream;
+
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.engine.DiscoverySelector;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.ClasspathResourceSelector;
+import org.junit.platform.engine.discovery.DirectorySelector;
+import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.IterationSelector;
+import org.junit.platform.engine.discovery.MethodSelector;
+import org.junit.platform.engine.discovery.ModuleSelector;
+import org.junit.platform.engine.discovery.PackageSelector;
+import org.junit.platform.engine.discovery.UriSelector;
+import picocli.CommandLine.ITypeConverter;
+
+class SelectorConverter {
+
+	static class Module implements ITypeConverter<ModuleSelector> {
+		@Override
+		public ModuleSelector convert(String value) {
+			return selectModule(value);
+		}
+	}
+
+	static class Uri implements ITypeConverter<UriSelector> {
+		@Override
+		public UriSelector convert(String value) {
+			return selectUri(value);
+		}
+	}
+
+	static class File implements ITypeConverter<FileSelector> {
+		@Override
+		public FileSelector convert(String value) {
+			return selectFile(value);
+		}
+	}
+
+	static class Directory implements ITypeConverter<DirectorySelector> {
+		@Override
+		public DirectorySelector convert(String value) {
+			return selectDirectory(value);
+		}
+	}
+
+	static class Package implements ITypeConverter<PackageSelector> {
+		@Override
+		public PackageSelector convert(String value) {
+			return selectPackage(value);
+		}
+	}
+
+	static class Class implements ITypeConverter<ClassSelector> {
+		@Override
+		public ClassSelector convert(String value) {
+			return selectClass(value);
+		}
+	}
+
+	static class Method implements ITypeConverter<MethodSelector> {
+		@Override
+		public MethodSelector convert(String value) {
+			return selectMethod(value);
+		}
+	}
+
+	static class ClasspathResource implements ITypeConverter<ClasspathResourceSelector> {
+		@Override
+		public ClasspathResourceSelector convert(String value) {
+			return selectClasspathResource(value);
+		}
+	}
+
+	static class Iteration implements ITypeConverter<IterationSelector> {
+
+		public static final Pattern PATTERN = Pattern.compile(
+			"(?<type>[a-z]+):(?<value>.*)\\[(?<indices>(\\d+)(\\.\\.\\d+)?(\\s*,\\s*(\\d+)(\\.\\.\\d+)?)*)]");
+
+		@Override
+		public IterationSelector convert(String value) {
+			Matcher matcher = PATTERN.matcher(value);
+			Preconditions.condition(matcher.matches(), "Invalid format: must be TYPE:VALUE[INDEX(,INDEX)*]");
+			DiscoverySelector parentSelector = createParentSelector(matcher.group("type"), matcher.group("value"));
+			int[] iterationIndices = Arrays.stream(matcher.group("indices").split(",")) //
+					.flatMapToInt(this::parseIndexDefinition) //
+					.toArray();
+			return selectIteration(parentSelector, iterationIndices);
+		}
+
+		private IntStream parseIndexDefinition(String value) {
+			String[] parts = value.split("\\.\\.", 2);
+			int firstIndex = Integer.parseInt(parts[0]);
+			if (parts.length == 2) {
+				int lastIndex = Integer.parseInt(parts[1]);
+				return IntStream.rangeClosed(firstIndex, lastIndex);
+			}
+			return IntStream.of(firstIndex);
+		}
+
+		private DiscoverySelector createParentSelector(String type, String value) {
+			switch (type) {
+				case "module":
+					return selectModule(value);
+				case "uri":
+					return selectUri(value);
+				case "file":
+					return selectFile(value);
+				case "directory":
+					return selectDirectory(value);
+				case "package":
+					return selectPackage(value);
+				case "class":
+					return selectClass(value);
+				case "method":
+					return selectMethod(value);
+				case "resource":
+					return selectClasspathResource(value);
+				default:
+					throw new IllegalArgumentException("Unknown type: " + type);
+			}
+		}
+	}
+
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
index 021603d4fe8b..24feb1596507 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
@@ -23,11 +23,10 @@
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -37,8 +36,10 @@
 import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.engine.discovery.ClassNameFilter;
+import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.ClasspathRootSelector;
-import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.engine.discovery.IterationSelector;
+import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 
@@ -49,24 +50,26 @@ class DiscoveryRequestCreator {
 
 	LauncherDiscoveryRequest toDiscoveryRequest(CommandLineOptions options) {
 		LauncherDiscoveryRequestBuilder requestBuilder = request();
-		requestBuilder.selectors(createDiscoverySelectors(options));
-		addFilters(requestBuilder, options);
+		List<? extends DiscoverySelector> selectors = createDiscoverySelectors(options);
+		requestBuilder.selectors(selectors);
+		addFilters(requestBuilder, options, selectors);
 		requestBuilder.configurationParameters(options.getConfigurationParameters());
 		return requestBuilder.build();
 	}
 
 	private List<? extends DiscoverySelector> createDiscoverySelectors(CommandLineOptions options) {
+		List<DiscoverySelector> explicitSelectors = options.getExplicitSelectors();
 		if (options.isScanClasspath()) {
-			Preconditions.condition(!options.hasExplicitSelectors(),
+			Preconditions.condition(explicitSelectors.isEmpty(),
 				"Scanning the classpath and using explicit selectors at the same time is not supported");
 			return createClasspathRootSelectors(options);
 		}
 		if (options.isScanModulepath()) {
-			Preconditions.condition(!options.hasExplicitSelectors(),
+			Preconditions.condition(explicitSelectors.isEmpty(),
 				"Scanning the module-path and using explicit selectors at the same time is not supported");
 			return selectModules(ModuleUtils.findAllNonSystemBootModuleNames());
 		}
-		return createExplicitDiscoverySelectors(options);
+		return Preconditions.notEmpty(explicitSelectors, "No arguments were supplied to the ConsoleLauncher");
 	}
 
 	private List<ClasspathRootSelector> createClasspathRootSelectors(CommandLineOptions options) {
@@ -83,23 +86,9 @@ private Set<Path> determineClasspathRoots(CommandLineOptions options) {
 		return new LinkedHashSet<>(options.getSelectedClasspathEntries());
 	}
 
-	private List<DiscoverySelector> createExplicitDiscoverySelectors(CommandLineOptions options) {
-		List<DiscoverySelector> selectors = new ArrayList<>();
-		options.getSelectedUris().stream().map(DiscoverySelectors::selectUri).forEach(selectors::add);
-		options.getSelectedFiles().stream().map(DiscoverySelectors::selectFile).forEach(selectors::add);
-		options.getSelectedDirectories().stream().map(DiscoverySelectors::selectDirectory).forEach(selectors::add);
-		options.getSelectedModules().stream().map(DiscoverySelectors::selectModule).forEach(selectors::add);
-		options.getSelectedPackages().stream().map(DiscoverySelectors::selectPackage).forEach(selectors::add);
-		options.getSelectedClasses().stream().map(DiscoverySelectors::selectClass).forEach(selectors::add);
-		options.getSelectedMethods().stream().map(DiscoverySelectors::selectMethod).forEach(selectors::add);
-		options.getSelectedClasspathResources().stream().map(DiscoverySelectors::selectClasspathResource).forEach(
-			selectors::add);
-		Preconditions.notEmpty(selectors, "No arguments were supplied to the ConsoleLauncher");
-		return selectors;
-	}
-
-	private void addFilters(LauncherDiscoveryRequestBuilder requestBuilder, CommandLineOptions options) {
-		requestBuilder.filters(includedClassNamePatterns(options));
+	private void addFilters(LauncherDiscoveryRequestBuilder requestBuilder, CommandLineOptions options,
+			List<? extends DiscoverySelector> selectors) {
+		requestBuilder.filters(includedClassNamePatterns(options, selectors));
 
 		if (!options.getExcludedClassNamePatterns().isEmpty()) {
 			requestBuilder.filters(
@@ -131,17 +120,26 @@ private void addFilters(LauncherDiscoveryRequestBuilder requestBuilder, CommandL
 		}
 	}
 
-	private ClassNameFilter includedClassNamePatterns(CommandLineOptions options) {
-		Stream<Stream<String>> patternStreams = Stream.of( //
+	private ClassNameFilter includedClassNamePatterns(CommandLineOptions options,
+			List<? extends DiscoverySelector> selectors) {
+		Stream<String> patternStreams = Stream.concat( //
 			options.getIncludedClassNamePatterns().stream(), //
-			options.getSelectedClasses().stream() //
-					.map(Pattern::quote), //
-			options.getSelectedMethods().stream() //
-					.map(name -> ReflectionUtils.parseFullyQualifiedMethodName(name)[0]) //
+			selectors.stream() //
+					.map(selector -> selector instanceof IterationSelector
+							? ((IterationSelector) selector).getParentSelector()
+							: selector) //
+					.map(selector -> {
+						if (selector instanceof ClassSelector) {
+							return ((ClassSelector) selector).getClassName();
+						}
+						if (selector instanceof MethodSelector) {
+							return ((MethodSelector) selector).getClassName();
+						}
+						return null;
+					}) //
+					.filter(Objects::nonNull) //
 					.map(Pattern::quote));
-		return includeClassNamePatterns(patternStreams //
-				.flatMap(Function.identity()) //
-				.toArray(String[]::new));
+		return includeClassNamePatterns(patternStreams.toArray(String[]::new));
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index 07a522f8c7d5..7ba4af6aaa73 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -19,12 +19,20 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathResource;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectDirectory;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectFile;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectIteration;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectModule;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUri;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -311,13 +319,13 @@ void parseInvalidXmlReportsDirs() {
 	void parseValidUriSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("-u file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("--u file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("-select-uri file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("-select-uri=file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("--select-uri file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(new URI("file:///foo.txt")), type.parseArgLine("--select-uri=file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(new URI("file:///foo.txt"), new URI("https://example")), type.parseArgLine("-u file:///foo.txt -u https://example").getSelectedUris())
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-u file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--u file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-select-uri file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-select-uri=file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--select-uri file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--select-uri=file:///foo.txt").getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt"), selectUri("https://example")), type.parseArgLine("-u file:///foo.txt -u https://example").getSelectedUris())
 		);
 		// @formatter:on
 	}
@@ -332,13 +340,13 @@ void parseInvalidUriSelectors() {
 	void parseValidFileSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("-f foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("--f foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("-select-file foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("-select-file=foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("--select-file foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of("foo.txt"), type.parseArgLine("--select-file=foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of("foo.txt", "bar.csv"), type.parseArgLine("-f foo.txt -f bar.csv").getSelectedFiles())
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-f foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--f foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-select-file foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-select-file=foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--select-file foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--select-file=foo.txt").getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt"), selectFile("bar.csv")), type.parseArgLine("-f foo.txt -f bar.csv").getSelectedFiles())
 		);
 		// @formatter:on
 	}
@@ -353,13 +361,13 @@ void parseInvalidFileSelectors() {
 	void parseValidDirectorySelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("-d foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("--d foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("-select-directory foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("-select-directory=foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("--select-directory foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of("foo/bar"), type.parseArgLine("--select-directory=foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of("foo/bar", "bar/qux"), type.parseArgLine("-d foo/bar -d bar/qux").getSelectedDirectories())
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-d foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--d foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-select-directory foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-select-directory=foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--select-directory foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--select-directory=foo/bar").getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar"), selectDirectory("bar/qux")), type.parseArgLine("-d foo/bar -d bar/qux").getSelectedDirectories())
 		);
 		// @formatter:on
 	}
@@ -374,13 +382,13 @@ void parseInvalidDirectorySelectors() {
 	void parseValidModuleSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-o com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--o com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-select-module com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-select-module=com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--select-module com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--select-module=com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of("com.acme.foo", "com.example.bar"), type.parseArgLine("-o com.acme.foo -o com.example.bar").getSelectedModules())
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-o com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--o com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-select-module com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-select-module=com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--select-module com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--select-module=com.acme.foo").getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo"), selectModule("com.example.bar")), type.parseArgLine("-o com.acme.foo -o com.example.bar").getSelectedModules())
 		);
 		// @formatter:on
 	}
@@ -395,13 +403,13 @@ void parseInvalidModuleSelectors() {
 	void parseValidPackageSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-p com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--p com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-select-package com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("-select-package=com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--select-package com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of("com.acme.foo"), type.parseArgLine("--select-package=com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of("com.acme.foo", "com.example.bar"), type.parseArgLine("-p com.acme.foo -p com.example.bar").getSelectedPackages())
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-p com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--p com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-select-package com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-select-package=com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--select-package com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--select-package=com.acme.foo").getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo"), selectPackage("com.example.bar")), type.parseArgLine("-p com.acme.foo -p com.example.bar").getSelectedPackages())
 		);
 		// @formatter:on
 	}
@@ -416,13 +424,13 @@ void parseInvalidPackageSelectors() {
 	void parseValidClassSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("-c com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("--c com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("-select-class com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("-select-class=com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("--select-class com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of("com.acme.Foo"), type.parseArgLine("--select-class=com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of("com.acme.Foo", "com.example.Bar"), type.parseArgLine("-c com.acme.Foo -c com.example.Bar").getSelectedClasses())
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-c com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--c com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-select-class com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-select-class=com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--select-class com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--select-class=com.acme.Foo").getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo"), selectClass("com.example.Bar")), type.parseArgLine("-c com.acme.Foo -c com.example.Bar").getSelectedClasses())
 		);
 		// @formatter:on
 	}
@@ -437,13 +445,13 @@ void parseInvalidClassSelectors() {
 	void parseValidMethodSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("-m com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("--m com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("-select-method com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("-select-method=com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("--select-method com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of("com.acme.Foo#m()"), type.parseArgLine("--select-method=com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of("com.acme.Foo#m()", "com.example.Bar#method(java.lang.Object)"),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-m com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--m com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-select-method com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-select-method=com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--select-method com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--select-method=com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()"), selectMethod("com.example.Bar#method(java.lang.Object)")),
 						type.parseArgLine("-m com.acme.Foo#m() -m com.example.Bar#method(java.lang.Object)").getSelectedMethods())
 		);
 		// @formatter:on
@@ -459,13 +467,13 @@ void parseInvalidMethodSelectors() {
 	void parseValidClasspathResourceSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("-r /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("--r /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("-select-resource /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("-select-resource=/foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("--select-resource /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of("/foo.csv"), type.parseArgLine("--select-resource=/foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of("/foo.csv", "bar.json"), type.parseArgLine("-r /foo.csv -r bar.json").getSelectedClasspathResources())
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-r /foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--r /foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-select-resource /foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-select-resource=/foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--select-resource /foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--select-resource=/foo.csv").getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv"), selectClasspathResource("bar.json")), type.parseArgLine("-r /foo.csv -r bar.json").getSelectedClasspathResources())
 		);
 		// @formatter:on
 	}
@@ -475,6 +483,27 @@ void parseInvalidClasspathResourceSelectors() {
 		assertOptionWithMissingRequiredArgumentThrowsException("-r", "--select-resource");
 	}
 
+	@ParameterizedTest
+	@EnumSource
+	void parseValidIterationSelectors(ArgsType type) {
+		// @formatter:off
+		assertAll(
+				() -> assertEquals(List.of(selectIteration(selectClasspathResource("/foo.csv"), 0)), type.parseArgLine("-i resource:/foo.csv[0]").getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectMethod("com.acme.Foo#m()"), 1, 2)), type.parseArgLine("--i method:com.acme.Foo#m()[1..2]").getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectClass("com.acme.Foo"), 0, 2)), type.parseArgLine("-select-iteration class:com.acme.Foo[0,2]").getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectPackage("com.acme.foo"), 3)), type.parseArgLine("-select-iteration=package:com.acme.foo[3]").getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectModule("com.acme.foo"), 0, 1, 2, 4, 5, 6)), type.parseArgLine("--select-iteration module:com.acme.foo[0..2,4..6]").getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectDirectory("foo/bar"), 1, 5)), type.parseArgLine("--select-iteration=directory:foo/bar[1,5]").getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectFile("foo.txt"), 6), selectIteration(selectUri("file:///foo.txt"), 7)), type.parseArgLine("-i file:foo.txt[6] -i uri:file:///foo.txt[7]").getSelectedIterations())
+		);
+		// @formatter:on
+	}
+
+	@Test
+	void parseInvalidIterationSelectors() {
+		assertOptionWithMissingRequiredArgumentThrowsException("-i", "--select-iteration");
+	}
+
 	@ParameterizedTest
 	@EnumSource
 	void parseClasspathScanningEntries(ArgsType type) {
@@ -543,8 +572,9 @@ void printHelpOutputsHelpOption() {
 	void printHelpPreservesOriginalIOException() {
 		var writer = new Writer() {
 
+			@SuppressWarnings("NullableProblems")
 			@Override
-			public void write(char[] cbuf, int off, int len) throws IOException {
+			public void write(char[] buffer, int off, int len) throws IOException {
 				throw new IOException("Something went wrong");
 			}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index cb2745359a1f..cc245f18e727 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -15,6 +15,14 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathResource;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectDirectory;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectFile;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectIteration;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUri;
 
 import java.io.File;
 import java.net.URI;
@@ -34,6 +42,7 @@
 import org.junit.platform.engine.discovery.ClasspathRootSelector;
 import org.junit.platform.engine.discovery.DirectorySelector;
 import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.IterationSelector;
 import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.PackageNameFilter;
 import org.junit.platform.engine.discovery.PackageSelector;
@@ -92,7 +101,7 @@ void convertsScanClasspathOptionWithAdditionalClasspathEntries() {
 	@Test
 	void doesNotSupportScanClasspathAndExplicitSelectors() {
 		options.setScanClasspath(true);
-		options.setSelectedClasses(List.of("SomeTest"));
+		options.setSelectedClasses(List.of(selectClass("SomeTest")));
 
 		Throwable cause = assertThrows(PreconditionViolationException.class, this::convert);
 
@@ -125,8 +134,9 @@ void convertsExplicitIncludeClassNamePatternOption() {
 
 	@Test
 	void includeSelectedClassesAndMethodsRegardlessOfClassNamePatterns() {
-		options.setSelectedClasses(List.of("SomeTest"));
-		options.setSelectedMethods(List.of("com.acme.Foo#m()"));
+		options.setSelectedClasses(List.of(selectClass("SomeTest")));
+		options.setSelectedMethods(List.of(selectMethod("com.acme.Foo#m()")));
+		options.setSelectedIterations(List.of(selectIteration(selectMethod("com.acme.Bar#n()"), 0)));
 		options.setIncludedClassNamePatterns(List.of("Foo.*Bar"));
 
 		var request = convert();
@@ -135,6 +145,7 @@ void includeSelectedClassesAndMethodsRegardlessOfClassNamePatterns() {
 		assertThat(filters).hasSize(1);
 		assertIncludes(filters.get(0), "SomeTest");
 		assertIncludes(filters.get(0), "com.acme.Foo");
+		assertIncludes(filters.get(0), "com.acme.Bar");
 		assertIncludes(filters.get(0), "Foo.*Bar");
 	}
 
@@ -196,8 +207,8 @@ void convertsEngineOptions() {
 	}
 
 	@Test
-	void convertsUriSelectors() {
-		options.setSelectedUris(List.of(URI.create("a"), URI.create("b")));
+	void propagatesUriSelectors() {
+		options.setSelectedUris(List.of(selectUri("a"), selectUri("b")));
 
 		var request = convert();
 		var uriSelectors = request.getSelectorsByType(UriSelector.class);
@@ -206,8 +217,8 @@ void convertsUriSelectors() {
 	}
 
 	@Test
-	void convertsFileSelectors() {
-		options.setSelectedFiles(List.of("foo.txt", "bar.csv"));
+	void propagatesFileSelectors() {
+		options.setSelectedFiles(List.of(selectFile("foo.txt"), selectFile("bar.csv")));
 
 		var request = convert();
 		var fileSelectors = request.getSelectorsByType(FileSelector.class);
@@ -216,8 +227,8 @@ void convertsFileSelectors() {
 	}
 
 	@Test
-	void convertsDirectorySelectors() {
-		options.setSelectedDirectories(List.of("foo/bar", "bar/qux"));
+	void propagatesDirectorySelectors() {
+		options.setSelectedDirectories(List.of(selectDirectory("foo/bar"), selectDirectory("bar/qux")));
 
 		var request = convert();
 		var directorySelectors = request.getSelectorsByType(DirectorySelector.class);
@@ -226,8 +237,8 @@ void convertsDirectorySelectors() {
 	}
 
 	@Test
-	void convertsPackageSelectors() {
-		options.setSelectedPackages(List.of("com.acme.foo", "com.example.bar"));
+	void propagatesPackageSelectors() {
+		options.setSelectedPackages(List.of(selectPackage("com.acme.foo"), selectPackage("com.example.bar")));
 
 		var request = convert();
 		var packageSelectors = request.getSelectorsByType(PackageSelector.class);
@@ -237,8 +248,8 @@ void convertsPackageSelectors() {
 	}
 
 	@Test
-	void convertsClassSelectors() {
-		options.setSelectedClasses(List.of("com.acme.Foo", "com.example.Bar"));
+	void propagatesClassSelectors() {
+		options.setSelectedClasses(List.of(selectClass("com.acme.Foo"), selectClass("com.example.Bar")));
 
 		var request = convert();
 		var classSelectors = request.getSelectorsByType(ClassSelector.class);
@@ -248,8 +259,9 @@ void convertsClassSelectors() {
 	}
 
 	@Test
-	void convertsMethodSelectors() {
-		options.setSelectedMethods(List.of("com.acme.Foo#m()", "com.example.Bar#method(java.lang.Object)"));
+	void propagatesMethodSelectors() {
+		options.setSelectedMethods(
+			List.of(selectMethod("com.acme.Foo#m()"), selectMethod("com.example.Bar#method(java.lang.Object)")));
 
 		var request = convert();
 		var methodSelectors = request.getSelectorsByType(MethodSelector.class);
@@ -264,8 +276,9 @@ void convertsMethodSelectors() {
 	}
 
 	@Test
-	void convertsClasspathResourceSelectors() {
-		options.setSelectedClasspathResources(List.of("foo.csv", "com/example/bar.json"));
+	void propagatesClasspathResourceSelectors() {
+		options.setSelectedClasspathResources(
+			List.of(selectClasspathResource("foo.csv"), selectClasspathResource("com/example/bar.json")));
 
 		var request = convert();
 		var classpathResourceSelectors = request.getSelectorsByType(ClasspathResourceSelector.class);
@@ -274,6 +287,22 @@ void convertsClasspathResourceSelectors() {
 			ClasspathResourceSelector::getClasspathResourceName).containsExactly("foo.csv", "com/example/bar.json");
 	}
 
+	@Test
+	void propagatesIterationSelectors() {
+		var methodSelector = selectMethod("com.acme.Foo#m()");
+		var classSelector = selectClass("com.example.Bar");
+		options.setSelectedIterations(List.of(selectIteration(methodSelector, 1), selectIteration(classSelector, 2)));
+
+		var request = convert();
+		var iterationSelectors = request.getSelectorsByType(IterationSelector.class);
+
+		assertThat(iterationSelectors).hasSize(2);
+		assertThat(iterationSelectors.get(0).getParentSelector()).isEqualTo(methodSelector);
+		assertThat(iterationSelectors.get(0).getIterationIndices()).containsExactly(1);
+		assertThat(iterationSelectors.get(1).getParentSelector()).isEqualTo(classSelector);
+		assertThat(iterationSelectors.get(1).getIterationIndices()).containsExactly(2);
+	}
+
 	@Test
 	void convertsConfigurationParameters() {
 		options.setScanClasspath(true);

From 07daaa5d396c88df8e5b7bfcbb62f08b2896eab3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 15:54:23 +0100
Subject: [PATCH 0633/1433] Define task for running ConsoleLauncher manually

---
 documentation/documentation.gradle.kts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 4455b23e6b91..f8bea9f24216 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -146,6 +146,21 @@ tasks {
 		}
 	}
 
+	register<JavaExec>("consoleLauncher") {
+		val reportsDir = file("$buildDir/console-launcher")
+		outputs.dir(reportsDir)
+		outputs.upToDateWhen { false }
+		classpath = sourceSets["test"].runtimeClasspath
+		mainClass.set("org.junit.platform.console.ConsoleLauncher")
+		args("--scan-classpath")
+		args("--config", "enableHttpServer=true")
+		args("--include-classname", ".*Tests")
+		args("--include-classname", ".*Demo")
+		args("--exclude-tag", "exclude")
+		args("--reports-dir", reportsDir)
+		systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
+	}
+
 	test {
 		dependsOn(consoleLauncherTest)
 		exclude("**/*")

From ac6e82ae7470f4b8a42852a3c4b9e87a7a11c299 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 16:10:26 +0100
Subject: [PATCH 0634/1433] Add Javadoc

---
 .../engine/discovery/DiscoverySelectors.java      | 11 +++++++++++
 .../engine/discovery/IterationSelector.java       | 15 +++++++++++++++
 .../support/discovery/SelectorResolver.java       | 15 +++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index c8477791e3c9..6a30d428e76b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -696,6 +696,17 @@ public static UniqueIdSelector selectUniqueId(String uniqueId) {
 		return new UniqueIdSelector(UniqueId.parse(uniqueId));
 	}
 
+	/**
+	 * Create an {@code IterationSelector} for the supplied parent selector and
+	 * iteration indices.
+	 *
+	 * @param parentSelector the parent selector to select iterations for; never
+	 * {@code null}
+	 * @param iterationIndices the iteration indices to select; never
+	 * {@code null} or empty
+	 * @since 1.9
+	 * @see IterationSelector
+	 */
 	@API(status = EXPERIMENTAL, since = "1.9")
 	public static IterationSelector selectIteration(DiscoverySelector parentSelector, int... iterationIndices) {
 		Preconditions.notNull(parentSelector, "Parent selector must not be null");
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
index f63d7ba65d63..7071e8d7e60d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
@@ -24,6 +24,15 @@
 import org.junit.platform.commons.util.ToStringBuilder;
 import org.junit.platform.engine.DiscoverySelector;
 
+/**
+ * A {@link IterationSelector} that selects the iterations of a parent
+ * {@link DiscoverySelector} via their index so that
+ * {@link org.junit.platform.engine.TestEngine TestEngines} can discover
+ * a subset of the iterations of tests or containers.
+ *
+ * @since 1.9
+ * @see DiscoverySelectors#selectIteration(DiscoverySelector, int...)
+ */
 @API(status = EXPERIMENTAL, since = "1.9")
 public class IterationSelector implements DiscoverySelector {
 
@@ -41,10 +50,16 @@ private SortedSet<Integer> toSortedSet(int[] iterationIndices) {
 				.collect(collectingAndThen(toCollection(TreeSet::new), Collections::unmodifiableSortedSet));
 	}
 
+	/**
+	 * Get the selected parent {@link DiscoverySelector}.
+	 */
 	public DiscoverySelector getParentSelector() {
 		return parentSelector;
 	}
 
+	/**
+	 * Get the selected iteration indices.
+	 */
 	public SortedSet<Integer> getIterationIndices() {
 		return iterationIndices;
 	}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
index f573ae8280d4..93f217514901 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
@@ -299,6 +299,21 @@ default Resolution resolve(UriSelector selector, Context context) {
 		return resolve((DiscoverySelector) selector, context);
 	}
 
+	/**
+	 * Resolve the supplied {@link IterationSelector} using the supplied
+	 * {@link Context Context}.
+	 *
+	 * <p>The default implementation delegates to {@link
+	 * #resolve(DiscoverySelector, Context)}.
+	 *
+	 * @param selector the selector to be resolved; never {@code null}
+	 * @param context the context to be used for resolving the selector; never
+	 * {@code null}
+	 * @return a {@link Resolution Resolution} of {@link Resolution#unresolved()
+	 * unresolved()}, {@link Resolution#selectors(Set) selectors()}, or {@link
+	 * Resolution#matches(Set) matches()}; never {@code null}
+	 * @see #resolve(DiscoverySelector, Context)
+	 */
 	@API(status = EXPERIMENTAL, since = "1.9")
 	default Resolution resolve(IterationSelector selector, Context context) {
 		return resolve((DiscoverySelector) selector, context);

From b7e204f4ad5709cfe7461d68606f5f6f53ce1347 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 31 Oct 2021 16:10:32 +0100
Subject: [PATCH 0635/1433] Add to release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index e0d5d1de2d6f..36ac237ff16b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -23,6 +23,7 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* New `IterationSelector` for selecting a subset of a test's or container's iterations.
 * JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at resolution time a fully running set of dependencies are calculated avoiding the need for these to be manually specified.
 
 
@@ -39,7 +40,8 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* Add support for `IterationSelector` to select a subset of the invocations of
+  parameterized or dynamic tests.
 
 
 [[release-notes-5.9.0-M1-junit-vintage]]

From efbd97ea6e655ef968b29e5804130d5dee3d6c8f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 2 Nov 2021 19:55:41 +0100
Subject: [PATCH 0636/1433] Make test work with and without Test Distribution

---
 .../jupiter/engine/JupiterTestEngineBasicTests.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
index 6b4805d371ee..79aba3638091 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.engine;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
@@ -31,17 +32,20 @@ void id() {
 
 	@Test
 	void groupId() {
-		assertEquals("org.junit.jupiter", jupiter.getGroupId().get());
+		assertEquals("org.junit.jupiter", jupiter.getGroupId().orElseThrow());
 	}
 
 	@Test
 	void artifactId() {
-		assertEquals("junit-jupiter-engine", jupiter.getArtifactId().get());
+		assertEquals("junit-jupiter-engine", jupiter.getArtifactId().orElseThrow());
 	}
 
 	@Test
 	void version() {
-		assertEquals(System.getProperty("developmentVersion"), jupiter.getVersion().get());
+		assertThat(jupiter.getVersion().orElseThrow()).isIn( //
+			System.getProperty("developmentVersion"), // with Test Distribution
+			"DEVELOPMENT" // without Test Distribution
+		);
 	}
 
 }

From 209a59f34d5bd0c70c7a8478c3da9b14372213b2 Mon Sep 17 00:00:00 2001
From: Narendra Pathai <narendra.pathai@gmail.com>
Date: Thu, 4 Nov 2021 00:14:58 +0530
Subject: [PATCH 0637/1433] Add EnumSource.MATCH_NONE mode (#2768)

The new mode selects only those enum constants whose names match none of
the supplied patterns.

Resolves #2761.
---
 .../release-notes/release-notes-5.9.0-M1.adoc     |  2 ++
 .../junit/jupiter/params/provider/EnumSource.java | 14 +++++++++++++-
 .../jupiter/params/provider/EnumSourceTests.java  | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 36ac237ff16b..a382b196cf78 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -42,6 +42,8 @@ on GitHub.
 
 * Add support for `IterationSelector` to select a subset of the invocations of
   parameterized or dynamic tests.
+* Add support for `MATCH_NONE` mode in `EnumSource` that selects only those enum constants
+  whose names match none of the supplied patterns.
 
 
 [[release-notes-5.9.0-M1-junit-vintage]]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
index 928fda84a59a..5aeae45bb590 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.params.provider;
 
 import static java.util.stream.Collectors.toSet;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
@@ -86,6 +87,7 @@
 	 * @see Mode#EXCLUDE
 	 * @see Mode#MATCH_ALL
 	 * @see Mode#MATCH_ANY
+	 * @see Mode#MATCH_NONE
 	 * @see #names
 	 */
 	Mode mode() default Mode.INCLUDE;
@@ -121,7 +123,17 @@ enum Mode {
 		 *
 		 * @see java.util.stream.Stream#anyMatch(java.util.function.Predicate)
 		 */
-		MATCH_ANY(Mode::validatePatterns, (name, patterns) -> patterns.stream().anyMatch(name::matches));
+		MATCH_ANY(Mode::validatePatterns, (name, patterns) -> patterns.stream().anyMatch(name::matches)),
+
+		/**
+		 * Select only those enum constants whose names match none of the patterns supplied
+		 * via the {@link EnumSource#names} attribute.
+		 *
+		 * @since 5.9
+		 * @see java.util.stream.Stream#noneMatch(java.util.function.Predicate)
+		 */
+		@API(status = EXPERIMENTAL, since = "5.9")
+		MATCH_NONE(Mode::validatePatterns, (name, patterns) -> patterns.stream().noneMatch(name::matches));
 
 		private final Validator validator;
 		private final BiPredicate<String, Set<String>> selector;
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
index 919798c9e887..a4d3c3c1f21a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
@@ -18,6 +18,7 @@
 import static org.junit.jupiter.params.provider.EnumSource.Mode.INCLUDE;
 import static org.junit.jupiter.params.provider.EnumSource.Mode.MATCH_ALL;
 import static org.junit.jupiter.params.provider.EnumSource.Mode.MATCH_ANY;
+import static org.junit.jupiter.params.provider.EnumSource.Mode.MATCH_NONE;
 import static org.junit.jupiter.params.provider.EnumSourceTests.EnumWithThreeConstants.BAR;
 import static org.junit.jupiter.params.provider.EnumSourceTests.EnumWithThreeConstants.BAZ;
 import static org.junit.jupiter.params.provider.EnumSourceTests.EnumWithThreeConstants.FOO;
@@ -91,6 +92,20 @@ void matchesAny() {
 			() -> assertTrue(MATCH_ANY.select(BAZ, Set.of("^.+[zZ]$"))));
 	}
 
+	@Test
+	void matchesNone() {
+		assertAll("matches none fails if any match", //
+			() -> assertFalse(MATCH_NONE.select(FOO, Set.of("F.."))),
+			() -> assertFalse(MATCH_NONE.select(FOO, Set.of("B..", "F.."))),
+			() -> assertFalse(MATCH_NONE.select(BAZ, Set.of("B.", "F.", "^.+[zZ]$"))));
+
+		assertAll("matches none", //
+			() -> assertTrue(MATCH_NONE.select(FOO, Set.of())), //
+			() -> assertTrue(MATCH_NONE.select(FOO, Set.of("F."))),
+			() -> assertTrue(MATCH_NONE.select(FOO, Set.of("B.."))),
+			() -> assertTrue(MATCH_NONE.select(BAZ, Set.of(".", "B.", "F."))));
+	}
+
 	enum EnumWithThreeConstants {
 		FOO, BAR, BAZ;
 

From af71c464becb74d5c9daefb314d8e46d2bdcbe87 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 3 Nov 2021 20:39:59 +0100
Subject: [PATCH 0638/1433] Stop publishing to scans.gradle.com for PR builds

---
 settings.gradle.kts | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c40ee6eb9042..7a43a14f8e67 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -43,25 +43,18 @@ val junitBuildCachePassword: String? by extra
 
 gradleEnterprise {
 	buildScan {
-		isCaptureTaskInputFiles = true
+		capture.isTaskInputFiles = true
 		isUploadInBackground = !isCiServer
 
-		fun accessKeysAreMissingOrBlank() = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNullOrBlank()
+		publishAlways()
 
-		if (gradle.startParameter.isBuildScan || (isCiServer && accessKeysAreMissingOrBlank())) {
-			termsOfServiceUrl = "https://gradle.com/terms-of-service"
-		} else {
+		// Publish to scans.gradle.com when `--scan` is used explicitly
+		if (!gradle.startParameter.isBuildScan) {
 			server = gradleEnterpriseServer
-			publishAlways()
 			this as BuildScanExtensionWithHiddenFeatures
 			publishIfAuthenticated()
 		}
 
-		if (isCiServer) {
-			publishAlways()
-			termsOfServiceAgree = "yes"
-		}
-
 		obfuscation {
 			if (isCiServer) {
 				username { "github" }

From 38d1cd6100664964e554c0a59fdb3b7e0bb7fc1d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 3 Nov 2021 20:40:15 +0100
Subject: [PATCH 0639/1433] Update section about Gradle Enterprise in readme

---
 README.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0d08b133a8ea..d37dfcf039a3 100644
--- a/README.md
+++ b/README.md
@@ -46,15 +46,19 @@ A code coverage report can also be generated locally via the [Gradle Wrapper] by
 executing `gradlew -PenableJaCoCo clean jacocoRootReport`. The results will be available
 in `build/reports/jacoco/jacocoRootReport/html/index.html`.
 
-## Gradle Build Scans and Build Caching
+## Gradle Enterprise
 
 [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.junit.org/scans)
 
-JUnit 5 utilizes [Gradle Enterprise](https://gradle.com/) for _Build Scans_ and the
-_Remote Build Cache_. An example build scan for JUnit 5 can be viewed
-[here](https://ge.junit.org/s/2vwrn4rn67dky). Currently, only core team members can
-publish build scans. The remote build cache, however, is enabled by default for everyone
-so that local builds can reuse task outputs from previous CI builds.
+JUnit 5 utilizes [Gradle Enterprise](https://gradle.com/) for _Build Scans_, _Build Cache_, and _Test Distribution_.
+
+The latest Build Scans are available on [ge.junit.org](https://ge.junit.org/). Currently,
+only core team members can publish Build Scans and use Test Distribution on that server.
+You can, however, publish a Build Scan to [scans.gradle.com](https://scans.gradle.com/) by
+using the `--scan` parameter explicitly.
+
+The remote Build Cache is enabled by default for everyone so that local builds can reuse
+task outputs from previous CI builds.
 
 ## Building from Source
 

From f4ef4b9e607579dd0000d4bfcfe6a34b39823b53 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 5 Nov 2021 11:38:31 +0100
Subject: [PATCH 0640/1433] Make quote character in @CsvFileSource configurable

Prior to this commit, the quote character for quoted strings in
@CsvFileSource was hard coded to a double quote (") and could not be
changed.

Commit f1cbfbe14a introduced a new quoteCharacter attribute in
@CsvSource that allows the user to change the quote character.

For consistency between the two features, this commit introduces a new
quoteCharacter attribute in @CsvFileSource. The quoteCharacter defaults
to a double quote for backward compatibility.

Closes #2735
---
 .../release-notes/release-notes-5.8.2.adoc    | 15 ++++++-----
 .../asciidoc/user-guide/writing-tests.adoc    | 15 +++++------
 .../src/test/resources/two-column.csv         |  2 +-
 .../params/provider/CsvFileSource.java        | 25 ++++++++++++++-----
 .../params/provider/CsvParserFactory.java     |  3 +--
 .../CsvFileArgumentsProviderTests.java        | 13 ++++++++++
 .../provider/MockCsvAnnotationBuilder.java    | 23 +++++++++++------
 7 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
index b16c00a2c1c1..6e97eae8b162 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
@@ -1,12 +1,12 @@
 [[release-notes-5.8.2]]
 == 5.8.2
 
-*Date of Release:* October ❓, 2021
+*Date of Release:* November ❓, 2021
 
 *Scope:*
 
-* Text blocks in `@CsvSource` are treated as CSV files
-* Custom quote character support in `@CsvSource`
+* Text blocks in `@CsvSource` are treated like CSV files
+* Custom quote character support in `@CsvSource` and `@CsvFileSource`
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/60?closed=1+[5.8.2] milestone page in the JUnit repository on
@@ -24,14 +24,13 @@ No changes.
 
 ==== New Features and Improvements
 
-* Text blocks in `@CsvSource` are now treated as complete CSV files, including support for
-  comments beginning with a `+++#+++` symbol as well as support for new lines within
+* Text blocks in `@CsvSource` are now treated like complete CSV files, including support
+  for comments beginning with a `+++#+++` symbol as well as support for new lines within
   quoted strings. See the
   <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvSource, User
   Guide>> for details and examples.
-* The quote character for _quoted strings_ in `@CsvSource` is now configurable via the new
-  `quoteCharacter` attribute, which defaults to a single quote (`'`) for backward
-  compatibility.
+* The quote character for _quoted strings_ in `@CsvSource` and `@CsvFileSource` is now
+  configurable via new `quoteCharacter` attributes in each annotation.
 
 
 [[release-notes-5.8.2-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 0bc94d85b421..efa460277ba1 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1344,9 +1344,9 @@ The default delimiter is a comma (`,`), but you can use another character by set
 `String` delimiter instead of a single character. However, both delimiter attributes
 cannot be set simultaneously.
 
-By default, `@CsvSource` uses a single quote `'` as its quote character, but this can be
+By default, `@CsvSource` uses a single quote (`'`) as its quote character, but this can be
 changed via the `quoteCharacter` attribute. See the `'lemon, lime'` value in the example
-above and in the table below. An empty, quoted value `''` results in an empty `String`
+above and in the table below. An empty, quoted value (`''`) results in an empty `String`
 unless the `emptyValue` attribute is set; whereas, an entirely _empty_ value is
 interpreted as a `null` reference. By specifying one or more `nullValues`, a custom value
 can be interpreted as a `null` reference (see the `NIL` example in the table below). An
@@ -1395,9 +1395,9 @@ In contrast to CSV records supplied via the `value` attribute, a text block can
 comments. Any line beginning with a `+++#+++` symbol will be treated as a comment and
 ignored. Note, however, that the `+++#+++` symbol must be the first character on the line
 without any leading whitespace. It is therefore recommended that the closing text block
-delimiter `"""` be placed either at the end of the last line of input or on the following
-line, left aligned with the rest of the input (as can be seen in the example below which
-demonstrates formatting similar to a table).
+delimiter (`"""`) be placed either at the end of the last line of input or on the
+following line, left aligned with the rest of the input (as can be seen in the example
+below which demonstrates formatting similar to a table).
 
 [source,java,indent=0]
 ----
@@ -1458,8 +1458,9 @@ include::{testResourcesDir}/two-column.csv[]
 ----
 
 In contrast to the default syntax used in `@CsvSource`, `@CsvFileSource` uses a double
-quote `"` as the quote character. See the `"United States of America"` value in the
-example above. An empty, quoted value `""` results in an empty `String` unless the
+quote (`+++"+++`) as the quote character by default, but this can be changed via the
+`quoteCharacter` attribute. See the `"United States of America"` value in the example
+above. An empty, quoted value (`+++""+++`) results in an empty `String` unless the
 `emptyValue` attribute is set; whereas, an entirely _empty_ value is interpreted as a
 `null` reference. By specifying one or more `nullValues`, a custom value can be
 interpreted as a `null` reference. An `ArgumentConversionException` is thrown if the
diff --git a/documentation/src/test/resources/two-column.csv b/documentation/src/test/resources/two-column.csv
index 917fba3ff5b6..011550be3707 100644
--- a/documentation/src/test/resources/two-column.csv
+++ b/documentation/src/test/resources/two-column.csv
@@ -1,4 +1,4 @@
-Country, reference
+Country, Reference
 Sweden, 1
 Poland, 2
 "United States of America", 3
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 1c582b2ea45b..a2c9f400b285 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -36,12 +36,12 @@
  * via either {@link #delimiter} or {@link #delimiterString}.
  *
  * <p>In contrast to the default syntax used in {@code @CsvSource}, {@code @CsvFileSource}
- * uses a double quote ({@code "}) as its quote character (see the User Guide for
- * examples). An empty, quoted value ({@code ""}) results in an empty {@link String}
- * unless the {@link #emptyValue} attribute is set; whereas, an entirely <em>empty</em>
- * value is interpreted as a {@code null} reference. By specifying one or more
- * {@link #nullValues} a custom value can be interpreted as a {@code null} reference
- * (see the User Guide for an example). An
+ * uses a double quote ({@code "}) as its quote character by default, but this can
+ * be changed via {@link #quoteCharacter}. An empty, quoted value ({@code ""})
+ * results in an empty {@link String} unless the {@link #emptyValue} attribute is
+ * set; whereas, an entirely <em>empty</em> value is interpreted as a {@code null}
+ * reference. By specifying one or more {@link #nullValues} a custom value can be
+ * interpreted as a {@code null} reference (see the User Guide for an example). An
  * {@link org.junit.jupiter.params.converter.ArgumentConversionException
  * ArgumentConversionException} is thrown if the target type of a {@code null}
  * reference is a primitive type.
@@ -95,6 +95,19 @@
 	 */
 	String lineSeparator() default "\n";
 
+	/**
+	 * The quote character to use for <em>quoted strings</em>.
+	 *
+	 * <p>Defaults to a double quote ({@code "}).
+	 *
+	 * <p>You may change the quote character to anything that makes sense for
+	 * your use case.
+	 *
+	 * @since 5.8.2
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8.2")
+	char quoteCharacter() default '"';
+
 	/**
 	 * The column delimiter character to use when reading the CSV files.
 	 *
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index c55a88e1fca4..7c7a4fd2f9ad 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -24,7 +24,6 @@ class CsvParserFactory {
 
 	private static final String DEFAULT_DELIMITER = ",";
 	private static final String LINE_SEPARATOR = "\n";
-	private static final char DOUBLE_QUOTE = '"';
 	private static final char EMPTY_CHAR = '\0';
 	private static final boolean COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE = true;
 
@@ -37,7 +36,7 @@ static CsvParser createParserFor(CsvSource annotation) {
 
 	static CsvParser createParserFor(CsvFileSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
-		return createParser(delimiter, annotation.lineSeparator(), DOUBLE_QUOTE, annotation.emptyValue(),
+		return createParser(delimiter, annotation.lineSeparator(), annotation.quoteCharacter(), annotation.emptyValue(),
 			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE,
 			annotation.ignoreLeadingAndTrailingWhitespace());
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index 7016d86d614e..a820ab5a7ca2 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -65,6 +65,19 @@ void providesArgumentsForCarriageReturnAndSemicolon() {
 		assertThat(arguments).containsExactly(array("foo", "bar"), array("baz", "qux"));
 	}
 
+	@Test
+	void providesArgumentsWithCustomQuoteCharacter() {
+		var annotation = csvFileSource()//
+				.resources("test.csv")//
+				.quoteCharacter('\'')//
+				.build();
+
+		var arguments = provideArguments(annotation, "foo, 'bar \"and\" baz', qux \n 'lemon lime', banana, apple");
+
+		assertThat(arguments).containsExactly(array("foo", "bar \"and\" baz", "qux"),
+			array("lemon lime", "banana", "apple"));
+	}
+
 	@Test
 	void providesArgumentsWithStringDelimiter() {
 		var annotation = csvFileSource()//
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index 47099b70c7d3..aa8a1d1e8fc9 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -34,6 +34,7 @@ static MockCsvFileSourceBuilder csvFileSource() {
 
 	// -------------------------------------------------------------------------
 
+	private char quoteCharacter = '\0';
 	protected char delimiter = '\0';
 	protected String delimiterString = "";
 	protected String emptyValue = "";
@@ -46,6 +47,11 @@ private MockCsvAnnotationBuilder() {
 
 	protected abstract B getSelf();
 
+	B quoteCharacter(char quoteCharacter) {
+		this.quoteCharacter = quoteCharacter;
+		return getSelf();
+	}
+
 	B delimiter(char delimiter) {
 		this.delimiter = delimiter;
 		return getSelf();
@@ -84,7 +90,10 @@ static class MockCsvSourceBuilder extends MockCsvAnnotationBuilder<CsvSource, Mo
 
 		private String[] lines = new String[0];
 		private String textBlock = "";
-		private char quoteCharacter = '\'';
+
+		private MockCsvSourceBuilder() {
+			super.quoteCharacter = '\'';
+		}
 
 		@Override
 		protected MockCsvSourceBuilder getSelf() {
@@ -101,16 +110,12 @@ MockCsvSourceBuilder textBlock(String textBlock) {
 			return this;
 		}
 
-		MockCsvSourceBuilder quoteCharacter(char quoteCharacter) {
-			this.quoteCharacter = quoteCharacter;
-			return this;
-		}
-
 		@Override
 		CsvSource build() {
 			var annotation = mock(CsvSource.class);
 
 			// Common
+			when(annotation.quoteCharacter()).thenReturn(super.quoteCharacter);
 			when(annotation.delimiter()).thenReturn(super.delimiter);
 			when(annotation.delimiterString()).thenReturn(super.delimiterString);
 			when(annotation.emptyValue()).thenReturn(super.emptyValue);
@@ -121,7 +126,6 @@ CsvSource build() {
 			// @CsvSource
 			when(annotation.value()).thenReturn(this.lines);
 			when(annotation.textBlock()).thenReturn(this.textBlock);
-			when(annotation.quoteCharacter()).thenReturn(this.quoteCharacter);
 
 			return annotation;
 		}
@@ -136,6 +140,10 @@ static class MockCsvFileSourceBuilder extends MockCsvAnnotationBuilder<CsvFileSo
 		private String lineSeparator = "\n";
 		private int numLinesToSkip = 0;
 
+		private MockCsvFileSourceBuilder() {
+			super.quoteCharacter = '"';
+		}
+
 		@Override
 		protected MockCsvFileSourceBuilder getSelf() {
 			return this;
@@ -171,6 +179,7 @@ CsvFileSource build() {
 			var annotation = mock(CsvFileSource.class);
 
 			// Common
+			when(annotation.quoteCharacter()).thenReturn(super.quoteCharacter);
 			when(annotation.delimiter()).thenReturn(super.delimiter);
 			when(annotation.delimiterString()).thenReturn(super.delimiterString);
 			when(annotation.emptyValue()).thenReturn(super.emptyValue);

From 91aec9eaecda720e1385d5a7aeb9075bde9d9bca Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 6 Nov 2021 19:04:39 +0100
Subject: [PATCH 0641/1433] Generate META-INF/shadowed-artifacts

---
 ...nit-platform-console-standalone.gradle.kts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index c7dc424879bb..516a5dc2f0d5 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -25,6 +25,22 @@ tasks {
 			attributes("Main-Class" to "org.junit.platform.console.ConsoleLauncher")
 		}
 	}
+	val shadowedArtifactsFile by registering {
+		val configurations = shadowJar.get().configurations
+		inputs.files(configurations).withNormalizer(ClasspathNormalizer::class)
+		val outputFile = layout.buildDirectory.file("shadowed-artifacts")
+		outputs.file(outputFile)
+		doFirst {
+			outputFile.get().asFile.printWriter().use { out ->
+				configurations
+					.flatMap { it.resolvedConfiguration.resolvedArtifacts }
+					.map { it.moduleVersion.id }
+					.map { "${it.group}:${it.name}:${it.version}" }
+					.sorted()
+					.forEach(out::println)
+			}
+		}
+	}
 	shadowJar {
 		// https://github.com/junit-team/junit5/issues/2557
 		// exclude compiled module declarations from any source (e.g. /*, /META-INF/versions/N/*)
@@ -40,6 +56,9 @@ tasks {
 			include("LICENSE-univocity-parsers.md")
 			into("META-INF")
 		}
+		from(shadowedArtifactsFile) {
+			into("META-INF")
+		}
 
 		bundle {
 			bnd("""

From 339f688beb0e401ea05b47ba4e54ffb09527f33d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 6 Nov 2021 19:07:25 +0100
Subject: [PATCH 0642/1433] Add list of shadowed artifacts to user guide

Resolves #2772.
---
 documentation/documentation.gradle.kts        | 37 ++++++++++++++-----
 .../asciidoc/user-guide/running-tests.adoc    | 15 +++++---
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index f8bea9f24216..bcb07d310d36 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -1,6 +1,5 @@
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.junit.gradle.exec.ClasspathSystemPropertyProvider
 import org.junit.gradle.javadoc.ModuleSpecificJavadocFileOption
@@ -25,6 +24,7 @@ javaLibrary {
 }
 
 val apiReport by configurations.creating
+val standaloneConsoleLauncher by configurations.creating
 
 dependencies {
 	implementation(projects.junitJupiterApi) {
@@ -52,6 +52,8 @@ dependencies {
 	testImplementation(libs.classgraph) {
 		because("ApiReportGenerator needs it")
 	}
+
+	standaloneConsoleLauncher(projects.junitPlatformConsoleStandalone)
 }
 
 asciidoctorj {
@@ -90,10 +92,11 @@ gitPublish {
 	}
 }
 
-val generatedAsciiDocPath = file("$buildDir/generated/asciidoc")
-val consoleLauncherOptionsFile = File(generatedAsciiDocPath, "console-launcher-options.txt")
-val experimentalApisTableFile = File(generatedAsciiDocPath, "experimental-apis-table.txt")
-val deprecatedApisTableFile = File(generatedAsciiDocPath, "deprecated-apis-table.txt")
+val generatedAsciiDocPath = layout.buildDirectory.dir("generated/asciidoc")
+val consoleLauncherOptionsFile = generatedAsciiDocPath.map { it.file("console-launcher-options.txt") }
+val experimentalApisTableFile = generatedAsciiDocPath.map { it.file("experimental-apis-table.adoc") }
+val deprecatedApisTableFile = generatedAsciiDocPath.map { it.file("deprecated-apis-table.adoc") }
+val standaloneConsoleLauncherShadowedArtifactsFile = generatedAsciiDocPath.map { it.file("console-launcher-standalone-shadowed-artifacts.adoc") }
 
 val jdkJavadocBaseUrl = "https://docs.oracle.com/en/java/javase/11/docs/api"
 val elementListsDir = file("$buildDir/elementLists")
@@ -189,9 +192,20 @@ tasks {
 		redirectOutput(deprecatedApisTableFile)
 	}
 
+	val generateStandaloneConsoleLauncherShadowedArtifactsFile by registering(Copy::class) {
+		from(zipTree(provider { standaloneConsoleLauncher.singleFile })) {
+			include("META-INF/shadowed-artifacts")
+			includeEmptyDirs = false
+			eachFile {
+				relativePath = RelativePath(true, standaloneConsoleLauncherShadowedArtifactsFile.get().asFile.name)
+			}
+			filter { line -> "- `${line}`" }
+		}
+		into(standaloneConsoleLauncherShadowedArtifactsFile.map { it.asFile.parentFile })
+	}
+
 	withType<AbstractAsciidoctorTask>().configureEach {
-		dependsOn(generateConsoleLauncherOptions, generateExperimentalApisTable, generateDeprecatedApisTable)
-		inputs.files(consoleLauncherOptionsFile, experimentalApisTableFile, deprecatedApisTableFile)
+		inputs.files(generateConsoleLauncherOptions, generateExperimentalApisTable, generateDeprecatedApisTable, generateStandaloneConsoleLauncherShadowedArtifactsFile)
 
 		resources {
 			from(sourceDir) {
@@ -218,6 +232,7 @@ tasks {
 				"consoleLauncherOptionsFile" to consoleLauncherOptionsFile,
 				"experimentalApisTableFile" to experimentalApisTableFile,
 				"deprecatedApisTableFile" to deprecatedApisTableFile,
+				"standaloneConsoleLauncherShadowedArtifactsFile" to standaloneConsoleLauncherShadowedArtifactsFile,
 				"outdir" to outputDir.absolutePath,
 				"source-highlighter" to "rouge",
 				"tabsize" to "4",
@@ -441,13 +456,15 @@ tasks {
 	}
 }
 
-fun JavaExec.redirectOutput(outputFile: File) {
+fun JavaExec.redirectOutput(outputFile: Provider<RegularFile>) {
 	outputs.file(outputFile)
 	val byteStream = ByteArrayOutputStream()
 	standardOutput = byteStream
 	doLast {
-		Files.createDirectories(outputFile.parentFile.toPath())
-		Files.write(outputFile.toPath(), byteStream.toByteArray())
+		outputFile.get().asFile.apply {
+			Files.createDirectories(parentFile.toPath())
+			Files.write(toPath(), byteStream.toByteArray())
+		}
 	}
 }
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index f72a7bdd5d0a..efab0a2b8dd1 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -524,14 +524,17 @@ Jupiter tests and print test execution results to the console.
 An executable `junit-platform-console-standalone-{platform-version}.jar` with all
 dependencies included is published in the {Maven_Central} repository under the
 https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console-standalone[junit-platform-console-standalone]
-directory. You can https://docs.oracle.com/javase/tutorial/deployment/jar/run.html[run]
-the standalone `ConsoleLauncher` as shown below.
+directory. It includes the following dependencies:
 
-`java -jar junit-platform-console-standalone-{platform-version}.jar <<<running-tests-console-launcher-options>>>`
+include::{standaloneConsoleLauncherShadowedArtifactsFile}[]
 
-Here's an example of its output:
+You can https://docs.oracle.com/javase/tutorial/deployment/jar/run.html[run] the
+standalone `ConsoleLauncher` as shown below.
+
+[source,console,subs=attributes+]
+----
+$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS>
 
-....
 ├─ JUnit Vintage
 │  └─ example.JUnit4Tests
 │     └─ standardJUnit4Test ✔
@@ -557,7 +560,7 @@ Test run finished after 64 ms
 [         0 tests aborted         ]
 [         5 tests successful      ]
 [         0 tests failed          ]
-....
+----
 
 .Exit Code
 NOTE: The `{ConsoleLauncher}` exits with a status code of `1` if any containers or tests

From 62bdae0882a310fb8f5a5fd24d7f54d429f60bd8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 7 Nov 2021 10:34:09 +0100
Subject: [PATCH 0643/1433] Include docs generation in check lifecycle task

---
 documentation/documentation.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index bcb07d310d36..3e49214ab85e 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -447,6 +447,10 @@ tasks {
 		}
 	}
 
+	check {
+		dependsOn(prepareDocsForUploadToGhPages)
+	}
+
 	gitPublishCopy {
 		dependsOn(prepareDocsForUploadToGhPages, createCurrentDocsFolder)
 	}

From 264cd2f1fd2a19630b307ac6efb49b1ec9d5273d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 7 Nov 2021 10:36:11 +0100
Subject: [PATCH 0644/1433] Increase readability

---
 documentation/documentation.gradle.kts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 3e49214ab85e..8d6e7e9b8167 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -205,7 +205,12 @@ tasks {
 	}
 
 	withType<AbstractAsciidoctorTask>().configureEach {
-		inputs.files(generateConsoleLauncherOptions, generateExperimentalApisTable, generateDeprecatedApisTable, generateStandaloneConsoleLauncherShadowedArtifactsFile)
+		inputs.files(
+			generateConsoleLauncherOptions,
+			generateExperimentalApisTable,
+			generateDeprecatedApisTable,
+			generateStandaloneConsoleLauncherShadowedArtifactsFile
+		)
 
 		resources {
 			from(sourceDir) {

From d3aea39911dbd0fbab59d5c7424a8740f993ad16 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 7 Nov 2021 10:36:59 +0100
Subject: [PATCH 0645/1433] Map from configuration to preserve task dependency

Fixes #2772.
---
 documentation/documentation.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 8d6e7e9b8167..00ed1083a76c 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -193,7 +193,7 @@ tasks {
 	}
 
 	val generateStandaloneConsoleLauncherShadowedArtifactsFile by registering(Copy::class) {
-		from(zipTree(provider { standaloneConsoleLauncher.singleFile })) {
+		from(zipTree(standaloneConsoleLauncher.elements.map { it.single().asFile })) {
 			include("META-INF/shadowed-artifacts")
 			includeEmptyDirs = false
 			eachFile {

From 733496d8767080380b1e781a3e0d88a833f0c9bc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 7 Nov 2021 16:20:51 +0100
Subject: [PATCH 0646/1433] Upgradle to 7.3-rc-5

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c14e66cf8ef0..fa4aa1268ff7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d57eb720003db00f85915c48ff4a5ac3c7e8a8a34bd34ced16ca0c7a31c10110
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-3-bin.zip
+distributionSha256Sum=dca199cee2553ec2497e840bf17969e56d4f99df661a693740b90de7ed0efbeb
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 98be0802b82300259c69bd9cd39bf3d37d256360 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 9 Nov 2021 10:29:18 +0100
Subject: [PATCH 0647/1433] Polish Overview section of User Guide

---
 .../src/docs/asciidoc/user-guide/overview.adoc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/overview.adoc b/documentation/src/docs/asciidoc/user-guide/overview.adoc
index b4b1b96d64a1..708b6c97afbc 100644
--- a/documentation/src/docs/asciidoc/user-guide/overview.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/overview.adoc
@@ -23,20 +23,20 @@ The **JUnit Platform** serves as a foundation for <<launcher-api,launching testi
 frameworks>> on the JVM. It also defines the `{TestEngine}` API for developing a testing
 framework that runs on the platform. Furthermore, the platform provides a
 <<running-tests-console-launcher,Console Launcher>> to launch the platform from the
-command line and a <<running-tests-junit-platform-runner,JUnit 4 based Runner>> for
-running any `TestEngine` on the platform in a JUnit 4 based environment. First-class
-support for the JUnit Platform also exists in popular IDEs (see
-<<running-tests-ide-intellij-idea>>, <<running-tests-ide-eclipse>>,
-<<running-tests-ide-netbeans>>, and <<running-tests-ide-vscode>>) and build tools (see
-<<running-tests-build-gradle>>, <<running-tests-build-maven>>, and
-<<running-tests-build-ant>>).
+command line and the <<junit-platform-suite-engine>> for running a custom test suite using
+one or more test engines on the platform. First-class support for the JUnit Platform also
+exists in popular IDEs (see <<running-tests-ide-intellij-idea>>,
+<<running-tests-ide-eclipse>>, <<running-tests-ide-netbeans>>, and
+<<running-tests-ide-vscode>>) and build tools (see <<running-tests-build-gradle>>,
+<<running-tests-build-maven>>, and <<running-tests-build-ant>>).
 
 **JUnit Jupiter** is the combination of the new <<writing-tests,programming model>> and
 <<extensions,extension model>> for writing tests and extensions in JUnit 5. The Jupiter
 sub-project provides a `TestEngine` for running Jupiter based tests on the platform.
 
 **JUnit Vintage** provides a `TestEngine` for running JUnit 3 and JUnit 4 based tests on
-the platform. It requires JUnit 4.12 or later to be present on the class/module path.
+the platform. It requires JUnit 4.12 or later to be present on the class path or module
+path.
 
 [[overview-java-versions]]
 === Supported Java Versions
@@ -47,7 +47,7 @@ has been compiled with previous versions of the JDK.
 [[overview-getting-help]]
 === Getting Help
 
-Ask JUnit 5 related questions on {StackOverflow} or chat with us on {Gitter}.
+Ask JUnit 5 related questions on {StackOverflow} or chat with the community on {Gitter}.
 
 [[overview-getting-started]]
 === Getting Started

From dcec04896676fbe0a1cdc7b3379c5044efca126a Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Tue, 9 Nov 2021 10:32:50 +0100
Subject: [PATCH 0648/1433] Add `keySet()` method on `ConfigurationParameters`
 to retrieve all parameter keys (#2727)

This commit introduces `keySet()` and deprecates `size()` on `ConfigurationParameters`.

Resolves #2520.
---
 .../release-notes/release-notes-5.9.0-M1.adoc |  4 ++-
 .../descriptor/ExtensionContextTests.java     |  8 +++++
 .../engine/ConfigurationParameters.java       | 14 ++++++++
 .../PrefixedConfigurationParameters.java      |  7 ++++
 .../core/LauncherConfigurationParameters.java | 32 +++++++++++++++++++
 .../tasks/DiscoveryRequestCreatorTests.java   |  1 +
 .../PrefixedConfigurationParametersTests.java |  1 +
 .../launcher/core/DefaultLauncherTests.java   |  3 ++
 .../LauncherConfigurationParametersTests.java | 11 +++++++
 ...eLauncherDiscoveryRequestBuilderTests.java |  6 ++++
 .../engine/SuiteTestDescriptorTests.java      |  7 ++++
 11 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index a382b196cf78..26bc2e09cd89 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -19,10 +19,12 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* `ConfigurationParameters.size()` has been deprecated.
 
 ==== New Features and Improvements
 
+* `ConfigurationParameters` has now a `keySet()` method allowing to retrieve
+  all configuration parameter keys.
 * New `IterationSelector` for selecting a subset of a test's or container's iterations.
 * JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at resolution time a fully running set of dependencies are calculated avoiding the need for these to be manually specified.
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
index 4d8290b31faf..49a514e004c7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -329,9 +330,16 @@ public Optional<Boolean> getBoolean(String key) {
 		}
 
 		@Override
+		@SuppressWarnings("deprecation")
 		public int size() {
 			throw new UnsupportedOperationException("size() should not be called");
 		}
+
+		@Override
+		public Set<String> keySet() {
+			throw new UnsupportedOperationException("keySet() should not be called");
+
+		}
 	}
 
 }
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
index eda17ddf8d00..904dd31d284f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
@@ -10,9 +10,11 @@
 
 package org.junit.platform.engine;
 
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 
 import org.apiguardian.api.API;
@@ -132,7 +134,19 @@ default <T> Optional<T> get(String key, Function<String, T> transformer) {
 	/**
 	 * Get the number of configuration parameters stored directly in this
 	 * {@code ConfigurationParameters}.
+	 * @deprecated Use {@link #keySet()}.
 	 */
+	@Deprecated
+	@API(status = DEPRECATED, since = "1.9")
 	int size();
 
+	/**
+	 * Get the keys of all configuration parameters stored in this
+	 * {@code ConfigurationParameters}.
+	 *
+	 * @return a set of keys contained in {@code ConfigurationParameters}
+	 */
+	@API(status = STABLE, since = "1.9")
+	Set<String> keySet();
+
 }
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
index 2406f5589fc4..5329ff2eef68 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
@@ -13,6 +13,7 @@
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 
 import org.apiguardian.api.API;
@@ -65,8 +66,14 @@ private String prefixed(String key) {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public int size() {
 		return delegate.size();
 	}
 
+	@Override
+	public Set<String> keySet() {
+		return delegate.keySet();
+	}
+
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
index 2de4180eb6d2..9e70286a75a6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
@@ -14,6 +14,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -23,6 +24,7 @@
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
@@ -59,12 +61,19 @@ public Optional<Boolean> getBoolean(String key) {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public int size() {
 		return providers.stream() //
 				.mapToInt(ParameterProvider::size) //
 				.sum();
 	}
 
+	@Override
+	public Set<String> keySet() {
+		return providers.stream().map(ParameterProvider::keySet).flatMap(Collection::stream).collect(
+			Collectors.toSet());
+	}
+
 	private String getProperty(String key) {
 		Preconditions.notBlank(key, "key must not be null or blank");
 		return providers.stream() //
@@ -140,6 +149,8 @@ default int size() {
 			return 0;
 		}
 
+		Set<String> keySet();
+
 		static ParameterProvider explicit(Map<String, String> configParams) {
 			return new ParameterProvider() {
 				@Override
@@ -152,6 +163,11 @@ public int size() {
 					return configParams.size();
 				}
 
+				@Override
+				public Set<String> keySet() {
+					return configParams.keySet();
+				}
+
 				@Override
 				public String toString() {
 					ToStringBuilder builder = new ToStringBuilder("explicit");
@@ -173,6 +189,11 @@ public String getValue(String key) {
 					}
 				}
 
+				@Override
+				public Set<String> keySet() {
+					return System.getProperties().stringPropertyNames();
+				}
+
 				@Override
 				public String toString() {
 					return "systemProperties [...]";
@@ -189,6 +210,11 @@ public String getValue(String key) {
 					return properties.getProperty(key);
 				}
 
+				@Override
+				public Set<String> keySet() {
+					return properties.stringPropertyNames();
+				}
+
 				@Override
 				public String toString() {
 					ToStringBuilder builder = new ToStringBuilder("propertiesFile");
@@ -206,10 +232,16 @@ public String getValue(String key) {
 				}
 
 				@Override
+				@SuppressWarnings("deprecation")
 				public int size() {
 					return configParams.size();
 				}
 
+				@Override
+				public Set<String> keySet() {
+					return configParams.keySet();
+				}
+
 				@Override
 				public String toString() {
 					ToStringBuilder builder = new ToStringBuilder("inherited");
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index cc245f18e727..56d98f564056 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -304,6 +304,7 @@ void propagatesIterationSelectors() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void convertsConfigurationParameters() {
 		options.setScanClasspath(true);
 		options.setConfigurationParameters(mapOf(entry("foo", "bar"), entry("baz", "true")));
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
index 52a07568cf97..e96d67881b4d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
@@ -77,6 +77,7 @@ void delegatesGetWithTransformerCalls() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void delegatesSizeCalls() {
 		when(delegate.size()).thenReturn(42);
 		var parameters = new PrefixedConfigurationParameters(delegate, "foo.bar.");
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 41471f02f883..6544323389a1 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -505,6 +505,7 @@ void launcherAppliesPostDiscoveryFilters() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void withoutConfigurationParameters_LauncherPassesEmptyConfigurationParametersIntoTheExecutionRequest() {
 		var engine = new TestEngineSpy();
 
@@ -517,6 +518,7 @@ void withoutConfigurationParameters_LauncherPassesEmptyConfigurationParametersIn
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void withConfigurationParameters_LauncherPassesPopulatedConfigurationParametersIntoTheExecutionRequest() {
 		var engine = new TestEngineSpy();
 
@@ -530,6 +532,7 @@ void withConfigurationParameters_LauncherPassesPopulatedConfigurationParametersI
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void withoutConfigurationParameters_LookupFallsBackToSystemProperty() {
 		System.setProperty(FOO, BAR);
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
index 486191c0ab73..87ecbd0e6e14 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
@@ -33,6 +33,7 @@
  *
  * @since 1.0
  */
+@SuppressWarnings("deprecation")
 class LauncherConfigurationParametersTests {
 
 	private static final String CONFIG_FILE_NAME = "test-junit-platform.properties";
@@ -69,6 +70,7 @@ void noConfigParams() {
 		ConfigurationParameters configParams = fromMap(Map.of());
 		assertThat(configParams.size()).isEqualTo(0);
 		assertThat(configParams.get(KEY)).isEmpty();
+		assertThat(configParams.keySet()).doesNotContain(KEY);
 		assertThat(configParams.toString()).doesNotContain(KEY);
 	}
 
@@ -76,6 +78,7 @@ void noConfigParams() {
 	void explicitConfigParam() {
 		ConfigurationParameters configParams = fromMap(Map.of(KEY, CONFIG_PARAM));
 		assertThat(configParams.get(KEY)).contains(CONFIG_PARAM);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).contains(CONFIG_PARAM);
 	}
 
@@ -84,6 +87,7 @@ void systemProperty() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
 		ConfigurationParameters configParams = fromMap(Map.of());
 		assertThat(configParams.get(KEY)).contains(SYSTEM_PROPERTY);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).doesNotContain(KEY);
 	}
 
@@ -91,6 +95,7 @@ void systemProperty() {
 	void configFile() {
 		ConfigurationParameters configParams = fromMapAndFile(Map.of(), CONFIG_FILE_NAME);
 		assertThat(configParams.get(KEY)).contains(CONFIG_FILE);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).contains(CONFIG_FILE);
 	}
 
@@ -100,6 +105,7 @@ void inherited() {
 			Map.of(), //
 			Map.of(KEY, INHERITED_PARAM));
 		assertThat(configParams.get(KEY)).contains(INHERITED_PARAM);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).contains(KEY);
 	}
 
@@ -108,6 +114,7 @@ void explicitConfigParamOverridesSystemProperty() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
 		ConfigurationParameters configParams = fromMap(Map.of(KEY, CONFIG_PARAM));
 		assertThat(configParams.get(KEY)).contains(CONFIG_PARAM);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).contains(CONFIG_PARAM);
 	}
 
@@ -115,6 +122,7 @@ void explicitConfigParamOverridesSystemProperty() {
 	void explicitConfigParamOverridesConfigFile() {
 		ConfigurationParameters configParams = fromMapAndFile(Map.of(KEY, CONFIG_PARAM), CONFIG_FILE_NAME);
 		assertThat(configParams.get(KEY)).contains(CONFIG_PARAM);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).contains(CONFIG_PARAM);
 	}
 
@@ -125,6 +133,7 @@ void explicitConfigParamOverridesInheritedProperty() {
 			Map.of(KEY, CONFIG_PARAM), //
 			Map.of(KEY, INHERITED_PARAM));
 		assertThat(configParams.get(KEY)).contains(CONFIG_PARAM);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).contains(CONFIG_PARAM);
 	}
 
@@ -133,6 +142,7 @@ void systemPropertyOverridesConfigFile() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
 		ConfigurationParameters configParams = fromMapAndFile(Map.of(), CONFIG_FILE_NAME);
 		assertThat(configParams.get(KEY)).contains(SYSTEM_PROPERTY);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).contains(CONFIG_FILE);
 	}
 
@@ -141,6 +151,7 @@ void inheritedPropertyOverridesSystemProperty() {
 		System.setProperty(KEY, SYSTEM_PROPERTY);
 		ConfigurationParameters configParams = fromMapAndParent(Map.of(), Map.of(KEY, INHERITED_PARAM));
 		assertThat(configParams.get(KEY)).contains(INHERITED_PARAM);
+		assertThat(configParams.keySet()).contains(KEY);
 		assertThat(configParams.toString()).contains(KEY);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index aa3f878f9f84..7b0e8d29ed71 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -443,10 +443,16 @@ public Optional<Boolean> getBoolean(String key) {
 		}
 
 		@Override
+		@SuppressWarnings("deprecation")
 		public int size() {
 			return map.size();
 		}
 
+		@Override
+		public Set<String> keySet() {
+			return null;
+		}
+
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index a7e4b3e69fb0..def9d77262c8 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -16,6 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 
@@ -111,10 +112,16 @@ public Optional<Boolean> getBoolean(String key) {
 		}
 
 		@Override
+		@SuppressWarnings("deprecation")
 		public int size() {
 			return 0;
 		}
 
+		@Override
+		public Set<String> keySet() {
+			return Collections.emptySet();
+		}
+
 	}
 
 }

From 186ceef7cef7c51051f028908158c53e15cf1130 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 10 Nov 2021 08:59:55 +0100
Subject: [PATCH 0649/1433] Upgradle to 7.3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fa4aa1268ff7..e64c4192a718 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=dca199cee2553ec2497e840bf17969e56d4f99df661a693740b90de7ed0efbeb
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-5-bin.zip
+distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From c52534c939bba22eddb2c83e16cf6d48e15febde Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Thu, 11 Nov 2021 16:26:13 +0100
Subject: [PATCH 0650/1433] Add missing description of provided service
 implementation

---
 .../src/module/org.junit.jupiter.engine/module-info.java       | 3 ++-
 .../src/module/org.junit.vintage.engine/module-info.java       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java b/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
index 51b22b50ce05..946b1dd3c6fb 100644
--- a/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
+++ b/junit-jupiter-engine/src/module/org.junit.jupiter.engine/module-info.java
@@ -14,7 +14,8 @@
  *
  * @since 5.0
  * @uses org.junit.jupiter.api.extension.Extension
- * @provides org.junit.platform.engine.TestEngine
+ * @provides org.junit.platform.engine.TestEngine The {@code JupiterTestEngine}
+ *   runs Jupiter based tests on the platform.
  */
 module org.junit.jupiter.engine {
 	requires static org.apiguardian.api;
diff --git a/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java b/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
index 17062be5d548..859744fcec17 100644
--- a/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
+++ b/junit-vintage-engine/src/module/org.junit.vintage.engine/module-info.java
@@ -13,7 +13,8 @@
  * JUnit 3 and 4 based tests on the platform.
  *
  * @since 4.12
- * @provides org.junit.platform.engine.TestEngine
+ * @provides org.junit.platform.engine.TestEngine The {@code VintageTestEngine}
+ *   runs JUnit 3 and 4 based tests on the platform.
  */
 module org.junit.vintage.engine {
 	requires junit; // 4

From 8db590105cb34982c19193d42aa4f30c14d6f193 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dawid.weiss@gmail.com>
Date: Sun, 14 Nov 2021 13:38:07 +0100
Subject: [PATCH 0651/1433] Introduce TestInstancePreCreateCallback extension
 point

`TestInstancePreConstructCallback` defines the API for `Extensions` that
wish to be invoked _prior_ to test instances being constructed (by a
constructor call or via `TestInstanceFactory`).

This extension provides a symmetric call to
`TestInstancePreDestroyCallback` and is useful in combination with
other extensions to prepare constructor parameters or keeping track of
test instances and their lifecycle.

Resolves #2733.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../src/docs/asciidoc/link-attributes.adoc    |   1 +
 .../release-notes/release-notes-5.9.0-M1.adoc |   2 +
 .../docs/asciidoc/user-guide/extensions.adoc  |  11 +
 .../TestInstancePreConstructCallback.java     |  57 +++
 .../TestInstancePreDestroyCallback.java       |   4 +
 .../descriptor/ClassBasedTestDescriptor.java  |  10 +
 .../api/extension/KitchenSinkExtension.java   |   5 +
 ...TestInstancePreConstructCallbackTests.java | 425 ++++++++++++++++++
 8 files changed, 515 insertions(+)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 3cc23413cee2..b1f9c13e4706 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -108,6 +108,7 @@ endif::[]
 :TestExecutionExceptionHandler:              {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.html[TestExecutionExceptionHandler]
 :TestInstanceFactory:                        {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/TestInstanceFactory.html[TestInstanceFactory]
 :TestInstancePostProcessor:                  {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/TestInstancePostProcessor.html[TestInstancePostProcessor]
+:TestInstancePreConstructCallback:           {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.html[TestInstancePreConstructCallback]
 :TestInstancePreDestroyCallback:             {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.html[TestInstancePreDestroyCallback]
 :TestTemplateInvocationContext:              {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/TestTemplateInvocationContext.html[TestTemplateInvocationContext]
 :TestTemplateInvocationContextProvider:      {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.html[TestTemplateInvocationContextProvider]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 26bc2e09cd89..a2d404532398 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -46,6 +46,8 @@ on GitHub.
   parameterized or dynamic tests.
 * Add support for `MATCH_NONE` mode in `EnumSource` that selects only those enum constants
   whose names match none of the supplied patterns.
+* A new extension `TestInstancePreConstructCallback` called prior to a test instance construction
+  (symmetric extension to `TestInstancePreDestroyCallback`).
 
 
 [[release-notes-5.9.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index 52777870bedc..4c80e2b2b119 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -321,6 +321,17 @@ following system property.
 
 Refer to <<running-tests-config-params-deactivation-pattern>> for details.
 
+[[extensions-test-instance-pre-construct-callback]]
+=== Test Instance Pre-construct Callback
+
+`{TestInstancePreConstructCallback}` defines the API for `Extensions` that wish to be invoked
+_prior_ to test instances being constructed (by a constructor call or via
+`{TestInstanceFactory}`).
+
+This extension provides a symmetric call to `{TestInstancePreDestroyCallback}` and is useful
+in combination with other extensions to prepare constructor parameters or keeping track of test
+instances and their lifecycle.
+
 [[extensions-test-instance-factories]]
 === Test Instance Factories
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
new file mode 100644
index 000000000000..05bd129ff94d
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.extension;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+/**
+ * {@link TestInstancePreConstructCallback} defines the API for {@link Extension
+ * Extensions} that wish to be invoked <em>prior</em> to creation of test instances.
+ *
+ * <p>This extension is a symmetric counterpart to {@link TestInstancePreDestroyCallback}.
+ * The use cases for this extension may include preparing context-sensitive arguments
+ * that are injected into the instance's constructor parameters.
+ *
+ * <p>Extensions that implement {@link TestInstancePreConstructCallback} must be
+ * registered at the class level if the test class is configured with
+ * {@link Lifecycle @TestInstance(Lifecycle.PER_CLASS)}
+ * semantics. If the test class is configured with
+ * {@link Lifecycle @TestInstance(Lifecycle.PER_METHOD)}
+ * semantics, {@link TestInstancePreConstructCallback} extensions may be registered
+ * at the class level or at the method level. In the latter case, the
+ * extension will only be applied to the test method for which it is registered.
+ *
+ * <h3>Constructor Requirements</h3>
+ *
+ * <p>Consult the documentation in {@link Extension} for details on constructor
+ * requirements.
+ *
+ * @since 5.9
+ * @see TestInstancePreDestroyCallback
+ * @see TestInstanceFactory
+ * @see ParameterResolver
+ */
+@FunctionalInterface
+@API(status = EXPERIMENTAL, since = "5.9")
+public interface TestInstancePreConstructCallback extends Extension {
+
+	/**
+	 * Callback invoked prior to test instances being constructed.
+	 *
+	 * @param factoryContext the context for the test instance about to be instantiated;
+	 * never {@code null}
+	 * @param context the current extension context; never {@code null}
+	 */
+	void preConstructTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext context) throws Exception;
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
index e29ef7c407a3..a3f990bb8fc3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
@@ -41,6 +41,9 @@
  * {@code TestInstancePreDestroyCallback} extension will only be applied to the
  * test method for which it is registered.
  *
+ * <p>A symmetric {@link TestInstancePreConstructCallback} extension defines a callback
+ * hook that is invoked prior to any test class instances being constructed.
+ *
  * <h3>Constructor Requirements</h3>
  *
  * <p>Consult the documentation in {@link Extension} for details on constructor
@@ -49,6 +52,7 @@
  * @since 5.6
  * @see #preDestroyTestInstance(ExtensionContext)
  * @see TestInstancePostProcessor
+ * @see TestInstancePreConstructCallback
  * @see TestInstanceFactory
  * @see ParameterResolver
  */
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index 91039207877d..71c382e489d4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -43,7 +43,9 @@
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.LifecycleMethodExecutionExceptionHandler;
 import org.junit.jupiter.api.extension.TestInstanceFactory;
+import org.junit.jupiter.api.extension.TestInstanceFactoryContext;
 import org.junit.jupiter.api.extension.TestInstancePostProcessor;
+import org.junit.jupiter.api.extension.TestInstancePreConstructCallback;
 import org.junit.jupiter.api.extension.TestInstancePreDestroyCallback;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.api.extension.TestInstantiationException;
@@ -297,6 +299,8 @@ protected TestInstances instantiateTestClass(Optional<TestInstances> outerInstan
 			ExtensionContext extensionContext) {
 
 		Optional<Object> outerInstance = outerInstances.map(TestInstances::getInnermostInstance);
+		invokeTestInstancePreConstructCallbacks(new DefaultTestInstanceFactoryContext(this.testClass, outerInstance),
+			registry, extensionContext);
 		Object instance = this.testInstanceFactory != null //
 				? invokeTestInstanceFactory(outerInstance, extensionContext) //
 				: invokeTestClassConstructor(outerInstance, registry, extensionContext);
@@ -356,6 +360,12 @@ private Object invokeTestClassConstructor(Optional<Object> outerInstance, Extens
 			InvocationInterceptor::interceptTestClassConstructor);
 	}
 
+	private void invokeTestInstancePreConstructCallbacks(TestInstanceFactoryContext factoryContext,
+			ExtensionRegistry registry, ExtensionContext context) {
+		registry.stream(TestInstancePreConstructCallback.class).forEach(
+			extension -> executeAndMaskThrowable(() -> extension.preConstructTestInstance(factoryContext, context)));
+	}
+
 	private void invokeTestInstancePostProcessors(Object instance, ExtensionRegistry registry,
 			ExtensionContext context) {
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
index 73edebc46ac8..7733653f969d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
@@ -44,6 +44,7 @@ public class KitchenSinkExtension implements
 	LifecycleMethodExecutionExceptionHandler,
 
 	// Dependency Injection
+	TestInstancePreConstructCallback,
 	TestInstanceFactory,
 	TestInstancePostProcessor,
 	TestInstancePreDestroyCallback,
@@ -112,6 +113,10 @@ public void handleAfterAllMethodExecutionException(ExtensionContext context, Thr
 
 	// --- Dependency Injection ------------------------------------------------
 
+	@Override
+	public void preConstructTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext context) {
+	}
+
 	@Override
 	public Object createTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext extensionContext) {
 		return null;
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
new file mode 100644
index 000000000000..c6c91d5ec0ec
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
@@ -0,0 +1,425 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestInstanceFactory;
+import org.junit.jupiter.api.extension.TestInstanceFactoryContext;
+import org.junit.jupiter.api.extension.TestInstancePreConstructCallback;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+
+/**
+ * Integration tests that verify support for {@link TestInstancePreConstructCallback}.
+ *
+ * @since 5.9
+ */
+class TestInstancePreConstructCallbackTests extends AbstractJupiterTestEngineTests {
+	private static final List<String> callSequence = new ArrayList<>();
+
+	@BeforeEach
+	void resetCallSequence() {
+		callSequence.clear();
+	}
+
+	static class CallSequenceRecordingTest {
+		protected static void record(String event) {
+			callSequence.add(event);
+		}
+	}
+
+	@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
+	static class InstancePreConstruct extends CallSequenceRecordingTest {
+		public InstancePreConstruct() {
+			record("constructor");
+		}
+
+		@BeforeAll
+		static void beforeAll() {
+			record("beforeAll");
+		}
+
+		@BeforeEach
+		void beforeEach() {
+			record("beforeEach");
+		}
+
+		@Test
+		void test1() {
+			record("test1");
+		}
+
+		@Test
+		void test2() {
+			record("test2");
+		}
+
+		@AfterEach
+		void afterEach() {
+			record("afterEach");
+		}
+
+		@AfterAll
+		static void afterAll() {
+			record("afterAll");
+		}
+	}
+
+	@Test
+	void instancePreConstruct() {
+		executeTestsForClass(InstancePreConstruct.class).testEvents().assertStatistics(
+			stats -> stats.started(2).succeeded(2));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"beforeAll",
+
+				"PreConstructCallback: name=foo, testClass=InstancePreConstruct, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"test1",
+				"afterEach",
+
+				"PreConstructCallback: name=foo, testClass=InstancePreConstruct, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"test2",
+				"afterEach",
+
+				"afterAll"
+		);
+		// @formatter:on
+	}
+
+	@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
+	static class FactoryPreConstruct extends CallSequenceRecordingTest {
+		@RegisterExtension
+		static final TestInstanceFactory factory = (factoryContext, extensionContext) -> {
+			record("testInstanceFactory");
+			return new FactoryPreConstruct();
+		};
+
+		public FactoryPreConstruct() {
+			record("constructor");
+		}
+
+		@BeforeAll
+		static void beforeAll() {
+			record("beforeAll");
+		}
+
+		@BeforeEach
+		void beforeEach() {
+			record("beforeEach");
+		}
+
+		@Test
+		void test1() {
+			record("test1");
+		}
+
+		@Test
+		void test2() {
+			record("test2");
+		}
+
+		@AfterEach
+		void afterEach() {
+			record("afterEach");
+		}
+
+		@AfterAll
+		static void afterAll() {
+			record("afterAll");
+		}
+	}
+
+	@Test
+	void factoryPreConstruct() {
+		executeTestsForClass(FactoryPreConstruct.class).testEvents().assertStatistics(
+			stats -> stats.started(2).succeeded(2));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"beforeAll",
+
+				"PreConstructCallback: name=foo, testClass=FactoryPreConstruct, outerInstance: null",
+				"testInstanceFactory",
+				"constructor",
+				"beforeEach",
+				"test1",
+				"afterEach",
+
+				"PreConstructCallback: name=foo, testClass=FactoryPreConstruct, outerInstance: null",
+				"testInstanceFactory",
+				"constructor",
+				"beforeEach",
+				"test2",
+				"afterEach",
+
+				"afterAll"
+		);
+		// @formatter:on
+	}
+
+	@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
+	static class PreConstructInNested extends CallSequenceRecordingTest {
+		static AtomicInteger instanceCounter = new AtomicInteger();
+		private final String instanceId;
+
+		public PreConstructInNested() {
+			record("constructor");
+			instanceId = "#" + instanceCounter.incrementAndGet();
+		}
+
+		@BeforeAll
+		static void beforeAll() {
+			instanceCounter.set(0);
+			record("beforeAll");
+		}
+
+		@BeforeEach
+		void beforeEach() {
+			record("beforeEach");
+		}
+
+		@Test
+		void outerTest1() {
+			record("outerTest1");
+		}
+
+		@Test
+		void outerTest2() {
+			record("outerTest2");
+		}
+
+		@AfterEach
+		void afterEach() {
+			record("afterEach");
+		}
+
+		@AfterAll
+		static void afterAll() {
+			record("afterAll");
+		}
+
+		@Override
+		public String toString() {
+			return instanceId;
+		}
+
+		@ExtendWith(InstancePreConstructCallbackRecordingBar.class)
+		abstract class InnerParent extends CallSequenceRecordingTest {
+		}
+
+		@Nested
+		@ExtendWith(InstancePreConstructCallbackRecordingBaz.class)
+		class Inner extends InnerParent {
+			Inner() {
+				record("constructorInner");
+			}
+
+			@BeforeEach
+			void beforeEachInner() {
+				record("beforeEachInner");
+			}
+
+			@Test
+			void innerTest1() {
+				record("innerTest1");
+			}
+
+			@AfterEach
+			void afterEachInner() {
+				record("afterEachInner");
+			}
+		}
+	}
+
+	@Test
+	void preConstructInNested() {
+		executeTestsForClass(PreConstructInNested.class).testEvents().assertStatistics(
+			stats -> stats.started(3).succeeded(3));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"beforeAll",
+
+				"PreConstructCallback: name=foo, testClass=PreConstructInNested, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"outerTest1",
+				"afterEach",
+
+				"PreConstructCallback: name=foo, testClass=PreConstructInNested, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"outerTest2",
+				"afterEach",
+
+				"PreConstructCallback: name=foo, testClass=PreConstructInNested, outerInstance: null",
+				"constructor",
+
+				"PreConstructCallback: name=foo, testClass=Inner, outerInstance: #3",
+				"PreConstructCallback: name=bar, testClass=Inner, outerInstance: #3",
+				"PreConstructCallback: name=baz, testClass=Inner, outerInstance: #3",
+				"constructorInner",
+				"beforeEach",
+				"beforeEachInner",
+				"innerTest1",
+				"afterEachInner",
+				"afterEach",
+
+				"afterAll"
+		);
+		// @formatter:on
+	}
+
+	static class PreConstructOnMethod extends CallSequenceRecordingTest {
+		PreConstructOnMethod() {
+			record("constructor");
+		}
+
+		@BeforeEach
+		void beforeEach() {
+			record("beforeEach");
+		}
+
+		@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
+		@Test
+		void test1() {
+			record("test1");
+		}
+
+		@Test
+		void test2() {
+			record("test2");
+		}
+
+		@AfterEach
+		void afterEach() {
+			record("afterEach");
+		}
+	}
+
+	@Test
+	void preConstructOnMethod() {
+		executeTestsForClass(PreConstructOnMethod.class).testEvents().assertStatistics(
+			stats -> stats.started(2).succeeded(2));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"PreConstructCallback: name=foo, testClass=PreConstructOnMethod, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"test1",
+				"afterEach",
+
+				"constructor",
+				"beforeEach",
+				"test2",
+				"afterEach"
+		);
+		// @formatter:on
+	}
+
+	@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+	@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
+	@ExtendWith(InstancePreConstructCallbackRecordingBar.class)
+	static class PreConstructWithClassLifecycle extends CallSequenceRecordingTest {
+		PreConstructWithClassLifecycle() {
+			record("constructor");
+		}
+
+		@BeforeEach
+		void beforeEach() {
+			record("beforeEach");
+		}
+
+		@Test
+		void test1() {
+			callSequence.add("test1");
+		}
+
+		@Test
+		void test2() {
+			callSequence.add("test2");
+		}
+	}
+
+	@Test
+	void preConstructWithClassLifecycle() {
+		executeTestsForClass(PreConstructWithClassLifecycle.class).testEvents().assertStatistics(
+			stats -> stats.started(2).succeeded(2));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"PreConstructCallback: name=foo, testClass=PreConstructWithClassLifecycle, outerInstance: null",
+				"PreConstructCallback: name=bar, testClass=PreConstructWithClassLifecycle, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"test1",
+				"beforeEach",
+				"test2"
+		);
+		// @formatter:on
+	}
+
+	static abstract class AbstractTestInstancePreConstructCallback implements TestInstancePreConstructCallback {
+		private final String name;
+
+		AbstractTestInstancePreConstructCallback(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public void preConstructTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext context) {
+			assertThat(context.getTestInstance()).isNotPresent();
+			assertThat(context.getTestClass()).isPresent();
+			assertThat(factoryContext.getTestClass()).isSameAs(context.getTestClass().get());
+			callSequence.add(
+				"PreConstructCallback: name=" + name + ", testClass=" + factoryContext.getTestClass().getSimpleName()
+						+ ", outerInstance: " + factoryContext.getOuterInstance().orElse(null));
+		}
+	}
+
+	static class InstancePreConstructCallbackRecordingFoo extends AbstractTestInstancePreConstructCallback {
+		InstancePreConstructCallbackRecordingFoo() {
+			super("foo");
+		}
+	}
+
+	static class InstancePreConstructCallbackRecordingBar extends AbstractTestInstancePreConstructCallback {
+		InstancePreConstructCallbackRecordingBar() {
+			super("bar");
+		}
+	}
+
+	static class InstancePreConstructCallbackRecordingBaz extends AbstractTestInstancePreConstructCallback {
+		InstancePreConstructCallbackRecordingBaz() {
+			super("baz");
+		}
+	}
+}

From bbdbef1d4743bc8674887d8a1ea56c7b787396c7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 14 Nov 2021 13:11:18 +0100
Subject: [PATCH 0652/1433] Only build docs as part of Linux CI build

---
 .github/workflows/main.yml             | 1 +
 documentation/documentation.gradle.kts | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 836b15b87ed9..bb53a79e288c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,6 +30,7 @@ jobs:
           -PenableJaCoCo
           build
           jacocoRootReport
+          prepareDocsForUploadToGhPages
     - name: Archive Test Distribution trace files
       uses: actions/upload-artifact@v2
       if: ${{ always() }}
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 00ed1083a76c..1f92f684c234 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -452,10 +452,6 @@ tasks {
 		}
 	}
 
-	check {
-		dependsOn(prepareDocsForUploadToGhPages)
-	}
-
 	gitPublishCopy {
 		dependsOn(prepareDocsForUploadToGhPages, createCurrentDocsFolder)
 	}

From 5a20a2ad86365e06c48a68e2542b7d901e45042f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 14 Nov 2021 13:15:08 +0100
Subject: [PATCH 0653/1433] Move trace file archiving step into composite
 action

---
 .github/actions/main-build/action.yml |  5 +++++
 .github/workflows/main.yml            | 18 ------------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/.github/actions/main-build/action.yml b/.github/actions/main-build/action.yml
index aa6e501bee3c..4b51887efcd8 100644
--- a/.github/actions/main-build/action.yml
+++ b/.github/actions/main-build/action.yml
@@ -12,3 +12,8 @@ runs:
     - uses: ./.github/actions/run-gradle
       with:
         arguments: ${{ inputs.arguments }}
+    - uses: actions/upload-artifact@v2
+      if: ${{ always() }}
+      with:
+        name: Test Distribution trace files (${{ github.job }})
+        path: '**/build/test-results/*/trace.json'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bb53a79e288c..bed703c71cab 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,12 +31,6 @@ jobs:
           build
           jacocoRootReport
           prepareDocsForUploadToGhPages
-    - name: Archive Test Distribution trace files
-      uses: actions/upload-artifact@v2
-      if: ${{ always() }}
-      with:
-        name: Test Distribution trace files (${{ github.job }})
-        path: '**/build/test-results/*/trace.json'
     - name: Upload to Codecov.io
       uses: codecov/codecov-action@v2
 
@@ -49,12 +43,6 @@ jobs:
         fetch-depth: 1
     - name: Build
       uses: ./.github/actions/main-build
-    - name: Archive Test Distribution trace files
-      uses: actions/upload-artifact@v2
-      if: ${{ always() }}
-      with:
-        name: Test Distribution trace files (${{ github.job }})
-        path: '**/build/test-results/*/trace.json'
 
   macOS:
     runs-on: macos-latest
@@ -65,12 +53,6 @@ jobs:
         fetch-depth: 1
     - name: Build
       uses: ./.github/actions/main-build
-    - name: Archive Test Distribution trace files
-      uses: actions/upload-artifact@v2
-      if: ${{ always() }}
-      with:
-        name: Test Distribution trace files (${{ github.job }})
-        path: '**/build/test-results/*/trace.json'
 
   publish_artifacts:
     name: Publish Snapshot Artifacts

From 822b55d2c8da2a0f617d890f1ded45c0e7f0e4d7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 14 Nov 2021 16:16:16 +0100
Subject: [PATCH 0654/1433] Update Spotless and ktlint

---
 buildSrc/build.gradle.kts                     |   2 +-
 .../kotlin/example/KotlinAssertionsDemo.kt    |  11 +-
 .../registration/KotlinWebServerDemo.kt       |   4 +-
 gradle/libs.versions.toml                     |   2 +-
 .../org/junit/jupiter/api/Assertions.kt       |  20 ++-
 .../api/KotlinAssertTimeoutAssertionsTests.kt |   6 +-
 .../jupiter/api/KotlinAssertionsTests.kt      | 155 ++++++++++--------
 .../jupiter/api/KotlinFailAssertionsTests.kt  |   2 +-
 .../kotlin/InstancePerClassKotlinTestCase.kt  |   2 +-
 .../kotlin/InstancePerMethodKotlinTestCase.kt |   2 +-
 .../params/aggregator/ArgumentsAccessor.kt    |   2 +-
 .../ArgumentsAccessorKotlinTests.kt           |   3 +-
 .../params/aggregator/DisplayNameTests.kt     |  10 +-
 13 files changed, 121 insertions(+), 100 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index cb7d132bbbf2..438092134a3c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.0.0")
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:5.15.2")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
diff --git a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
index 723ea2ac43ae..50ea4a4446e4 100644
--- a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
+++ b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
@@ -13,7 +13,6 @@ package example
 
 import example.domain.Person
 import example.util.Calculator
-import java.time.Duration
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
@@ -22,6 +21,7 @@ import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.assertTimeout
 import org.junit.jupiter.api.assertTimeoutPreemptively
+import java.time.Duration
 
 class KotlinAssertionsDemo {
 
@@ -48,7 +48,8 @@ class KotlinAssertionsDemo {
 
     @Test
     fun `grouped assertions`() {
-        assertAll("Person properties",
+        assertAll(
+            "Person properties",
             { assertEquals("Jane", person.firstName) },
             { assertEquals("Doe", person.lastName) }
         )
@@ -56,7 +57,8 @@ class KotlinAssertionsDemo {
 
     @Test
     fun `grouped assertions from a stream`() {
-        assertAll("People with first name starting with J",
+        assertAll(
+            "People with first name starting with J",
             people
                 .stream()
                 .map {
@@ -68,7 +70,8 @@ class KotlinAssertionsDemo {
 
     @Test
     fun `grouped assertions from a collection`() {
-        assertAll("People with last name of Doe",
+        assertAll(
+            "People with last name of Doe",
             people.map { { assertEquals("Doe", it.lastName) } }
         )
     }
diff --git a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
index 6448a2baedfd..67f1010e12b1 100644
--- a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
+++ b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
@@ -20,8 +20,8 @@ class KotlinWebServerDemo {
         @JvmStatic
         @RegisterExtension
         val server = WebServerExtension.builder()
-                .enableSecurity(false)
-                .build()
+            .enableSecurity(false)
+            .build()
     }
 
     @Test
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a356b55c40d9..b9657428b67a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ jmh = "1.32"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
-ktlint = "0.35.0"
+ktlint = "0.43.0"
 log4j = "2.14.1"
 opentest4j = "1.2.0"
 surefire = "2.22.2"
diff --git a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
index 20b4d7b2cf81..f448d57f8ab0 100644
--- a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
+++ b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
@@ -11,14 +11,14 @@
 
 package org.junit.jupiter.api
 
-import java.time.Duration
-import java.util.function.Supplier
-import java.util.stream.Stream
 import org.apiguardian.api.API
 import org.apiguardian.api.API.Status.EXPERIMENTAL
 import org.apiguardian.api.API.Status.STABLE
 import org.junit.jupiter.api.function.Executable
 import org.junit.jupiter.api.function.ThrowingSupplier
+import java.time.Duration
+import java.util.function.Supplier
+import java.util.stream.Stream
 
 /**
  * @see Assertions.fail
@@ -140,11 +140,15 @@ inline fun <reified T : Throwable> assertThrows(noinline message: () -> String,
         caught
     } as? Throwable
 
-    return Assertions.assertThrows(T::class.java, Executable {
-        if (throwable != null) {
-            throw throwable
-        }
-    }, Supplier(message))
+    return Assertions.assertThrows(
+        T::class.java,
+        Executable {
+            if (throwable != null) {
+                throw throwable
+            }
+        },
+        Supplier(message)
+    )
 }
 
 /**
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
index 0a4889b81c7e..381b155d4c41 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
@@ -9,9 +9,6 @@
  */
 package org.junit.jupiter.api
 
-import java.time.Duration.ofMillis
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.atomic.AtomicBoolean
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -19,6 +16,9 @@ import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.platform.commons.util.ExceptionUtils
 import org.opentest4j.AssertionFailedError
+import java.time.Duration.ofMillis
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.atomic.AtomicBoolean
 
 /**
  * Unit tests for JUnit Jupiter [Assertions].
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
index 54b00e372d29..7db0939a9d18 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
@@ -9,8 +9,6 @@
  */
 package org.junit.jupiter.api
 
-import java.util.stream.Stream
-import kotlin.reflect.KClass
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith
@@ -22,6 +20,8 @@ import org.junit.jupiter.api.DynamicContainer.dynamicContainer
 import org.junit.jupiter.api.DynamicTest.dynamicTest
 import org.opentest4j.AssertionFailedError
 import org.opentest4j.MultipleFailuresError
+import java.util.stream.Stream
+import kotlin.reflect.KClass
 
 /**
  * Unit tests for JUnit Jupiter [org.junit.jupiter.api] top-level assertion functions.
@@ -70,106 +70,118 @@ class KotlinAssertionsTests {
 
     @TestFactory
     fun assertDoesNotThrow(): Stream<out DynamicNode> = Stream.of(
-        dynamicContainer("succeeds when no exception thrown", Stream.of(
-            dynamicTest("for no arguments variant") {
-                val actual = assertDoesNotThrow { 1 }
-                assertEquals(1, actual)
-            },
-            dynamicTest("for no arguments variant (suspended)") {
-                runBlocking {
-                    val actual = assertDoesNotThrow { suspend { 1 }() }
+        dynamicContainer(
+            "succeeds when no exception thrown",
+            Stream.of(
+                dynamicTest("for no arguments variant") {
+                    val actual = assertDoesNotThrow { 1 }
                     assertEquals(1, actual)
-                }
-            },
-            dynamicTest("for message variant") {
-                val actual = assertDoesNotThrow("message") { 2 }
-                assertEquals(2, actual)
-            },
-            dynamicTest("for message variant (suspended)") {
-                runBlocking {
-                    val actual = assertDoesNotThrow("message") { suspend { 2 }() }
+                },
+                dynamicTest("for no arguments variant (suspended)") {
+                    runBlocking {
+                        val actual = assertDoesNotThrow { suspend { 1 }() }
+                        assertEquals(1, actual)
+                    }
+                },
+                dynamicTest("for message variant") {
+                    val actual = assertDoesNotThrow("message") { 2 }
                     assertEquals(2, actual)
-                }
-            },
-            dynamicTest("for message supplier variant") {
-                val actual = assertDoesNotThrow({ "message" }) { 3 }
-                assertEquals(3, actual)
-            },
-            dynamicTest("for message supplier variant (suspended)") {
-                runBlocking {
-                    val actual = assertDoesNotThrow({ "message" }) { suspend { 3 }() }
+                },
+                dynamicTest("for message variant (suspended)") {
+                    runBlocking {
+                        val actual = assertDoesNotThrow("message") { suspend { 2 }() }
+                        assertEquals(2, actual)
+                    }
+                },
+                dynamicTest("for message supplier variant") {
+                    val actual = assertDoesNotThrow({ "message" }) { 3 }
                     assertEquals(3, actual)
-                }
-            }
-        )),
-        dynamicContainer("fails when an exception is thrown", Stream.of(
-            dynamicTest("for no arguments variant") {
-                val exception = assertThrows<AssertionError> {
-                    assertDoesNotThrow {
-                        fail("fail")
+                },
+                dynamicTest("for message supplier variant (suspended)") {
+                    runBlocking {
+                        val actual = assertDoesNotThrow({ "message" }) { suspend { 3 }() }
+                        assertEquals(3, actual)
                     }
                 }
-                assertMessageEquals(exception,
-                    "Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
-            },
-            dynamicTest("for no arguments variant (suspended)") {
-                runBlocking {
+            )
+        ),
+        dynamicContainer(
+            "fails when an exception is thrown",
+            Stream.of(
+                dynamicTest("for no arguments variant") {
                     val exception = assertThrows<AssertionError> {
                         assertDoesNotThrow {
-                            suspend { fail("fail") }()
+                            fail("fail")
                         }
                     }
                     assertMessageEquals(
                         exception,
                         "Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
                     )
-                }
-            },
-            dynamicTest("for message variant") {
-                val exception = assertThrows<AssertionError> {
-                    assertDoesNotThrow("Does not throw") {
-                        fail("fail")
+                },
+                dynamicTest("for no arguments variant (suspended)") {
+                    runBlocking {
+                        val exception = assertThrows<AssertionError> {
+                            assertDoesNotThrow {
+                                suspend { fail("fail") }()
+                            }
+                        }
+                        assertMessageEquals(
+                            exception,
+                            "Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
+                        )
                     }
-                }
-                assertMessageEquals(exception,
-                    "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
-            },
-            dynamicTest("for message variant (suspended)") {
-                runBlocking {
+                },
+                dynamicTest("for message variant") {
                     val exception = assertThrows<AssertionError> {
                         assertDoesNotThrow("Does not throw") {
-                            suspend { fail("fail") }()
+                            fail("fail")
                         }
                     }
                     assertMessageEquals(
                         exception,
                         "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
                     )
-                }
-            },
-            dynamicTest("for message supplier variant") {
-                val exception = assertThrows<AssertionError> {
-                    assertDoesNotThrow({ "Does not throw" }) {
-                        fail("fail")
+                },
+                dynamicTest("for message variant (suspended)") {
+                    runBlocking {
+                        val exception = assertThrows<AssertionError> {
+                            assertDoesNotThrow("Does not throw") {
+                                suspend { fail("fail") }()
+                            }
+                        }
+                        assertMessageEquals(
+                            exception,
+                            "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
+                        )
                     }
-                }
-                assertMessageEquals(exception,
-                    "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail")
-            },
-            dynamicTest("for message supplier variant (suspended)") {
-                runBlocking {
+                },
+                dynamicTest("for message supplier variant") {
                     val exception = assertThrows<AssertionError> {
                         assertDoesNotThrow({ "Does not throw" }) {
-                            suspend { fail("fail") }()
+                            fail("fail")
                         }
                     }
                     assertMessageEquals(
                         exception,
                         "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
                     )
+                },
+                dynamicTest("for message supplier variant (suspended)") {
+                    runBlocking {
+                        val exception = assertThrows<AssertionError> {
+                            assertDoesNotThrow({ "Does not throw" }) {
+                                suspend { fail("fail") }()
+                            }
+                        }
+                        assertMessageEquals(
+                            exception,
+                            "Does not throw ==> Unexpected exception thrown: org.opentest4j.AssertionFailedError: fail"
+                        )
+                    }
                 }
-            }
-        ))
+            )
+        )
     )
 
     @Test
@@ -205,6 +217,7 @@ class KotlinAssertionsTests {
             vararg exceptionTypes: KClass<out Throwable>
         ) =
             AssertAllAssertionsTests.assertExpectedExceptionTypes(
-                multipleFailuresError, *exceptionTypes.map { it.java }.toTypedArray())
+                multipleFailuresError, *exceptionTypes.map { it.java }.toTypedArray()
+            )
     }
 }
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
index f2c631bef939..c14c664a2aab 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
@@ -9,12 +9,12 @@
  */
 package org.junit.jupiter.api
 
-import java.util.stream.Stream
 import org.junit.jupiter.api.AssertEquals.assertEquals
 import org.junit.jupiter.api.AssertionTestUtils.assertEmptyMessage
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageContains
 import org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals
 import org.opentest4j.AssertionFailedError
+import java.util.stream.Stream
 
 class KotlinFailAssertionsTests {
 
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
index 9638bd733e3f..871cb9ed1066 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
@@ -57,6 +57,6 @@ class InstancePerClassKotlinTestCase {
 
     private fun increment(name: String) {
         TEST_INSTANCES.computeIfAbsent(this, { _ -> HashMap() })
-                .compute(name, { _, oldValue -> (oldValue ?: 0) + 1 })
+            .compute(name, { _, oldValue -> (oldValue ?: 0) + 1 })
     }
 }
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
index f2fb8b4e6eba..82fca8f2b809 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
@@ -35,7 +35,7 @@ class InstancePerMethodKotlinTestCase {
 
         private fun increment(instance: Any, name: String) {
             TEST_INSTANCES.computeIfAbsent(instance, { _ -> LinkedHashMap() })
-                    .compute(name, { _, oldValue -> (oldValue ?: 0) + 1 })
+                .compute(name, { _, oldValue -> (oldValue ?: 0) + 1 })
         }
     }
 
diff --git a/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt b/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
index 0028b05827e8..4b5c64a168db 100644
--- a/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
+++ b/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
@@ -26,4 +26,4 @@ import org.apiguardian.api.API
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER") // method is in fact not shadowed due to reified type
 inline fun <reified T : Any> ArgumentsAccessor.get(index: Int): T =
-        this.get(index, T::class.java)
+    this.get(index, T::class.java)
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
index 6414b755fc4d..47f48d52f5d7 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
@@ -32,7 +32,8 @@ class ArgumentsAccessorKotlinTests {
         }
 
         assertThat(exception).hasMessage(
-                "Argument at index [0] with value [1] and type [java.lang.Integer] could not be converted or cast to type [java.lang.Character].")
+            "Argument at index [0] with value [1] and type [java.lang.Integer] could not be converted or cast to type [java.lang.Character]."
+        )
     }
 
     @Test
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
index cd9336bbded9..798c5f8eb714 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
@@ -20,11 +20,11 @@ import org.junit.jupiter.params.provider.MethodSource
 object DisplayNameTests {
     @JvmStatic
     fun data() = arrayOf(
-            arrayOf("A", 1),
-            arrayOf("B", 2),
-            arrayOf("C", 3),
-            arrayOf("", 4), // empty is okay
-            arrayOf(null, 5) // null was the problem
+        arrayOf("A", 1),
+        arrayOf("B", 2),
+        arrayOf("C", 3),
+        arrayOf("", 4), // empty is okay
+        arrayOf(null, 5) // null was the problem
     )
 
     @ParameterizedTest

From 3c9fd99beb9ccdcf0b55364a6f4f0336bbeefdd0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 14 Nov 2021 16:16:51 +0100
Subject: [PATCH 0655/1433] Update Gradle plugins

---
 buildSrc/build.gradle.kts | 3 ++-
 gradle/libs.versions.toml | 2 +-
 settings.gradle.kts       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 438092134a3c..ddee950602f2 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	`kotlin-dsl`
+	id("com.github.ben-manes.versions") version "0.39.0"
 }
 
 repositories {
@@ -14,7 +15,7 @@ dependencies {
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
-    implementation("gradle.plugin.net.nemerosa:versioning:2.15.0")
+    implementation("gradle.plugin.net.nemerosa:versioning:2.15.1")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.1") // keep in sync with root settings.gradle.kts
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b9657428b67a..4484dcba5c57 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ asciidoctor-pdf = "1.5.3"
 assertj = "3.21.0"
 checkstyle = "9.0"
 jacoco = "0.8.7"
-jmh = "1.32"
+jmh = "1.33"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7a43a14f8e67..ccfa5f74a2c1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ pluginManagement {
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "3.3.2"
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"
-		id("me.champeau.jmh") version "0.6.5"
+		id("me.champeau.jmh") version "0.6.6"
 		id("io.spring.nohttp") version "0.0.10"
 		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 	}

From fc6d4e58d023ec9148133703af8e4d8586ab3657 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 14 Nov 2021 16:17:03 +0100
Subject: [PATCH 0656/1433] Update dependencies

---
 gradle/libs.versions.toml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4484dcba5c57..893529efd8bb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,9 +18,9 @@ apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apigu
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.22.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
-bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "5.3.0" }
-classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.106" }
-commons-io = { module = "commons-io:commons-io", version = "2.9.0" }
+bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.0.0" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.132" }
+commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.0-beta-1" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
@@ -32,10 +32,10 @@ junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
-mockito = { module = "org.mockito:mockito-junit-jupiter", version = "3.10.0" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.0.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
-picocli = { module = "info.picocli:picocli", version = "4.6.1" }
-slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.30" }
+picocli = { module = "info.picocli:picocli", version = "4.6.2" }
+slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.32" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 

From a7f192a06c44227093f66a110cc26108d5c523a7 Mon Sep 17 00:00:00 2001
From: Tim Lander <tim57282@hotmail.com>
Date: Wed, 17 Nov 2021 23:34:20 +0800
Subject: [PATCH 0657/1433] Add an example of inner class fully qualified
 method name (#2782)

---
 .../java/org/junit/jupiter/params/provider/MethodSource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index d1fb10374482..dacabb7933be 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -109,7 +109,8 @@
 	 *
 	 * <p>Factory methods in external classes must be referenced by <em>fully
 	 * qualified method name</em> &mdash; for example,
-	 * {@code com.example.StringsProviders#blankStrings}.
+	 * {@code com.example.StringsProviders#blankStrings} or
+	 * {@code com.example.OuterClass$InnerClass#classMethod}.
 	 *
 	 * <p>If no factory method names are declared, a method within the test class
 	 * that has the same name as the test method will be used as the factory

From 3c26d658b5ec9c9ac15516d913216973d92e2133 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 19 Nov 2021 13:23:28 +0100
Subject: [PATCH 0658/1433] Polishing

See #2782
---
 .../java/org/junit/jupiter/params/provider/MethodSource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index dacabb7933be..9b2240a0fb95 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -110,7 +110,8 @@
 	 * <p>Factory methods in external classes must be referenced by <em>fully
 	 * qualified method name</em> &mdash; for example,
 	 * {@code com.example.StringsProviders#blankStrings} or
-	 * {@code com.example.OuterClass$InnerClass#classMethod}.
+	 * {@code com.example.TopLevelClass$NestedClass#classMethod} for a factory
+	 * method in a static nested class.
 	 *
 	 * <p>If no factory method names are declared, a method within the test class
 	 * that has the same name as the test method will be used as the factory

From 450e94a4268d41ba6abfebdb2e11ed6d900ef099 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 27 Oct 2021 14:46:25 +0200
Subject: [PATCH 0659/1433] Support CSV headers in display names in
 parameterized tests

Given the following parameterized test that sets
useHeadersInDisplayName to true and uses {arguments} instead of
{argumentsWithNames} for its display name pattern...

@ParameterizedTest(name = "[{index}] {arguments}")
@CsvSource(useHeadersInDisplayName = true, textBlock = """
	FRUIT,  RANK
	apple,  1
	banana, 2
	cherry, 3
	""")
void test(String fruit, int rank) {}

The generated display names are:

[1] FRUIT = apple, RANK = 1
[2] FRUIT = banana, RANK = 2
[3] FRUIT = cherry, RANK = 3

See #2759
---
 .../release-notes/release-notes-5.8.2.adoc    |  8 +-
 .../asciidoc/user-guide/writing-tests.adoc    | 49 +++++++++-
 .../java/example/ParameterizedTestDemo.java   |  7 ++
 .../src/test/resources/two-column.csv         |  2 +-
 .../params/provider/CsvArgumentsProvider.java | 96 +++++++++++++------
 .../provider/CsvFileArgumentsProvider.java    | 28 ++++--
 .../params/provider/CsvFileSource.java        | 32 ++++++-
 .../params/provider/CsvParserFactory.java     | 13 ++-
 .../jupiter/params/provider/CsvSource.java    | 39 +++++++-
 .../ParameterizedTestIntegrationTests.java    | 78 +++++++++------
 .../provider/CsvArgumentsProviderTests.java   | 45 +++++++--
 .../CsvFileArgumentsProviderTests.java        | 15 +++
 .../provider/MockCsvAnnotationBuilder.java    |  8 ++
 .../params/two-column-with-headers.csv        | 13 +++
 14 files changed, 345 insertions(+), 88 deletions(-)
 create mode 100644 junit-jupiter-params/src/test/resources/org/junit/jupiter/params/two-column-with-headers.csv

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
index 6e97eae8b162..f8e4f7d4b924 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
@@ -6,6 +6,7 @@
 *Scope:*
 
 * Text blocks in `@CsvSource` are treated like CSV files
+* CSV headers in display names for `@CsvSource` and `@CsvFileSource`
 * Custom quote character support in `@CsvSource` and `@CsvFileSource`
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
@@ -29,8 +30,13 @@ No changes.
   quoted strings. See the
   <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvSource, User
   Guide>> for details and examples.
+* CSV headers can now be used in display names in parameterized tests. See
+  <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvSource,
+  `@CsvSource`>> and
+  <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvFileSource,
+  `@CsvFileSource`>> in the User Guide for details and examples.
 * The quote character for _quoted strings_ in `@CsvSource` and `@CsvFileSource` is now
-  configurable via new `quoteCharacter` attributes in each annotation.
+  configurable via a new `quoteCharacter` attribute in each annotation.
 
 
 [[release-notes-5.8.2-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index efa460277ba1..5699ce07b095 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1332,7 +1332,9 @@ include::{testDir}/example/ExternalMethodSourceDemo.java[tags=external_MethodSou
 
 `@CsvSource` allows you to express argument lists as comma-separated values (i.e., CSV
 `String` literals). Each string provided via the `value` attribute in `@CsvSource`
-represents a CSV record and results in one invocation of the parameterized test.
+represents a CSV record and results in one invocation of the parameterized test. The first
+record may optionally be used to supply CSV headers (see the Javadoc for the
+`useHeadersInDisplayName` attribute for details and an example).
 
 [source,java,indent=0]
 ----
@@ -1375,12 +1377,16 @@ by default. This behavior can be changed by setting the
 If the programming language you are using supports _text blocks_ -- for example, Java SE
 15 or higher -- you can alternatively use the `textBlock` attribute of `@CsvSource`. Each
 record within a text block represents a CSV record and results in one invocation of the
-parameterized test. Using a text block, the previous example can be implemented as follows.
+parameterized test. The first record may optionally be used to supply CSV headers by
+setting the `useHeadersInDisplayName` attribute to `true` as in the example below.
+
+Using a text block, the previous example can be implemented as follows.
 
 [source,java,indent=0]
 ----
-@ParameterizedTest
-@CsvSource(textBlock = """
+@ParameterizedTest(name = "[{index}] {arguments}")
+@CsvSource(useHeadersInDisplayName = true, textBlock = """
+	FRUIT,         RANK
 	apple,         1
 	banana,        2
 	'lemon, lime', 0xF1
@@ -1391,6 +1397,15 @@ void testWithCsvSource(String fruit, int rank) {
 }
 ----
 
+The generated display names for the previous example include the CSV header names.
+
+----
+[1] FRUIT = apple, RANK = 1
+[2] FRUIT = banana, RANK = 2
+[3] FRUIT = lemon, lime, RANK = 0xF1
+[4] FRUIT = strawberry, RANK = 700_000
+----
+
 In contrast to CSV records supplied via the `value` attribute, a text block can contain
 comments. Any line beginning with a `+++#+++` symbol will be treated as a comment and
 ignored. Note, however, that the `+++#+++` symbol must be the first character on the line
@@ -1435,7 +1450,11 @@ your text block.
 
 `@CsvFileSource` lets you use comma-separated value (CSV) files from the classpath or the
 local file system. Each record from a CSV file results in one invocation of the
-parameterized test.
+parameterized test. The first record may optionally be used to supply CSV headers. You can
+instruct JUnit to ignore the headers via the `numLinesToSkip` attribute. If you would like
+for the headers to be used in the display names, you can set the `useHeadersInDisplayName`
+attribute to `true`. The examples below demonstrate the use of `numLinesToSkip` and
+`useHeadersInDisplayName`.
 
 The default delimiter is a comma (`,`), but you can use another character by setting the
 `delimiter` attribute. Alternatively, the `delimiterString` attribute allows you to use a
@@ -1457,6 +1476,26 @@ include::{testDir}/example/ParameterizedTestDemo.java[tags=CsvFileSource_example
 include::{testResourcesDir}/two-column.csv[]
 ----
 
+The following listing shows the generated display names for the first two parameterized
+test methods above.
+
+----
+[1] country=Sweden, reference=1
+[2] country=Poland, reference=2
+[3] country=United States of America, reference=3
+[4] country=France, reference=700_000
+----
+
+The following listing shows the generated display names for the last parameterized test
+method above that uses CSV header names.
+
+----
+[1] COUNTRY = Sweden, REFERENCE = 1
+[2] COUNTRY = Poland, REFERENCE = 2
+[3] COUNTRY = United States of America, REFERENCE = 3
+[4] COUNTRY = France, REFERENCE = 700_000
+----
+
 In contrast to the default syntax used in `@CsvSource`, `@CsvFileSource` uses a double
 quote (`+++"+++`) as the quote character by default, but this can be changed via the
 `quoteCharacter` attribute. See the `"United States of America"` value in the example
diff --git a/documentation/src/test/java/example/ParameterizedTestDemo.java b/documentation/src/test/java/example/ParameterizedTestDemo.java
index bcd0f0a12668..4717f6133b15 100644
--- a/documentation/src/test/java/example/ParameterizedTestDemo.java
+++ b/documentation/src/test/java/example/ParameterizedTestDemo.java
@@ -236,6 +236,13 @@ void testWithCsvFileSourceFromFile(String country, int reference) {
 		assertNotNull(country);
 		assertNotEquals(0, reference);
 	}
+
+	@ParameterizedTest(name = "[{index}] {arguments}")
+	@CsvFileSource(resources = "/two-column.csv", useHeadersInDisplayName = true)
+	void testWithCsvFileSourceAndHeaders(String country, int reference) {
+		assertNotNull(country);
+		assertNotEquals(0, reference);
+	}
 	// end::CsvFileSource_example[]
 
 	// tag::ArgumentsSource_example[]
diff --git a/documentation/src/test/resources/two-column.csv b/documentation/src/test/resources/two-column.csv
index 011550be3707..7ebb4c545f1b 100644
--- a/documentation/src/test/resources/two-column.csv
+++ b/documentation/src/test/resources/two-column.csv
@@ -1,4 +1,4 @@
-Country, Reference
+COUNTRY, REFERENCE
 Sweden, 1
 Poland, 2
 "United States of America", 3
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index a218d1f02b10..fda9ed4002d8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -15,6 +15,7 @@
 
 import java.io.StringReader;
 import java.lang.annotation.Annotation;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -23,6 +24,7 @@
 
 import com.univocity.parsers.csv.CsvParser;
 
+import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -53,56 +55,96 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 		Preconditions.condition(this.annotation.value().length > 0 ^ textBlockDeclared,
 			() -> "@CsvSource must be declared with either `value` or `textBlock` but not both");
 
-		if (textBlockDeclared) {
-			return parseTextBlock(this.annotation.textBlock()).stream().map(Arguments::of);
-		}
-
-		AtomicInteger index = new AtomicInteger(0);
-		// @formatter:off
-		return Arrays.stream(this.annotation.value())
-				.map(line -> parseLine(line, index.incrementAndGet()))
-				.map(Arguments::of);
-		// @formatter:on
+		return textBlockDeclared ? parseTextBlock() : parseValueArray();
 	}
 
-	private List<String[]> parseTextBlock(String textBlock) {
+	private Stream<Arguments> parseTextBlock() {
+		String textBlock = this.annotation.textBlock();
+		boolean useHeadersInDisplayName = this.annotation.useHeadersInDisplayName();
+		List<Arguments> argumentsList = new ArrayList<>();
+
 		try {
-			AtomicInteger index = new AtomicInteger(0);
 			List<String[]> csvRecords = this.csvParser.parseAll(new StringReader(textBlock));
+			String[] headers = useHeadersInDisplayName ? getHeaders(this.csvParser) : null;
+
+			AtomicInteger index = new AtomicInteger(0);
 			for (String[] csvRecord : csvRecords) {
 				index.incrementAndGet();
 				Preconditions.notNull(csvRecord,
-					() -> "Line at index " + index.get() + " contains invalid CSV: \"\"\"\n" + textBlock + "\n\"\"\"");
-				processNullValues(csvRecord, this.nullValues);
+					() -> "Record at index " + index + " contains invalid CSV: \"\"\"\n" + textBlock + "\n\"\"\"");
+				argumentsList.add(processCsvRecord(csvRecord, this.nullValues, useHeadersInDisplayName, headers));
 			}
-			return csvRecords;
 		}
 		catch (Throwable throwable) {
 			throw handleCsvException(throwable, this.annotation);
 		}
+
+		return argumentsList.stream();
 	}
 
-	private String[] parseLine(String line, int index) {
+	private Stream<Arguments> parseValueArray() {
+		boolean useHeadersInDisplayName = this.annotation.useHeadersInDisplayName();
+		List<Arguments> argumentsList = new ArrayList<>();
+
 		try {
-			String[] csvRecord = this.csvParser.parseLine(line + LINE_SEPARATOR);
-			Preconditions.notNull(csvRecord,
-				() -> "Line at index " + index + " contains invalid CSV: \"" + line + "\"");
-			processNullValues(csvRecord, this.nullValues);
-			return csvRecord;
+			String[] headers = null;
+			AtomicInteger index = new AtomicInteger(0);
+			for (String input : this.annotation.value()) {
+				index.incrementAndGet();
+				String[] csvRecord = this.csvParser.parseLine(input + LINE_SEPARATOR);
+				// Lazily retrieve headers if necessary.
+				if (useHeadersInDisplayName && headers == null) {
+					headers = getHeaders(this.csvParser);
+				}
+				Preconditions.notNull(csvRecord,
+					() -> "Record at index " + index + " contains invalid CSV: \"" + input + "\"");
+				argumentsList.add(processCsvRecord(csvRecord, this.nullValues, useHeadersInDisplayName, headers));
+			}
 		}
 		catch (Throwable throwable) {
 			throw handleCsvException(throwable, this.annotation);
 		}
+
+		return argumentsList.stream();
 	}
 
-	static void processNullValues(String[] csvRecord, Set<String> nullValues) {
-		if (!nullValues.isEmpty()) {
-			for (int i = 0; i < csvRecord.length; i++) {
-				if (nullValues.contains(csvRecord[i])) {
-					csvRecord[i] = null;
-				}
+	// Cannot get parsed headers until after parsing has started.
+	static String[] getHeaders(CsvParser csvParser) {
+		return Arrays.stream(csvParser.getContext().parsedHeaders())//
+				.map(String::trim)//
+				.toArray(String[]::new);
+	}
+
+	/**
+	 * Processes custom null values, supports wrapping of column values in
+	 * {@link Named} if necessary (for CSV header support), and returns the
+	 * CSV record wrapped in an {@link Arguments} instance.
+	 */
+	static Arguments processCsvRecord(Object[] csvRecord, Set<String> nullValues, boolean useHeadersInDisplayName,
+			String[] headers) {
+
+		// Nothing to process?
+		if (nullValues.isEmpty() && !useHeadersInDisplayName) {
+			return Arguments.of(csvRecord);
+		}
+
+		Preconditions.condition(!useHeadersInDisplayName || (csvRecord.length <= headers.length),
+			() -> String.format(
+				"The number of columns (%d) exceeds the number of supplied headers (%d) in CSV record: %s",
+				csvRecord.length, headers.length, Arrays.toString(csvRecord)));
+
+		Object[] arguments = new Object[csvRecord.length];
+		for (int i = 0; i < csvRecord.length; i++) {
+			Object column = csvRecord[i];
+			if (nullValues.contains(column)) {
+				column = null;
+			}
+			if (useHeadersInDisplayName) {
+				column = Named.of(headers[i] + " = " + column, column);
 			}
+			arguments[i] = column;
 		}
+		return Arguments.of(arguments);
 	}
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index 66b8f2379074..6e7c8d931fa7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -13,9 +13,9 @@
 import static java.util.Spliterators.spliteratorUnknownSize;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.StreamSupport.stream;
-import static org.junit.jupiter.params.provider.Arguments.arguments;
+import static org.junit.jupiter.params.provider.CsvArgumentsProvider.getHeaders;
 import static org.junit.jupiter.params.provider.CsvArgumentsProvider.handleCsvException;
-import static org.junit.jupiter.params.provider.CsvArgumentsProvider.processNullValues;
+import static org.junit.jupiter.params.provider.CsvArgumentsProvider.processCsvRecord;
 import static org.junit.jupiter.params.provider.CsvParserFactory.createParserFor;
 import static org.junit.platform.commons.util.CollectionUtils.toSet;
 
@@ -119,41 +119,49 @@ private static class CsvParserIterator implements Iterator<Arguments> {
 
 		private final CsvParser csvParser;
 		private final CsvFileSource annotation;
+		private final boolean useHeadersInDisplayName;
 		private final Set<String> nullValues;
-		private Object[] nextCsvRecord;
+		private Arguments nextArguments;
+		private String[] headers;
 
 		CsvParserIterator(CsvParser csvParser, CsvFileSource annotation) {
 			this.csvParser = csvParser;
 			this.annotation = annotation;
+			this.useHeadersInDisplayName = annotation.useHeadersInDisplayName();
 			this.nullValues = toSet(annotation.nullValues());
 			advance();
 		}
 
 		@Override
 		public boolean hasNext() {
-			return this.nextCsvRecord != null;
+			return this.nextArguments != null;
 		}
 
 		@Override
 		public Arguments next() {
-			Arguments result = arguments(this.nextCsvRecord);
+			Arguments result = this.nextArguments;
 			advance();
 			return result;
 		}
 
 		private void advance() {
-			String[] csvRecord = null;
 			try {
-				csvRecord = this.csvParser.parseNext();
+				String[] csvRecord = this.csvParser.parseNext();
 				if (csvRecord != null) {
-					processNullValues(csvRecord, this.nullValues);
+					// Lazily retrieve headers if necessary.
+					if (this.useHeadersInDisplayName && this.headers == null) {
+						this.headers = getHeaders(this.csvParser);
+					}
+					this.nextArguments = processCsvRecord(csvRecord, this.nullValues, this.useHeadersInDisplayName,
+						this.headers);
+				}
+				else {
+					this.nextArguments = null;
 				}
 			}
 			catch (Throwable throwable) {
 				handleCsvException(throwable, this.annotation);
 			}
-
-			this.nextCsvRecord = csvRecord;
 		}
 
 	}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index a2c9f400b285..e639612cf7d4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -27,7 +27,9 @@
  * or {@link #files}.
  *
  * <p>The CSV records parsed from these resources and files will be provided as
- * arguments to the annotated {@code @ParameterizedTest} method.
+ * arguments to the annotated {@code @ParameterizedTest} method. Note that the
+ * first record may optionally be used to supply CSV headers (see
+ * {@link #useHeadersInDisplayName}).
  *
  * <p>Any line beginning with a {@code #} symbol will be interpreted as a comment
  * and will be ignored.
@@ -95,6 +97,34 @@
 	 */
 	String lineSeparator() default "\n";
 
+	/**
+	 * Configures whether the first CSV record should be treated as header names
+	 * for columns.
+	 *
+	 * <p>When set to {@code true}, the header names will be used in the
+	 * generated display name for each {@code @ParameterizedTest} method
+	 * invocation. When using this feature, you must ensure that the display name
+	 * pattern for {@code @ParameterizedTest} includes
+	 * {@value org.junit.jupiter.params.ParameterizedTest#ARGUMENTS_PLACEHOLDER} instead of
+	 * {@value org.junit.jupiter.params.ParameterizedTest#ARGUMENTS_WITH_NAMES_PLACEHOLDER}
+	 * as demonstrated in the example below.
+	 *
+	 * <p>Defaults to {@code false}.
+	 *
+	 *
+	 * <h4>Example</h4>
+	 * <pre class="code">
+	 * {@literal @}ParameterizedTest(name = "[{index}] {arguments}")
+	 * {@literal @}CsvFileSource(resources = "fruits.csv", useHeadersInDisplayName = true)
+	 * void test(String fruit, int rank) {
+	 *     // ...
+	 * }</pre>
+	 *
+	 * @since 5.8.2
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8.2")
+	boolean useHeadersInDisplayName() default false;
+
 	/**
 	 * The quote character to use for <em>quoted strings</em>.
 	 *
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index 7c7a4fd2f9ad..7e7652776442 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -31,14 +31,15 @@ static CsvParser createParserFor(CsvSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
 		boolean commentProcessingEnabled = !annotation.textBlock().isEmpty();
 		return createParser(delimiter, LINE_SEPARATOR, annotation.quoteCharacter(), annotation.emptyValue(),
-			annotation.maxCharsPerColumn(), commentProcessingEnabled, annotation.ignoreLeadingAndTrailingWhitespace());
+			annotation.maxCharsPerColumn(), commentProcessingEnabled, annotation.useHeadersInDisplayName(),
+			annotation.ignoreLeadingAndTrailingWhitespace());
 	}
 
 	static CsvParser createParserFor(CsvFileSource annotation) {
 		String delimiter = selectDelimiter(annotation, annotation.delimiter(), annotation.delimiterString());
 		return createParser(delimiter, annotation.lineSeparator(), annotation.quoteCharacter(), annotation.emptyValue(),
 			annotation.maxCharsPerColumn(), COMMENT_PROCESSING_FOR_CSV_FILE_SOURCE,
-			annotation.ignoreLeadingAndTrailingWhitespace());
+			annotation.useHeadersInDisplayName(), annotation.ignoreLeadingAndTrailingWhitespace());
 	}
 
 	private static String selectDelimiter(Annotation annotation, char delimiter, String delimiterString) {
@@ -55,16 +56,18 @@ private static String selectDelimiter(Annotation annotation, char delimiter, Str
 	}
 
 	private static CsvParser createParser(String delimiter, String lineSeparator, char quote, String emptyValue,
-			int maxCharsPerColumn, boolean commentProcessingEnabled, boolean ignoreLeadingAndTrailingWhitespace) {
+			int maxCharsPerColumn, boolean commentProcessingEnabled, boolean headerExtractionEnabled,
+			boolean ignoreLeadingAndTrailingWhitespace) {
 		return new CsvParser(createParserSettings(delimiter, lineSeparator, quote, emptyValue, maxCharsPerColumn,
-			commentProcessingEnabled, ignoreLeadingAndTrailingWhitespace));
+			commentProcessingEnabled, headerExtractionEnabled, ignoreLeadingAndTrailingWhitespace));
 	}
 
 	private static CsvParserSettings createParserSettings(String delimiter, String lineSeparator, char quote,
-			String emptyValue, int maxCharsPerColumn, boolean commentProcessingEnabled,
+			String emptyValue, int maxCharsPerColumn, boolean commentProcessingEnabled, boolean headerExtractionEnabled,
 			boolean ignoreLeadingAndTrailingWhitespace) {
 
 		CsvParserSettings settings = new CsvParserSettings();
+		settings.setHeaderExtractionEnabled(headerExtractionEnabled);
 		settings.getFormat().setDelimiter(delimiter);
 		settings.getFormat().setLineSeparator(lineSeparator);
 		settings.getFormat().setQuote(quote);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index 40c3ec3d09b8..d3a244cac611 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -77,7 +77,9 @@
 	 * via this attribute or the {@link #textBlock} attribute.
 	 *
 	 * <p>Each value corresponds to a record in a CSV file and will be split using
-	 * the specified {@link #delimiter} or {@link #delimiterString}.
+	 * the specified {@link #delimiter} or {@link #delimiterString}. Note that
+	 * the first value may optionally be used to supply CSV headers (see
+	 * {@link #useHeadersInDisplayName}).
 	 *
 	 * <p>If <em>text block</em> syntax is supported by your programming language,
 	 * you may find it more convenient to declare your CSV content via the
@@ -113,6 +115,8 @@
 	 *
 	 * <p>Each record in the text block corresponds to a record in a CSV file and will
 	 * be split using the specified {@link #delimiter} or {@link #delimiterString}.
+	 * Note that the first record may optionally be used to supply CSV headers (see
+	 * {@link #useHeadersInDisplayName}).
 	 *
 	 * <p>In contrast to CSV records supplied via {@link #value}, a text block
 	 * can contain comments. Any line beginning with a hash tag ({@code #}) will
@@ -151,6 +155,39 @@
 	@API(status = EXPERIMENTAL, since = "5.8.1")
 	String textBlock() default "";
 
+	/**
+	 * Configures whether the first CSV record should be treated as header names
+	 * for columns.
+	 *
+	 * <p>When set to {@code true}, the header names will be used in the
+	 * generated display name for each {@code @ParameterizedTest} method
+	 * invocation. When using this feature, you must ensure that the display name
+	 * pattern for {@code @ParameterizedTest} includes
+	 * {@value org.junit.jupiter.params.ParameterizedTest#ARGUMENTS_PLACEHOLDER} instead of
+	 * {@value org.junit.jupiter.params.ParameterizedTest#ARGUMENTS_WITH_NAMES_PLACEHOLDER}
+	 * as demonstrated in the example below.
+	 *
+	 * <p>Defaults to {@code false}.
+	 *
+	 * <h4>Example</h4>
+	 * <pre class="code">
+	 * {@literal @}ParameterizedTest(name = "[{index}] {arguments}")
+	 * {@literal @}CsvSource(useHeadersInDisplayName = true, textBlock = """
+	 *     FRUIT,         RANK
+	 *     apple,         1
+	 *     banana,        2
+	 *     'lemon, lime', 0xF1
+	 *     strawberry,    700_000
+	 *     """)
+	 * void test(String fruit, int rank) {
+	 *     // ...
+	 * }</pre>
+	 *
+	 * @since 5.8.2
+	 */
+	@API(status = EXPERIMENTAL, since = "5.8.2")
+	boolean useHeadersInDisplayName() default false;
+
 	/**
 	 * The quote character to use for <em>quoted strings</em>.
 	 *
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index db4108d4505e..1ba34f9dad35 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -123,38 +123,56 @@ void executesLinesFromTextBlock(String fruit, int rank) {
 		}
 	}
 
-	@ParameterizedTest
-	@CsvSource(delimiter = '|', quoteCharacter = '"', textBlock = """
-			#-----------------------------
-			#    FRUIT     |     RANK
-			#-----------------------------
-			     apple     |      1
-			#-----------------------------
-			     banana    |      2
-			#-----------------------------
-			     cherry    | 3.1415926535\
-			8979323846\
-			2643383279\
-			5028841971\
-			6939937510\
-			5820974944\
-			5923078164\
-			0628620899\
-			8628034825\
-			3421170679
-			#-----------------------------
-			  "lemon lime" |     99
-			#-----------------------------
-			   strawberry  |    700_000
-			#-----------------------------
+	@ParameterizedTest(name = "[{index}] {arguments}")
+	@CsvSource(delimiter = '|', useHeadersInDisplayName = true, nullValues = "NIL", textBlock = """
+			#---------------------------------
+			  FRUIT  | RANK
+			#---------------------------------
+			  apple  | 1
+			#---------------------------------
+			  banana | 2
+			#---------------------------------
+			  cherry | 3.14159265358979323846
+			#---------------------------------
+			         | 0
+			#---------------------------------
+			  NIL    | 0
+			#---------------------------------
 			""")
-	void executesLinesFromTextBlockUsingPseudoTableFormat(String fruit, double rank) {
+	void executesLinesFromTextBlockUsingTableFormatAndHeadersAndNullValues(String fruit, double rank,
+			TestInfo testInfo) {
+		assertFruitTable(fruit, rank, testInfo);
+	}
+
+	@ParameterizedTest(name = "[{index}] {arguments}")
+	@CsvFileSource(resources = "two-column-with-headers.csv", delimiter = '|', useHeadersInDisplayName = true, nullValues = "NIL")
+	void executesLinesFromClasspathResourceUsingTableFormatAndHeadersAndNullValues(String fruit, double rank,
+			TestInfo testInfo) {
+		assertFruitTable(fruit, rank, testInfo);
+	}
+
+	private void assertFruitTable(String fruit, double rank, TestInfo testInfo) {
+		String displayName = testInfo.getDisplayName();
+
+		if (fruit == null) {
+			assertThat(rank).isEqualTo(0);
+			assertThat(displayName).matches("\\[(4|5)\\] FRUIT = null, RANK = 0");
+			return;
+		}
+
 		switch (fruit) {
-			case "apple" -> assertThat(rank).isEqualTo(1);
-			case "banana" -> assertThat(rank).isEqualTo(2);
-			case "cherry" -> assertThat(rank).isCloseTo(Math.PI, within(0.0));
-			case "lemon lime" -> assertThat(rank).isEqualTo(99);
-			case "strawberry" -> assertThat(rank).isEqualTo(700_000);
+			case "apple" -> {
+				assertThat(rank).isEqualTo(1);
+				assertThat(displayName).isEqualTo("[1] FRUIT = apple, RANK = 1");
+			}
+			case "banana" -> {
+				assertThat(rank).isEqualTo(2);
+				assertThat(displayName).isEqualTo("[2] FRUIT = banana, RANK = 2");
+			}
+			case "cherry" -> {
+				assertThat(rank).isCloseTo(Math.PI, within(0.0));
+				assertThat(displayName).isEqualTo("[3] FRUIT = cherry, RANK = 3.14159265358979323846");
+			}
 			default -> fail("Unexpected fruit : " + fruit);
 		}
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 32fd519baac2..1bd44c4a4aef 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -31,7 +31,7 @@ void throwsExceptionForInvalidCsv() {
 
 		assertThatExceptionOfType(JUnitException.class)//
 				.isThrownBy(() -> provideArguments(annotation).toArray())//
-				.withMessage("Line at index 3 contains invalid CSV: \"\"");
+				.withMessage("Record at index 3 contains invalid CSV: \"\"");
 	}
 
 	@Test
@@ -267,10 +267,8 @@ void convertsEmptyValuesToNullInLinesAfterFirstLine() {
 	void throwsExceptionIfSourceExceedsMaxCharsPerColumnConfig() {
 		var annotation = csvSource().lines("413").maxCharsPerColumn(2).build();
 
-		var arguments = provideArguments(annotation);
-
 		assertThatExceptionOfType(CsvParsingException.class)//
-				.isThrownBy(arguments::toArray)//
+				.isThrownBy(() -> provideArguments(annotation))//
 				.withMessageStartingWith("Failed to parse CSV input configured via Mock for CsvSource")//
 				.withRootCauseInstanceOf(ArrayIndexOutOfBoundsException.class);
 	}
@@ -288,10 +286,8 @@ void providesArgumentWithDefaultMaxCharsPerColumnConfig() {
 	void throwsExceptionWhenSourceExceedsDefaultMaxCharsPerColumnConfig() {
 		var annotation = csvSource().lines("0".repeat(4097)).delimiter(';').build();
 
-		var arguments = provideArguments(annotation);
-
 		assertThatExceptionOfType(CsvParsingException.class)//
-				.isThrownBy(arguments::toArray)//
+				.isThrownBy(() -> provideArguments(annotation))//
 				.withMessageStartingWith("Failed to parse CSV input configured via Mock for CsvSource")//
 				.withRootCauseInstanceOf(ArrayIndexOutOfBoundsException.class);
 	}
@@ -336,6 +332,41 @@ void honorsCommentCharacterWhenUsingTextBlockAttribute() {
 		assertThat(arguments).containsExactly(array("bar", "#baz"), array("#bar", "baz"));
 	}
 
+	@Test
+	void supportsCsvHeadersWhenUsingTextBlockAttribute() {
+		var annotation = csvSource().useHeadersInDisplayName(true).textBlock("""
+				FRUIT, RANK
+				apple, 1
+				banana, 2
+				""").build();
+
+		var arguments = provideArguments(annotation);
+		Stream<String[]> argumentsAsStrings = arguments.map(array -> {
+			String[] strings = new String[array.length];
+			for (int i = 0; i < array.length; i++) {
+				strings[i] = String.valueOf(array[i]);
+			}
+			return strings;
+		});
+
+		assertThat(argumentsAsStrings).containsExactly(array("FRUIT = apple", "RANK = 1"),
+			array("FRUIT = banana", "RANK = 2"));
+	}
+
+	@Test
+	void throwsExceptionIfColumnCountExceedsHeaderCount() {
+		var annotation = csvSource().useHeadersInDisplayName(true).textBlock("""
+				FRUIT, RANK
+				apple, 1
+				banana, 2, BOOM!
+				""").build();
+
+		assertThatExceptionOfType(PreconditionViolationException.class)//
+				.isThrownBy(() -> provideArguments(annotation))//
+				.withMessage(
+					"The number of columns (3) exceeds the number of supplied headers (2) in CSV record: [banana, 2, BOOM!]");
+	}
+
 	private Stream<Object[]> provideArguments(CsvSource annotation) {
 		var provider = new CsvArgumentsProvider();
 		provider.accept(annotation);
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index a820ab5a7ca2..0176c4517ee1 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -275,6 +275,21 @@ void readsFromMultipleClasspathResourcesWithHeaders() {
 			array("baz"), array("qux"), array(""));
 	}
 
+	@Test
+	void supportsCsvHeadersInDisplayNames() {
+		var annotation = csvFileSource()//
+				.encoding("ISO-8859-1")//
+				.resources("/single-column.csv")//
+				.useHeadersInDisplayName(true)//
+				.build();
+
+		var arguments = provideArguments(new CsvFileArgumentsProvider(), annotation);
+		Stream<String[]> argumentsAsStrings = arguments.map(array -> new String[] { String.valueOf(array[0]) });
+
+		assertThat(argumentsAsStrings).containsExactly(array("foo = bar"), array("foo = baz"), array("foo = qux"),
+			array("foo = "));
+	}
+
 	@Test
 	void throwsExceptionForMissingClasspathResource() {
 		var annotation = csvFileSource()//
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index aa8a1d1e8fc9..b19f66475a61 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -34,6 +34,7 @@ static MockCsvFileSourceBuilder csvFileSource() {
 
 	// -------------------------------------------------------------------------
 
+	private boolean useHeadersInDisplayName = false;
 	private char quoteCharacter = '\0';
 	protected char delimiter = '\0';
 	protected String delimiterString = "";
@@ -47,6 +48,11 @@ private MockCsvAnnotationBuilder() {
 
 	protected abstract B getSelf();
 
+	B useHeadersInDisplayName(boolean useHeadersInDisplayName) {
+		this.useHeadersInDisplayName = useHeadersInDisplayName;
+		return getSelf();
+	}
+
 	B quoteCharacter(char quoteCharacter) {
 		this.quoteCharacter = quoteCharacter;
 		return getSelf();
@@ -115,6 +121,7 @@ CsvSource build() {
 			var annotation = mock(CsvSource.class);
 
 			// Common
+			when(annotation.useHeadersInDisplayName()).thenReturn(super.useHeadersInDisplayName);
 			when(annotation.quoteCharacter()).thenReturn(super.quoteCharacter);
 			when(annotation.delimiter()).thenReturn(super.delimiter);
 			when(annotation.delimiterString()).thenReturn(super.delimiterString);
@@ -179,6 +186,7 @@ CsvFileSource build() {
 			var annotation = mock(CsvFileSource.class);
 
 			// Common
+			when(annotation.useHeadersInDisplayName()).thenReturn(super.useHeadersInDisplayName);
 			when(annotation.quoteCharacter()).thenReturn(super.quoteCharacter);
 			when(annotation.delimiter()).thenReturn(super.delimiter);
 			when(annotation.delimiterString()).thenReturn(super.delimiterString);
diff --git a/junit-jupiter-params/src/test/resources/org/junit/jupiter/params/two-column-with-headers.csv b/junit-jupiter-params/src/test/resources/org/junit/jupiter/params/two-column-with-headers.csv
new file mode 100644
index 000000000000..9a9fd17d14e7
--- /dev/null
+++ b/junit-jupiter-params/src/test/resources/org/junit/jupiter/params/two-column-with-headers.csv
@@ -0,0 +1,13 @@
+#---------------------------------
+  FRUIT  | RANK
+#---------------------------------
+  apple  | 1
+#---------------------------------
+  banana | 2
+#---------------------------------
+  cherry | 3.14159265358979323846
+#---------------------------------
+         | 0
+#---------------------------------
+  NIL    | 0
+#---------------------------------

From 6a47ae152003a6ac3e77f2e604159b71e4f82953 Mon Sep 17 00:00:00 2001
From: aSemy <adam.semenenko@gmail.com>
Date: Sat, 20 Nov 2021 14:52:06 +0100
Subject: [PATCH 0660/1433] Use Gradle `because` to document
 junit-platform-launcher dependency

Closes #2783
---
 .../src/docs/asciidoc/user-guide/running-tests.adoc          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index efab0a2b8dd1..4a71863abe3e 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -29,8 +29,9 @@ include the corresponding versions of the `junit-platform-launcher`,
 [subs=attributes+]
 ----
 testImplementation(platform("org.junit:junit-bom:{bom-version}"))
-// Only needed to run tests in a version of IntelliJ IDEA that bundles older versions
-testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+testRuntimeOnly("org.junit.platform:junit-platform-launcher") {
+  because("Only needed to run tests in a version of IntelliJ IDEA that bundles older versions")
+}
 testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 ----

From 0a17b296efd6d9e27f25c5d1272fb37614798dd8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 28 Nov 2021 16:16:55 +0100
Subject: [PATCH 0661/1433] Fix Javadoc of
 DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME

---
 .../core/LauncherDiscoveryRequestBuilder.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 54f75d52bfd7..fce48f3bcf39 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -92,10 +92,12 @@ public final class LauncherDiscoveryRequestBuilder {
 	 *
 	 * <p>Supported values are {@code "logging"} and {@code "abortOnFailure"}.
 	 *
-	 * <p>If not specified, the default is {@code "logging"}.
+	 * <p>If not specified, the default is {@value #DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE}.
 	 */
 	public static final String DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME = "junit.platform.discovery.listener.default";
 
+	private static final String DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE = "abortOnFailure";
+
 	private final List<DiscoverySelector> selectors = new ArrayList<>();
 	private final List<EngineFilter> engineFilters = new ArrayList<>();
 	private final List<DiscoveryFilter<?>> discoveryFilters = new ArrayList<>();
@@ -305,11 +307,8 @@ private LauncherConfigurationParameters buildLauncherConfigurationParameters() {
 	}
 
 	private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationParameters configurationParameters) {
-		LauncherDiscoveryListener defaultDiscoveryListener = configurationParameters.get(
-			DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME) //
-				.map(value -> LauncherDiscoveryListeners.fromConfigurationParameter(
-					DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME, value)) //
-				.orElseGet(LauncherDiscoveryListeners::abortOnFailure);
+		LauncherDiscoveryListener defaultDiscoveryListener = getDefaultLauncherDiscoveryListener(
+			configurationParameters);
 		if (discoveryListeners.isEmpty()) {
 			return defaultDiscoveryListener;
 		}
@@ -322,4 +321,12 @@ private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationPara
 		return LauncherDiscoveryListeners.composite(allDiscoveryListeners);
 	}
 
+	private LauncherDiscoveryListener getDefaultLauncherDiscoveryListener(
+			ConfigurationParameters configurationParameters) {
+		String value = configurationParameters.get(DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME) //
+				.orElse(DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE);
+		return LauncherDiscoveryListeners.fromConfigurationParameter(
+			DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME, value);
+	}
+
 }

From a7bc80fd302648a1a7b45703b88bf1e4afc30f39 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 28 Nov 2021 16:36:32 +0100
Subject: [PATCH 0662/1433] Release 5.8.2

---
 README.md                                                       | 2 +-
 .../src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d37dfcf039a3..bce09e72c0a1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.8.1](https://github.com/junit-team/junit5/releases/tag/r5.8.1) (September 22, 2021)
+- General Availability (GA): [JUnit 5.8.2](https://github.com/junit-team/junit5/releases/tag/r5.8.2) (November 28, 2021)
 - Preview (Milestone/Release Candidate): n/a
 
 ## Documentation
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
index f8e4f7d4b924..831cc74ae286 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.8.2]]
 == 5.8.2
 
-*Date of Release:* November ❓, 2021
+*Date of Release:* November 28, 2021
 
 *Scope:*
 

From 3e06d8f92452d0586a5b7b5b96dfff79fba0bbe1 Mon Sep 17 00:00:00 2001
From: Harry Glasgow <harry.glasgow@protonmail.com>
Date: Mon, 29 Nov 2021 20:12:11 +0800
Subject: [PATCH 0663/1433] Feature/temp dir cleanup (#2729)

This PR adds a cleanup mode (`ALWAYS` (default), `ON_SUCCESS`, or
`NEVER`) parameter to `@TempDir` that allows to configured when the
temp directory should be deleted. The default can be configured by
setting a configuration parameter.

Resolves #2159.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.9.0-M1.adoc |   4 +-
 .../asciidoc/user-guide/writing-tests.adoc    |  15 +
 .../java/example/TempDirCleanupModeDemo.java  |  28 ++
 .../org/junit/jupiter/api/io/CleanupMode.java |  50 +++
 .../org/junit/jupiter/api/io/TempDir.java     |  23 +-
 .../config/CachingJupiterConfiguration.java   |   8 +
 .../config/DefaultJupiterConfiguration.java   |  11 +
 .../engine/config/JupiterConfiguration.java   |   4 +-
 .../extension/MutableExtensionRegistry.java   |   7 +-
 .../engine/extension/TempDirectory.java       |  72 +++-
 ... => DefaultExecutionCleanupModeTests.java} |   2 +-
 .../CachingJupiterConfigurationTests.java     |  12 +
 .../DefaultJupiterConfigurationTests.java     |   9 +
 .../extension/CloseablePathCleanupTests.java  | 108 ++++++
 .../extension/TempDirectoryCleanupTests.java  | 327 ++++++++++++++++++
 .../TempDirectoryParameterResolverTests.java  |  61 ++++
 16 files changed, 724 insertions(+), 17 deletions(-)
 create mode 100644 documentation/src/test/java/example/TempDirCleanupModeDemo.java
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/{DefaultExecutionModeTests.java => DefaultExecutionCleanupModeTests.java} (98%)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index a2d404532398..595e077b0597 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -63,4 +63,6 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* `@TempDir` now includes a cleanup mode attribute for preventing a temporary directory
+  from being deleted after a test. The default cleanup mode can be configured via a
+  configuration parameter.
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 5699ce07b095..f33781d4e454 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2349,3 +2349,18 @@ method uses a separate directory.
 ----
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_field_injection]
 ----
+
+The `@TempDir` annotation has an optional `cleanup` attribute that can be set to either
+`NEVER`, `ON_SUCCESS`, or `ALWAYS`. If the cleanup mode is set to `NEVER`, temporary
+directories are not deleted after a test completes. If it is set to `ON_SUCCESS`,
+temporary directories are deleted only after a test completed successfully.
+
+The default cleanup mode is `ALWAYS`. You can use the
+`junit.jupiter.temp.dir.cleanup.mode.default`
+<<running-tests-config-params, configuration parameter>> to override this default.
+
+[source,java,indent=0]
+.A test class with a temporary directory that doesn't get cleaned up
+----
+include::{testDir}/example/TempDirCleanupModeDemo.java[tags=user_guide]
+----
diff --git a/documentation/src/test/java/example/TempDirCleanupModeDemo.java b/documentation/src/test/java/example/TempDirCleanupModeDemo.java
new file mode 100644
index 000000000000..223ec0ba0ee2
--- /dev/null
+++ b/documentation/src/test/java/example/TempDirCleanupModeDemo.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example;
+
+import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
+
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+// tag::user_guide[]
+class TempDirCleanupModeDemo {
+
+	@Test
+	void fileTest(@TempDir(cleanup = ON_SUCCESS) Path tempDir) {
+		// perform test
+	}
+}
+// end::user_guide[]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
new file mode 100644
index 000000000000..a1b0b88009dd
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.io;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+
+/**
+ * Enumeration of cleanup modes for a {@code TempDir}.
+ *
+ * <p>When a test with a temporary directory completes, it might be useful in
+ * some cases to be able to view the contents of the directory resulting from
+ * the test. {@code CleanupMode} allows control of how a {@code TempDir}
+ * is cleaned up.
+ *
+ * @since 5.4
+ * @see TempDir
+ */
+@API(status = EXPERIMENTAL, since = "5.4")
+public enum CleanupMode {
+
+	/**
+	 * Defer to the configured cleanup mode.
+	 */
+	DEFAULT,
+
+	/**
+	 * Always clean up a temporary directory after the test has completed.
+	 */
+	ALWAYS,
+
+	/**
+	 * Don't clean up a temporary directory after the test has completed.
+	 */
+	NEVER,
+
+	/**
+	 * Only clean up a temporary directory if the test completed successfully.
+	 */
+	ON_SUCCESS
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 142e75fbea99..b57e0c60955c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -69,13 +69,22 @@
  *
  * <h3>Deletion</h3>
  *
- * <p>When the end of the scope of a temporary directory is reached, i.e. when
- * the test method or class has finished execution, JUnit will attempt to
- * recursively delete all files and directories in the temporary directory
+ * <p>By default, when the end of the scope of a temporary directory is reached,
+ * i.e. when the test method or class has finished execution, JUnit will attempt
+ * to recursively delete all files and directories in the temporary directory
  * and, finally, the temporary directory itself. In case deletion of a file or
  * directory fails, an {@link IOException} will be thrown that will cause the
  * test or test class to fail.
  *
+ * <p>The {@code @TempDir} annotation has a {@link CleanupMode} parameter that
+ * allows overriding the default behavior. If the cleanup mode is set to
+ * {@link CleanupMode#NEVER}, then the temporary directory will not be deleted
+ * after the test completes. If the cleanup mode is set to
+ * {@link CleanupMode#ON_SUCCESS}, then the temporary directory will only be
+ * deleted if the test completes successfully. The default behavior can be
+ * altered by setting the {@value #DEFAULT_CLEANUP_MODE_PROPERTY_NAME}
+ * configuration parameter.
+ *
  * @since 5.4
  */
 @Target({ ElementType.FIELD, ElementType.PARAMETER })
@@ -83,4 +92,12 @@
 @Documented
 @API(status = EXPERIMENTAL, since = "5.4")
 public @interface TempDir {
+
+	String DEFAULT_CLEANUP_MODE_PROPERTY_NAME = "junit.jupiter.cleanup.mode.default";
+
+	/**
+	 * How the temporary directory gets cleaned up after the test completes.
+	 */
+	CleanupMode cleanup() default CleanupMode.DEFAULT;
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index c77626266284..bad0d073f764 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.engine.config;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.junit.jupiter.api.io.TempDir.DEFAULT_CLEANUP_MODE_PROPERTY_NAME;
 
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -23,6 +24,7 @@
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
 /**
@@ -107,4 +109,10 @@ public Optional<ClassOrderer> getDefaultTestClassOrderer() {
 			key -> delegate.getDefaultTestClassOrderer());
 	}
 
+	@Override
+	public CleanupMode getDefaultTempDirCleanupMode() {
+		return (CleanupMode) cache.computeIfAbsent(DEFAULT_CLEANUP_MODE_PROPERTY_NAME,
+			key -> delegate.getDefaultTempDirCleanupMode());
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index f8823892a5d7..ddf98efd8064 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -11,6 +11,8 @@
 package org.junit.jupiter.engine.config;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
+import static org.junit.jupiter.api.io.TempDir.DEFAULT_CLEANUP_MODE_PROPERTY_NAME;
 
 import java.util.Optional;
 import java.util.function.Function;
@@ -22,6 +24,7 @@
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.platform.commons.util.ClassNamePatternFilterUtils;
 import org.junit.platform.commons.util.Preconditions;
@@ -50,6 +53,9 @@ public class DefaultJupiterConfiguration implements JupiterConfiguration {
 	private static final InstantiatingConfigurationParameterConverter<ClassOrderer> classOrdererConverter = //
 		new InstantiatingConfigurationParameterConverter<>(ClassOrderer.class, "class orderer");
 
+	private static final EnumConfigurationParameterConverter<CleanupMode> cleanupModeConverter = //
+		new EnumConfigurationParameterConverter<>(CleanupMode.class, "cleanup mode");
+
 	private final ConfigurationParameters configurationParameters;
 
 	public DefaultJupiterConfiguration(ConfigurationParameters configurationParameters) {
@@ -117,4 +123,9 @@ public Optional<ClassOrderer> getDefaultTestClassOrderer() {
 		return classOrdererConverter.get(configurationParameters, DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME);
 	}
 
+	@Override
+	public CleanupMode getDefaultTempDirCleanupMode() {
+		return cleanupModeConverter.get(configurationParameters, DEFAULT_CLEANUP_MODE_PROPERTY_NAME, ALWAYS);
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index ce1c9670475a..49f65897595e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.platform.commons.util.ClassNamePatternFilterUtils;
 
@@ -42,7 +43,6 @@ public interface JupiterConfiguration {
 	String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = "junit.jupiter.testmethod.order.default";
 	String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = "junit.jupiter.testclass.order.default";
 	String TEMP_DIR_SCOPE_PROPERTY_NAME = "junit.jupiter.tempdir.scope";
-
 	String DEFAULT_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.default";
 	String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testable.method.default";
 	String DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.test.method.default";
@@ -77,4 +77,6 @@ public interface JupiterConfiguration {
 
 	Optional<ClassOrderer> getDefaultTestClassOrderer();
 
+	CleanupMode getDefaultTempDirCleanupMode();
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 6a739ca3958a..5d3d3d2e8c61 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -47,9 +47,8 @@ public class MutableExtensionRegistry implements ExtensionRegistry, ExtensionReg
 
 	private static final Logger logger = LoggerFactory.getLogger(MutableExtensionRegistry.class);
 
-	private static final List<Extension> DEFAULT_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(//
+	private static final List<Extension> DEFAULT_STATELESS_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(//
 		new DisabledCondition(), //
-		new TempDirectory(), //
 		new TimeoutExtension(), //
 		new RepeatedTestExtension(), //
 		new TestInfoParameterResolver(), //
@@ -71,7 +70,9 @@ public class MutableExtensionRegistry implements ExtensionRegistry, ExtensionReg
 	public static MutableExtensionRegistry createRegistryWithDefaultExtensions(JupiterConfiguration configuration) {
 		MutableExtensionRegistry extensionRegistry = new MutableExtensionRegistry(null);
 
-		DEFAULT_EXTENSIONS.forEach(extensionRegistry::registerDefaultExtension);
+		DEFAULT_STATELESS_EXTENSIONS.forEach(extensionRegistry::registerDefaultExtension);
+
+		extensionRegistry.registerDefaultExtension(new TempDirectory(configuration));
 
 		if (configuration.isExtensionAutoDetectionEnabled()) {
 			registerAutoDetectedExtensions(extensionRegistry);
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 8849f2bacb2e..5f1931f7b1cc 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -12,6 +12,10 @@
 
 import static java.nio.file.FileVisitResult.CONTINUE;
 import static java.util.stream.Collectors.joining;
+import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
+import static org.junit.jupiter.api.io.CleanupMode.DEFAULT;
+import static org.junit.jupiter.api.io.CleanupMode.NEVER;
+import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
 import static org.junit.jupiter.engine.config.JupiterConfiguration.TEMP_DIR_SCOPE_PROPERTY_NAME;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
@@ -30,6 +34,7 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
+import java.util.Optional;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.function.Predicate;
@@ -43,8 +48,13 @@
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.config.EnumConfigurationParameterConverter;
+import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
@@ -65,6 +75,12 @@ class TempDirectory implements BeforeAllCallback, BeforeEachCallback, ParameterR
 	private static final String KEY = "temp.dir";
 	private static final String TEMP_DIR_PREFIX = "junit";
 
+	private final JupiterConfiguration configuration;
+
+	public TempDirectory(JupiterConfiguration configuration) {
+		this.configuration = configuration;
+	}
+
 	/**
 	 * Perform field injection for non-private, {@code static} fields (i.e.,
 	 * class fields) of type {@link Path} or {@link File} that are annotated with
@@ -99,8 +115,10 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 
 		findAnnotatedFields(testClass, TempDir.class, predicate).forEach(field -> {
 			assertSupportedType("field", field.getType());
+
 			try {
-				makeAccessible(field).set(testInstance, getPathOrFile(field, field.getType(), context));
+				CleanupMode mode = findCleanupModeForField(field);
+				makeAccessible(field).set(testInstance, getPathOrFile(field, field.getType(), mode, context));
 			}
 			catch (Throwable t) {
 				ExceptionUtils.throwAsUncheckedException(t);
@@ -130,7 +148,32 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 		Class<?> parameterType = parameterContext.getParameter().getType();
 		assertSupportedType("parameter", parameterType);
-		return getPathOrFile(parameterContext.getParameter(), parameterType, extensionContext);
+		CleanupMode cleanupMode = findCleanupModeForParameter(parameterContext);
+		return getPathOrFile(parameterContext.getParameter(), parameterType, cleanupMode, extensionContext);
+	}
+
+	private CleanupMode findCleanupModeForParameter(ParameterContext parameterContext) {
+		CleanupMode cleanupMode = null;
+		Optional<TempDir> optional = parameterContext.findAnnotation(TempDir.class);
+		if (optional.isPresent()) {
+			cleanupMode = optional.get().cleanup();
+		}
+		if (cleanupMode == null || cleanupMode == DEFAULT) {
+			cleanupMode = ALWAYS;
+		}
+		return cleanupMode;
+	}
+
+	private CleanupMode findCleanupModeForField(Field field) {
+		CleanupMode cleanupMode = null;
+		Optional<TempDir> optional = AnnotationSupport.findAnnotation(field, TempDir.class);
+		if (optional.isPresent()) {
+			cleanupMode = optional.get().cleanup();
+		}
+		if (cleanupMode == null || cleanupMode == DEFAULT) {
+			cleanupMode = configuration.getDefaultTempDirCleanupMode();
+		}
+		return cleanupMode;
 	}
 
 	private void assertSupportedType(String target, Class<?> type) {
@@ -140,12 +183,13 @@ private void assertSupportedType(String target, Class<?> type) {
 		}
 	}
 
-	private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, ExtensionContext extensionContext) {
+	private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, CleanupMode cleanupMode,
+			ExtensionContext extensionContext) {
 		Namespace namespace = getScope(extensionContext) == Scope.PER_DECLARATION //
 				? NAMESPACE.append(sourceElement) //
 				: NAMESPACE;
 		Path path = extensionContext.getStore(namespace) //
-				.getOrComputeIfAbsent(KEY, __ -> createTempDir(), CloseablePath.class) //
+				.getOrComputeIfAbsent(KEY, __ -> createTempDir(cleanupMode, extensionContext), CloseablePath.class) //
 				.get();
 
 		return (type == Path.class) ? path : path.toFile();
@@ -160,21 +204,27 @@ private Scope getScope(ExtensionContext context) {
 		);
 	}
 
-	private static CloseablePath createTempDir() {
+	static CloseablePath createTempDir(CleanupMode cleanupMode, ExtensionContext executionContext) {
 		try {
-			return new CloseablePath(Files.createTempDirectory(TEMP_DIR_PREFIX));
+			return new CloseablePath(Files.createTempDirectory(TEMP_DIR_PREFIX), cleanupMode, executionContext);
 		}
 		catch (Exception ex) {
 			throw new ExtensionConfigurationException("Failed to create default temp directory", ex);
 		}
 	}
 
-	private static class CloseablePath implements CloseableResource {
+	static class CloseablePath implements CloseableResource {
+
+		private static final Logger logger = LoggerFactory.getLogger(CloseablePath.class);
 
 		private final Path dir;
+		private final CleanupMode cleanupMode;
+		private final ExtensionContext executionContext;
 
-		CloseablePath(Path dir) {
+		CloseablePath(Path dir, CleanupMode cleanupMode, ExtensionContext executionContext) {
 			this.dir = dir;
+			this.cleanupMode = cleanupMode;
+			this.executionContext = executionContext;
 		}
 
 		Path get() {
@@ -183,6 +233,12 @@ Path get() {
 
 		@Override
 		public void close() throws IOException {
+			if (cleanupMode == NEVER
+					|| (cleanupMode == ON_SUCCESS && executionContext.getExecutionException().isPresent())) {
+				logger.info(() -> "Skipping cleanup of temp dir " + dir + " due to cleanup mode configuration.");
+				return;
+			}
+
 			SortedMap<Path, IOException> failures = deleteAllFilesAndDirectories();
 			if (!failures.isEmpty()) {
 				throw createIOExceptionWithAttachedFailures(failures);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionCleanupModeTests.java
similarity index 98%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionCleanupModeTests.java
index a2e15e6bb4f3..a8af6e6e2019 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionCleanupModeTests.java
@@ -32,7 +32,7 @@
 import org.junit.platform.engine.support.hierarchical.Node.ExecutionMode;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 
-class DefaultExecutionModeTests extends AbstractJupiterTestEngineTests {
+class DefaultExecutionCleanupModeTests extends AbstractJupiterTestEngineTests {
 
 	@Test
 	void defaultExecutionModeIsReadFromConfigurationParameter() {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
index de3a389ccbe6..dc29bb1b3190 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.engine.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.io.CleanupMode.NEVER;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.only;
 import static org.mockito.Mockito.times;
@@ -111,6 +112,17 @@ void cachesDefaultTestMethodOrderer() {
 		verify(delegate, only()).getDefaultTestMethodOrderer();
 	}
 
+	@Test
+	void cachesDefaultTempDirCleanupMode() {
+		when(delegate.getDefaultTempDirCleanupMode()).thenReturn(NEVER);
+
+		// call `cache.getDefaultTempStrategyDirCleanupMode()` twice to verify the delegate method is called only once.
+		assertThat(cache.getDefaultTempDirCleanupMode()).isSameAs(NEVER);
+		assertThat(cache.getDefaultTempDirCleanupMode()).isSameAs(NEVER);
+
+		verify(delegate, only()).getDefaultTempDirCleanupMode();
+	}
+
 	@Test
 	void doesNotCacheRawParameters() {
 		when(delegate.getRawConfigurationParameter("foo")).thenReturn(Optional.of("bar")).thenReturn(
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
index 5a27ae57ce60..b530c70c45c2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
+import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
 import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_INSTANCE_LIFECYCLE_PROPERTY_NAME;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -25,6 +26,7 @@
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.engine.Constants;
 import org.junit.jupiter.engine.descriptor.CustomDisplayNameGenerator;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -48,6 +50,13 @@ void getDefaultTestInstanceLifecycleWithNoConfigParamSet() {
 		assertThat(lifecycle).isEqualTo(PER_METHOD);
 	}
 
+	@Test
+	void getDefaultTempDirCleanupModeWithNoConfigParamSet() {
+		JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock(ConfigurationParameters.class));
+		CleanupMode cleanupMode = configuration.getDefaultTempDirCleanupMode();
+		assertThat(cleanupMode).isEqualTo(ALWAYS);
+	}
+
 	@Test
 	void getDefaultTestInstanceLifecycleWithConfigParamSet() {
 		assertAll(//
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
new file mode 100644
index 000000000000..fd990b336bf5
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static java.nio.file.Files.deleteIfExists;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
+import static org.junit.jupiter.api.io.CleanupMode.NEVER;
+import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.io.CleanupMode;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.opentest4j.TestAbortedException;
+
+/**
+ * Integration tests for cleanup of the {@link TempDirectory}
+ * when {@link TempDir} is set to {@link CleanupMode#ALWAYS} or
+ * {@link CleanupMode#NEVER}.
+ *
+ * @since 5.9
+ *
+ * @see TempDir
+ * @see CleanupMode
+ */
+class CloseablePathCleanupTests extends AbstractJupiterTestEngineTests {
+
+	private TempDirectory.CloseablePath path;
+
+	@AfterEach
+	void cleanupTempDirectory() throws IOException {
+		deleteIfExists(path.get());
+	}
+
+	/**
+	 * Ensure a closeable path is cleaned up for a cleanup mode of ALWAYS.
+	 */
+	@Test
+	void testAlways() throws IOException {
+		ExtensionContext extensionContext = mock(ExtensionContext.class);
+		path = TempDirectory.createTempDir(ALWAYS, extensionContext);
+		assertTrue(path.get().toFile().exists());
+
+		path.close();
+		assertFalse(path.get().toFile().exists());
+	}
+
+	/**
+	 * Ensure a closeable path is not cleaned up for a cleanup mode of NEVER.
+	 */
+	@Test
+	void testNever() throws IOException {
+		ExtensionContext extensionContext = mock(ExtensionContext.class);
+		path = TempDirectory.createTempDir(NEVER, extensionContext);
+		assertTrue(path.get().toFile().exists());
+
+		path.close();
+		assertTrue(path.get().toFile().exists());
+	}
+
+	/**
+	 * Ensure a closeable path is not cleaned up for a cleanup mode of ON_SUCCESS, if there is a TestAbortedException.
+	 */
+	@Test
+	void testOnSuccessWithTestAbortedException() throws IOException {
+		ExtensionContext extensionContext = mock(ExtensionContext.class);
+		when(extensionContext.getExecutionException()).thenReturn(Optional.of(new TestAbortedException()));
+
+		path = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
+		assertTrue(path.get().toFile().exists());
+
+		path.close();
+		assertTrue(path.get().toFile().exists());
+	}
+
+	/**
+	 * Ensure a closeable path is cleaned up for a cleanup mode of ON_SUCCESS, if there is no exception.
+	 */
+	@Test
+	void testOnSuccessWithNoTestAbortedException() throws IOException {
+		ExtensionContext extensionContext = mock(ExtensionContext.class);
+		when(extensionContext.getExecutionException()).thenReturn(Optional.empty());
+
+		path = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
+		assertTrue(path.get().toFile().exists());
+
+		path.close();
+		assertFalse(path.get().toFile().exists());
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
new file mode 100644
index 000000000000..d4144dcc3335
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static java.nio.file.Files.deleteIfExists;
+import static java.nio.file.Files.exists;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
+import static org.junit.jupiter.api.io.CleanupMode.NEVER;
+import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.CleanupMode;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+
+/**
+ * Test that {@link TempDir temporary directories} are not deleted if set for {@link CleanupMode#NEVER},
+ * deletes any if set for {@link CleanupMode#ON_SUCCESS} only if the test passes,
+ * and deletes any if set for {@link CleanupMode#ALWAYS}.
+ *
+ * @see CleanupMode
+ * @see TempDir
+ * @since 5.9
+ */
+class TempDirectoryCleanupTests extends AbstractJupiterTestEngineTests {
+
+	@Nested
+	class TempDirFieldTests {
+
+		private static Path defaultFieldDir;
+		private static Path neverFieldDir;
+		private static Path alwaysFieldDir;
+		private static Path onSuccessFailingFieldDir;
+		private static Path onSuccessPassingFieldDir;
+
+		/**
+		 * Ensure the cleanup modes defaults to ALWAYS for fields.
+		 * <p/>
+		 * Expect the TempDir to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeDefaultField() {
+			LauncherDiscoveryRequest request = request().selectors(
+				selectMethod(DefaultFieldCase.class, "testDefaultField")).build();
+			executeTests(request);
+
+			assertFalse(exists(defaultFieldDir));
+		}
+
+		/**
+		 * Ensure that NEVER cleanup modes are obeyed for fields.
+		 * <p/>
+		 * Expect the TempDir not to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeNeverField() {
+			LauncherDiscoveryRequest request = request().selectors(
+				selectMethod(NeverFieldCase.class, "testNeverField")).build();
+			executeTests(request);
+
+			assertTrue(exists(neverFieldDir));
+		}
+
+		/**
+		 * Ensure that ALWAYS cleanup modes are obeyed for fields.
+		 * <p/>
+		 * Expect the TempDir to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeAlwaysField() {
+			LauncherDiscoveryRequest request = request().selectors(
+				selectMethod(AlwaysFieldCase.class, "testAlwaysField")).build();
+			executeTests(request);
+
+			assertFalse(exists(alwaysFieldDir));
+		}
+
+		/**
+		 * Ensure that ON_SUCCESS cleanup modes are obeyed for passing field tests.
+		 * <p/>
+		 * Expect the TempDir to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeOnSuccessPassingField() {
+			LauncherDiscoveryRequest request = request().selectors(
+				selectMethod(OnSuccessPassingFieldCase.class, "testOnSuccessPassingField")).build();
+			executeTests(request);
+
+			assertFalse(exists(onSuccessPassingFieldDir));
+		}
+
+		/**
+		 * Ensure that ON_SUCCESS cleanup modes are obeyed for failing field tests.
+		 * <p/>
+		 * Expect the TempDir not to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeOnSuccessFailingField() {
+			LauncherDiscoveryRequest request = request().selectors(
+				selectMethod(OnSuccessFailingFieldCase.class, "testOnSuccessFailingField")).build();
+			executeTests(request);
+
+			assertTrue(exists(onSuccessFailingFieldDir));
+		}
+
+		@AfterAll
+		static void afterAll() throws IOException {
+			deleteIfExists(defaultFieldDir);
+			deleteIfExists(neverFieldDir);
+			deleteIfExists(alwaysFieldDir);
+			deleteIfExists(onSuccessFailingFieldDir);
+			deleteIfExists(onSuccessPassingFieldDir);
+		}
+
+		// -------------------------------------------------------------------
+
+		static class DefaultFieldCase {
+
+			@TempDir
+			Path defaultFieldDir;
+
+			@Test
+			void testDefaultField() {
+				TempDirFieldTests.defaultFieldDir = defaultFieldDir;
+			}
+		}
+
+		static class NeverFieldCase {
+
+			@TempDir(cleanup = NEVER)
+			Path neverFieldDir;
+
+			@Test
+			void testNeverField() {
+				TempDirFieldTests.neverFieldDir = neverFieldDir;
+			}
+		}
+
+		static class AlwaysFieldCase {
+
+			@TempDir(cleanup = ALWAYS)
+			Path alwaysFieldDir;
+
+			@Test
+			void testAlwaysField() {
+				TempDirFieldTests.alwaysFieldDir = alwaysFieldDir;
+			}
+		}
+
+		static class OnSuccessPassingFieldCase {
+
+			@TempDir(cleanup = ON_SUCCESS)
+			Path onSuccessPassingFieldDir;
+
+			@Test
+			void testOnSuccessPassingField() {
+				TempDirFieldTests.onSuccessPassingFieldDir = onSuccessPassingFieldDir;
+			}
+		}
+
+		static class OnSuccessFailingFieldCase {
+
+			@TempDir(cleanup = ON_SUCCESS)
+			Path onSuccessFailingFieldDir;
+
+			@Test
+			void testOnSuccessFailingField() {
+				TempDirFieldTests.onSuccessFailingFieldDir = onSuccessFailingFieldDir;
+				fail();
+			}
+		}
+
+	}
+
+	@Nested
+	class TempDirParameterTests {
+
+		private static Path defaultParameterDir;
+		private static Path neverParameterDir;
+		private static Path alwaysParameterDir;
+		private static Path onSuccessFailingParameterDir;
+		private static Path onSuccessPassingParameterDir;
+
+		/**
+		 * Ensure the cleanup modes defaults to ALWAYS for parameters.
+		 * <p/>
+		 * Expect the TempDir to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeDefaultParameter() {
+			LauncherDiscoveryRequest request = request().selectors(
+				selectMethod(DefaultParameterCase.class, "testDefaultParameter", "java.nio.file.Path")).build();
+			executeTests(request);
+
+			assertFalse(exists(defaultParameterDir));
+		}
+
+		/**
+		 * Ensure that NEVER cleanup modes are obeyed for parameters.
+		 * <p/>
+		 * Expect the TempDir not to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeNeverParameter() {
+			LauncherDiscoveryRequest request = request().selectors(
+				selectMethod(NeverParameterCase.class, "testNeverParameter", "java.nio.file.Path")).build();
+			executeTests(request);
+
+			assertTrue(exists(neverParameterDir));
+		}
+
+		/**
+		 * Ensure that ALWAYS cleanup modes are obeyed for parameters.
+		 * <p/>
+		 * Expect the TempDir to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeAlwaysParameter() {
+			LauncherDiscoveryRequest request = request().selectors(
+				selectMethod(AlwaysParameterCase.class, "testAlwaysParameter", "java.nio.file.Path")).build();
+			executeTests(request);
+
+			assertFalse(exists(alwaysParameterDir));
+		}
+
+		/**
+		 * Ensure that ON_SUCCESS cleanup modes are obeyed for passing parameter tests.
+		 * <p/>
+		 * Expect the TempDir to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeOnSuccessPassingParameter() {
+			LauncherDiscoveryRequest request = request().selectors(selectMethod(OnSuccessPassingParameterCase.class,
+				"testOnSuccessPassingParameter", "java.nio.file.Path")).build();
+			executeTests(request);
+
+			assertFalse(exists(onSuccessPassingParameterDir));
+		}
+
+		/**
+		 * Ensure that ON_SUCCESS cleanup modes are obeyed for failing parameter tests.
+		 * <p/>
+		 * Expect the TempDir not to be cleaned up.
+		 */
+		@Test
+		void testCleanupModeOnSuccessFailingParameter() {
+			LauncherDiscoveryRequest request = request().selectors(selectMethod(OnSuccessFailingParameterCase.class,
+				"testOnSuccessFailingParameter", "java.nio.file.Path")).build();
+			executeTests(request);
+
+			assertTrue(exists(onSuccessFailingParameterDir));
+		}
+
+		@AfterAll
+		static void afterAll() throws IOException {
+			deleteIfExists(defaultParameterDir);
+			deleteIfExists(neverParameterDir);
+			deleteIfExists(alwaysParameterDir);
+			deleteIfExists(onSuccessFailingParameterDir);
+			deleteIfExists(onSuccessPassingParameterDir);
+		}
+
+		// -------------------------------------------------------------------
+
+		static class DefaultParameterCase {
+
+			@Test
+			void testDefaultParameter(@TempDir Path defaultParameterDir) {
+				TempDirParameterTests.defaultParameterDir = defaultParameterDir;
+			}
+		}
+
+		static class NeverParameterCase {
+
+			@Test
+			void testNeverParameter(@TempDir(cleanup = NEVER) Path neverParameterDir) {
+				TempDirParameterTests.neverParameterDir = neverParameterDir;
+			}
+		}
+
+		static class AlwaysParameterCase {
+
+			@Test
+			void testAlwaysParameter(@TempDir(cleanup = ALWAYS) Path alwaysParameterDir) {
+				TempDirParameterTests.alwaysParameterDir = alwaysParameterDir;
+			}
+		}
+
+		static class OnSuccessPassingParameterCase {
+
+			@Test
+			void testOnSuccessPassingParameter(@TempDir(cleanup = ON_SUCCESS) Path onSuccessPassingParameterDir) {
+				TempDirParameterTests.onSuccessPassingParameterDir = onSuccessPassingParameterDir;
+			}
+		}
+
+		static class OnSuccessFailingParameterCase {
+
+			@Test
+			void testOnSuccessFailingParameter(@TempDir(cleanup = ON_SUCCESS) Path onSuccessFailingParameterDir) {
+				TempDirParameterTests.onSuccessFailingParameterDir = onSuccessFailingParameterDir;
+				fail();
+			}
+		}
+
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java
new file mode 100644
index 000000000000..d4fd10d87091
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.junit.platform.testkit.engine.EventConditions.event;
+import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
+import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
+import static org.junit.platform.testkit.engine.EventConditions.test;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
+
+import java.io.File;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.platform.testkit.engine.EngineExecutionResults;
+import org.junit.platform.testkit.engine.Events;
+
+/**
+ * @since 5.9
+ */
+class TempDirectoryParameterResolverTests extends AbstractJupiterTestEngineTests {
+
+	@Test
+	@DisplayName("Test good and bad @TempDir parameters")
+	void testTempDirType() {
+		EngineExecutionResults executionResults = executeTestsForClass(ATestCase.class);
+		Events tests = executionResults.testEvents();
+		tests.assertStatistics(stats -> stats.started(2).failed(1).succeeded(1));
+		tests.succeeded().assertEventsMatchExactly(event(test("testGoodTempDirType"), finishedSuccessfully()));
+		tests.failed().assertEventsMatchExactly(event(test("testBadTempDirType"),
+			finishedWithFailure(instanceOf(ParameterResolutionException.class), message(
+				"Failed to resolve parameter [java.lang.String badTempDir] in method [void org.junit.jupiter.engine.extension.TempDirectoryParameterResolverTests$ATestCase.testBadTempDirType(java.lang.String)]: Can only resolve @TempDir parameter of type java.nio.file.Path or java.io.File but was: java.lang.String"))));
+	}
+
+	// -------------------------------------------------------------------
+
+	static class ATestCase {
+
+		@Test
+		void testGoodTempDirType(@TempDir File goodTempDir) {
+		}
+
+		@Test
+		void testBadTempDirType(@TempDir String badTempDir) {
+		}
+
+	}
+
+}

From 4cd1fc064c6864d01ccacf08c4117c7c39d05e0a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 1 Dec 2021 19:39:13 +0100
Subject: [PATCH 0664/1433] Upgradle to 7.3.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e64c4192a718..93a3251ccfc8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From b88fd2358a63d3575e7f9acf54d95bbb6d33c3a1 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Sat, 11 Dec 2021 10:06:24 +0100
Subject: [PATCH 0665/1433] Upgrade log4j to 2.15.0

See http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44228.
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 893529efd8bb..d7d306f067f8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 ktlint = "0.43.0"
-log4j = "2.14.1"
+log4j = "2.15.0"
 opentest4j = "1.2.0"
 surefire = "2.22.2"
 

From ff6019e6b42d9abed14a12ee70e3c27c93964e52 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Sat, 11 Dec 2021 10:26:48 +0100
Subject: [PATCH 0666/1433] Upgrade mockito to 4.1.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d7d306f067f8..c39837e8f9b2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
-mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.0.0" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.1.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.2" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.32" }

From 97d3322ce3ca2f7b70ee6025c88dd493a3e6d0e0 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Tue, 14 Dec 2021 07:48:30 +0100
Subject: [PATCH 0667/1433] Upgrade log4j to 2.16.0

https://lists.apache.org/thread/d6v4r6nosxysyq9rvnr779336yf0woz4
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c39837e8f9b2..80777025bc0e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 ktlint = "0.43.0"
-log4j = "2.15.0"
+log4j = "2.16.0"
 opentest4j = "1.2.0"
 surefire = "2.22.2"
 

From 3d8aacd767b98451039de18dcb252c0ee36b21fa Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Sat, 18 Dec 2021 12:02:11 +0100
Subject: [PATCH 0668/1433] Upgrade log4j to 2.17.0

https://github.com/apache/logging-log4j2/blob/6b1581901ba7a107cdc4a2208ecec03655722b44/RELEASE-NOTES.md
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 80777025bc0e..02a62a0f5e35 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 ktlint = "0.43.0"
-log4j = "2.16.0"
+log4j = "2.17.0"
 opentest4j = "1.2.0"
 surefire = "2.22.2"
 

From cbce58dfe11209cb7352b460728d14a3b904c065 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Dec 2021 11:48:09 +0100
Subject: [PATCH 0669/1433] Upgrade bnd to 6.1.0

---
 buildSrc/build.gradle.kts | 2 +-
 gradle/libs.versions.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ddee950602f2..a7221e9f2d75 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
 	implementation(kotlin("gradle-plugin"))
-	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.0.0")
+	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 02a62a0f5e35..1c7254912435 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apigu
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.22.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
-bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.0.0" }
+bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.1.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.132" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.0-beta-1" }

From db52a1a08e7b395a906edb46809f575346acb388 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Dec 2021 12:51:32 +0100
Subject: [PATCH 0670/1433] Upgradle to 7.3.2

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 93a3251ccfc8..ad382b775c40 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionSha256Sum=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 424e385bceaf04b4297316846354383bd4ecd215 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Dec 2021 14:42:38 +0100
Subject: [PATCH 0671/1433] Upgrade to Shadow plugin 7.1.1

---
 buildSrc/build.gradle.kts                                   | 2 +-
 .../junit-platform-console-standalone.gradle.kts            | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index a7221e9f2d75..02de6dd30792 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.1")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.1")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.1") // keep in sync with root settings.gradle.kts
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 516a5dc2f0d5..18ebdb112608 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -26,14 +26,12 @@ tasks {
 		}
 	}
 	val shadowedArtifactsFile by registering {
-		val configurations = shadowJar.get().configurations
-		inputs.files(configurations).withNormalizer(ClasspathNormalizer::class)
+		inputs.files(configurations.shadowed).withNormalizer(ClasspathNormalizer::class)
 		val outputFile = layout.buildDirectory.file("shadowed-artifacts")
 		outputs.file(outputFile)
 		doFirst {
 			outputFile.get().asFile.printWriter().use { out ->
-				configurations
-					.flatMap { it.resolvedConfiguration.resolvedArtifacts }
+				configurations.shadowed.get().resolvedConfiguration.resolvedArtifacts
 					.map { it.moduleVersion.id }
 					.map { "${it.group}:${it.name}:${it.version}" }
 					.sorted()

From 631169582ec75e4d460a7efe16c660a21d5e408c Mon Sep 17 00:00:00 2001
From: mbucc <mkbucc@gmail.com>
Date: Sun, 19 Dec 2021 03:44:14 -0500
Subject: [PATCH 0672/1433] Document how to run the ConsoleLauncher with
 classpath wildcards

This enables using the compact "jar star" pattern to define the classpath.

Partially addresses #2788

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../src/docs/asciidoc/user-guide/running-tests.adoc       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 4a71863abe3e..593ec6f1fac7 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -563,6 +563,14 @@ Test run finished after 64 ms
 [         0 tests failed          ]
 ----
 
+You can also run the standalone `ConsoleLauncher` as shown below (for example, to include
+all jars in a directory):
+
+[source,console,subs=attributes+]
+----
+$ java -cp classes:testlib/* org.junit.platform.console.ConsoleLauncher <OPTIONS>
+----
+
 .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

From 052ab6ea2f61b8c8f1b1739055d870ead019879d Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Wed, 29 Dec 2021 09:02:36 +0100
Subject: [PATCH 0673/1433] Upgrade log4j to 2.17.1

https://logging.apache.org/log4j/2.x/changes-report.html#a2.17.1
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1c7254912435..59b77d395ae6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 ktlint = "0.43.0"
-log4j = "2.17.0"
+log4j = "2.17.1"
 opentest4j = "1.2.0"
 surefire = "2.22.2"
 

From 8171da4deba47f58f20e60546ef7b382f36c7f4b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 29 Dec 2021 12:11:22 +0100
Subject: [PATCH 0674/1433] Update Shadow Gradle plugin

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 02de6dd30792..ec68c44a2815 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.1")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.1")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.1") // keep in sync with root settings.gradle.kts

From 9006c7c82eb6bfec5077456f050d5aa8aab1db0b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 29 Dec 2021 12:11:33 +0100
Subject: [PATCH 0675/1433] Update JfrUnit

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 59b77d395ae6..b5eedda8f384 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.0-beta-1" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
-jfrunit = { module = "org.moditect.jfrunit:jfrunit", version = "1.0.0.Alpha1" }
+jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "1.6.2" }

From 1ae53a5c1d05a11d4b94549da2e1dfedf2bce6d5 Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:40:54 +0100
Subject: [PATCH 0676/1433] Use correct HTML heading levels in Javadoc

HTML headers in the documentation of type members should start at <h4>.

See https://docs.oracle.com/en/java/javase/17/docs/specs/javadoc/doc-comment-spec.html#html-content

Closes #2802
---
 .../org/junit/jupiter/api/Assertions.java     | 12 +++++------
 .../org/junit/jupiter/api/ClassOrderer.java   |  2 +-
 .../org/junit/jupiter/api/MethodOrderer.java  |  2 +-
 .../java/org/junit/jupiter/api/TestInfo.java  |  2 +-
 .../api/extension/ParameterContext.java       |  8 ++++----
 .../org/junit/jupiter/engine/Constants.java   | 20 +++++++++----------
 .../platform/commons/util/ExceptionUtils.java |  2 +-
 .../org/junit/platform/engine/TestTag.java    |  2 +-
 .../engine/discovery/DiscoverySelectors.java  |  2 +-
 .../platform/launcher/LauncherConstants.java  |  4 ++--
 .../core/LauncherDiscoveryRequestBuilder.java |  2 +-
 .../testkit/engine/EngineTestKit.java         |  4 ++--
 12 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 2e96dcd06c2b..b7d2c4b40323 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -3122,7 +3122,7 @@ public static <T extends Throwable> T assertThrows(Class<T> expectedType, Execut
 	 * <em>Assert</em> that execution of the supplied {@code executable} does
 	 * <em>not</em> throw any kind of {@linkplain Throwable exception}.
 	 *
-	 * <h3>Usage Note</h3>
+	 * <h4>Usage Note</h4>
 	 * <p>Although any exception thrown from a test method will cause the test
 	 * to <em>fail</em>, there are certain use cases where it can be beneficial
 	 * to explicitly assert that an exception is not thrown for a given code
@@ -3139,7 +3139,7 @@ public static void assertDoesNotThrow(Executable executable) {
 	 * <em>Assert</em> that execution of the supplied {@code executable} does
 	 * <em>not</em> throw any kind of {@linkplain Throwable exception}.
 	 *
-	 * <h3>Usage Note</h3>
+	 * <h4>Usage Note</h4>
 	 * <p>Although any exception thrown from a test method will cause the test
 	 * to <em>fail</em>, there are certain use cases where it can be beneficial
 	 * to explicitly assert that an exception is not thrown for a given code
@@ -3158,7 +3158,7 @@ public static void assertDoesNotThrow(Executable executable, String message) {
 	 * <em>Assert</em> that execution of the supplied {@code executable} does
 	 * <em>not</em> throw any kind of {@linkplain Throwable exception}.
 	 *
-	 * <h3>Usage Note</h3>
+	 * <h4>Usage Note</h4>
 	 * <p>Although any exception thrown from a test method will cause the test
 	 * to <em>fail</em>, there are certain use cases where it can be beneficial
 	 * to explicitly assert that an exception is not thrown for a given code
@@ -3182,7 +3182,7 @@ public static void assertDoesNotThrow(Executable executable, Supplier<String> me
 	 *
 	 * <p>If the assertion passes, the {@code supplier}'s result will be returned.
 	 *
-	 * <h3>Usage Note</h3>
+	 * <h4>Usage Note</h4>
 	 * <p>Although any exception thrown from a test method will cause the test
 	 * to <em>fail</em>, there are certain use cases where it can be beneficial
 	 * to explicitly assert that an exception is not thrown for a given code
@@ -3203,7 +3203,7 @@ public static <T> T assertDoesNotThrow(ThrowingSupplier<T> supplier) {
 	 *
 	 * <p>Fails with the supplied failure {@code message}.
 	 *
-	 * <h3>Usage Note</h3>
+	 * <h4>Usage Note</h4>
 	 * <p>Although any exception thrown from a test method will cause the test
 	 * to <em>fail</em>, there are certain use cases where it can be beneficial
 	 * to explicitly assert that an exception is not thrown for a given code
@@ -3225,7 +3225,7 @@ public static <T> T assertDoesNotThrow(ThrowingSupplier<T> supplier, String mess
 	 * <p>If necessary, the failure message will be retrieved lazily from the
 	 * supplied {@code messageSupplier}.
 	 *
-	 * <h3>Usage Note</h3>
+	 * <h4>Usage Note</h4>
 	 * <p>Although any exception thrown from a test method will cause the test
 	 * to <em>fail</em>, there are certain use cases where it can be beneficial
 	 * to explicitly assert that an exception is not thrown for a given code
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 2bc5dfa71d29..c367b5aed115 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -205,7 +205,7 @@ class Random implements ClassOrderer {
 		 * <p>The same property is used by {@link MethodOrderer.Random} for
 		 * consistency between the two random orderers.
 		 *
-		 * <h3>Supported Values</h3>
+		 * <h4>Supported Values</h4>
 		 *
 		 * <p>Supported values include any string that can be converted to a
 		 * {@link Long} via {@link Long#valueOf(String)}.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 3443eb20d584..3ee2995cc33b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -264,7 +264,7 @@ class Random implements MethodOrderer {
 		 * <p>The same property is used by {@link ClassOrderer.Random} for
 		 * consistency between the two random orderers.
 		 *
-		 * <h3>Supported Values</h3>
+		 * <h4>Supported Values</h4>
 		 *
 		 * <p>Supported values include any string that can be converted to a
 		 * {@link Long} via {@link Long#valueOf(String)}.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
index 3417272f4a7e..0fdd028acdb2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
@@ -48,7 +48,7 @@ public interface TestInfo {
 	 * <p>The display name is either a default name or a custom name configured
 	 * via {@link DisplayName @DisplayName}.
 	 *
-	 * <h3>Default Display Names</h3>
+	 * <h4>Default Display Names</h4>
 	 *
 	 * <p>If the context in which {@code TestInfo} is used is at the container
 	 * level, the default display name is generated based on the name of the
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
index c6c344f9df43..b05ace0a46c2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
@@ -41,7 +41,7 @@ public interface ParameterContext {
 	/**
 	 * Get the {@link Parameter} for this context.
 	 *
-	 * <h3>WARNING</h3>
+	 * <h4>WARNING</h4>
 	 * <p>When searching for annotations on the parameter in this context,
 	 * favor {@link #isAnnotated(Class)}, {@link #findAnnotation(Class)}, and
 	 * {@link #findRepeatableAnnotations(Class)} over methods in the
@@ -93,7 +93,7 @@ default Executable getDeclaringExecutable() {
 	 * <em>present</em> or <em>meta-present</em> on the {@link Parameter} for
 	 * this context.
 	 *
-	 * <h3>WARNING</h3>
+	 * <h4>WARNING</h4>
 	 * <p>Favor the use of this method over directly invoking
 	 * {@link Parameter#isAnnotationPresent(Class)} due to a bug in {@code javac}
 	 * on JDK versions prior to JDK 9.
@@ -111,7 +111,7 @@ default Executable getDeclaringExecutable() {
 	 * <em>present</em> or <em>meta-present</em> on the {@link Parameter} for
 	 * this context.
 	 *
-	 * <h3>WARNING</h3>
+	 * <h4>WARNING</h4>
 	 * <p>Favor the use of this method over directly invoking annotation lookup
 	 * methods in the {@link Parameter} API due to a bug in {@code javac} on JDK
 	 * versions prior to JDK 9.
@@ -131,7 +131,7 @@ default Executable getDeclaringExecutable() {
 	 * {@code annotationType} that are either <em>present</em> or
 	 * <em>meta-present</em> on the {@link Parameter} for this context.
 	 *
-	 * <h3>WARNING</h3>
+	 * <h4>WARNING</h4>
 	 * <p>Favor the use of this method over directly invoking annotation lookup
 	 * methods in the {@link Parameter} API due to a bug in {@code javac} on JDK
 	 * versions prior to JDK 9.
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 8823c58f8dec..2778dc5750c9 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -52,7 +52,7 @@ public final class Constants {
 	/**
 	 * Property name used to provide patterns for deactivating conditions: {@value}
 	 *
-	 * <h3>Pattern Matching Syntax</h3>
+	 * <h4>Pattern Matching Syntax</h4>
 	 *
 	 * <p>If the property value consists solely of an asterisk ({@code *}), all
 	 * conditions will be deactivated. Otherwise, the property value will be treated
@@ -63,7 +63,7 @@ public final class Constants {
 	 * against one or more characters in a FQCN. All other characters in a pattern
 	 * will be matched one-to-one against a FQCN.
 	 *
-	 * <h3>Examples</h3>
+	 * <h4>Examples</h4>
 	 *
 	 * <ul>
 	 * <li>{@code *}: deactivates all conditions.
@@ -96,7 +96,7 @@ public final class Constants {
 	/**
 	 * Property name used to set the default display name generator class name: {@value}
 	 *
-	 * <h3>Supported Values</h3>
+	 * <h4>Supported Values</h4>
 	 *
 	 * <p>Supported values include fully qualified class names for types that implement
 	 * {@link org.junit.jupiter.api.DisplayNameGenerator}.
@@ -117,7 +117,7 @@ public final class Constants {
 	/**
 	 * Property name used to set the default test instance lifecycle mode: {@value}
 	 *
-	 * <h3>Supported Values</h3>
+	 * <h4>Supported Values</h4>
 	 *
 	 * <p>Supported values include names of enum constants defined in
 	 * {@link org.junit.jupiter.api.TestInstance.Lifecycle}, ignoring case.
@@ -144,7 +144,7 @@ public final class Constants {
 	 *
 	 * <p>This setting is only effective if parallel execution is enabled.
 	 *
-	 * <h3>Supported Values</h3>
+	 * <h4>Supported Values</h4>
 	 *
 	 * <p>Supported values include names of enum constants defined in
 	 * {@link org.junit.jupiter.api.parallel.ExecutionMode}, ignoring case.
@@ -165,7 +165,7 @@ public final class Constants {
 	 *
 	 * <p>This setting is only effective if parallel execution is enabled.
 	 *
-	 * <h3>Supported Values</h3>
+	 * <h4>Supported Values</h4>
 	 *
 	 * <p>Supported values include names of enum constants defined in
 	 * {@link org.junit.jupiter.api.parallel.ExecutionMode}, ignoring case.
@@ -436,7 +436,7 @@ public final class Constants {
 	 * <p>The value of this property will be used to toggle whether
 	 * {@link org.junit.jupiter.api.Timeout @Timeout} is applied to tests.</p>
 	 *
-	 * <h3>Supported timeout mode values:</h3>
+	 * <h4>Supported timeout mode values:</h4>
 	 * <ul>
 	 * <li>{@code enabled}: enables timeouts
 	 * <li>{@code disabled}: disables timeouts
@@ -453,7 +453,7 @@ public final class Constants {
 	/**
 	 * Property name used to set the default method orderer class name: {@value}
 	 *
-	 * <h3>Supported Values</h3>
+	 * <h4>Supported Values</h4>
 	 *
 	 * <p>Supported values include fully qualified class names for types that
 	 * implement {@link org.junit.jupiter.api.MethodOrderer}.
@@ -467,7 +467,7 @@ public final class Constants {
 	/**
 	 * Property name used to set the default class orderer class name: {@value}
 	 *
-	 * <h3>Supported Values</h3>
+	 * <h4>Supported Values</h4>
 	 *
 	 * <p>Supported values include fully qualified class names for types that
 	 * implement {@link org.junit.jupiter.api.ClassOrderer}.
@@ -479,7 +479,7 @@ public final class Constants {
 	 * Property name used to set the scope of temporary directories created via
 	 * {@link org.junit.jupiter.api.io.TempDir @TempDir} annotation: {@value}
 	 *
-	 * <h3>Supported Values</h3>
+	 * <h4>Supported Values</h4>
 	 * <ul>
 	 * <li>{@code per_context}: creates a single temporary directory for the
 	 * entire test class or method, depending on where it's first declared
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
index 02c208a204d1..a493f3b4bc32 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -45,7 +45,7 @@ private ExceptionUtils() {
 	 * the Java compiler into believing that the thrown exception is an
 	 * unchecked exception even if it is a checked exception.
 	 *
-	 * <h3>Warning</h3>
+	 * <h4>Warning</h4>
 	 *
 	 * <p>This method should be used sparingly.
 	 *
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
index 110dd5c0c9ec..7a2d10ea5f39 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
@@ -58,7 +58,7 @@ public final class TestTag implements Serializable {
 	 * Determine if the supplied tag name is valid with regard to the supported
 	 * syntax for tags.
 	 *
-	 * <h3>Syntax Rules for Tags</h3>
+	 * <h4>Syntax Rules for Tags</h4>
 	 * <ul>
 	 * <li>A tag must not be {@code null}.</li>
 	 * <li>A tag must not be blank.</li>
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 6a30d428e76b..4783275e7d58 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -414,7 +414,7 @@ public static ClassSelector selectClass(String className) {
 	 * <em>source code syntax</em> (e.g., {@code int[][]}, {@code java.lang.String[]},
 	 * etc.).
 	 *
-	 * <h3>Examples</h3>
+	 * <h4>Examples</h4>
 	 *
 	 * <table class="plain">
 	 * <tr><th>Method</th><th>Fully Qualified Method Name</th></tr>
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index c48b219da408..c796e75fa91b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -94,7 +94,7 @@ public class LauncherConstants {
 	 * Property name used to provide patterns for deactivating listeners registered
 	 * via the {@link java.util.ServiceLoader ServiceLoader} mechanism: {@value}
 	 *
-	 * <h3>Pattern Matching Syntax</h3>
+	 * <h4>Pattern Matching Syntax</h4>
 	 *
 	 * <p>If the property value consists solely of an asterisk ({@code *}), all
 	 * listeners will be deactivated. Otherwise, the property value will be treated
@@ -105,7 +105,7 @@ public class LauncherConstants {
 	 * against one or more characters in a FQCN. All other characters in a pattern
 	 * will be matched one-to-one against a FQCN.
 	 *
-	 * <h3>Examples</h3>
+	 * <h4>Examples</h4>
 	 *
 	 * <ul>
 	 * <li>{@code *}: deactivates all listeners.
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index fce48f3bcf39..4997254e4e18 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -88,7 +88,7 @@ public final class LauncherDiscoveryRequestBuilder {
 	/**
 	 * Property name used to set the default discovery listener that is added to all : {@value}
 	 *
-	 * <h3>Supported Values</h3>
+	 * <h4>Supported Values</h4>
 	 *
 	 * <p>Supported values are {@code "logging"} and {@code "abortOnFailure"}.
 	 *
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index f2a1d95767c5..65d3f3ea3f0d 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -73,7 +73,7 @@ public final class EngineTestKit {
 	 * mechanism, analogous to the manner in which test engines are loaded in
 	 * the JUnit Platform Launcher API.
 	 *
-	 * <h3>Example Usage</h3>
+	 * <h4>Example Usage</h4>
 	 *
 	 * <pre class="code">
 	 * EngineTestKit
@@ -102,7 +102,7 @@ public static Builder engine(String engineId) {
 	/**
 	 * Create an execution {@link Builder} for the supplied {@link TestEngine}.
 	 *
-	 * <h3>Example Usage</h3>
+	 * <h4>Example Usage</h4>
 	 *
 	 * <pre class="code">
 	 * EngineTestKit

From 7071d6dc088e1efbca9963aa246f8d465ebd0855 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 31 Dec 2021 16:04:15 +0100
Subject: [PATCH 0677/1433] Suppress resource warnings in LauncherSessionTests

---
 .../junit/platform/launcher/core/LauncherSessionTests.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
index 30ce2c9fb208..dc5bb0578701 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
@@ -24,7 +24,7 @@
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.mockito.ArgumentCaptor;
 
-public class LauncherSessionTests {
+class LauncherSessionTests {
 
 	LauncherSessionListener firstSessionListener = mock(LauncherSessionListener.class);
 	LauncherSessionListener secondSessionListener = mock(LauncherSessionListener.class);
@@ -64,6 +64,7 @@ void callsRegisteredListenersWhenLauncherIsUsedDirectly() {
 
 	@Test
 	void callsRegisteredListenersWhenLauncherIsUsedViaSession() {
+		@SuppressWarnings("resource")
 		var session = LauncherFactory.openSession(launcherConfig);
 		var launcher = session.getLauncher();
 
@@ -93,6 +94,7 @@ void callsRegisteredListenersWhenLauncherIsUsedViaSession() {
 
 	@Test
 	void closedSessionCannotBeUsed() {
+		@SuppressWarnings("resource")
 		var session = LauncherFactory.openSession(launcherConfig);
 		var launcher = session.getLauncher();
 		var testPlan = launcher.discover(request);

From 1785e250f73fa88ddb53be4ed3e2df1fd36594f5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 31 Dec 2021 16:21:29 +0100
Subject: [PATCH 0678/1433] Polishing

---
 .../TestInstancePreConstructCallback.java     |  19 +-
 ...TestInstancePreConstructCallbackTests.java | 297 +++++++++---------
 2 files changed, 162 insertions(+), 154 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
index 05bd129ff94d..1bdbb9c5a7fb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
@@ -16,21 +16,21 @@
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 
 /**
- * {@link TestInstancePreConstructCallback} defines the API for {@link Extension
+ * {@code TestInstancePreConstructCallback} defines the API for {@link Extension
  * Extensions} that wish to be invoked <em>prior</em> to creation of test instances.
  *
  * <p>This extension is a symmetric counterpart to {@link TestInstancePreDestroyCallback}.
  * The use cases for this extension may include preparing context-sensitive arguments
- * that are injected into the instance's constructor parameters.
+ * that are injected into the instance's constructor.
  *
- * <p>Extensions that implement {@link TestInstancePreConstructCallback} must be
+ * <p>Extensions that implement {@code TestInstancePreConstructCallback} must be
  * registered at the class level if the test class is configured with
- * {@link Lifecycle @TestInstance(Lifecycle.PER_CLASS)}
- * semantics. If the test class is configured with
- * {@link Lifecycle @TestInstance(Lifecycle.PER_METHOD)}
- * semantics, {@link TestInstancePreConstructCallback} extensions may be registered
- * at the class level or at the method level. In the latter case, the
- * extension will only be applied to the test method for which it is registered.
+ * {@link Lifecycle @TestInstance(Lifecycle.PER_CLASS)} semantics. If the test
+ * class is configured with
+ * {@link Lifecycle @TestInstance(Lifecycle.PER_METHOD)} semantics,
+ * {@code TestInstancePreConstructCallback} extensions may be registered at the
+ * class level or at the method level. In the latter case, the extension will
+ * only be applied to the test method for which it is registered.
  *
  * <h3>Constructor Requirements</h3>
  *
@@ -54,4 +54,5 @@ public interface TestInstancePreConstructCallback extends Extension {
 	 * @param context the current extension context; never {@code null}
 	 */
 	void preConstructTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext context) throws Exception;
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
index c6c91d5ec0ec..0e774c93213a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
@@ -37,6 +37,7 @@
  * @since 5.9
  */
 class TestInstancePreConstructCallbackTests extends AbstractJupiterTestEngineTests {
+
 	private static final List<String> callSequence = new ArrayList<>();
 
 	@BeforeEach
@@ -44,15 +45,148 @@ void resetCallSequence() {
 		callSequence.clear();
 	}
 
-	static class CallSequenceRecordingTest {
+	@Test
+	void instancePreConstruct() {
+		executeTestsForClass(InstancePreConstructTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(2).succeeded(2));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"beforeAll",
+
+				"PreConstructCallback: name=foo, testClass=InstancePreConstructTestCase, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"test1",
+				"afterEach",
+
+				"PreConstructCallback: name=foo, testClass=InstancePreConstructTestCase, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"test2",
+				"afterEach",
+
+				"afterAll"
+		);
+		// @formatter:on
+	}
+
+	@Test
+	void factoryPreConstruct() {
+		executeTestsForClass(FactoryPreConstructTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(2).succeeded(2));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"beforeAll",
+
+				"PreConstructCallback: name=foo, testClass=FactoryPreConstructTestCase, outerInstance: null",
+				"testInstanceFactory",
+				"constructor",
+				"beforeEach",
+				"test1",
+				"afterEach",
+
+				"PreConstructCallback: name=foo, testClass=FactoryPreConstructTestCase, outerInstance: null",
+				"testInstanceFactory",
+				"constructor",
+				"beforeEach",
+				"test2",
+				"afterEach",
+
+				"afterAll"
+		);
+		// @formatter:on
+	}
+
+	@Test
+	void preConstructInNested() {
+		executeTestsForClass(PreConstructInNestedTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(3).succeeded(3));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"beforeAll",
+
+				"PreConstructCallback: name=foo, testClass=PreConstructInNestedTestCase, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"outerTest1",
+				"afterEach",
+
+				"PreConstructCallback: name=foo, testClass=PreConstructInNestedTestCase, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"outerTest2",
+				"afterEach",
+
+				"PreConstructCallback: name=foo, testClass=PreConstructInNestedTestCase, outerInstance: null",
+				"constructor",
+
+				"PreConstructCallback: name=foo, testClass=InnerTestCase, outerInstance: #3",
+				"PreConstructCallback: name=bar, testClass=InnerTestCase, outerInstance: #3",
+				"PreConstructCallback: name=baz, testClass=InnerTestCase, outerInstance: #3",
+				"constructorInner",
+				"beforeEach",
+				"beforeEachInner",
+				"innerTest1",
+				"afterEachInner",
+				"afterEach",
+
+				"afterAll"
+		);
+		// @formatter:on
+	}
+
+	@Test
+	void preConstructOnMethod() {
+		executeTestsForClass(PreConstructOnMethod.class).testEvents()//
+				.assertStatistics(stats -> stats.started(2).succeeded(2));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"PreConstructCallback: name=foo, testClass=PreConstructOnMethod, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"test1",
+				"afterEach",
+
+				"constructor",
+				"beforeEach",
+				"test2",
+				"afterEach"
+		);
+		// @formatter:on
+	}
+
+	@Test
+	void preConstructWithClassLifecycle() {
+		executeTestsForClass(PreConstructWithClassLifecycle.class).testEvents()//
+				.assertStatistics(stats -> stats.started(2).succeeded(2));
+
+		// @formatter:off
+		assertThat(callSequence).containsExactly(
+				"PreConstructCallback: name=foo, testClass=PreConstructWithClassLifecycle, outerInstance: null",
+				"PreConstructCallback: name=bar, testClass=PreConstructWithClassLifecycle, outerInstance: null",
+				"constructor",
+				"beforeEach",
+				"test1",
+				"beforeEach",
+				"test2"
+		);
+		// @formatter:on
+	}
+
+	private abstract static class CallSequenceRecordingTestCase {
 		protected static void record(String event) {
 			callSequence.add(event);
 		}
 	}
 
 	@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
-	static class InstancePreConstruct extends CallSequenceRecordingTest {
-		public InstancePreConstruct() {
+	static class InstancePreConstructTestCase extends CallSequenceRecordingTestCase {
+
+		InstancePreConstructTestCase() {
 			record("constructor");
 		}
 
@@ -87,41 +221,16 @@ static void afterAll() {
 		}
 	}
 
-	@Test
-	void instancePreConstruct() {
-		executeTestsForClass(InstancePreConstruct.class).testEvents().assertStatistics(
-			stats -> stats.started(2).succeeded(2));
-
-		// @formatter:off
-		assertThat(callSequence).containsExactly(
-				"beforeAll",
-
-				"PreConstructCallback: name=foo, testClass=InstancePreConstruct, outerInstance: null",
-				"constructor",
-				"beforeEach",
-				"test1",
-				"afterEach",
-
-				"PreConstructCallback: name=foo, testClass=InstancePreConstruct, outerInstance: null",
-				"constructor",
-				"beforeEach",
-				"test2",
-				"afterEach",
-
-				"afterAll"
-		);
-		// @formatter:on
-	}
-
 	@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
-	static class FactoryPreConstruct extends CallSequenceRecordingTest {
+	static class FactoryPreConstructTestCase extends CallSequenceRecordingTestCase {
+
 		@RegisterExtension
 		static final TestInstanceFactory factory = (factoryContext, extensionContext) -> {
 			record("testInstanceFactory");
-			return new FactoryPreConstruct();
+			return new FactoryPreConstructTestCase();
 		};
 
-		public FactoryPreConstruct() {
+		FactoryPreConstructTestCase() {
 			record("constructor");
 		}
 
@@ -156,40 +265,14 @@ static void afterAll() {
 		}
 	}
 
-	@Test
-	void factoryPreConstruct() {
-		executeTestsForClass(FactoryPreConstruct.class).testEvents().assertStatistics(
-			stats -> stats.started(2).succeeded(2));
-
-		// @formatter:off
-		assertThat(callSequence).containsExactly(
-				"beforeAll",
-
-				"PreConstructCallback: name=foo, testClass=FactoryPreConstruct, outerInstance: null",
-				"testInstanceFactory",
-				"constructor",
-				"beforeEach",
-				"test1",
-				"afterEach",
-
-				"PreConstructCallback: name=foo, testClass=FactoryPreConstruct, outerInstance: null",
-				"testInstanceFactory",
-				"constructor",
-				"beforeEach",
-				"test2",
-				"afterEach",
-
-				"afterAll"
-		);
-		// @formatter:on
-	}
-
 	@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
-	static class PreConstructInNested extends CallSequenceRecordingTest {
+	static class PreConstructInNestedTestCase extends CallSequenceRecordingTestCase {
+
 		static AtomicInteger instanceCounter = new AtomicInteger();
+
 		private final String instanceId;
 
-		public PreConstructInNested() {
+		PreConstructInNestedTestCase() {
 			record("constructor");
 			instanceId = "#" + instanceCounter.incrementAndGet();
 		}
@@ -231,13 +314,14 @@ public String toString() {
 		}
 
 		@ExtendWith(InstancePreConstructCallbackRecordingBar.class)
-		abstract class InnerParent extends CallSequenceRecordingTest {
+		abstract class InnerParent extends CallSequenceRecordingTestCase {
 		}
 
 		@Nested
 		@ExtendWith(InstancePreConstructCallbackRecordingBaz.class)
-		class Inner extends InnerParent {
-			Inner() {
+		class InnerTestCase extends InnerParent {
+
+			InnerTestCase() {
 				record("constructorInner");
 			}
 
@@ -258,46 +342,7 @@ void afterEachInner() {
 		}
 	}
 
-	@Test
-	void preConstructInNested() {
-		executeTestsForClass(PreConstructInNested.class).testEvents().assertStatistics(
-			stats -> stats.started(3).succeeded(3));
-
-		// @formatter:off
-		assertThat(callSequence).containsExactly(
-				"beforeAll",
-
-				"PreConstructCallback: name=foo, testClass=PreConstructInNested, outerInstance: null",
-				"constructor",
-				"beforeEach",
-				"outerTest1",
-				"afterEach",
-
-				"PreConstructCallback: name=foo, testClass=PreConstructInNested, outerInstance: null",
-				"constructor",
-				"beforeEach",
-				"outerTest2",
-				"afterEach",
-
-				"PreConstructCallback: name=foo, testClass=PreConstructInNested, outerInstance: null",
-				"constructor",
-
-				"PreConstructCallback: name=foo, testClass=Inner, outerInstance: #3",
-				"PreConstructCallback: name=bar, testClass=Inner, outerInstance: #3",
-				"PreConstructCallback: name=baz, testClass=Inner, outerInstance: #3",
-				"constructorInner",
-				"beforeEach",
-				"beforeEachInner",
-				"innerTest1",
-				"afterEachInner",
-				"afterEach",
-
-				"afterAll"
-		);
-		// @formatter:on
-	}
-
-	static class PreConstructOnMethod extends CallSequenceRecordingTest {
+	static class PreConstructOnMethod extends CallSequenceRecordingTestCase {
 		PreConstructOnMethod() {
 			record("constructor");
 		}
@@ -324,31 +369,10 @@ void afterEach() {
 		}
 	}
 
-	@Test
-	void preConstructOnMethod() {
-		executeTestsForClass(PreConstructOnMethod.class).testEvents().assertStatistics(
-			stats -> stats.started(2).succeeded(2));
-
-		// @formatter:off
-		assertThat(callSequence).containsExactly(
-				"PreConstructCallback: name=foo, testClass=PreConstructOnMethod, outerInstance: null",
-				"constructor",
-				"beforeEach",
-				"test1",
-				"afterEach",
-
-				"constructor",
-				"beforeEach",
-				"test2",
-				"afterEach"
-		);
-		// @formatter:on
-	}
-
 	@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 	@ExtendWith(InstancePreConstructCallbackRecordingFoo.class)
 	@ExtendWith(InstancePreConstructCallbackRecordingBar.class)
-	static class PreConstructWithClassLifecycle extends CallSequenceRecordingTest {
+	static class PreConstructWithClassLifecycle extends CallSequenceRecordingTestCase {
 		PreConstructWithClassLifecycle() {
 			record("constructor");
 		}
@@ -369,24 +393,6 @@ void test2() {
 		}
 	}
 
-	@Test
-	void preConstructWithClassLifecycle() {
-		executeTestsForClass(PreConstructWithClassLifecycle.class).testEvents().assertStatistics(
-			stats -> stats.started(2).succeeded(2));
-
-		// @formatter:off
-		assertThat(callSequence).containsExactly(
-				"PreConstructCallback: name=foo, testClass=PreConstructWithClassLifecycle, outerInstance: null",
-				"PreConstructCallback: name=bar, testClass=PreConstructWithClassLifecycle, outerInstance: null",
-				"constructor",
-				"beforeEach",
-				"test1",
-				"beforeEach",
-				"test2"
-		);
-		// @formatter:on
-	}
-
 	static abstract class AbstractTestInstancePreConstructCallback implements TestInstancePreConstructCallback {
 		private final String name;
 
@@ -422,4 +428,5 @@ static class InstancePreConstructCallbackRecordingBaz extends AbstractTestInstan
 			super("baz");
 		}
 	}
+
 }

From ef2574c0399eeed148af1b4468be0ecedda6043e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 31 Dec 2021 17:04:04 +0100
Subject: [PATCH 0679/1433] Undo unnecessary rename of
 DefaultExecutionModeTests

---
 ...tionCleanupModeTests.java => DefaultExecutionModeTests.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/{DefaultExecutionCleanupModeTests.java => DefaultExecutionModeTests.java} (98%)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionCleanupModeTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
similarity index 98%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionCleanupModeTests.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
index a8af6e6e2019..a2e15e6bb4f3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionCleanupModeTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
@@ -32,7 +32,7 @@
 import org.junit.platform.engine.support.hierarchical.Node.ExecutionMode;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 
-class DefaultExecutionCleanupModeTests extends AbstractJupiterTestEngineTests {
+class DefaultExecutionModeTests extends AbstractJupiterTestEngineTests {
 
 	@Test
 	void defaultExecutionModeIsReadFromConfigurationParameter() {

From 206ef3549dc10b9782060b03814538cf1e348a99 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 31 Dec 2021 17:08:12 +0100
Subject: [PATCH 0680/1433] Fix issues with @TempDir cleanup mode support

- Use correct versions in @since tags and @API declarations
- Add missing @since tags and @API declarations
- Add missing Javadoc
- Fix configuration parameter name for default cleanup mode
- Clarify meaning of DEFAULT cleanup mode
- Improve Javadoc
- Polish tests

See #2729
---
 .../org/junit/jupiter/api/io/CleanupMode.java | 21 ++++---
 .../org/junit/jupiter/api/io/TempDir.java     | 41 ++++++++-----
 .../extension/CloseablePathCleanupTests.java  | 58 +++++++++----------
 3 files changed, 66 insertions(+), 54 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
index a1b0b88009dd..14268dcdfd8a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
@@ -18,18 +18,20 @@
  * Enumeration of cleanup modes for a {@code TempDir}.
  *
  * <p>When a test with a temporary directory completes, it might be useful in
- * some cases to be able to view the contents of the directory resulting from
- * the test. {@code CleanupMode} allows control of how a {@code TempDir}
+ * some cases to be able to view the contents of the temporary directory used by
+ * the test. {@code CleanupMode} allows you to control how a {@code TempDir}
  * is cleaned up.
  *
- * @since 5.4
+ * @since 5.9
  * @see TempDir
  */
-@API(status = EXPERIMENTAL, since = "5.4")
+@API(status = EXPERIMENTAL, since = "5.9")
 public enum CleanupMode {
 
 	/**
-	 * Defer to the configured cleanup mode.
+	 * Use the default cleanup mode.
+	 *
+	 * @see TempDir#DEFAULT_CLEANUP_MODE_PROPERTY_NAME
 	 */
 	DEFAULT,
 
@@ -39,12 +41,13 @@ public enum CleanupMode {
 	ALWAYS,
 
 	/**
-	 * Don't clean up a temporary directory after the test has completed.
+	 * Only clean up a temporary directory if the test completed successfully.
 	 */
-	NEVER,
+	ON_SUCCESS,
 
 	/**
-	 * Only clean up a temporary directory if the test completed successfully.
+	 * Never clean up a temporary directory after the test has completed.
 	 */
-	ON_SUCCESS
+	NEVER;
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index b57e0c60955c..8653482b699d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -67,22 +67,22 @@
  * {@link org.junit.jupiter.api.AfterEach @AfterEach} methods &mdash; each test
  * will use its own temporary directory.
  *
- * <h3>Deletion</h3>
+ * <h3>Clean Up</h3>
  *
  * <p>By default, when the end of the scope of a temporary directory is reached,
- * i.e. when the test method or class has finished execution, JUnit will attempt
- * to recursively delete all files and directories in the temporary directory
- * and, finally, the temporary directory itself. In case deletion of a file or
- * directory fails, an {@link IOException} will be thrown that will cause the
- * test or test class to fail.
+ * &mdash; when the test method or class has finished execution &mdash; JUnit will
+ * attempt to clean up the temporary directory by recursively deleting all files
+ * and directories in the temporary directory and, finally, the temporary directory
+ * itself. In case deletion of a file or directory fails, an {@link IOException}
+ * will be thrown that will cause the test or test class to fail.
  *
- * <p>The {@code @TempDir} annotation has a {@link CleanupMode} parameter that
- * allows overriding the default behavior. If the cleanup mode is set to
- * {@link CleanupMode#NEVER}, then the temporary directory will not be deleted
- * after the test completes. If the cleanup mode is set to
- * {@link CleanupMode#ON_SUCCESS}, then the temporary directory will only be
- * deleted if the test completes successfully. The default behavior can be
- * altered by setting the {@value #DEFAULT_CLEANUP_MODE_PROPERTY_NAME}
+ * <p>The {@link #cleanup} attribute allows you to configure the {@link CleanupMode}.
+ * If the cleanup mode is set to {@link CleanupMode#NEVER NEVER}, the temporary
+ * directory will not be cleaned up after the test completes. If the cleanup mode is
+ * set to {@link CleanupMode#ON_SUCCESS ON_SUCCESS}, the temporary directory will
+ * only be cleaned up if the test completes successfully. By default, the
+ * {@link CleanupMode#ALWAYS ALWAYS} clean up mode will be used, but this can be
+ * configured globally by setting the {@value #DEFAULT_CLEANUP_MODE_PROPERTY_NAME}
  * configuration parameter.
  *
  * @since 5.4
@@ -93,11 +93,24 @@
 @API(status = EXPERIMENTAL, since = "5.4")
 public @interface TempDir {
 
-	String DEFAULT_CLEANUP_MODE_PROPERTY_NAME = "junit.jupiter.cleanup.mode.default";
+	/**
+	 * The name of the configuration parameter that is used to configure the
+	 * default {@link CleanupMode}.
+	 *
+	 * <p>If this configuration parameter is not set, {@link CleanupMode#ALWAYS}
+	 * will be used as the default.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	String DEFAULT_CLEANUP_MODE_PROPERTY_NAME = "junit.jupiter.tempdir.cleanup.mode.default";
 
 	/**
 	 * How the temporary directory gets cleaned up after the test completes.
+	 *
+	 * @since 5.9
 	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
 	CleanupMode cleanup() default CleanupMode.DEFAULT;
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index fd990b336bf5..be96cef05707 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -11,8 +11,7 @@
 package org.junit.jupiter.engine.extension;
 
 import static java.nio.file.Files.deleteIfExists;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
 import static org.junit.jupiter.api.io.CleanupMode.NEVER;
 import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
@@ -31,9 +30,8 @@
 import org.opentest4j.TestAbortedException;
 
 /**
- * Integration tests for cleanup of the {@link TempDirectory}
- * when {@link TempDir} is set to {@link CleanupMode#ALWAYS} or
- * {@link CleanupMode#NEVER}.
+ * Integration tests for cleanup of the {@link TempDirectory} when the {@link CleanupMode} is
+ * set to {@link CleanupMode#ALWAYS}, {@link CleanupMode#NEVER}, or {@link CleanupMode#ON_SUCCESS}.
  *
  * @since 5.9
  *
@@ -42,67 +40,65 @@
  */
 class CloseablePathCleanupTests extends AbstractJupiterTestEngineTests {
 
-	private TempDirectory.CloseablePath path;
+	private final ExtensionContext extensionContext = mock(ExtensionContext.class);
+
+	private TempDirectory.CloseablePath closeablePath;
 
 	@AfterEach
 	void cleanupTempDirectory() throws IOException {
-		deleteIfExists(path.get());
+		deleteIfExists(closeablePath.get());
 	}
 
 	/**
 	 * Ensure a closeable path is cleaned up for a cleanup mode of ALWAYS.
 	 */
 	@Test
-	void testAlways() throws IOException {
-		ExtensionContext extensionContext = mock(ExtensionContext.class);
-		path = TempDirectory.createTempDir(ALWAYS, extensionContext);
-		assertTrue(path.get().toFile().exists());
+	void always() throws IOException {
+		closeablePath = TempDirectory.createTempDir(ALWAYS, extensionContext);
+		assertThat(closeablePath.get()).exists();
 
-		path.close();
-		assertFalse(path.get().toFile().exists());
+		closeablePath.close();
+		assertThat(closeablePath.get()).doesNotExist();
 	}
 
 	/**
 	 * Ensure a closeable path is not cleaned up for a cleanup mode of NEVER.
 	 */
 	@Test
-	void testNever() throws IOException {
-		ExtensionContext extensionContext = mock(ExtensionContext.class);
-		path = TempDirectory.createTempDir(NEVER, extensionContext);
-		assertTrue(path.get().toFile().exists());
+	void never() throws IOException {
+		closeablePath = TempDirectory.createTempDir(NEVER, extensionContext);
+		assertThat(closeablePath.get()).exists();
 
-		path.close();
-		assertTrue(path.get().toFile().exists());
+		closeablePath.close();
+		assertThat(closeablePath.get()).exists();
 	}
 
 	/**
 	 * Ensure a closeable path is not cleaned up for a cleanup mode of ON_SUCCESS, if there is a TestAbortedException.
 	 */
 	@Test
-	void testOnSuccessWithTestAbortedException() throws IOException {
-		ExtensionContext extensionContext = mock(ExtensionContext.class);
+	void onSuccessWithTestAbortedException() throws IOException {
 		when(extensionContext.getExecutionException()).thenReturn(Optional.of(new TestAbortedException()));
 
-		path = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
-		assertTrue(path.get().toFile().exists());
+		closeablePath = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
+		assertThat(closeablePath.get()).exists();
 
-		path.close();
-		assertTrue(path.get().toFile().exists());
+		closeablePath.close();
+		assertThat(closeablePath.get()).exists();
 	}
 
 	/**
 	 * Ensure a closeable path is cleaned up for a cleanup mode of ON_SUCCESS, if there is no exception.
 	 */
 	@Test
-	void testOnSuccessWithNoTestAbortedException() throws IOException {
-		ExtensionContext extensionContext = mock(ExtensionContext.class);
+	void onSuccessWithNoTestAbortedException() throws IOException {
 		when(extensionContext.getExecutionException()).thenReturn(Optional.empty());
 
-		path = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
-		assertTrue(path.get().toFile().exists());
+		closeablePath = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
+		assertThat(closeablePath.get()).exists();
 
-		path.close();
-		assertFalse(path.get().toFile().exists());
+		closeablePath.close();
+		assertThat(closeablePath.get()).doesNotExist();
 	}
 
 }

From 01353cddca2768d51f811ed464737a2087876e3e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 31 Dec 2021 19:18:44 +0100
Subject: [PATCH 0681/1433] Polish TempDir cleanup support

See #2729
---
 .../engine/extension/TempDirectory.java       |   6 +-
 .../extension/CloseablePathCleanupTests.java  |   7 +-
 .../extension/TempDirectoryCleanupTests.java  | 106 ++++++++++--------
 3 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 5f1931f7b1cc..eb2bfe608213 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -18,6 +18,7 @@
 import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
 import static org.junit.jupiter.engine.config.JupiterConfiguration.TEMP_DIR_SCOPE_PROPERTY_NAME;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
 
 import java.io.File;
@@ -54,7 +55,6 @@
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
-import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
@@ -166,12 +166,12 @@ private CleanupMode findCleanupModeForParameter(ParameterContext parameterContex
 
 	private CleanupMode findCleanupModeForField(Field field) {
 		CleanupMode cleanupMode = null;
-		Optional<TempDir> optional = AnnotationSupport.findAnnotation(field, TempDir.class);
+		Optional<TempDir> optional = findAnnotation(field, TempDir.class);
 		if (optional.isPresent()) {
 			cleanupMode = optional.get().cleanup();
 		}
 		if (cleanupMode == null || cleanupMode == DEFAULT) {
-			cleanupMode = configuration.getDefaultTempDirCleanupMode();
+			cleanupMode = this.configuration.getDefaultTempDirCleanupMode();
 		}
 		return cleanupMode;
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index be96cef05707..e9767bb2bce4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
-import org.opentest4j.TestAbortedException;
 
 /**
  * Integration tests for cleanup of the {@link TempDirectory} when the {@link CleanupMode} is
@@ -77,8 +76,8 @@ void never() throws IOException {
 	 * Ensure a closeable path is not cleaned up for a cleanup mode of ON_SUCCESS, if there is a TestAbortedException.
 	 */
 	@Test
-	void onSuccessWithTestAbortedException() throws IOException {
-		when(extensionContext.getExecutionException()).thenReturn(Optional.of(new TestAbortedException()));
+	void onSuccessWithException() throws IOException {
+		when(extensionContext.getExecutionException()).thenReturn(Optional.of(new Exception()));
 
 		closeablePath = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
 		assertThat(closeablePath.get()).exists();
@@ -91,7 +90,7 @@ void onSuccessWithTestAbortedException() throws IOException {
 	 * Ensure a closeable path is cleaned up for a cleanup mode of ON_SUCCESS, if there is no exception.
 	 */
 	@Test
-	void onSuccessWithNoTestAbortedException() throws IOException {
+	void onSuccessWithNoException() throws IOException {
 		when(extensionContext.getExecutionException()).thenReturn(Optional.empty());
 
 		closeablePath = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
index d4144dcc3335..5a5657fd765d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
@@ -11,9 +11,7 @@
 package org.junit.jupiter.engine.extension;
 
 import static java.nio.file.Files.deleteIfExists;
-import static java.nio.file.Files.exists;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
 import static org.junit.jupiter.api.io.CleanupMode.NEVER;
@@ -33,9 +31,9 @@
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 
 /**
- * Test that {@link TempDir temporary directories} are not deleted if set for {@link CleanupMode#NEVER},
- * deletes any if set for {@link CleanupMode#ON_SUCCESS} only if the test passes,
- * and deletes any if set for {@link CleanupMode#ALWAYS}.
+ * Test that {@linkplain TempDir temporary directories} are not deleted with
+ * {@link CleanupMode#NEVER}, are deleted with {@link CleanupMode#ON_SUCCESS}
+ * but only if the test passes, and are always deleted with {@link CleanupMode#ALWAYS}.
  *
  * @see CleanupMode
  * @see TempDir
@@ -53,17 +51,18 @@ class TempDirFieldTests {
 		private static Path onSuccessPassingFieldDir;
 
 		/**
-		 * Ensure the cleanup modes defaults to ALWAYS for fields.
+		 * Ensure the cleanup mode defaults to ALWAYS for fields.
 		 * <p/>
 		 * Expect the TempDir to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeDefaultField() {
-			LauncherDiscoveryRequest request = request().selectors(
-				selectMethod(DefaultFieldCase.class, "testDefaultField")).build();
+		void cleanupModeDefaultField() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(DefaultFieldCase.class, "testDefaultField"))//
+					.build();
 			executeTests(request);
 
-			assertFalse(exists(defaultFieldDir));
+			assertThat(defaultFieldDir).doesNotExist();
 		}
 
 		/**
@@ -72,12 +71,13 @@ void testCleanupModeDefaultField() {
 		 * Expect the TempDir not to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeNeverField() {
-			LauncherDiscoveryRequest request = request().selectors(
-				selectMethod(NeverFieldCase.class, "testNeverField")).build();
+		void cleanupModeNeverField() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(NeverFieldCase.class, "testNeverField"))//
+					.build();
 			executeTests(request);
 
-			assertTrue(exists(neverFieldDir));
+			assertThat(neverFieldDir).exists();
 		}
 
 		/**
@@ -86,12 +86,13 @@ void testCleanupModeNeverField() {
 		 * Expect the TempDir to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeAlwaysField() {
-			LauncherDiscoveryRequest request = request().selectors(
-				selectMethod(AlwaysFieldCase.class, "testAlwaysField")).build();
+		void cleanupModeAlwaysField() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(AlwaysFieldCase.class, "testAlwaysField"))//
+					.build();
 			executeTests(request);
 
-			assertFalse(exists(alwaysFieldDir));
+			assertThat(alwaysFieldDir).doesNotExist();
 		}
 
 		/**
@@ -100,12 +101,13 @@ void testCleanupModeAlwaysField() {
 		 * Expect the TempDir to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeOnSuccessPassingField() {
-			LauncherDiscoveryRequest request = request().selectors(
-				selectMethod(OnSuccessPassingFieldCase.class, "testOnSuccessPassingField")).build();
+		void cleanupModeOnSuccessPassingField() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(OnSuccessPassingFieldCase.class, "testOnSuccessPassingField"))//
+					.build();
 			executeTests(request);
 
-			assertFalse(exists(onSuccessPassingFieldDir));
+			assertThat(onSuccessPassingFieldDir).doesNotExist();
 		}
 
 		/**
@@ -114,12 +116,13 @@ void testCleanupModeOnSuccessPassingField() {
 		 * Expect the TempDir not to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeOnSuccessFailingField() {
-			LauncherDiscoveryRequest request = request().selectors(
-				selectMethod(OnSuccessFailingFieldCase.class, "testOnSuccessFailingField")).build();
+		void cleanupModeOnSuccessFailingField() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(OnSuccessFailingFieldCase.class, "testOnSuccessFailingField"))//
+					.build();
 			executeTests(request);
 
-			assertTrue(exists(onSuccessFailingFieldDir));
+			assertThat(onSuccessFailingFieldDir).exists();
 		}
 
 		@AfterAll
@@ -201,17 +204,18 @@ class TempDirParameterTests {
 		private static Path onSuccessPassingParameterDir;
 
 		/**
-		 * Ensure the cleanup modes defaults to ALWAYS for parameters.
+		 * Ensure the cleanup mode defaults to ALWAYS for parameters.
 		 * <p/>
 		 * Expect the TempDir to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeDefaultParameter() {
-			LauncherDiscoveryRequest request = request().selectors(
-				selectMethod(DefaultParameterCase.class, "testDefaultParameter", "java.nio.file.Path")).build();
+		void cleanupModeDefaultParameter() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(DefaultParameterCase.class, "testDefaultParameter", "java.nio.file.Path"))//
+					.build();
 			executeTests(request);
 
-			assertFalse(exists(defaultParameterDir));
+			assertThat(defaultParameterDir).doesNotExist();
 		}
 
 		/**
@@ -220,12 +224,13 @@ void testCleanupModeDefaultParameter() {
 		 * Expect the TempDir not to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeNeverParameter() {
-			LauncherDiscoveryRequest request = request().selectors(
-				selectMethod(NeverParameterCase.class, "testNeverParameter", "java.nio.file.Path")).build();
+		void cleanupModeNeverParameter() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(NeverParameterCase.class, "testNeverParameter", "java.nio.file.Path"))//
+					.build();
 			executeTests(request);
 
-			assertTrue(exists(neverParameterDir));
+			assertThat(neverParameterDir).exists();
 		}
 
 		/**
@@ -234,12 +239,13 @@ void testCleanupModeNeverParameter() {
 		 * Expect the TempDir to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeAlwaysParameter() {
-			LauncherDiscoveryRequest request = request().selectors(
-				selectMethod(AlwaysParameterCase.class, "testAlwaysParameter", "java.nio.file.Path")).build();
+		void cleanupModeAlwaysParameter() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(AlwaysParameterCase.class, "testAlwaysParameter", "java.nio.file.Path"))//
+					.build();
 			executeTests(request);
 
-			assertFalse(exists(alwaysParameterDir));
+			assertThat(alwaysParameterDir).doesNotExist();
 		}
 
 		/**
@@ -248,12 +254,14 @@ void testCleanupModeAlwaysParameter() {
 		 * Expect the TempDir to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeOnSuccessPassingParameter() {
-			LauncherDiscoveryRequest request = request().selectors(selectMethod(OnSuccessPassingParameterCase.class,
-				"testOnSuccessPassingParameter", "java.nio.file.Path")).build();
+		void cleanupModeOnSuccessPassingParameter() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(OnSuccessPassingParameterCase.class, "testOnSuccessPassingParameter",
+						"java.nio.file.Path"))//
+					.build();
 			executeTests(request);
 
-			assertFalse(exists(onSuccessPassingParameterDir));
+			assertThat(onSuccessPassingParameterDir).doesNotExist();
 		}
 
 		/**
@@ -262,12 +270,14 @@ void testCleanupModeOnSuccessPassingParameter() {
 		 * Expect the TempDir not to be cleaned up.
 		 */
 		@Test
-		void testCleanupModeOnSuccessFailingParameter() {
-			LauncherDiscoveryRequest request = request().selectors(selectMethod(OnSuccessFailingParameterCase.class,
-				"testOnSuccessFailingParameter", "java.nio.file.Path")).build();
+		void cleanupModeOnSuccessFailingParameter() {
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(OnSuccessFailingParameterCase.class, "testOnSuccessFailingParameter",
+						"java.nio.file.Path"))//
+					.build();
 			executeTests(request);
 
-			assertTrue(exists(onSuccessFailingParameterDir));
+			assertThat(onSuccessFailingParameterDir).exists();
 		}
 
 		@AfterAll

From 498cf7f41ab23cbacaf2216d931bc7c7c5d75d56 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 31 Dec 2021 19:43:40 +0100
Subject: [PATCH 0682/1433] Fix bug with @TempDir custom default cleanup mode

Prior to this commit, a custom default cleanup mode was ignored when
determining the cleanup mode for a parameter annotated with @TempDir.

See #2729
---
 .../engine/extension/TempDirectory.java       | 42 ++++++++-----------
 .../extension/TempDirectoryCleanupTests.java  | 32 ++++++++++++++
 2 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index eb2bfe608213..0fe5de7b1841 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -12,7 +12,6 @@
 
 import static java.nio.file.FileVisitResult.CONTINUE;
 import static java.util.stream.Collectors.joining;
-import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
 import static org.junit.jupiter.api.io.CleanupMode.DEFAULT;
 import static org.junit.jupiter.api.io.CleanupMode.NEVER;
 import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
@@ -35,7 +34,6 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
-import java.util.Optional;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.function.Predicate;
@@ -117,8 +115,8 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 			assertSupportedType("field", field.getType());
 
 			try {
-				CleanupMode mode = findCleanupModeForField(field);
-				makeAccessible(field).set(testInstance, getPathOrFile(field, field.getType(), mode, context));
+				CleanupMode cleanupMode = determineCleanupModeForField(field);
+				makeAccessible(field).set(testInstance, getPathOrFile(field, field.getType(), cleanupMode, context));
 			}
 			catch (Throwable t) {
 				ExceptionUtils.throwAsUncheckedException(t);
@@ -148,35 +146,29 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 		Class<?> parameterType = parameterContext.getParameter().getType();
 		assertSupportedType("parameter", parameterType);
-		CleanupMode cleanupMode = findCleanupModeForParameter(parameterContext);
+		CleanupMode cleanupMode = determineCleanupModeForParameter(parameterContext);
 		return getPathOrFile(parameterContext.getParameter(), parameterType, cleanupMode, extensionContext);
 	}
 
-	private CleanupMode findCleanupModeForParameter(ParameterContext parameterContext) {
-		CleanupMode cleanupMode = null;
-		Optional<TempDir> optional = parameterContext.findAnnotation(TempDir.class);
-		if (optional.isPresent()) {
-			cleanupMode = optional.get().cleanup();
-		}
-		if (cleanupMode == null || cleanupMode == DEFAULT) {
-			cleanupMode = ALWAYS;
-		}
-		return cleanupMode;
+	private CleanupMode determineCleanupModeForField(Field field) {
+		TempDir tempDir = findAnnotation(field, TempDir.class).orElseThrow(
+			() -> new IllegalStateException("Field " + field + " must be annotated with @TempDir"));
+		return determineCleanupMode(tempDir);
 	}
 
-	private CleanupMode findCleanupModeForField(Field field) {
-		CleanupMode cleanupMode = null;
-		Optional<TempDir> optional = findAnnotation(field, TempDir.class);
-		if (optional.isPresent()) {
-			cleanupMode = optional.get().cleanup();
-		}
-		if (cleanupMode == null || cleanupMode == DEFAULT) {
-			cleanupMode = this.configuration.getDefaultTempDirCleanupMode();
-		}
-		return cleanupMode;
+	private CleanupMode determineCleanupModeForParameter(ParameterContext parameterContext) {
+		TempDir tempDir = parameterContext.findAnnotation(TempDir.class).orElseThrow(() -> new IllegalStateException(
+			"Parameter " + parameterContext.getParameter() + " must be annotated with @TempDir"));
+		return determineCleanupMode(tempDir);
+	}
+
+	private CleanupMode determineCleanupMode(TempDir tempDir) {
+		CleanupMode cleanupMode = tempDir.cleanup();
+		return cleanupMode == DEFAULT ? this.configuration.getDefaultTempDirCleanupMode() : cleanupMode;
 	}
 
 	private void assertSupportedType(String target, Class<?> type) {
+
 		if (type != Path.class && type != File.class) {
 			throw new ExtensionConfigurationException("Can only resolve @TempDir " + target + " of type "
 					+ Path.class.getName() + " or " + File.class.getName() + " but was: " + type.getName());
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
index 5a5657fd765d..3a440af1d96d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
@@ -65,6 +65,22 @@ void cleanupModeDefaultField() {
 			assertThat(defaultFieldDir).doesNotExist();
 		}
 
+		/**
+		 * Ensure that a custom, global cleanup mode is used for fields.
+		 * <p/>
+		 * Expect the TempDir NOT to be cleaned up if set to NEVER.
+		 */
+		@Test
+		void cleanupModeCustomDefaultField() {
+			LauncherDiscoveryRequest request = request()//
+					.configurationParameter(TempDir.DEFAULT_CLEANUP_MODE_PROPERTY_NAME, "never")//
+					.selectors(selectMethod(DefaultFieldCase.class, "testDefaultField"))//
+					.build();
+			executeTests(request);
+
+			assertThat(defaultFieldDir).exists();
+		}
+
 		/**
 		 * Ensure that NEVER cleanup modes are obeyed for fields.
 		 * <p/>
@@ -218,6 +234,22 @@ void cleanupModeDefaultParameter() {
 			assertThat(defaultParameterDir).doesNotExist();
 		}
 
+		/**
+		 * Ensure that a custom, global cleanup mode is used for parameters.
+		 * <p/>
+		 * Expect the TempDir NOT to be cleaned up if set to NEVER.
+		 */
+		@Test
+		void cleanupModeCustomDefaultParameter() {
+			LauncherDiscoveryRequest request = request()//
+					.configurationParameter(TempDir.DEFAULT_CLEANUP_MODE_PROPERTY_NAME, "never")//
+					.selectors(selectMethod(DefaultParameterCase.class, "testDefaultParameter", "java.nio.file.Path"))//
+					.build();
+			executeTests(request);
+
+			assertThat(defaultParameterDir).exists();
+		}
+
 		/**
 		 * Ensure that NEVER cleanup modes are obeyed for parameters.
 		 * <p/>

From 73dbfa54bb27eebbcbabccac56c2c35eeb550433 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jan 2022 09:53:26 +0100
Subject: [PATCH 0683/1433] Upgradle to 7.3.3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ad382b775c40..59250647c409 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From e69243ae0f3c68f07d075ac3901c98c375d040f0 Mon Sep 17 00:00:00 2001
From: JUnit Team <team@junit.org>
Date: Thu, 6 Jan 2022 10:00:09 +0100
Subject: [PATCH 0684/1433] Update copyright

---
 documentation/src/main/java/example/domain/Person.java          | 2 +-
 documentation/src/main/java/example/registration/WebClient.java | 2 +-
 .../src/main/java/example/registration/WebResponse.java         | 2 +-
 .../src/main/java/example/registration/WebServerExtension.java  | 2 +-
 documentation/src/main/java/example/util/Calculator.java        | 2 +-
 documentation/src/main/java/example/util/ListWriter.java        | 2 +-
 documentation/src/main/java/example/util/StringUtils.java       | 2 +-
 documentation/src/test/java/example/AssertionsDemo.java         | 2 +-
 documentation/src/test/java/example/AssumptionsDemo.java        | 2 +-
 .../src/test/java/example/ConditionalTestExecutionDemo.java     | 2 +-
 documentation/src/test/java/example/CustomTestEngine.java       | 2 +-
 documentation/src/test/java/example/DisabledClassDemo.java      | 2 +-
 documentation/src/test/java/example/DisabledTestsDemo.java      | 2 +-
 documentation/src/test/java/example/DisplayNameDemo.java        | 2 +-
 .../src/test/java/example/DisplayNameGeneratorDemo.java         | 2 +-
 documentation/src/test/java/example/DocumentationTestSuite.java | 2 +-
 documentation/src/test/java/example/DynamicTestsDemo.java       | 2 +-
 documentation/src/test/java/example/ExampleTestCase.java        | 2 +-
 .../src/test/java/example/ExternalCustomConditionDemo.java      | 2 +-
 .../src/test/java/example/ExternalMethodSourceDemo.java         | 2 +-
 documentation/src/test/java/example/Fast.java                   | 2 +-
 documentation/src/test/java/example/FastTest.java               | 2 +-
 documentation/src/test/java/example/HamcrestAssertionsDemo.java | 2 +-
 documentation/src/test/java/example/IgnoredTestsDemo.java       | 2 +-
 documentation/src/test/java/example/JUnit4Tests.java            | 2 +-
 documentation/src/test/java/example/JUnitPlatformClassDemo.java | 2 +-
 documentation/src/test/java/example/JUnitPlatformSuiteDemo.java | 2 +-
 .../src/test/java/example/MyFirstJUnitJupiterTests.java         | 2 +-
 .../src/test/java/example/OrderedNestedTestClassesDemo.java     | 2 +-
 documentation/src/test/java/example/OrderedTestsDemo.java       | 2 +-
 documentation/src/test/java/example/ParameterizedTestDemo.java  | 2 +-
 documentation/src/test/java/example/PollingTimeoutDemo.java     | 2 +-
 documentation/src/test/java/example/RepeatedTestsDemo.java      | 2 +-
 documentation/src/test/java/example/SharedResourcesDemo.java    | 2 +-
 documentation/src/test/java/example/SlowTests.java              | 2 +-
 documentation/src/test/java/example/StandardTests.java          | 2 +-
 documentation/src/test/java/example/SuiteDemo.java              | 2 +-
 documentation/src/test/java/example/TaggingDemo.java            | 2 +-
 documentation/src/test/java/example/TempDirCleanupModeDemo.java | 2 +-
 documentation/src/test/java/example/TempDirectoryDemo.java      | 2 +-
 documentation/src/test/java/example/TestInfoDemo.java           | 2 +-
 documentation/src/test/java/example/TestReporterDemo.java       | 2 +-
 documentation/src/test/java/example/TestTemplateDemo.java       | 2 +-
 documentation/src/test/java/example/TestingAStackDemo.java      | 2 +-
 documentation/src/test/java/example/TimeoutDemo.java            | 2 +-
 documentation/src/test/java/example/UsingTheLauncherDemo.java   | 2 +-
 .../src/test/java/example/callbacks/AbstractDatabaseTests.java  | 2 +-
 .../java/example/callbacks/BrokenLifecycleMethodConfigDemo.java | 2 +-
 .../src/test/java/example/callbacks/DatabaseTestsDemo.java      | 2 +-
 documentation/src/test/java/example/callbacks/Extension1.java   | 2 +-
 documentation/src/test/java/example/callbacks/Extension2.java   | 2 +-
 documentation/src/test/java/example/callbacks/Logger.java       | 2 +-
 .../test/java/example/defaultmethods/ComparableContract.java    | 2 +-
 .../src/test/java/example/defaultmethods/EqualsContract.java    | 2 +-
 .../src/test/java/example/defaultmethods/StringTests.java       | 2 +-
 .../src/test/java/example/defaultmethods/Testable.java          | 2 +-
 .../test/java/example/exception/IgnoreIOExceptionExtension.java | 2 +-
 .../src/test/java/example/exception/IgnoreIOExceptionTests.java | 2 +-
 .../test/java/example/exception/MultipleHandlersTestCase.java   | 2 +-
 .../java/example/exception/RecordStateOnErrorExtension.java     | 2 +-
 documentation/src/test/java/example/extensions/Random.java      | 2 +-
 .../src/test/java/example/extensions/RandomNumberDemo.java      | 2 +-
 .../src/test/java/example/extensions/RandomNumberExtension.java | 2 +-
 .../src/test/java/example/interceptor/SwingEdtInterceptor.java  | 2 +-
 .../src/test/java/example/registration/DocumentationDemo.java   | 2 +-
 .../src/test/java/example/registration/WebServerDemo.java       | 2 +-
 .../test/java/example/session/GlobalSetupTeardownListener.java  | 2 +-
 documentation/src/test/java/example/session/HttpTests.java      | 2 +-
 .../src/test/java/example/testinterface/TestInterfaceDemo.java  | 2 +-
 .../example/testinterface/TestInterfaceDynamicTestsDemo.java    | 2 +-
 .../test/java/example/testinterface/TestLifecycleLogger.java    | 2 +-
 .../test/java/example/testinterface/TimeExecutionLogger.java    | 2 +-
 .../test/java/example/testkit/EngineTestKitAllEventsDemo.java   | 2 +-
 .../java/example/testkit/EngineTestKitFailedMethodDemo.java     | 2 +-
 .../java/example/testkit/EngineTestKitSkippedMethodDemo.java    | 2 +-
 .../test/java/example/testkit/EngineTestKitStatisticsDemo.java  | 2 +-
 documentation/src/test/java/example/timing/TimingExtension.java | 2 +-
 .../src/test/java/example/timing/TimingExtensionTests.java      | 2 +-
 documentation/src/test/java/extensions/ExpectToFail.java        | 2 +-
 .../test/java/org/junit/api/tools/AbstractApiReportWriter.java  | 2 +-
 documentation/src/test/java/org/junit/api/tools/ApiReport.java  | 2 +-
 .../src/test/java/org/junit/api/tools/ApiReportGenerator.java   | 2 +-
 .../src/test/java/org/junit/api/tools/ApiReportWriter.java      | 2 +-
 .../test/java/org/junit/api/tools/AsciidocApiReportWriter.java  | 2 +-
 .../src/test/java/org/junit/api/tools/HtmlApiReportWriter.java  | 2 +-
 .../test/java/org/junit/api/tools/MarkdownApiReportWriter.java  | 2 +-
 documentation/src/test/kotlin/example/FibonacciCalculator.kt    | 2 +-
 documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt   | 2 +-
 .../src/test/kotlin/example/registration/KotlinWebServerDemo.kt | 2 +-
 .../src/main/java/org/junit/jupiter/api/AfterAll.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/AfterEach.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertAll.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertArrayEquals.java  | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertEquals.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertFalse.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertInstanceOf.java   | 2 +-
 .../main/java/org/junit/jupiter/api/AssertIterableEquals.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertLinesMatch.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotEquals.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotNull.java      | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotSame.java      | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNull.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertSame.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertThrows.java       | 2 +-
 .../main/java/org/junit/jupiter/api/AssertThrowsExactly.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertTimeout.java      | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertTrue.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertionUtils.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/Assertions.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/Assumptions.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/BeforeAll.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/BeforeEach.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/ClassDescriptor.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/ClassOrderer.java       | 2 +-
 .../main/java/org/junit/jupiter/api/ClassOrdererContext.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/Disabled.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/DisplayName.java        | 2 +-
 .../main/java/org/junit/jupiter/api/DisplayNameGeneration.java  | 2 +-
 .../main/java/org/junit/jupiter/api/DisplayNameGenerator.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicContainer.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicNode.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicTest.java        | 2 +-
 .../org/junit/jupiter/api/IndicativeSentencesGeneration.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodDescriptor.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodOrderer.java      | 2 +-
 .../main/java/org/junit/jupiter/api/MethodOrdererContext.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/Named.java              | 2 +-
 .../src/main/java/org/junit/jupiter/api/Nested.java             | 2 +-
 .../src/main/java/org/junit/jupiter/api/Order.java              | 2 +-
 .../src/main/java/org/junit/jupiter/api/RepeatedTest.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/RepetitionInfo.java     | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java  | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestClassOrder.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestFactory.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestInfo.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestInstance.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestMethodOrder.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestReporter.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestTemplate.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/Timeout.java            | 2 +-
 .../api/condition/AbstractRepeatableAnnotationCondition.java    | 2 +-
 .../junit/jupiter/api/condition/BooleanExecutionCondition.java  | 2 +-
 .../org/junit/jupiter/api/condition/DisabledForJreRange.java    | 2 +-
 .../jupiter/api/condition/DisabledForJreRangeCondition.java     | 2 +-
 .../main/java/org/junit/jupiter/api/condition/DisabledIf.java   | 2 +-
 .../org/junit/jupiter/api/condition/DisabledIfCondition.java    | 2 +-
 .../jupiter/api/condition/DisabledIfEnvironmentVariable.java    | 2 +-
 .../api/condition/DisabledIfEnvironmentVariableCondition.java   | 2 +-
 .../jupiter/api/condition/DisabledIfEnvironmentVariables.java   | 2 +-
 .../junit/jupiter/api/condition/DisabledIfSystemProperties.java | 2 +-
 .../junit/jupiter/api/condition/DisabledIfSystemProperty.java   | 2 +-
 .../api/condition/DisabledIfSystemPropertyCondition.java        | 2 +-
 .../java/org/junit/jupiter/api/condition/DisabledOnJre.java     | 2 +-
 .../org/junit/jupiter/api/condition/DisabledOnJreCondition.java | 2 +-
 .../main/java/org/junit/jupiter/api/condition/DisabledOnOs.java | 2 +-
 .../org/junit/jupiter/api/condition/DisabledOnOsCondition.java  | 2 +-
 .../org/junit/jupiter/api/condition/EnabledForJreRange.java     | 2 +-
 .../jupiter/api/condition/EnabledForJreRangeCondition.java      | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledIf.java    | 2 +-
 .../org/junit/jupiter/api/condition/EnabledIfCondition.java     | 2 +-
 .../jupiter/api/condition/EnabledIfEnvironmentVariable.java     | 2 +-
 .../api/condition/EnabledIfEnvironmentVariableCondition.java    | 2 +-
 .../jupiter/api/condition/EnabledIfEnvironmentVariables.java    | 2 +-
 .../junit/jupiter/api/condition/EnabledIfSystemProperties.java  | 2 +-
 .../junit/jupiter/api/condition/EnabledIfSystemProperty.java    | 2 +-
 .../jupiter/api/condition/EnabledIfSystemPropertyCondition.java | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledOnJre.java | 2 +-
 .../org/junit/jupiter/api/condition/EnabledOnJreCondition.java  | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledOnOs.java  | 2 +-
 .../org/junit/jupiter/api/condition/EnabledOnOsCondition.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/condition/JRE.java      | 2 +-
 .../org/junit/jupiter/api/condition/MethodBasedCondition.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/condition/OS.java       | 2 +-
 .../java/org/junit/jupiter/api/extension/AfterAllCallback.java  | 2 +-
 .../java/org/junit/jupiter/api/extension/AfterEachCallback.java | 2 +-
 .../junit/jupiter/api/extension/AfterTestExecutionCallback.java | 2 +-
 .../java/org/junit/jupiter/api/extension/BeforeAllCallback.java | 2 +-
 .../org/junit/jupiter/api/extension/BeforeEachCallback.java     | 2 +-
 .../jupiter/api/extension/BeforeTestExecutionCallback.java      | 2 +-
 .../junit/jupiter/api/extension/ConditionEvaluationResult.java  | 2 +-
 .../jupiter/api/extension/DynamicTestInvocationContext.java     | 2 +-
 .../org/junit/jupiter/api/extension/ExecutionCondition.java     | 2 +-
 .../main/java/org/junit/jupiter/api/extension/ExtendWith.java   | 2 +-
 .../main/java/org/junit/jupiter/api/extension/Extension.java    | 2 +-
 .../jupiter/api/extension/ExtensionConfigurationException.java  | 2 +-
 .../java/org/junit/jupiter/api/extension/ExtensionContext.java  | 2 +-
 .../junit/jupiter/api/extension/ExtensionContextException.java  | 2 +-
 .../main/java/org/junit/jupiter/api/extension/Extensions.java   | 2 +-
 .../org/junit/jupiter/api/extension/InvocationInterceptor.java  | 2 +-
 .../api/extension/LifecycleMethodExecutionExceptionHandler.java | 2 +-
 .../java/org/junit/jupiter/api/extension/ParameterContext.java  | 2 +-
 .../jupiter/api/extension/ParameterResolutionException.java     | 2 +-
 .../java/org/junit/jupiter/api/extension/ParameterResolver.java | 2 +-
 .../jupiter/api/extension/ReflectiveInvocationContext.java      | 2 +-
 .../java/org/junit/jupiter/api/extension/RegisterExtension.java | 2 +-
 .../jupiter/api/extension/TestExecutionExceptionHandler.java    | 2 +-
 .../org/junit/jupiter/api/extension/TestInstanceFactory.java    | 2 +-
 .../junit/jupiter/api/extension/TestInstanceFactoryContext.java | 2 +-
 .../junit/jupiter/api/extension/TestInstancePostProcessor.java  | 2 +-
 .../jupiter/api/extension/TestInstancePreConstructCallback.java | 2 +-
 .../jupiter/api/extension/TestInstancePreDestroyCallback.java   | 2 +-
 .../java/org/junit/jupiter/api/extension/TestInstances.java     | 2 +-
 .../junit/jupiter/api/extension/TestInstantiationException.java | 2 +-
 .../jupiter/api/extension/TestTemplateInvocationContext.java    | 2 +-
 .../api/extension/TestTemplateInvocationContextProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/api/extension/TestWatcher.java  | 2 +-
 .../api/extension/support/TypeBasedParameterResolver.java       | 2 +-
 .../main/java/org/junit/jupiter/api/function/Executable.java    | 2 +-
 .../java/org/junit/jupiter/api/function/ThrowingConsumer.java   | 2 +-
 .../java/org/junit/jupiter/api/function/ThrowingSupplier.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/io/CleanupMode.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/io/TempDir.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Execution.java | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ExecutionMode.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Isolated.java  | 2 +-
 .../java/org/junit/jupiter/api/parallel/ResourceAccessMode.java | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ResourceLock.java  | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ResourceLocks.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Resources.java | 2 +-
 .../src/main/kotlin/org/junit/jupiter/api/Assertions.kt         | 2 +-
 .../api/extension/ExtensionContextParameterResolver.java        | 2 +-
 .../java/org/junit/jupiter/api/fixtures/TrackLogRecords.java    | 2 +-
 .../src/main/java/org/junit/jupiter/engine/Constants.java       | 2 +-
 .../main/java/org/junit/jupiter/engine/JupiterTestEngine.java   | 2 +-
 .../jupiter/engine/config/CachingJupiterConfiguration.java      | 2 +-
 .../jupiter/engine/config/DefaultJupiterConfiguration.java      | 2 +-
 .../engine/config/EnumConfigurationParameterConverter.java      | 2 +-
 .../config/InstantiatingConfigurationParameterConverter.java    | 2 +-
 .../org/junit/jupiter/engine/config/JupiterConfiguration.java   | 2 +-
 .../jupiter/engine/descriptor/AbstractExtensionContext.java     | 2 +-
 .../jupiter/engine/descriptor/ClassBasedTestDescriptor.java     | 2 +-
 .../junit/jupiter/engine/descriptor/ClassExtensionContext.java  | 2 +-
 .../junit/jupiter/engine/descriptor/ClassTestDescriptor.java    | 2 +-
 .../engine/descriptor/DefaultDynamicTestInvocationContext.java  | 2 +-
 .../engine/descriptor/DefaultTestInstanceFactoryContext.java    | 2 +-
 .../org/junit/jupiter/engine/descriptor/DisplayNameUtils.java   | 2 +-
 .../engine/descriptor/DynamicContainerTestDescriptor.java       | 2 +-
 .../jupiter/engine/descriptor/DynamicDescendantFilter.java      | 2 +-
 .../jupiter/engine/descriptor/DynamicExtensionContext.java      | 2 +-
 .../jupiter/engine/descriptor/DynamicNodeTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/DynamicTestTestDescriptor.java    | 2 +-
 .../org/junit/jupiter/engine/descriptor/ExtensionUtils.java     | 2 +-
 .../java/org/junit/jupiter/engine/descriptor/Filterable.java    | 2 +-
 .../jupiter/engine/descriptor/JupiterEngineDescriptor.java      | 2 +-
 .../engine/descriptor/JupiterEngineExtensionContext.java        | 2 +-
 .../junit/jupiter/engine/descriptor/JupiterTestDescriptor.java  | 2 +-
 .../junit/jupiter/engine/descriptor/LifecycleMethodUtils.java   | 2 +-
 .../jupiter/engine/descriptor/MethodBasedTestDescriptor.java    | 2 +-
 .../junit/jupiter/engine/descriptor/MethodExtensionContext.java | 2 +-
 .../junit/jupiter/engine/descriptor/MethodSourceSupport.java    | 2 +-
 .../jupiter/engine/descriptor/NestedClassTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/TestFactoryTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/TestInstanceLifecycleUtils.java   | 2 +-
 .../jupiter/engine/descriptor/TestMethodTestDescriptor.java     | 2 +-
 .../jupiter/engine/descriptor/TestTemplateExtensionContext.java | 2 +-
 .../engine/descriptor/TestTemplateInvocationTestDescriptor.java | 2 +-
 .../jupiter/engine/descriptor/TestTemplateTestDescriptor.java   | 2 +-
 .../engine/discovery/AbstractAnnotatedDescriptorWrapper.java    | 2 +-
 .../junit/jupiter/engine/discovery/AbstractOrderingVisitor.java | 2 +-
 .../junit/jupiter/engine/discovery/ClassOrderingVisitor.java    | 2 +-
 .../junit/jupiter/engine/discovery/ClassSelectorResolver.java   | 2 +-
 .../junit/jupiter/engine/discovery/DefaultClassDescriptor.java  | 2 +-
 .../jupiter/engine/discovery/DefaultClassOrdererContext.java    | 2 +-
 .../junit/jupiter/engine/discovery/DefaultMethodDescriptor.java | 2 +-
 .../jupiter/engine/discovery/DefaultMethodOrdererContext.java   | 2 +-
 .../jupiter/engine/discovery/DiscoverySelectorResolver.java     | 2 +-
 .../java/org/junit/jupiter/engine/discovery/MethodFinder.java   | 2 +-
 .../junit/jupiter/engine/discovery/MethodOrderingVisitor.java   | 2 +-
 .../junit/jupiter/engine/discovery/MethodSelectorResolver.java  | 2 +-
 .../junit/jupiter/engine/discovery/predicates/IsInnerClass.java | 2 +-
 .../jupiter/engine/discovery/predicates/IsNestedTestClass.java  | 2 +-
 .../engine/discovery/predicates/IsPotentialTestContainer.java   | 2 +-
 .../engine/discovery/predicates/IsTestClassWithTests.java       | 2 +-
 .../engine/discovery/predicates/IsTestFactoryMethod.java        | 2 +-
 .../junit/jupiter/engine/discovery/predicates/IsTestMethod.java | 2 +-
 .../engine/discovery/predicates/IsTestTemplateMethod.java       | 2 +-
 .../jupiter/engine/discovery/predicates/IsTestableMethod.java   | 2 +-
 .../junit/jupiter/engine/execution/AfterEachMethodAdapter.java  | 2 +-
 .../junit/jupiter/engine/execution/BeforeEachMethodAdapter.java | 2 +-
 .../jupiter/engine/execution/ConditionEvaluationException.java  | 2 +-
 .../org/junit/jupiter/engine/execution/ConditionEvaluator.java  | 2 +-
 .../junit/jupiter/engine/execution/ConstructorInvocation.java   | 2 +-
 .../junit/jupiter/engine/execution/DefaultParameterContext.java | 2 +-
 .../junit/jupiter/engine/execution/DefaultTestInstances.java    | 2 +-
 .../org/junit/jupiter/engine/execution/ExecutableInvoker.java   | 2 +-
 .../junit/jupiter/engine/execution/ExtensionValuesStore.java    | 2 +-
 .../jupiter/engine/execution/InvocationInterceptorChain.java    | 2 +-
 .../jupiter/engine/execution/JupiterEngineExecutionContext.java | 2 +-
 .../org/junit/jupiter/engine/execution/MethodInvocation.java    | 2 +-
 .../org/junit/jupiter/engine/execution/NamespaceAwareStore.java | 2 +-
 .../junit/jupiter/engine/execution/TestInstancesProvider.java   | 2 +-
 .../org/junit/jupiter/engine/extension/DisabledCondition.java   | 2 +-
 .../org/junit/jupiter/engine/extension/ExtensionRegistrar.java  | 2 +-
 .../org/junit/jupiter/engine/extension/ExtensionRegistry.java   | 2 +-
 .../jupiter/engine/extension/MutableExtensionRegistry.java      | 2 +-
 .../engine/extension/RepeatedTestDisplayNameFormatter.java      | 2 +-
 .../junit/jupiter/engine/extension/RepeatedTestExtension.java   | 2 +-
 .../jupiter/engine/extension/RepeatedTestInvocationContext.java | 2 +-
 .../engine/extension/RepetitionInfoParameterResolver.java       | 2 +-
 .../java/org/junit/jupiter/engine/extension/TempDirectory.java  | 2 +-
 .../jupiter/engine/extension/TestInfoParameterResolver.java     | 2 +-
 .../jupiter/engine/extension/TestReporterParameterResolver.java | 2 +-
 .../junit/jupiter/engine/extension/TimeoutConfiguration.java    | 2 +-
 .../org/junit/jupiter/engine/extension/TimeoutDuration.java     | 2 +-
 .../junit/jupiter/engine/extension/TimeoutDurationParser.java   | 2 +-
 .../org/junit/jupiter/engine/extension/TimeoutExtension.java    | 2 +-
 .../org/junit/jupiter/engine/extension/TimeoutInvocation.java   | 2 +-
 .../engine/support/JupiterThrowableCollectorFactory.java        | 2 +-
 .../support/OpenTest4JAndJUnit4AwareThrowableCollector.java     | 2 +-
 junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java  | 2 +-
 junit-jupiter-engine/src/test/java/example/B_TestCase.java      | 2 +-
 .../src/test/java/org/junit/jupiter/JupiterTestSuite.java       | 2 +-
 .../java/org/junit/jupiter/api/AssertAllAssertionsTests.java    | 2 +-
 .../org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java | 2 +-
 .../junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java    | 2 +-
 .../java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java | 2 +-
 .../java/org/junit/jupiter/api/AssertFalseAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java  | 2 +-
 .../junit/jupiter/api/AssertIterableEqualsAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java   | 2 +-
 .../org/junit/jupiter/api/AssertNotNullAssertionsTests.java     | 2 +-
 .../org/junit/jupiter/api/AssertNotSameAssertionsTests.java     | 2 +-
 .../java/org/junit/jupiter/api/AssertNullAssertionsTests.java   | 2 +-
 .../java/org/junit/jupiter/api/AssertSameAssertionsTests.java   | 2 +-
 .../java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java | 2 +-
 .../junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java   | 2 +-
 .../org/junit/jupiter/api/AssertTimeoutAssertionsTests.java     | 2 +-
 .../java/org/junit/jupiter/api/AssertTrueAssertionsTests.java   | 2 +-
 .../src/test/java/org/junit/jupiter/api/AssertionTestUtils.java | 2 +-
 .../src/test/java/org/junit/jupiter/api/AssumptionsTests.java   | 2 +-
 .../jupiter/api/DisplayNameGenerationInheritanceTestCase.java   | 2 +-
 .../java/org/junit/jupiter/api/DisplayNameGenerationTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/api/DynamicTestTests.java   | 2 +-
 .../src/test/java/org/junit/jupiter/api/EnigmaThrowable.java    | 2 +-
 .../test/java/org/junit/jupiter/api/FailAssertionsTests.java    | 2 +-
 .../api/IndicativeSentencesGenerationInheritanceTestCase.java   | 2 +-
 .../junit/jupiter/api/IndicativeSentencesNestedTestCase.java    | 2 +-
 .../junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java  | 2 +-
 .../src/test/java/org/junit/jupiter/api/IterableFactory.java    | 2 +-
 .../jupiter/api/condition/AbstractExecutionConditionTests.java  | 2 +-
 .../api/condition/DisabledForJreRangeConditionTests.java        | 2 +-
 .../api/condition/DisabledForJreRangeIntegrationTests.java      | 2 +-
 .../junit/jupiter/api/condition/DisabledIfConditionTests.java   | 2 +-
 .../condition/DisabledIfEnvironmentVariableConditionTests.java  | 2 +-
 .../DisabledIfEnvironmentVariableIntegrationTests.java          | 2 +-
 .../junit/jupiter/api/condition/DisabledIfIntegrationTests.java | 2 +-
 .../api/condition/DisabledIfSystemPropertyConditionTests.java   | 2 +-
 .../api/condition/DisabledIfSystemPropertyIntegrationTests.java | 2 +-
 .../jupiter/api/condition/DisabledOnJreConditionTests.java      | 2 +-
 .../jupiter/api/condition/DisabledOnJreIntegrationTests.java    | 2 +-
 .../junit/jupiter/api/condition/DisabledOnOsConditionTests.java | 2 +-
 .../jupiter/api/condition/DisabledOnOsIntegrationTests.java     | 2 +-
 .../jupiter/api/condition/EnabledForJreRangeConditionTests.java | 2 +-
 .../api/condition/EnabledForJreRangeIntegrationTests.java       | 2 +-
 .../junit/jupiter/api/condition/EnabledIfConditionTests.java    | 2 +-
 .../condition/EnabledIfEnvironmentVariableConditionTests.java   | 2 +-
 .../condition/EnabledIfEnvironmentVariableIntegrationTests.java | 2 +-
 .../junit/jupiter/api/condition/EnabledIfIntegrationTests.java  | 2 +-
 .../api/condition/EnabledIfSystemPropertyConditionTests.java    | 2 +-
 .../api/condition/EnabledIfSystemPropertyIntegrationTests.java  | 2 +-
 .../junit/jupiter/api/condition/EnabledOnJreConditionTests.java | 2 +-
 .../jupiter/api/condition/EnabledOnJreIntegrationTests.java     | 2 +-
 .../junit/jupiter/api/condition/EnabledOnOsConditionTests.java  | 2 +-
 .../jupiter/api/condition/EnabledOnOsIntegrationTests.java      | 2 +-
 .../src/test/java/org/junit/jupiter/api/condition/JRETests.java | 2 +-
 .../org/junit/jupiter/api/condition/StaticConditionMethods.java | 2 +-
 .../api/extension/CloseableResourceIntegrationTests.java        | 2 +-
 .../jupiter/api/extension/ExtensionComposabilityTests.java      | 2 +-
 .../org/junit/jupiter/api/extension/KitchenSinkExtension.java   | 2 +-
 .../api/extension/support/TypeBasedParameterResolverTests.java  | 2 +-
 .../junit/jupiter/api/subpackage/SubclassedAssertionsTests.java | 2 +-
 .../jupiter/api/subpackage/SubclassedAssumptionsTests.java      | 2 +-
 .../junit/jupiter/engine/AbstractJupiterTestEngineTests.java    | 2 +-
 .../org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java    | 2 +-
 .../engine/BeforeAllAndAfterAllComposedAnnotationTests.java     | 2 +-
 .../engine/BeforeEachAndAfterEachComposedAnnotationTests.java   | 2 +-
 .../org/junit/jupiter/engine/DefaultExecutionModeTests.java     | 2 +-
 .../test/java/org/junit/jupiter/engine/DefaultMethodTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/engine/DisabledTests.java   | 2 +-
 .../org/junit/jupiter/engine/DynamicNodeGenerationTests.java    | 2 +-
 .../java/org/junit/jupiter/engine/ExceptionHandlingTests.java   | 2 +-
 .../java/org/junit/jupiter/engine/FailedAssumptionsTests.java   | 2 +-
 .../engine/InvalidLifecycleMethodConfigurationTests.java        | 2 +-
 .../org/junit/jupiter/engine/JupiterTestEngineBasicTests.java   | 2 +-
 .../junit/jupiter/engine/MultipleTestableAnnotationsTests.java  | 2 +-
 .../java/org/junit/jupiter/engine/NestedTestClassesTests.java   | 2 +-
 .../org/junit/jupiter/engine/NestedWithInheritanceTests.java    | 2 +-
 .../jupiter/engine/NestedWithSeparateInheritanceTests.java      | 2 +-
 .../jupiter/engine/NonVoidTestableMethodIntegrationTests.java   | 2 +-
 .../org/junit/jupiter/engine/OverloadedTestMethodTests.java     | 2 +-
 .../src/test/java/org/junit/jupiter/engine/RecordTests.java     | 2 +-
 .../src/test/java/org/junit/jupiter/engine/ReportingTests.java  | 2 +-
 .../test/java/org/junit/jupiter/engine/SealedClassTests.java    | 2 +-
 .../java/org/junit/jupiter/engine/StandardTestClassTests.java   | 2 +-
 .../org/junit/jupiter/engine/TestClassInheritanceTests.java     | 2 +-
 .../jupiter/engine/TestInstanceLifecycleConfigurationTests.java | 2 +-
 .../junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java  | 2 +-
 .../org/junit/jupiter/engine/TestInstanceLifecycleTests.java    | 2 +-
 .../org/junit/jupiter/engine/TestTemplateInvocationTests.java   | 2 +-
 .../junit/jupiter/engine/bridge/AbstractNonGenericTests.java    | 2 +-
 .../org/junit/jupiter/engine/bridge/AbstractNumberTests.java    | 2 +-
 .../java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java | 2 +-
 .../org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java | 2 +-
 .../junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java  | 2 +-
 .../java/org/junit/jupiter/engine/bridge/NumberResolver.java    | 2 +-
 .../java/org/junit/jupiter/engine/bridge/NumberTestGroup.java   | 2 +-
 .../org/junit/jupiter/engine/bridge/PackagePrivateParent.java   | 2 +-
 .../jupiter/engine/config/CachingJupiterConfigurationTests.java | 2 +-
 .../jupiter/engine/config/DefaultJupiterConfigurationTests.java | 2 +-
 .../InstantiatingConfigurationParameterConverterTests.java      | 2 +-
 .../jupiter/engine/descriptor/CustomDisplayNameGenerator.java   | 2 +-
 .../junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java  | 2 +-
 .../junit/jupiter/engine/descriptor/ExtensionContextTests.java  | 2 +-
 .../jupiter/engine/descriptor/JupiterTestDescriptorTests.java   | 2 +-
 .../jupiter/engine/descriptor/LifecycleMethodUtilsTests.java    | 2 +-
 .../engine/descriptor/TestFactoryTestDescriptorTests.java       | 2 +-
 .../engine/descriptor/TestInstanceLifecycleUtilsTests.java      | 2 +-
 .../descriptor/TestTemplateInvocationTestDescriptorTests.java   | 2 +-
 .../engine/descriptor/TestTemplateTestDescriptorTests.java      | 2 +-
 .../engine/descriptor/subpackage/Class1WithTestCases.java       | 2 +-
 .../engine/descriptor/subpackage/Class2WithTestCases.java       | 2 +-
 .../descriptor/subpackage/ClassWithStaticInnerTestCases.java    | 2 +-
 .../engine/descriptor/subpackage/ClassWithoutTestCases.java     | 2 +-
 .../engine/discovery/DiscoverySelectorResolverTests.java        | 2 +-
 .../java/org/junit/jupiter/engine/discovery/DiscoveryTests.java | 2 +-
 .../jupiter/engine/discovery/predicates/IsInnerClassTests.java  | 2 +-
 .../engine/discovery/predicates/IsNestedTestClassTests.java     | 2 +-
 .../discovery/predicates/IsPotentialTestContainerTests.java     | 2 +-
 .../engine/discovery/predicates/IsTestClassWithTestsTests.java  | 2 +-
 .../engine/discovery/predicates/IsTestFactoryMethodTests.java   | 2 +-
 .../jupiter/engine/discovery/predicates/IsTestMethodTests.java  | 2 +-
 .../engine/discovery/predicates/IsTestTemplateMethodTests.java  | 2 +-
 .../jupiter/engine/execution/DefaultTestInstancesTests.java     | 2 +-
 .../jupiter/engine/execution/DynamicTestIntegrationTests.java   | 2 +-
 .../junit/jupiter/engine/execution/ExecutableInvokerTests.java  | 2 +-
 .../engine/execution/ExtensionContextStoreConcurrencyTests.java | 2 +-
 .../jupiter/engine/execution/ExtensionContextStoreTests.java    | 2 +-
 .../jupiter/engine/execution/ExtensionValuesStoreTests.java     | 2 +-
 .../engine/execution/JupiterEngineExecutionContextTests.java    | 2 +-
 .../UniqueIdParsingForArrayParameterIntegrationTests.java       | 2 +-
 .../engine/execution/injection/sample/CustomAnnotation.java     | 2 +-
 .../injection/sample/CustomAnnotationParameterResolver.java     | 2 +-
 .../jupiter/engine/execution/injection/sample/CustomType.java   | 2 +-
 .../execution/injection/sample/CustomTypeParameterResolver.java | 2 +-
 .../execution/injection/sample/DoubleParameterResolver.java     | 2 +-
 .../execution/injection/sample/LongParameterResolver.java       | 2 +-
 .../injection/sample/MapOfListsTypeBasedParameterResolver.java  | 2 +-
 .../injection/sample/MapOfStringsParameterResolver.java         | 2 +-
 .../injection/sample/NullIntegerParameterResolver.java          | 2 +-
 .../execution/injection/sample/NumberParameterResolver.java     | 2 +-
 .../injection/sample/PrimitiveArrayParameterResolver.java       | 2 +-
 .../injection/sample/PrimitiveIntegerParameterResolver.java     | 2 +-
 .../junit/jupiter/engine/extension/BeforeAndAfterAllTests.java  | 2 +-
 .../junit/jupiter/engine/extension/BeforeAndAfterEachTests.java | 2 +-
 .../extension/BeforeAndAfterTestExecutionCallbackTests.java     | 2 +-
 .../jupiter/engine/extension/CloseablePathCleanupTests.java     | 2 +-
 .../org/junit/jupiter/engine/extension/EnigmaException.java     | 2 +-
 .../engine/extension/EventuallyInterruptibleInvocation.java     | 2 +-
 .../junit/jupiter/engine/extension/ExecutionConditionTests.java | 2 +-
 .../engine/extension/ExtensionContextExecutionTests.java        | 2 +-
 .../ExtensionRegistrationViaParametersAndFieldsTests.java       | 2 +-
 .../junit/jupiter/engine/extension/ExtensionRegistryTests.java  | 2 +-
 .../jupiter/engine/extension/InvocationInterceptorTests.java    | 2 +-
 .../LifecycleMethodExecutionExceptionHandlerTests.java          | 2 +-
 .../org/junit/jupiter/engine/extension/OrderedClassTests.java   | 2 +-
 .../org/junit/jupiter/engine/extension/OrderedMethodTests.java  | 2 +-
 .../OrderedProgrammaticExtensionRegistrationTests.java          | 2 +-
 .../junit/jupiter/engine/extension/ParameterResolverTests.java  | 2 +-
 .../extension/ProgrammaticExtensionRegistrationTests.java       | 2 +-
 .../junit/jupiter/engine/extension/RandomlyOrderedTests.java    | 2 +-
 .../org/junit/jupiter/engine/extension/RepeatedTestTests.java   | 2 +-
 .../junit/jupiter/engine/extension/ServiceLoaderExtension.java  | 2 +-
 .../jupiter/engine/extension/TempDirectoryCleanupTests.java     | 2 +-
 .../engine/extension/TempDirectoryParameterResolverTests.java   | 2 +-
 .../jupiter/engine/extension/TempDirectoryPerContextTests.java  | 2 +-
 .../engine/extension/TempDirectoryPerDeclarationTests.java      | 2 +-
 .../engine/extension/TestExecutionExceptionHandlerTests.java    | 2 +-
 .../engine/extension/TestInfoParameterResolverTests.java        | 2 +-
 .../jupiter/engine/extension/TestInstanceFactoryTests.java      | 2 +-
 .../TestInstancePostProcessorAndPreDestroyCallbackTests.java    | 2 +-
 .../engine/extension/TestInstancePostProcessorTests.java        | 2 +-
 .../engine/extension/TestInstancePreConstructCallbackTests.java | 2 +-
 .../engine/extension/TestInstancePreDestroyCallbackTests.java   | 2 +-
 .../TestInstancePreDestroyCallbackUtilityMethodTests.java       | 2 +-
 .../engine/extension/TestReporterParameterResolverTests.java    | 2 +-
 .../org/junit/jupiter/engine/extension/TestWatcherTests.java    | 2 +-
 .../jupiter/engine/extension/TimeoutConfigurationTests.java     | 2 +-
 .../jupiter/engine/extension/TimeoutDurationParserTests.java    | 2 +-
 .../junit/jupiter/engine/extension/TimeoutDurationTests.java    | 2 +-
 .../junit/jupiter/engine/extension/TimeoutExtensionTests.java   | 2 +-
 .../junit/jupiter/engine/extension/TimeoutInvocationTests.java  | 2 +-
 .../jupiter/engine/extension/sub/AlwaysDisabledCondition.java   | 2 +-
 .../engine/extension/sub/AnotherAlwaysDisabledCondition.java    | 2 +-
 .../jupiter/engine/extension/sub/SystemPropertyCondition.java   | 2 +-
 .../OpenTest4JAndJUnit4AwareThrowableCollectorTests.java        | 2 +-
 .../org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt | 2 +-
 .../test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt  | 2 +-
 .../kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt   | 2 +-
 .../jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt      | 2 +-
 .../jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt     | 2 +-
 .../jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt    | 2 +-
 .../junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java  | 2 +-
 .../jupiter/migrationsupport/EnableJUnit4MigrationSupport.java  | 2 +-
 .../jupiter/migrationsupport/conditions/IgnoreCondition.java    | 2 +-
 .../migrationsupport/rules/EnableRuleMigrationSupport.java      | 2 +-
 .../migrationsupport/rules/ExpectedExceptionSupport.java        | 2 +-
 .../jupiter/migrationsupport/rules/ExternalResourceSupport.java | 2 +-
 .../junit/jupiter/migrationsupport/rules/TestRuleSupport.java   | 2 +-
 .../junit/jupiter/migrationsupport/rules/VerifierSupport.java   | 2 +-
 .../migrationsupport/rules/adapter/AbstractTestRuleAdapter.java | 2 +-
 .../rules/adapter/ExpectedExceptionAdapter.java                 | 2 +-
 .../migrationsupport/rules/adapter/ExternalResourceAdapter.java | 2 +-
 .../rules/adapter/GenericBeforeAndAfterAdvice.java              | 2 +-
 .../jupiter/migrationsupport/rules/adapter/VerifierAdapter.java | 2 +-
 .../rules/member/AbstractTestRuleAnnotatedMember.java           | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedField.java   | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedMember.java  | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedMethod.java  | 2 +-
 .../migrationsupport/JupiterMigrationSupportTestSuite.java      | 2 +-
 .../conditions/IgnoreAnnotationIntegrationTests.java            | 2 +-
 .../migrationsupport/conditions/IgnoreConditionTests.java       | 2 +-
 .../migrationsupport/rules/AbstractTestRuleAdapterTests.java    | 2 +-
 .../rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java | 2 +-
 .../migrationsupport/rules/ExpectedExceptionSupportTests.java   | 2 +-
 ...esourceSupportForDifferentDeclaredReturnTypesRulesTests.java | 2 +-
 ...ExternalResourceSupportForMixedMethodAndFieldRulesTests.java | 2 +-
 .../ExternalResourceSupportForMultipleFieldRulesTests.java      | 2 +-
 .../ExternalResourceSupportForMultipleMethodRulesTests.java     | 2 +-
 .../ExternalResourceSupportForTemporaryFolderFieldTests.java    | 2 +-
 .../rules/ExternalResourceSupportWithInheritanceTests.java      | 2 +-
 .../rules/ExternalResourceWithoutAdapterTests.java              | 2 +-
 .../jupiter/migrationsupport/rules/FailAfterAllHelper.java      | 2 +-
 .../rules/LauncherBasedEnableRuleMigrationSupportTests.java     | 2 +-
 .../rules/VerifierSupportForMixedMethodAndFieldRulesTests.java  | 2 +-
 .../rules/WrongExtendWithForVerifierFieldTests.java             | 2 +-
 .../rules/WrongExtendWithForVerifierMethodTests.java            | 2 +-
 .../main/java/org/junit/jupiter/params/ParameterizedTest.java   | 2 +-
 .../org/junit/jupiter/params/ParameterizedTestExtension.java    | 2 +-
 .../jupiter/params/ParameterizedTestInvocationContext.java      | 2 +-
 .../junit/jupiter/params/ParameterizedTestMethodContext.java    | 2 +-
 .../junit/jupiter/params/ParameterizedTestNameFormatter.java    | 2 +-
 .../jupiter/params/ParameterizedTestParameterResolver.java      | 2 +-
 .../java/org/junit/jupiter/params/aggregator/AggregateWith.java | 2 +-
 .../jupiter/params/aggregator/ArgumentAccessException.java      | 2 +-
 .../org/junit/jupiter/params/aggregator/ArgumentsAccessor.java  | 2 +-
 .../params/aggregator/ArgumentsAggregationException.java        | 2 +-
 .../junit/jupiter/params/aggregator/ArgumentsAggregator.java    | 2 +-
 .../jupiter/params/aggregator/DefaultArgumentsAccessor.java     | 2 +-
 .../jupiter/params/converter/ArgumentConversionException.java   | 2 +-
 .../org/junit/jupiter/params/converter/ArgumentConverter.java   | 2 +-
 .../java/org/junit/jupiter/params/converter/ConvertWith.java    | 2 +-
 .../jupiter/params/converter/DefaultArgumentConverter.java      | 2 +-
 .../params/converter/FallbackStringToObjectConverter.java       | 2 +-
 .../jupiter/params/converter/JavaTimeArgumentConverter.java     | 2 +-
 .../jupiter/params/converter/JavaTimeConversionPattern.java     | 2 +-
 .../junit/jupiter/params/converter/SimpleArgumentConverter.java | 2 +-
 .../junit/jupiter/params/converter/TypedArgumentConverter.java  | 2 +-
 .../main/java/org/junit/jupiter/params/provider/Arguments.java  | 2 +-
 .../org/junit/jupiter/params/provider/ArgumentsProvider.java    | 2 +-
 .../java/org/junit/jupiter/params/provider/ArgumentsSource.java | 2 +-
 .../org/junit/jupiter/params/provider/ArgumentsSources.java     | 2 +-
 .../org/junit/jupiter/params/provider/CsvArgumentsProvider.java | 2 +-
 .../junit/jupiter/params/provider/CsvFileArgumentsProvider.java | 2 +-
 .../java/org/junit/jupiter/params/provider/CsvFileSource.java   | 2 +-
 .../org/junit/jupiter/params/provider/CsvParserFactory.java     | 2 +-
 .../org/junit/jupiter/params/provider/CsvParsingException.java  | 2 +-
 .../main/java/org/junit/jupiter/params/provider/CsvSource.java  | 2 +-
 .../junit/jupiter/params/provider/EmptyArgumentsProvider.java   | 2 +-
 .../java/org/junit/jupiter/params/provider/EmptySource.java     | 2 +-
 .../junit/jupiter/params/provider/EnumArgumentsProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/params/provider/EnumSource.java | 2 +-
 .../junit/jupiter/params/provider/MethodArgumentsProvider.java  | 2 +-
 .../java/org/junit/jupiter/params/provider/MethodSource.java    | 2 +-
 .../org/junit/jupiter/params/provider/NullAndEmptySource.java   | 2 +-
 .../junit/jupiter/params/provider/NullArgumentsProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/params/provider/NullEnum.java   | 2 +-
 .../main/java/org/junit/jupiter/params/provider/NullSource.java | 2 +-
 .../junit/jupiter/params/provider/ValueArgumentsProvider.java   | 2 +-
 .../java/org/junit/jupiter/params/provider/ValueSource.java     | 2 +-
 .../org/junit/jupiter/params/support/AnnotationConsumer.java    | 2 +-
 .../jupiter/params/support/AnnotationConsumerInitializer.java   | 2 +-
 .../org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt    | 2 +-
 .../junit/jupiter/params/ParameterizedTestExtensionTests.java   | 2 +-
 .../junit/jupiter/params/ParameterizedTestIntegrationTests.java | 2 +-
 .../jupiter/params/ParameterizedTestMethodContextTests.java     | 2 +-
 .../jupiter/params/ParameterizedTestNameFormatterTests.java     | 2 +-
 .../java/org/junit/jupiter/params/ParameterizedTestSuite.java   | 2 +-
 .../jupiter/params/aggregator/AggregatorIntegrationTests.java   | 2 +-
 .../params/aggregator/DefaultArgumentsAccessorTests.java        | 2 +-
 .../jupiter/params/converter/DefaultArgumentConverterTests.java | 2 +-
 .../params/converter/FallbackStringToObjectConverterTests.java  | 2 +-
 .../params/converter/JavaTimeArgumentConverterTests.java        | 2 +-
 .../jupiter/params/converter/TypedArgumentConverterTests.java   | 2 +-
 .../java/org/junit/jupiter/params/provider/ArgumentsTests.java  | 2 +-
 .../jupiter/params/provider/CsvArgumentsProviderTests.java      | 2 +-
 .../jupiter/params/provider/CsvFileArgumentsProviderTests.java  | 2 +-
 .../jupiter/params/provider/EnumArgumentsProviderTests.java     | 2 +-
 .../java/org/junit/jupiter/params/provider/EnumSourceTests.java | 2 +-
 .../jupiter/params/provider/MethodArgumentsProviderTests.java   | 2 +-
 .../junit/jupiter/params/provider/MockCsvAnnotationBuilder.java | 2 +-
 .../jupiter/params/provider/ValueArgumentsProviderTests.java    | 2 +-
 .../jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt   | 2 +-
 .../org/junit/jupiter/params/aggregator/DisplayNameTests.kt     | 2 +-
 .../main/java/org/junit/platform/commons/JUnitException.java    | 2 +-
 .../junit/platform/commons/PreconditionViolationException.java  | 2 +-
 .../java/org/junit/platform/commons/annotation/Testable.java    | 2 +-
 .../src/main/java/org/junit/platform/commons/function/Try.java  | 2 +-
 .../org/junit/platform/commons/logging/LogRecordListener.java   | 2 +-
 .../main/java/org/junit/platform/commons/logging/Logger.java    | 2 +-
 .../java/org/junit/platform/commons/logging/LoggerFactory.java  | 2 +-
 .../org/junit/platform/commons/support/AnnotationSupport.java   | 2 +-
 .../java/org/junit/platform/commons/support/ClassSupport.java   | 2 +-
 .../junit/platform/commons/support/HierarchyTraversalMode.java  | 2 +-
 .../org/junit/platform/commons/support/ModifierSupport.java     | 2 +-
 .../org/junit/platform/commons/support/ReflectionSupport.java   | 2 +-
 .../java/org/junit/platform/commons/support/SearchOption.java   | 2 +-
 .../java/org/junit/platform/commons/util/AnnotationUtils.java   | 2 +-
 .../org/junit/platform/commons/util/BlacklistedExceptions.java  | 2 +-
 .../java/org/junit/platform/commons/util/ClassFileVisitor.java  | 2 +-
 .../main/java/org/junit/platform/commons/util/ClassFilter.java  | 2 +-
 .../java/org/junit/platform/commons/util/ClassLoaderUtils.java  | 2 +-
 .../platform/commons/util/ClassNamePatternFilterUtils.java      | 2 +-
 .../main/java/org/junit/platform/commons/util/ClassUtils.java   | 2 +-
 .../java/org/junit/platform/commons/util/ClasspathScanner.java  | 2 +-
 .../java/org/junit/platform/commons/util/CloseablePath.java     | 2 +-
 .../java/org/junit/platform/commons/util/CollectionUtils.java   | 2 +-
 .../java/org/junit/platform/commons/util/ExceptionUtils.java    | 2 +-
 .../java/org/junit/platform/commons/util/FunctionUtils.java     | 2 +-
 .../src/main/java/org/junit/platform/commons/util/LruCache.java | 2 +-
 .../main/java/org/junit/platform/commons/util/ModuleUtils.java  | 2 +-
 .../main/java/org/junit/platform/commons/util/PackageUtils.java | 2 +-
 .../platform/commons/util/PreconditionViolationException.java   | 2 +-
 .../java/org/junit/platform/commons/util/Preconditions.java     | 2 +-
 .../java/org/junit/platform/commons/util/ReflectionUtils.java   | 2 +-
 .../main/java/org/junit/platform/commons/util/RuntimeUtils.java | 2 +-
 .../main/java/org/junit/platform/commons/util/StringUtils.java  | 2 +-
 .../java/org/junit/platform/commons/util/ToStringBuilder.java   | 2 +-
 .../junit/platform/commons/util/UnrecoverableExceptions.java    | 2 +-
 .../main/java9/org/junit/platform/commons/util/ModuleUtils.java | 2 +-
 .../junit/platform/commons/test/ConcurrencyTestingUtils.java    | 2 +-
 .../main/java/org/junit/platform/console/ConsoleLauncher.java   | 2 +-
 .../junit/platform/console/ConsoleLauncherExecutionResult.java  | 2 +-
 .../org/junit/platform/console/options/AvailableOptions.java    | 2 +-
 .../org/junit/platform/console/options/CommandLineOptions.java  | 2 +-
 .../platform/console/options/CommandLineOptionsParser.java      | 2 +-
 .../main/java/org/junit/platform/console/options/Details.java   | 2 +-
 .../console/options/PicocliCommandLineOptionsParser.java        | 2 +-
 .../org/junit/platform/console/options/SelectorConverter.java   | 2 +-
 .../src/main/java/org/junit/platform/console/options/Theme.java | 2 +-
 .../src/main/java/org/junit/platform/console/tasks/Color.java   | 2 +-
 .../org/junit/platform/console/tasks/ConsoleTestExecutor.java   | 2 +-
 .../console/tasks/CustomContextClassLoaderExecutor.java         | 2 +-
 .../junit/platform/console/tasks/DiscoveryRequestCreator.java   | 2 +-
 .../org/junit/platform/console/tasks/FlatPrintingListener.java  | 2 +-
 .../main/java/org/junit/platform/console/tasks/TreeNode.java    | 2 +-
 .../main/java/org/junit/platform/console/tasks/TreePrinter.java | 2 +-
 .../org/junit/platform/console/tasks/TreePrintingListener.java  | 2 +-
 .../platform/console/tasks/VerboseTreePrintingListener.java     | 2 +-
 .../org/junit/platform/console/ConsoleLauncherToolProvider.java | 2 +-
 .../main/java/org/junit/platform/engine/CompositeFilter.java    | 2 +-
 .../java/org/junit/platform/engine/ConfigurationParameters.java | 2 +-
 .../main/java/org/junit/platform/engine/DiscoveryFilter.java    | 2 +-
 .../main/java/org/junit/platform/engine/DiscoverySelector.java  | 2 +-
 .../java/org/junit/platform/engine/EngineDiscoveryListener.java | 2 +-
 .../java/org/junit/platform/engine/EngineDiscoveryRequest.java  | 2 +-
 .../java/org/junit/platform/engine/EngineExecutionListener.java | 2 +-
 .../main/java/org/junit/platform/engine/ExecutionRequest.java   | 2 +-
 .../src/main/java/org/junit/platform/engine/Filter.java         | 2 +-
 .../src/main/java/org/junit/platform/engine/FilterResult.java   | 2 +-
 .../org/junit/platform/engine/SelectorResolutionResult.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestDescriptor.java | 2 +-
 .../src/main/java/org/junit/platform/engine/TestEngine.java     | 2 +-
 .../java/org/junit/platform/engine/TestExecutionResult.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestSource.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestTag.java        | 2 +-
 .../src/main/java/org/junit/platform/engine/UniqueId.java       | 2 +-
 .../src/main/java/org/junit/platform/engine/UniqueIdFormat.java | 2 +-
 .../platform/engine/discovery/AbstractClassNameFilter.java      | 2 +-
 .../org/junit/platform/engine/discovery/ClassNameFilter.java    | 2 +-
 .../java/org/junit/platform/engine/discovery/ClassSelector.java | 2 +-
 .../platform/engine/discovery/ClasspathResourceSelector.java    | 2 +-
 .../junit/platform/engine/discovery/ClasspathRootSelector.java  | 2 +-
 .../org/junit/platform/engine/discovery/DirectorySelector.java  | 2 +-
 .../org/junit/platform/engine/discovery/DiscoverySelectors.java | 2 +-
 .../junit/platform/engine/discovery/ExcludeClassNameFilter.java | 2 +-
 .../platform/engine/discovery/ExcludePackageNameFilter.java     | 2 +-
 .../java/org/junit/platform/engine/discovery/FilePosition.java  | 2 +-
 .../java/org/junit/platform/engine/discovery/FileSelector.java  | 2 +-
 .../junit/platform/engine/discovery/IncludeClassNameFilter.java | 2 +-
 .../platform/engine/discovery/IncludePackageNameFilter.java     | 2 +-
 .../org/junit/platform/engine/discovery/IterationSelector.java  | 2 +-
 .../org/junit/platform/engine/discovery/MethodSelector.java     | 2 +-
 .../org/junit/platform/engine/discovery/ModuleSelector.java     | 2 +-
 .../junit/platform/engine/discovery/NestedClassSelector.java    | 2 +-
 .../junit/platform/engine/discovery/NestedMethodSelector.java   | 2 +-
 .../org/junit/platform/engine/discovery/PackageNameFilter.java  | 2 +-
 .../org/junit/platform/engine/discovery/PackageSelector.java    | 2 +-
 .../org/junit/platform/engine/discovery/UniqueIdSelector.java   | 2 +-
 .../java/org/junit/platform/engine/discovery/UriSelector.java   | 2 +-
 .../java/org/junit/platform/engine/reporting/ReportEntry.java   | 2 +-
 .../engine/support/config/PrefixedConfigurationParameters.java  | 2 +-
 .../engine/support/descriptor/AbstractTestDescriptor.java       | 2 +-
 .../junit/platform/engine/support/descriptor/ClassSource.java   | 2 +-
 .../engine/support/descriptor/ClasspathResourceSource.java      | 2 +-
 .../platform/engine/support/descriptor/CompositeTestSource.java | 2 +-
 .../platform/engine/support/descriptor/DefaultUriSource.java    | 2 +-
 .../platform/engine/support/descriptor/DirectorySource.java     | 2 +-
 .../platform/engine/support/descriptor/EngineDescriptor.java    | 2 +-
 .../junit/platform/engine/support/descriptor/FilePosition.java  | 2 +-
 .../junit/platform/engine/support/descriptor/FileSource.java    | 2 +-
 .../platform/engine/support/descriptor/FileSystemSource.java    | 2 +-
 .../junit/platform/engine/support/descriptor/MethodSource.java  | 2 +-
 .../junit/platform/engine/support/descriptor/PackageSource.java | 2 +-
 .../junit/platform/engine/support/descriptor/ResourceUtils.java | 2 +-
 .../org/junit/platform/engine/support/descriptor/UriSource.java | 2 +-
 .../support/discovery/ClassContainerSelectorResolver.java       | 2 +-
 .../support/discovery/EngineDiscoveryRequestResolution.java     | 2 +-
 .../support/discovery/EngineDiscoveryRequestResolver.java       | 2 +-
 .../platform/engine/support/discovery/SelectorResolver.java     | 2 +-
 .../engine/support/filter/ClasspathScanningSupport.java         | 2 +-
 .../platform/engine/support/hierarchical/CompositeLock.java     | 2 +-
 .../hierarchical/DefaultParallelExecutionConfiguration.java     | 2 +-
 .../DefaultParallelExecutionConfigurationStrategy.java          | 2 +-
 .../engine/support/hierarchical/EngineExecutionContext.java     | 2 +-
 .../platform/engine/support/hierarchical/ExclusiveResource.java | 2 +-
 .../ForkJoinPoolHierarchicalTestExecutorService.java            | 2 +-
 .../engine/support/hierarchical/HierarchicalTestEngine.java     | 2 +-
 .../engine/support/hierarchical/HierarchicalTestExecutor.java   | 2 +-
 .../support/hierarchical/HierarchicalTestExecutorService.java   | 2 +-
 .../junit/platform/engine/support/hierarchical/LockManager.java | 2 +-
 .../org/junit/platform/engine/support/hierarchical/Node.java    | 2 +-
 .../engine/support/hierarchical/NodeExecutionAdvisor.java       | 2 +-
 .../platform/engine/support/hierarchical/NodeTestTask.java      | 2 +-
 .../engine/support/hierarchical/NodeTestTaskContext.java        | 2 +-
 .../platform/engine/support/hierarchical/NodeTreeWalker.java    | 2 +-
 .../junit/platform/engine/support/hierarchical/NodeUtils.java   | 2 +-
 .../org/junit/platform/engine/support/hierarchical/NopLock.java | 2 +-
 .../support/hierarchical/OpenTest4JAwareThrowableCollector.java | 2 +-
 .../support/hierarchical/ParallelExecutionConfiguration.java    | 2 +-
 .../hierarchical/ParallelExecutionConfigurationStrategy.java    | 2 +-
 .../platform/engine/support/hierarchical/ResourceLock.java      | 2 +-
 .../hierarchical/SameThreadHierarchicalTestExecutorService.java | 2 +-
 .../junit/platform/engine/support/hierarchical/SingleLock.java  | 2 +-
 .../engine/support/hierarchical/SingleTestExecutor.java         | 2 +-
 .../engine/support/hierarchical/ThrowableCollector.java         | 2 +-
 .../engine/support/hierarchical/DemoEngineExecutionContext.java | 2 +-
 .../hierarchical/DemoHierarchicalContainerDescriptor.java       | 2 +-
 .../support/hierarchical/DemoHierarchicalEngineDescriptor.java  | 2 +-
 .../support/hierarchical/DemoHierarchicalTestDescriptor.java    | 2 +-
 .../engine/support/hierarchical/DemoHierarchicalTestEngine.java | 2 +-
 .../java/org/junit/platform/fakes/TestDescriptorStub.java       | 2 +-
 .../java/org/junit/platform/fakes/TestEngineSpy.java            | 2 +-
 .../java/org/junit/platform/fakes/TestEngineStub.java           | 2 +-
 .../junit/platform/jfr/FlightRecordingDiscoveryListener.java    | 2 +-
 .../junit/platform/jfr/FlightRecordingExecutionListener.java    | 2 +-
 .../src/main/java/org/junit/platform/jfr/UniqueId.java          | 2 +-
 .../java/org/junit/platform/launcher/EngineDiscoveryResult.java | 2 +-
 .../src/main/java/org/junit/platform/launcher/EngineFilter.java | 2 +-
 .../src/main/java/org/junit/platform/launcher/Launcher.java     | 2 +-
 .../java/org/junit/platform/launcher/LauncherConstants.java     | 2 +-
 .../org/junit/platform/launcher/LauncherDiscoveryListener.java  | 2 +-
 .../org/junit/platform/launcher/LauncherDiscoveryRequest.java   | 2 +-
 .../main/java/org/junit/platform/launcher/LauncherSession.java  | 2 +-
 .../org/junit/platform/launcher/LauncherSessionListener.java    | 2 +-
 .../java/org/junit/platform/launcher/PostDiscoveryFilter.java   | 2 +-
 .../src/main/java/org/junit/platform/launcher/TagFilter.java    | 2 +-
 .../java/org/junit/platform/launcher/TestExecutionListener.java | 2 +-
 .../main/java/org/junit/platform/launcher/TestIdentifier.java   | 2 +-
 .../src/main/java/org/junit/platform/launcher/TestPlan.java     | 2 +-
 .../platform/launcher/core/CompositeTestExecutionListener.java  | 2 +-
 .../junit/platform/launcher/core/DefaultDiscoveryRequest.java   | 2 +-
 .../java/org/junit/platform/launcher/core/DefaultLauncher.java  | 2 +-
 .../org/junit/platform/launcher/core/DefaultLauncherConfig.java | 2 +-
 .../junit/platform/launcher/core/DefaultLauncherSession.java    | 2 +-
 .../launcher/core/DelegatingEngineExecutionListener.java        | 2 +-
 .../platform/launcher/core/EngineDiscoveryErrorDescriptor.java  | 2 +-
 .../platform/launcher/core/EngineDiscoveryOrchestrator.java     | 2 +-
 .../platform/launcher/core/EngineDiscoveryResultValidator.java  | 2 +-
 .../platform/launcher/core/EngineExecutionOrchestrator.java     | 2 +-
 .../org/junit/platform/launcher/core/EngineIdValidator.java     | 2 +-
 .../junit/platform/launcher/core/ExecutionListenerAdapter.java  | 2 +-
 .../java/org/junit/platform/launcher/core/InternalLauncher.java | 2 +-
 .../java/org/junit/platform/launcher/core/InternalTestPlan.java | 2 +-
 .../java/org/junit/platform/launcher/core/LauncherConfig.java   | 2 +-
 .../platform/launcher/core/LauncherConfigurationParameters.java | 2 +-
 .../platform/launcher/core/LauncherDiscoveryRequestBuilder.java | 2 +-
 .../junit/platform/launcher/core/LauncherDiscoveryResult.java   | 2 +-
 .../java/org/junit/platform/launcher/core/LauncherFactory.java  | 2 +-
 .../java/org/junit/platform/launcher/core/ListenerRegistry.java | 2 +-
 .../launcher/core/OutcomeDelayingEngineExecutionListener.java   | 2 +-
 .../org/junit/platform/launcher/core/ServiceLoaderRegistry.java | 2 +-
 .../platform/launcher/core/ServiceLoaderTestEngineRegistry.java | 2 +-
 .../junit/platform/launcher/core/SessionPerRequestLauncher.java | 2 +-
 .../launcher/core/StreamInterceptingTestExecutionListener.java  | 2 +-
 .../org/junit/platform/launcher/core/StreamInterceptor.java     | 2 +-
 .../junit/platform/launcher/listeners/LegacyReportingUtils.java | 2 +-
 .../org/junit/platform/launcher/listeners/LoggingListener.java  | 2 +-
 .../launcher/listeners/MutableTestExecutionSummary.java         | 2 +-
 .../platform/launcher/listeners/SummaryGeneratingListener.java  | 2 +-
 .../junit/platform/launcher/listeners/TestExecutionSummary.java | 2 +-
 .../platform/launcher/listeners/UniqueIdTrackingListener.java   | 2 +-
 .../discovery/AbortOnFailureLauncherDiscoveryListener.java      | 2 +-
 .../listeners/discovery/CompositeLauncherDiscoveryListener.java | 2 +-
 .../listeners/discovery/LauncherDiscoveryListeners.java         | 2 +-
 .../listeners/discovery/LoggingLauncherDiscoveryListener.java   | 2 +-
 .../listeners/session/CompositeLauncherSessionListener.java     | 2 +-
 .../launcher/listeners/session/LauncherSessionListeners.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/DequeStack.java   | 2 +-
 .../org/junit/platform/launcher/tagexpression/Operator.java     | 2 +-
 .../org/junit/platform/launcher/tagexpression/Operators.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseResult.java  | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseResults.java | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseStatus.java  | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Parser.java  | 2 +-
 .../org/junit/platform/launcher/tagexpression/ShuntingYard.java | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Stack.java   | 2 +-
 .../junit/platform/launcher/tagexpression/TagExpression.java    | 2 +-
 .../junit/platform/launcher/tagexpression/TagExpressions.java   | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Token.java   | 2 +-
 .../org/junit/platform/launcher/tagexpression/TokenWith.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/Tokenizer.java    | 2 +-
 .../launcher/core/ConfigurationParametersFactoryForTests.java   | 2 +-
 .../launcher/core/LauncherFactoryForTestingPurposesOnly.java    | 2 +-
 .../junit/platform/reporting/legacy/LegacyReportingUtils.java   | 2 +-
 .../reporting/legacy/xml/LegacyXmlReportGeneratingListener.java | 2 +-
 .../org/junit/platform/reporting/legacy/xml/XmlReportData.java  | 2 +-
 .../junit/platform/reporting/legacy/xml/XmlReportWriter.java    | 2 +-
 .../src/main/java/org/junit/platform/runner/JUnitPlatform.java  | 2 +-
 .../org/junit/platform/runner/JUnitPlatformRunnerListener.java  | 2 +-
 .../java/org/junit/platform/runner/JUnitPlatformTestTree.java   | 2 +-
 .../org/junit/platform/suite/api/ConfigurationParameter.java    | 2 +-
 .../org/junit/platform/suite/api/ConfigurationParameters.java   | 2 +-
 .../suite/api/DisableParentConfigurationParameters.java         | 2 +-
 .../org/junit/platform/suite/api/ExcludeClassNamePatterns.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/ExcludeEngines.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/ExcludePackages.java | 2 +-
 .../src/main/java/org/junit/platform/suite/api/ExcludeTags.java | 2 +-
 .../org/junit/platform/suite/api/IncludeClassNamePatterns.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/IncludeEngines.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/IncludePackages.java | 2 +-
 .../src/main/java/org/junit/platform/suite/api/IncludeTags.java | 2 +-
 .../main/java/org/junit/platform/suite/api/SelectClasses.java   | 2 +-
 .../org/junit/platform/suite/api/SelectClasspathResource.java   | 2 +-
 .../org/junit/platform/suite/api/SelectClasspathResources.java  | 2 +-
 .../java/org/junit/platform/suite/api/SelectDirectories.java    | 2 +-
 .../src/main/java/org/junit/platform/suite/api/SelectFile.java  | 2 +-
 .../src/main/java/org/junit/platform/suite/api/SelectFiles.java | 2 +-
 .../main/java/org/junit/platform/suite/api/SelectModules.java   | 2 +-
 .../main/java/org/junit/platform/suite/api/SelectPackages.java  | 2 +-
 .../src/main/java/org/junit/platform/suite/api/SelectUris.java  | 2 +-
 .../src/main/java/org/junit/platform/suite/api/Suite.java       | 2 +-
 .../java/org/junit/platform/suite/api/SuiteDisplayName.java     | 2 +-
 .../java/org/junit/platform/suite/api/UseTechnicalNames.java    | 2 +-
 .../platform/suite/commons/AdditionalDiscoverySelectors.java    | 2 +-
 .../suite/commons/SuiteLauncherDiscoveryRequestBuilder.java     | 2 +-
 .../org/junit/platform/suite/engine/ClassSelectorResolver.java  | 2 +-
 .../junit/platform/suite/engine/DiscoverySelectorResolver.java  | 2 +-
 .../junit/platform/suite/engine/IsPotentialTestContainer.java   | 2 +-
 .../main/java/org/junit/platform/suite/engine/IsSuiteClass.java | 2 +-
 .../org/junit/platform/suite/engine/SuiteEngineDescriptor.java  | 2 +-
 .../java/org/junit/platform/suite/engine/SuiteLauncher.java     | 2 +-
 .../org/junit/platform/suite/engine/SuiteTestDescriptor.java    | 2 +-
 .../java/org/junit/platform/suite/engine/SuiteTestEngine.java   | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Assertions.java | 2 +-
 .../junit/platform/testkit/engine/EngineExecutionResults.java   | 2 +-
 .../java/org/junit/platform/testkit/engine/EngineTestKit.java   | 2 +-
 .../src/main/java/org/junit/platform/testkit/engine/Event.java  | 2 +-
 .../java/org/junit/platform/testkit/engine/EventConditions.java | 2 +-
 .../java/org/junit/platform/testkit/engine/EventStatistics.java | 2 +-
 .../main/java/org/junit/platform/testkit/engine/EventType.java  | 2 +-
 .../src/main/java/org/junit/platform/testkit/engine/Events.java | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Execution.java  | 2 +-
 .../org/junit/platform/testkit/engine/ExecutionRecorder.java    | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Executions.java | 2 +-
 .../java/org/junit/platform/testkit/engine/TerminationInfo.java | 2 +-
 .../platform/testkit/engine/TestExecutionResultConditions.java  | 2 +-
 .../main/java/org/junit/vintage/engine/JUnit4VersionCheck.java  | 2 +-
 .../main/java/org/junit/vintage/engine/VintageTestEngine.java   | 2 +-
 .../org/junit/vintage/engine/descriptor/DescriptionUtils.java   | 2 +-
 .../main/java/org/junit/vintage/engine/descriptor/OrFilter.java | 2 +-
 .../org/junit/vintage/engine/descriptor/RunnerDecorator.java    | 2 +-
 .../java/org/junit/vintage/engine/descriptor/RunnerRequest.java | 2 +-
 .../junit/vintage/engine/descriptor/RunnerTestDescriptor.java   | 2 +-
 .../org/junit/vintage/engine/descriptor/TestSourceProvider.java | 2 +-
 .../vintage/engine/descriptor/VintageEngineDescriptor.java      | 2 +-
 .../junit/vintage/engine/descriptor/VintageTestDescriptor.java  | 2 +-
 .../junit/vintage/engine/discovery/ClassSelectorResolver.java   | 2 +-
 .../discovery/DefensiveAllDefaultPossibilitiesBuilder.java      | 2 +-
 .../engine/discovery/FilterableIgnoringRunnerDecorator.java     | 2 +-
 .../junit/vintage/engine/discovery/IgnoringRunnerDecorator.java | 2 +-
 .../vintage/engine/discovery/IsPotentialJUnit4TestClass.java    | 2 +-
 .../vintage/engine/discovery/IsPotentialJUnit4TestMethod.java   | 2 +-
 .../junit/vintage/engine/discovery/MethodSelectorResolver.java  | 2 +-
 .../engine/discovery/RunnerTestDescriptorPostProcessor.java     | 2 +-
 .../java/org/junit/vintage/engine/discovery/UniqueIdFilter.java | 2 +-
 .../org/junit/vintage/engine/discovery/VintageDiscoverer.java   | 2 +-
 .../main/java/org/junit/vintage/engine/execution/EventType.java | 2 +-
 .../org/junit/vintage/engine/execution/RunListenerAdapter.java  | 2 +-
 .../java/org/junit/vintage/engine/execution/RunnerExecutor.java | 2 +-
 .../main/java/org/junit/vintage/engine/execution/TestRun.java   | 2 +-
 .../java/org/junit/vintage/engine/support/UniqueIdReader.java   | 2 +-
 .../org/junit/vintage/engine/support/UniqueIdStringifier.java   | 2 +-
 .../java/org/junit/vintage/engine/JUnit4ParameterizedTests.java | 2 +-
 .../java/org/junit/vintage/engine/JUnit4VersionCheckTests.java  | 2 +-
 .../junit/vintage/engine/VintageLauncherIntegrationTests.java   | 2 +-
 .../org/junit/vintage/engine/VintageTestEngineBasicTests.java   | 2 +-
 .../junit/vintage/engine/VintageTestEngineDiscoveryTests.java   | 2 +-
 .../junit/vintage/engine/VintageTestEngineExecutionTests.java   | 2 +-
 .../org/junit/vintage/engine/VintageTestEngineTestSuite.java    | 2 +-
 .../java/org/junit/vintage/engine/VintageUniqueIdBuilder.java   | 2 +-
 .../junit/vintage/engine/descriptor/DescriptionUtilsTests.java  | 2 +-
 .../java/org/junit/vintage/engine/descriptor/OrFilterTests.java | 2 +-
 .../vintage/engine/descriptor/TestSourceProviderTests.java      | 2 +-
 .../vintage/engine/descriptor/VintageTestDescriptorTests.java   | 2 +-
 .../engine/discovery/IsPotentialJUnit4TestClassTests.java       | 2 +-
 .../discovery/RunnerTestDescriptorPostProcessorTests.java       | 2 +-
 .../junit/vintage/engine/discovery/VintageDiscovererTests.java  | 2 +-
 .../java/org/junit/vintage/engine/execution/TestRunTests.java   | 2 +-
 .../org/junit/vintage/engine/support/UniqueIdReaderTests.java   | 2 +-
 .../junit/vintage/engine/support/UniqueIdStringifierTests.java  | 2 +-
 .../samples/PlainOldJavaClassWithoutAnyTestsTestCase.java       | 2 +-
 .../vintage/engine/samples/junit3/AbstractJUnit3TestCase.java   | 2 +-
 .../engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java | 2 +-
 .../JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java  | 2 +-
 .../vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java | 2 +-
 .../junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java     | 2 +-
 .../vintage/engine/samples/junit4/AbstractJUnit4TestCase.java   | 2 +-
 .../junit4/AbstractJunit4TestCaseWithConstructorParameter.java  | 2 +-
 .../org/junit/vintage/engine/samples/junit4/Categories.java     | 2 +-
 .../engine/samples/junit4/CompletelyDynamicTestCase.java        | 2 +-
 .../vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java   | 2 +-
 .../junit/vintage/engine/samples/junit4/ConfigurableRunner.java | 2 +-
 .../org/junit/vintage/engine/samples/junit4/DynamicRunner.java  | 2 +-
 .../vintage/engine/samples/junit4/EmptyIgnoredTestCase.java     | 2 +-
 .../vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java   | 2 +-
 .../vintage/engine/samples/junit4/ExceptionThrowingRunner.java  | 2 +-
 .../vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java    | 2 +-
 .../junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java    | 2 +-
 .../engine/samples/junit4/IgnoredParameterizedTestCase.java     | 2 +-
 .../engine/samples/junit4/JUnit4ParameterizedTestCase.java      | 2 +-
 .../junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java     | 2 +-
 .../junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java     | 2 +-
 ...iteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java | 2 +-
 ...it4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java | 2 +-
 .../samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java  | 2 +-
 .../samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java    | 2 +-
 .../junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java    | 2 +-
 ...iteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java | 2 +-
 .../JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java    | 2 +-
 ...stCaseWithFailingDescriptionThatIsNotReportedAsFinished.java | 2 +-
 ...it4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java | 2 +-
 ...uiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java | 2 +-
 .../engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java      | 2 +-
 .../JUnit4TestCaseWithAssumptionFailureInBeforeClass.java       | 2 +-
 .../JUnit4TestCaseWithDistinguishableOverloadedMethod.java      | 2 +-
 ...JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java | 2 +-
 .../samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java     | 2 +-
 .../samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java    | 2 +-
 .../junit4/JUnit4TestCaseWithExceptionThrowingRunner.java       | 2 +-
 ...stCaseWithFailingDescriptionThatIsNotReportedAsFinished.java | 2 +-
 .../JUnit4TestCaseWithIndistinguishableOverloadedMethod.java    | 2 +-
 .../samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java   | 2 +-
 ...it4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java | 2 +-
 ...estCaseWithRunnerWithDuplicateChangingChildDescriptions.java | 2 +-
 .../vintage/engine/samples/junit4/MalformedJUnit4TestCase.java  | 2 +-
 .../vintage/engine/samples/junit4/NotFilterableRunner.java      | 2 +-
 .../vintage/engine/samples/junit4/ParameterizedTestCase.java    | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java  | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java | 2 +-
 .../PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java   | 2 +-
 .../junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java     | 2 +-
 .../junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java   | 2 +-
 .../engine/samples/junit4/RunnerThatOnlyReportsFailures.java    | 2 +-
 .../junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java        | 2 +-
 .../engine/samples/junit4/SingleFailingTheoryTestCase.java      | 2 +-
 .../samples/junit4/TestCaseRunWithJUnitPlatformRunner.java      | 2 +-
 .../src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java | 2 +-
 platform-tests/src/test/java/DefaultPackageTestCase.java        | 2 +-
 .../src/test/java/org/junit/jupiter/api/condition/OSTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/extensions/Heavyweight.java | 2 +-
 .../java/org/junit/jupiter/extensions/HeavyweightTests.java     | 2 +-
 .../java/org/junit/platform/AbstractEqualsAndHashCodeTests.java | 2 +-
 .../test/java/org/junit/platform/JUnitPlatformTestSuite.java    | 2 +-
 .../src/test/java/org/junit/platform/TestEngineTests.java       | 2 +-
 .../platform/commons/annotation/TestableAnnotationTests.java    | 2 +-
 .../test/java/org/junit/platform/commons/function/TryTests.java | 2 +-
 .../junit/platform/commons/support/AnnotationSupportTests.java  | 2 +-
 .../org/junit/platform/commons/support/ClassSupportTests.java   | 2 +-
 .../junit/platform/commons/support/ModifierSupportTests.java    | 2 +-
 .../junit/platform/commons/support/PreconditionAssertions.java  | 2 +-
 .../junit/platform/commons/support/ReflectionSupportTests.java  | 2 +-
 .../org/junit/platform/commons/util/AnnotationUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ClassLoaderUtilsTests.java  | 2 +-
 .../platform/commons/util/ClassNamePatternFilterUtilsTests.java | 2 +-
 .../java/org/junit/platform/commons/util/ClassUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ClasspathScannerTests.java  | 2 +-
 .../org/junit/platform/commons/util/CollectionUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ExceptionUtilsTests.java    | 2 +-
 .../org/junit/platform/commons/util/FunctionUtilsTests.java     | 2 +-
 .../java/org/junit/platform/commons/util/LruCacheTests.java     | 2 +-
 .../java/org/junit/platform/commons/util/ModuleUtilsTests.java  | 2 +-
 .../java/org/junit/platform/commons/util/PackageUtilsTests.java | 2 +-
 .../org/junit/platform/commons/util/PreconditionsTests.java     | 2 +-
 .../org/junit/platform/commons/util/ReflectionUtilsTests.java   | 2 +-
 .../util/ReflectionUtilsWithGenericTypeHierarchiesTests.java    | 2 +-
 .../java/org/junit/platform/commons/util/RuntimeUtilsTests.java | 2 +-
 .../org/junit/platform/commons/util/SerializationUtils.java     | 2 +-
 .../java/org/junit/platform/commons/util/StringUtilsTests.java  | 2 +-
 .../org/junit/platform/commons/util/ToStringBuilderTests.java   | 2 +-
 .../platform/commons/util/classes/AExecutionConditionClass.java | 2 +-
 .../commons/util/classes/ATestExecutionListenerClass.java       | 2 +-
 .../org/junit/platform/commons/util/classes/AVanillaEmpty.java  | 2 +-
 .../platform/commons/util/classes/BExecutionConditionClass.java | 2 +-
 .../commons/util/classes/BTestExecutionListenerClass.java       | 2 +-
 .../org/junit/platform/commons/util/classes/BVanillaEmpty.java  | 2 +-
 .../java/org/junit/platform/console/ConsoleDetailsTests.java    | 2 +-
 .../platform/console/ConsoleLauncherExecutionResultTests.java   | 2 +-
 .../junit/platform/console/ConsoleLauncherIntegrationTests.java | 2 +-
 .../java/org/junit/platform/console/ConsoleLauncherTests.java   | 2 +-
 .../java/org/junit/platform/console/ConsoleLauncherWrapper.java | 2 +-
 .../junit/platform/console/ConsoleLauncherWrapperResult.java    | 2 +-
 .../console/options/PicocliCommandLineOptionsParserTests.java   | 2 +-
 .../java/org/junit/platform/console/options/ThemeTests.java     | 2 +-
 .../platform/console/subpackage/ContainerForInnerTest.java      | 2 +-
 .../platform/console/subpackage/ContainerForInnerTests.java     | 2 +-
 .../console/subpackage/ContainerForStaticNestedTest.java        | 2 +-
 .../console/subpackage/ContainerForStaticNestedTests.java       | 2 +-
 .../java/org/junit/platform/console/subpackage/SecondTest.java  | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Test.java   | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Test1.java  | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Tests.java  | 2 +-
 .../java/org/junit/platform/console/subpackage/ThirdTests.java  | 2 +-
 .../junit/platform/console/tasks/ConsoleTestExecutorTests.java  | 2 +-
 .../console/tasks/CustomContextClassLoaderExecutorTests.java    | 2 +-
 .../platform/console/tasks/DiscoveryRequestCreatorTests.java    | 2 +-
 .../junit/platform/console/tasks/FlatPrintingListenerTests.java | 2 +-
 .../java/org/junit/platform/console/tasks/TreeNodeTests.java    | 2 +-
 .../java/org/junit/platform/console/tasks/TreePrinterTests.java | 2 +-
 .../junit/platform/console/tasks/VerboseTreeListenerTests.java  | 2 +-
 .../java/org/junit/platform/engine/FilterCompositionTests.java  | 2 +-
 .../java/org/junit/platform/engine/TestDescriptorTests.java     | 2 +-
 .../src/test/java/org/junit/platform/engine/TestTagTests.java   | 2 +-
 .../java/org/junit/platform/engine/UniqueIdFormatTests.java     | 2 +-
 .../src/test/java/org/junit/platform/engine/UniqueIdTests.java  | 2 +-
 .../junit/platform/engine/discovery/ClassNameFilterTests.java   | 2 +-
 .../org/junit/platform/engine/discovery/ClassSelectorTests.java | 2 +-
 .../engine/discovery/ClasspathResourceSelectorTests.java        | 2 +-
 .../platform/engine/discovery/ClasspathRootSelectorTests.java   | 2 +-
 .../junit/platform/engine/discovery/DirectorySelectorTests.java | 2 +-
 .../platform/engine/discovery/DiscoverySelectorsTests.java      | 2 +-
 .../org/junit/platform/engine/discovery/FilePositionTests.java  | 2 +-
 .../org/junit/platform/engine/discovery/FileSelectorTests.java  | 2 +-
 .../junit/platform/engine/discovery/MethodSelectorTests.java    | 2 +-
 .../junit/platform/engine/discovery/ModuleSelectorTests.java    | 2 +-
 .../platform/engine/discovery/NestedClassSelectorTests.java     | 2 +-
 .../platform/engine/discovery/NestedMethodSelectorTests.java    | 2 +-
 .../junit/platform/engine/discovery/PackageNameFilterTests.java | 2 +-
 .../junit/platform/engine/discovery/PackageSelectorTests.java   | 2 +-
 .../junit/platform/engine/discovery/UniqueIdSelectorTests.java  | 2 +-
 .../org/junit/platform/engine/discovery/UriSelectorTests.java   | 2 +-
 .../support/config/PrefixedConfigurationParametersTests.java    | 2 +-
 .../engine/support/descriptor/AbstractTestDescriptorTests.java  | 2 +-
 .../engine/support/descriptor/AbstractTestSourceTests.java      | 2 +-
 .../platform/engine/support/descriptor/ClassSourceTests.java    | 2 +-
 .../engine/support/descriptor/ClasspathResourceSourceTests.java | 2 +-
 .../engine/support/descriptor/CompositeTestSourceTests.java     | 2 +-
 .../engine/support/descriptor/DefaultUriSourceTests.java        | 2 +-
 .../engine/support/descriptor/DemoClassTestDescriptor.java      | 2 +-
 .../engine/support/descriptor/DemoMethodTestDescriptor.java     | 2 +-
 .../platform/engine/support/descriptor/FilePositionTests.java   | 2 +-
 .../engine/support/descriptor/FileSystemSourceTests.java        | 2 +-
 .../platform/engine/support/descriptor/MethodSourceTests.java   | 2 +-
 .../platform/engine/support/descriptor/PackageSourceTests.java  | 2 +-
 .../engine/support/hierarchical/CompositeLockTests.java         | 2 +-
 .../DefaultParallelExecutionConfigurationStrategyTests.java     | 2 +-
 .../support/hierarchical/HierarchicalTestExecutorTests.java     | 2 +-
 .../platform/engine/support/hierarchical/LockManagerTests.java  | 2 +-
 .../platform/engine/support/hierarchical/MemoryLeakTests.java   | 2 +-
 .../support/hierarchical/NodeTreeWalkerIntegrationTests.java    | 2 +-
 .../support/hierarchical/ParallelExecutionIntegrationTests.java | 2 +-
 .../engine/support/hierarchical/ResourceLockSupport.java        | 2 +-
 .../hierarchical/SameThreadExecutionIntegrationTests.java       | 2 +-
 .../platform/engine/support/hierarchical/SingleLockTests.java   | 2 +-
 .../engine/support/hierarchical/SingleTestExecutorTests.java    | 2 +-
 .../engine/support/hierarchical/ThrowableCollectorTests.java    | 2 +-
 .../jfr/FlightRecordingDiscoveryListenerIntegrationTests.java   | 2 +-
 .../jfr/FlightRecordingExecutionListenerIntegrationTests.java   | 2 +-
 .../java/org/junit/platform/launcher/DiscoveryFilterStub.java   | 2 +-
 .../src/test/java/org/junit/platform/launcher/FilterStub.java   | 2 +-
 .../org/junit/platform/launcher/PostDiscoveryFilterStub.java    | 2 +-
 .../test/java/org/junit/platform/launcher/TagFilterTests.java   | 2 +-
 .../java/org/junit/platform/launcher/TagIntegrationTests.java   | 2 +-
 .../java/org/junit/platform/launcher/TestIdentifierTests.java   | 2 +-
 .../junit/platform/launcher/TestLauncherDiscoveryListener.java  | 2 +-
 .../junit/platform/launcher/TestLauncherSessionListener.java    | 2 +-
 .../test/java/org/junit/platform/launcher/TestPlanTests.java    | 2 +-
 .../org/junit/platform/launcher/TestPostDiscoveryTagFilter.java | 2 +-
 .../launcher/core/CompositeTestExecutionListenerTests.java      | 2 +-
 .../org/junit/platform/launcher/core/DefaultLauncherTests.java  | 2 +-
 .../launcher/core/EngineDiscoveryResultValidatorTests.java      | 2 +-
 .../platform/launcher/core/ExecutionListenerAdapterTests.java   | 2 +-
 .../org/junit/platform/launcher/core/LauncherConfigTests.java   | 2 +-
 .../launcher/core/LauncherConfigurationParametersTests.java     | 2 +-
 .../launcher/core/LauncherDiscoveryRequestBuilderTests.java     | 2 +-
 .../org/junit/platform/launcher/core/LauncherFactoryTests.java  | 2 +-
 .../org/junit/platform/launcher/core/LauncherSessionTests.java  | 2 +-
 .../org/junit/platform/launcher/core/ListenerRegistryTests.java | 2 +-
 ...StreamInterceptingTestExecutionListenerIntegrationTests.java | 2 +-
 .../junit/platform/launcher/core/StreamInterceptorTests.java    | 2 +-
 .../launcher/listeners/AnotherUnusedTestExecutionListener.java  | 2 +-
 .../platform/launcher/listeners/NoopTestExecutionListener.java  | 2 +-
 .../platform/launcher/listeners/SummaryGenerationTests.java     | 2 +-
 .../listeners/UniqueIdTrackingListenerIntegrationTests.java     | 2 +-
 .../launcher/listeners/UniqueIdTrackingListenerUnitTests.java   | 2 +-
 .../launcher/listeners/UnusedTestExecutionListener.java         | 2 +-
 .../discovery/AbortOnFailureLauncherDiscoveryListenerTests.java | 2 +-
 .../discovery/AbstractLauncherDiscoveryListenerTests.java       | 2 +-
 .../discovery/LoggingLauncherDiscoveryListenerTests.java        | 2 +-
 .../junit/platform/launcher/tagexpression/ParserErrorTests.java | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParserTests.java  | 2 +-
 .../platform/launcher/tagexpression/TagExpressionsTests.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/TokenTests.java   | 2 +-
 .../junit/platform/launcher/tagexpression/TokenizerTests.java   | 2 +-
 .../platform/reporting/legacy/LegacyReportingUtilsTests.java    | 2 +-
 .../junit/platform/reporting/legacy/xml/IncrementingClock.java  | 2 +-
 .../legacy/xml/LegacyXmlReportGeneratingListenerTests.java      | 2 +-
 .../platform/reporting/legacy/xml/XmlReportAssertions.java      | 2 +-
 .../junit/platform/reporting/legacy/xml/XmlReportDataTests.java | 2 +-
 .../platform/reporting/legacy/xml/XmlReportWriterTests.java     | 2 +-
 .../org/junit/platform/runner/JUnitPlatformRunnerTests.java     | 2 +-
 .../commons/SuiteLauncherDiscoveryRequestBuilderTests.java      | 2 +-
 .../java/org/junit/platform/suite/engine/SuiteEngineTests.java  | 2 +-
 .../junit/platform/suite/engine/SuiteTestDescriptorTests.java   | 2 +-
 .../platform/suite/engine/testcases/DynamicTestsTestCase.java   | 2 +-
 .../platform/suite/engine/testcases/MultipleTestsTestCase.java  | 2 +-
 .../platform/suite/engine/testcases/SingleTestTestCase.java     | 2 +-
 .../junit/platform/suite/engine/testsuites/AbstractSuite.java   | 2 +-
 .../org/junit/platform/suite/engine/testsuites/CyclicSuite.java | 2 +-
 .../junit/platform/suite/engine/testsuites/DynamicSuite.java    | 2 +-
 .../junit/platform/suite/engine/testsuites/MultipleSuite.java   | 2 +-
 .../org/junit/platform/suite/engine/testsuites/NestedSuite.java | 2 +-
 .../platform/suite/engine/testsuites/SelectClassesSuite.java    | 2 +-
 .../platform/suite/engine/testsuites/SuiteDisplayNameSuite.java | 2 +-
 .../org/junit/platform/suite/engine/testsuites/SuiteSuite.java  | 2 +-
 .../org/junit/platform/testkit/engine/EngineTestKitTests.java   | 2 +-
 .../java/org/junit/platform/testkit/engine/EventsTests.java     | 2 +-
 .../platform/testkit/engine/ExecutionsIntegrationTests.java     | 2 +-
 .../testkit/engine/NestedContainerEventConditionTests.java      | 2 +-
 .../src/main/java/platform/tooling/support/Helper.java          | 2 +-
 .../src/main/java/platform/tooling/support/MavenRepo.java       | 2 +-
 .../src/main/java/platform/tooling/support/Request.java         | 2 +-
 .../src/main/java/platform/tooling/support/ThirdPartyJars.java  | 2 +-
 .../src/test/java/platform/tooling/support/HelperTests.java     | 2 +-
 .../java/platform/tooling/support/tests/AntStarterTests.java    | 2 +-
 .../test/java/platform/tooling/support/tests/ArchUnitTests.java | 2 +-
 .../tooling/support/tests/GradleKotlinExtensionsTests.java      | 2 +-
 .../tooling/support/tests/GradleMissingEngineTests.java         | 2 +-
 .../platform/tooling/support/tests/GradleModuleFileTests.java   | 2 +-
 .../java/platform/tooling/support/tests/GradleStarterTests.java | 2 +-
 .../tooling/support/tests/JarContainsManifestFirstTests.java    | 2 +-
 .../platform/tooling/support/tests/JarDescribeModuleTests.java  | 2 +-
 .../java/platform/tooling/support/tests/JavaVersionsTests.java  | 2 +-
 .../test/java/platform/tooling/support/tests/ManifestTests.java | 2 +-
 .../java/platform/tooling/support/tests/MavenPomFileTests.java  | 2 +-
 .../java/platform/tooling/support/tests/MavenStarterTests.java  | 2 +-
 .../platform/tooling/support/tests/ModularUserGuideTests.java   | 2 +-
 .../platform/tooling/support/tests/MultiReleaseJarTests.java    | 2 +-
 .../tooling/support/tests/PackageCyclesDetectionTests.java      | 2 +-
 .../java/platform/tooling/support/tests/StandaloneTests.java    | 2 +-
 .../java/platform/tooling/support/tests/ToolProviderTests.java  | 2 +-
 .../tooling/support/tests/VintageGradleIntegrationTests.java    | 2 +-
 .../tooling/support/tests/VintageMavenIntegrationTests.java     | 2 +-
 src/spotless/eclipse-public-license-2.0.java                    | 2 +-
 1178 files changed, 1178 insertions(+), 1178 deletions(-)

diff --git a/documentation/src/main/java/example/domain/Person.java b/documentation/src/main/java/example/domain/Person.java
index 5a75f7127483..2baf09e52879 100644
--- a/documentation/src/main/java/example/domain/Person.java
+++ b/documentation/src/main/java/example/domain/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebClient.java b/documentation/src/main/java/example/registration/WebClient.java
index c6c3fac7516a..153222b66248 100644
--- a/documentation/src/main/java/example/registration/WebClient.java
+++ b/documentation/src/main/java/example/registration/WebClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebResponse.java b/documentation/src/main/java/example/registration/WebResponse.java
index 5d396e05bd22..39c71a400436 100644
--- a/documentation/src/main/java/example/registration/WebResponse.java
+++ b/documentation/src/main/java/example/registration/WebResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebServerExtension.java b/documentation/src/main/java/example/registration/WebServerExtension.java
index 6a0e5021323a..adcae9157bcc 100644
--- a/documentation/src/main/java/example/registration/WebServerExtension.java
+++ b/documentation/src/main/java/example/registration/WebServerExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/Calculator.java b/documentation/src/main/java/example/util/Calculator.java
index 55791891d80b..c096b71e1877 100644
--- a/documentation/src/main/java/example/util/Calculator.java
+++ b/documentation/src/main/java/example/util/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/ListWriter.java b/documentation/src/main/java/example/util/ListWriter.java
index fe17e5bf55cc..3420f34a1601 100644
--- a/documentation/src/main/java/example/util/ListWriter.java
+++ b/documentation/src/main/java/example/util/ListWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/StringUtils.java b/documentation/src/main/java/example/util/StringUtils.java
index 4233e00a2fed..2a09131c8469 100644
--- a/documentation/src/main/java/example/util/StringUtils.java
+++ b/documentation/src/main/java/example/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/AssertionsDemo.java b/documentation/src/test/java/example/AssertionsDemo.java
index 670695e3e3fd..18f398c9577e 100644
--- a/documentation/src/test/java/example/AssertionsDemo.java
+++ b/documentation/src/test/java/example/AssertionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/AssumptionsDemo.java b/documentation/src/test/java/example/AssumptionsDemo.java
index 6340feca4eab..0f6755c67bec 100644
--- a/documentation/src/test/java/example/AssumptionsDemo.java
+++ b/documentation/src/test/java/example/AssumptionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
index 7e0a7d060c29..38a15b01aa2a 100644
--- a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
+++ b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/CustomTestEngine.java b/documentation/src/test/java/example/CustomTestEngine.java
index cd7974280389..e14c4821e7b1 100644
--- a/documentation/src/test/java/example/CustomTestEngine.java
+++ b/documentation/src/test/java/example/CustomTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisabledClassDemo.java b/documentation/src/test/java/example/DisabledClassDemo.java
index 7874a0048771..a4c8168aa2d8 100644
--- a/documentation/src/test/java/example/DisabledClassDemo.java
+++ b/documentation/src/test/java/example/DisabledClassDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisabledTestsDemo.java b/documentation/src/test/java/example/DisabledTestsDemo.java
index ad60c5afe539..72d146f793b3 100644
--- a/documentation/src/test/java/example/DisabledTestsDemo.java
+++ b/documentation/src/test/java/example/DisabledTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisplayNameDemo.java b/documentation/src/test/java/example/DisplayNameDemo.java
index fb98cc889244..eda1c9347586 100644
--- a/documentation/src/test/java/example/DisplayNameDemo.java
+++ b/documentation/src/test/java/example/DisplayNameDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisplayNameGeneratorDemo.java b/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
index 04b77952e0ed..f5170e4c5bc5 100644
--- a/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
+++ b/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DocumentationTestSuite.java b/documentation/src/test/java/example/DocumentationTestSuite.java
index d430a6618158..29280ff3e490 100644
--- a/documentation/src/test/java/example/DocumentationTestSuite.java
+++ b/documentation/src/test/java/example/DocumentationTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DynamicTestsDemo.java b/documentation/src/test/java/example/DynamicTestsDemo.java
index df23a28a57ea..78081a93690b 100644
--- a/documentation/src/test/java/example/DynamicTestsDemo.java
+++ b/documentation/src/test/java/example/DynamicTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ExampleTestCase.java b/documentation/src/test/java/example/ExampleTestCase.java
index 8581b92851bf..70669434358c 100644
--- a/documentation/src/test/java/example/ExampleTestCase.java
+++ b/documentation/src/test/java/example/ExampleTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ExternalCustomConditionDemo.java b/documentation/src/test/java/example/ExternalCustomConditionDemo.java
index c577c61f0741..afa135502243 100644
--- a/documentation/src/test/java/example/ExternalCustomConditionDemo.java
+++ b/documentation/src/test/java/example/ExternalCustomConditionDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ExternalMethodSourceDemo.java b/documentation/src/test/java/example/ExternalMethodSourceDemo.java
index d12398508a73..93c35a6eb567 100644
--- a/documentation/src/test/java/example/ExternalMethodSourceDemo.java
+++ b/documentation/src/test/java/example/ExternalMethodSourceDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/Fast.java b/documentation/src/test/java/example/Fast.java
index a1045122dbd0..0908da76d652 100644
--- a/documentation/src/test/java/example/Fast.java
+++ b/documentation/src/test/java/example/Fast.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/FastTest.java b/documentation/src/test/java/example/FastTest.java
index e596c7519b27..9d5fcd7e4722 100644
--- a/documentation/src/test/java/example/FastTest.java
+++ b/documentation/src/test/java/example/FastTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/HamcrestAssertionsDemo.java b/documentation/src/test/java/example/HamcrestAssertionsDemo.java
index 2bef36f34cc2..6b74a22df88a 100644
--- a/documentation/src/test/java/example/HamcrestAssertionsDemo.java
+++ b/documentation/src/test/java/example/HamcrestAssertionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/IgnoredTestsDemo.java b/documentation/src/test/java/example/IgnoredTestsDemo.java
index edf05bb2b5c9..75289a0948fc 100644
--- a/documentation/src/test/java/example/IgnoredTestsDemo.java
+++ b/documentation/src/test/java/example/IgnoredTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnit4Tests.java b/documentation/src/test/java/example/JUnit4Tests.java
index 800ce8a46958..86babd497881 100644
--- a/documentation/src/test/java/example/JUnit4Tests.java
+++ b/documentation/src/test/java/example/JUnit4Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnitPlatformClassDemo.java b/documentation/src/test/java/example/JUnitPlatformClassDemo.java
index a4b01f67be04..be2844623c05 100644
--- a/documentation/src/test/java/example/JUnitPlatformClassDemo.java
+++ b/documentation/src/test/java/example/JUnitPlatformClassDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java b/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
index 9a572b28b9cc..7dd7296ed015 100644
--- a/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
+++ b/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java b/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
index 1166849171a6..d1ddbc5b77bc 100644
--- a/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
+++ b/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java b/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java
index 3565feb52873..194bfcbe3828 100644
--- a/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java
+++ b/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/OrderedTestsDemo.java b/documentation/src/test/java/example/OrderedTestsDemo.java
index 2dbbeca1d66e..10399dff02be 100644
--- a/documentation/src/test/java/example/OrderedTestsDemo.java
+++ b/documentation/src/test/java/example/OrderedTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ParameterizedTestDemo.java b/documentation/src/test/java/example/ParameterizedTestDemo.java
index 4717f6133b15..b93a643920c9 100644
--- a/documentation/src/test/java/example/ParameterizedTestDemo.java
+++ b/documentation/src/test/java/example/ParameterizedTestDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/PollingTimeoutDemo.java b/documentation/src/test/java/example/PollingTimeoutDemo.java
index cfc2d2d28791..88708cf270f1 100644
--- a/documentation/src/test/java/example/PollingTimeoutDemo.java
+++ b/documentation/src/test/java/example/PollingTimeoutDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/RepeatedTestsDemo.java b/documentation/src/test/java/example/RepeatedTestsDemo.java
index 07d2e77249f5..a414d053e036 100644
--- a/documentation/src/test/java/example/RepeatedTestsDemo.java
+++ b/documentation/src/test/java/example/RepeatedTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/SharedResourcesDemo.java b/documentation/src/test/java/example/SharedResourcesDemo.java
index 95c5c3010cb0..b71d3e500ed1 100644
--- a/documentation/src/test/java/example/SharedResourcesDemo.java
+++ b/documentation/src/test/java/example/SharedResourcesDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/SlowTests.java b/documentation/src/test/java/example/SlowTests.java
index b4aee752547b..10e88d044160 100644
--- a/documentation/src/test/java/example/SlowTests.java
+++ b/documentation/src/test/java/example/SlowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/StandardTests.java b/documentation/src/test/java/example/StandardTests.java
index 9395b88ea1b7..a2bd484c237e 100644
--- a/documentation/src/test/java/example/StandardTests.java
+++ b/documentation/src/test/java/example/StandardTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/SuiteDemo.java b/documentation/src/test/java/example/SuiteDemo.java
index 57201559ac96..182d863900cd 100644
--- a/documentation/src/test/java/example/SuiteDemo.java
+++ b/documentation/src/test/java/example/SuiteDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TaggingDemo.java b/documentation/src/test/java/example/TaggingDemo.java
index d70205927a3d..3ec3c925b1c1 100644
--- a/documentation/src/test/java/example/TaggingDemo.java
+++ b/documentation/src/test/java/example/TaggingDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TempDirCleanupModeDemo.java b/documentation/src/test/java/example/TempDirCleanupModeDemo.java
index 223ec0ba0ee2..ed164c25a377 100644
--- a/documentation/src/test/java/example/TempDirCleanupModeDemo.java
+++ b/documentation/src/test/java/example/TempDirCleanupModeDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index 1daba23a28e0..d41b6983d85d 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestInfoDemo.java b/documentation/src/test/java/example/TestInfoDemo.java
index 941105942db6..2360fb07bb47 100644
--- a/documentation/src/test/java/example/TestInfoDemo.java
+++ b/documentation/src/test/java/example/TestInfoDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestReporterDemo.java b/documentation/src/test/java/example/TestReporterDemo.java
index 0edb0471fc2a..2a2f68cbe687 100644
--- a/documentation/src/test/java/example/TestReporterDemo.java
+++ b/documentation/src/test/java/example/TestReporterDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestTemplateDemo.java b/documentation/src/test/java/example/TestTemplateDemo.java
index da330056d3b1..4378ededc314 100644
--- a/documentation/src/test/java/example/TestTemplateDemo.java
+++ b/documentation/src/test/java/example/TestTemplateDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestingAStackDemo.java b/documentation/src/test/java/example/TestingAStackDemo.java
index d3a6c7e2c5be..d46ff8bf253a 100644
--- a/documentation/src/test/java/example/TestingAStackDemo.java
+++ b/documentation/src/test/java/example/TestingAStackDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TimeoutDemo.java b/documentation/src/test/java/example/TimeoutDemo.java
index 93e5cb810d72..ddcc489a2c4f 100644
--- a/documentation/src/test/java/example/TimeoutDemo.java
+++ b/documentation/src/test/java/example/TimeoutDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/UsingTheLauncherDemo.java b/documentation/src/test/java/example/UsingTheLauncherDemo.java
index 544cf960ccdc..8c1e29106195 100644
--- a/documentation/src/test/java/example/UsingTheLauncherDemo.java
+++ b/documentation/src/test/java/example/UsingTheLauncherDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java b/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
index 58344c1c7c7c..8010fd31c696 100644
--- a/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
+++ b/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java b/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
index cedeb020be28..6e4880eb4537 100644
--- a/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
+++ b/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java b/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
index e6dc21582ff2..b7eb652907b4 100644
--- a/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
+++ b/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Extension1.java b/documentation/src/test/java/example/callbacks/Extension1.java
index 6bf297f9550f..b1658aa451dc 100644
--- a/documentation/src/test/java/example/callbacks/Extension1.java
+++ b/documentation/src/test/java/example/callbacks/Extension1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Extension2.java b/documentation/src/test/java/example/callbacks/Extension2.java
index d4e595167bbf..b7ad2849598a 100644
--- a/documentation/src/test/java/example/callbacks/Extension2.java
+++ b/documentation/src/test/java/example/callbacks/Extension2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Logger.java b/documentation/src/test/java/example/callbacks/Logger.java
index aa7250cab307..7bfe2399bc5b 100644
--- a/documentation/src/test/java/example/callbacks/Logger.java
+++ b/documentation/src/test/java/example/callbacks/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/ComparableContract.java b/documentation/src/test/java/example/defaultmethods/ComparableContract.java
index ac55e4b7ac69..c5580d303d80 100644
--- a/documentation/src/test/java/example/defaultmethods/ComparableContract.java
+++ b/documentation/src/test/java/example/defaultmethods/ComparableContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/EqualsContract.java b/documentation/src/test/java/example/defaultmethods/EqualsContract.java
index 357c74146466..c986a0b6f619 100644
--- a/documentation/src/test/java/example/defaultmethods/EqualsContract.java
+++ b/documentation/src/test/java/example/defaultmethods/EqualsContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/StringTests.java b/documentation/src/test/java/example/defaultmethods/StringTests.java
index 95973a1b2ccd..85aaac73afb1 100644
--- a/documentation/src/test/java/example/defaultmethods/StringTests.java
+++ b/documentation/src/test/java/example/defaultmethods/StringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/Testable.java b/documentation/src/test/java/example/defaultmethods/Testable.java
index 90028b28659b..f1ac340faf34 100644
--- a/documentation/src/test/java/example/defaultmethods/Testable.java
+++ b/documentation/src/test/java/example/defaultmethods/Testable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java b/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
index 1e2e15dfbcb8..266f39292cc8 100644
--- a/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
+++ b/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java b/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
index 690b22dfa328..6df8ce4a72e0 100644
--- a/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
+++ b/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java b/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
index 8455247839cd..709231a6bcaa 100644
--- a/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
+++ b/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java b/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
index ddd0a9ad6456..5b2804684915 100644
--- a/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
+++ b/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/extensions/Random.java b/documentation/src/test/java/example/extensions/Random.java
index 81a2dc7ee0d8..9d83f3d4da94 100644
--- a/documentation/src/test/java/example/extensions/Random.java
+++ b/documentation/src/test/java/example/extensions/Random.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/extensions/RandomNumberDemo.java b/documentation/src/test/java/example/extensions/RandomNumberDemo.java
index 0b8656a99c3e..24db76bc013f 100644
--- a/documentation/src/test/java/example/extensions/RandomNumberDemo.java
+++ b/documentation/src/test/java/example/extensions/RandomNumberDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/extensions/RandomNumberExtension.java b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
index 598582725319..f3ed2c9f2631 100644
--- a/documentation/src/test/java/example/extensions/RandomNumberExtension.java
+++ b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java b/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
index 09a805c9dcc1..5970b80b9dd7 100644
--- a/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
+++ b/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/registration/DocumentationDemo.java b/documentation/src/test/java/example/registration/DocumentationDemo.java
index 008c734b5b94..c5cf431bce48 100644
--- a/documentation/src/test/java/example/registration/DocumentationDemo.java
+++ b/documentation/src/test/java/example/registration/DocumentationDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/registration/WebServerDemo.java b/documentation/src/test/java/example/registration/WebServerDemo.java
index 4b839e53a8b4..0ade52412975 100644
--- a/documentation/src/test/java/example/registration/WebServerDemo.java
+++ b/documentation/src/test/java/example/registration/WebServerDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
index eb11410018a3..6d3417817d45 100644
--- a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
+++ b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/session/HttpTests.java b/documentation/src/test/java/example/session/HttpTests.java
index 124d54fc48e0..01477b6b0d75 100644
--- a/documentation/src/test/java/example/session/HttpTests.java
+++ b/documentation/src/test/java/example/session/HttpTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java b/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
index 51ba1f8bbec5..e37ee55e4bf2 100644
--- a/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
+++ b/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java b/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
index 2e751d622652..41cce3456765 100644
--- a/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
+++ b/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java b/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
index 935f56133edf..1d4ccbe818a1 100644
--- a/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
+++ b/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java b/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
index 32f88d3c4391..1f0d28276e6e 100644
--- a/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
+++ b/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
index 6090550547fe..2a8991c45f93 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
index a2ab5c59baf7..fe13c967edb0 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
index dc4b40ff2bdc..401e76881bb7 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
index 399189e67790..0f0d92d5be0d 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/timing/TimingExtension.java b/documentation/src/test/java/example/timing/TimingExtension.java
index f219e8175214..c82321201a5e 100644
--- a/documentation/src/test/java/example/timing/TimingExtension.java
+++ b/documentation/src/test/java/example/timing/TimingExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/timing/TimingExtensionTests.java b/documentation/src/test/java/example/timing/TimingExtensionTests.java
index caa01fc7026b..cf84479e7450 100644
--- a/documentation/src/test/java/example/timing/TimingExtensionTests.java
+++ b/documentation/src/test/java/example/timing/TimingExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/extensions/ExpectToFail.java b/documentation/src/test/java/extensions/ExpectToFail.java
index 4787142e7143..fb14a7d110eb 100644
--- a/documentation/src/test/java/extensions/ExpectToFail.java
+++ b/documentation/src/test/java/extensions/ExpectToFail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
index 1e2e30f9e4ed..29b2909d3cd7 100644
--- a/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReport.java b/documentation/src/test/java/org/junit/api/tools/ApiReport.java
index c51de7a6b17c..3d8a6fb498fc 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReport.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java b/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
index b6f88801359e..637513538d5f 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
index 12976610581c..30c430d05fe1 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
index f29f979bd102..ce688064103e 100644
--- a/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
index 0498deefff02..c27ca6b9cee0 100644
--- a/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
index 653ddc39b5b1..a6296d1a3c1c 100644
--- a/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/FibonacciCalculator.kt b/documentation/src/test/kotlin/example/FibonacciCalculator.kt
index c7c111039bec..281cb7d492ef 100644
--- a/documentation/src/test/kotlin/example/FibonacciCalculator.kt
+++ b/documentation/src/test/kotlin/example/FibonacciCalculator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
index 50ea4a4446e4..64afa0de38cd 100644
--- a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
+++ b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
index 67f1010e12b1..3f23480c7798 100644
--- a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
+++ b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index 746452c7a9c7..46d441056e2d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
index f95ed4f53a47..bade31f41dd5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
index b083e3274320..6424dd14b2cf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
index 32a0707efd7b..0f28b904e663 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
index 2e7f00afa57f..e64b136772ff 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
index a66ff5d3bb38..8a06b335599c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
index fe3239d354a0..604c26e98af6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
index f6fbff1420c5..fd491bc25c0c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
index 8cc9f609bebe..a5f1641dfd03 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
index eb580b75b15f..8b55d54d12e2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
index cf1655bd9f66..3bdb087dd9f6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
index 6f6b8f978fed..eebd9329cf4a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
index b8635cb17f94..a3652c39292e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
index f843202d4a20..b3a43b24844f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
index 620c52a8ac79..6f8a790dc237 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
index 0a6b0d4864b4..9be0d9a2f1d1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
index a2852ed390d1..f40a05f273f0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index e3043ef42804..d5634c578d31 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
index 2aba46841a9c..92e4451db0f2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
index faeeb6ab6808..524f8142901b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index b7d2c4b40323..4eb591d512ee 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
index 51e308cced3a..c62893931748 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index 98665c5427ce..cfc7521d25f2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
index 2fc46372e0c3..99d5dcf3bb30 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
index 9a6a660b9497..7496c1caa876 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index c367b5aed115..a94b2c01e030 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
index 8942a327e206..cc4d169eade8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
index fc6db60bf4fd..8961e0bdea7a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
index bb30c8846867..5b250299829e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
index f12a81923bd1..32eb81eed40a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 58a5038b162e..065b2c54e177 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
index 88c40789b96f..bae75ee8304d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
index f7e2b42b3a6d..819f1e2b0f52 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
index de0e03cfe88e..62a018985741 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
index a3ded3df9de9..1f8c916d664a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
index 0c9ab15a8670..256326781eec 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 3ee2995cc33b..8d349dd01880 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
index 03f414da97d4..970e0ba10620 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
index d707529a7e50..1b7cb774ce7d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
index 28c4edaf7294..47380b7404e7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
index 223c1c06117d..83261f3b2f93 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
index 23ce4b26f22e..3b4c7ee96cc5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
index d6b0079d2261..b75e401f17d8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
index 02467574ab66..9e1d8cfef746 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
index a5b66474364b..7ac55cb3eede 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
index b4ace03ed44d..e9a212371bab 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
index e1824954425a..07a08fdf072d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
index f2ed493518f5..fd18f84f2785 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
index 0fdd028acdb2..cfb73b39eb49 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
index 4dce4a2b568b..0f09f05a43a4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
index 6dcb568bbdb7..ee4dd6064ba7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
index 28a6501f526c..6ae826528479 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
index 4a1b23181191..51c9d4dd24a4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
index 4d9c1e3af4ed..14ad0970ae1a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
index 0b1b2383f6e5..36c86d7427b9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
index c31122d7ab82..8124255ce253 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
index 093f3deddf26..a5e9368b6625 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
index f059cd8c3d7d..1fb2ba57b743 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
index ba8af2b2277f..5405f33d596c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
index 63aea9a6b43b..04932ebbf4b1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
index 30657ff96ee0..e4583598c057 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
index f81891306c29..03a452d235b8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
index 91b3eb4bf8f7..0ad4b39c6131 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
index bc6740925eb3..e5134a9313b6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
index 16acc56e6efd..cda6efd2ce08 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
index c81420ac71e7..5cb6a73f9e3d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
index 2e7acfa3adaa..884a5f106400 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
index 22e3ab32c6da..b78cba9e8e26 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index 00c8d0f9a6b8..aedd2a928487 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
index f5db7b4b7daf..f3dd92a58991 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
index 13e237bea7a9..93b4dafe450a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
index b1d45642660f..9d1aaae5a51f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
index 303e83a5c96e..1d14677ef1cd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
index 7bd93c0f37cd..a19f6d76d77c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
index 980c667becd7..2898881c08ee 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
index 9787da3f4b2e..cdd7ded016b2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
index 957b5e1e97e8..fda577afa14f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
index 79f168f5d0d2..5da673a61946 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
index 345cf5b78bfc..428aa55676da 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
index d83e4fd4ae1c..c6d9e632addb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
index 3e1d4fc12f64..e71d54e2a18b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
index 11963520c999..0e81c803787f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index e043b0c512e4..65ac44380698 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
index 222107a68b22..ef6b3c86820e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index ba5169de9dbd..072ec7600b2f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index 101019a1ec9b..d02be78306d4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
index 82df6bba98e6..779d2acfe56a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
index 8086f90c0ab3..036be1b67533 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
index d3a03a0b578c..80e6e5bb1b63 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
index d2c671b0fd84..00faaf5745a4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
index ed93069878a0..7d4054196a5e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
index f0ee9a1da463..f10713638c33 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
index 7051044e57e2..5c2e22a1af4d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
index aefd501eec34..0f89cf1a3e1b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
index db1c8bc54a88..aee09435610b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
index 6021558bff60..db4c1eb05bea 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
index ced0f065fd1a..bb98e3b7b52a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
index c0b3b0000db7..5bb872887a47 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
index 0d0518d3b5ad..6631cde0bab8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index fa2a5c5e1bf0..f573561c3d89 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
index 1d0aa9932cfb..be16215c49d6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
index f9480b8ec609..0f1e73320d46 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
index 918a43d52e41..8dafc9edab92 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
index 64f68570635a..f84cf047a199 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
index b05ace0a46c2..c80242cfb821 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
index 42eabf33f36b..afdb3bc3c051 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
index 107ed852df60..d2277df16c5f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
index 03b1f5b1af50..fb0ac752931f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
index 16837b7c77ee..27daf8aeef2f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
index 87d4708bade1..4247060e6e52 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
index b3e7ed085f1d..62691738618c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
index 50a105cf00c5..22a04b91f060 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
index a86379184abc..0b14d1b89269 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
index 1bdbb9c5a7fb..6fcc171dc54a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
index a3f990bb8fc3..365aca73a9b1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
index f3c5720f8781..e9eb29129427 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
index 55e25579c3c5..3311e8943945 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
index 51ca08ba683a..4d775d529393 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
index 8ccd4442cbd1..8235a980cdc5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
index 8d00095662e7..b8bfc521aebc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
index 289c05a8295b..a3a0f40c2278 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
index 07feadd14d3a..3680ff01fc2f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
index a1fad0dcb91f..2f104ed06fd7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
index 8cc6ff53ac94..0548fa431875 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
index 14268dcdfd8a..f947967f3f50 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 8653482b699d..007625e4fd74 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index a78a8fb4d8f0..d0753477177b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
index 013f8787dfba..989455659cf4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
index de656a57785f..ff4eaa06cea1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
index bf60cda457d4..3ded110722ed 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
index b3baee4857d8..ddac32f503e2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
index 0b9fcf4e8468..fe4d18661660 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
index 99cf25d6231f..5421662c8674 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
index f448d57f8ab0..60e82a8fb4a2 100644
--- a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
+++ b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
index 48aa51f87c28..275f46b3f08a 100644
--- a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
+++ b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
index 2c4ea4ce3f23..52885647d71c 100644
--- a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
+++ b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 2778dc5750c9..988439c1a99a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
index 87bd99de7149..cc3ffa3d98fd 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index bad0d073f764..76c566f77d39 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index ddf98efd8064..a21a9c7ef249 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
index 8c9ad3fe9ad6..6ee650d10ed7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
index 13b707698897..2aada5cae621 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index 49f65897595e..fddadad9684c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
index fa5740db5870..baaae959f3c2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index 71c382e489d4..b1a02844b476 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
index d45d4f1a4d67..945bb6c46028 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
index 0630e4a02c1c..e12549f9f679 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
index f12ce3af178e..ca0d47800af5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
index db82b8482f58..5a15bbfc611a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
index 10ee9652776e..6e580ef3baac 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
index 38b828d13f25..811a11205c83 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
index c09fd98749ed..d08c3ba0d3e9 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
index 47361d42cdb7..31aa82afca4a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
index 64ef2c12eaef..befabd78b42f 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
index 91b53ff33187..f8252afbac23 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index ad6a8e4086c0..810d7e5a0a18 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
index e39e9e5ca72c..827151de5bb3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
index 54439ede3b44..7793ce4cf0ef 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
index 18e3afae9bd3..87806cb24f9c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
index 7bff29c261cc..0b17e0b07a2d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
index cbec4966d543..53a2a5c5360a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
index e5ef8e0e66fd..356b22a5ef1b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
index abf25e91af35..2843b4f7bf89 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
index a6c0b1b97e56..14f4c517d0c4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
index 2eb93aedba78..dea65c85efb8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
index 7e4eb642c0eb..28e05067b0e4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
index cf18bf33e30c..4ec69200e5d2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
index a6bd1aea309e..fb3b9ada658b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
index a5e875cb8634..aa16d6a7b1b3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
index 71366b56c2b1..24c623d1a30a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
index f7f86b9d4363..c3eb4cae8add 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
index 1b053457af8a..463f077c2d52 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
index 447f9c432a1b..03da534699d8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
index 9df0c8e59a44..b1a154a3ac11 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
index 874984a83ca1..18f7107b992b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
index e9e13f7c242d..e6f0b220a5a1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
index 66467eb0abf8..cc26708bf419 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
index 6bf6042eb449..b4a5cba81e04 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
index 7cb195f11ecd..f70c675d465b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
index 541be65df359..2c5de8cc58c4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
index bcc3d2c7056a..c7b0c5bfee81 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
index 599a34e50f47..f3fd6d867890 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
index 11f12ccae2fe..01a51ab5056c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
index b60f65000bb1..968c4054e8c6 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
index c2d9c0e1513c..ff7dd1ac24c1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
index 7c4a9a3cc6a4..c35d02204fc8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
index 72c8c4378379..e55ecffa9789 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
index 312b3a181433..77b40190fe11 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
index e7d6d321c8f0..da014aca0664 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
index 81973bcfc58b..2136aff69e47 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
index 97abba7bb103..f793ccda36b0 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
index b495fa449d9f..d80ba914a472 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
index d480ec8fbfc5..0f0f03dcfeaf 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
index e859f75e84c2..02f56c677ac2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
index 2b35ea39b195..1a6dba0f7bea 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
index 2dbe5b13baa7..f5af1cefdbaa 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
index 4a2d81cad101..f14efc5a4568 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
index 56f62d1abf10..b03b3f4a3c86 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java
index 1f113368b438..1d3641f4cd3c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
index ebb584517975..5b06d7eae56a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
index 3f561ca57db2..c45a9f2dbfe3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
index ecf40625b7fa..daf0eeb6f837 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
index b3705b4d2ec8..d2cd8f77aae4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
index b49c12aab664..0f343b713ecd 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
index 23b67c5f8654..c8e93a9f30cb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
index bf86b23d5024..a2464b72da94 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
index 3d6815c3d316..703fd3fef2dc 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
index 1e253bec400a..915a64197d79 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 5d3d3d2e8c61..58ce3cf285b7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
index 220ff19da216..b1c2df6bdd5d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
index 1c58efa7e370..1ddd7e01acc2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
index eab532dc7336..bd82bdc5fe2e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
index a9a7b59eed12..ec44504ef4f2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 0fe5de7b1841..7f691db71e3c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
index 4e0945c6b9dd..adaa7bf76fb1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
index 9cf84e53e627..cac64e58fadf 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
index 870ffe21b3f5..e3c847b0d652 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
index 00a02c299d2f..57032e1d09ba 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
index b54228e5c6ee..6b19159c0cb3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
index 1fb00792497b..6680c2fd54b9 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java
index 87f33e6386cb..a16db56b80e5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
index 76bd8b17c04e..a218d7e2d126 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
index 33d5401cee9b..238e0219f54b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java b/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
index 22c9d0fec493..cb6da73a100e 100644
--- a/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
+++ b/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/example/B_TestCase.java b/junit-jupiter-engine/src/test/java/example/B_TestCase.java
index e0369be5676e..9020f1894469 100644
--- a/junit-jupiter-engine/src/test/java/example/B_TestCase.java
+++ b/junit-jupiter-engine/src/test/java/example/B_TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
index 6c03f9db17b1..f68e03974f64 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
index 0fdc38d40c6f..a99eb1ca51b6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
index 9c0e6880cc22..b67c52ec79e4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
index b9b8bab79674..5238db6275b9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
index 288cb8a51875..a68f5c47fcab 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
index e9e7e410ee03..7b711bad2e5b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
index 93a4fdd50318..bdf0b8476f71 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
index 2a9dd981e063..a68d86643869 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
index bf8f31289a7f..3080cc2d4221 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
index e7cf2ef0d43d..5755fa66c5fb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
index e120bd4f9098..d69d3716a8a3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
index f79d3445112c..da8cb57915bb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
index 54849ad6d3be..f1714b20894d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
index acdbe033f4e7..4143b41b2a76 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
index d3e20009ed6f..5239f0f1c944 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
index 762c6ce1d9aa..d3f05d52d18a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index cf1d8803c9d9..e9828d2cc3d8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
index 4f36599c92a2..faeadabe0569 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
index a2cd16f66290..bb14bfb0cbc3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
index a82403dee77b..58f39f42f286 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
index ee990808595e..7f68db1e0c7d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
index eff86d0a759b..1f3f468f86d5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
index 7ea7c1e926fb..b4c586b43948 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
index 70e58699db7c..9e4061ced067 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
index 16fc8e5af636..599b088b1925 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java
index 5ade3aa36db5..1b60dbd8f0b6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
index a1790bdd27a9..e3edd5b758f8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
index 9e27bd45efa7..f9764f89eef8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
index d8739bb0ce14..9e02a3c4643a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
index 2eaac6d690e2..14b1b5075ee6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index d8bc38de16ea..33d4be9ac7e7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index 93b8e7d55085..17b2cb61f03b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
index 74468d6eb34b..f2daefee0b31 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
index 331fb28fa090..5a8946b77224 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
index f1c05d171025..50b9714ee3f2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
index 901a642da945..6315c3f89a79 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
index 2ee17e4e61b3..6933a1773b0f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
index b8e01dfed68c..927d04c7d00f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index f0f65ab91378..50eaaf195ed7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 8414b1bc98e0..247265653815 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
index 42322bc47ade..5b2f3e1107e9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
index 1b8b035fcc69..a0d76870d0d2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 7d908f768c08..0a1eb0521e4a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index 4416a28699cb..15826bcd6f31 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
index 6a8fd811103a..0fb03b2b3da4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
index bf4602ccb8c3..1c38c1eba721 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
index 22ad1bc58913..09b9050c112b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
index 4b2cd6f265f5..be7827ab894e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
index 8f0920ff71ea..dc5529d4c26b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
index fc5cd647f0f8..7af53e704efc 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index a782b07728a0..bb823d343e66 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index f1a9bbd430c9..904cd92b9e9c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
index bc057012d028..96a7c018076c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
index 6784f7931690..39d878700bc2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
index d488335afbe8..fbfe072a53a0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
index c85ff399cef4..f4d8e378b2d0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
index d12538ab6351..f9e35c4d3a57 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
index 55b7c5bdf7bd..f8db055077e1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
index 7733653f969d..2a9b874637fb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
index 851b1a3dcdd2..75950433a3cb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
index e945c932bcb9..9fcde033ed49 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
index 6d2f35d1aad5..08ad11b8ab62 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
index 4c00b8147bc6..856780e0dbaa 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
index e266c405b885..7fe62961777d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
index 984c884bb586..0b4dfcb43b51 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
index bee53a29afba..4989403c8979 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
index a2e15e6bb4f3..8fe90401e8ff 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
index da3400f70d34..c784f1dd8bff 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
index 021a34c7a453..b66f56895f02 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
index b89248c87941..b6857d0f26f3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
index a7a3898c3c2b..107e3e9c8fb6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
index b97c4536f574..276b022254ca 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
index 7124447ca4c5..1b5fd04b4e15 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
index 79aba3638091..22038843e8a5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
index 345301d3cb8c..ee6dd3bf778e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
index 3237b230c779..87114faf8994 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
index b6d01e3cf0ff..bf4c5ef3a674 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
index 2dede7ef0ac6..4528405018a9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
index f509efd41e2c..5c5659e7a6c9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
index 1beb46ab3615..cf54b3b9a7a0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java
index 2ab8697f041d..776cd53ebd2c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
index 31ef077bc1ac..fb623569cdc5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java
index 406dfa59ca78..6faf5e0cdd14 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
index 088a642ca0fe..61f622aeee5a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
index 35fefe9bc600..21a885ba49d7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
index 8d7551299055..0d80fc60c299 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
index 44f04b2816b0..e785ea5751a1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
index 72eb7039ab24..b72d4e497db8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
index 7a5fe3426e98..8c129f4e1aac 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
index 68dd2e33cb32..7058c4b58741 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
index d5c0776903bd..1f644e595084 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
index 0f5057efd6d7..516ee7646acb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
index d2c85118748d..edd08cfe9f42 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
index 732d1b7f68f0..620d695b68bc 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
index 21ad5715194f..e6ca05fd4dc4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
index 54cde15680cb..49bf69a03cdd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
index 81c9a10dc988..ece447bf5ff5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
index dc29bb1b3190..72717bffd608 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
index b530c70c45c2..584f65f1d8ae 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
index 79af28e20ce5..0ff5eb56c9dc 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
index fffdb00ed3fb..bd74cbf208c4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
index 79b5d3656537..ec8894e67f47 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
index 49a514e004c7..af9c7681debe 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
index 8ab2d34fe6a4..0c540d8f7e72 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
index ed43d8d446d2..ccf78cd02f47 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
index a4d852f2f8be..a88700f06044 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
index aaadf2b1c419..d22845ecc42d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
index 750317f4d4f7..67182614032a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
index 79e78425b9eb..a370c4c2e961 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
index 2f8c65076aad..d5043609a6b5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
index 937c00d235c1..0be3cb79fb67 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
index e7b506f14270..58f9e7321676 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
index 5bc49398517b..0e0b253030cf 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
index ae2ab6c9dfb8..207c6c8f0ae4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
index be77a5868d3d..2ea7f18a35f5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
index fd73fa409622..8c7c734b119f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
index 7d595c528993..e5e7b20938e8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
index 87b62e7be62a..a513ef5eb9f1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
index 1d97d6cf3ff4..4a5cb17432f2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
index a69b1693f53f..ba9706e970b7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
index c4ce4cdb49ae..6c41992e2707 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
index 04078c65688f..6a28c9bbf0e1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
index 22094796a83f..ac439d333230 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
index a39c756aebec..1ebdd27c2626 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java
index e3cd1351a077..fb6ddb3d7f29 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
index 3cf14688f82c..b3bde4a57706 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
index a2ebe331f840..0d62b1d4dfca 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
index b804b6feba9a..97a7b215a407 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
index bd7dbd63e2fe..4d86c68f7f68 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
index 91aae317ed3b..3ddaecfc0b79 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
index f37369227ab7..d371b025b9c6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
index 67555f98d1c3..14f631cb55f0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
index f1f95a8f1ac1..cf9a1f6d50a8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
index 93eb37909bf6..dddcffa24033 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
index 931495f61206..e5f26ad0f96d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
index 422f956aed76..bf2857364305 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
index 6d653eefd845..54b11d6bd4b6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
index dcc1acbe1940..617e8d087dc7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
index e7143d2dda9c..7aa08b57deaf 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
index 56b123d4442f..245d86e4b565 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
index 0cca20002c3e..161fb68b2209 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
index a55fd0bade6f..4732cdcbdad1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
index 82c9c90be262..5546fd35dd3a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
index 33bc9260a34f..d40a133316e3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
index a3062fce0cc1..15619e87133c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index e9767bb2bce4..203033e46d65 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
index 0a144163da7c..cbd0362b2dd6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
index 3d290bdfa69c..ae1d146b5723 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
index 3c7d8a8247d9..12c6d81fa3b7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
index 9ea8c8e66cec..6ffa4f7ff187 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index 670f679f917b..836fbc085f51 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
index 8a9883df634b..07094380bc8f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
index 04479927e4d9..01e3d10ebb7b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
index 83a1c1f4bc11..323d88a212b1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
index 78288a0b629b..1bd1b9156113 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
index 04de0e29521e..e6187b55aee3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
index 2dc6d03717a5..24f83c5f9f73 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
index c407f42b62b3..ef6ae8fcff11 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
index 6c9588992562..16be2561acb3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
index 23fe300f005c..b6997ca15455 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
index cdb1d65c0698..af28805f4673 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
index 35c3fac0e114..5785cdcba363 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
index 3a440af1d96d..9a4b8fb1fd01 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java
index d4fd10d87091..9f94282af988 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index b1e34bef4f64..7420236def7c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 7bc8a5e9a500..34d949881d24 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
index 64c8442c2f13..366d2a4f4ea0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
index 8e66af3c0cc8..070ec9c06051 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
index ebec08edc32f..ddd25f01c166 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
index 7d20f80278d7..256a41257a9b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
index 431550b71f6e..26142267cf45 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
index 0e774c93213a..d6975a2c096b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
index 6d021fd5cdcb..7dda92365286 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
index fd555d8a3c76..54a3ed110dcd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
index 19e668b67728..394ab6b09006 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
index ad81f4c72425..315f70642145 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
index a396e7f975df..3d950fe53893 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
index d50d7d816a9e..b3195c7bad3b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
index 139e28488d76..1fc87607fc68 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 522a76b81181..0d6981b33788 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java
index 164e240a8b1b..460d0754ba0b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
index 812f993e7ba3..0b820dfb60dc 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
index 311888850620..cce8fa3f6d61 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
index fa44b0f8bb4a..79d126531464 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
index a2b057400791..fa8ea0a99b7d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
index 381b155d4c41..94d1cfc111f6 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
index 7db0939a9d18..7e44ea799b3f 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
index c14c664a2aab..2234f5dce3fd 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
index 2f94a3f71124..79489fb84221 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
index 871cb9ed1066..a6aa021e858a 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
index 82fca8f2b809..67a14a37e923 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java b/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
index 8b84bdff2125..c50399eea78b 100644
--- a/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
+++ b/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
index 5899ccc7e254..6bf825945f20 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
index 5680c09a2ca1..bc0e47b6c5d1 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
index a9e9e10d0f0c..f28802c5003f 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
index 42a0032734d8..66280212ac8e 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
index 2c822c0e3add..34789798babb 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
index 6848d1b7cebd..df82a22a9017 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
index 4b6a9d5ad7cb..ba0dbc96631a 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
index 84929dd24bf0..9f24bbf5976c 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
index b45b934f39bd..f0c5041dcb38 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
index d74a5d6787ac..4295952113f9 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
index be2d221e0d40..202148eeb52b 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
index ed55d3230c66..aef447ef4bb7 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
index 992cbc69e94f..b6409a85babd 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
index d8790a4afa4a..cab356a3448b 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
index 9e0359ceb8fa..01506885103e 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
index 5e25e9264918..2950842bba1e 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
index 45230eedb7f3..425691004ca3 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
index ed547ca9682f..fb18f895de66 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
index d7fbd7e30575..1b5d14b43c76 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
index f465cc1eb356..642d0dc8f107 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
index f360438b29c3..461b84ec5d20 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
index 5212d35399b8..f1df8401212e 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
index 290d979cc765..9715660fa1de 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
index a01f5d33ae6e..6108ceda7a02 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
index 92fab45ed474..110309901ecf 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
index 6766fd97809a..9789c2dcf15c 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
index 943f04727f14..ff03a0d6d09a 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
index 7c8650267152..3d639ce44e2c 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
index 27ca31190142..c6a730abe9c5 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
index 6639b7599276..99b3abcfcf62 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
index 59ac457115d2..4ef4ef732c97 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
index 4fde2321d9e0..109c6608fe71 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
index b5ac3c51c6d0..0a0d43702a08 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
index 7dd517ea89a7..023a78a723ca 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index 93fb6acc8a60..ed3e907b22ac 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
index 024f06b9b398..1df2deed467b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
index 0746f24b33f4..1110cc196c4a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
index 5d82fc06555d..d9dc2ed4e556 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
index 3f10d21d26c1..07f308070563 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
index 69f498215046..ca5ba2ba2596 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
index 496f89abe6ad..d4c5f8d6e859 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
index 6108428fcf1e..6f143a759cf4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
index 4e8aaefce950..e31c8080fecb 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
index 4df6c313ee20..379c9aac1b94 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
index bab7592fa662..5779699497ca 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
index d4258eb759cb..65f53071cc75 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
index 72679c4114c8..eee4c0120a59 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
index 7eb1ae4f7b02..f7b4a75739cc 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
index 00360939dd17..46b4d121b1e3 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index 70942775b98f..bed208d512ee 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
index 99e3aa74310c..b4c6a2ebebf1 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
index e91e448a6d06..c049b8a59f04 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
index 657bce9620d2..f491fbf72fdc 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
index e8d0116fae29..6cb2a32ea2e1 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index 904e1aad3a39..f6ea5ad66858 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
index 39d07d94c2b5..98d1aa082496 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
index 2d8b5aab526c..2fb7ff668955 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
index ecb11db04a2f..757a11344c5d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
index 728188895265..706910de1bab 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index fda9ed4002d8..7f475a23081f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index 6e7c8d931fa7..10112978b59d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index e639612cf7d4..84a980638b3d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index 7e7652776442..aa31d3cc1963 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
index 374824d3f86c..6e47ffb1eae1 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index d3a244cac611..f1930dcedbee 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
index c1c84e279a89..ac6d1b01358f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
index d7ca266a85de..3b4ed8c72662 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
index 561099e8603d..6985bb8c838f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
index 5aeae45bb590..59b1ebfedb8a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 116b751f4d0d..5b05087c053b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index 9b2240a0fb95..baea1ad42ae9 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
index d85148f4d6f8..09ad77c258ab 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
index 6c68b94d2df8..b33bd5d88431 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
index 70213f7895a4..f314531d8cb0 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
index 3878c47d251b..841af2641408 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
index f93db6cd8920..a8ee833916db 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
index 2566b1c470ee..ee047975faed 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
index 6f07fcbed749..731d77f0ac54 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
index 925243644e38..2ea65af2fafa 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt b/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
index 4b5c64a168db..4601274c701d 100644
--- a/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
+++ b/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index 994a2e919228..53f49adeec07 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 1ba34f9dad35..50aa14fc2732 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
index a3dce4932bc7..befc91a2f9f5 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
index f9de719db4e9..5cbea3c75e10 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
index b8c65a31bbb0..14a75944d260 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
index b1bfaffc07ae..9df38a3a5c1d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
index 4b36111aee4a..33c3c3b88c83 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 0f300132d83b..4a8d75cede13 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
index 6e84738d700f..b88a48cde398 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
index e7532f1e9427..0180957c5394 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
index 1302b2810f8c..0f82f5e7e73c 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
index 45c38da24fd1..e8ff584e033d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 1bd44c4a4aef..872ff28397e8 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index 0176c4517ee1..44b11dbe3b95 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
index 5a3c24f67c3a..135df1f40f6f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
index a4d3c3c1f21a..cb85817bfd80 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index efd474399cad..a2753c161ef6 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index b19f66475a61..7fca4048c19a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
index bab82fe96451..835aec70bcfa 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
index 47f48d52f5d7..6c1aa9e2e84a 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
index 798c5f8eb714..080eeb2c8dd7 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
index 4c9eaa084306..ae91f0e61602 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
index 079756e9f1ce..e5b8b91191a1 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
index 0c45f4e16f43..6527e27a16ec 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
index 43bb1f36cd13..c7c54f43e840 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
index f6e17fcdfca3..d0b7feabe56a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
index 6f5073426c38..1d5302fccc0d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
index 0ed0ff7fbd76..511d4d897437 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
index b0e922e40c04..657546f25c23 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
index 70d4559e237a..3e6648e8c959 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
index fea4699d8b35..9222d590043c 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
index 493ac12f5e5b..4e9085e35c6e 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
index 60d9e1c7a682..f0741d0b5c9e 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
index 6a5351a4be8e..760db041aee4 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
index 44142512f380..925323957b32 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
index ea444b22caed..aab36bdbfcaf 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
index c840442d7f1b..2502cabed5b8 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
index 203543094175..4d61af86ce52 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
index 94c2526dfa34..5ac748179c12 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
index 85e11aaf23e6..2bd67c97c0d9 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
index f65242898641..926b15ecc90d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
index 4bac8c3cc789..3d9caf3d0967 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
index a7db3bb46196..d3c9d457d398 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index 06592d4f8b1e..c4efc4bead05 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
index a493f3b4bc32..eb11a0bf9612 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
index 966c110535e7..54bb9b84728a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
index e25db1d173da..5245a7b1a13b 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
index 6aa35fe92ba2..0ac0e15be670 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
index 12978601f6f3..f1f6dc82db40 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
index 9eb1942e9222..bfb58e40a7bd 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
index 9dd0a015e051..bc44be614591 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index c44510751799..ad97349c4aa6 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
index 28955051f62c..ed32faa1310e 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
index 8eaeed47b405..a0cd2d3b1de7 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
index 3e98c3fb3759..b05980d5ab2b 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
index 25df35605f6a..4ffe1ae76735 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
index 6e02d92b3dd1..a4a5da92d857 100644
--- a/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
+++ b/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java
index 62b235b5fca6..68a65c1fd03d 100644
--- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index 7e21b7a63f2b..c5c72eddda4d 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
index 6ce97bd088b4..cce1b8293f70 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index 16f5d0ccd578..7f24cda49085 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index c325f70ba4d7..64342412931f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
index 833c2cac9689..63ca43c7c120 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
index 5aee8744827e..f445509c705b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
index 7eca6f911e47..f6d488693ea0 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
index dc2ead117104..706b1fc7ea19 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
index 88f0c5403d43..d7fd622aac88 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
index 62b1c1da87b5..687eaeb6a743 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index adad9244a17b..0e2d351e4b66 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
index 6d6761c6f93b..7eff60123106 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
index 24feb1596507..76368f3867a9 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
index 09188c21be87..629ae306594b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
index a1ca226d8e05..dd9cc61fc0dc 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
index d189591474f6..b4e7b3c04099 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
index cf17f1800731..b70778a00af7 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
index 97035579a99d..56cc63a84ff4 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
index 2543b4a6342b..98486c7873d5 100644
--- a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
+++ b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
index bc10bdba91d6..ecc941371d70 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
index 904dd31d284f..3f3a8c15cda6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
index a198792a45ae..b9038b876fb4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
index e73c89b18aa6..e7e88fd08a29 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
index a3b089911b20..abab7c04d299 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
index 71c7800f861f..df34b36d6529 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
index 21e24dbe8594..1a0838a19a9f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
index be8675d3d452..6a8b91f1a262 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
index 26f9bace5a0e..ee4ace269305 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
index a6256aba204d..9c5d2d79e94c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
index 9fde84cfd5ee..52656ace8061 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
index d65eeab0eefc..a2cffcf5592b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
index a4959ca3207d..c8201707eeb4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
index e35eb262f2f8..1006f81062f7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
index e7a21de3f080..b6b175726e7b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
index 7a2d10ea5f39..b5e1166d86d3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index d3c2be240030..f239ef5c038c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
index dc440834d26e..cf931f79af22 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
index ee6ca96fb020..d3b23410cd88 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
index 3c4ded198198..d5942fd2999e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
index 034085991378..b33f981f89ea 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
index 6098d426fcbc..c4f714478ec6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
index 6fcf1dfb9354..0e5a2740283e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
index a06a4cb7fa00..9885c3584161 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 4783275e7d58..8e5d43b358f4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
index 68b409ae9ef9..03fd04b9df96 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
index 438a0d997a4a..dab9dde7b273 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
index b2253bc4c2d6..f5b3969fed2a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
index 187f30235f69..6f9ed604d81d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
index 932a0e793117..55a286caf5df 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
index 462f6a32e770..3666df39a37e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
index 7071e8d7e60d..d7f95867fd77 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 967ef7fba61d..d8010f0ad6b5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
index 97bc4dfafa13..3288b5c7638c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
index 68aa2c7334a2..1fd221f54f80 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index cd35eef9def4..a879cf09d68e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
index e98c6ebfe750..e77fbe828393 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
index f4c50acd4db3..f1ac80b7ad6e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
index 9e4c15f2033a..c328d8cf6d43 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
index e23210ed4bd5..23d181bba6fd 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
index b620ee26312a..e98086b5cf1b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
index 5329ff2eef68..071c591410f3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
index 44aa335f1032..ff5de7e844c3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
index 411f4957ce50..66cabecb6daf 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
index 0f4de18dddf0..39201a188813 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
index 6732adc9697f..b3bd968951d7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
index 98601d505d8d..d0c56ca14582 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
index 5426eb884f2b..5d7f808749a5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
index 8e69ccb0bf31..058c7c8e56ce 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
index 269f9b4ff5cf..4635d12387ea 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
index 7b2b00e31080..cfa3c114ba9a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
index 3d29ee8d9d08..335ff3225b1f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
index f3fd80749646..5492bbd90f3a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
index 11cb04a7c0fa..f714ed70085c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
index 4bf7ebef0a68..15b014848a15 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
index e52e584e4046..689de827e870 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
index ec6565e1cf1e..927d157955a5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
index cec6d5898936..8b2a5b3de5e2 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
index ea346c856227..c88df82865e7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
index 93f217514901..e32fca8c9541 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
index 3ab6072fd4ad..b3b5f39839a8 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
index be97a27da4ca..53b5b4b929e6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
index 57ccabb35e69..961f7d727f64 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
index d3256ff3de54..aa0e8531d938 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
index 1199cea0d875..2dbb21a9871a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
index 44f22594865b..64412dc6b7a5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
index 43584100ab3c..dbae941364d7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
index 8156f42d4332..fb60a2308e4f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
index 9cfac92fcb6e..5b781b663df3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
index 6de559e7c57b..f8767e118c82 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
index d620cda3558a..b9d8778ca195 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
index 4a6181121d29..f5468f11bb96 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
index 1e95e0516598..5918c7b96d51 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
index 1414b5099881..1fa542d8f0d4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
index a5dee9587b30..c3b6e93f9a44 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
index b1403967eec7..00521be8ee4b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
index 33e9eeb214db..f0212d11f7b9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
index 426ceb74a69b..fea1c84987b6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
index 26f7832b41e5..4526824e688f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
index 01ba013f7259..a1549aad8471 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
index c464babcf8ee..a68551aa5f82 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
index 6efc57dab609..c471858dab33 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
index b9bee1fd0837..841d3c75f020 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
index 9fc3a9fe26db..5c8666b586a2 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
index 8db798ac61ec..c252fbe3b05d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
index 511f10553937..d934be5284b4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
index 8baf48abf067..8437b01f4ddd 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
index 18afe7707bed..b11ec5481d56 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
index c14fa1921222..2d499a9706e5 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
index 320e712a7d28..47d9942b626e 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
index f4e6c3fd300c..2f9f8aaf41ff 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
index d97d6ad5762d..a179e00962dd 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
index ba94ac5ff8b7..4e5607828d5c 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
index 35f5dd9ef4c3..f4140988aca6 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
index 62ff497696f7..1db552486b12 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
index a9db10b0d6b8..6df356e6925c 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
index df7799df5185..dd783ad6d4e2 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
index 7f7419401c4b..fe937d846a16 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
index 1580447e0f73..2e874f582024 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
index 82421f6e4254..5ad899165d37 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index c796e75fa91b..33c1923b1f77 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index 9299f85a2a8d..b0337bf8cd25 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
index aebec8bd5886..a76abb63b6c0 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
index 5d4f6c6a13da..da968fc9f08d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
index 2c4dc0f4cf45..ebdd60288b0b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
index 610d610acb37..45328f2fdd75 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
index edc1bb02f2a4..ab69315eaa05 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
index e502dd3f439c..f64f47382d1b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index fcf9e9428e41..beaf8128dc56 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index 91d4fc69f4ca..abfbc3a8e9ba 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
index 7b7931f1425e..399745ac6362 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
index 5e629f150007..53f27acb05f7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index 15b7bef4e8b9..258513847e39 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
index 4fd4d72441f7..fd90412a2984 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
index 0fa19cd7b63b..e443c48b19dc 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
index 763f04a5eb54..14fac9ecfc9c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
index f57ce7002cbf..75beb3922aa3 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index 541eb8cdffc2..91c768dbe544 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
index 6c5dcd4e9d15..a917588358db 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index eaf2c71bff5c..5402a3f4bf63 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
index de0a8186ba92..e7c434ae261f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
index 7d5af7d8a996..86c89aed87a8 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
index c163b64c6daa..3b2e0001bd4a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
index 807a2dab4a32..a435164d5b54 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
index db0cd5b9d301..1fe710e52420 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
index 9e70286a75a6..2f220916d3f6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 4997254e4e18..b34c364e9a47 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
index d96ad1dee15a..f9a4cf26d0e6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 1c3e536a67f4..309cc883c5ed 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
index 0ac9a94a2543..3a0e220b6bf6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
index 781c847f8b8a..e4754b87dd56 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
index 490214c19d63..936d79c0ec74 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
index 29e8ae95d3d0..cda5f0c2a18e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
index df129e586371..76b8671079b1 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
index edda5c1f791d..ddcfaff3158d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
index b040e8489107..66209be947d6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
index f025aca3dcb7..a751ae3d117c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
index 802a25cf98d8..2325df03b3b4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
index 09890e551fe4..1e95f1ae754e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
index 451e92e98bf4..55d9f5e8e70e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
index bb3a4a089187..9c9be35bb398 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index d3dd27aefa2a..fb89e5125d1d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
index a26026d1ae21..94f96b2c9a3e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
index 04a052c16270..277126cac864 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
index 546d2bbb9023..71a32a808947 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
index 7557de0b78cd..770903f0211e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
index 80473b99d298..4039fec43d3d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
index 4e654afcf568..2e7b901c18f5 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
index b5263325973e..b2cf0a2ccc3c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
index 9ab15093048f..2b22142e0580 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
index 3795ed95d452..4793a6ed4d99 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
index 2aa92b98f6d9..fc766a8b5011 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
index cfab5d857586..49e25ce6005f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
index 38117f1072b4..1f3036e6144a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
index 48449c9e8ae6..a783fa55b1bd 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
index 405f898b5837..3be8a21cc47b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
index fc5a1ab6da22..2433acce5fa7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
index 5d791410765d..5d9c1c29f1a4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
index 880c7793b4c1..d551581fded5 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
index efd481e69dcd..e7190e0823cc 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
index 7443b5dcd4ad..0f0d20ad8fdd 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
index 7088110b642c..a0f618ca217c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
index 272548b82e4c..dcf316dd25a1 100644
--- a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
+++ b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
index 0f90f0438452..39eff221aa6f 100644
--- a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
+++ b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
index 39131eb133c2..4b55976dfc63 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
index 0e2677a60001..49a78541ee9c 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
index 18437a60b6b5..9d8fc64c3489 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
index 015cfe0fa2d2..c61ed924c4f1 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index c01f4ed55d2c..588e44e1026f 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
index bb4f59de8692..f91d6a886f5e 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
index dae56a23aad7..107b8bd95654 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
index 185df0b1b905..5dfc28eb24fd 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
index e63205a3809a..b458701acd09 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
index 48f116a35582..6ed05a4764ac 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
index a96042077026..93b9a5132620 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
index 7551584683b6..217890b82ee1 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
index addffb419282..f8e5d95efc69 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
index e08c7c7c9d6a..3cb8605e360f 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
index f4004f82317b..3f2f1949c21d 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
index fffed4eed54f..4a7258349173 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
index 94b720e6e2a0..d36e4c66fd48 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
index 32de491b2785..3f533426bf2e 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
index 57b23cf157e0..af6ba7f2c40f 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
index 678d8829b1d4..08c7a3d1204c 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
index 8eebf8f0ebfc..c0be5d431892 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
index 85fc2bc4c71f..d63020417db5 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
index 263e9fe32c2d..4fc48cdaf390 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
index b12ad33a1f4f..232e1b4406da 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
index d15a80882953..833b995cdfb0 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
index 4659689c598d..57986a22ae40 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
index 1b94f688cf0a..bdf929623e17 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
index cb55b72b6bd5..ebcbd52935ed 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
index f1c06f188542..2d271ec46c69 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
index cef0ab2cb37e..00d3350d2e0d 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
index b8bc45165d0a..91866aa08c19 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index eaca285e7826..147539a0fc07 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
index 5f610a5943df..44730efa5624 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
index 6dfc44afe8ee..79f9d8cbf98f 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
index 348e1c1b2dc0..3a9cbcdc0a26 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
index 9f81798b9dd9..948f06751529 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
index 51afa206cdd2..31b4b49a99ed 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
index b0af0e9c8895..84f85a8e3d13 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index cd0a001be465..88e382d23685 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
index 8045ae2f3303..e7c54bac8726 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
index 6c81b6e76c92..9ef8358f6085 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
index 181563681279..6475a0a73b67 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index 65d3f3ea3f0d..530d9eef8767 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
index 4eddb5255300..65b9ceaf5fe3 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
index 350453569a02..931e39e67ec3 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
index 3550a5dd35ca..f1db3d05a9ab 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
index 023003ce8b86..dc22e3e26600 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
index 0815d69d10f5..a981a94100a9 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
index 2dcce3e28fe6..7f1e4b4066a1 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
index a927028ead2a..0db82a47852f 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
index 9d487c441ace..b87fc9b8fc24 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
index 5c8a08c9ca37..4b70aca9beb7 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
index e50ac4c4e94d..8c7bcbf72c29 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
index 6d9c5e254063..0ffa68ac0f82 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
index 83ca4ed3a33f..bce12f52d451 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
index 950d60faf0d0..59f20cea9026 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
index 98be1e884d20..39e1046146de 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
index 346dab3d4186..87f5fbfd9237 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
index b9687efce26c..5390b5c94ae0 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
index 18d567b32ccc..56b03e625b83 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
index 24b1ed79c8b9..31886aa782a9 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
index 63bb392a261a..6af85def05f6 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
index 4431ad4c3401..6b06a9e4c5e6 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
index 894364861e79..3700e5f92b40 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
index ab108e0f32e1..1d4b6fe9d533 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
index a3972dcba983..d586dfca6bb4 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
index a4ad9b4be3cf..dacdba625de9 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
index 90186a524588..ca4b12ad2f9e 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
index 652ea12aad54..6c92c551046f 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
index aaa29b43763f..c37a744591d4 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
index 77d15318afa1..9f10e5fe2ba0 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
index 558e76aa8fb8..2a68fd5d57af 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
index 8a331d211acf..b899aef37f58 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
index 30f6d4f0145d..3ebc5c802296 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
index a7799ee17e38..1a8494a095f7 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
index 5e486c2ac80a..87c12c274e1b 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
index 319a372d4b33..ddb3a27f7dd9 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
index 690271cd3836..9c7fb87717bc 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
index 99897c096dc1..5a0f815a3ff3 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
index 8eb633df7788..d6bec3b2ecfb 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
index 00cbe0f49d20..b9ca1e7355eb 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
index 47b3397e8b88..9b204236f5be 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
index f16342cad37c..2bbf685e67ed 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
index 8aa70d01bd5b..a8d07f7f1b52 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
index b2da79d14b9d..b5614f9cd51f 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
index 45d70d344949..072edd5fd357 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
index e9328423bd84..fdc3e813b804 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
index 29de0ec67a43..fc3083c8bf1a 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
index 1a937cfc8b2f..307c78c7a802 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
index 530458d7c365..8e6c74444f39 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
index 5eb1786c6ee6..7690c47d4ced 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
index a3168b7a0ee1..65ccd5ea1037 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
index e78395c3b8a7..9a3cc044f941 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
index 63dddffb44bf..70294b3ce48f 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
index ef6b555a724b..dd48ef2550ae 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
index 4934b2637598..90341229dcdd 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
index 7ac2e73fec5c..f3b423b461eb 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
index d3e8aee61509..107b07c3f887 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
index 30582b651418..7a90cc206ada 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
index b58b2497c54f..2c37a851c288 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
index f7c69ad5caf0..283290e8ce54 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
index 697c6ce7fbaf..351ec840fea7 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
index a1b6cb1a946b..d05dc143f2a0 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
index 210f6e883007..31cc165b9e2f 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
index b18862251a79..958db3e27d14 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
index 0026a937b93a..1d61e5507991 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
index 150cf33efb32..0dd49cb5326f 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
index 2680cb881b41..0dc636545d2e 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
index 10d640a510ed..b500ac4ed8ba 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
index 8f58db958e00..822a881afd99 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
index 0c86f14738ca..b62cc734179d 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
index f6b9ec769115..d4cc092db6a3 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
index 58d9f6dcb3c5..082d24beff0d 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
index 19ea74600356..eef9d8bd293a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
index c7a780f6bd78..21a6f2a19d01 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
index 4e3168fa5258..38371372d03e 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
index 16b4bbb897db..d031e2428590 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
index 8fe310355e28..4c7d2a5620bb 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
index 7aec2deefb7f..1c8b4812107a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index 60e57a529d83..0f437a9df3cf 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
index ae88b62d8ce4..6f057ff1ecfa 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
index 1bb289adf1d3..7c0ca261da93 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
index 6f7a0b0a7d02..012fe8f5776d 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
index 98b28e932837..7e9a628c79bb 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index c36ff60c1982..1ba923d1a560 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
index c5e60d152fca..e94a473c1159 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
index bc0db4f1639a..63f2221184fc 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
index 6b1718822653..e368fe3bff07 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
index 146d004d93a8..6dd5ac07244b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
index df3afd2b8fb2..6996b22ab070 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index 635562ece9dd..aafbd4915e4e 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
index ad6f1603490b..33fc9d48bed5 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
index 6b2a53ad977a..802d23c5a720 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
index 495c1ee962ab..9c0029bb2a37 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
index bce83eee8e71..7a3e05f8897b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
index c807d7b17a6a..3428266f3123 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
index 82d3f4c1c471..98e29bbbc0a8 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
index 222c97e54330..ff5fc5b4de62 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
index f3c901c37e4d..aa2af4f8bbae 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
index 713c0abd9c0e..1c279a3773e3 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
index c79eebdd9d83..c8906f9792ed 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
index 0835e614b9a1..567d58d9830f 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
index f0890b7b8ccc..e14dc1430879 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
index 5fe18fc5da62..8fe64bc90895 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
index 114f65bd7218..d23fc97d69ec 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
index b03e9608bb56..b1bebc7f2c7f 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
index f5a0a6c0a9f0..6a983af10af9 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
index 85b64024c986..7eb944ef63b9 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
index 011a7b177128..456c21b1492d 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
index 133c0c487883..db54c9bd3b05 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
index 202d96f6da45..3425fbc48bb2 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
index c106c6649cd4..8fe637ff2005 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
index 054104725c95..bc448b7b7e4c 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
index e7a8a2dc59cf..24e4a5d25b99 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java b/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
index d41d7a86f7d2..e74589c0fc84 100644
--- a/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
+++ b/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/DefaultPackageTestCase.java b/platform-tests/src/test/java/DefaultPackageTestCase.java
index e902fc670a05..6d77e4eb7013 100644
--- a/platform-tests/src/test/java/DefaultPackageTestCase.java
+++ b/platform-tests/src/test/java/DefaultPackageTestCase.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java b/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
index 7b787fcf298f..69511be30161 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
index 59ed57442b64..facddc9c270f 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java
index 641f8a2ffbfe..dc0f5af28a60 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java b/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
index 3ec2fba68fea..d7c7bffe67b7 100644
--- a/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
index 6900d12e7bc9..c15557853a6d 100644
--- a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java b/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
index 4a4d7551c68f..6bcc4fb67c3c 100644
--- a/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java b/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
index de8db8c1ce17..29181e5b3e12 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
index 87aff28c74cf..51d4819053bd 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
index 438136b48240..7758c0e48c9c 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
index 0d5bf3f035c4..c9ad70889c01 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
index c4222bd23c9f..50a7221d35a6 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java b/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
index a9cb66e78922..0e3cb4fb4031 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index 3e3298ad4879..e2629e05043a 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
index b41391849404..e591c46e20c6 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
index bc4ce0de5d67..bce8b8c6c267 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
index f2ba82645a5f..575c649480bf 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
index 1d2e857c59dd..4d54305c1f25 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
index 72b07feccba4..787fee59a48c 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index ef55a0344537..e8093659ee2b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
index 736273453d2e..d7395b41a653 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
index 507857f62bf4..523cff7b3a8f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
index ec0668ac601c..59a7d3f61f17 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
index 6effa2bcae0b..533cb17d61ca 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
index 0005995a1e00..3f0a5ab3455f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
index cbbc4b82e54f..3978a0c57342 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 0d2e2e60fb43..99a20b084089 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
index 3f42f01f9a7a..1ba6577e08ba 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
index 66cb4fb1baad..69aa54c40ae8 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
index 847ad5040481..4feda4bcb7e8 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
index 54115734a725..55ce3b2faa30 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
index ec2d2ca19adc..e35c98952a85 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
index 461b1f325f2a..e1940461af57 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
index 226712dfea11..774346f3a08f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
index 65b45ef2b94b..40e7a28173ab 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
index ed54d32ba7ca..dadae6fdc9bb 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
index c5790d84e263..65337f4fcf4f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
index 15ef8bdbcb02..041e7ecf4fe6 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
index 01b208b62290..499c3396a0e7 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
index 2dda1beb0c01..475bf2cd91fa 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
index 89c999053f37..3e2241004a83 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index 566b0742d136..8b1af287fdcc 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
index 05c93d4cfdfd..22846b4e9ae0 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
index 195cb9ed62dd..539ae4bf8feb 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index 7ba4af6aaa73..3e7c0d2425bb 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
index 776257e5959e..fb3f50e7e11d 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
index 38dfc294423c..2c8c529b0b0b 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
index a8a1977020ff..5ba1915f7067 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
index 1cbd5b9a7b64..1ed70aaf00ab 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
index a5a872c49a93..2ff762c5cbfb 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
index 2e45164e33c0..91956de9b0e4 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
index 64b66b7dd568..b57598e9a897 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
index 0c264b83a487..67532b15a312 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
index 8aee33f5c4e1..5ddb93d4ef27 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
index 53bcb1cd8fdb..3b2f64094feb 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index 2ca1e4320de4..44136d8a48ec 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
index 77efc0cdafee..8f50daf56c3c 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index 56d98f564056..f815943a57a1 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
index fd731358cae8..7bb1ec8969d7 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
index 8d218170b9ac..91ede1d7be4b 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
index 95ea579f9738..b244d8cd67ee 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
index a172bdcc1995..ebf4c806ccff 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
index 400ce7bc4304..899db26dd186 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
index d9198a47ad17..48483a410be8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
index ff57740b1cd4..87c8edb7a1a0 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
index 3b1298f50488..552b3b0505ca 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
index 9f31532958f7..b34a72b4a104 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
index 85a5959e74b9..efbed09ad0d0 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
index 8b07b914b1a8..c1a647583336 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
index e07907d9355f..e8b26215d5ac 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
index ebf1c08fad54..061e50d76629 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
index 91ac2ed262bf..d83dc4da9ef1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index c94a4860bdf9..fb3f2c754fd9 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
index 2f1f46f7388c..acfd9538991f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
index 905f175839db..c85fedfb8c6b 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 700987f483f3..63ff2ebf27ac 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
index 468415f81c7a..18c24ebc5b60 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
index 8f9cf88bda69..59bf7933d3bc 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
index 831f9e636beb..06bf615d2120 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
index bcb0e078f278..6cfee25cfbe8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
index afa33556b816..ba712020b39b 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
index de8a24ee3a72..9c117b176750 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
index 5cf25cd3c85e..9039e95fb739 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
index e96d67881b4d..226ba8a8e1f5 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
index 82de658318ce..1057ea8df19e 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
index bda2bc614a7d..7cc4406b58c2 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
index 03c6c4d6341a..25ee76fa05d1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
index 770e6fe3d46d..fc931a9069aa 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
index 44d5005ead18..439c5a0d9eb3 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
index 1806a72c3724..b9ec159450ca 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
index f435cd9f111c..57b3ef9aecf1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
index ad128096bd69..e928dc3dca0c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
index d3b30c5673db..77ca484940f1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
index a3aaaeb95baa..bdf036f8f025 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
index f5e0fde6f1e1..f112676af433 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
index 23655be4feae..d084834384a8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
index bc1dfe6ce357..c277c3e88a91 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
index 119caed41735..746f419c8eaf 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
index df89984acb30..10f0e1511886 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
index fad8d16f22ca..973d3127c3ea 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
index 173b09dd5390..441095b22582 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
index e7b9fdf5c449..cb10e1bbe932 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
index 5facf032285f..b4443e496a0a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
index fbbfd080d55b..349b5f3fb9be 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
index 657515dfe52f..714ea701d7ad 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
index 3b39d74d2b0d..c6966e449daa 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
index 514850f814c5..f745bb4d12d8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
index 89c3459049b5..e8b9b5154516 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
index 4bf11025fa16..66816363079a 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
index 85e41b69a8d3..c5f679b8c654 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
index 86999dfeea7b..986346bb80dd 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
index 2a9782454475..5be517289660 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
index e9be8894e765..997506420635 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
index 389a48a9ccbf..365480de8bb4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
index c26fdc3142fb..dfa99569327f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
index 2d5a29d5b66b..31cab1236a66 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
index 1c2de148b093..413473825a82 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
index 46d6cad63f89..25af4a121d65 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
index f30043aa5233..b73d7426f637 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
index 2a448877ed43..85957bc761cd 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
index 76c4c945be4d..c1fffe2ef0b7 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 6544323389a1..fad546574c8b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
index 13a280be24c1..243accab2d65 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
index 1bf3e03e2940..b36a8d235974 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
index a419cc8928cf..0955c89a65fd 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
index 87ecbd0e6e14..97ce4573c39e 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
index 8d0630f5dc45..c45d8e2c9307 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 30400989c8b9..70333283e96b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
index dc5bb0578701..b74b8ad1fb29 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
index abefde4b1d53..076a428de099 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
index 977a5b43ae33..b4a5b727c30c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
index c39550078382..8ed11146236e 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
index 2d41ae6f778a..89d4a42c3f0f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
index d2cf26b0f506..14438f62c8ca 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index 35951ffe7f85..4671332bcf34 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
index abec2cbfd5a3..56535d77bee0 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
index 2aea2aff3855..cc59100b51f0 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
index 6e4bc4390b8f..933b915987f5 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
index 17c52de1a978..f5d6bf59ec8a 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
index 8e33cb23d7b4..c5467c549d9c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
index 07bcd190a1df..ed52d557b252 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
index 35054e05c125..a686fe959924 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
index d60802a39ca6..24f887cf957e 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
index e13a06dec87d..82e81aef34dc 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
index ece4d0ff4bb8..4fee75a93057 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
index 81762e33995b..319440c3fa4f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
index 366a1d644adb..cc329d465e5b 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
index 570e3d020d82..8f10736e40e8 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 87852e3c3df8..321b69d745b8 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
index b3d1037db4ac..4534538e442c 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index 906e7d6d040f..8eb7598a581e 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index 5b02b962f368..4fb44c5f653d 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index b2491e7913fc..4e2c793e5c0b 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index 7b0e8d29ed71..3d10535e8956 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index 17e5d6771e9e..a683895d4811 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index def9d77262c8..ab56a02f22fb 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
index 8a7577c935f9..6d857c2f20df 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
index b4e9b020c63a..a25db296e23e 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
index 1f8c153eaa29..561b28ae0f15 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
index c7ca90da21e7..e544f0c4edc7 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
index 23534540f372..1897e743fec6 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
index a6f6aef1fdfa..d83e1ad19f8f 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
index 52386804a2d0..48676d211aff 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
index 0c79bd93c72c..f131dcbd377b 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
index 49f7ee50ea34..c0c7b455df3b 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
index 33f107858f26..920b871d22e3 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
index 12679a1cb98d..027a30018608 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
index 906ce70cb5ad..c6ac6e49a239 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
index b380eeaaafef..b5f4dec98f0f 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
index f32413cea271..fcbda4ce96d0 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
index 729ae1996c9f..a8571bfef83a 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 453a72cdb676..7254a869d9bd 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
index d6e5bd2b9130..1a6dec0cc569 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
index 30d7048ce9ff..30d1a263c441 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java
index 6e7db80e130c..c921cb99be7b 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
index 2895a7bbbf85..bfde5041e292 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
index cf83d453fae7..fcbdb42767d6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
index 71be9fd0b170..e5452a84d85c 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
index 994ae303209d..961737ac0fb3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
index 0f5ed11d0535..5fab1fa4f9aa 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
index a581df45e1d5..5b6680228855 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
index 0d5b085c272f..975a6f3d0986 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
index 2c3f5a36dc30..f25204e8ebde 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
index 50d8b5dd35e0..3ed7bda3efe1 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
index ca545d46368f..23d72b4fd733 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
index 4700a5de9e54..006fc7ed72f5 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
index e107bb522f47..c34995fb89b6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
index 55bfe5020d23..e7c4b9b520cd 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index 65da6cfd6805..bad31b526a13 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
index a371d9f8a93a..0a8fdb4b26a6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
index 213988361fac..45a7d5bac9ab 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 1aa4146550b5..2370cc89a8b6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
index 95393d902006..4e8f160a3175 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index ba97fc28478e..b4bd053697ec 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index 267175b9e285..3b94f1c893d6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/src/spotless/eclipse-public-license-2.0.java b/src/spotless/eclipse-public-license-2.0.java
index a74c31a03f26..f05cfbf6309c 100644
--- a/src/spotless/eclipse-public-license-2.0.java
+++ b/src/spotless/eclipse-public-license-2.0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which

From e6f22531507b5f575d366fb12f2bd6e88cfff535 Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Thu, 13 Jan 2022 12:39:28 +0000
Subject: [PATCH 0685/1433] Update Gradle Enterprise plugins (#2808)

---
 settings.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index ccfa5f74a2c1..3c845572c695 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,9 +5,9 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.7.1"
+		id("com.gradle.enterprise") version "3.8"
 		id("com.gradle.enterprise.test-distribution") version "2.2.1" // keep in sync with buildSrc/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.4.2"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From 20fc0fc93ebca7f1f928d57400e28013fa0025e1 Mon Sep 17 00:00:00 2001
From: Roberto Cella <rob.uniud@gmail.com>
Date: Sat, 15 Jan 2022 16:33:32 +0100
Subject: [PATCH 0686/1433] Document new failure message argument position in
 JUnit 4 migration tips

This commit documents the difference between JUnit 4 and JUnit Jupiter
with regard to the position of failure message arguments for assertions
and assumptions.

See #2810
Closes #2809
---
 .../user-guide/migration-from-junit4.adoc     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
index 1daf9302be87..62c9f88efadc 100644
--- a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
@@ -63,6 +63,9 @@ tests to JUnit Jupiter.
 * `@Rule` and `@ClassRule` no longer exist; superseded by `@ExtendWith` and
   `@RegisterExtension`
   - See also <<migrating-from-junit4-rule-support>>.
+* Assertions and assumptions in JUnit Jupiter accept the failure message as their last
+  argument instead of the first one.
+  - See <<migrating-from-junit4-failure-message-arguments>> for details.
 
 
 [[migrating-from-junit4-rule-support]]
@@ -118,3 +121,35 @@ automatically registers the `IgnoreCondition` along with
 ----
 include::{testDir}/example/IgnoredTestsDemo.java[tags=user_guide]
 ----
+
+
+[[migrating-from-junit4-failure-message-arguments]]
+=== Failure Message Arguments
+
+The `Assumptions` and `Assertions` classes in JUnit Jupiter declare arguments in a
+different order than in JUnit 4. In JUnit 4 assertion and assumption methods accept
+the failure message as the first argument; whereas, in JUnit Jupiter assertion and
+assumption methods accept the failure message as the last argument.
+
+For instance, the method `assertEquals` in JUnit 4 is declared as
+`assertEquals(String message, Object expected, Object actual)`, but in JUnit Jupiter it
+is declared as `assertEquals(Object expected, Object actual, String message)`.
+The rationale for this is that a failure message is _optional_, and optional arguments
+should be declared after required arguments in a method signature.
+
+The methods affected by this change are the following:
+
+- Assertions
+  * `assertTrue`
+  * `assertFalse`
+  * `assertNull`
+  * `assertNotNull`
+  * `assertEquals`
+  * `assertNotEquals`
+  * `assertArrayEquals`
+  * `assertSame`
+  * `assertNotSame`
+  * `assertThrows`
+- Assumptions
+  * `assumeTrue`
+  * `assumeFalse`

From aa9d2f22912078bce88fc66328f8f671e6d6e32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prinet?= <jprinet@gmail.com>
Date: Mon, 17 Jan 2022 11:50:59 +0100
Subject: [PATCH 0687/1433] Upgrade Gradle enterprise plugin dependencies
 (#2812)

---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ec68c44a2815..4ee9121474ae 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
     implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.1")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.1") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.2") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3c845572c695..3d5baecb2e21 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,8 +5,8 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.8"
-		id("com.gradle.enterprise.test-distribution") version "2.2.1" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise") version "3.8.1"
+		id("com.gradle.enterprise.test-distribution") version "2.2.2" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"

From 89f6bbce2041ef29580df59ee86a9471a7698f3b Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Sun, 23 Jan 2022 11:00:26 +0100
Subject: [PATCH 0688/1433] Remove Jitpack usage and configuration file

Addresses part of #2815
---
 .jitpack.yml                                               | 5 -----
 buildSrc/src/main/kotlin/publishing-conventions.gradle.kts | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 .jitpack.yml

diff --git a/.jitpack.yml b/.jitpack.yml
deleted file mode 100644
index 39c04bae497c..000000000000
--- a/.jitpack.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-install:
-  - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
-  - source ./install-jdk.sh --feature 15
-  - ./gradlew --version
-  - ./gradlew publishToMavenLocal -x test
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index ddf78e3dac10..97b9a46e92b7 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -6,7 +6,6 @@ plugins {
 
 val isSnapshot = project.version.toString().contains("SNAPSHOT")
 val isContinuousIntegrationEnvironment = System.getenv("CI")?.toBoolean() ?: false
-val isJitPackEnvironment = System.getenv("JITPACK")?.toBoolean() ?: false
 
 val jupiterProjects: List<Project> by rootProject
 val platformProjects: List<Project> by rootProject
@@ -43,7 +42,7 @@ tasks.withType<PublishToMavenLocal>().configureEach {
 
 signing {
 	sign(publishing.publications)
-	isRequired = !(isSnapshot || isContinuousIntegrationEnvironment || isJitPackEnvironment)
+	isRequired = !(isSnapshot || isContinuousIntegrationEnvironment)
 }
 
 tasks.withType<Sign>().configureEach {

From 1460eea30428e2c6d778bf7e5cadec453e4c39e8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Jan 2022 18:45:00 +0100
Subject: [PATCH 0689/1433] Upgradle to 7.4-rc-1

---
 buildSrc/src/main/kotlin/ProjectExtensions.kt |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 59536 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/buildSrc/src/main/kotlin/ProjectExtensions.kt
index fa3f5c9bc956..fc8a515977e7 100644
--- a/buildSrc/src/main/kotlin/ProjectExtensions.kt
+++ b/buildSrc/src/main/kotlin/ProjectExtensions.kt
@@ -10,7 +10,7 @@ fun Project.requiredVersionFromLibs(name: String) =
     libsVersionCatalog.findVersion(name).get().requiredVersion
 
 fun Project.dependencyFromLibs(name: String) =
-    libsVersionCatalog.findDependency(name).get()
+    libsVersionCatalog.findLibrary(name).get()
 
 fun Project.bundleFromLibs(name: String) =
     libsVersionCatalog.findBundle(name).get()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 8958
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
R_{@Vu|29OF7ypyz{{qB}Ob!45

delta 8722
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 59250647c409..f3347f902964 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionSha256Sum=b2a452bc37637aa453f0f3fb526240caed02878c47a9736f3059590605893bdb
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From bc46c9c4d6382f3ff8d342d405dbf95839eef0ea Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Jan 2022 18:45:12 +0100
Subject: [PATCH 0690/1433] Use gpg-agent for signing

---
 buildSrc/src/main/kotlin/publishing-conventions.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index 97b9a46e92b7..c4e28d5bb3a9 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -41,6 +41,7 @@ tasks.withType<PublishToMavenLocal>().configureEach {
 }
 
 signing {
+	useGpgCmd()
 	sign(publishing.publications)
 	isRequired = !(isSnapshot || isContinuousIntegrationEnvironment)
 }

From 7814b04d4482dc612d40d1ed52c10b1d978f3ddb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Jan 2022 18:54:27 +0100
Subject: [PATCH 0691/1433] Update to Groovy 4

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b5eedda8f384..693424db58fa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.1.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.132" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
-groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.0-beta-1" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.0" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }

From 0d098b4e049ff295ce6aa6dc74f9c46087e97cba Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Fri, 4 Feb 2022 11:14:28 +0100
Subject: [PATCH 0692/1433] Allow extensions to leverage registered
 ParameterResolvers for method and constructor invocations (#2786)

This commit introduces a new `ExecutableInvoker` API in Jupiter, available in the `ExtensionContext`.
This invoker allows extensions to leverage registered `ParameterResolvers` for method and constructor invocations.

Resolves #2393.
---
 .../src/docs/asciidoc/link-attributes.adoc    |   1 +
 .../release-notes/release-notes-5.9.0-M1.adoc |  10 +-
 .../docs/asciidoc/user-guide/extensions.adoc  |   7 +
 .../api/extension/ExecutableInvoker.java      |  72 ++++++++++
 .../api/extension/ExtensionContext.java       |   9 ++
 .../descriptor/AbstractExtensionContext.java  |  10 +-
 .../descriptor/ClassBasedTestDescriptor.java  |  14 +-
 .../descriptor/ClassExtensionContext.java     |  13 +-
 .../descriptor/DynamicExtensionContext.java   |   6 +-
 .../descriptor/DynamicNodeTestDescriptor.java |   3 +-
 .../descriptor/JupiterEngineDescriptor.java   |   5 +-
 .../JupiterEngineExtensionContext.java        |   6 +-
 .../descriptor/MethodExtensionContext.java    |   5 +-
 .../descriptor/TestFactoryTestDescriptor.java |   6 +-
 .../descriptor/TestMethodTestDescriptor.java  |  11 +-
 .../TestTemplateExtensionContext.java         |   7 +-
 .../TestTemplateInvocationTestDescriptor.java |   2 +-
 .../TestTemplateTestDescriptor.java           |   5 +-
 .../execution/DefaultExecutableInvoker.java   |  58 ++++++++
 .../InterceptingExecutableInvoker.java        | 116 +++++++++++++++
 ...ker.java => ParameterResolutionUtils.java} | 103 ++------------
 .../ExecutableInvokerIntegrationTests.java    |  92 ++++++++++++
 .../descriptor/ExtensionContextTests.java     |  30 ++--
 .../AbstractExecutableInvokerTests.java       |  98 +++++++++++++
 .../DefaultExecutableInvokerTests.java        |  36 +++++
 .../InterceptingExecutableInvokerTests.java   |  46 ++++++
 ...ava => ParameterResolutionUtilsTests.java} | 134 +++++++++---------
 .../ParameterizedTestExtensionTests.java      |   6 +
 28 files changed, 707 insertions(+), 204 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultExecutableInvoker.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java
 rename junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/{ExecutableInvoker.java => ParameterResolutionUtils.java} (59%)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExecutableInvokerIntegrationTests.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultExecutableInvokerTests.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvokerTests.java
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/{ExecutableInvokerTests.java => ParameterResolutionUtilsTests.java} (78%)

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index b1f9c13e4706..8a45d4218e8e 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -97,6 +97,7 @@ endif::[]
 :BeforeAllCallback:                          {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/BeforeAllCallback.html[BeforeAllCallback]
 :BeforeEachCallback:                         {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/BeforeEachCallback.html[BeforeEachCallback]
 :BeforeTestExecutionCallback:                {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.html[BeforeTestExecutionCallback]
+:ExecutableInvoker:                          {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/ExecutableInvoker.html[ExecutableInvoker]
 :ExecutionCondition:                         {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/ExecutionCondition.html[ExecutionCondition]
 :ExtendWith:                                 {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/ExtendWith.html[@ExtendWith]
 :ExtensionContext:                           {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/ExtensionContext.html[ExtensionContext]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 595e077b0597..6b88bd3abf60 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -26,7 +26,9 @@ on GitHub.
 * `ConfigurationParameters` has now a `keySet()` method allowing to retrieve
   all configuration parameter keys.
 * New `IterationSelector` for selecting a subset of a test's or container's iterations.
-* JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at resolution time a fully running set of dependencies are calculated avoiding the need for these to be manually specified.
+* JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
+  resolution time a fully running set of dependencies are calculated avoiding the need
+  for these to be manually specified.
 
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
@@ -46,8 +48,10 @@ on GitHub.
   parameterized or dynamic tests.
 * Add support for `MATCH_NONE` mode in `EnumSource` that selects only those enum constants
   whose names match none of the supplied patterns.
-* A new extension `TestInstancePreConstructCallback` called prior to a test instance construction
-  (symmetric extension to `TestInstancePreDestroyCallback`).
+* A new extension `TestInstancePreConstructCallback` called prior to a test instance
+  construction (symmetric extension to `TestInstancePreDestroyCallback`).
+* Allow extensions to leverage registered `ParameterResolvers` for method and constructor
+  invocations, via the new `ExecutableInvoker` available in the `ExtensionContext`.
 
 
 [[release-notes-5.9.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index 4c80e2b2b119..2656ce8374ea 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -416,6 +416,13 @@ those provided in `java.lang.reflect.Parameter` in order to avoid this bug in th
 * `List<A> findRepeatableAnnotations(Class<A> annotationType)`
 ====
 
+[NOTE]
+====
+Other extensions can also leverage registered `ParameterResolvers` for method and
+constructor invocations, using the `{ExecutableInvoker}` available via the
+`getExecutableInvoker()` method in the `ExtensionContext`.
+====
+
 [[extensions-test-result-processing]]
 === Test Result Processing
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java
new file mode 100644
index 000000000000..f14d8cc1e961
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.extension;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code ExecutableInvoker} allows invoking methods and constructors
+ * with support for dynamic resolution of parameters via
+ * {@link ParameterResolver ParameterResolvers}.
+ *
+ * @since 5.9
+ */
+@API(status = EXPERIMENTAL, since = "5.9")
+public interface ExecutableInvoker {
+
+	/**
+	 * Invoke the supplied {@code static} method with dynamic parameter resolution.
+	 *
+	 * @param method the method to invoke and resolve parameters for
+	 * @see #invoke(Method, Object)
+	 */
+	default Object invoke(Method method) {
+		return invoke(method, null);
+	}
+
+	/**
+	 * Invoke the supplied method with dynamic parameter resolution.
+	 *
+	 * @param method the method to invoke and resolve parameters for
+	 * @param target the target on which the executable will be invoked;
+	 * can be {@code null} for {@code static} methods
+	 */
+	Object invoke(Method method, Object target);
+
+	/**
+	 * Invoke the supplied top-level constructor with dynamic parameter resolution.
+	 *
+	 * @param constructor the constructor to invoke and resolve parameters for
+	 * @see #invoke(Constructor, Object)
+	 */
+	default <T> T invoke(Constructor<T> constructor) {
+		return invoke(constructor, null);
+	}
+
+	/**
+	 * Invoke the supplied constructor with the supplied outer instance and
+	 * dynamic parameter resolution.
+	 *
+	 * <p>Use this method when invoking the constructor for an <em>inner</em> class.
+	 *
+	 * @param constructor the constructor to invoke and resolve parameters for
+	 * @param outerInstance the outer instance to supply as the first argument
+	 * to the constructor; must be {@code null} for top-level classes
+	 * or {@code static} nested classes
+	 */
+	<T> T invoke(Constructor<T> constructor, Object outerInstance);
+
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index f573561c3d89..55c7fad2e50f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -393,6 +393,15 @@ default void publishReportEntry(String value) {
 	@API(status = STABLE, since = "5.8.1")
 	ExecutionMode getExecutionMode();
 
+	/**
+	 * Get an {@link ExecutableInvoker} to invoke methods and constructors
+	 * with support for dynamic resolution of parameters.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	ExecutableInvoker getExecutableInvoker();
+
 	/**
 	 * {@code Store} provides methods for extensions to save and retrieve data.
 	 */
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
index baaae959f3c2..5ed8ce41c398 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
@@ -20,6 +20,7 @@
 import java.util.Set;
 import java.util.function.Function;
 
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
@@ -44,9 +45,11 @@ abstract class AbstractExtensionContext<T extends TestDescriptor> implements Ext
 	private final Set<String> tags;
 	private final JupiterConfiguration configuration;
 	private final ExtensionValuesStore valuesStore;
+	private final ExecutableInvoker executableInvoker;
 
 	AbstractExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener, T testDescriptor,
-			JupiterConfiguration configuration) {
+			JupiterConfiguration configuration, ExecutableInvoker executableInvoker) {
+		this.executableInvoker = executableInvoker;
 
 		Preconditions.notNull(testDescriptor, "TestDescriptor must not be null");
 		Preconditions.notNull(configuration, "JupiterConfiguration must not be null");
@@ -136,6 +139,11 @@ public ExecutionMode getExecutionMode() {
 		return toJupiterExecutionMode(getPlatformExecutionMode());
 	}
 
+	@Override
+	public ExecutableInvoker getExecutableInvoker() {
+		return executableInvoker;
+	}
+
 	protected abstract Node.ExecutionMode getPlatformExecutionMode();
 
 	private ExecutionMode toJupiterExecutionMode(Node.ExecutionMode mode) {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index b1a02844b476..7dfa614dc2b5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -37,6 +37,7 @@
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -53,10 +54,11 @@
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.AfterEachMethodAdapter;
 import org.junit.jupiter.engine.execution.BeforeEachMethodAdapter;
+import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
 import org.junit.jupiter.engine.execution.DefaultTestInstances;
-import org.junit.jupiter.engine.execution.ExecutableInvoker;
-import org.junit.jupiter.engine.execution.ExecutableInvoker.ReflectiveInterceptorCall;
-import org.junit.jupiter.engine.execution.ExecutableInvoker.ReflectiveInterceptorCall.VoidMethodInterceptorCall;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.ReflectiveInterceptorCall;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.ReflectiveInterceptorCall.VoidMethodInterceptorCall;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
 import org.junit.jupiter.engine.execution.TestInstancesProvider;
 import org.junit.jupiter.engine.extension.ExtensionRegistrar;
@@ -82,7 +84,7 @@
 @API(status = INTERNAL, since = "5.5")
 public abstract class ClassBasedTestDescriptor extends JupiterTestDescriptor {
 
-	private static final ExecutableInvoker executableInvoker = new ExecutableInvoker();
+	private static final InterceptingExecutableInvoker executableInvoker = new InterceptingExecutableInvoker();
 
 	private final Class<?> testClass;
 	protected final Set<TestTag> tags;
@@ -174,8 +176,10 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		this.afterAllMethods.forEach(method -> registerExtensionsFromExecutableParameters(registry, method));
 
 		ThrowableCollector throwableCollector = createThrowableCollector();
+		ExecutableInvoker executableInvoker = new DefaultExecutableInvoker(context);
 		ClassExtensionContext extensionContext = new ClassExtensionContext(context.getExtensionContext(),
-			context.getExecutionListener(), this, this.lifecycle, context.getConfiguration(), throwableCollector);
+			context.getExecutionListener(), this, this.lifecycle, context.getConfiguration(), throwableCollector,
+			executableInvoker);
 
 		// @formatter:off
 		return context.extend()
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
index 945bb6c46028..5fbcb0e5f925 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
@@ -36,20 +37,22 @@ final class ClassExtensionContext extends AbstractExtensionContext<ClassBasedTes
 	/**
 	 * Create a new {@code ClassExtensionContext} with {@link Lifecycle#PER_METHOD}.
 	 *
-	 * @see #ClassExtensionContext(ExtensionContext, EngineExecutionListener, ClassBasedTestDescriptor, Lifecycle, JupiterConfiguration, ThrowableCollector)
+	 * @see #ClassExtensionContext(ExtensionContext, EngineExecutionListener, ClassBasedTestDescriptor,
+	 * Lifecycle, JupiterConfiguration, ThrowableCollector, ExecutableInvoker)
 	 */
 	ClassExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
 			ClassBasedTestDescriptor testDescriptor, JupiterConfiguration configuration,
-			ThrowableCollector throwableCollector) {
+			ThrowableCollector throwableCollector, ExecutableInvoker executableInvoker) {
 
-		this(parent, engineExecutionListener, testDescriptor, Lifecycle.PER_METHOD, configuration, throwableCollector);
+		this(parent, engineExecutionListener, testDescriptor, Lifecycle.PER_METHOD, configuration, throwableCollector,
+			executableInvoker);
 	}
 
 	ClassExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
 			ClassBasedTestDescriptor testDescriptor, Lifecycle lifecycle, JupiterConfiguration configuration,
-			ThrowableCollector throwableCollector) {
+			ThrowableCollector throwableCollector, ExecutableInvoker executableInvoker) {
 
-		super(parent, engineExecutionListener, testDescriptor, configuration);
+		super(parent, engineExecutionListener, testDescriptor, configuration, executableInvoker);
 
 		this.lifecycle = lifecycle;
 		this.throwableCollector = throwableCollector;
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
index 31aa82afca4a..4e0c3cb72a70 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
@@ -24,8 +25,9 @@
 class DynamicExtensionContext extends AbstractExtensionContext<DynamicNodeTestDescriptor> {
 
 	DynamicExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
-			DynamicNodeTestDescriptor testDescriptor, JupiterConfiguration configuration) {
-		super(parent, engineExecutionListener, testDescriptor, configuration);
+			DynamicNodeTestDescriptor testDescriptor, JupiterConfiguration configuration,
+			ExecutableInvoker executableInvoker) {
+		super(parent, engineExecutionListener, testDescriptor, configuration, executableInvoker);
 	}
 
 	@Override
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
index befabd78b42f..8619bb1fba58 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
@@ -12,6 +12,7 @@
 
 import org.junit.jupiter.api.DynamicNode;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestSource;
@@ -45,7 +46,7 @@ public String getLegacyReportingName() {
 	@Override
 	public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext context) {
 		DynamicExtensionContext extensionContext = new DynamicExtensionContext(context.getExtensionContext(),
-			context.getExecutionListener(), this, context.getConfiguration());
+			context.getExecutionListener(), this, context.getConfiguration(), new DefaultExecutableInvoker(context));
 		// @formatter:off
 		return context.extend()
 				.withExtensionContext(extensionContext)
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
index 7793ce4cf0ef..0aa9d9056770 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
@@ -14,8 +14,10 @@
 import static org.junit.jupiter.engine.descriptor.JupiterTestDescriptor.toExecutionMode;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
 import org.junit.platform.engine.EngineExecutionListener;
@@ -51,8 +53,9 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		MutableExtensionRegistry extensionRegistry = MutableExtensionRegistry.createRegistryWithDefaultExtensions(
 			context.getConfiguration());
 		EngineExecutionListener executionListener = context.getExecutionListener();
+		ExecutableInvoker executableInvoker = new DefaultExecutableInvoker(context);
 		ExtensionContext extensionContext = new JupiterEngineExtensionContext(executionListener, this,
-			context.getConfiguration());
+			context.getConfiguration(), executableInvoker);
 
 		// @formatter:off
 		return context.extend()
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
index 87806cb24f9c..14c042e3c8be 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.engine.EngineExecutionListener;
@@ -26,9 +27,10 @@
 final class JupiterEngineExtensionContext extends AbstractExtensionContext<JupiterEngineDescriptor> {
 
 	JupiterEngineExtensionContext(EngineExecutionListener engineExecutionListener,
-			JupiterEngineDescriptor testDescriptor, JupiterConfiguration configuration) {
+			JupiterEngineDescriptor testDescriptor, JupiterConfiguration configuration,
+			ExecutableInvoker executableInvoker) {
 
-		super(null, engineExecutionListener, testDescriptor, configuration);
+		super(null, engineExecutionListener, testDescriptor, configuration, executableInvoker);
 	}
 
 	@Override
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
index 2843b4f7bf89..b10be186c15d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
@@ -33,9 +34,9 @@ final class MethodExtensionContext extends AbstractExtensionContext<TestMethodTe
 
 	MethodExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
 			TestMethodTestDescriptor testDescriptor, JupiterConfiguration configuration,
-			ThrowableCollector throwableCollector) {
+			ThrowableCollector throwableCollector, ExecutableInvoker executableInvoker) {
 
-		super(parent, engineExecutionListener, testDescriptor, configuration);
+		super(parent, engineExecutionListener, testDescriptor, configuration, executableInvoker);
 
 		this.throwableCollector = throwableCollector;
 	}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
index 28e05067b0e4..49461ccf607a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
@@ -29,8 +29,8 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
-import org.junit.jupiter.engine.execution.ExecutableInvoker;
-import org.junit.jupiter.engine.execution.ExecutableInvoker.ReflectiveInterceptorCall;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.ReflectiveInterceptorCall;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -58,7 +58,7 @@ public class TestFactoryTestDescriptor extends TestMethodTestDescriptor implemen
 	public static final String DYNAMIC_TEST_SEGMENT_TYPE = "dynamic-test";
 
 	private static final ReflectiveInterceptorCall<Method, Object> interceptorCall = InvocationInterceptor::interceptTestFactoryMethod;
-	private static final ExecutableInvoker executableInvoker = new ExecutableInvoker();
+	private static final InterceptingExecutableInvoker executableInvoker = new InterceptingExecutableInvoker();
 
 	private final DynamicDescendantFilter dynamicDescendantFilter = new DynamicDescendantFilter();
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
index fb3b9ada658b..19daed95ccb5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
@@ -34,8 +35,9 @@
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.AfterEachMethodAdapter;
 import org.junit.jupiter.engine.execution.BeforeEachMethodAdapter;
-import org.junit.jupiter.engine.execution.ExecutableInvoker;
-import org.junit.jupiter.engine.execution.ExecutableInvoker.ReflectiveInterceptorCall;
+import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.ReflectiveInterceptorCall;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
 import org.junit.jupiter.engine.extension.ExtensionRegistry;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
@@ -67,7 +69,7 @@
 public class TestMethodTestDescriptor extends MethodBasedTestDescriptor {
 
 	public static final String SEGMENT_TYPE = "method";
-	private static final ExecutableInvoker executableInvoker = new ExecutableInvoker();
+	private static final InterceptingExecutableInvoker executableInvoker = new InterceptingExecutableInvoker();
 	private static final ReflectiveInterceptorCall<Method, Void> defaultInterceptorCall = ReflectiveInterceptorCall.ofVoidMethod(
 		InvocationInterceptor::interceptTestMethod);
 
@@ -96,8 +98,9 @@ public Type getType() {
 	public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext context) {
 		MutableExtensionRegistry registry = populateNewExtensionRegistry(context);
 		ThrowableCollector throwableCollector = createThrowableCollector();
+		ExecutableInvoker executableInvoker = new DefaultExecutableInvoker(context);
 		MethodExtensionContext extensionContext = new MethodExtensionContext(context.getExtensionContext(),
-			context.getExecutionListener(), this, context.getConfiguration(), throwableCollector);
+			context.getExecutionListener(), this, context.getConfiguration(), throwableCollector, executableInvoker);
 		throwableCollector.execute(() -> {
 			TestInstances testInstances = context.getTestInstancesProvider().getTestInstances(registry,
 				throwableCollector);
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
index aa16d6a7b1b3..164552deaba5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
@@ -29,10 +30,10 @@ final class TestTemplateExtensionContext extends AbstractExtensionContext<TestTe
 	private final TestInstances testInstances;
 
 	TestTemplateExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
-			TestTemplateTestDescriptor testDescriptor, JupiterConfiguration configuration,
-			TestInstances testInstances) {
+			TestTemplateTestDescriptor testDescriptor, JupiterConfiguration configuration, TestInstances testInstances,
+			ExecutableInvoker executableInvoker) {
 
-		super(parent, engineExecutionListener, testDescriptor, configuration);
+		super(parent, engineExecutionListener, testDescriptor, configuration, executableInvoker);
 		this.testInstances = testInstances;
 	}
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
index 24c623d1a30a..a6bdd8c09e65 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
@@ -20,7 +20,7 @@
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
-import org.junit.jupiter.engine.execution.ExecutableInvoker.ReflectiveInterceptorCall;
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.ReflectiveInterceptorCall;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
 import org.junit.platform.engine.TestDescriptor;
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
index c3eb4cae8add..8d44338c722b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
@@ -21,11 +21,13 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
 import org.junit.jupiter.engine.extension.ExtensionRegistry;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
@@ -79,8 +81,9 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		// The test instance should be properly maintained by the enclosing class's ExtensionContext.
 		TestInstances testInstances = context.getExtensionContext().getTestInstances().orElse(null);
 
+		ExecutableInvoker executableInvoker = new DefaultExecutableInvoker(context);
 		ExtensionContext extensionContext = new TestTemplateExtensionContext(context.getExtensionContext(),
-			context.getExecutionListener(), this, context.getConfiguration(), testInstances);
+			context.getExecutionListener(), this, context.getConfiguration(), testInstances, executableInvoker);
 
 		// @formatter:off
 		return context.extend()
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultExecutableInvoker.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultExecutableInvoker.java
new file mode 100644
index 000000000000..0c13e3ef03a6
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultExecutableInvoker.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.execution;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.junit.jupiter.engine.execution.ParameterResolutionUtils.resolveParameters;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.engine.extension.ExtensionRegistry;
+import org.junit.platform.commons.util.ReflectionUtils;
+
+/**
+ * @since 5.9
+ */
+@API(status = INTERNAL, since = "5.9")
+public class DefaultExecutableInvoker implements ExecutableInvoker {
+
+	private final ExtensionContext extensionContext;
+	private final ExtensionRegistry extensionRegistry;
+
+	public DefaultExecutableInvoker(ExtensionContext extensionContext, ExtensionRegistry extensionRegistry) {
+		this.extensionContext = extensionContext;
+		this.extensionRegistry = extensionRegistry;
+	}
+
+	public DefaultExecutableInvoker(JupiterEngineExecutionContext context) {
+		this(context.getExtensionContext(), context.getExtensionRegistry());
+	}
+
+	@Override
+	public <T> T invoke(Constructor<T> constructor, Object outerInstance) {
+		Object[] arguments = resolveParameters(constructor, Optional.empty(), Optional.ofNullable(outerInstance),
+			extensionContext, extensionRegistry);
+		return ReflectionUtils.newInstance(constructor, arguments);
+	}
+
+	@Override
+	public Object invoke(Method method, Object target) {
+		Object[] arguments = resolveParameters(method, Optional.ofNullable(target), extensionContext,
+			extensionRegistry);
+		return ReflectionUtils.invokeMethod(method, target, arguments);
+	}
+
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java
new file mode 100644
index 000000000000..50aaf7dba71e
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.execution;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.junit.jupiter.engine.execution.ParameterResolutionUtils.resolveParameters;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.InvocationInterceptor;
+import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
+import org.junit.jupiter.engine.extension.ExtensionRegistry;
+
+/**
+ * {@code InterceptingExecutableInvoker} encapsulates the invocation of a
+ * {@link java.lang.reflect.Executable} (i.e., method or constructor),
+ * including support for dynamic resolution of method parameters via
+ * {@link ParameterResolver ParameterResolvers}.
+ *
+ * @since 5.0
+ */
+@API(status = INTERNAL, since = "5.0")
+public class InterceptingExecutableInvoker {
+
+	private static final InvocationInterceptorChain interceptorChain = new InvocationInterceptorChain();
+
+	/**
+	 * Invoke the supplied constructor with the supplied outer instance and
+	 * dynamic parameter resolution.
+	 *
+	 * @param constructor the constructor to invoke and resolve parameters for
+	 * @param outerInstance the outer instance to supply as the first argument
+	 * to the constructor; empty, for top-level classes
+	 * @param extensionContext the current {@code ExtensionContext}
+	 * @param extensionRegistry the {@code ExtensionRegistry} to retrieve
+	 * {@code ParameterResolvers} from
+	 * @param interceptorCall the call for intercepting this constructor
+	 * invocation via all registered {@linkplain InvocationInterceptor
+	 * interceptors}
+	 */
+	public <T> T invoke(Constructor<T> constructor, Optional<Object> outerInstance, ExtensionContext extensionContext,
+			ExtensionRegistry extensionRegistry, ReflectiveInterceptorCall<Constructor<T>, T> interceptorCall) {
+
+		Object[] arguments = resolveParameters(constructor, Optional.empty(), outerInstance, extensionContext,
+			extensionRegistry);
+		ConstructorInvocation<T> invocation = new ConstructorInvocation<>(constructor, arguments);
+		return invoke(invocation, invocation, extensionContext, extensionRegistry, interceptorCall);
+	}
+
+	/**
+	 * Invoke the supplied method with dynamic parameter resolution.
+	 *
+	 * @param method the method to invoke and resolve parameters for
+	 * @param target the target on which the executable will be invoked,
+	 * potentially wrapped in an {@link Optional}; can be {@code null} or an
+	 * empty {@code Optional} for a {@code static} method
+	 * @param extensionContext the current {@code ExtensionContext}
+	 * @param extensionRegistry the {@code ExtensionRegistry} to retrieve
+	 * {@code ParameterResolvers} from
+	 * @param interceptorCall the call for intercepting this method invocation
+	 * via all registered {@linkplain InvocationInterceptor interceptors}
+	 */
+	public <T> T invoke(Method method, Object target, ExtensionContext extensionContext,
+			ExtensionRegistry extensionRegistry, ReflectiveInterceptorCall<Method, T> interceptorCall) {
+
+		@SuppressWarnings("unchecked")
+		Optional<Object> optionalTarget = (target instanceof Optional ? (Optional<Object>) target
+				: Optional.ofNullable(target));
+		Object[] arguments = resolveParameters(method, optionalTarget, extensionContext, extensionRegistry);
+		MethodInvocation<T> invocation = new MethodInvocation<>(method, optionalTarget, arguments);
+		return invoke(invocation, invocation, extensionContext, extensionRegistry, interceptorCall);
+	}
+
+	private <E extends Executable, T> T invoke(Invocation<T> originalInvocation,
+			ReflectiveInvocationContext<E> invocationContext, ExtensionContext extensionContext,
+			ExtensionRegistry extensionRegistry, ReflectiveInterceptorCall<E, T> call) {
+		return interceptorChain.invoke(originalInvocation, extensionRegistry, (interceptor,
+				wrappedInvocation) -> call.apply(interceptor, wrappedInvocation, invocationContext, extensionContext));
+	}
+
+	public interface ReflectiveInterceptorCall<E extends Executable, T> {
+
+		T apply(InvocationInterceptor interceptor, Invocation<T> invocation,
+				ReflectiveInvocationContext<E> invocationContext, ExtensionContext extensionContext) throws Throwable;
+
+		static ReflectiveInterceptorCall<Method, Void> ofVoidMethod(VoidMethodInterceptorCall call) {
+			return ((interceptorChain, invocation, invocationContext, extensionContext) -> {
+				call.apply(interceptorChain, invocation, invocationContext, extensionContext);
+				return null;
+			});
+		}
+
+		interface VoidMethodInterceptorCall {
+			void apply(InvocationInterceptor interceptor, Invocation<Void> invocation,
+					ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext)
+					throws Throwable;
+		}
+
+	}
+
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java
similarity index 59%
rename from junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java
rename to junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java
index 1d3641f4cd3c..a2ebffad05ea 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExecutableInvoker.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java
@@ -24,12 +24,9 @@
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.InvocationInterceptor;
-import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
-import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
 import org.junit.jupiter.engine.extension.ExtensionRegistry;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
@@ -38,92 +35,15 @@
 import org.junit.platform.commons.util.UnrecoverableExceptions;
 
 /**
- * {@code ExecutableInvoker} encapsulates the invocation of a
- * {@link java.lang.reflect.Executable} (i.e., method or constructor),
- * including support for dynamic resolution of method parameters via
- * {@link ParameterResolver ParameterResolvers}.
+ * {@code ParameterResolutionUtils} provides support for dynamic resolution
+ * of executable parameters via {@link ParameterResolver ParameterResolvers}.
  *
- * @since 5.0
+ * @since 5.9
  */
-@API(status = INTERNAL, since = "5.0")
-public class ExecutableInvoker {
+@API(status = INTERNAL, since = "5.9")
+public class ParameterResolutionUtils {
 
-	private static final Logger logger = LoggerFactory.getLogger(ExecutableInvoker.class);
-	private static final InvocationInterceptorChain interceptorChain = new InvocationInterceptorChain();
-
-	/**
-	 * Invoke the supplied constructor with the supplied outer instance and
-	 * dynamic parameter resolution.
-	 *
-	 * <p>This method should only be used to invoke the constructor for
-	 * an inner class.
-	 *
-	 * @param constructor the constructor to invoke and resolve parameters for
-	 * @param outerInstance the outer instance to supply as the first argument
-	 * to the constructor; empty, for top-level classes
-	 * @param extensionContext the current {@code ExtensionContext}
-	 * @param extensionRegistry the {@code ExtensionRegistry} to retrieve
-	 * {@code ParameterResolvers} from
-	 * @param interceptorCall the call for intercepting this constructor
-	 * invocation via all registered {@linkplain InvocationInterceptor
-	 * interceptors}
-	 */
-	public <T> T invoke(Constructor<T> constructor, Optional<Object> outerInstance, ExtensionContext extensionContext,
-			ExtensionRegistry extensionRegistry, ReflectiveInterceptorCall<Constructor<T>, T> interceptorCall) {
-
-		Object[] arguments = resolveParameters(constructor, Optional.empty(), outerInstance, extensionContext,
-			extensionRegistry);
-		ConstructorInvocation<T> invocation = new ConstructorInvocation<>(constructor, arguments);
-		return invoke(invocation, invocation, extensionContext, extensionRegistry, interceptorCall);
-	}
-
-	/**
-	 * Invoke the supplied {@code static} method with dynamic parameter resolution.
-	 *
-	 * @param method the method to invoke and resolve parameters for
-	 * @param extensionContext the current {@code ExtensionContext}
-	 * @param extensionRegistry the {@code ExtensionRegistry} to retrieve
-	 * {@code ParameterResolvers} from
-	 * @param interceptorCall the call for intercepting this method invocation
-	 * via all registered {@linkplain InvocationInterceptor interceptors}
-	 */
-	public <T> T invoke(Method method, Object target, ExtensionContext extensionContext,
-			ExtensionRegistry extensionRegistry, ReflectiveInterceptorCall<Method, T> interceptorCall) {
-
-		@SuppressWarnings("unchecked")
-		Optional<Object> optionalTarget = (target instanceof Optional ? (Optional<Object>) target
-				: Optional.ofNullable(target));
-		Object[] arguments = resolveParameters(method, optionalTarget, extensionContext, extensionRegistry);
-		MethodInvocation<T> invocation = new MethodInvocation<>(method, optionalTarget, arguments);
-		return invoke(invocation, invocation, extensionContext, extensionRegistry, interceptorCall);
-	}
-
-	private <E extends Executable, T> T invoke(Invocation<T> originalInvocation,
-			ReflectiveInvocationContext<E> invocationContext, ExtensionContext extensionContext,
-			ExtensionRegistry extensionRegistry, ReflectiveInterceptorCall<E, T> call) {
-		return interceptorChain.invoke(originalInvocation, extensionRegistry, (interceptor,
-				wrappedInvocation) -> call.apply(interceptor, wrappedInvocation, invocationContext, extensionContext));
-	}
-
-	public interface ReflectiveInterceptorCall<E extends Executable, T> {
-
-		T apply(InvocationInterceptor interceptor, Invocation<T> invocation,
-				ReflectiveInvocationContext<E> invocationContext, ExtensionContext extensionContext) throws Throwable;
-
-		static ReflectiveInterceptorCall<Method, Void> ofVoidMethod(VoidMethodInterceptorCall call) {
-			return ((interceptorChain, invocation, invocationContext, extensionContext) -> {
-				call.apply(interceptorChain, invocation, invocationContext, extensionContext);
-				return null;
-			});
-		}
-
-		interface VoidMethodInterceptorCall {
-			void apply(InvocationInterceptor interceptor, Invocation<Void> invocation,
-					ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext)
-					throws Throwable;
-		}
-
-	}
+	private static final Logger logger = LoggerFactory.getLogger(ParameterResolutionUtils.class);
 
 	/**
 	 * Resolve the array of parameters for the supplied method and target.
@@ -138,7 +58,7 @@ void apply(InvocationInterceptor interceptor, Invocation<Void> invocation,
 	 * @return the array of Objects to be used as parameters in the executable
 	 * invocation; never {@code null} though potentially empty
 	 */
-	private Object[] resolveParameters(Method method, Optional<Object> target, ExtensionContext extensionContext,
+	public static Object[] resolveParameters(Method method, Optional<Object> target, ExtensionContext extensionContext,
 			ExtensionRegistry extensionRegistry) {
 
 		return resolveParameters(method, target, Optional.empty(), extensionContext, extensionRegistry);
@@ -161,8 +81,8 @@ private Object[] resolveParameters(Method method, Optional<Object> target, Exten
 	 * @return the array of Objects to be used as parameters in the executable
 	 * invocation; never {@code null} though potentially empty
 	 */
-	private Object[] resolveParameters(Executable executable, Optional<Object> target, Optional<Object> outerInstance,
-			ExtensionContext extensionContext, ExtensionRegistry extensionRegistry) {
+	public static Object[] resolveParameters(Executable executable, Optional<Object> target,
+			Optional<Object> outerInstance, ExtensionContext extensionContext, ExtensionRegistry extensionRegistry) {
 
 		Preconditions.notNull(target, "target must not be null");
 
@@ -185,7 +105,7 @@ private Object[] resolveParameters(Executable executable, Optional<Object> targe
 		return values;
 	}
 
-	private Object resolveParameter(ParameterContext parameterContext, Executable executable,
+	private static Object resolveParameter(ParameterContext parameterContext, Executable executable,
 			ExtensionContext extensionContext, ExtensionRegistry extensionRegistry) {
 
 		try {
@@ -240,7 +160,7 @@ private Object resolveParameter(ParameterContext parameterContext, Executable ex
 		}
 	}
 
-	private void validateResolvedType(Parameter parameter, Object value, Executable executable,
+	private static void validateResolvedType(Parameter parameter, Object value, Executable executable,
 			ParameterResolver resolver) {
 
 		Class<?> type = parameter.getType();
@@ -270,4 +190,5 @@ private void validateResolvedType(Parameter parameter, Object value, Executable
 	private static String asLabel(Executable executable) {
 		return executable instanceof Constructor ? "constructor" : "method";
 	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExecutableInvokerIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExecutableInvokerIntegrationTests.java
new file mode 100644
index 000000000000..a9c25aff5145
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExecutableInvokerIntegrationTests.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.extension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.platform.testkit.engine.EngineExecutionResults;
+
+/**
+ * @since 5.9
+ */
+public class ExecutableInvokerIntegrationTests extends AbstractJupiterTestEngineTests {
+
+	@Test
+	void invokeConstructorViaExtensionContext() {
+		EngineExecutionResults results = executeTestsForClass(ExecuteConstructorTwiceTestCase.class);
+
+		assertEquals(1, results.testEvents().succeeded().count());
+		assertEquals(2, ExecuteConstructorTwiceTestCase.constructorInvocations);
+	}
+
+	@Test
+	void invokeMethodViaExtensionContext() {
+		EngineExecutionResults results = executeTestsForClass(ExecuteTestsTwiceTestCase.class);
+
+		assertEquals(1, results.testEvents().succeeded().count());
+		assertEquals(2, ExecuteTestsTwiceTestCase.testInvocations);
+	}
+
+	@ExtendWith(ExecuteTestsTwiceExtension.class)
+	static class ExecuteTestsTwiceTestCase {
+
+		static int testInvocations = 0;
+
+		@Test
+		void testWithResolvedParameter(TestInfo testInfo) {
+			assertNotNull(testInfo);
+			testInvocations++;
+		}
+
+	}
+
+	@ExtendWith(ExecuteConstructorTwiceExtension.class)
+	static class ExecuteConstructorTwiceTestCase {
+
+		static int constructorInvocations = 0;
+
+		public ExecuteConstructorTwiceTestCase(TestInfo testInfo) {
+			assertNotNull(testInfo);
+			constructorInvocations++;
+		}
+
+		@Test
+		void test() {
+
+		}
+
+	}
+
+	static class ExecuteTestsTwiceExtension implements AfterTestExecutionCallback {
+
+		@Override
+		public void afterTestExecution(ExtensionContext context) {
+			context.getExecutableInvoker() //
+					.invoke(context.getRequiredTestMethod(), context.getRequiredTestInstance());
+		}
+
+	}
+
+	static class ExecuteConstructorTwiceExtension implements BeforeAllCallback {
+
+		@Override
+		public void beforeAll(ExtensionContext context) throws Exception {
+			context.getExecutableInvoker() //
+					.invoke(context.getRequiredTestClass().getConstructor(TestInfo.class));
+		}
+
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
index af9c7681debe..61703eb251b9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
@@ -74,7 +74,7 @@ void fromJupiterEngineDescriptor() {
 			UniqueId.root("engine", "junit-jupiter"), configuration);
 
 		JupiterEngineExtensionContext engineContext = new JupiterEngineExtensionContext(null, engineTestDescriptor,
-			configuration);
+			configuration, null);
 
 		// @formatter:off
 		assertAll("engineContext",
@@ -100,7 +100,7 @@ void fromClassTestDescriptor() {
 		ClassTestDescriptor outerClassDescriptor = outerClassDescriptor(nestedClassDescriptor);
 
 		ClassExtensionContext outerExtensionContext = new ClassExtensionContext(null, null, outerClassDescriptor,
-			configuration, null);
+			configuration, null, null);
 
 		// @formatter:off
 		assertAll("outerContext",
@@ -118,7 +118,7 @@ void fromClassTestDescriptor() {
 		// @formatter:on
 
 		ClassExtensionContext nestedExtensionContext = new ClassExtensionContext(outerExtensionContext, null,
-			nestedClassDescriptor, configuration, null);
+			nestedClassDescriptor, configuration, null, null);
 		assertThat(nestedExtensionContext.getParent()).containsSame(outerExtensionContext);
 	}
 
@@ -131,18 +131,18 @@ void tagsCanBeRetrievedInExtensionContext() {
 		outerClassDescriptor.addChild(methodTestDescriptor);
 
 		ClassExtensionContext outerExtensionContext = new ClassExtensionContext(null, null, outerClassDescriptor,
-			configuration, null);
+			configuration, null, null);
 
 		assertThat(outerExtensionContext.getTags()).containsExactly("outer-tag");
 		assertThat(outerExtensionContext.getRoot()).isSameAs(outerExtensionContext);
 
 		ClassExtensionContext nestedExtensionContext = new ClassExtensionContext(outerExtensionContext, null,
-			nestedClassDescriptor, configuration, null);
+			nestedClassDescriptor, configuration, null, null);
 		assertThat(nestedExtensionContext.getTags()).containsExactlyInAnyOrder("outer-tag", "nested-tag");
 		assertThat(nestedExtensionContext.getRoot()).isSameAs(outerExtensionContext);
 
 		MethodExtensionContext methodExtensionContext = new MethodExtensionContext(outerExtensionContext, null,
-			methodTestDescriptor, configuration, new OpenTest4JAwareThrowableCollector());
+			methodTestDescriptor, configuration, new OpenTest4JAwareThrowableCollector(), null);
 		methodExtensionContext.setTestInstances(DefaultTestInstances.of(new OuterClass()));
 		assertThat(methodExtensionContext.getTags()).containsExactlyInAnyOrder("outer-tag", "method-tag");
 		assertThat(methodExtensionContext.getRoot()).isSameAs(outerExtensionContext);
@@ -161,11 +161,11 @@ void fromMethodTestDescriptor() {
 		Method testMethod = methodTestDescriptor.getTestMethod();
 
 		JupiterEngineExtensionContext engineExtensionContext = new JupiterEngineExtensionContext(null, engineDescriptor,
-			configuration);
+			configuration, null);
 		ClassExtensionContext classExtensionContext = new ClassExtensionContext(engineExtensionContext, null,
-			classTestDescriptor, configuration, null);
+			classTestDescriptor, configuration, null, null);
 		MethodExtensionContext methodExtensionContext = new MethodExtensionContext(classExtensionContext, null,
-			methodTestDescriptor, configuration, new OpenTest4JAwareThrowableCollector());
+			methodTestDescriptor, configuration, new OpenTest4JAwareThrowableCollector(), null);
 		methodExtensionContext.setTestInstances(DefaultTestInstances.of(testInstance));
 
 		// @formatter:off
@@ -191,7 +191,7 @@ void reportEntriesArePublishedToExecutionContext() {
 		ClassTestDescriptor classTestDescriptor = outerClassDescriptor(null);
 		EngineExecutionListener engineExecutionListener = Mockito.spy(EngineExecutionListener.class);
 		ExtensionContext extensionContext = new ClassExtensionContext(null, engineExecutionListener,
-			classTestDescriptor, configuration, null);
+			classTestDescriptor, configuration, null, null);
 
 		Map<String, String> map1 = Collections.singletonMap("key", "value");
 		Map<String, String> map2 = Collections.singletonMap("other key", "other value");
@@ -221,10 +221,10 @@ void reportEntriesArePublishedToExecutionContext() {
 	void usingStore() {
 		TestMethodTestDescriptor methodTestDescriptor = methodDescriptor();
 		ClassTestDescriptor classTestDescriptor = outerClassDescriptor(methodTestDescriptor);
-		ExtensionContext parentContext = new ClassExtensionContext(null, null, classTestDescriptor, configuration,
+		ExtensionContext parentContext = new ClassExtensionContext(null, null, classTestDescriptor, configuration, null,
 			null);
 		MethodExtensionContext childContext = new MethodExtensionContext(parentContext, null, methodTestDescriptor,
-			configuration, new OpenTest4JAwareThrowableCollector());
+			configuration, new OpenTest4JAwareThrowableCollector(), null);
 		childContext.setTestInstances(DefaultTestInstances.of(new OuterClass()));
 
 		ExtensionContext.Store childStore = childContext.getStore(Namespace.GLOBAL);
@@ -274,9 +274,9 @@ Stream<DynamicTest> configurationParameter() throws Exception {
 			configuration);
 
 		return Stream.of( //
-			(ExtensionContext) new JupiterEngineExtensionContext(null, engineDescriptor, echo), //
-			new ClassExtensionContext(null, null, classTestDescriptor, echo, null), //
-			new MethodExtensionContext(null, null, methodTestDescriptor, echo, null) //
+			(ExtensionContext) new JupiterEngineExtensionContext(null, engineDescriptor, echo, null), //
+			new ClassExtensionContext(null, null, classTestDescriptor, echo, null, null), //
+			new MethodExtensionContext(null, null, methodTestDescriptor, echo, null, null) //
 		).map(context -> dynamicTest(context.getClass().getSimpleName(),
 			() -> assertEquals(expected, context.getConfigurationParameter(key))));
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
new file mode 100644
index 000000000000..4841213b3a5e
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.execution;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.engine.execution.ParameterResolutionUtilsTests.ConfigurableParameterResolver;
+import static org.junit.jupiter.engine.execution.ParameterResolutionUtilsTests.ConstructorInjectionTestCase;
+import static org.junit.jupiter.engine.execution.ParameterResolutionUtilsTests.MethodSource;
+import static org.junit.jupiter.engine.execution.ParameterResolutionUtilsTests.NumberParameterResolver;
+import static org.junit.jupiter.engine.execution.ParameterResolutionUtilsTests.StringParameterResolver;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
+import org.junit.platform.commons.util.ReflectionUtils;
+
+/**
+ * @since 5.9
+ */
+abstract class AbstractExecutableInvokerTests {
+
+	private static final String ENIGMA = "enigma";
+
+	protected final MethodSource instance = mock(MethodSource.class);
+	protected Method method;
+
+	protected final ExtensionContext extensionContext = mock(ExtensionContext.class);
+
+	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+
+	protected final MutableExtensionRegistry extensionRegistry = MutableExtensionRegistry.createRegistryWithDefaultExtensions(
+		configuration);
+
+	@Test
+	void constructorInjection() {
+		register(new StringParameterResolver(), new NumberParameterResolver());
+
+		Class<ConstructorInjectionTestCase> outerClass = ConstructorInjectionTestCase.class;
+		Constructor<ConstructorInjectionTestCase> constructor = ReflectionUtils.getDeclaredConstructor(outerClass);
+		ConstructorInjectionTestCase outer = invokeConstructor(constructor, null);
+
+		assertNotNull(outer);
+		assertEquals(ENIGMA, outer.str);
+
+		Class<ConstructorInjectionTestCase.NestedTestCase> innerClass = ConstructorInjectionTestCase.NestedTestCase.class;
+		Constructor<ConstructorInjectionTestCase.NestedTestCase> innerConstructor = ReflectionUtils.getDeclaredConstructor(
+			innerClass);
+		ConstructorInjectionTestCase.NestedTestCase inner = invokeConstructor(innerConstructor, outer);
+
+		assertNotNull(inner);
+		assertEquals(42, inner.num);
+	}
+
+	@Test
+	void resolveArgumentsViaParameterResolver() {
+		testMethodWithASingleStringParameter();
+		thereIsAParameterResolverThatResolvesTheParameterTo("argument");
+
+		invokeMethod();
+
+		verify(instance).singleStringParameter("argument");
+	}
+
+	private void thereIsAParameterResolverThatResolvesTheParameterTo(Object argument) {
+		register(ConfigurableParameterResolver.supportsAndResolvesTo(parameterContext -> argument));
+	}
+
+	private void testMethodWithASingleStringParameter() {
+		this.method = ReflectionUtils.findMethod(this.instance.getClass(), "singleStringParameter", String.class).get();
+	}
+
+	private void register(ParameterResolver... resolvers) {
+		for (ParameterResolver resolver : resolvers) {
+			extensionRegistry.registerExtension(resolver, this);
+		}
+	}
+
+	abstract void invokeMethod();
+
+	abstract <T> T invokeConstructor(Constructor<T> constructor, Object outerInstance);
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultExecutableInvokerTests.java
new file mode 100644
index 000000000000..aa1f264f741e
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultExecutableInvokerTests.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.execution;
+
+import java.lang.reflect.Constructor;
+
+/**
+ * Unit tests for {@link DefaultExecutableInvoker}.
+ *
+ * @since 5.9
+ */
+class DefaultExecutableInvokerTests extends AbstractExecutableInvokerTests {
+
+	@Override
+	void invokeMethod() {
+		newInvoker().invoke(this.method, this.instance);
+	}
+
+	@Override
+	<T> T invokeConstructor(Constructor<T> constructor, Object outerInstance) {
+		return newInvoker().invoke(constructor, outerInstance);
+	}
+
+	private DefaultExecutableInvoker newInvoker() {
+		return new DefaultExecutableInvoker(this.extensionContext, this.extensionRegistry);
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvokerTests.java
new file mode 100644
index 000000000000..a270e28d487c
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvokerTests.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.execution;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.util.Optional;
+
+import org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.ReflectiveInterceptorCall;
+
+/**
+ * Unit tests for {@link InterceptingExecutableInvoker}.
+ *
+ * @since 5.0
+ */
+class InterceptingExecutableInvokerTests extends AbstractExecutableInvokerTests {
+
+	@Override
+	void invokeMethod() {
+		newInvoker().invoke(this.method, this.instance, this.extensionContext, this.extensionRegistry,
+			passthroughInterceptor());
+	}
+
+	@Override
+	<T> T invokeConstructor(Constructor<T> constructor, Object outerInstance) {
+		return newInvoker().invoke(constructor, Optional.ofNullable(outerInstance), extensionContext, extensionRegistry,
+			passthroughInterceptor());
+	}
+
+	private InterceptingExecutableInvoker newInvoker() {
+		return new InterceptingExecutableInvoker();
+	}
+
+	private static <E extends Executable, T> ReflectiveInterceptorCall<E, T> passthroughInterceptor() {
+		return (interceptor, invocation, invocationContext, extensionContext) -> invocation.proceed();
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
similarity index 78%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
index fb6ddb3d7f29..31dbb1657c40 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExecutableInvokerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
@@ -12,14 +12,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.util.Optional;
@@ -33,16 +31,15 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
-import org.junit.jupiter.engine.execution.ExecutableInvoker.ReflectiveInterceptorCall;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
 import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
- * Unit tests for {@link ExecutableInvoker}.
+ * Unit tests for {@link ParameterResolutionUtils}.
  *
- * @since 5.0
+ * @since 5.9
  */
-class ExecutableInvokerTests {
+class ParameterResolutionUtilsTests {
 
 	private static final String ENIGMA = "enigma";
 
@@ -53,38 +50,40 @@ class ExecutableInvokerTests {
 
 	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
 
-	private MutableExtensionRegistry extensionRegistry = MutableExtensionRegistry.createRegistryWithDefaultExtensions(
+	private final MutableExtensionRegistry extensionRegistry = MutableExtensionRegistry.createRegistryWithDefaultExtensions(
 		configuration);
 
 	@Test
-	void constructorInjection() {
-		register(new StringParameterResolver(), new NumberParameterResolver());
+	void resolveConstructorArguments() {
+		register(new StringParameterResolver());
 
-		Class<ConstructorInjectionTestCase> outerClass = ConstructorInjectionTestCase.class;
-		Constructor<ConstructorInjectionTestCase> constructor = ReflectionUtils.getDeclaredConstructor(outerClass);
-		ConstructorInjectionTestCase outer = newInvoker().invoke(constructor, Optional.empty(), extensionContext,
-			extensionRegistry, passthroughInterceptor());
+		Class<ConstructorInjectionTestCase> topLevelClass = ConstructorInjectionTestCase.class;
+		Object[] arguments = resolveConstructorParameters(topLevelClass, null);
+
+		assertThat(arguments).containsExactly(ENIGMA);
+	}
+
+	@Test
+	void resolveNestedConstructorArguments() {
+		register(new NumberParameterResolver());
 
-		assertNotNull(outer);
-		assertEquals(ENIGMA, outer.str);
+		Class<ConstructorInjectionTestCase> outerClass = ConstructorInjectionTestCase.class;
+		ConstructorInjectionTestCase outer = ReflectionUtils.newInstance(outerClass, "str");
 
 		Class<ConstructorInjectionTestCase.NestedTestCase> innerClass = ConstructorInjectionTestCase.NestedTestCase.class;
-		Constructor<ConstructorInjectionTestCase.NestedTestCase> innerConstructor = ReflectionUtils.getDeclaredConstructor(
-			innerClass);
-		ConstructorInjectionTestCase.NestedTestCase inner = newInvoker().invoke(innerConstructor, Optional.of(outer),
-			extensionContext, extensionRegistry, passthroughInterceptor());
+		Object[] arguments = resolveConstructorParameters(innerClass, outer);
 
-		assertNotNull(inner);
-		assertEquals(42, inner.num);
+		assertThat(arguments).containsExactly(outer, 42);
 	}
 
 	@Test
-	void constructorInjectionWithMissingResolver() {
+	void resolveConstructorArgumentsWithMissingResolver() {
 		Constructor<ConstructorInjectionTestCase> constructor = ReflectionUtils.getDeclaredConstructor(
 			ConstructorInjectionTestCase.class);
 
-		Exception exception = assertThrows(ParameterResolutionException.class, () -> newInvoker().invoke(constructor,
-			Optional.empty(), extensionContext, extensionRegistry, passthroughInterceptor()));
+		Exception exception = assertThrows(ParameterResolutionException.class,
+			() -> ParameterResolutionUtils.resolveParameters(constructor, Optional.empty(), Optional.empty(),
+				extensionContext, extensionRegistry));
 
 		assertThat(exception.getMessage())//
 				.contains("No ParameterResolver registered for parameter [java.lang.String")//
@@ -93,13 +92,13 @@ void constructorInjectionWithMissingResolver() {
 	}
 
 	@Test
-	void invokingMethodsWithoutParameterDoesNotDependOnParameterResolvers() {
+	void resolvingArgumentsForMethodsWithoutParameterDoesNotDependOnParameterResolvers() {
 		testMethodWithNoParameters();
 		throwDuringParameterResolution(new RuntimeException("boom!"));
 
-		invokeMethod();
+		Object[] arguments = resolveMethodParameters();
 
-		verify(instance).noParameter();
+		assertThat(arguments).isEmpty();
 	}
 
 	@Test
@@ -107,9 +106,9 @@ void resolveArgumentsViaParameterResolver() {
 		testMethodWithASingleStringParameter();
 		thereIsAParameterResolverThatResolvesTheParameterTo("argument");
 
-		invokeMethod();
+		Object[] arguments = resolveMethodParameters();
 
-		verify(instance).singleStringParameter("argument");
+		assertThat(arguments).containsExactly("argument");
 	}
 
 	@Test
@@ -126,9 +125,9 @@ void resolveMultipleArguments() {
 			}
 		}));
 
-		invokeMethod();
+		Object[] arguments = resolveMethodParameters();
 
-		verify(instance).multipleParameters("0", 1, 2.0);
+		assertThat(arguments).containsExactly("0", 1, 2.0);
 	}
 
 	@Test
@@ -137,9 +136,9 @@ void onlyConsiderParameterResolversThatSupportAParticularParameter() {
 		thereIsAParameterResolverThatDoesNotSupportThisParameter();
 		thereIsAParameterResolverThatResolvesTheParameterTo("something");
 
-		invokeMethod();
+		Object[] arguments = resolveMethodParameters();
 
-		verify(instance).singleStringParameter("something");
+		assertThat(arguments).containsExactly("something");
 	}
 
 	@Test
@@ -148,7 +147,7 @@ void passContextInformationToParameterResolverMethods() {
 		ArgumentRecordingParameterResolver extension = new ArgumentRecordingParameterResolver();
 		register(extension);
 
-		invokeMethod();
+		resolveMethodParameters();
 
 		assertSame(extensionContext, extension.supportsArguments.extensionContext);
 		assertEquals(0, extension.supportsArguments.parameterContext.getIndex());
@@ -161,13 +160,13 @@ void passContextInformationToParameterResolverMethods() {
 	}
 
 	@Test
-	void invocationOfMethodsWithPrimitiveTypesIsSupported() {
+	void resolvingArgumentsForMethodsWithPrimitiveTypesIsSupported() {
 		testMethodWithASinglePrimitiveIntParameter();
 		thereIsAParameterResolverThatResolvesTheParameterTo(42);
 
-		invokeMethod();
+		Object[] arguments = resolveMethodParameters();
 
-		verify(instance).primitiveParameterInt(42);
+		assertThat(arguments).containsExactly(42);
 	}
 
 	@Test
@@ -175,9 +174,10 @@ void nullIsAViableArgumentIfAReferenceTypeParameterIsExpected() {
 		testMethodWithASingleStringParameter();
 		thereIsAParameterResolverThatResolvesTheParameterTo(null);
 
-		invokeMethod();
+		Object[] arguments = resolveMethodParameters();
 
-		verify(instance).singleStringParameter(null);
+		assertThat(arguments).hasSize(1);
+		assertNull(arguments[0]);
 	}
 
 	@Test
@@ -185,7 +185,8 @@ void reportThatNullIsNotAViableArgumentIfAPrimitiveTypeIsExpected() {
 		testMethodWithASinglePrimitiveIntParameter();
 		thereIsAParameterResolverThatResolvesTheParameterTo(null);
 
-		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class, this::invokeMethod);
+		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class,
+			this::resolveMethodParameters);
 
 		// @formatter:off
 		assertThat(caught.getMessage())
@@ -199,7 +200,8 @@ void reportThatNullIsNotAViableArgumentIfAPrimitiveTypeIsExpected() {
 	void reportIfThereIsNoParameterResolverThatSupportsTheParameter() {
 		testMethodWithASingleStringParameter();
 
-		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class, this::invokeMethod);
+		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class,
+			this::resolveMethodParameters);
 
 		assertThat(caught.getMessage()).contains("parameter [java.lang.String").contains("in method");
 	}
@@ -210,7 +212,8 @@ void reportIfThereAreMultipleParameterResolversThatSupportTheParameter() {
 		thereIsAParameterResolverThatResolvesTheParameterTo("one");
 		thereIsAParameterResolverThatResolvesTheParameterTo("two");
 
-		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class, this::invokeMethod);
+		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class,
+			this::resolveMethodParameters);
 
 		String className = Pattern.quote(ConfigurableParameterResolver.class.getName());
 
@@ -226,7 +229,8 @@ void reportTypeMismatchBetweenParameterAndResolvedParameter() {
 		testMethodWithASingleStringParameter();
 		thereIsAParameterResolverThatResolvesTheParameterTo(BigDecimal.ONE);
 
-		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class, this::invokeMethod);
+		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class,
+			this::resolveMethodParameters);
 
 		// @formatter:off
 		assertThat(caught.getMessage())
@@ -242,7 +246,8 @@ void wrapAllExceptionsThrownDuringParameterResolutionIntoAParameterResolutionExc
 		IllegalArgumentException cause = anyExceptionButParameterResolutionException();
 		throwDuringParameterResolution(cause);
 
-		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class, this::invokeMethod);
+		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class,
+			this::resolveMethodParameters);
 
 		assertSame(cause, caught.getCause(), () -> "cause should be present");
 		assertThat(caught.getMessage())//
@@ -250,12 +255,13 @@ void wrapAllExceptionsThrownDuringParameterResolutionIntoAParameterResolutionExc
 	}
 
 	@Test
-	void exceptionMessageContainsMessageFromEexceptionThrownDuringParameterResolution() {
+	void exceptionMessageContainsMessageFromExceptionThrownDuringParameterResolution() {
 		anyTestMethodWithAtLeastOneParameter();
 		RuntimeException cause = new RuntimeException("boom!");
 		throwDuringParameterResolution(cause);
 
-		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class, this::invokeMethod);
+		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class,
+			this::resolveMethodParameters);
 
 		assertSame(cause, caught.getCause(), () -> "cause should be present");
 		assertThat(caught.getMessage())//
@@ -268,7 +274,8 @@ void doNotWrapThrownExceptionIfItIsAlreadyAParameterResolutionException() {
 		ParameterResolutionException cause = new ParameterResolutionException("custom message");
 		throwDuringParameterResolution(cause);
 
-		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class, this::invokeMethod);
+		ParameterResolutionException caught = assertThrows(ParameterResolutionException.class,
+			this::resolveMethodParameters);
 
 		assertSame(cause, caught);
 	}
@@ -315,25 +322,23 @@ private void register(ParameterResolver... resolvers) {
 		}
 	}
 
-	private ExecutableInvoker newInvoker() {
-		return new ExecutableInvoker();
-	}
-
-	private void invokeMethod() {
-		newInvoker().invoke(this.method, this.instance, this.extensionContext, this.extensionRegistry,
-			passthroughInterceptor());
+	private <T> Object[] resolveConstructorParameters(Class<T> clazz, Object outerInstance) {
+		Constructor<T> constructor = ReflectionUtils.getDeclaredConstructor(clazz);
+		return ParameterResolutionUtils.resolveParameters(constructor, Optional.empty(),
+			Optional.ofNullable(outerInstance), extensionContext, extensionRegistry);
 	}
 
-	static <E extends Executable, T> ReflectiveInterceptorCall<E, T> passthroughInterceptor() {
-		return (interceptor, invocation, invocationContext, extensionContext) -> invocation.proceed();
+	private Object[] resolveMethodParameters() {
+		return ParameterResolutionUtils.resolveParameters(this.method, Optional.of(this.instance),
+			this.extensionContext, this.extensionRegistry);
 	}
 
 	// -------------------------------------------------------------------------
 
 	static class ArgumentRecordingParameterResolver implements ParameterResolver {
 
-		Arguments supportsArguments;
-		Arguments resolveArguments;
+		ArgumentRecordingParameterResolver.Arguments supportsArguments;
+		ArgumentRecordingParameterResolver.Arguments resolveArguments;
 
 		static class Arguments {
 
@@ -348,13 +353,13 @@ static class Arguments {
 
 		@Override
 		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
-			supportsArguments = new Arguments(parameterContext, extensionContext);
+			supportsArguments = new ArgumentRecordingParameterResolver.Arguments(parameterContext, extensionContext);
 			return true;
 		}
 
 		@Override
 		public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
-			resolveArguments = new Arguments(parameterContext, extensionContext);
+			resolveArguments = new ArgumentRecordingParameterResolver.Arguments(parameterContext, extensionContext);
 			return null;
 		}
 	}
@@ -399,6 +404,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 		}
 	}
 
+	@SuppressWarnings("unused")
 	interface MethodSource {
 
 		void noParameter();
@@ -410,7 +416,7 @@ interface MethodSource {
 		void multipleParameters(String first, Integer second, Double third);
 	}
 
-	private static class StringParameterResolver implements ParameterResolver {
+	static class StringParameterResolver implements ParameterResolver {
 
 		@Override
 		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
@@ -423,7 +429,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 		}
 	}
 
-	private static class NumberParameterResolver implements ParameterResolver {
+	static class NumberParameterResolver implements ParameterResolver {
 
 		@Override
 		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
@@ -436,7 +442,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 		}
 	}
 
-	private static class ConstructorInjectionTestCase {
+	static class ConstructorInjectionTestCase {
 
 		final String str;
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index 53f49adeec07..a02039e1a46a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -30,6 +30,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -273,6 +274,11 @@ public Store getStore(Namespace namespace) {
 			public ExecutionMode getExecutionMode() {
 				return ExecutionMode.SAME_THREAD;
 			}
+
+			@Override
+			public ExecutableInvoker getExecutableInvoker() {
+				return null;
+			}
 		};
 	}
 

From c75f0941e5805836e801236c7af48b68e1f14636 Mon Sep 17 00:00:00 2001
From: Daniel Widdis <widdis@gmail.com>
Date: Fri, 4 Feb 2022 23:06:52 -0800
Subject: [PATCH 0693/1433] Support FreeBSD and OpenBSD in @EnabledOnOs and
 @DisabledOnOs

This commit introduces new FREEBSD and OPENBSD constants in the OS enum
for use with @EnabledOnOs and @DisabledOnOs.

This commit also updates the Enabled/Disabled OS Condition integration
tests to include the previous AIX addition.

Closes: #2821
---
 .../release-notes/release-notes-5.9.0-M1.adoc |  1 +
 .../org/junit/jupiter/api/condition/OS.java   | 28 +++++++++++++-
 .../condition/DisabledOnOsConditionTests.java | 33 ++++++++++++++++-
 .../DisabledOnOsIntegrationTests.java         | 29 ++++++++++++++-
 .../condition/EnabledOnOsConditionTests.java  | 33 ++++++++++++++++-
 .../EnabledOnOsIntegrationTests.java          | 37 ++++++++++++++++++-
 .../junit/jupiter/api/condition/OSTests.java  | 12 ++++++
 7 files changed, 165 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 6b88bd3abf60..5d8b2dda592c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -29,6 +29,7 @@ on GitHub.
 * JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
   resolution time a fully running set of dependencies are calculated avoiding the need
   for these to be manually specified.
+* New support for FreeBSD and OpenBSD operating systems in `@EnabledOnOs` and `@DisabledOnOs`.
 
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
index 779d2acfe56a..f0ea46685b02 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
@@ -30,8 +30,10 @@
  *
  * @since 5.1
  * @see #AIX
+ * @see #FREEBSD
  * @see #LINUX
  * @see #MAC
+ * @see #OPENBSD
  * @see #SOLARIS
  * @see #WINDOWS
  * @see #OTHER
@@ -49,6 +51,14 @@ public enum OS {
 	@API(status = STABLE, since = "5.3")
 	AIX,
 
+	/**
+	 * FreeBSD operating system.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	FREEBSD,
+
 	/**
 	 * Linux-based operating system.
 	 */
@@ -59,6 +69,14 @@ public enum OS {
 	 */
 	MAC,
 
+	/**
+	 * OpenBSD operating system.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	OPENBSD,
+
 	/**
 	 * Oracle Solaris operating system.
 	 */
@@ -70,8 +88,8 @@ public enum OS {
 	WINDOWS,
 
 	/**
-	 * An operating system other than {@link #AIX}, {@link #LINUX}, {@link #MAC},
-	 * {@link #SOLARIS}, or {@link #WINDOWS}.
+	 * An operating system other than {@link #AIX}, {@link #FREEBSD}, {@link #LINUX},
+	 * {@link #MAC}, {@link #OPENBSD}, {@link #SOLARIS}, or {@link #WINDOWS}.
 	 */
 	OTHER;
 
@@ -107,12 +125,18 @@ static OS parse(String osName) {
 		if (osName.contains("aix")) {
 			return AIX;
 		}
+		if (osName.contains("freebsd")) {
+			return FREEBSD;
+		}
 		if (osName.contains("linux")) {
 			return LINUX;
 		}
 		if (osName.contains("mac")) {
 			return MAC;
 		}
+		if (osName.contains("openbsd")) {
+			return OPENBSD;
+		}
 		if (osName.contains("sunos") || osName.contains("solaris")) {
 			return SOLARIS;
 		}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
index 5b2f3e1107e9..fde27eb03abf 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
@@ -12,8 +12,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onAix;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onFreebsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onLinux;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onMac;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onOpenbsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onSolaris;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onWindows;
 
@@ -72,6 +75,24 @@ void disabledOnEveryOs() {
 		assertReasonContains("Disabled on operating system: " + OS_NAME + " ==> Disabled on every OS");
 	}
 
+	/**
+	 * @see DisabledOnOsIntegrationTests#aix()
+	 */
+	@Test
+	void aix() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsIf(onAix());
+	}
+
+	/**
+	 * @see DisabledOnOsIntegrationTests#freebsd()
+	 */
+	@Test
+	void freebsd() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsIf(onFreebsd());
+	}
+
 	/**
 	 * @see DisabledOnOsIntegrationTests#linux()
 	 */
@@ -99,6 +120,15 @@ void macOsWithComposedAnnotation() {
 		assertDisabledOnCurrentOsIf(onMac());
 	}
 
+	/**
+	 * @see DisabledOnOsIntegrationTests#openbsd()
+	 */
+	@Test
+	void openbsd() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsIf(onOpenbsd());
+	}
+
 	/**
 	 * @see DisabledOnOsIntegrationTests#windows()
 	 */
@@ -123,7 +153,8 @@ void solaris() {
 	@Test
 	void other() {
 		evaluateCondition();
-		assertDisabledOnCurrentOsIf(!(onLinux() || onMac() || onSolaris() || onWindows()));
+		assertDisabledOnCurrentOsIf(
+			!(onAix() || onFreebsd() || onLinux() || onMac() || onOpenbsd() || onSolaris() || onWindows()));
 	}
 
 	private void assertDisabledOnCurrentOsIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
index a0d76870d0d2..e26d47fe9c39 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
@@ -13,12 +13,18 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onAix;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onFreebsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onLinux;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onMac;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onOpenbsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onSolaris;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onWindows;
+import static org.junit.jupiter.api.condition.OS.AIX;
+import static org.junit.jupiter.api.condition.OS.FREEBSD;
 import static org.junit.jupiter.api.condition.OS.LINUX;
 import static org.junit.jupiter.api.condition.OS.MAC;
+import static org.junit.jupiter.api.condition.OS.OPENBSD;
 import static org.junit.jupiter.api.condition.OS.OTHER;
 import static org.junit.jupiter.api.condition.OS.SOLARIS;
 import static org.junit.jupiter.api.condition.OS.WINDOWS;
@@ -50,11 +56,24 @@ void missingOsDeclaration() {
 	}
 
 	@Test
-	@DisabledOnOs(value = { LINUX, MAC, WINDOWS, SOLARIS, OTHER }, disabledReason = "Disabled on every OS")
+	@DisabledOnOs(value = { AIX, FREEBSD, LINUX, MAC, OPENBSD, WINDOWS, SOLARIS,
+			OTHER }, disabledReason = "Disabled on every OS")
 	void disabledOnEveryOs() {
 		fail("should be disabled");
 	}
 
+	@Test
+	@DisabledOnOs(AIX)
+	void aix() {
+		assertFalse(onAix());
+	}
+
+	@Test
+	@DisabledOnOs(FREEBSD)
+	void freebsd() {
+		assertFalse(onFreebsd());
+	}
+
 	@Test
 	@DisabledOnOs(LINUX)
 	void linux() {
@@ -73,6 +92,12 @@ void macOsWithComposedAnnotation() {
 		assertFalse(onMac());
 	}
 
+	@Test
+	@DisabledOnOs(OPENBSD)
+	void openbsd() {
+		assertFalse(onOpenbsd());
+	}
+
 	@Test
 	@DisabledOnOs(WINDOWS)
 	void windows() {
@@ -88,7 +113,7 @@ void solaris() {
 	@Test
 	@DisabledOnOs(OTHER)
 	void other() {
-		assertTrue(onLinux() || onMac() || onSolaris() || onWindows());
+		assertTrue(onAix() || onFreebsd() || onLinux() || onMac() || onOpenbsd() || onSolaris() || onWindows());
 	}
 
 	// -------------------------------------------------------------------------
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
index 96a7c018076c..284030f08739 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
@@ -12,8 +12,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onAix;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onFreebsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onLinux;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onMac;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onOpenbsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onSolaris;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onWindows;
 
@@ -71,6 +74,24 @@ void enabledOnEveryOs() {
 		assertEnabledOnCurrentOsIf(true);
 	}
 
+	/**
+	 * @see EnabledOnOsIntegrationTests#aix()
+	 */
+	@Test
+	void aix() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsIf(onAix());
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#freebsd()
+	 */
+	@Test
+	void freebsd() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsIf(onFreebsd());
+	}
+
 	/**
 	 * @see EnabledOnOsIntegrationTests#linux()
 	 */
@@ -98,6 +119,15 @@ void macOsWithComposedAnnotation() {
 		assertEnabledOnCurrentOsIf(onMac());
 	}
 
+	/**
+	 * @see EnabledOnOsIntegrationTests#openbsd()
+	 */
+	@Test
+	void openbsd() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsIf(onOpenbsd());
+	}
+
 	/**
 	 * @see EnabledOnOsIntegrationTests#windows()
 	 */
@@ -122,7 +152,8 @@ void solaris() {
 	@Test
 	void other() {
 		evaluateCondition();
-		assertEnabledOnCurrentOsIf(!(onLinux() || onMac() || onSolaris() || onWindows()));
+		assertEnabledOnCurrentOsIf(
+			!(onAix() || onFreebsd() || onLinux() || onMac() || onOpenbsd() || onSolaris() || onWindows()));
 		assertCustomDisabledReasonIs("Disabled on almost every OS");
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
index 39d878700bc2..212dff702e64 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
@@ -12,8 +12,11 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.condition.OS.AIX;
+import static org.junit.jupiter.api.condition.OS.FREEBSD;
 import static org.junit.jupiter.api.condition.OS.LINUX;
 import static org.junit.jupiter.api.condition.OS.MAC;
+import static org.junit.jupiter.api.condition.OS.OPENBSD;
 import static org.junit.jupiter.api.condition.OS.OTHER;
 import static org.junit.jupiter.api.condition.OS.SOLARIS;
 import static org.junit.jupiter.api.condition.OS.WINDOWS;
@@ -48,10 +51,22 @@ void missingOsDeclaration() {
 	}
 
 	@Test
-	@EnabledOnOs({ LINUX, MAC, WINDOWS, SOLARIS, OTHER })
+	@EnabledOnOs({ AIX, FREEBSD, LINUX, MAC, OPENBSD, WINDOWS, SOLARIS, OTHER })
 	void enabledOnEveryOs() {
 	}
 
+	@Test
+	@EnabledOnOs(AIX)
+	void aix() {
+		assertTrue(onAix());
+	}
+
+	@Test
+	@EnabledOnOs(FREEBSD)
+	void freebsd() {
+		assertTrue(onFreebsd());
+	}
+
 	@Test
 	@EnabledOnOs(LINUX)
 	void linux() {
@@ -70,6 +85,12 @@ void macOsWithComposedAnnotation() {
 		assertTrue(onMac());
 	}
 
+	@Test
+	@EnabledOnOs(OPENBSD)
+	void openbsd() {
+		assertTrue(onOpenbsd());
+	}
+
 	@Test
 	@EnabledOnOs(WINDOWS)
 	void windows() {
@@ -85,7 +106,15 @@ void solaris() {
 	@Test
 	@EnabledOnOs(value = OTHER, disabledReason = "Disabled on almost every OS")
 	void other() {
-		assertFalse(onLinux() || onMac() || onSolaris() || onWindows());
+		assertFalse(onAix() || onFreebsd() || onLinux() || onMac() || onOpenbsd() || onSolaris() || onWindows());
+	}
+
+	static boolean onAix() {
+		return OS_NAME.contains("aix");
+	}
+
+	static boolean onFreebsd() {
+		return OS_NAME.contains("freebsd");
 	}
 
 	static boolean onLinux() {
@@ -96,6 +125,10 @@ static boolean onMac() {
 		return OS_NAME.contains("mac");
 	}
 
+	static boolean onOpenbsd() {
+		return OS_NAME.contains("openbsd");
+	}
+
 	static boolean onSolaris() {
 		return OS_NAME.contains("solaris");
 	}
diff --git a/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java b/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
index 69511be30161..5c4ff657964a 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
@@ -40,6 +40,12 @@ void aix(String name) {
 			assertEquals(OS.AIX, OS.parse(name));
 		}
 
+		@ParameterizedTest
+		@ValueSource(strings = { "FREEBSD", "FreeBSD" })
+		void freebsd(String name) {
+			assertEquals(OS.FREEBSD, OS.parse(name));
+		}
+
 		@ParameterizedTest
 		@ValueSource(strings = { "LINUX", "Linux" })
 		void linux(String name) {
@@ -52,6 +58,12 @@ void mac(String name) {
 			assertEquals(OS.MAC, OS.parse(name));
 		}
 
+		@ParameterizedTest
+		@ValueSource(strings = { "OPENBSD", "OpenBSD" })
+		void openbsd(String name) {
+			assertEquals(OS.OPENBSD, OS.parse(name));
+		}
+
 		@ParameterizedTest
 		@ValueSource(strings = { "SOLARIS", "SunOS" })
 		void solaris(String name) {

From 4832950062dd1becd350b0880dd3259b57abe9b7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 6 Feb 2022 16:09:12 +0100
Subject: [PATCH 0694/1433] Polish release notes for 5.9 M1

---
 .../release-notes/release-notes-5.9.0-M1.adoc | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 5d8b2dda592c..4e0292ffef29 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -19,17 +19,17 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* `ConfigurationParameters.size()` has been deprecated.
+* `ConfigurationParameters.size()` has been deprecated in favor of the new `keySet()`
+  method.
 
 ==== New Features and Improvements
 
-* `ConfigurationParameters` has now a `keySet()` method allowing to retrieve
-  all configuration parameter keys.
+* `ConfigurationParameters` has a new `keySet()` method which allows you to retrieve all
+  configuration parameter keys.
 * New `IterationSelector` for selecting a subset of a test's or container's iterations.
 * JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
-  resolution time a fully running set of dependencies are calculated avoiding the need
-  for these to be manually specified.
-* New support for FreeBSD and OpenBSD operating systems in `@EnabledOnOs` and `@DisabledOnOs`.
+  resolution time a fully running set of dependencies is calculated, avoiding the need for
+  these to be manually specified.
 
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
@@ -45,14 +45,19 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* Add support for `IterationSelector` to select a subset of the invocations of
-  parameterized or dynamic tests.
-* Add support for `MATCH_NONE` mode in `EnumSource` that selects only those enum constants
-  whose names match none of the supplied patterns.
-* A new extension `TestInstancePreConstructCallback` called prior to a test instance
-  construction (symmetric extension to `TestInstancePreDestroyCallback`).
-* Allow extensions to leverage registered `ParameterResolvers` for method and constructor
-  invocations, via the new `ExecutableInvoker` available in the `ExtensionContext`.
+* `@TempDir` now includes a cleanup mode attribute for preventing a temporary directory
+  from being deleted after a test. The default cleanup mode can be configured via a
+  configuration parameter.
+* Support for FreeBSD and OpenBSD operating systems in `@EnabledOnOs` and `@DisabledOnOs`.
+* New `MATCH_NONE` mode for `@EnumSource` that selects only those enum constants whose
+  names match none of the supplied patterns.
+* New `TestInstancePreConstructCallback` extension API that is called prior to test
+  instance construction – symmetric to the existing `TestInstancePreDestroyCallback`
+  extension API.
+* Extensions can now leverage registered `ParameterResolvers` when invoking methods and
+  constructors via the new `ExecutableInvoker` available in the `ExtensionContext`.
+* A subset of the invocations of parameterized or dynamic tests can now be selected via
+  the new `IterationSelector` discovery selector when launching the JUnit Platform.
 
 
 [[release-notes-5.9.0-M1-junit-vintage]]
@@ -68,6 +73,4 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* `@TempDir` now includes a cleanup mode attribute for preventing a temporary directory
-  from being deleted after a test. The default cleanup mode can be configured via a
-  configuration parameter.
+* ❓

From be1539603f4ca321df8f01eec6ea2f1a4ca87dfb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 6 Feb 2022 16:09:28 +0100
Subject: [PATCH 0695/1433] Polish Javadoc

---
 .../org/junit/platform/engine/ConfigurationParameters.java    | 4 ++--
 .../junit/platform/engine/discovery/IterationSelector.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
index 3f3a8c15cda6..c7fd8852c920 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
@@ -134,7 +134,7 @@ default <T> Optional<T> get(String key, Function<String, T> transformer) {
 	/**
 	 * Get the number of configuration parameters stored directly in this
 	 * {@code ConfigurationParameters}.
-	 * @deprecated Use {@link #keySet()}.
+	 * @deprecated as of JUnit Platform 1.9 in favor of {@link #keySet()}
 	 */
 	@Deprecated
 	@API(status = DEPRECATED, since = "1.9")
@@ -144,7 +144,7 @@ default <T> Optional<T> get(String key, Function<String, T> transformer) {
 	 * Get the keys of all configuration parameters stored in this
 	 * {@code ConfigurationParameters}.
 	 *
-	 * @return a set of keys contained in {@code ConfigurationParameters}
+	 * @return the set of keys contained in this {@code ConfigurationParameters}
 	 */
 	@API(status = STABLE, since = "1.9")
 	Set<String> keySet();
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
index d7f95867fd77..58e53de73aca 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
@@ -25,8 +25,8 @@
 import org.junit.platform.engine.DiscoverySelector;
 
 /**
- * A {@link IterationSelector} that selects the iterations of a parent
- * {@link DiscoverySelector} via their index so that
+ * A {@link DiscoverySelector} that selects the iterations of a parent
+ * {@code DiscoverySelector} via their indices so that
  * {@link org.junit.platform.engine.TestEngine TestEngines} can discover
  * a subset of the iterations of tests or containers.
  *

From 27e8d82eaec61fc61cb1289077feeec876d2dbbf Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 10 Feb 2022 12:45:57 +0100
Subject: [PATCH 0696/1433] Upgradle to 7.4

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f3347f902964..1debed0d8fd3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b2a452bc37637aa453f0f3fb526240caed02878c47a9736f3059590605893bdb
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-rc-1-bin.zip
+distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 4a3bc288dd9127453edc309a8473b42562a2de18 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Mon, 14 Feb 2022 09:40:39 +0100
Subject: [PATCH 0697/1433] Use `oracle-actions/setup-java` to install JDK

---
 .github/workflows/cross-version.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 20e5806f08ed..b4df9259f2d9 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -29,17 +29,12 @@ jobs:
           fetch-depth: 1
       - name: Set up Test JDK
         uses: ./.github/actions/setup-test-jdk
-      - name: 'Download JDK ${{ matrix.jdk }}'
-        id: download-jdk
-        uses: sormuras/download-jdk@v1
-        with:
-          feature: '${{ matrix.jdk }}'
       - name: 'Set up JDK ${{ matrix.jdk }}'
-        uses: actions/setup-java@v2
+        uses: oracle-actions/setup-java@v1
         with:
-          distribution: 'jdkfile'
-          java-version: '${{ steps.download-jdk.outputs.version }}'
-          jdkFile: '${{ steps.download-jdk.outputs.file }}'
+          website: jdk.java.net
+          release: ${{ matrix.jdk }}
+          version: latest
       - name: 'Prepare JDK${{ matrix.jdk }} env var'
         shell: bash
         run: echo "JDK${{ matrix.jdk }}=$JAVA_HOME" >> $GITHUB_ENV

From d638153a60967c313a947392899996d6d720c453 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 26 Feb 2022 14:44:10 +0100
Subject: [PATCH 0698/1433] Update ArchUnit to 0.23.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 693424db58fa..1b9f7f02182b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ surefire = "2.22.2"
 
 [libraries]
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.22.0" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.23.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.1.0" }

From 6f4d7cd70532075a650145342be6e297658685b0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 26 Feb 2022 14:44:31 +0100
Subject: [PATCH 0699/1433] Remove now unnecessary feature opt-in

---
 settings.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3d5baecb2e21..d6a71d2cbb4e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -131,5 +131,4 @@ rootProject.children.forEach { project ->
 	}
 }
 
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

From 095830eade4333ee9a7cf61d6fae02c5b95d28d1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 26 Feb 2022 14:46:26 +0100
Subject: [PATCH 0700/1433] Update bnd to 6.2.0

---
 buildSrc/build.gradle.kts | 2 +-
 gradle/libs.versions.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 4ee9121474ae..72f64d8cbde3 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
 	implementation(kotlin("gradle-plugin"))
-	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0")
+	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.2.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1b9f7f02182b..470987a6bd42 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apigu
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.23.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
-bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.1.0" }
+bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.2.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.132" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.0" }

From 718b6937415dd825383641f9ddb00ce12f4640fb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 1 Mar 2022 19:23:19 +0100
Subject: [PATCH 0701/1433] Update TD Gradle plugin to 2.2.3

---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 72f64d8cbde3..80b8113a75c2 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
     implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
     implementation("gradle.plugin.net.nemerosa:versioning:2.15.1")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.2") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.3") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d6a71d2cbb4e..94c0a9bf1a6c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.8.1"
-		id("com.gradle.enterprise.test-distribution") version "2.2.2" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise.test-distribution") version "2.2.3" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"

From 95973af40e1f506b59376e7b44b374e6f418cd17 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 4 Mar 2022 12:40:31 +0100
Subject: [PATCH 0702/1433] Polishing

---
 .../org/junit/jupiter/api/io/CleanupMode.java |  2 +-
 .../org/junit/jupiter/api/io/TempDir.java     |  1 +
 ...va => TempDirectoryPreconditionTests.java} | 24 +++++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/{TempDirectoryParameterResolverTests.java => TempDirectoryPreconditionTests.java} (63%)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
index f947967f3f50..016dc5b09e7c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
@@ -15,7 +15,7 @@
 import org.apiguardian.api.API;
 
 /**
- * Enumeration of cleanup modes for a {@code TempDir}.
+ * Enumeration of cleanup modes for {@link TempDir @TempDir}.
  *
  * <p>When a test with a temporary directory completes, it might be useful in
  * some cases to be able to view the contents of the temporary directory used by
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 007625e4fd74..a8d0ba159b5d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -54,6 +54,7 @@
  * {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method.
  *
  * <h4>Old behavior</h4>
+ *
  * <p>You can revert to the old behavior of using a single temporary directory
  * by setting the {@code junit.jupiter.tempdir.scope} configuration parameter to
  * {@code per_context}. In that case, the scope of the temporary directory
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
similarity index 63%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
index 9f94282af988..d7b84df70d61 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
@@ -18,6 +18,7 @@
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -28,32 +29,35 @@
 import org.junit.platform.testkit.engine.Events;
 
 /**
+ * Integration tests for preconditions and assertions in the {@link TempDirectory}
+ * extension.
+ *
  * @since 5.9
  */
-class TempDirectoryParameterResolverTests extends AbstractJupiterTestEngineTests {
+class TempDirectoryPreconditionTests extends AbstractJupiterTestEngineTests {
 
 	@Test
-	@DisplayName("Test good and bad @TempDir parameters")
-	void testTempDirType() {
-		EngineExecutionResults executionResults = executeTestsForClass(ATestCase.class);
+	@DisplayName("Valid and invalid @TempDir parameter types")
+	void parameterTypes() {
+		EngineExecutionResults executionResults = executeTestsForClass(ParameterTypeTestCase.class);
 		Events tests = executionResults.testEvents();
 		tests.assertStatistics(stats -> stats.started(2).failed(1).succeeded(1));
-		tests.succeeded().assertEventsMatchExactly(event(test("testGoodTempDirType"), finishedSuccessfully()));
-		tests.failed().assertEventsMatchExactly(event(test("testBadTempDirType"),
+		tests.succeeded().assertEventsMatchExactly(event(test("validTempDirType"), finishedSuccessfully()));
+		tests.failed().assertEventsMatchExactly(event(test("invalidTempDirType"),
 			finishedWithFailure(instanceOf(ParameterResolutionException.class), message(
-				"Failed to resolve parameter [java.lang.String badTempDir] in method [void org.junit.jupiter.engine.extension.TempDirectoryParameterResolverTests$ATestCase.testBadTempDirType(java.lang.String)]: Can only resolve @TempDir parameter of type java.nio.file.Path or java.io.File but was: java.lang.String"))));
+				"Failed to resolve parameter [java.lang.String text] in method [void org.junit.jupiter.engine.extension.TempDirectoryPreconditionTests$ParameterTypeTestCase.invalidTempDirType(java.lang.String)]: Can only resolve @TempDir parameter of type java.nio.file.Path or java.io.File but was: java.lang.String"))));
 	}
 
 	// -------------------------------------------------------------------
 
-	static class ATestCase {
+	static class ParameterTypeTestCase {
 
 		@Test
-		void testGoodTempDirType(@TempDir File goodTempDir) {
+		void validTempDirType(@TempDir File file, @TempDir Path path) {
 		}
 
 		@Test
-		void testBadTempDirType(@TempDir String badTempDir) {
+		void invalidTempDirType(@TempDir String text) {
 		}
 
 	}

From 0dad5f937acd418f9a3601531b6297e88be14a61 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 4 Mar 2022 13:26:07 +0100
Subject: [PATCH 0703/1433] Assert that @TempDir fields are not final

Closes #2839
---
 .../release-notes/release-notes-5.9.0-M1.adoc |  4 +-
 .../asciidoc/user-guide/writing-tests.adoc    |  6 +-
 .../org/junit/jupiter/api/io/TempDir.java     |  4 +-
 .../engine/extension/TempDirectory.java       |  8 ++-
 .../TempDirectoryPreconditionTests.java       | 58 ++++++++++++++++++-
 5 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 4e0292ffef29..ba90d0a74b0d 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -41,7 +41,9 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* `@TempDir` fields are no longer allowed to be declared as `final`.
+  - This improves diagnostics for failures resulting from a user-declared `static final`
+    `@TempDir` field by throwing an exception with an informative error message.
 
 ==== New Features and Improvements
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index f33781d4e454..9d1657a0120a 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2308,9 +2308,9 @@ can improve and eventually <<api-evolution, promote>> this feature.
 
 The built-in `{TempDirectory}` extension is used to create and clean up a temporary
 directory for an individual test or all tests in a test class. It is registered by
-default. To use it, annotate a field of type `java.nio.file.Path` or `java.io.File` with
-`{TempDir}` or add a parameter of type `java.nio.file.Path` or `java.io.File` annotated
-with `@TempDir` to a lifecycle method or test method.
+default. To use it, annotate a non-final, unassigned field of type `java.nio.file.Path` or
+`java.io.File` with `{TempDir}` or add a parameter of type `java.nio.file.Path` or
+`java.io.File` annotated with `@TempDir` to a lifecycle method or test method.
 
 For example, the following test declares a parameter annotated with `@TempDir` for a
 single test method, creates and writes to a file in the temporary directory, and checks
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index a8d0ba159b5d..b12b7818cff1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -39,8 +39,8 @@
  * <p>The temporary directory is only created if a field in a test class or a
  * parameter in a lifecycle method or test method is annotated with
  * {@code @TempDir}. If the field type or parameter type is neither {@link Path}
- * nor {@link File} or if the temporary directory cannot be created, an
- * {@link ExtensionConfigurationException} or a
+ * nor {@link File}, if a field is declared as {@code final}, or if the temporary
+ * directory cannot be created, an {@link ExtensionConfigurationException} or a
  * {@link ParameterResolutionException} will be thrown as appropriate. In
  * addition, a {@code ParameterResolutionException} will be thrown for a
  * constructor parameter annotated with {@code @TempDir}.
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 7f691db71e3c..c756c5540607 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -112,6 +112,7 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 			Predicate<Field> predicate) {
 
 		findAnnotatedFields(testClass, TempDir.class, predicate).forEach(field -> {
+			assertNonFinalField(field);
 			assertSupportedType("field", field.getType());
 
 			try {
@@ -167,8 +168,13 @@ private CleanupMode determineCleanupMode(TempDir tempDir) {
 		return cleanupMode == DEFAULT ? this.configuration.getDefaultTempDirCleanupMode() : cleanupMode;
 	}
 
-	private void assertSupportedType(String target, Class<?> type) {
+	private void assertNonFinalField(Field field) {
+		if (ReflectionUtils.isFinal(field)) {
+			throw new ExtensionConfigurationException("@TempDir field [" + field + "] must not be declared as final.");
+		}
+	}
 
+	private void assertSupportedType(String target, Class<?> type) {
 		if (type != Path.class && type != File.class) {
 			throw new ExtensionConfigurationException("Can only resolve @TempDir " + target + " of type "
 					+ Path.class.getName() + " or " + File.class.getName() + " but was: " + type.getName());
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
index d7b84df70d61..56539b997b8e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.engine.extension;
 
+import static org.junit.platform.testkit.engine.EventConditions.container;
 import static org.junit.platform.testkit.engine.EventConditions.event;
 import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
@@ -19,9 +20,11 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
@@ -43,9 +46,43 @@ void parameterTypes() {
 		Events tests = executionResults.testEvents();
 		tests.assertStatistics(stats -> stats.started(2).failed(1).succeeded(1));
 		tests.succeeded().assertEventsMatchExactly(event(test("validTempDirType"), finishedSuccessfully()));
+		// @formatter:off
 		tests.failed().assertEventsMatchExactly(event(test("invalidTempDirType"),
-			finishedWithFailure(instanceOf(ParameterResolutionException.class), message(
-				"Failed to resolve parameter [java.lang.String text] in method [void org.junit.jupiter.engine.extension.TempDirectoryPreconditionTests$ParameterTypeTestCase.invalidTempDirType(java.lang.String)]: Can only resolve @TempDir parameter of type java.nio.file.Path or java.io.File but was: java.lang.String"))));
+			finishedWithFailure(instanceOf(ParameterResolutionException.class), message("""
+					Failed to resolve parameter [java.lang.String text] in method \
+					[void org.junit.jupiter.engine.extension.TempDirectoryPreconditionTests$ParameterTypeTestCase.invalidTempDirType(java.lang.String)]: \
+					Can only resolve @TempDir parameter of type java.nio.file.Path or java.io.File but was: java.lang.String\
+					"""))));
+		// @formatter:on
+	}
+
+	@Test
+	@DisplayName("final static @TempDir fields are not supported")
+	void finalStaticFieldIsNotSupported() {
+		EngineExecutionResults executionResults = executeTestsForClass(FinalStaticFieldTestCase.class);
+		Events containers = executionResults.containerEvents();
+		containers.assertStatistics(stats -> stats.started(2).failed(1).succeeded(1));
+		containers.succeeded().assertEventsMatchExactly(event(container("junit-jupiter"), finishedSuccessfully()));
+		containers.failed().assertEventsMatchExactly(event(container("FinalStaticFieldTestCase"),
+			finishedWithFailure(instanceOf(ExtensionConfigurationException.class), message("""
+					@TempDir field [static final java.nio.file.Path \
+					org.junit.jupiter.engine.extension.TempDirectoryPreconditionTests$FinalStaticFieldTestCase.path] \
+					must not be declared as final.\
+					"""))));
+	}
+
+	@Test
+	@DisplayName("final instance @TempDir fields are not supported")
+	void finalInstanceFieldIsNotSupported() {
+		EngineExecutionResults executionResults = executeTestsForClass(FinalInstanceFieldTestCase.class);
+		Events tests = executionResults.testEvents();
+		tests.assertStatistics(stats -> stats.started(1).failed(1).succeeded(0));
+		tests.failed().assertEventsMatchExactly(
+			event(test("test()"), finishedWithFailure(instanceOf(ExtensionConfigurationException.class), message("""
+					@TempDir field [final java.nio.file.Path \
+					org.junit.jupiter.engine.extension.TempDirectoryPreconditionTests$FinalInstanceFieldTestCase.path] \
+					must not be declared as final.\
+					"""))));
 	}
 
 	// -------------------------------------------------------------------
@@ -59,7 +96,24 @@ void validTempDirType(@TempDir File file, @TempDir Path path) {
 		@Test
 		void invalidTempDirType(@TempDir String text) {
 		}
+	}
+
+	static class FinalStaticFieldTestCase {
+
+		static final @TempDir Path path = Paths.get(".");
+
+		@Test
+		void test() {
+		}
+	}
 
+	static class FinalInstanceFieldTestCase {
+
+		final @TempDir Path path = Paths.get(".");
+
+		@Test
+		void test() {
+		}
 	}
 
 }

From fcd531c58b438c4881a270a516c3c7732ed5dcee Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 4 Mar 2022 13:27:50 +0100
Subject: [PATCH 0704/1433] Fix @TempDir default cleanup mode config param name
 in User Guide

---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 9d1657a0120a..88028d9b8306 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2356,7 +2356,7 @@ directories are not deleted after a test completes. If it is set to `ON_SUCCESS`
 temporary directories are deleted only after a test completed successfully.
 
 The default cleanup mode is `ALWAYS`. You can use the
-`junit.jupiter.temp.dir.cleanup.mode.default`
+`junit.jupiter.tempdir.cleanup.mode.default`
 <<running-tests-config-params, configuration parameter>> to override this default.
 
 [source,java,indent=0]

From 0c4cc88dcddd46f7d6f09a26c9ceb953b50d0e39 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 6 Mar 2022 15:16:57 +0100
Subject: [PATCH 0705/1433] Introduce dedicated "Test Engines" section in User
 Guide

See #2825
---
 .../src/docs/asciidoc/link-attributes.adoc    |  1 +
 .../asciidoc/user-guide/advanced-topics.adoc  |  2 -
 .../src/docs/asciidoc/user-guide/engines.adoc | 68 +++++++++++++++++++
 .../asciidoc/user-guide/launcher-api.adoc     | 37 +---------
 4 files changed, 72 insertions(+), 36 deletions(-)
 create mode 100644 documentation/src/docs/asciidoc/user-guide/engines.adoc

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 8a45d4218e8e..7e4dd23c159a 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -14,6 +14,7 @@ endif::[]
 :ClassSupport:                               {javadoc-root}/org.junit.platform.commons/org/junit/platform/commons/support/ClassSupport.html[ClassSupport]
 :ModifierSupport:                            {javadoc-root}/org.junit.platform.commons/org/junit/platform/commons/support/ModifierSupport.html[ModifierSupport]
 :ReflectionSupport:                          {javadoc-root}/org.junit.platform.commons/org/junit/platform/commons/support/ReflectionSupport.html[ReflectionSupport]
+:Testable:                                   {javadoc-root}/org.junit.platform.commons/org/junit/platform/commons/annotation/Testable.html[@Testable]
 // Platform Console Launcher
 :junit-platform-console:                     {javadoc-root}/org.junit.platform.console/org/junit/platform/console/package-summary.html[junit-platform-console]
 :ConsoleLauncher:                            {javadoc-root}/org.junit.platform.console/org/junit/platform/console/ConsoleLauncher.html[ConsoleLauncher]
diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
index bc1d41be4c93..117312036198 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
@@ -9,6 +9,4 @@ include::junit-platform-suite-engine.adoc[]
 
 include::testkit.adoc[]
 
-////
 include::engines.adoc[]
-////
diff --git a/documentation/src/docs/asciidoc/user-guide/engines.adoc b/documentation/src/docs/asciidoc/user-guide/engines.adoc
new file mode 100644
index 000000000000..82b0cf5db36b
--- /dev/null
+++ b/documentation/src/docs/asciidoc/user-guide/engines.adoc
@@ -0,0 +1,68 @@
+[[test-engines]]
+=== Test Engines
+
+A `TestEngine` facilitates _discovery_ and _execution_ of tests for a particular
+programming model.
+
+For example, JUnit provides a `TestEngine` that discovers and executes tests written using
+the JUnit Jupiter programming model (see <<writing-tests>> and <<extensions>>).
+
+[[test-engines-junit]]
+==== JUnit Test Engines
+
+JUnit provides three `TestEngine` implementations.
+
+* `{junit-jupiter-engine}`: The core of JUnit Jupiter.
+* `{junit-vintage-engine}`: A thin layer on top of JUnit 4 to allow running _vintage_
+  tests (based on JUnit 3.8 and JUnit 4) with the JUnit Platform launcher infrastructure.
+* `{junit-platform-suite-engine}`: Executes declarative suites of tests with the JUnit
+  Platform launcher infrastructure.
+
+[[test-engines-custom]]
+==== Custom Test Engines
+
+Third parties may contribute their own custom `{TestEngine}` by implementing the interfaces
+in the {junit-platform-engine} module and _registering_ their engine.
+
+Every `TestEngine` must provide its own _unique ID_, _discover_ tests from an
+`EngineDiscoveryRequest`, and _execute_ those tests according to an `ExecutionRequest`.
+
+[WARNING]
+.The `junit-` unique ID prefix is reserved for TestEngines from the JUnit Team
+====
+The JUnit Platform `Launcher` enforces that only `TestEngine` implementations published
+by the JUnit Team may use the `junit-` prefix for their `TestEngine` IDs.
+
+* If any third-party `TestEngine` claims to be `junit-jupiter` or `junit-vintage`, an
+  exception will be thrown, immediately halting execution of the JUnit Platform.
+* If any third-party `TestEngine` uses the `junit-` prefix for its ID, a warning message
+  will be logged. Later releases of the JUnit Platform will throw an exception for such
+  violations.
+====
+
+In order to facilitate test discovery within IDEs and tools prior to launching the JUnit
+Platform, `TestEngine` implementations are encouraged to make use of the `@Testable`
+annotation. For example, the `@Test` and `@TestFactory` annotations in JUnit Jupiter are
+meta-annotated with `@Testable`. Consult the Javadoc for `{Testable}` for further details.
+
+Although there is currently no official guide on how to implement a custom `TestEngine`,
+you can consult the implementation of <<test-engines-junit>> or the implementation of
+third-party test engines listed in the
+https://github.com/junit-team/junit5/wiki/Third-party-Extensions#junit-platform-test-engines[JUnit 5 wiki].
+You will also find various tutorials and blogs on the Internet that demonstrate how to
+write a custom `TestEngine`.
+
+NOTE: `{HierarchicalTestEngine}` is a convenient abstract base implementation (used by the
+`{junit-jupiter-engine}`) that only requires implementors to provide the logic for test
+discovery. It implements execution of `TestDescriptors` that implement the `Node`
+interface, including support for parallel execution.
+
+[[test-engines-registration]]
+==== Registering a TestEngine
+
+`TestEngine` registration is supported via Java's `{ServiceLoader}` mechanism.
+
+For example, the `junit-jupiter-engine` module registers its
+`org.junit.jupiter.engine.JupiterTestEngine` in a file named
+`org.junit.platform.engine.TestEngine` within the `/META-INF/services` folder in the
+`junit-jupiter-engine` JAR.
diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
index abcd326e7256..4508ad3b5824 100644
--- a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
@@ -9,7 +9,7 @@ configuration that's necessary from the outside.
 JUnit 5 introduces the concept of a `Launcher` that can be used to discover, filter, and
 execute tests. Moreover, third party test libraries – like Spock, Cucumber, and FitNesse
 – can plug into the JUnit Platform's launching infrastructure by providing a custom
-`{TestEngine}`.
+<<test-engines,TestEngine>>.
 
 The launcher API is in the `{junit-platform-launcher}` module.
 
@@ -74,39 +74,8 @@ There is no return value for the `execute()` method, but you can use a
 [[launcher-api-engines-custom]]
 ==== Registering a TestEngine
 
-JUnit provides three `{TestEngine}` implementations.
-
-* `{junit-jupiter-engine}`: The core of JUnit Jupiter.
-* `{junit-vintage-engine}`: A thin layer on top of JUnit 4 to allow running _vintage_
-  tests with the launcher infrastructure.
-* `{junit-platform-suite-engine}`: To execute declarative suites of tests with the
-  launcher infrastructure.
-
-Third parties may also contribute their own `TestEngine` by implementing the interfaces in
-the {junit-platform-engine} module and _registering_ their engine. Engine registration is
-supported via Java's `{ServiceLoader}` mechanism. For example, the `junit-jupiter-engine`
-module registers its `org.junit.jupiter.engine.JupiterTestEngine` in a file named
-`org.junit.platform.engine.TestEngine` within the `/META-INF/services` folder in the
-`junit-jupiter-engine` JAR.
-
-NOTE: `{HierarchicalTestEngine}` is a convenient abstract base implementation (used by
-the `{junit-jupiter-engine}`) that only requires implementors to provide the logic for
-test discovery. It implements execution of `TestDescriptors` that implement the `Node`
-interface, including support for parallel execution.
-
-[[launcher-api-engines-custom-ids]]
-[WARNING]
-.The `junit-` prefix is reserved for TestEngines from the JUnit Team
-====
-The JUnit Platform `Launcher` enforces that only `TestEngine` implementations published
-by the JUnit Team may use the `junit-` prefix for their `TestEngine` IDs.
-
-* If any third-party `TestEngine` claims to be `junit-jupiter` or `junit-vintage`, an
-  exception will be thrown, immediately halting execution of the JUnit Platform.
-* If any third-party `TestEngine` uses the `junit-` prefix for its ID, a warning message
-  will be logged. Later releases of the JUnit Platform will throw an exception for such
-  violations.
-====
+See the dedicated section on <<test-engines-registration, TestEngine registration>> for
+details.
 
 [[launcher-api-post-discovery-filters-custom]]
 ==== Registering a PostDiscoveryFilter

From 00bda22e7d8f236825d87f1f41324239f35d86e9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 6 Mar 2022 15:28:13 +0100
Subject: [PATCH 0706/1433] Polishing

---
 .../src/docs/asciidoc/user-guide/engines.adoc        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/engines.adoc b/documentation/src/docs/asciidoc/user-guide/engines.adoc
index 82b0cf5db36b..79fbddcebcac 100644
--- a/documentation/src/docs/asciidoc/user-guide/engines.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/engines.adoc
@@ -21,8 +21,8 @@ JUnit provides three `TestEngine` implementations.
 [[test-engines-custom]]
 ==== Custom Test Engines
 
-Third parties may contribute their own custom `{TestEngine}` by implementing the interfaces
-in the {junit-platform-engine} module and _registering_ their engine.
+You can contribute your own custom `{TestEngine}` by implementing the interfaces in the
+{junit-platform-engine} module and _registering_ your engine.
 
 Every `TestEngine` must provide its own _unique ID_, _discover_ tests from an
 `EngineDiscoveryRequest`, and _execute_ those tests according to an `ExecutionRequest`.
@@ -52,10 +52,10 @@ https://github.com/junit-team/junit5/wiki/Third-party-Extensions#junit-platform-
 You will also find various tutorials and blogs on the Internet that demonstrate how to
 write a custom `TestEngine`.
 
-NOTE: `{HierarchicalTestEngine}` is a convenient abstract base implementation (used by the
-`{junit-jupiter-engine}`) that only requires implementors to provide the logic for test
-discovery. It implements execution of `TestDescriptors` that implement the `Node`
-interface, including support for parallel execution.
+NOTE: `{HierarchicalTestEngine}` is a convenient abstract base implementation of the
+`TestEngine` SPI (used by the `{junit-jupiter-engine}`) that only requires implementors to
+provide the logic for test discovery. It implements execution of `TestDescriptors` that
+implement the `Node` interface, including support for parallel execution.
 
 [[test-engines-registration]]
 ==== Registering a TestEngine

From 01c20732087363c3a43f34cf469f0332aca5ef35 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 6 Mar 2022 15:35:26 +0100
Subject: [PATCH 0707/1433] Document configuration parameter naming guidelines
 for test engines

Closes #2825
---
 .../src/docs/asciidoc/user-guide/engines.adoc        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/engines.adoc b/documentation/src/docs/asciidoc/user-guide/engines.adoc
index 79fbddcebcac..3c06d5af1736 100644
--- a/documentation/src/docs/asciidoc/user-guide/engines.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/engines.adoc
@@ -45,6 +45,18 @@ Platform, `TestEngine` implementations are encouraged to make use of the `@Testa
 annotation. For example, the `@Test` and `@TestFactory` annotations in JUnit Jupiter are
 meta-annotated with `@Testable`. Consult the Javadoc for `{Testable}` for further details.
 
+If your custom `TestEngine` needs to be configured, consider allowing users to supply
+configuration via <<running-tests-config-params,configuration parameters>>. Please note,
+however, that you are strongly encouraged to use a unique prefix for all configuration
+parameters supported by your test engine. Doing so will ensure that there are no conflicts
+between the names of your configuration parameters and those from other test engines. In
+addition, since configuration parameters may be supplied as JVM system properties, it is
+wise to avoid conflicts with the names of other system properties. For example, JUnit
+Jupiter uses `junit.jupiter.` as a prefix of all of its supported configuration
+parameters. Furthermore, as with the warning above regarding the `junit-` prefix for
+`TestEngine` IDs, you should not use `junit.` as a prefix for the names of your own
+configuration parameters.
+
 Although there is currently no official guide on how to implement a custom `TestEngine`,
 you can consult the implementation of <<test-engines-junit>> or the implementation of
 third-party test engines listed in the

From 920b68868e6f258b9370996e4371c7ba44061b92 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 6 Mar 2022 17:01:01 +0100
Subject: [PATCH 0708/1433] Use value references in Javadoc to eliminate
 duplication (#2769)

Triggered by discussion in fd93eec.
---
 .../org/junit/jupiter/api/ClassOrderer.java   |  30 +-
 .../jupiter/api/DisplayNameGeneration.java    |   6 +
 .../jupiter/api/DisplayNameGenerator.java     |  23 ++
 .../org/junit/jupiter/api/MethodOrderer.java  |  32 +-
 .../org/junit/jupiter/api/TestClassOrder.java |   2 +-
 .../org/junit/jupiter/api/TestInstance.java   |  30 +-
 .../junit/jupiter/api/TestMethodOrder.java    |   6 +
 .../java/org/junit/jupiter/api/Timeout.java   | 250 +++++++++++++-
 .../org/junit/jupiter/api/io/TempDir.java     |  24 +-
 .../junit/jupiter/api/parallel/Execution.java |  54 +++
 .../org/junit/jupiter/engine/Constants.java   | 312 ++++--------------
 .../engine/config/JupiterConfiguration.java   |  27 +-
 .../engine/extension/TempDirectory.java       |   4 +-
 .../extension/TimeoutConfiguration.java       |  20 +-
 .../engine/extension/TimeoutExtension.java    |   2 +-
 .../TempDirectoryPerContextTests.java         |   4 +-
 .../jupiter/params/ParameterizedTest.java     |   2 +-
 17 files changed, 510 insertions(+), 318 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index a94b2c01e030..41b0c7636c64 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -12,6 +12,7 @@
 
 import static java.util.Comparator.comparingInt;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -35,7 +36,7 @@
  * class}.
  *
  * <p>A {@link ClassOrderer} can be configured <em>globally</em> for the entire
- * test suite via the {@code junit.jupiter.testclass.order.default} configuration
+ * test suite via the {@value #DEFAULT_ORDER_PROPERTY_NAME} configuration
  * parameter (see the User Guide for details) or <em>locally</em> for
  * {@link Nested @Nested} test classes via the {@link TestClassOrder @TestClassOrder}
  * annotation.
@@ -61,6 +62,22 @@
 @API(status = EXPERIMENTAL, since = "5.8")
 public interface ClassOrderer {
 
+	/**
+	 * Property name used to set the default class orderer class name: {@value}
+	 *
+	 * <h4>Supported Values</h4>
+	 *
+	 * <p>Supported values include fully qualified class names for types that
+	 * implement {@link org.junit.jupiter.api.ClassOrderer}.
+	 *
+	 * <p>If not specified, test classes are not ordered unless test classes are
+	 * annotated with {@link TestClassOrder @TestClassOrder}.
+	 *
+	 * @since 5.8
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_ORDER_PROPERTY_NAME = "junit.jupiter.testclass.order.default";
+
 	/**
 	 * Order the classes encapsulated in the supplied {@link ClassOrdererContext}.
 	 *
@@ -173,12 +190,11 @@ private static int getOrder(ClassDescriptor descriptor) {
 	 * of this class. In order to support repeatable builds, the value of the
 	 * default random seed is logged at {@code CONFIG} level. In addition, a
 	 * custom seed (potentially the default seed from the previous test plan
-	 * execution) may be specified via the {@link Random#RANDOM_SEED_PROPERTY_NAME
-	 * junit.jupiter.execution.order.random.seed} <em>configuration parameter</em>
-	 * which can be supplied via the {@code Launcher} API, build tools (e.g.,
-	 * Gradle and Maven), a JVM system property, or the JUnit Platform configuration
-	 * file (i.e., a file named {@code junit-platform.properties} in the root of
-	 * the class path). Consult the User Guide for further information.
+	 * execution) may be specified via the {@value Random#RANDOM_SEED_PROPERTY_NAME}
+	 * <em>configuration parameter</em> which can be supplied via the {@code Launcher}
+	 * API, build tools (e.g., Gradle and Maven), a JVM system property, or the JUnit
+	 * Platform configuration file (i.e., a file named {@code junit-platform.properties}
+	 * in the root of the class path). Consult the User Guide for further information.
 	 *
 	 * @see Random#RANDOM_SEED_PROPERTY_NAME
 	 * @see java.util.Random
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
index 32eb81eed40a..04adf0b37798 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
@@ -29,6 +29,12 @@
  * interfaces. It is also inherited from {@linkplain Class#getEnclosingClass()
  * enclosing classes} for {@link Nested @Nested} test classes.
  *
+ * <p>As an alternative to {@code @DisplayNameGeneration}, a global
+ * {@link DisplayNameGenerator} can be configured for the entire test suite via
+ * the {@value DisplayNameGenerator#DEFAULT_GENERATOR_PROPERTY_NAME} configuration parameter. See
+ * the User Guide for details. Note, however, that a {@code @DisplayNameGeneration}
+ * declaration always overrides a global {@code DisplayNameGenerator}.
+ *
  * @since 5.4
  * @see DisplayName
  * @see DisplayNameGenerator
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 065b2c54e177..7b72eb642cfa 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -33,6 +33,12 @@
  *
  * <p>Concrete implementations must have a <em>default constructor</em>.
  *
+ * <p>A {@link DisplayNameGenerator} can be configured <em>globally</em> for the
+ * entire test suite via the {@value #DEFAULT_GENERATOR_PROPERTY_NAME}
+ * configuration parameter (see the User Guide for details) or <em>locally</em>
+ * for a test class via the {@link TestClassOrder @DisplayNameGeneration}
+ * annotation.
+ *
  * <h4>Built-in Implementations</h4>
  * <ul>
  * <li>{@link Standard}</li>
@@ -48,6 +54,23 @@
 @API(status = STABLE, since = "5.7")
 public interface DisplayNameGenerator {
 
+	/**
+	 * Property name used to set the default display name generator class name:
+	 * {@value}
+	 *
+	 * <h4>Supported Values</h4>
+	 *
+	 * <p>Supported values include fully qualified class names for types that
+	 * implement {@link DisplayNameGenerator}.
+	 *
+	 * <p>If not specified, the default is
+	 * {@link DisplayNameGenerator.Standard}.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_GENERATOR_PROPERTY_NAME = "junit.jupiter.displayname.generator.default";
+
 	/**
 	 * Generate a display name for the given top-level or {@code static} nested test class.
 	 *
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 8d349dd01880..adc3a3e203d9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -34,6 +34,11 @@
  * {@code @Test}, {@code @RepeatedTest}, {@code @ParameterizedTest},
  * {@code @TestFactory}, or {@code @TestTemplate}.
  *
+ * <p>A {@link MethodOrderer} can be configured <em>globally</em> for the entire
+ * test suite via the {@value #DEFAULT_ORDER_PROPERTY_NAME} configuration
+ * parameter (see the User Guide for details) or <em>locally</em> for a test
+ * class via the {@link TestMethodOrder @TestMethodOrder} annotation.
+ *
  * <h4>Built-in Implementations</h4>
  *
  * <p>JUnit Jupiter provides the following built-in {@code MethodOrderer}
@@ -54,6 +59,22 @@
 @API(status = STABLE, since = "5.7")
 public interface MethodOrderer {
 
+	/**
+	 * Property name used to set the default method orderer class name: {@value}
+	 *
+	 * <h4>Supported Values</h4>
+	 *
+	 * <p>Supported values include fully qualified class names for types that
+	 * implement {@link org.junit.jupiter.api.MethodOrderer}.
+	 *
+	 * <p>If not specified, test methods will be ordered using an algorithm that
+	 * is deterministic but intentionally non-obvious.
+	 *
+	 * @since 5.7
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_ORDER_PROPERTY_NAME = "junit.jupiter.testmethod.order.default";
+
 	/**
 	 * Order the methods encapsulated in the supplied {@link MethodOrdererContext}.
 	 *
@@ -232,12 +253,11 @@ private static int getOrder(MethodDescriptor descriptor) {
 	 * of this class. In order to support repeatable builds, the value of the
 	 * default random seed is logged at {@code CONFIG} level. In addition, a
 	 * custom seed (potentially the default seed from the previous test plan
-	 * execution) may be specified via the {@link Random#RANDOM_SEED_PROPERTY_NAME
-	 * junit.jupiter.execution.order.random.seed} <em>configuration parameter</em>
-	 * which can be supplied via the {@code Launcher} API, build tools (e.g.,
-	 * Gradle and Maven), a JVM system property, or the JUnit Platform configuration
-	 * file (i.e., a file named {@code junit-platform.properties} in the root of
-	 * the class path). Consult the User Guide for further information.
+	 * execution) may be specified via the {@value ClassOrderer.Random#RANDOM_SEED_PROPERTY_NAME}
+	 * <em>configuration parameter</em> which can be supplied via the {@code Launcher}
+	 * API, build tools (e.g., Gradle and Maven), a JVM system property, or the JUnit
+	 * Platform configuration file (i.e., a file named {@code junit-platform.properties}
+	 * in the root of the class path). Consult the User Guide for further information.
 	 *
 	 * @see Random#RANDOM_SEED_PROPERTY_NAME
 	 * @see java.util.Random
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
index 07a08fdf072d..65659d8a60cc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
@@ -33,7 +33,7 @@
  *
  * <p>As an alternative to {@code @TestClassOrder}, a global {@link ClassOrderer}
  * can be configured for the entire test suite via the
- * {@code junit.jupiter.testclass.order.default} configuration parameter. See
+ * {@value ClassOrderer#DEFAULT_ORDER_PROPERTY_NAME} configuration parameter. See
  * the User Guide for details. Note, however, that a {@code @TestClassOrder}
  * declaration always overrides a global {@code ClassOrderer}.
  *
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
index 0f09f05a43a4..7de8ef20e85c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
@@ -31,7 +31,7 @@
  * implicitly default to {@link Lifecycle#PER_METHOD PER_METHOD}. Note, however,
  * that an explicit lifecycle mode is <em>inherited</em> within a test class
  * hierarchy. In addition, the <em>default</em> lifecycle mode may be overridden
- * via the {@code junit.jupiter.testinstance.lifecycle.default} <em>configuration
+ * via the {@value Lifecycle#DEFAULT_LIFECYCLE_PROPERTY_NAME} <em>configuration
  * parameter</em> which can be supplied via the {@code Launcher} API, build tools
  * (e.g., Gradle and Maven), a JVM system property, or the JUnit Platform
  * configuration file (i.e., a file named {@code junit-platform.properties} in
@@ -76,22 +76,42 @@
 	enum Lifecycle {
 
 		/**
-		 * When using this mode, a new test instance will be created once per test class.
+		 * When using this mode, a new test instance will be created once per
+		 * test class.
 		 *
 		 * @see #PER_METHOD
 		 */
 		PER_CLASS,
 
 		/**
-		 * When using this mode, a new test instance will be created for each test method,
-		 * test factory method, or test template method.
+		 * When using this mode, a new test instance will be created for each
+		 * test method, test factory method, or test template method.
 		 *
-		 * <p>This mode is analogous to the behavior found in JUnit versions 1 through 4.
+		 * <p>This mode is analogous to the behavior found in JUnit versions 1
+		 * through 4.
 		 *
 		 * @see #PER_CLASS
 		 */
 		PER_METHOD;
 
+		/**
+		 * Property name used to set the default test instance lifecycle mode:
+		 * {@value}
+		 *
+		 * <h4>Supported Values</h4>
+		 *
+		 * <p>Supported values include names of enum constants defined in
+		 * {@link org.junit.jupiter.api.TestInstance.Lifecycle}, ignoring case.
+		 *
+		 * <p>If not specified, the default is "per_method" which corresponds to
+		 * {@code @TestInstance(Lifecycle.PER_METHOD)}.
+		 *
+		 * @since 5.0
+		 * @see org.junit.jupiter.api.TestInstance
+		 */
+		@API(status = STABLE, since = "5.9")
+		public static final String DEFAULT_LIFECYCLE_PROPERTY_NAME = "junit.jupiter.testinstance.lifecycle.default";
+
 	}
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
index ee4dd6064ba7..ec9ef682b0b5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
@@ -35,6 +35,12 @@
  * a test class, test methods will be ordered using a default algorithm that is
  * deterministic but intentionally nonobvious.
  *
+ * <p>As an alternative to {@code @TestMethodOrder}, a global {@link MethodOrderer}
+ * can be configured for the entire test suite via the
+ * {@value MethodOrderer#DEFAULT_ORDER_PROPERTY_NAME} configuration parameter. See
+ * the User Guide for details. Note, however, that a {@code @TestClassOrder}
+ * declaration always overrides a global {@code ClassOrderer}.
+ *
  * <h4>Example Usage</h4>
  *
  * <p>The following demonstrates how to guarantee that test methods are executed
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
index 14ad0970ae1a..1462f661fe74 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
@@ -41,34 +41,36 @@
  * default timeout is defined via one of the following configuration parameters:
  *
  * <dl>
- *     <dt>{@code junit.jupiter.execution.timeout.default}</dt>
+ *     <dt>{@value #DEFAULT_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for all testable and lifecycle methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.testable.method.default}</dt>
+ *     <dt>{@value #DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for all testable methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.test.method.default}</dt>
+ *     <dt>{@value #DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link Test @Test} methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.testtemplate.method.default}</dt>
+ *     <dt>{@value #DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link TestTemplate @TestTemplate} methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.testfactory.method.default}</dt>
+ *     <dt>{@value DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link TestFactory @TestFactory} methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.lifecycle.method.default}</dt>
+ *     <dt>{@value DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for all lifecycle methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.beforeall.method.default}</dt>
+ *     <dt>{@value #DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link BeforeAll @BeforeAll} methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.beforeeach.method.default}</dt>
+ *     <dt>{@value #DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link BeforeEach @BeforeEach} methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.aftereach.method.default}</dt>
+ *     <dt>{@value #DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link AfterEach @AfterEach} methods</dd>
- *     <dt>{@code junit.jupiter.execution.timeout.afterall.method.default}</dt>
+ *     <dt>{@value #DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link AfterAll @AfterAll} methods</dd>
  * </dl>
  *
  * <p>More specific configuration parameters override less specific ones. For
- * example, {@code junit.jupiter.execution.timeout.test.method.default}
- * overrides {@code junit.jupiter.execution.timeout.testable.method.default}
- * which overrides {@code junit.jupiter.execution.timeout.default}.
+ * example, {@value #DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME}
+ * overrides {@value #DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME}
+ * which overrides {@value #DEFAULT_TIMEOUT_PROPERTY_NAME}.
  *
- * <p>Values must be in the following, case-insensitive format:
+ * <h3 id="supported-values">Supported Values</h3>
+ *
+ * <p>Values for timeouts must be in the following, case-insensitive format:
  * {@code <number> [ns|μs|ms|s|m|h|d]}. The space between the number and the
  * unit may be omitted. Specifying no unit is equivalent to using seconds.
  *
@@ -84,6 +86,18 @@
  * <tr><td> {@code 42 d}  </td><td> {@code @Timeout(value = 42, unit = DAYS)}         </td></tr>
  * </table>
  *
+ * <h3>Disabling Timeouts</h3>
+ *
+ * <p>You may use the {@value #TIMEOUT_MODE_PROPERTY_NAME} configuration
+ * parameter to explicitly enable or disable timeouts.
+ *
+ * <p>Supported values:
+ * <ul>
+ * <li>{@code enabled}: enables timeouts
+ * <li>{@code disabled}: disables timeouts
+ * <li>{@code disabled_on_debug}: disables timeouts while debugging
+ * </ul>
+ *
  * @since 5.5
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
@@ -93,6 +107,214 @@
 @API(status = STABLE, since = "5.7")
 public @interface Timeout {
 
+	/**
+	 * Property name used to set the default timeout for all testable and
+	 * lifecycle methods: {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a more
+	 * specific property or a {@link Timeout @Timeout}
+	 * annotation present on the method or on an enclosing test class (for
+	 * testable methods).
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.default";
+
+	/**
+	 * Property name used to set the default timeout for all testable methods:
+	 * {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a more
+	 * specific property or a {@link Timeout @Timeout}
+	 * annotation present on the testable method or on an enclosing test class.
+	 *
+	 * <p>This property overrides the {@value #DEFAULT_TIMEOUT_PROPERTY_NAME}
+	 * property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testable.method.default";
+
+	/**
+	 * Property name used to set the default timeout for all {@link Test @Test}
+	 * methods: {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a
+	 * {@link Timeout @Timeout} annotation present on the {@link Test @Test}
+	 * method or on an enclosing test class.
+	 *
+	 * <p>This property overrides the
+	 * {@value #DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.test.method.default";
+
+	/**
+	 * Property name used to set the default timeout for all
+	 * {@link TestTemplate @TestTemplate} methods: {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a
+	 * {@link Timeout @Timeout} annotation present on the
+	 * {@link TestTemplate @TestTemplate} method or on an enclosing test class.
+	 *
+	 * <p>This property overrides the
+	 * {@value #DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testtemplate.method.default";
+
+	/**
+	 * Property name used to set the default timeout for all
+	 * {@link TestFactory @TestFactory} methods: {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a
+	 * {@link Timeout @Timeout} annotation present on the
+	 * {@link TestFactory @TestFactory} method or on an enclosing test class.
+	 *
+	 * <p>This property overrides the
+	 * {@value #DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testfactory.method.default";
+
+	/**
+	 * Property name used to set the default timeout for all lifecycle methods:
+	 * {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a more
+	 * specific property or a {@link Timeout @Timeout} annotation present on the
+	 * lifecycle method.
+	 *
+	 * <p>This property overrides the {@value #DEFAULT_TIMEOUT_PROPERTY_NAME}
+	 * property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.lifecycle.method.default";
+
+	/**
+	 * Property name used to set the default timeout for all
+	 * {@link BeforeAll @BeforeAll} methods: {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a
+	 * {@link Timeout @Timeout} annotation present on the
+	 * {@link BeforeAll @BeforeAll} method.
+	 *
+	 * <p>This property overrides the
+	 * {@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.beforeall.method.default";
+
+	/**
+	 * Property name used to set the default timeout for all
+	 * {@link BeforeEach @BeforeEach} methods: {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a
+	 * {@link Timeout @Timeout} annotation present on the
+	 * {@link BeforeEach @BeforeEach} method.
+	 *
+	 * <p>This property overrides the
+	 * {@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.beforeeach.method.default";
+
+	/**
+	 * Property name used to set the default timeout for all
+	 * {@link AfterEach @AfterEach} methods: {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a
+	 * {@link Timeout @Timeout} annotation present on the
+	 * {@link AfterEach @AfterEach} method.
+	 *
+	 * <p>This property overrides the
+	 * {@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.aftereach.method.default";
+
+	/**
+	 * Property name used to set the default timeout for all
+	 * {@link AfterAll @AfterAll} methods: {@value}.
+	 *
+	 * <p>The value of this property will be used unless overridden by a
+	 * {@link Timeout @Timeout} annotation present on the
+	 * {@link AfterAll @AfterAll} method.
+	 *
+	 * <p>This property overrides the
+	 * {@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
+	 *
+	 * <p>Please refer to the <a href="#supported-values">class
+	 * description</a> for the definition of supported values.
+	 *
+	 * @since 5.5
+	 */
+	@API(status = STABLE, since = "5.9")
+	String DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.afterall.method.default";
+
+	/**
+	 * Property used to determine if timeouts are applied to tests: {@value}.
+	 *
+	 * <p>The value of this property will be used to toggle whether
+	 * {@link Timeout @Timeout} is applied to tests.</p>
+	 *
+	 * <h4>Supported timeout mode values:</h4>
+	 * <ul>
+	 * <li>{@code enabled}: enables timeouts
+	 * <li>{@code disabled}: disables timeouts
+	 * <li>{@code disabled_on_debug}: disables timeouts while debugging
+	 * </ul>
+	 *
+	 * <p>If not specified, the default is {@code enabled}.
+	 *
+	 * @since 5.6
+	 */
+	@API(status = STABLE, since = "5.9")
+	String TIMEOUT_MODE_PROPERTY_NAME = "junit.jupiter.execution.timeout.mode";
+
 	/**
 	 * The duration of this timeout.
 	 *
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index b12b7818cff1..278448079dc1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api.io;
 
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
 import java.io.File;
@@ -56,7 +57,7 @@
  * <h4>Old behavior</h4>
  *
  * <p>You can revert to the old behavior of using a single temporary directory
- * by setting the {@code junit.jupiter.tempdir.scope} configuration parameter to
+ * by setting the {@value #SCOPE_PROPERTY_NAME} configuration parameter to
  * {@code per_context}. In that case, the scope of the temporary directory
  * depends on where the first {@code @TempDir} annotation is encountered when
  * executing a test class. The temporary directory will be shared by all tests
@@ -94,6 +95,27 @@
 @API(status = EXPERIMENTAL, since = "5.4")
 public @interface TempDir {
 
+	/**
+	 * Property name used to set the scope of temporary directories created via
+	 * {@link org.junit.jupiter.api.io.TempDir @TempDir} annotation: {@value}
+	 *
+	 * <h4>Supported Values</h4>
+	 * <ul>
+	 * <li>{@code per_context}: creates a single temporary directory for the
+	 * entire test class or method, depending on where it's first declared
+	 * <li>{@code per_declaration}: creates separate temporary directories for
+	 * each declaration site of the {@code @TempDir} annotation.
+	 * </ul>
+	 *
+	 * <p>If not specified, the default is {@code per_declaration}.
+	 *
+	 * @since 5.8
+	 */
+	@SuppressWarnings("DeprecatedIsStillUsed")
+	@Deprecated
+	@API(status = DEPRECATED, since = "5.9")
+	String SCOPE_PROPERTY_NAME = "junit.jupiter.tempdir.scope";
+
 	/**
 	 * The name of the configuration parameter that is used to configure the
 	 * default {@link CleanupMode}.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index d0753477177b..c7bce4ccf4ca 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -27,6 +27,23 @@
  * <p>Since JUnit Jupiter 5.4, this annotation is {@linkplain Inherited inherited}
  * within class hierarchies.
  *
+ * <h3>Default Execution Mode</h3>
+ *
+ * <p>If this annotation is not present, {@link ExecutionMode#SAME_THREAD} is
+ * used unless a default execution mode is defined via one of the following
+ * configuration parameters:
+ *
+ * <dl>
+ *     <dt>{@value #DEFAULT_EXECUTION_MODE_PROPERTY_NAME}</dt>
+ *     <dd>Default execution mode for all classes and tests</dd>
+ *     <dt>{@value #DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME}</dt>
+ *     <dd>Default execution mode for top-level classes</dd>
+ * </dl>
+ *
+ * <p>{@value #DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME}
+ * overrides {@value #DEFAULT_EXECUTION_MODE_PROPERTY_NAME} for top-level
+ * classes
+ *
  * @see Isolated
  * @see ResourceLock
  * @since 5.3
@@ -37,6 +54,43 @@
 @Inherited
 public @interface Execution {
 
+	/**
+	 * Property name used to set the default test execution mode: {@value}
+	 *
+	 * <p>This setting is only effective if parallel execution is enabled.
+	 *
+	 * <h4>Supported Values</h4>
+	 *
+	 * <p>Supported values include names of enum constants defined in
+	 * {@link ExecutionMode}, ignoring case.
+	 *
+	 * <p>If not specified, the default is "same_thread" which corresponds to
+	 * {@code @Execution(ExecutionMode.SAME_THREAD)}.
+	 *
+	 * @since 5.4
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	String DEFAULT_EXECUTION_MODE_PROPERTY_NAME = "junit.jupiter.execution.parallel.mode.default";
+
+	/**
+	 * Property name used to set the default test execution mode for top-level
+	 * classes: {@value}
+	 *
+	 * <p>This setting is only effective if parallel execution is enabled.
+	 *
+	 * <h4>Supported Values</h4>
+	 *
+	 * <p>Supported values include names of enum constants defined in
+	 * {@link ExecutionMode}, ignoring case.
+	 *
+	 * <p>If not specified, it will be resolved into the same value as
+	 * {@link #DEFAULT_EXECUTION_MODE_PROPERTY_NAME}.
+	 *
+	 * @since 5.4
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	String DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME = "junit.jupiter.execution.parallel.mode.classes.default";
+
 	/**
 	 * The required/preferred execution mode.
 	 *
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 988439c1a99a..7291d5a3cae3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -19,30 +19,27 @@
 import static org.junit.platform.engine.support.hierarchical.DefaultParallelExecutionConfigurationStrategy.CONFIG_STRATEGY_PROPERTY_NAME;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.platform.commons.util.ClassNamePatternFilterUtils;
 import org.junit.platform.engine.support.hierarchical.ParallelExecutionConfigurationStrategy;
 
 /**
  * Collection of constants related to the {@link JupiterTestEngine}.
  *
- * <h3 id="supported-values-timeouts">Supported Values for Timeouts</h3>
- *
- * <p>Values for timeouts must be in the following, case-insensitive format:
- * {@code <number> [ns|μs|ms|s|m|h|d]}. The space between the number and the
- * unit may be omitted. Specifying no unit is equivalent to using seconds.
- *
- * <table class="plain">
- * <tr><th> Value         </th><th> Equivalent annotation                             </th></tr>
- * <tr><td> {@code 42}    </td><td> {@code @Timeout(42)}                              </td></tr>
- * <tr><td> {@code 42 ns} </td><td> {@code @Timeout(value = 42, unit = NANOSECONDS)}  </td></tr>
- * <tr><td> {@code 42 μs} </td><td> {@code @Timeout(value = 42, unit = MICROSECONDS)} </td></tr>
- * <tr><td> {@code 42 ms} </td><td> {@code @Timeout(value = 42, unit = MILLISECONDS)} </td></tr>
- * <tr><td> {@code 42 s}  </td><td> {@code @Timeout(value = 42, unit = SECONDS)}      </td></tr>
- * <tr><td> {@code 42 m}  </td><td> {@code @Timeout(value = 42, unit = MINUTES)}      </td></tr>
- * <tr><td> {@code 42 h}  </td><td> {@code @Timeout(value = 42, unit = HOURS)}        </td></tr>
- * <tr><td> {@code 42 d}  </td><td> {@code @Timeout(value = 42, unit = DAYS)}         </td></tr>
- * </table>
- *
  * @since 5.0
  * @see org.junit.platform.engine.ConfigurationParameters
  */
@@ -91,20 +88,14 @@ public final class Constants {
 	 * @see #DEACTIVATE_CONDITIONS_PATTERN_PROPERTY_NAME
 	 * @see org.junit.jupiter.api.extension.ExecutionCondition
 	 */
-	public static final String DEACTIVATE_ALL_CONDITIONS_PATTERN = JupiterConfiguration.DEACTIVATE_ALL_CONDITIONS_PATTERN;
+	public static final String DEACTIVATE_ALL_CONDITIONS_PATTERN = ClassNamePatternFilterUtils.DEACTIVATE_ALL_PATTERN;
 
 	/**
 	 * Property name used to set the default display name generator class name: {@value}
 	 *
-	 * <h4>Supported Values</h4>
-	 *
-	 * <p>Supported values include fully qualified class names for types that implement
-	 * {@link org.junit.jupiter.api.DisplayNameGenerator}.
-	 *
-	 * <p>If not specified, the default is
-	 * {@link org.junit.jupiter.api.DisplayNameGenerator.Standard}.
+	 * @see DisplayNameGenerator#DEFAULT_GENERATOR_PROPERTY_NAME
 	 */
-	public static final String DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME = JupiterConfiguration.DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME;
+	public static final String DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME = DisplayNameGenerator.DEFAULT_GENERATOR_PROPERTY_NAME;
 
 	/**
 	 * Property name used to enable auto-detection and registration of extensions via
@@ -117,17 +108,9 @@ public final class Constants {
 	/**
 	 * Property name used to set the default test instance lifecycle mode: {@value}
 	 *
-	 * <h4>Supported Values</h4>
-	 *
-	 * <p>Supported values include names of enum constants defined in
-	 * {@link org.junit.jupiter.api.TestInstance.Lifecycle}, ignoring case.
-	 *
-	 * <p>If not specified, the default is "per_method" which corresponds to
-	 * {@code @TestInstance(Lifecycle.PER_METHOD)}.
-	 *
-	 * @see org.junit.jupiter.api.TestInstance
+	 * @see TestInstance.Lifecycle#DEFAULT_LIFECYCLE_PROPERTY_NAME
 	 */
-	public static final String DEFAULT_TEST_INSTANCE_LIFECYCLE_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_INSTANCE_LIFECYCLE_PROPERTY_NAME;
+	public static final String DEFAULT_TEST_INSTANCE_LIFECYCLE_PROPERTY_NAME = TestInstance.Lifecycle.DEFAULT_LIFECYCLE_PROPERTY_NAME;
 
 	/**
 	 * Property name used to enable parallel test execution: {@value}
@@ -142,43 +125,19 @@ public final class Constants {
 	/**
 	 * Property name used to set the default test execution mode: {@value}
 	 *
-	 * <p>This setting is only effective if parallel execution is enabled.
-	 *
-	 * <h4>Supported Values</h4>
-	 *
-	 * <p>Supported values include names of enum constants defined in
-	 * {@link org.junit.jupiter.api.parallel.ExecutionMode}, ignoring case.
-	 *
-	 * <p>If not specified, the default is "same_thread" which corresponds to
-	 * {@code @Execution(ExecutionMode.SAME_THREAD)}.
-	 *
-	 * @since 5.4
-	 * @see org.junit.jupiter.api.parallel.Execution
-	 * @see org.junit.jupiter.api.parallel.ExecutionMode
+	 * @see Execution#DEFAULT_EXECUTION_MODE_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.4")
-	public static final String DEFAULT_PARALLEL_EXECUTION_MODE = JupiterConfiguration.DEFAULT_EXECUTION_MODE_PROPERTY_NAME;
+	public static final String DEFAULT_PARALLEL_EXECUTION_MODE = Execution.DEFAULT_EXECUTION_MODE_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default test execution mode for top-level
 	 * classes: {@value}
 	 *
-	 * <p>This setting is only effective if parallel execution is enabled.
-	 *
-	 * <h4>Supported Values</h4>
-	 *
-	 * <p>Supported values include names of enum constants defined in
-	 * {@link org.junit.jupiter.api.parallel.ExecutionMode}, ignoring case.
-	 *
-	 * <p>If not specified, it will be resolved into the same value as
-	 * {@link #DEFAULT_PARALLEL_EXECUTION_MODE}.
-	 *
-	 * @since 5.4
-	 * @see org.junit.jupiter.api.parallel.Execution
-	 * @see org.junit.jupiter.api.parallel.ExecutionMode
+	 * @see Execution#DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME = JupiterConfiguration.DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME;
+	public static final String DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME = Execution.DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME;
 
 	static final String PARALLEL_CONFIG_PREFIX = "junit.jupiter.execution.parallel.config.";
 
@@ -233,266 +192,125 @@ public final class Constants {
 
 	/**
 	 * Property name used to set the default timeout for all testable and
-	 * lifecycle methods.
-	 *
-	 * <p>The value of this property will be used unless overridden by a more
-	 * specific property or a {@link org.junit.jupiter.api.Timeout @Timeout}
-	 * annotation present on the method or on an enclosing test class (for testable
-	 * methods).
-	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
+	 * lifecycle methods: {@value}.
 	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TIMEOUT_PROPERTY_NAME;
 
 	/**
-	 * Property name used to set the default timeout for all testable methods.
-	 *
-	 * <p>The value of this property will be used unless overridden by a more
-	 * specific property or a {@link org.junit.jupiter.api.Timeout @Timeout}
-	 * annotation present on the testable method or on an enclosing test class.
-	 *
-	 * <p>This property overrides the {@value #DEFAULT_TIMEOUT_PROPERTY_NAME}
-	 * property.
-	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
+	 * Property name used to set the default timeout for all testable methods: {@value}.
 	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default timeout for all
-	 * {@link org.junit.jupiter.api.Test @Test} methods.
+	 * {@link Test @Test} methods: {@value}.
 	 *
-	 * <p>The value of this property will be used unless overridden by a
-	 * {@link org.junit.jupiter.api.Timeout @Timeout} annotation present on the
-	 * {@link org.junit.jupiter.api.Test @Test} method or on an enclosing test
-	 * class.
-	 *
-	 * <p>This property overrides the
-	 * {@value #DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
-	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
-	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default timeout for all
-	 * {@link org.junit.jupiter.api.TestTemplate @TestTemplate} methods.
-	 *
-	 * <p>The value of this property will be used unless overridden by a
-	 * {@link org.junit.jupiter.api.Timeout @Timeout} annotation present on the
-	 * {@link org.junit.jupiter.api.TestTemplate @TestTemplate} method or on an
-	 * enclosing test class.
+	 * {@link TestTemplate @TestTemplate} methods: {@value}.
 	 *
-	 * <p>This property overrides the
-	 * {@value #DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
-	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
-	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default timeout for all
-	 * {@link org.junit.jupiter.api.TestFactory @TestFactory} methods.
-	 *
-	 * <p>The value of this property will be used unless overridden by a
-	 * {@link org.junit.jupiter.api.Timeout @Timeout} annotation present on the
-	 * {@link org.junit.jupiter.api.TestFactory @TestFactory} method or on an
-	 * enclosing test class.
+	 * {@link TestFactory @TestFactory} methods: {@value}.
 	 *
-	 * <p>This property overrides the
-	 * {@value #DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
-	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
-	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
-	 * Property name used to set the default timeout for all lifecycle methods.
-	 *
-	 * <p>The value of this property will be used unless overridden by a more
-	 * specific property or a {@link org.junit.jupiter.api.Timeout @Timeout}
-	 * annotation present on the lifecycle method.
-	 *
-	 * <p>This property overrides the {@value #DEFAULT_TIMEOUT_PROPERTY_NAME}
-	 * property.
+	 * Property name used to set the default timeout for all lifecycle methods: {@value}.
 	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
-	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default timeout for all
-	 * {@link org.junit.jupiter.api.BeforeAll @BeforeAll} methods.
-	 *
-	 * <p>The value of this property will be used unless overridden by a
-	 * {@link org.junit.jupiter.api.Timeout @Timeout} annotation present on the
-	 * {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method.
-	 *
-	 * <p>This property overrides the
-	 * {@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
+	 * {@link BeforeAll @BeforeAll} methods: {@value}.
 	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
-	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default timeout for all
-	 * {@link org.junit.jupiter.api.BeforeEach @BeforeEach} methods.
-	 *
-	 * <p>The value of this property will be used unless overridden by a
-	 * {@link org.junit.jupiter.api.Timeout @Timeout} annotation present on the
-	 * {@link org.junit.jupiter.api.BeforeEach @BeforeEach} method.
-	 *
-	 * <p>This property overrides the
-	 * {@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
-	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
+	 * {@link BeforeEach @BeforeEach} methods: {@value}.
 	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default timeout for all
-	 * {@link org.junit.jupiter.api.AfterEach @AfterEach} methods.
-	 *
-	 * <p>The value of this property will be used unless overridden by a
-	 * {@link org.junit.jupiter.api.Timeout @Timeout} annotation present on the
-	 * {@link org.junit.jupiter.api.AfterEach @AfterEach} method.
-	 *
-	 * <p>This property overrides the
-	 * {@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
-	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
+	 * {@link AfterEach @AfterEach} methods: {@value}.
 	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default timeout for all
-	 * {@link org.junit.jupiter.api.AfterAll @AfterAll} methods.
+	 * {@link AfterAll @AfterAll} methods: {@value}.
 	 *
-	 * <p>The value of this property will be used unless overridden by a
-	 * {@link org.junit.jupiter.api.Timeout @Timeout} annotation present on the
-	 * {@link org.junit.jupiter.api.AfterAll @AfterAll} method.
-	 *
-	 * <p>This property overrides the
-	 * {@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME} property.
-	 *
-	 * <p>Please refer to the <a href="#supported-values-timeouts">class
-	 * description</a> for the definition of supported values.
-	 *
-	 * @since 5.5
-	 * @see org.junit.jupiter.api.Timeout
+	 * @see Timeout#DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.5")
-	public static final String DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME = JupiterConfiguration.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
+	public static final String DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
 	 * Property used to determine if timeouts are applied to tests: {@value}.
 	 *
-	 * <p>The value of this property will be used to toggle whether
-	 * {@link org.junit.jupiter.api.Timeout @Timeout} is applied to tests.</p>
-	 *
-	 * <h4>Supported timeout mode values:</h4>
-	 * <ul>
-	 * <li>{@code enabled}: enables timeouts
-	 * <li>{@code disabled}: disables timeouts
-	 * <li>{@code disabled_on_debug}: disables timeouts while debugging
-	 * </ul>
-	 *
-	 * <p>If not specified, the default is {@code enabled}.
-	 *
-	 * @since 5.6
+	 * @see Timeout#TIMEOUT_MODE_PROPERTY_NAME
 	 */
 	@API(status = EXPERIMENTAL, since = "5.6")
-	public static final String TIMEOUT_MODE_PROPERTY_NAME = JupiterConfiguration.TIMEOUT_MODE_PROPERTY_NAME;
+	public static final String TIMEOUT_MODE_PROPERTY_NAME = Timeout.TIMEOUT_MODE_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default method orderer class name: {@value}
 	 *
-	 * <h4>Supported Values</h4>
-	 *
-	 * <p>Supported values include fully qualified class names for types that
-	 * implement {@link org.junit.jupiter.api.MethodOrderer}.
-	 *
-	 * <p>If not specified, test methods will be ordered using an algorithm that
-	 * is deterministic but intentionally non-obvious.
+	 * @see MethodOrderer#DEFAULT_ORDER_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7")
-	public static final String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME;
+	@API(status = STABLE, since = "5.9")
+	public static final String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = MethodOrderer.DEFAULT_ORDER_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the default class orderer class name: {@value}
 	 *
-	 * <h4>Supported Values</h4>
-	 *
-	 * <p>Supported values include fully qualified class names for types that
-	 * implement {@link org.junit.jupiter.api.ClassOrderer}.
+	 * @see ClassOrderer#DEFAULT_ORDER_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
-	public static final String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = JupiterConfiguration.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME;
+	@API(status = STABLE, since = "5.9")
+	public static final String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = ClassOrderer.DEFAULT_ORDER_PROPERTY_NAME;
 
 	/**
 	 * Property name used to set the scope of temporary directories created via
-	 * {@link org.junit.jupiter.api.io.TempDir @TempDir} annotation: {@value}
-	 *
-	 * <h4>Supported Values</h4>
-	 * <ul>
-	 * <li>{@code per_context}: creates a single temporary directory for the
-	 * entire test class or method, depending on where it's first declared
-	 * <li>{@code per_declaration}: creates separate temporary directories for
-	 * each declaration site of the {@code @TempDir} annotation.
-	 * </ul>
+	 * {@link TempDir @TempDir} annotation: {@value}
 	 *
-	 * <p>If not specified, the default is {@code per_declaration}.
+	 * @see TempDir#SCOPE_PROPERTY_NAME
 	 */
-	@SuppressWarnings("DeprecatedIsStillUsed")
 	@Deprecated
 	@API(status = DEPRECATED, since = "5.8")
-	public static final String TEMP_DIR_SCOPE_PROPERTY_NAME = JupiterConfiguration.TEMP_DIR_SCOPE_PROPERTY_NAME;
+	public static final String TEMP_DIR_SCOPE_PROPERTY_NAME = TempDir.SCOPE_PROPERTY_NAME;
 
 	private Constants() {
 		/* no-op */
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index fddadad9684c..0ae65007d888 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -23,8 +23,8 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.io.CleanupMode;
+import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.junit.platform.commons.util.ClassNamePatternFilterUtils;
 
 /**
  * @since 5.4
@@ -34,26 +34,13 @@ public interface JupiterConfiguration {
 
 	String DEACTIVATE_CONDITIONS_PATTERN_PROPERTY_NAME = "junit.jupiter.conditions.deactivate";
 	String PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME = "junit.jupiter.execution.parallel.enabled";
-	String DEFAULT_EXECUTION_MODE_PROPERTY_NAME = "junit.jupiter.execution.parallel.mode.default";
-	String DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME = "junit.jupiter.execution.parallel.mode.classes.default";
+	String DEFAULT_EXECUTION_MODE_PROPERTY_NAME = Execution.DEFAULT_EXECUTION_MODE_PROPERTY_NAME;
+	String DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME = Execution.DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME;
 	String EXTENSIONS_AUTODETECTION_ENABLED_PROPERTY_NAME = "junit.jupiter.extensions.autodetection.enabled";
-	String DEFAULT_TEST_INSTANCE_LIFECYCLE_PROPERTY_NAME = "junit.jupiter.testinstance.lifecycle.default";
-	String DEACTIVATE_ALL_CONDITIONS_PATTERN = ClassNamePatternFilterUtils.DEACTIVATE_ALL_PATTERN;
-	String DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME = "junit.jupiter.displayname.generator.default";
-	String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = "junit.jupiter.testmethod.order.default";
-	String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = "junit.jupiter.testclass.order.default";
-	String TEMP_DIR_SCOPE_PROPERTY_NAME = "junit.jupiter.tempdir.scope";
-	String DEFAULT_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.default";
-	String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testable.method.default";
-	String DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.test.method.default";
-	String DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testtemplate.method.default";
-	String DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.testfactory.method.default";
-	String DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.lifecycle.method.default";
-	String DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.beforeall.method.default";
-	String DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.beforeeach.method.default";
-	String DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.aftereach.method.default";
-	String DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.afterall.method.default";
-	String TIMEOUT_MODE_PROPERTY_NAME = "junit.jupiter.execution.timeout.mode";
+	String DEFAULT_TEST_INSTANCE_LIFECYCLE_PROPERTY_NAME = TestInstance.Lifecycle.DEFAULT_LIFECYCLE_PROPERTY_NAME;
+	String DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME = DisplayNameGenerator.DEFAULT_GENERATOR_PROPERTY_NAME;
+	String DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME = MethodOrderer.DEFAULT_ORDER_PROPERTY_NAME;
+	String DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME = ClassOrderer.DEFAULT_ORDER_PROPERTY_NAME;
 
 	Optional<String> getRawConfigurationParameter(String key);
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index c756c5540607..d0873ab1f283 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -15,7 +15,6 @@
 import static org.junit.jupiter.api.io.CleanupMode.DEFAULT;
 import static org.junit.jupiter.api.io.CleanupMode.NEVER;
 import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.TEMP_DIR_SCOPE_PROPERTY_NAME;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
@@ -193,11 +192,12 @@ private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, Clea
 		return (type == Path.class) ? path : path.toFile();
 	}
 
+	@SuppressWarnings("deprecation")
 	private Scope getScope(ExtensionContext context) {
 		return context.getRoot().getStore(NAMESPACE).getOrComputeIfAbsent( //
 			Scope.class, //
 			__ -> new EnumConfigurationParameterConverter<>(Scope.class, "@TempDir scope") //
-					.get(TEMP_DIR_SCOPE_PROPERTY_NAME, context::getConfigurationParameter, Scope.PER_DECLARATION), //
+					.get(TempDir.SCOPE_PROPERTY_NAME, context::getConfigurationParameter, Scope.PER_DECLARATION), //
 			Scope.class //
 		);
 	}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
index e3c847b0d652..7d20ae9167ed 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
@@ -10,16 +10,16 @@
 
 package org.junit.jupiter.engine.extension;
 
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME;
-import static org.junit.jupiter.engine.config.JupiterConfiguration.DEFAULT_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_TIMEOUT_PROPERTY_NAME;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
index 6680c2fd54b9..de88933037d4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.engine.extension;
 
-import static org.junit.jupiter.engine.config.JupiterConfiguration.TIMEOUT_MODE_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.TIMEOUT_MODE_PROPERTY_NAME;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index 7420236def7c..d03ee596aff2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -53,7 +53,6 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
-import org.junit.jupiter.engine.Constants;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
@@ -71,8 +70,7 @@ class TempDirectoryPerContextTests extends AbstractJupiterTestEngineTests {
 	protected EngineExecutionResults executeTestsForClass(Class<?> testClass) {
 		return executeTests(request() //
 				.selectors(selectClass(testClass)) //
-				.configurationParameter(Constants.TEMP_DIR_SCOPE_PROPERTY_NAME,
-					TempDirectory.Scope.PER_CONTEXT.toString()) //
+				.configurationParameter(TempDir.SCOPE_PROPERTY_NAME, TempDirectory.Scope.PER_CONTEXT.toString()) //
 				.build());
 	}
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index ed3e907b22ac..cab91dcfed62 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -193,7 +193,7 @@
 	 * <p>If the default display name flag (<code>{default_display_name}</code>)
 	 * is not overridden, JUnit will:
 	 * <ul>
-	 * <li>Look up the {@code junit.jupiter.params.displayname.default}
+	 * <li>Look up the {@value ParameterizedTestExtension#DISPLAY_NAME_PATTERN_KEY}
 	 * <em>configuration parameter</em> and use it if available. The configuration
 	 * parameter can be supplied via the {@code Launcher} API, build tools (e.g.,
 	 * Gradle and Maven), a JVM system property, or the JUnit Platform configuration

From afd6d88c39a8c389cafa4c10941b9851522dbd0a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 6 Mar 2022 18:25:25 +0100
Subject: [PATCH 0709/1433] Restructure "Advanced Topics" user guide
 documentation on disk

---
 .../src/docs/asciidoc/user-guide/advanced-topics.adoc  | 10 +++++-----
 .../user-guide/{ => advanced-topics}/engines.adoc      |  0
 .../junit-platform-reporting.adoc                      |  0
 .../junit-platform-suite-engine.adoc                   |  0
 .../user-guide/{ => advanced-topics}/launcher-api.adoc |  0
 .../user-guide/{ => advanced-topics}/testkit.adoc      |  0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename documentation/src/docs/asciidoc/user-guide/{ => advanced-topics}/engines.adoc (100%)
 rename documentation/src/docs/asciidoc/user-guide/{ => advanced-topics}/junit-platform-reporting.adoc (100%)
 rename documentation/src/docs/asciidoc/user-guide/{ => advanced-topics}/junit-platform-suite-engine.adoc (100%)
 rename documentation/src/docs/asciidoc/user-guide/{ => advanced-topics}/launcher-api.adoc (100%)
 rename documentation/src/docs/asciidoc/user-guide/{ => advanced-topics}/testkit.adoc (100%)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
index 117312036198..64b008ec7308 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
@@ -1,12 +1,12 @@
 [[advanced-topics]]
 == Advanced Topics
 
-include::launcher-api.adoc[]
+include::advanced-topics/launcher-api.adoc[]
 
-include::junit-platform-reporting.adoc[]
+include::advanced-topics/junit-platform-reporting.adoc[]
 
-include::junit-platform-suite-engine.adoc[]
+include::advanced-topics/junit-platform-suite-engine.adoc[]
 
-include::testkit.adoc[]
+include::advanced-topics/testkit.adoc[]
 
-include::engines.adoc[]
+include::advanced-topics/engines.adoc[]
diff --git a/documentation/src/docs/asciidoc/user-guide/engines.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/engines.adoc
similarity index 100%
rename from documentation/src/docs/asciidoc/user-guide/engines.adoc
rename to documentation/src/docs/asciidoc/user-guide/advanced-topics/engines.adoc
diff --git a/documentation/src/docs/asciidoc/user-guide/junit-platform-reporting.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
similarity index 100%
rename from documentation/src/docs/asciidoc/user-guide/junit-platform-reporting.adoc
rename to documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
diff --git a/documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-suite-engine.adoc
similarity index 100%
rename from documentation/src/docs/asciidoc/user-guide/junit-platform-suite-engine.adoc
rename to documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-suite-engine.adoc
diff --git a/documentation/src/docs/asciidoc/user-guide/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
similarity index 100%
rename from documentation/src/docs/asciidoc/user-guide/launcher-api.adoc
rename to documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
diff --git a/documentation/src/docs/asciidoc/user-guide/testkit.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/testkit.adoc
similarity index 100%
rename from documentation/src/docs/asciidoc/user-guide/testkit.adoc
rename to documentation/src/docs/asciidoc/user-guide/advanced-topics/testkit.adoc

From f917be69f2c38155e5fbea4a06c927494d7270a2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 11 Mar 2022 21:30:40 +0100
Subject: [PATCH 0710/1433] Upgradle to 7.4.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1debed0d8fd3..ffe61b45c929 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 365966886eb0dcc4af0c1f6a0b899543157156fa Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Mar 2022 16:47:54 +0100
Subject: [PATCH 0711/1433] Resolve Ant from Maven Central via Gradle

---
 gradle/libs.versions.toml                     |  5 ++
 .../platform-tooling-support-tests.gradle.kts | 15 ++++-
 .../projects/ant-starter/build.xml            |  1 -
 .../support/tests/AntStarterTests.java        | 56 +++++++++++++------
 4 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 470987a6bd42..5e720a5242d5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,4 +1,5 @@
 [versions]
+ant = "1.10.12"
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
 assertj = "3.21.0"
@@ -14,6 +15,9 @@ opentest4j = "1.2.0"
 surefire = "2.22.2"
 
 [libraries]
+ant = { module = "org.apache.ant:ant", version.ref = "ant" }
+ant-junit = { module = "org.apache.ant:ant-junit", version.ref = "ant" }
+ant-junitlauncher = { module = "org.apache.ant:ant-junitlauncher", version.ref = "ant" }
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.23.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
@@ -40,4 +44,5 @@ spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5"
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 
 [bundles]
+ant = ["ant", "ant-junit", "ant-junitlauncher"]
 log4j = ["log4j-core", "log4j-jul"]
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index ce3adfa4bfc3..6dfea561baf2 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -11,6 +11,7 @@ javaLibrary {
 }
 
 val thirdPartyJars by configurations.creating
+val antJars by configurations.creating
 
 dependencies {
 	implementation(libs.bartholdy) {
@@ -35,12 +36,19 @@ dependencies {
 	testRuntimeOnly(libs.slf4j.julBinding) {
 		because("provide appropriate SLF4J binding")
 	}
+	testImplementation(libs.ant) {
+		because("we reference Ant's main class")
+	}
 
 	thirdPartyJars(libs.junit4)
 	thirdPartyJars(libs.assertj)
 	thirdPartyJars(libs.apiguardian)
 	thirdPartyJars(libs.hamcrest)
 	thirdPartyJars(libs.opentest4j)
+
+	antJars(platform(projects.junitBom))
+	antJars(libs.bundles.ant)
+	antJars(projects.junitPlatformConsoleStandalone)
 }
 
 tasks.test {
@@ -62,7 +70,8 @@ tasks.test {
 
 	val tempRepoDir: File by rootProject
 	jvmArgumentProviders += MavenRepo(tempRepoDir)
-	jvmArgumentProviders += ThirdPartyJars(thirdPartyJars)
+	jvmArgumentProviders += JarPath(thirdPartyJars)
+	jvmArgumentProviders += JarPath(antJars)
 
 	(options as JUnitPlatformOptions).apply {
 		includeEngines("archunit")
@@ -117,6 +126,6 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 	}
 }
 
-class ThirdPartyJars(@Classpath val configuration: Configuration) : CommandLineArgumentProvider {
-	override fun asArguments() = listOf("-DthirdPartyJars=${configuration.asPath}")
+class JarPath(@Classpath val configuration: Configuration, @Input val key: String = configuration.name) : CommandLineArgumentProvider {
+	override fun asArguments() = listOf("-D${key}=${configuration.asPath}")
 }
diff --git a/platform-tooling-support-tests/projects/ant-starter/build.xml b/platform-tooling-support-tests/projects/ant-starter/build.xml
index 7d0e7c262647..953cd72f852f 100644
--- a/platform-tooling-support-tests/projects/ant-starter/build.xml
+++ b/platform-tooling-support-tests/projects/ant-starter/build.xml
@@ -14,7 +14,6 @@
     <path id="test.classpath">
         <pathelement path="build/test"/>
         <pathelement path="build/main"/>
-        <fileset dir="${ant.home}/lib" includes="*.jar" />
     </path>
 
     <target name="build" description="clean build" depends="clean, test" />
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
index fcbdb42767d6..f10e9129baea 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
@@ -10,21 +10,19 @@
 
 package platform.tooling.support.tests;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.List;
 
-import de.sormuras.bartholdy.tool.Ant;
+import de.sormuras.bartholdy.Tool;
+import de.sormuras.bartholdy.tool.AbstractTool;
+import de.sormuras.bartholdy.tool.Java;
 
+import org.apache.tools.ant.Main;
 import org.junit.jupiter.api.Test;
-import org.opentest4j.TestAbortedException;
-
-import platform.tooling.support.Helper;
-import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
 /**
@@ -33,13 +31,11 @@
 class AntStarterTests {
 
 	@Test
-	void ant_1_10_6() {
-		var standalone = MavenRepo.jar("junit-platform-console-standalone").getParent();
+	void ant_starter() {
 		var result = Request.builder() //
-				.setTool(Ant.install("1.10.6", Paths.get("build", "test-tools"))) //
+				.setTool(ant()) //
 				.setProject("ant-starter") //
-				.addArguments("-verbose", "-lib", standalone.toAbsolutePath()) //
-				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.addArguments("-verbose") //
 				.build() //
 				.run();
 
@@ -47,14 +43,10 @@ void ant_1_10_6() {
 
 		assertEquals(0, result.getExitCode());
 		assertEquals("", result.getOutput("err"), "error log isn't empty");
-		assertThat(result.getOutput("out")).contains("Using Java version: 1.8");
 		assertLinesMatch(List.of(">> HEAD >>", //
 			"test.junit.launcher:", //
 			">>>>", //
-			"\\[junitlauncher\\] Test run finished after [\\d]+ ms", //
-			">>>>", //
-			"\\[junitlauncher\\] \\[         5 tests successful      \\]", //
-			"\\[junitlauncher\\] \\[         0 tests failed          \\]", //
+			"\\[junitlauncher\\] Tests run: 5, Failures: 0, Aborted: 0, Skipped: 0, Time elapsed: .+ sec", //
 			">>>>", //
 			"test.console.launcher:", //
 			">>>>", //
@@ -66,4 +58,34 @@ void ant_1_10_6() {
 			result.getOutputLines("out"));
 	}
 
+	private static Tool ant() {
+		Java java = new Java();
+		return new AbstractTool() {
+			@Override
+			public Path getHome() {
+				return java.getHome();
+			}
+
+			@Override
+			public String getProgram() {
+				return java.getProgram();
+			}
+
+			@Override
+			protected List<String> getToolArguments() {
+				return List.of("-cp", System.getProperty("antJars"), Main.class.getName());
+			}
+
+			@Override
+			public String getName() {
+				return "embedded-ant";
+			}
+
+			@Override
+			public String getVersion() {
+				return Main.getAntVersion();
+			}
+		};
+	}
+
 }

From 2a837973f05f1cbe07fb6504fc898e17060d7fc0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Mar 2022 17:52:39 +0100
Subject: [PATCH 0712/1433] Resolve Maven from Maven Central via Gradle

---
 gradle/libs.versions.toml                     |  1 +
 .../platform-tooling-support-tests.gradle.kts | 24 +++++++++++++++++++
 .../platform/tooling/support/Request.java     |  4 +---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5e720a5242d5..a59489e65f7d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,6 +36,7 @@ junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
+maven = { module = "org.apache.maven:apache-maven", version = "3.8.5" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.1.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 picocli = { module = "info.picocli:picocli", version = "4.6.2" }
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 6dfea561baf2..4fe284fecb5d 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -12,6 +12,7 @@ javaLibrary {
 
 val thirdPartyJars by configurations.creating
 val antJars by configurations.creating
+val mavenDistribution by configurations.creating
 
 dependencies {
 	implementation(libs.bartholdy) {
@@ -49,6 +50,19 @@ dependencies {
 	antJars(platform(projects.junitBom))
 	antJars(libs.bundles.ant)
 	antJars(projects.junitPlatformConsoleStandalone)
+
+	mavenDistribution(libs.maven) {
+		artifact {
+			classifier = "bin"
+			type = "zip"
+			isTransitive = false
+		}
+	}
+}
+
+val unzipMavenDistribution by tasks.registering(Copy::class) {
+	from(zipTree(mavenDistribution.elements.map { it.single() }))
+	into(layout.buildDirectory.dir("maven-distribution"))
 }
 
 tasks.test {
@@ -72,6 +86,7 @@ tasks.test {
 	jvmArgumentProviders += MavenRepo(tempRepoDir)
 	jvmArgumentProviders += JarPath(thirdPartyJars)
 	jvmArgumentProviders += JarPath(antJars)
+	jvmArgumentProviders += MavenDistribution(project, unzipMavenDistribution)
 
 	(options as JUnitPlatformOptions).apply {
 		includeEngines("archunit")
@@ -129,3 +144,12 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 class JarPath(@Classpath val configuration: Configuration, @Input val key: String = configuration.name) : CommandLineArgumentProvider {
 	override fun asArguments() = listOf("-D${key}=${configuration.asPath}")
 }
+
+class MavenDistribution(project: Project, sourceTask: TaskProvider<*>) : CommandLineArgumentProvider {
+	@InputDirectory
+	@PathSensitive(RELATIVE)
+	val mavenDistribution: DirectoryProperty = project.objects.directoryProperty()
+		.value(project.layout.dir(sourceTask.map { it.outputs.files.singleFile.listFiles()!!.single() }))
+
+	override fun asArguments() = listOf("-DmavenDistribution=${mavenDistribution.get().asFile.absolutePath}")
+}
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
index 30d1a263c441..e38dccf0b864 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
@@ -37,14 +37,12 @@ public class Request {
 	private static final Path TOOLS = Paths.get("build", "test-tools");
 	public static final Path WORKSPACE = Paths.get("build", "test-workspace");
 
-	private static final String MAVEN_VERSION = "3.6.1";
-
 	public static Builder builder() {
 		return new Builder();
 	}
 
 	public static Maven maven() {
-		return Maven.install(MAVEN_VERSION, TOOLS);
+		return new Maven(Path.of(System.getProperty("mavenDistribution")));
 	}
 
 	private Tool tool;

From 006b43a1b76edec217edc59a1b95c79fa0a4a940 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 22 Mar 2022 18:59:13 +0100
Subject: [PATCH 0713/1433] Simplify AntStarterTests

---
 .../support/tests/AntStarterTests.java        | 37 +------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
index f10e9129baea..900e3e8c8736 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
@@ -14,11 +14,8 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 
-import java.nio.file.Path;
 import java.util.List;
 
-import de.sormuras.bartholdy.Tool;
-import de.sormuras.bartholdy.tool.AbstractTool;
 import de.sormuras.bartholdy.tool.Java;
 
 import org.apache.tools.ant.Main;
@@ -33,8 +30,9 @@ class AntStarterTests {
 	@Test
 	void ant_starter() {
 		var result = Request.builder() //
-				.setTool(ant()) //
+				.setTool(new Java()) //
 				.setProject("ant-starter") //
+				.addArguments("-cp", System.getProperty("antJars"), Main.class.getName()) //
 				.addArguments("-verbose") //
 				.build() //
 				.run();
@@ -57,35 +55,4 @@ void ant_starter() {
 			">> TAIL >>"), //
 			result.getOutputLines("out"));
 	}
-
-	private static Tool ant() {
-		Java java = new Java();
-		return new AbstractTool() {
-			@Override
-			public Path getHome() {
-				return java.getHome();
-			}
-
-			@Override
-			public String getProgram() {
-				return java.getProgram();
-			}
-
-			@Override
-			protected List<String> getToolArguments() {
-				return List.of("-cp", System.getProperty("antJars"), Main.class.getName());
-			}
-
-			@Override
-			public String getName() {
-				return "embedded-ant";
-			}
-
-			@Override
-			public String getVersion() {
-				return Main.getAntVersion();
-			}
-		};
-	}
-
 }

From 226f6d7b300db51c4e0be3855cfff69e7343c6ef Mon Sep 17 00:00:00 2001
From: Jerome Prinet <jprinet@gradle.com>
Date: Tue, 22 Mar 2022 11:29:19 +0100
Subject: [PATCH 0714/1433] Provide module-source-path compiler argument
 through CommandLineArgumentProvider

---
 .../src/main/kotlin/java-library-conventions.gradle.kts   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 1f85e6b5916c..dc49f90e4ccc 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -154,7 +154,6 @@ val compileModule by tasks.registering(JavaCompile::class) {
 			"-Xlint:all,-requires-automatic,-requires-transitive-automatic",
 			"-Werror", // Terminates compilation when warnings occur.
 			"--module-version", "${project.version}",
-			"--module-source-path", files(modularProjects.map { "${it.projectDir}/src/module" }).asPath
 	))
 	options.compilerArgumentProviders.add(ModulePathArgumentProvider())
 	options.compilerArgumentProviders.addAll(modularProjects.map { PatchModuleArgumentProvider(it) })
@@ -218,7 +217,12 @@ tasks.compileTestJava {
 inner class ModulePathArgumentProvider : CommandLineArgumentProvider, Named {
 	@get:CompileClasspath
 	val modulePath: Provider<Configuration> = configurations.compileClasspath
-	override fun asArguments() = listOf("--module-path", modulePath.get().asPath)
+	override fun asArguments() = listOf(
+                                    "--module-path",
+                                    modulePath.get().asPath,
+                                    "--module-source-path",
+                                    files(modularProjects.map { "${it.projectDir}/src/module" }).asPath
+                                  )
 	@Internal
 	override fun getName() = "module-path"
 }

From 4fe69db32ef095641ce29fa6d07e63d5d90c520f Mon Sep 17 00:00:00 2001
From: Jerome Prinet <jprinet@gradle.com>
Date: Tue, 22 Mar 2022 11:39:13 +0100
Subject: [PATCH 0715/1433] Bump Gradle Enterprise plugins

---
 settings.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 94c0a9bf1a6c..2eac7e84a925 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,9 +5,9 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.8.1"
+		id("com.gradle.enterprise") version "3.9"
 		id("com.gradle.enterprise.test-distribution") version "2.2.3" // keep in sync with buildSrc/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.2"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.4"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From 05196cb62aae853e099bd7a3866d9c36553274d5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 23 Mar 2022 07:39:02 +0100
Subject: [PATCH 0716/1433] Remove slow Gradle plugin and call git directly

---
 buildSrc/build.gradle.kts                         |  1 -
 .../src/main/kotlin/build-metadata.gradle.kts     | 15 ++++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 80b8113a75c2..05338843676e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
     implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
     implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-    implementation("gradle.plugin.net.nemerosa:versioning:2.15.1")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.3") // keep in sync with root settings.gradle.kts
 }
diff --git a/buildSrc/src/main/kotlin/build-metadata.gradle.kts b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
index 434e0c397c6a..5d189fba246e 100644
--- a/buildSrc/src/main/kotlin/build-metadata.gradle.kts
+++ b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
@@ -1,18 +1,9 @@
-import org.gradle.kotlin.dsl.extra
-import org.gradle.kotlin.dsl.invoke
+import org.codehaus.groovy.runtime.ProcessGroovyMethods
 import java.time.Instant
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
-plugins {
-	id("net.nemerosa.versioning")
-}
-
-versioning {
-	noWarningOnDirty = true
-}
-
 val buildTimeAndDate: OffsetDateTime by extra {
 
 	// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against
@@ -33,5 +24,7 @@ val buildTimeAndDate: OffsetDateTime by extra {
 
 val buildDate: String by extra { DateTimeFormatter.ISO_LOCAL_DATE.format(buildTimeAndDate) }
 val buildTime: String by extra { DateTimeFormatter.ofPattern("HH:mm:ss.SSSZ").format(buildTimeAndDate) }
-val buildRevision: String by extra { versioning.info.commit }
+val buildRevision: String by extra {
+	ProcessGroovyMethods.getText(ProcessGroovyMethods.execute("git rev-parse --verify HEAD"))
+}
 val builtByValue by extra { project.findProperty("builtBy") ?: project.property("defaultBuiltBy") }

From 2280e8c2ac0846043e73a146c1b419f005830a90 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 23 Mar 2022 08:59:01 +0100
Subject: [PATCH 0717/1433] Update ArchUnit to 0.23.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a59489e65f7d..b0996b0d5753 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ ant = { module = "org.apache.ant:ant", version.ref = "ant" }
 ant-junit = { module = "org.apache.ant:ant-junit", version.ref = "ant" }
 ant-junitlauncher = { module = "org.apache.ant:ant-junitlauncher", version.ref = "ant" }
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.23.0" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.23.1" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.2.0" }

From 1d38477ed2327b3be221b232022b14eb2ee5e25d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 25 Mar 2022 13:50:41 +0100
Subject: [PATCH 0718/1433] Document @[Before|After]All can be static in
 @Nested on JDK 16+

This commit updates the documentation to point out that @BeforeAll and
@AfterAll lifecycle methods can be declared as static in @Nested test
classes beginning with Java 16.

This commit also introduces an integration test to verify this feature.

Closes: #2853
---
 .../asciidoc/user-guide/writing-tests.adoc    | 16 +++-
 .../java/org/junit/jupiter/api/AfterAll.java  | 14 +--
 .../java/org/junit/jupiter/api/BeforeAll.java | 14 +--
 .../org/junit/jupiter/api/TestInstance.java   | 15 +--
 ...AllAndAfterAllComposedAnnotationTests.java |  5 +-
 ...chAndAfterEachComposedAnnotationTests.java |  5 +-
 ...estedBeforeAllAndAfterAllMethodsTests.java | 95 +++++++++++++++++++
 7 files changed, 134 insertions(+), 30 deletions(-)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 88028d9b8306..8a1eed5c7e8b 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -38,7 +38,7 @@ in the `junit-jupiter-api` module.
 | `@AfterEach`             | Denotes that the annotated method should be executed _after_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@After`. Such methods are _inherited_ unless they are _overridden_.
 | `@BeforeAll`             | Denotes that the annotated method should be executed _before_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@BeforeClass`. Such methods are _inherited_ (unless they are _hidden_ or _overridden_) and must be `static` (unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used).
 | `@AfterAll`              | Denotes that the annotated method should be executed _after_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@AfterClass`. Such methods are _inherited_ (unless they are _hidden_ or _overridden_) and must be `static` (unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used).
-| `@Nested`                | Denotes that the annotated class is a non-static <<writing-tests-nested,nested test class>>. `@BeforeAll` and `@AfterAll` methods cannot be used directly in a `@Nested` test class unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used. Such annotations are not _inherited_.
+| `@Nested`                | Denotes that the annotated class is a non-static <<writing-tests-nested,nested test class>>. On Java 8 through Java 15, `@BeforeAll` and `@AfterAll` methods cannot be used directly in a `@Nested` test class unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used. Beginning with Java 16, `@BeforeAll` and `@AfterAll` methods can be declared as `static` in a `@Nested` test class with either test instance lifecycle mode. Such annotations are not _inherited_.
 | `@Tag`                   | Used to declare <<writing-tests-tagging-and-filtering,tags for filtering tests>>, either at the class or method level; analogous to test groups in TestNG or Categories in JUnit 4. Such annotations are _inherited_ at the class level but not at the method level.
 | `@Disabled`              | Used to <<writing-tests-disabling,disable>> a test class or test method; analogous to JUnit 4's `@Ignore`. Such annotations are not _inherited_.
 | `@Timeout`               | Used to fail a test, test factory, test template, or lifecycle method if its execution exceeds a given duration. Such annotations are _inherited_.
@@ -677,6 +677,9 @@ Specifically, with the "per-class" mode it becomes possible to declare `@BeforeA
 "per-class" mode therefore also makes it possible to use `@BeforeAll` and `@AfterAll`
 methods in `@Nested` test classes.
 
+NOTE: Beginning with Java 16, `@BeforeAll` and `@AfterAll` methods can be declared as
+`static` in `@Nested` test classes.
+
 If you are authoring tests using the Kotlin programming language, you may also find it
 easier to implement `@BeforeAll` and `@AfterAll` methods by switching to the "per-class"
 test instance lifecycle mode.
@@ -747,10 +750,13 @@ running the outer tests, because the setup code from the outer tests is always e
 
 NOTE: _Only non-static nested classes_ (i.e. _inner classes_) can serve as `@Nested` test
 classes. Nesting can be arbitrarily deep, and those inner classes are subject to full
-lifecycle support with one exception: `@BeforeAll` and `@AfterAll` methods do not work
-_by default_. The reason is that Java does not allow `static` members in inner classes.
-However, this restriction can be circumvented by annotating a `@Nested` test class with
-`@TestInstance(Lifecycle.PER_CLASS)` (see <<writing-tests-test-instance-lifecycle>>).
+lifecycle support with one exception: `@BeforeAll` and `@AfterAll` methods do not work _by
+default_. The reason is that Java does not allow `static` members in inner classes prior
+to Java 16. However, this restriction can be circumvented by annotating a `@Nested` test
+class with `@TestInstance(Lifecycle.PER_CLASS)` (see
+<<writing-tests-test-instance-lifecycle>>). If you are using Java 16 or higher,
+`@BeforeAll` and `@AfterAll` methods can be declared as `static` in `@Nested` test
+classes, and this restriction no longer applies.
 
 [[writing-tests-dependency-injection]]
 === Dependency Injection for Constructors and Methods
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index 46d441056e2d..1863c1680122 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -29,12 +29,14 @@
  *
  * <h3>Method Signatures</h3>
  *
- * <p>{@code @AfterAll} methods must have a {@code void} return type,
- * must not be {@code private}, and must be {@code static} by default.
- * Consequently, {@code @AfterAll} methods are not
- * supported in {@link Nested @Nested} test classes or as <em>interface default
- * methods</em> unless the test class is annotated with
- * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}. {@code @AfterAll}
+ * <p>{@code @AfterAll} methods must have a {@code void} return type, must not
+ * be {@code private}, and must be {@code static} by default. Consequently,
+ * {@code @AfterAll} methods are not supported in {@link Nested @Nested} test
+ * classes or as <em>interface default methods</em> unless the test class is
+ * annotated with {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}.
+ * However, beginning with Java 16 {@code @AfterAll} methods may be declared as
+ * {@code static} in {@link Nested @Nested} test classes, and the
+ * {@code Lifecycle.PER_CLASS} restriction no longer applies. {@code @AfterAll}
  * methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index cfc7521d25f2..95a20dc58b4d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -29,12 +29,14 @@
  *
  * <h3>Method Signatures</h3>
  *
- * <p>{@code @BeforeAll} methods must have a {@code void} return type,
- * must not be {@code private}, and must be {@code static} by default.
- * Consequently, {@code @BeforeAll} methods are not
- * supported in {@link Nested @Nested} test classes or as <em>interface default
- * methods</em> unless the test class is annotated with
- * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}. {@code @BeforeAll}
+ * <p>{@code @BeforeAll} methods must have a {@code void} return type, must not
+ * be {@code private}, and must be {@code static} by default. Consequently,
+ * {@code @BeforeAll} methods are not supported in {@link Nested @Nested} test
+ * classes or as <em>interface default methods</em> unless the test class is
+ * annotated with {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}.
+ * However, beginning with Java 16 {@code @BeforeAll} methods may be declared as
+ * {@code static} in {@link Nested @Nested} test classes, and the
+ * {@code Lifecycle.PER_CLASS} restriction no longer applies. {@code @BeforeAll}
  * methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
index 7de8ef20e85c..39434b352b90 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
@@ -44,13 +44,14 @@
  * <li>Shared test instance state between test methods in a given test class
  * as well as between non-static {@link BeforeAll @BeforeAll} and
  * {@link AfterAll @AfterAll} methods in the test class.</li>
- * <li>Declaration of {@link BeforeAll @BeforeAll} and {@link AfterAll @AfterAll}
- * methods in {@link Nested @Nested} test classes.</li>
- * <li>Declaration of {@link BeforeAll @BeforeAll} and {@link AfterAll @AfterAll}
- * on interface {@code default} methods.</li>
- * <li>Simplified declaration of {@link BeforeAll @BeforeAll} and
- * {@link AfterAll @AfterAll} methods in test classes implemented with the Kotlin
- * programming language.</li>
+ * <li>Declaration of non-static {@code @BeforeAll} and {@code @AfterAll} methods
+ * in {@link Nested @Nested} test classes. Beginning with Java 16, {@code @BeforeAll}
+ * and {@code @AfterAll} methods may be declared as {@code static} in
+ * {@link Nested @Nested} test classes with either lifecycle mode.</li>
+ * <li>Declaration of {@code @BeforeAll} and {@code @AfterAll} on interface
+ * {@code default} methods.</li>
+ * <li>Simplified declaration of non-static {@code @BeforeAll} and {@code @AfterAll}
+ * methods in test classes implemented with the Kotlin programming language.</li>
  * </ul>
  *
  * <p>{@code @TestInstance} may also be used as a meta-annotation in order to
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
index 0b4dfcb43b51..8161147d2852 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
@@ -10,8 +10,7 @@
 
 package org.junit.jupiter.engine;
 
-import static java.util.Arrays.asList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -37,7 +36,7 @@ class BeforeAllAndAfterAllComposedAnnotationTests extends AbstractJupiterTestEng
 	void beforeAllAndAfterAllAsMetaAnnotations() {
 		executeTestsForClass(TestCase.class).testEvents().assertStatistics(stats -> stats.started(1).succeeded(1));
 
-		assertEquals(asList("beforeAll", "test", "afterAll"), methodsInvoked);
+		assertThat(methodsInvoked).containsExactly("beforeAll", "test", "afterAll");
 	}
 
 	static class TestCase {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
index 4989403c8979..b6c671a8665b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
@@ -10,8 +10,7 @@
 
 package org.junit.jupiter.engine;
 
-import static java.util.Arrays.asList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -37,7 +36,7 @@ class BeforeEachAndAfterEachComposedAnnotationTests extends AbstractJupiterTestE
 	void beforeEachAndAfterEachAsMetaAnnotations() {
 		executeTestsForClass(TestCase.class).testEvents().assertStatistics(stats -> stats.started(1).succeeded(1));
 
-		assertEquals(asList("beforeEach", "test", "afterEach"), methodsInvoked);
+		assertThat(methodsInvoked).containsExactly("beforeEach", "test", "afterEach");
 	}
 
 	static class TestCase {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java
new file mode 100644
index 000000000000..473dda4b393b
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+/**
+ * Integration tests that verify support for {@code static} {@link BeforeAll} and
+ * {@link AfterAll} methods in {@link Nested} tests on Java 16+.
+ *
+ * @since 5.9
+ * @see BeforeAllAndAfterAllComposedAnnotationTests
+ */
+class StaticNestedBeforeAllAndAfterAllMethodsTests extends AbstractJupiterTestEngineTests {
+
+	private static final List<String> methodsInvoked = new ArrayList<>();
+
+	@DisplayName("static @BeforeAll and @AfterAll methods in @Nested test class")
+	@Test
+	void staticBeforeAllAndAfterAllMethodsInNestedTestClass() {
+		executeTestsForClass(TestCase.class).testEvents().assertStatistics(stats -> stats.started(2).succeeded(2));
+
+		assertThat(methodsInvoked).containsExactly(//
+			"@BeforeAll: top-level", //
+			"@Test: top-level", //
+			"@BeforeAll: nested", //
+			"@Test: nested", //
+			"@AfterAll: nested", //
+			"@AfterAll: top-level"//
+		);
+	}
+
+	static class TestCase {
+
+		@BeforeAll
+		static void beforeAll() {
+			methodsInvoked.add("@BeforeAll: top-level");
+		}
+
+		@Test
+		void test() {
+			methodsInvoked.add("@Test: top-level");
+		}
+
+		@AfterAll
+		static void afterAll() {
+			methodsInvoked.add("@AfterAll: top-level");
+		}
+
+		@Nested
+		// Lifecycle.PER_METHOD is the default, but we declare it here in order
+		// to be very explicit about what we are testing, namely static lifecycle
+		// methods in an inner class WITHOUT Lifecycle.PER_CLASS semantics.
+		@TestInstance(Lifecycle.PER_METHOD)
+		class NestedTestCase {
+
+			@BeforeAll
+			static void beforeAllInner() {
+				methodsInvoked.add("@BeforeAll: nested");
+			}
+
+			@Test
+			void test() {
+				methodsInvoked.add("@Test: nested");
+			}
+
+			@AfterAll
+			static void afterAllInner() {
+				methodsInvoked.add("@AfterAll: nested");
+			}
+
+		}
+
+	}
+
+}

From a1a5c1a21fa81279e16eea29fe30046d2c51d920 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 31 Mar 2022 18:00:38 +0200
Subject: [PATCH 0719/1433] Upgradle to 7.4.2

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffe61b45c929..5c51a4acc9d2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From ca57c1f300520b1498da335e2b03ec9b533da597 Mon Sep 17 00:00:00 2001
From: Debugging Sparrow <dbgsprw@gmail.com>
Date: Sun, 3 Apr 2022 23:23:00 +0900
Subject: [PATCH 0720/1433] Fix indentation in buildSrc/build.gradle.kts
 (#2874)

---
 buildSrc/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 05338843676e..ff729eccfab5 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,9 +12,9 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.2.0")
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
-    implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
+	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
+	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.3") // keep in sync with root settings.gradle.kts
 }

From 169e313ef09669041604870240c6d2279efc17f3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 3 Apr 2022 16:25:14 +0200
Subject: [PATCH 0721/1433] Check build scripts in buildSrc with Spotless as
 well

---
 buildSrc/src/main/kotlin/spotless-conventions.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
index faa4de3df9e4..6ecc51b7888b 100644
--- a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
@@ -10,7 +10,7 @@ val license: License by rootProject.extra
 spotless {
 
     format("misc") {
-        target("*.gradle", "*.gradle.kts", "*.gitignore")
+        target("*.gradle.kts", "buildSrc/**/*.gradle.kts", "*.gitignore")
         indentWithTabs()
         trimTrailingWhitespace()
         endWithNewline()
@@ -46,4 +46,3 @@ spotless {
         }
     }
 }
-

From 92f8e211e05f5a762f583a6f6c7165a879fe45e7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 3 Apr 2022 16:26:50 +0200
Subject: [PATCH 0722/1433] Fix indentation in buildSrc

---
 .../main/kotlin/base-conventions.gradle.kts   |  8 +-
 .../kotlin/dependency-update-check.gradle.kts | 28 +++----
 .../java-library-conventions.gradle.kts       | 10 +--
 .../kotlin/spotless-conventions.gradle.kts    | 74 +++++++++----------
 .../main/kotlin/temp-maven-repo.gradle.kts    | 36 ++++-----
 5 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/buildSrc/src/main/kotlin/base-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-conventions.gradle.kts
index 2a3842333d33..0c4c4c5f7a29 100644
--- a/buildSrc/src/main/kotlin/base-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/base-conventions.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    eclipse
-    idea
-    id("java-toolchain-conventions")
-    id("spotless-conventions")
+	eclipse
+	idea
+	id("java-toolchain-conventions")
+	id("spotless-conventions")
 }
diff --git a/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts b/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts
index bf6c679ae18a..a62a03a12169 100644
--- a/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts
+++ b/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts
@@ -1,21 +1,21 @@
 import org.gradle.kotlin.dsl.resolutionStrategy
 
 plugins {
-    id("com.github.ben-manes.versions")
+	id("com.github.ben-manes.versions")
 }
 
 tasks.dependencyUpdates {
-    checkConstraints = true
-    resolutionStrategy {
-        componentSelection {
-            all {
-                val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea")
-                    .map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
-                    .any { it.matches(candidate.version) }
-                if (rejected) {
-                    reject("Release candidate")
-                }
-            }
-        }
-    }
+	checkConstraints = true
+	resolutionStrategy {
+		componentSelection {
+			all {
+				val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea")
+					.map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") }
+					.any { it.matches(candidate.version) }
+				if (rejected) {
+					reject("Release candidate")
+				}
+			}
+		}
+	}
 }
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index dc49f90e4ccc..0908793214f6 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -218,11 +218,11 @@ inner class ModulePathArgumentProvider : CommandLineArgumentProvider, Named {
 	@get:CompileClasspath
 	val modulePath: Provider<Configuration> = configurations.compileClasspath
 	override fun asArguments() = listOf(
-                                    "--module-path",
-                                    modulePath.get().asPath,
-                                    "--module-source-path",
-                                    files(modularProjects.map { "${it.projectDir}/src/module" }).asPath
-                                  )
+									"--module-path",
+									modulePath.get().asPath,
+									"--module-source-path",
+									files(modularProjects.map { "${it.projectDir}/src/module" }).asPath
+								)
 	@Internal
 	override fun getName() = "module-path"
 }
diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
index 6ecc51b7888b..268486a248df 100644
--- a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
@@ -2,47 +2,47 @@ import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.provideDelegate
 
 plugins {
-    id("com.diffplug.spotless")
+	id("com.diffplug.spotless")
 }
 
 val license: License by rootProject.extra
 
 spotless {
 
-    format("misc") {
-        target("*.gradle.kts", "buildSrc/**/*.gradle.kts", "*.gitignore")
-        indentWithTabs()
-        trimTrailingWhitespace()
-        endWithNewline()
-    }
-
-    format("documentation") {
-        target("*.adoc", "*.md", "src/**/*.adoc", "src/**/*.md")
-        trimTrailingWhitespace()
-        endWithNewline()
-    }
-
-    pluginManager.withPlugin("java") {
-
-        val importOrderConfigFile = rootProject.file("src/eclipse/junit-eclipse.importorder")
-        val javaFormatterConfigFile = rootProject.file("src/eclipse/junit-eclipse-formatter-settings.xml")
-
-        java {
-            licenseHeaderFile(license.headerFile, "(package|import|open|module) ")
-            importOrderFile(importOrderConfigFile)
-            eclipse().configFile(javaFormatterConfigFile)
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-    }
-
-    pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
-        kotlin {
-            targetExclude("**/src/test/resources/**")
-            ktlint(requiredVersionFromLibs("ktlint"))
-            licenseHeaderFile(license.headerFile)
-            trimTrailingWhitespace()
-            endWithNewline()
-        }
-    }
+	format("misc") {
+		target("*.gradle.kts", "buildSrc/**/*.gradle.kts", "*.gitignore")
+		indentWithTabs()
+		trimTrailingWhitespace()
+		endWithNewline()
+	}
+
+	format("documentation") {
+		target("*.adoc", "*.md", "src/**/*.adoc", "src/**/*.md")
+		trimTrailingWhitespace()
+		endWithNewline()
+	}
+
+	pluginManager.withPlugin("java") {
+
+		val importOrderConfigFile = rootProject.file("src/eclipse/junit-eclipse.importorder")
+		val javaFormatterConfigFile = rootProject.file("src/eclipse/junit-eclipse-formatter-settings.xml")
+
+		java {
+			licenseHeaderFile(license.headerFile, "(package|import|open|module) ")
+			importOrderFile(importOrderConfigFile)
+			eclipse().configFile(javaFormatterConfigFile)
+			trimTrailingWhitespace()
+			endWithNewline()
+		}
+	}
+
+	pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
+		kotlin {
+			targetExclude("**/src/test/resources/**")
+			ktlint(requiredVersionFromLibs("ktlint"))
+			licenseHeaderFile(license.headerFile)
+			trimTrailingWhitespace()
+			endWithNewline()
+		}
+	}
 }
diff --git a/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts b/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
index fe02bf33becc..d180a3a85628 100644
--- a/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
+++ b/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
@@ -6,25 +6,25 @@ val tempRepoName by extra("temp")
 val tempRepoDir by extra(file("$buildDir/repo"))
 
 val clearTempRepoDir by tasks.registering {
-    doFirst {
-        tempRepoDir.deleteRecursively()
-    }
+	doFirst {
+		tempRepoDir.deleteRecursively()
+	}
 }
 
 subprojects {
-    pluginManager.withPlugin("maven-publish") {
-        configure<PublishingExtension>() {
-            repositories {
-                maven {
-                    name = tempRepoName
-                    url = uri(tempRepoDir)
-                }
-            }
-        }
-        tasks.withType<PublishToMavenRepository>().configureEach {
-            if (name.endsWith("To${tempRepoName.capitalize()}Repository")) {
-                dependsOn(clearTempRepoDir)
-            }
-        }
-    }
+	pluginManager.withPlugin("maven-publish") {
+		configure<PublishingExtension>() {
+			repositories {
+				maven {
+					name = tempRepoName
+					url = uri(tempRepoDir)
+				}
+			}
+		}
+		tasks.withType<PublishToMavenRepository>().configureEach {
+			if (name.endsWith("To${tempRepoName.capitalize()}Repository")) {
+				dependsOn(clearTempRepoDir)
+			}
+		}
+	}
 }

From 9a35e7fb701b752b2875c3437c45452212fd0b09 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Apr 2022 14:03:37 +0200
Subject: [PATCH 0723/1433] Exclude generated build scripts from Spotless scan

---
 buildSrc/src/main/kotlin/spotless-conventions.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
index 268486a248df..9f82998c135c 100644
--- a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
@@ -11,6 +11,7 @@ spotless {
 
 	format("misc") {
 		target("*.gradle.kts", "buildSrc/**/*.gradle.kts", "*.gitignore")
+		targetExclude("buildSrc/build/**")
 		indentWithTabs()
 		trimTrailingWhitespace()
 		endWithNewline()

From c9e111d09255ba1e5d39fa01a879c678c283794a Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Fri, 8 Apr 2022 12:10:49 +0200
Subject: [PATCH 0724/1433] Shadow JUnit Platform Suite Engine into Console's
 Standalone JAR file (#2814)

Shadow JUnit Platform Suite Engine into Console's Standalone JAR file as motivated by https://github.com/junit-team/junit5/issues/2813#issuecomment-1017546843
---
 .../release-notes/release-notes-5.9.0-M1.adoc |  2 +-
 ...nit-platform-console-standalone.gradle.kts |  1 +
 .../projects/standalone/expected-err.txt      |  4 ++-
 .../projects/standalone/expected-out.txt      | 12 ++++-----
 .../src/standalone/SuiteIntegration.java      | 26 +++++++++++++++++++
 .../support/tests/StandaloneTests.java        |  7 ++---
 6 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 platform-tooling-support-tests/projects/standalone/src/standalone/SuiteIntegration.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index ba90d0a74b0d..77131a10fb9c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -30,7 +30,7 @@ on GitHub.
 * JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
   resolution time a fully running set of dependencies is calculated, avoiding the need for
   these to be manually specified.
-
+* JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 18ebdb112608..ca8d74cc0420 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -8,6 +8,7 @@ description = "JUnit Platform Console Standalone"
 dependencies {
 	shadowed(projects.junitPlatformReporting)
 	shadowed(projects.junitPlatformConsole)
+	shadowed(projects.junitPlatformSuite)
 	shadowed(projects.junitJupiterEngine)
 	shadowed(projects.junitJupiterParams)
 	shadowed(projects.junitVintageEngine)
diff --git a/platform-tooling-support-tests/projects/standalone/expected-err.txt b/platform-tooling-support-tests/projects/standalone/expected-err.txt
index ae1258c81b77..ce91a2f7c73f 100644
--- a/platform-tooling-support-tests/projects/standalone/expected-err.txt
+++ b/platform-tooling-support-tests/projects/standalone/expected-err.txt
@@ -1,5 +1,5 @@
 .+ org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry loadTestEngines
-.+ Discovered TestEngines with IDs. .junit-jupiter .+ junit-vintage .+
+.+ Discovered TestEngines with IDs. .junit-jupiter .+ junit-vintage .+ junit-platform-suite .+
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded PostDiscoveryFilter instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
@@ -8,3 +8,5 @@
 .+ Loaded TestExecutionListener instances: .+
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded LauncherSessionListener instances: ..
+.+ org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry loadTestEngines
+.+ Discovered TestEngines with IDs. .junit-jupiter .+ junit-vintage .+ junit-platform-suite .+
diff --git a/platform-tooling-support-tests/projects/standalone/expected-out.txt b/platform-tooling-support-tests/projects/standalone/expected-out.txt
index d1b27aa368f0..24338dbc89fc 100644
--- a/platform-tooling-support-tests/projects/standalone/expected-out.txt
+++ b/platform-tooling-support-tests/projects/standalone/expected-out.txt
@@ -4,16 +4,16 @@ Failures (2):
 >> STACKTRACE >>
 
 Test run finished after \d+ ms
-[         6 containers found      ]
+[        11 containers found      ]
 [         0 containers skipped    ]
-[         6 containers started    ]
+[        11 containers started    ]
 [         0 containers aborted    ]
-[         6 containers successful ]
+[        11 containers successful ]
 [         0 containers failed     ]
-[         8 tests found           ]
+[        10 tests found           ]
 [         2 tests skipped         ]
-[         6 tests started         ]
+[         8 tests started         ]
 [         1 tests aborted         ]
-[         3 tests successful      ]
+[         5 tests successful      ]
 [         2 tests failed          ]
 
diff --git a/platform-tooling-support-tests/projects/standalone/src/standalone/SuiteIntegration.java b/platform-tooling-support-tests/projects/standalone/src/standalone/SuiteIntegration.java
new file mode 100644
index 000000000000..811ec0f7bc10
--- /dev/null
+++ b/platform-tooling-support-tests/projects/standalone/src/standalone/SuiteIntegration.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package standalone;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses(SuiteIntegration.SingleTestContainer.class)
+class SuiteIntegration {
+
+	static class SingleTestContainer {
+		@Test
+		void successful() {
+		}
+	}
+}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 2370cc89a8b6..d26770b15842 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -69,10 +69,11 @@ void compile() throws Exception {
 				.addArguments("--class-path", MavenRepo.jar("junit-platform-console-standalone")) //
 				.addArguments(workspace.resolve("src/standalone/JupiterIntegration.java")) //
 				.addArguments(workspace.resolve("src/standalone/JupiterParamsIntegration.java")) //
+				.addArguments(workspace.resolve("src/standalone/SuiteIntegration.java")) //
 				.addArguments(workspace.resolve("src/standalone/VintageIntegration.java")).build() //
 				.run();
 
-		assertEquals(0, result.getExitCode(), String.join("\n", result.getOutputLines("out")));
+		assertEquals(0, result.getExitCode(), result.getOutput("out") + result.getOutput("err"));
 		assertTrue(result.getOutput("out").isEmpty());
 		assertTrue(result.getOutput("err").isEmpty());
 
@@ -109,8 +110,8 @@ void test() throws IOException {
 		var workspace = Request.WORKSPACE.resolve("standalone");
 		var expectedOutLines = Files.readAllLines(workspace.resolve("expected-out.txt"));
 		var expectedErrLines = Files.readAllLines(workspace.resolve("expected-err.txt"));
-		assertLinesMatch(expectedOutLines, result.getOutputLines("out"));
-		assertLinesMatch(expectedErrLines, result.getOutputLines("err"));
+		assertLinesMatch(expectedOutLines, result.getOutputLines("out"), result.getOutput("out"));
+		assertLinesMatch(expectedErrLines, result.getOutputLines("err"), result.getOutput("err"));
 
 		var jupiterVersion = Helper.version("junit-jupiter-engine");
 		var vintageVersion = Helper.version("junit-vintage-engine");

From 77e863ce7c0b8ae7884f291acfb03c105ef6a432 Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Fri, 8 Apr 2022 12:35:12 +0200
Subject: [PATCH 0725/1433] Add failIfNoTests attribute to `@Suite`

New `failIfNoTests` attribute added to `@Suite`. This will fail the
suite if no tests were discovered.

This mechanism is implemented by having the `SuiteLauncher` listen
in on the test execution while also delegating any execution events
to the engine execution listener of the parent engine. If the
listener did not hear any test executions the suite will mark its
own execution as a failure.

To prevent pruning the `SuiteTestDescriptor` from being pruned
prematurely and not being executed at all, the suite  describes
itself a as test container that may register test. In practice
the container will never register any tests.

The `InternalTestPlan` is not passed to `TestExecutionListener` because
Hyrum's Law suggests that given a sufficient number of users of an API, any
observable behaviour will be depended on by someone. By not passing the
`InternalTestPlan` but rather the `TestPlan` we may still avoid the situation
where a test execution listener through reflection tries to access the
discovery result.

Closes #2823
---
 .../release-notes/release-notes-5.9.0-M1.adoc |   2 +
 .../CompositeEngineExecutionListener.java     |  81 +++++++++
 .../core/EngineExecutionOrchestrator.java     |  62 +++++--
 .../core/ExecutionListenerAdapter.java        |   4 +-
 .../launcher/core/InternalTestPlan.java       |   4 +
 .../launcher/core/ListenerRegistry.java       |   5 +
 .../listeners/SummaryGeneratingListener.java  |   4 +
 .../org/junit/platform/suite/api/Suite.java   |   9 +
 .../engine/SuiteDidNotDiscoverAnyTests.java   |  23 +++
 .../platform/suite/engine/SuiteLauncher.java  |   9 +-
 .../suite/engine/SuiteTestDescriptor.java     |  42 ++++-
 ...CompositeEngineExecutionListenerTests.java | 161 ++++++++++++++++++
 .../suite/engine/SuiteEngineTests.java        |  55 ++++++
 .../engine/SuiteTestDescriptorTests.java      |  12 +-
 .../testcases/EmptyDynamicTestsTestCase.java  |  28 +++
 .../engine/testcases/EmptyTestTestCase.java   |  18 ++
 .../suite/engine/testsuites/DynamicSuite.java |   7 +-
 .../testsuites/EmptyDynamicTestSuite.java     |  23 +++
 ...DynamicTestWithFailIfNoTestFalseSuite.java |  23 +++
 .../engine/testsuites/EmptyTestCaseSuite.java |  23 +++
 ...ptyTestCaseWithFailIfNoTestFalseSuite.java |  23 +++
 21 files changed, 592 insertions(+), 26 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
 create mode 100644 junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteDidNotDiscoverAnyTests.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyDynamicTestsTestCase.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyTestTestCase.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestSuite.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseSuite.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 77131a10fb9c..a2904468288d 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -31,6 +31,8 @@ on GitHub.
   resolution time a fully running set of dependencies is calculated, avoiding the need for
   these to be manually specified.
 * JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
+* New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if
+  no tests were discovered.
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
new file mode 100644
index 000000000000..c99a44f57cbd
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+import org.junit.platform.commons.util.UnrecoverableExceptions;
+import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.reporting.ReportEntry;
+
+class CompositeEngineExecutionListener implements EngineExecutionListener {
+
+	private static final Logger logger = LoggerFactory.getLogger(CompositeEngineExecutionListener.class);
+
+	private final List<EngineExecutionListener> engineExecutionListeners;
+
+	CompositeEngineExecutionListener(List<EngineExecutionListener> engineExecutionListeners) {
+		this.engineExecutionListeners = new ArrayList<>(engineExecutionListeners);
+	}
+
+	@Override
+	public void dynamicTestRegistered(TestDescriptor testDescriptor) {
+		notifyEach(engineExecutionListeners, listener -> listener.dynamicTestRegistered(testDescriptor),
+			() -> "dynamicTestRegistered(" + testDescriptor + ")");
+	}
+
+	@Override
+	public void executionSkipped(TestDescriptor testDescriptor, String reason) {
+		notifyEach(engineExecutionListeners, listener -> listener.executionSkipped(testDescriptor, reason),
+			() -> "executionSkipped(" + testDescriptor + ", " + reason + ")");
+	}
+
+	@Override
+	public void executionStarted(TestDescriptor testDescriptor) {
+		notifyEach(engineExecutionListeners, listener -> listener.executionStarted(testDescriptor),
+			() -> "executionStarted(" + testDescriptor + ")");
+	}
+
+	@Override
+	public void executionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+		notifyEach(engineExecutionListeners,
+			listener -> listener.executionFinished(testDescriptor, testExecutionResult),
+			() -> "executionFinished(" + testDescriptor + ", " + testExecutionResult + ")");
+	}
+
+	@Override
+	public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
+		notifyEach(engineExecutionListeners, listener -> listener.reportingEntryPublished(testDescriptor, entry),
+			() -> "reportingEntryPublished(" + testDescriptor + ", " + entry + ")");
+	}
+
+	private static <T extends EngineExecutionListener> void notifyEach(List<T> listeners, Consumer<T> consumer,
+			Supplier<String> description) {
+		listeners.forEach(listener -> {
+			try {
+				consumer.accept(listener);
+			}
+			catch (Throwable throwable) {
+				UnrecoverableExceptions.rethrowIfUnrecoverable(throwable);
+				logger.warn(throwable,
+					() -> String.format("EngineExecutionListener [%s] threw exception for method: %s",
+						listener.getClass().getName(), description.get()));
+			}
+		});
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index 5402a3f4bf63..011db2f3c8b8 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -10,7 +10,9 @@
 
 package org.junit.platform.launcher.core;
 
+import static java.util.Objects.requireNonNull;
 import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.junit.platform.launcher.core.ListenerRegistry.forEngineExecutionListeners;
 
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -25,6 +27,7 @@
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
 
 /**
  * Orchestrates test execution using the configured test engines.
@@ -45,15 +48,47 @@ public EngineExecutionOrchestrator() {
 	}
 
 	void execute(InternalTestPlan internalTestPlan, TestExecutionListener... listeners) {
+		ConfigurationParameters configurationParameters = internalTestPlan.getConfigurationParameters();
+		ListenerRegistry<TestExecutionListener> testExecutionListenerListeners = buildListenerRegistryForExecution(
+			listeners);
+		withInterceptedStreams(configurationParameters, testExecutionListenerListeners,
+			testExecutionListener -> execute(internalTestPlan, EngineExecutionListener.NOOP, testExecutionListener));
+	}
+
+	/**
+	 * Executes tests for the supplied {@linkplain LauncherDiscoveryResult
+	 * discoveryResult} and notifies the supplied {@linkplain
+	 * EngineExecutionListener engineExecutionListener} and
+	 * {@linkplain TestExecutionListener testExecutionListener} of execution
+	 * events.
+	 */
+	@API(status = INTERNAL, since = "1.9", consumers = { "org.junit.platform.suite.engine" })
+	public void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionListener engineExecutionListener,
+			TestExecutionListener testExecutionListener) {
+		requireNonNull(discoveryResult);
+		requireNonNull(engineExecutionListener);
+		requireNonNull(testExecutionListener);
+
+		InternalTestPlan internalTestPlan = InternalTestPlan.from(discoveryResult);
+		execute(internalTestPlan, engineExecutionListener, testExecutionListener);
+	}
+
+	private void execute(InternalTestPlan internalTestPlan, EngineExecutionListener parentEngineExecutionListener,
+			TestExecutionListener testExecutionListener) {
 		internalTestPlan.markStarted();
+
+		// Do not directly pass the internal test plan to test execution listeners.
+		// Hyrum's Law indicates that someone will eventually come to depend on it.
+		TestPlan testPlan = internalTestPlan.getDelegate();
 		LauncherDiscoveryResult discoveryResult = internalTestPlan.getDiscoveryResult();
-		ConfigurationParameters configurationParameters = discoveryResult.getConfigurationParameters();
-		ListenerRegistry<TestExecutionListener> listenerRegistry = buildListenerRegistryForExecution(listeners);
-		withInterceptedStreams(configurationParameters, listenerRegistry, testExecutionListener -> {
-			testExecutionListener.testPlanExecutionStarted(internalTestPlan);
-			execute(discoveryResult, new ExecutionListenerAdapter(internalTestPlan, testExecutionListener));
-			testExecutionListener.testPlanExecutionFinished(internalTestPlan);
-		});
+
+		ListenerRegistry<EngineExecutionListener> engineExecutionListenerRegistry = forEngineExecutionListeners();
+		engineExecutionListenerRegistry.add(new ExecutionListenerAdapter(testPlan, testExecutionListener));
+		engineExecutionListenerRegistry.add(parentEngineExecutionListener);
+
+		testExecutionListener.testPlanExecutionStarted(testPlan);
+		execute(discoveryResult, engineExecutionListenerRegistry.getCompositeListener());
+		testExecutionListener.testPlanExecutionFinished(testPlan);
 	}
 
 	private void withInterceptedStreams(ConfigurationParameters configurationParameters,
@@ -76,16 +111,21 @@ private void withInterceptedStreams(ConfigurationParameters configurationParamet
 	 * discovery results} and notifies the supplied {@linkplain
 	 * EngineExecutionListener listener} of execution events.
 	 */
-	public void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionListener listener) {
+	@API(status = INTERNAL, since = "1.7", consumers = { "org.junit.platform.testkit" })
+	public void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionListener engineExecutionListener) {
+		requireNonNull(discoveryResult);
+		requireNonNull(engineExecutionListener);
+
 		for (TestEngine testEngine : discoveryResult.getTestEngines()) {
 			TestDescriptor engineDescriptor = discoveryResult.getEngineTestDescriptor(testEngine);
 			if (engineDescriptor instanceof EngineDiscoveryErrorDescriptor) {
-				listener.executionStarted(engineDescriptor);
-				listener.executionFinished(engineDescriptor,
+				engineExecutionListener.executionStarted(engineDescriptor);
+				engineExecutionListener.executionFinished(engineDescriptor,
 					TestExecutionResult.failed(((EngineDiscoveryErrorDescriptor) engineDescriptor).getCause()));
 			}
 			else {
-				execute(engineDescriptor, listener, discoveryResult.getConfigurationParameters(), testEngine);
+				execute(engineDescriptor, engineExecutionListener, discoveryResult.getConfigurationParameters(),
+					testEngine);
 			}
 		}
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
index 86c89aed87a8..f739dfcfe0ee 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
@@ -26,10 +26,10 @@
  */
 class ExecutionListenerAdapter implements EngineExecutionListener {
 
-	private final InternalTestPlan testPlan;
+	private final TestPlan testPlan;
 	private final TestExecutionListener testExecutionListener;
 
-	ExecutionListenerAdapter(InternalTestPlan testPlan, TestExecutionListener testExecutionListener) {
+	ExecutionListenerAdapter(TestPlan testPlan, TestExecutionListener testExecutionListener) {
 		this.testPlan = testPlan;
 		this.testExecutionListener = testExecutionListener;
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
index a435164d5b54..836669b8cb23 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
@@ -50,6 +50,10 @@ LauncherDiscoveryResult getDiscoveryResult() {
 		return discoveryResult;
 	}
 
+	public TestPlan getDelegate() {
+		return delegate;
+	}
+
 	@Override
 	@SuppressWarnings("deprecation")
 	public void add(TestIdentifier testIdentifier) {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
index 3a0e220b6bf6..bcc30d678176 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
@@ -18,6 +18,7 @@
 import java.util.function.Function;
 
 import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -40,6 +41,10 @@ static ListenerRegistry<TestExecutionListener> forTestExecutionListeners() {
 		return create(CompositeTestExecutionListener::new);
 	}
 
+	static ListenerRegistry<EngineExecutionListener> forEngineExecutionListeners() {
+		return create(CompositeEngineExecutionListener::new);
+	}
+
 	static <T> ListenerRegistry<T> create(Function<List<T>, T> compositeListenerFactory) {
 		return new ListenerRegistry<>(compositeListenerFactory);
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
index 55d9f5e8e70e..e32db1ceb02b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
@@ -35,6 +35,10 @@ public class SummaryGeneratingListener implements TestExecutionListener {
 	private TestPlan testPlan;
 	private MutableTestExecutionSummary summary;
 
+	public SummaryGeneratingListener() {
+
+	}
+
 	/**
 	 * Get the summary generated by this listener.
 	 */
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
index ebcbd52935ed..5df5c0892ffc 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
@@ -73,4 +73,13 @@
 @API(status = Status.EXPERIMENTAL, since = "1.8")
 @Testable
 public @interface Suite {
+
+	/**
+	 * Fail suite if no tests were discovered.
+	 *
+	 * @since 1.9
+	 */
+	@API(status = Status.EXPERIMENTAL, since = "1.9")
+	boolean failIfNoTests() default true;
+
 }
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteDidNotDiscoverAnyTests.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteDidNotDiscoverAnyTests.java
new file mode 100644
index 000000000000..6197ff90c1c4
--- /dev/null
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteDidNotDiscoverAnyTests.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine;
+
+import org.junit.platform.commons.JUnitException;
+
+class SuiteDidNotDiscoverAnyTests extends JUnitException {
+
+	private static final long serialVersionUID = 1L;
+
+	SuiteDidNotDiscoverAnyTests(Class<?> suiteClass) {
+		super(String.format("Suite [%s] did not discover any tests", suiteClass.getName()));
+	}
+
+}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
index 84f85a8e3d13..7be8d79703b8 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
@@ -25,6 +25,8 @@
 import org.junit.platform.launcher.core.EngineExecutionOrchestrator;
 import org.junit.platform.launcher.core.LauncherDiscoveryResult;
 import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
+import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
+import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 /**
  * @since 1.8
@@ -55,8 +57,11 @@ LauncherDiscoveryResult discover(LauncherDiscoveryRequest discoveryRequest, Uniq
 		return discoveryOrchestrator.discover(discoveryRequest, Phase.DISCOVERY, parentId);
 	}
 
-	void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionListener listener) {
-		executionOrchestrator.execute(discoveryResult, listener);
+	TestExecutionSummary execute(LauncherDiscoveryResult discoveryResult,
+			EngineExecutionListener parentEngineExecutionListener) {
+		SummaryGeneratingListener listener = new SummaryGeneratingListener();
+		executionOrchestrator.execute(discoveryResult, parentEngineExecutionListener, listener);
+		return listener.getSummary();
 	}
 
 }
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index 88e382d23685..a41318dbd743 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -13,11 +13,11 @@
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.counting;
 import static java.util.stream.Collectors.groupingBy;
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder.request;
 
 import java.util.function.Supplier;
 
-import org.junit.platform.commons.util.AnnotationUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.ConfigurationParameters;
@@ -31,6 +31,8 @@
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.core.LauncherDiscoveryResult;
+import org.junit.platform.launcher.listeners.TestExecutionSummary;
+import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.api.SuiteDisplayName;
 import org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder;
 
@@ -50,6 +52,8 @@ final class SuiteTestDescriptor extends AbstractTestDescriptor {
 
 	private final SuiteLauncherDiscoveryRequestBuilder discoveryRequestBuilder = request();
 	private final ConfigurationParameters configurationParameters;
+	private final Boolean failIfNoTests;
+	private final Class<?> suiteClass;
 
 	private LauncherDiscoveryResult launcherDiscoveryResult;
 	private SuiteLauncher launcher;
@@ -57,6 +61,8 @@ final class SuiteTestDescriptor extends AbstractTestDescriptor {
 	SuiteTestDescriptor(UniqueId id, Class<?> suiteClass, ConfigurationParameters configurationParameters) {
 		super(requireNoCycles(id), getSuiteDisplayName(suiteClass), ClassSource.from(suiteClass));
 		this.configurationParameters = configurationParameters;
+		this.failIfNoTests = getFailIfNoTests(suiteClass);
+		this.suiteClass = suiteClass;
 	}
 
 	private static UniqueId requireNoCycles(UniqueId id) {
@@ -75,6 +81,14 @@ private static UniqueId requireNoCycles(UniqueId id) {
 		return id;
 	}
 
+	private static Boolean getFailIfNoTests(Class<?> suiteClass) {
+		// @formatter:off
+		return findAnnotation(suiteClass, Suite.class)
+				.map(Suite::failIfNoTests)
+				.orElseThrow(() -> new IllegalStateException(String.format("Suite [%s] was not annotated with @Suite", suiteClass.getName())));
+		// @formatter:on
+	}
+
 	SuiteTestDescriptor addDiscoveryRequestFrom(Class<?> suiteClass) {
 		Preconditions.condition(launcherDiscoveryResult == null,
 			"discovery request can not be modified after discovery");
@@ -118,17 +132,33 @@ public Type getType() {
 
 	private static String getSuiteDisplayName(Class<?> testClass) {
 		// @formatter:off
-		return AnnotationUtils.findAnnotation(testClass, SuiteDisplayName.class)
+		return findAnnotation(testClass, SuiteDisplayName.class)
 				.map(SuiteDisplayName::value)
 				.filter(StringUtils::isNotBlank)
 				.orElse(testClass.getSimpleName());
 		// @formatter:on
 	}
 
-	void execute(EngineExecutionListener listener) {
-		listener.executionStarted(this);
-		launcher.execute(launcherDiscoveryResult, listener);
-		listener.executionFinished(this, TestExecutionResult.successful());
+	void execute(EngineExecutionListener parentEngineExecutionListener) {
+		parentEngineExecutionListener.executionStarted(this);
+		LauncherDiscoveryResult discoveryResult = this.launcherDiscoveryResult;
+		TestExecutionSummary summary = launcher.execute(discoveryResult, parentEngineExecutionListener);
+		parentEngineExecutionListener.executionFinished(this, computeTestExecutionResult(summary));
+	}
+
+	private TestExecutionResult computeTestExecutionResult(TestExecutionSummary summary) {
+		if (failIfNoTests && summary.getTestsFoundCount() == 0) {
+			return TestExecutionResult.failed(new SuiteDidNotDiscoverAnyTests(suiteClass));
+		}
+		return TestExecutionResult.successful();
+	}
+
+	@Override
+	public boolean mayRegisterTests() {
+		// While a suite will not register new tests after discovery, we pretend
+		// it does. This allows the suite to fail if not tests were discovered.
+		// If not, the empty suite would be pruned.
+		return true;
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
new file mode 100644
index 000000000000..4d8e786e44e9
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.fixtures.TrackLogRecords;
+import org.junit.platform.commons.logging.LogRecordListener;
+import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.reporting.ReportEntry;
+import org.junit.platform.engine.support.descriptor.DemoMethodTestDescriptor;
+
+@TrackLogRecords
+class CompositeEngineExecutionListenerTests {
+
+	private final List<EngineExecutionListener> listeners = new ArrayList<>(
+		List.of(new ThrowingEngineExecutionListener()));
+
+	@Test
+	void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(LogRecordListener logRecordListener) {
+		var testDescriptor = getSampleMethodTestDescriptor();
+
+		compositeTestExecutionListener().dynamicTestRegistered(testDescriptor);
+
+		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class,
+			"dynamicTestRegistered");
+	}
+
+	@Test
+	void shouldNotThrowExceptionButLogIfExecutionStartedListenerMethodFails(LogRecordListener logRecordListener) {
+		var testDescriptor = getSampleMethodTestDescriptor();
+
+		compositeTestExecutionListener().executionStarted(testDescriptor);
+
+		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class, "executionStarted");
+	}
+
+	@Test
+	void shouldNotThrowExceptionButLogIfExecutionSkippedListenerMethodFails(LogRecordListener logRecordListener) {
+		var testDescriptor = getSampleMethodTestDescriptor();
+
+		compositeTestExecutionListener().executionSkipped(testDescriptor, "deliberately skipped container");
+
+		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class, "executionSkipped");
+	}
+
+	@Test
+	void shouldNotThrowExceptionButLogIfExecutionFinishedListenerMethodFails(LogRecordListener logRecordListener) {
+		var testDescriptor = getSampleMethodTestDescriptor();
+
+		compositeTestExecutionListener().executionFinished(testDescriptor, mock(TestExecutionResult.class));
+
+		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class,
+			"executionFinished");
+	}
+
+	@Test
+	void shouldNotThrowExceptionButLogIfReportingEntryPublishedListenerMethodFails(
+			LogRecordListener logRecordListener) {
+		var testDescriptor = getSampleMethodTestDescriptor();
+
+		compositeTestExecutionListener().reportingEntryPublished(testDescriptor, ReportEntry.from("one", "two"));
+
+		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class,
+			"reportingEntryPublished");
+	}
+
+	@Test
+	void shouldThrowOutOfMemoryExceptionAndStopListenerWithoutLog(LogRecordListener logRecordListener) {
+		listeners.clear();
+		listeners.add(new EngineExecutionListener() {
+			@Override
+			public void executionStarted(TestDescriptor testDescriptor) {
+				throw new OutOfMemoryError();
+			}
+		});
+		var testDescriptor = getSampleMethodTestDescriptor();
+		assertThatThrownBy(() -> compositeTestExecutionListener().executionStarted(testDescriptor)).isInstanceOf(
+			OutOfMemoryError.class);
+
+		assertNotLogs(logRecordListener);
+	}
+
+	private EngineExecutionListener compositeTestExecutionListener() {
+		return new CompositeEngineExecutionListener(listeners);
+	}
+
+	private LogRecord firstWarnLogRecord(LogRecordListener logRecordListener) throws AssertionError {
+		return logRecordListener.stream(CompositeEngineExecutionListener.class, Level.WARNING).findFirst().orElseThrow(
+			() -> new AssertionError("Failed to find error log record"));
+	}
+
+	private void assertNotLogs(LogRecordListener logRecordListener) throws AssertionError {
+		assertThat(logRecordListener.stream(CompositeEngineExecutionListener.class, Level.WARNING).count()).isZero();
+	}
+
+	private TestDescriptor getSampleMethodTestDescriptor() {
+		return getDemoMethodTestDescriptor();
+	}
+
+	private void assertThatTestListenerErrorLogged(LogRecordListener logRecordListener, Class<?> listenerClass,
+			String methodName) {
+		assertThat(firstWarnLogRecord(logRecordListener).getMessage()).startsWith(
+			"EngineExecutionListener [" + listenerClass.getName() + "] threw exception for method: " + methodName);
+	}
+
+	private DemoMethodTestDescriptor getDemoMethodTestDescriptor() {
+		var method = ReflectionUtils.findMethod(this.getClass(), "getDemoMethodTestDescriptor",
+			new Class<?>[0]).orElseThrow();
+		return new DemoMethodTestDescriptor(UniqueId.root("method", "unique_id"), this.getClass(), method);
+	}
+
+	private static class ThrowingEngineExecutionListener implements EngineExecutionListener {
+
+		@Override
+		public void dynamicTestRegistered(TestDescriptor testDescriptor) {
+			throw new RuntimeException("failed to invoke listener");
+		}
+
+		@Override
+		public void executionStarted(TestDescriptor testDescriptor) {
+			throw new RuntimeException("failed to invoke listener");
+		}
+
+		@Override
+		public void executionSkipped(TestDescriptor testDescriptor, String reason) {
+			throw new RuntimeException("failed to invoke listener");
+		}
+
+		@Override
+		public void executionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+			throw new RuntimeException("failed to invoke listener");
+		}
+
+		@Override
+		public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
+			throw new RuntimeException("failed to invoke listener");
+		}
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index a683895d4811..2235f12386f9 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -15,9 +15,12 @@
 import static org.junit.platform.suite.engine.SuiteEngineDescriptor.ENGINE_ID;
 import static org.junit.platform.testkit.engine.EventConditions.container;
 import static org.junit.platform.testkit.engine.EventConditions.displayName;
+import static org.junit.platform.testkit.engine.EventConditions.engine;
 import static org.junit.platform.testkit.engine.EventConditions.event;
 import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
+import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
 import static org.junit.platform.testkit.engine.EventConditions.test;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
@@ -34,6 +37,10 @@
 import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 import org.junit.platform.suite.engine.testsuites.AbstractSuite;
 import org.junit.platform.suite.engine.testsuites.DynamicSuite;
+import org.junit.platform.suite.engine.testsuites.EmptyDynamicTestSuite;
+import org.junit.platform.suite.engine.testsuites.EmptyDynamicTestWithFailIfNoTestFalseSuite;
+import org.junit.platform.suite.engine.testsuites.EmptyTestCaseSuite;
+import org.junit.platform.suite.engine.testsuites.EmptyTestCaseWithFailIfNoTestFalseSuite;
 import org.junit.platform.suite.engine.testsuites.MultipleSuite;
 import org.junit.platform.suite.engine.testsuites.NestedSuite;
 import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
@@ -276,4 +283,52 @@ void postDiscoveryCanRemoveTestDescriptorsInSuite() {
 		// @formatter:on
 	}
 
+	@Test
+	void emptySuiteFails() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(EmptyTestCaseSuite.class))
+				.execute()
+				.containerEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(container(EmptyTestCaseSuite.class), finishedWithFailure(instanceOf(SuiteDidNotDiscoverAnyTests.class))));
+		// @formatter:on
+	}
+
+	@Test
+	void emptySuitePassesWhenFailIfNoTestIsFalse() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(EmptyTestCaseWithFailIfNoTestFalseSuite.class))
+				.execute()
+				.containerEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(engine(), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void emptyDynamicSuiteFails() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(EmptyDynamicTestSuite.class))
+				.execute()
+				.containerEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(container(EmptyDynamicTestSuite.class), finishedWithFailure(instanceOf(SuiteDidNotDiscoverAnyTests.class))));
+		// @formatter:on
+	}
+
+	@Test
+	void emptyDynamicSuitePassesWhenFailIfNoTestIsFalse() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(EmptyDynamicTestWithFailIfNoTestFalseSuite.class))
+				.execute()
+				.allEvents()
+				.assertThatEvents()
+				.haveAtLeastOne(event(container(EmptyDynamicTestWithFailIfNoTestFalseSuite.class), finishedSuccessfully()));
+		// @formatter:on
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index ab56a02f22fb..9bf6ff9fe4fb 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -29,6 +30,7 @@
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
+import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 import org.junit.platform.suite.engine.testsuites.CyclicSuite;
 import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
@@ -37,7 +39,10 @@
  * @since 1.8
  */
 class SuiteTestDescriptorTests {
+	@Suite
+	static class TestSuite {
 
+	}
 	UniqueId engineId = UniqueId.forEngine(SuiteEngineDescriptor.ENGINE_ID);
 	UniqueId suiteId = engineId.append(SuiteTestDescriptor.SEGMENT_TYPE, "test");
 	UniqueId jupiterEngineId = suiteId.append("engine", JupiterEngineDescriptor.ENGINE_ID);
@@ -45,7 +50,7 @@ class SuiteTestDescriptorTests {
 	UniqueId methodId = testClassId.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
 
 	ConfigurationParameters configurationParameters = new EmptyConfigurationParameters();
-	SuiteTestDescriptor suite = new SuiteTestDescriptor(suiteId, Object.class, configurationParameters);
+	SuiteTestDescriptor suite = new SuiteTestDescriptor(suiteId, TestSuite.class, configurationParameters);
 
 	@Test
 	void suiteIsEmptyBeforeDiscovery() {
@@ -100,6 +105,11 @@ void suitesMayNotContainACycle() {
 			exception.getCause().getCause().getCause().getMessage());
 	}
 
+	@Test
+	void suiteMayRegisterTests() {
+		assertTrue(suite.mayRegisterTests());
+	}
+
 	private static class EmptyConfigurationParameters implements ConfigurationParameters {
 		@Override
 		public Optional<String> get(String key) {
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyDynamicTestsTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyDynamicTestsTestCase.java
new file mode 100644
index 000000000000..f3c77b7b6ee3
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyDynamicTestsTestCase.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testcases;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+
+/**
+ * @since 1.9
+ */
+public class EmptyDynamicTestsTestCase {
+
+	@TestFactory
+	Stream<DynamicTest> dynamicTests() {
+		return Stream.empty();
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyTestTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyTestTestCase.java
new file mode 100644
index 000000000000..ec5f1290eeea
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyTestTestCase.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testcases;
+
+/**
+ * @since 1.9
+ */
+public class EmptyTestTestCase {
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
index d83e1ad19f8f..d75f0f5c5ea3 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
@@ -10,15 +10,14 @@
 
 package org.junit.platform.suite.engine.testsuites;
 
-import org.junit.platform.suite.api.IncludeClassNamePatterns;
-import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.DynamicTestsTestCase;
 
 /**
  * @since 1.8
  */
 @Suite
-@IncludeClassNamePatterns(".*TestCase$")
-@SelectPackages("org.junit.platform.suite.engine.testcases")
+@SelectClasses(DynamicTestsTestCase.class)
 public class DynamicSuite {
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestSuite.java
new file mode 100644
index 000000000000..ecb4873f71e2
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestSuite.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.EmptyDynamicTestsTestCase;
+
+/**
+ * @since 1.9
+ */
+@Suite
+@SelectClasses(EmptyDynamicTestsTestCase.class)
+public class EmptyDynamicTestSuite {
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java
new file mode 100644
index 000000000000..bfec545c56c6
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.EmptyDynamicTestsTestCase;
+
+/**
+ * @since 1.9
+ */
+@Suite(failIfNoTests = false)
+@SelectClasses(EmptyDynamicTestsTestCase.class)
+public class EmptyDynamicTestWithFailIfNoTestFalseSuite {
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseSuite.java
new file mode 100644
index 000000000000..1d80d8881b43
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseSuite.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.EmptyTestTestCase;
+
+/**
+ * @since 1.9
+ */
+@Suite
+@SelectClasses(EmptyTestTestCase.class)
+public class EmptyTestCaseSuite {
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java
new file mode 100644
index 000000000000..44e3896b2ca8
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.EmptyTestTestCase;
+
+/**
+ * @since 1.9
+ */
+@Suite(failIfNoTests = false)
+@SelectClasses(EmptyTestTestCase.class)
+public class EmptyTestCaseWithFailIfNoTestFalseSuite {
+}

From cd712e0479a36e1c25800f960ec23788d475e63b Mon Sep 17 00:00:00 2001
From: Nick McKinney <mckinneynicholas@gmail.com>
Date: Fri, 8 Apr 2022 07:10:27 -0400
Subject: [PATCH 0726/1433] Add support for color customization on the console
 launcher

Prior to this commit, the console launcher used a single and
fixed color palette to display tests and their results.

This commit introduces new `--color-palette` and `--single-color`
command-line options allowing users to customize the color
palette of JUnit's console launcher to their needs and liking.

Closes #985
---
 .../release-notes/release-notes-5.9.0-M1.adoc |  15 ++
 .../console/options/AvailableOptions.java     |  12 ++
 .../console/options/CommandLineOptions.java   |  18 ++
 .../platform/console/tasks/ColorPalette.java  | 122 +++++++++++
 .../console/tasks/ConsoleTestExecutor.java    |  21 +-
 .../console/tasks/FlatPrintingListener.java   |  52 ++---
 .../junit/platform/console/tasks/Style.java   |  39 ++++
 .../platform/console/tasks/TreePrinter.java   |  57 +++--
 .../console/tasks/TreePrintingListener.java   |   4 +-
 .../tasks/VerboseTreePrintingListener.java    |  51 +++--
 .../console/tasks/ColorPaletteTest.java       | 194 ++++++++++++++++++
 .../tasks/FlatPrintingListenerTests.java      |  87 +++++++-
 .../console/tasks/TreePrinterTests.java       |   8 +-
 .../tasks/VerboseTreeListenerTests.java       |   2 +-
 14 files changed, 577 insertions(+), 105 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTest.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index a2904468288d..b8a2a77604a9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -33,6 +33,21 @@ on GitHub.
 * JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
 * New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if
   no tests were discovered.
+* Console output color can now be customized. The option `--single-color` will apply a
+  built-in monochrome style, while `--color-palette` will accept a properties file to
+  override the ANSI SGR color styling.
+  The properties file below demonstrates the default style:
+
+  ....
+  SUCCESSFUL = 32
+  ABORTED = 33
+  FAILED = 31
+  SKIPPED = 35
+  CONTAINER = 35
+  TEST = 34
+  DYNAMIC = 35
+  REPORTED = 37
+  ....
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index 7f24cda49085..c6c16da27183 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -58,6 +58,16 @@ class AvailableOptions {
 	@Option(names = "-disable-ansi-colors", hidden = true)
 	private boolean disableAnsiColors2;
 
+	@Option(names = "--color-palette", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
+	private Path colorPalette;
+	@Option(names = "-color-palette", hidden = true)
+	private Path colorPalette2;
+
+	@Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
+	private boolean singleColorPalette;
+	@Option(names = "-single-color", hidden = true)
+	private boolean singleColorPalette2;
+
 	@Option(names = "--disable-banner", description = "Disable print out of the welcome message.")
 	private boolean disableBanner;
 
@@ -311,6 +321,8 @@ CommandLineOptions toCommandLineOptions(ParseResult parseResult) {
 		// General Purpose
 		result.setDisplayHelp(this.helpRequested || this.helpRequested2);
 		result.setAnsiColorOutputDisabled(this.disableAnsiColors || this.disableAnsiColors2);
+		result.setColorPalettePath(choose(this.colorPalette, this.colorPalette2, null));
+		result.setSingleColorPalette(this.singleColorPalette || this.singleColorPalette2);
 		result.setBannerDisabled(this.disableBanner || this.disableBanner2);
 		result.setDetails(choose(this.details, this.details2, CommandLineOptions.DEFAULT_DETAILS));
 		result.setTheme(choose(this.theme, this.theme2, CommandLineOptions.DEFAULT_THEME));
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index 64342412931f..0b28db0b2f50 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -48,6 +48,8 @@ public class CommandLineOptions {
 
 	private boolean displayHelp;
 	private boolean ansiColorOutputDisabled;
+	private Path colorPalettePath;
+	private boolean isSingleColorPalette;
 	private boolean bannerDisabled;
 	private Details details = DEFAULT_DETAILS;
 	private Theme theme = DEFAULT_THEME;
@@ -98,6 +100,22 @@ public void setAnsiColorOutputDisabled(boolean ansiColorOutputDisabled) {
 		this.ansiColorOutputDisabled = ansiColorOutputDisabled;
 	}
 
+	public Path getColorPalettePath() {
+		return colorPalettePath;
+	}
+
+	public void setColorPalettePath(Path colorPalettePath) {
+		this.colorPalettePath = colorPalettePath;
+	}
+
+	public boolean isSingleColorPalette() {
+		return isSingleColorPalette;
+	}
+
+	public void setSingleColorPalette(boolean singleColorPalette) {
+		this.isSingleColorPalette = singleColorPalette;
+	}
+
 	public boolean isBannerDisabled() {
 		return this.bannerDisabled;
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
new file mode 100644
index 000000000000..41dcb8bcb3fa
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.tasks;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+class ColorPalette {
+	public static final ColorPalette SINGLE_COLOR = new ColorPalette(singleColorPalette(), false);
+	public static final ColorPalette DEFAULT = new ColorPalette(defaultPalette(), false);
+	public static final ColorPalette NONE = new ColorPalette(new EnumMap<>(Style.class), true);
+	private final Map<Style, String> colorsToAnsiSequences;
+	private final boolean disableAnsiColors;
+
+	// https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters
+	private static Map<Style, String> defaultPalette() {
+		Map<Style, String> colorsToAnsiSequences = new EnumMap<>(Style.class);
+		colorsToAnsiSequences.put(Style.NONE, "0");
+		colorsToAnsiSequences.put(Style.SUCCESSFUL, "32");
+		colorsToAnsiSequences.put(Style.ABORTED, "33");
+		colorsToAnsiSequences.put(Style.FAILED, "31");
+		colorsToAnsiSequences.put(Style.SKIPPED, "35");
+		colorsToAnsiSequences.put(Style.CONTAINER, "36");
+		colorsToAnsiSequences.put(Style.TEST, "34");
+		colorsToAnsiSequences.put(Style.DYNAMIC, "35");
+		colorsToAnsiSequences.put(Style.REPORTED, "37");
+		return colorsToAnsiSequences;
+	}
+
+	private static Map<Style, String> singleColorPalette() {
+		Map<Style, String> colorsToAnsiSequences = new EnumMap<>(Style.class);
+		colorsToAnsiSequences.put(Style.NONE, "0");
+		colorsToAnsiSequences.put(Style.SUCCESSFUL, "1");
+		colorsToAnsiSequences.put(Style.ABORTED, "4");
+		colorsToAnsiSequences.put(Style.FAILED, "7");
+		colorsToAnsiSequences.put(Style.SKIPPED, "9");
+		colorsToAnsiSequences.put(Style.CONTAINER, "1");
+		colorsToAnsiSequences.put(Style.TEST, "0");
+		colorsToAnsiSequences.put(Style.DYNAMIC, "0");
+		colorsToAnsiSequences.put(Style.REPORTED, "2");
+		return colorsToAnsiSequences;
+	}
+
+	public ColorPalette(Map<Style, String> overrides) {
+		this(defaultPalette(), false);
+
+		if (overrides.containsKey(Style.NONE)) {
+			throw new IllegalArgumentException("Cannot override the standard style 'NONE'");
+		}
+		this.colorsToAnsiSequences.putAll(overrides);
+	}
+
+	public ColorPalette(Properties properties) {
+		this(toOverrideMap(properties));
+	}
+
+	public ColorPalette(Reader reader) {
+		this(getProperties(reader));
+	}
+
+	public ColorPalette(Path path) {
+		this(getProperties(path));
+	}
+
+	private ColorPalette(Map<Style, String> colorsToAnsiSequences, boolean disableAnsiColors) {
+		this.colorsToAnsiSequences = colorsToAnsiSequences;
+		this.disableAnsiColors = disableAnsiColors;
+	}
+
+	private static Map<Style, String> toOverrideMap(Properties properties) {
+		Map<String, String> upperCaseProperties = properties.entrySet().stream().collect(
+			Collectors.toMap(entry -> ((String) entry.getKey()).toUpperCase(), entry -> (String) entry.getValue()));
+
+		return Arrays.stream(Style.values()).filter(style -> upperCaseProperties.containsKey(style.name())).collect(
+			Collectors.toMap(Function.identity(), style -> upperCaseProperties.get(style.name())));
+	}
+
+	private static Properties getProperties(Reader reader) {
+		Properties properties = new Properties();
+		try {
+			properties.load(reader);
+		}
+		catch (IOException e) {
+			throw new IllegalArgumentException("Could not read color palette properties", e);
+		}
+		return properties;
+	}
+
+	private static Properties getProperties(Path path) {
+		try (FileReader fileReader = new FileReader(path.toFile())) {
+			return getProperties(fileReader);
+		}
+		catch (IOException e) {
+			throw new IllegalArgumentException("Could not open color palette properties file", e);
+		}
+	}
+
+	public String paint(Style style, String text) {
+		return disableAnsiColors || style == Style.NONE ? text
+				: getAnsiFormatter(style) + text + getAnsiFormatter(Style.NONE);
+	}
+
+	private String getAnsiFormatter(Style style) {
+		return String.format("\u001B[%sm", colorsToAnsiSequences.get(style));
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index 0e2d351e4b66..0db8008d6a0b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -105,23 +105,36 @@ private SummaryGeneratingListener registerListeners(PrintWriter out, Launcher la
 	}
 
 	private Optional<TestExecutionListener> createDetailsPrintingListener(PrintWriter out) {
-		boolean disableAnsiColors = options.isAnsiColorOutputDisabled();
+		ColorPalette colorPalette = getColorPalette();
 		Theme theme = options.getTheme();
 		switch (options.getDetails()) {
 			case SUMMARY:
 				// summary listener is always created and registered
 				return Optional.empty();
 			case FLAT:
-				return Optional.of(new FlatPrintingListener(out, disableAnsiColors));
+				return Optional.of(new FlatPrintingListener(out, colorPalette));
 			case TREE:
-				return Optional.of(new TreePrintingListener(out, disableAnsiColors, theme));
+				return Optional.of(new TreePrintingListener(out, colorPalette, theme));
 			case VERBOSE:
-				return Optional.of(new VerboseTreePrintingListener(out, disableAnsiColors, 16, theme));
+				return Optional.of(new VerboseTreePrintingListener(out, colorPalette, 16, theme));
 			default:
 				return Optional.empty();
 		}
 	}
 
+	private ColorPalette getColorPalette() {
+		if (options.isAnsiColorOutputDisabled()) {
+			return ColorPalette.NONE;
+		}
+		if (options.getColorPalettePath() != null) {
+			return new ColorPalette(options.getColorPalettePath());
+		}
+		if (options.isSingleColorPalette()) {
+			return ColorPalette.SINGLE_COLOR;
+		}
+		return ColorPalette.DEFAULT;
+	}
+
 	private Optional<TestExecutionListener> createXmlWritingListener(PrintWriter out) {
 		return options.getReportsDir().map(reportsDir -> new LegacyXmlReportGeneratingListener(reportsDir, out));
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
index 629ae306594b..e1849cc5001d 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
@@ -10,8 +10,6 @@
 
 package org.junit.platform.console.tasks;
 
-import static org.junit.platform.console.tasks.Color.NONE;
-
 import java.io.PrintWriter;
 import java.util.regex.Pattern;
 
@@ -32,11 +30,11 @@ class FlatPrintingListener implements TestExecutionListener {
 	static final String INDENTATION = "             ";
 
 	private final PrintWriter out;
-	private final boolean disableAnsiColors;
+	private final ColorPalette colorPalette;
 
-	FlatPrintingListener(PrintWriter out, boolean disableAnsiColors) {
+	FlatPrintingListener(PrintWriter out, ColorPalette colorPalette) {
 		this.out = out;
-		this.disableAnsiColors = disableAnsiColors;
+		this.colorPalette = colorPalette;
 	}
 
 	@Override
@@ -52,57 +50,47 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 
 	@Override
 	public void dynamicTestRegistered(TestIdentifier testIdentifier) {
-		printlnTestDescriptor(Color.DYNAMIC, "Registered:", testIdentifier);
+		printlnTestDescriptor(Style.DYNAMIC, "Registered:", testIdentifier);
 	}
 
 	@Override
 	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
-		printlnTestDescriptor(Color.SKIPPED, "Skipped:", testIdentifier);
-		printlnMessage(Color.SKIPPED, "Reason", reason);
+		printlnTestDescriptor(Style.SKIPPED, "Skipped:", testIdentifier);
+		printlnMessage(Style.SKIPPED, "Reason", reason);
 	}
 
 	@Override
 	public void executionStarted(TestIdentifier testIdentifier) {
-		printlnTestDescriptor(Color.valueOf(testIdentifier), "Started:", testIdentifier);
+		printlnTestDescriptor(Style.valueOf(testIdentifier), "Started:", testIdentifier);
 	}
 
 	@Override
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-		Color color = Color.valueOf(testExecutionResult);
-		printlnTestDescriptor(color, "Finished:", testIdentifier);
-		testExecutionResult.getThrowable().ifPresent(t -> printlnException(color, t));
+		Style style = Style.valueOf(testExecutionResult);
+		printlnTestDescriptor(style, "Finished:", testIdentifier);
+		testExecutionResult.getThrowable().ifPresent(t -> printlnException(style, t));
 	}
 
 	@Override
 	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
-		printlnTestDescriptor(Color.REPORTED, "Reported:", testIdentifier);
-		printlnMessage(Color.REPORTED, "Reported values", entry.toString());
-	}
-
-	private void printlnTestDescriptor(Color color, String message, TestIdentifier testIdentifier) {
-		println(color, "%-10s   %s (%s)", message, testIdentifier.getDisplayName(), testIdentifier.getUniqueId());
+		printlnTestDescriptor(Style.REPORTED, "Reported:", testIdentifier);
+		printlnMessage(Style.REPORTED, "Reported values", entry.toString());
 	}
 
-	private void printlnException(Color color, Throwable throwable) {
-		printlnMessage(color, "Exception", ExceptionUtils.readStackTrace(throwable));
+	private void printlnTestDescriptor(Style style, String message, TestIdentifier testIdentifier) {
+		println(style, "%-10s   %s (%s)", message, testIdentifier.getDisplayName(), testIdentifier.getUniqueId());
 	}
 
-	private void printlnMessage(Color color, String message, String detail) {
-		println(color, INDENTATION + "=> " + message + ": %s", indented(detail));
+	private void printlnException(Style style, Throwable throwable) {
+		printlnMessage(style, "Exception", ExceptionUtils.readStackTrace(throwable));
 	}
 
-	private void println(Color color, String format, Object... args) {
-		println(color, String.format(format, args));
+	private void printlnMessage(Style style, String message, String detail) {
+		println(style, INDENTATION + "=> " + message + ": %s", indented(detail));
 	}
 
-	private void println(Color color, String message) {
-		if (this.disableAnsiColors) {
-			this.out.println(message);
-		}
-		else {
-			// Use string concatenation to avoid ANSI disruption on console
-			this.out.println(color + message + NONE);
-		}
+	private void println(Style style, String format, Object... args) {
+		this.out.println(colorPalette.paint(style, String.format(format, args)));
 	}
 
 	/**
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
new file mode 100644
index 000000000000..1f5a68de53e3
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.tasks;
+
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.launcher.TestIdentifier;
+
+/**
+ * @since 1.9
+ */
+enum Style {
+	NONE, SUCCESSFUL, ABORTED, FAILED, SKIPPED, CONTAINER, TEST, DYNAMIC, REPORTED;
+
+	static Style valueOf(TestExecutionResult result) {
+		switch (result.getStatus()) {
+			case SUCCESSFUL:
+				return Style.SUCCESSFUL;
+			case ABORTED:
+				return Style.ABORTED;
+			case FAILED:
+				return Style.FAILED;
+			default:
+				return Style.NONE;
+		}
+	}
+
+	static Style valueOf(TestIdentifier testIdentifier) {
+		return testIdentifier.isContainer() ? CONTAINER : TEST;
+	}
+
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
index b4e7b3c04099..a713aaf4a27b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
@@ -11,12 +11,6 @@
 package org.junit.platform.console.tasks;
 
 import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement;
-import static org.junit.platform.console.tasks.Color.CONTAINER;
-import static org.junit.platform.console.tasks.Color.FAILED;
-import static org.junit.platform.console.tasks.Color.GREEN;
-import static org.junit.platform.console.tasks.Color.NONE;
-import static org.junit.platform.console.tasks.Color.SKIPPED;
-import static org.junit.platform.console.tasks.Color.YELLOW;
 
 import java.io.PrintWriter;
 import java.util.Iterator;
@@ -36,16 +30,16 @@ class TreePrinter {
 
 	private final PrintWriter out;
 	private final Theme theme;
-	private final boolean disableAnsiColors;
+	private final ColorPalette colorPalette;
 
-	TreePrinter(PrintWriter out, Theme theme, boolean disableAnsiColors) {
+	TreePrinter(PrintWriter out, Theme theme, ColorPalette colorPalette) {
 		this.out = out;
 		this.theme = theme;
-		this.disableAnsiColors = disableAnsiColors;
+		this.colorPalette = colorPalette;
 	}
 
 	void print(TreeNode node) {
-		out.println(color(CONTAINER, theme.root()));
+		out.println(color(Style.CONTAINER, theme.root()));
 		print(node, "", true);
 		out.flush();
 	}
@@ -68,15 +62,15 @@ private void print(TreeNode node, String indent, boolean continuous) {
 
 	private void printVisible(TreeNode node, String indent, boolean continuous) {
 		String bullet = continuous ? theme.entry() : theme.end();
-		String prefix = color(CONTAINER, indent + bullet);
-		String tabbed = color(CONTAINER, indent + tab(node, continuous));
+		String prefix = color(Style.CONTAINER, indent + bullet);
+		String tabbed = color(Style.CONTAINER, indent + tab(node, continuous));
 		String caption = colorCaption(node);
-		String duration = color(CONTAINER, node.duration + " ms");
-		String icon = color(SKIPPED, theme.skipped());
+		String duration = color(Style.CONTAINER, node.duration + " ms");
+		String icon = color(Style.SKIPPED, theme.skipped());
 		if (node.result().isPresent()) {
 			TestExecutionResult result = node.result().get();
-			Color resultColor = Color.valueOf(result);
-			icon = color(resultColor, theme.status(result));
+			Style resultStyle = Style.valueOf(result);
+			icon = color(resultStyle, theme.status(result));
 		}
 		out.print(prefix);
 		out.print(" ");
@@ -88,7 +82,7 @@ private void printVisible(TreeNode node, String indent, boolean continuous) {
 		out.print(" ");
 		out.print(icon);
 		node.result().ifPresent(result -> printThrowable(tabbed, result));
-		node.reason().ifPresent(reason -> printMessage(SKIPPED, tabbed, reason));
+		node.reason().ifPresent(reason -> printMessage(Style.SKIPPED, tabbed, reason));
 		node.reports.forEach(e -> printReportEntry(tabbed, e));
 		out.println();
 	}
@@ -108,16 +102,16 @@ private String colorCaption(TreeNode node) {
 		String caption = node.caption();
 		if (node.result().isPresent()) {
 			TestExecutionResult result = node.result().get();
-			Color resultColor = Color.valueOf(result);
+			Style resultStyle = Style.valueOf(result);
 			if (result.getStatus() != Status.SUCCESSFUL) {
-				return color(resultColor, caption);
+				return color(resultStyle, caption);
 			}
 		}
 		if (node.reason().isPresent()) {
-			return color(SKIPPED, caption);
+			return color(Style.SKIPPED, caption);
 		}
-		Color color = node.identifier().map(Color::valueOf).orElse(Color.NONE);
-		return color(color, caption);
+		Style style = node.identifier().map(Style::valueOf).orElse(Style.NONE);
+		return color(style, caption);
 	}
 
 	private void printThrowable(String indent, TestExecutionResult result) {
@@ -129,7 +123,7 @@ private void printThrowable(String indent, TestExecutionResult result) {
 		if (StringUtils.isBlank(message)) {
 			message = throwable.toString();
 		}
-		printMessage(FAILED, indent, message);
+		printMessage(Style.FAILED, indent, message);
 	}
 
 	private void printReportEntry(String indent, ReportEntry reportEntry) {
@@ -149,33 +143,30 @@ private void printReportEntry(String indent, ReportEntry reportEntry) {
 
 	private void printReportEntry(String indent, Map.Entry<String, String> mapEntry) {
 		out.print(indent);
-		out.print(color(YELLOW, mapEntry.getKey()));
+		out.print(color(Style.ABORTED, mapEntry.getKey()));
 		out.print(" = `");
-		out.print(color(GREEN, mapEntry.getValue()));
+		out.print(color(Style.SUCCESSFUL, mapEntry.getValue()));
 		out.print("`");
 	}
 
-	private void printMessage(Color color, String indent, String message) {
+	private void printMessage(Style style, String indent, String message) {
 		String[] lines = message.split("\\R");
 		out.print(" ");
-		out.print(color(color, lines[0]));
+		out.print(color(style, lines[0]));
 		if (lines.length > 1) {
 			for (int i = 1; i < lines.length; i++) {
 				out.println();
 				out.print(indent);
 				if (StringUtils.isNotBlank(lines[i])) {
 					String extra = theme.blank();
-					out.print(color(color, extra + lines[i]));
+					out.print(color(style, extra + lines[i]));
 				}
 			}
 		}
 	}
 
-	private String color(Color color, String text) {
-		if (disableAnsiColors || color == NONE) {
-			return text;
-		}
-		return color.toString() + text + NONE.toString();
+	private String color(Style style, String text) {
+		return colorPalette.paint(style, text);
 	}
 
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
index b70778a00af7..936d32545bc3 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
@@ -31,8 +31,8 @@ class TreePrintingListener implements TestExecutionListener {
 	private TreeNode root;
 	private final TreePrinter treePrinter;
 
-	TreePrintingListener(PrintWriter out, boolean disableAnsiColors, Theme theme) {
-		this.treePrinter = new TreePrinter(out, theme, disableAnsiColors);
+	TreePrintingListener(PrintWriter out, ColorPalette colorPalette, Theme theme) {
+		this.treePrinter = new TreePrinter(out, theme, colorPalette);
 	}
 
 	private TreeNode addNode(TestIdentifier testIdentifier, Supplier<TreeNode> nodeSupplier) {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
index 56cc63a84ff4..a411528de916 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
@@ -11,7 +11,7 @@
 package org.junit.platform.console.tasks;
 
 import static org.junit.platform.commons.util.ExceptionUtils.readStackTrace;
-import static org.junit.platform.console.tasks.Color.NONE;
+import static org.junit.platform.console.tasks.Style.NONE;
 
 import java.io.PrintWriter;
 import java.util.ArrayDeque;
@@ -30,15 +30,15 @@
 class VerboseTreePrintingListener implements TestExecutionListener {
 
 	private final PrintWriter out;
-	private final boolean disableAnsiColors;
 	private final Theme theme;
+	private final ColorPalette colorPalette;
 	private final Deque<Long> frames;
 	private final String[] verticals;
 	private long executionStartedMillis;
 
-	VerboseTreePrintingListener(PrintWriter out, boolean disableAnsiColors, int maxContainerNestingLevel, Theme theme) {
+	VerboseTreePrintingListener(PrintWriter out, ColorPalette colorPalette, int maxContainerNestingLevel, Theme theme) {
 		this.out = out;
-		this.disableAnsiColors = disableAnsiColors;
+		this.colorPalette = colorPalette;
 		this.theme = theme;
 
 		// create frame stack and push initial root frame
@@ -62,8 +62,8 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 
 		long tests = testPlan.countTestIdentifiers(TestIdentifier::isTest);
 		printf(NONE, "%s", "Test plan execution started. Number of static tests: ");
-		printf(Color.TEST, "%d%n", tests);
-		printf(Color.CONTAINER, "%s%n", theme.root());
+		printf(Style.TEST, "%d%n", tests);
+		printf(Style.CONTAINER, "%s%n", theme.root());
 	}
 
 	@Override
@@ -72,7 +72,7 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 
 		long tests = testPlan.countTestIdentifiers(TestIdentifier::isTest);
 		printf(NONE, "%s", "Test plan execution finished. Number of all tests: ");
-		printf(Color.TEST, "%d%n", tests);
+		printf(Style.TEST, "%d%n", tests);
 	}
 
 	@Override
@@ -80,7 +80,7 @@ public void executionStarted(TestIdentifier testIdentifier) {
 		this.executionStartedMillis = System.currentTimeMillis();
 		if (testIdentifier.isContainer()) {
 			printVerticals(theme.entry());
-			printf(Color.CONTAINER, " %s", testIdentifier.getDisplayName());
+			printf(Style.CONTAINER, " %s", testIdentifier.getDisplayName());
 			printf(NONE, "%n");
 			frames.push(System.currentTimeMillis());
 		}
@@ -88,44 +88,44 @@ public void executionStarted(TestIdentifier testIdentifier) {
 			return;
 		}
 		printVerticals(theme.entry());
-		printf(Color.valueOf(testIdentifier), " %s%n", testIdentifier.getDisplayName());
+		printf(Style.valueOf(testIdentifier), " %s%n", testIdentifier.getDisplayName());
 		printDetails(testIdentifier);
 	}
 
 	@Override
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-		testExecutionResult.getThrowable().ifPresent(t -> printDetail(Color.FAILED, "caught", readStackTrace(t)));
+		testExecutionResult.getThrowable().ifPresent(t -> printDetail(Style.FAILED, "caught", readStackTrace(t)));
 		if (testIdentifier.isContainer()) {
 			Long creationMillis = frames.pop();
 			printVerticals(theme.end());
-			printf(Color.CONTAINER, " %s", testIdentifier.getDisplayName());
+			printf(Style.CONTAINER, " %s", testIdentifier.getDisplayName());
 			printf(NONE, " finished after %d ms.%n", System.currentTimeMillis() - creationMillis);
 			return;
 		}
 		printDetail(NONE, "duration", "%d ms%n", System.currentTimeMillis() - executionStartedMillis);
 		String status = theme.status(testExecutionResult) + " " + testExecutionResult.getStatus();
-		printDetail(Color.valueOf(testExecutionResult), "status", "%s%n", status);
+		printDetail(Style.valueOf(testExecutionResult), "status", "%s%n", status);
 	}
 
 	@Override
 	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
 		printVerticals(theme.entry());
-		printf(Color.valueOf(testIdentifier), " %s%n", testIdentifier.getDisplayName());
+		printf(Style.valueOf(testIdentifier), " %s%n", testIdentifier.getDisplayName());
 		printDetails(testIdentifier);
-		printDetail(Color.SKIPPED, "reason", reason);
-		printDetail(Color.SKIPPED, "status", theme.skipped() + " SKIPPED");
+		printDetail(Style.SKIPPED, "reason", reason);
+		printDetail(Style.SKIPPED, "status", theme.skipped() + " SKIPPED");
 	}
 
 	@Override
 	public void dynamicTestRegistered(TestIdentifier testIdentifier) {
 		printVerticals(theme.entry());
-		printf(Color.DYNAMIC, " %s", testIdentifier.getDisplayName());
+		printf(Style.DYNAMIC, " %s", testIdentifier.getDisplayName());
 		printf(NONE, "%s%n", " dynamically registered");
 	}
 
 	@Override
 	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
-		printDetail(Color.REPORTED, "reports", entry.toString());
+		printDetail(Style.REPORTED, "reports", entry.toString());
 	}
 
 	/**
@@ -151,20 +151,15 @@ private void printVerticals(String tile) {
 		printf(NONE, tile);
 	}
 
-	private void printf(Color color, String message, Object... args) {
-		if (disableAnsiColors || color == NONE) {
-			out.printf(message, args);
-		}
-		else {
-			out.printf(color + message + NONE, args);
-		}
+	private void printf(Style style, String message, Object... args) {
+		out.printf(colorPalette.paint(style, message), args);
 		out.flush();
 	}
 
 	/**
 	 * Print single detail with a potential multi-line message.
 	 */
-	private void printDetail(Color color, String detail, String format, Object... args) {
+	private void printDetail(Style style, String detail, String format, Object... args) {
 		// print initial verticals - expecting to be at start of the line
 		String verticals = verticals(frames.size() + 1);
 		printf(NONE, verticals);
@@ -175,17 +170,17 @@ private void printDetail(Color color, String detail, String format, Object... ar
 		}
 		// trivial case: at least one arg is given? Let printf do the entire work
 		if (args.length > 0) {
-			printf(color, format, args);
+			printf(style, format, args);
 			return;
 		}
 		// still here? Split format into separate lines and indent them from the second line on
 		String[] lines = format.split("\\R");
-		printf(color, "%s", lines[0]);
+		printf(style, "%s", lines[0]);
 		if (lines.length > 1) {
 			String delimiter = System.lineSeparator() + verticals + String.format(detailFormat + "    ", "");
 			for (int i = 1; i < lines.length; i++) {
 				printf(NONE, "%s", delimiter);
-				printf(color, "%s", lines[i]);
+				printf(style, "%s", lines[i]);
 			}
 		}
 		printf(NONE, "%n");
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTest.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTest.java
new file mode 100644
index 000000000000..f4ab1b5ef23b
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.tasks;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.Mockito.mock;
+
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.console.options.Theme;
+import org.junit.platform.engine.ConfigurationParameters;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.reporting.ReportEntry;
+import org.junit.platform.fakes.TestDescriptorStub;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+class ColorPaletteTest {
+	@Nested
+	class LoadFromProperties {
+		@Test
+		void singleOverride() {
+			String properties = """
+					SUCCESSFUL = 35;1
+					""";
+			ColorPalette colorPalette = new ColorPalette(new StringReader(properties));
+
+			String actual = colorPalette.paint(Style.SUCCESSFUL, "text");
+
+			Assertions.assertEquals("\u001B[35;1mtext\u001B[0m", actual);
+		}
+
+		@Test
+		void keysAreCaseInsensitive() {
+			String properties = """
+					suCcESSfuL = 35;1
+					""";
+			ColorPalette colorPalette = new ColorPalette(new StringReader(properties));
+
+			String actual = colorPalette.paint(Style.SUCCESSFUL, "text");
+
+			Assertions.assertEquals("\u001B[35;1mtext\u001B[0m", actual);
+		}
+
+		@Test
+		void junkKeysAreIgnored() {
+			String properties = """
+					SUCCESSFUL = 35;1
+					JUNK = 1;31;40
+					""";
+			ColorPalette colorPalette = new ColorPalette(new StringReader(properties));
+
+			String actual = colorPalette.paint(Style.SUCCESSFUL, "text");
+
+			Assertions.assertEquals("\u001B[35;1mtext\u001B[0m", actual);
+		}
+
+		@Test
+		void multipleOverrides() {
+			String properties = """
+					SUCCESSFUL = 35;1
+					FAILED = 33;4
+					""";
+			ColorPalette colorPalette = new ColorPalette(new StringReader(properties));
+
+			String successful = colorPalette.paint(Style.SUCCESSFUL, "text");
+			String failed = colorPalette.paint(Style.FAILED, "text");
+
+			Assertions.assertEquals("\u001B[35;1mtext\u001B[0m", successful);
+			Assertions.assertEquals("\u001B[33;4mtext\u001B[0m", failed);
+		}
+
+		@Test
+		void unspecifiedStylesAreDefault() {
+			String properties = """
+					SUCCESSFUL = 35;1
+					""";
+			ColorPalette colorPalette = new ColorPalette(new StringReader(properties));
+
+			String actual = colorPalette.paint(Style.FAILED, "text");
+
+			Assertions.assertEquals("\u001B[31mtext\u001B[0m", actual);
+		}
+
+		@Test
+		void cannotOverrideNone() {
+			String properties = """
+					NONE = 35;1
+					""";
+			StringReader reader = new StringReader(properties);
+
+			Assertions.assertThrows(IllegalArgumentException.class, () -> new ColorPalette(reader));
+		}
+	}
+
+	@Nested
+	class DemonstratePalettes {
+		@Test
+		void verbose_default() {
+			PrintWriter out = new PrintWriter(System.out);
+			TestExecutionListener listener = new VerboseTreePrintingListener(out, ColorPalette.DEFAULT, 16,
+				Theme.ASCII);
+
+			demoTestRun(listener);
+
+			assertDoesNotThrow(out::flush);
+		}
+
+		@Test
+		void verbose_single_color() {
+			PrintWriter out = new PrintWriter(System.out);
+			TestExecutionListener listener = new VerboseTreePrintingListener(out, ColorPalette.SINGLE_COLOR, 16,
+				Theme.ASCII);
+
+			demoTestRun(listener);
+
+			assertDoesNotThrow(out::flush);
+		}
+
+		@Test
+		void simple_default() {
+			PrintWriter out = new PrintWriter(System.out);
+			TestExecutionListener listener = new TreePrintingListener(out, ColorPalette.DEFAULT, Theme.ASCII);
+
+			demoTestRun(listener);
+
+			assertDoesNotThrow(out::flush);
+		}
+
+		@Test
+		void simple_single_color() {
+			PrintWriter out = new PrintWriter(System.out);
+			TestExecutionListener listener = new TreePrintingListener(out, ColorPalette.SINGLE_COLOR, Theme.ASCII);
+
+			demoTestRun(listener);
+
+			assertDoesNotThrow(out::flush);
+		}
+
+		@Test
+		void flat_default() {
+			PrintWriter out = new PrintWriter(System.out);
+			TestExecutionListener listener = new FlatPrintingListener(out, ColorPalette.DEFAULT);
+
+			demoTestRun(listener);
+
+			assertDoesNotThrow(out::flush);
+		}
+
+		@Test
+		void flat_single_color() {
+			PrintWriter out = new PrintWriter(System.out);
+			TestExecutionListener listener = new FlatPrintingListener(out, ColorPalette.SINGLE_COLOR);
+
+			demoTestRun(listener);
+
+			assertDoesNotThrow(out::flush);
+		}
+
+		private void demoTestRun(TestExecutionListener listener) {
+			TestDescriptor testDescriptor = new TestDescriptorStub(UniqueId.forEngine("demo-engine"), "My Test");
+			TestPlan testPlan = TestPlan.from(List.of(testDescriptor), mock(ConfigurationParameters.class));
+			listener.testPlanExecutionStarted(testPlan);
+			listener.executionStarted(TestIdentifier.from(testDescriptor));
+			listener.executionFinished(TestIdentifier.from(testDescriptor), TestExecutionResult.successful());
+			listener.dynamicTestRegistered(TestIdentifier.from(testDescriptor));
+			listener.executionStarted(TestIdentifier.from(testDescriptor));
+			listener.executionFinished(TestIdentifier.from(testDescriptor),
+				TestExecutionResult.failed(new Exception()));
+			listener.executionStarted(TestIdentifier.from(testDescriptor));
+			listener.executionFinished(TestIdentifier.from(testDescriptor),
+				TestExecutionResult.aborted(new Exception()));
+			listener.reportingEntryPublished(TestIdentifier.from(testDescriptor), ReportEntry.from("Key", "Value"));
+			listener.executionSkipped(TestIdentifier.from(testDescriptor), "to demonstrate skipping");
+			listener.testPlanExecutionFinished(testPlan);
+		}
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
index 7bb1ec8969d7..2bbe98bff9dd 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
@@ -19,6 +19,8 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import org.assertj.core.util.Maps;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
@@ -69,8 +71,91 @@ void executionFinishedWithFailure() {
 			() -> assertEquals(INDENTATION + "=> Exception: java.lang.AssertionError: Boom!", lines[1]));
 	}
 
+	@Nested
+	class Color {
+		@Nested
+		class Default {
+			@Test
+			void executionSkipped() {
+				var stringWriter = new StringWriter();
+				new FlatPrintingListener(new PrintWriter(stringWriter), ColorPalette.DEFAULT).executionSkipped(
+					newTestIdentifier(), "Test" + EOL + "disabled");
+				var lines = lines(stringWriter);
+
+				assertEquals(3, lines.length);
+				assertAll("lines in the output", //
+					() -> assertEquals("\u001B[35mSkipped:     demo-test ([engine:demo-engine])\u001B[0m", lines[0]), //
+					() -> assertEquals("\u001B[35m" + INDENTATION + "=> Reason: Test", lines[1]), //
+					() -> assertEquals(INDENTATION + "disabled\u001B[0m", lines[2]));
+			}
+
+			@Test
+			void reportingEntryPublished() {
+				var stringWriter = new StringWriter();
+				new FlatPrintingListener(new PrintWriter(stringWriter), ColorPalette.DEFAULT).reportingEntryPublished(
+					newTestIdentifier(), ReportEntry.from("foo", "bar"));
+				var lines = lines(stringWriter);
+
+				assertEquals(2, lines.length);
+				assertAll("lines in the output", //
+					() -> assertEquals("\u001B[37mReported:    demo-test ([engine:demo-engine])\u001B[0m", lines[0]), //
+					() -> assertTrue(lines[1].startsWith(
+						"\u001B[37m" + INDENTATION + "=> Reported values: ReportEntry [timestamp =")), //
+					() -> assertTrue(lines[1].endsWith(", foo = 'bar']\u001B[0m")));
+			}
+
+			@Test
+			void executionFinishedWithFailure() {
+				var stringWriter = new StringWriter();
+				new FlatPrintingListener(new PrintWriter(stringWriter), ColorPalette.DEFAULT).executionFinished(
+					newTestIdentifier(), failed(new AssertionError("Boom!")));
+				var lines = lines(stringWriter);
+
+				assertAll("lines in the output", //
+					() -> assertEquals("\u001B[31mFinished:    demo-test ([engine:demo-engine])\u001B[0m", lines[0]), //
+					() -> assertEquals("\u001B[31m" + INDENTATION + "=> Exception: java.lang.AssertionError: Boom!",
+						lines[1]),
+					() -> assertTrue(lines[lines.length - 1].endsWith("\u001B[0m")));
+			}
+		}
+
+		@Nested
+		class Overrides {
+			@Test
+			void overridingSkipped() {
+				var stringWriter = new StringWriter();
+				ColorPalette colorPalette = new ColorPalette(Maps.newHashMap(Style.SKIPPED, "36;7"));
+				new FlatPrintingListener(new PrintWriter(stringWriter), colorPalette).executionSkipped(
+					newTestIdentifier(), "Test" + EOL + "disabled");
+				var lines = lines(stringWriter);
+
+				assertEquals(3, lines.length);
+				assertAll("lines in the output", //
+					() -> assertEquals("\u001B[36;7mSkipped:     demo-test ([engine:demo-engine])\u001B[0m", lines[0]), //
+					() -> assertEquals("\u001B[36;7m" + INDENTATION + "=> Reason: Test", lines[1]), //
+					() -> assertEquals(INDENTATION + "disabled\u001B[0m", lines[2]));
+			}
+
+			@Test
+			void overridingUnusedStyle() {
+				var stringWriter = new StringWriter();
+				ColorPalette colorPalette = new ColorPalette(Maps.newHashMap(Style.FAILED, "36;7"));
+				new FlatPrintingListener(new PrintWriter(stringWriter), colorPalette).executionSkipped(
+					newTestIdentifier(), "Test" + EOL + "disabled");
+				var lines = lines(stringWriter);
+
+				assertEquals(3, lines.length);
+				assertAll("lines in the output", //
+					() -> assertEquals("\u001B[35mSkipped:     demo-test ([engine:demo-engine])\u001B[0m", lines[0]), //
+					() -> assertEquals("\u001B[35m" + INDENTATION + "=> Reason: Test", lines[1]), //
+					() -> assertEquals(INDENTATION + "disabled\u001B[0m", lines[2]));
+			}
+		}
+
+	}
+
 	private FlatPrintingListener listener(StringWriter stringWriter) {
-		return new FlatPrintingListener(new PrintWriter(stringWriter), true);
+		return new FlatPrintingListener(new PrintWriter(stringWriter), ColorPalette.NONE);
 	}
 
 	private static TestIdentifier newTestIdentifier() {
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
index b244d8cd67ee..018ea4af911d 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
@@ -50,7 +50,7 @@ private List<String> actual() {
 
 	@Test
 	void emptyTree() {
-		new TreePrinter(out, Theme.UNICODE, true).print(new TreeNode("<root>"));
+		new TreePrinter(out, Theme.UNICODE, ColorPalette.NONE).print(new TreeNode("<root>"));
 		assertIterableEquals(List.of("╷"), actual());
 	}
 
@@ -61,7 +61,7 @@ void emptyEngines() {
 		root.addChild(new TreeNode(identifier("e-1", "engine one")).setResult(successful()));
 		root.addChild(new TreeNode(identifier("e-2", "engine two")).setResult(failed(null)));
 		root.addChild(new TreeNode(identifier("e-3", "engine three")).setResult(aborted(null)));
-		new TreePrinter(out, Theme.UNICODE, true).print(root);
+		new TreePrinter(out, Theme.UNICODE, ColorPalette.NONE).print(root);
 		assertIterableEquals( //
 			List.of( //
 				"╷", //
@@ -77,7 +77,7 @@ void emptyEngines() {
 	void printNodeHandlesNullMessageThrowableGracefully() {
 		var result = TestExecutionResult.failed(new NullPointerException());
 		var node = new TreeNode(identifier("NPE", "test()")).setResult(result);
-		new TreePrinter(out, Theme.ASCII, true).print(node);
+		new TreePrinter(out, Theme.ASCII, ColorPalette.NONE).print(node);
 		assertLinesMatch(List.of(".", "+-- test() [X] java.lang.NullPointerException"), actual());
 	}
 
@@ -101,7 +101,7 @@ void reportsAreTabbedCorrectly() {
 		m2.addReportEntry(ReportEntry.from("key", "m-2"));
 		c1.addChild(m2);
 
-		new TreePrinter(out, Theme.UNICODE, true).print(root);
+		new TreePrinter(out, Theme.UNICODE, ColorPalette.NONE).print(root);
 		assertLinesMatch(List.of( //
 			"╷", //
 			"└─ engine one ✔", //
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
index ebf4c806ccff..aa212b4754e9 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
@@ -81,7 +81,7 @@ void failureMessageWithFormatSpecifier() {
 	}
 
 	private VerboseTreePrintingListener listener(StringWriter stringWriter) {
-		return new VerboseTreePrintingListener(new PrintWriter(stringWriter), true, 16, Theme.ASCII);
+		return new VerboseTreePrintingListener(new PrintWriter(stringWriter), ColorPalette.NONE, 16, Theme.ASCII);
 	}
 
 	private static TestIdentifier newTestIdentifier() {

From da646b5265f309fd5e71e062f6a91e99207718a7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 13:30:30 +0200
Subject: [PATCH 0727/1433] Use Preconditions.notNull

---
 .../launcher/core/EngineExecutionOrchestrator.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index 011db2f3c8b8..982d62a91371 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.launcher.core;
 
-import static java.util.Objects.requireNonNull;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.launcher.core.ListenerRegistry.forEngineExecutionListeners;
 
@@ -19,6 +18,7 @@
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.UnrecoverableExceptions;
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.EngineExecutionListener;
@@ -65,9 +65,9 @@ void execute(InternalTestPlan internalTestPlan, TestExecutionListener... listene
 	@API(status = INTERNAL, since = "1.9", consumers = { "org.junit.platform.suite.engine" })
 	public void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionListener engineExecutionListener,
 			TestExecutionListener testExecutionListener) {
-		requireNonNull(discoveryResult);
-		requireNonNull(engineExecutionListener);
-		requireNonNull(testExecutionListener);
+		Preconditions.notNull(discoveryResult, "discoveryResult must not be null");
+		Preconditions.notNull(engineExecutionListener, "engineExecutionListener must not be null");
+		Preconditions.notNull(testExecutionListener, "testExecutionListener must not be null");
 
 		InternalTestPlan internalTestPlan = InternalTestPlan.from(discoveryResult);
 		execute(internalTestPlan, engineExecutionListener, testExecutionListener);
@@ -113,8 +113,8 @@ private void withInterceptedStreams(ConfigurationParameters configurationParamet
 	 */
 	@API(status = INTERNAL, since = "1.7", consumers = { "org.junit.platform.testkit" })
 	public void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionListener engineExecutionListener) {
-		requireNonNull(discoveryResult);
-		requireNonNull(engineExecutionListener);
+		Preconditions.notNull(discoveryResult, "discoveryResult must not be null");
+		Preconditions.notNull(engineExecutionListener, "engineExecutionListener must not be null");
 
 		for (TestEngine testEngine : discoveryResult.getTestEngines()) {
 			TestDescriptor engineDescriptor = discoveryResult.getEngineTestDescriptor(testEngine);

From 8d8609a8005b40d51b2364983f9d5ef12f888173 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 13:34:16 +0200
Subject: [PATCH 0728/1433] Throw JUnitException instead of
 IllegalStateException

---
 .../org/junit/jupiter/engine/extension/TempDirectory.java    | 5 +++--
 .../org/junit/platform/suite/engine/SuiteTestDescriptor.java | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index d0873ab1f283..44411380e44b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -50,6 +50,7 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.config.EnumConfigurationParameterConverter;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ExceptionUtils;
@@ -152,12 +153,12 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 
 	private CleanupMode determineCleanupModeForField(Field field) {
 		TempDir tempDir = findAnnotation(field, TempDir.class).orElseThrow(
-			() -> new IllegalStateException("Field " + field + " must be annotated with @TempDir"));
+			() -> new JUnitException("Field " + field + " must be annotated with @TempDir"));
 		return determineCleanupMode(tempDir);
 	}
 
 	private CleanupMode determineCleanupModeForParameter(ParameterContext parameterContext) {
-		TempDir tempDir = parameterContext.findAnnotation(TempDir.class).orElseThrow(() -> new IllegalStateException(
+		TempDir tempDir = parameterContext.findAnnotation(TempDir.class).orElseThrow(() -> new JUnitException(
 			"Parameter " + parameterContext.getParameter() + " must be annotated with @TempDir"));
 		return determineCleanupMode(tempDir);
 	}
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index a41318dbd743..c1dab2e1d491 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -18,6 +18,7 @@
 
 import java.util.function.Supplier;
 
+import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.ConfigurationParameters;
@@ -85,7 +86,7 @@ private static Boolean getFailIfNoTests(Class<?> suiteClass) {
 		// @formatter:off
 		return findAnnotation(suiteClass, Suite.class)
 				.map(Suite::failIfNoTests)
-				.orElseThrow(() -> new IllegalStateException(String.format("Suite [%s] was not annotated with @Suite", suiteClass.getName())));
+				.orElseThrow(() -> new JUnitException(String.format("Suite [%s] was not annotated with @Suite", suiteClass.getName())));
 		// @formatter:on
 	}
 

From fcbf6ddcde1cbe89876c79d9238ac0db16450450 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 13:36:49 +0200
Subject: [PATCH 0729/1433] Rename for consistency with other exception classes

---
 ...tDiscoverAnyTests.java => NoTestsDiscoveredException.java} | 4 ++--
 .../org/junit/platform/suite/engine/SuiteTestDescriptor.java  | 2 +-
 .../org/junit/platform/suite/engine/SuiteEngineTests.java     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/{SuiteDidNotDiscoverAnyTests.java => NoTestsDiscoveredException.java} (83%)

diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteDidNotDiscoverAnyTests.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/NoTestsDiscoveredException.java
similarity index 83%
rename from junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteDidNotDiscoverAnyTests.java
rename to junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/NoTestsDiscoveredException.java
index 6197ff90c1c4..5307c8dc3a64 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteDidNotDiscoverAnyTests.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/NoTestsDiscoveredException.java
@@ -12,11 +12,11 @@
 
 import org.junit.platform.commons.JUnitException;
 
-class SuiteDidNotDiscoverAnyTests extends JUnitException {
+class NoTestsDiscoveredException extends JUnitException {
 
 	private static final long serialVersionUID = 1L;
 
-	SuiteDidNotDiscoverAnyTests(Class<?> suiteClass) {
+	NoTestsDiscoveredException(Class<?> suiteClass) {
 		super(String.format("Suite [%s] did not discover any tests", suiteClass.getName()));
 	}
 
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index c1dab2e1d491..680a1291aa18 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -149,7 +149,7 @@ void execute(EngineExecutionListener parentEngineExecutionListener) {
 
 	private TestExecutionResult computeTestExecutionResult(TestExecutionSummary summary) {
 		if (failIfNoTests && summary.getTestsFoundCount() == 0) {
-			return TestExecutionResult.failed(new SuiteDidNotDiscoverAnyTests(suiteClass));
+			return TestExecutionResult.failed(new NoTestsDiscoveredException(suiteClass));
 		}
 		return TestExecutionResult.successful();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index 2235f12386f9..208803c9e1e6 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -291,7 +291,7 @@ void emptySuiteFails() {
 				.execute()
 				.containerEvents()
 				.assertThatEvents()
-				.haveExactly(1, event(container(EmptyTestCaseSuite.class), finishedWithFailure(instanceOf(SuiteDidNotDiscoverAnyTests.class))));
+				.haveExactly(1, event(container(EmptyTestCaseSuite.class), finishedWithFailure(instanceOf(NoTestsDiscoveredException.class))));
 		// @formatter:on
 	}
 
@@ -315,7 +315,7 @@ void emptyDynamicSuiteFails() {
 				.execute()
 				.containerEvents()
 				.assertThatEvents()
-				.haveExactly(1, event(container(EmptyDynamicTestSuite.class), finishedWithFailure(instanceOf(SuiteDidNotDiscoverAnyTests.class))));
+				.haveExactly(1, event(container(EmptyDynamicTestSuite.class), finishedWithFailure(instanceOf(NoTestsDiscoveredException.class))));
 		// @formatter:on
 	}
 

From c321834cfc7c5164c83fa48f22cc884e9556220b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 13:55:51 +0200
Subject: [PATCH 0730/1433] Document color customization in user guide

---
 .../release-notes/release-notes-5.9.0-M1.adoc | 17 +++------------
 .../asciidoc/user-guide/running-tests.adoc    | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index b8a2a77604a9..3c4c3b9fe738 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -34,20 +34,9 @@ on GitHub.
 * New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if
   no tests were discovered.
 * Console output color can now be customized. The option `--single-color` will apply a
-  built-in monochrome style, while `--color-palette` will accept a properties file to
-  override the ANSI SGR color styling.
-  The properties file below demonstrates the default style:
-
-  ....
-  SUCCESSFUL = 32
-  ABORTED = 33
-  FAILED = 31
-  SKIPPED = 35
-  CONTAINER = 35
-  TEST = 34
-  DYNAMIC = 35
-  REPORTED = 37
-  ....
+  built-in monochrome style, while `--color-palette` will accept a properties file. See
+  the <<../user-guide/index.adoc#running-tests-console-launcher-color-customization, User
+  Guide>> for details.
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 593ec6f1fac7..9150fd2a20c6 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -612,6 +612,27 @@ You can pass a real parameter with an initial `@` character by escaping it with
 additional `@` symbol. For example, `@@somearg` will become `@somearg` and will not be
 subject to expansion.
 
+[[running-tests-console-launcher-color-customization]]
+==== Color customization
+
+The colors used in the output of the `{ConsoleLauncher}` can be customized.
+The option `--single-color` will apply a built-in monochrome style, while
+`--color-palette` will accept a properties file to override the
+https://en.wikipedia.org/wiki/ANSI_escape_code#Colors[ANSI SGR] color styling.
+The properties file below demonstrates the default style:
+
+[source,properties,indent=0]
+----
+SUCCESSFUL = 32
+ABORTED = 33
+FAILED = 31
+SKIPPED = 35
+CONTAINER = 35
+TEST = 34
+DYNAMIC = 35
+REPORTED = 37
+----
+
 
 [[running-tests-junit-platform-runner]]
 === Using JUnit 4 to run the JUnit Platform

From 2a9a837c24118ce2790d5ba47920840e5393d100 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 15:37:49 +0200
Subject: [PATCH 0731/1433] Group CLI options

To make the usage help output more readable.
---
 .../console/options/AvailableOptions.java     | 600 ++++++++++--------
 .../console/options/CommandLineOptions.java   |   4 +-
 .../support/tests/ToolProviderTests.java      |   2 +-
 3 files changed, 335 insertions(+), 271 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index c6c16da27183..0328fd93cf3d 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -10,9 +10,12 @@
 
 package org.junit.platform.console.options;
 
+import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_DETAILS;
+import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_DETAILS_NAME;
+import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_THEME;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +32,7 @@
 import org.junit.platform.engine.discovery.UriSelector;
 
 import picocli.CommandLine;
+import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
@@ -39,328 +43,386 @@
 /**
  * @since 1.0
  */
-@Command(name = "ConsoleLauncher", sortOptions = false, description = "Launches the JUnit Platform from the console.")
+@Command(//
+		name = "ConsoleLauncher", //
+		abbreviateSynopsis = true, //
+		sortOptions = false, //
+		usageHelpWidth = 95, //
+		showAtFileInUsageHelp = true, //
+		usageHelpAutoWidth = true, //
+		description = "Launches the JUnit Platform for test discovery and execution.", //
+		footerHeading = "%n", //
+		footer = "For more information, please refer to the JUnit User Guide at%n" //
+				+ "@|underline https://junit.org/junit5/docs/current/user-guide/|@"//
+)
 class AvailableOptions {
 
 	private static final String CP_OPTION = "cp";
 
-	// --- General Purpose -------------------------------------------------
-
-	@Option(names = { "-h", "--help" }, usageHelp = true, description = "Display help information.")
-	private boolean helpRequested;
-
-	@Option(names = { "--h", "-help" }, help = true, hidden = true)
-	private boolean helpRequested2;
-
-	@Option(names = "--disable-ansi-colors", description = "Disable ANSI colors in output (not supported by all terminals).")
-	private boolean disableAnsiColors;
-
-	@Option(names = "-disable-ansi-colors", hidden = true)
-	private boolean disableAnsiColors2;
-
-	@Option(names = "--color-palette", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
-	private Path colorPalette;
-	@Option(names = "-color-palette", hidden = true)
-	private Path colorPalette2;
-
-	@Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
-	private boolean singleColorPalette;
-	@Option(names = "-single-color", hidden = true)
-	private boolean singleColorPalette2;
-
-	@Option(names = "--disable-banner", description = "Disable print out of the welcome message.")
-	private boolean disableBanner;
-
-	@Option(names = "-disable-banner", hidden = true)
-	private boolean disableBanner2;
-
-	@Option(names = "--details", paramLabel = "MODE", description = "Select an output details mode for when tests are executed. " //
-			+ "Use one of: ${COMPLETION-CANDIDATES}. If 'none' is selected, " //
-			+ "then only the summary and test failures are shown. Default: ${DEFAULT-VALUE}.")
-	private Details details = CommandLineOptions.DEFAULT_DETAILS;
-
-	@Option(names = "-details", hidden = true)
-	private Details details2 = CommandLineOptions.DEFAULT_DETAILS;
-
-	@Option(names = "--details-theme", paramLabel = "THEME", description = "Select an output details tree theme for when tests are executed. "
-			+ "Use one of: ${COMPLETION-CANDIDATES}. Default: ${DEFAULT-VALUE}.")
-	private Theme theme = CommandLineOptions.DEFAULT_THEME;
-
-	@Option(names = "-details-theme", hidden = true)
-	private Theme theme2 = CommandLineOptions.DEFAULT_THEME;
-
-	@Option(names = { "-cp", "--classpath",
-			"--class-path" }, split = ";|:", paramLabel = "PATH", arity = "1", description = "Provide additional classpath entries "
-					+ "-- for example, for adding engines and their dependencies. This option can be repeated.")
-	private List<Path> additionalClasspathEntries = new ArrayList<>();
-
-	@Option(names = { "--cp", "-classpath", "-class-path" }, split = ";|:", hidden = true)
-	private List<Path> additionalClasspathEntries2 = new ArrayList<>();
-
-	@Option(names = "--fail-if-no-tests", description = "Fail and return exit status code 2 if no tests are found.")
-	private boolean failIfNoTests; // no single-dash equivalent: was introduced in 5.3-M1
-
-	// --- Reports ---------------------------------------------------------
-
-	@Option(names = "--reports-dir", paramLabel = "DIR", description = "Enable report output into a specified local directory (will be created if it does not exist).")
-	private Path reportsDir;
-
-	@Option(names = "-reports-dir", hidden = true)
-	private Path reportsDir2;
-
-	// --- Java Platform Module System -------------------------------------
-
-	@Option(names = "--scan-modules", description = "EXPERIMENTAL: Scan all resolved modules for test discovery.")
-	private boolean scanModulepath;
-
-	@Option(names = "-scan-modules", hidden = true)
-	private boolean scanModulepath2;
-
-	@Option(names = { "-o",
-			"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "EXPERIMENTAL: Select single module for test discovery. This option can be repeated.")
-	private List<ModuleSelector> selectedModules = new ArrayList<>();
-
-	@Option(names = { "--o", "-select-module" }, arity = "1", converter = SelectorConverter.Module.class, hidden = true)
-	private List<ModuleSelector> selectedModules2 = new ArrayList<>();
-
-	// --- Selectors -------------------------------------------------------
-
-	@Option(names = { "--scan-class-path",
-			"--scan-classpath" }, split = ";|:", paramLabel = "PATH", arity = "0..1", description = "Scan all directories on the classpath or explicit classpath roots. " //
-					+ "Without arguments, only directories on the system classpath as well as additional classpath " //
-					+ "entries supplied via -" + CP_OPTION + " (directories and JAR files) are scanned. " //
-					+ "Explicit classpath roots that are not on the classpath will be silently ignored. " //
-					+ "This option can be repeated.")
-	private List<Path> selectedClasspathEntries = new ArrayList<>();
-
-	@Option(names = { "-scan-class-path", "-scan-classpath" }, split = ";|:", arity = "0..1", hidden = true)
-	private List<Path> selectedClasspathEntries2 = new ArrayList<>();
-
-	@Option(names = { "-u",
-			"--select-uri" }, paramLabel = "URI", arity = "1", converter = SelectorConverter.Uri.class, description = "Select a URI for test discovery. This option can be repeated.")
-	private List<UriSelector> selectedUris = new ArrayList<>();
-
-	@Option(names = { "--u", "-select-uri" }, arity = "1", hidden = true, converter = SelectorConverter.Uri.class)
-	private List<UriSelector> selectedUris2 = new ArrayList<>();
+	@ArgGroup(validate = false, order = 1, heading = "%n@|bold COMMANDS|@%n%n")
+	CommandOptions commandOptions;
 
-	@Option(names = { "-f",
-			"--select-file" }, paramLabel = "FILE", arity = "1", converter = SelectorConverter.File.class, description = "Select a file for test discovery. This option can be repeated.")
-	private List<FileSelector> selectedFiles = new ArrayList<>();
+	@ArgGroup(validate = false, order = 2, heading = "%n@|bold SELECTORS|@%n%n")
+	SelectorOptions selectorOptions;
 
-	@Option(names = { "--f", "-select-file" }, arity = "1", hidden = true, converter = SelectorConverter.File.class)
-	private List<FileSelector> selectedFiles2 = new ArrayList<>();
+	@ArgGroup(validate = false, order = 3, heading = "%n@|bold FILTERS|@%n%n")
+	FilterOptions filterOptions;
 
-	@Option(names = { "-d",
-			"--select-directory" }, paramLabel = "DIR", arity = "1", converter = SelectorConverter.Directory.class, description = "Select a directory for test discovery. This option can be repeated.")
-	private List<DirectorySelector> selectedDirectories = new ArrayList<>();
+	@ArgGroup(validate = false, order = 4, heading = "%n@|bold RUNTIME CONFIGURATION|@%n%n")
+	RuntimeConfigurationOptions runtimeConfigurationOptions;
 
-	@Option(names = { "--d",
-			"-select-directory" }, arity = "1", hidden = true, converter = SelectorConverter.Directory.class)
-	private List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
+	@ArgGroup(validate = false, order = 5, heading = "%n@|bold REPORTING|@%n%n")
+	ReportingOptions reportingOptions;
 
-	@Option(names = { "-p",
-			"--select-package" }, paramLabel = "PKG", arity = "1", converter = SelectorConverter.Package.class, description = "Select a package for test discovery. This option can be repeated.")
-	private List<PackageSelector> selectedPackages = new ArrayList<>();
+	@ArgGroup(validate = false, order = 6, heading = "%n@|bold CONSOLE OUTPUT|@%n%n")
+	ConsoleOutputOptions consoleOutputOptions;
 
-	@Option(names = { "--p",
-			"-select-package" }, arity = "1", hidden = true, converter = SelectorConverter.Package.class)
-	private List<PackageSelector> selectedPackages2 = new ArrayList<>();
+	static class CommandOptions {
 
-	@Option(names = { "-c",
-			"--select-class" }, paramLabel = "CLASS", arity = "1", converter = SelectorConverter.Class.class, description = "Select a class for test discovery. This option can be repeated.")
-	private List<ClassSelector> selectedClasses = new ArrayList<>();
+		@Option(names = { "-h", "--help" }, usageHelp = true, description = "Display help information.")
+		private boolean helpRequested;
 
-	@Option(names = { "--c", "-select-class" }, arity = "1", hidden = true, converter = SelectorConverter.Class.class)
-	private List<ClassSelector> selectedClasses2 = new ArrayList<>();
+		@Option(names = { "--h", "-help" }, help = true, hidden = true)
+		private boolean helpRequested2;
 
-	@Option(names = { "-m",
-			"--select-method" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Method.class, description = "Select a method for test discovery. This option can be repeated.")
-	private List<MethodSelector> selectedMethods = new ArrayList<>();
-
-	@Option(names = { "--m", "-select-method" }, arity = "1", hidden = true, converter = SelectorConverter.Method.class)
-	private List<MethodSelector> selectedMethods2 = new ArrayList<>();
+		private void applyTo(CommandLineOptions result) {
+			result.setDisplayHelp(this.helpRequested || this.helpRequested2);
+		}
+	}
 
-	@Option(names = { "-r",
-			"--select-resource" }, paramLabel = "RESOURCE", arity = "1", converter = SelectorConverter.ClasspathResource.class, description = "Select a classpath resource for test discovery. This option can be repeated.")
-	private List<ClasspathResourceSelector> selectedClasspathResources = new ArrayList<>();
+	static class SelectorOptions {
+
+		@Option(names = { "--scan-classpath",
+				"--scan-class-path" }, split = ";|:", paramLabel = "PATH", arity = "0..1", description = "Scan all directories on the classpath or explicit classpath roots. " //
+						+ "Without arguments, only directories on the system classpath as well as additional classpath " //
+						+ "entries supplied via -" + CP_OPTION + " (directories and JAR files) are scanned. " //
+						+ "Explicit classpath roots that are not on the classpath will be silently ignored. " //
+						+ "This option can be repeated.")
+		private List<Path> selectedClasspathEntries = new ArrayList<>();
+
+		@Option(names = { "-scan-class-path", "-scan-classpath" }, split = ";|:", arity = "0..1", hidden = true)
+		private List<Path> selectedClasspathEntries2 = new ArrayList<>();
+
+		@Option(names = "--scan-modules", description = "EXPERIMENTAL: Scan all resolved modules for test discovery.")
+		private boolean scanModulepath;
+
+		@Option(names = "-scan-modules", hidden = true)
+		private boolean scanModulepath2;
+
+		@Option(names = { "-u",
+				"--select-uri" }, paramLabel = "URI", arity = "1", converter = SelectorConverter.Uri.class, description = "Select a URI for test discovery. This option can be repeated.")
+		private List<UriSelector> selectedUris = new ArrayList<>();
+
+		@Option(names = { "--u", "-select-uri" }, arity = "1", hidden = true, converter = SelectorConverter.Uri.class)
+		private List<UriSelector> selectedUris2 = new ArrayList<>();
+
+		@Option(names = { "-f",
+				"--select-file" }, paramLabel = "FILE", arity = "1", converter = SelectorConverter.File.class, description = "Select a file for test discovery. This option can be repeated.")
+		private List<FileSelector> selectedFiles = new ArrayList<>();
+
+		@Option(names = { "--f", "-select-file" }, arity = "1", hidden = true, converter = SelectorConverter.File.class)
+		private List<FileSelector> selectedFiles2 = new ArrayList<>();
+
+		@Option(names = { "-d",
+				"--select-directory" }, paramLabel = "DIR", arity = "1", converter = SelectorConverter.Directory.class, description = "Select a directory for test discovery. This option can be repeated.")
+		private List<DirectorySelector> selectedDirectories = new ArrayList<>();
+
+		@Option(names = { "--d",
+				"-select-directory" }, arity = "1", hidden = true, converter = SelectorConverter.Directory.class)
+		private List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
+
+		@Option(names = { "-o",
+				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "EXPERIMENTAL: Select single module for test discovery. This option can be repeated.")
+		private List<ModuleSelector> selectedModules = new ArrayList<>();
+
+		@Option(names = { "--o",
+				"-select-module" }, arity = "1", converter = SelectorConverter.Module.class, hidden = true)
+		private List<ModuleSelector> selectedModules2 = new ArrayList<>();
+
+		@Option(names = { "-p",
+				"--select-package" }, paramLabel = "PKG", arity = "1", converter = SelectorConverter.Package.class, description = "Select a package for test discovery. This option can be repeated.")
+		private List<PackageSelector> selectedPackages = new ArrayList<>();
+
+		@Option(names = { "--p",
+				"-select-package" }, arity = "1", hidden = true, converter = SelectorConverter.Package.class)
+		private List<PackageSelector> selectedPackages2 = new ArrayList<>();
+
+		@Option(names = { "-c",
+				"--select-class" }, paramLabel = "CLASS", arity = "1", converter = SelectorConverter.Class.class, description = "Select a class for test discovery. This option can be repeated.")
+		private List<ClassSelector> selectedClasses = new ArrayList<>();
+
+		@Option(names = { "--c",
+				"-select-class" }, arity = "1", hidden = true, converter = SelectorConverter.Class.class)
+		private List<ClassSelector> selectedClasses2 = new ArrayList<>();
+
+		@Option(names = { "-m",
+				"--select-method" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Method.class, description = "Select a method for test discovery. This option can be repeated.")
+		private List<MethodSelector> selectedMethods = new ArrayList<>();
+
+		@Option(names = { "--m",
+				"-select-method" }, arity = "1", hidden = true, converter = SelectorConverter.Method.class)
+		private List<MethodSelector> selectedMethods2 = new ArrayList<>();
+
+		@Option(names = { "-r",
+				"--select-resource" }, paramLabel = "RESOURCE", arity = "1", converter = SelectorConverter.ClasspathResource.class, description = "Select a classpath resource for test discovery. This option can be repeated.")
+		private List<ClasspathResourceSelector> selectedClasspathResources = new ArrayList<>();
+
+		@Option(names = { "--r",
+				"-select-resource" }, arity = "1", hidden = true, converter = SelectorConverter.ClasspathResource.class)
+		private List<ClasspathResourceSelector> selectedClasspathResources2 = new ArrayList<>();
+
+		@Option(names = { "-i",
+				"--select-iteration" }, paramLabel = "TYPE:VALUE[INDEX(..INDEX)?(,INDEX(..INDEX)?)*]", arity = "1", converter = SelectorConverter.Iteration.class, description = "Select iterations for test discovery (e.g. method:com.acme.Foo#m()[1..2]). This option can be repeated.")
+		private List<IterationSelector> selectedIterations = new ArrayList<>();
+
+		@Option(names = { "--i",
+				"-select-iteration" }, arity = "1", hidden = true, converter = SelectorConverter.Iteration.class)
+		private List<IterationSelector> selectedIterations2 = new ArrayList<>();
+
+		private void applyTo(ParseResult parseResult, CommandLineOptions result) {
+			result.setScanClasspath(parseResult.hasMatchedOption("scan-class-path")); // flag was specified
+			result.setScanModulepath(this.scanModulepath || this.scanModulepath2);
+			result.setSelectedModules(merge(this.selectedModules, this.selectedModules2));
+			result.setSelectedClasspathEntries(merge(this.selectedClasspathEntries, this.selectedClasspathEntries2));
+			result.setSelectedUris(merge(this.selectedUris, this.selectedUris2));
+			result.setSelectedFiles(merge(this.selectedFiles, this.selectedFiles2));
+			result.setSelectedDirectories(merge(this.selectedDirectories, this.selectedDirectories2));
+			result.setSelectedPackages(merge(this.selectedPackages, this.selectedPackages2));
+			result.setSelectedClasses(merge(this.selectedClasses, this.selectedClasses2));
+			result.setSelectedMethods(merge(this.selectedMethods, this.selectedMethods2));
+			result.setSelectedClasspathResources(
+				merge(this.selectedClasspathResources, this.selectedClasspathResources2));
+			result.setSelectedIterations(merge(this.selectedIterations, this.selectedIterations2));
+		}
+	}
 
-	@Option(names = { "--r",
-			"-select-resource" }, arity = "1", hidden = true, converter = SelectorConverter.ClasspathResource.class)
-	private List<ClasspathResourceSelector> selectedClasspathResources2 = new ArrayList<>();
+	static class FilterOptions {
+
+		@Option(names = { "-n",
+				"--include-classname" }, paramLabel = "PATTERN", defaultValue = ClassNameFilter.STANDARD_INCLUDE_PATTERN, arity = "1", description = "Provide a regular expression to include only classes whose fully qualified names match. " //
+						+ "To avoid loading classes unnecessarily, the default pattern only includes class " //
+						+ "names that begin with \"Test\" or end with \"Test\" or \"Tests\". " //
+						+ "When this option is repeated, all patterns will be combined using OR semantics. " //
+						+ "Default: ${DEFAULT-VALUE}")
+		private List<String> includeClassNamePatterns = new ArrayList<>();
+
+		@Option(names = { "--n", "-include-classname" }, arity = "1", hidden = true)
+		private List<String> includeClassNamePatterns2 = new ArrayList<>();
+
+		@Option(names = { "-N",
+				"--exclude-classname" }, paramLabel = "PATTERN", arity = "1", description = "Provide a regular expression to exclude those classes whose fully qualified names match. " //
+						+ "When this option is repeated, all patterns will be combined using OR semantics.")
+		private List<String> excludeClassNamePatterns = new ArrayList<>();
+
+		@Option(names = { "--N", "-exclude-classname" }, arity = "1", hidden = true)
+		private List<String> excludeClassNamePatterns2 = new ArrayList<>();
+
+		@Option(names = {
+				"--include-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be included in the test run. This option can be repeated.")
+		private List<String> includePackages = new ArrayList<>();
+
+		@Option(names = { "-include-package" }, arity = "1", hidden = true)
+		private List<String> includePackages2 = new ArrayList<>();
+
+		@Option(names = {
+				"--exclude-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be excluded from the test run. This option can be repeated.")
+		private List<String> excludePackages = new ArrayList<>();
+
+		@Option(names = { "-exclude-package" }, arity = "1", hidden = true)
+		private List<String> excludePackages2 = new ArrayList<>();
+
+		@Option(names = { "-t",
+				"--include-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to include only tests whose tags match. "
+						+ //
+						"When this option is repeated, all patterns will be combined using OR semantics.")
+		private List<String> includedTags = new ArrayList<>();
+
+		@Option(names = { "--t", "-include-tag" }, arity = "1", hidden = true)
+		private List<String> includedTags2 = new ArrayList<>();
+
+		@Option(names = { "-T",
+				"--exclude-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to exclude those tests whose tags match. "
+						+ //
+						"When this option is repeated, all patterns will be combined using OR semantics.")
+		private List<String> excludedTags = new ArrayList<>();
+
+		@Option(names = { "--T", "-exclude-tag" }, arity = "1", hidden = true)
+		private List<String> excludedTags2 = new ArrayList<>();
+
+		@Option(names = { "-e",
+				"--include-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be included in the test run. This option can be repeated.")
+		private List<String> includedEngines = new ArrayList<>();
+
+		@Option(names = { "--e", "-include-engine" }, arity = "1", hidden = true)
+		private List<String> includedEngines2 = new ArrayList<>();
+
+		@Option(names = { "-E",
+				"--exclude-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be excluded from the test run. This option can be repeated.")
+		private List<String> excludedEngines = new ArrayList<>();
+
+		@Option(names = { "--E", "-exclude-engine" }, arity = "1", hidden = true)
+		private List<String> excludedEngines2 = new ArrayList<>();
+
+		private void applyTo(CommandLineOptions result) {
+			result.setIncludedClassNamePatterns(merge(this.includeClassNamePatterns, this.includeClassNamePatterns2));
+			result.setExcludedClassNamePatterns(merge(this.excludeClassNamePatterns, this.excludeClassNamePatterns2));
+			result.setIncludedPackages(merge(this.includePackages, this.includePackages2));
+			result.setExcludedPackages(merge(this.excludePackages, this.excludePackages2));
+			result.setIncludedTagExpressions(merge(this.includedTags, this.includedTags2));
+			result.setExcludedTagExpressions(merge(this.excludedTags, this.excludedTags2));
+			result.setIncludedEngines(merge(this.includedEngines, this.includedEngines2));
+			result.setExcludedEngines(merge(this.excludedEngines, this.excludedEngines2));
+		}
+	}
 
-	@Option(names = { "-i",
-			"--select-iteration" }, paramLabel = "TYPE:VALUE[INDEX(..INDEX)?(,INDEX(..INDEX)?)*]", arity = "1", converter = SelectorConverter.Iteration.class, description = "Select iterations for test discovery (e.g. method:com.acme.Foo#m()[1..2]). This option can be repeated.")
-	private List<IterationSelector> selectedIterations = new ArrayList<>();
+	static class RuntimeConfigurationOptions {
 
-	@Option(names = { "--i",
-			"-select-iteration" }, arity = "1", hidden = true, converter = SelectorConverter.Iteration.class)
-	private List<IterationSelector> selectedIterations2 = new ArrayList<>();
+		@Option(names = { "-" + CP_OPTION, "--classpath",
+				"--class-path" }, split = ";|:", paramLabel = "PATH", arity = "1", description = "Provide additional classpath entries "
+						+ "-- for example, for adding engines and their dependencies. This option can be repeated.")
+		private List<Path> additionalClasspathEntries = new ArrayList<>();
 
-	// --- Filters ---------------------------------------------------------
+		@Option(names = { "--cp", "-classpath", "-class-path" }, split = ";|:", hidden = true)
+		private List<Path> additionalClasspathEntries2 = new ArrayList<>();
 
-	@Option(names = { "-n",
-			"--include-classname" }, paramLabel = "PATTERN", arity = "1", description = "Provide a regular expression to include only classes whose fully qualified names match. " //
-					+ "To avoid loading classes unnecessarily, the default pattern only includes class " //
-					+ "names that begin with \"Test\" or end with \"Test\" or \"Tests\". " //
-					+ "When this option is repeated, all patterns will be combined using OR semantics. " //
-					+ "Default: ${DEFAULT-VALUE}")
-	private List<String> includeClassNamePatterns = new ArrayList<>(
-		Arrays.asList(ClassNameFilter.STANDARD_INCLUDE_PATTERN));
+		// Implementation note: the @Option annotation is on a setter method to allow validation.
+		private Map<String, String> configurationParameters = new LinkedHashMap<>();
 
-	@Option(names = { "--n", "-include-classname" }, arity = "1", hidden = true)
-	private List<String> includeClassNamePatterns2 = new ArrayList<>();
+		@Spec
+		private CommandSpec spec;
 
-	@Option(names = { "-N",
-			"--exclude-classname" }, paramLabel = "PATTERN", arity = "1", description = "Provide a regular expression to exclude those classes whose fully qualified names match. " //
-					+ "When this option is repeated, all patterns will be combined using OR semantics.")
-	private List<String> excludeClassNamePatterns = new ArrayList<>();
+		@Option(names = { "-config" }, arity = "1", hidden = true)
+		public void setConfigurationParameters2(Map<String, String> keyValuePairs) {
+			setConfigurationParameters(keyValuePairs);
+		}
 
-	@Option(names = { "--N", "-exclude-classname" }, arity = "1", hidden = true)
-	private List<String> excludeClassNamePatterns2 = new ArrayList<>();
+		/**
+		 * Adds the specified key-value pair (or pairs) to the configuration parameters.
+		 * A {@code ParameterException} is thrown if the same key is specified multiple times
+		 * on the command line.
+		 *
+		 * @param map the key-value pairs to add
+		 * @throws picocli.CommandLine.ParameterException if the map already contains this key
+		 * @see <a href="https://github.com/junit-team/junit5/issues/1308">#1308</a>
+		 */
+		@Option(names = "--config", paramLabel = "KEY=VALUE", arity = "1", description = "Set a configuration parameter for test discovery and execution. This option can be repeated.")
+		public void setConfigurationParameters(Map<String, String> map) {
+			for (String key : map.keySet()) {
+				String newValue = map.get(key);
+				validateUnique(key, newValue);
+				configurationParameters.put(key, newValue);
+			}
+		}
 
-	@Option(names = {
-			"--include-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be included in the test run. This option can be repeated.")
-	private List<String> includePackages = new ArrayList<>();
+		private void validateUnique(String key, String newValue) {
+			String existing = configurationParameters.get(key);
+			if (existing != null && !existing.equals(newValue)) {
+				throw new ParameterException(spec.commandLine(),
+					String.format("Duplicate key '%s' for values '%s' and '%s'.", key, existing, newValue));
+			}
+		}
 
-	@Option(names = { "-include-package" }, arity = "1", hidden = true)
-	private List<String> includePackages2 = new ArrayList<>();
+		private void applyTo(CommandLineOptions result) {
+			result.setAdditionalClasspathEntries(merge(additionalClasspathEntries, additionalClasspathEntries2));
+			result.setConfigurationParameters(configurationParameters);
+		}
+	}
 
-	@Option(names = {
-			"--exclude-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be excluded from the test run. This option can be repeated.")
-	private List<String> excludePackages = new ArrayList<>();
+	static class ReportingOptions {
 
-	@Option(names = { "-exclude-package" }, arity = "1", hidden = true)
-	private List<String> excludePackages2 = new ArrayList<>();
+		@Option(names = "--fail-if-no-tests", description = "Fail and return exit status code 2 if no tests are found.")
+		private boolean failIfNoTests; // no single-dash equivalent: was introduced in 5.3-M1
 
-	@Option(names = { "-t",
-			"--include-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to include only tests whose tags match. "
-					+ //
-					"When this option is repeated, all patterns will be combined using OR semantics.")
-	private List<String> includedTags = new ArrayList<>();
+		@Option(names = "--reports-dir", paramLabel = "DIR", description = "Enable report output into a specified local directory (will be created if it does not exist).")
+		private Path reportsDir;
 
-	@Option(names = { "--t", "-include-tag" }, arity = "1", hidden = true)
-	private List<String> includedTags2 = new ArrayList<>();
+		@Option(names = "-reports-dir", hidden = true)
+		private Path reportsDir2;
 
-	@Option(names = { "-T",
-			"--exclude-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to exclude those tests whose tags match. "
-					+ //
-					"When this option is repeated, all patterns will be combined using OR semantics.")
-	private List<String> excludedTags = new ArrayList<>();
+		private void applyTo(CommandLineOptions result) {
+			result.setFailIfNoTests(this.failIfNoTests);
+			result.setReportsDir(choose(this.reportsDir, this.reportsDir2, null));
+		}
+	}
 
-	@Option(names = { "--T", "-exclude-tag" }, arity = "1", hidden = true)
-	private List<String> excludedTags2 = new ArrayList<>();
+	static class ConsoleOutputOptions {
+		@Option(names = "--disable-ansi-colors", description = "Disable ANSI colors in output (not supported by all terminals).")
+		private boolean disableAnsiColors;
 
-	@Option(names = { "-e",
-			"--include-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be included in the test run. This option can be repeated.")
-	private List<String> includedEngines = new ArrayList<>();
+		@Option(names = "-disable-ansi-colors", hidden = true)
+		private boolean disableAnsiColors2;
 
-	@Option(names = { "--e", "-include-engine" }, arity = "1", hidden = true)
-	private List<String> includedEngines2 = new ArrayList<>();
+		@Option(names = "--color-palette", paramLabel = "FILE", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
+		private Path colorPalette;
+		@Option(names = "-color-palette", hidden = true)
+		private Path colorPalette2;
 
-	@Option(names = { "-E",
-			"--exclude-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be excluded from the test run. This option can be repeated.")
-	private List<String> excludedEngines = new ArrayList<>();
+		@Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
+		private boolean singleColorPalette;
+		@Option(names = "-single-color", hidden = true)
+		private boolean singleColorPalette2;
 
-	@Option(names = { "--E", "-exclude-engine" }, arity = "1", hidden = true)
-	private List<String> excludedEngines2 = new ArrayList<>();
+		@Option(names = "--disable-banner", description = "Disable print out of the welcome message.")
+		private boolean disableBanner;
 
-	// --- Configuration Parameters ----------------------------------------
+		@Option(names = "-disable-banner", hidden = true)
+		private boolean disableBanner2;
 
-	// Implementation note: the @Option annotation is on a setter method to allow validation.
-	private Map<String, String> configurationParameters = new LinkedHashMap<>();
+		@Option(names = "--details", paramLabel = "MODE", defaultValue = DEFAULT_DETAILS_NAME, description = "Select an output details mode for when tests are executed. " //
+				+ "Use one of: ${COMPLETION-CANDIDATES}. If 'none' is selected, " //
+				+ "then only the summary and test failures are shown. Default: ${DEFAULT-VALUE}.")
+		private Details details = DEFAULT_DETAILS;
 
-	@Spec
-	private CommandSpec spec;
+		@Option(names = "-details", hidden = true, defaultValue = DEFAULT_DETAILS_NAME)
+		private Details details2 = DEFAULT_DETAILS;
 
-	AvailableOptions() {
-	}
+		@Option(names = "--details-theme", paramLabel = "THEME", description = "Select an output details tree theme for when tests are executed. "
+				+ "Use one of: ${COMPLETION-CANDIDATES}. Default is detected based on default character encoding.")
+		private Theme theme = DEFAULT_THEME;
 
-	/**
-	 * Adds the specified key-value pair (or pairs) to the configuration parameters.
-	 * A {@code ParameterException} is thrown if the same key is specified multiple times
-	 * on the command line.
-	 *
-	 * @param map the key-value pairs to add
-	 * @throws picocli.CommandLine.ParameterException if the map already contains this key
-	 * @see <a href="https://github.com/junit-team/junit5/issues/1308">#1308</a>
-	 */
-	@Option(names = "--config", paramLabel = "KEY=VALUE", arity = "1", description = "Set a configuration parameter for test discovery and execution. This option can be repeated.")
-	public void setConfigurationParameters(Map<String, String> map) {
-		for (String key : map.keySet()) {
-			String newValue = map.get(key);
-			validateUnique(key, newValue);
-			configurationParameters.put(key, newValue);
-		}
-	}
+		@Option(names = "-details-theme", hidden = true)
+		private Theme theme2 = DEFAULT_THEME;
 
-	private void validateUnique(String key, String newValue) {
-		String existing = configurationParameters.get(key);
-		if (existing != null && !existing.equals(newValue)) {
-			throw new ParameterException(spec.commandLine(),
-				String.format("Duplicate key '%s' for values '%s' and '%s'.", key, existing, newValue));
+		private void applyTo(CommandLineOptions result) {
+			result.setAnsiColorOutputDisabled(disableAnsiColors || disableAnsiColors2);
+			result.setColorPalettePath(choose(colorPalette, colorPalette2, null));
+			result.setSingleColorPalette(singleColorPalette || singleColorPalette2);
+			result.setBannerDisabled(disableBanner || disableBanner2);
+			result.setDetails(choose(details, details2, DEFAULT_DETAILS));
+			result.setTheme(choose(theme, theme2, DEFAULT_THEME));
 		}
 	}
 
-	@Option(names = { "-config" }, arity = "1", hidden = true)
-	public void setConfigurationParameters2(Map<String, String> keyValuePairs) {
-		setConfigurationParameters(keyValuePairs);
+	AvailableOptions() {
 	}
 
 	CommandLine getParser() {
 		CommandLine result = new CommandLine(this);
-		result.setUsageHelpWidth(90);
 		result.setCaseInsensitiveEnumValuesAllowed(true);
 		result.setAtFileCommentChar(null); // for --select-method com.acme.Foo#m()
 		return result;
 	}
 
 	CommandLineOptions toCommandLineOptions(ParseResult parseResult) {
-
 		CommandLineOptions result = new CommandLineOptions();
-
-		// General Purpose
-		result.setDisplayHelp(this.helpRequested || this.helpRequested2);
-		result.setAnsiColorOutputDisabled(this.disableAnsiColors || this.disableAnsiColors2);
-		result.setColorPalettePath(choose(this.colorPalette, this.colorPalette2, null));
-		result.setSingleColorPalette(this.singleColorPalette || this.singleColorPalette2);
-		result.setBannerDisabled(this.disableBanner || this.disableBanner2);
-		result.setDetails(choose(this.details, this.details2, CommandLineOptions.DEFAULT_DETAILS));
-		result.setTheme(choose(this.theme, this.theme2, CommandLineOptions.DEFAULT_THEME));
-		result.setAdditionalClasspathEntries(merge(this.additionalClasspathEntries, this.additionalClasspathEntries2));
-		result.setFailIfNoTests(this.failIfNoTests);
-
-		// Reports
-		result.setReportsDir(choose(this.reportsDir, this.reportsDir2, null));
-
-		// Java Platform Module System
-		result.setScanModulepath(this.scanModulepath || this.scanModulepath2);
-		result.setSelectedModules(merge(this.selectedModules, this.selectedModules2));
-
-		// Selectors
-		result.setScanClasspath(parseResult.hasMatchedOption("scan-class-path")); // flag was specified
-		result.setSelectedClasspathEntries(merge(this.selectedClasspathEntries, this.selectedClasspathEntries2));
-		result.setSelectedUris(merge(this.selectedUris, this.selectedUris2));
-		result.setSelectedFiles(merge(this.selectedFiles, this.selectedFiles2));
-		result.setSelectedDirectories(merge(this.selectedDirectories, this.selectedDirectories2));
-		result.setSelectedPackages(merge(this.selectedPackages, this.selectedPackages2));
-		result.setSelectedClasses(merge(this.selectedClasses, this.selectedClasses2));
-		result.setSelectedMethods(merge(this.selectedMethods, this.selectedMethods2));
-		result.setSelectedClasspathResources(merge(this.selectedClasspathResources, this.selectedClasspathResources2));
-		result.setSelectedIterations(merge(this.selectedIterations, this.selectedIterations2));
-
-		// Filters
-		result.setIncludedClassNamePatterns(merge(this.includeClassNamePatterns, this.includeClassNamePatterns2));
-		result.setExcludedClassNamePatterns(merge(this.excludeClassNamePatterns, this.excludeClassNamePatterns2));
-		result.setIncludedPackages(merge(this.includePackages, this.includePackages2));
-		result.setExcludedPackages(merge(this.excludePackages, this.excludePackages2));
-		result.setIncludedTagExpressions(merge(this.includedTags, this.includedTags2));
-		result.setExcludedTagExpressions(merge(this.excludedTags, this.excludedTags2));
-		result.setIncludedEngines(merge(this.includedEngines, this.includedEngines2));
-		result.setExcludedEngines(merge(this.excludedEngines, this.excludedEngines2));
-
-		// Configuration Parameters
-		result.setConfigurationParameters(this.configurationParameters);
-
+		if (commandOptions != null) {
+			this.commandOptions.applyTo(result);
+		}
+		if (this.selectorOptions != null) {
+			this.selectorOptions.applyTo(parseResult, result);
+		}
+		if (this.filterOptions != null) {
+			this.filterOptions.applyTo(result);
+		}
+		if (this.runtimeConfigurationOptions != null) {
+			this.runtimeConfigurationOptions.applyTo(result);
+		}
+		if (this.reportingOptions != null) {
+			this.reportingOptions.applyTo(result);
+		}
+		if (this.consoleOutputOptions != null) {
+			this.consoleOutputOptions.applyTo(result);
+		}
 		return result;
 	}
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index 0b28db0b2f50..66800aef4449 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -22,6 +22,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 
@@ -43,7 +44,8 @@
 @API(status = INTERNAL, since = "1.0")
 public class CommandLineOptions {
 
-	static final Details DEFAULT_DETAILS = Details.TREE;
+	static final String DEFAULT_DETAILS_NAME = "tree";
+	static final Details DEFAULT_DETAILS = Details.valueOf(DEFAULT_DETAILS_NAME.toUpperCase(Locale.ROOT));
 	static final Theme DEFAULT_THEME = Theme.valueOf(Charset.defaultCharset());
 
 	private boolean displayHelp;
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
index 4e8f160a3175..779c5eb33f51 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
@@ -133,7 +133,7 @@ private static void assertJUnitPrintsHelpMessage(ToolProvider junit) {
 		var code = junit.run(new PrintWriter(out), new PrintWriter(err), "--help");
 		assertAll(() -> assertLinesMatch(List.of( //
 			">> USAGE >>", //
-			"Launches the JUnit Platform from the console.", //
+			"Launches the JUnit Platform for test discovery and execution.", //
 			">> OPTIONS >>"), //
 			out.toString().lines().collect(Collectors.toList())), //
 			() -> assertEquals("", err.toString()), //

From fed557f113b87a7b4f8d65b72eac86cb3a7ac8d4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 31 Jan 2022 21:25:19 +0100
Subject: [PATCH 0732/1433] Add JDK 19 CI build

---
 .github/workflows/cross-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index b4df9259f2d9..96799f6b6420 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -19,7 +19,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [18]
+        jdk: [18, 19]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:

From f4a8b6aca7ede1a1a96ca24a3bb93df1aaf31cd9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 31 Jan 2022 21:27:19 +0100
Subject: [PATCH 0733/1433] Update gradle.properties

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5e496378322e..8e7c8cfe2f8e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.java.installations.fromEnv=JDK8,JDK18
+org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true

From c8d67cf1f2a0669e255564e169d65d09af04ed25 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 22:12:05 +0200
Subject: [PATCH 0734/1433] Update Groovy to 4.0.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b0996b0d5753..b37258bd4cf7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.2.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.132" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
-groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.0" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.1" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }

From e1ffc6bed0db12622f7d20d8feab461543a604d4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 22:12:17 +0200
Subject: [PATCH 0735/1433] Document why --release is not used

---
 junit-platform-jfr/junit-platform-jfr.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index 748ea2942e41..4bf6d89688d8 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
 }
 
 javaLibrary {
+	// --release 8 does not support jdk.jfr even though it was backported
 	configureRelease = false
 }
 

From 26b2ba9c67103924c469fbb01357a218f4f786a7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 22:12:37 +0200
Subject: [PATCH 0736/1433] Configure source/target compatibility for Groovy
 compilation

---
 .../kotlin/java-library-conventions.gradle.kts | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 0908793214f6..0870f6df880d 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -286,20 +286,14 @@ afterEvaluate {
 	}
 	pluginManager.withPlugin("groovy") {
 		tasks.named<GroovyCompile>("compileGroovy").configure {
-			if (extension.configureRelease) {
-				options.release.set(extension.mainJavaVersion.majorVersion.toInt())
-			} else {
-				sourceCompatibility = extension.mainJavaVersion.majorVersion
-				targetCompatibility = extension.mainJavaVersion.majorVersion
-			}
+			// Groovy compiler does not support the --release flag.
+			sourceCompatibility = extension.mainJavaVersion.majorVersion
+			targetCompatibility = extension.mainJavaVersion.majorVersion
 		}
 		tasks.named<GroovyCompile>("compileTestGroovy").configure {
-			if (extension.configureRelease) {
-				options.release.set(extension.testJavaVersion.majorVersion.toInt())
-			} else {
-				sourceCompatibility = extension.testJavaVersion.majorVersion
-				targetCompatibility = extension.testJavaVersion.majorVersion
-			}
+			// Groovy compiler does not support the --release flag.
+			sourceCompatibility = extension.testJavaVersion.majorVersion
+			targetCompatibility = extension.testJavaVersion.majorVersion
 		}
 	}
 }

From c56f2b1df2aed6370a0463a9c63116abea8bf421 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 22:13:01 +0200
Subject: [PATCH 0737/1433] Use JDK 17 for Groovy until 4.0.2 is released

---
 .../src/main/kotlin/java-toolchain-conventions.gradle.kts   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index c657f937979d..e72c2244497b 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -12,4 +12,10 @@ project.pluginManager.withPlugin("java") {
 	tasks.withType<JavaCompile>().configureEach {
 		outputs.cacheIf { javaLanguageVersion == defaultLanguageVersion }
 	}
+	tasks.withType<GroovyCompile>().configureEach {
+		javaLauncher.set(javaToolchainService.launcherFor {
+			// Groovy does not yet support JDK 19, see https://issues.apache.org/jira/browse/GROOVY-10569
+			languageVersion.set(defaultLanguageVersion)
+		})
+	}
 }

From 8b7a33168b06c5858b1abee03294bd9b5c4b05f8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 22:15:10 +0200
Subject: [PATCH 0738/1433] Add JRE.JAVA_19

---
 .../release-notes/release-notes-5.9.0-M1.adoc     |  1 +
 .../java/org/junit/jupiter/api/condition/JRE.java | 13 ++++++++++++-
 .../DisabledForJreRangeConditionTests.java        |  3 ++-
 .../DisabledForJreRangeIntegrationTests.java      |  6 ++++--
 .../condition/DisabledOnJreConditionTests.java    | 12 +++++++++++-
 .../condition/DisabledOnJreIntegrationTests.java  | 12 ++++++++++--
 .../EnabledForJreRangeConditionTests.java         |  3 ++-
 .../EnabledForJreRangeIntegrationTests.java       |  5 +++--
 .../api/condition/EnabledOnJreConditionTests.java | 12 +++++++++++-
 .../condition/EnabledOnJreIntegrationTests.java   | 15 +++++++++++++--
 10 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 3c4c3b9fe738..1ab7d191848e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -66,6 +66,7 @@ on GitHub.
   constructors via the new `ExecutableInvoker` available in the `ExtensionContext`.
 * A subset of the invocations of parameterized or dynamic tests can now be selected via
   the new `IterationSelector` discovery selector when launching the JUnit Platform.
+* `JAVA_19` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-5.9.0-M1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index 072ec7600b2f..789b2cacfebf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -122,11 +122,20 @@ public enum JRE {
 	@API(status = STABLE, since = "5.8.1")
 	JAVA_18,
 
+	/**
+	 * Java 19.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	JAVA_19,
+
 	/**
 	 * A JRE version other than {@link #JAVA_8}, {@link #JAVA_9},
 	 * {@link #JAVA_10}, {@link #JAVA_11}, {@link #JAVA_12},
 	 * {@link #JAVA_13}, {@link #JAVA_14}, {@link #JAVA_15},
-	 * {@link #JAVA_16}, {@link #JAVA_17}, or {@link #JAVA_18}.
+	 * {@link #JAVA_16}, {@link #JAVA_17}, {@link #JAVA_18}, or
+	 * {@link #JAVA_19}.
 	 */
 	OTHER;
 
@@ -176,6 +185,8 @@ private static JRE determineCurrentVersion() {
 					return JAVA_17;
 				case 18:
 					return JAVA_18;
+				case 19:
+					return JAVA_19;
 				default:
 					return OTHER;
 			}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index 33d4be9ac7e7..d1f71b789152 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -120,7 +121,7 @@ void javaMin10() {
 	void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index 17b2cb61f03b..ac1c438dfccc 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -79,7 +80,8 @@ void javaMax12() {
 	@Test
 	@DisabledForJreRange(min = JAVA_10)
 	void javaMin10() {
-		assertFalse(onJava10() || onJava11() || onJava12() || onJava13() || onJava14());
+		assertFalse(onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15() || onJava16()
+				|| onJava17() || onJava18() || onJava19());
 		assertTrue(onJava8() || onJava9());
 	}
 
@@ -87,7 +89,7 @@ void javaMin10() {
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index 50eaaf195ed7..33539990a5c1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -176,6 +177,15 @@ void java18() {
 		assertDisabledOnCurrentJreIf(onJava18());
 	}
 
+	/**
+	 * @see DisabledOnJreIntegrationTests#java19()
+	 */
+	@Test
+	void java19() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(onJava19());
+	}
+
 	/**
 	 * @see DisabledOnJreIntegrationTests#other()
 	 */
@@ -183,7 +193,7 @@ void java18() {
 	void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 247265653815..6145ed6b7acf 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -33,6 +34,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_16;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
+import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -60,7 +62,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@DisabledOnJre(value = { JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17,
-			JAVA_18, OTHER }, disabledReason = "Disabled on every JRE")
+			JAVA_18, JAVA_19, OTHER }, disabledReason = "Disabled on every JRE")
 	void disabledOnAllJavaVersions() {
 		fail("should be disabled");
 	}
@@ -131,11 +133,17 @@ void java18() {
 		assertFalse(onJava18());
 	}
 
+	@Test
+	@DisabledOnJre(JAVA_19)
+	void java19() {
+		assertFalse(onJava19());
+	}
+
 	@Test
 	@DisabledOnJre(OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 0a1eb0521e4a..cbf878962293 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -120,7 +121,7 @@ void javaMin10() {
 	void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19()));
 	}
 
 	private void assertEnabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index 15826bcd6f31..b23be6e945bf 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -84,7 +85,7 @@ void javaMax12() {
 	@EnabledForJreRange(min = JAVA_10)
 	void javaMin10() {
 		assertTrue(onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15() || onJava16()
-				|| onJava17() || onJava18());
+				|| onJava17() || onJava18() || onJava19());
 		assertFalse(onJava9());
 	}
 
@@ -92,7 +93,7 @@ void javaMin10() {
 	@EnabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index bb823d343e66..e36104774295 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -175,6 +176,15 @@ void java18() {
 		assertEnabledOnCurrentJreIf(onJava18());
 	}
 
+	/**
+	 * @see EnabledOnJreIntegrationTests#java18()
+	 */
+	@Test
+	void java19() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(onJava19());
+	}
+
 	/**
 	 * @see EnabledOnJreIntegrationTests#other()
 	 */
@@ -182,7 +192,7 @@ void java18() {
 	void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19()));
 		assertCustomDisabledReasonIs("Disabled on almost every JRE");
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index 904cd92b9e9c..2efb829204da 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_16;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
+import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -50,7 +51,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17, JAVA_18,
-			OTHER })
+			JAVA_19, OTHER })
 	void enabledOnAllJavaVersions() {
 	}
 
@@ -120,11 +121,17 @@ void java18() {
 		assertTrue(onJava18());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_19)
+	void java19() {
+		assertTrue(onJava19());
+	}
+
 	@Test
 	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19());
 	}
 
 	static boolean onJava8() {
@@ -171,4 +178,8 @@ static boolean onJava18() {
 		return JAVA_VERSION.startsWith("18");
 	}
 
+	static boolean onJava19() {
+		return JAVA_VERSION.startsWith("19");
+	}
+
 }

From ce509d4da5824f8da2482df223dad6457f9e4e6f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 22:45:52 +0200
Subject: [PATCH 0739/1433] Modernize JRE tests so they actually get executed

---
 .../DisabledForJreRangeConditionTests.java    | 34 +++++---------
 .../DisabledForJreRangeIntegrationTests.java  | 42 +++++++----------
 .../EnabledForJreRangeConditionTests.java     | 35 +++++---------
 .../EnabledForJreRangeIntegrationTests.java   | 47 ++++++++-----------
 .../junit/jupiter/api/condition/JRETests.java | 28 +++++++++++
 5 files changed, 90 insertions(+), 96 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index d1f71b789152..3097f02494c2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -69,49 +69,41 @@ void defaultValues() {
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#java8()
+	 * @see DisabledForJreRangeIntegrationTests#java17()
 	 */
 	@Test
-	void java8() {
+	void java17() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava8());
+		assertDisabledOnCurrentJreIf(onJava17());
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#java8to11()
+	 * @see DisabledForJreRangeIntegrationTests#java18to19()
 	 */
 	@Test
-	void java8to11() {
+	void java18to19() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava8() || onJava9() || onJava10() || onJava11());
+		assertDisabledOnCurrentJreIf(onJava18() || onJava19());
 		assertCustomDisabledReasonIs("Disabled on some JRE");
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#java9to12()
+	 * @see DisabledForJreRangeIntegrationTests#javaMax18()
 	 */
 	@Test
-	void java9to12() {
+	void javaMax18() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava9() || onJava10() || onJava11() || onJava12());
+		assertDisabledOnCurrentJreIf(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18());
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#javaMax12()
+	 * @see DisabledForJreRangeIntegrationTests#javaMin18()
 	 */
 	@Test
-	void javaMax12() {
+	void javaMin18() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava8() || onJava9() || onJava10() || onJava11() || onJava12());
-	}
-
-	/**
-	 * @see DisabledForJreRangeIntegrationTests#javaMin10()
-	 */
-	@Test
-	void javaMin10() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9()));
+		assertDisabledOnCurrentJreIf(!(onJava17()));
 	}
 
 	/**
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index ac1c438dfccc..3fa788ba342c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -25,11 +25,9 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
-import static org.junit.jupiter.api.condition.JRE.JAVA_10;
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-import static org.junit.jupiter.api.condition.JRE.JAVA_12;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-import static org.junit.jupiter.api.condition.JRE.JAVA_9;
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
+import static org.junit.jupiter.api.condition.JRE.JAVA_18;
+import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
 
 import org.junit.jupiter.api.Disabled;
@@ -54,35 +52,29 @@ void defaultValues() {
 	}
 
 	@Test
-	@DisabledForJreRange(min = JAVA_8, max = JAVA_8)
-	void java8() {
-		assertFalse(onJava8());
+	@DisabledForJreRange(min = JAVA_17, max = JAVA_17)
+	void java17() {
+		assertFalse(onJava17());
 	}
 
 	@Test
-	@DisabledForJreRange(min = JAVA_8, max = JAVA_11, disabledReason = "Disabled on some JRE")
-	void java8to11() {
-		assertFalse(onJava8() || onJava9() || onJava10() || onJava11());
+	@DisabledForJreRange(min = JAVA_18, max = JAVA_19, disabledReason = "Disabled on some JRE")
+	void java18to19() {
+		assertFalse(onJava18() || onJava19());
 	}
 
 	@Test
-	@DisabledForJreRange(min = JAVA_9, max = JAVA_12)
-	void java9to12() {
-		assertFalse(onJava9() || onJava10() || onJava11() || onJava12());
+	@DisabledForJreRange(max = JAVA_18)
+	void javaMax18() {
+		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
+				|| onJava15() || onJava16() || onJava17() || onJava18());
 	}
 
 	@Test
-	@DisabledForJreRange(max = JAVA_12)
-	void javaMax12() {
-		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12());
-	}
-
-	@Test
-	@DisabledForJreRange(min = JAVA_10)
-	void javaMin10() {
-		assertFalse(onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15() || onJava16()
-				|| onJava17() || onJava18() || onJava19());
-		assertTrue(onJava8() || onJava9());
+	@DisabledForJreRange(min = JAVA_18)
+	void javaMin18() {
+		assertFalse(onJava18() || onJava19());
+		assertTrue(onJava17());
 	}
 
 	@Test
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index cbf878962293..48bfde0e2319 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -69,49 +69,40 @@ void defaultValues() {
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#java8()
+	 * @see EnabledForJreRangeIntegrationTests#java17()
 	 */
 	@Test
-	void java8() {
+	void java17() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava8());
+		assertEnabledOnCurrentJreIf(onJava17());
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#java8to11()
+	 * @see EnabledForJreRangeIntegrationTests#java18to19()
 	 */
 	@Test
-	void java8to11() {
+	void java18to19() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava8() || onJava9() || onJava10() || onJava11());
-		assertCustomDisabledReasonIs("Disabled on some JRE");
+		assertEnabledOnCurrentJreIf(onJava18() || onJava19());
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#java9to12()
+	 * @see EnabledForJreRangeIntegrationTests#javaMax18()
 	 */
 	@Test
-	void java9to12() {
+	void javaMax18() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava9() || onJava10() || onJava11() || onJava12());
+		assertEnabledOnCurrentJreIf(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18());
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#javaMax12()
+	 * @see EnabledForJreRangeIntegrationTests#javaMin18()
 	 */
 	@Test
-	void javaMax12() {
+	void javaMin18() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava8() || onJava9() || onJava10() || onJava11() || onJava12());
-	}
-
-	/**
-	 * @see EnabledForJreRangeIntegrationTests#javaMin10()
-	 */
-	@Test
-	void javaMin10() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9()));
+		assertEnabledOnCurrentJreIf(!(onJava17()));
 	}
 
 	/**
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index b23be6e945bf..a702162de644 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -25,11 +25,9 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
-import static org.junit.jupiter.api.condition.JRE.JAVA_10;
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-import static org.junit.jupiter.api.condition.JRE.JAVA_12;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-import static org.junit.jupiter.api.condition.JRE.JAVA_9;
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
+import static org.junit.jupiter.api.condition.JRE.JAVA_18;
+import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
 
 import org.junit.jupiter.api.Disabled;
@@ -55,38 +53,31 @@ void defaultValues() {
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_8, max = JAVA_8)
-	void java8() {
-		assertTrue(onJava8());
+	@EnabledForJreRange(min = JAVA_17, max = JAVA_17)
+	void java17() {
+		assertTrue(onJava17());
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_8, max = JAVA_11, disabledReason = "Disabled on some JRE")
-	void java8to11() {
-		assertTrue(onJava8() || onJava9() || onJava10() || onJava11());
-		assertFalse(onJava12());
+	@EnabledForJreRange(min = JAVA_18, max = JAVA_19)
+	void java18to19() {
+		assertTrue(onJava18() || onJava19());
+		assertFalse(onJava17());
 	}
 
 	@Test
-	@EnabledForJreRange(min = JAVA_9, max = JAVA_12)
-	void java9to12() {
-		assertTrue(onJava9() || onJava10() || onJava11() || onJava12());
-		assertFalse(onJava8() || onJava13());
+	@EnabledForJreRange(max = JAVA_18)
+	void javaMax18() {
+		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
+				|| onJava15() || onJava16() || onJava17() || onJava18());
+		assertFalse(onJava19());
 	}
 
 	@Test
-	@EnabledForJreRange(max = JAVA_12)
-	void javaMax12() {
-		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12());
-		assertFalse(onJava13());
-	}
-
-	@Test
-	@EnabledForJreRange(min = JAVA_10)
-	void javaMin10() {
-		assertTrue(onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15() || onJava16()
-				|| onJava17() || onJava18() || onJava19());
-		assertFalse(onJava9());
+	@EnabledForJreRange(min = JAVA_18)
+	void javaMin18() {
+		assertTrue(onJava18() || onJava19());
+		assertFalse(onJava17());
 	}
 
 	@Test
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
index fbfe072a53a0..da6d7d4db6ce 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
@@ -17,6 +17,10 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_13;
 import static org.junit.jupiter.api.condition.JRE.JAVA_14;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
+import static org.junit.jupiter.api.condition.JRE.JAVA_16;
+import static org.junit.jupiter.api.condition.JRE.JAVA_17;
+import static org.junit.jupiter.api.condition.JRE.JAVA_18;
+import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -78,6 +82,30 @@ void java15() {
 		assertEquals(JAVA_15, JRE.currentVersion());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_16)
+	void java16() {
+		assertEquals(JAVA_16, JRE.currentVersion());
+	}
+
+	@Test
+	@EnabledOnJre(JAVA_17)
+	void java17() {
+		assertEquals(JAVA_17, JRE.currentVersion());
+	}
+
+	@Test
+	@EnabledOnJre(JAVA_18)
+	void java18() {
+		assertEquals(JAVA_18, JRE.currentVersion());
+	}
+
+	@Test
+	@EnabledOnJre(JAVA_19)
+	void java19() {
+		assertEquals(JAVA_19, JRE.currentVersion());
+	}
+
 	@Test
 	@EnabledOnJre(OTHER)
 	void other() {

From c8fa9c371106ef5ab5d87d68abde4ead27a0ea5a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 10 Apr 2022 19:18:52 +0200
Subject: [PATCH 0740/1433] Only retry deleting directories when cleaning up
 `TempDir` once (#2885)

Fixes #2883.
---
 .../release-notes/release-notes-5.9.0-M1.adoc |  2 +-
 .../engine/extension/TempDirectory.java       | 47 ++++++++++++++-----
 .../extension/CloseablePathCleanupTests.java  | 11 +++++
 .../TempDirectoryPerDeclarationTests.java     | 31 ++++++++++++
 4 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 1ab7d191848e..c6c595a46299 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -43,7 +43,7 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Only retry deleting directories when cleaning up `@TempDir` once.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 44411380e44b..4b33f7ed1743 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -33,6 +33,8 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.function.Predicate;
@@ -69,10 +71,13 @@
  */
 class TempDirectory implements BeforeAllCallback, BeforeEachCallback, ParameterResolver {
 
-	private static final Namespace NAMESPACE = Namespace.create(TempDirectory.class);
+	static final Namespace NAMESPACE = Namespace.create(TempDirectory.class);
 	private static final String KEY = "temp.dir";
 	private static final String TEMP_DIR_PREFIX = "junit";
 
+	// for testing purposes
+	static final String FILE_OPERATIONS_KEY = "file.operations";
+
 	private final JupiterConfiguration configuration;
 
 	public TempDirectory(JupiterConfiguration configuration) {
@@ -238,18 +243,23 @@ public void close() throws IOException {
 				return;
 			}
 
-			SortedMap<Path, IOException> failures = deleteAllFilesAndDirectories();
+			FileOperations fileOperations = executionContext.getStore(NAMESPACE) //
+					.getOrDefault(FILE_OPERATIONS_KEY, FileOperations.class, FileOperations.DEFAULT);
+
+			SortedMap<Path, IOException> failures = deleteAllFilesAndDirectories(fileOperations);
 			if (!failures.isEmpty()) {
 				throw createIOExceptionWithAttachedFailures(failures);
 			}
 		}
 
-		private SortedMap<Path, IOException> deleteAllFilesAndDirectories() throws IOException {
+		private SortedMap<Path, IOException> deleteAllFilesAndDirectories(FileOperations fileOperations)
+				throws IOException {
 			if (Files.notExists(dir)) {
 				return Collections.emptySortedMap();
 			}
 
 			SortedMap<Path, IOException> failures = new TreeMap<>();
+			Set<Path> retriedPaths = new HashSet<>();
 			resetPermissions(dir);
 			Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
 
@@ -280,7 +290,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
 
 				private FileVisitResult deleteAndContinue(Path path) {
 					try {
-						Files.delete(path);
+						fileOperations.delete(path);
 					}
 					catch (NoSuchFileException ignore) {
 						// ignore
@@ -296,17 +306,22 @@ private FileVisitResult deleteAndContinue(Path path) {
 				}
 
 				private void resetPermissionsAndTryToDeleteAgain(Path path, IOException exception) {
-					try {
-						resetPermissions(path);
-						if (Files.isDirectory(path)) {
-							Files.walkFileTree(path, this);
+					boolean notYetRetried = retriedPaths.add(path);
+					if (notYetRetried) {
+						try {
+							resetPermissions(path);
+							if (Files.isDirectory(path)) {
+								Files.walkFileTree(path, this);
+							}
+							else {
+								fileOperations.delete(path);
+							}
 						}
-						else {
-							Files.delete(path);
+						catch (Exception suppressed) {
+							exception.addSuppressed(suppressed);
 						}
 					}
-					catch (Exception suppressed) {
-						exception.addSuppressed(suppressed);
+					else {
 						failures.put(path, exception);
 					}
 				}
@@ -366,4 +381,12 @@ enum Scope {
 
 	}
 
+	interface FileOperations {
+
+		FileOperations DEFAULT = Files::delete;
+
+		void delete(Path path) throws IOException;
+
+	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index 203033e46d65..0daa108be3c0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
 import static org.junit.jupiter.api.io.CleanupMode.NEVER;
 import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -22,11 +23,15 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.jupiter.engine.execution.ExtensionValuesStore;
+import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 
 /**
  * Integration tests for cleanup of the {@link TempDirectory} when the {@link CleanupMode} is
@@ -43,6 +48,12 @@ class CloseablePathCleanupTests extends AbstractJupiterTestEngineTests {
 
 	private TempDirectory.CloseablePath closeablePath;
 
+	@BeforeEach
+	void setUpExtensionContext() {
+		var store = new NamespaceAwareStore(new ExtensionValuesStore(null), Namespace.GLOBAL);
+		when(extensionContext.getStore(any())).thenReturn(store);
+	}
+
 	@AfterEach
 	void cleanupTempDirectory() throws IOException {
 		deleteIfExists(closeablePath.get());
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 34d949881d24..fdcdb166f0e1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -24,6 +24,7 @@
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.cause;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.suppressed;
 
 import java.io.File;
 import java.io.IOException;
@@ -52,11 +53,15 @@
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.Constants;
+import org.junit.jupiter.engine.extension.TempDirectory.FileOperations;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
@@ -186,6 +191,17 @@ void canBeUsedViaStaticFieldInsideNestedTestClasses() {
 				.assertStatistics(stats -> stats.started(2).succeeded(2));
 	}
 
+	@Test
+	void onlyAttemptsToDeleteUndeletableDirectoriesOnce() {
+		var results = executeTestsForClass(UndeletableDirectoryTestCase.class);
+
+		assertSingleFailedTest(results, //
+			instanceOf(IOException.class), //
+			message(it -> it.startsWith("Failed to delete temp directory")), //
+			suppressed(0, instanceOf(IOException.class), message("Simulated failure")), //
+			suppressed(1, instanceOf(IOException.class), message("Simulated failure")));
+	}
+
 	@Nested
 	@DisplayName("reports failure")
 	@TestMethodOrder(OrderAnnotation.class)
@@ -989,4 +1005,19 @@ private static Map<String, Path> getTempDirs(TestInfo testInfo) {
 			return tempDirs.computeIfAbsent(testInfo.getDisplayName(), __ -> new LinkedHashMap<>());
 		}
 	}
+
+	static class UndeletableDirectoryTestCase {
+
+		@RegisterExtension
+		Extension injector = (BeforeEachCallback) context -> context //
+				.getStore(TempDirectory.NAMESPACE) //
+				.put(TempDirectory.FILE_OPERATIONS_KEY, (FileOperations) path -> {
+					throw new IOException("Simulated failure");
+				});
+
+		@Test
+		void test(@TempDir Path tempDir) throws Exception {
+			Files.createDirectory(tempDir.resolve("test-sub-dir"));
+		}
+	}
 }

From f42118ebbde43816e1213b6f2c57a80585d69637 Mon Sep 17 00:00:00 2001
From: klease <38634989+klease@users.noreply.github.com>
Date: Sun, 10 Apr 2022 20:08:59 +0200
Subject: [PATCH 0741/1433] Allow specifying ForkJoinPool saturate predicate
 (#2792)

This allows a custom configuration to supply a predicate to handle the case
where the ForkJoinPool has reached the maximum pool size but all threads
are currently blocked.

Resolves #2787.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.9.0-M1.adoc       |  2 ++
 ...ForkJoinPoolHierarchicalTestExecutorService.java |  2 +-
 .../ParallelExecutionConfiguration.java             | 13 +++++++++++++
 ...ParallelExecutionConfigurationStrategyTests.java | 13 ++++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index c6c595a46299..1035e7feb3fb 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -27,6 +27,8 @@ on GitHub.
 * `ConfigurationParameters` has a new `keySet()` method which allows you to retrieve all
   configuration parameter keys.
 * New `IterationSelector` for selecting a subset of a test's or container's iterations.
+* `ParallelExecutionConfiguration` allows configuring the "saturate" predicate of the
+  `ForkJoinPool` used for parallel test execution.
 * JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
   resolution time a fully running set of dependencies is calculated, avoiding the need for
   these to be manually specified.
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
index dbae941364d7..f32c443e2ca9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
@@ -88,7 +88,7 @@ private ForkJoinPool createForkJoinPool(ParallelExecutionConfiguration configura
 				Integer.TYPE, Integer.TYPE, Predicate.class, Long.TYPE, TimeUnit.class);
 			return constructor.newInstance(configuration.getParallelism(), threadFactory, null, false,
 				configuration.getCorePoolSize(), configuration.getMaxPoolSize(), configuration.getMinimumRunnable(),
-				null, configuration.getKeepAliveSeconds(), TimeUnit.SECONDS);
+				configuration.getSaturatePredicate(), configuration.getKeepAliveSeconds(), TimeUnit.SECONDS);
 		}).orElseTry(() -> {
 			// Fallback for Java 8
 			return new ForkJoinPool(configuration.getParallelism(), threadFactory, null, false);
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
index a1549aad8471..aa39d56e6b0b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
@@ -13,6 +13,7 @@
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
 import java.util.concurrent.ForkJoinPool;
+import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
 
@@ -60,4 +61,16 @@ public interface ParallelExecutionConfiguration {
 	 */
 	int getKeepAliveSeconds();
 
+	/**
+	 * Get the saturate predicate to be used for the execution's {@link ForkJoinPool}.
+	 * @return the saturate predicate to be passed to the {@code ForkJoinPool} constructor; may be {@code null}
+	 * @since 1.9
+	 * @see ForkJoinPool#ForkJoinPool(int, ForkJoinPool.ForkJoinWorkerThreadFactory, Thread.UncaughtExceptionHandler,
+	 * boolean, int, int, int, Predicate, long, TimeUnit)
+	 */
+	@API(status = EXPERIMENTAL, since = "1.9")
+	default Predicate<? super ForkJoinPool> getSaturatePredicate() {
+		return null;
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
index 746f419c8eaf..309dc9d8d473 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
@@ -17,6 +17,8 @@
 import static org.mockito.Mockito.when;
 
 import java.util.Optional;
+import java.util.concurrent.ForkJoinPool;
+import java.util.function.Predicate;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -49,6 +51,7 @@ void fixedStrategyCreatesValidConfiguration() {
 		assertThat(configuration.getMinimumRunnable()).isEqualTo(42);
 		assertThat(configuration.getMaxPoolSize()).isEqualTo(256 + 42);
 		assertThat(configuration.getKeepAliveSeconds()).isEqualTo(30);
+		assertThat(configuration.getSaturatePredicate()).isNull();
 	}
 
 	@Test
@@ -64,6 +67,7 @@ void dynamicStrategyCreatesValidConfiguration() {
 		assertThat(configuration.getMinimumRunnable()).isEqualTo(availableProcessors * 2);
 		assertThat(configuration.getMaxPoolSize()).isEqualTo(256 + (availableProcessors * 2));
 		assertThat(configuration.getKeepAliveSeconds()).isEqualTo(30);
+		assertThat(configuration.getSaturatePredicate()).isNull();
 	}
 
 	@Test
@@ -79,6 +83,8 @@ void customStrategyCreatesValidConfiguration() {
 		assertThat(configuration.getMinimumRunnable()).isEqualTo(2);
 		assertThat(configuration.getMaxPoolSize()).isEqualTo(3);
 		assertThat(configuration.getKeepAliveSeconds()).isEqualTo(5);
+		assertThat(configuration.getSaturatePredicate()).isNotNull();
+		assertThat(configuration.getSaturatePredicate().test(null)).isTrue();
 	}
 
 	@ParameterizedTest
@@ -177,7 +183,12 @@ void customStrategyThrowsExceptionWhenClassDoesNotExist() {
 	static class CustomParallelExecutionConfigurationStrategy implements ParallelExecutionConfigurationStrategy {
 		@Override
 		public ParallelExecutionConfiguration createConfiguration(ConfigurationParameters configurationParameters) {
-			return new DefaultParallelExecutionConfiguration(1, 2, 3, 4, 5);
+			return new DefaultParallelExecutionConfiguration(1, 2, 3, 4, 5) {
+				@Override
+				public Predicate<? super ForkJoinPool> getSaturatePredicate() {
+					return __ -> true;
+				}
+			};
 		}
 	}
 

From d8328d5245dab0a675fe9d25ac872da74694c5c2 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Mon, 11 Apr 2022 10:15:28 +0200
Subject: [PATCH 0742/1433] Use system's console charset for theme detection

Prior to this commit the charset returned by
`Charset.defaultCharset()` was always used to determine
the default theme used by the JUnit `ConsoleLauncher`
application.

Now, on Java 17 and later, Java's Console API is queried
in order to retrieve the user-specified of the charset used
by the system console -- before falling back to the default
charset returned by `Charset.defaultCharset()`.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .github/workflows/codeql-analysis.yml         |  1 -
 .../java-multi-release-sources.gradle.kts     | 52 ++++++++++---------
 .../release-notes/release-notes-5.9.0-M1.adoc | 10 ++--
 .../junit-platform-console.gradle.kts         | 13 ++++-
 .../console/options/CommandLineOptions.java   |  3 +-
 .../console/options/ConsoleUtils.java         | 40 ++++++++++++++
 .../console/options/ConsoleUtils.java         | 42 +++++++++++++++
 .../console/options/ConsoleUtilsTests.java    | 28 ++++++++++
 src/checkstyle/suppressions.xml               |  4 +-
 9 files changed, 158 insertions(+), 35 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
 create mode 100644 junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/console/options/ConsoleUtilsTests.java

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9a0cb0e47d80..3d2321519793 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -32,7 +32,6 @@ jobs:
       with:
         arguments: |
           --no-build-cache
-          -PjavaToolchainVersion=11
           -Dscan.tag.CodeQL
           allMainClasses
     - name: Perform CodeQL Analysis
diff --git a/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts b/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
index 1843acb7c395..9b3155ab764c 100644
--- a/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
@@ -4,38 +4,40 @@ plugins {
 
 val mavenizedProjects: List<Project> by rootProject.extra
 
-val mainRelease9 by sourceSets.registering {
-	compileClasspath += sourceSets.main.get().output
-	runtimeClasspath += sourceSets.main.get().output
-	java {
-		setSrcDirs(setOf("src/main/java9"))
+listOf(9, 17).forEach { javaVersion ->
+	val sourceSet = sourceSets.register("mainRelease${javaVersion}") {
+		compileClasspath += sourceSets.main.get().output
+		runtimeClasspath += sourceSets.main.get().output
+		java {
+			setSrcDirs(setOf("src/main/java${javaVersion}"))
+		}
 	}
-}
-
-configurations.named(mainRelease9.get().compileClasspathConfigurationName).configure {
-	extendsFrom(configurations.compileClasspath.get())
-}
-
-tasks {
 
-	named("allMainClasses").configure {
-		dependsOn(mainRelease9.get().classesTaskName)
+	configurations.named(sourceSet.get().compileClasspathConfigurationName).configure {
+		extendsFrom(configurations.compileClasspath.get())
 	}
 
-	named<JavaCompile>(mainRelease9.get().compileJavaTaskName).configure {
-		options.release.set(9)
-	}
+	tasks {
 
-	named<Checkstyle>("checkstyle${mainRelease9.name.capitalize()}").configure {
-		configFile = rootProject.file("src/checkstyle/checkstyleMain.xml")
-	}
+		named("allMainClasses").configure {
+			dependsOn(sourceSet.get().classesTaskName)
+		}
 
-	if (project in mavenizedProjects) {
-		javadoc {
-			source(mainRelease9.get().allJava)
+		named<JavaCompile>(sourceSet.get().compileJavaTaskName).configure {
+			options.release.set(javaVersion)
 		}
-		named<Jar>("sourcesJar").configure {
-			from(mainRelease9.get().allSource)
+
+		named<Checkstyle>("checkstyle${sourceSet.name.capitalize()}").configure {
+			configFile = rootProject.file("src/checkstyle/checkstyleMain.xml")
+		}
+
+		if (project in mavenizedProjects) {
+			javadoc {
+				source(sourceSet.get().allJava)
+			}
+			named<Jar>("sourcesJar").configure {
+				from(sourceSet.get().allSource)
+			}
 		}
 	}
 }
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 1035e7feb3fb..a1b6727cd7fe 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -35,10 +35,12 @@ on GitHub.
 * JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
 * New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if
   no tests were discovered.
-* Console output color can now be customized. The option `--single-color` will apply a
-  built-in monochrome style, while `--color-palette` will accept a properties file. See
-  the <<../user-guide/index.adoc#running-tests-console-launcher-color-customization, User
-  Guide>> for details.
+* `ConsoleLauncher`'s output color can now be customized. The option `--single-color` will
+  apply a built-in monochrome style, while `--color-palette` will accept a properties file.
+  See the <<../user-guide/index.adoc#running-tests-console-launcher-color-customization,
+  User Guide>> for details.
+* `ConsoleLauncher`'s default theme is now determined by the charset reported by the system
+  console on Java 17 and later.
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 7f1d5ac41104..e389c10166f0 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -21,6 +21,8 @@ dependencies {
 
 tasks {
 	shadowJar {
+		val release17ClassesDir = sourceSets.mainRelease17.get().output.classesDirs.singleFile
+		inputs.dir(release17ClassesDir).withPathSensitivity(PathSensitivity.RELATIVE)
 		exclude("META-INF/versions/9/module-info.class")
 		relocate("picocli", "org.junit.platform.console.shadow.picocli")
 		from(projectDir) {
@@ -35,7 +37,9 @@ tasks {
 				args(
 					"--update",
 					"--file", archiveFile.get().asFile.absolutePath,
-					"--main-class", "org.junit.platform.console.ConsoleLauncher"
+					"--main-class", "org.junit.platform.console.ConsoleLauncher",
+					"--release", "17",
+					"-C", release17ClassesDir.absolutePath, "."
 				)
 			}
 		}
@@ -54,3 +58,10 @@ tasks {
 		property("-runee", "JavaSE-9")
 	}
 }
+
+eclipse {
+	classpath {
+		sourceSets -= project.sourceSets.mainRelease9.get()
+		sourceSets -= project.sourceSets.mainRelease17.get()
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index 66800aef4449..2035da22cea4 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -17,7 +17,6 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
 
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -46,7 +45,7 @@ public class CommandLineOptions {
 
 	static final String DEFAULT_DETAILS_NAME = "tree";
 	static final Details DEFAULT_DETAILS = Details.valueOf(DEFAULT_DETAILS_NAME.toUpperCase(Locale.ROOT));
-	static final Theme DEFAULT_THEME = Theme.valueOf(Charset.defaultCharset());
+	static final Theme DEFAULT_THEME = Theme.valueOf(ConsoleUtils.charset());
 
 	private boolean displayHelp;
 	private boolean ansiColorOutputDisabled;
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
new file mode 100644
index 000000000000..85e243500c7b
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.nio.charset.Charset;
+
+import org.apiguardian.api.API;
+
+/**
+ * Collection of utilities for working with {@code java.io.Console}
+ * and friends.
+ *
+ * <h3>DISCLAIMER</h3>
+ *
+ * <p>These utilities are intended solely for usage within the JUnit framework
+ * itself. <strong>Any usage by external parties is not supported.</strong>
+ * Use at your own risk!
+ *
+ * @since 1.9
+ */
+@API(status = INTERNAL, since = "1.9")
+public class ConsoleUtils {
+
+	/**
+	 * {@return the charset of the console}
+	 */
+	public static Charset charset() {
+		return Charset.defaultCharset();
+	}
+}
diff --git a/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java b/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
new file mode 100644
index 000000000000..01d2a6b0cac1
--- /dev/null
+++ b/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.io.Console;
+import java.nio.charset.Charset;
+
+import org.apiguardian.api.API;
+
+/**
+ * Collection of utilities for working with {@code java.io.Console}
+ * and friends.
+ *
+ * <h3>DISCLAIMER</h3>
+ *
+ * <p>These utilities are intended solely for usage within the JUnit framework
+ * itself. <strong>Any usage by external parties is not supported.</strong>
+ * Use at your own risk!
+ *
+ * @since 1.9
+ */
+@API(status = INTERNAL, since = "1.9")
+public class ConsoleUtils {
+
+	/**
+	 * {@return the charset of the console}
+	 */
+	public static Charset charset() {
+		Console console = System.console();
+		return console != null ? console.charset() : Charset.defaultCharset();
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/ConsoleUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ConsoleUtilsTests.java
new file mode 100644
index 000000000000..7d5103411f8b
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ConsoleUtilsTests.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.nio.charset.Charset;
+
+import org.junit.jupiter.api.Test;
+
+class ConsoleUtilsTests {
+
+	@Test
+	void consoleCharsetReportedByConsoleUtilsIsEitherNativeCharsetOrDefaultCharset() {
+		var console = System.console();
+		var expected = console != null ? console.charset() : Charset.defaultCharset();
+		assertEquals(expected, ConsoleUtils.charset());
+	}
+
+}
diff --git a/src/checkstyle/suppressions.xml b/src/checkstyle/suppressions.xml
index b15726f91ffb..05801fccce21 100644
--- a/src/checkstyle/suppressions.xml
+++ b/src/checkstyle/suppressions.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
 	<suppress checks="JavadocPackage"
-		files="junit-platform-commons[\\/]src[\\/]main[\\/]java9[\\/]org[\\/]junit[\\/]platform[\\/]commons[\\/]util[\\/]*"/>
+		files="junit-platform-commons[\\/]src[\\/]main[\\/]java.+?[\\/]org[\\/]junit[\\/]platform[\\/]commons[\\/]util[\\/]*"/>
 	<suppress checks="JavadocPackage"
-		files="junit-platform-console[\\/]src[\\/]main[\\/]java9[\\/]org[\\/]junit[\\/]platform[\\/]console[\\/]*"/>
+		files="junit-platform-console[\\/]src[\\/]main[\\/]java.+?[\\/]org[\\/]junit[\\/]platform[\\/]console[\\/]*"/>
 </suppressions>

From 42c1add1478053921cf04bc5a082c136a8afbe50 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Thu, 14 Apr 2022 19:55:45 +0200
Subject: [PATCH 0743/1433] Improve error message when FQMN in `@MethodSource`
 is invalid

This commit improves the error message when a fully qualified method name provided in `@MethodSource` is invalid (e.g. org.example.TestClass.testMethod).

Issue #2869
---
 .../params/provider/MethodArgumentsProvider.java      |  2 +-
 .../params/provider/MethodArgumentsProviderTests.java | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 5b05087c053b..27986cdd5bef 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -51,7 +51,7 @@ public Stream<Arguments> provideArguments(ExtensionContext context) {
 
 	private Method getMethod(ExtensionContext context, String factoryMethodName) {
 		if (StringUtils.isNotBlank(factoryMethodName)) {
-			if (factoryMethodName.contains("#")) {
+			if (factoryMethodName.contains(".") || factoryMethodName.contains("#")) {
 				return getMethodByFullyQualifiedName(factoryMethodName);
 			}
 			else {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index a2753c161ef6..0c74627aac8e 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -259,6 +259,17 @@ void throwsExceptionWhenExternalFactoryMethodCannotBeFound() {
 			"Could not find method [nonExistentMethod] in class [" + ExternalFactoryMethods.class.getName() + "]");
 	}
 
+	@Test
+	void throwsExceptionWhenFullyQualifiedMethodNameIsInvalid() {
+		var exception = assertThrows(JUnitException.class,
+			() -> provideArguments(ExternalFactoryMethods.class.getName() + ".wrongSyntax").toArray());
+
+		assertThat(exception.getMessage()).isEqualTo(
+			"[" + ExternalFactoryMethods.class.getName() + ".wrongSyntax] is not a valid fully qualified method name: "
+					+ "it must start with a fully qualified class name followed by a '#' and then the method name, "
+					+ "optionally followed by a parameter list enclosed in parentheses.");
+	}
+
 	@Nested
 	class PrimitiveArrays {
 

From bd339a570a04d86b92a89e31bbecc59475692e2c Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Sat, 16 Apr 2022 13:33:56 +0200
Subject: [PATCH 0744/1433] Set merge strategy to `union` for release note
 files (#2892)

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 252299c5609a..d836e4264a62 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,4 @@
 *.key binary
 *.jar binary
 *.ttf binary
+release-notes-* merge=union

From 4856b3553a05f0c3637b95bed6f0aeec4886a2aa Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Thu, 21 Apr 2022 12:35:50 +0200
Subject: [PATCH 0745/1433] Prune suite discovery result before use (#2887)

Prior to this commit global `PostDiscoveryFilters` were not applied correctly.

Fixes #2838.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.9.0-M1.adoc |  2 +-
 .../org/junit/platform/launcher/TestPlan.java | 21 +++++++++++++-----
 .../core/EngineDiscoveryOrchestrator.java     | 16 +++-----------
 .../core/LauncherDiscoveryResult.java         | 19 ++++++++++++++++
 .../suite/engine/SuiteTestDescriptor.java     |  6 ++++-
 .../suite/engine/SuiteEngineTests.java        | 19 ++++++++++++++++
 .../engine/SuiteTestDescriptorTests.java      |  2 +-
 .../engine/testcases/JUnit4TestsTestCase.java | 20 +++++++++++++++++
 .../engine/testcases/TaggedTestTestCase.java  | 22 +++++++++++++++++++
 .../engine/testsuites/MultiEngineSuite.java   | 22 +++++++++++++++++++
 10 files changed, 127 insertions(+), 22 deletions(-)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/JUnit4TestsTestCase.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/TaggedTestTestCase.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultiEngineSuite.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index a1b6727cd7fe..c5226f6f0de2 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -15,7 +15,7 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Fix handling of global post-discovery filters that apply to `@Suite` classes.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index abfbc3a8e9ba..8184d8c5ab25 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -121,15 +121,24 @@ public void add(@SuppressWarnings("unused") TestIdentifier testIdentifier) {
 	public void addInternal(TestIdentifier testIdentifier) {
 		Preconditions.notNull(testIdentifier, "testIdentifier must not be null");
 		allIdentifiers.put(testIdentifier.getUniqueIdObject(), testIdentifier);
-		if (testIdentifier.getParentIdObject().isPresent()) {
-			UniqueId parentId = testIdentifier.getParentIdObject().get();
-			Set<TestIdentifier> directChildren = children.computeIfAbsent(parentId,
-				key -> synchronizedSet(new LinkedHashSet<>(16)));
-			directChildren.add(testIdentifier);
+
+		// Root identifiers. Typically, a test engine.
+		if (!testIdentifier.getParentIdObject().isPresent()) {
+			roots.add(testIdentifier);
+			return;
 		}
-		else {
+
+		// Identifiers without a parent in this test plan. Could be a test
+		// engine that is used in a suite.
+		UniqueId parentId = testIdentifier.getParentIdObject().get();
+		if (!allIdentifiers.containsKey(parentId)) {
 			roots.add(testIdentifier);
+			return;
 		}
+
+		Set<TestIdentifier> directChildren = children.computeIfAbsent(parentId,
+			key -> synchronizedSet(new LinkedHashSet<>(16)));
+		directChildren.add(testIdentifier);
 	}
 
 	/**
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index 91c768dbe544..57898fbf027a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -11,7 +11,6 @@
 package org.junit.platform.launcher.core;
 
 import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toMap;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.engine.Filter.composeFilters;
 
@@ -21,7 +20,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -96,8 +94,9 @@ public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase
 	 * will not emit start or emit events for engines without tests.
 	 */
 	public LauncherDiscoveryResult discover(LauncherDiscoveryRequest request, Phase phase, UniqueId parentId) {
-		Map<TestEngine, TestDescriptor> result = discover(request, phase, parentId::appendEngine);
-		return new LauncherDiscoveryResult(pruneEngines(result), request.getConfigurationParameters());
+		Map<TestEngine, TestDescriptor> testEngines = discover(request, phase, parentId::appendEngine);
+		LauncherDiscoveryResult result = new LauncherDiscoveryResult(testEngines, request.getConfigurationParameters());
+		return result.withRetainedEngines(TestDescriptor::containsTests);
 	}
 
 	private Map<TestEngine, TestDescriptor> discover(LauncherDiscoveryRequest request, Phase phase,
@@ -202,15 +201,6 @@ private void logTestDescriptorExclusionReasons(Map<String, List<TestDescriptor>>
 		});
 	}
 
-	private Map<TestEngine, TestDescriptor> pruneEngines(Map<TestEngine, TestDescriptor> result) {
-		// @formatter:off
-		return result.entrySet()
-				.stream()
-				.filter(entry -> TestDescriptor.containsTests(entry.getValue()))
-				.collect(toMap(Entry::getKey, Entry::getValue));
-		// @formatter:on
-	}
-
 	/**
 	 * Prune all branches in the tree of {@link TestDescriptor TestDescriptors}
 	 * that do not have executable tests.
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
index f9a4cf26d0e6..94122c8f9ca6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
@@ -11,11 +11,13 @@
 package org.junit.platform.launcher.core;
 
 import static java.util.Collections.unmodifiableMap;
+import static java.util.stream.Collectors.toMap;
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
 import org.junit.platform.engine.ConfigurationParameters;
@@ -56,4 +58,21 @@ Collection<TestDescriptor> getEngineTestDescriptors() {
 		return this.testEngineDescriptors.values();
 	}
 
+	public LauncherDiscoveryResult withRetainedEngines(Predicate<? super TestDescriptor> predicate) {
+		Map<TestEngine, TestDescriptor> prunedTestEngineDescriptors = retainEngines(predicate);
+		if (prunedTestEngineDescriptors.size() < testEngineDescriptors.size()) {
+			return new LauncherDiscoveryResult(prunedTestEngineDescriptors, configurationParameters);
+		}
+		return this;
+	}
+
+	private Map<TestEngine, TestDescriptor> retainEngines(Predicate<? super TestDescriptor> predicate) {
+		// @formatter:off
+		return testEngineDescriptors.entrySet()
+				.stream()
+				.filter(entry -> predicate.test(entry.getValue()))
+				.collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+		// @formatter:on
+	}
+
 }
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index 680a1291aa18..b5ab2dcbe5d6 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -142,7 +142,11 @@ private static String getSuiteDisplayName(Class<?> testClass) {
 
 	void execute(EngineExecutionListener parentEngineExecutionListener) {
 		parentEngineExecutionListener.executionStarted(this);
-		LauncherDiscoveryResult discoveryResult = this.launcherDiscoveryResult;
+		// #2838: The discovery result from a suite may have been filtered by
+		// post discovery filters from the launcher. The discovery result should
+		// be pruned accordingly
+		LauncherDiscoveryResult discoveryResult = this.launcherDiscoveryResult.withRetainedEngines(
+			getChildren()::contains);
 		TestExecutionSummary summary = launcher.execute(discoveryResult, parentEngineExecutionListener);
 		parentEngineExecutionListener.executionFinished(this, computeTestExecutionResult(summary));
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index 208803c9e1e6..e0b7862fb22b 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -12,6 +12,7 @@
 
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
+import static org.junit.platform.launcher.TagFilter.excludeTags;
 import static org.junit.platform.suite.engine.SuiteEngineDescriptor.ENGINE_ID;
 import static org.junit.platform.testkit.engine.EventConditions.container;
 import static org.junit.platform.testkit.engine.EventConditions.displayName;
@@ -33,14 +34,17 @@
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.engine.testcases.DynamicTestsTestCase;
+import org.junit.platform.suite.engine.testcases.JUnit4TestsTestCase;
 import org.junit.platform.suite.engine.testcases.MultipleTestsTestCase;
 import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
+import org.junit.platform.suite.engine.testcases.TaggedTestTestCase;
 import org.junit.platform.suite.engine.testsuites.AbstractSuite;
 import org.junit.platform.suite.engine.testsuites.DynamicSuite;
 import org.junit.platform.suite.engine.testsuites.EmptyDynamicTestSuite;
 import org.junit.platform.suite.engine.testsuites.EmptyDynamicTestWithFailIfNoTestFalseSuite;
 import org.junit.platform.suite.engine.testsuites.EmptyTestCaseSuite;
 import org.junit.platform.suite.engine.testsuites.EmptyTestCaseWithFailIfNoTestFalseSuite;
+import org.junit.platform.suite.engine.testsuites.MultiEngineSuite;
 import org.junit.platform.suite.engine.testsuites.MultipleSuite;
 import org.junit.platform.suite.engine.testsuites.NestedSuite;
 import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
@@ -331,4 +335,19 @@ void emptyDynamicSuitePassesWhenFailIfNoTestIsFalse() {
 		// @formatter:on
 	}
 
+	@Test
+	void pruneAfterPostDiscoveryFilters() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(MultiEngineSuite.class))
+				.filters(excludeTags("excluded"))
+				.execute()
+				.allEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(JUnit4TestsTestCase.class.getName()), finishedSuccessfully()))
+				.doNotHave(test(TaggedTestTestCase.class.getName()))
+				.doNotHave(container("junit-jupiter"));
+		// @formatter:on
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index 9bf6ff9fe4fb..b0ce53036796 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -59,7 +59,7 @@ void suiteIsEmptyBeforeDiscovery() {
 	}
 
 	@Test
-	void suitDiscoversTestsFromClass() {
+	void suiteDiscoversTestsFromClass() {
 		suite.addDiscoveryRequestFrom(SelectClassesSuite.class);
 		suite.discover();
 		assertEquals(Set.of(jupiterEngineId, testClassId, methodId),
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/JUnit4TestsTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/JUnit4TestsTestCase.java
new file mode 100644
index 000000000000..7ac88ca12567
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/JUnit4TestsTestCase.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testcases;
+
+import org.junit.Test;
+
+public class JUnit4TestsTestCase {
+	@Test
+	public void aTest() {
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/TaggedTestTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/TaggedTestTestCase.java
new file mode 100644
index 000000000000..44813086481e
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/TaggedTestTestCase.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testcases;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+public class TaggedTestTestCase {
+	@Test
+	@Tag("excluded")
+	public void test() {
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultiEngineSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultiEngineSuite.java
new file mode 100644
index 000000000000..656e08f273ce
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultiEngineSuite.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.JUnit4TestsTestCase;
+import org.junit.platform.suite.engine.testcases.TaggedTestTestCase;
+
+@Suite
+@SelectClasses({ JUnit4TestsTestCase.class, TaggedTestTestCase.class })
+public class MultiEngineSuite {
+
+}

From b1f6fbfe79de737135b05002445ccb07d04eb715 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 22 Apr 2022 11:26:12 +0200
Subject: [PATCH 0746/1433] Update Gradle Enterprise plugins

---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ff729eccfab5..f56ebf57244a 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.2.3") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2eac7e84a925..57c3b522d5ef 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,9 +5,9 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.9"
-		id("com.gradle.enterprise.test-distribution") version "2.2.3" // keep in sync with buildSrc/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.4"
+		id("com.gradle.enterprise") version "3.10"
+		id("com.gradle.enterprise.test-distribution") version "2.3" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.5"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From f2e10c96d2dd51bcf8f22803e0f6c71c3fe296fc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 22 Apr 2022 12:19:50 +0200
Subject: [PATCH 0747/1433] Enable Predictive Test Selection for local and PR
 builds (#2895)

This PR enables Gradle Enterprise Predictive Test Selection for local
and PR builds. CI builds on main and release/* will continue to always
execute all tests.
---
 .github/actions/run-gradle/action.yml         |  2 +-
 .../kotlin/testing-conventions.gradle.kts     |  3 +++
 .../platform-tooling-support-tests.gradle.kts | 23 +++++++------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
index 929f9be181be..cdd702d0a0ab 100644
--- a/.github/actions/run-gradle/action.yml
+++ b/.github/actions/run-gradle/action.yml
@@ -19,7 +19,7 @@ runs:
       with:
         arguments: |
           -Porg.gradle.java.installations.auto-download=false
-          -Dplatform.tooling.support.tests.enabled=true
+          -PenablePredictiveTestSelection=${{ github.event_name == 'pull_request' }}
           "-Dscan.value.GitHub job=${{ github.job }}"
           javaToolchains
           ${{ inputs.arguments }}
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 0fad3034e72d..0ddd2d405d1e 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -34,6 +34,9 @@ tasks.withType<Test>().configureEach {
 			}
 		}
 	}
+	predictiveSelection {
+		enabled.set(providers.gradleProperty("enablePredictiveTestSelection").map(String::toBoolean).orElse(true))
+	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 	// Required until ASM officially supports the JDK 14
 	systemProperty("net.bytebuddy.experimental", true)
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 4fe284fecb5d..e9b03a885238 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -66,21 +66,14 @@ val unzipMavenDistribution by tasks.registering(Copy::class) {
 }
 
 tasks.test {
-	// Opt-in via system property: '-Dplatform.tooling.support.tests.enabled=true'
-	enabled = System.getProperty("platform.tooling.support.tests.enabled")?.toBoolean() ?: false
-
-	// The following if-block is necessary since Gradle will otherwise
-	// always publish all mavenizedProjects even if this "test" task
-	// is not executed.
-	if (enabled) {
-		// All maven-aware projects must be installed, i.e. published to the local repository
-		val mavenizedProjects: List<Project> by rootProject
-		val tempRepoName: String by rootProject
-
-		(mavenizedProjects + projects.junitBom.dependencyProject)
-				.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") }
-				.forEach { dependsOn(it) }
-	}
+
+	// All maven-aware projects must be installed, i.e. published to the local repository
+	val mavenizedProjects: List<Project> by rootProject
+	val tempRepoName: String by rootProject
+
+	(mavenizedProjects + projects.junitBom.dependencyProject)
+			.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") }
+			.forEach { dependsOn(it) }
 
 	val tempRepoDir: File by rootProject
 	jvmArgumentProviders += MavenRepo(tempRepoDir)

From ac40f4363c07caf270e738fc2fe0e344e9621105 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 22 Apr 2022 17:45:40 +0200
Subject: [PATCH 0748/1433] Disable code coverage comments now that PTS is
 enabled

---
 .codecov.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.codecov.yml b/.codecov.yml
index d724eb3c1d0b..1d36236f1316 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,3 +1,4 @@
+comment: false
 coverage:
   status:
     project:

From d39056a02402bf9a1b826fbd7aeee52d909040f7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 22 Apr 2022 17:58:52 +0200
Subject: [PATCH 0749/1433] Make Codecov "informational" only

https://docs.codecov.com/docs/commit-status#informational
---
 .codecov.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.codecov.yml b/.codecov.yml
index 1d36236f1316..04dae7644042 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -4,4 +4,5 @@ coverage:
     project:
       default:
         threshold: 1
+        informational: true
     patch: off

From b9b746b4eb2b01a0123df93c85ad263d15d1fd96 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Sat, 23 Apr 2022 13:11:41 +0200
Subject: [PATCH 0750/1433] List available test engines

This commit adds the `--list-engines` command to the
JUnit Platform Console Launcher printing an overview of
all registered test engines.

Closes #2789

Co-authored-by: Tobias Frech <tobias@frech.info>
Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.9.0-M1.adoc |  2 ++
 .../platform/console/ConsoleLauncher.java     | 25 +++++++++++++++++++
 .../console/options/AvailableOptions.java     |  4 +++
 .../console/options/CommandLineOptions.java   |  9 +++++++
 .../support/tests/StandaloneTests.java        | 22 ++++++++++++++++
 5 files changed, 62 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index c5226f6f0de2..45a7d1c27ba8 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -41,6 +41,8 @@ on GitHub.
   User Guide>> for details.
 * `ConsoleLauncher`'s default theme is now determined by the charset reported by the system
   console on Java 17 and later.
+* New `--list-engines` option added to the `ConsoleLauncher` displaying all registered test
+  engine implementations.
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index c5c72eddda4d..672293ad56bd 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -15,6 +15,9 @@
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.util.Comparator;
+import java.util.StringJoiner;
+import java.util.stream.StreamSupport;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
@@ -22,6 +25,8 @@
 import org.junit.platform.console.options.CommandLineOptionsParser;
 import org.junit.platform.console.options.PicocliCommandLineOptionsParser;
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
+import org.junit.platform.engine.TestEngine;
+import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 /**
@@ -63,6 +68,10 @@ public static ConsoleLauncherExecutionResult execute(PrintWriter out, PrintWrite
 	ConsoleLauncherExecutionResult execute(String... args) {
 		try {
 			CommandLineOptions options = commandLineOptionsParser.parse(args);
+			if (options.isListEngines()) {
+				displayEngines(out);
+				return ConsoleLauncherExecutionResult.success();
+			}
 			if (!options.isBannerDisabled()) {
 				displayBanner(out);
 			}
@@ -90,6 +99,22 @@ void displayBanner(PrintWriter out) {
 		out.println();
 	}
 
+	void displayEngines(PrintWriter out) {
+		ServiceLoaderTestEngineRegistry registry = new ServiceLoaderTestEngineRegistry();
+		Iterable<TestEngine> engines = registry.loadTestEngines();
+		StreamSupport.stream(engines.spliterator(), false) //
+				.sorted(Comparator.comparing(TestEngine::getId)) //
+				.forEach(engine -> displayEngine(out, engine));
+	}
+
+	private void displayEngine(PrintWriter out, TestEngine engine) {
+		StringJoiner details = new StringJoiner(":", " (", ")");
+		engine.getGroupId().ifPresent(details::add);
+		engine.getArtifactId().ifPresent(details::add);
+		engine.getVersion().ifPresent(details::add);
+		out.println(engine.getId() + details);
+	}
+
 	private ConsoleLauncherExecutionResult executeTests(CommandLineOptions options, PrintWriter out) {
 		try {
 			TestExecutionSummary testExecutionSummary = new ConsoleTestExecutor(options).execute(out);
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index 0328fd93cf3d..5eb9cd9438b9 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -85,8 +85,12 @@ static class CommandOptions {
 		@Option(names = { "--h", "-help" }, help = true, hidden = true)
 		private boolean helpRequested2;
 
+		@Option(names = { "--list-engines" }, description = "List all observable test engines.")
+		private boolean listEnginesRequested;
+
 		private void applyTo(CommandLineOptions result) {
 			result.setDisplayHelp(this.helpRequested || this.helpRequested2);
+			result.setListEngines(this.listEnginesRequested);
 		}
 	}
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index 2035da22cea4..e8575e1c232a 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -48,6 +48,7 @@ public class CommandLineOptions {
 	static final Theme DEFAULT_THEME = Theme.valueOf(ConsoleUtils.charset());
 
 	private boolean displayHelp;
+	private boolean listEngines;
 	private boolean ansiColorOutputDisabled;
 	private Path colorPalettePath;
 	private boolean isSingleColorPalette;
@@ -93,6 +94,14 @@ public void setDisplayHelp(boolean displayHelp) {
 		this.displayHelp = displayHelp;
 	}
 
+	public boolean isListEngines() {
+		return this.listEngines;
+	}
+
+	public void setListEngines(boolean listEngines) {
+		this.listEngines = listEngines;
+	}
+
 	public boolean isAnsiColorOutputDisabled() {
 		return this.ansiColorOutputDisabled;
 	}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index d26770b15842..c02c91a67584 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -58,6 +58,28 @@ void jarFileWithoutCompiledModuleDescriptorClass() throws Exception {
 		assertTrue(found.isEmpty(), jar + " must not contain any " + name + " files: " + found);
 	}
 
+	@Test
+	void listAllObservableEngines() {
+		var result = Request.builder() //
+				.setTool(new Java()) //
+				.setProject("standalone") //
+				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
+				.addArguments("--list-engines").build() //
+				.run(false);
+
+		assertEquals(0, result.getExitCode(), String.join("\n", result.getOutputLines("out")));
+
+		var jupiterVersion = Helper.version("junit-jupiter-engine");
+		var suiteVersion = Helper.version("junit-platform-suite-engine");
+		var vintageVersion = Helper.version("junit-vintage-engine");
+		assertLinesMatch("""
+				junit-jupiter (org.junit.jupiter:junit-jupiter-engine:%s)
+				junit-platform-suite (org.junit.platform:junit-platform-suite-engine:%s)
+				junit-vintage (org.junit.vintage:junit-vintage-engine:%s)
+				""".formatted(jupiterVersion, suiteVersion, vintageVersion).lines(), //
+			result.getOutput("out").lines());
+	}
+
 	@Test
 	@Order(1)
 	void compile() throws Exception {

From 611ecefbfc5f637a65625e92cd79896e85eb4bac Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 24 Apr 2022 16:09:34 +0200
Subject: [PATCH 0751/1433] Help diagnose EngineFilter misconfiguration (#2844)

* Throw JUnitException for unmatched include EngineFilters
* Log warning if all engines were excluded

Resolves #2824.
---
 .../release-notes/release-notes-5.9.0-M1.adoc |   3 +
 .../junit/platform/launcher/EngineFilter.java |  13 +-
 .../core/EngineDiscoveryOrchestrator.java     |   7 +-
 .../launcher/core/EngineFilterer.java         |  94 +++++++++
 .../core/ServiceLoaderTestEngineRegistry.java |  30 +--
 .../launcher/core/TestEngineFormatter.java    |  49 +++++
 .../testkit/engine/EngineTestKit.java         |  42 +---
 .../DefaultLauncherEngineFilterTests.java     | 194 ++++++++++++++++++
 .../launcher/core/DefaultLauncherTests.java   | 113 ----------
 .../projects/standalone/expected-err.txt      |  10 +-
 10 files changed, 370 insertions(+), 185 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 45a7d1c27ba8..c78123b3c671 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -43,6 +43,9 @@ on GitHub.
   console on Java 17 and later.
 * New `--list-engines` option added to the `ConsoleLauncher` displaying all registered test
   engine implementations.
+* Configuring include `EngineFilters` that do not match any registered `TestEngine`
+  results in an error to avoid misconfiguration, e.g. due to typos.
+
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
index 2e874f582024..e0519879e188 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
@@ -11,6 +11,7 @@
 package org.junit.platform.launcher;
 
 import static java.util.stream.Collectors.toList;
+import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.engine.FilterResult.includedIf;
 
@@ -109,6 +110,16 @@ private EngineFilter(List<String> engineIds, Type type) {
 		this.type = type;
 	}
 
+	@API(status = INTERNAL, since = "1.9")
+	public List<String> getEngineIds() {
+		return engineIds;
+	}
+
+	@API(status = INTERNAL, since = "1.9")
+	public boolean isIncludeFilter() {
+		return type == Type.INCLUDE;
+	}
+
 	@Override
 	public FilterResult apply(TestEngine testEngine) {
 		Preconditions.notNull(testEngine, "TestEngine must not be null");
@@ -152,7 +163,7 @@ private enum Type {
 
 		private final String verb;
 
-		private Type(String verb) {
+		Type(String verb) {
 			this.verb = verb;
 		}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index 57898fbf027a..94dcc7813395 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -114,11 +114,10 @@ private Map<TestEngine, TestDescriptor> discover(LauncherDiscoveryRequest reques
 	private Map<TestEngine, TestDescriptor> discoverSafely(LauncherDiscoveryRequest request, Phase phase,
 			LauncherDiscoveryListener listener, Function<String, UniqueId> uniqueIdCreator) {
 		Map<TestEngine, TestDescriptor> testEngineDescriptors = new LinkedHashMap<>();
+		EngineFilterer engineFilterer = new EngineFilterer(request.getEngineFilters());
 
 		for (TestEngine testEngine : this.testEngines) {
-			boolean engineIsExcluded = request.getEngineFilters().stream() //
-					.map(engineFilter -> engineFilter.apply(testEngine)) //
-					.anyMatch(FilterResult::excluded);
+			boolean engineIsExcluded = engineFilterer.isExcluded(testEngine);
 
 			if (engineIsExcluded) {
 				logger.debug(() -> String.format(
@@ -134,6 +133,8 @@ private Map<TestEngine, TestDescriptor> discoverSafely(LauncherDiscoveryRequest
 			testEngineDescriptors.put(testEngine, rootDescriptor);
 		}
 
+		engineFilterer.performSanityChecks();
+
 		List<PostDiscoveryFilter> filters = new LinkedList<>(postDiscoveryFilters);
 		filters.addAll(request.getPostDiscoveryFilters());
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java
new file mode 100644
index 000000000000..98d2e6afc6ac
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toCollection;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
+import org.junit.platform.engine.FilterResult;
+import org.junit.platform.engine.TestEngine;
+import org.junit.platform.launcher.EngineFilter;
+
+class EngineFilterer {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(EngineFilterer.class);
+
+	private final List<EngineFilter> engineFilters;
+
+	private final Map<TestEngine, Boolean> checkedTestEngines = new HashMap<>();
+
+	EngineFilterer(List<EngineFilter> engineFilters) {
+		this.engineFilters = engineFilters;
+	}
+
+	boolean isExcluded(TestEngine testEngine) {
+		boolean excluded = engineFilters.stream() //
+				.map(engineFilter -> engineFilter.apply(testEngine)) //
+				.anyMatch(FilterResult::excluded);
+		checkedTestEngines.put(testEngine, excluded);
+		return excluded;
+	}
+
+	void performSanityChecks() {
+		checkNoUnmatchedIncludeFilter();
+		warnIfAllEnginesExcluded();
+	}
+
+	private void warnIfAllEnginesExcluded() {
+		if (!checkedTestEngines.isEmpty() && checkedTestEngines.values().stream().allMatch(excluded -> excluded)) {
+			LOGGER.warn(() -> "All TestEngines were excluded by EngineFilters.\n" + getStateDescription());
+		}
+	}
+
+	private void checkNoUnmatchedIncludeFilter() {
+		SortedSet<String> unmatchedEngineIdsOfIncludeFilters = getUnmatchedEngineIdsOfIncludeFilters();
+		if (!unmatchedEngineIdsOfIncludeFilters.isEmpty()) {
+			throw new JUnitException("No TestEngine ID matched the following include EngineFilters: "
+					+ unmatchedEngineIdsOfIncludeFilters + ".\n" //
+					+ "Please fix/remove the filter or add the engine.\n" //
+					+ getStateDescription());
+		}
+	}
+
+	private SortedSet<String> getUnmatchedEngineIdsOfIncludeFilters() {
+		return engineFilters.stream() //
+				.filter(EngineFilter::isIncludeFilter) //
+				.filter(engineFilter -> checkedTestEngines.keySet().stream() //
+						.map(engineFilter::apply) //
+						.noneMatch(FilterResult::included)) //
+				.flatMap(engineFilter -> engineFilter.getEngineIds().stream()) //
+				.collect(toCollection(TreeSet::new));
+	}
+
+	private String getStateDescription() {
+		return getRegisteredEnginesDescription() + "\n" + getRegisteredFiltersDescription();
+	}
+
+	private String getRegisteredEnginesDescription() {
+		return TestEngineFormatter.format("Registered TestEngines", checkedTestEngines.keySet());
+	}
+
+	private String getRegisteredFiltersDescription() {
+		return "Registered EngineFilters:" + engineFilters.stream() //
+				.map(Objects::toString) //
+				.collect(joining("\n- ", "\n- ", ""));
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
index cda5f0c2a18e..0d691e4b07a6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
@@ -10,20 +10,14 @@
 
 package org.junit.platform.launcher.core;
 
-import static java.lang.String.join;
-import static java.util.stream.Collectors.toList;
 import static org.apiguardian.api.API.Status.INTERNAL;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.ServiceLoader;
-import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ClassLoaderUtils;
-import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.engine.TestEngine;
 
 /**
@@ -33,7 +27,6 @@
 public final class ServiceLoaderTestEngineRegistry {
 
 	public ServiceLoaderTestEngineRegistry() {
-
 	}
 
 	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderTestEngineRegistry.class);
@@ -41,29 +34,8 @@ public ServiceLoaderTestEngineRegistry() {
 	public Iterable<TestEngine> loadTestEngines() {
 		Iterable<TestEngine> testEngines = ServiceLoader.load(TestEngine.class,
 			ClassLoaderUtils.getDefaultClassLoader());
-		logger.config(() -> createDiscoveredTestEnginesMessage(testEngines));
+		logger.config(() -> TestEngineFormatter.format("Discovered TestEngines", testEngines));
 		return testEngines;
 	}
 
-	@SuppressWarnings("unchecked")
-	private String createDiscoveredTestEnginesMessage(Iterable<TestEngine> testEngines) {
-		// @formatter:off
-		List<String> details = ((Stream<TestEngine>) CollectionUtils.toStream(testEngines))
-				.map(engine -> String.format("%s (%s)", engine.getId(), join(", ", computeAttributes(engine))))
-				.collect(toList());
-		return details.isEmpty()
-				? "No TestEngine implementation discovered."
-				: "Discovered TestEngines with IDs: [" + join(", ", details) + "]";
-		// @formatter:on
-	}
-
-	private List<String> computeAttributes(TestEngine engine) {
-		List<String> attributes = new ArrayList<>(4);
-		engine.getGroupId().ifPresent(groupId -> attributes.add("group ID: " + groupId));
-		engine.getArtifactId().ifPresent(artifactId -> attributes.add("artifact ID: " + artifactId));
-		engine.getVersion().ifPresent(version -> attributes.add("version: " + version));
-		ClassLoaderUtils.getLocation(engine).ifPresent(location -> attributes.add("location: " + location));
-		return attributes;
-	}
-
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java
new file mode 100644
index 000000000000..bc5e2ca9723f
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static java.lang.String.join;
+import static java.util.stream.Collectors.joining;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.platform.commons.util.ClassLoaderUtils;
+import org.junit.platform.commons.util.CollectionUtils;
+import org.junit.platform.engine.TestEngine;
+
+class TestEngineFormatter {
+
+	private TestEngineFormatter() {
+	}
+
+	@SuppressWarnings("unchecked")
+	static String format(String title, Iterable<TestEngine> testEngines) {
+		return format(title, (Stream<TestEngine>) CollectionUtils.toStream(testEngines));
+	}
+
+	private static String format(String title, Stream<TestEngine> testEngines) {
+		String details = testEngines //
+				.map(engine -> String.format("- %s (%s)", engine.getId(), join(", ", computeAttributes(engine)))) //
+				.collect(joining("\n"));
+		return title + ":" + (details.isEmpty() ? " <none>" : "\n" + details);
+	}
+
+	private static List<String> computeAttributes(TestEngine engine) {
+		List<String> attributes = new ArrayList<>(4);
+		engine.getGroupId().ifPresent(groupId -> attributes.add("group ID: " + groupId));
+		engine.getArtifactId().ifPresent(artifactId -> attributes.add("artifact ID: " + artifactId));
+		engine.getVersion().ifPresent(version -> attributes.add("version: " + version));
+		ClassLoaderUtils.getLocation(engine).ifPresent(location -> attributes.add("location: " + location));
+		return attributes;
+	}
+}
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index 530d9eef8767..9631d8651ff5 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -10,18 +10,13 @@
 
 package org.junit.platform.testkit.engine;
 
-import static java.lang.String.join;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singleton;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.StreamSupport.stream;
 import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
 import static org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.Phase.EXECUTION;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.stream.Stream;
@@ -30,7 +25,6 @@
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
-import org.junit.platform.commons.util.ClassLoaderUtils;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.DiscoveryFilter;
@@ -47,6 +41,7 @@
 import org.junit.platform.launcher.core.EngineExecutionOrchestrator;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.launcher.core.LauncherDiscoveryResult;
+import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
 
 /**
  * {@code EngineTestKit} provides support for executing a test plan for a given
@@ -273,43 +268,16 @@ private static void executeUsingLauncherOrchestration(TestEngine testEngine,
 		new EngineExecutionOrchestrator().execute(discoveryResult, listener);
 	}
 
+	@SuppressWarnings("unchecked")
 	private static TestEngine loadTestEngine(String engineId) {
-		return stream((loadTestEngines()).spliterator(), false)//
-				.filter(engine -> engineId.equals(engine.getId()))//
+		Iterable<TestEngine> testEngines = new ServiceLoaderTestEngineRegistry().loadTestEngines();
+		return ((Stream<TestEngine>) CollectionUtils.toStream(testEngines)) //
+				.filter((TestEngine engine) -> engineId.equals(engine.getId()))//
 				.findFirst()//
 				.orElseThrow(() -> new PreconditionViolationException(
 					String.format("Failed to load TestEngine with ID [%s]", engineId)));
 	}
 
-	private static Iterable<TestEngine> loadTestEngines() {
-		ClassLoader defaultClassLoader = ClassLoaderUtils.getDefaultClassLoader();
-		Iterable<TestEngine> testEngines = ServiceLoader.load(TestEngine.class, defaultClassLoader);
-		logger.config(() -> createDiscoveredTestEnginesMessage(testEngines));
-		return testEngines;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static String createDiscoveredTestEnginesMessage(Iterable<TestEngine> testEngines) {
-		// @formatter:off
-		List<String> details = ((Stream<TestEngine>) CollectionUtils.toStream(testEngines))
-				.map(engine -> String.format("%s (%s)", engine.getId(), join(", ", computeAttributes(engine))))
-				.collect(toList());
-
-		return details.isEmpty()
-				? "No TestEngine implementation discovered."
-				: "Discovered TestEngines with IDs: [" + join(", ", details) + "]";
-		// @formatter:on
-	}
-
-	private static List<String> computeAttributes(TestEngine engine) {
-		List<String> attributes = new ArrayList<>(4);
-		engine.getGroupId().ifPresent(groupId -> attributes.add("group ID: " + groupId));
-		engine.getArtifactId().ifPresent(artifactId -> attributes.add("artifact ID: " + artifactId));
-		engine.getVersion().ifPresent(version -> attributes.add("version: " + version));
-		ClassLoaderUtils.getLocation(engine).ifPresent(location -> attributes.add("location: " + location));
-		return attributes;
-	}
-
 	private EngineTestKit() {
 		/* no-op */
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java
new file mode 100644
index 000000000000..8d805b8fcf5e
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static java.util.logging.Level.WARNING;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
+import static org.junit.platform.launcher.EngineFilter.excludeEngines;
+import static org.junit.platform.launcher.EngineFilter.includeEngines;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+import static org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly.createLauncher;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.fixtures.TrackLogRecords;
+import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.logging.LogRecordListener;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+
+/**
+ * @since 1.0
+ */
+class DefaultLauncherEngineFilterTests {
+
+	private static final Runnable noOp = () -> {
+	};
+
+	@Test
+	void launcherWillNotExecuteEnginesIfNotIncludedByAnEngineFilter() {
+		var firstEngine = new DemoHierarchicalTestEngine("first");
+		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
+		var secondEngine = new DemoHierarchicalTestEngine("second");
+		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
+
+		var launcher = createLauncher(firstEngine, secondEngine);
+
+		// @formatter:off
+		var testPlan = launcher.discover(
+			request()
+				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
+				.filters(includeEngines("first"))
+				.build());
+		// @formatter:on
+
+		assertThat(testPlan.getRoots()).hasSize(1);
+		var rootIdentifier = testPlan.getRoots().iterator().next();
+		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
+		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
+	}
+
+	@Test
+	void launcherWillExecuteAllEnginesExplicitlyIncludedViaSingleEngineFilter() {
+		var firstEngine = new DemoHierarchicalTestEngine("first");
+		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
+		var secondEngine = new DemoHierarchicalTestEngine("second");
+		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
+
+		var launcher = createLauncher(firstEngine, secondEngine);
+
+		// @formatter:off
+		var testPlan = launcher.discover(
+			request()
+				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
+				.filters(includeEngines("first", "second"))
+				.build());
+		// @formatter:on
+
+		assertThat(testPlan.getRoots()).hasSize(2);
+	}
+
+	@Test
+	void launcherWillNotExecuteEnginesExplicitlyIncludedViaMultipleCompetingEngineFilters() {
+		var firstEngine = new DemoHierarchicalTestEngine("first");
+		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
+		var secondEngine = new DemoHierarchicalTestEngine("second");
+		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
+
+		var launcher = createLauncher(firstEngine, secondEngine);
+
+		// @formatter:off
+		var testPlan = launcher.discover(
+			request()
+				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
+				.filters(includeEngines("first"), includeEngines("second"))
+				.build());
+		// @formatter:on
+
+		assertThat(testPlan.getRoots()).isEmpty();
+	}
+
+	@Test
+	void launcherWillNotExecuteEnginesExplicitlyExcludedByAnEngineFilter() {
+		var firstEngine = new DemoHierarchicalTestEngine("first");
+		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
+		var secondEngine = new DemoHierarchicalTestEngine("second");
+		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
+
+		var launcher = createLauncher(firstEngine, secondEngine);
+
+		// @formatter:off
+		var testPlan = launcher.discover(
+			request()
+				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
+				.filters(excludeEngines("second"))
+				.build());
+		// @formatter:on
+
+		assertThat(testPlan.getRoots()).hasSize(1);
+		var rootIdentifier = testPlan.getRoots().iterator().next();
+		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
+		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
+	}
+
+	@Test
+	void launcherWillExecuteEnginesHonoringBothIncludeAndExcludeEngineFilters() {
+		var firstEngine = new DemoHierarchicalTestEngine("first");
+		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
+		var secondEngine = new DemoHierarchicalTestEngine("second");
+		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
+		var thirdEngine = new DemoHierarchicalTestEngine("third");
+		TestDescriptor test3 = thirdEngine.addTest("test3", noOp);
+
+		var launcher = createLauncher(firstEngine, secondEngine, thirdEngine);
+
+		// @formatter:off
+		var testPlan = launcher.discover(
+			request()
+				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()), selectUniqueId(test3.getUniqueId()))
+				.filters(includeEngines("first", "second"), excludeEngines("second"))
+				.build());
+		// @formatter:on
+
+		assertThat(testPlan.getRoots()).hasSize(1);
+		var rootIdentifier = testPlan.getRoots().iterator().next();
+		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
+		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
+	}
+
+	@Test
+	@TrackLogRecords
+	void launcherThrowsExceptionWhenNoEngineMatchesIncludeEngineFilter(LogRecordListener log) {
+		var engine = new DemoHierarchicalTestEngine("first");
+		TestDescriptor test1 = engine.addTest("test1", noOp);
+		LauncherDiscoveryRequest request = request() //
+				.selectors(selectUniqueId(test1.getUniqueId())) //
+				.filters(includeEngines("second")) //
+				.build();
+
+		var launcher = createLauncher(engine);
+		var exception = assertThrows(JUnitException.class, () -> launcher.discover(request));
+
+		assertThat(exception.getMessage()) //
+				.startsWith("No TestEngine ID matched the following include EngineFilters: [second].") //
+				.contains("Please fix/remove the filter or add the engine.") //
+				.contains("Registered TestEngines:\n- first (") //
+				.endsWith("Registered EngineFilters:\n- EngineFilter that includes engines with IDs [second]");
+		assertThat(log.stream(WARNING)).isEmpty();
+	}
+
+	@Test
+	@TrackLogRecords
+	void launcherWillLogWarningWhenAllEnginesWereExcluded(LogRecordListener log) {
+		var engine = new DemoHierarchicalTestEngine("first");
+		TestDescriptor test = engine.addTest("test1", noOp);
+
+		var launcher = createLauncher(engine);
+
+		// @formatter:off
+		var testPlan = launcher.discover(
+				request()
+						.selectors(selectUniqueId(test.getUniqueId()))
+						.filters(excludeEngines("first"))
+						.build());
+		// @formatter:on
+
+		assertThat(testPlan.getRoots()).isEmpty();
+		assertThat(log.stream(WARNING)).hasSize(1);
+		assertThat(log.stream(WARNING).findAny().orElseThrow().getMessage()) //
+				.startsWith("All TestEngines were excluded by EngineFilters.") //
+				.contains("Registered TestEngines:\n- first (") //
+				.endsWith("Registered EngineFilters:\n- EngineFilter that excludes engines with IDs [first]");
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index fad546574c8b..209e9d945bb1 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -18,8 +18,6 @@
 import static org.junit.platform.engine.TestExecutionResult.successful;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
-import static org.junit.platform.launcher.EngineFilter.excludeEngines;
-import static org.junit.platform.launcher.EngineFilter.includeEngines;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 import static org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly.createLauncher;
@@ -369,117 +367,6 @@ void discoverTestPlanForMultipleEngines() {
 		assertThat(testPlan.getChildren(UniqueId.forEngine("engine2").toString())).hasSize(1);
 	}
 
-	@Test
-	void launcherWillNotExecuteEnginesIfNotIncludedByAnEngineFilter() {
-		var firstEngine = new DemoHierarchicalTestEngine("first");
-		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		var secondEngine = new DemoHierarchicalTestEngine("second");
-		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
-
-		var launcher = createLauncher(firstEngine, secondEngine);
-
-		// @formatter:off
-		var testPlan = launcher.discover(
-			request()
-				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
-				.filters(includeEngines("first"))
-				.build());
-		// @formatter:on
-
-		assertThat(testPlan.getRoots()).hasSize(1);
-		var rootIdentifier = testPlan.getRoots().iterator().next();
-		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
-		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
-	}
-
-	@Test
-	void launcherWillExecuteAllEnginesExplicitlyIncludedViaSingleEngineFilter() {
-		var firstEngine = new DemoHierarchicalTestEngine("first");
-		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		var secondEngine = new DemoHierarchicalTestEngine("second");
-		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
-
-		var launcher = createLauncher(firstEngine, secondEngine);
-
-		// @formatter:off
-		var testPlan = launcher.discover(
-			request()
-				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
-				.filters(includeEngines("first", "second"))
-				.build());
-		// @formatter:on
-
-		assertThat(testPlan.getRoots()).hasSize(2);
-	}
-
-	@Test
-	void launcherWillNotExecuteEnginesExplicitlyIncludedViaMultipleCompetingEngineFilters() {
-		var firstEngine = new DemoHierarchicalTestEngine("first");
-		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		var secondEngine = new DemoHierarchicalTestEngine("second");
-		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
-
-		var launcher = createLauncher(firstEngine, secondEngine);
-
-		// @formatter:off
-		var testPlan = launcher.discover(
-			request()
-				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
-				.filters(includeEngines("first"), includeEngines("second"))
-				.build());
-		// @formatter:on
-
-		assertThat(testPlan.getRoots()).isEmpty();
-	}
-
-	@Test
-	void launcherWillNotExecuteEnginesExplicitlyExcludedByAnEngineFilter() {
-		var firstEngine = new DemoHierarchicalTestEngine("first");
-		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		var secondEngine = new DemoHierarchicalTestEngine("second");
-		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
-
-		var launcher = createLauncher(firstEngine, secondEngine);
-
-		// @formatter:off
-		var testPlan = launcher.discover(
-			request()
-				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()))
-				.filters(excludeEngines("second"))
-				.build());
-		// @formatter:on
-
-		assertThat(testPlan.getRoots()).hasSize(1);
-		var rootIdentifier = testPlan.getRoots().iterator().next();
-		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
-		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
-	}
-
-	@Test
-	void launcherWillExecuteEnginesHonoringBothIncludeAndExcludeEngineFilters() {
-		var firstEngine = new DemoHierarchicalTestEngine("first");
-		TestDescriptor test1 = firstEngine.addTest("test1", noOp);
-		var secondEngine = new DemoHierarchicalTestEngine("second");
-		TestDescriptor test2 = secondEngine.addTest("test2", noOp);
-		var thirdEngine = new DemoHierarchicalTestEngine("third");
-		TestDescriptor test3 = thirdEngine.addTest("test3", noOp);
-
-		var launcher = createLauncher(firstEngine, secondEngine, thirdEngine);
-
-		// @formatter:off
-		var testPlan = launcher.discover(
-			request()
-				.selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId()), selectUniqueId(test3.getUniqueId()))
-				.filters(includeEngines("first", "second"), excludeEngines("second"))
-				.build());
-		// @formatter:on
-
-		assertThat(testPlan.getRoots()).hasSize(1);
-		var rootIdentifier = testPlan.getRoots().iterator().next();
-		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
-		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
-	}
-
 	@Test
 	void launcherAppliesPostDiscoveryFilters() {
 		var engine = new DemoHierarchicalTestEngine("myEngine");
diff --git a/platform-tooling-support-tests/projects/standalone/expected-err.txt b/platform-tooling-support-tests/projects/standalone/expected-err.txt
index ce91a2f7c73f..46cdad9ec4b2 100644
--- a/platform-tooling-support-tests/projects/standalone/expected-err.txt
+++ b/platform-tooling-support-tests/projects/standalone/expected-err.txt
@@ -1,5 +1,8 @@
 .+ org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry loadTestEngines
-.+ Discovered TestEngines with IDs. .junit-jupiter .+ junit-vintage .+ junit-platform-suite .+
+.+ Discovered TestEngines:
+- junit-jupiter .+
+- junit-vintage .+
+- junit-platform-suite .+
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded PostDiscoveryFilter instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
@@ -9,4 +12,7 @@
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded LauncherSessionListener instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry loadTestEngines
-.+ Discovered TestEngines with IDs. .junit-jupiter .+ junit-vintage .+ junit-platform-suite .+
+.+ Discovered TestEngines:
+- junit-jupiter .+
+- junit-vintage .+
+- junit-platform-suite .+

From be69de7c86bf96cbbbf181b68bd2c8a9cd53bbc9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 2 May 2022 17:19:37 +0200
Subject: [PATCH 0752/1433] Follow naming convention for test classes

---
 ...aletteTest.java => ColorPaletteTests.java} | 36 +++++++++++++------
 .../tasks/FlatPrintingListenerTests.java      | 11 ++++--
 2 files changed, 33 insertions(+), 14 deletions(-)
 rename platform-tests/src/test/java/org/junit/platform/console/tasks/{ColorPaletteTest.java => ColorPaletteTests.java} (87%)

diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTest.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
similarity index 87%
rename from platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTest.java
rename to platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
index f4ab1b5ef23b..cb1c8236b476 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
@@ -11,13 +11,14 @@
 package org.junit.platform.console.tasks;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
 import java.io.PrintWriter;
 import java.io.StringReader;
 import java.util.List;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.console.options.Theme;
@@ -31,9 +32,16 @@
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 
-class ColorPaletteTest {
+/**
+ * Unit tests for {@link ColorPalette}.
+ *
+ * @since 1.9
+ */
+class ColorPaletteTests {
+
 	@Nested
-	class LoadFromProperties {
+	class LoadFromPropertiesTests {
+
 		@Test
 		void singleOverride() {
 			String properties = """
@@ -43,7 +51,7 @@ void singleOverride() {
 
 			String actual = colorPalette.paint(Style.SUCCESSFUL, "text");
 
-			Assertions.assertEquals("\u001B[35;1mtext\u001B[0m", actual);
+			assertEquals("\u001B[35;1mtext\u001B[0m", actual);
 		}
 
 		@Test
@@ -55,7 +63,7 @@ void keysAreCaseInsensitive() {
 
 			String actual = colorPalette.paint(Style.SUCCESSFUL, "text");
 
-			Assertions.assertEquals("\u001B[35;1mtext\u001B[0m", actual);
+			assertEquals("\u001B[35;1mtext\u001B[0m", actual);
 		}
 
 		@Test
@@ -68,7 +76,7 @@ void junkKeysAreIgnored() {
 
 			String actual = colorPalette.paint(Style.SUCCESSFUL, "text");
 
-			Assertions.assertEquals("\u001B[35;1mtext\u001B[0m", actual);
+			assertEquals("\u001B[35;1mtext\u001B[0m", actual);
 		}
 
 		@Test
@@ -82,8 +90,8 @@ void multipleOverrides() {
 			String successful = colorPalette.paint(Style.SUCCESSFUL, "text");
 			String failed = colorPalette.paint(Style.FAILED, "text");
 
-			Assertions.assertEquals("\u001B[35;1mtext\u001B[0m", successful);
-			Assertions.assertEquals("\u001B[33;4mtext\u001B[0m", failed);
+			assertEquals("\u001B[35;1mtext\u001B[0m", successful);
+			assertEquals("\u001B[33;4mtext\u001B[0m", failed);
 		}
 
 		@Test
@@ -95,7 +103,7 @@ void unspecifiedStylesAreDefault() {
 
 			String actual = colorPalette.paint(Style.FAILED, "text");
 
-			Assertions.assertEquals("\u001B[31mtext\u001B[0m", actual);
+			assertEquals("\u001B[31mtext\u001B[0m", actual);
 		}
 
 		@Test
@@ -105,12 +113,16 @@ void cannotOverrideNone() {
 					""";
 			StringReader reader = new StringReader(properties);
 
-			Assertions.assertThrows(IllegalArgumentException.class, () -> new ColorPalette(reader));
+			assertThrows(IllegalArgumentException.class, () -> new ColorPalette(reader));
 		}
 	}
 
+	/**
+	 * TODO Actually assert something in these "demo" tests and stop printing to SYSOUT.
+	 */
 	@Nested
-	class DemonstratePalettes {
+	class DemonstratePalettesTests {
+
 		@Test
 		void verbose_default() {
 			PrintWriter out = new PrintWriter(System.out);
@@ -190,5 +202,7 @@ private void demoTestRun(TestExecutionListener listener) {
 			listener.executionSkipped(TestIdentifier.from(testDescriptor), "to demonstrate skipping");
 			listener.testPlanExecutionFinished(testPlan);
 		}
+
 	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
index 2bbe98bff9dd..274e977ac960 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
@@ -72,9 +72,11 @@ void executionFinishedWithFailure() {
 	}
 
 	@Nested
-	class Color {
+	class ColorPaletteTests {
+
 		@Nested
-		class Default {
+		class DefaultColorPaletteTests {
+
 			@Test
 			void executionSkipped() {
 				var stringWriter = new StringWriter();
@@ -117,10 +119,12 @@ void executionFinishedWithFailure() {
 						lines[1]),
 					() -> assertTrue(lines[lines.length - 1].endsWith("\u001B[0m")));
 			}
+
 		}
 
 		@Nested
-		class Overrides {
+		class ColorPaletteOverrideTests {
+
 			@Test
 			void overridingSkipped() {
 				var stringWriter = new StringWriter();
@@ -150,6 +154,7 @@ void overridingUnusedStyle() {
 					() -> assertEquals("\u001B[35m" + INDENTATION + "=> Reason: Test", lines[1]), //
 					() -> assertEquals(INDENTATION + "disabled\u001B[0m", lines[2]));
 			}
+
 		}
 
 	}

From 3ef0216940e25aceb3807ebe68a7df96bacf7158 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 2 May 2022 17:20:07 +0200
Subject: [PATCH 0753/1433] Polishing

---
 .../asciidoc/release-notes/release-notes-5.9.0-M1.adoc |  8 ++++----
 .../org/junit/platform/console/tasks/ColorPalette.java | 10 ++++++++--
 .../java/org/junit/platform/console/tasks/Style.java   |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index c78123b3c671..61a662990924 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -33,8 +33,8 @@ on GitHub.
   resolution time a fully running set of dependencies is calculated, avoiding the need for
   these to be manually specified.
 * JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
-* New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if
-  no tests were discovered.
+* New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if no tests
+  were discovered.
 * `ConsoleLauncher`'s output color can now be customized. The option `--single-color` will
   apply a built-in monochrome style, while `--color-palette` will accept a properties file.
   See the <<../user-guide/index.adoc#running-tests-console-launcher-color-customization,
@@ -44,7 +44,7 @@ on GitHub.
 * New `--list-engines` option added to the `ConsoleLauncher` displaying all registered test
   engine implementations.
 * Configuring include `EngineFilters` that do not match any registered `TestEngine`
-  results in an error to avoid misconfiguration, e.g. due to typos.
+  results in an error to avoid misconfiguration – for example, due to typos.
 
 
 [[release-notes-5.9.0-M1-junit-jupiter]]
@@ -62,7 +62,7 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* `@TempDir` now includes a cleanup mode attribute for preventing a temporary directory
+* `@TempDir` now includes a `cleanup` mode attribute for preventing a temporary directory
   from being deleted after a test. The default cleanup mode can be configured via a
   configuration parameter.
 * Support for FreeBSD and OpenBSD operating systems in `@EnabledOnOs` and `@DisabledOnOs`.
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
index 41dcb8bcb3fa..069d56410b56 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
@@ -21,10 +21,15 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+/**
+ * @since 1.9
+ */
 class ColorPalette {
+
 	public static final ColorPalette SINGLE_COLOR = new ColorPalette(singleColorPalette(), false);
 	public static final ColorPalette DEFAULT = new ColorPalette(defaultPalette(), false);
 	public static final ColorPalette NONE = new ColorPalette(new EnumMap<>(Style.class), true);
+
 	private final Map<Style, String> colorsToAnsiSequences;
 	private final boolean disableAnsiColors;
 
@@ -112,11 +117,12 @@ private static Properties getProperties(Path path) {
 	}
 
 	public String paint(Style style, String text) {
-		return disableAnsiColors || style == Style.NONE ? text
+		return this.disableAnsiColors || style == Style.NONE ? text
 				: getAnsiFormatter(style) + text + getAnsiFormatter(Style.NONE);
 	}
 
 	private String getAnsiFormatter(Style style) {
-		return String.format("\u001B[%sm", colorsToAnsiSequences.get(style));
+		return String.format("\u001B[%sm", this.colorsToAnsiSequences.get(style));
 	}
+
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
index 1f5a68de53e3..f1c1b64d1969 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
@@ -17,6 +17,7 @@
  * @since 1.9
  */
 enum Style {
+
 	NONE, SUCCESSFUL, ABORTED, FAILED, SKIPPED, CONTAINER, TEST, DYNAMIC, REPORTED;
 
 	static Style valueOf(TestExecutionResult result) {

From 3b79a2f687f8fb040eb2aebcf31bf9ba2e722fda Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 3 May 2022 11:13:42 +0200
Subject: [PATCH 0754/1433] Fix Asciidoc formatting in User Guide

This commit fixes the formatting for "*System*, *Unit*" and applies
triple plus passthrough consistently.

See https://docs.asciidoctor.org/asciidoc/latest/pass/pass-macro/#triple-plus
---
 .../asciidoc/user-guide/running-tests.adoc    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 9150fd2a20c6..93c2dbafc66b 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -341,10 +341,10 @@ long as you configure `test` scoped dependencies on JUnit 4 and the JUnit Vintag
 The Maven Surefire Plugin will scan for test classes whose fully qualified names match
 the following patterns.
 
-- `+**/Test*.java+`
-- `+**/*Test.java+`
-- `+**/*Tests.java+`
-- `+**/*TestCase.java+`
+- `+++**/Test*.java+++`
+- `+++**/*Test.java+++`
+- `+++**/*Tests.java+++`
+- `+++**/*TestCase.java+++`
 
 Moreover, it will exclude all nested classes (including static member classes) by default.
 
@@ -796,23 +796,23 @@ parameters_ used for the following features.
 - <<launcher-api-listeners-custom-deactivation>>
 
 If the value for the given _configuration parameter_ consists solely of an asterisk
-(`+*+`), the pattern will match against all candidate classes. Otherwise, the value will
-be treated as a comma-separated list of patterns where each pattern will be matched
+(`+++*+++`), the pattern will match against all candidate classes. Otherwise, the value
+will be treated as a comma-separated list of patterns where each pattern will be matched
 against the fully qualified class name (_FQCN_) of each candidate class. Any dot (`.`) in
 a pattern will match against a dot (`.`) or a dollar sign (`$`) in a FQCN. Any asterisk
-(`+*+`) will match against one or more characters in a FQCN. All other characters in a
+(`+++*+++`) will match against one or more characters in a FQCN. All other characters in a
 pattern will be matched one-to-one against a FQCN.
 
 Examples:
 
-- `+*+`: matches all candidate classes.
-- `+org.junit.*+`: matches all candidate classes under the `org.junit` base package and
+- `+++*+++`: matches all candidate classes.
+- `+++org.junit.*+++`: matches all candidate classes under the `org.junit` base package and
   any of its subpackages.
-- `+*.MyCustomImpl+`: matches every candidate class whose simple class name is exactly
+- `+++*.MyCustomImpl+++`: matches every candidate class whose simple class name is exactly
   `MyCustomImpl`.
-- `+*System*+`: matches every candidate class whose FQCN contains `System`.
-- `+*System*+, +*Unit*+`: matches every candidate class whose FQCN contains `System` or
-  `Unit`.
+- `+++*System*+++`: matches every candidate class whose FQCN contains `System`.
+- `+++*System*+++, +++*Unit*+++`: matches every candidate class whose FQCN contains
+  `System` or `Unit`.
 - `org.example.MyCustomImpl`: matches the candidate class whose FQCN is exactly
   `org.example.MyCustomImpl`.
 - `org.example.MyCustomImpl, org.example.TheirCustomImpl`: matches candidate classes whose
@@ -877,19 +877,19 @@ expressions can be useful.
 | Tag Expression
 | Selection
 
-| +product+
+| `+++product+++`
 | all tests for *product*
 
-| +catalog \| shipping+
+| `+++catalog \| shipping+++`
 | all tests for *catalog* plus all tests for *shipping*
 
-| +catalog & shipping+
+| `+++catalog & shipping+++`
 | all tests for the intersection between *catalog* and *shipping*
 
-| +product & !end-to-end+
+| `+++product & !end-to-end+++`
 | all tests for *product*, but not the _end-to-end_ tests
 
-| +(micro \| integration) & (product \| shipping)+
+| `+++(micro \| integration) & (product \| shipping)+++`
 | all _micro_ or _integration_ tests for *product* or *shipping*
 |===
 

From 07c98a7358004d8a9688381717fea4970220662d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prinet?= <jprinet@gradle.com>
Date: Thu, 5 May 2022 12:52:39 +0200
Subject: [PATCH 0755/1433] Add dependabot configuration to monitor Gradle
 plugins (#2907)

---
 .github/dependabot.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000000..29a1155627e6
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+version: 2
+registries:
+  gradle-plugin-portal:
+    type: maven-repository
+    url: https://plugins.gradle.org/m2
+    username: dummy # Required by dependabot
+    password: dummy # Required by dependabot
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    allow:
+      - dependency-name: "com.gradle*"
+    registries:
+      - gradle-plugin-portal
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10

From bd39c9d8329289d57044e36e897fe5b2a5ecc474 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 17:23:32 +0200
Subject: [PATCH 0756/1433] Bump com.gradle.enterprise.test-distribution from
 2.3 to 2.3.1 (#2908)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 57c3b522d5ef..2043a71e72f9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.10"
-		id("com.gradle.enterprise.test-distribution") version "2.3" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise.test-distribution") version "2.3.1" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.5"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"

From 80bf93fd3cb841e76fc017dc759d8ef0df158d49 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 6 May 2022 15:52:14 +0200
Subject: [PATCH 0757/1433] Make @Order a stable API

Closes #2910
---
 .../docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc  | 1 +
 .../src/main/java/org/junit/jupiter/api/ClassOrderer.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodOrderer.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/Order.java           | 5 ++---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 61a662990924..3102f9930ecc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -68,6 +68,7 @@ on GitHub.
 * Support for FreeBSD and OpenBSD operating systems in `@EnabledOnOs` and `@DisabledOnOs`.
 * New `MATCH_NONE` mode for `@EnumSource` that selects only those enum constants whose
   names match none of the supplied patterns.
+* The `@Order` annotation is now a `STABLE` API.
 * New `TestInstancePreConstructCallback` extension API that is called prior to test
   instance construction – symmetric to the existing `TestInstancePreDestroyCallback`
   extension API.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 41b0c7636c64..e00a3640ed1e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -154,7 +154,7 @@ public void orderClasses(ClassOrdererContext context) {
 	 * arbitrarily adjacent to each other.
 	 *
 	 * <p>Any classes not annotated with {@code @Order} will be assigned the
-	 * {@link Order#DEFAULT default order} value which will effectively cause them
+	 * {@linkplain Order#DEFAULT default order} value which will effectively cause them
 	 * to appear at the end of the sorted list, unless certain classes are assigned
 	 * an explicit order value greater than the default order value. Any classes
 	 * assigned an explicit order value greater than the default order value will
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index adc3a3e203d9..1997de0bba38 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -217,7 +217,7 @@ public void orderMethods(MethodOrdererContext context) {
 	 * arbitrarily adjacent to each other.
 	 *
 	 * <p>Any methods not annotated with {@code @Order} will be assigned the
-	 * {@link Order#DEFAULT default order} value which will effectively cause them
+	 * {@linkplain Order#DEFAULT default order} value which will effectively cause them
 	 * to appear at the end of the sorted list, unless certain methods are assigned
 	 * an explicit order value greater than the default order value. Any methods
 	 * assigned an explicit order value greater than the default order value will
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
index 83261f3b2f93..e8203fb3cbb4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -46,7 +46,7 @@
 @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@API(status = EXPERIMENTAL, since = "5.4")
+@API(status = STABLE, since = "5.9")
 public @interface Order {
 
 	/**
@@ -56,7 +56,6 @@
 	 * @since 5.6
 	 * @see Order#value
 	 */
-	@API(status = EXPERIMENTAL, since = "5.6")
 	int DEFAULT = Integer.MAX_VALUE / 2;
 
 	/**

From 018da263cac48a05ed03431865b78ed4c3a04e66 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 11 May 2022 18:05:22 +0200
Subject: [PATCH 0758/1433] Allow opting out of running
 :platform-tooling-support-tests:test

via `-Dplatform.tooling.support.tests.enabled=false`
---
 .../platform-tooling-support-tests.gradle.kts    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index e9b03a885238..5dca606eeed2 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -66,14 +66,22 @@ val unzipMavenDistribution by tasks.registering(Copy::class) {
 }
 
 tasks.test {
+	// Opt-in via system property: '-Dplatform.tooling.support.tests.enabled=true'
+	enabled = System.getProperty("platform.tooling.support.tests.enabled")?.toBoolean() ?: true
 
-	// All maven-aware projects must be installed, i.e. published to the local repository
-	val mavenizedProjects: List<Project> by rootProject
-	val tempRepoName: String by rootProject
+	// The following if-block is necessary since Gradle will otherwise
+	// always publish all mavenizedProjects even if this "test" task
+	// is not executed.
+	if (enabled) {
 
-	(mavenizedProjects + projects.junitBom.dependencyProject)
+		// All maven-aware projects must be installed, i.e. published to the local repository
+		val mavenizedProjects: List<Project> by rootProject
+		val tempRepoName: String by rootProject
+
+		(mavenizedProjects + projects.junitBom.dependencyProject)
 			.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") }
 			.forEach { dependsOn(it) }
+	}
 
 	val tempRepoDir: File by rootProject
 	jvmArgumentProviders += MavenRepo(tempRepoDir)

From f1650584562d088420eff1450beb5cc1c94dddef Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 11 May 2022 18:06:19 +0200
Subject: [PATCH 0759/1433] Remove outdated configuration

since we no longer use `Bartholdy.install`
---
 .../platform-tooling-support-tests.gradle.kts                   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 5dca606eeed2..31bf3df1db86 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -108,8 +108,6 @@ tasks.test {
 		requirements.add("jdk=8")
 	}
 	jvmArgumentProviders += JavaHomeDir(project, 8)
-
-	maxParallelForks = 1 // Bartholdy.install is not parallel safe, see https://github.com/sormuras/bartholdy/issues/4
 }
 
 class MavenRepo(@get:InputDirectory @get:PathSensitive(RELATIVE) val repoDir: File) : CommandLineArgumentProvider {

From 4c582af1eef421d3ef9b5ec2ef97768563968a75 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Fri, 13 May 2022 13:01:54 +0200
Subject: [PATCH 0760/1433] Use registered ParameterResolver(s) when invoking
 @MethodSource factory methods (#2880)

This commit adds the possibility to provide arguments to a `@MethodSource` factory method.
They will be resolved by any registered `ParameterResolver` supporting this type of parameter.

Closes #2191
---
 .../release-notes/release-notes-5.9.0-M1.adoc |   2 +
 .../asciidoc/user-guide/writing-tests.adoc    |  14 ++-
 ...thodSourceParameterResolutionTestDemo.java |  65 +++++++++++
 .../provider/MethodArgumentsProvider.java     |  34 +++---
 .../jupiter/params/provider/MethodSource.java |   6 +-
 .../MethodArgumentsProviderTests.java         | 102 ++++++++++++++++--
 6 files changed, 197 insertions(+), 26 deletions(-)
 create mode 100644 documentation/src/test/java/example/MethodSourceParameterResolutionTestDemo.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 3102f9930ecc..814267148374 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -77,6 +77,8 @@ on GitHub.
 * A subset of the invocations of parameterized or dynamic tests can now be selected via
   the new `IterationSelector` discovery selector when launching the JUnit Platform.
 * `JAVA_19` has been added to the `JRE` enum for use with JRE-based execution conditions.
+* `@MethodSource` factory methods can now accept arguments resolved by registered
+  `ParameterResolver`.
 
 
 [[release-notes-5.9.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 8a1eed5c7e8b..de0ff39ddf92 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1273,7 +1273,7 @@ or external classes.
 
 Factory methods within the test class must be `static` unless the test class is annotated
 with `@TestInstance(Lifecycle.PER_CLASS)`; whereas, factory methods in external classes
-must always be `static`. In addition, such factory methods must not accept any arguments.
+must always be `static`.
 
 Each factory method must generate a _stream_ of _arguments_, and each set of arguments
 within the stream will be provided as the physical arguments for individual invocations
@@ -1333,6 +1333,18 @@ package example;
 include::{testDir}/example/ExternalMethodSourceDemo.java[tags=external_MethodSource_example]
 ----
 
+Factory methods can declare parameters, which will be provided by registered implementations
+of `ParameterResolver`. In the following example, the factory method is referenced by its
+name since there's only one such method in the test class. If there are several methods with
+the same name, the factory method needs to be referenced by its fully qualified method name
+(e.g., `@MethodSource("example.MyTests#factoryMethodWithArguments(java.lang.String)")`).
+
+[source,java,indent=0]
+----
+include::{testDir}/example/MethodSourceParameterResolutionTestDemo.java[tags=parameter_resolution_MethodSource_example]
+----
+
+
 [[writing-tests-parameterized-tests-sources-CsvSource]]
 ===== @CsvSource
 
diff --git a/documentation/src/test/java/example/MethodSourceParameterResolutionTestDemo.java b/documentation/src/test/java/example/MethodSourceParameterResolutionTestDemo.java
new file mode 100644
index 000000000000..9f0e93284154
--- /dev/null
+++ b/documentation/src/test/java/example/MethodSourceParameterResolutionTestDemo.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class MethodSourceParameterResolutionTestDemo {
+
+	// @formatter:off
+	// tag::parameter_resolution_MethodSource_example[]
+	@RegisterExtension
+	static final IntegerResolver integerResolver = new IntegerResolver();
+
+	@ParameterizedTest
+	@MethodSource("factoryMethodWithArguments")
+	void testWithArgumentsProviderUsingParameterResolvers(String argument) {
+		assertTrue(argument.startsWith("2"));
+	}
+
+	static Stream<Arguments> factoryMethodWithArguments(int quantity) {
+		return Stream.of(
+				arguments(quantity + " apple"),
+				arguments(quantity + " lemon")
+		);
+	}
+
+	static class IntegerResolver implements ParameterResolver {
+
+		@Override
+		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+				throws ParameterResolutionException {
+			return parameterContext.getParameter().getType() == int.class;
+		}
+
+		@Override
+		public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+				throws ParameterResolutionException {
+			return 2;
+		}
+
+	}
+	// end::parameter_resolution_MethodSource_example[]
+	// @formatter:on
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 27986cdd5bef..d8b52d473ecc 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -15,6 +15,7 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -43,23 +44,21 @@ public Stream<Arguments> provideArguments(ExtensionContext context) {
 		// @formatter:off
 		return Arrays.stream(this.methodNames)
 				.map(factoryMethodName -> getMethod(context, factoryMethodName))
-				.map(method -> ReflectionUtils.invokeMethod(method, testInstance))
+				.map(method -> context.getExecutableInvoker().invoke(method, testInstance))
 				.flatMap(CollectionUtils::toStream)
 				.map(MethodArgumentsProvider::toArguments);
 		// @formatter:on
 	}
 
 	private Method getMethod(ExtensionContext context, String factoryMethodName) {
-		if (StringUtils.isNotBlank(factoryMethodName)) {
-			if (factoryMethodName.contains(".") || factoryMethodName.contains("#")) {
-				return getMethodByFullyQualifiedName(factoryMethodName);
-			}
-			else {
-				return ReflectionUtils.getRequiredMethod(context.getRequiredTestClass(), factoryMethodName);
-			}
+		if (StringUtils.isBlank(factoryMethodName)) {
+			return ReflectionUtils.getRequiredMethod(context.getRequiredTestClass(),
+				context.getRequiredTestMethod().getName());
 		}
-		return ReflectionUtils.getRequiredMethod(context.getRequiredTestClass(),
-			context.getRequiredTestMethod().getName());
+		if (factoryMethodName.contains(".") || factoryMethodName.contains("#")) {
+			return getMethodByFullyQualifiedName(factoryMethodName);
+		}
+		return getMethodByShortName(context.getRequiredTestClass(), factoryMethodName);
 	}
 
 	private Method getMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
@@ -68,10 +67,19 @@ private Method getMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
 		String methodName = methodParts[1];
 		String methodParameters = methodParts[2];
 
-		Preconditions.condition(StringUtils.isBlank(methodParameters),
-			() -> format("factory method [%s] must not declare formal parameters", fullyQualifiedMethodName));
+		return ReflectionUtils.findMethod(loadRequiredClass(className), methodName, methodParameters).orElseThrow(
+			() -> new JUnitException(
+				format("Could not find method [%s(%s)] in class [%s]", methodName, methodParameters, className)));
+	}
 
-		return ReflectionUtils.getRequiredMethod(loadRequiredClass(className), methodName);
+	private Method getMethodByShortName(Class<?> testClass, String methodName) {
+		List<Method> methods = ReflectionUtils.findMethods(testClass, method -> method.getName().equals(methodName));
+		Preconditions.condition(methods.size() > 0,
+			() -> format("Could not find method [%s] in class [%s]", methodName, testClass.getName()));
+		Preconditions.condition(methods.size() <= 1,
+			() -> format("Several factory methods named [%s] were found in class [%s]", methodName,
+				testClass.getName()));
+		return methods.get(0);
 	}
 
 	private Class<?> loadRequiredClass(String className) {
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index baea1ad42ae9..e8e280987d21 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -87,8 +87,10 @@
  * <p>Factory methods within the test class must be {@code static} unless the
  * {@link org.junit.jupiter.api.TestInstance.Lifecycle#PER_CLASS PER_CLASS}
  * test instance lifecycle mode is used; whereas, factory methods in external
- * classes must always be {@code static}. In any case, factory methods must not
- * declare any parameters.
+ * classes must always be {@code static}.
+ *
+ * <p>Factory methods can declare parameters, which will be provided by registered
+ * implementations of {@link org.junit.jupiter.api.extension.ParameterResolver}.
  *
  * @since 5.0
  * @see Arguments
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 0c74627aac8e..3f326864d4b8 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.engine.extension.MutableExtensionRegistry.createRegistryWithDefaultExtensions;
 import static org.junit.jupiter.params.provider.MethodArgumentsProviderTests.DefaultFactoryMethodNameTestCase.TEST_METHOD;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
 import static org.mockito.Mockito.doCallRealMethod;
@@ -28,9 +29,16 @@
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
+import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -40,6 +48,8 @@
  */
 class MethodArgumentsProviderTests {
 
+	private MutableExtensionRegistry extensionRegistry;
+
 	@Test
 	void throwsExceptionForIllegalReturnType() {
 		var exception = assertThrows(PreconditionViolationException.class,
@@ -232,15 +242,6 @@ void providesArgumentsUsingExternalAndInternalFactoryMethodsCombined() {
 		assertThat(arguments).containsExactly(array("foo"), array("bar"), array("string1"), array("string2"));
 	}
 
-	@Test
-	void throwsExceptionWhenExternalFactoryMethodDeclaresParameters() {
-		var exception = assertThrows(PreconditionViolationException.class, () -> provideArguments(
-			ExternalFactoryMethods.class.getName() + "#methodWithParams(String, String)").toArray());
-
-		assertThat(exception.getMessage()).isEqualTo("factory method [" + ExternalFactoryMethods.class.getName()
-				+ "#methodWithParams(String, String)] must not declare formal parameters");
-	}
-
 	@Test
 	void throwsExceptionWhenClassForExternalFactoryMethodCannotBeLoaded() {
 		var exception = assertThrows(JUnitException.class,
@@ -256,7 +257,7 @@ void throwsExceptionWhenExternalFactoryMethodCannotBeFound() {
 			() -> provideArguments(ExternalFactoryMethods.class.getName() + "#nonExistentMethod").toArray());
 
 		assertThat(exception.getMessage()).isEqualTo(
-			"Could not find method [nonExistentMethod] in class [" + ExternalFactoryMethods.class.getName() + "]");
+			"Could not find method [nonExistentMethod()] in class [" + ExternalFactoryMethods.class.getName() + "]");
 	}
 
 	@Test
@@ -357,6 +358,58 @@ void providesArgumentsUsing2dObjectArray() {
 
 	}
 
+	@Nested
+	class ParameterResolution {
+
+		@BeforeEach
+		void registerParameterResolver() {
+			JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+			extensionRegistry = createRegistryWithDefaultExtensions(configuration);
+			extensionRegistry.registerExtension(StringResolver.class);
+		}
+
+		@Test
+		void providesArgumentsUsingFactoryMethodWithParameter() {
+			var arguments = provideArguments("stringStreamProviderWithParameter");
+
+			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
+		}
+
+		@Test
+		void providesArgumentsUsingFullyQualifiedNameWithParameter() {
+			var arguments = provideArguments(
+				TestCase.class.getName() + "#stringStreamProviderWithParameter(java.lang.String)");
+
+			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
+		}
+
+		@Test
+		void throwExceptionWhenSeveralFactoryMethodsWithSameNameAreAvailable() {
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments("stringStreamProviderWithOrWithoutParameter").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo(
+				"Several factory methods named [stringStreamProviderWithOrWithoutParameter] were found in class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]");
+		}
+
+		@Test
+		void providesArgumentsUsingFactoryMethodSelectedViaFullyQualifiedNameWithParameter() {
+			var arguments = provideArguments(
+				TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter(java.lang.String)");
+
+			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
+		}
+
+		@Test
+		void providesArgumentsUsingFactoryMethodSelectedViaFullyQualifiedNameWithoutParameter() {
+			var arguments = provideArguments(
+				TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter()");
+
+			assertThat(arguments).containsExactly(array("foo"), array("bar"));
+		}
+
+	}
+
 	// -------------------------------------------------------------------------
 
 	private static Object[] array(Object... objects) {
@@ -377,6 +430,8 @@ private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod,
 		var extensionContext = mock(ExtensionContext.class);
 		when(extensionContext.getTestClass()).thenReturn(Optional.ofNullable(testClass));
 		when(extensionContext.getTestMethod()).thenReturn(Optional.ofNullable(testMethod));
+		when(extensionContext.getExecutableInvoker()).thenReturn(
+			new DefaultExecutableInvoker(extensionContext, extensionRegistry));
 
 		doCallRealMethod().when(extensionContext).getRequiredTestMethod();
 		doCallRealMethod().when(extensionContext).getRequiredTestClass();
@@ -449,6 +504,18 @@ static Stream<Arguments> argumentsStreamProvider() {
 			return objectArrayStreamProvider().map(Arguments::of);
 		}
 
+		static Stream<String> stringStreamProviderWithParameter(String parameter) {
+			return Stream.of("foo" + parameter, "bar" + parameter);
+		}
+
+		static Stream<String> stringStreamProviderWithOrWithoutParameter() {
+			return stringStreamProvider();
+		}
+
+		static Stream<String> stringStreamProviderWithOrWithoutParameter(String parameter) {
+			return stringStreamProviderWithParameter(parameter);
+		}
+
 		// --- Iterable / Collection -------------------------------------------
 
 		static Iterable<String> stringIterableProvider() {
@@ -549,4 +616,19 @@ static Stream<String> stringsProvider() {
 		}
 	}
 
+	static class StringResolver implements ParameterResolver {
+
+		@Override
+		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+				throws ParameterResolutionException {
+			return parameterContext.getParameter().getType() == String.class;
+		}
+
+		@Override
+		public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+				throws ParameterResolutionException {
+			return "!";
+		}
+	}
+
 }

From e727ac8929af0c601df17b0864a19d4f9c274dfb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 2 Apr 2021 17:02:21 +0200
Subject: [PATCH 0761/1433] Basic OpenTestReportGeneratingListener

---
 documentation/documentation.gradle.kts        |  2 +
 .../junit-platform-reporting.gradle.kts       |  2 +
 .../xml/OpenTestReportGeneratingListener.java | 83 +++++++++++++++++++
 ...it.platform.launcher.TestExecutionListener |  1 +
 .../module-info.java                          |  3 +
 settings.gradle.kts                           |  6 ++
 6 files changed, 97 insertions(+)
 create mode 100644 junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
 create mode 100644 junit-platform-reporting/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 1f92f684c234..e29dd03a1b13 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -125,6 +125,7 @@ tasks {
 			val debugging = findProperty("consoleLauncherTestDebug")?.toString()?.toBoolean() ?: false
 			val output = ByteArrayOutputStream()
 			val result = javaexec {
+				debug = project.findProperty("debug") == "true"
 				classpath = runtimeClasspath
 				mainClass.set("org.junit.platform.console.ConsoleLauncher")
 				args("--scan-classpath")
@@ -134,6 +135,7 @@ tasks {
 				args("--exclude-tag", "exclude")
 				args("--reports-dir", reportsDir)
 				systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
+				systemProperty("junit.platform.reports.dir", reportsDir)
 				debug = debugging
 				if (!debugging) {
 					standardOutput = output
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index 57da6f66bf9e..2ab434dcdaba 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -10,6 +10,8 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
+	implementation("org.opentest4j.reporting:lib")
+
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
new file mode 100644
index 000000000000..25cb65425ba0
--- /dev/null
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -0,0 +1,83 @@
+package org.junit.platform.reporting.open.xml;
+
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+import org.opentest4j.reporting.EventReportFileWriter;
+import org.opentest4j.reporting.Namespace;
+import org.opentest4j.reporting.NamespaceRegistry;
+import org.opentest4j.reporting.Started;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.opentest4j.reporting.JUnitExtensions.LEGACY_REPORTING_NAME;
+
+public class OpenTestReportGeneratingListener implements TestExecutionListener {
+
+    private final Path reportDir;
+    private EventReportFileWriter eventWriter;
+
+    public OpenTestReportGeneratingListener() {
+        this(lookupReportDirFromSystemProperties());
+    }
+
+    private static Path lookupReportDirFromSystemProperties() {
+        String reportDir = System.getProperty("junit.platform.reports.dir");
+        return reportDir != null ? Paths.get(reportDir) : null;
+    }
+
+    public OpenTestReportGeneratingListener(Path reportDir) {
+        this.reportDir = reportDir;
+    }
+
+    @Override
+    public void testPlanExecutionStarted(TestPlan testPlan) {
+        if (reportDir != null) {
+            try {
+                Files.createDirectories(reportDir);
+                Map<Namespace, String> additionalNamespaces = new HashMap<>();
+                additionalNamespaces.put(Namespace.JAVA, "java");
+                additionalNamespaces.put(Namespace.JUNIT, "junit");
+                Path eventsXml = reportDir.resolve("junit-platform-events-" + System.currentTimeMillis() + ".xml");
+                eventWriter = new EventReportFileWriter(eventsXml, NamespaceRegistry.of(additionalNamespaces));
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to close XML events file", e);
+            }
+        }
+    }
+
+    @Override
+    public void testPlanExecutionFinished(TestPlan testPlan) {
+        if (eventWriter != null) {
+            try {
+                eventWriter.close();
+            } catch (IOException e) {
+                throw new UncheckedIOException("Failed to close XML events file", e);
+            } finally {
+                eventWriter = null;
+            }
+        }
+    }
+
+    @Override
+    public void executionStarted(TestIdentifier testIdentifier) {
+        eventWriter.append(builder -> {
+            Started started = builder.started(testIdentifier.getUniqueId()) //
+                    .name(testIdentifier.getDisplayName());
+            testIdentifier.getParentId().ifPresent(started::parentId);
+            return started.attribute(LEGACY_REPORTING_NAME, testIdentifier.getLegacyReportingName());
+        });
+    }
+
+    @Override
+    public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+        eventWriter.append(builder -> builder.finished(testIdentifier.getUniqueId()));
+    }
+}
diff --git a/junit-platform-reporting/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/junit-platform-reporting/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
new file mode 100644
index 000000000000..d48ed59783b1
--- /dev/null
+++ b/junit-platform-reporting/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
@@ -0,0 +1 @@
+org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener
diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
index b6240681922f..e272dadb7fb1 100644
--- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
@@ -23,4 +23,7 @@
 	// exports org.junit.platform.reporting; empty package
 	exports org.junit.platform.reporting.legacy;
 	exports org.junit.platform.reporting.legacy.xml;
+
+	provides org.junit.platform.launcher.TestExecutionListener
+			with org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener;
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2043a71e72f9..e6eb9962b874 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -119,6 +119,12 @@ include("platform-tests")
 include("platform-tooling-support-tests")
 include("junit-bom")
 
+includeBuild("../open-test-reporting") {
+	dependencySubstitution {
+		substitute(module("org.opentest4j.reporting:lib")).with(project(":"))
+	}
+}
+
 // check that every subproject has a custom build file
 // based on the project name
 rootProject.children.forEach { project ->

From eb0dcbf69d332e634f954cfb399d037812e0f431 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Apr 2021 13:05:09 +0200
Subject: [PATCH 0762/1433] Split package

---
 .../xml/OpenTestReportGeneratingListener.java | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 25cb65425ba0..e15e970bf7d5 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -1,13 +1,16 @@
 package org.junit.platform.reporting.open.xml;
 
 import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
-import org.opentest4j.reporting.EventReportFileWriter;
-import org.opentest4j.reporting.Namespace;
-import org.opentest4j.reporting.NamespaceRegistry;
-import org.opentest4j.reporting.Started;
+import org.opentest4j.reporting.events.api.EventReportFileWriter;
+import org.opentest4j.reporting.events.api.Namespace;
+import org.opentest4j.reporting.events.api.NamespaceRegistry;
+import org.opentest4j.reporting.events.core.CoreFactory;
+import org.opentest4j.reporting.events.java.JavaFactory;
+import org.opentest4j.reporting.events.junit.JUnitFactory;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -17,7 +20,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.opentest4j.reporting.JUnitExtensions.LEGACY_REPORTING_NAME;
+import static org.opentest4j.reporting.events.junit.JUnitFactory.LEGACY_REPORTING_NAME;
 
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
@@ -43,8 +46,8 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
             try {
                 Files.createDirectories(reportDir);
                 Map<Namespace, String> additionalNamespaces = new HashMap<>();
-                additionalNamespaces.put(Namespace.JAVA, "java");
-                additionalNamespaces.put(Namespace.JUNIT, "junit");
+                additionalNamespaces.put(JavaFactory.NAMESPACE, "java");
+                additionalNamespaces.put(JUnitFactory.NAMESPACE, "junit");
                 Path eventsXml = reportDir.resolve("junit-platform-events-" + System.currentTimeMillis() + ".xml");
                 eventWriter = new EventReportFileWriter(eventsXml, NamespaceRegistry.of(additionalNamespaces));
             } catch (Exception e) {
@@ -68,16 +71,22 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 
     @Override
     public void executionStarted(TestIdentifier testIdentifier) {
-        eventWriter.append(builder -> {
-            Started started = builder.started(testIdentifier.getUniqueId()) //
-                    .name(testIdentifier.getDisplayName());
-            testIdentifier.getParentId().ifPresent(started::parentId);
-            return started.attribute(LEGACY_REPORTING_NAME, testIdentifier.getLegacyReportingName());
+        eventWriter.append(CoreFactory.started(testIdentifier.getUniqueId(), testIdentifier.getDisplayName()), started -> {
+            testIdentifier.getParentId().ifPresent(started::withParentId);
+            testIdentifier.getSource().ifPresent(source -> started.addChild(CoreFactory.sources(), sources -> {
+                if (source instanceof ClassSource) {
+                    ClassSource classSource = (ClassSource) source;
+                    sources.addChild(JavaFactory.classSource(classSource.getClassName()), classSourceElement -> //
+                            classSource.getPosition()
+                                    .ifPresent(filePosition -> classSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
+                }
+            }));
+            started.withAttribute(LEGACY_REPORTING_NAME, testIdentifier.getLegacyReportingName());
         });
     }
 
     @Override
     public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-        eventWriter.append(builder -> builder.finished(testIdentifier.getUniqueId()));
+        eventWriter.append(CoreFactory.finished(testIdentifier.getUniqueId()));
     }
 }

From b0e09cba793f87c537f4a6289c16e6001b2f8c66 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Apr 2021 14:05:38 +0200
Subject: [PATCH 0763/1433] Add more elements

---
 .../reporting/open/xml/JUnitFactory.java      | 20 +++++++++++++++++++
 .../open/xml/LegacyReportingName.java         | 16 +++++++++++++++
 .../xml/OpenTestReportGeneratingListener.java | 19 ++++++++++++++----
 .../platform/reporting/open/xml/Type.java     | 16 +++++++++++++++
 4 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
 create mode 100644 junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
 create mode 100644 junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
new file mode 100644
index 000000000000..a34a09015e3c
--- /dev/null
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
@@ -0,0 +1,20 @@
+package org.junit.platform.reporting.open.xml;
+
+import org.opentest4j.reporting.events.api.Factory;
+import org.opentest4j.reporting.events.api.Namespace;
+
+public class JUnitFactory {
+
+    public static Namespace NAMESPACE = Namespace.of("https://schemas.opentest4j.org/reporting/junit/1.0");
+
+    private JUnitFactory() {
+    }
+
+    public static Factory<LegacyReportingName> legacyReportingName(String legacyReportingName) {
+        return context -> new LegacyReportingName(context, legacyReportingName);
+    }
+
+    public static Factory<Type> type(String value) {
+        return context -> new Type(context, value);
+    }
+}
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
new file mode 100644
index 000000000000..a21c99fadb30
--- /dev/null
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
@@ -0,0 +1,16 @@
+package org.junit.platform.reporting.open.xml;
+
+import org.opentest4j.reporting.events.api.ChildElement;
+import org.opentest4j.reporting.events.api.Context;
+import org.opentest4j.reporting.events.api.QualifiedName;
+import org.opentest4j.reporting.events.core.Metadata;
+
+public class LegacyReportingName extends ChildElement<Metadata, LegacyReportingName> {
+
+    public static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "legacyReportingName");
+
+    LegacyReportingName(Context context, String value) {
+        super(context, ELEMENT);
+        withContent(value);
+    }
+}
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index e15e970bf7d5..6a8ed78e2179 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -2,6 +2,7 @@
 
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
@@ -10,7 +11,6 @@
 import org.opentest4j.reporting.events.api.NamespaceRegistry;
 import org.opentest4j.reporting.events.core.CoreFactory;
 import org.opentest4j.reporting.events.java.JavaFactory;
-import org.opentest4j.reporting.events.junit.JUnitFactory;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -20,8 +20,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.opentest4j.reporting.events.junit.JUnitFactory.LEGACY_REPORTING_NAME;
-
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
     private final Path reportDir;
@@ -73,15 +71,28 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
     public void executionStarted(TestIdentifier testIdentifier) {
         eventWriter.append(CoreFactory.started(testIdentifier.getUniqueId(), testIdentifier.getDisplayName()), started -> {
             testIdentifier.getParentId().ifPresent(started::withParentId);
+            started.addChild(CoreFactory.metadata(), metadata -> {
+                metadata.addChild(CoreFactory.tags(), tags -> //
+                        testIdentifier.getTags().forEach(tag -> tags.addChild(CoreFactory.tag(tag.getName()))));
+                metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
+                metadata.addChild(JUnitFactory.type(testIdentifier.getType().toString()));
+            });
             testIdentifier.getSource().ifPresent(source -> started.addChild(CoreFactory.sources(), sources -> {
                 if (source instanceof ClassSource) {
                     ClassSource classSource = (ClassSource) source;
                     sources.addChild(JavaFactory.classSource(classSource.getClassName()), classSourceElement -> //
                             classSource.getPosition()
                                     .ifPresent(filePosition -> classSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
+                } else if (source instanceof MethodSource) {
+                    MethodSource methodSource = (MethodSource) source;
+                    sources.addChild(JavaFactory.methodSource(methodSource.getClassName(), methodSource.getMethodName()), methodSourceElement -> {
+                        String methodParameterTypes = methodSource.getMethodParameterTypes();
+                        if (methodParameterTypes != null) {
+                            methodSourceElement.withMethodParameterTypes(methodParameterTypes);
+                        }
+                    });
                 }
             }));
-            started.withAttribute(LEGACY_REPORTING_NAME, testIdentifier.getLegacyReportingName());
         });
     }
 
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
new file mode 100644
index 000000000000..22c233e7d485
--- /dev/null
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
@@ -0,0 +1,16 @@
+package org.junit.platform.reporting.open.xml;
+
+import org.opentest4j.reporting.events.api.ChildElement;
+import org.opentest4j.reporting.events.api.Context;
+import org.opentest4j.reporting.events.api.QualifiedName;
+import org.opentest4j.reporting.events.core.Metadata;
+
+public class Type extends ChildElement<Metadata, Type> {
+
+    public static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "type");
+
+    Type(Context context, String value) {
+        super(context, ELEMENT);
+        withContent(value);
+    }
+}

From 8793d5adbbf5d93a9e772aaa4ece2314a8c0a672 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Apr 2021 14:08:15 +0200
Subject: [PATCH 0764/1433] Use Type enum

---
 .../reporting/open/xml/JUnitFactory.java      |  9 ++++----
 .../open/xml/LegacyReportingName.java         | 22 +++++++++++++-----
 .../xml/OpenTestReportGeneratingListener.java |  2 +-
 .../platform/reporting/open/xml/Type.java     | 23 ++++++++++++++-----
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
index a34a09015e3c..d43f783de0e3 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
@@ -1,20 +1,21 @@
 package org.junit.platform.reporting.open.xml;
 
+import org.junit.platform.engine.TestDescriptor;
 import org.opentest4j.reporting.events.api.Factory;
 import org.opentest4j.reporting.events.api.Namespace;
 
-public class JUnitFactory {
+class JUnitFactory {
 
     public static Namespace NAMESPACE = Namespace.of("https://schemas.opentest4j.org/reporting/junit/1.0");
 
     private JUnitFactory() {
     }
 
-    public static Factory<LegacyReportingName> legacyReportingName(String legacyReportingName) {
+    static Factory<LegacyReportingName> legacyReportingName(String legacyReportingName) {
         return context -> new LegacyReportingName(context, legacyReportingName);
     }
 
-    public static Factory<Type> type(String value) {
-        return context -> new Type(context, value);
+    static Factory<Type> type(TestDescriptor.Type type) {
+        return context -> new Type(context, type);
     }
 }
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
index a21c99fadb30..d44a362c302d 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
 package org.junit.platform.reporting.open.xml;
 
 import org.opentest4j.reporting.events.api.ChildElement;
@@ -5,12 +15,12 @@
 import org.opentest4j.reporting.events.api.QualifiedName;
 import org.opentest4j.reporting.events.core.Metadata;
 
-public class LegacyReportingName extends ChildElement<Metadata, LegacyReportingName> {
+class LegacyReportingName extends ChildElement<Metadata, LegacyReportingName> {
 
-    public static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "legacyReportingName");
+	static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "legacyReportingName");
 
-    LegacyReportingName(Context context, String value) {
-        super(context, ELEMENT);
-        withContent(value);
-    }
+	LegacyReportingName(Context context, String value) {
+		super(context, ELEMENT);
+		withContent(value);
+	}
 }
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 6a8ed78e2179..9ad0272034ff 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -75,7 +75,7 @@ public void executionStarted(TestIdentifier testIdentifier) {
                 metadata.addChild(CoreFactory.tags(), tags -> //
                         testIdentifier.getTags().forEach(tag -> tags.addChild(CoreFactory.tag(tag.getName()))));
                 metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
-                metadata.addChild(JUnitFactory.type(testIdentifier.getType().toString()));
+                metadata.addChild(JUnitFactory.type(testIdentifier.getType()));
             });
             testIdentifier.getSource().ifPresent(source -> started.addChild(CoreFactory.sources(), sources -> {
                 if (source instanceof ClassSource) {
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
index 22c233e7d485..58c6569170e4 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
@@ -1,16 +1,27 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
 package org.junit.platform.reporting.open.xml;
 
+import org.junit.platform.engine.TestDescriptor;
 import org.opentest4j.reporting.events.api.ChildElement;
 import org.opentest4j.reporting.events.api.Context;
 import org.opentest4j.reporting.events.api.QualifiedName;
 import org.opentest4j.reporting.events.core.Metadata;
 
-public class Type extends ChildElement<Metadata, Type> {
+class Type extends ChildElement<Metadata, Type> {
 
-    public static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "type");
+	public static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "type");
 
-    Type(Context context, String value) {
-        super(context, ELEMENT);
-        withContent(value);
-    }
+	Type(Context context, TestDescriptor.Type type) {
+		super(context, ELEMENT);
+		withContent(type.toString());
+	}
 }

From 0aae6a94b70a885d828ef50dd885447458b0d4c1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Apr 2021 14:08:28 +0200
Subject: [PATCH 0765/1433] Only include tags when non-empty

---
 .../open/xml/OpenTestReportGeneratingListener.java          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 9ad0272034ff..bbb4c4eea53a 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -72,8 +72,10 @@ public void executionStarted(TestIdentifier testIdentifier) {
         eventWriter.append(CoreFactory.started(testIdentifier.getUniqueId(), testIdentifier.getDisplayName()), started -> {
             testIdentifier.getParentId().ifPresent(started::withParentId);
             started.addChild(CoreFactory.metadata(), metadata -> {
-                metadata.addChild(CoreFactory.tags(), tags -> //
-                        testIdentifier.getTags().forEach(tag -> tags.addChild(CoreFactory.tag(tag.getName()))));
+                if (!testIdentifier.getTags().isEmpty()) {
+                    metadata.addChild(CoreFactory.tags(), tags -> //
+                            testIdentifier.getTags().forEach(tag -> tags.addChild(CoreFactory.tag(tag.getName()))));
+                }
                 metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
                 metadata.addChild(JUnitFactory.type(testIdentifier.getType()));
             });

From 0a7687555e789e153407307fdc234e42ff82cf41 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Apr 2021 14:23:52 +0200
Subject: [PATCH 0766/1433] Include report entries

---
 .../open/xml/OpenTestReportGeneratingListener.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index bbb4c4eea53a..227acb2b6783 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -1,6 +1,7 @@
 package org.junit.platform.reporting.open.xml;
 
 import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -98,6 +99,16 @@ public void executionStarted(TestIdentifier testIdentifier) {
         });
     }
 
+    @Override
+    public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
+        eventWriter.append(CoreFactory.reported(testIdentifier.getUniqueId()), reported -> {
+            reported.addChild(CoreFactory.attachments(), attachments -> attachments.addChild(CoreFactory.data(), data -> {
+                data.withTime(entry.getTimestamp());
+                entry.getKeyValuePairs().forEach(data::addEntry);
+            }));
+        });
+    }
+
     @Override
     public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
         eventWriter.append(CoreFactory.finished(testIdentifier.getUniqueId()));

From 4ae28ffe5deac992dae7d93a8bfeaff8ec97aacb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Apr 2021 14:29:07 +0200
Subject: [PATCH 0767/1433] Include time in started/finished events

---
 .../reporting/open/xml/OpenTestReportGeneratingListener.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 227acb2b6783..ea89cf72ce41 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -18,6 +18,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -70,7 +71,7 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 
     @Override
     public void executionStarted(TestIdentifier testIdentifier) {
-        eventWriter.append(CoreFactory.started(testIdentifier.getUniqueId(), testIdentifier.getDisplayName()), started -> {
+        eventWriter.append(CoreFactory.started(testIdentifier.getUniqueId(), Instant.now(), testIdentifier.getDisplayName()), started -> {
             testIdentifier.getParentId().ifPresent(started::withParentId);
             started.addChild(CoreFactory.metadata(), metadata -> {
                 if (!testIdentifier.getTags().isEmpty()) {
@@ -111,6 +112,6 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
 
     @Override
     public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-        eventWriter.append(CoreFactory.finished(testIdentifier.getUniqueId()));
+        eventWriter.append(CoreFactory.finished(testIdentifier.getUniqueId(), Instant.now()));
     }
 }

From 2e192f315d4ba08f5109c4a2e207a9a253446115 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 5 Apr 2021 17:48:47 +0200
Subject: [PATCH 0768/1433] Use synthetic ids for brevity and report uniqueId
 in metadata

---
 .../reporting/open/xml/JUnitFactory.java      | 32 ++++++++++++-----
 .../xml/OpenTestReportGeneratingListener.java | 36 ++++++++++++++++---
 .../platform/reporting/open/xml/UniqueId.java | 26 ++++++++++++++
 3 files changed, 81 insertions(+), 13 deletions(-)
 create mode 100644 junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
index d43f783de0e3..ddb5a93cff8c 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
 package org.junit.platform.reporting.open.xml;
 
 import org.junit.platform.engine.TestDescriptor;
@@ -6,16 +16,20 @@
 
 class JUnitFactory {
 
-    public static Namespace NAMESPACE = Namespace.of("https://schemas.opentest4j.org/reporting/junit/1.0");
+	public static Namespace NAMESPACE = Namespace.of("https://schemas.opentest4j.org/reporting/junit/1.0");
+
+	private JUnitFactory() {
+	}
 
-    private JUnitFactory() {
-    }
+	static Factory<UniqueId> uniqueId(org.junit.platform.engine.UniqueId uniqueId) {
+		return context -> new UniqueId(context, uniqueId);
+	}
 
-    static Factory<LegacyReportingName> legacyReportingName(String legacyReportingName) {
-        return context -> new LegacyReportingName(context, legacyReportingName);
-    }
+	static Factory<LegacyReportingName> legacyReportingName(String legacyReportingName) {
+		return context -> new LegacyReportingName(context, legacyReportingName);
+	}
 
-    static Factory<Type> type(TestDescriptor.Type type) {
-        return context -> new Type(context, type);
-    }
+	static Factory<Type> type(TestDescriptor.Type type) {
+		return context -> new Type(context, type);
+	}
 }
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index ea89cf72ce41..8a58f77196bf 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -1,6 +1,7 @@
 package org.junit.platform.reporting.open.xml;
 
 import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
@@ -21,10 +22,15 @@
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
     private final Path reportDir;
+
+    private final AtomicInteger idCounter = new AtomicInteger();
+    private final Map<UniqueId, String> inProgressIds = new ConcurrentHashMap<>();
     private EventReportFileWriter eventWriter;
 
     public OpenTestReportGeneratingListener() {
@@ -69,15 +75,30 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
         }
     }
 
+    @Override
+    public void executionSkipped(TestIdentifier testIdentifier, String reason) {
+        String id = String.valueOf(idCounter.incrementAndGet());
+        reportStarted(testIdentifier, id);
+        // TODO report reason
+        reportFinished(id);
+    }
+
     @Override
     public void executionStarted(TestIdentifier testIdentifier) {
-        eventWriter.append(CoreFactory.started(testIdentifier.getUniqueId(), Instant.now(), testIdentifier.getDisplayName()), started -> {
-            testIdentifier.getParentId().ifPresent(started::withParentId);
+        String id = String.valueOf(idCounter.incrementAndGet());
+        inProgressIds.put(testIdentifier.getUniqueIdObject(), id);
+        reportStarted(testIdentifier, id);
+    }
+
+    private void reportStarted(TestIdentifier testIdentifier, String id) {
+        eventWriter.append(CoreFactory.started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
+            testIdentifier.getParentIdObject().ifPresent(parentId -> started.withParentId(inProgressIds.get(parentId)));
             started.addChild(CoreFactory.metadata(), metadata -> {
                 if (!testIdentifier.getTags().isEmpty()) {
                     metadata.addChild(CoreFactory.tags(), tags -> //
                             testIdentifier.getTags().forEach(tag -> tags.addChild(CoreFactory.tag(tag.getName()))));
                 }
+                metadata.addChild(JUnitFactory.uniqueId(testIdentifier.getUniqueIdObject()));
                 metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
                 metadata.addChild(JUnitFactory.type(testIdentifier.getType()));
             });
@@ -102,7 +123,8 @@ public void executionStarted(TestIdentifier testIdentifier) {
 
     @Override
     public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
-        eventWriter.append(CoreFactory.reported(testIdentifier.getUniqueId()), reported -> {
+        String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
+        eventWriter.append(CoreFactory.reported(id), reported -> {
             reported.addChild(CoreFactory.attachments(), attachments -> attachments.addChild(CoreFactory.data(), data -> {
                 data.withTime(entry.getTimestamp());
                 entry.getKeyValuePairs().forEach(data::addEntry);
@@ -112,6 +134,12 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
 
     @Override
     public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-        eventWriter.append(CoreFactory.finished(testIdentifier.getUniqueId(), Instant.now()));
+        // TODO report results
+        String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
+        reportFinished(id);
+    }
+
+    private void reportFinished(String id) {
+        eventWriter.append(CoreFactory.finished(id, Instant.now()));
     }
 }
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
new file mode 100644
index 000000000000..b8284529d996
--- /dev/null
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.reporting.open.xml;
+
+import org.opentest4j.reporting.events.api.ChildElement;
+import org.opentest4j.reporting.events.api.Context;
+import org.opentest4j.reporting.events.api.QualifiedName;
+import org.opentest4j.reporting.events.core.Metadata;
+
+class UniqueId extends ChildElement<Metadata, UniqueId> {
+
+	static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "uniqueId");
+
+	UniqueId(Context context, org.junit.platform.engine.UniqueId value) {
+		super(context, ELEMENT);
+		withContent(value.toString());
+	}
+}

From 695adc5caac3fdc2618945800da8d93e17c5abc1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 10 Apr 2021 14:35:01 +0200
Subject: [PATCH 0769/1433] Don't cache task when debugging

---
 documentation/documentation.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index e29dd03a1b13..ab6a59f9cbd0 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -116,11 +116,10 @@ tasks {
 		inputs.files(runtimeClasspath).withNormalizer(ClasspathNormalizer::class)
 		val reportsDir = file("$buildDir/test-results")
 		outputs.dir(reportsDir)
-		outputs.cacheIf { true }
+		outputs.cacheIf { project.findProperty("debug") != "true" }
 
 		// Track OS as input so that tests are executed on all configured operating systems on CI
 		trackOperationSystemAsInput()
-
 		doFirst {
 			val debugging = findProperty("consoleLauncherTestDebug")?.toString()?.toBoolean() ?: false
 			val output = ByteArrayOutputStream()

From 984449e58077a8c9e71ee07f4d82a36138ff2337 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 10 Apr 2021 14:35:13 +0200
Subject: [PATCH 0770/1433] Avoid creation of additional XML reports

---
 documentation/src/test/java/example/UsingTheLauncherDemo.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/src/test/java/example/UsingTheLauncherDemo.java b/documentation/src/test/java/example/UsingTheLauncherDemo.java
index 8c1e29106195..a4629c04a111 100644
--- a/documentation/src/test/java/example/UsingTheLauncherDemo.java
+++ b/documentation/src/test/java/example/UsingTheLauncherDemo.java
@@ -66,6 +66,7 @@ void discovery() {
 		// @formatter:on
 	}
 
+	@org.junit.jupiter.api.Tag("exclude")
 	@org.junit.jupiter.api.Test
 	@SuppressWarnings("unused")
 	void execution() {

From 60635e8798294bd4d70987d5dc6c439e91909d80 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 17 Apr 2021 17:22:27 +0200
Subject: [PATCH 0771/1433] Move to libs.versions.toml

---
 gradle/libs.versions.toml                                    | 1 +
 junit-platform-reporting/junit-platform-reporting.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b37258bd4cf7..49be1ce89610 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,6 +39,7 @@ log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4
 maven = { module = "org.apache.maven:apache-maven", version = "3.8.5" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.1.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
+openTestReporting = { module = "org.opentest4j.reporting:lib", version = "1.0-SNAPSHOT" }
 picocli = { module = "info.picocli:picocli", version = "4.6.2" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.32" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index 2ab434dcdaba..38a7062a9860 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
-	implementation("org.opentest4j.reporting:lib")
+	implementation(libs.openTestReporting)
 
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)

From af29093dd679efbafc2394b59f0fb4a5dcbd1804 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 18 Apr 2021 16:48:47 +0200
Subject: [PATCH 0772/1433] Report test results

---
 .../xml/OpenTestReportGeneratingListener.java | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 8a58f77196bf..c96eb2650a5b 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -1,5 +1,7 @@
 package org.junit.platform.reporting.open.xml;
 
+import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
@@ -12,6 +14,7 @@
 import org.opentest4j.reporting.events.api.Namespace;
 import org.opentest4j.reporting.events.api.NamespaceRegistry;
 import org.opentest4j.reporting.events.core.CoreFactory;
+import org.opentest4j.reporting.events.core.Result;
 import org.opentest4j.reporting.events.java.JavaFactory;
 
 import java.io.IOException;
@@ -79,8 +82,13 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
     public void executionSkipped(TestIdentifier testIdentifier, String reason) {
         String id = String.valueOf(idCounter.incrementAndGet());
         reportStarted(testIdentifier, id);
-        // TODO report reason
-        reportFinished(id);
+        eventWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
+            finished.addChild(CoreFactory.result(Result.Status.SKIPPED), result -> {
+                if (StringUtils.isNotBlank(reason)) {
+                    result.addChild(CoreFactory.reason(reason));
+                }
+            });
+        });
     }
 
     @Override
@@ -134,12 +142,26 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
 
     @Override
     public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-        // TODO report results
         String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
-        reportFinished(id);
+        eventWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
+            finished.addChild(CoreFactory.result(convertStatus(testExecutionResult.getStatus())), result -> {
+                testExecutionResult.getThrowable().ifPresent(throwable -> {
+                    result.addChild(JavaFactory.throwable(throwable));
+                });
+            });
+        });
     }
 
-    private void reportFinished(String id) {
-        eventWriter.append(CoreFactory.finished(id, Instant.now()));
+    private Result.Status convertStatus(TestExecutionResult.Status status) {
+        switch (status) {
+            case FAILED:
+                return Result.Status.FAILED;
+            case SUCCESSFUL:
+                return Result.Status.SUCCESSFUL;
+            case ABORTED:
+                return Result.Status.ABORTED;
+        }
+        throw new JUnitException("Unhandled status: " + status);
     }
+
 }

From 0b2746f5aaac7d8b084eb12add75797aa09deaa6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 18 Apr 2021 17:09:42 +0200
Subject: [PATCH 0773/1433] Add remaining source types

---
 .../xml/OpenTestReportGeneratingListener.java | 60 ++++++++++++++-----
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index c96eb2650a5b..c545ab1abe5f 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -3,10 +3,17 @@
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.engine.support.descriptor.ClasspathResourceSource;
+import org.junit.platform.engine.support.descriptor.CompositeTestSource;
+import org.junit.platform.engine.support.descriptor.DirectorySource;
+import org.junit.platform.engine.support.descriptor.FileSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
+import org.junit.platform.engine.support.descriptor.PackageSource;
+import org.junit.platform.engine.support.descriptor.UriSource;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
@@ -15,6 +22,7 @@
 import org.opentest4j.reporting.events.api.NamespaceRegistry;
 import org.opentest4j.reporting.events.core.CoreFactory;
 import org.opentest4j.reporting.events.core.Result;
+import org.opentest4j.reporting.events.core.Sources;
 import org.opentest4j.reporting.events.java.JavaFactory;
 
 import java.io.IOException;
@@ -110,25 +118,45 @@ private void reportStarted(TestIdentifier testIdentifier, String id) {
                 metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
                 metadata.addChild(JUnitFactory.type(testIdentifier.getType()));
             });
-            testIdentifier.getSource().ifPresent(source -> started.addChild(CoreFactory.sources(), sources -> {
-                if (source instanceof ClassSource) {
-                    ClassSource classSource = (ClassSource) source;
-                    sources.addChild(JavaFactory.classSource(classSource.getClassName()), classSourceElement -> //
-                            classSource.getPosition()
-                                    .ifPresent(filePosition -> classSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
-                } else if (source instanceof MethodSource) {
-                    MethodSource methodSource = (MethodSource) source;
-                    sources.addChild(JavaFactory.methodSource(methodSource.getClassName(), methodSource.getMethodName()), methodSourceElement -> {
-                        String methodParameterTypes = methodSource.getMethodParameterTypes();
-                        if (methodParameterTypes != null) {
-                            methodSourceElement.withMethodParameterTypes(methodParameterTypes);
-                        }
-                    });
-                }
-            }));
+            testIdentifier.getSource().ifPresent(source -> started.addChild(CoreFactory.sources(), sources -> addTestSource(source, sources)));
         });
     }
 
+    private void addTestSource(TestSource source, Sources sources) {
+        if (source instanceof CompositeTestSource) {
+            ((CompositeTestSource) source).getSources().forEach(it -> addTestSource(it, sources));
+        } else if (source instanceof ClassSource) {
+            ClassSource classSource = (ClassSource) source;
+            sources.addChild(JavaFactory.classSource(classSource.getClassName()), classSourceElement -> //
+                    classSource.getPosition()
+                            .ifPresent(filePosition -> classSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
+        } else if (source instanceof MethodSource) {
+            MethodSource methodSource = (MethodSource) source;
+            sources.addChild(JavaFactory.methodSource(methodSource.getClassName(), methodSource.getMethodName()), methodSourceElement -> {
+                String methodParameterTypes = methodSource.getMethodParameterTypes();
+                if (methodParameterTypes != null) {
+                    methodSourceElement.withMethodParameterTypes(methodParameterTypes);
+                }
+            });
+        } else if (source instanceof ClasspathResourceSource) {
+            ClasspathResourceSource classpathResourceSource = (ClasspathResourceSource) source;
+            sources.addChild(JavaFactory.classpathResourceSource(classpathResourceSource.getClasspathResourceName()), classpathResourceSourceElement -> //
+                    classpathResourceSource.getPosition()
+                            .ifPresent(filePosition -> classpathResourceSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
+        } else if (source instanceof PackageSource) {
+            sources.addChild(JavaFactory.packageSource(((PackageSource) source).getPackageName()));
+        } else if (source instanceof FileSource) {
+            FileSource fileSource = (FileSource) source;
+            sources.addChild(CoreFactory.fileSource(fileSource.getFile()), fileSourceElement -> {
+                fileSource.getPosition().ifPresent(filePosition -> fileSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn()));
+            });
+        } else if (source instanceof DirectorySource) {
+            sources.addChild(CoreFactory.directorySource(((DirectorySource) source).getFile()));
+        } else if (source instanceof UriSource) {
+            sources.addChild(CoreFactory.uriSource(((UriSource) source).getUri()));
+        }
+    }
+
     @Override
     public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
         String id = inProgressIds.get(testIdentifier.getUniqueIdObject());

From addc32075fde7682fcd19cbc364d55793883fabe Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 25 Apr 2021 17:08:52 +0200
Subject: [PATCH 0774/1433] Report infrastructure

---
 .../xml/OpenTestReportGeneratingListener.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index c545ab1abe5f..ee5ebe8c9867 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -27,6 +27,8 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -67,12 +69,29 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
                 additionalNamespaces.put(JUnitFactory.NAMESPACE, "junit");
                 Path eventsXml = reportDir.resolve("junit-platform-events-" + System.currentTimeMillis() + ".xml");
                 eventWriter = new EventReportFileWriter(eventsXml, NamespaceRegistry.of(additionalNamespaces));
+                reportInfrastructure();
             } catch (Exception e) {
                 throw new RuntimeException("Failed to close XML events file", e);
             }
         }
     }
 
+    private void reportInfrastructure() {
+        eventWriter.append(CoreFactory.infrastructure(), infrastructure -> {
+            try {
+                String hostName = InetAddress.getLocalHost().getHostName();
+                infrastructure.addChild(CoreFactory.hostName(hostName));
+            } catch (UnknownHostException ignored) {
+            }
+            infrastructure.addChild(CoreFactory.userName(System.getProperty("user.name")));
+            infrastructure.addChild(CoreFactory.operatingSystem(System.getProperty("os.name")));
+            infrastructure.addChild(CoreFactory.cpuCores(Runtime.getRuntime().availableProcessors()));
+            infrastructure.addChild(JavaFactory.javaVersion(System.getProperty("java.version")));
+            infrastructure.addChild(JavaFactory.fileEncoding(System.getProperty("file.encoding")));
+            infrastructure.addChild(JavaFactory.heapSize(), heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
+        });
+    }
+
     @Override
     public void testPlanExecutionFinished(TestPlan testPlan) {
         if (eventWriter != null) {

From d34ba5cff3f9430047eba5ba2cc4d581b6849155 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 8 Aug 2021 14:37:41 +0200
Subject: [PATCH 0775/1433] Extract output dir/file logic to allow reuse

---
 .../launcher/listeners/OutputDir.java         | 108 ++++++++++++++++++
 .../listeners/UniqueIdTrackingListener.java   |  74 +-----------
 ...enerUnitTests.java => OutputDirTests.java} |  28 +----
 3 files changed, 117 insertions(+), 93 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
 rename platform-tests/src/test/java/org/junit/platform/launcher/listeners/{UniqueIdTrackingListenerUnitTests.java => OutputDirTests.java} (72%)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
new file mode 100644
index 000000000000..65f8a9dc4ff8
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.listeners;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.SecureRandom;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.util.StringUtils;
+
+@API(status = API.Status.INTERNAL, since = "1.8")
+public class OutputDir {
+
+	public static OutputDir create(Optional<String> customDir) {
+		try {
+			return createSafely(customDir, () -> Paths.get(".").toAbsolutePath());
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException("Failed to create output dir", e);
+		}
+	}
+
+	/**
+	 * Package private for testing purposes.
+	 */
+	static OutputDir createSafely(Optional<String> customDir, Supplier<Path> currentWorkingDir) throws IOException {
+		Path cwd = currentWorkingDir.get();
+		Path outputDir;
+
+		if (customDir.isPresent() && StringUtils.isNotBlank(customDir.get())) {
+			outputDir = cwd.resolve(customDir.get());
+		}
+		else if (Files.exists(cwd.resolve("pom.xml"))) {
+			outputDir = cwd.resolve("target");
+		}
+		else if (containsFilesWithExtensions(cwd, ".gradle", ".gradle.kts")) {
+			outputDir = cwd.resolve("build");
+		}
+		else {
+			outputDir = cwd;
+		}
+
+		if (!Files.exists(outputDir)) {
+			Files.createDirectories(outputDir);
+		}
+
+		return new OutputDir(outputDir);
+	}
+
+	private final Path path;
+
+	private OutputDir(Path path) {
+		this.path = path;
+	}
+
+	public Path toPath() {
+		return path;
+	}
+
+	public Path createFile(String prefix, String extension) throws UncheckedIOException {
+		String filename = String.format("%s-%d.%s", prefix, Math.abs(new SecureRandom().nextLong()), extension);
+		Path outputFile = path.resolve(filename);
+
+		try {
+			if (Files.exists(outputFile)) {
+				Files.delete(outputFile);
+			}
+			return Files.createFile(outputFile);
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException("Failed to create output file: " + outputFile, e);
+		}
+	}
+
+	/**
+	 * Determine if the supplied directory contains files with any of the
+	 * supplied extensions.
+	 */
+	private static boolean containsFilesWithExtensions(Path dir, String... extensions) throws IOException {
+		return Files.find(dir, 1, //
+			(path, basicFileAttributes) -> {
+				if (basicFileAttributes.isRegularFile()) {
+					for (String extension : extensions) {
+						if (path.getFileName().toString().endsWith(extension)) {
+							return true;
+						}
+					}
+				}
+				return false;
+			}) //
+				.findFirst() //
+				.isPresent();
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index fb89e5125d1d..256a1dd1df88 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -17,15 +17,12 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
-import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -164,9 +161,9 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 		if (this.enabled) {
 			Path outputFile;
 			try {
-				outputFile = getOutputFile(testPlan.getConfigurationParameters());
+				outputFile = createOutputFile(testPlan.getConfigurationParameters());
 			}
-			catch (IOException ex) {
+			catch (Exception ex) {
 				logger.error(ex, () -> "Failed to create output file");
 				// Abort since we cannot generate the file.
 				return;
@@ -183,70 +180,11 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 		}
 	}
 
-	private Path getOutputFile(ConfigurationParameters configurationParameters) throws IOException {
-		String prefix = configurationParameters.get(OUTPUT_FILE_PREFIX_PROPERTY_NAME)//
+	private Path createOutputFile(ConfigurationParameters configurationParameters) {
+		String prefix = configurationParameters.get(OUTPUT_FILE_PREFIX_PROPERTY_NAME) //
 				.orElse(DEFAULT_OUTPUT_FILE_PREFIX);
-		String filename = String.format("%s-%d.txt", prefix, Math.abs(new SecureRandom().nextLong()));
-		Path outputFile = getOutputDir(configurationParameters).resolve(filename);
-
-		if (Files.exists(outputFile)) {
-			Files.delete(outputFile);
-		}
-
-		Files.createFile(outputFile);
-
-		return outputFile;
-	}
-
-	Path getOutputDir(ConfigurationParameters configurationParameters) throws IOException {
-		Path cwd = currentWorkingDir();
-		Path outputDir;
-
-		String customDir = configurationParameters.get(OUTPUT_DIR_PROPERTY_NAME).orElse(null);
-		if (StringUtils.isNotBlank(customDir)) {
-			outputDir = cwd.resolve(customDir);
-		}
-		else if (Files.exists(cwd.resolve("pom.xml"))) {
-			outputDir = cwd.resolve("target");
-		}
-		else if (containsFilesWithExtensions(cwd, ".gradle", ".gradle.kts")) {
-			outputDir = cwd.resolve("build");
-		}
-		else {
-			outputDir = cwd;
-		}
-
-		if (!Files.exists(outputDir)) {
-			Files.createDirectories(outputDir);
-		}
-
-		return outputDir;
-	}
-
-	/**
-	 * Get the current working directory.
-	 * <p>Package private for testing purposes.
-	 */
-	Path currentWorkingDir() {
-		return Paths.get(".");
-	}
-
-	/**
-	 * Determine if the supplied directory contains files with any of the
-	 * supplied extensions.
-	 */
-	private boolean containsFilesWithExtensions(Path dir, String... extensions) throws IOException {
-		return Files.find(dir, 1, //
-			(path, basicFileAttributes) -> {
-				if (basicFileAttributes.isRegularFile()) {
-					for (String extension : extensions) {
-						if (path.getFileName().toString().endsWith(extension)) {
-							return true;
-						}
-					}
-				}
-				return false;
-			}).findFirst().isPresent();
+		return OutputDir.create(configurationParameters.get(OUTPUT_DIR_PROPERTY_NAME)) //
+				.createFile(prefix, "txt");
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/OutputDirTests.java
similarity index 72%
rename from platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
rename to platform-tests/src/test/java/org/junit/platform/launcher/listeners/OutputDirTests.java
index cc59100b51f0..8700f9ed2efa 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerUnitTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/OutputDirTests.java
@@ -11,9 +11,6 @@
 package org.junit.platform.launcher.listeners;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.platform.launcher.listeners.UniqueIdTrackingListener.OUTPUT_DIR_PROPERTY_NAME;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -22,24 +19,13 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.engine.ConfigurationParameters;
 
-/**
- * Unit tests for the {@link UniqueIdTrackingListener}.
- *
- * @since 1.8
- */
-class UniqueIdTrackingListenerUnitTests {
-
-	private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+class OutputDirTests {
 
 	@Test
 	void getOutputDirUsesCustomOutputDir() throws Exception {
 		String customDir = "build/UniqueIdTrackingListenerIntegrationTests";
-
-		when(configParams.get(OUTPUT_DIR_PROPERTY_NAME)).thenReturn(Optional.of(customDir));
-
-		Path outputDir = new UniqueIdTrackingListener().getOutputDir(configParams);
+		Path outputDir = OutputDir.create(Optional.of(customDir)).toPath();
 		assertThat(Files.isSameFile(Paths.get(customDir), outputDir)).isTrue();
 		assertThat(outputDir).exists();
 	}
@@ -93,15 +79,7 @@ void getOutputDirDetectsGradleKotlinCustomBuildScript() throws Exception {
 	}
 
 	private void assertOutputDirIsDetected(String cwd, String expected) throws IOException {
-		when(configParams.get(OUTPUT_DIR_PROPERTY_NAME)).thenReturn(Optional.empty());
-
-		UniqueIdTrackingListener listener = new UniqueIdTrackingListener() {
-			@Override
-			Path currentWorkingDir() {
-				return Paths.get(cwd);
-			}
-		};
-		Path outputDir = listener.getOutputDir(configParams);
+		Path outputDir = OutputDir.createSafely(Optional.empty(), () -> Paths.get(cwd)).toPath();
 		assertThat(Files.isSameFile(Paths.get(expected), outputDir)).isTrue();
 		assertThat(outputDir).exists();
 	}

From 7b79fbe4420a84a64892fd8aa3a866bee295a93b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 8 Aug 2021 14:38:00 +0200
Subject: [PATCH 0776/1433] Resolve Gradle deprecation warning

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index e6eb9962b874..b623c5101e60 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -121,7 +121,7 @@ include("junit-bom")
 
 includeBuild("../open-test-reporting") {
 	dependencySubstitution {
-		substitute(module("org.opentest4j.reporting:lib")).with(project(":"))
+		substitute(module("org.opentest4j.reporting:lib")).using(project(":"))
 	}
 }
 

From 9d548538561d5596f4a8a2a25a2f530da9af8b20 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 8 Aug 2021 14:41:45 +0200
Subject: [PATCH 0777/1433] Add missing package descriptor

---
 .../org/junit/platform/reporting/open/xml/package-info.java  | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/package-info.java

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/package-info.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/package-info.java
new file mode 100644
index 000000000000..5befd7af7b57
--- /dev/null
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for generating Open Test Reporting compatible XML event reports.
+ */
+
+package org.junit.platform.reporting.open.xml;

From a333665d3a2927efd9de76dac26916058cf40098 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 8 Aug 2021 14:42:39 +0200
Subject: [PATCH 0778/1433] Make listener opt-in and reuse output dir handling

---
 documentation/documentation.gradle.kts        |   3 +-
 .../xml/OpenTestReportGeneratingListener.java | 383 +++++++++---------
 2 files changed, 201 insertions(+), 185 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index ab6a59f9cbd0..5d8b7794a8d5 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -134,7 +134,8 @@ tasks {
 				args("--exclude-tag", "exclude")
 				args("--reports-dir", reportsDir)
 				systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
-				systemProperty("junit.platform.reports.dir", reportsDir)
+				systemProperty("junit.platform.reporting.output.dir", reportsDir)
+				systemProperty("junit.platform.reporting.open.xml.enabled", "true")
 				debug = debugging
 				if (!debugging) {
 					standardOutput = output
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index ee5ebe8c9867..1a765958b8ec 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -1,7 +1,28 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
 package org.junit.platform.reporting.open.xml;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.StringUtils;
+import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
@@ -17,198 +38,192 @@
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
+import org.junit.platform.launcher.listeners.OutputDir;
+import org.opentest4j.reporting.events.api.DefaultEventReportFileWriter;
 import org.opentest4j.reporting.events.api.EventReportFileWriter;
-import org.opentest4j.reporting.events.api.Namespace;
 import org.opentest4j.reporting.events.api.NamespaceRegistry;
 import org.opentest4j.reporting.events.core.CoreFactory;
 import org.opentest4j.reporting.events.core.Result;
 import org.opentest4j.reporting.events.core.Sources;
 import org.opentest4j.reporting.events.java.JavaFactory;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
-    private final Path reportDir;
-
-    private final AtomicInteger idCounter = new AtomicInteger();
-    private final Map<UniqueId, String> inProgressIds = new ConcurrentHashMap<>();
-    private EventReportFileWriter eventWriter;
-
-    public OpenTestReportGeneratingListener() {
-        this(lookupReportDirFromSystemProperties());
-    }
-
-    private static Path lookupReportDirFromSystemProperties() {
-        String reportDir = System.getProperty("junit.platform.reports.dir");
-        return reportDir != null ? Paths.get(reportDir) : null;
-    }
-
-    public OpenTestReportGeneratingListener(Path reportDir) {
-        this.reportDir = reportDir;
-    }
-
-    @Override
-    public void testPlanExecutionStarted(TestPlan testPlan) {
-        if (reportDir != null) {
-            try {
-                Files.createDirectories(reportDir);
-                Map<Namespace, String> additionalNamespaces = new HashMap<>();
-                additionalNamespaces.put(JavaFactory.NAMESPACE, "java");
-                additionalNamespaces.put(JUnitFactory.NAMESPACE, "junit");
-                Path eventsXml = reportDir.resolve("junit-platform-events-" + System.currentTimeMillis() + ".xml");
-                eventWriter = new EventReportFileWriter(eventsXml, NamespaceRegistry.of(additionalNamespaces));
-                reportInfrastructure();
-            } catch (Exception e) {
-                throw new RuntimeException("Failed to close XML events file", e);
-            }
-        }
-    }
-
-    private void reportInfrastructure() {
-        eventWriter.append(CoreFactory.infrastructure(), infrastructure -> {
-            try {
-                String hostName = InetAddress.getLocalHost().getHostName();
-                infrastructure.addChild(CoreFactory.hostName(hostName));
-            } catch (UnknownHostException ignored) {
-            }
-            infrastructure.addChild(CoreFactory.userName(System.getProperty("user.name")));
-            infrastructure.addChild(CoreFactory.operatingSystem(System.getProperty("os.name")));
-            infrastructure.addChild(CoreFactory.cpuCores(Runtime.getRuntime().availableProcessors()));
-            infrastructure.addChild(JavaFactory.javaVersion(System.getProperty("java.version")));
-            infrastructure.addChild(JavaFactory.fileEncoding(System.getProperty("file.encoding")));
-            infrastructure.addChild(JavaFactory.heapSize(), heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
-        });
-    }
-
-    @Override
-    public void testPlanExecutionFinished(TestPlan testPlan) {
-        if (eventWriter != null) {
-            try {
-                eventWriter.close();
-            } catch (IOException e) {
-                throw new UncheckedIOException("Failed to close XML events file", e);
-            } finally {
-                eventWriter = null;
-            }
-        }
-    }
-
-    @Override
-    public void executionSkipped(TestIdentifier testIdentifier, String reason) {
-        String id = String.valueOf(idCounter.incrementAndGet());
-        reportStarted(testIdentifier, id);
-        eventWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
-            finished.addChild(CoreFactory.result(Result.Status.SKIPPED), result -> {
-                if (StringUtils.isNotBlank(reason)) {
-                    result.addChild(CoreFactory.reason(reason));
-                }
-            });
-        });
-    }
-
-    @Override
-    public void executionStarted(TestIdentifier testIdentifier) {
-        String id = String.valueOf(idCounter.incrementAndGet());
-        inProgressIds.put(testIdentifier.getUniqueIdObject(), id);
-        reportStarted(testIdentifier, id);
-    }
-
-    private void reportStarted(TestIdentifier testIdentifier, String id) {
-        eventWriter.append(CoreFactory.started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
-            testIdentifier.getParentIdObject().ifPresent(parentId -> started.withParentId(inProgressIds.get(parentId)));
-            started.addChild(CoreFactory.metadata(), metadata -> {
-                if (!testIdentifier.getTags().isEmpty()) {
-                    metadata.addChild(CoreFactory.tags(), tags -> //
-                            testIdentifier.getTags().forEach(tag -> tags.addChild(CoreFactory.tag(tag.getName()))));
-                }
-                metadata.addChild(JUnitFactory.uniqueId(testIdentifier.getUniqueIdObject()));
-                metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
-                metadata.addChild(JUnitFactory.type(testIdentifier.getType()));
-            });
-            testIdentifier.getSource().ifPresent(source -> started.addChild(CoreFactory.sources(), sources -> addTestSource(source, sources)));
-        });
-    }
-
-    private void addTestSource(TestSource source, Sources sources) {
-        if (source instanceof CompositeTestSource) {
-            ((CompositeTestSource) source).getSources().forEach(it -> addTestSource(it, sources));
-        } else if (source instanceof ClassSource) {
-            ClassSource classSource = (ClassSource) source;
-            sources.addChild(JavaFactory.classSource(classSource.getClassName()), classSourceElement -> //
-                    classSource.getPosition()
-                            .ifPresent(filePosition -> classSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
-        } else if (source instanceof MethodSource) {
-            MethodSource methodSource = (MethodSource) source;
-            sources.addChild(JavaFactory.methodSource(methodSource.getClassName(), methodSource.getMethodName()), methodSourceElement -> {
-                String methodParameterTypes = methodSource.getMethodParameterTypes();
-                if (methodParameterTypes != null) {
-                    methodSourceElement.withMethodParameterTypes(methodParameterTypes);
-                }
-            });
-        } else if (source instanceof ClasspathResourceSource) {
-            ClasspathResourceSource classpathResourceSource = (ClasspathResourceSource) source;
-            sources.addChild(JavaFactory.classpathResourceSource(classpathResourceSource.getClasspathResourceName()), classpathResourceSourceElement -> //
-                    classpathResourceSource.getPosition()
-                            .ifPresent(filePosition -> classpathResourceSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
-        } else if (source instanceof PackageSource) {
-            sources.addChild(JavaFactory.packageSource(((PackageSource) source).getPackageName()));
-        } else if (source instanceof FileSource) {
-            FileSource fileSource = (FileSource) source;
-            sources.addChild(CoreFactory.fileSource(fileSource.getFile()), fileSourceElement -> {
-                fileSource.getPosition().ifPresent(filePosition -> fileSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn()));
-            });
-        } else if (source instanceof DirectorySource) {
-            sources.addChild(CoreFactory.directorySource(((DirectorySource) source).getFile()));
-        } else if (source instanceof UriSource) {
-            sources.addChild(CoreFactory.uriSource(((UriSource) source).getUri()));
-        }
-    }
-
-    @Override
-    public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
-        String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
-        eventWriter.append(CoreFactory.reported(id), reported -> {
-            reported.addChild(CoreFactory.attachments(), attachments -> attachments.addChild(CoreFactory.data(), data -> {
-                data.withTime(entry.getTimestamp());
-                entry.getKeyValuePairs().forEach(data::addEntry);
-            }));
-        });
-    }
-
-    @Override
-    public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-        String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
-        eventWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
-            finished.addChild(CoreFactory.result(convertStatus(testExecutionResult.getStatus())), result -> {
-                testExecutionResult.getThrowable().ifPresent(throwable -> {
-                    result.addChild(JavaFactory.throwable(throwable));
-                });
-            });
-        });
-    }
-
-    private Result.Status convertStatus(TestExecutionResult.Status status) {
-        switch (status) {
-            case FAILED:
-                return Result.Status.FAILED;
-            case SUCCESSFUL:
-                return Result.Status.SUCCESSFUL;
-            case ABORTED:
-                return Result.Status.ABORTED;
-        }
-        throw new JUnitException("Unhandled status: " + status);
-    }
+	private static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
+
+	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder() //
+			.add(JavaFactory.NAMESPACE, "java") //
+			.add(JUnitFactory.NAMESPACE, "junit") //
+			.build();
+
+	private final AtomicInteger idCounter = new AtomicInteger();
+	private final Map<UniqueId, String> inProgressIds = new ConcurrentHashMap<>();
+	private EventReportFileWriter eventWriter = EventReportFileWriter.NOOP;
+
+	@Override
+	public void testPlanExecutionStarted(TestPlan testPlan) {
+		ConfigurationParameters config = testPlan.getConfigurationParameters();
+		if (config.getBoolean(ENABLED_PROPERTY_NAME).orElse(false)) {
+			Path eventsXml = OutputDir.create(config.get("junit.platform.reporting.output.dir")) //
+					.createFile("junit-platform-events", "xml");
+			try {
+				eventWriter = new DefaultEventReportFileWriter(eventsXml, NAMESPACE_REGISTRY);
+				reportInfrastructure();
+			}
+			catch (Exception e) {
+				throw new RuntimeException("Failed to initialize XML events file: " + eventsXml, e);
+			}
+		}
+	}
+
+	private void reportInfrastructure() {
+		eventWriter.append(CoreFactory.infrastructure(), infrastructure -> {
+			try {
+				String hostName = InetAddress.getLocalHost().getHostName();
+				infrastructure.addChild(CoreFactory.hostName(hostName));
+			}
+			catch (UnknownHostException ignored) {
+			}
+			infrastructure.addChild(CoreFactory.userName(System.getProperty("user.name")));
+			infrastructure.addChild(CoreFactory.operatingSystem(System.getProperty("os.name")));
+			infrastructure.addChild(CoreFactory.cpuCores(Runtime.getRuntime().availableProcessors()));
+			infrastructure.addChild(JavaFactory.javaVersion(System.getProperty("java.version")));
+			infrastructure.addChild(JavaFactory.fileEncoding(System.getProperty("file.encoding")));
+			infrastructure.addChild(JavaFactory.heapSize(),
+				heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
+		});
+	}
+
+	@Override
+	public void testPlanExecutionFinished(TestPlan testPlan) {
+		try {
+			eventWriter.close();
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException("Failed to close XML events file", e);
+		}
+		finally {
+			eventWriter = EventReportFileWriter.NOOP;
+		}
+	}
+
+	@Override
+	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
+		String id = String.valueOf(idCounter.incrementAndGet());
+		reportStarted(testIdentifier, id);
+		eventWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
+			finished.addChild(CoreFactory.result(Result.Status.SKIPPED), result -> {
+				if (StringUtils.isNotBlank(reason)) {
+					result.addChild(CoreFactory.reason(reason));
+				}
+			});
+		});
+	}
+
+	@Override
+	public void executionStarted(TestIdentifier testIdentifier) {
+		String id = String.valueOf(idCounter.incrementAndGet());
+		inProgressIds.put(testIdentifier.getUniqueIdObject(), id);
+		reportStarted(testIdentifier, id);
+	}
+
+	private void reportStarted(TestIdentifier testIdentifier, String id) {
+		eventWriter.append(CoreFactory.started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
+			testIdentifier.getParentIdObject().ifPresent(parentId -> started.withParentId(inProgressIds.get(parentId)));
+			started.addChild(CoreFactory.metadata(), metadata -> {
+				if (!testIdentifier.getTags().isEmpty()) {
+					metadata.addChild(CoreFactory.tags(), tags -> //
+					testIdentifier.getTags().forEach(tag -> tags.addChild(CoreFactory.tag(tag.getName()))));
+				}
+				metadata.addChild(JUnitFactory.uniqueId(testIdentifier.getUniqueIdObject()));
+				metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
+				metadata.addChild(JUnitFactory.type(testIdentifier.getType()));
+			});
+			testIdentifier.getSource().ifPresent(
+				source -> started.addChild(CoreFactory.sources(), sources -> addTestSource(source, sources)));
+		});
+	}
+
+	private void addTestSource(TestSource source, Sources sources) {
+		if (source instanceof CompositeTestSource) {
+			((CompositeTestSource) source).getSources().forEach(it -> addTestSource(it, sources));
+		}
+		else if (source instanceof ClassSource) {
+			ClassSource classSource = (ClassSource) source;
+			sources.addChild(JavaFactory.classSource(classSource.getClassName()), classSourceElement -> //
+			classSource.getPosition().ifPresent(
+				filePosition -> classSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
+		}
+		else if (source instanceof MethodSource) {
+			MethodSource methodSource = (MethodSource) source;
+			sources.addChild(JavaFactory.methodSource(methodSource.getClassName(), methodSource.getMethodName()),
+				methodSourceElement -> {
+					String methodParameterTypes = methodSource.getMethodParameterTypes();
+					if (methodParameterTypes != null) {
+						methodSourceElement.withMethodParameterTypes(methodParameterTypes);
+					}
+				});
+		}
+		else if (source instanceof ClasspathResourceSource) {
+			ClasspathResourceSource classpathResourceSource = (ClasspathResourceSource) source;
+			sources.addChild(JavaFactory.classpathResourceSource(classpathResourceSource.getClasspathResourceName()),
+				classpathResourceSourceElement -> //
+				classpathResourceSource.getPosition().ifPresent(
+					filePosition -> classpathResourceSourceElement.addFilePosition(filePosition.getLine(),
+						filePosition.getColumn())));
+		}
+		else if (source instanceof PackageSource) {
+			sources.addChild(JavaFactory.packageSource(((PackageSource) source).getPackageName()));
+		}
+		else if (source instanceof FileSource) {
+			FileSource fileSource = (FileSource) source;
+			sources.addChild(CoreFactory.fileSource(fileSource.getFile()), fileSourceElement -> {
+				fileSource.getPosition().ifPresent(filePosition -> fileSourceElement.addFilePosition(
+					filePosition.getLine(), filePosition.getColumn()));
+			});
+		}
+		else if (source instanceof DirectorySource) {
+			sources.addChild(CoreFactory.directorySource(((DirectorySource) source).getFile()));
+		}
+		else if (source instanceof UriSource) {
+			sources.addChild(CoreFactory.uriSource(((UriSource) source).getUri()));
+		}
+	}
+
+	@Override
+	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
+		String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
+		eventWriter.append(CoreFactory.reported(id), reported -> {
+			reported.addChild(CoreFactory.attachments(),
+				attachments -> attachments.addChild(CoreFactory.data(), data -> {
+					data.withTime(entry.getTimestamp());
+					entry.getKeyValuePairs().forEach(data::addEntry);
+				}));
+		});
+	}
+
+	@Override
+	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+		String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
+		eventWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
+			finished.addChild(CoreFactory.result(convertStatus(testExecutionResult.getStatus())), result -> {
+				testExecutionResult.getThrowable().ifPresent(throwable -> {
+					result.addChild(JavaFactory.throwable(throwable));
+				});
+			});
+		});
+	}
+
+	private Result.Status convertStatus(TestExecutionResult.Status status) {
+		switch (status) {
+			case FAILED:
+				return Result.Status.FAILED;
+			case SUCCESSFUL:
+				return Result.Status.SUCCESSFUL;
+			case ABORTED:
+				return Result.Status.ABORTED;
+		}
+		throw new JUnitException("Unhandled status: " + status);
+	}
 
 }

From 9c4bec88d7b05320269902f8c560269b39e31710 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 8 Aug 2021 15:27:36 +0200
Subject: [PATCH 0779/1433] Adapt to writer rename

---
 .../xml/OpenTestReportGeneratingListener.java | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 1a765958b8ec..d2fe6f29cfa7 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -39,8 +39,8 @@
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.listeners.OutputDir;
-import org.opentest4j.reporting.events.api.DefaultEventReportFileWriter;
-import org.opentest4j.reporting.events.api.EventReportFileWriter;
+import org.opentest4j.reporting.events.api.DefaultEventsFileWriter;
+import org.opentest4j.reporting.events.api.EventsFileWriter;
 import org.opentest4j.reporting.events.api.NamespaceRegistry;
 import org.opentest4j.reporting.events.core.CoreFactory;
 import org.opentest4j.reporting.events.core.Result;
@@ -58,7 +58,7 @@ public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
 	private final AtomicInteger idCounter = new AtomicInteger();
 	private final Map<UniqueId, String> inProgressIds = new ConcurrentHashMap<>();
-	private EventReportFileWriter eventWriter = EventReportFileWriter.NOOP;
+	private EventsFileWriter eventsFileWriter = EventsFileWriter.NOOP;
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan testPlan) {
@@ -67,7 +67,7 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 			Path eventsXml = OutputDir.create(config.get("junit.platform.reporting.output.dir")) //
 					.createFile("junit-platform-events", "xml");
 			try {
-				eventWriter = new DefaultEventReportFileWriter(eventsXml, NAMESPACE_REGISTRY);
+				eventsFileWriter = new DefaultEventsFileWriter(eventsXml, NAMESPACE_REGISTRY);
 				reportInfrastructure();
 			}
 			catch (Exception e) {
@@ -77,7 +77,7 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 	}
 
 	private void reportInfrastructure() {
-		eventWriter.append(CoreFactory.infrastructure(), infrastructure -> {
+		eventsFileWriter.append(CoreFactory.infrastructure(), infrastructure -> {
 			try {
 				String hostName = InetAddress.getLocalHost().getHostName();
 				infrastructure.addChild(CoreFactory.hostName(hostName));
@@ -97,13 +97,13 @@ private void reportInfrastructure() {
 	@Override
 	public void testPlanExecutionFinished(TestPlan testPlan) {
 		try {
-			eventWriter.close();
+			eventsFileWriter.close();
 		}
 		catch (IOException e) {
 			throw new UncheckedIOException("Failed to close XML events file", e);
 		}
 		finally {
-			eventWriter = EventReportFileWriter.NOOP;
+			eventsFileWriter = EventsFileWriter.NOOP;
 		}
 	}
 
@@ -111,7 +111,7 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
 		String id = String.valueOf(idCounter.incrementAndGet());
 		reportStarted(testIdentifier, id);
-		eventWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
+		eventsFileWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
 			finished.addChild(CoreFactory.result(Result.Status.SKIPPED), result -> {
 				if (StringUtils.isNotBlank(reason)) {
 					result.addChild(CoreFactory.reason(reason));
@@ -128,7 +128,7 @@ public void executionStarted(TestIdentifier testIdentifier) {
 	}
 
 	private void reportStarted(TestIdentifier testIdentifier, String id) {
-		eventWriter.append(CoreFactory.started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
+		eventsFileWriter.append(CoreFactory.started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
 			testIdentifier.getParentIdObject().ifPresent(parentId -> started.withParentId(inProgressIds.get(parentId)));
 			started.addChild(CoreFactory.metadata(), metadata -> {
 				if (!testIdentifier.getTags().isEmpty()) {
@@ -193,7 +193,7 @@ else if (source instanceof UriSource) {
 	@Override
 	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
 		String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
-		eventWriter.append(CoreFactory.reported(id), reported -> {
+		eventsFileWriter.append(CoreFactory.reported(id), reported -> {
 			reported.addChild(CoreFactory.attachments(),
 				attachments -> attachments.addChild(CoreFactory.data(), data -> {
 					data.withTime(entry.getTimestamp());
@@ -205,7 +205,7 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
 	@Override
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
 		String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
-		eventWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
+		eventsFileWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
 			finished.addChild(CoreFactory.result(convertStatus(testExecutionResult.getStatus())), result -> {
 				testExecutionResult.getThrowable().ifPresent(throwable -> {
 					result.addChild(JavaFactory.throwable(throwable));

From be9b70264401ed8af25825b1efa10f080727d628 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 8 Aug 2021 15:29:08 +0200
Subject: [PATCH 0780/1433] Polishing

---
 .../xml/OpenTestReportGeneratingListener.java | 50 ++++++++-----------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index d2fe6f29cfa7..5018470215cb 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -111,13 +111,12 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
 		String id = String.valueOf(idCounter.incrementAndGet());
 		reportStarted(testIdentifier, id);
-		eventsFileWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
-			finished.addChild(CoreFactory.result(Result.Status.SKIPPED), result -> {
+		eventsFileWriter.append(CoreFactory.finished(id, Instant.now()), //
+			finished -> finished.addChild(CoreFactory.result(Result.Status.SKIPPED), result -> {
 				if (StringUtils.isNotBlank(reason)) {
 					result.addChild(CoreFactory.reason(reason));
 				}
-			});
-		});
+			}));
 	}
 
 	@Override
@@ -150,37 +149,34 @@ private void addTestSource(TestSource source, Sources sources) {
 		}
 		else if (source instanceof ClassSource) {
 			ClassSource classSource = (ClassSource) source;
-			sources.addChild(JavaFactory.classSource(classSource.getClassName()), classSourceElement -> //
-			classSource.getPosition().ifPresent(
-				filePosition -> classSourceElement.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
+			sources.addChild(JavaFactory.classSource(classSource.getClassName()), //
+				element -> classSource.getPosition().ifPresent(
+					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof MethodSource) {
 			MethodSource methodSource = (MethodSource) source;
 			sources.addChild(JavaFactory.methodSource(methodSource.getClassName(), methodSource.getMethodName()),
-				methodSourceElement -> {
+				element -> {
 					String methodParameterTypes = methodSource.getMethodParameterTypes();
 					if (methodParameterTypes != null) {
-						methodSourceElement.withMethodParameterTypes(methodParameterTypes);
+						element.withMethodParameterTypes(methodParameterTypes);
 					}
 				});
 		}
 		else if (source instanceof ClasspathResourceSource) {
 			ClasspathResourceSource classpathResourceSource = (ClasspathResourceSource) source;
-			sources.addChild(JavaFactory.classpathResourceSource(classpathResourceSource.getClasspathResourceName()),
-				classpathResourceSourceElement -> //
-				classpathResourceSource.getPosition().ifPresent(
-					filePosition -> classpathResourceSourceElement.addFilePosition(filePosition.getLine(),
-						filePosition.getColumn())));
+			sources.addChild(JavaFactory.classpathResourceSource(classpathResourceSource.getClasspathResourceName()), //
+				element -> classpathResourceSource.getPosition().ifPresent(
+					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof PackageSource) {
 			sources.addChild(JavaFactory.packageSource(((PackageSource) source).getPackageName()));
 		}
 		else if (source instanceof FileSource) {
 			FileSource fileSource = (FileSource) source;
-			sources.addChild(CoreFactory.fileSource(fileSource.getFile()), fileSourceElement -> {
-				fileSource.getPosition().ifPresent(filePosition -> fileSourceElement.addFilePosition(
-					filePosition.getLine(), filePosition.getColumn()));
-			});
+			sources.addChild(CoreFactory.fileSource(fileSource.getFile()), //
+				element -> fileSource.getPosition().ifPresent(
+					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof DirectorySource) {
 			sources.addChild(CoreFactory.directorySource(((DirectorySource) source).getFile()));
@@ -193,25 +189,21 @@ else if (source instanceof UriSource) {
 	@Override
 	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
 		String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
-		eventsFileWriter.append(CoreFactory.reported(id), reported -> {
-			reported.addChild(CoreFactory.attachments(),
+		eventsFileWriter.append(CoreFactory.reported(id), //
+			reported -> reported.addChild(CoreFactory.attachments(),
 				attachments -> attachments.addChild(CoreFactory.data(), data -> {
 					data.withTime(entry.getTimestamp());
 					entry.getKeyValuePairs().forEach(data::addEntry);
-				}));
-		});
+				})));
 	}
 
 	@Override
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
 		String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
-		eventsFileWriter.append(CoreFactory.finished(id, Instant.now()), finished -> {
-			finished.addChild(CoreFactory.result(convertStatus(testExecutionResult.getStatus())), result -> {
-				testExecutionResult.getThrowable().ifPresent(throwable -> {
-					result.addChild(JavaFactory.throwable(throwable));
-				});
-			});
-		});
+		eventsFileWriter.append(CoreFactory.finished(id, Instant.now()), //
+			finished -> finished.addChild(CoreFactory.result(convertStatus(testExecutionResult.getStatus())), //
+				result -> testExecutionResult.getThrowable() //
+						.ifPresent(throwable -> result.addChild(JavaFactory.throwable(throwable)))));
 	}
 
 	private Result.Status convertStatus(TestExecutionResult.Status status) {

From 461ea5391c58258b63dffef4d4bc6ed0b993086a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 19 Dec 2021 09:29:00 +0100
Subject: [PATCH 0781/1433] Fix compileModule

---
 junit-platform-console/junit-platform-console.gradle.kts        | 2 ++
 .../src/module/org.junit.platform.reporting/module-info.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index e389c10166f0..8bac3f18ff22 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -13,6 +13,8 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
+	compileOnly(libs.openTestReporting)
+
 	shadowed(libs.picocli)
 
 	osgiVerification(projects.junitJupiterEngine)
diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
index e272dadb7fb1..370ac6b8aa98 100644
--- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
@@ -19,6 +19,7 @@
 	requires org.junit.platform.commons;
 	requires transitive org.junit.platform.engine;
 	requires transitive org.junit.platform.launcher;
+	requires org.opentest4j.reporting;
 
 	// exports org.junit.platform.reporting; empty package
 	exports org.junit.platform.reporting.legacy;

From 0455fc9a3af21a998b54722f2ea32efba340576f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 19 Dec 2021 09:29:13 +0100
Subject: [PATCH 0782/1433] Import Status enum constant

---
 .../org/junit/platform/launcher/listeners/OutputDir.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
index 65f8a9dc4ff8..18f02df1af03 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
@@ -10,6 +10,9 @@
 
 package org.junit.platform.launcher.listeners;
 
+import org.apiguardian.api.API;
+import org.junit.platform.commons.util.StringUtils;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -19,10 +22,9 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import org.apiguardian.api.API;
-import org.junit.platform.commons.util.StringUtils;
+import static org.apiguardian.api.API.Status.INTERNAL;
 
-@API(status = API.Status.INTERNAL, since = "1.8")
+@API(status = INTERNAL, since = "1.8")
 public class OutputDir {
 
 	public static OutputDir create(Optional<String> customDir) {

From 2c28ebadb25ecd64258082c2362e5310a360599c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 19 Dec 2021 09:29:42 +0100
Subject: [PATCH 0783/1433] Disable caching and up-to-date-ness when debugging

---
 documentation/documentation.gradle.kts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 5d8b7794a8d5..da412fed8be5 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -116,12 +116,16 @@ tasks {
 		inputs.files(runtimeClasspath).withNormalizer(ClasspathNormalizer::class)
 		val reportsDir = file("$buildDir/test-results")
 		outputs.dir(reportsDir)
-		outputs.cacheIf { project.findProperty("debug") != "true" }
+
+		val debugging = providers.gradleProperty("consoleLauncherTestDebug")
+			.map { it != "false" }
+			.orElse(false)
+		outputs.cacheIf { !debugging.get() }
+		outputs.upToDateWhen { !debugging.get() }
 
 		// Track OS as input so that tests are executed on all configured operating systems on CI
 		trackOperationSystemAsInput()
 		doFirst {
-			val debugging = findProperty("consoleLauncherTestDebug")?.toString()?.toBoolean() ?: false
 			val output = ByteArrayOutputStream()
 			val result = javaexec {
 				debug = project.findProperty("debug") == "true"
@@ -136,14 +140,14 @@ tasks {
 				systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 				systemProperty("junit.platform.reporting.output.dir", reportsDir)
 				systemProperty("junit.platform.reporting.open.xml.enabled", "true")
-				debug = debugging
-				if (!debugging) {
+				debug = debugging.get()
+				if (!debugging.get()) {
 					standardOutput = output
 					errorOutput = output
 				}
 				isIgnoreExitValue = true
 			}
-			if (result.exitValue != 0 && !debugging) {
+			if (result.exitValue != 0 && !debugging.get()) {
 				System.out.write(output.toByteArray())
 				System.out.flush()
 			}

From 8383cfd42ba53dc4885e9995344175560c734c20 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 21 Dec 2021 09:28:15 +0100
Subject: [PATCH 0784/1433] Adapt to changes in open-test-reporting

---
 gradle/libs.versions.toml                     |  2 +-
 .../launcher/listeners/OutputDir.java         |  6 ++--
 .../xml/OpenTestReportGeneratingListener.java | 31 ++++++++++++-------
 .../module-info.java                          |  3 +-
 settings.gradle.kts                           |  2 +-
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 49be1ce89610..ad3a17324650 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4
 maven = { module = "org.apache.maven:apache-maven", version = "3.8.5" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.1.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
-openTestReporting = { module = "org.opentest4j.reporting:lib", version = "1.0-SNAPSHOT" }
+openTestReporting = { module = "org.opentest4j.reporting:open-test-reporting-events", version = "1.0-SNAPSHOT" }
 picocli = { module = "info.picocli:picocli", version = "4.6.2" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.32" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
index 18f02df1af03..e29ec606525c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
@@ -10,8 +10,7 @@
 
 package org.junit.platform.launcher.listeners;
 
-import org.apiguardian.api.API;
-import org.junit.platform.commons.util.StringUtils;
+import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -22,7 +21,8 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import static org.apiguardian.api.API.Status.INTERNAL;
+import org.apiguardian.api.API;
+import org.junit.platform.commons.util.StringUtils;
 
 @API(status = INTERNAL, since = "1.8")
 public class OutputDir {
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 5018470215cb..042ecff8e2d8 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -39,35 +39,40 @@
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.listeners.OutputDir;
-import org.opentest4j.reporting.events.api.DefaultEventsFileWriter;
-import org.opentest4j.reporting.events.api.EventsFileWriter;
+import org.opentest4j.reporting.events.api.DocumentWriter;
 import org.opentest4j.reporting.events.api.NamespaceRegistry;
 import org.opentest4j.reporting.events.core.CoreFactory;
 import org.opentest4j.reporting.events.core.Result;
 import org.opentest4j.reporting.events.core.Sources;
 import org.opentest4j.reporting.events.java.JavaFactory;
+import org.opentest4j.reporting.events.node.EventFactory;
+import org.opentest4j.reporting.events.node.Events;
 
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
 	private static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
 
 	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder() //
+			.add(EventFactory.NAMESPACE, "e") //
 			.add(JavaFactory.NAMESPACE, "java") //
 			.add(JUnitFactory.NAMESPACE, "junit") //
 			.build();
 
 	private final AtomicInteger idCounter = new AtomicInteger();
 	private final Map<UniqueId, String> inProgressIds = new ConcurrentHashMap<>();
-	private EventsFileWriter eventsFileWriter = EventsFileWriter.NOOP;
+	private DocumentWriter<Events> eventsFileWriter = DocumentWriter.noop();
+
+	public OpenTestReportGeneratingListener() {
+	}
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan testPlan) {
 		ConfigurationParameters config = testPlan.getConfigurationParameters();
-		if (config.getBoolean(ENABLED_PROPERTY_NAME).orElse(false)) {
+		if (isEnabled(config)) {
 			Path eventsXml = OutputDir.create(config.get("junit.platform.reporting.output.dir")) //
 					.createFile("junit-platform-events", "xml");
 			try {
-				eventsFileWriter = new DefaultEventsFileWriter(eventsXml, NAMESPACE_REGISTRY);
+				eventsFileWriter = Events.createDocumentWriter(NAMESPACE_REGISTRY, CoreFactory.NAMESPACE, eventsXml);
 				reportInfrastructure();
 			}
 			catch (Exception e) {
@@ -76,8 +81,12 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 		}
 	}
 
+	private Boolean isEnabled(ConfigurationParameters config) {
+		return config.getBoolean(ENABLED_PROPERTY_NAME).orElse(false);
+	}
+
 	private void reportInfrastructure() {
-		eventsFileWriter.append(CoreFactory.infrastructure(), infrastructure -> {
+		eventsFileWriter.append(EventFactory.infrastructure(), infrastructure -> {
 			try {
 				String hostName = InetAddress.getLocalHost().getHostName();
 				infrastructure.addChild(CoreFactory.hostName(hostName));
@@ -103,7 +112,7 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 			throw new UncheckedIOException("Failed to close XML events file", e);
 		}
 		finally {
-			eventsFileWriter = EventsFileWriter.NOOP;
+			eventsFileWriter = DocumentWriter.noop();
 		}
 	}
 
@@ -111,7 +120,7 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
 		String id = String.valueOf(idCounter.incrementAndGet());
 		reportStarted(testIdentifier, id);
-		eventsFileWriter.append(CoreFactory.finished(id, Instant.now()), //
+		eventsFileWriter.append(EventFactory.finished(id, Instant.now()), //
 			finished -> finished.addChild(CoreFactory.result(Result.Status.SKIPPED), result -> {
 				if (StringUtils.isNotBlank(reason)) {
 					result.addChild(CoreFactory.reason(reason));
@@ -127,7 +136,7 @@ public void executionStarted(TestIdentifier testIdentifier) {
 	}
 
 	private void reportStarted(TestIdentifier testIdentifier, String id) {
-		eventsFileWriter.append(CoreFactory.started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
+		eventsFileWriter.append(EventFactory.started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
 			testIdentifier.getParentIdObject().ifPresent(parentId -> started.withParentId(inProgressIds.get(parentId)));
 			started.addChild(CoreFactory.metadata(), metadata -> {
 				if (!testIdentifier.getTags().isEmpty()) {
@@ -189,7 +198,7 @@ else if (source instanceof UriSource) {
 	@Override
 	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
 		String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
-		eventsFileWriter.append(CoreFactory.reported(id), //
+		eventsFileWriter.append(EventFactory.reported(id), //
 			reported -> reported.addChild(CoreFactory.attachments(),
 				attachments -> attachments.addChild(CoreFactory.data(), data -> {
 					data.withTime(entry.getTimestamp());
@@ -200,7 +209,7 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
 	@Override
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
 		String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
-		eventsFileWriter.append(CoreFactory.finished(id, Instant.now()), //
+		eventsFileWriter.append(EventFactory.finished(id, Instant.now()), //
 			finished -> finished.addChild(CoreFactory.result(convertStatus(testExecutionResult.getStatus())), //
 				result -> testExecutionResult.getThrowable() //
 						.ifPresent(throwable -> result.addChild(JavaFactory.throwable(throwable)))));
diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
index 370ac6b8aa98..1da527b9e7c3 100644
--- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
@@ -19,11 +19,12 @@
 	requires org.junit.platform.commons;
 	requires transitive org.junit.platform.engine;
 	requires transitive org.junit.platform.launcher;
-	requires org.opentest4j.reporting;
+	requires org.opentest4j.reporting.events;
 
 	// exports org.junit.platform.reporting; empty package
 	exports org.junit.platform.reporting.legacy;
 	exports org.junit.platform.reporting.legacy.xml;
+	exports org.junit.platform.reporting.open.xml;
 
 	provides org.junit.platform.launcher.TestExecutionListener
 			with org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener;
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b623c5101e60..8cb4f7f7128f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -121,7 +121,7 @@ include("junit-bom")
 
 includeBuild("../open-test-reporting") {
 	dependencySubstitution {
-		substitute(module("org.opentest4j.reporting:lib")).using(project(":"))
+		substitute(module("org.opentest4j.reporting:open-test-reporting-events")).using(project(":events"))
 	}
 }
 

From 11f478d928067b972eaaab83ae45582e029d6623 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 21 Dec 2021 09:33:28 +0100
Subject: [PATCH 0785/1433] Define JUnit extensions XSD

---
 .../reporting/open/xml/JUnitFactory.java      |  2 +-
 .../platform/reporting/open/xml/catalog.xml   |  4 +++
 .../platform/reporting/open/xml/junit.xsd     | 30 +++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/catalog.xml
 create mode 100644 junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/junit.xsd

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
index ddb5a93cff8c..822e7ec05ef7 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
@@ -16,7 +16,7 @@
 
 class JUnitFactory {
 
-	public static Namespace NAMESPACE = Namespace.of("https://schemas.opentest4j.org/reporting/junit/1.0");
+	public static Namespace NAMESPACE = Namespace.of("https://schemas.junit.org/open-test-reporting");
 
 	private JUnitFactory() {
 	}
diff --git a/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/catalog.xml b/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/catalog.xml
new file mode 100644
index 000000000000..e9c9a27d21a6
--- /dev/null
+++ b/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/catalog.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <uri name="https://schemas.junit.org/open-test-reporting" uri="junit.xsd"/>
+</catalog>
diff --git a/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/junit.xsd b/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/junit.xsd
new file mode 100644
index 000000000000..b8456f0d98eb
--- /dev/null
+++ b/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/junit.xsd
@@ -0,0 +1,30 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="https://schemas.junit.org/open-test-reporting"
+           elementFormDefault="qualified">
+
+    <!-- metadata -->
+    <xs:element name="uniqueId">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string"/>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="legacyReportingName">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string"/>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="type">
+        <xs:simpleType>
+            <xs:restriction base="xs:string">
+                <xs:enumeration value="TEST"/>
+                <xs:enumeration value="CONTAINER"/>
+                <xs:enumeration value="CONTAINER_AND_TEST"/>
+            </xs:restriction>
+        </xs:simpleType>
+    </xs:element>
+
+</xs:schema>

From bf33fe4e10582f7ffe3af62dd3d4b143e62c79f3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 21 Dec 2021 16:38:15 +0100
Subject: [PATCH 0786/1433] Set schema location

---
 .../open/xml/OpenTestReportGeneratingListener.java     | 10 +++++-----
 .../org/junit/platform/reporting/open/xml/catalog.xml  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 042ecff8e2d8..83462a425d2a 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -52,10 +52,10 @@ public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
 	private static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
 
-	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder() //
-			.add(EventFactory.NAMESPACE, "e") //
-			.add(JavaFactory.NAMESPACE, "java") //
-			.add(JUnitFactory.NAMESPACE, "junit") //
+	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder(CoreFactory.NAMESPACE) //
+			.add("e", EventFactory.NAMESPACE) //
+			.add("java", JavaFactory.NAMESPACE) //
+			.add("junit", JUnitFactory.NAMESPACE, "https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd") //
 			.build();
 
 	private final AtomicInteger idCounter = new AtomicInteger();
@@ -72,7 +72,7 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 			Path eventsXml = OutputDir.create(config.get("junit.platform.reporting.output.dir")) //
 					.createFile("junit-platform-events", "xml");
 			try {
-				eventsFileWriter = Events.createDocumentWriter(NAMESPACE_REGISTRY, CoreFactory.NAMESPACE, eventsXml);
+				eventsFileWriter = Events.createDocumentWriter(NAMESPACE_REGISTRY, eventsXml);
 				reportInfrastructure();
 			}
 			catch (Exception e) {
diff --git a/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/catalog.xml b/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/catalog.xml
index e9c9a27d21a6..057d295ac832 100644
--- a/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/catalog.xml
+++ b/junit-platform-reporting/src/main/resources/org/junit/platform/reporting/open/xml/catalog.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-    <uri name="https://schemas.junit.org/open-test-reporting" uri="junit.xsd"/>
+    <system systemId="https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd" uri="junit.xsd"/>
 </catalog>

From 4ca9d3adf75c9e6d3f08a367874bf46ebb9a7894 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 22 Dec 2021 12:07:55 +0100
Subject: [PATCH 0787/1433] Use RootFactory

---
 .../xml/OpenTestReportGeneratingListener.java | 109 +++++++++++-------
 1 file changed, 67 insertions(+), 42 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 83462a425d2a..ffdb35412599 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -10,6 +10,34 @@
 
 package org.junit.platform.reporting.open.xml;
 
+import static org.opentest4j.reporting.events.core.CoreFactory.attachments;
+import static org.opentest4j.reporting.events.core.CoreFactory.cpuCores;
+import static org.opentest4j.reporting.events.core.CoreFactory.data;
+import static org.opentest4j.reporting.events.core.CoreFactory.directorySource;
+import static org.opentest4j.reporting.events.core.CoreFactory.fileSource;
+import static org.opentest4j.reporting.events.core.CoreFactory.hostName;
+import static org.opentest4j.reporting.events.core.CoreFactory.infrastructure;
+import static org.opentest4j.reporting.events.core.CoreFactory.metadata;
+import static org.opentest4j.reporting.events.core.CoreFactory.operatingSystem;
+import static org.opentest4j.reporting.events.core.CoreFactory.reason;
+import static org.opentest4j.reporting.events.core.CoreFactory.result;
+import static org.opentest4j.reporting.events.core.CoreFactory.sources;
+import static org.opentest4j.reporting.events.core.CoreFactory.tag;
+import static org.opentest4j.reporting.events.core.CoreFactory.tags;
+import static org.opentest4j.reporting.events.core.CoreFactory.uriSource;
+import static org.opentest4j.reporting.events.core.CoreFactory.userName;
+import static org.opentest4j.reporting.events.java.JavaFactory.classSource;
+import static org.opentest4j.reporting.events.java.JavaFactory.classpathResourceSource;
+import static org.opentest4j.reporting.events.java.JavaFactory.fileEncoding;
+import static org.opentest4j.reporting.events.java.JavaFactory.heapSize;
+import static org.opentest4j.reporting.events.java.JavaFactory.javaVersion;
+import static org.opentest4j.reporting.events.java.JavaFactory.methodSource;
+import static org.opentest4j.reporting.events.java.JavaFactory.packageSource;
+import static org.opentest4j.reporting.events.java.JavaFactory.throwable;
+import static org.opentest4j.reporting.events.root.RootFactory.finished;
+import static org.opentest4j.reporting.events.root.RootFactory.reported;
+import static org.opentest4j.reporting.events.root.RootFactory.started;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.InetAddress;
@@ -45,15 +73,15 @@
 import org.opentest4j.reporting.events.core.Result;
 import org.opentest4j.reporting.events.core.Sources;
 import org.opentest4j.reporting.events.java.JavaFactory;
-import org.opentest4j.reporting.events.node.EventFactory;
-import org.opentest4j.reporting.events.node.Events;
+import org.opentest4j.reporting.events.root.Events;
+import org.opentest4j.reporting.events.root.RootFactory;
 
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
 	private static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
 
 	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder(CoreFactory.NAMESPACE) //
-			.add("e", EventFactory.NAMESPACE) //
+			.add("e", RootFactory.NAMESPACE) //
 			.add("java", JavaFactory.NAMESPACE) //
 			.add("junit", JUnitFactory.NAMESPACE, "https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd") //
 			.build();
@@ -86,20 +114,19 @@ private Boolean isEnabled(ConfigurationParameters config) {
 	}
 
 	private void reportInfrastructure() {
-		eventsFileWriter.append(EventFactory.infrastructure(), infrastructure -> {
+		eventsFileWriter.append(infrastructure(), infrastructure -> {
 			try {
 				String hostName = InetAddress.getLocalHost().getHostName();
-				infrastructure.addChild(CoreFactory.hostName(hostName));
+				infrastructure.addChild(hostName(hostName));
 			}
 			catch (UnknownHostException ignored) {
 			}
-			infrastructure.addChild(CoreFactory.userName(System.getProperty("user.name")));
-			infrastructure.addChild(CoreFactory.operatingSystem(System.getProperty("os.name")));
-			infrastructure.addChild(CoreFactory.cpuCores(Runtime.getRuntime().availableProcessors()));
-			infrastructure.addChild(JavaFactory.javaVersion(System.getProperty("java.version")));
-			infrastructure.addChild(JavaFactory.fileEncoding(System.getProperty("file.encoding")));
-			infrastructure.addChild(JavaFactory.heapSize(),
-				heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
+			infrastructure.addChild(userName(System.getProperty("user.name")));
+			infrastructure.addChild(operatingSystem(System.getProperty("os.name")));
+			infrastructure.addChild(cpuCores(Runtime.getRuntime().availableProcessors()));
+			infrastructure.addChild(javaVersion(System.getProperty("java.version")));
+			infrastructure.addChild(fileEncoding(System.getProperty("file.encoding")));
+			infrastructure.addChild(heapSize(), heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
 		});
 	}
 
@@ -120,10 +147,10 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
 		String id = String.valueOf(idCounter.incrementAndGet());
 		reportStarted(testIdentifier, id);
-		eventsFileWriter.append(EventFactory.finished(id, Instant.now()), //
-			finished -> finished.addChild(CoreFactory.result(Result.Status.SKIPPED), result -> {
+		eventsFileWriter.append(finished(id, Instant.now()), //
+			finished -> finished.addChild(result(Result.Status.SKIPPED), result -> {
 				if (StringUtils.isNotBlank(reason)) {
-					result.addChild(CoreFactory.reason(reason));
+					result.addChild(reason(reason));
 				}
 			}));
 	}
@@ -136,19 +163,19 @@ public void executionStarted(TestIdentifier testIdentifier) {
 	}
 
 	private void reportStarted(TestIdentifier testIdentifier, String id) {
-		eventsFileWriter.append(EventFactory.started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
+		eventsFileWriter.append(started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
 			testIdentifier.getParentIdObject().ifPresent(parentId -> started.withParentId(inProgressIds.get(parentId)));
-			started.addChild(CoreFactory.metadata(), metadata -> {
+			started.addChild(metadata(), metadata -> {
 				if (!testIdentifier.getTags().isEmpty()) {
-					metadata.addChild(CoreFactory.tags(), tags -> //
-					testIdentifier.getTags().forEach(tag -> tags.addChild(CoreFactory.tag(tag.getName()))));
+					metadata.addChild(tags(), tags -> //
+					testIdentifier.getTags().forEach(tag -> tags.addChild(tag(tag.getName()))));
 				}
 				metadata.addChild(JUnitFactory.uniqueId(testIdentifier.getUniqueIdObject()));
 				metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
 				metadata.addChild(JUnitFactory.type(testIdentifier.getType()));
 			});
 			testIdentifier.getSource().ifPresent(
-				source -> started.addChild(CoreFactory.sources(), sources -> addTestSource(source, sources)));
+				source -> started.addChild(sources(), sources -> addTestSource(source, sources)));
 		});
 	}
 
@@ -158,61 +185,59 @@ private void addTestSource(TestSource source, Sources sources) {
 		}
 		else if (source instanceof ClassSource) {
 			ClassSource classSource = (ClassSource) source;
-			sources.addChild(JavaFactory.classSource(classSource.getClassName()), //
+			sources.addChild(classSource(classSource.getClassName()), //
 				element -> classSource.getPosition().ifPresent(
 					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof MethodSource) {
 			MethodSource methodSource = (MethodSource) source;
-			sources.addChild(JavaFactory.methodSource(methodSource.getClassName(), methodSource.getMethodName()),
-				element -> {
-					String methodParameterTypes = methodSource.getMethodParameterTypes();
-					if (methodParameterTypes != null) {
-						element.withMethodParameterTypes(methodParameterTypes);
-					}
-				});
+			sources.addChild(methodSource(methodSource.getClassName(), methodSource.getMethodName()), element -> {
+				String methodParameterTypes = methodSource.getMethodParameterTypes();
+				if (methodParameterTypes != null) {
+					element.withMethodParameterTypes(methodParameterTypes);
+				}
+			});
 		}
 		else if (source instanceof ClasspathResourceSource) {
 			ClasspathResourceSource classpathResourceSource = (ClasspathResourceSource) source;
-			sources.addChild(JavaFactory.classpathResourceSource(classpathResourceSource.getClasspathResourceName()), //
+			sources.addChild(classpathResourceSource(classpathResourceSource.getClasspathResourceName()), //
 				element -> classpathResourceSource.getPosition().ifPresent(
 					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof PackageSource) {
-			sources.addChild(JavaFactory.packageSource(((PackageSource) source).getPackageName()));
+			sources.addChild(packageSource(((PackageSource) source).getPackageName()));
 		}
 		else if (source instanceof FileSource) {
 			FileSource fileSource = (FileSource) source;
-			sources.addChild(CoreFactory.fileSource(fileSource.getFile()), //
+			sources.addChild(fileSource(fileSource.getFile()), //
 				element -> fileSource.getPosition().ifPresent(
 					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof DirectorySource) {
-			sources.addChild(CoreFactory.directorySource(((DirectorySource) source).getFile()));
+			sources.addChild(directorySource(((DirectorySource) source).getFile()));
 		}
 		else if (source instanceof UriSource) {
-			sources.addChild(CoreFactory.uriSource(((UriSource) source).getUri()));
+			sources.addChild(uriSource(((UriSource) source).getUri()));
 		}
 	}
 
 	@Override
 	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
 		String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
-		eventsFileWriter.append(EventFactory.reported(id), //
-			reported -> reported.addChild(CoreFactory.attachments(),
-				attachments -> attachments.addChild(CoreFactory.data(), data -> {
-					data.withTime(entry.getTimestamp());
-					entry.getKeyValuePairs().forEach(data::addEntry);
-				})));
+		eventsFileWriter.append(reported(id, Instant.now()), //
+			reported -> reported.addChild(attachments(), attachments -> attachments.addChild(data(), data -> {
+				data.withTime(entry.getTimestamp());
+				entry.getKeyValuePairs().forEach(data::addEntry);
+			})));
 	}
 
 	@Override
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
 		String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
-		eventsFileWriter.append(EventFactory.finished(id, Instant.now()), //
-			finished -> finished.addChild(CoreFactory.result(convertStatus(testExecutionResult.getStatus())), //
+		eventsFileWriter.append(finished(id, Instant.now()), //
+			finished -> finished.addChild(result(convertStatus(testExecutionResult.getStatus())), //
 				result -> testExecutionResult.getThrowable() //
-						.ifPresent(throwable -> result.addChild(JavaFactory.throwable(throwable)))));
+						.ifPresent(throwable -> result.addChild(throwable(throwable)))));
 	}
 
 	private Result.Status convertStatus(TestExecutionResult.Status status) {

From cfb3e30133579807d329aff8fe3c176f028f91c7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 22 Dec 2021 14:57:35 +0100
Subject: [PATCH 0788/1433] Adjust to changes in open-test-reporting

---
 .../reporting/open/xml/JUnitFactory.java      |  2 +-
 .../open/xml/LegacyReportingName.java         |  2 +-
 .../xml/OpenTestReportGeneratingListener.java | 65 ++++++++++---------
 .../platform/reporting/open/xml/Type.java     |  2 +-
 .../platform/reporting/open/xml/UniqueId.java |  2 +-
 settings.gradle.kts                           |  1 +
 6 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
index 822e7ec05ef7..682e75d5e65e 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
@@ -12,7 +12,7 @@
 
 import org.junit.platform.engine.TestDescriptor;
 import org.opentest4j.reporting.events.api.Factory;
-import org.opentest4j.reporting.events.api.Namespace;
+import org.opentest4j.reporting.schema.Namespace;
 
 class JUnitFactory {
 
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
index d44a362c302d..0f706add66bd 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
@@ -12,8 +12,8 @@
 
 import org.opentest4j.reporting.events.api.ChildElement;
 import org.opentest4j.reporting.events.api.Context;
-import org.opentest4j.reporting.events.api.QualifiedName;
 import org.opentest4j.reporting.events.core.Metadata;
+import org.opentest4j.reporting.schema.QualifiedName;
 
 class LegacyReportingName extends ChildElement<Metadata, LegacyReportingName> {
 
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index ffdb35412599..11df40d092ca 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -10,6 +10,9 @@
 
 package org.junit.platform.reporting.open.xml;
 
+import static org.junit.platform.reporting.open.xml.JUnitFactory.legacyReportingName;
+import static org.junit.platform.reporting.open.xml.JUnitFactory.type;
+import static org.junit.platform.reporting.open.xml.JUnitFactory.uniqueId;
 import static org.opentest4j.reporting.events.core.CoreFactory.attachments;
 import static org.opentest4j.reporting.events.core.CoreFactory.cpuCores;
 import static org.opentest4j.reporting.events.core.CoreFactory.data;
@@ -69,20 +72,18 @@
 import org.junit.platform.launcher.listeners.OutputDir;
 import org.opentest4j.reporting.events.api.DocumentWriter;
 import org.opentest4j.reporting.events.api.NamespaceRegistry;
-import org.opentest4j.reporting.events.core.CoreFactory;
 import org.opentest4j.reporting.events.core.Result;
 import org.opentest4j.reporting.events.core.Sources;
-import org.opentest4j.reporting.events.java.JavaFactory;
 import org.opentest4j.reporting.events.root.Events;
-import org.opentest4j.reporting.events.root.RootFactory;
+import org.opentest4j.reporting.schema.Namespace;
 
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
 	private static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
 
-	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder(CoreFactory.NAMESPACE) //
-			.add("e", RootFactory.NAMESPACE) //
-			.add("java", JavaFactory.NAMESPACE) //
+	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder(Namespace.REPORTING_CORE) //
+			.add("e", Namespace.REPORTING_EVENTS) //
+			.add("java", Namespace.REPORTING_JAVA) //
 			.add("junit", JUnitFactory.NAMESPACE, "https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd") //
 			.build();
 
@@ -117,16 +118,16 @@ private void reportInfrastructure() {
 		eventsFileWriter.append(infrastructure(), infrastructure -> {
 			try {
 				String hostName = InetAddress.getLocalHost().getHostName();
-				infrastructure.addChild(hostName(hostName));
+				infrastructure.append(hostName(hostName));
 			}
 			catch (UnknownHostException ignored) {
 			}
-			infrastructure.addChild(userName(System.getProperty("user.name")));
-			infrastructure.addChild(operatingSystem(System.getProperty("os.name")));
-			infrastructure.addChild(cpuCores(Runtime.getRuntime().availableProcessors()));
-			infrastructure.addChild(javaVersion(System.getProperty("java.version")));
-			infrastructure.addChild(fileEncoding(System.getProperty("file.encoding")));
-			infrastructure.addChild(heapSize(), heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
+			infrastructure.append(userName(System.getProperty("user.name")));
+			infrastructure.append(operatingSystem(System.getProperty("os.name")));
+			infrastructure.append(cpuCores(Runtime.getRuntime().availableProcessors()));
+			infrastructure.append(javaVersion(System.getProperty("java.version")));
+			infrastructure.append(fileEncoding(System.getProperty("file.encoding")));
+			infrastructure.append(heapSize(), heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
 		});
 	}
 
@@ -148,9 +149,9 @@ public void executionSkipped(TestIdentifier testIdentifier, String reason) {
 		String id = String.valueOf(idCounter.incrementAndGet());
 		reportStarted(testIdentifier, id);
 		eventsFileWriter.append(finished(id, Instant.now()), //
-			finished -> finished.addChild(result(Result.Status.SKIPPED), result -> {
+			finished -> finished.append(result(Result.Status.SKIPPED), result -> {
 				if (StringUtils.isNotBlank(reason)) {
-					result.addChild(reason(reason));
+					result.append(reason(reason));
 				}
 			}));
 	}
@@ -165,17 +166,17 @@ public void executionStarted(TestIdentifier testIdentifier) {
 	private void reportStarted(TestIdentifier testIdentifier, String id) {
 		eventsFileWriter.append(started(id, Instant.now(), testIdentifier.getDisplayName()), started -> {
 			testIdentifier.getParentIdObject().ifPresent(parentId -> started.withParentId(inProgressIds.get(parentId)));
-			started.addChild(metadata(), metadata -> {
+			started.append(metadata(), metadata -> {
 				if (!testIdentifier.getTags().isEmpty()) {
-					metadata.addChild(tags(), tags -> //
-					testIdentifier.getTags().forEach(tag -> tags.addChild(tag(tag.getName()))));
+					metadata.append(tags(), tags -> //
+					testIdentifier.getTags().forEach(tag -> tags.append(tag(tag.getName()))));
 				}
-				metadata.addChild(JUnitFactory.uniqueId(testIdentifier.getUniqueIdObject()));
-				metadata.addChild(JUnitFactory.legacyReportingName(testIdentifier.getLegacyReportingName()));
-				metadata.addChild(JUnitFactory.type(testIdentifier.getType()));
+				metadata.append(uniqueId(testIdentifier.getUniqueIdObject()));
+				metadata.append(legacyReportingName(testIdentifier.getLegacyReportingName()));
+				metadata.append(type(testIdentifier.getType()));
 			});
 			testIdentifier.getSource().ifPresent(
-				source -> started.addChild(sources(), sources -> addTestSource(source, sources)));
+				source -> started.append(sources(), sources -> addTestSource(source, sources)));
 		});
 	}
 
@@ -185,13 +186,13 @@ private void addTestSource(TestSource source, Sources sources) {
 		}
 		else if (source instanceof ClassSource) {
 			ClassSource classSource = (ClassSource) source;
-			sources.addChild(classSource(classSource.getClassName()), //
+			sources.append(classSource(classSource.getClassName()), //
 				element -> classSource.getPosition().ifPresent(
 					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof MethodSource) {
 			MethodSource methodSource = (MethodSource) source;
-			sources.addChild(methodSource(methodSource.getClassName(), methodSource.getMethodName()), element -> {
+			sources.append(methodSource(methodSource.getClassName(), methodSource.getMethodName()), element -> {
 				String methodParameterTypes = methodSource.getMethodParameterTypes();
 				if (methodParameterTypes != null) {
 					element.withMethodParameterTypes(methodParameterTypes);
@@ -200,24 +201,24 @@ else if (source instanceof MethodSource) {
 		}
 		else if (source instanceof ClasspathResourceSource) {
 			ClasspathResourceSource classpathResourceSource = (ClasspathResourceSource) source;
-			sources.addChild(classpathResourceSource(classpathResourceSource.getClasspathResourceName()), //
+			sources.append(classpathResourceSource(classpathResourceSource.getClasspathResourceName()), //
 				element -> classpathResourceSource.getPosition().ifPresent(
 					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof PackageSource) {
-			sources.addChild(packageSource(((PackageSource) source).getPackageName()));
+			sources.append(packageSource(((PackageSource) source).getPackageName()));
 		}
 		else if (source instanceof FileSource) {
 			FileSource fileSource = (FileSource) source;
-			sources.addChild(fileSource(fileSource.getFile()), //
+			sources.append(fileSource(fileSource.getFile()), //
 				element -> fileSource.getPosition().ifPresent(
 					filePosition -> element.addFilePosition(filePosition.getLine(), filePosition.getColumn())));
 		}
 		else if (source instanceof DirectorySource) {
-			sources.addChild(directorySource(((DirectorySource) source).getFile()));
+			sources.append(directorySource(((DirectorySource) source).getFile()));
 		}
 		else if (source instanceof UriSource) {
-			sources.addChild(uriSource(((UriSource) source).getUri()));
+			sources.append(uriSource(((UriSource) source).getUri()));
 		}
 	}
 
@@ -225,7 +226,7 @@ else if (source instanceof UriSource) {
 	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
 		String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
 		eventsFileWriter.append(reported(id, Instant.now()), //
-			reported -> reported.addChild(attachments(), attachments -> attachments.addChild(data(), data -> {
+			reported -> reported.append(attachments(), attachments -> attachments.append(data(), data -> {
 				data.withTime(entry.getTimestamp());
 				entry.getKeyValuePairs().forEach(data::addEntry);
 			})));
@@ -235,9 +236,9 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
 		String id = inProgressIds.remove(testIdentifier.getUniqueIdObject());
 		eventsFileWriter.append(finished(id, Instant.now()), //
-			finished -> finished.addChild(result(convertStatus(testExecutionResult.getStatus())), //
+			finished -> finished.append(result(convertStatus(testExecutionResult.getStatus())), //
 				result -> testExecutionResult.getThrowable() //
-						.ifPresent(throwable -> result.addChild(throwable(throwable)))));
+						.ifPresent(throwable -> result.append(throwable(throwable)))));
 	}
 
 	private Result.Status convertStatus(TestExecutionResult.Status status) {
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
index 58c6569170e4..e1e96de11318 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
@@ -13,8 +13,8 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.opentest4j.reporting.events.api.ChildElement;
 import org.opentest4j.reporting.events.api.Context;
-import org.opentest4j.reporting.events.api.QualifiedName;
 import org.opentest4j.reporting.events.core.Metadata;
+import org.opentest4j.reporting.schema.QualifiedName;
 
 class Type extends ChildElement<Metadata, Type> {
 
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
index b8284529d996..b461c03d4850 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
@@ -12,8 +12,8 @@
 
 import org.opentest4j.reporting.events.api.ChildElement;
 import org.opentest4j.reporting.events.api.Context;
-import org.opentest4j.reporting.events.api.QualifiedName;
 import org.opentest4j.reporting.events.core.Metadata;
+import org.opentest4j.reporting.schema.QualifiedName;
 
 class UniqueId extends ChildElement<Metadata, UniqueId> {
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8cb4f7f7128f..3c1dcf98513d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -122,6 +122,7 @@ include("junit-bom")
 includeBuild("../open-test-reporting") {
 	dependencySubstitution {
 		substitute(module("org.opentest4j.reporting:open-test-reporting-events")).using(project(":events"))
+		substitute(module("org.opentest4j.reporting:open-test-reporting-schema")).using(project(":schema"))
 	}
 }
 

From 7a3d72c6d3bdb3831304edde21ad431906c1d23d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jan 2022 11:17:42 +0100
Subject: [PATCH 0789/1433] Chain append calls

---
 .../xml/OpenTestReportGeneratingListener.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 11df40d092ca..843a294993cc 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -122,12 +122,13 @@ private void reportInfrastructure() {
 			}
 			catch (UnknownHostException ignored) {
 			}
-			infrastructure.append(userName(System.getProperty("user.name")));
-			infrastructure.append(operatingSystem(System.getProperty("os.name")));
-			infrastructure.append(cpuCores(Runtime.getRuntime().availableProcessors()));
-			infrastructure.append(javaVersion(System.getProperty("java.version")));
-			infrastructure.append(fileEncoding(System.getProperty("file.encoding")));
-			infrastructure.append(heapSize(), heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
+			infrastructure //
+					.append(userName(System.getProperty("user.name"))) //
+					.append(operatingSystem(System.getProperty("os.name"))) //
+					.append(cpuCores(Runtime.getRuntime().availableProcessors())) //
+					.append(javaVersion(System.getProperty("java.version"))) //
+					.append(fileEncoding(System.getProperty("file.encoding"))) //
+					.append(heapSize(), heapSize -> heapSize.withMax(Runtime.getRuntime().maxMemory()));
 		});
 	}
 
@@ -171,9 +172,9 @@ private void reportStarted(TestIdentifier testIdentifier, String id) {
 					metadata.append(tags(), tags -> //
 					testIdentifier.getTags().forEach(tag -> tags.append(tag(tag.getName()))));
 				}
-				metadata.append(uniqueId(testIdentifier.getUniqueIdObject()));
-				metadata.append(legacyReportingName(testIdentifier.getLegacyReportingName()));
-				metadata.append(type(testIdentifier.getType()));
+				metadata.append(uniqueId(testIdentifier.getUniqueIdObject())) //
+						.append(legacyReportingName(testIdentifier.getLegacyReportingName())) //
+						.append(type(testIdentifier.getType()));
 			});
 			testIdentifier.getSource().ifPresent(
 				source -> started.append(sources(), sources -> addTestSource(source, sources)));

From 7ac2105e25d9dc0ffe3ecdb352aa5f84d43115f8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jan 2022 13:55:33 +0100
Subject: [PATCH 0790/1433] Update copyright

---
 .../java/org/junit/platform/launcher/listeners/OutputDir.java   | 2 +-
 .../org/junit/platform/reporting/open/xml/JUnitFactory.java     | 2 +-
 .../junit/platform/reporting/open/xml/LegacyReportingName.java  | 2 +-
 .../reporting/open/xml/OpenTestReportGeneratingListener.java    | 2 +-
 .../main/java/org/junit/platform/reporting/open/xml/Type.java   | 2 +-
 .../java/org/junit/platform/reporting/open/xml/UniqueId.java    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
index e29ec606525c..58c7caba7ad6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
index 682e75d5e65e..be13c1d1ed3b 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
index 0f706add66bd..316bbaa775c0 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 843a294993cc..a2745c115803 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
index e1e96de11318..82aaf4a4b1cd 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
index b461c03d4850..a6298bfbc186 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2022 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which

From 61c6a9d8bd624366cb4459e1dd612c2fb31e497e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jan 2022 13:56:05 +0100
Subject: [PATCH 0791/1433] Polishing

---
 .../org/junit/platform/reporting/open/xml/JUnitFactory.java   | 4 ++--
 .../reporting/open/xml/OpenTestReportGeneratingListener.java  | 2 +-
 .../main/java/org/junit/platform/reporting/open/xml/Type.java | 2 +-
 .../java/org/junit/platform/reporting/open/xml/UniqueId.java  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
index be13c1d1ed3b..3a622f0e7e29 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
@@ -16,12 +16,12 @@
 
 class JUnitFactory {
 
-	public static Namespace NAMESPACE = Namespace.of("https://schemas.junit.org/open-test-reporting");
+	static Namespace NAMESPACE = Namespace.of("https://schemas.junit.org/open-test-reporting");
 
 	private JUnitFactory() {
 	}
 
-	static Factory<UniqueId> uniqueId(org.junit.platform.engine.UniqueId uniqueId) {
+	static Factory<UniqueId> uniqueId(String uniqueId) {
 		return context -> new UniqueId(context, uniqueId);
 	}
 
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index a2745c115803..a5c0185dd5bf 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -172,7 +172,7 @@ private void reportStarted(TestIdentifier testIdentifier, String id) {
 					metadata.append(tags(), tags -> //
 					testIdentifier.getTags().forEach(tag -> tags.append(tag(tag.getName()))));
 				}
-				metadata.append(uniqueId(testIdentifier.getUniqueIdObject())) //
+				metadata.append(uniqueId(testIdentifier.getUniqueId())) //
 						.append(legacyReportingName(testIdentifier.getLegacyReportingName())) //
 						.append(type(testIdentifier.getType()));
 			});
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
index 82aaf4a4b1cd..851486f435d9 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
@@ -18,7 +18,7 @@
 
 class Type extends ChildElement<Metadata, Type> {
 
-	public static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "type");
+	static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "type");
 
 	Type(Context context, TestDescriptor.Type type) {
 		super(context, ELEMENT);
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
index a6298bfbc186..92a83a283296 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
@@ -19,8 +19,8 @@ class UniqueId extends ChildElement<Metadata, UniqueId> {
 
 	static final QualifiedName ELEMENT = QualifiedName.of(JUnitFactory.NAMESPACE, "uniqueId");
 
-	UniqueId(Context context, org.junit.platform.engine.UniqueId value) {
+	UniqueId(Context context, String value) {
 		super(context, ELEMENT);
-		withContent(value.toString());
+		withContent(value);
 	}
 }

From e4ab557b788d1d3132c589f1c58e85081c7684cf Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 9 Jan 2022 14:36:12 +0100
Subject: [PATCH 0792/1433] Add test for OpenTestReportGeneratingListener

---
 gradle/libs.versions.toml                     |   8 +-
 .../junit-platform-console.gradle.kts         |   2 +-
 .../DemoEngineExecutionContext.java           |   9 ++
 .../DemoHierarchicalTestDescriptor.java       |  12 +-
 .../DemoHierarchicalTestEngine.java           |  10 +-
 .../junit-platform-reporting.gradle.kts       |   2 +-
 .../xml/OpenTestReportGeneratingListener.java |   5 +-
 platform-tests/platform-tests.gradle.kts      |   2 +
 ...egacyXmlReportGeneratingListenerTests.java |  36 ++---
 ...OpenTestReportGeneratingListenerTests.java | 136 ++++++++++++++++++
 .../runner/JUnitPlatformRunnerTests.java      |   4 +-
 settings.gradle.kts                           |   2 +-
 12 files changed, 197 insertions(+), 31 deletions(-)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ad3a17324650..15d4748fd138 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,9 @@ junit4Min = "4.12"
 ktlint = "0.43.0"
 log4j = "2.17.1"
 opentest4j = "1.2.0"
+openTestReporting = "0.1.0-SNAPSHOT"
 surefire = "2.22.2"
+xmlunit = "2.8.4"
 
 [libraries]
 ant = { module = "org.apache.ant:ant", version.ref = "ant" }
@@ -39,12 +41,16 @@ log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4
 maven = { module = "org.apache.maven:apache-maven", version = "3.8.5" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.1.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
-openTestReporting = { module = "org.opentest4j.reporting:open-test-reporting-events", version = "1.0-SNAPSHOT" }
+openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
+openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }
 picocli = { module = "info.picocli:picocli", version = "4.6.2" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.32" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
+xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }
+xmlunit-placeholders = { module = "org.xmlunit:xmlunit-placeholders", version.ref = "xmlunit" }
 
 [bundles]
 ant = ["ant", "ant-junit", "ant-junitlauncher"]
 log4j = ["log4j-core", "log4j-jul"]
+xmlunit = ["xmlunit-assertj", "xmlunit-placeholders"]
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 8bac3f18ff22..0b90d0c7742f 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
-	compileOnly(libs.openTestReporting)
+	compileOnly(libs.openTestReporting.events)
 
 	shadowed(libs.picocli)
 
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
index 8437b01f4ddd..e7e96f29b9f9 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
@@ -10,8 +10,17 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
+import org.junit.platform.engine.ExecutionRequest;
+
 /**
  * @since 1.0
  */
 public class DemoEngineExecutionContext implements EngineExecutionContext {
+
+	public final ExecutionRequest request;
+
+	public DemoEngineExecutionContext(ExecutionRequest request) {
+		this.request = request;
+	}
+
 }
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
index 47d9942b626e..60c31b622c40 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
@@ -13,6 +13,9 @@
 import static org.junit.platform.engine.support.hierarchical.Node.SkipResult.doNotSkip;
 import static org.junit.platform.engine.support.hierarchical.Node.SkipResult.skip;
 
+import java.util.function.BiConsumer;
+
+import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
@@ -22,16 +25,17 @@
  */
 public class DemoHierarchicalTestDescriptor extends AbstractTestDescriptor implements Node<DemoEngineExecutionContext> {
 
-	private final Runnable executeBlock;
+	private final BiConsumer<DemoEngineExecutionContext, TestDescriptor> executeBlock;
 	private String skippedReason;
 	private boolean skipped;
 
-	public DemoHierarchicalTestDescriptor(UniqueId uniqueId, String displayName, Runnable executeBlock) {
+	public DemoHierarchicalTestDescriptor(UniqueId uniqueId, String displayName,
+			BiConsumer<DemoEngineExecutionContext, TestDescriptor> executeBlock) {
 		this(uniqueId, displayName, null, executeBlock);
 	}
 
 	public DemoHierarchicalTestDescriptor(UniqueId uniqueId, String displayName, TestSource source,
-			Runnable executeBlock) {
+			BiConsumer<DemoEngineExecutionContext, TestDescriptor> executeBlock) {
 		super(uniqueId, displayName, source);
 		this.executeBlock = executeBlock;
 	}
@@ -55,7 +59,7 @@ public SkipResult shouldBeSkipped(DemoEngineExecutionContext context) {
 	public DemoEngineExecutionContext execute(DemoEngineExecutionContext context,
 			DynamicTestExecutor dynamicTestExecutor) {
 		if (this.executeBlock != null) {
-			this.executeBlock.run();
+			this.executeBlock.accept(context, this);
 		}
 		return context;
 	}
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
index 2f9f8aaf41ff..1f58a1edb609 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
+import java.util.function.BiConsumer;
 import java.util.function.Function;
 
 import org.junit.platform.engine.EngineDiscoveryRequest;
@@ -49,6 +50,13 @@ public DemoHierarchicalTestDescriptor addTest(String uniqueName, Runnable execut
 	}
 
 	public DemoHierarchicalTestDescriptor addTest(String uniqueName, String displayName, Runnable executeBlock) {
+		return addChild(uniqueName,
+			uniqueId -> new DemoHierarchicalTestDescriptor(uniqueId, displayName, (c, t) -> executeBlock.run()),
+			"test");
+	}
+
+	public DemoHierarchicalTestDescriptor addTest(String uniqueName, String displayName,
+			BiConsumer<DemoEngineExecutionContext, TestDescriptor> executeBlock) {
 		return addChild(uniqueName, uniqueId -> new DemoHierarchicalTestDescriptor(uniqueId, displayName, executeBlock),
 			"test");
 	}
@@ -84,7 +92,7 @@ public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId
 
 	@Override
 	protected DemoEngineExecutionContext createExecutionContext(ExecutionRequest request) {
-		return new DemoEngineExecutionContext();
+		return new DemoEngineExecutionContext(request);
 	}
 
 }
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index 38a7062a9860..daf88ef5ce07 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
-	implementation(libs.openTestReporting)
+	implementation(libs.openTestReporting.events)
 
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index a5c0185dd5bf..4662634bff82 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -79,7 +79,8 @@
 
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
-	private static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
+	static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
+	static final String OUTPUT_DIR_PROPERTY_NAME = "junit.platform.reporting.output.dir";
 
 	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder(Namespace.REPORTING_CORE) //
 			.add("e", Namespace.REPORTING_EVENTS) //
@@ -98,7 +99,7 @@ public OpenTestReportGeneratingListener() {
 	public void testPlanExecutionStarted(TestPlan testPlan) {
 		ConfigurationParameters config = testPlan.getConfigurationParameters();
 		if (isEnabled(config)) {
-			Path eventsXml = OutputDir.create(config.get("junit.platform.reporting.output.dir")) //
+			Path eventsXml = OutputDir.create(config.get(OUTPUT_DIR_PROPERTY_NAME)) //
 					.createFile("junit-platform-events", "xml");
 			try {
 				eventsFileWriter = Events.createDocumentWriter(NAMESPACE_REGISTRY, eventsXml);
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 0ae45babf9e1..afc3fa6bd5a7 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -28,6 +28,8 @@ dependencies {
 	testImplementation(libs.apiguardian)
 	testImplementation(libs.jfrunit)
 	testImplementation(libs.joox)
+	testImplementation(libs.openTestReporting.tooling)
+	testImplementation(libs.bundles.xmlunit)
 
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(projects.junitVintageEngine)
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 321b69d745b8..3927e44c6b57 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -72,7 +72,7 @@ void writesFileForSingleSucceedingTest() throws Exception {
 		engine.addTest("succeedingTest", "display<-->Name 😎", () -> {
 		});
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -101,7 +101,7 @@ void writesFileForSingleFailingTest() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("failingTest", () -> fail("expected to <b>fail</b>"));
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -129,7 +129,7 @@ void writesFileForSingleErroneousTest() throws Exception {
 			throw new RuntimeException("error occurred");
 		});
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -156,7 +156,7 @@ void writesFileForSingleSkippedTest() throws Exception {
 		var testDescriptor = engine.addTest("skippedTest", () -> fail("never called"));
 		testDescriptor.markSkipped("should be skipped");
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -179,7 +179,7 @@ void writesFileForSingleAbortedTest() throws Exception {
 		var engine = new DemoHierarchicalTestEngine("dummy");
 		engine.addTest("abortedTest", () -> assumeFalse(true, "deliberately aborted"));
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -205,7 +205,7 @@ void measuresTimesInSeconds() throws Exception {
 		engine.addTest("secondTest", () -> {
 		});
 
-		executeTests(engine, tempDirectory, new IncrementingClock(0, Duration.ofMillis(333)));
+		executeTests(engine, new IncrementingClock(0, Duration.ofMillis(333)));
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -229,7 +229,7 @@ void testWithImmeasurableTimeIsOutputCorrectly() throws Exception {
 		engine.addTest("test", () -> {
 		});
 
-		executeTests(engine, tempDirectory, Clock.fixed(Instant.EPOCH, ZoneId.systemDefault()));
+		executeTests(engine, Clock.fixed(Instant.EPOCH, ZoneId.systemDefault()));
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -242,7 +242,7 @@ void writesFileForSkippedContainer() throws Exception {
 		engine.addTest("test", () -> fail("never called"));
 		engine.getEngineDescriptor().markSkipped("should be skipped");
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -260,7 +260,7 @@ void writesFileForFailingContainer() throws Exception {
 		engine.addTest("test", () -> fail("never called"));
 		engine.getEngineDescriptor().setBeforeAllBehavior(() -> fail("failure before all tests"));
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -283,7 +283,7 @@ void writesFileForFailingContainerWithoutTest() throws Exception {
 			throw new RuntimeException("boom");
 		});
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -311,11 +311,11 @@ public void after(DemoEngineExecutionContext context) {
 					throw new RuntimeException("boom");
 				}
 			}, "child");
-		container.addChild(
-			new DemoHierarchicalTestDescriptor(container.getUniqueId().append("test", "someTest"), "someTest", () -> {
+		container.addChild(new DemoHierarchicalTestDescriptor(container.getUniqueId().append("test", "someTest"),
+			"someTest", (c, t) -> {
 			}));
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 
@@ -338,7 +338,7 @@ void writesSystemProperties() throws Exception {
 		engine.addTest("test", () -> {
 		});
 
-		executeTests(engine, tempDirectory);
+		executeTests(engine);
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 		var properties = testsuite.child("properties").children("property");
@@ -355,7 +355,7 @@ void writesHostNameAndTimestamp() throws Exception {
 		var now = LocalDateTime.parse("2016-01-28T14:02:59.123");
 		var zone = ZoneId.systemDefault();
 
-		executeTests(engine, tempDirectory, Clock.fixed(ZonedDateTime.of(now, zone).toInstant(), zone));
+		executeTests(engine, Clock.fixed(ZonedDateTime.of(now, zone).toInstant(), zone));
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-dummy.xml"));
 		assertThat(testsuite.attr("hostname")).isEqualTo(InetAddress.getLocalHost().getHostName());
@@ -420,11 +420,11 @@ void writesReportEntriesToSystemOutElement() throws Exception {
 					"Report Entry #2 (timestamp: " + Year.now(), "- bar: baz\n", "- qux: foo\n");
 	}
 
-	private void executeTests(TestEngine engine, Path tempDirectory) {
-		executeTests(engine, tempDirectory, Clock.systemDefaultZone());
+	private void executeTests(TestEngine engine) {
+		executeTests(engine, Clock.systemDefaultZone());
 	}
 
-	private void executeTests(TestEngine engine, Path tempDirectory, Clock clock) {
+	private void executeTests(TestEngine engine, Clock clock) {
 		var out = new PrintWriter(new StringWriter());
 		var reportListener = new LegacyXmlReportGeneratingListener(tempDirectory.toString(), out, clock);
 		var launcher = createLauncher(engine);
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
new file mode 100644
index 000000000000..4c1ea7a7f444
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.reporting.open.xml;
+
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+import static org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly.createLauncher;
+import static org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener.ENABLED_PROPERTY_NAME;
+import static org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener.OUTPUT_DIR_PROPERTY_NAME;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.platform.engine.TestEngine;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.reporting.ReportEntry;
+import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
+import org.opentest4j.reporting.tooling.validator.DefaultValidator;
+import org.opentest4j.reporting.tooling.validator.ValidationResult;
+import org.xmlunit.assertj3.XmlAssert;
+import org.xmlunit.placeholder.PlaceholderDifferenceEvaluator;
+
+/**
+ * Tests for {@link OpenTestReportGeneratingListener}.
+ *
+ * @since 1.9
+ */
+public class OpenTestReportGeneratingListenerTests {
+
+	@TempDir(cleanup = ON_SUCCESS)
+	Path tempDirectory;
+
+	@Test
+	void writesValidXmlReport() throws Exception {
+		var engine = new DemoHierarchicalTestEngine("dummy");
+		engine.addTest("failingTest", "display<-->Name 😎", (context, descriptor) -> {
+			var listener = context.request.getEngineExecutionListener();
+			listener.reportingEntryPublished(descriptor, ReportEntry.from("key", "value"));
+			fail("failure message");
+		});
+
+		executeTests(engine);
+
+		var xmlFile = findXmlReport();
+		assertThat(validate(xmlFile)).isEmpty();
+
+		var expected = """
+				<e:events xmlns="https://schemas.opentest4j.org/reporting/core/0.1.0" xmlns:e="https://schemas.opentest4j.org/reporting/events/0.1.0" xmlns:java="https://schemas.opentest4j.org/reporting/java/0.1.0"
+				          xmlns:junit="https://schemas.junit.org/open-test-reporting" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				          xsi:schemaLocation="https://schemas.junit.org/open-test-reporting https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd">
+				    <infrastructure>
+				        <hostName>${xmlunit.ignore}</hostName>
+				        <userName>${xmlunit.ignore}</userName>
+				        <operatingSystem>${xmlunit.ignore}</operatingSystem>
+				        <cpuCores>${xmlunit.ignore}</cpuCores>
+				        <java:javaVersion>${xmlunit.ignore}</java:javaVersion>
+				        <java:fileEncoding>UTF-8</java:fileEncoding>
+				        <java:heapSize max="${xmlunit.isNumber}"/>
+				    </infrastructure>
+				    <e:started id="1" name="dummy" time="${xmlunit.isDateTime}">
+				        <metadata>
+				            <junit:uniqueId>[engine:dummy]</junit:uniqueId>
+				            <junit:legacyReportingName>dummy</junit:legacyReportingName>
+				            <junit:type>CONTAINER</junit:type>
+				        </metadata>
+				    </e:started>
+				    <e:started id="2" name="display&lt;--&gt;Name 😎" parentId="1" time="${xmlunit.isDateTime}">
+				        <metadata>
+				            <junit:uniqueId>[engine:dummy]/[test:failingTest]</junit:uniqueId>
+				            <junit:legacyReportingName>display&lt;--&gt;Name 😎</junit:legacyReportingName>
+				            <junit:type>TEST</junit:type>
+				        </metadata>
+				    </e:started>
+				    <e:reported id="2" time="${xmlunit.isDateTime}">
+				        <attachments>
+				            <data time="${xmlunit.isDateTime}">
+				                <entry key="key">value</entry>
+				            </data>
+				        </attachments>
+				    </e:reported>
+				    <e:finished id="2" time="${xmlunit.isDateTime}">
+				        <result status="FAILED">
+				            <java:throwable assertionError="true" type="org.opentest4j.AssertionFailedError">
+				                ${xmlunit.matchesRegex(org\\.opentest4j\\.AssertionFailedError: failure message)}
+				            </java:throwable>
+				        </result>
+				    </e:finished>
+				    <e:finished id="1" time="${xmlunit.isDateTime}">
+				        <result status="SUCCESSFUL"/>
+				    </e:finished>
+				</e:events>
+				""";
+
+		XmlAssert.assertThat(xmlFile).and(expected) //
+				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator()) //
+				.ignoreWhitespace() //
+				.areIdentical();
+	}
+
+	private ValidationResult validate(Path xmlFile) throws URISyntaxException {
+		var catalogUri = requireNonNull(getClass().getResource("catalog.xml")).toURI();
+		return new DefaultValidator(catalogUri).validate(xmlFile);
+	}
+
+	private void executeTests(TestEngine engine) {
+		var build = request() //
+				.selectors(selectUniqueId(UniqueId.forEngine(engine.getId()))) //
+				.configurationParameter(ENABLED_PROPERTY_NAME, String.valueOf(true)) //
+				.configurationParameter(OUTPUT_DIR_PROPERTY_NAME, tempDirectory.toString()) //
+				.build();
+		createLauncher(engine).execute(build, new OpenTestReportGeneratingListener());
+	}
+
+	private Path findXmlReport() throws IOException {
+		try (var stream = Files.list(tempDirectory)) {
+			return stream.findAny().orElseThrow(AssertionError::new);
+		}
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index 4e2c793e5c0b..8c2921607f9b 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -687,7 +687,7 @@ void descriptionForJavaMethodAndClassSources() throws Exception {
 				ClassSource.from(getClass()));
 			containerDescriptor.addChild(
 				new DemoHierarchicalTestDescriptor(containerDescriptor.getUniqueId().append("test", "failingTest"),
-					"testDisplayName", MethodSource.from(failingTest), () -> {
+					"testDisplayName", MethodSource.from(failingTest), (c, t) -> {
 					}));
 
 			var platformRunner = new JUnitPlatform(TestClass.class, createLauncher(engine));
@@ -723,7 +723,7 @@ void descriptionForJavaMethodAndClassSourcesUsingTechnicalNames() throws Excepti
 				ClassSource.from(getClass()));
 			containerDescriptor.addChild(
 				new DemoHierarchicalTestDescriptor(containerDescriptor.getUniqueId().append("test", "failingTest"),
-					"testDisplayName", MethodSource.from(failingTest), () -> {
+					"testDisplayName", MethodSource.from(failingTest), (c, t) -> {
 					}));
 
 			var platformRunner = new JUnitPlatform(TestClassWithTechnicalNames.class, createLauncher(engine));
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3c1dcf98513d..d5ee349177ff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -122,7 +122,7 @@ include("junit-bom")
 includeBuild("../open-test-reporting") {
 	dependencySubstitution {
 		substitute(module("org.opentest4j.reporting:open-test-reporting-events")).using(project(":events"))
-		substitute(module("org.opentest4j.reporting:open-test-reporting-schema")).using(project(":schema"))
+		substitute(module("org.opentest4j.reporting:open-test-reporting-tooling")).using(project(":tooling"))
 	}
 }
 

From c37c3bb34fff7d71b4900f8ecebbac29f2a95d00 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 9 Jan 2022 15:14:18 +0100
Subject: [PATCH 0793/1433] Shadow open-test-reporting

---
 .../junit-platform-console.gradle.kts         |   6 +
 .../LICENSE-open-test-reporting.md            | 194 ++++++++++++++++++
 .../junit-platform-reporting.gradle.kts       |  13 +-
 .../module-info.java                          |   1 -
 4 files changed, 212 insertions(+), 2 deletions(-)
 create mode 100644 junit-platform-reporting/LICENSE-open-test-reporting.md

diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 0b90d0c7742f..94b664a06135 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -22,6 +22,12 @@ dependencies {
 }
 
 tasks {
+	compileModule {
+		options.compilerArgs.addAll(listOf(
+			"--add-modules", "org.opentest4j.reporting.events",
+			"--add-reads", "org.junit.platform.reporting=org.opentest4j.reporting.events"
+		))
+	}
 	shadowJar {
 		val release17ClassesDir = sourceSets.mainRelease17.get().output.classesDirs.singleFile
 		inputs.dir(release17ClassesDir).withPathSensitivity(PathSensitivity.RELATIVE)
diff --git a/junit-platform-reporting/LICENSE-open-test-reporting.md b/junit-platform-reporting/LICENSE-open-test-reporting.md
new file mode 100644
index 000000000000..6aec502b3945
--- /dev/null
+++ b/junit-platform-reporting/LICENSE-open-test-reporting.md
@@ -0,0 +1,194 @@
+Apache License
+==============
+
+_Version 2.0, January 2004_
+_&lt;<https://www.apache.org/licenses/>&gt;_
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“Legal Entity” shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, “control” means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“Object” form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+“Work” shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+“submitted” means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as “Not a Contribution.”
+
+“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+#### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+#### 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+#### 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+* **(b)** You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+#### 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+#### 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+#### 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+#### 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+#### 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+_END OF TERMS AND CONDITIONS_
+
+### APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets `[]` replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same “printed page” as the copyright notice for easier identification within
+third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index daf88ef5ce07..144c3fbe5bbc 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
 	`java-library-conventions`
+	`shadow-conventions`
 }
 
 description = "JUnit Platform Reporting"
@@ -10,8 +11,18 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
-	implementation(libs.openTestReporting.events)
+	shadowed(libs.openTestReporting.events)
 
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
 }
+
+tasks {
+	shadowJar {
+		relocate("org.opentest4j.reporting", "org.junit.platform.reporting.shadow.org.opentest4j.reporting")
+		from(projectDir) {
+			include("LICENSE-open-test-reporting.md")
+			into("META-INF")
+		}
+	}
+}
diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
index 1da527b9e7c3..66c749470bf0 100644
--- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
@@ -19,7 +19,6 @@
 	requires org.junit.platform.commons;
 	requires transitive org.junit.platform.engine;
 	requires transitive org.junit.platform.launcher;
-	requires org.opentest4j.reporting.events;
 
 	// exports org.junit.platform.reporting; empty package
 	exports org.junit.platform.reporting.legacy;

From cdd07d2e4a391309b81a12a7a5f94cfda81a9692 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 9 Jan 2022 15:37:07 +0100
Subject: [PATCH 0794/1433] Fix integration tests

---
 .../open/xml/OpenTestReportGeneratingListener.java     | 10 +++++++++-
 .../junit-platform-reporting.expected.txt              |  2 ++
 .../platform/tooling/support/tests/ArchUnitTests.java  |  4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 4662634bff82..73967cb55582 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.reporting.open.xml;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.junit.platform.reporting.open.xml.JUnitFactory.legacyReportingName;
 import static org.junit.platform.reporting.open.xml.JUnitFactory.type;
 import static org.junit.platform.reporting.open.xml.JUnitFactory.uniqueId;
@@ -51,6 +52,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.ConfigurationParameters;
@@ -77,6 +79,12 @@
 import org.opentest4j.reporting.events.root.Events;
 import org.opentest4j.reporting.schema.Namespace;
 
+/**
+ * Open Test Reporting events XML generating test execution listener.
+ *
+ * @since 1.9
+ */
+@API(status = EXPERIMENTAL, since = "1.9")
 public class OpenTestReportGeneratingListener implements TestExecutionListener {
 
 	static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
@@ -106,7 +114,7 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 				reportInfrastructure();
 			}
 			catch (Exception e) {
-				throw new RuntimeException("Failed to initialize XML events file: " + eventsXml, e);
+				throw new JUnitException("Failed to initialize XML events file: " + eventsXml, e);
 			}
 		}
 	}
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
index 97d05754aa07..e9dbd208e00a 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
@@ -1,9 +1,11 @@
 org.junit.platform.reporting@${platformVersion} jar:file:.+/junit-platform-reporting-\d.+\.jar..module-info\.class
 exports org.junit.platform.reporting.legacy
 exports org.junit.platform.reporting.legacy.xml
+exports org.junit.platform.reporting.open.xml
 requires java.base mandated
 requires java.xml
 requires org.apiguardian.api static transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine transitive
 requires org.junit.platform.launcher transitive
+provides org.junit.platform.launcher.TestExecutionListener with org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
index e5452a84d85c..b0cbd859cb40 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
@@ -20,6 +20,7 @@
 import static com.tngtech.archunit.core.domain.JavaModifier.PUBLIC;
 import static com.tngtech.archunit.core.domain.properties.HasModifiers.Predicates.modifier;
 import static com.tngtech.archunit.core.domain.properties.HasName.Predicates.name;
+import static com.tngtech.archunit.core.domain.properties.HasName.Predicates.nameContaining;
 import static com.tngtech.archunit.lang.conditions.ArchPredicates.are;
 import static com.tngtech.archunit.lang.conditions.ArchPredicates.have;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
@@ -73,7 +74,8 @@ void avoidJavaUtilLogging(JavaClasses classes) {
 	@ArchTest
 	void avoidThrowingGenericExceptions(JavaClasses classes) {
 		// LoggerFactory.java:155 -> new Throwable()
-		var subset = classes.that(are(not(name("org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger"))));
+		var subset = classes.that(are(not(
+			name("org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger").or(nameContaining(".shadow.")))));
 		GeneralCodingRules.NO_CLASSES_SHOULD_THROW_GENERIC_EXCEPTIONS.check(subset);
 	}
 

From 82c5074af318972eeac365c29c5355d3b4209029 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 25 Mar 2022 13:29:23 +0100
Subject: [PATCH 0795/1433] Switch to released version of open-test-reporting

---
 gradle/libs.versions.toml | 2 +-
 settings.gradle.kts       | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 15d4748fd138..aa4fd473881d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ junit4Min = "4.12"
 ktlint = "0.43.0"
 log4j = "2.17.1"
 opentest4j = "1.2.0"
-openTestReporting = "0.1.0-SNAPSHOT"
+openTestReporting = "0.1.0-M1"
 surefire = "2.22.2"
 xmlunit = "2.8.4"
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d5ee349177ff..2043a71e72f9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -119,13 +119,6 @@ include("platform-tests")
 include("platform-tooling-support-tests")
 include("junit-bom")
 
-includeBuild("../open-test-reporting") {
-	dependencySubstitution {
-		substitute(module("org.opentest4j.reporting:open-test-reporting-events")).using(project(":events"))
-		substitute(module("org.opentest4j.reporting:open-test-reporting-tooling")).using(project(":tooling"))
-	}
-}
-
 // check that every subproject has a custom build file
 // based on the project name
 rootProject.children.forEach { project ->

From 394e33022729e92f6787a5dcda1ccf813236d1ba Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 21:12:37 +0200
Subject: [PATCH 0796/1433] Fix test on Windows

---
 .../open/xml/OpenTestReportGeneratingListenerTests.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
index 4c1ea7a7f444..7287f168064d 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
@@ -70,7 +70,7 @@ void writesValidXmlReport() throws Exception {
 				        <operatingSystem>${xmlunit.ignore}</operatingSystem>
 				        <cpuCores>${xmlunit.ignore}</cpuCores>
 				        <java:javaVersion>${xmlunit.ignore}</java:javaVersion>
-				        <java:fileEncoding>UTF-8</java:fileEncoding>
+				        <java:fileEncoding>${xmlunit.ignore}</java:fileEncoding>
 				        <java:heapSize max="${xmlunit.isNumber}"/>
 				    </infrastructure>
 				    <e:started id="1" name="dummy" time="${xmlunit.isDateTime}">

From 27e53ad579d7b59d9817e24a9cbbe4f28e4968e1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 9 Apr 2022 21:28:50 +0200
Subject: [PATCH 0797/1433] Fix aggregated Javadoc generation

---
 documentation/documentation.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index da412fed8be5..b0fe12fa5fb6 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -372,6 +372,7 @@ tasks {
 			addStringOption("-add-modules", "info.picocli")
 			addOption(ModuleSpecificJavadocFileOption("-add-reads", mapOf(
 					"org.junit.platform.console" to "info.picocli",
+					"org.junit.platform.reporting" to "org.opentest4j.reporting.events",
 					"org.junit.jupiter.params" to "univocity.parsers"
 			)))
 		}

From 2e2b19deb6c1eff7a74205d150cb399b7f8e7b91 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 11 May 2022 21:17:44 +0200
Subject: [PATCH 0798/1433] Fix `since` declaration

---
 .../java/org/junit/platform/launcher/listeners/OutputDir.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
index 58c7caba7ad6..a76785ee4667 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
@@ -24,7 +24,7 @@
 import org.apiguardian.api.API;
 import org.junit.platform.commons.util.StringUtils;
 
-@API(status = INTERNAL, since = "1.8")
+@API(status = INTERNAL, since = "1.9")
 public class OutputDir {
 
 	public static OutputDir create(Optional<String> customDir) {

From 33044af764ab0723c6245f09dc07731b8c49ec98 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 13 May 2022 12:19:24 +0200
Subject: [PATCH 0799/1433] Document how to configure new XML reports

---
 documentation/documentation.gradle.kts        |   4 +-
 .../src/docs/asciidoc/link-attributes.adoc    |   2 +
 .../junit-platform-reporting.adoc             | 146 ++++++++++++++++--
 .../asciidoc/user-guide/running-tests.adoc    |  16 +-
 4 files changed, 147 insertions(+), 21 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index b0fe12fa5fb6..f91316ae8a88 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -137,9 +137,9 @@ tasks {
 				args("--include-classname", ".*Demo")
 				args("--exclude-tag", "exclude")
 				args("--reports-dir", reportsDir)
+				args("--config=junit.platform.reporting.output.dir=${reportsDir}")
+				args("--config=junit.platform.reporting.open.xml.enabled=true")
 				systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
-				systemProperty("junit.platform.reporting.output.dir", reportsDir)
-				systemProperty("junit.platform.reporting.open.xml.enabled", "true")
 				debug = debugging.get()
 				if (!debugging.get()) {
 					standardOutput = output
diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 7e4dd23c159a..168f973042ae 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -43,6 +43,7 @@ endif::[]
 :UniqueIdTrackingListener:                   {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.html[UniqueIdTrackingListener]
 // Platform Reporting
 :LegacyXmlReportGeneratingListener:          {javadoc-root}/org.junit.platform.reporting/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.html[LegacyXmlReportGeneratingListener]
+:OpenTestReportGeneratingListener:           {javadoc-root}/org.junit.platform.reporting/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.html[OpenTestReportGeneratingListener]
 // Platform Runner
 :JUnitPlatform-Runner:                       {javadoc-root}/org.junit.platform.runnner/org/junit/platform/runner/JUnitPlatform.html[JUnitPlatform]
 // Platform Suite
@@ -182,3 +183,4 @@ endif::[]
 :SpringExtension:                            https://github.com/spring-projects/spring-framework/tree/HEAD/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java[SpringExtension]
 :StackOverflow:                              https://stackoverflow.com/questions/tagged/junit5[Stack Overflow]
 :Truth:                                      https://truth.dev/[Truth]
+:OpenTestReporting:                          https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
index 586d32b0cab6..30ff5b8a7fca 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
@@ -1,17 +1,135 @@
 [[junit-platform-reporting]]
 === JUnit Platform Reporting
 
-The `junit-platform-reporting` artifact contains `{TestExecutionListener}`
-implementations that generate test reports. These listeners are typically used by IDEs
-and build tools. The package `org.junit.platform.reporting.legacy.xml` currently contains
-the following implementation.
-
-* `{LegacyXmlReportGeneratingListener}` generates a separate XML report for each root in
-  the `{TestPlan}`. Note that the generated XML format is compatible with the de facto
-  standard for JUnit 4 based test reports that was made popular by the Ant build system.
-  The `LegacyXmlReportGeneratingListener` is used by the
-  <<running-tests-console-launcher>> as well.
-
-NOTE: The `{junit-platform-launcher}` module also contains `TestExecutionListener`
-implementations that can be used for reporting purposes. See <<running-tests-listeners>>
-for details.
+The `junit-platform-reporting` artifact contains `{TestExecutionListener}` implementations
+that generate XML test reports in two flavors:
+<<junit-platform-reporting-legacy-xml, legacy>> and
+<<junit-platform-reporting-open-test-reporting, Open Test Reporting>>.
+
+NOTE: The module also contains other `TestExecutionListener` implementations that can be
+used to build custom reporting. See <<running-tests-listeners>> for details.
+
+[[junit-platform-reporting-legacy-xml]]
+==== Legacy XML reports
+
+`{LegacyXmlReportGeneratingListener}` generates a separate XML report for each root in the
+`{TestPlan}`. Note that the generated XML format is compatible with the de facto standard
+for JUnit 4 based test reports that was made popular by the Ant build system.
+
+The `LegacyXmlReportGeneratingListener` is used by the <<running-tests-console-launcher>>
+as well.
+
+[[junit-platform-reporting-open-test-reporting]]
+==== Open Test Reporting XML reports
+
+`{OpenTestReportGeneratingListener}` writes an XML report for the entire execution in the
+event-based format specified by {OpenTestReporting} which supports all features of the
+JUnit Platform such as hierarchical test structures, display names, tags, etc.
+
+The listener is auto-registered and can be configured via the following
+<<running-tests-config-params>>:
+
+`junit.platform.reporting.open.xml.enabled=true|false`::
+  Enable/disable writing the report.
+`junit.platform.reporting.output.dir=<path>`::
+  Configure the output directory for the reports. By default, `build` is used if a Gradle
+  build script is found, and `target` if a Maven POM is found; otherwise, the current
+  working directory is used.
+
+If enabled, the listener creates an XML report file named
+`junit-platform-events-<random-id>.xml` per test run in the configured output directory.
+
+===== Gradle
+
+For Gradle, writing Open Test Reporting compatible XML reports can be enabled and
+configured via system properties. The following samples configure its output directory to
+be the same directory Gradle uses for its own XML reports. A `CommandLineArgumentProvider`
+is used to keep the tasks relocatable across different machines which is important when
+using Gradle's Build Cache.
+
+[source,groovy,indent=0]
+[subs=attributes+]
+.Groovy DSL
+----
+dependencies {
+    testRuntimeOnly("org.junit.platform:junit-platform-reporting:{platform-version}")
+}
+tasks.withType(Test).configureEach {
+    def outputDir = reports.junitXml.outputLocation
+    jvmArgumentProviders << ({
+        [
+            "-Djunit.platform.reporting.open.xml.enabled=true",
+            "-Djunit.platform.reporting.output.dir=${outputDir.get().asFile.absolutePath}"
+        ]
+    } as CommandLineArgumentProvider)
+}
+----
+
+[source,kotlin,indent=0]
+[subs=attributes+]
+.Kotlin DSL
+----
+dependencies {
+    testRuntimeOnly("org.junit.platform:junit-platform-reporting:{platform-version}")
+}
+tasks.withType<Test>().configureEach {
+    val outputDir = reports.junitXml.outputLocation
+    jvmArgumentProviders += CommandLineArgumentProvider {
+		listOf(
+			"-Djunit.platform.reporting.open.xml.enabled=true",
+			"-Djunit.platform.reporting.output.dir=${outputDir.get().asFile.absolutePath}"
+		)
+	}
+}
+----
+
+===== Maven
+
+For Maven Surefire/Failsafe, you can enable Open Test Reporting output and configure the
+resulting XML files to be written to the same directory Surefire/Failsafe uses for its own
+XML reports as follows:
+
+[source,xml,indent=0]
+[subs=attributes+]
+----
+<project>
+	<!-- ... -->
+	<dependencies>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-reporting</artifactId>
+			<version>{platform-version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>{surefire-version}</version>
+				<configuration>
+					<properties>
+						<configurationParameters>
+							junit.platform.reporting.open.xml.enabled = true
+							junit.platform.reporting.output.dir = ${project.build.directory}/surefire-reports
+						</configurationParameters>
+					</properties>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<!-- ... -->
+</project>
+----
+
+===== Console Launcher
+
+When using the <<running-tests-console-launcher>>, you can enable Open Test Reporting
+output by setting the configuration parameters via `--config`:
+
+[source,console,subs=attributes+]
+----
+$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS> \
+  --config=junit.platform.reporting.open.xml.enabled=true \
+  --config=junit.platform.reporting.output.dir=reports
+----
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 93c2dbafc66b..f8d3c14885a2 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -947,15 +947,21 @@ guide.
 The JUnit Platform provides the following listeners which you may wish to use with your
 test suite.
 
+<<junit-platform-reporting>> ::
+  `{LegacyXmlReportGeneratingListener}` can be used via the
+  <<running-tests-console-launcher>> or registered manually to generate XML reports
+  compatible with the de facto standard for JUnit 4 based test reports.
++
+`{OpenTestReportGeneratingListener}` generates an XML report in the event-based format
+specified by {OpenTestReporting}. It is auto-registered and can be enabled and
+configured via <<running-tests-config-params>>.
++
+See <<junit-platform-reporting>> for details.
+
 <<running-tests-listeners-flight-recorder>> ::
   `FlightRecordingExecutionListener` and `FlightRecordingDiscoveryListener` that generate
   Java Flight Recorder events during test discovery and execution.
 
-`{LegacyXmlReportGeneratingListener}` ::
-  `TestExecutionListener` that generates XML reports compatible with the de facto
-  standard for JUnit 4 based test reports. See <<junit-platform-reporting>> for
-  details.
-
 `{LoggingListener}` ::
   `TestExecutionListener` for logging informational messages for all events via a
   `BiConsumer` that consumes `Throwable` and `Supplier<String>`.

From 0742c79936dab577423296d7e6bc70570caaa071 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 16:15:58 +0200
Subject: [PATCH 0800/1433] Order advanced topics by importance

---
 .../src/docs/asciidoc/user-guide/advanced-topics.adoc         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
index 64b008ec7308..ab7f4d11463a 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics.adoc
@@ -1,12 +1,12 @@
 [[advanced-topics]]
 == Advanced Topics
 
-include::advanced-topics/launcher-api.adoc[]
-
 include::advanced-topics/junit-platform-reporting.adoc[]
 
 include::advanced-topics/junit-platform-suite-engine.adoc[]
 
 include::advanced-topics/testkit.adoc[]
 
+include::advanced-topics/launcher-api.adoc[]
+
 include::advanced-topics/engines.adoc[]

From 29c440b8d679a9394930e1a81ba65f554796c4a9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 16:16:19 +0200
Subject: [PATCH 0801/1433] Enable writing Open Test Reports for all test tasks

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 0ddd2d405d1e..5d52df05fe9c 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -48,8 +48,16 @@ tasks.withType<Test>().configureEach {
 			"-XX:FlightRecorderOptions=stackdepth=1024"
 		)
 	}
+
 	// Track OS as input so that tests are executed on all configured operating systems on CI
 	trackOperationSystemAsInput()
+
+	jvmArgumentProviders += CommandLineArgumentProvider {
+		listOf(
+			"-Djunit.platform.reporting.open.xml.enabled=true",
+			"-Djunit.platform.reporting.output.dir=${reports.junitXml.outputLocation.get().asFile.absolutePath}"
+		)
+	}
 }
 
 dependencies {
@@ -63,6 +71,7 @@ dependencies {
 
 	"testRuntimeOnly"(project(":junit-platform-engine"))
 	"testRuntimeOnly"(project(":junit-platform-jfr"))
+	"testRuntimeOnly"(project(":junit-platform-reporting"))
 
 	"testRuntimeOnly"(bundleFromLibs("log4j"))
 }

From caeea685b90055db95acaa4240fb00919031109a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 16:26:55 +0200
Subject: [PATCH 0802/1433] Add tip to use Open Test Reporting CLI for
 conversion

---
 documentation/src/docs/asciidoc/link-attributes.adoc       | 1 +
 .../advanced-topics/junit-platform-reporting.adoc          | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 168f973042ae..7bc8cfdd3de8 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -184,3 +184,4 @@ endif::[]
 :StackOverflow:                              https://stackoverflow.com/questions/tagged/junit5[Stack Overflow]
 :Truth:                                      https://truth.dev/[Truth]
 :OpenTestReporting:                          https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
+:OpenTestReportingCliTool:                   https://github.com/ota4j-team/open-test-reporting#cli-tool-for-validation-and-format-conversion[Open Test Reporting CLI Tool]
diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
index 30ff5b8a7fca..c6d89a0edba8 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
@@ -10,7 +10,7 @@ NOTE: The module also contains other `TestExecutionListener` implementations tha
 used to build custom reporting. See <<running-tests-listeners>> for details.
 
 [[junit-platform-reporting-legacy-xml]]
-==== Legacy XML reports
+==== Legacy XML format
 
 `{LegacyXmlReportGeneratingListener}` generates a separate XML report for each root in the
 `{TestPlan}`. Note that the generated XML format is compatible with the de facto standard
@@ -20,7 +20,7 @@ The `LegacyXmlReportGeneratingListener` is used by the <<running-tests-console-l
 as well.
 
 [[junit-platform-reporting-open-test-reporting]]
-==== Open Test Reporting XML reports
+==== Open Test Reporting XML format
 
 `{OpenTestReportGeneratingListener}` writes an XML report for the entire execution in the
 event-based format specified by {OpenTestReporting} which supports all features of the
@@ -39,6 +39,9 @@ The listener is auto-registered and can be configured via the following
 If enabled, the listener creates an XML report file named
 `junit-platform-events-<random-id>.xml` per test run in the configured output directory.
 
+TIP: The {OpenTestReportingCliTool} can be used to convert from the event-based format to
+the hierarchical format which is more human-readable.
+
 ===== Gradle
 
 For Gradle, writing Open Test Reporting compatible XML reports can be enabled and

From 82f988a4b7fb3ec5b49e5abca9a4f31d9a8ce278 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 16:27:07 +0200
Subject: [PATCH 0803/1433] Document Open Test Reporting support in release
 notes

---
 .../docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 814267148374..8c86c9782225 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -24,6 +24,11 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* Add support for https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
+  format which supports all features of the JUnit Platform such as hierarchical test
+  structures, display names, tags, etc. Please refer to the
+  <<../user-guide/index.adoc#junit-platform-reporting-open-test-reporting, User Guide>>
+  for instructions on how to enable such reports in your build.
 * `ConfigurationParameters` has a new `keySet()` method which allows you to retrieve all
   configuration parameter keys.
 * New `IterationSelector` for selecting a subset of a test's or container's iterations.

From 347e3119d36a5c226cddd7981452f11335fad422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erdin=C3=A7=20Ocak?= <erdinc.ocakk@gmail.com>
Date: Sun, 15 May 2022 20:26:54 +0300
Subject: [PATCH 0804/1433] Support ParallelExecutionConfigurationStrategy with
 Turkish locale
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since Turkish has a special characters as "ı" and "İ", uppercase
convertion here causes all test methods to finish with exit code -1.
Because uppercase of "i" is "İ" in Turkish and that breaks the code,
e.g. "dynamic" > "DYNAMİC".

There is a special comment for Turkish characters on reference
documentation of java.lang.String:
https://docs.oracle.com/javase/7/docs/api/java/lang/String.html#toUpperCase(java.util.Locale)

Uppercase conversion on
`DefaultParallelExecutionConfigurationStrategy#getStrategy` has been
changed to use root locale, since Turkish special character(i>İ) breaks
the code with default locale settings.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../asciidoc/release-notes/release-notes-5.9.0-M1.adoc     | 7 ++++++-
 .../DefaultParallelExecutionConfigurationStrategy.java     | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 8c86c9782225..48cf33bfa261 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -16,6 +16,9 @@ on GitHub.
 ==== Bug Fixes
 
 * Fix handling of global post-discovery filters that apply to `@Suite` classes.
+* Since Turkish language has special characters as 'ı' and 'İ', the uppercase conversion on
+  `DefaultParallelExecutionConfigurationStrategy#getStrategy` was causing all test to finish
+  with exit code -1. That has been fixed by using Root locale instead of default one.
 
 ==== Deprecations and Breaking Changes
 
@@ -91,7 +94,9 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Since Turkish language has special characters as 'ı' and 'İ', the uppercase conversion on
+  `DefaultParallelExecutionConfigurationStrategy#getStrategy` was causing all test to finish
+  with exit code -1. That has been fixed by using Root locale instead of default one.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
index aa0e8531d938..5160e6c796ee 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
@@ -13,6 +13,7 @@
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
 import java.math.BigDecimal;
+import java.util.Locale;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
@@ -133,7 +134,8 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter
 	public static final String CONFIG_CUSTOM_CLASS_PROPERTY_NAME = "custom.class";
 
 	static ParallelExecutionConfigurationStrategy getStrategy(ConfigurationParameters configurationParameters) {
-		return valueOf(configurationParameters.get(CONFIG_STRATEGY_PROPERTY_NAME).orElse("dynamic").toUpperCase());
+		return valueOf(
+			configurationParameters.get(CONFIG_STRATEGY_PROPERTY_NAME).orElse("dynamic").toUpperCase(Locale.ROOT));
 	}
 
 }

From 5df7406fe285d3bbe5b97040b433ff84a3310a84 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 19:28:47 +0200
Subject: [PATCH 0805/1433] Polish release notes

---
 .../release-notes/release-notes-5.9.0-M1.adoc | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 48cf33bfa261..414c6dd13903 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -1,9 +1,16 @@
 [[release-notes-5.9.0-M1]]
 == 5.9.0-M1
 
-*Date of Release:* ❓
+*Date of Release:* May 15, 2022
 
-*Scope:* ❓
+*Scope:*
+
+* XML reports in new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting] format
+* Configurable cleanup mode for `@TempDir`
+* New `TestInstancePreConstructCallback` extension API
+* Reusable parameter resolution for custom extension methods via `ExecutableInvoker`
+* New `IterationSelector`
+* Various improvements to `ConsoleLauncher`
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/58?closed=1+[5.9 M1] milestone page in the JUnit repository
@@ -61,6 +68,9 @@ on GitHub.
 ==== Bug Fixes
 
 * Only retry deleting directories when cleaning up `@TempDir` once.
+* Since Turkish language has special characters as 'ı' and 'İ', the uppercase conversion on
+  `DefaultParallelExecutionConfigurationStrategy#getStrategy` was causing all test to finish
+  with exit code -1. That has been fixed by using Root locale instead of default one.
 
 ==== Deprecations and Breaking Changes
 
@@ -92,16 +102,4 @@ on GitHub.
 [[release-notes-5.9.0-M1-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* Since Turkish language has special characters as 'ı' and 'İ', the uppercase conversion on
-  `DefaultParallelExecutionConfigurationStrategy#getStrategy` was causing all test to finish
-  with exit code -1. That has been fixed by using Root locale instead of default one.
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes.

From 176ac403a6b4dc416a96d2e9a49285a5b46d9936 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 15 May 2022 20:19:22 +0200
Subject: [PATCH 0806/1433] Fix formatting and polish 5.9 M1 release notes

---
 .../release-notes/release-notes-5.9.0-M1.adoc | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 414c6dd13903..01b7fdca26d0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -5,7 +5,8 @@
 
 *Scope:*
 
-* XML reports in new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting] format
+* XML reports in new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
+  format
 * Configurable cleanup mode for `@TempDir`
 * New `TestInstancePreConstructCallback` extension API
 * Reusable parameter resolution for custom extension methods via `ExecutableInvoker`
@@ -22,10 +23,11 @@ on GitHub.
 
 ==== Bug Fixes
 
-* Fix handling of global post-discovery filters that apply to `@Suite` classes.
-* Since Turkish language has special characters as 'ı' and 'İ', the uppercase conversion on
-  `DefaultParallelExecutionConfigurationStrategy#getStrategy` was causing all test to finish
-  with exit code -1. That has been fixed by using Root locale instead of default one.
+* Fixed handling of global post-discovery filters that apply to `@Suite` classes.
+* Since the Turkish language has special characters such as 'ı' and 'İ', the uppercase
+  conversion in `DefaultParallelExecutionConfigurationStrategy#getStrategy` previously
+  caused all tests to finish with exit code -1. This has been fixed by using the root
+  locale instead of the default one.
 
 ==== Deprecations and Breaking Changes
 
@@ -34,7 +36,7 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* Add support for https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
+* Support for the https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
   format which supports all features of the JUnit Platform such as hierarchical test
   structures, display names, tags, etc. Please refer to the
   <<../user-guide/index.adoc#junit-platform-reporting-open-test-reporting, User Guide>>
@@ -42,23 +44,24 @@ on GitHub.
 * `ConfigurationParameters` has a new `keySet()` method which allows you to retrieve all
   configuration parameter keys.
 * New `IterationSelector` for selecting a subset of a test's or container's iterations.
-* `ParallelExecutionConfiguration` allows configuring the "saturate" predicate of the
+* `ParallelExecutionConfiguration` allows configuring the `saturate` predicate of the
   `ForkJoinPool` used for parallel test execution.
 * JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
   resolution time a fully running set of dependencies is calculated, avoiding the need for
   these to be manually specified.
 * JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
 * New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if no tests
-  were discovered.
-* `ConsoleLauncher`'s output color can now be customized. The option `--single-color` will
-  apply a built-in monochrome style, while `--color-palette` will accept a properties file.
-  See the <<../user-guide/index.adoc#running-tests-console-launcher-color-customization,
+  are discovered.
+* The output color for the `ConsoleLauncher` can now be customized. The option
+  `--single-color` will apply a built-in monochrome style, while `--color-palette` will
+  accept a properties file. See the
+  <<../user-guide/index.adoc#running-tests-console-launcher-color-customization,
   User Guide>> for details.
-* `ConsoleLauncher`'s default theme is now determined by the charset reported by the system
-  console on Java 17 and later.
-* New `--list-engines` option added to the `ConsoleLauncher` displaying all registered test
-  engine implementations.
-* Configuring include `EngineFilters` that do not match any registered `TestEngine`
+* The default theme for the `ConsoleLauncher` is now determined by the charset reported by
+  the system console on Java 17 and later.
+* New `--list-engines` option added to the `ConsoleLauncher` which displays all registered
+  test engine implementations.
+* Configuring included `EngineFilters` that do not match any registered `TestEngine`
   results in an error to avoid misconfiguration – for example, due to typos.
 
 
@@ -67,10 +70,11 @@ on GitHub.
 
 ==== Bug Fixes
 
-* Only retry deleting directories when cleaning up `@TempDir` once.
-* Since Turkish language has special characters as 'ı' and 'İ', the uppercase conversion on
-  `DefaultParallelExecutionConfigurationStrategy#getStrategy` was causing all test to finish
-  with exit code -1. That has been fixed by using Root locale instead of default one.
+* When cleaning up a `@TempDir`, only one retry attempt will be made to delete directories.
+* Since the Turkish language has special characters such as 'ı' and 'İ', the uppercase
+  conversion in `DefaultParallelExecutionConfigurationStrategy#getStrategy` previously
+  caused all tests to finish with exit code -1. This has been fixed by using the root
+  locale instead of the default one.
 
 ==== Deprecations and Breaking Changes
 
@@ -90,13 +94,14 @@ on GitHub.
 * New `TestInstancePreConstructCallback` extension API that is called prior to test
   instance construction – symmetric to the existing `TestInstancePreDestroyCallback`
   extension API.
-* Extensions can now leverage registered `ParameterResolvers` when invoking methods and
-  constructors via the new `ExecutableInvoker` available in the `ExtensionContext`.
+* Extensions can now leverage registered `ParameterResolver` extensions when invoking
+  methods and constructors via the new `ExecutableInvoker` API available in the
+  `ExtensionContext`.
 * A subset of the invocations of parameterized or dynamic tests can now be selected via
   the new `IterationSelector` discovery selector when launching the JUnit Platform.
 * `JAVA_19` has been added to the `JRE` enum for use with JRE-based execution conditions.
 * `@MethodSource` factory methods can now accept arguments resolved by registered
-  `ParameterResolver`.
+  `ParameterResolver` extensions.
 
 
 [[release-notes-5.9.0-M1-junit-vintage]]

From 91312fb532a5aaed4bd695dac1c098dbefab3d57 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 20:32:24 +0200
Subject: [PATCH 0807/1433] Exclude Vintage engine from JFRUnit dependency

---
 platform-tests/platform-tests.gradle.kts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index afc3fa6bd5a7..8f67df13a8bf 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -26,7 +26,9 @@ dependencies {
 	testImplementation(testFixtures(projects.junitPlatformLauncher))
 	testImplementation(projects.junitJupiterEngine)
 	testImplementation(libs.apiguardian)
-	testImplementation(libs.jfrunit)
+	testImplementation(libs.jfrunit) {
+		exclude(group = "org.junit.vintage")
+	}
 	testImplementation(libs.joox)
 	testImplementation(libs.openTestReporting.tooling)
 	testImplementation(libs.bundles.xmlunit)

From b8162372ad413342288e0cdaf0ca52b464f5e6e1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 20:36:13 +0200
Subject: [PATCH 0808/1433] Add explicit project dependency to
 junit-platform-launcher

---
 .../platform-tooling-support-tests.gradle.kts                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 31bf3df1db86..519e915e0720 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -50,6 +50,7 @@ dependencies {
 	antJars(platform(projects.junitBom))
 	antJars(libs.bundles.ant)
 	antJars(projects.junitPlatformConsoleStandalone)
+	antJars(projects.junitPlatformLauncher)
 
 	mavenDistribution(libs.maven) {
 		artifact {

From 74c781454ca1763ef7248dd778f9b500e2a81a46 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 20:27:39 +0200
Subject: [PATCH 0809/1433] Release 5.9.0-M1

---
 README.md         | 2 +-
 gradle.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index bce09e72c0a1..4b1858d97b87 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 ## Latest Releases
 
 - General Availability (GA): [JUnit 5.8.2](https://github.com/junit-team/junit5/releases/tag/r5.8.2) (November 28, 2021)
-- Preview (Milestone/Release Candidate): n/a
+- Preview (Milestone/Release Candidate): [JUnit 5.9.0-M1](https://github.com/junit-team/junit5/releases/tag/r5.9.0-M1) (May 15, 2022)
 
 ## Documentation
 
diff --git a/gradle.properties b/gradle.properties
index 8e7c8cfe2f8e..fc0b9c3ba86d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.9.0-SNAPSHOT
+version         = 5.9.0-M1
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.9.0-SNAPSHOT
+platformVersion = 1.9.0-M1
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.9.0-SNAPSHOT
+vintageVersion  = 5.9.0-M1
 
 defaultBuiltBy  = JUnit Team
 

From a6683c457b018ede0e25b994d9d655371f934004 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 15 May 2022 21:07:31 +0200
Subject: [PATCH 0810/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index fc0b9c3ba86d..87907265ad76 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.9.0-M1
+version         = 5.9.1-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.9.0-M1
+platformVersion = 1.9.1-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.9.0-M1
+vintageVersion  = 5.9.1-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From dfa9d37ce116e328516eb8fade726da4e50ca470 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 May 2022 09:00:25 +0000
Subject: [PATCH 0811/1433] Bump com.gradle.enterprise from 3.10 to 3.10.1

Bumps com.gradle.enterprise from 3.10 to 3.10.1.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2043a71e72f9..a89273d27f1d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.10"
+		id("com.gradle.enterprise") version "3.10.1"
 		id("com.gradle.enterprise.test-distribution") version "2.3.1" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.5"
 		id("org.ajoberstar.git-publish") version "3.0.0"

From dd6bddc1700454f4d317e89c48b4acaa0939c0e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 May 2022 09:00:23 +0000
Subject: [PATCH 0812/1433] Bump
 com.gradle.common-custom-user-data-gradle-plugin from 1.6.5 to 1.7

Bumps com.gradle.common-custom-user-data-gradle-plugin from 1.6.5 to 1.7.

---
updated-dependencies:
- dependency-name: com.gradle.common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a89273d27f1d..e9da5054f318 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
 	plugins {
 		id("com.gradle.enterprise") version "3.10.1"
 		id("com.gradle.enterprise.test-distribution") version "2.3.1" // keep in sync with buildSrc/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.5"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From 1150d6b389bdcd0c1fcb0def7d5037ec1940d064 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 21 May 2022 11:25:09 +0200
Subject: [PATCH 0813/1433] Update Test Distribution Gradle plugin to 2.3.2

---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index f56ebf57244a..db3ac6619c15 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3.2") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e9da5054f318..0b16f8e6d91a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.10.1"
-		id("com.gradle.enterprise.test-distribution") version "2.3.1" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise.test-distribution") version "2.3.2" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"

From 89368428832d4448305de59a8647a9194a3c4e29 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 29 May 2022 15:25:40 +0200
Subject: [PATCH 0814/1433] Deleted unused test code

---
 .../jupiter/params/provider/MethodArgumentsProviderTests.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 3f326864d4b8..95378fe7a37d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -604,10 +604,6 @@ static Stream<String> stringsProvider() {
 			return Stream.of("string1", "string2");
 		}
 
-		static Stream<String> methodWithParams(String a, String b) {
-			return Stream.of(a, b);
-		}
-
 		static class Nested {
 
 			static Stream<String> stringsProvider() {

From d74edbce161915bb7f3c8c81e9135e1c25b49b0f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 29 May 2022 15:27:16 +0200
Subject: [PATCH 0815/1433] Polishing

---
 .../MethodArgumentsProviderTests.java         | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 95378fe7a37d..facdd88a29d4 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -384,7 +384,7 @@ void providesArgumentsUsingFullyQualifiedNameWithParameter() {
 		}
 
 		@Test
-		void throwExceptionWhenSeveralFactoryMethodsWithSameNameAreAvailable() {
+		void throwsExceptionWhenSeveralFactoryMethodsWithSameNameAreAvailable() {
 			var exception = assertThrows(PreconditionViolationException.class,
 				() -> provideArguments("stringStreamProviderWithOrWithoutParameter").toArray());
 
@@ -472,6 +472,18 @@ static Stream<String> stringStreamProvider() {
 			return Stream.of("foo", "bar");
 		}
 
+		static Stream<String> stringStreamProviderWithParameter(String parameter) {
+			return Stream.of("foo" + parameter, "bar" + parameter);
+		}
+
+		static Stream<String> stringStreamProviderWithOrWithoutParameter() {
+			return stringStreamProvider();
+		}
+
+		static Stream<String> stringStreamProviderWithOrWithoutParameter(String parameter) {
+			return stringStreamProviderWithParameter(parameter);
+		}
+
 		static DoubleStream doubleStreamProvider() {
 			return DoubleStream.of(1.2, 3.4);
 		}
@@ -504,18 +516,6 @@ static Stream<Arguments> argumentsStreamProvider() {
 			return objectArrayStreamProvider().map(Arguments::of);
 		}
 
-		static Stream<String> stringStreamProviderWithParameter(String parameter) {
-			return Stream.of("foo" + parameter, "bar" + parameter);
-		}
-
-		static Stream<String> stringStreamProviderWithOrWithoutParameter() {
-			return stringStreamProvider();
-		}
-
-		static Stream<String> stringStreamProviderWithOrWithoutParameter(String parameter) {
-			return stringStreamProviderWithParameter(parameter);
-		}
-
 		// --- Iterable / Collection -------------------------------------------
 
 		static Iterable<String> stringIterableProvider() {

From feeb5bcb6962c7ef997c04ecba474bb17f01480d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 29 May 2022 16:42:28 +0200
Subject: [PATCH 0816/1433] Polishing

---
 .../provider/MethodArgumentsProvider.java     | 27 ++++++++++---------
 .../MethodArgumentsProviderTests.java         |  6 ++---
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index d8b52d473ecc..2e70f4f76058 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -43,41 +43,42 @@ public Stream<Arguments> provideArguments(ExtensionContext context) {
 		Object testInstance = context.getTestInstance().orElse(null);
 		// @formatter:off
 		return Arrays.stream(this.methodNames)
-				.map(factoryMethodName -> getMethod(context, factoryMethodName))
-				.map(method -> context.getExecutableInvoker().invoke(method, testInstance))
+				.map(factoryMethodName -> getFactoryMethod(context, factoryMethodName))
+				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
 				.map(MethodArgumentsProvider::toArguments);
 		// @formatter:on
 	}
 
-	private Method getMethod(ExtensionContext context, String factoryMethodName) {
+	private Method getFactoryMethod(ExtensionContext context, String factoryMethodName) {
 		if (StringUtils.isBlank(factoryMethodName)) {
 			return ReflectionUtils.getRequiredMethod(context.getRequiredTestClass(),
 				context.getRequiredTestMethod().getName());
 		}
 		if (factoryMethodName.contains(".") || factoryMethodName.contains("#")) {
-			return getMethodByFullyQualifiedName(factoryMethodName);
+			return getFactoryMethodByFullyQualifiedName(factoryMethodName);
 		}
-		return getMethodByShortName(context.getRequiredTestClass(), factoryMethodName);
+		return getFactoryMethodBySimpleName(context.getRequiredTestClass(), factoryMethodName);
 	}
 
-	private Method getMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
+	private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
 		String methodName = methodParts[1];
 		String methodParameters = methodParts[2];
 
 		return ReflectionUtils.findMethod(loadRequiredClass(className), methodName, methodParameters).orElseThrow(
-			() -> new JUnitException(
-				format("Could not find method [%s(%s)] in class [%s]", methodName, methodParameters, className)));
+			() -> new JUnitException(format("Could not find factory method [%s(%s)] in class [%s]", methodName,
+				methodParameters, className)));
 	}
 
-	private Method getMethodByShortName(Class<?> testClass, String methodName) {
-		List<Method> methods = ReflectionUtils.findMethods(testClass, method -> method.getName().equals(methodName));
+	private Method getFactoryMethodBySimpleName(Class<?> testClass, String factoryMethodName) {
+		List<Method> methods = ReflectionUtils.findMethods(testClass,
+			factoryMethod -> factoryMethodName.equals(factoryMethod.getName()));
 		Preconditions.condition(methods.size() > 0,
-			() -> format("Could not find method [%s] in class [%s]", methodName, testClass.getName()));
-		Preconditions.condition(methods.size() <= 1,
-			() -> format("Several factory methods named [%s] were found in class [%s]", methodName,
+			() -> format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName()));
+		Preconditions.condition(methods.size() == 1,
+			() -> format("Several factory methods named [%s] were found in class [%s]", factoryMethodName,
 				testClass.getName()));
 		return methods.get(0);
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index facdd88a29d4..2fe7688455e5 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -200,7 +200,7 @@ void providesArgumentsFromNonStaticFactoryMethodWhenStaticIsNotRequired() {
 	void throwsExceptionWhenFactoryMethodDoesNotExist() {
 		var exception = assertThrows(JUnitException.class, () -> provideArguments("unknownMethod").toArray());
 
-		assertThat(exception.getMessage()).contains("Could not find method [unknownMethod] in class [",
+		assertThat(exception.getMessage()).contains("Could not find factory method [unknownMethod] in class [",
 			TestCase.class.getName());
 	}
 
@@ -256,8 +256,8 @@ void throwsExceptionWhenExternalFactoryMethodCannotBeFound() {
 		var exception = assertThrows(JUnitException.class,
 			() -> provideArguments(ExternalFactoryMethods.class.getName() + "#nonExistentMethod").toArray());
 
-		assertThat(exception.getMessage()).isEqualTo(
-			"Could not find method [nonExistentMethod()] in class [" + ExternalFactoryMethods.class.getName() + "]");
+		assertThat(exception.getMessage()).isEqualTo("Could not find factory method [nonExistentMethod()] in class ["
+				+ ExternalFactoryMethods.class.getName() + "]");
 	}
 
 	@Test

From 9d23af35eda6fc079c6019f5a58a4245db537d6f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 29 May 2022 16:51:06 +0200
Subject: [PATCH 0817/1433] Polishing

---
 .../params/provider/MethodArgumentsProviderTests.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 2fe7688455e5..d29398b954a7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -14,7 +14,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.engine.extension.MutableExtensionRegistry.createRegistryWithDefaultExtensions;
 import static org.junit.jupiter.params.provider.MethodArgumentsProviderTests.DefaultFactoryMethodNameTestCase.TEST_METHOD;
-import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -205,10 +204,10 @@ void throwsExceptionWhenFactoryMethodDoesNotExist() {
 	}
 
 	@Test
-	void providesArgumentsUsingDefaultFactoryMethodName() {
-		var method = selectMethod(DefaultFactoryMethodNameTestCase.class, TEST_METHOD,
-			String.class.getName()).getJavaMethod();
-		var arguments = provideArguments(DefaultFactoryMethodNameTestCase.class, method, false, "");
+	void providesArgumentsUsingDefaultFactoryMethodName() throws Exception {
+		Class<?> testClass = DefaultFactoryMethodNameTestCase.class;
+		var testMethod = testClass.getDeclaredMethod(TEST_METHOD, String.class);
+		var arguments = provideArguments(testClass, testMethod, false, "");
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"));
 	}
@@ -428,7 +427,7 @@ private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod,
 		when(methodSource.value()).thenReturn(methodNames);
 
 		var extensionContext = mock(ExtensionContext.class);
-		when(extensionContext.getTestClass()).thenReturn(Optional.ofNullable(testClass));
+		when(extensionContext.getTestClass()).thenReturn(Optional.of(testClass));
 		when(extensionContext.getTestMethod()).thenReturn(Optional.ofNullable(testMethod));
 		when(extensionContext.getExecutableInvoker()).thenReturn(
 			new DefaultExecutableInvoker(extensionContext, extensionRegistry));

From 130795b520a0b09289d0ddf46c6a13433f5521e5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 3 Jun 2022 17:31:09 +0200
Subject: [PATCH 0818/1433] Fix SNAPSHOT versions

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 87907265ad76..8e7c8cfe2f8e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.9.1-SNAPSHOT
+version         = 5.9.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.9.1-SNAPSHOT
+platformVersion = 1.9.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.9.1-SNAPSHOT
+vintageVersion  = 5.9.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From d250d124c487110b2b83338bf83874533290f6f4 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 3 Jun 2022 17:26:18 +0200
Subject: [PATCH 0819/1433] Introduce release notes for 5.9 M2

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.9.0-M2.adoc | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 21de9cc49385..d01816ea1747 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.9.0-M2.adoc[]
+
 include::{basedir}/release-notes-5.9.0-M1.adoc[]
 
 include::{basedir}/release-notes-5.8.2.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
new file mode 100644
index 000000000000..e3f074d40dc8
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.9.0-M2]]
+== 5.9.0-M2
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/61?closed=1+[5.9 M2] milestone page in the JUnit repository
+on GitHub.
+
+
+[[release-notes-5.9.0-M2-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.0-M2-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.0-M2-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From 271e36e6018ae167fdbb6d39d5dfb6c926939f48 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 29 May 2022 16:27:44 +0200
Subject: [PATCH 0820/1433] Support default @MethodSource factory with
 arguments

Prior to this commit, a default factory method for a @MethodSource
parameterized was not permitted to accept arguments (i.e., declare
parameters resolved by a ParameterResolver).

This commit modifies the factory method resolution algorithm so that a
factory method that accepts arguments can also be inferred as the
"default" factory method. The key change is the check that the current
candidate factory method is not the original test method.
---
 .../release-notes/release-notes-5.9.0-M2.adoc |  5 ++-
 .../provider/MethodArgumentsProvider.java     | 11 +++---
 .../MethodArgumentsProviderTests.java         | 39 ++++++++++++++++---
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
index e3f074d40dc8..e231baaaf9a4 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
@@ -39,7 +39,10 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* Default `@MethodSource` factory methods can now accept arguments. A _default_ factory
+  method is a method declared in the test class with the same name as the
+  `@ParameterizedTest` method that is inferred as the factory method when no explicit
+  factory method is specified in the `@MethodSource` annotation.
 
 
 [[release-notes-5.9.0-M2-junit-vintage]]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 2e70f4f76058..4be203387d09 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -51,14 +51,14 @@ public Stream<Arguments> provideArguments(ExtensionContext context) {
 	}
 
 	private Method getFactoryMethod(ExtensionContext context, String factoryMethodName) {
+		Method testMethod = context.getRequiredTestMethod();
 		if (StringUtils.isBlank(factoryMethodName)) {
-			return ReflectionUtils.getRequiredMethod(context.getRequiredTestClass(),
-				context.getRequiredTestMethod().getName());
+			factoryMethodName = testMethod.getName();
 		}
 		if (factoryMethodName.contains(".") || factoryMethodName.contains("#")) {
 			return getFactoryMethodByFullyQualifiedName(factoryMethodName);
 		}
-		return getFactoryMethodBySimpleName(context.getRequiredTestClass(), factoryMethodName);
+		return getFactoryMethodBySimpleName(context.getRequiredTestClass(), testMethod, factoryMethodName);
 	}
 
 	private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
@@ -72,9 +72,10 @@ private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodN
 				methodParameters, className)));
 	}
 
-	private Method getFactoryMethodBySimpleName(Class<?> testClass, String factoryMethodName) {
+	private Method getFactoryMethodBySimpleName(Class<?> testClass, Method testMethod, String factoryMethodName) {
+		// Find all methods with the desired factory method name, but ignore the test method itself.
 		List<Method> methods = ReflectionUtils.findMethods(testClass,
-			factoryMethod -> factoryMethodName.equals(factoryMethod.getName()));
+			factoryMethod -> factoryMethodName.equals(factoryMethod.getName()) && !testMethod.equals(factoryMethod));
 		Preconditions.condition(methods.size() > 0,
 			() -> format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName()));
 		Preconditions.condition(methods.size() == 1,
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index d29398b954a7..1a32fa1f35a7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
-import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
@@ -367,6 +366,15 @@ void registerParameterResolver() {
 			extensionRegistry.registerExtension(StringResolver.class);
 		}
 
+		@Test
+		void providesArgumentsUsingDefaultFactoryMethodWithParameter() throws Exception {
+			Class<?> testClass = TestCase.class;
+			var testMethod = testClass.getDeclaredMethod("overloadedStringStreamProvider", Object.class);
+			var arguments = provideArguments(testClass, testMethod, false, "");
+
+			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
+		}
+
 		@Test
 		void providesArgumentsUsingFactoryMethodWithParameter() {
 			var arguments = provideArguments("stringStreamProviderWithParameter");
@@ -422,13 +430,23 @@ private Stream<Object[]> provideArguments(String... methodNames) {
 	private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod, boolean allowNonStaticMethod,
 			String... methodNames) {
 
+		if (testMethod == null) {
+			try {
+				// ensure we have a non-null method, even if it's not a real test method.
+				testMethod = getClass().getMethod("toString");
+			}
+			catch (Exception ex) {
+				throw new RuntimeException(ex);
+			}
+		}
+
 		var methodSource = mock(MethodSource.class);
 
 		when(methodSource.value()).thenReturn(methodNames);
 
 		var extensionContext = mock(ExtensionContext.class);
 		when(extensionContext.getTestClass()).thenReturn(Optional.of(testClass));
-		when(extensionContext.getTestMethod()).thenReturn(Optional.ofNullable(testMethod));
+		when(extensionContext.getTestMethod()).thenReturn(Optional.of(testMethod));
 		when(extensionContext.getExecutableInvoker()).thenReturn(
 			new DefaultExecutableInvoker(extensionContext, extensionRegistry));
 
@@ -483,6 +501,17 @@ static Stream<String> stringStreamProviderWithOrWithoutParameter(String paramete
 			return stringStreamProviderWithParameter(parameter);
 		}
 
+		// @ParameterizedTest
+		// @MethodSource // use default, inferred factory method
+		void overloadedStringStreamProvider(Object parameter) {
+			// test implementation
+		}
+
+		// Default factory method for overloadedStringStreamProvider(Object)
+		static Stream<String> overloadedStringStreamProvider(String parameter) {
+			return stringStreamProviderWithParameter(parameter);
+		}
+
 		static DoubleStream doubleStreamProvider() {
 			return DoubleStream.of(1.2, 3.4);
 		}
@@ -614,14 +643,12 @@ static Stream<String> stringsProvider() {
 	static class StringResolver implements ParameterResolver {
 
 		@Override
-		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-				throws ParameterResolutionException {
+		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 			return parameterContext.getParameter().getType() == String.class;
 		}
 
 		@Override
-		public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-				throws ParameterResolutionException {
+		public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 			return "!";
 		}
 	}

From ee0d675a93410141091241de005c3f14a7e4f83d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 3 Jun 2022 18:40:38 +0200
Subject: [PATCH 0821/1433] Polish User Guide

---
 .../src/docs/asciidoc/link-attributes.adoc    |  1 +
 .../asciidoc/user-guide/writing-tests.adoc    | 39 +++++++++++--------
 ... MethodSourceParameterResolutionDemo.java} | 19 ++++-----
 .../java/example/ParameterizedTestDemo.java   | 10 +++--
 4 files changed, 40 insertions(+), 29 deletions(-)
 rename documentation/src/test/java/example/{MethodSourceParameterResolutionTestDemo.java => MethodSourceParameterResolutionDemo.java} (79%)

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 7bc8cfdd3de8..820c808abb47 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -78,6 +78,7 @@ endif::[]
 :MethodOrderer_OrderAnnotation:              {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.OrderAnnotation.html[MethodOrderer.OrderAnnotation]
 :MethodOrderer_Random:                       {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.Random.html[MethodOrderer.Random]
 :MethodOrderer:                              {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/MethodOrderer.html[MethodOrderer]
+:Named:                                      {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/Named.html[Named]
 :Order:                                      {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/Order.html[@Order]
 :RepetitionInfo:                             {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/RepetitionInfo.html[RepetitionInfo]
 :TestInfo:                                   {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/TestInfo.html[TestInfo]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index de0ff39ddf92..04faa753a79c 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1323,8 +1323,8 @@ interface. In addition, `Arguments.of(Object...)` may be used as an alternative
 include::{testDir}/example/ParameterizedTestDemo.java[tags=multi_arg_MethodSource_example]
 ----
 
-An external, `static` _factory_ method can be referenced by providing its _fully
-qualified method name_ as demonstrated in the following example.
+An external, `static` _factory_ method can be referenced by providing its _fully qualified
+method name_ as demonstrated in the following example.
 
 [source,java,indent=0]
 ----
@@ -1333,15 +1333,16 @@ package example;
 include::{testDir}/example/ExternalMethodSourceDemo.java[tags=external_MethodSource_example]
 ----
 
-Factory methods can declare parameters, which will be provided by registered implementations
-of `ParameterResolver`. In the following example, the factory method is referenced by its
-name since there's only one such method in the test class. If there are several methods with
-the same name, the factory method needs to be referenced by its fully qualified method name
-(e.g., `@MethodSource("example.MyTests#factoryMethodWithArguments(java.lang.String)")`).
+Factory methods can declare parameters, which will be provided by registered
+implementations of the `ParameterResolver` extension API. In the following example, the
+factory method is referenced by its name since there is only one such method in the test
+class. If there are several methods with the same name, the factory method must be
+referenced by its fully qualified method name – for example,
+`@MethodSource("example.MyTests#factoryMethodWithArguments(java.lang.String)")`.
 
 [source,java,indent=0]
 ----
-include::{testDir}/example/MethodSourceParameterResolutionTestDemo.java[tags=parameter_resolution_MethodSource_example]
+include::{testDir}/example/MethodSourceParameterResolutionDemo.java[tags=parameter_resolution_MethodSource_example]
 ----
 
 
@@ -1782,7 +1783,8 @@ Display name of container ✔
 └─ 3 ==> the rank of 'lemon, lime' is 3 ✔
 ....
 
-Please note that `name` is a `MessageFormat` pattern. Thus, a single quote (`'`) needs to be represented as a doubled single quote (`''`) in order to be displayed.
+Please note that `name` is a `MessageFormat` pattern. Thus, a single quote (`'`) needs to
+be represented as a doubled single quote (`''`) in order to be displayed.
 
 The following placeholders are supported within custom display names.
 
@@ -1802,9 +1804,9 @@ if they exceed the configured maximum length. The limit is configurable via the
 `junit.jupiter.params.displayname.argument.maxlength` configuration parameter and defaults
 to 512 characters.
 
-When using `@MethodSource` or `@ArgumentSource`, you can give names to arguments. This
-name will be used if the argument is included in the invocation display name, like in
-the example below.
+When using `@MethodSource` or `@ArgumentSource`, you can provide custom names for
+arguments using the `{Named}` API. A custom name will be used if the argument is included
+in the invocation display name, like in the example below.
 
 [source,java,indent=0]
 ----
@@ -1817,18 +1819,21 @@ A parameterized test with named arguments ✔
 └─ 2: Another file ✔
 ....
 
-If you'd like to set default name pattern for all parameterized tests in your project, you can add the following
-configuration to `junit-platform.properties`
+If you'd like to set a default name pattern for all parameterized tests in your project,
+you can declare the `junit.jupiter.params.displayname.default` configuration parameter in
+the `junit-platform.properties` file as demonstrated in the following example (see
+<<running-tests-config-params>> for other options).
 
 [source,properties,indent=0]
 ----
 junit.jupiter.params.displayname.default = {index}
 ----
 
-the display name for a parameterized method is determined according to the following precedence rules:
+The display name for a parameterized test is determined according to the following
+precedence rules:
 
-1. `name` of `@ParameterizedTest`, if present
-2. the value of `junit.jupiter.params.displayname.default` (from junit-platform.properties), if present
+1. `name` attribute in `@ParameterizedTest`, if present
+2. value of the `junit.jupiter.params.displayname.default` configuration parameter, if present
 3. `DEFAULT_DISPLAY_NAME` constant defined in `@ParameterizedTest`
 
 [[writing-tests-parameterized-tests-lifecycle-interop]]
diff --git a/documentation/src/test/java/example/MethodSourceParameterResolutionTestDemo.java b/documentation/src/test/java/example/MethodSourceParameterResolutionDemo.java
similarity index 79%
rename from documentation/src/test/java/example/MethodSourceParameterResolutionTestDemo.java
rename to documentation/src/test/java/example/MethodSourceParameterResolutionDemo.java
index 9f0e93284154..36ea8701d907 100644
--- a/documentation/src/test/java/example/MethodSourceParameterResolutionTestDemo.java
+++ b/documentation/src/test/java/example/MethodSourceParameterResolutionDemo.java
@@ -17,14 +17,13 @@
 
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
-import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class MethodSourceParameterResolutionTestDemo {
+class MethodSourceParameterResolutionDemo {
 
 	// @formatter:off
 	// tag::parameter_resolution_MethodSource_example[]
@@ -33,28 +32,30 @@ class MethodSourceParameterResolutionTestDemo {
 
 	@ParameterizedTest
 	@MethodSource("factoryMethodWithArguments")
-	void testWithArgumentsProviderUsingParameterResolvers(String argument) {
+	void testWithFactoryMethodWithArguments(String argument) {
 		assertTrue(argument.startsWith("2"));
 	}
 
 	static Stream<Arguments> factoryMethodWithArguments(int quantity) {
 		return Stream.of(
-				arguments(quantity + " apple"),
-				arguments(quantity + " lemon")
+				arguments(quantity + " apples"),
+				arguments(quantity + " lemons")
 		);
 	}
 
 	static class IntegerResolver implements ParameterResolver {
 
 		@Override
-		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-				throws ParameterResolutionException {
+		public boolean supportsParameter(ParameterContext parameterContext,
+				ExtensionContext extensionContext) {
+
 			return parameterContext.getParameter().getType() == int.class;
 		}
 
 		@Override
-		public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-				throws ParameterResolutionException {
+		public Object resolveParameter(ParameterContext parameterContext,
+				ExtensionContext extensionContext) {
+
 			return 2;
 		}
 
diff --git a/documentation/src/test/java/example/ParameterizedTestDemo.java b/documentation/src/test/java/example/ParameterizedTestDemo.java
index b93a643920c9..0a35327b10e5 100644
--- a/documentation/src/test/java/example/ParameterizedTestDemo.java
+++ b/documentation/src/test/java/example/ParameterizedTestDemo.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Named.named;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE;
 import static org.junit.jupiter.params.provider.EnumSource.Mode.MATCH_ALL;
@@ -40,7 +41,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestReporter;
@@ -451,6 +451,7 @@ void testWithCustomDisplayNames(String fruit, int rank) {
 	}
 	// end::custom_display_names[]
 
+	// @formatter:off
 	// tag::named_arguments[]
 	@DisplayName("A parameterized test with named arguments")
 	@ParameterizedTest(name = "{index}: {0}")
@@ -459,8 +460,11 @@ void testWithNamedArguments(File file) {
 	}
 
 	static Stream<Arguments> namedArguments() {
-		return Stream.of(arguments(Named.of("An important file", new File("path1"))),
-			arguments(Named.of("Another file", new File("path2"))));
+		return Stream.of(
+			arguments(named("An important file", new File("path1"))),
+			arguments(named("Another file", new File("path2")))
+		);
 	}
 	// end::named_arguments[]
+	// @formatter:on
 }

From f0397d63e3432bc2fe30980c2b8d4ebbd7bf32b8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 3 Jun 2022 19:48:20 +0200
Subject: [PATCH 0822/1433] Upgrade to AssertJ 3.23.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aa4fd473881d..8632ec25e5a8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 ant = "1.10.12"
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
-assertj = "3.21.0"
+assertj = "3.23.1"
 checkstyle = "9.0"
 jacoco = "0.8.7"
 jmh = "1.33"

From 394421c843dabd9c80e4354bb3dc235f773d648f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 5 Jun 2022 14:05:07 +0200
Subject: [PATCH 0823/1433] Delete unused logger field

---
 .../java/org/junit/platform/testkit/engine/EngineTestKit.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index 9631d8651ff5..407a25ccd4d5 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -23,8 +23,6 @@
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.PreconditionViolationException;
-import org.junit.platform.commons.logging.Logger;
-import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.DiscoveryFilter;
@@ -58,8 +56,6 @@
 @API(status = MAINTAINED, since = "1.7")
 public final class EngineTestKit {
 
-	private static final Logger logger = LoggerFactory.getLogger(EngineTestKit.class);
-
 	/**
 	 * Create an execution {@link Builder} for the {@link TestEngine} with the
 	 * supplied ID.

From 49bb02b09ee907b6714e222988d2bca5d650fb04 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 5 Jun 2022 14:05:26 +0200
Subject: [PATCH 0824/1433] Suppress warnings

---
 .../src/main/java/org/junit/jupiter/engine/Constants.java    | 1 +
 .../org/junit/jupiter/api/AssertNotNullAssertionsTests.java  | 2 ++
 .../org/junit/jupiter/api/AssertNullAssertionsTests.java     | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 7291d5a3cae3..be6eebf23fc9 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -310,6 +310,7 @@ public final class Constants {
 	 */
 	@Deprecated
 	@API(status = DEPRECATED, since = "5.8")
+	@SuppressWarnings("deprecation")
 	public static final String TEMP_DIR_SCOPE_PROPERTY_NAME = TempDir.SCOPE_PROPERTY_NAME;
 
 	private Constants() {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
index d69d3716a8a3..2854a3d28939 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
@@ -38,6 +38,7 @@ void assertNotNullWithNonNullObjectAndMessageSupplier() {
 	}
 
 	@Test
+	@SuppressWarnings("unused")
 	void assertNotNullWithNull() {
 		try {
 			assertNotNull(null);
@@ -49,6 +50,7 @@ void assertNotNullWithNull() {
 	}
 
 	@Test
+	@SuppressWarnings("unused")
 	void assertNotNullWithNullAndMessageSupplier() {
 		try {
 			assertNotNull(null, () -> "test");
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
index f1714b20894d..145b25aa1e6f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
@@ -40,6 +40,7 @@ void assertNullWithNullAndMessageSupplier() {
 	}
 
 	@Test
+	@SuppressWarnings("unused")
 	void assertNullWithNonNullObject() {
 		try {
 			assertNull("foo");
@@ -61,6 +62,7 @@ void assertNullWithNonNullObjectWithNullStringReturnedFromToStringAndMessageSupp
 		assertNullWithNonNullObjectWithNullStringReturnedFromToString(() -> "boom");
 	}
 
+	@SuppressWarnings("unused")
 	private void assertNullWithNonNullObjectWithNullStringReturnedFromToString(Supplier<String> messageSupplier) {
 		String actual = "null";
 		try {
@@ -91,6 +93,7 @@ void assertNullWithNonNullObjectWithNullReferenceReturnedFromToStringAndMessageS
 		assertNullWithNonNullObjectWithNullReferenceReturnedFromToString(() -> "boom");
 	}
 
+	@SuppressWarnings("unused")
 	private void assertNullWithNonNullObjectWithNullReferenceReturnedFromToString(Supplier<String> messageSupplier) {
 		Object actual = new NullToString();
 		try {
@@ -113,6 +116,7 @@ private void assertNullWithNonNullObjectWithNullReferenceReturnedFromToString(Su
 	}
 
 	@Test
+	@SuppressWarnings("unused")
 	void assertNullWithNonNullObjectAndMessage() {
 		try {
 			assertNull("foo", "a message");
@@ -125,6 +129,7 @@ void assertNullWithNonNullObjectAndMessage() {
 	}
 
 	@Test
+	@SuppressWarnings("unused")
 	void assertNullWithNonNullObjectAndMessageSupplier() {
 		try {
 			assertNull("foo", () -> "test");

From 5f58f700a3264cb329d04fddbe45fbec995bc412 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 5 Jun 2022 15:52:41 +0200
Subject: [PATCH 0825/1433] Polish "Custom Conditions" section in User Guide

---
 .../asciidoc/user-guide/writing-tests.adoc    | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 04faa753a79c..e946d5b9e01c 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -472,10 +472,13 @@ indirectly present, or meta-present on a given element.
 [[writing-tests-conditional-execution-custom]]
 ==== Custom Conditions
 
-A container or test may be enabled or disabled based on the boolean return of a
-method via the `{EnabledIf}` and `{DisabledIf}` annotations. The method is provided to
-the annotation via its name.
-If needed, the condition method can take a single parameter of type `ExtensionContext`.
+As an alternative to implementing an <<extensions-conditions, `ExecutionCondition`>>, a
+container or test may be enabled or disabled based on a _condition method_ configured via
+the `{EnabledIf}` and `{DisabledIf}` annotations. A condition method must have a `boolean`
+return type and may accept either no arguments or a single `ExtensionContext` argument.
+
+The following test class demonstrates how to configure a local method named
+`customCondition` via `@EnabledIf` and `@DisabledIf`.
 
 [source,java,indent=0]
 ----
@@ -483,7 +486,7 @@ include::{testDir}/example/ConditionalTestExecutionDemo.java[tags=user_guide_cus
 ----
 
 Alternatively, the condition method can be located outside the test class. In this case,
-it has to be referenced by its _fully qualified name_ as demonstrated in the following
+it must be referenced by its _fully qualified name_ as demonstrated in the following
 example.
 
 [source,java,indent=0]
@@ -493,9 +496,10 @@ package example;
 include::{testDir}/example/ExternalCustomConditionDemo.java[tags=user_guide_external_custom_condition]
 ----
 
-NOTE: When `{EnabledIf}` or `{DisabledIf}` is used at class level, the condition method
-must always be `static`. Condition methods located in external classes must also be
-`static`. In any other case, you can use both static or instance methods.
+NOTE: When `@EnabledIf` or `@DisabledIf` is used at class level, the condition method must
+always be `static`. Condition methods located in external classes must also be `static`.
+In any other case, you can use either static methods or instance methods as condition
+methods.
 
 
 [[writing-tests-tagging-and-filtering]]
@@ -1930,8 +1934,8 @@ The first method returns an invalid return type. Since an invalid return type ca
 detected at compile time, a `JUnitException` is thrown when it is detected at runtime.
 
 The next six methods are very simple examples that demonstrate the generation of a
-`Collection`, `Iterable`, `Iterator`, array, or `Stream` of `DynamicTest` instances. Most of
-these examples do not really exhibit dynamic behavior but merely demonstrate the
+`Collection`, `Iterable`, `Iterator`, array, or `Stream` of `DynamicTest` instances. Most
+of these examples do not really exhibit dynamic behavior but merely demonstrate the
 supported return types in principle. However, `dynamicTestsFromStream()` and
 `dynamicTestsFromIntStream()` demonstrate how easy it is to generate dynamic tests for a
 given set of strings or a range of input numbers.

From d018a95dd752e25ca390defdb866f7ad0023a6f6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 5 Jun 2022 16:08:52 +0200
Subject: [PATCH 0826/1433] Add @DisabledIf example for headless environments
 to User Guide

Closes #2933
---
 .../docs/asciidoc/user-guide/writing-tests.adoc  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index e946d5b9e01c..89f9ea408b3e 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -501,6 +501,22 @@ always be `static`. Condition methods located in external classes must also be `
 In any other case, you can use either static methods or instance methods as condition
 methods.
 
+[TIP]
+====
+It is often the case that you can use an existing static method in a utility class as a
+custom condition.
+
+For example, `java.awt.GraphicsEnvironment` provides a `public static boolean isHeadless()`
+method that can be used to determine if the current environment does not support a
+graphical display. Thus, if you have a test that depends on graphical support you can
+disable it when such support is unavailable as follows.
+
+[source,java,indent=0]
+----
+@DisabledIf(value = "java.awt.GraphicsEnvironment#isHeadless",
+	disabledReason = "headless environment")
+----
+====
 
 [[writing-tests-tagging-and-filtering]]
 === Tagging and Filtering

From 97c36126d0ec799dfdc6f7a935b56a2d5936b4af Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 5 Jun 2022 16:21:01 +0200
Subject: [PATCH 0827/1433] Fix comment

---
 .../platform-tooling-support-tests.gradle.kts                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 519e915e0720..56dd772c6069 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -67,7 +67,7 @@ val unzipMavenDistribution by tasks.registering(Copy::class) {
 }
 
 tasks.test {
-	// Opt-in via system property: '-Dplatform.tooling.support.tests.enabled=true'
+	// Opt-out via system property: '-Dplatform.tooling.support.tests.enabled=false'
 	enabled = System.getProperty("platform.tooling.support.tests.enabled")?.toBoolean() ?: true
 
 	// The following if-block is necessary since Gradle will otherwise

From 8fd353a464331ef7c3fee47a18abc66858226e66 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 5 Jun 2022 17:00:16 +0200
Subject: [PATCH 0828/1433] Fix ModularUserGuideTests regarding Byte Buddy

---
 .../tooling/support/tests/ModularUserGuideTests.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index bad31b526a13..1cfc95855574 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -50,6 +50,9 @@ class ModularUserGuideTests {
 			  requires org.junit.platform.runner;
 			  requires org.junit.platform.testkit;
 
+			  // Byte Buddy is used by AssertJ's soft assertions which are used by the Engine Test Kit
+			  requires net.bytebuddy;
+
 			  requires java.desktop;
 			  requires java.logging;
 			  requires java.scripting;
@@ -76,6 +79,8 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
 		var lib = Files.createDirectories(temp.resolve("lib"));
 		ThirdPartyJars.copy(lib, "junit", "junit");
 		ThirdPartyJars.copy(lib, "org.assertj", "assertj-core");
+		// Byte Buddy is used by AssertJ's soft assertions which are used by the Engine Test Kit
+		ThirdPartyJars.copy(lib, "net.bytebuddy", "byte-buddy");
 		ThirdPartyJars.copy(lib, "org.apiguardian", "apiguardian-api");
 		ThirdPartyJars.copy(lib, "org.hamcrest", "hamcrest");
 		ThirdPartyJars.copy(lib, "org.opentest4j", "opentest4j");
@@ -180,6 +185,7 @@ void runTestsFromUserGuideWithinModularBoundaries(@TempDir Path temp) throws Exc
 			"lib", //
 			"lib/apiguardian-api-.+\\.jar", //
 			"lib/assertj-core-.+\\.jar", //
+			"lib/byte-buddy-.+", //
 			"lib/hamcrest-.+\\.jar", //
 			"lib/junit-.+\\.jar", //
 			">> ALL JUNIT 5 JARS >>", //
@@ -193,4 +199,5 @@ void runTestsFromUserGuideWithinModularBoundaries(@TempDir Path temp) throws Exc
 
 		junit(temp, out, err);
 	}
+
 }

From 1ed17a2c6b6b8bed24b96aed57774c7acb50fc65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Jun 2022 12:34:25 +0000
Subject: [PATCH 0829/1433] Bump com.gradle.enterprise from 3.10.1 to 3.10.2

Bumps com.gradle.enterprise from 3.10.1 to 3.10.2.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0b16f8e6d91a..e1da531f2072 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.10.1"
+		id("com.gradle.enterprise") version "3.10.2"
 		id("com.gradle.enterprise.test-distribution") version "2.3.2" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7"
 		id("org.ajoberstar.git-publish") version "3.0.0"

From 18371c4d0a82ba67e82cb4f51d9f9594d8c51b30 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 9 Jun 2022 14:56:48 +0200
Subject: [PATCH 0830/1433] Update Test Distribution Gradle plugin to 2.3.3

Closes #2940.
---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index db3ac6619c15..95911f075d16 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3.2") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3.3") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e1da531f2072..b601b6885b19 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.10.2"
-		id("com.gradle.enterprise.test-distribution") version "2.3.2" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise.test-distribution") version "2.3.3" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"

From 8685a6a7dc7104cac43553a83da81b93e65b33b4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 9 Jun 2022 15:13:29 +0200
Subject: [PATCH 0831/1433] Update to BND 6.3.1 (#2935)

---
 buildSrc/build.gradle.kts | 2 +-
 gradle/libs.versions.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 95911f075d16..3dd979c64de6 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
 	implementation(kotlin("gradle-plugin"))
-	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.2.0")
+	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.3.1")
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8632ec25e5a8..6bfa0b03406f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apigu
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.23.1" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
-bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.2.0" }
+bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.3.1" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.132" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.1" }

From e42aa281a4f9ef82bbbddc0b43ca5a739de29e5f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 14 Jun 2022 09:22:49 +0200
Subject: [PATCH 0832/1433] Upgradle to 7.5-rc-2

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 59821 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   6 ++++++
 gradlew.bat                              |  14 ++++++++------
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 10197
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
V^VU-c2;R4Y5)%S~aP=SP{{YK41APDh

delta 9308
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c51a4acc9d2..cee7d8bb3995 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=ba761aa1563f5d893d1a6e7ddca48bbdc4385fdd527974e6472b873b7eae9a32
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337ff..a69d9cb6c206 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4e6..f127cfd49d40 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From b20dc3c39895bc010c5286593e8e60ec803ac511 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 14 Jun 2022 09:30:42 +0200
Subject: [PATCH 0833/1433] Revert "Upgradle to 7.5-rc-2"

This reverts commit e42aa281a4f9ef82bbbddc0b43ca5a739de29e5f.
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 60756 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   6 ------
 gradlew.bat                              |  14 ++++++--------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832f090a2944b7473328c07c9755baa3196..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 9308
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

delta 10197
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
V^VU-c2;R4Y5)%S~aP=SP{{YK41APDh

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cee7d8bb3995..5c51a4acc9d2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ba761aa1563f5d893d1a6e7ddca48bbdc4385fdd527974e6472b873b7eae9a32
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-2-bin.zip
+distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6c206..1b6c787337ff 100755
--- a/gradlew
+++ b/gradlew
@@ -205,12 +205,6 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd49d40..107acd32c4e6 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From 23910c857f1842a6b6172969b631450d7466738a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 14 Jun 2022 10:27:39 +0200
Subject: [PATCH 0834/1433] Add JRE.JAVA_20 (#2944)

---
 .github/workflows/cross-version.yml               |  2 +-
 .../release-notes/release-notes-5.9.0-M1.adoc     |  3 ++-
 gradle.properties                                 |  2 +-
 .../java/org/junit/jupiter/api/condition/JRE.java | 14 ++++++++++++--
 .../DisabledForJreRangeConditionTests.java        |  3 ++-
 .../DisabledForJreRangeIntegrationTests.java      |  3 ++-
 .../condition/DisabledOnJreConditionTests.java    | 12 +++++++++++-
 .../condition/DisabledOnJreIntegrationTests.java  | 12 ++++++++++--
 .../EnabledForJreRangeConditionTests.java         |  3 ++-
 .../EnabledForJreRangeIntegrationTests.java       |  5 +++--
 .../api/condition/EnabledOnJreConditionTests.java | 14 ++++++++++++--
 .../condition/EnabledOnJreIntegrationTests.java   | 15 +++++++++++++--
 12 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 96799f6b6420..fcea6360c17a 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -19,7 +19,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [18, 19]
+        jdk: [18, 19, 20]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
index 01b7fdca26d0..3be365ceacb8 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -99,7 +99,8 @@ on GitHub.
   `ExtensionContext`.
 * A subset of the invocations of parameterized or dynamic tests can now be selected via
   the new `IterationSelector` discovery selector when launching the JUnit Platform.
-* `JAVA_19` has been added to the `JRE` enum for use with JRE-based execution conditions.
+* `JAVA_19` and `JAVA_20` have been added to the `JRE` enum for use with JRE-based
+  execution conditions.
 * `@MethodSource` factory methods can now accept arguments resolved by registered
   `ParameterResolver` extensions.
 
diff --git a/gradle.properties b/gradle.properties
index 8e7c8cfe2f8e..85e59570b686 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19
+org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19,JDK20
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index 789b2cacfebf..6e7150ec56f3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -130,12 +130,20 @@ public enum JRE {
 	@API(status = STABLE, since = "5.9")
 	JAVA_19,
 
+	/**
+	 * Java 20.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	JAVA_20,
+
 	/**
 	 * A JRE version other than {@link #JAVA_8}, {@link #JAVA_9},
 	 * {@link #JAVA_10}, {@link #JAVA_11}, {@link #JAVA_12},
 	 * {@link #JAVA_13}, {@link #JAVA_14}, {@link #JAVA_15},
-	 * {@link #JAVA_16}, {@link #JAVA_17}, {@link #JAVA_18}, or
-	 * {@link #JAVA_19}.
+	 * {@link #JAVA_16}, {@link #JAVA_17}, {@link #JAVA_18},
+	 * {@link #JAVA_19}, or {@link #JAVA_20}.
 	 */
 	OTHER;
 
@@ -187,6 +195,8 @@ private static JRE determineCurrentVersion() {
 					return JAVA_18;
 				case 19:
 					return JAVA_19;
+				case 20:
+					return JAVA_20;
 				default:
 					return OTHER;
 			}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index 3097f02494c2..c4a4d8dc7275 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -113,7 +114,7 @@ void javaMin18() {
 	void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index 3fa788ba342c..d05c043ecf78 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
@@ -81,7 +82,7 @@ void javaMin18() {
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index 33539990a5c1..187f763fad94 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -186,6 +187,15 @@ void java19() {
 		assertDisabledOnCurrentJreIf(onJava19());
 	}
 
+	/**
+	 * @see DisabledOnJreIntegrationTests#java20()
+	 */
+	@Test
+	void java20() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(onJava20());
+	}
+
 	/**
 	 * @see DisabledOnJreIntegrationTests#other()
 	 */
@@ -193,7 +203,7 @@ void java19() {
 	void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 6145ed6b7acf..42c24ddbf5e1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -35,6 +36,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
+import static org.junit.jupiter.api.condition.JRE.JAVA_20;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -62,7 +64,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@DisabledOnJre(value = { JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17,
-			JAVA_18, JAVA_19, OTHER }, disabledReason = "Disabled on every JRE")
+			JAVA_18, JAVA_19, JAVA_20, OTHER }, disabledReason = "Disabled on every JRE")
 	void disabledOnAllJavaVersions() {
 		fail("should be disabled");
 	}
@@ -139,11 +141,17 @@ void java19() {
 		assertFalse(onJava19());
 	}
 
+	@Test
+	@DisabledOnJre(JAVA_20)
+	void java20() {
+		assertFalse(onJava20());
+	}
+
 	@Test
 	@DisabledOnJre(OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 48bfde0e2319..9d5e506c30f0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -112,7 +113,7 @@ void javaMin18() {
 	void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()));
 	}
 
 	private void assertEnabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index a702162de644..d3900f82899e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
@@ -76,7 +77,7 @@ void javaMax18() {
 	@Test
 	@EnabledForJreRange(min = JAVA_18)
 	void javaMin18() {
-		assertTrue(onJava18() || onJava19());
+		assertTrue(onJava18() || onJava19() || onJava20());
 		assertFalse(onJava17());
 	}
 
@@ -84,7 +85,7 @@ void javaMin18() {
 	@EnabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index e36104774295..e2f217f118d3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -177,7 +178,7 @@ void java18() {
 	}
 
 	/**
-	 * @see EnabledOnJreIntegrationTests#java18()
+	 * @see EnabledOnJreIntegrationTests#java19()
 	 */
 	@Test
 	void java19() {
@@ -185,6 +186,15 @@ void java19() {
 		assertEnabledOnCurrentJreIf(onJava19());
 	}
 
+	/**
+	 * @see EnabledOnJreIntegrationTests#java20()
+	 */
+	@Test
+	void java20() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(onJava20());
+	}
+
 	/**
 	 * @see EnabledOnJreIntegrationTests#other()
 	 */
@@ -192,7 +202,7 @@ void java19() {
 	void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19()));
+				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()));
 		assertCustomDisabledReasonIs("Disabled on almost every JRE");
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index 2efb829204da..7ba00a917fc4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
+import static org.junit.jupiter.api.condition.JRE.JAVA_20;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -51,7 +52,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17, JAVA_18,
-			JAVA_19, OTHER })
+			JAVA_19, JAVA_20, OTHER })
 	void enabledOnAllJavaVersions() {
 	}
 
@@ -127,11 +128,17 @@ void java19() {
 		assertTrue(onJava19());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_20)
+	void java20() {
+		assertTrue(onJava20());
+	}
+
 	@Test
 	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20());
 	}
 
 	static boolean onJava8() {
@@ -182,4 +189,8 @@ static boolean onJava19() {
 		return JAVA_VERSION.startsWith("19");
 	}
 
+	static boolean onJava20() {
+		return JAVA_VERSION.startsWith("20");
+	}
+
 }

From 5451651b16e5714bad4b89326696012b215c1ccd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 15 Jun 2022 11:39:00 +0200
Subject: [PATCH 0835/1433] Enable additional Javadoc DocLint checks and fix
 violations

---
 .../main/kotlin/java-library-conventions.gradle.kts  |  2 +-
 documentation/documentation.gradle.kts               |  2 +-
 .../test/java/example/DocumentationTestSuite.java    |  2 +-
 .../main/java/org/junit/jupiter/api/AfterAll.java    |  6 +++---
 .../main/java/org/junit/jupiter/api/AfterEach.java   |  6 +++---
 .../main/java/org/junit/jupiter/api/Assertions.java  |  8 ++++----
 .../main/java/org/junit/jupiter/api/BeforeAll.java   |  6 +++---
 .../main/java/org/junit/jupiter/api/BeforeEach.java  |  6 +++---
 .../java/org/junit/jupiter/api/ClassOrderer.java     |  4 ++--
 .../org/junit/jupiter/api/DisplayNameGenerator.java  |  2 +-
 .../java/org/junit/jupiter/api/MethodOrderer.java    |  4 ++--
 .../src/main/java/org/junit/jupiter/api/Nested.java  |  2 +-
 .../java/org/junit/jupiter/api/RepeatedTest.java     |  2 +-
 .../src/main/java/org/junit/jupiter/api/Tag.java     |  2 +-
 .../src/main/java/org/junit/jupiter/api/Test.java    |  2 +-
 .../java/org/junit/jupiter/api/TestClassOrder.java   |  2 +-
 .../main/java/org/junit/jupiter/api/TestFactory.java |  2 +-
 .../java/org/junit/jupiter/api/TestInstance.java     |  2 +-
 .../java/org/junit/jupiter/api/TestMethodOrder.java  |  2 +-
 .../java/org/junit/jupiter/api/TestTemplate.java     |  2 +-
 .../src/main/java/org/junit/jupiter/api/Timeout.java |  5 +++--
 .../jupiter/api/condition/DisabledForJreRange.java   |  2 +-
 .../org/junit/jupiter/api/condition/DisabledIf.java  |  2 +-
 .../junit/jupiter/api/condition/DisabledOnJre.java   |  2 +-
 .../junit/jupiter/api/condition/DisabledOnOs.java    |  2 +-
 .../jupiter/api/condition/EnabledForJreRange.java    |  2 +-
 .../org/junit/jupiter/api/condition/EnabledIf.java   |  2 +-
 .../junit/jupiter/api/condition/EnabledOnJre.java    |  2 +-
 .../org/junit/jupiter/api/condition/EnabledOnOs.java |  2 +-
 .../jupiter/api/extension/AfterAllCallback.java      |  4 ++--
 .../jupiter/api/extension/AfterEachCallback.java     |  4 ++--
 .../api/extension/AfterTestExecutionCallback.java    |  4 ++--
 .../jupiter/api/extension/BeforeAllCallback.java     |  4 ++--
 .../jupiter/api/extension/BeforeEachCallback.java    |  4 ++--
 .../api/extension/BeforeTestExecutionCallback.java   |  4 ++--
 .../jupiter/api/extension/ExecutionCondition.java    |  2 +-
 .../org/junit/jupiter/api/extension/ExtendWith.java  |  6 +++---
 .../org/junit/jupiter/api/extension/Extension.java   |  2 +-
 .../jupiter/api/extension/InvocationInterceptor.java |  4 ++--
 .../LifecycleMethodExecutionExceptionHandler.java    |  4 ++--
 .../jupiter/api/extension/ParameterResolver.java     |  2 +-
 .../jupiter/api/extension/RegisterExtension.java     | 12 ++++++------
 .../api/extension/TestExecutionExceptionHandler.java |  2 +-
 .../jupiter/api/extension/TestInstanceFactory.java   |  4 ++--
 .../api/extension/TestInstancePostProcessor.java     |  2 +-
 .../extension/TestInstancePreConstructCallback.java  |  2 +-
 .../extension/TestInstancePreDestroyCallback.java    |  2 +-
 .../TestTemplateInvocationContextProvider.java       |  2 +-
 .../org/junit/jupiter/api/extension/TestWatcher.java |  2 +-
 .../org/junit/jupiter/api/function/Executable.java   |  2 +-
 .../junit/jupiter/api/function/ThrowingConsumer.java |  2 +-
 .../junit/jupiter/api/function/ThrowingSupplier.java |  2 +-
 .../main/java/org/junit/jupiter/api/io/TempDir.java  |  8 ++++----
 .../org/junit/jupiter/api/parallel/Execution.java    |  2 +-
 .../engine/descriptor/ClassTestDescriptor.java       |  2 +-
 .../engine/descriptor/NestedClassTestDescriptor.java |  2 +-
 .../engine/descriptor/TestMethodTestDescriptor.java  |  2 +-
 .../java/org/junit/jupiter/JupiterTestSuite.java     |  2 +-
 .../JupiterMigrationSupportTestSuite.java            |  2 +-
 .../org/junit/jupiter/params/ParameterizedTest.java  | 10 +++++-----
 .../converter/FallbackStringToObjectConverter.java   |  2 +-
 .../junit/jupiter/params/provider/EmptySource.java   |  2 +-
 .../junit/jupiter/params/provider/MethodSource.java  |  3 ++-
 .../junit/jupiter/params/ParameterizedTestSuite.java |  2 +-
 .../junit/platform/commons/annotation/Testable.java  | 10 +++++-----
 .../junit/platform/commons/logging/package-info.java |  2 +-
 .../org/junit/platform/commons/package-info.java     |  2 +-
 .../junit/platform/commons/util/AnnotationUtils.java |  6 +++---
 .../platform/commons/util/BlacklistedExceptions.java |  4 ++--
 .../org/junit/platform/commons/util/ClassFilter.java |  2 +-
 .../platform/commons/util/ClassLoaderUtils.java      |  2 +-
 .../commons/util/ClassNamePatternFilterUtils.java    |  2 +-
 .../org/junit/platform/commons/util/ClassUtils.java  |  2 +-
 .../platform/commons/util/ClasspathScanner.java      |  2 +-
 .../junit/platform/commons/util/CollectionUtils.java |  2 +-
 .../junit/platform/commons/util/ExceptionUtils.java  |  2 +-
 .../junit/platform/commons/util/FunctionUtils.java   |  2 +-
 .../org/junit/platform/commons/util/ModuleUtils.java |  2 +-
 .../junit/platform/commons/util/PackageUtils.java    |  2 +-
 .../junit/platform/commons/util/Preconditions.java   |  2 +-
 .../junit/platform/commons/util/ReflectionUtils.java |  2 +-
 .../junit/platform/commons/util/RuntimeUtils.java    |  2 +-
 .../org/junit/platform/commons/util/StringUtils.java |  2 +-
 .../junit/platform/commons/util/ToStringBuilder.java |  2 +-
 .../commons/util/UnrecoverableExceptions.java        |  4 ++--
 .../junit/platform/commons/util/package-info.java    |  2 +-
 .../org/junit/platform/commons/util/ModuleUtils.java |  2 +-
 .../junit/platform/console/options/ConsoleUtils.java |  2 +-
 .../junit/platform/console/options/ConsoleUtils.java |  2 +-
 .../engine/discovery/DiscoverySelectors.java         |  3 +--
 .../junit/platform/launcher/core/LauncherConfig.java |  2 +-
 .../core/LauncherDiscoveryRequestBuilder.java        |  2 +-
 .../launcher/listeners/UniqueIdTrackingListener.java |  2 +-
 .../org/junit/platform/suite/api/ExcludeTags.java    |  4 ++--
 .../org/junit/platform/suite/api/IncludeTags.java    |  4 ++--
 .../junit/platform/suite/api/SuiteDisplayName.java   |  4 ++--
 .../junit/platform/suite/api/UseTechnicalNames.java  |  2 +-
 .../org/junit/platform/suite/api/package-info.java   |  4 ++--
 .../junit/platform/suite/commons/package-info.java   |  2 +-
 .../platform/suite/engine/SuiteTestDescriptor.java   |  2 +-
 .../vintage/engine/VintageTestEngineTestSuite.java   |  2 +-
 .../org/junit/platform/JUnitPlatformTestSuite.java   |  2 +-
 102 files changed, 153 insertions(+), 152 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 0870f6df880d..4d30a4313165 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -56,7 +56,7 @@ if (project in mavenizedProjects) {
 			encoding = "UTF-8"
 			locale = "en"
 			(this as StandardJavadocDocletOptions).apply {
-				addBooleanOption("Xdoclint:html,syntax", true)
+				addBooleanOption("Xdoclint:all,-missing,-reference", true)
 				addBooleanOption("html5", true)
 				addMultilineStringsOption("tag").value = listOf(
 						"apiNote:a:API Note:",
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index f91316ae8a88..a8a96bd98f1c 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -340,7 +340,7 @@ tasks {
 
 			this as StandardJavadocDocletOptions
 			splitIndex(true)
-			addBooleanOption("Xdoclint:all,-accessibility,-missing", true)
+			addBooleanOption("Xdoclint:all,-missing", true)
 			addBooleanOption("html5", true)
 			addMultilineStringsOption("tag").value = listOf(
 					"apiNote:a:API Note:",
diff --git a/documentation/src/test/java/example/DocumentationTestSuite.java b/documentation/src/test/java/example/DocumentationTestSuite.java
index 29280ff3e490..52b5659b29cd 100644
--- a/documentation/src/test/java/example/DocumentationTestSuite.java
+++ b/documentation/src/test/java/example/DocumentationTestSuite.java
@@ -16,7 +16,7 @@
 import org.junit.platform.suite.api.Suite;
 
 /**
- * <h3>Logging Configuration</h3>
+ * <h2>Logging Configuration</h2>
  *
  * <p>In order for our log4j2 configuration to be used in an IDE, you must
  * set the following system property before running any tests &mdash; for
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index 1863c1680122..d4059380111f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -27,7 +27,7 @@
  * <p>In contrast to {@link AfterEach @AfterEach} methods, {@code @AfterAll}
  * methods are only executed once for a given test class.
  *
- * <h3>Method Signatures</h3>
+ * <h2>Method Signatures</h2>
  *
  * <p>{@code @AfterAll} methods must have a {@code void} return type, must not
  * be {@code private}, and must be {@code static} by default. Consequently,
@@ -40,7 +40,7 @@
  * methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
- * <h3>Inheritance and Execution Order</h3>
+ * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @AfterAll} methods are inherited from superclasses as long as
  * they are not <em>hidden</em> or <em>overridden</em>. Furthermore,
@@ -73,7 +73,7 @@
  * dependencies between the {@code @BeforeAll} methods or between the
  * {@code @AfterAll} methods.
  *
- * <h3>Composition</h3>
+ * <h2>Composition</h2>
  *
  * <p>{@code @AfterAll} may be used as a meta-annotation in order to create
  * a custom <em>composed annotation</em> that inherits the semantics of
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
index bade31f41dd5..3595b3fab594 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
@@ -26,14 +26,14 @@
  * {@code @RepeatedTest}, {@code @ParameterizedTest}, {@code @TestFactory},
  * and {@code @TestTemplate} method in the current test class.
  *
- * <h3>Method Signatures</h3>
+ * <h2>Method Signatures</h2>
  *
  * <p>{@code @AfterEach} methods must have a {@code void} return type,
  * must not be {@code private}, and must not be {@code static}.
  * They may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
- * <h3>Inheritance and Execution Order</h3>
+ * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @AfterEach} methods are inherited from superclasses as long as
  * they are not overridden. Furthermore, {@code @AfterEach} methods from
@@ -65,7 +65,7 @@
  * no dependencies between the {@code @BeforeEach} methods or between the
  * {@code @AfterEach} methods.
  *
- * <h3>Composition</h3>
+ * <h2>Composition</h2>
  *
  * <p>{@code @AfterEach} may be used as a meta-annotation in order to create
  * a custom <em>composed annotation</em> that inherits the semantics of
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 4eb591d512ee..fa6585771612 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -34,7 +34,7 @@
  * <p>Unless otherwise noted, a <em>failed</em> assertion will throw an
  * {@link org.opentest4j.AssertionFailedError} or a subclass thereof.
  *
- * <h3>Object Equality</h3>
+ * <h2>Object Equality</h2>
  *
  * <p>Assertion methods comparing two objects for <em>equality</em>, such as the
  * {@code assertEquals(expected, actual)} and {@code assertNotEquals(unexpected, actual)}
@@ -50,13 +50,13 @@
  * {@code assertTrue(actual.equals(expected))}, {@code assertFalse(expected.equals(null))},
  * etc.
  *
- * <h3>Kotlin Support</h3>
+ * <h2>Kotlin Support</h2>
  *
  * <p>Additional <a href="https://kotlinlang.org/">Kotlin</a> assertions can be
  * found as <em>top-level functions</em> in the {@link org.junit.jupiter.api}
  * package.
  *
- * <h3>Preemptive Timeouts</h3>
+ * <h2>Preemptive Timeouts</h2>
  *
  * <p>The various {@code assertTimeoutPreemptively()} methods in this class
  * execute the provided {@code executable} or {@code supplier} in a different
@@ -77,7 +77,7 @@
  * <p>Similar side effects may be encountered with other frameworks that rely on
  * {@code ThreadLocal} storage.
  *
- * <h3>Extensibility</h3>
+ * <h2>Extensibility</h2>
  *
  * <p>Although it is technically possible to extend this class, extension is
  * strongly discouraged. The JUnit Team highly recommends that the methods
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index 95a20dc58b4d..5023334c614e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -27,7 +27,7 @@
  * <p>In contrast to {@link BeforeEach @BeforeEach} methods, {@code @BeforeAll}
  * methods are only executed once for a given test class.
  *
- * <h3>Method Signatures</h3>
+ * <h2>Method Signatures</h2>
  *
  * <p>{@code @BeforeAll} methods must have a {@code void} return type, must not
  * be {@code private}, and must be {@code static} by default. Consequently,
@@ -40,7 +40,7 @@
  * methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
- * <h3>Inheritance and Execution Order</h3>
+ * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @BeforeAll} methods are inherited from superclasses as long as
  * they are not <em>hidden</em> or <em>overridden</em>. Furthermore,
@@ -73,7 +73,7 @@
  * dependencies between the {@code @BeforeAll} methods or between the
  * {@code @AfterAll} methods.
  *
- * <h3>Composition</h3>
+ * <h2>Composition</h2>
  *
  * <p>{@code @BeforeAll} may be used as a meta-annotation in order to create
  * a custom <em>composed annotation</em> that inherits the semantics of
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
index 99d5dcf3bb30..eb8fa9aaf20e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
@@ -26,14 +26,14 @@
  * {@code @RepeatedTest}, {@code @ParameterizedTest}, {@code @TestFactory},
  * and {@code @TestTemplate} method in the current test class.
  *
- * <h3>Method Signatures</h3>
+ * <h2>Method Signatures</h2>
  *
  * <p>{@code @BeforeEach} methods must have a {@code void} return type,
  * must not be {@code private}, and must not be {@code static}.
  * They may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
- * <h3>Inheritance and Execution Order</h3>
+ * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @BeforeEach} methods are inherited from superclasses as long as
  * they are not overridden. Furthermore, {@code @BeforeEach} methods from
@@ -65,7 +65,7 @@
  * no dependencies between the {@code @BeforeEach} methods or between the
  * {@code @AfterEach} methods.
  *
- * <h3>Composition</h3>
+ * <h2>Composition</h2>
  *
  * <p>{@code @BeforeEach} may be used as a meta-annotation in order to create
  * a custom <em>composed annotation</em> that inherits the semantics of
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index e00a3640ed1e..0ebdbef03653 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -41,7 +41,7 @@
  * {@link Nested @Nested} test classes via the {@link TestClassOrder @TestClassOrder}
  * annotation.
  *
- * <h4>Built-in Implementations</h4>
+ * <h2>Built-in Implementations</h2>
  *
  * <p>JUnit Jupiter provides the following built-in {@code ClassOrderer}
  * implementations.
@@ -183,7 +183,7 @@ private static int getOrder(ClassDescriptor descriptor) {
 	/**
 	 * {@code ClassOrderer} that orders classes pseudo-randomly.
 	 *
-	 * <h4>Custom Seed</h4>
+	 * <h2>Custom Seed</h2>
 	 *
 	 * <p>By default, the random <em>seed</em> used for ordering classes is the
 	 * value returned by {@link System#nanoTime()} during static initialization
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 7b72eb642cfa..99f10b5c6b94 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -39,7 +39,7 @@
  * for a test class via the {@link TestClassOrder @DisplayNameGeneration}
  * annotation.
  *
- * <h4>Built-in Implementations</h4>
+ * <h2>Built-in Implementations</h2>
  * <ul>
  * <li>{@link Standard}</li>
  * <li>{@link Simple}</li>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 1997de0bba38..89950bf4dfa4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -39,7 +39,7 @@
  * parameter (see the User Guide for details) or <em>locally</em> for a test
  * class via the {@link TestMethodOrder @TestMethodOrder} annotation.
  *
- * <h4>Built-in Implementations</h4>
+ * <h2>Built-in Implementations</h2>
  *
  * <p>JUnit Jupiter provides the following built-in {@code MethodOrderer}
  * implementations.
@@ -246,7 +246,7 @@ private static int getOrder(MethodDescriptor descriptor) {
 	/**
 	 * {@code MethodOrderer} that orders methods pseudo-randomly.
 	 *
-	 * <h4>Custom Seed</h4>
+	 * <h2>Custom Seed</h2>
 	 *
 	 * <p>By default, the random <em>seed</em> used for ordering methods is the
 	 * value returned by {@link System#nanoTime()} during static initialization
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
index 47380b7404e7..cde1fb6b07ec 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
@@ -31,7 +31,7 @@
  * <p>{@code @Nested} test classes may be ordered via
  * {@link TestClassOrder @TestClassOrder} or a global {@link ClassOrderer}.
  *
- * <h3>Test Instance Lifecycle</h3>
+ * <h2>Test Instance Lifecycle</h2>
  *
  * <ul>
  * <li>A {@code @Nested} test class <em>can</em> be configured with its own
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
index 3b4c7ee96cc5..e66dae0bb5fa 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
@@ -43,7 +43,7 @@
  * create a custom <em>composed annotation</em> that inherits the semantics
  * of {@code @RepeatedTest}.
  *
- * <h3>Test Execution Order</h3>
+ * <h2>Test Execution Order</h2>
  *
  * <p>By default, test methods will be ordered using an algorithm that is
  * deterministic but intentionally nonobvious. This ensures that subsequent runs
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
index 9e1d8cfef746..bd6a232cae41 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
@@ -32,7 +32,7 @@
  * list of tags to be included in or excluded from the current test plan,
  * potentially dependent on the current environment.
  *
- * <h3>Syntax Rules for Tags</h3>
+ * <h2>Syntax Rules for Tags</h2>
  * <ul>
  * <li>A tag must not be blank.</li>
  * <li>A <em>trimmed</em> tag must not contain whitespace.</li>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
index e9a212371bab..2e3e53fec736 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
@@ -36,7 +36,7 @@
  * a custom <em>composed annotation</em> that inherits the semantics of
  * {@code @Test}.
  *
- * <h3>Test Execution Order</h3>
+ * <h2>Test Execution Order</h2>
  *
  * <p>By default, test methods will be ordered using an algorithm that is
  * deterministic but intentionally nonobvious. This ensures that subsequent runs
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
index 65659d8a60cc..a0e17823dd51 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
@@ -37,7 +37,7 @@
  * the User Guide for details. Note, however, that a {@code @TestClassOrder}
  * declaration always overrides a global {@code ClassOrderer}.
  *
- * <h4>Example Usage</h4>
+ * <h2>Example Usage</h2>
  *
  * <p>The following demonstrates how to guarantee that {@code @Nested} test classes
  * are executed in the order specified via the {@link Order @Order} annotation.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
index fd18f84f2785..45818bb6f142 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
@@ -43,7 +43,7 @@
  * resolved by {@link org.junit.jupiter.api.extension.ParameterResolver
  * ParameterResolvers}.
  *
- * <h3>Test Execution Order</h3>
+ * <h2>Test Execution Order</h2>
  *
  * <p>By default, test methods will be ordered using an algorithm that is
  * deterministic but intentionally nonobvious. This ensures that subsequent runs
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
index 39434b352b90..96ebcbc1ed29 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
@@ -37,7 +37,7 @@
  * configuration file (i.e., a file named {@code junit-platform.properties} in
  * the root of the class path). Consult the User Guide for further information.
  *
- * <h3>Use Cases</h3>
+ * <h2>Use Cases</h2>
  * <p>Setting the test instance lifecycle mode to {@link Lifecycle#PER_CLASS
  * PER_CLASS} enables the following features.
  * <ul>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
index ec9ef682b0b5..622ce030b182 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
@@ -41,7 +41,7 @@
  * the User Guide for details. Note, however, that a {@code @TestClassOrder}
  * declaration always overrides a global {@code ClassOrderer}.
  *
- * <h4>Example Usage</h4>
+ * <h2>Example Usage</h2>
  *
  * <p>The following demonstrates how to guarantee that test methods are executed
  * in the order specified via the {@link Order @Order} annotation.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
index 51c9d4dd24a4..d4daf9d8411d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
@@ -49,7 +49,7 @@
  * create a custom <em>composed annotation</em> that inherits the semantics
  * of {@code @TestTemplate}.
  *
- * <h3>Test Execution Order</h3>
+ * <h2>Test Execution Order</h2>
  *
  * <p>By default, test methods will be ordered using an algorithm that is
  * deterministic but intentionally nonobvious. This ensures that subsequent runs
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
index 1462f661fe74..6bab4ee4d68d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
@@ -35,7 +35,7 @@
  * {@link Test @Test}, {@link TestFactory @TestFactory}, or
  * {@link TestTemplate @TestTemplate}, but not to its lifecycle methods.
  *
- * <h3>Default Timeouts</h3>
+ * <h2>Default Timeouts</h2>
  *
  * <p>If this annotation is not present, no timeout will be used unless a
  * default timeout is defined via one of the following configuration parameters:
@@ -75,6 +75,7 @@
  * unit may be omitted. Specifying no unit is equivalent to using seconds.
  *
  * <table class="plain">
+ * <caption>Timeout configuration via configuration parameter vs. annotation</caption>
  * <tr><th> Value         </th><th> Equivalent annotation                             </th></tr>
  * <tr><td> {@code 42}    </td><td> {@code @Timeout(42)}                              </td></tr>
  * <tr><td> {@code 42 ns} </td><td> {@code @Timeout(value = 42, unit = NANOSECONDS)}  </td></tr>
@@ -86,7 +87,7 @@
  * <tr><td> {@code 42 d}  </td><td> {@code @Timeout(value = 42, unit = DAYS)}         </td></tr>
  * </table>
  *
- * <h3>Disabling Timeouts</h3>
+ * <h2>Disabling Timeouts</h2>
  *
  * <p>You may use the {@value #TIMEOUT_MODE_PROPERTY_NAME} configuration
  * parameter to explicitly enable or disable timeouts.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
index a5e9368b6625..5c8cf34c34a6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
@@ -38,7 +38,7 @@
  * custom <em>composed annotation</em> that inherits the semantics of this
  * annotation.
  *
- * <h4>Warning</h4>
+ * <h2>Warning</h2>
  *
  * <p>This annotation can only be declared once on an
  * {@link java.lang.reflect.AnnotatedElement AnnotatedElement} (i.e., test
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
index 5405f33d596c..8db9dd047a0a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
@@ -38,7 +38,7 @@
  * custom <em>composed annotation</em> that inherits the semantics of this
  * annotation.
  *
- * <h4>Warning</h4>
+ * <h2>Warning</h2>
  *
  * This annotation can only be declared once on an
  * {@link java.lang.reflect.AnnotatedElement AnnotatedElement} (i.e., test
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
index 884a5f106400..3fdf227cfa02 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
@@ -38,7 +38,7 @@
  * custom <em>composed annotation</em> that inherits the semantics of this
  * annotation.
  *
- * <h4>Warning</h4>
+ * <h2>Warning</h2>
  *
  * <p>As of JUnit Jupiter 5.1, this annotation can only be declared once on an
  * {@link java.lang.reflect.AnnotatedElement AnnotatedElement} (i.e., test
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index aedd2a928487..cd894771be7c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -38,7 +38,7 @@
  * custom <em>composed annotation</em> that inherits the semantics of this
  * annotation.
  *
- * <h4>Warning</h4>
+ * <h2>Warning</h2>
  *
  * <p>As of JUnit Jupiter 5.1, this annotation can only be declared once on an
  * {@link java.lang.reflect.AnnotatedElement AnnotatedElement} (i.e., test
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
index 93b4dafe450a..89f92c7ca758 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
@@ -38,7 +38,7 @@
  * custom <em>composed annotation</em> that inherits the semantics of this
  * annotation.
  *
- * <h4>Warning</h4>
+ * <h2>Warning</h2>
  *
  * <p>This annotation can only be declared once on an
  * {@link java.lang.reflect.AnnotatedElement AnnotatedElement} (i.e., test
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
index 1d14677ef1cd..1b7a84bd4f22 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
@@ -38,7 +38,7 @@
  * custom <em>composed annotation</em> that inherits the semantics of this
  * annotation.
  *
- * <h4>Warning</h4>
+ * <h2>Warning</h2>
  *
  * This annotation can only be declared once on an
  * {@link java.lang.reflect.AnnotatedElement AnnotatedElement} (i.e., test
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
index e71d54e2a18b..adca5ff552ac 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
@@ -38,7 +38,7 @@
  * custom <em>composed annotation</em> that inherits the semantics of this
  * annotation.
  *
- * <h4>Warning</h4>
+ * <h2>Warning</h2>
  *
  * <p>As of JUnit Jupiter 5.1, this annotation can only be declared once on an
  * {@link java.lang.reflect.AnnotatedElement AnnotatedElement} (i.e., test
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index 65ac44380698..691cc9ad6069 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -38,7 +38,7 @@
  * custom <em>composed annotation</em> that inherits the semantics of this
  * annotation.
  *
- * <h4>Warning</h4>
+ * <h2>Warning</h2>
  *
  * <p>As of JUnit Jupiter 5.1, this annotation can only be declared once on an
  * {@link java.lang.reflect.AnnotatedElement AnnotatedElement} (i.e., test
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
index 036be1b67533..aa6240fd3b4a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
@@ -24,12 +24,12 @@
  * <p>Extensions that implement {@code AfterAllCallback} must be registered at
  * the class level.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
- * <h3>Wrapping Behavior</h3>
+ * <h2>Wrapping Behavior</h2>
  *
  * <p>JUnit Jupiter guarantees <em>wrapping behavior</em> for multiple
  * registered extensions that implement lifecycle callbacks such as
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
index 80e6e5bb1b63..b07965047d78 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
@@ -27,12 +27,12 @@
  * {@link AfterTestExecutionCallback} instead of {@link BeforeEachCallback} and
  * {@link AfterEachCallback}.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
- * <h3>Wrapping Behavior</h3>
+ * <h2>Wrapping Behavior</h2>
  *
  * <p>JUnit Jupiter guarantees <em>wrapping behavior</em> for multiple
  * registered extensions that implement lifecycle callbacks such as
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
index 00faaf5745a4..f1be46050bcb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
@@ -28,12 +28,12 @@
  * {@link AfterEachCallback} instead of {@link BeforeTestExecutionCallback} and
  * {@link AfterTestExecutionCallback}.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
- * <h3>Wrapping Behavior</h3>
+ * <h2>Wrapping Behavior</h2>
  *
  * <p>JUnit Jupiter guarantees <em>wrapping behavior</em> for multiple
  * registered extensions that implement lifecycle callbacks such as
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
index 7d4054196a5e..fb5c86f98122 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
@@ -24,12 +24,12 @@
  * <p>Extensions that implement {@code BeforeAllCallback} must be registered at
  * the class level.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
- * <h3>Wrapping Behavior</h3>
+ * <h2>Wrapping Behavior</h2>
  *
  * <p>JUnit Jupiter guarantees <em>wrapping behavior</em> for multiple
  * registered extensions that implement lifecycle callbacks such as
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
index f10713638c33..b133ca23298c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
@@ -27,12 +27,12 @@
  * {@link AfterTestExecutionCallback} instead of {@link BeforeEachCallback} and
  * {@link AfterEachCallback}.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
- * <h3>Wrapping Behavior</h3>
+ * <h2>Wrapping Behavior</h2>
  *
  * <p>JUnit Jupiter guarantees <em>wrapping behavior</em> for multiple
  * registered extensions that implement lifecycle callbacks such as
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
index 5c2e22a1af4d..3dfcec8ac981 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
@@ -28,12 +28,12 @@
  * {@link AfterEachCallback} instead of {@link BeforeTestExecutionCallback} and
  * {@link AfterTestExecutionCallback}.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
  *
- * <h3>Wrapping Behavior</h3>
+ * <h2>Wrapping Behavior</h2>
  *
  * <p>JUnit Jupiter guarantees <em>wrapping behavior</em> for multiple
  * registered extensions that implement lifecycle callbacks such as
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
index db4c1eb05bea..ca7d725c8068 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
@@ -29,7 +29,7 @@
  * method-level lifecycle callbacks such as {@code @BeforeEach} methods,
  * {@code @AfterEach} methods, and corresponding extension APIs.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
index bb98e3b7b52a..b1819de7bf6c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
@@ -33,14 +33,14 @@
  *
  * <p>{@code @ExtendWith} fields may be either {@code static} or non-static.
  *
- * <h3>Inheritance</h3>
+ * <h2>Inheritance</h2>
  *
  * <p>{@code @ExtendWith} fields are inherited from superclasses as long as they
  * are not <em>hidden</em> or <em>overridden</em>. Furthermore, {@code @ExtendWith}
  * fields from superclasses will be registered before {@code @ExtendWith} fields
  * in subclasses.
  *
- * <h3>Registration Order</h3>
+ * <h2>Registration Order</h2>
  *
  * <p>When {@code @ExtendWith} is present on a test class, test interface, or
  * test method or on a parameter in a test method or lifecycle method, the
@@ -63,7 +63,7 @@
  * {@code @Order}, relative to {@code @ExtendWith} fields and other
  * {@code @RegisterExtension} fields.
  *
- * <h3>Supported Extension APIs</h3>
+ * <h2>Supported Extension APIs</h2>
  *
  * <ul>
  * <li>{@link ExecutionCondition}</li>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
index 5bb872887a47..600eb74b0eb7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
@@ -23,7 +23,7 @@
  * the {@link java.util.ServiceLoader} mechanism. For details on the latter,
  * consult the User Guide.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Extension implementations must have a <em>default constructor</em> if
  * registered via {@code @ExtendWith} or the {@code ServiceLoader}. When
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
index 8dafc9edab92..4771ecddcd4b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
@@ -30,7 +30,7 @@
  * {@code InvocationInterceptor} defines the API for {@link Extension
  * Extensions} that wish to intercept calls to test code.
  *
- * <h3>Invocation Contract</h3>
+ * <h2>Invocation Contract</h2>
  *
  * <p>Each method in this class must call {@link Invocation#proceed()} or {@link
  * Invocation#skip()} exactly once on the supplied invocation. Otherwise, the
@@ -39,7 +39,7 @@
  * <p>The default implementation calls {@link Invocation#proceed()
  * proceed()} on the supplied {@linkplain Invocation invocation}.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
index f84cf047a199..d19355e4ff78 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
@@ -28,12 +28,12 @@
  * to be handled. When registered at the test level, only exceptions thrown from
  * {@code @BeforeEach} or {@code @AfterEach} methods will be handled.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on constructor
  * requirements.
  *
- * <h3 id="implementation-guidelines">Implementation Guidelines</h3>
+ * <h2 id="implementation-guidelines">Implementation Guidelines</h2>
  *
  * <p>An implementation of an exception handler method defined in this API must
  * perform one of the following.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
index d2277df16c5f..f85beccfee34 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
@@ -30,7 +30,7 @@
  * an argument for the parameter must be resolved at runtime by a
  * {@code ParameterResolver}.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
index 27daf8aeef2f..6c0058d60a05 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
@@ -33,7 +33,7 @@
  * <p>{@code @RegisterExtension} fields must not be {@code null} (when evaluated)
  * but may be either {@code static} or non-static.
  *
- * <h3>Static Fields</h3>
+ * <h2>Static Fields</h2>
  *
  * <p>If a {@code @RegisterExtension} field is {@code static}, the extension
  * will be registered after extensions that are registered at the class level
@@ -45,7 +45,7 @@
  * {@link TestInstancePreDestroyCallback} as well as method-level extension APIs
  * such as {@link BeforeEachCallback}, etc.
  *
- * <h3>Instance Fields</h3>
+ * <h2>Instance Fields</h2>
  *
  * <p>If a {@code @RegisterExtension} field is non-static (i.e., an instance
  * field), the extension will be registered after the test class has been
@@ -63,14 +63,14 @@
  * semantics, an instance extension will be registered <em>before</em> extensions
  * that are registered at the method level via {@code @ExtendWith}.
  *
- * <h3>Inheritance</h3>
+ * <h2>Inheritance</h2>
  *
  * <p>{@code @RegisterExtension} fields are inherited from superclasses as long
  * as they are not <em>hidden</em> or <em>overridden</em>. Furthermore,
  * {@code @RegisterExtension} fields from superclasses will be registered before
  * {@code @RegisterExtension} fields in subclasses.
  *
- * <h3>Registration Order</h3>
+ * <h2>Registration Order</h2>
  *
  * <p>By default, if multiple extensions are registered via
  * {@code @RegisterExtension}, they will be ordered using an algorithm that is
@@ -85,7 +85,7 @@
  * {@code @Order}, relative to {@code @RegisterExtension} fields and other
  * {@code @ExtendWith} fields.
  *
- * <h3>Example Usage</h3>
+ * <h2>Example Usage</h2>
  *
  * <p>In the following example, the {@code docs} field in the test class is
  * initialized programmatically by supplying a custom {@code lookUpDocsDir()}
@@ -111,7 +111,7 @@
  *     }
  * }</pre>
  *
- * <h3>Supported Extension APIs</h3>
+ * <h2>Supported Extension APIs</h2>
  *
  * <ul>
  * <li>{@link ExecutionCondition}</li>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
index 4247060e6e52..a6bb2b638049 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
@@ -25,7 +25,7 @@
  * <p>Common use cases include swallowing an exception if it's anticipated
  * or rolling back a transaction in certain error scenarios.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
index 62691738618c..fc1eaf0411ab 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
@@ -25,7 +25,7 @@
  * <p>Extensions that implement {@code TestInstanceFactory} must be registered
  * at the class level.
  *
- * <h3>Warning</h3>
+ * <h2>Warning</h2>
  *
  * <p>Only one {@code TestInstanceFactory} is allowed to be registered for any
  * given test class. Registering multiple factories for any single test class
@@ -37,7 +37,7 @@
  * user's responsibility to ensure that only a single {@code TestInstanceFactory}
  * is registered for any specific test class.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
index 0b14d1b89269..78aeed9c4d48 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
@@ -25,7 +25,7 @@
  * <p>Extensions that implement {@code TestInstancePostProcessor} must be
  * registered at the class level.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
index 6fcc171dc54a..935318723a64 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
@@ -32,7 +32,7 @@
  * class level or at the method level. In the latter case, the extension will
  * only be applied to the test method for which it is registered.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on constructor
  * requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
index 365aca73a9b1..705c9055ab88 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
@@ -44,7 +44,7 @@
  * <p>A symmetric {@link TestInstancePreConstructCallback} extension defines a callback
  * hook that is invoked prior to any test class instances being constructed.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on constructor
  * requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
index 8235a980cdc5..469e47bdd4fd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
@@ -41,7 +41,7 @@
  * the test template method will be invoked using the contexts of all active
  * providers.
  *
- * <h3>Constructor Requirements</h3>
+ * <h2>Constructor Requirements</h2>
  *
  * <p>Consult the documentation in {@link Extension} for details on
  * constructor requirements.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
index b8bfc521aebc..e2efd5114c64 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
@@ -35,7 +35,7 @@
  *
  * <p>Extensions implementing this API can be registered at any level.
  *
- * <h3>Exception Handling</h3>
+ * <h2>Exception Handling</h2>
  *
  * <p>In contrast to other {@link Extension} APIs, a {@code TestWatcher} is not
  * permitted to adversely influence the execution of tests. Consequently, any
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
index 3680ff01fc2f..0e98ee489e6e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
@@ -22,7 +22,7 @@
  * <p>The {@code Executable} interface is similar to {@link java.lang.Runnable},
  * except that an {@code Executable} can throw any kind of exception.
  *
- * <h4>Rationale for throwing {@code Throwable} instead of {@code Exception}</h4>
+ * <h2>Rationale for throwing {@code Throwable} instead of {@code Exception}</h2>
  *
  * <p>Although Java applications typically throw exceptions that are instances
  * of {@link java.lang.Exception}, {@link java.lang.RuntimeException},
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
index 2f104ed06fd7..bf937eb35583 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
@@ -23,7 +23,7 @@
  * {@link java.util.function.Consumer}, except that a {@code ThrowingConsumer}
  * can throw any kind of exception, including checked exceptions.
  *
- * <h4>Rationale for throwing {@code Throwable} instead of {@code Exception}</h4>
+ * <h2>Rationale for throwing {@code Throwable} instead of {@code Exception}</h2>
  *
  * <p>Although Java applications typically throw exceptions that are instances
  * of {@link java.lang.Exception}, {@link java.lang.RuntimeException},
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
index 0548fa431875..8c35fcae626a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
@@ -23,7 +23,7 @@
  * {@link java.util.function.Supplier}, except that a {@code ThrowingSupplier}
  * can throw any kind of exception, including checked exceptions.
  *
- * <h4>Rationale for throwing {@code Throwable} instead of {@code Exception}</h4>
+ * <h2>Rationale for throwing {@code Throwable} instead of {@code Exception}</h2>
  *
  * <p>Although Java applications typically throw exceptions that are instances
  * of {@link Exception}, {@link RuntimeException},
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 278448079dc1..762c8d6defc9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -35,7 +35,7 @@
  * parameters. Please use field injection instead by annotating an instance
  * field with {@code @TempDir}.
  *
- * <h3>Creation</h3>
+ * <h2>Creation</h2>
  *
  * <p>The temporary directory is only created if a field in a test class or a
  * parameter in a lifecycle method or test method is annotated with
@@ -46,7 +46,7 @@
  * addition, a {@code ParameterResolutionException} will be thrown for a
  * constructor parameter annotated with {@code @TempDir}.
  *
- * <h3>Scope</h3>
+ * <h2>Scope</h2>
  *
  * <p>By default, a separate temporary directory is created for every
  * declaration of the {@code @TempDir} annotation. If you want to share a
@@ -54,7 +54,7 @@
  * annotation on a {@code static} field or on a parameter of a
  * {@link org.junit.jupiter.api.BeforeAll @BeforeAll} method.
  *
- * <h4>Old behavior</h4>
+ * <h3>Old behavior</h3>
  *
  * <p>You can revert to the old behavior of using a single temporary directory
  * by setting the {@value #SCOPE_PROPERTY_NAME} configuration parameter to
@@ -69,7 +69,7 @@
  * {@link org.junit.jupiter.api.AfterEach @AfterEach} methods &mdash; each test
  * will use its own temporary directory.
  *
- * <h3>Clean Up</h3>
+ * <h2>Clean Up</h2>
  *
  * <p>By default, when the end of the scope of a temporary directory is reached,
  * &mdash; when the test method or class has finished execution &mdash; JUnit will
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index c7bce4ccf4ca..ad67864faf9b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -27,7 +27,7 @@
  * <p>Since JUnit Jupiter 5.4, this annotation is {@linkplain Inherited inherited}
  * within class hierarchies.
  *
- * <h3>Default Execution Mode</h3>
+ * <h2>Default Execution Mode</h2>
  *
  * <p>If this annotation is not present, {@link ExecutionMode#SAME_THREAD} is
  * used unless a default execution mode is defined via one of the following
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
index e12549f9f679..c294c99c7639 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
@@ -34,7 +34,7 @@
 /**
  * {@link TestDescriptor} for tests based on Java classes.
  *
- * <h3>Default Display Names</h3>
+ * <h2>Default Display Names</h2>
  *
  * <p>The default display name for a top-level or nested static test class is
  * the fully qualified name of the class with the package name and leading dot
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
index dea65c85efb8..4cb82ea99614 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
@@ -35,7 +35,7 @@
 /**
  * {@link TestDescriptor} for tests based on nested (but not static) Java classes.
  *
- * <h3>Default Display Names</h3>
+ * <h2>Default Display Names</h2>
  *
  * <p>The default display name for a non-static nested test class is the simple
  * name of the class.
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
index 19daed95ccb5..253e093e579e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -50,7 +50,7 @@
 /**
  * {@link TestDescriptor} for {@link org.junit.jupiter.api.Test @Test} methods.
  *
- * <h3>Default Display Names</h3>
+ * <h2>Default Display Names</h2>
  *
  * <p>The default display name for a test method is the name of the method
  * concatenated with a comma-separated list of parameter types in parentheses.
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
index f68e03974f64..b8021fb769d5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
@@ -19,7 +19,7 @@
  * Test suite for the JUnit Jupiter programming model, extension model, and
  * {@code TestEngine} implementation.
  *
- * <h3>Logging Configuration</h3>
+ * <h2>Logging Configuration</h2>
  *
  * <p>In order for our log4j2 configuration to be used in an IDE, you must
  * set the following system property before running any tests &mdash; for
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
index 425691004ca3..35513bee0a74 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
@@ -18,7 +18,7 @@
 /**
  * Test suite for JUnit Jupiter migration support.
  *
- * <h3>Logging Configuration</h3>
+ * <h2>Logging Configuration</h2>
  *
  * <p>In order for our log4j2 configuration to be used in an IDE, you must
  * set the following system property before running any tests &mdash; for
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index cab91dcfed62..eeb0bdb7b31d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -29,7 +29,7 @@
  *
  * <p>Such methods must not be {@code private} or {@code static}.
  *
- * <h3>Argument Providers and Sources</h3>
+ * <h2>Argument Providers and Sources</h2>
  *
  * <p>{@code @ParameterizedTest} methods must specify at least one
  * {@link org.junit.jupiter.params.provider.ArgumentsProvider ArgumentsProvider}
@@ -40,7 +40,7 @@
  * {@link org.junit.jupiter.params.provider.Arguments Arguments} that will be
  * used to invoke the parameterized test method.
  *
- * <h3>Formal Parameter List</h3>
+ * <h2>Formal Parameter List</h2>
  *
  * <p>A {@code @ParameterizedTest} method may declare additional parameters at
  * the end of the method's parameter list to be resolved by other
@@ -64,7 +64,7 @@
  * or any parameter annotated with
  * {@link org.junit.jupiter.params.aggregator.AggregateWith @AggregateWith}.
  *
- * <h3>Argument Conversion</h3>
+ * <h2>Argument Conversion</h2>
  *
  * <p>Method parameters may be annotated with
  * {@link org.junit.jupiter.params.converter.ConvertWith @ConvertWith}
@@ -74,13 +74,13 @@
  * conversion to the target type automatically (see the User Guide for further
  * details).
  *
- * <h3>Composed Annotations</h3>
+ * <h2>Composed Annotations</h2>
  *
  * <p>{@code @ParameterizedTest} may also be used as a meta-annotation in order
  * to create a custom <em>composed annotation</em> that inherits the semantics
  * of {@code @ParameterizedTest}.
  *
- * <h3>Test Execution Order</h3>
+ * <h2>Test Execution Order</h2>
  *
  * <p>By default, test methods will be ordered using an algorithm that is
  * deterministic but intentionally nonobvious. This ensures that subsequent runs
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
index b4c6a2ebebf1..67d20dd30e9b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
@@ -35,7 +35,7 @@
  * {@link String} to a given target type by invoking a static factory method
  * or factory constructor defined in the target type.
  *
- * <h3>Search Algorithm</h3>
+ * <h2>Search Algorithm</h2>
  *
  * <ol>
  * <li>Search for a single, non-private static factory method in the target
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
index 3b4ed8c72662..65b2ad69fd51 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
@@ -24,7 +24,7 @@
  * {@code @EmptySource} is an {@link ArgumentsSource} which provides a single
  * <em>empty</em> argument to the annotated {@code @ParameterizedTest} method.
  *
- * <h3>Supported Parameter Types</h3>
+ * <h2>Supported Parameter Types</h2>
  *
  * <p>This argument source will only provide an empty argument for the following
  * method parameter types. Subtypes of the supported types are not supported.
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index e8e280987d21..26d70432d85b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -62,12 +62,13 @@
  * {@code @ParameterizedTest} methods for those factories accept individual
  * {@code int[][]} and {@code Object[][]} arguments, respectively.
  *
- * <h3>Examples</h3>
+ * <h2>Examples</h2>
  *
  * <p>The following table displays compatible method signatures for parameterized
  * test methods and their corresponding factory methods.
  *
  * <table class="plain">
+ * <caption>Compatible method signatures and factory methods</caption>
  * <tr><th>{@code @ParameterizedTest} method</th><th>Factory method</th></tr>
  * <tr><td>{@code void test(int)}</td><td>{@code static int[] factory()}</td></tr>
  * <tr><td>{@code void test(int)}</td><td>{@code static IntStream factory()}</td></tr>
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
index 14a75944d260..43f8145e64af 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
@@ -18,7 +18,7 @@
 /**
  * Test suite for JUnit Jupiter parameterized test support.
  *
- * <h3>Logging Configuration</h3>
+ * <h2>Logging Configuration</h2>
  *
  * <p>In order for our log4j2 configuration to be used in an IDE, you must
  * set the following system property before running any tests &mdash; for
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
index 6527e27a16ec..c1b8781a09d5 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
@@ -27,14 +27,14 @@
  * (typically a method, field, or class) can be executed by a {@code TestEngine}
  * as a test or test container on the JUnit Platform.
  *
- * <h3>Motivation for {@code @Testable}</h3>
+ * <h2>Motivation for {@code @Testable}</h2>
  * <p>Some clients of the JUnit Platform, notably IDEs such as IntelliJ IDEA,
  * operate only on sources for test discovery. Thus, they cannot use the full
  * runtime discovery mechanism of the JUnit Platform since it relies on compiled
  * classes. {@code @Testable} therefore serves as an alternative mechanism for
  * IDEs to discover potential tests by analyzing the source code only.
  *
- * <h3>Common Use Cases</h3>
+ * <h2>Common Use Cases</h2>
  * <p>{@code @Testable} will typically be used as a meta-annotation in order to
  * create a custom <em>composed annotation</em> that inherits the semantics
  * of {@code @Testable}. For example, the {@code @Test} and {@code @TestFactory}
@@ -45,7 +45,7 @@
  * can be annotated with {@code @Testable}. Note that {@code @Testable} is an
  * {@link Inherited @Inherited} annotation.
  *
- * <h3>Requirements for IDEs and Tooling Vendors</h3>
+ * <h2>Requirements for IDEs and Tooling Vendors</h2>
  * <ul>
  * <li>If a top-level class, static nested class, or inner class is not
  * annotated or meta-annotated with {@code @Testable} but contains a method or field
@@ -58,7 +58,7 @@
  * source code.</li>
  * </ul>
  *
- * <h3>Restrictions for TestEngine Implementations</h3>
+ * <h2>Restrictions for TestEngine Implementations</h2>
  * <p>A {@code TestEngine} must <strong>not</strong> in any way perform
  * <em>discovery</em> based on the presence of {@code @Testable}. In terms of
  * discovery, the presence of {@code @Testable} should only be meaningful to
@@ -66,7 +66,7 @@
  * is therefore required to discover tests based on information specific to
  * that test engine (e.g., annotations specific to that test engine).
  *
- * <h3>Supported Target Elements</h3>
+ * <h2>Supported Target Elements</h2>
  * <p>Since JUnit Platform version 1.7, {@code @Testable} may target any
  * declaration {@linkplain java.lang.annotation.ElementType element type}. This
  * includes the aforementioned method, field, and class elements.
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/package-info.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/package-info.java
index afab81b79b11..75260c34a99a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/package-info.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/package-info.java
@@ -1,7 +1,7 @@
 /**
  * Internal <em>logging</em> package.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These classes are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/package-info.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/package-info.java
index 40eb39c74c59..66e1cf2aa51c 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/package-info.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/package-info.java
@@ -1,7 +1,7 @@
 /**
  * Common APIs and support utilities for the JUnit Platform.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>Any API annotated with {@code @API(status = INTERNAL)} is intended solely
  * for usage within the JUnit framework itself. <strong>Any usage of internal
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
index 925323957b32..316474484a66 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
@@ -43,7 +43,7 @@
 /**
  * Collection of utilities for working with {@linkplain Annotation annotations}.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
@@ -393,13 +393,13 @@ private static boolean isRepeatableAnnotationContainer(Class<? extends Annotatio
 	 * annotations directly on a {@link Parameter} will fail for inner class
 	 * constructors.
 	 *
-	 * <h4>Bug in {@code javac} on JDK versions prior to JDK 9</h4>
+	 * <h3>Bug in {@code javac} on JDK versions prior to JDK 9</h3>
 	 *
 	 * <p>The parameter annotations array in the compiled byte code for the user's
 	 * class excludes an entry for the implicit <em>enclosing instance</em>
 	 * parameter for an inner class constructor.
 	 *
-	 * <h4>Workaround</h4>
+	 * <h3>Workaround</h3>
 	 *
 	 * <p>This method provides a workaround for this off-by-one error by helping
 	 * JUnit maintainers and extension authors to access annotations on the preceding
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
index aab36bdbfcaf..a84c333a00ba 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
@@ -20,12 +20,12 @@
  * <p><em>Unrecoverable</em> exceptions are those that should always terminate
  * test plan execution immediately.
  *
- * <h4>Currently Unrecoverable Exceptions</h4>
+ * <h2>Currently Unrecoverable Exceptions</h2>
  * <ul>
  * <li>{@link OutOfMemoryError}</li>
  * </ul>
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
index 4d61af86ce52..e5961ee8b869 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
@@ -19,7 +19,7 @@
 /**
  * Class-related predicate used by reflection utilities.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
index 5ac748179c12..5c3f332fe372 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
@@ -21,7 +21,7 @@
 /**
  * Collection of utilities for working with {@linkplain ClassLoader} and associated tasks.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
index 2bd67c97c0d9..1e1778c1b044 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
@@ -25,7 +25,7 @@
 /**
  * Collection of utilities for creating filters based on class names.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
index 926b15ecc90d..c9d5c7cb5050 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
@@ -21,7 +21,7 @@
 /**
  * Collection of utilities for working with {@link Class classes}.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
index 3d9caf3d0967..9c943195d90d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
@@ -39,7 +39,7 @@
 import org.junit.platform.commons.logging.LoggerFactory;
 
 /**
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index c4efc4bead05..c8f677b1b325 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -37,7 +37,7 @@
 /**
  * Collection of utilities for working with {@link Collection Collections}.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
index eb11a0bf9612..5bffb9b903eb 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -20,7 +20,7 @@
 /**
  * Collection of utilities for working with exceptions.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
index 54bb9b84728a..6720886c39dd 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
@@ -21,7 +21,7 @@
  * Collection of utilities for working with {@link Function Functions},
  * {@link Predicate Predicates}, etc.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
index 0ac0e15be670..e875a3e55644 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
@@ -26,7 +26,7 @@
  * Collection of utilities for working with {@code java.lang.Module}
  * and friends.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
index f1f6dc82db40..971bdf14ab81 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
@@ -25,7 +25,7 @@
 /**
  * Collection of utilities for working with {@linkplain Package packages}.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
index bc44be614591..58ee0a70470e 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
@@ -27,7 +27,7 @@
  * <p>Each method in this class throws a {@link PreconditionViolationException}
  * if the precondition is violated.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index ad97349c4aa6..042a0d5593cf 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -61,7 +61,7 @@
 /**
  * Collection of utilities for working with the Java reflection APIs.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
index ed32faa1310e..13f0ccfeeb11 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
@@ -21,7 +21,7 @@
  * Collection of utilities for working with {@link Runtime},
  * {@link java.lang.management.RuntimeMXBean}, etc.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
index a0cd2d3b1de7..c853d73c4349 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
@@ -22,7 +22,7 @@
  * Collection of utilities for working with {@link String Strings},
  * {@link CharSequence CharSequences}, etc.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
index b05980d5ab2b..130714a2e182 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
@@ -22,7 +22,7 @@
  * Simple builder for generating strings in custom implementations of
  * {@link Object#toString toString()}.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
index 4ffe1ae76735..77eac841ad75 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
@@ -20,12 +20,12 @@
  * <p><em>Unrecoverable</em> exceptions are those that should always terminate
  * test plan execution immediately.
  *
- * <h4>Currently Unrecoverable Exceptions</h4>
+ * <h2>Currently Unrecoverable Exceptions</h2>
  * <ul>
  * <li>{@link OutOfMemoryError}</li>
  * </ul>
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/package-info.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/package-info.java
index e6edb41c98cc..119940686c89 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/package-info.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/package-info.java
@@ -1,7 +1,7 @@
 /**
  * Internal common utilities for JUnit.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
index a4a5da92d857..40255dc28c73 100644
--- a/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
+++ b/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
@@ -40,7 +40,7 @@
  * Collection of utilities for working with {@code java.lang.Module}
  * and friends.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
index 85e243500c7b..80d58d813730 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
@@ -20,7 +20,7 @@
  * Collection of utilities for working with {@code java.io.Console}
  * and friends.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java b/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
index 01d2a6b0cac1..8daae7d7ed68 100644
--- a/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
+++ b/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
@@ -21,7 +21,7 @@
  * Collection of utilities for working with {@code java.io.Console}
  * and friends.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>These utilities are intended solely for usage within the JUnit framework
  * itself. <strong>Any usage by external parties is not supported.</strong>
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 8e5d43b358f4..729dca58e6f7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -414,9 +414,8 @@ public static ClassSelector selectClass(String className) {
 	 * <em>source code syntax</em> (e.g., {@code int[][]}, {@code java.lang.String[]},
 	 * etc.).
 	 *
-	 * <h4>Examples</h4>
-	 *
 	 * <table class="plain">
+	 * <caption>Examples</caption>
 	 * <tr><th>Method</th><th>Fully Qualified Method Name</th></tr>
 	 * <tr><td>{@code java.lang.String.chars()}</td><td>{@code java.lang.String#chars}</td></tr>
 	 * <tr><td>{@code java.lang.String.chars()}</td><td>{@code java.lang.String#chars()}</td></tr>
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
index 1fe710e52420..efc23d181baa 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
@@ -30,7 +30,7 @@
  * {@code LauncherConfig} defines the configuration API for creating
  * {@link Launcher} instances via the {@link LauncherFactory}.
  *
- * <h4>Example</h4>
+ * <h2>Example</h2>
  *
  * <pre class="code">
  * LauncherConfig launcherConfig = LauncherConfig.builder()
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index b34c364e9a47..42e23f00ab6f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -38,7 +38,7 @@
  * The {@code LauncherDiscoveryRequestBuilder} provides a light-weight DSL for
  * generating a {@link LauncherDiscoveryRequest}.
  *
- * <h4>Example</h4>
+ * <h2>Example</h2>
  *
  * <pre class="code">
  * import static org.junit.platform.engine.discovery.DiscoverySelectors.*;
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index 256a1dd1df88..f644ec3711d0 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -49,7 +49,7 @@
  * order to rerun the exact same tests from a standard JVM test run within a
  * native image.
  *
- * <h3>Configuration and Defaults</h3>
+ * <h2>Configuration and Defaults</h2>
  *
  * <p>The {@code OUTPUT_DIR} is the directory in which this listener generates
  * the output file. The exact path of the generated file is
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
index 3cb8605e360f..b40367d400dc 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
@@ -26,7 +26,7 @@
  * {@linkplain #value tags or tag expressions} to be excluded when running a
  * test suite on the JUnit Platform.
  *
- * <h3>Tag Expressions</h3>
+ * <h2>Tag Expressions</h2>
  *
  * <p>Tag expressions are boolean expressions with the following allowed
  * operators: {@code !} (not), {@code &} (and) and {@code |} (or). Parentheses
@@ -34,7 +34,7 @@
  * <a href="https://junit.org/junit5/docs/current/user-guide/#running-tests-tag-expressions">JUnit 5 User Guide</a>
  * for usage examples.
  *
- * <h3>Syntax Rules for Tags</h3>
+ * <h2>Syntax Rules for Tags</h2>
  * <ul>
  * <li>A tag must not be blank.</li>
  * <li>A trimmed tag must not contain whitespace.</li>
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
index 3f533426bf2e..2e79ccd4afa1 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
@@ -26,7 +26,7 @@
  * {@linkplain #value tags or tag expressions} to be included when running a
  * test suite on the JUnit Platform.
  *
- * <h3>Tag Expressions</h3>
+ * <h2>Tag Expressions</h2>
  *
  * <p>Tag expressions are boolean expressions with the following allowed
  * operators: {@code !} (not), {@code &} (and) and {@code |} (or). Parentheses
@@ -34,7 +34,7 @@
  * <a href="https://junit.org/junit5/docs/current/user-guide/#running-tests-tag-expressions">JUnit 5 User Guide</a>
  * for usage examples.
  *
- * <h3>Syntax Rules for Tags</h3>
+ * <h2>Syntax Rules for Tags</h2>
  * <ul>
  * <li>A tag must not be blank.</li>
  * <li>A trimmed tag must not contain whitespace.</li>
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
index 2d271ec46c69..c474a1dff93e 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
@@ -28,11 +28,11 @@
  * <p>Display names are typically used for test reporting in IDEs and build
  * tools and may contain spaces, special characters, and even emoji.
  *
- * <h4>JUnit 4 Suite Support</h4>
+ * <h2>JUnit 4 Suite Support</h2>
  * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
  * {@code @RunWith(JUnitPlatform.class)}.
  *
- * <h4>JUnit 5 Suite Support</h4>
+ * <h2>JUnit 5 Suite Support</h2>
  * <p>Test suites can be run on the JUnit Platform in a JUnit 5 environment via
  * the {@code junit-platform-suite-engine} module.
  *
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
index 00d3350d2e0d..561b8dc17772 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
@@ -37,7 +37,7 @@
  * <p>Note that the presence of {@code @UseTechnicalNames} overrides any custom
  * display name configured for the suite via {@link SuiteDisplayName @SuiteDisplayName}.
  *
- * <h4>JUnit 4 Suite Support</h4>
+ * <h2>JUnit 4 Suite Support</h2>
  * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
  * {@code @RunWith(JUnitPlatform.class)}.
  *
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/package-info.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/package-info.java
index 27a247baea60..f5cd9bc50756 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/package-info.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/package-info.java
@@ -1,11 +1,11 @@
 /**
  * Annotations for configuring a <em>test suite</em> on the JUnit Platform.
  *
- * <h4>JUnit 4 Suite Support</h4>
+ * <h2>JUnit 4 Suite Support</h2>
  * <p>Test suites can be run on the JUnit Platform in a JUnit 4 environment via
  * {@code @RunWith(JUnitPlatform.class)} with the {@code junit-platform-runner}.
  *
- * <h4>JUnit 5 Suite Support</h4>
+ * <h2>JUnit 5 Suite Support</h2>
  * <p>Test suites can be run on the JUnit Platform in a JUnit 5 environment via
  * {@link Suite @Suite} with the {@code junit-platform-suite-engine}.
  */
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
index f087359b5768..3eeb635013aa 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/package-info.java
@@ -1,7 +1,7 @@
 /**
  * Common support utilities for executing test suites on the JUnit Platform.
  *
- * <h3>DISCLAIMER</h3>
+ * <h2>DISCLAIMER</h2>
  *
  * <p>Any API annotated with {@code @API(status = INTERNAL)} is intended solely
  * for usage within the JUnit framework itself. <strong>Any usage of internal
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index b5ab2dcbe5d6..aa7c354f9a87 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -40,7 +40,7 @@
 /**
  * {@link TestDescriptor} for tests based on the JUnit Platform Suite API.
  *
- * <h3>Default Display Names</h3>
+ * <h2>Default Display Names</h2>
  *
  * <p>The default display name is the simple name of the class.
  *
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
index 072edd5fd357..76a12af05ea2 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
@@ -18,7 +18,7 @@
 /**
  * Test suite for the {@link VintageTestEngine}.
  *
- * <h3>Logging Configuration</h3>
+ * <h2>Logging Configuration</h2>
  *
  * <p>In order for our log4j2 configuration to be used in an IDE, you must
  * set the following system property before running any tests &mdash; for
diff --git a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
index c15557853a6d..2921f47053a5 100644
--- a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
@@ -18,7 +18,7 @@
 /**
  * Test suite for the JUnit Platform.
  *
- * <h3>Logging Configuration</h3>
+ * <h2>Logging Configuration</h2>
  *
  * <p>In order for our log4j2 configuration to be used in an IDE, you must
  * set the following system property before running any tests &mdash; for

From 25d5f9e3196a2b13727818a5414a77f401982c48 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 15 Jun 2022 11:39:31 +0200
Subject: [PATCH 0836/1433] Disable old lint warnings on JDK 19 and later

---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 4d30a4313165..66e07ffbe00d 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -57,6 +57,7 @@ if (project in mavenizedProjects) {
 			locale = "en"
 			(this as StandardJavadocDocletOptions).apply {
 				addBooleanOption("Xdoclint:all,-missing,-reference", true)
+				addBooleanOption("XD-Xlint:none", true)
 				addBooleanOption("html5", true)
 				addMultilineStringsOption("tag").value = listOf(
 						"apiNote:a:API Note:",

From fdfdcb1085c746257ce8ec7cec4185757c56bbb8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 17 Jun 2022 13:15:46 +0200
Subject: [PATCH 0837/1433] Polishing

---
 .../java/org/junit/platform/testkit/engine/EngineTestKit.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index 407a25ccd4d5..a41f358c4455 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -256,10 +256,9 @@ private static void executeDirectly(TestEngine testEngine, EngineDiscoveryReques
 
 	private static void executeUsingLauncherOrchestration(TestEngine testEngine,
 			LauncherDiscoveryRequest discoveryRequest, EngineExecutionListener listener) {
-		TestDescriptor engineTestDescriptor;
 		LauncherDiscoveryResult discoveryResult = new EngineDiscoveryOrchestrator(singleton(testEngine),
 			emptySet()).discover(discoveryRequest, EXECUTION);
-		engineTestDescriptor = discoveryResult.getEngineTestDescriptor(testEngine);
+		TestDescriptor engineTestDescriptor = discoveryResult.getEngineTestDescriptor(testEngine);
 		Preconditions.notNull(engineTestDescriptor, "TestEngine did not yield a TestDescriptor");
 		new EngineExecutionOrchestrator().execute(discoveryResult, listener);
 	}

From 3818dcee6f3d5b91b769343ad05e1363abfea6a9 Mon Sep 17 00:00:00 2001
From: stoyanK7 <stoyank127@gmail.com>
Date: Tue, 14 Jun 2022 21:36:06 +0200
Subject: [PATCH 0838/1433] Document config params for parallel test execution
 in Jupiter

Closes #2946
---
 .../asciidoc/user-guide/writing-tests.adoc    | 54 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 89f9ea408b3e..5bb979a9c830 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2294,6 +2294,59 @@ behind the scenes may spawn additional threads to ensure execution continues wit
 sufficient parallelism. Thus, if you require such guarantees in a test class, please use
 your own means of controlling concurrency.
 
+===== Relevant properties
+
+The below table lists out relevant parallel execution properties in `junit-platform.properties`.
+[cols="1,2,1,1"]
+|===
+|Property |Description |Acceptable values |Default value
+
+| ```junit.jupiter.execution.parallel.enabled```
+|Enable parallel test exection
+a|
+* `true`
+* `false`
+|```false```
+
+| ```junit.jupiter.execution.parallel.mode.default```
+|Set execution mode of the nodes in the test tree
+a|
+* `concurrent`
+* `same_thread`
+|```same_thread```
+
+| ```junit.jupiter.execution.parallel.mode.classes.default```
+|Set execution mode of the top-level classes
+a|
+* `concurrent`
+* `same_thread`
+|```same_thread```
+
+| ```junit.jupiter.execution.parallel.config.strategy```
+|Set execution strategy for desired parallelism and maximum pool size
+a|
+* `dynamic`
+* `fixed`
+* `custom`
+| ```dynamic```
+
+| ```junit.jupiter.execution.parallel.config.dynamic.factor```
+|Set the factor to be multiplied with the number of available processors/cores to determine the desired parallelism for the dynamic configuration strategy
+|Must be a decimal number
+| ```1```
+
+
+| ```junit.jupiter.execution.parallel.config.fixed.parallelism```
+|Set the desired parallelism for the fixed configuration strategy
+|Must be an integer
+|No default value
+
+| ```junit.jupiter.execution.parallel.config.custom.class```
+|Specify the fully qualified class name of the ```ParallelExecutionConfigurationStrategy``` to be used for the custom configuration strategy
+|for instance ```org.example.CustomStrategy```
+|No default value
+|===
+
 [[writing-tests-parallel-execution-synchronization]]
 ==== Synchronization
 
@@ -2333,7 +2386,6 @@ to the same shared resource is running.
 include::{testDir}/example/SharedResourcesDemo.java[tags=user_guide]
 ----
 
-
 [[writing-tests-built-in-extensions]]
 === Built-in Extensions
 

From 2f0a5024e7917c47fac3cfc9d4629ef05470cec8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 17 Jun 2022 14:22:01 +0200
Subject: [PATCH 0839/1433] Polish contribution

See #2946
---
 .../asciidoc/user-guide/writing-tests.adoc    | 71 ++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 5bb979a9c830..96bd6f4bdac9 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2294,57 +2294,61 @@ behind the scenes may spawn additional threads to ensure execution continues wit
 sufficient parallelism. Thus, if you require such guarantees in a test class, please use
 your own means of controlling concurrency.
 
+[[writing-tests-parallel-execution-config-properties]]
 ===== Relevant properties
 
-The below table lists out relevant parallel execution properties in `junit-platform.properties`.
-[cols="1,2,1,1"]
+The following table lists relevant properties for configuring parallel execution. See
+<<running-tests-config-params>> for details on how to set such properties.
+
+[cols="d,d,a,d"]
 |===
-|Property |Description |Acceptable values |Default value
+|Property |Description |Supported Values |Default Value
 
 | ```junit.jupiter.execution.parallel.enabled```
-|Enable parallel test exection
-a|
-* `true`
-* `false`
-|```false```
+| Enable parallel test execution
+|
+  * `true`
+  * `false`
+| ```false```
 
 | ```junit.jupiter.execution.parallel.mode.default```
-|Set execution mode of the nodes in the test tree
-a|
-* `concurrent`
-* `same_thread`
-|```same_thread```
+| Default execution mode of nodes in the test tree
+|
+  * `concurrent`
+  * `same_thread`
+| ```same_thread```
 
 | ```junit.jupiter.execution.parallel.mode.classes.default```
-|Set execution mode of the top-level classes
-a|
-* `concurrent`
-* `same_thread`
-|```same_thread```
+| Default execution mode of top-level classes
+|
+  * `concurrent`
+  * `same_thread`
+| ```same_thread```
 
 | ```junit.jupiter.execution.parallel.config.strategy```
-|Set execution strategy for desired parallelism and maximum pool size
-a|
-* `dynamic`
-* `fixed`
-* `custom`
+| Execution strategy for desired parallelism and maximum pool size
+|
+  * `dynamic`
+  * `fixed`
+  * `custom`
 | ```dynamic```
 
 | ```junit.jupiter.execution.parallel.config.dynamic.factor```
-|Set the factor to be multiplied with the number of available processors/cores to determine the desired parallelism for the dynamic configuration strategy
-|Must be a decimal number
-| ```1```
-
+| Factor to be multiplied by the number of available processors/cores to determine the
+  desired parallelism for the ```dynamic``` configuration strategy
+| a positive decimal number
+| ```1.0```
 
 | ```junit.jupiter.execution.parallel.config.fixed.parallelism```
-|Set the desired parallelism for the fixed configuration strategy
-|Must be an integer
-|No default value
+| Desired parallelism for the ```fixed``` configuration strategy
+| a positive integer
+| no default value
 
 | ```junit.jupiter.execution.parallel.config.custom.class```
-|Specify the fully qualified class name of the ```ParallelExecutionConfigurationStrategy``` to be used for the custom configuration strategy
-|for instance ```org.example.CustomStrategy```
-|No default value
+| Fully qualified class name of the _ParallelExecutionConfigurationStrategy_ to be
+  used for the ```custom``` configuration strategy
+| for example, _org.example.CustomStrategy_
+| no default value
 |===
 
 [[writing-tests-parallel-execution-synchronization]]
@@ -2386,6 +2390,7 @@ to the same shared resource is running.
 include::{testDir}/example/SharedResourcesDemo.java[tags=user_guide]
 ----
 
+
 [[writing-tests-built-in-extensions]]
 === Built-in Extensions
 

From 1f6f5a71282ff6452954f08308c34623970e80d3 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Sat, 18 Jun 2022 16:25:32 +0200
Subject: [PATCH 0840/1433] Add a public factory method to instantiate
 ExecutionRequest (#2943)

This commit adds a public factory method to instantiate `ExecutionRequest`, for external usage.

Closes #2912.
---
 .../release-notes/release-notes-5.9.0-M2.adoc   |  2 +-
 .../junit/platform/engine/ExecutionRequest.java | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
index e231baaaf9a4..48ef7f57f83f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
@@ -23,7 +23,7 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* New public factory method to instantiate an `ExecutionRequest`.
 
 
 [[release-notes-5.9.0-M2-junit-jupiter]]
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
index 6a8b91f1a262..385e40714a41 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
@@ -44,6 +44,23 @@ public ExecutionRequest(TestDescriptor rootTestDescriptor, EngineExecutionListen
 		this.configurationParameters = configurationParameters;
 	}
 
+	/**
+	 * Factory for creating an execution request.
+	 *
+	 * @param rootTestDescriptor the engine's root {@link TestDescriptor}
+	 * @param engineExecutionListener the {@link EngineExecutionListener} to be
+	 * notified of test execution events
+	 * @param configurationParameters {@link ConfigurationParameters} that the
+	 * engine may use to influence test execution
+	 * @return a new {@code ExecutionRequest}; never {@code null}
+	 * @since 1.9
+	 */
+	@API(status = STABLE, since = "1.9")
+	public static ExecutionRequest create(TestDescriptor rootTestDescriptor,
+			EngineExecutionListener engineExecutionListener, ConfigurationParameters configurationParameters) {
+		return new ExecutionRequest(rootTestDescriptor, engineExecutionListener, configurationParameters);
+	}
+
 	/**
 	 * Get the root {@link TestDescriptor} of the engine that processes this
 	 * request.

From 035eac999d506c61e1ccfe70f19960a9312e8e7c Mon Sep 17 00:00:00 2001
From: Thomas Zub <thomas.zub@outlook.de>
Date: Sun, 19 Jun 2022 15:12:33 +0200
Subject: [PATCH 0841/1433] Track already visited pairs of Iterables to avoid
 stack overflow

Resolves #2915.

Co-authored-by: Thomas Zub <thomas.zub@codecentric.de>
Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../jupiter/api/AssertIterableEquals.java     | 88 +++++++++++++++++--
 .../AssertIterableEqualsAssertionsTests.java  | 15 ++++
 2 files changed, 94 insertions(+), 9 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
index a5f1641dfd03..c0edc0825335 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
@@ -19,6 +19,8 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
@@ -49,6 +51,11 @@ static void assertIterableEquals(Iterable<?> expected, Iterable<?> actual, Suppl
 
 	private static void assertIterableEquals(Iterable<?> expected, Iterable<?> actual, Deque<Integer> indexes,
 			Object messageOrSupplier) {
+		assertIterableEquals(expected, actual, indexes, messageOrSupplier, new LinkedHashMap<>());
+	}
+
+	private static void assertIterableEquals(Iterable<?> expected, Iterable<?> actual, Deque<Integer> indexes,
+			Object messageOrSupplier, Map<Pair, Status> investigatedElements) {
 
 		if (expected == actual) {
 			return;
@@ -60,28 +67,61 @@ private static void assertIterableEquals(Iterable<?> expected, Iterable<?> actua
 
 		int processed = 0;
 		while (expectedIterator.hasNext() && actualIterator.hasNext()) {
-			processed++;
 			Object expectedElement = expectedIterator.next();
 			Object actualElement = actualIterator.next();
 
-			if (Objects.equals(expectedElement, actualElement)) {
-				continue;
-			}
+			indexes.addLast(processed);
+
+			assertIterableElementsEqual(expectedElement, actualElement, indexes, messageOrSupplier,
+				investigatedElements);
 
-			indexes.addLast(processed - 1);
-			assertIterableElementsEqual(expectedElement, actualElement, indexes, messageOrSupplier);
 			indexes.removeLast();
+			processed++;
 		}
 
 		assertIteratorsAreEmpty(expectedIterator, actualIterator, processed, indexes, messageOrSupplier);
 	}
 
 	private static void assertIterableElementsEqual(Object expected, Object actual, Deque<Integer> indexes,
-			Object messageOrSupplier) {
+			Object messageOrSupplier, Map<Pair, Status> investigatedElements) {
+
+		// If both are equal, we don't need to check recursively.
+		if (Objects.equals(expected, actual)) {
+			return;
+		}
+
+		// If both are iterables, we need to check whether they contain the same elements.
 		if (expected instanceof Iterable && actual instanceof Iterable) {
-			assertIterableEquals((Iterable<?>) expected, (Iterable<?>) actual, indexes, messageOrSupplier);
+
+			Pair pair = new Pair(expected, actual);
+
+			// Before comparing their elements, we check whether we have already checked this pair.
+			Status status = investigatedElements.get(pair);
+
+			// If we've already determined that both contain the same elements, we don't need to check them again.
+			if (status == Status.CONTAIN_SAME_ELEMENTS) {
+				return;
+			}
+
+			// If the pair is already under investigation, we fail to avoid infinite recursion.
+			if (status == Status.UNDER_INVESTIGATION) {
+				indexes.removeLast();
+				failIterablesNotEqual(expected, actual, indexes, messageOrSupplier);
+			}
+
+			// Otherwise, we put the pair under investigation and recurse.
+			investigatedElements.put(pair, Status.UNDER_INVESTIGATION);
+
+			assertIterableEquals((Iterable<?>) expected, (Iterable<?>) actual, indexes, messageOrSupplier,
+				investigatedElements);
+
+			// If we reach this point, we've checked that the two iterables contain the same elements so we store this information
+			// in case we come across the same pair again.
+			investigatedElements.put(pair, Status.CONTAIN_SAME_ELEMENTS);
 		}
-		else if (!Objects.equals(expected, actual)) {
+
+		// Otherwise, they are neither equal nor iterables, so we fail.
+		else {
 			assertIterablesNotNull(expected, actual, indexes, messageOrSupplier);
 			failIterablesNotEqual(expected, actual, indexes, messageOrSupplier);
 		}
@@ -131,4 +171,34 @@ private static void failIterablesNotEqual(Object expected, Object actual, Deque<
 		fail(prefix + message);
 	}
 
+	private final static class Pair {
+		private final Object left;
+		private final Object right;
+
+		public Pair(Object left, Object right) {
+			this.left = left;
+			this.right = right;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+			Pair that = (Pair) o;
+			return Objects.equals(this.left, that.left) //
+					&& Objects.equals(this.right, that.right);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(left, right);
+		}
+	}
+
+	private enum Status {
+		UNDER_INVESTIGATION, CONTAIN_SAME_ELEMENTS
+	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
index a68d86643869..dc3d10b3e250 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
@@ -83,6 +83,7 @@ void assertIterableEqualsNestedIterablesWithIntegers() {
 			listOf(listOf(1), listOf(2), listOf(listOf(3, listOf(4)))));
 		assertIterableEquals(setOf(setOf(1), setOf(2), setOf(setOf(3, setOf(4)))),
 			setOf(setOf(1), setOf(2), setOf(setOf(3, setOf(4)))));
+		assertIterableEquals(listOf(listOf(1), listOf(listOf(1))), setOf(setOf(1), setOf(setOf(1))));
 	}
 
 	@Test
@@ -460,4 +461,18 @@ void assertIterableEqualsThrowsStackOverflowErrorForInterlockedRecursiveStructur
 		assertThrows(StackOverflowError.class, () -> assertIterableEquals(expected, actual));
 	}
 
+	@Test
+	// https://github.com/junit-team/junit5/issues/2915
+	void assertIterableEqualsWithDifferentListOfPath() {
+		try {
+			var expected = listOf(Path.of("1").resolve("2"));
+			var actual = listOf(Path.of("1").resolve("3"));
+			assertIterableEquals(expected, actual);
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageEquals(ex, "iterable contents differ at index [0][1], expected: <2> but was: <3>");
+		}
+	}
+
 }

From 67f7a3b799d8e64bee661b53f1e3b874fcff261d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 19 Jun 2022 15:57:51 +0200
Subject: [PATCH 0842/1433] Add "Tool Support" section

Resolves #2826.
---
 .../user-guide/advanced-topics/launcher-api.adoc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
index 4508ad3b5824..3daf564d1728 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
@@ -97,7 +97,21 @@ Registered implementations of `{LauncherSessionListener}` are notified when a
 and closed (when no more tests will be discovered or executed). They can be registered
 programmatically via the `{LauncherConfig}` that is passed to the `{LauncherFactory}`, or
 they can be discovered at runtime via Java's `{ServiceLoader}` mechanism and automatically
-registered with `LauncherSession` (unless automatic registration is disabled.)
+registered with `{LauncherSession}` (unless automatic registration is disabled.)
+
+[[launcher-api-launcher-session-listeners-tool-support]]
+===== Tool Support
+
+The following build tools and IDEs are known to provide full support for `{LauncherSession}`:
+
+* Gradle 4.6 and later
+* Maven Surefire/Failsafe 3.0.0-M6 and later
+* IntelliJ IDEA 2017.3 and later
+
+Other tools might also work but have not been tested explicitly.
+
+[[launcher-api-launcher-session-listeners-tool-example-usage]]
+===== Example Usage
 
 A `{LauncherSessionListener}` is well suited for implementing once-per-JVM setup/teardown
 behavior since it's called before the first and after the last test in a launcher session,

From a2bf57697ba84ef16b4fa7bb3cc3194ddc6cbcf3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 19 Jun 2022 16:04:41 +0200
Subject: [PATCH 0843/1433] Only retry failing tests on CI by default

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 5d52df05fe9c..cb70596eb53d 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -15,11 +15,11 @@ tasks.withType<Test>().configureEach {
 		events = setOf(FAILED)
 		exceptionFormat = FULL
 	}
+	val isCiServer = System.getenv("CI") != null
 	retry {
-		maxRetries.set(providers.gradleProperty("retries").map(String::toInt).orElse(2))
+		maxRetries.set(providers.gradleProperty("retries").map(String::toInt).orElse(if (isCiServer) 2 else 0))
 	}
 	distribution {
-		val isCiServer = System.getenv("CI") != null
 		enabled.convention(providers.gradleProperty("enableTestDistribution")
 			.map(String::toBoolean)
 			.map { enabled -> enabled && (!isCiServer || System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNotBlank()) }

From a8b7b54638fcb552d6ebcca068f6e721e2a656ef Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Fri, 17 Jun 2022 16:14:40 +0200
Subject: [PATCH 0844/1433] Fix support for absolute path entries on Windows

Prior this commit absolute paths on Windows starting with a drive
letter like `C:\foo.jar` were always split into two path entries:
  - `C`
  - `foo.jar`

This commit replaces the too simplistic `split = ";|:"` option
conversion with a custom converter for classpath entries taking
current platform's path separator character into account.

Fixes #2905
---
 .../release-notes/release-notes-5.9.0-M2.adoc |  2 +-
 .../console/options/AvailableOptions.java     | 10 ++++---
 .../options/ClasspathEntriesConverter.java    | 27 +++++++++++++++++++
 .../PicocliCommandLineOptionsParserTests.java | 11 ++++++++
 4 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/ClasspathEntriesConverter.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
index 48ef7f57f83f..61e4d5f2820f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
@@ -15,7 +15,7 @@ on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Absolute path entries are now supported in JUnit's Platform Console Launcher on Windows.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index 5eb9cd9438b9..97a33b4bec98 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -97,14 +97,15 @@ private void applyTo(CommandLineOptions result) {
 	static class SelectorOptions {
 
 		@Option(names = { "--scan-classpath",
-				"--scan-class-path" }, split = ";|:", paramLabel = "PATH", arity = "0..1", description = "Scan all directories on the classpath or explicit classpath roots. " //
+				"--scan-class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "0..1", description = "Scan all directories on the classpath or explicit classpath roots. " //
 						+ "Without arguments, only directories on the system classpath as well as additional classpath " //
 						+ "entries supplied via -" + CP_OPTION + " (directories and JAR files) are scanned. " //
 						+ "Explicit classpath roots that are not on the classpath will be silently ignored. " //
 						+ "This option can be repeated.")
 		private List<Path> selectedClasspathEntries = new ArrayList<>();
 
-		@Option(names = { "-scan-class-path", "-scan-classpath" }, split = ";|:", arity = "0..1", hidden = true)
+		@Option(names = { "-scan-class-path",
+				"-scan-classpath" }, converter = ClasspathEntriesConverter.class, arity = "0..1", hidden = true)
 		private List<Path> selectedClasspathEntries2 = new ArrayList<>();
 
 		@Option(names = "--scan-modules", description = "EXPERIMENTAL: Scan all resolved modules for test discovery.")
@@ -282,11 +283,12 @@ private void applyTo(CommandLineOptions result) {
 	static class RuntimeConfigurationOptions {
 
 		@Option(names = { "-" + CP_OPTION, "--classpath",
-				"--class-path" }, split = ";|:", paramLabel = "PATH", arity = "1", description = "Provide additional classpath entries "
+				"--class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "1", description = "Provide additional classpath entries "
 						+ "-- for example, for adding engines and their dependencies. This option can be repeated.")
 		private List<Path> additionalClasspathEntries = new ArrayList<>();
 
-		@Option(names = { "--cp", "-classpath", "-class-path" }, split = ";|:", hidden = true)
+		@Option(names = { "--cp", "-classpath",
+				"-class-path" }, converter = ClasspathEntriesConverter.class, hidden = true)
 		private List<Path> additionalClasspathEntries2 = new ArrayList<>();
 
 		// Implementation note: the @Option annotation is on a setter method to allow validation.
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ClasspathEntriesConverter.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ClasspathEntriesConverter.java
new file mode 100644
index 000000000000..754321708dd9
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ClasspathEntriesConverter.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import picocli.CommandLine;
+
+class ClasspathEntriesConverter implements CommandLine.ITypeConverter<List<Path>> {
+	@Override
+	public List<Path> convert(String value) {
+		return Stream.of(value.split(File.pathSeparator)).map(Paths::get).collect(Collectors.toList());
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index 3e7c0d2425bb..fc88a9cd28d7 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -43,6 +43,8 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.platform.commons.JUnitException;
@@ -292,6 +294,15 @@ void parseValidAdditionalClasspathEntries(ArgsType type) {
 		// @formatter:on
 	}
 
+	@Test
+	@EnabledOnOs(OS.WINDOWS)
+	void parseValidAndAbsoluteAdditionalClasspathEntries() throws Exception {
+		ArgsType type = ArgsType.args;
+		assertEquals(List.of(Path.of("C:\\a.jar")), type.parseArgLine("-cp C:\\a.jar").getAdditionalClasspathEntries());
+		assertEquals(List.of(Path.of("C:\\foo.jar"), Path.of("D:\\bar.jar")),
+			type.parseArgLine("-cp C:\\foo.jar;D:\\bar.jar").getAdditionalClasspathEntries());
+	}
+
 	@Test
 	void parseInvalidAdditionalClasspathEntries() {
 		assertOptionWithMissingRequiredArgumentThrowsException("-cp", "--classpath", "--class-path");

From e26bbb3518cfe9d1a0adf3ae52226cab1b3b62d7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 21 Jun 2022 20:04:30 +0200
Subject: [PATCH 0845/1433] Clarify comment

---
 .../main/java/org/junit/jupiter/api/AssertIterableEquals.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
index c0edc0825335..dd581398d4d6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
@@ -103,7 +103,7 @@ private static void assertIterableElementsEqual(Object expected, Object actual,
 				return;
 			}
 
-			// If the pair is already under investigation, we fail to avoid infinite recursion.
+			// If the pair is already under investigation, we fail in order to avoid infinite recursion.
 			if (status == Status.UNDER_INVESTIGATION) {
 				indexes.removeLast();
 				failIterablesNotEqual(expected, actual, indexes, messageOrSupplier);

From 7c0ffb3cb8342e51129eb7e69a4c5f620be82d7e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 21 Jun 2022 20:08:40 +0200
Subject: [PATCH 0846/1433] Consistently link only first occurrence within
 subsection to Javadoc

---
 .../asciidoc/user-guide/advanced-topics/launcher-api.adoc   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
index 3daf564d1728..2c8b25e7c9c2 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
@@ -97,12 +97,12 @@ Registered implementations of `{LauncherSessionListener}` are notified when a
 and closed (when no more tests will be discovered or executed). They can be registered
 programmatically via the `{LauncherConfig}` that is passed to the `{LauncherFactory}`, or
 they can be discovered at runtime via Java's `{ServiceLoader}` mechanism and automatically
-registered with `{LauncherSession}` (unless automatic registration is disabled.)
+registered with `LauncherSession` (unless automatic registration is disabled.)
 
 [[launcher-api-launcher-session-listeners-tool-support]]
 ===== Tool Support
 
-The following build tools and IDEs are known to provide full support for `{LauncherSession}`:
+The following build tools and IDEs are known to provide full support for `LauncherSession`:
 
 * Gradle 4.6 and later
 * Maven Surefire/Failsafe 3.0.0-M6 and later
@@ -113,7 +113,7 @@ Other tools might also work but have not been tested explicitly.
 [[launcher-api-launcher-session-listeners-tool-example-usage]]
 ===== Example Usage
 
-A `{LauncherSessionListener}` is well suited for implementing once-per-JVM setup/teardown
+A `LauncherSessionListener` is well suited for implementing once-per-JVM setup/teardown
 behavior since it's called before the first and after the last test in a launcher session,
 respectively. The scope of a launcher session depends on the used IDE or build tool but
 usually corresponds to the lifecycle of the test JVM. A custom listener that starts an

From a941caec42bec8c3c68b0a90a8ac766bb4c56ba7 Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Wed, 22 Jun 2022 14:06:48 +0200
Subject: [PATCH 0847/1433] Fix potential exponential backtracking in
 ReflectionUtils array parsing

This commit removes superfluous repetition of the outer group, turning
the inner group into a "non-capturing atomic group" and applying a
"possessive quantifier"", thus disallowing backtracking into the
grouped pattern.

Fixes #2950
---
 .../java/org/junit/platform/commons/util/ReflectionUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 042a0d5593cf..d1924747f795 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -115,7 +115,7 @@ public enum HierarchyTraversalMode {
 	private static final Pattern VM_INTERNAL_PRIMITIVE_ARRAY_PATTERN = Pattern.compile("^(\\[+)(\\[[ZBCDFIJS])$");
 
 	// Pattern: "java.lang.String[]", "int[]", "int[][][][]", etc.
-	private static final Pattern SOURCE_CODE_SYNTAX_ARRAY_PATTERN = Pattern.compile("^([^\\[\\]]+)((\\[\\])+)+$");
+	private static final Pattern SOURCE_CODE_SYNTAX_ARRAY_PATTERN = Pattern.compile("^([^\\[\\]]+)((?>\\[\\])++)$");
 
 	private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
 

From 29505973edeea92bd2a7e5b5923177cec0dfe0db Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 22 Jun 2022 15:43:37 +0200
Subject: [PATCH 0848/1433] Polish contribution

See #2950, #2953
---
 .../release-notes/release-notes-5.9.0-M2.adoc  |  2 ++
 .../platform/commons/util/ReflectionUtils.java |  2 ++
 .../commons/util/ReflectionUtilsTests.java     | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
index 61e4d5f2820f..e15725f62200 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
@@ -16,6 +16,8 @@ on GitHub.
 ==== Bug Fixes
 
 * Absolute path entries are now supported in JUnit's Platform Console Launcher on Windows.
+* Attempts to load a `Class` for an invalid class name representing an extremely large
+  multidimensional array now fail within a reasonable amount of time.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index d1924747f795..654bef9a68e0 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -115,6 +115,8 @@ public enum HierarchyTraversalMode {
 	private static final Pattern VM_INTERNAL_PRIMITIVE_ARRAY_PATTERN = Pattern.compile("^(\\[+)(\\[[ZBCDFIJS])$");
 
 	// Pattern: "java.lang.String[]", "int[]", "int[][][][]", etc.
+	// ?> => non-capturing atomic group
+	// ++ => possessive quantifier
 	private static final Pattern SOURCE_CODE_SYNTAX_ARRAY_PATTERN = Pattern.compile("^([^\\[\\]]+)((?>\\[\\])++)$");
 
 	private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 99a20b084089..041a459c61ad 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -10,7 +10,9 @@
 
 package org.junit.platform.commons.util;
 
+import static java.time.Duration.ofMillis;
 import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -18,6 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.platform.commons.function.Try.success;
 import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.BOTTOM_UP;
@@ -45,6 +48,7 @@
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Nested;
@@ -537,6 +541,20 @@ void tryToLoadClassWhenClassNotFoundException() {
 			() -> ReflectionUtils.tryToLoadClass("foo.bar.EnigmaClassThatDoesNotExist").get());
 	}
 
+	@Test
+	void tryToLoadClassFailsWithinReasonableTimeForInsanelyLargeAndInvalidMultidimensionalPrimitiveArrayName() {
+		// Create a class name of the form int[][][]...[][][]X
+		String className = IntStream.rangeClosed(1, 20_000)//
+				.mapToObj(i -> "[]")//
+				.collect(joining("", "int", "X"));
+
+		// The following should ideally fail in less than 50ms. So we just make
+		// sure it fails in less than 500ms in order to (hopefully) allow the
+		// test to pass on CI servers with limited resources.
+		assertTimeoutPreemptively(ofMillis(500),
+			() -> assertThrows(ClassNotFoundException.class, () -> ReflectionUtils.tryToLoadClass(className).get()));
+	}
+
 	@Test
 	@SuppressWarnings("deprecation")
 	void loadClass() {

From 63d991a0badfef77c886e230030ca46b07bb73cb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Jun 2022 10:31:07 +0200
Subject: [PATCH 0849/1433] Add definitions section

Resolves #2205.
---
 .../asciidoc/user-guide/writing-tests.adoc    | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 96bd6f4bdac9..7fde01551c07 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -97,19 +97,38 @@ void myFastTest() {
 }
 ----
 
-[[writing-tests-classes-and-methods]]
-=== Test Classes and Methods
-
-**Test Class**: any top-level class, `static` member class, or <<writing-tests-nested,
-`@Nested` class>> that contains at least one _test method_.
+[[writing-tests-definitions]]
+=== Definitions
+
+.Platform Concepts
+****
+Container::
+a node in the test tree that contains other containers or tests as its children (e.g. a _test class_).
+
+Test::
+a node in the test tree that verifies expected behavior when executed (e.g. a `@Test` method).
+****
+
+.Jupiter Concepts
+****
+Lifecycle Method::
+any method that is directly annotated or meta-annotated with
+`@BeforeAll`, `@AfterAll`, `@BeforeEach`, or `@AfterEach`.
 
+Test Class::
+any top-level class, `static` member class, or <<writing-tests-nested,
+`@Nested` class>> that contains at least one _test method_, i.e. a _container_.
 Test classes must not be `abstract` and must have a single constructor.
 
-**Test Method**: any instance method that is directly annotated or meta-annotated with
+Test Method::
+any instance method that is directly annotated or meta-annotated with
 `@Test`, `@RepeatedTest`, `@ParameterizedTest`, `@TestFactory`, or `@TestTemplate`.
+With the exception of `@Test`, these create a _container_ in the test tree that groups
+_tests_ or, potentially (for `@TestFactory`), other _containers_.
+****
 
-**Lifecycle Method**: any method that is directly annotated or meta-annotated with
-`@BeforeAll`, `@AfterAll`, `@BeforeEach`, or `@AfterEach`.
+[[writing-tests-classes-and-methods]]
+=== Test Classes and Methods
 
 Test methods and lifecycle methods may be declared locally within the current test class,
 inherited from superclasses, or inherited from interfaces (see

From 24cc4465fcd6ed3e8b8d6b3d30d5f1fa7946715c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Jun 2022 13:08:59 +0200
Subject: [PATCH 0850/1433] Allow scanning classpath concurrently (#2956)

Resolves #2952.
---
 .../release-notes/release-notes-5.9.0-M2.adoc |  1 +
 .../platform/commons/util/CloseablePath.java  | 58 +++++++++++++++++--
 .../commons/util/ClasspathScannerTests.java   | 27 ++++++---
 3 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
index e15725f62200..54c9588427ba 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
@@ -18,6 +18,7 @@ on GitHub.
 * Absolute path entries are now supported in JUnit's Platform Console Launcher on Windows.
 * Attempts to load a `Class` for an invalid class name representing an extremely large
   multidimensional array now fail within a reasonable amount of time.
+* Fix concurrency issue in classpath scanning.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
index d3c9d457d398..3ad49fe7f0e6 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
@@ -14,12 +14,16 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
 /**
@@ -35,10 +39,12 @@ final class CloseablePath implements Closeable {
 	private static final Closeable NULL_CLOSEABLE = () -> {
 	};
 
+	private static final ConcurrentMap<URI, ManagedFileSystem> MANAGED_FILE_SYSTEMS = new ConcurrentHashMap<>();
+
 	private final Path path;
 	private final Closeable delegate;
 
-	static CloseablePath create(URI uri) throws IOException, URISyntaxException {
+	static CloseablePath create(URI uri) throws URISyntaxException {
 		if (JAR_URI_SCHEME.equals(uri.getScheme())) {
 			String[] parts = uri.toString().split(JAR_URI_SEPARATOR);
 			String jarUri = parts[0];
@@ -52,11 +58,12 @@ static CloseablePath create(URI uri) throws IOException, URISyntaxException {
 		return new CloseablePath(Paths.get(uri), NULL_CLOSEABLE);
 	}
 
-	private static CloseablePath createForJarFileSystem(URI jarUri, Function<FileSystem, Path> pathProvider)
-			throws IOException {
-		FileSystem fileSystem = FileSystems.newFileSystem(jarUri, emptyMap());
-		Path path = pathProvider.apply(fileSystem);
-		return new CloseablePath(path, fileSystem);
+	private static CloseablePath createForJarFileSystem(URI jarUri, Function<FileSystem, Path> pathProvider) {
+		ManagedFileSystem managedFileSystem = MANAGED_FILE_SYSTEMS.compute(jarUri,
+			(__, oldValue) -> oldValue == null ? new ManagedFileSystem(jarUri) : oldValue.retain());
+		Path path = pathProvider.apply(managedFileSystem.fileSystem);
+		return new CloseablePath(path,
+			() -> MANAGED_FILE_SYSTEMS.compute(jarUri, (__, ___) -> managedFileSystem.release()));
 	}
 
 	private CloseablePath(Path path, Closeable delegate) {
@@ -72,4 +79,43 @@ public Path getPath() {
 	public void close() throws IOException {
 		delegate.close();
 	}
+
+	private static class ManagedFileSystem {
+
+		private final AtomicInteger referenceCount = new AtomicInteger(1);
+		private final FileSystem fileSystem;
+		private final URI jarUri;
+
+		ManagedFileSystem(URI jarUri) {
+			this.jarUri = jarUri;
+			try {
+				fileSystem = FileSystems.newFileSystem(jarUri, emptyMap());
+			}
+			catch (IOException e) {
+				throw new UncheckedIOException("Failed to create file system for " + jarUri, e);
+			}
+		}
+
+		private ManagedFileSystem retain() {
+			referenceCount.incrementAndGet();
+			return this;
+		}
+
+		private ManagedFileSystem release() {
+			if (referenceCount.decrementAndGet() == 0) {
+				close();
+				return null;
+			}
+			return this;
+		}
+
+		private void close() {
+			try {
+				fileSystem.close();
+			}
+			catch (IOException e) {
+				throw new UncheckedIOException("Failed to close file system for " + jarUri, e);
+			}
+		}
+	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
index 787fee59a48c..e3de9a5f4be4 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
@@ -16,12 +16,15 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.platform.commons.test.ConcurrencyTestingUtils.executeConcurrently;
 
 import java.io.IOException;
 import java.lang.module.ModuleFinder;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.FileSystemNotFoundException;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -223,17 +226,25 @@ private void checkModules2500(ModuleFinder finder) {
 	}
 
 	@Test
-	void findAllClassesInPackageWithinJarFile() throws Exception {
-		var jarfile = getClass().getResource("/jartest.jar");
+	void findAllClassesInPackageWithinJarFileConcurrently() throws Exception {
+		var jarFile = getClass().getResource("/jartest.jar");
+		var jarUri = URI.create("jar:" + jarFile);
 
-		try (var classLoader = new URLClassLoader(new URL[] { jarfile })) {
+		try (var classLoader = new URLClassLoader(new URL[] { jarFile })) {
 			var classpathScanner = new ClasspathScanner(() -> classLoader, ReflectionUtils::tryToLoadClass);
 
-			var classes = classpathScanner.scanForClassesInPackage("org.junit.platform.jartest.included", allClasses);
-			assertThat(classes).hasSize(2);
-			var classNames = classes.stream().map(Class::getSimpleName).collect(Collectors.toList());
-			assertTrue(classNames.contains("Included"));
-			assertTrue(classNames.contains("RecursivelyIncluded"));
+			var results = executeConcurrently(10,
+				() -> classpathScanner.scanForClassesInPackage("org.junit.platform.jartest.included", allClasses));
+
+			assertThrows(FileSystemNotFoundException.class, () -> FileSystems.getFileSystem(jarUri),
+				"FileSystem should be closed");
+
+			results.forEach(classes -> {
+				assertThat(classes).hasSize(2);
+				var classNames = classes.stream().map(Class::getSimpleName).toList();
+				assertTrue(classNames.contains("Included"));
+				assertTrue(classNames.contains("RecursivelyIncluded"));
+			});
 		}
 	}
 

From e7130723ba11f8a6e14db141f5239d132f8284d4 Mon Sep 17 00:00:00 2001
From: Gilberto J Requena <3902492+gilbertojrequena@users.noreply.github.com>
Date: Sun, 26 Jun 2022 16:23:45 +0200
Subject: [PATCH 0851/1433] Add thread mode to @Timeout (#2949)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Timeouts can now be applied using one of the following three thread
modes: `SAME_THREAD`, `SEPARATE_THREAD`, or `INFERRED`.

When `SAME_THREAD` is used, the execution of the annotated method
proceeds in the main thread of the test. If the timeout is exceeded,
the main thread is interrupted from another thread. This is done to
ensure interoperability with frameworks such as Spring that make use of
mechanisms that are sensitive to the currently running thread — for
example, `ThreadLocal` transaction management.

On the contrary when `SEPARATE_THREAD` is used, like the
`assertTimeoutPreemptively()` assertion, the execution of the annotated
method proceeds in a separate thread, this can lead to undesirable side
effects, see <<writing-tests-assertions-preemptive-timeouts>>.

When `INFERRED` (default) thread mode is used, the thread mode is
resolved via the `junit.jupiter.execution.timeout.thread.mode.default`
configuration parameter. If the provided configuration parameter is
invalid or not present then `SAME_THREAD` is used as fallback.

Resolves #2087.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.9.0-M2.adoc |   7 +
 .../asciidoc/user-guide/writing-tests.adoc    |  41 ++-
 .../src/test/java/example/TimeoutDemo.java    |   7 +
 .../java/org/junit/jupiter/api/Timeout.java   |  54 ++++
 .../org/junit/jupiter/engine/Constants.java   |  10 +
 ....java => SameThreadTimeoutInvocation.java} |  16 +-
 .../SeparateThreadTimeoutInvocation.java      |  48 +++
 .../extension/TimeoutConfiguration.java       |  37 +++
 .../engine/extension/TimeoutDuration.java     |  27 ++
 .../extension/TimeoutExceptionFactory.java    |  39 +++
 .../engine/extension/TimeoutExtension.java    |  70 ++---
 .../extension/TimeoutInvocationFactory.java   | 114 +++++++
 ... => SameThreadTimeoutInvocationTests.java} |   4 +-
 .../SeparateThreadTimeoutInvocationTest.java  |  77 +++++
 .../extension/TimeoutConfigurationTests.java  |  22 ++
 .../TimeoutExceptionFactoryTest.java          |  73 +++++
 .../extension/TimeoutExtensionTests.java      | 277 ++++++++++++++++++
 .../TimeoutInvocationFactoryTest.java         |  89 ++++++
 18 files changed, 944 insertions(+), 68 deletions(-)
 rename junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/{TimeoutInvocation.java => SameThreadTimeoutInvocation.java} (77%)
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactory.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/{TimeoutInvocationTests.java => SameThreadTimeoutInvocationTests.java} (91%)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
index 54c9588427ba..e7f2ff209872 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
@@ -47,6 +47,13 @@ on GitHub.
   `@ParameterizedTest` method that is inferred as the factory method when no explicit
   factory method is specified in the `@MethodSource` annotation.
 
+* Thread mode can be set on `@Timeout` annotation. It allows to configure whether the test code
+  is executed in the thread of the calling code or in a separate thread, the modes are:
+  `INFERRED` (default) which resolves the thread mode configured via the
+  property `junit.jupiter.execution.timeout.thread.mode.default`, `SAME_THREAD` that executes
+  the test code in the same thread than the calling code, and `SEPARATE_THREAD` which
+  executes the test code in a separate thread.
+
 
 [[release-notes-5.9.0-M2-junit-vintage]]
 === JUnit Vintage
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 7fde01551c07..c56837489655 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -270,11 +270,10 @@ include::{testDir}/example/AssertionsDemo.java[tags=user_guide]
 [WARNING]
 .Preemptive Timeouts with `assertTimeoutPreemptively()`
 ====
-Contrary to <<writing-tests-declarative-timeouts, declarative timeouts>>, the various
-`assertTimeoutPreemptively()` methods in the `Assertions` class execute the provided
-`executable` or `supplier` in a different thread than that of the calling code. This
-behavior can lead to undesirable side effects if the code that is executed within the
-`executable` or `supplier` relies on `java.lang.ThreadLocal` storage.
+The various`assertTimeoutPreemptively()` methods in the `Assertions` class execute
+the provided `executable` or `supplier` in a different thread than that of the calling
+code. This behavior can lead to undesirable side effects if the code that is executed
+within the `executable` or `supplier` relies on `java.lang.ThreadLocal` storage.
 
 One common example of this is the transactional testing support in the Spring Framework.
 Specifically, Spring's testing support binds transaction state to the current thread (via
@@ -2045,12 +2044,6 @@ The following example shows how `@Timeout` is applied to lifecycle and test meth
 include::{testDir}/example/TimeoutDemo.java[tags=user_guide]
 ----
 
-Contrary to the `assertTimeoutPreemptively()` assertion, the execution of the annotated
-method proceeds in the main thread of the test. If the timeout is exceeded, the main
-thread is interrupted from another thread. This is done to ensure interoperability with
-frameworks such as Spring that make use of mechanisms that are sensitive to the currently
-running thread — for example, `ThreadLocal` transaction management.
-
 To apply the same timeout to all test methods within a test class and all of its `@Nested`
 classes, you can declare the `@Timeout` annotation at the class level. It will then be
 applied to all test, test factory, and test template methods within that class and its
@@ -2066,8 +2059,32 @@ within the specified duration but does not verify the execution time of each ind
 If `@Timeout` is present on a `@TestTemplate` method — for example, a `@RepeatedTest` or
 `@ParameterizedTest` — each invocation will have the given timeout applied to it.
 
+[[writing-tests-declarative-timeouts-thread-mode]]
+==== Thread mode
+
+The timeout can be applied using one of the following three thread modes: `SAME_THREAD`,
+`SEPARATE_THREAD`, or `INFERRED`.
+
+When `SAME_THREAD` is used, the execution of the annotated method proceeds in the main
+thread of the test. If the timeout is exceeded, the main thread is interrupted from
+another thread. This is done to ensure interoperability with frameworks such as Spring
+that make use of mechanisms that are sensitive to the currently running thread — for
+example, `ThreadLocal` transaction management.
+
+On the contrary when `SEPARATE_THREAD` is used, like the `assertTimeoutPreemptively()`
+assertion, the execution of the annotated method proceeds in a separate thread, this
+can lead to undesirable side effects, see <<writing-tests-assertions-preemptive-timeouts>>.
+
+When `INFERRED` (default) thread mode is used, the thread mode is resolved via the
+`junit.jupiter.execution.timeout.thread.mode.default` configuration parameter. If the
+provided configuration parameter is invalid or not present then `SAME_THREAD` is used as
+fallback.
+
+[[writing-tests-declarative-timeouts-default-timeouts]]
+==== Default Timeouts
+
 The following <<running-tests-config-params, configuration parameters>> can be used to
-specify global timeouts for all methods of a certain category unless they or an enclosing
+specify default timeouts for all methods of a certain category unless they or an enclosing
 test class is annotated with `@Timeout`:
 
 `junit.jupiter.execution.timeout.default`::
diff --git a/documentation/src/test/java/example/TimeoutDemo.java b/documentation/src/test/java/example/TimeoutDemo.java
index ddcc489a2c4f..0980a8fd1ff7 100644
--- a/documentation/src/test/java/example/TimeoutDemo.java
+++ b/documentation/src/test/java/example/TimeoutDemo.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.Timeout.ThreadMode;
 
 // tag::user_guide[]
 class TimeoutDemo {
@@ -31,5 +32,11 @@ void failsIfExecutionTimeExceeds100Milliseconds() {
 		// fails if execution time exceeds 100 milliseconds
 	}
 
+	@Test
+	@Timeout(value = 100, unit = TimeUnit.MILLISECONDS, threadMode = ThreadMode.SEPARATE_THREAD)
+	void failsIfExecutionTimeExceeds100MillisecondsInSeparateThread() {
+		// fails if execution time exceeds 100 milliseconds, the test code is executed in a separate thread
+	}
+
 }
 // end::user_guide[]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
index 6bab4ee4d68d..74faf89b360f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
@@ -316,6 +317,21 @@
 	@API(status = STABLE, since = "5.9")
 	String TIMEOUT_MODE_PROPERTY_NAME = "junit.jupiter.execution.timeout.mode";
 
+	/**
+	 * Property name used to set the default thread mode for all testable and lifecycle
+	 * methods: "junit.jupiter.execution.timeout.thread.mode.default".
+	 *
+	 * <p>The value of this property will be used unless overridden by a {@link Timeout @Timeout}
+	 * annotation present on the method or on an enclosing test class (for testable methods).
+	 *
+	 * <p>The supported values are {@code SAME_THREAD} or {@code SEPARATE_THREAD}, if none is provided
+	 * {@code SAME_THREAD} is used as default.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	String DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME = "junit.jupiter.execution.timeout.thread.mode.default";
+
 	/**
 	 * The duration of this timeout.
 	 *
@@ -331,4 +347,42 @@
 	 */
 	TimeUnit unit() default TimeUnit.SECONDS;
 
+	/**
+	 * The thread mode of this timeout.
+	 *
+	 * @return thread mode
+	 * @since 5.9
+	 * @see ThreadMode
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	ThreadMode threadMode() default ThreadMode.INFERRED;
+
+	/**
+	 * {@code ThreadMode} is use to define whether the test code should be executed in the thread
+	 * of the calling code or in a separated thread.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	enum ThreadMode {
+		/**
+		 * The thread mode is determined using the parameter configured in property
+		 * {@value Timeout#DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME}.
+		 */
+		INFERRED,
+
+		/**
+		 * The test code is executed in the thread of the calling code.
+		 */
+		SAME_THREAD,
+
+		/**
+		 * The test code is executed in a different thread than that of the calling code. Furthermore,
+		 * execution of the test code will be preemptively aborted if the timeout is exceeded. See the
+		 * {@linkplain Assertions Preemptive Timeouts} section of the class-level
+		 * Javadoc for a discussion of possible undesirable side effects.
+		 */
+		SEPARATE_THREAD,
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index be6eebf23fc9..b68a9bdbb2ba 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -313,6 +313,16 @@ public final class Constants {
 	@SuppressWarnings("deprecation")
 	public static final String TEMP_DIR_SCOPE_PROPERTY_NAME = TempDir.SCOPE_PROPERTY_NAME;
 
+	/**
+	 * Property name used to set the default timeout thread mode.
+	 *
+	 * @since 5.9
+	 * @see Timeout
+	 * @see Timeout.ThreadMode
+	 */
+	@API(status = EXPERIMENTAL, since = "5.9")
+	public static final String DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME = Timeout.DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME;
+
 	private Constants() {
 		/* no-op */
 	}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java
similarity index 77%
rename from junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java
rename to junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java
index a16db56b80e5..7cb93b5dff07 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java
@@ -12,7 +12,6 @@
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
 import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
@@ -21,14 +20,14 @@
 /**
  * @since 5.5
  */
-class TimeoutInvocation<T> implements Invocation<T> {
+class SameThreadTimeoutInvocation<T> implements Invocation<T> {
 
 	private final Invocation<T> delegate;
 	private final TimeoutDuration timeout;
 	private final ScheduledExecutorService executor;
 	private final Supplier<String> descriptionSupplier;
 
-	TimeoutInvocation(Invocation<T> delegate, TimeoutDuration timeout, ScheduledExecutorService executor,
+	SameThreadTimeoutInvocation(Invocation<T> delegate, TimeoutDuration timeout, ScheduledExecutorService executor,
 			Supplier<String> descriptionSupplier) {
 		this.delegate = delegate;
 		this.timeout = timeout;
@@ -56,7 +55,7 @@ public T proceed() throws Throwable {
 			}
 			if (interruptTask.executed) {
 				Thread.interrupted();
-				failure = createTimeoutException(failure);
+				failure = TimeoutExceptionFactory.create(descriptionSupplier.get(), timeout, failure);
 			}
 		}
 		if (failure != null) {
@@ -65,15 +64,6 @@ public T proceed() throws Throwable {
 		return result;
 	}
 
-	private TimeoutException createTimeoutException(Throwable failure) {
-		String message = String.format("%s timed out after %s", descriptionSupplier.get(), timeout);
-		TimeoutException timeoutError = new TimeoutException(message);
-		if (failure != null) {
-			timeoutError.addSuppressed(failure);
-		}
-		return timeoutError;
-	}
-
 	static class InterruptTask implements Runnable {
 
 		private final Thread thread;
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
new file mode 100644
index 000000000000..1860f413455d
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+
+import java.util.concurrent.TimeoutException;
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
+import org.opentest4j.AssertionFailedError;
+
+/**
+ * @since 5.9
+ */
+class SeparateThreadTimeoutInvocation<T> implements Invocation<T> {
+
+	private final Invocation<T> delegate;
+	private final TimeoutDuration timeout;
+	private final Supplier<String> descriptionSupplier;
+
+	SeparateThreadTimeoutInvocation(Invocation<T> delegate, TimeoutDuration timeout,
+			Supplier<String> descriptionSupplier) {
+		this.delegate = delegate;
+		this.timeout = timeout;
+		this.descriptionSupplier = descriptionSupplier;
+	}
+
+	@Override
+	public T proceed() throws Throwable {
+		try {
+			return assertTimeoutPreemptively(timeout.toDuration(), delegate::proceed, descriptionSupplier);
+		}
+		catch (AssertionFailedError failure) {
+			TimeoutException exception = TimeoutExceptionFactory.create(descriptionSupplier.get(), timeout, null);
+			exception.initCause(failure.getCause());
+			throw exception;
+		}
+	}
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
index 7d20ae9167ed..799255432b4e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
@@ -20,12 +20,17 @@
 import static org.junit.jupiter.api.Timeout.DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME;
 import static org.junit.jupiter.api.Timeout.DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME;
 import static org.junit.jupiter.api.Timeout.DEFAULT_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.ThreadMode.SAME_THREAD;
+import static org.junit.jupiter.api.Timeout.ThreadMode.SEPARATE_THREAD;
 
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
+import org.junit.jupiter.api.Timeout.ThreadMode;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
@@ -39,6 +44,7 @@ class TimeoutConfiguration {
 
 	private final TimeoutDurationParser parser = new TimeoutDurationParser();
 	private final Map<String, Optional<TimeoutDuration>> cache = new ConcurrentHashMap<>();
+	private final AtomicReference<Optional<ThreadMode>> threadMode = new AtomicReference<>();
 	private final ExtensionContext extensionContext;
 
 	TimeoutConfiguration(ExtensionContext extensionContext) {
@@ -106,4 +112,35 @@ private Optional<TimeoutDuration> parseTimeoutDuration(String propertyName) {
 		}));
 	}
 
+	Optional<ThreadMode> getDefaultTimeoutThreadMode() {
+		if (threadMode.get() != null) {
+			return threadMode.get();
+		}
+		else {
+			Optional<ThreadMode> configuredThreadMode = parseTimeoutThreadModeConfiguration();
+			threadMode.set(configuredThreadMode);
+			return configuredThreadMode;
+		}
+	}
+
+	private Optional<ThreadMode> parseTimeoutThreadModeConfiguration() {
+		return extensionContext.getConfigurationParameter(DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME).map(value -> {
+			try {
+				ThreadMode threadMode = ThreadMode.valueOf(value.toUpperCase());
+				if (threadMode == ThreadMode.INFERRED) {
+					logger.warn(() -> String.format(
+						"Invalid timeout thread mode '%s', only %s and %s can be used as configuration parameter for %s.",
+						value, SAME_THREAD, SEPARATE_THREAD, DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME));
+					return null;
+				}
+				return threadMode;
+			}
+			catch (Exception e) {
+				logger.warn(e,
+					() -> String.format("Invalid timeout thread mode '%s' set via the '%s' configuration parameter.",
+						value, DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME));
+				return null;
+			}
+		});
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
index 57032e1d09ba..553964d18bb8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
@@ -10,10 +10,13 @@
 
 package org.junit.jupiter.engine.extension;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Timeout;
+import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.Preconditions;
 
 /**
@@ -68,4 +71,28 @@ public String toString() {
 		return value + " " + label;
 	}
 
+	public Duration toDuration() {
+		return Duration.of(value, toChronoUnit());
+	}
+
+	private ChronoUnit toChronoUnit() {
+		switch (unit) {
+			case NANOSECONDS:
+				return ChronoUnit.NANOS;
+			case MICROSECONDS:
+				return ChronoUnit.MICROS;
+			case MILLISECONDS:
+				return ChronoUnit.MILLIS;
+			case SECONDS:
+				return ChronoUnit.SECONDS;
+			case MINUTES:
+				return ChronoUnit.MINUTES;
+			case HOURS:
+				return ChronoUnit.HOURS;
+			case DAYS:
+				return ChronoUnit.DAYS;
+			default:
+				throw new JUnitException("Could not map TimeUnit " + unit + " to ChronoUnit");
+		}
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactory.java
new file mode 100644
index 000000000000..4c94a3c0a281
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactory.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import java.util.concurrent.TimeoutException;
+
+import org.junit.platform.commons.util.Preconditions;
+
+/**
+ * @since 5.9
+ */
+class TimeoutExceptionFactory {
+
+	private TimeoutExceptionFactory() {
+	}
+
+	static TimeoutException create(String methodSignature, TimeoutDuration timeoutDuration, Throwable failure) {
+		String message = String.format("%s timed out after %s",
+			Preconditions.notNull(methodSignature, "method signature must not be null"),
+			Preconditions.notNull(timeoutDuration, "timeout duration must not be null"));
+		TimeoutException timeoutException = new TimeoutException(message);
+		if (failure != null) {
+			timeoutException.addSuppressed(failure);
+		}
+		return timeoutException;
+	}
+
+	static TimeoutException create(String methodSignature, TimeoutDuration timeoutDuration) {
+		return create(methodSignature, timeoutDuration, null);
+	}
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
index de88933037d4..4f1de2fdfe17 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
@@ -11,24 +11,22 @@
 package org.junit.jupiter.engine.extension;
 
 import static org.junit.jupiter.api.Timeout.TIMEOUT_MODE_PROPERTY_NAME;
+import static org.junit.jupiter.api.Timeout.ThreadMode.SAME_THREAD;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
 import java.util.Optional;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.Timeout.ThreadMode;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
-import org.junit.platform.commons.JUnitException;
+import org.junit.jupiter.engine.extension.TimeoutInvocationFactory.TimeoutInvocationParameters;
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -41,6 +39,7 @@ class TimeoutExtension implements BeforeAllCallback, BeforeEachCallback, Invocat
 
 	private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(Timeout.class);
 	private static final String TESTABLE_METHOD_TIMEOUT_KEY = "testable_method_timeout_from_annotation";
+	private static final String TESTABLE_METHOD_TIMEOUT_THREAD_MODE_KEY = "testable_method_timeout_thread_mode_from_annotation";
 	private static final String GLOBAL_TIMEOUT_CONFIG_KEY = "global_timeout_config";
 	private static final String ENABLED_MODE_VALUE = "enabled";
 	private static final String DISABLED_MODE_VALUE = "disabled";
@@ -59,6 +58,9 @@ public void beforeEach(ExtensionContext context) {
 	private void readAndStoreTimeoutSoChildrenInheritIt(ExtensionContext context) {
 		readTimeoutFromAnnotation(context.getElement()).ifPresent(
 			timeout -> context.getStore(NAMESPACE).put(TESTABLE_METHOD_TIMEOUT_KEY, timeout));
+		readTimeoutThreadModeFromAnnotation(context.getElement()).ifPresent(
+			timeoutThreadMode -> context.getStore(NAMESPACE).put(TESTABLE_METHOD_TIMEOUT_THREAD_MODE_KEY,
+				timeoutThreadMode));
 	}
 
 	@Override
@@ -131,6 +133,11 @@ private Optional<TimeoutDuration> readTimeoutFromAnnotation(Optional<AnnotatedEl
 		return AnnotationSupport.findAnnotation(element, Timeout.class).map(TimeoutDuration::from);
 	}
 
+	@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+	private Optional<ThreadMode> readTimeoutThreadModeFromAnnotation(Optional<AnnotatedElement> element) {
+		return AnnotationSupport.findAnnotation(element, Timeout.class).map(Timeout::threadMode);
+	}
+
 	private <T> T interceptTestableMethod(Invocation<T> invocation,
 			ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext,
 			TimeoutProvider defaultTimeoutProvider) throws Throwable {
@@ -167,8 +174,23 @@ private <T> Invocation<T> decorate(Invocation<T> invocation, ReflectiveInvocatio
 		if (timeout == null || isTimeoutDisabled(extensionContext)) {
 			return invocation;
 		}
-		return new TimeoutInvocation<>(invocation, timeout, getExecutor(extensionContext),
-			() -> describe(invocationContext, extensionContext));
+
+		ThreadMode threadMode = resolveTimeoutThreadMode(extensionContext);
+		return new TimeoutInvocationFactory(extensionContext.getRoot().getStore(NAMESPACE)).create(threadMode,
+			new TimeoutInvocationParameters<>(invocation, timeout,
+				() -> describe(invocationContext, extensionContext)));
+	}
+
+	private ThreadMode resolveTimeoutThreadMode(ExtensionContext extensionContext) {
+		ThreadMode annotationThreadMode = getAnnotationThreadMode(extensionContext);
+		if (annotationThreadMode == null || annotationThreadMode == ThreadMode.INFERRED) {
+			return getGlobalTimeoutConfiguration(extensionContext).getDefaultTimeoutThreadMode().orElse(SAME_THREAD);
+		}
+		return annotationThreadMode;
+	}
+
+	private ThreadMode getAnnotationThreadMode(ExtensionContext extensionContext) {
+		return extensionContext.getStore(NAMESPACE).get(TESTABLE_METHOD_TIMEOUT_THREAD_MODE_KEY, ThreadMode.class);
 	}
 
 	private String describe(ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) {
@@ -180,10 +202,6 @@ private String describe(ReflectiveInvocationContext<Method> invocationContext, E
 		return ReflectionUtils.getFullyQualifiedMethodName(invocationContext.getTargetClass(), method);
 	}
 
-	private ScheduledExecutorService getExecutor(ExtensionContext extensionContext) {
-		return extensionContext.getRoot().getStore(NAMESPACE).getOrComputeIfAbsent(ExecutorResource.class).get();
-	}
-
 	/**
 	 * Determine if timeouts are disabled for the supplied extension context.
 	 */
@@ -211,34 +229,4 @@ private boolean isTimeoutDisabled(String mode) {
 	@FunctionalInterface
 	private interface TimeoutProvider extends Function<TimeoutConfiguration, Optional<TimeoutDuration>> {
 	}
-
-	private static class ExecutorResource implements CloseableResource {
-
-		private final ScheduledExecutorService executor;
-
-		@SuppressWarnings("unused")
-		ExecutorResource() {
-			executor = Executors.newSingleThreadScheduledExecutor(runnable -> {
-				Thread thread = new Thread(runnable, "junit-jupiter-timeout-watcher");
-				thread.setPriority(Thread.MAX_PRIORITY);
-				return thread;
-			});
-		}
-
-		ScheduledExecutorService get() {
-			return executor;
-		}
-
-		@Override
-		public void close() throws Throwable {
-			executor.shutdown();
-			boolean terminated = executor.awaitTermination(5, TimeUnit.SECONDS);
-			if (!terminated) {
-				executor.shutdownNow();
-				throw new JUnitException("Scheduled executor could not be stopped in an orderly manner");
-			}
-		}
-
-	}
-
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java
new file mode 100644
index 000000000000..2af93e782d8c
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.Timeout.ThreadMode;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
+import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
+import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.util.Preconditions;
+
+/**
+ * @since 5.9
+ */
+class TimeoutInvocationFactory {
+
+	private final Store store;
+
+	TimeoutInvocationFactory(Store store) {
+		this.store = Preconditions.notNull(store, "store must not be null");
+	}
+
+	<T> Invocation<T> create(ThreadMode threadMode, TimeoutInvocationParameters<T> timeoutInvocationParameters) {
+		Preconditions.notNull(threadMode, "thread mode must not be null");
+		Preconditions.condition(threadMode != ThreadMode.INFERRED, "thread mode must not be INFERRED");
+		Preconditions.notNull(timeoutInvocationParameters, "timeout invocation parameters must not be null");
+		if (threadMode == ThreadMode.SEPARATE_THREAD) {
+			return new SeparateThreadTimeoutInvocation<>(timeoutInvocationParameters.getInvocation(),
+				timeoutInvocationParameters.getTimeoutDuration(), timeoutInvocationParameters.getDescriptionSupplier());
+		}
+		return new SameThreadTimeoutInvocation<>(timeoutInvocationParameters.getInvocation(),
+			timeoutInvocationParameters.getTimeoutDuration(), getThreadExecutorForSameThreadInvocation(),
+			timeoutInvocationParameters.getDescriptionSupplier());
+	}
+
+	private ScheduledExecutorService getThreadExecutorForSameThreadInvocation() {
+		return store.getOrComputeIfAbsent(SingleThreadExecutorResource.class).get();
+	}
+
+	private static abstract class ExecutorResource implements CloseableResource {
+
+		protected final ScheduledExecutorService executor;
+
+		ExecutorResource(ScheduledExecutorService executor) {
+			this.executor = executor;
+		}
+
+		ScheduledExecutorService get() {
+			return executor;
+		}
+
+		@Override
+		public void close() throws Throwable {
+			executor.shutdown();
+			boolean terminated = executor.awaitTermination(5, TimeUnit.SECONDS);
+			if (!terminated) {
+				executor.shutdownNow();
+				throw new JUnitException("Scheduled executor could not be stopped in an orderly manner");
+			}
+		}
+	}
+
+	static class SingleThreadExecutorResource extends ExecutorResource {
+
+		@SuppressWarnings("unused")
+		SingleThreadExecutorResource() {
+			super(Executors.newSingleThreadScheduledExecutor(runnable -> {
+				Thread thread = new Thread(runnable, "junit-jupiter-timeout-watcher");
+				thread.setPriority(Thread.MAX_PRIORITY);
+				return thread;
+			}));
+		}
+	}
+
+	static class TimeoutInvocationParameters<T> {
+
+		private final Invocation<T> invocation;
+		private final TimeoutDuration timeout;
+		private final Supplier<String> descriptionSupplier;
+
+		TimeoutInvocationParameters(Invocation<T> invocation, TimeoutDuration timeout,
+				Supplier<String> descriptionSupplier) {
+			this.invocation = Preconditions.notNull(invocation, "invocation must not be null");
+			this.timeout = Preconditions.notNull(timeout, "timeout must not be null");
+			this.descriptionSupplier = Preconditions.notNull(descriptionSupplier,
+				"description supplier must not be null");
+		}
+
+		public Invocation<T> getInvocation() {
+			return invocation;
+		}
+
+		public TimeoutDuration getTimeoutDuration() {
+			return timeout;
+		}
+
+		public Supplier<String> getDescriptionSupplier() {
+			return descriptionSupplier;
+		}
+	}
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocationTests.java
similarity index 91%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocationTests.java
index 460d0754ba0b..f4af4da6c0ad 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocationTests.java
@@ -27,14 +27,14 @@
 /**
  * @since 5.5
  */
-class TimeoutInvocationTests {
+class SameThreadTimeoutInvocationTests {
 
 	@Test
 	void resetsInterruptFlag() {
 		var exception = assertThrows(TimeoutException.class, () -> withExecutor(executor -> {
 			var delegate = new EventuallyInterruptibleInvocation();
 			var duration = new TimeoutDuration(1, NANOSECONDS);
-			var timeoutInvocation = new TimeoutInvocation<>(delegate, duration, executor, () -> "execution");
+			var timeoutInvocation = new SameThreadTimeoutInvocation<>(delegate, duration, executor, () -> "execution");
 			timeoutInvocation.proceed();
 		}));
 		assertFalse(Thread.currentThread().isInterrupted());
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
new file mode 100644
index 000000000000..4e8973af9750
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout.ThreadMode;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
+import org.junit.jupiter.engine.execution.ExtensionValuesStore;
+import org.junit.jupiter.engine.execution.NamespaceAwareStore;
+import org.junit.jupiter.engine.extension.TimeoutInvocationFactory.TimeoutInvocationParameters;
+
+/**
+ * @since 5.9
+ */
+@DisplayName("SeparateThreadTimeoutInvocation")
+class SeparateThreadTimeoutInvocationTest {
+
+	@Test
+	@DisplayName("throws timeout exception when timeout duration is exceeded")
+	void throwsTimeoutException() {
+		AtomicReference<String> threadName = new AtomicReference<>();
+		var invocation = aSeparateThreadInvocation(() -> {
+			threadName.set(Thread.currentThread().getName());
+			Thread.sleep(100);
+			return null;
+		});
+
+		assertThatThrownBy(invocation::proceed) //
+				.hasMessage("method() timed out after 10 milliseconds") //
+				.isInstanceOf(TimeoutException.class) //
+				.hasRootCauseMessage("Execution timed out in thread " + threadName.get());
+	}
+
+	@Test
+	@DisplayName("executes invocation in a separate thread")
+	void runsInvocationUsingSeparateThread() throws Throwable {
+		var invocationThreadName = aSeparateThreadInvocation(() -> Thread.currentThread().getName()).proceed();
+		assertThat(invocationThreadName).isNotEqualTo(Thread.currentThread().getName());
+	}
+
+	@Test
+	@DisplayName("throws invocation exception")
+	void shouldThrowInvocationException() {
+		var invocation = aSeparateThreadInvocation(() -> {
+			throw new RuntimeException("hi!");
+		});
+		assertThatThrownBy(invocation::proceed) //
+				.isInstanceOf(RuntimeException.class) //
+				.hasMessage("hi!");
+	}
+
+	private static <T> SeparateThreadTimeoutInvocation<T> aSeparateThreadInvocation(Invocation<T> invocation) {
+		var namespace = ExtensionContext.Namespace.create(SeparateThreadTimeoutInvocationTest.class);
+		var store = new NamespaceAwareStore(new ExtensionValuesStore(null), namespace);
+		var parameters = new TimeoutInvocationParameters<>(invocation, new TimeoutDuration(10, MILLISECONDS),
+			() -> "method()");
+		return (SeparateThreadTimeoutInvocation<T>) new TimeoutInvocationFactory(store) //
+				.create(ThreadMode.SEPARATE_THREAD, parameters);
+	}
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
index 3d950fe53893..5df3617b92f0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
@@ -18,6 +18,7 @@
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Timeout.ThreadMode.SEPARATE_THREAD;
 import static org.junit.jupiter.engine.Constants.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -28,6 +29,7 @@
 import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.DEFAULT_TIMEOUT_PROPERTY_NAME;
+import static org.junit.jupiter.engine.Constants.DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -57,6 +59,7 @@ void noTimeoutIfNoPropertiesAreSet() {
 		assertThat(config.getDefaultTestFactoryMethodTimeout()).isEmpty();
 		assertThat(config.getDefaultAfterEachMethodTimeout()).isEmpty();
 		assertThat(config.getDefaultAfterAllMethodTimeout()).isEmpty();
+		assertThat(config.getDefaultTimeoutThreadMode()).isEmpty();
 	}
 
 	@Test
@@ -131,4 +134,23 @@ void logsInvalidValues(LogRecordListener logRecordListener) {
 				.containsExactly(
 					"Ignored invalid timeout 'invalid' set via the 'junit.jupiter.execution.timeout.test.method.default' configuration parameter.");
 	}
+
+	@Test
+	void specificThreadModeIsUsed() {
+		when(extensionContext.getConfigurationParameter(DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME)).thenReturn(
+			Optional.of("SEPARATE_THREAD"));
+		assertThat(config.getDefaultTimeoutThreadMode()).isEqualTo(Optional.of(SEPARATE_THREAD));
+	}
+
+	@Test
+	@TrackLogRecords
+	void logsInvalidThreadModeValueAndReturnEmpty(LogRecordListener logRecordListener) {
+		when(extensionContext.getConfigurationParameter(DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME)).thenReturn(
+			Optional.of("invalid"));
+
+		assertThat(config.getDefaultTimeoutThreadMode()).isEqualTo(Optional.empty());
+		assertThat(logRecordListener.stream(Level.WARNING).map(LogRecord::getMessage)) //
+				.containsExactly(
+					"Invalid timeout thread mode 'invalid' set via the 'junit.jupiter.execution.timeout.thread.mode.default' configuration parameter.");
+	}
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java
new file mode 100644
index 000000000000..75de6f895309
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.engine.extension.TimeoutExceptionFactory.create;
+
+import java.util.concurrent.TimeoutException;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @since 5.9
+ */
+@DisplayName("TimeoutExceptionFactory")
+class TimeoutExceptionFactoryTest {
+
+	private static final TimeoutDuration tenMillisDuration = new TimeoutDuration(10, MILLISECONDS);
+	private static final Exception suppressedException = new Exception("Winke!");
+	private static final String methodSignature = "test()";
+
+	@Test
+	@DisplayName("creates exception with method signature and timeout")
+	void createExceptionWithMethodSignatureTimeout() {
+		TimeoutException exception = create(methodSignature, tenMillisDuration);
+
+		assertThat(exception) //
+				.hasMessage("test() timed out after 10 milliseconds") //
+				.hasNoSuppressedExceptions();
+	}
+
+	@Test
+	@DisplayName("creates exception with method signature, timeout and throwable")
+	void createExceptionWithMethodSignatureTimeoutAndThrowable() {
+		TimeoutException exception = create(methodSignature, tenMillisDuration, suppressedException);
+
+		assertThat(exception) //
+				.hasMessage("test() timed out after 10 milliseconds") //
+				.hasSuppressedException(suppressedException);
+	}
+
+	@Nested
+	@DisplayName("throws exception when")
+	class ThrowException {
+
+		@Test
+		@DisplayName("method signature is null")
+		void methodSignatureIsnull() {
+			assertThatThrownBy(() -> create(null, tenMillisDuration, suppressedException)) //
+					.hasMessage("method signature must not be null");
+		}
+
+		@Test
+		@DisplayName("method timeout duration is null")
+		void timeoutDurationIsnull() {
+			assertThatThrownBy(() -> create(methodSignature, null, suppressedException)) //
+					.hasMessage("timeout duration must not be null");
+		}
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 0d6981b33788..60fdd14ee51d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -16,6 +16,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.junit.jupiter.api.Timeout.ThreadMode.SAME_THREAD;
+import static org.junit.jupiter.api.Timeout.ThreadMode.SEPARATE_THREAD;
 import static org.junit.jupiter.engine.Constants.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
@@ -42,14 +44,18 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.RuntimeUtils;
+import org.junit.platform.engine.TestExecutionResult.Status;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 import org.junit.platform.testkit.engine.Events;
 import org.junit.platform.testkit.engine.Execution;
@@ -332,6 +338,144 @@ private Execution findExecution(Events events, String displayName) {
 				.collect(toList()));
 	}
 
+	@Nested
+	@DisplayName("separate thread")
+	class SeparateThread {
+		@Test
+		@DisplayName("timeout exceeded")
+		void timeoutExceededInSeparateThread() {
+			EngineExecutionResults results = executeTestsForClass(TimeoutExceedingSeparateThreadTestCase.class);
+
+			Execution execution = findExecution(results.testEvents(), "testMethod()");
+			assertThat(execution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(TimeoutException.class) //
+					.hasMessage("testMethod() timed out after 10 milliseconds");
+		}
+
+		@Test
+		@DisplayName("non timeout exceeded")
+		void nonTimeoutExceededInSeparateThread() {
+			executeTestsForClass(NonTimeoutExceedingSeparateThreadTestCase.class).allEvents() //
+					.assertStatistics(stats -> stats.failed(0));
+		}
+
+		@Test
+		@DisplayName("does not swallow unrecoverable exceptions")
+		void separateThreadDoesNotSwallowUnrecoverableExceptions() {
+			assertThrows(OutOfMemoryError.class,
+				() -> executeTestsForClass(UnrecoverableExceptionInSeparateThreadTestCase.class));
+		}
+
+		@Test
+		@DisplayName("handles invocation exceptions")
+		void separateThreadHandlesInvocationExceptions() {
+			EngineExecutionResults results = executeTests(request() //
+					.selectors(selectMethod(ExceptionInSeparateThreadTestCase.class, "test")) //
+					.build());
+
+			Execution execution = findExecution(results.testEvents(), "test()");
+			assertThat(execution.getDuration()) //
+					.isLessThanOrEqualTo(Duration.ofMillis(10));
+			assertThat(execution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(RuntimeException.class) //
+					.hasMessage("Oppps!");
+		}
+
+		@Test
+		@DisplayName("when one test is stuck \"forever\" the next tests should not stuck")
+		void oneThreadStuckForever() {
+			EngineExecutionResults results = executeTestsForClass(OneTestStuckForeverAndTheOthersNotTestCase.class);
+
+			Execution stuckExecution = findExecution(results.testEvents(), "stuck()");
+			assertThat(stuckExecution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(TimeoutException.class) //
+					.hasMessage("stuck() timed out after 10 milliseconds");
+
+			Execution testZeroExecution = findExecution(results.testEvents(), "testZero()");
+			assertThat(testZeroExecution.getTerminationInfo().getExecutionResult().getStatus()) //
+					.isEqualTo(Status.SUCCESSFUL);
+
+			Execution testOneExecution = findExecution(results.testEvents(), "testOne()");
+			assertThat(testOneExecution.getTerminationInfo().getExecutionResult().getStatus()) //
+					.isEqualTo(Status.SUCCESSFUL);
+		}
+
+		@Test
+		@DisplayName("mixed same thread and separate thread tests")
+		void mixedSameThreadAndSeparateThreadTests() {
+			EngineExecutionResults results = executeTestsForClass(MixedSameThreadAndSeparateThreadTestCase.class);
+
+			Execution stuck = findExecution(results.testEvents(), "testZero()");
+			assertThat(stuck.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(TimeoutException.class) //
+					.hasMessage("testZero() timed out after 10 milliseconds");
+
+			Execution testZeroExecution = findExecution(results.testEvents(), "testOne()");
+			assertThat(testZeroExecution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(TimeoutException.class) //
+					.hasMessage("testOne() timed out after 10 milliseconds");
+
+			Execution testOneExecution = findExecution(results.testEvents(), "testTwo()");
+			assertThat(testOneExecution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(TimeoutException.class) //
+					.hasMessage("testTwo() timed out after 10 milliseconds");
+		}
+
+		@Test
+		@DisplayName("one test is stuck \"forever\" in separate thread and other tests in same thread not")
+		void oneThreadStuckForeverAndOtherTestsInSameThread() {
+			EngineExecutionResults results = executeTestsForClass(
+				OneTestStuckForeverAndTheOthersInSameThreadNotTestCase.class);
+
+			Execution stuckExecution = findExecution(results.testEvents(), "stuck()");
+			assertThat(stuckExecution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(TimeoutException.class) //
+					.hasMessage("stuck() timed out after 10 milliseconds");
+
+			Execution testZeroExecution = findExecution(results.testEvents(), "testZero()");
+			assertThat(testZeroExecution.getTerminationInfo().getExecutionResult().getStatus()) //
+					.isEqualTo(Status.SUCCESSFUL);
+
+			Execution testOneExecution = findExecution(results.testEvents(), "testOne()");
+			assertThat(testOneExecution.getTerminationInfo().getExecutionResult().getStatus()) //
+					.isEqualTo(Status.SUCCESSFUL);
+		}
+
+		@Test
+		@DisplayName("is not applied on annotated @Test methods using timeout mode: disabled")
+		void doesNotApplyTimeoutOnAnnotatedTestMethodsUsingDisabledTimeoutMode() {
+			EngineExecutionResults results = executeTests(request() //
+					.selectors(selectMethod(TimeoutExceedingSeparateThreadTestCase.class, "testMethod")) //
+					.configurationParameter(TIMEOUT_MODE_PROPERTY_NAME, "disabled").build());
+
+			Execution execution = findExecution(results.testEvents(), "testMethod()");
+			assertThat(execution.getTerminationInfo().getExecutionResult().getThrowable()) //
+					.isEmpty();
+		}
+
+		@Nested
+		@DisplayName("on class level")
+		class OnClassLevel {
+			@Test
+			@DisplayName("timeout exceeded")
+			void timeoutExceededInSeparateThreadOnClassLevel() {
+				EngineExecutionResults results = executeTestsForClass(TimeoutExceededOnClassLevelTestCase.class);
+
+				Execution execution = findExecution(results.testEvents(), "exceptionThrown()");
+				assertThat(execution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+						.isInstanceOf(TimeoutException.class) //
+						.hasMessage("exceptionThrown() timed out after 10 milliseconds");
+			}
+
+			@Test
+			@DisplayName("non timeout exceeded")
+			void nonTimeoutExceededInSeparateThreadOnClassLevel() {
+				executeTestsForClass(NonTimeoutExceededOnClassLevelTestCase.class).allEvents() //
+						.assertStatistics(stats -> stats.failed(0));
+			}
+		}
+	}
+
 	static class TimeoutAnnotatedTestMethodTestCase {
 		@Test
 		@Timeout(value = 10, unit = MILLISECONDS)
@@ -543,4 +687,137 @@ void testMethod() {
 
 	}
 
+	static class TimeoutExceedingWithInferredThreadModeTestCase {
+		@Test
+		@Timeout(value = 10, unit = MILLISECONDS)
+		void testMethod() throws InterruptedException {
+			Thread.sleep(100);
+		}
+	}
+
+	static class TimeoutExceedingSeparateThreadTestCase {
+		@Test
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void testMethod() throws InterruptedException {
+			Thread.sleep(100);
+		}
+	}
+
+	static class NonTimeoutExceedingSeparateThreadTestCase {
+		@Test
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void testMethod() {
+		}
+	}
+
+	static class UnrecoverableExceptionInSeparateThreadTestCase {
+		@Test
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void test() {
+			throw new OutOfMemoryError();
+		}
+	}
+
+	static class ExceptionInSeparateThreadTestCase {
+		@Test
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void test() {
+			throw new RuntimeException("Oppps!");
+		}
+	}
+
+	@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+	static class TimeoutExceededOnClassLevelTestCase {
+		@Test
+		void exceptionThrown() throws InterruptedException {
+			Thread.sleep(100);
+		}
+	}
+
+	@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+	static class NonTimeoutExceededOnClassLevelTestCase {
+		@Test
+		void test() {
+		}
+	}
+
+	@TestMethodOrder(OrderAnnotation.class)
+	static class OneTestStuckForeverAndTheOthersNotTestCase {
+		private static final CountDownLatch latch = new CountDownLatch(1);
+
+		@Test
+		@Order(0)
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void stuck() throws InterruptedException {
+			latch.await();
+		}
+
+		@Test
+		@Order(1)
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void testZero() {
+		}
+
+		@Test
+		@Order(2)
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void testOne() {
+		}
+
+		@AfterAll
+		static void stop() throws InterruptedException {
+			Thread.sleep(100);
+			latch.countDown();
+		}
+	}
+
+	static class MixedSameThreadAndSeparateThreadTestCase {
+		@Test
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void testZero() throws InterruptedException {
+			Thread.sleep(100);
+		}
+
+		@Test
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SAME_THREAD)
+		void testOne() throws InterruptedException {
+			Thread.sleep(100);
+		}
+
+		@Test
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void testTwo() throws InterruptedException {
+			Thread.sleep(100);
+		}
+	}
+
+	@TestMethodOrder(OrderAnnotation.class)
+	static class OneTestStuckForeverAndTheOthersInSameThreadNotTestCase {
+		private static final CountDownLatch latch = new CountDownLatch(1);
+
+		@Test
+		@Order(0)
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		void stuck() throws InterruptedException {
+			latch.await();
+		}
+
+		@Test
+		@Order(1)
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SAME_THREAD)
+		void testZero() {
+		}
+
+		@Test
+		@Order(2)
+		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SAME_THREAD)
+		void testOne() {
+		}
+
+		@AfterAll
+		static void stop() throws InterruptedException {
+			Thread.sleep(100);
+			latch.countDown();
+		}
+	}
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java
new file mode 100644
index 000000000000..6fc152a368d9
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.verify;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout.ThreadMode;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
+import org.junit.jupiter.engine.execution.ExtensionValuesStore;
+import org.junit.jupiter.engine.execution.NamespaceAwareStore;
+import org.junit.jupiter.engine.extension.TimeoutInvocationFactory.SingleThreadExecutorResource;
+import org.junit.jupiter.engine.extension.TimeoutInvocationFactory.TimeoutInvocationParameters;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@DisplayName("TimeoutInvocationFactory")
+@ExtendWith(MockitoExtension.class)
+class TimeoutInvocationFactoryTest {
+
+	@Spy
+	private final Store store = new NamespaceAwareStore(new ExtensionValuesStore(null),
+		ExtensionContext.Namespace.create(TimeoutInvocationFactoryTest.class));
+	@Mock
+	private Invocation<String> invocation;
+	@Mock
+	private TimeoutDuration timeoutDuration;
+	private TimeoutInvocationFactory timeoutInvocationFactory;
+	private TimeoutInvocationParameters<String> parameters;
+
+	@BeforeEach
+	void setUp() {
+		parameters = new TimeoutInvocationParameters<>(invocation, timeoutDuration, () -> "description");
+		timeoutInvocationFactory = new TimeoutInvocationFactory(store);
+	}
+
+	@Test
+	@DisplayName("throws exception when null store is provided on create")
+	void shouldThrowExceptionWhenInstantiatingWithNullStore() {
+		assertThatThrownBy(() -> new TimeoutInvocationFactory(null)) //
+				.hasMessage("store must not be null");
+	}
+
+	@Test
+	@DisplayName("throws exception when null timeout thread mode is provided on create")
+	void shouldThrowExceptionWhenNullTimeoutThreadModeIsProvidedWhenCreate() {
+		assertThatThrownBy(() -> timeoutInvocationFactory.create(null, parameters)) //
+				.hasMessage("thread mode must not be null");
+	}
+
+	@Test
+	@DisplayName("throws exception when null timeout invocation parameters is provided on create")
+	void shouldThrowExceptionWhenNullTimeoutInvocationParametersIsProvidedWhenCreate() {
+		assertThatThrownBy(() -> timeoutInvocationFactory.create(ThreadMode.SAME_THREAD, null)) //
+				.hasMessage("timeout invocation parameters must not be null");
+	}
+
+	@Test
+	@DisplayName("creates timeout invocation for SAME_THREAD thread mode")
+	void shouldCreateTimeoutInvocationForSameThreadTimeoutThreadMode() {
+		var invocation = timeoutInvocationFactory.create(ThreadMode.SAME_THREAD, parameters);
+		assertThat(invocation).isInstanceOf(SameThreadTimeoutInvocation.class);
+		verify(store).getOrComputeIfAbsent(SingleThreadExecutorResource.class);
+	}
+
+	@Test
+	@DisplayName("creates timeout invocation for SEPARATE_THREAD thread mode")
+	void shouldCreateTimeoutInvocationForSeparateThreadTimeoutThreadMode() {
+		var invocation = timeoutInvocationFactory.create(ThreadMode.SEPARATE_THREAD, parameters);
+		assertThat(invocation).isInstanceOf(SeparateThreadTimeoutInvocation.class);
+	}
+
+}

From 077adb97d2d7c603d6280f9edcd1c140f96ae3d0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Jun 2022 16:56:00 +0200
Subject: [PATCH 0852/1433] Install Graphviz before running Asciidoctor

---
 .github/workflows/main.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bed703c71cab..43754d118b7c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,6 +23,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 1
+    - name: Install Graphviz
+      run: |
+        sudo apt-get update
+        sudo apt-get install graphviz
     - name: Build
       uses: ./.github/actions/main-build
       with:

From f68034a6d57d840ec5d53762d41a462257292059 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Jun 2022 16:59:45 +0200
Subject: [PATCH 0853/1433] Attempt to stabilize timeout test on Windows

---
 .../junit/jupiter/engine/extension/TimeoutExtensionTests.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 60fdd14ee51d..03cf6deb5622 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -12,6 +12,7 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -712,7 +713,7 @@ void testMethod() {
 
 	static class UnrecoverableExceptionInSeparateThreadTestCase {
 		@Test
-		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		@Timeout(value = 5, unit = SECONDS, threadMode = SEPARATE_THREAD)
 		void test() {
 			throw new OutOfMemoryError();
 		}

From d122341d9be00d9498ed3d216fdd4b17e6035d97 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Jun 2022 17:04:41 +0200
Subject: [PATCH 0854/1433] Polish delivery log

---
 .../release-notes/release-notes-5.9.0-M2.adoc       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
index e7f2ff209872..cb715319fefc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
@@ -46,13 +46,12 @@ on GitHub.
   method is a method declared in the test class with the same name as the
   `@ParameterizedTest` method that is inferred as the factory method when no explicit
   factory method is specified in the `@MethodSource` annotation.
-
-* Thread mode can be set on `@Timeout` annotation. It allows to configure whether the test code
-  is executed in the thread of the calling code or in a separate thread, the modes are:
-  `INFERRED` (default) which resolves the thread mode configured via the
-  property `junit.jupiter.execution.timeout.thread.mode.default`, `SAME_THREAD` that executes
-  the test code in the same thread than the calling code, and `SEPARATE_THREAD` which
-  executes the test code in a separate thread.
+* Thread mode can be set on `@Timeout` annotation. It allows to configure whether test
+  code is executed in the thread of the calling code or in a separate thread. The three
+  modes are: `INFERRED` (default) which resolves the thread mode configured via the
+  property `junit.jupiter.execution.timeout.thread.mode.default`, `SAME_THREAD` that
+  executes the test code in the same thread as the calling code, and `SEPARATE_THREAD`
+  which executes it in a separate thread.
 
 
 [[release-notes-5.9.0-M2-junit-vintage]]

From 8e0c3b8576f27a4b4d43e2dc35ee7368f1e97a46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 10:00:07 +0200
Subject: [PATCH 0855/1433] Bump common-custom-user-data-gradle-plugin to 1.7.2
 (#2937)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index b601b6885b19..5390a9ccfa8f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
 	plugins {
 		id("com.gradle.enterprise") version "3.10.2"
 		id("com.gradle.enterprise.test-distribution") version "2.3.3" // keep in sync with buildSrc/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From 52f96a912bdddd49be463911a1006ada855d7436 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 29 Jun 2022 15:15:31 +0200
Subject: [PATCH 0856/1433] Upgradle to 7.5-rc-3

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 59821 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   6 ++++++
 gradlew.bat                              |  14 ++++++++------
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 10197
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
V^VU-c2;R4Y5)%S~aP=SP{{YK41APDh

delta 9308
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c51a4acc9d2..1e7fb1af96c9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=d10d8e6206d613313379834f3ed94ec7b781790f22edd44b0f2afa76708e2050
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337ff..a69d9cb6c206 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4e6..f127cfd49d40 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From d1f5835b54e8b308aeb4f39862386f2b90cc80bf Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Jul 2022 13:04:32 +0200
Subject: [PATCH 0857/1433] Rename release notes for 5.9 RC1

---
 .../src/docs/asciidoc/release-notes/index.adoc     |  2 +-
 ...-5.9.0-M2.adoc => release-notes-5.9.0-RC1.adoc} | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename documentation/src/docs/asciidoc/release-notes/{release-notes-5.9.0-M2.adoc => release-notes-5.9.0-RC1.adoc} (84%)

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index d01816ea1747..a1306096ed19 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,7 +16,7 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
-include::{basedir}/release-notes-5.9.0-M2.adoc[]
+include::{basedir}/release-notes-5.9.0-RC1.adoc[]
 
 include::{basedir}/release-notes-5.9.0-M1.adoc[]
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
similarity index 84%
rename from documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
rename to documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
index cb715319fefc..377e171511d6 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
@@ -1,16 +1,16 @@
-[[release-notes-5.9.0-M2]]
-== 5.9.0-M2
+[[release-notes-5.9.0-RC1]]
+== 5.9.0-RC1
 
-*Date of Release:* ❓
+*Date of Release:* July ❓, 2022
 
 *Scope:* ❓
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/61?closed=1+[5.9 M2] milestone page in the JUnit repository
+link:{junit5-repo}+/milestone/61?closed=1+[5.9 RC1] milestone page in the JUnit repository
 on GitHub.
 
 
-[[release-notes-5.9.0-M2-junit-platform]]
+[[release-notes-5.9.0-RC1-junit-platform]]
 === JUnit Platform
 
 ==== Bug Fixes
@@ -29,7 +29,7 @@ on GitHub.
 * New public factory method to instantiate an `ExecutionRequest`.
 
 
-[[release-notes-5.9.0-M2-junit-jupiter]]
+[[release-notes-5.9.0-RC1-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -54,7 +54,7 @@ on GitHub.
   which executes it in a separate thread.
 
 
-[[release-notes-5.9.0-M2-junit-vintage]]
+[[release-notes-5.9.0-RC1-junit-vintage]]
 === JUnit Vintage
 
 ==== Bug Fixes

From 1b1114bdab2641fa3ab31642519a11f4589b3a5f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Jul 2022 13:39:17 +0200
Subject: [PATCH 0858/1433] Polish wording in User Guide

---
 .../user-guide/migration-from-junit4.adoc     | 50 +++++++++----------
 .../docs/asciidoc/user-guide/overview.adoc    |  2 +-
 .../asciidoc/user-guide/running-tests.adoc    | 20 ++++----
 .../asciidoc/user-guide/writing-tests.adoc    | 11 ++--
 4 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
index 62c9f88efadc..09d351fbfec6 100644
--- a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
@@ -1,26 +1,26 @@
 [[migrating-from-junit4]]
 == Migrating from JUnit 4
 
-Although the JUnit Jupiter programming model and extension model will not support JUnit 4
+Although the JUnit Jupiter programming model and extension model do not support JUnit 4
 features such as `Rules` and `Runners` natively, it is not expected that source code
 maintainers will need to update all of their existing tests, test extensions, and custom
 build test infrastructure to migrate to JUnit Jupiter.
 
 Instead, JUnit provides a gentle migration path via a _JUnit Vintage test engine_ which
-allows existing tests based on JUnit 3 and JUnit 4 to be executed using the JUnit
-Platform infrastructure. Since all classes and annotations specific to JUnit Jupiter
-reside under a new `org.junit.jupiter` base package, having both JUnit 4 and JUnit
-Jupiter in the classpath does not lead to any conflicts. It is therefore safe to maintain
-existing JUnit 4 tests alongside JUnit Jupiter tests. Furthermore, since the JUnit team
-will continue to provide maintenance and bug fix releases for the JUnit 4.x baseline,
-developers have plenty of time to migrate to JUnit Jupiter on their own schedule.
+allows existing tests based on JUnit 3 and JUnit 4 to be executed using the JUnit Platform
+infrastructure. Since all classes and annotations specific to JUnit Jupiter reside under
+the `org.junit.jupiter` base package, having both JUnit 4 and JUnit Jupiter in the
+classpath does not lead to any conflicts. It is therefore safe to maintain existing JUnit
+4 tests alongside JUnit Jupiter tests. Furthermore, since the JUnit team will continue to
+provide maintenance and bug fix releases for the JUnit 4.x baseline, developers have
+plenty of time to migrate to JUnit Jupiter on their own schedule.
 
 
 [[migrating-from-junit4-running]]
 === Running JUnit 4 Tests on the JUnit Platform
 
-Just make sure that the `junit-vintage-engine` artifact is in your test runtime path. In
-that case JUnit 3 and JUnit 4 tests will automatically be picked up by the JUnit Platform
+Make sure that the `junit-vintage-engine` artifact is in your test runtime path. In that
+case JUnit 3 and JUnit 4 tests will automatically be picked up by the JUnit Platform
 launcher.
 
 See the example projects in the {junit5-samples-repo}[`junit5-samples`] repository to
@@ -31,10 +31,10 @@ find out how this is done with Gradle and Maven.
 
 For test classes or methods that are annotated with `@Category`, the _JUnit Vintage test
 engine_ exposes the category's fully qualified class name as a <<running-tests-tags, tag>>
-of the corresponding test identifier. For example, if a test method is annotated with
-`@Category(Example.class)`, it will be tagged with `"com.acme.Example"`. Similar to the
-`Categories` runner in JUnit 4, this information can be used to filter the discovered
-tests before executing them (see <<running-tests>> for details).
+for the corresponding test class or test method. For example, if a test method is
+annotated with `@Category(Example.class)`, it will be tagged with `"com.acme.Example"`.
+Similar to the `Categories` runner in JUnit 4, this information can be used to filter the
+discovered tests before executing them (see <<running-tests>> for details).
 
 
 [[migrating-from-junit4-tips]]
@@ -61,7 +61,7 @@ tests to JUnit Jupiter.
 * `@Category` no longer exists; use `@Tag` instead.
 * `@RunWith` no longer exists; superseded by `@ExtendWith`.
 * `@Rule` and `@ClassRule` no longer exist; superseded by `@ExtendWith` and
-  `@RegisterExtension`
+  `@RegisterExtension`.
   - See also <<migrating-from-junit4-rule-support>>.
 * Assertions and assumptions in JUnit Jupiter accept the failure message as their last
   argument instead of the first one.
@@ -98,7 +98,7 @@ all rule migration support extensions: `VerifierSupport`, `ExternalResourceSuppo
 `@EnableJUnit4MigrationSupport` which registers migration support for rules _and_ JUnit
 4's `@Ignore` annotation (see <<migrating-from-junit4-ignore-annotation-support>>).
 
-However, if you intend to develop a new extension for JUnit 5 please use the new
+However, if you intend to develop a new extension for JUnit Jupiter please use the new
 extension model of JUnit Jupiter instead of the rule-based model of JUnit 4.
 
 
@@ -127,15 +127,15 @@ include::{testDir}/example/IgnoredTestsDemo.java[tags=user_guide]
 === Failure Message Arguments
 
 The `Assumptions` and `Assertions` classes in JUnit Jupiter declare arguments in a
-different order than in JUnit 4. In JUnit 4 assertion and assumption methods accept
-the failure message as the first argument; whereas, in JUnit Jupiter assertion and
-assumption methods accept the failure message as the last argument.
-
-For instance, the method `assertEquals` in JUnit 4 is declared as
-`assertEquals(String message, Object expected, Object actual)`, but in JUnit Jupiter it
-is declared as `assertEquals(Object expected, Object actual, String message)`.
-The rationale for this is that a failure message is _optional_, and optional arguments
-should be declared after required arguments in a method signature.
+different order than in JUnit 4. In JUnit 4 assertion and assumption methods accept the
+failure message as the first argument; whereas, in JUnit Jupiter assertion and assumption
+methods accept the failure message as the last argument.
+
+For instance, the method `assertEquals` in JUnit 4 is declared as `assertEquals(String
+message, Object expected, Object actual)`, but in JUnit Jupiter it is declared as
+`assertEquals(Object expected, Object actual, String message)`. The rationale for this is
+that a failure message is _optional_, and optional arguments should be declared after
+required arguments in a method signature.
 
 The methods affected by this change are the following:
 
diff --git a/documentation/src/docs/asciidoc/user-guide/overview.adoc b/documentation/src/docs/asciidoc/user-guide/overview.adoc
index 708b6c97afbc..d06a5eb53eda 100644
--- a/documentation/src/docs/asciidoc/user-guide/overview.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/overview.adoc
@@ -30,7 +30,7 @@ exists in popular IDEs (see <<running-tests-ide-intellij-idea>>,
 <<running-tests-ide-vscode>>) and build tools (see <<running-tests-build-gradle>>,
 <<running-tests-build-maven>>, and <<running-tests-build-ant>>).
 
-**JUnit Jupiter** is the combination of the new <<writing-tests,programming model>> and
+**JUnit Jupiter** is the combination of the <<writing-tests,programming model>> and
 <<extensions,extension model>> for writing tests and extensions in JUnit 5. The Jupiter
 sub-project provides a `TestEngine` for running Jupiter based tests on the platform.
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index f8d3c14885a2..23dea662ff0e 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -131,7 +131,7 @@ Platform 1.2 and discontinued in 1.3. Please switch to Gradle's standard `test`
 
 Starting with https://docs.gradle.org/4.6/release-notes.html[version 4.6], Gradle provides
 https://docs.gradle.org/current/userguide/java_testing.html#using_junit5[native support]
-for executing tests on the JUnit Platform. To enable it, you just need to specify
+for executing tests on the JUnit Platform. To enable it, you need to specify
 `useJUnitPlatform()` within a `test` task declaration in `build.gradle`:
 
 [source,groovy,indent=0]
@@ -441,18 +441,18 @@ below) or via the `junit-platform.properties` file.
 [[running-tests-build-ant]]
 ==== Ant
 
-Starting with version `1.10.3` of link:https://ant.apache.org/[Ant], a new
-link:https://ant.apache.org/manual/Tasks/junitlauncher.html[`junitlauncher`] task has
-been introduced to provide native support for launching tests on the JUnit Platform. The
-`junitlauncher` task is solely responsible for launching the JUnit Platform and passing
-it the selected collection of tests. The JUnit Platform then delegates to registered test
-engines to discover and execute the tests.
+Starting with version `1.10.3`, link:https://ant.apache.org/[Ant] has a
+link:https://ant.apache.org/manual/Tasks/junitlauncher.html[`junitlauncher`] task that
+provides native support for launching tests on the JUnit Platform. The `junitlauncher`
+task is solely responsible for launching the JUnit Platform and passing it the selected
+collection of tests. The JUnit Platform then delegates to registered test engines to
+discover and execute the tests.
 
-The `junitlauncher` task attempts to align as close as possible with native Ant
+The `junitlauncher` task attempts to align as closely as possible with native Ant
 constructs such as
 link:https://ant.apache.org/manual/Types/resources.html#collection[resource collections]
-for allowing users to select the tests that they want executed by test engines. This
-gives the task a consistent and natural feel when compared to many other core Ant tasks.
+for allowing users to select the tests that they want executed by test engines. This gives
+the task a consistent and natural feel when compared to many other core Ant tasks.
 
 Starting with version `1.10.6` of Ant, the `junitlauncher` task supports
 link:https://ant.apache.org/manual/Tasks/junitlauncher.html#fork[forking the tests in a separate JVM].
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index c56837489655..b630cde79f43 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1967,12 +1967,11 @@ and dynamic tests.
 The first method returns an invalid return type. Since an invalid return type cannot be
 detected at compile time, a `JUnitException` is thrown when it is detected at runtime.
 
-The next six methods are very simple examples that demonstrate the generation of a
-`Collection`, `Iterable`, `Iterator`, array, or `Stream` of `DynamicTest` instances. Most
-of these examples do not really exhibit dynamic behavior but merely demonstrate the
-supported return types in principle. However, `dynamicTestsFromStream()` and
-`dynamicTestsFromIntStream()` demonstrate how easy it is to generate dynamic tests for a
-given set of strings or a range of input numbers.
+The next six methods demonstrate the generation of a `Collection`, `Iterable`, `Iterator`,
+array, or `Stream` of `DynamicTest` instances. Most of these examples do not really
+exhibit dynamic behavior but merely demonstrate the supported return types in principle.
+However, `dynamicTestsFromStream()` and `dynamicTestsFromIntStream()` demonstrate how to
+generate dynamic tests for a given set of strings or a range of input numbers.
 
 The next method is truly dynamic in nature. `generateRandomNumberOfTests()` implements an
 `Iterator` that generates random numbers, a display name generator, and a test executor

From b1e7a652dbb1a5ce596b00aea7bdba1f6ee369a3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Jul 2022 14:26:27 +0200
Subject: [PATCH 0859/1433] Document how to manage JUnit version in Spring Boot
 Gradle/Maven builds

Closes #2820
---
 .../asciidoc/user-guide/running-tests.adoc    | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 23dea662ff0e..3fcb484f7193 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -162,6 +162,9 @@ Please refer to the
 https://docs.gradle.org/current/userguide/java_plugin.html#sec:java_test[official Gradle documentation]
 for a comprehensive list of options.
 
+NOTE: See <<running-tests-build-spring-boot>> for details on how to override the version
+of JUnit used in your Spring Boot application.
+
 [[running-tests-build-gradle-config-params]]
 ===== Configuration Parameters
 
@@ -256,6 +259,9 @@ for executing tests on the JUnit Platform. The `pom.xml` file in the
 `{junit5-jupiter-starter-maven}` project demonstrates how to use the Maven Surefire plugin
 and can serve as a starting point for configuring your Maven build.
 
+NOTE: See <<running-tests-build-spring-boot>> for details on how to override the version
+of JUnit used in your Spring Boot application.
+
 [[running-tests-build-maven-engines-configure]]
 ===== Configuring Test Engines
 
@@ -515,6 +521,48 @@ For further details on usage and configuration options please refer to the offic
 documentation for the
 link:https://ant.apache.org/manual/Tasks/junitlauncher.html[`junitlauncher` task].
 
+[[running-tests-build-spring-boot]]
+==== Spring Boot
+
+link:https://spring.io/projects/spring-boot[Spring Boot] provides automatic support for
+managing the version of JUnit used in your project. In addition, the
+`spring-boot-starter-test` artifact automatically includes testing libraries such as JUnit
+Jupiter, AspectJ, Mockito, etc.
+
+If your build relies on dependency management support from Spring Boot, you should not
+import the <<dependency-metadata-junit-bom,`junit-bom`>> in your build script since that
+will result in duplicate (and potentially conflicting) management of JUnit dependencies.
+
+If you need to override the version of a dependency used in your Spring Boot application,
+you have to override the exact name of the
+link:https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#appendix.dependency-versions.properties[version property]
+defined in the BOM used by the Spring Boot plugin. For example, the name of the JUnit
+Jupiter version property in Spring Boot is `junit-jupiter.version`. The mechanism for
+changing a dependency version is documented for both
+link:https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#managing-dependencies.dependency-management-plugin.customizing[Gradle]
+and
+link:https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/#using.parent-pom[Maven].
+
+With Gradle you can override the JUnit Jupiter version by including the following in your
+`build.gradle` file.
+
+[source,groovy,indent=0]
+[subs=attributes+]
+----
+	ext['junit-jupiter.version'] = '{jupiter-version}'
+----
+
+With Maven you can override the JUnit Jupiter version by including the following in your
+`pom.xml` file.
+
+[source,xml,indent=0]
+[subs=attributes+]
+----
+	<properties>
+		<junit-jupiter.version>{jupiter-version}</junit-jupiter.version>
+	</properties>
+----
+
 [[running-tests-console-launcher]]
 === Console Launcher
 

From 1f807e205ec972be68bbcf00ecfa63da734aa0c6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Jul 2022 15:36:41 +0200
Subject: [PATCH 0860/1433] Document #2820 in Release Notes

---
 .../docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
index 377e171511d6..48704cea84ba 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
@@ -27,6 +27,8 @@ on GitHub.
 ==== New Features and Improvements
 
 * New public factory method to instantiate an `ExecutionRequest`.
+* Documentation for overriding the JUnit version used in Spring Boot applications. See the
+  <<../user-guide/index.adoc#running-tests-build-spring-boot, User Guide>> for details.
 
 
 [[release-notes-5.9.0-RC1-junit-jupiter]]

From d346a7feacbd7035a302e8ea875c205354492b03 Mon Sep 17 00:00:00 2001
From: Michael Fomenko <michael.fmnk@gmail.com>
Date: Sat, 2 Jul 2022 16:27:56 +0300
Subject: [PATCH 0861/1433] Added support conditional execution based on
 architecture (#2894)

The `EnabledOnOs` and `DisabledOnOs` annotations now have
`architectures` attributes for enabling/disabling tests based on the
architecture of the system executing them.

Resolves #2848.

Co-authored-by: Juliette de Rancourt <derancourt.juliette@gmail.com>
Co-authored-by: Sam Brannen <sbrannen@vmware.com>
Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes-5.9.0-RC1.adoc              |   2 +
 .../asciidoc/user-guide/writing-tests.adoc    |  15 ++-
 .../example/ConditionalTestExecutionDemo.java |  26 +++++
 .../AbstractOsBasedExecutionCondition.java    |  74 ++++++++++++
 .../jupiter/api/condition/DisabledOnOs.java   |  19 ++-
 .../api/condition/DisabledOnOsCondition.java  |  38 ++++--
 .../jupiter/api/condition/EnabledOnOs.java    |  19 ++-
 .../api/condition/EnabledOnOsCondition.java   |  38 ++++--
 .../condition/DisabledOnOsConditionTests.java | 108 +++++++++++++++++-
 .../DisabledOnOsIntegrationTests.java         |  50 +++++++-
 .../condition/EnabledOnOsConditionTests.java  | 106 ++++++++++++++++-
 .../EnabledOnOsIntegrationTests.java          |  61 +++++++++-
 12 files changed, 519 insertions(+), 37 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
index 48704cea84ba..60664173d1a2 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
@@ -54,6 +54,8 @@ on GitHub.
   property `junit.jupiter.execution.timeout.thread.mode.default`, `SAME_THREAD` that
   executes the test code in the same thread as the calling code, and `SEPARATE_THREAD`
   which executes it in a separate thread.
+* Support for enabling/disabling tests based on the system's hardware architecture via new
+  `architectures` attributes on `@EnabledOnOs` and `@DisabledOnOs`.
 
 
 [[release-notes-5.9.0-RC1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index b630cde79f43..2099006c940c 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -418,17 +418,26 @@ the `org.junit.jupiter.api.condition` package.
 ====
 
 [[writing-tests-conditional-execution-os]]
-==== Operating System Conditions
+==== Operating System and Architecture Conditions
 
-A container or test may be enabled or disabled on a particular operating system via the
-`{EnabledOnOs}` and `{DisabledOnOs}` annotations.
+A container or test may be enabled or disabled on a particular operating system,
+architecture, or combination of both via the `{EnabledOnOs}` and `{DisabledOnOs}`
+annotations.
 
 [[writing-tests-conditional-execution-os-demo]]
 [source,java,indent=0]
+.Conditional execution based on operating system
 ----
 include::{testDir}/example/ConditionalTestExecutionDemo.java[tags=user_guide_os]
 ----
 
+[[writing-tests-conditional-execution-architectures-demo]]
+[source,java,indent=0]
+.Conditional execution based on architecture
+----
+include::{testDir}/example/ConditionalTestExecutionDemo.java[tags=user_guide_architecture]
+----
+
 [[writing-tests-conditional-execution-jre]]
 ==== Java Runtime Environment Conditions
 
diff --git a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
index 38a15b01aa2a..d4dea7b4f31f 100644
--- a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
+++ b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
@@ -71,6 +71,32 @@ void notOnWindows() {
 	}
 	// end::user_guide_os[]
 
+	// tag::user_guide_architecture[]
+	@Test
+	@EnabledOnOs(architectures = "aarch64")
+	void onAarch64() {
+		// ...
+	}
+
+	@Test
+	@DisabledOnOs(architectures = "x86_64")
+	void notOnX86_64() {
+		// ...
+	}
+
+	@Test
+	@EnabledOnOs(value = MAC, architectures = "aarch64")
+	void onNewMacs() {
+		// ...
+	}
+
+	@Test
+	@DisabledOnOs(value = MAC, architectures = "aarch64")
+	void notOnNewMacs() {
+		// ...
+	}
+	// end::user_guide_architecture[]
+
 	// tag::user_guide_jre[]
 	@Test
 	@EnabledOnJre(JAVA_8)
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java
new file mode 100644
index 000000000000..014623805305
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.condition;
+
+import static org.junit.jupiter.api.extension.ConditionEvaluationResult.enabled;
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
+
+import java.lang.annotation.Annotation;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Base class for OS-based {@link ExecutionCondition} implementations.
+ *
+ * @since 5.9
+ */
+abstract class AbstractOsBasedExecutionCondition<A extends Annotation> implements ExecutionCondition {
+	private final Class<A> annotationType;
+
+	AbstractOsBasedExecutionCondition(Class<A> annotationType) {
+		this.annotationType = annotationType;
+	}
+
+	@Override
+	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+		return findAnnotation(context.getElement(), annotationType) //
+				.map(this::evaluateExecutionCondition) //
+				.orElseGet(this::enabledByDefault);
+	}
+
+	abstract ConditionEvaluationResult evaluateExecutionCondition(A annotation);
+
+	protected String createReason(boolean enabled, boolean osSpecified, boolean archSpecified) {
+		StringBuilder reason = new StringBuilder() //
+				.append(enabled ? "Enabled" : "Disabled") //
+				.append(osSpecified ? " on operating system: " : " on architecture: ");
+
+		if (osSpecified && archSpecified) {
+			reason.append(String.format("%s (%s)", currentOS(), currentArchitecture()));
+		}
+		else if (osSpecified) {
+			reason.append(currentOS());
+		}
+		else {
+			reason.append(currentArchitecture());
+		}
+
+		return reason.toString();
+	}
+
+	private ConditionEvaluationResult enabledByDefault() {
+		String reason = String.format("@%s is not present", annotationType.getSimpleName());
+		return enabled(reason);
+	}
+
+	private String currentOS() {
+		return System.getProperty("os.name");
+	}
+
+	protected String currentArchitecture() {
+		return System.getProperty("os.arch");
+	}
+
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index cd894771be7c..3e4c67799a05 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -24,10 +24,15 @@
 /**
  * {@code @DisabledOnOs} is used to signal that the annotated test class or
  * test method is <em>disabled</em> on one or more specified
- * {@linkplain #value operating systems}.
+ * {@linkplain #value operating systems} or on one or more specified
+ * {@linkplain #architectures architectures}
+ *
+ * <p>If operating systems and architectures are specified, the annotated test
+ * class or test method is disabled if both conditions apply.
  *
  * <p>When applied at the class level, all test methods within that class
- * will be disabled on the same specified operating systems.
+ * will be disabled on the same specified operating systems, architectures, or
+ * the specified combinations of both.
  *
  * <p>If a test method is disabled via this annotation, that does not prevent
  * the test class from being instantiated. Rather, it prevents the execution of
@@ -77,7 +82,15 @@
 	 *
 	 * @see OS
 	 */
-	OS[] value();
+	OS[] value() default {};
+
+	/**
+	 * Architectures on which the annotated class or method should be disabled.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	String[] architectures() default {};
 
 	/**
 	 * Custom reason to provide if the test or container is disabled.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
index f3dd92a58991..ba546207030d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
@@ -10,11 +10,9 @@
 
 package org.junit.jupiter.api.condition;
 
-import static org.junit.jupiter.api.condition.EnabledOnOsCondition.DISABLED_ON_CURRENT_OS;
-import static org.junit.jupiter.api.condition.EnabledOnOsCondition.ENABLED_ON_CURRENT_OS;
-
 import java.util.Arrays;
 
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.platform.commons.util.Preconditions;
 
@@ -24,16 +22,42 @@
  * @since 5.1
  * @see DisabledOnOs
  */
-class DisabledOnOsCondition extends BooleanExecutionCondition<DisabledOnOs> {
+class DisabledOnOsCondition extends AbstractOsBasedExecutionCondition<DisabledOnOs> {
 
 	DisabledOnOsCondition() {
-		super(DisabledOnOs.class, ENABLED_ON_CURRENT_OS, DISABLED_ON_CURRENT_OS, DisabledOnOs::disabledReason);
+		super(DisabledOnOs.class);
 	}
 
 	@Override
-	boolean isEnabled(DisabledOnOs annotation) {
+	ConditionEvaluationResult evaluateExecutionCondition(DisabledOnOs annotation) {
+		boolean osSpecified = annotation.value().length > 0;
+		boolean archSpecified = annotation.architectures().length > 0;
+		Preconditions.condition(osSpecified || archSpecified,
+			"You must declare at least one OS or architecture in @DisabledOnOs");
+
+		boolean enabled = isEnabledBasedOnOs(annotation) || isEnabledBasedOnArchitecture(annotation);
+		String reason = createReason(enabled, osSpecified, archSpecified);
+
+		return enabled ? ConditionEvaluationResult.enabled(reason)
+				: ConditionEvaluationResult.disabled(reason, annotation.disabledReason());
+	}
+
+	private boolean isEnabledBasedOnArchitecture(DisabledOnOs annotation) {
+		String[] architectures = annotation.architectures();
+		if (architectures.length == 0) {
+			return false;
+		}
+
+		String currentArchitecture = currentArchitecture();
+		return Arrays.stream(architectures).noneMatch(currentArchitecture::equalsIgnoreCase);
+	}
+
+	private boolean isEnabledBasedOnOs(DisabledOnOs annotation) {
 		OS[] operatingSystems = annotation.value();
-		Preconditions.condition(operatingSystems.length > 0, "You must declare at least one OS in @DisabledOnOs");
+		if (operatingSystems.length == 0) {
+			return false;
+		}
+
 		return Arrays.stream(operatingSystems).noneMatch(OS::isCurrentOs);
 	}
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index 691cc9ad6069..389d1030dc51 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -24,10 +24,15 @@
 /**
  * {@code @EnabledOnOs} is used to signal that the annotated test class or
  * test method is only <em>enabled</em> on one or more specified
- * {@linkplain #value operating systems}.
+ * {@linkplain #value operating systems} or one or more specified
+ * {@linkplain #architectures architectures}.
+ *
+ * <p>If operating systems and architectures are specified, the annotated test
+ * class or test method is enabled if both conditions apply.
  *
  * <p>When applied at the class level, all test methods within that class
- * will be enabled on the same specified operating systems.
+ * will be enabled on the same specified operating systems, architectures, or
+ * the specified combinations of both.
  *
  * <p>If a test method is disabled via this annotation, that does not prevent
  * the test class from being instantiated. Rather, it prevents the execution of
@@ -77,7 +82,15 @@
 	 *
 	 * @see OS
 	 */
-	OS[] value();
+	OS[] value() default {};
+
+	/**
+	 * Architectures on which the annotated class or method should be enabled.
+	 *
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	String[] architectures() default {};
 
 	/**
 	 * Custom reason to provide if the test or container is disabled.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
index ef6b3c86820e..5ae5e008181c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
@@ -12,6 +12,7 @@
 
 import java.util.Arrays;
 
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.platform.commons.util.Preconditions;
 
@@ -21,20 +22,41 @@
  * @since 5.1
  * @see EnabledOnOs
  */
-class EnabledOnOsCondition extends BooleanExecutionCondition<EnabledOnOs> {
-
-	static final String ENABLED_ON_CURRENT_OS = "Enabled on operating system: " + System.getProperty("os.name");
-
-	static final String DISABLED_ON_CURRENT_OS = "Disabled on operating system: " + System.getProperty("os.name");
+class EnabledOnOsCondition extends AbstractOsBasedExecutionCondition<EnabledOnOs> {
 
 	EnabledOnOsCondition() {
-		super(EnabledOnOs.class, ENABLED_ON_CURRENT_OS, DISABLED_ON_CURRENT_OS, EnabledOnOs::disabledReason);
+		super(EnabledOnOs.class);
 	}
 
 	@Override
-	boolean isEnabled(EnabledOnOs annotation) {
+	ConditionEvaluationResult evaluateExecutionCondition(EnabledOnOs annotation) {
+		boolean osSpecified = annotation.value().length > 0;
+		boolean archSpecified = annotation.architectures().length > 0;
+		Preconditions.condition(osSpecified || archSpecified,
+			"You must declare at least one OS or architecture in @EnabledOnOs");
+
+		boolean enabled = isEnabledBasedOnOs(annotation) && isEnabledBasedOnArchitecture(annotation);
+		String reason = createReason(enabled, osSpecified, archSpecified);
+
+		return enabled ? ConditionEvaluationResult.enabled(reason)
+				: ConditionEvaluationResult.disabled(reason, annotation.disabledReason());
+	}
+
+	private boolean isEnabledBasedOnArchitecture(EnabledOnOs annotation) {
+		String[] architectures = annotation.architectures();
+		if (architectures.length == 0) {
+			return true;
+		}
+
+		String currentArchitecture = currentArchitecture();
+		return Arrays.stream(architectures).anyMatch(currentArchitecture::equalsIgnoreCase);
+	}
+
+	private boolean isEnabledBasedOnOs(EnabledOnOs annotation) {
 		OS[] operatingSystems = annotation.value();
-		Preconditions.condition(operatingSystems.length > 0, "You must declare at least one OS in @EnabledOnOs");
+		if (operatingSystems.length == 0) {
+			return true;
+		}
 		return Arrays.stream(operatingSystems).anyMatch(OS::isCurrentOs);
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
index fde27eb03abf..d6c4af6998f3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onAix;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onArchitecture;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onFreebsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onLinux;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onMac;
@@ -35,6 +36,7 @@
 class DisabledOnOsConditionTests extends AbstractExecutionConditionTests {
 
 	private static final String OS_NAME = System.getProperty("os.name");
+	private static final String ARCH = System.getProperty("os.arch");
 
 	@Override
 	protected ExecutionCondition getExecutionCondition() {
@@ -57,12 +59,12 @@ void enabledBecauseAnnotationIsNotPresent() {
 	}
 
 	/**
-	 * @see DisabledOnOsIntegrationTests#missingOsDeclaration()
+	 * @see DisabledOnOsIntegrationTests#missingOsAndArchitectureDeclaration()
 	 */
 	@Test
-	void missingOsDeclaration() {
+	void missingOsAndArchitectureDeclaration() {
 		Exception exception = assertThrows(PreconditionViolationException.class, this::evaluateCondition);
-		assertThat(exception).hasMessageContaining("You must declare at least one OS");
+		assertThat(exception).hasMessageContaining("You must declare at least one OS or architecture");
 	}
 
 	/**
@@ -72,7 +74,7 @@ void missingOsDeclaration() {
 	void disabledOnEveryOs() {
 		evaluateCondition();
 		assertDisabled();
-		assertReasonContains("Disabled on operating system: " + OS_NAME + " ==> Disabled on every OS");
+		assertReasonContains(String.format("Disabled on operating system: %s ==> Disabled on every OS", OS_NAME));
 	}
 
 	/**
@@ -157,14 +159,108 @@ void other() {
 			!(onAix() || onFreebsd() || onLinux() || onMac() || onOpenbsd() || onSolaris() || onWindows()));
 	}
 
+	/**
+	 * @see DisabledOnOsIntegrationTests#architectureX86_64()
+	 */
+	@Test
+	void architectureX86_64() {
+		evaluateCondition();
+		assertDisabledOnCurrentArchitectureIf(onArchitecture("x86_64"));
+	}
+
+	/**
+	 * @see DisabledOnOsIntegrationTests#architectureAarch64()
+	 */
+	@Test
+	void architectureAarch64() {
+		evaluateCondition();
+		assertDisabledOnCurrentArchitectureIf(onArchitecture("aarch64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#architectureX86_64WithMacOs()
+	 */
+	@Test
+	void architectureX86_64WithMacOs() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsAndArchitectureIf(onMac() && onArchitecture("x86_64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#architectureX86_64WithWindows()
+	 */
+	@Test
+	void architectureX86_64WithWindows() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsAndArchitectureIf(onWindows() && onArchitecture("x86_64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#architectureX86_64WithLinux()
+	 */
+	@Test
+	void architectureX86_64WithLinux() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsAndArchitectureIf(onLinux() && onArchitecture("x86_64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#aarch64WithMacOs()
+	 */
+	@Test
+	void aarch64WithMacOs() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsAndArchitectureIf(onMac() && onArchitecture("aarch64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#aarch64WithWindows()
+	 */
+	@Test
+	void aarch64WithWindows() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsAndArchitectureIf(onWindows() && onArchitecture("aarch64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#aarch64WithLinux()
+	 */
+	@Test
+	void aarch64WithLinux() {
+		evaluateCondition();
+		assertDisabledOnCurrentOsAndArchitectureIf(onLinux() && onArchitecture("aarch64"));
+	}
+
 	private void assertDisabledOnCurrentOsIf(boolean condition) {
 		if (condition) {
 			assertDisabled();
-			assertReasonContains("Disabled on operating system: " + OS_NAME);
+			assertReasonContains(String.format("Disabled on operating system: %s", OS_NAME));
+		}
+		else {
+			assertEnabled();
+			assertReasonContains(String.format("Enabled on operating system: %s", OS_NAME));
+		}
+	}
+
+	private void assertDisabledOnCurrentArchitectureIf(boolean condition) {
+		if (condition) {
+			assertDisabled();
+			assertReasonContains(String.format("Disabled on architecture: %s", ARCH));
+		}
+		else {
+			assertEnabled();
+			assertReasonContains(String.format("Enabled on architecture: %s", ARCH));
+		}
+	}
+
+	private void assertDisabledOnCurrentOsAndArchitectureIf(boolean condition) {
+		if (condition) {
+			assertDisabled();
+			assertReasonContains(String.format("Disabled on operating system: %s (%s)", OS_NAME, ARCH));
 		}
 		else {
 			assertEnabled();
-			assertReasonContains("Enabled on operating system: " + OS_NAME);
+			assertReasonContains(String.format("Enabled on operating system: %s (%s)", OS_NAME, ARCH));
 		}
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
index e26d47fe9c39..859fd018e742 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onAix;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onArchitecture;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onFreebsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onLinux;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onMac;
@@ -52,7 +53,7 @@ void enabledBecauseAnnotationIsNotPresent() {
 	@Test
 	@Disabled("Only used in a unit test via reflection")
 	@DisabledOnOs({})
-	void missingOsDeclaration() {
+	void missingOsAndArchitectureDeclaration() {
 	}
 
 	@Test
@@ -116,6 +117,53 @@ void other() {
 		assertTrue(onAix() || onFreebsd() || onLinux() || onMac() || onOpenbsd() || onSolaris() || onWindows());
 	}
 
+	@Test
+	@DisabledOnOs(architectures = "x86_64")
+	void architectureX86_64() {
+		assertFalse(onArchitecture("x_86_64"));
+	}
+
+	@Test
+	@DisabledOnOs(architectures = "aarch64")
+	void architectureAarch64() {
+		assertFalse(onArchitecture("aarch64"));
+	}
+
+	@Test
+	@DisabledOnOs(value = MAC, architectures = "x86_64")
+	void architectureX86_64WithMacOs() {
+		assertFalse(onMac() && onArchitecture("x_86_64"));
+	}
+
+	@Test
+	@DisabledOnOs(value = WINDOWS, architectures = "x86_64")
+	void architectureX86_64WithWindows() {
+		assertFalse(onWindows() && onArchitecture("x86_64"));
+	}
+
+	@Test
+	@DisabledOnOs(value = LINUX, architectures = "x86_64")
+	void architectureX86_64WithLinux() {
+		assertFalse(onLinux() && onArchitecture("x86_64"));
+	}
+
+	@Test
+	@DisabledOnOs(value = MAC, architectures = "aarch64")
+	void aarch64WithMacOs() {
+		assertFalse(onMac() && onArchitecture("aarch64"));
+	}
+
+	@Test
+	@DisabledOnOs(value = WINDOWS, architectures = "aarch64")
+	void aarch64WithWindows() {
+		assertFalse(onWindows() && onArchitecture("aarch64"));
+	}
+
+	@Test
+	@DisabledOnOs(value = LINUX, architectures = "aarch64")
+	void aarch64WithLinux() {
+		assertFalse(onLinux() && onArchitecture("aarch64"));
+	}
 	// -------------------------------------------------------------------------
 
 	@Target(ElementType.METHOD)
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
index 284030f08739..ddfccaebeb93 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onAix;
+import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onArchitecture;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onFreebsd;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onLinux;
 import static org.junit.jupiter.api.condition.EnabledOnOsIntegrationTests.onMac;
@@ -35,6 +36,7 @@
 class EnabledOnOsConditionTests extends AbstractExecutionConditionTests {
 
 	private static final String OS_NAME = System.getProperty("os.name");
+	private static final String ARCH = System.getProperty("os.arch");
 
 	@Override
 	protected ExecutionCondition getExecutionCondition() {
@@ -57,12 +59,12 @@ void enabledBecauseAnnotationIsNotPresent() {
 	}
 
 	/**
-	 * @see EnabledOnOsIntegrationTests#missingOsDeclaration()
+	 * @see EnabledOnOsIntegrationTests#missingOsAndArchitectureDeclaration()
 	 */
 	@Test
-	void missingOsDeclaration() {
+	void missingOsAndArchitectureDeclaration() {
 		Exception exception = assertThrows(PreconditionViolationException.class, this::evaluateCondition);
-		assertThat(exception).hasMessageContaining("You must declare at least one OS");
+		assertThat(exception).hasMessageContaining("You must declare at least one OS or architecture");
 	}
 
 	/**
@@ -157,14 +159,108 @@ void other() {
 		assertCustomDisabledReasonIs("Disabled on almost every OS");
 	}
 
+	/**
+	 * @see EnabledOnOsIntegrationTests#architectureX86_64()
+	 */
+	@Test
+	void architectureX86_64() {
+		evaluateCondition();
+		assertEnabledOnCurrentArchitectureIf(onArchitecture("x86_64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#architectureAarch64()
+	 */
+	@Test
+	void architectureAarch64() {
+		evaluateCondition();
+		assertEnabledOnCurrentArchitectureIf(onArchitecture("aarch64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#architectureX86_64WithMacOs()
+	 */
+	@Test
+	void architectureX86_64WithMacOs() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsAndArchitectureIf(onMac() && onArchitecture("x86_64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#architectureX86_64WithWindows()
+	 */
+	@Test
+	void architectureX86_64WithWindows() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsAndArchitectureIf(onWindows() && onArchitecture("x86_64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#architectureX86_64WithLinux()
+	 */
+	@Test
+	void architectureX86_64WithLinux() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsAndArchitectureIf(onLinux() && onArchitecture("x86_64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#aarch64WithMacOs()
+	 */
+	@Test
+	void aarch64WithMacOs() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsAndArchitectureIf(onMac() && onArchitecture("aarch64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#aarch64WithWindows()
+	 */
+	@Test
+	void aarch64WithWindows() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsAndArchitectureIf(onWindows() && onArchitecture("aarch64"));
+	}
+
+	/**
+	 * @see EnabledOnOsIntegrationTests#aarch64WithLinux()
+	 */
+	@Test
+	void aarch64WithLinux() {
+		evaluateCondition();
+		assertEnabledOnCurrentOsAndArchitectureIf(onLinux() && onArchitecture("aarch64"));
+	}
+
 	private void assertEnabledOnCurrentOsIf(boolean condition) {
 		if (condition) {
 			assertEnabled();
-			assertReasonContains("Enabled on operating system: " + OS_NAME);
+			assertReasonContains(String.format("Enabled on operating system: %s", OS_NAME));
+		}
+		else {
+			assertDisabled();
+			assertReasonContains(String.format("Disabled on operating system: %s", OS_NAME));
+		}
+	}
+
+	private void assertEnabledOnCurrentArchitectureIf(boolean condition) {
+		if (condition) {
+			assertEnabled();
+			assertReasonContains(String.format("Enabled on architecture: %s", ARCH));
+		}
+		else {
+			assertDisabled();
+			assertReasonContains(String.format("Disabled on architecture: %s", ARCH));
+		}
+	}
+
+	private void assertEnabledOnCurrentOsAndArchitectureIf(boolean condition) {
+		if (condition) {
+			assertEnabled();
+			assertReasonContains(String.format("Enabled on operating system: %s (%s)", OS_NAME, ARCH));
 		}
 		else {
 			assertDisabled();
-			assertReasonContains("Disabled on operating system: " + OS_NAME);
+			assertReasonContains(String.format("Disabled on operating system: %s (%s)", OS_NAME, ARCH));
 		}
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
index 212dff702e64..8e8f8b1c8f6d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
@@ -37,6 +37,7 @@
  */
 class EnabledOnOsIntegrationTests {
 
+	private static final String ARCH = System.getProperty("os.arch").toLowerCase(Locale.ENGLISH);
 	private static final String OS_NAME = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
 
 	@Test
@@ -47,7 +48,7 @@ void enabledBecauseAnnotationIsNotPresent() {
 	@Test
 	@Disabled("Only used in a unit test via reflection")
 	@EnabledOnOs({})
-	void missingOsDeclaration() {
+	void missingOsAndArchitectureDeclaration() {
 	}
 
 	@Test
@@ -109,10 +110,68 @@ void other() {
 		assertFalse(onAix() || onFreebsd() || onLinux() || onMac() || onOpenbsd() || onSolaris() || onWindows());
 	}
 
+	@Test
+	@EnabledOnOs(architectures = "x86_64")
+	void architectureX86_64() {
+		assertFalse(onArchitecture("x_86_64"));
+	}
+
+	@Test
+	@EnabledOnOs(architectures = "aarch64")
+	void architectureAarch64() {
+		assertTrue(onArchitecture("aarch64"));
+	}
+
+	@Test
+	@EnabledOnOs(value = MAC, architectures = "x86_64")
+	void architectureX86_64WithMacOs() {
+		assertTrue(onMac());
+		assertTrue(onArchitecture("x86_64"));
+	}
+
+	@Test
+	@EnabledOnOs(value = WINDOWS, architectures = "x86_64")
+	void architectureX86_64WithWindows() {
+		assertTrue(onWindows());
+		assertTrue(onArchitecture("x86_64"));
+	}
+
+	@Test
+	@EnabledOnOs(value = LINUX, architectures = "x86_64")
+	void architectureX86_64WithLinux() {
+		assertTrue(onLinux());
+		assertTrue(onArchitecture("x86_64"));
+	}
+
+	@Test
+	@EnabledOnOs(value = MAC, architectures = "aarch64")
+	void aarch64WithMacOs() {
+		assertTrue(onMac());
+		assertTrue(onArchitecture("aarch64"));
+	}
+
+	@Test
+	@EnabledOnOs(value = WINDOWS, architectures = "aarch64")
+	void aarch64WithWindows() {
+		assertTrue(onWindows());
+		assertTrue(onArchitecture("aarch64"));
+	}
+
+	@Test
+	@EnabledOnOs(value = LINUX, architectures = "aarch64")
+	void aarch64WithLinux() {
+		assertTrue(onLinux());
+		assertTrue(onArchitecture("aarch64"));
+	}
+
 	static boolean onAix() {
 		return OS_NAME.contains("aix");
 	}
 
+	static boolean onArchitecture(String arch) {
+		return ARCH.contains(arch);
+	}
+
 	static boolean onFreebsd() {
 		return OS_NAME.contains("freebsd");
 	}

From 856868d9f692aa96203e91691d9391758a00a7dc Mon Sep 17 00:00:00 2001
From: Ville Saalo <ville.saalo@iki.fi>
Date: Sat, 2 Jul 2022 16:29:20 +0300
Subject: [PATCH 0862/1433] Add "abort" methods to Assumptions (#2913)

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes-5.9.0-RC1.adoc              |  3 +
 .../org/junit/jupiter/api/Assumptions.java    | 67 +++++++++++++++++--
 .../junit/jupiter/api/AssumptionsTests.java   | 34 ++++++++--
 3 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
index 60664173d1a2..800866aeeb23 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
@@ -56,6 +56,9 @@ on GitHub.
   which executes it in a separate thread.
 * Support for enabling/disabling tests based on the system's hardware architecture via new
   `architectures` attributes on `@EnabledOnOs` and `@DisabledOnOs`.
+* Three new `abort` methods have been added to the `Assumptions` class. These are
+  analogous to the `fail` methods in the `Assertions` class, but instead of failing they
+  abort the test or container.
 
 
 [[release-notes-5.9.0-RC1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
index c62893931748..7a543d2515ed 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
@@ -98,7 +98,7 @@ public static void assumeTrue(BooleanSupplier assumptionSupplier, String message
 	 */
 	public static void assumeTrue(boolean assumption, Supplier<String> messageSupplier) throws TestAbortedException {
 		if (!assumption) {
-			throwTestAbortedException(messageSupplier.get());
+			throwAssumptionFailed(messageSupplier.get());
 		}
 	}
 
@@ -112,7 +112,7 @@ public static void assumeTrue(boolean assumption, Supplier<String> messageSuppli
 	 */
 	public static void assumeTrue(boolean assumption, String message) throws TestAbortedException {
 		if (!assumption) {
-			throwTestAbortedException(message);
+			throwAssumptionFailed(message);
 		}
 	}
 
@@ -174,7 +174,7 @@ public static void assumeFalse(BooleanSupplier assumptionSupplier, String messag
 	 */
 	public static void assumeFalse(boolean assumption, Supplier<String> messageSupplier) throws TestAbortedException {
 		if (assumption) {
-			throwTestAbortedException(messageSupplier.get());
+			throwAssumptionFailed(messageSupplier.get());
 		}
 	}
 
@@ -188,7 +188,7 @@ public static void assumeFalse(boolean assumption, Supplier<String> messageSuppl
 	 */
 	public static void assumeFalse(boolean assumption, String message) throws TestAbortedException {
 		if (assumption) {
-			throwTestAbortedException(message);
+			throwAssumptionFailed(message);
 		}
 	}
 
@@ -253,9 +253,64 @@ public static void assumingThat(boolean assumption, Executable executable) {
 		}
 	}
 
-	private static void throwTestAbortedException(String message) {
+	/**
+	 * <em>Abort</em> the test <em>without</em> a message.
+	 *
+	 * <p>Although aborting with an explicit failure message is recommended,
+	 * this method may be useful when maintaining legacy code.
+	 *
+	 * <p>See Javadoc for {@link #abort(String)} for an explanation of this
+	 * method's generic return type {@code V}.
+	 *
+	 * @throws TestAbortedException always
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	public static <V> V abort() {
+		throw new TestAbortedException();
+	}
+
+	/**
+	 * <em>Abort</em> the test with the given {@code message}.
+	 *
+	 * <p>The generic return type {@code V} allows this method to be used
+	 * directly as a single-statement lambda expression, thereby avoiding the
+	 * need to implement a code block with an explicit return value. Since this
+	 * method throws an {@link TestAbortedException} before its return
+	 * statement, this method never actually returns a value to its caller.
+	 * The following example demonstrates how this may be used in practice.
+	 *
+	 * <pre>{@code
+	 * Stream.of().map(entry -> abort("assumption not met"));
+	 * }</pre>
+	 *
+	 * @param message the message to be included in the {@code TestAbortedException}
+	 * @throws TestAbortedException always
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	public static <V> V abort(String message) {
+		throw new TestAbortedException(message);
+	}
+
+	/**
+	 * <em>Abort</em> the test with the supplied message.
+	 *
+	 * <p>See Javadoc for {@link #abort(String)} for an explanation of this
+	 * method's generic return type {@code V}.
+	 *
+	 * @param messageSupplier the supplier of the message to be included in {@code TestAbortedException}
+	 * @throws TestAbortedException always
+	 * @since 5.9
+	 */
+	@API(status = STABLE, since = "5.9")
+	public static <V> V abort(Supplier<String> messageSupplier) {
+		throw new TestAbortedException(messageSupplier.get());
+	}
+
+	private static void throwAssumptionFailed(String message) {
 		throw new TestAbortedException(
-			StringUtils.isNotBlank(message) ? ("Assumption failed: " + message) : "Assumption failed");
+			StringUtils.isNotBlank(message) ? "Assumption failed: " + message : "Assumption failed");
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
index 58f39f42f286..3e9cba4d55f9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
@@ -14,12 +14,14 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.abort;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.junit.jupiter.api.Assumptions.assumingThat;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import org.junit.jupiter.api.function.Executable;
 import org.opentest4j.TestAbortedException;
@@ -195,17 +197,37 @@ void assumingThatWithFailingExecutable() {
 		}));
 	}
 
+	// --- abort ---------------------------------------------------------
+
+	@Test
+	void abortWithNoArguments() {
+		assertTestAbortedException(null, Assumptions::abort);
+	}
+
+	@Test
+	void abortWithStringMessage() {
+		assertTestAbortedException("test", () -> abort("test"));
+	}
+
+	@Test
+	void abortWithStringSupplier() {
+		assertTestAbortedException("test", () -> abort(() -> "test"));
+	}
+
 	// -------------------------------------------------------------------
 
 	private static void assertAssumptionFailure(String msg, Executable executable) {
+		assertTestAbortedException(msg == null ? "Assumption failed" : "Assumption failed: " + msg, executable);
+	}
+
+	private static void assertTestAbortedException(String expectedMessage, Executable executable) {
 		try {
 			executable.execute();
 			expectTestAbortedException();
 		}
 		catch (Throwable ex) {
 			assertTrue(ex instanceof TestAbortedException);
-			assertMessageEquals((TestAbortedException) ex,
-				msg == null ? "Assumption failed" : "Assumption failed: " + msg);
+			assertMessageEquals(ex, expectedMessage);
 		}
 	}
 
@@ -213,10 +235,10 @@ private static void expectTestAbortedException() {
 		throw new AssertionError("Should have thrown a " + TestAbortedException.class.getName());
 	}
 
-	private static void assertMessageEquals(TestAbortedException ex, String msg) throws AssertionError {
-		if (!msg.equals(ex.getMessage())) {
-			throw new AssertionError(
-				"Message in TestAbortedException should be [" + msg + "], but was [" + ex.getMessage() + "].");
+	private static void assertMessageEquals(Throwable t, String expectedMessage) throws AssertionError {
+		if (!Objects.equals(expectedMessage, t.getMessage())) {
+			throw new AssertionError("Message in TestAbortedException should be [" + expectedMessage + "], but was ["
+					+ t.getMessage() + "].");
 		}
 	}
 

From 451ce8684ed039456b8b544685af59153e4cb6e3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 2 Jul 2022 16:29:14 +0200
Subject: [PATCH 0863/1433] Polishing

---
 .../release-notes-5.9.0-RC1.adoc              | 34 ++++---------------
 .../org/junit/jupiter/api/Assumptions.java    | 21 +++++++-----
 .../AbstractOsBasedExecutionCondition.java    | 24 ++++++-------
 .../jupiter/api/condition/DisabledOnOs.java   |  7 ++--
 .../api/condition/DisabledOnOsCondition.java  | 19 +++++------
 .../jupiter/api/condition/EnabledOnOs.java    |  7 ++--
 .../api/condition/EnabledOnOsCondition.java   | 18 +++++-----
 7 files changed, 54 insertions(+), 76 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
index 800866aeeb23..47f0077a6351 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
@@ -20,10 +20,6 @@ on GitHub.
   multidimensional array now fail within a reasonable amount of time.
 * Fix concurrency issue in classpath scanning.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * New public factory method to instantiate an `ExecutionRequest`.
@@ -34,16 +30,13 @@ on GitHub.
 [[release-notes-5.9.0-RC1-junit-jupiter]]
 === JUnit Jupiter
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
+* Three new `abort` methods have been added to the `Assumptions` class. These are
+  analogous to the `fail` methods in the `Assertions` class, but instead of failing they
+  abort the test or container.
+* Support for enabling/disabling tests based on the system's hardware architecture via new
+  `architectures` attributes in `@EnabledOnOs` and `@DisabledOnOs`.
 * Default `@MethodSource` factory methods can now accept arguments. A _default_ factory
   method is a method declared in the test class with the same name as the
   `@ParameterizedTest` method that is inferred as the factory method when no explicit
@@ -54,24 +47,9 @@ on GitHub.
   property `junit.jupiter.execution.timeout.thread.mode.default`, `SAME_THREAD` that
   executes the test code in the same thread as the calling code, and `SEPARATE_THREAD`
   which executes it in a separate thread.
-* Support for enabling/disabling tests based on the system's hardware architecture via new
-  `architectures` attributes on `@EnabledOnOs` and `@DisabledOnOs`.
-* Three new `abort` methods have been added to the `Assumptions` class. These are
-  analogous to the `fail` methods in the `Assertions` class, but instead of failing they
-  abort the test or container.
 
 
 [[release-notes-5.9.0-RC1-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
index 7a543d2515ed..d98a44d254e2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
@@ -54,7 +54,7 @@ protected Assumptions() {
 		/* no-op */
 	}
 
-	// --- assumeTrue ----------------------------------------------------
+	// --- assumeTrue ----------------------------------------------------------
 
 	/**
 	 * Validate the given assumption.
@@ -130,7 +130,7 @@ public static void assumeTrue(BooleanSupplier assumptionSupplier, Supplier<Strin
 		assumeTrue(assumptionSupplier.getAsBoolean(), messageSupplier);
 	}
 
-	// --- assumeFalse ----------------------------------------------------
+	// --- assumeFalse ---------------------------------------------------------
 
 	/**
 	 * Validate the given assumption.
@@ -206,7 +206,7 @@ public static void assumeFalse(BooleanSupplier assumptionSupplier, Supplier<Stri
 		assumeFalse(assumptionSupplier.getAsBoolean(), messageSupplier);
 	}
 
-	// --- assumingThat --------------------------------------------------
+	// --- assumingThat --------------------------------------------------------
 
 	/**
 	 * Execute the supplied {@link Executable}, but only if the supplied
@@ -253,11 +253,13 @@ public static void assumingThat(boolean assumption, Executable executable) {
 		}
 	}
 
+	// --- abort ---------------------------------------------------------------
+
 	/**
 	 * <em>Abort</em> the test <em>without</em> a message.
 	 *
-	 * <p>Although aborting with an explicit failure message is recommended,
-	 * this method may be useful when maintaining legacy code.
+	 * <p>Although aborting with an explicit message is recommended, this may be
+	 * useful when maintaining legacy code.
 	 *
 	 * <p>See Javadoc for {@link #abort(String)} for an explanation of this
 	 * method's generic return type {@code V}.
@@ -276,9 +278,9 @@ public static <V> V abort() {
 	 * <p>The generic return type {@code V} allows this method to be used
 	 * directly as a single-statement lambda expression, thereby avoiding the
 	 * need to implement a code block with an explicit return value. Since this
-	 * method throws an {@link TestAbortedException} before its return
-	 * statement, this method never actually returns a value to its caller.
-	 * The following example demonstrates how this may be used in practice.
+	 * method throws a {@link TestAbortedException} before its return statement,
+	 * this method never actually returns a value to its caller. The following
+	 * example demonstrates how this may be used in practice.
 	 *
 	 * <pre>{@code
 	 * Stream.of().map(entry -> abort("assumption not met"));
@@ -299,7 +301,8 @@ public static <V> V abort(String message) {
 	 * <p>See Javadoc for {@link #abort(String)} for an explanation of this
 	 * method's generic return type {@code V}.
 	 *
-	 * @param messageSupplier the supplier of the message to be included in {@code TestAbortedException}
+	 * @param messageSupplier the supplier of the message to be included in the
+	 * {@code TestAbortedException}
 	 * @throws TestAbortedException always
 	 * @since 5.9
 	 */
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java
index 014623805305..ec483e07f192 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java
@@ -25,6 +25,10 @@
  * @since 5.9
  */
 abstract class AbstractOsBasedExecutionCondition<A extends Annotation> implements ExecutionCondition {
+
+	static final String CURRENT_ARCHITECTURE = System.getProperty("os.arch");
+	static final String CURRENT_OS = System.getProperty("os.name");
+
 	private final Class<A> annotationType;
 
 	AbstractOsBasedExecutionCondition(Class<A> annotationType) {
@@ -33,42 +37,34 @@ abstract class AbstractOsBasedExecutionCondition<A extends Annotation> implement
 
 	@Override
 	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
-		return findAnnotation(context.getElement(), annotationType) //
+		return findAnnotation(context.getElement(), this.annotationType) //
 				.map(this::evaluateExecutionCondition) //
 				.orElseGet(this::enabledByDefault);
 	}
 
 	abstract ConditionEvaluationResult evaluateExecutionCondition(A annotation);
 
-	protected String createReason(boolean enabled, boolean osSpecified, boolean archSpecified) {
+	String createReason(boolean enabled, boolean osSpecified, boolean archSpecified) {
 		StringBuilder reason = new StringBuilder() //
 				.append(enabled ? "Enabled" : "Disabled") //
 				.append(osSpecified ? " on operating system: " : " on architecture: ");
 
 		if (osSpecified && archSpecified) {
-			reason.append(String.format("%s (%s)", currentOS(), currentArchitecture()));
+			reason.append(String.format("%s (%s)", CURRENT_OS, CURRENT_ARCHITECTURE));
 		}
 		else if (osSpecified) {
-			reason.append(currentOS());
+			reason.append(CURRENT_OS);
 		}
 		else {
-			reason.append(currentArchitecture());
+			reason.append(CURRENT_ARCHITECTURE);
 		}
 
 		return reason.toString();
 	}
 
 	private ConditionEvaluationResult enabledByDefault() {
-		String reason = String.format("@%s is not present", annotationType.getSimpleName());
+		String reason = String.format("@%s is not present", this.annotationType.getSimpleName());
 		return enabled(reason);
 	}
 
-	private String currentOS() {
-		return System.getProperty("os.name");
-	}
-
-	protected String currentArchitecture() {
-		return System.getProperty("os.arch");
-	}
-
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index 3e4c67799a05..529aee6b1fc5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -27,8 +27,8 @@
  * {@linkplain #value operating systems} or on one or more specified
  * {@linkplain #architectures architectures}
  *
- * <p>If operating systems and architectures are specified, the annotated test
- * class or test method is disabled if both conditions apply.
+ * <p>If operating systems <em>and</em> architectures are specified, the annotated
+ * test class or test method is disabled if both conditions apply.
  *
  * <p>When applied at the class level, all test methods within that class
  * will be disabled on the same specified operating systems, architectures, or
@@ -87,6 +87,9 @@
 	/**
 	 * Architectures on which the annotated class or method should be disabled.
 	 *
+	 * <p>Each architecture will be compared to the value returned from
+	 * {@code System.getProperty("os.arch")}, ignoring case.
+	 *
 	 * @since 5.9
 	 */
 	@API(status = STABLE, since = "5.9")
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
index ba546207030d..9500989171d5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
@@ -42,23 +42,20 @@ ConditionEvaluationResult evaluateExecutionCondition(DisabledOnOs annotation) {
 				: ConditionEvaluationResult.disabled(reason, annotation.disabledReason());
 	}
 
-	private boolean isEnabledBasedOnArchitecture(DisabledOnOs annotation) {
-		String[] architectures = annotation.architectures();
-		if (architectures.length == 0) {
-			return false;
-		}
-
-		String currentArchitecture = currentArchitecture();
-		return Arrays.stream(architectures).noneMatch(currentArchitecture::equalsIgnoreCase);
-	}
-
 	private boolean isEnabledBasedOnOs(DisabledOnOs annotation) {
 		OS[] operatingSystems = annotation.value();
 		if (operatingSystems.length == 0) {
 			return false;
 		}
-
 		return Arrays.stream(operatingSystems).noneMatch(OS::isCurrentOs);
 	}
 
+	private boolean isEnabledBasedOnArchitecture(DisabledOnOs annotation) {
+		String[] architectures = annotation.architectures();
+		if (architectures.length == 0) {
+			return false;
+		}
+		return Arrays.stream(architectures).noneMatch(CURRENT_ARCHITECTURE::equalsIgnoreCase);
+	}
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index 389d1030dc51..7db330c896ca 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -27,8 +27,8 @@
  * {@linkplain #value operating systems} or one or more specified
  * {@linkplain #architectures architectures}.
  *
- * <p>If operating systems and architectures are specified, the annotated test
- * class or test method is enabled if both conditions apply.
+ * <p>If operating systems <em>and</em> architectures are specified, the annotated
+ * test class or test method is enabled if both conditions apply.
  *
  * <p>When applied at the class level, all test methods within that class
  * will be enabled on the same specified operating systems, architectures, or
@@ -87,6 +87,9 @@
 	/**
 	 * Architectures on which the annotated class or method should be enabled.
 	 *
+	 * <p>Each architecture will be compared to the value returned from
+	 * {@code System.getProperty("os.arch")}, ignoring case.
+	 *
 	 * @since 5.9
 	 */
 	@API(status = STABLE, since = "5.9")
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
index 5ae5e008181c..be61ace4f8d4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
@@ -42,16 +42,6 @@ ConditionEvaluationResult evaluateExecutionCondition(EnabledOnOs annotation) {
 				: ConditionEvaluationResult.disabled(reason, annotation.disabledReason());
 	}
 
-	private boolean isEnabledBasedOnArchitecture(EnabledOnOs annotation) {
-		String[] architectures = annotation.architectures();
-		if (architectures.length == 0) {
-			return true;
-		}
-
-		String currentArchitecture = currentArchitecture();
-		return Arrays.stream(architectures).anyMatch(currentArchitecture::equalsIgnoreCase);
-	}
-
 	private boolean isEnabledBasedOnOs(EnabledOnOs annotation) {
 		OS[] operatingSystems = annotation.value();
 		if (operatingSystems.length == 0) {
@@ -60,4 +50,12 @@ private boolean isEnabledBasedOnOs(EnabledOnOs annotation) {
 		return Arrays.stream(operatingSystems).anyMatch(OS::isCurrentOs);
 	}
 
+	private boolean isEnabledBasedOnArchitecture(EnabledOnOs annotation) {
+		String[] architectures = annotation.architectures();
+		if (architectures.length == 0) {
+			return true;
+		}
+		return Arrays.stream(architectures).anyMatch(CURRENT_ARCHITECTURE::equalsIgnoreCase);
+	}
+
 }

From 9a33b332541e865d4b884982c5449e359b3bc25c Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Sat, 2 Jul 2022 16:36:00 +0200
Subject: [PATCH 0864/1433] Fix broken Javadoc link in DisplayNameGenerator

Closes #2959
---
 .../main/java/org/junit/jupiter/api/DisplayNameGenerator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 99f10b5c6b94..e23fd31e39db 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -36,7 +36,7 @@
  * <p>A {@link DisplayNameGenerator} can be configured <em>globally</em> for the
  * entire test suite via the {@value #DEFAULT_GENERATOR_PROPERTY_NAME}
  * configuration parameter (see the User Guide for details) or <em>locally</em>
- * for a test class via the {@link TestClassOrder @DisplayNameGeneration}
+ * for a test class via the {@link DisplayNameGeneration @DisplayNameGeneration}
  * annotation.
  *
  * <h2>Built-in Implementations</h2>

From f44f5d74f6377fc3177f990f72e019950d346a22 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 3 Jul 2022 19:23:24 +0200
Subject: [PATCH 0865/1433] Improve stability of timeout tests (#2960)

---
 .../SeparateThreadTimeoutInvocationTest.java  | 12 +++--
 .../extension/TimeoutExtensionTests.java      | 54 ++++++++-----------
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
index 4e8973af9750..ba9e409f9e7e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
@@ -13,6 +13,7 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.condition.OS.WINDOWS;
 
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
@@ -20,6 +21,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout.ThreadMode;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
 import org.junit.jupiter.engine.execution.ExtensionValuesStore;
@@ -32,18 +34,20 @@
 @DisplayName("SeparateThreadTimeoutInvocation")
 class SeparateThreadTimeoutInvocationTest {
 
+	private static final long PREEMPTIVE_TIMEOUT_MILLIS = OS.current() == WINDOWS ? 1000 : 100;
+
 	@Test
 	@DisplayName("throws timeout exception when timeout duration is exceeded")
 	void throwsTimeoutException() {
 		AtomicReference<String> threadName = new AtomicReference<>();
 		var invocation = aSeparateThreadInvocation(() -> {
 			threadName.set(Thread.currentThread().getName());
-			Thread.sleep(100);
+			Thread.sleep(PREEMPTIVE_TIMEOUT_MILLIS * 2);
 			return null;
 		});
 
 		assertThatThrownBy(invocation::proceed) //
-				.hasMessage("method() timed out after 10 milliseconds") //
+				.hasMessage("method() timed out after " + PREEMPTIVE_TIMEOUT_MILLIS + " milliseconds") //
 				.isInstanceOf(TimeoutException.class) //
 				.hasRootCauseMessage("Execution timed out in thread " + threadName.get());
 	}
@@ -69,8 +73,8 @@ void shouldThrowInvocationException() {
 	private static <T> SeparateThreadTimeoutInvocation<T> aSeparateThreadInvocation(Invocation<T> invocation) {
 		var namespace = ExtensionContext.Namespace.create(SeparateThreadTimeoutInvocationTest.class);
 		var store = new NamespaceAwareStore(new ExtensionValuesStore(null), namespace);
-		var parameters = new TimeoutInvocationParameters<>(invocation, new TimeoutDuration(10, MILLISECONDS),
-			() -> "method()");
+		var parameters = new TimeoutInvocationParameters<>(invocation,
+			new TimeoutDuration(PREEMPTIVE_TIMEOUT_MILLIS, MILLISECONDS), () -> "method()");
 		return (SeparateThreadTimeoutInvocation<T>) new TimeoutInvocationFactory(store) //
 				.create(ThreadMode.SEPARATE_THREAD, parameters);
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 03cf6deb5622..38249d9b03ec 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -383,10 +383,12 @@ void separateThreadHandlesInvocationExceptions() {
 		}
 
 		@Test
-		@DisplayName("when one test is stuck \"forever\" the next tests should not stuck")
+		@DisplayName("when one test is stuck \"forever\" the next tests should not get stuck")
 		void oneThreadStuckForever() {
 			EngineExecutionResults results = executeTestsForClass(OneTestStuckForeverAndTheOthersNotTestCase.class);
 
+			results.allEvents().debug();
+
 			Execution stuckExecution = findExecution(results.testEvents(), "stuck()");
 			assertThat(stuckExecution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
 					.isInstanceOf(TimeoutException.class) //
@@ -465,7 +467,7 @@ void timeoutExceededInSeparateThreadOnClassLevel() {
 				Execution execution = findExecution(results.testEvents(), "exceptionThrown()");
 				assertThat(execution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
 						.isInstanceOf(TimeoutException.class) //
-						.hasMessage("exceptionThrown() timed out after 10 milliseconds");
+						.hasMessage("exceptionThrown() timed out after 100 milliseconds");
 			}
 
 			@Test
@@ -625,7 +627,7 @@ static void afterAll() throws Exception {
 
 		private static void waitForInterrupt(String methodName) throws InterruptedException {
 			if (methodName.equals(slowMethod)) {
-				new CountDownLatch(1).await();
+				blockUntilInterrupted();
 			}
 		}
 	}
@@ -692,7 +694,7 @@ static class TimeoutExceedingWithInferredThreadModeTestCase {
 		@Test
 		@Timeout(value = 10, unit = MILLISECONDS)
 		void testMethod() throws InterruptedException {
-			Thread.sleep(100);
+			Thread.sleep(1000);
 		}
 	}
 
@@ -700,20 +702,20 @@ static class TimeoutExceedingSeparateThreadTestCase {
 		@Test
 		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void testMethod() throws InterruptedException {
-			Thread.sleep(100);
+			Thread.sleep(1000);
 		}
 	}
 
 	static class NonTimeoutExceedingSeparateThreadTestCase {
 		@Test
-		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void testMethod() {
 		}
 	}
 
 	static class UnrecoverableExceptionInSeparateThreadTestCase {
 		@Test
-		@Timeout(value = 5, unit = SECONDS, threadMode = SEPARATE_THREAD)
+		@Timeout(value = 100, unit = SECONDS, threadMode = SEPARATE_THREAD)
 		void test() {
 			throw new OutOfMemoryError();
 		}
@@ -721,21 +723,21 @@ void test() {
 
 	static class ExceptionInSeparateThreadTestCase {
 		@Test
-		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void test() {
 			throw new RuntimeException("Oppps!");
 		}
 	}
 
-	@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+	@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 	static class TimeoutExceededOnClassLevelTestCase {
 		@Test
 		void exceptionThrown() throws InterruptedException {
-			Thread.sleep(100);
+			Thread.sleep(1000);
 		}
 	}
 
-	@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+	@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 	static class NonTimeoutExceededOnClassLevelTestCase {
 		@Test
 		void test() {
@@ -744,63 +746,55 @@ void test() {
 
 	@TestMethodOrder(OrderAnnotation.class)
 	static class OneTestStuckForeverAndTheOthersNotTestCase {
-		private static final CountDownLatch latch = new CountDownLatch(1);
 
 		@Test
 		@Order(0)
 		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void stuck() throws InterruptedException {
-			latch.await();
+			blockUntilInterrupted();
 		}
 
 		@Test
 		@Order(1)
-		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void testZero() {
 		}
 
 		@Test
 		@Order(2)
-		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void testOne() {
 		}
-
-		@AfterAll
-		static void stop() throws InterruptedException {
-			Thread.sleep(100);
-			latch.countDown();
-		}
 	}
 
 	static class MixedSameThreadAndSeparateThreadTestCase {
 		@Test
 		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void testZero() throws InterruptedException {
-			Thread.sleep(100);
+			Thread.sleep(1000);
 		}
 
 		@Test
 		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SAME_THREAD)
 		void testOne() throws InterruptedException {
-			Thread.sleep(100);
+			Thread.sleep(1000);
 		}
 
 		@Test
 		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void testTwo() throws InterruptedException {
-			Thread.sleep(100);
+			Thread.sleep(1000);
 		}
 	}
 
 	@TestMethodOrder(OrderAnnotation.class)
 	static class OneTestStuckForeverAndTheOthersInSameThreadNotTestCase {
-		private static final CountDownLatch latch = new CountDownLatch(1);
 
 		@Test
 		@Order(0)
 		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void stuck() throws InterruptedException {
-			latch.await();
+			blockUntilInterrupted();
 		}
 
 		@Test
@@ -814,11 +808,9 @@ void testZero() {
 		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SAME_THREAD)
 		void testOne() {
 		}
+	}
 
-		@AfterAll
-		static void stop() throws InterruptedException {
-			Thread.sleep(100);
-			latch.countDown();
-		}
+	private static void blockUntilInterrupted() throws InterruptedException {
+		new CountDownLatch(1).await();
 	}
 }

From 73d868ce0f09ddb225882062afb174a263dfa7c7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 3 Jul 2022 20:57:51 +0200
Subject: [PATCH 0866/1433] Improve diagnostics in MethodBasedCondition and
 simplify implementation

---
 .../api/condition/MethodBasedCondition.java   | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index d02be78306d4..952a7ecd2dd4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -26,6 +26,7 @@
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.commons.util.StringUtils;
 
 /**
  * @since 5.7
@@ -73,9 +74,9 @@ private Method findMethod(Class<?> clazz, String methodName) {
 
 	private boolean invokeConditionMethod(Method method, ExtensionContext context) {
 		Preconditions.condition(method.getReturnType() == boolean.class,
-			() -> format("Method [%s] should return a boolean", method.getName()));
-		Preconditions.condition(acceptsExtensionContextArgument(method),
-			() -> format("Method [%s] should accept either an ExtensionContext or no arguments", method.getName()));
+			() -> format("Method [%s] must return a boolean", method));
+		Preconditions.condition(acceptsExtensionContextOrNoArguments(method),
+			() -> format("Method [%s] must accept either an ExtensionContext or no arguments", method));
 
 		Object testInstance = context.getTestInstance().orElse(null);
 		if (method.getParameterCount() == 0) {
@@ -84,28 +85,18 @@ private boolean invokeConditionMethod(Method method, ExtensionContext context) {
 		return (boolean) ReflectionUtils.invokeMethod(method, testInstance, context);
 	}
 
-	private boolean acceptsExtensionContextArgument(Method method) {
-		switch (method.getParameterCount()) {
-			case 0:
-				return true;
-			case 1:
-				return method.getParameterTypes()[0] == ExtensionContext.class;
-			default:
-				return false;
-		}
+	private boolean acceptsExtensionContextOrNoArguments(Method method) {
+		int parameterCount = method.getParameterCount();
+		return parameterCount == 0 || (parameterCount == 1 && method.getParameterTypes()[0] == ExtensionContext.class);
 	}
 
 	private ConditionEvaluationResult buildConditionEvaluationResult(boolean methodResult, A annotation) {
-		String defaultReason = format("Condition provided in @%s evaluates to %s", this.annotationType.getSimpleName(),
-			methodResult);
+		String defaultReason = format("Condition provided in %s evaluated to %s", this.annotationType, methodResult);
 		if (isEnabled(methodResult)) {
 			return enabled(defaultReason);
 		}
 		String customReason = this.customDisabledReason.apply(annotation);
-		if (customReason.isEmpty()) {
-			return disabled(defaultReason);
-		}
-		return disabled(customReason);
+		return StringUtils.isNotBlank(customReason) ? disabled(customReason) : disabled(defaultReason);
 	}
 
 	protected abstract boolean isEnabled(boolean methodResult);

From 6f3981e799ad2016c47cac6e5b320cffa3390301 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Jul 2022 08:11:38 +0200
Subject: [PATCH 0867/1433] Update Test Distribution plugin to 2.3.5 (#2962)

---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3dd979c64de6..ef4f4f161e5e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3.3") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3.5") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5390a9ccfa8f..c71a37eb46e8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.10.2"
-		id("com.gradle.enterprise.test-distribution") version "2.3.3" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise.test-distribution") version "2.3.5" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"

From 8771b65e7804563fe7c208547b5fef0207a192d2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Jul 2022 08:31:01 +0200
Subject: [PATCH 0868/1433] Simplify condition

---
 .../org/junit/jupiter/api/AssertTimeoutAssertionsTests.java    | 3 +--
 .../engine/extension/SeparateThreadTimeoutInvocationTest.java  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index e9828d2cc3d8..424317ed6b3b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -28,7 +28,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.function.Executable;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.opentest4j.AssertionFailedError;
@@ -40,7 +39,7 @@
  */
 class AssertTimeoutAssertionsTests {
 
-	private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(OS.current() == WINDOWS ? 1000 : 100);
+	private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(WINDOWS.isCurrentOs() ? 1000 : 100);
 
 	private static ThreadLocal<AtomicBoolean> changed = ThreadLocal.withInitial(() -> new AtomicBoolean(false));
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
index ba9e409f9e7e..a5355fa63682 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout.ThreadMode;
-import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
 import org.junit.jupiter.engine.execution.ExtensionValuesStore;
@@ -34,7 +33,7 @@
 @DisplayName("SeparateThreadTimeoutInvocation")
 class SeparateThreadTimeoutInvocationTest {
 
-	private static final long PREEMPTIVE_TIMEOUT_MILLIS = OS.current() == WINDOWS ? 1000 : 100;
+	private static final long PREEMPTIVE_TIMEOUT_MILLIS = WINDOWS.isCurrentOs() ? 1000 : 100;
 
 	@Test
 	@DisplayName("throws timeout exception when timeout duration is exceeded")

From a75eef00a5a9eb0e3d551099b3d009bf3d3ecc4e Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Tue, 21 Jun 2022 15:11:51 +0200
Subject: [PATCH 0869/1433] #2914: rename existing test methods and fix javadoc
 typo

---
 .../InvalidLifecycleMethodConfigurationTests.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
index 1b5fd04b4e15..084b8b48ae68 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
@@ -23,7 +23,7 @@
 import org.junit.platform.testkit.engine.Events;
 
 /**
- * Integration tests that very proper handling of invalid configuration for
+ * Integration tests that verify proper handling of invalid configuration for
  * lifecycle methods in conjunction with the {@link JupiterTestEngine}.
  *
  * <p>In general, configuration errors should not be thrown until the
@@ -44,13 +44,13 @@ void executeValidTestCaseAlongsideTestCaseWithInvalidAfterAllDeclaration() {
 	}
 
 	@Test
-	void executeValidTestCaseAlongsideTestCaseWithInvalidBeforeEachDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidBeforeEachMethod.class);
+	void executeValidTestCaseAlongsideTestCaseWithInvalidStaticBeforeEachDeclaration() {
+		assertExecutionResults(TestCaseWithInvalidStaticBeforeEachMethod.class);
 	}
 
 	@Test
-	void executeValidTestCaseAlongsideTestCaseWithInvalidAfterEachDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidAfterEachMethod.class);
+	void executeValidTestCaseAlongsideTestCaseWithInvalidStaticAfterEachDeclaration() {
+		assertExecutionResults(TestCaseWithInvalidStaticAfterEachMethod.class);
 	}
 
 	private void assertExecutionResults(Class<?> invalidTestClass) {
@@ -104,7 +104,7 @@ void test() {
 		}
 	}
 
-	static class TestCaseWithInvalidBeforeEachMethod {
+	static class TestCaseWithInvalidStaticBeforeEachMethod {
 
 		// must NOT be static
 		@BeforeEach
@@ -116,7 +116,7 @@ void test() {
 		}
 	}
 
-	static class TestCaseWithInvalidAfterEachMethod {
+	static class TestCaseWithInvalidStaticAfterEachMethod {
 
 		// must NOT be static
 		@AfterEach

From a588ee3f4db752beaac2a3f7638b93aa47977cb6 Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Tue, 21 Jun 2022 15:27:06 +0200
Subject: [PATCH 0870/1433] #2914: throw exception when encountering private
 lifecycle methods

---
 .../descriptor/LifecycleMethodUtils.java      | 19 ++++++++---
 ...alidLifecycleMethodConfigurationTests.java | 34 +++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
index 53a2a5c5360a..ec1c8fcc95fc 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
@@ -45,11 +45,11 @@ static List<Method> findAfterAllMethods(Class<?> testClass, boolean requireStati
 	}
 
 	static List<Method> findBeforeEachMethods(Class<?> testClass) {
-		return findMethodsAndAssertNonStatic(testClass, BeforeEach.class, HierarchyTraversalMode.TOP_DOWN);
+		return findMethodsAndAssertNonStaticAndNonPrivate(testClass, BeforeEach.class, HierarchyTraversalMode.TOP_DOWN);
 	}
 
 	static List<Method> findAfterEachMethods(Class<?> testClass) {
-		return findMethodsAndAssertNonStatic(testClass, AfterEach.class, HierarchyTraversalMode.BOTTOM_UP);
+		return findMethodsAndAssertNonStaticAndNonPrivate(testClass, AfterEach.class, HierarchyTraversalMode.BOTTOM_UP);
 	}
 
 	private static void assertStatic(Class<? extends Annotation> annotationType, Method method) {
@@ -67,6 +67,13 @@ private static void assertNonStatic(Class<? extends Annotation> annotationType,
 		}
 	}
 
+	private static void assertNonPrivate(Class<? extends Annotation> annotationType, Method method) {
+		if (ReflectionUtils.isPrivate(method)) {
+			throw new JUnitException(String.format("@%s method '%s' must not be private.",
+				annotationType.getSimpleName(), method.toGenericString()));
+		}
+	}
+
 	private static void assertVoid(Class<? extends Annotation> annotationType, Method method) {
 		if (!returnsVoid(method)) {
 			throw new JUnitException(String.format("@%s method '%s' must not return a value.",
@@ -83,10 +90,14 @@ private static List<Method> findMethodsAndAssertStatic(Class<?> testClass, boole
 		return methods;
 	}
 
-	private static List<Method> findMethodsAndAssertNonStatic(Class<?> testClass,
+	private static List<Method> findMethodsAndAssertNonStaticAndNonPrivate(Class<?> testClass,
 			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
 		List<Method> methods = findMethodsAndCheckVoidReturnType(testClass, annotationType, traversalMode);
-		methods.forEach(method -> assertNonStatic(annotationType, method));
+		methods.forEach(method -> {
+			assertNonStatic(annotationType, method);
+			assertNonPrivate(annotationType, method);
+		});
+
 		return methods;
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
index 084b8b48ae68..c22df72b70ba 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
@@ -48,11 +48,21 @@ void executeValidTestCaseAlongsideTestCaseWithInvalidStaticBeforeEachDeclaration
 		assertExecutionResults(TestCaseWithInvalidStaticBeforeEachMethod.class);
 	}
 
+	@Test
+	void executeValidTestCaseAlongsideTestCaseWithInvalidPrivateBeforeEachDeclaration() {
+		assertExecutionResults(TestCaseWithInvalidPrivateBeforeEachMethod.class);
+	}
+
 	@Test
 	void executeValidTestCaseAlongsideTestCaseWithInvalidStaticAfterEachDeclaration() {
 		assertExecutionResults(TestCaseWithInvalidStaticAfterEachMethod.class);
 	}
 
+	@Test
+	void executeValidTestCaseAlongsideTestCaseWithInvalidPrivateAfterEachDeclaration() {
+		assertExecutionResults(TestCaseWithInvalidPrivateAfterEachMethod.class);
+	}
+
 	private void assertExecutionResults(Class<?> invalidTestClass) {
 		EngineExecutionResults executionResults = executeTests(selectClass(TestCase.class),
 			selectClass(invalidTestClass));
@@ -116,6 +126,18 @@ void test() {
 		}
 	}
 
+	static class TestCaseWithInvalidPrivateBeforeEachMethod {
+
+		// must NOT be private
+		@BeforeEach
+		private void beforeEach() {
+		}
+
+		@Test
+		void test() {
+		}
+	}
+
 	static class TestCaseWithInvalidStaticAfterEachMethod {
 
 		// must NOT be static
@@ -128,4 +150,16 @@ void test() {
 		}
 	}
 
+	static class TestCaseWithInvalidPrivateAfterEachMethod {
+
+		// must NOT be private
+		@AfterEach
+		private void afterEach() {
+		}
+
+		@Test
+		void test() {
+		}
+	}
+
 }

From cdbb761549f4a61983733f576f1c6db3577f07b7 Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Tue, 28 Jun 2022 09:05:42 +0200
Subject: [PATCH 0871/1433] #2914: add integration test to explicitly
 demonstrate lifecycle method visibility

---
 .../engine/LifecycleMethodShadowingTests.java | 156 ++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodShadowingTests.java

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodShadowingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodShadowingTests.java
new file mode 100644
index 000000000000..f21db4c52cda
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodShadowingTests.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine;
+
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Integration tests that explicitly demonstrate the shadowing/overriding
+ * rules for lifecylce methods in the {@link JupiterTestEngine}.
+ *
+ * @since 5.9
+ */
+class LifecycleMethodShadowingTests {
+
+	@Nested
+	@DisplayName("A package-private lifecycle super-method can be combined with")
+	class PackagePrivateSuperClassTests {
+
+		@Nested
+		@DisplayName("a protected lifecycle method in the derived class")
+		class ProtectedExtendsPackagePrivateLifecycleMethod
+				extends SuperClassWithPackagePrivateLifecycleMethodTestCase {
+
+			@BeforeEach
+			protected void beforeEach() {
+			}
+
+		}
+
+		@Nested
+		@DisplayName("a package-private lifecycle method in the derived class")
+		class PackagePrivateExtendsPackagePrivateLifecycleMethod
+				extends SuperClassWithPackagePrivateLifecycleMethodTestCase {
+
+			@BeforeEach
+			void beforeEach() {
+			}
+
+		}
+
+		@Nested
+		@DisplayName("a public lifecycle method in the derived class")
+		class PublicExtendsPackagePrivateLifecycleMethod extends SuperClassWithPackagePrivateLifecycleMethodTestCase {
+
+			@BeforeEach
+			public void beforeEach() {
+			}
+
+		}
+	}
+
+	@Nested
+	@DisplayName("A protected lifecycle super-method can be combined with")
+	class ProtectedSuperClassTests {
+
+		@Nested
+		@DisplayName("a protected lifecycle method in the derived class")
+		class ProtectedExtendsPackagePrivate extends SuperClassWithProtectedLifecycleMethodTestCase {
+
+			@BeforeEach
+			protected void beforeEach() {
+			}
+
+		}
+
+		@Nested
+		@DisplayName("a public lifecycle method in the derived class")
+		class PublicExtendsPackagePrivate extends SuperClassWithProtectedLifecycleMethodTestCase {
+
+			@BeforeEach
+			public void beforeEach() {
+			}
+
+		}
+	}
+
+	@Nested
+	@DisplayName("A public lifecycle super-method can be combined with")
+	class PublicSuperClassTests {
+
+		@Nested
+		@DisplayName("a public lifecycle method in the derived class")
+		class PublicExtendsPackagePrivate extends SuperClassWithPublicLifecycleMethodTestCase {
+
+			@BeforeEach
+			public void beforeEach() {
+			}
+
+		}
+	}
+
+}
+
+// -------------------------------------------------------------------------
+
+class SuperClassWithPackagePrivateLifecycleMethodTestCase {
+
+	@BeforeEach
+	void beforeEach() {
+		fail();
+	}
+
+	@Test
+	void test() {
+	}
+
+}
+
+class SuperClassWithProtectedLifecycleMethodTestCase {
+
+	@BeforeEach
+	protected void beforeEach() {
+		fail();
+	}
+
+	@Test
+	void test() {
+	}
+
+}
+
+class SuperClassWithPublicLifecycleMethodTestCase {
+
+	@BeforeEach
+	public void beforeEach() {
+		fail();
+	}
+
+	@Test
+	void test() {
+	}
+
+}

From d1327f36b337c622f9efe32f6873730d92dcbe31 Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Fri, 1 Jul 2022 10:22:20 +0200
Subject: [PATCH 0872/1433] #2914: improve naming: use the new term 'supersede'

---
 ...Tests.java => LifecycleMethodSupersedingTests.java} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/{LifecycleMethodShadowingTests.java => LifecycleMethodSupersedingTests.java} (90%)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodShadowingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodSupersedingTests.java
similarity index 90%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodShadowingTests.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodSupersedingTests.java
index f21db4c52cda..cfc92c17974d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodShadowingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodSupersedingTests.java
@@ -29,14 +29,14 @@
 
 /**
  * Integration tests that explicitly demonstrate the shadowing/overriding
- * rules for lifecylce methods in the {@link JupiterTestEngine}.
+ * rules for lifecycle methods in the {@link JupiterTestEngine}.
  *
  * @since 5.9
  */
-class LifecycleMethodShadowingTests {
+class LifecycleMethodSupersedingTests {
 
 	@Nested
-	@DisplayName("A package-private lifecycle super-method can be combined with")
+	@DisplayName("A package-private lifecycle super-method can be superseded by")
 	class PackagePrivateSuperClassTests {
 
 		@Nested
@@ -73,7 +73,7 @@ public void beforeEach() {
 	}
 
 	@Nested
-	@DisplayName("A protected lifecycle super-method can be combined with")
+	@DisplayName("A protected lifecycle super-method can be superseded by")
 	class ProtectedSuperClassTests {
 
 		@Nested
@@ -98,7 +98,7 @@ public void beforeEach() {
 	}
 
 	@Nested
-	@DisplayName("A public lifecycle super-method can be combined with")
+	@DisplayName("A public lifecycle super-method can be superseded by")
 	class PublicSuperClassTests {
 
 		@Nested

From e971037d9dd626700793e03db5895b3260afcfd9 Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Fri, 1 Jul 2022 10:28:56 +0200
Subject: [PATCH 0873/1433] #2914: let private @BeforeAll and @AfterAll methods
 fail as well

---
 ...alidLifecycleMethodConfigurationTests.java | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
index c22df72b70ba..c2838e6ad6e4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
@@ -34,13 +34,23 @@
 class InvalidLifecycleMethodConfigurationTests extends AbstractJupiterTestEngineTests {
 
 	@Test
-	void executeValidTestCaseAlongsideTestCaseWithInvalidBeforeAllDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidBeforeAllMethod.class);
+	void executeValidTestCaseAlongsideTestCaseWithInvalidNonStaticBeforeAllDeclaration() {
+		assertExecutionResults(TestCaseWithInvalidNonStaticBeforeAllMethod.class);
 	}
 
 	@Test
-	void executeValidTestCaseAlongsideTestCaseWithInvalidAfterAllDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidAfterAllMethod.class);
+	void executeValidTestCaseAlongsideTestCaseWithInvalidPrivateBeforeAllDeclaration() {
+		assertExecutionResults(TestCaseWithInvalidPrivateBeforeAllMethod.class);
+	}
+
+	@Test
+	void executeValidTestCaseAlongsideTestCaseWithInvalidNonStaticAfterAllDeclaration() {
+		assertExecutionResults(TestCaseWithInvalidNonStaticAfterAllMethod.class);
+	}
+
+	@Test
+	void executeValidTestCaseAlongsideTestCaseWithInvalidPrivateAfterAllDeclaration() {
+		assertExecutionResults(TestCaseWithInvalidPrivateAfterAllMethod.class);
 	}
 
 	@Test
@@ -90,7 +100,7 @@ void test() {
 		}
 	}
 
-	static class TestCaseWithInvalidBeforeAllMethod {
+	static class TestCaseWithInvalidNonStaticBeforeAllMethod {
 
 		// must be static
 		@BeforeAll
@@ -102,7 +112,19 @@ void test() {
 		}
 	}
 
-	static class TestCaseWithInvalidAfterAllMethod {
+	static class TestCaseWithInvalidPrivateBeforeAllMethod {
+
+		// must not be private
+		@BeforeAll
+        private static void beforeAll() {
+		}
+
+		@Test
+		void test() {
+		}
+	}
+
+	static class TestCaseWithInvalidNonStaticAfterAllMethod {
 
 		// must be static
 		@AfterAll
@@ -114,6 +136,18 @@ void test() {
 		}
 	}
 
+	static class TestCaseWithInvalidPrivateAfterAllMethod {
+
+        // must not be private
+        @AfterAll
+		private static void afterAll() {
+		}
+
+		@Test
+		void test() {
+		}
+	}
+
 	static class TestCaseWithInvalidStaticBeforeEachMethod {
 
 		// must NOT be static

From ad47264064d9278f644bf249180c58182cba1aa6 Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Fri, 1 Jul 2022 21:43:33 +0200
Subject: [PATCH 0874/1433] #2914: explain 'superseding' in javadoc of
 @[Before|After][All|Each] methods

---
 .../main/java/org/junit/jupiter/api/AfterAll.java | 15 +++++++++------
 .../java/org/junit/jupiter/api/AfterEach.java     |  6 ++++--
 .../java/org/junit/jupiter/api/BeforeAll.java     | 15 +++++++++------
 .../java/org/junit/jupiter/api/BeforeEach.java    |  6 ++++--
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index d4059380111f..c23c3276c259 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -43,14 +43,17 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @AfterAll} methods are inherited from superclasses as long as
- * they are not <em>hidden</em> or <em>overridden</em>. Furthermore,
- * {@code @AfterAll} methods from superclasses will be executed after
- * {@code @AfterAll} methods in subclasses.
+ * they are not <em>hidden</em> (default mode with {@code static} modifier) or
+ * <em>overridden</em> or 'superseded' (i.e., replaced based on signature only,
+ * irrespective of Java's visibility rules). Furthermore, {@code @AfterAll}
+ * methods from superclasses will be executed after {@code @AfterAll} methods
+ * in subclasses.
  *
  * <p>Similarly, {@code @AfterAll} methods declared in an interface are
- * inherited as long as they are not <em>hidden</em> or <em>overridden</em>,
- * and {@code @AfterAll} methods from an interface will be executed after
- * {@code @AfterAll} methods in the class that implements the interface.
+ * inherited as long as they are not <em>hidden</em> or <em>overridden</em>
+ * (or 'superseded', see above), and {@code @AfterAll} methods from an
+ * interface will be executed after {@code @AfterAll} methods in the class
+ * that implements the interface.
  *
  * <p>JUnit Jupiter does not guarantee the execution order of multiple
  * {@code @AfterAll} methods that are declared within a single test class or
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
index 3595b3fab594..7e670867cf53 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
@@ -36,8 +36,10 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @AfterEach} methods are inherited from superclasses as long as
- * they are not overridden. Furthermore, {@code @AfterEach} methods from
- * superclasses will be executed after {@code @AfterEach} methods in subclasses.
+ * they are not overridden  or 'superseded' (i.e., replaced based on signature
+ * only, irrespective of Java's visibility rules). Furthermore,
+ * {@code @AfterEach} methods from superclasses will be executed after
+ * {@code @AfterEach} methods in subclasses.
  *
  * <p>Similarly, {@code @AfterEach} methods declared as <em>interface default
  * methods</em> are inherited as long as they are not overridden, and
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index 5023334c614e..5b270ce5e6ff 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -43,14 +43,17 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @BeforeAll} methods are inherited from superclasses as long as
- * they are not <em>hidden</em> or <em>overridden</em>. Furthermore,
- * {@code @BeforeAll} methods from superclasses will be executed before
- * {@code @BeforeAll} methods in subclasses.
+ * they are not <em>hidden</em> (default mode with {@code static} modifier) or
+ * <em>overridden</em> or 'superseded' (i.e., replaced based on signature only,
+ * irrespective of Java's visibility rules). Furthermore, {@code @BeforeAll}
+ * methods from superclasses will be executed before {@code @BeforeAll} methods
+ * in subclasses.
  *
  * <p>Similarly, {@code @BeforeAll} methods declared in an interface are
- * inherited as long as they are not <em>hidden</em> or <em>overridden</em>,
- * and {@code @BeforeAll} methods from an interface will be executed before
- * {@code @BeforeAll} methods in the class that implements the interface.
+ * inherited as long as they are not <em>hidden</em> or <em>overridden</em>
+ * (or 'superseded', see above), and {@code @BeforeAll} methods from an
+ * interface will be executed before {@code @BeforeAll} methods in the class
+ * that implements the interface.
  *
  * <p>JUnit Jupiter does not guarantee the execution order of multiple
  * {@code @BeforeAll} methods that are declared within a single test class or
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
index eb8fa9aaf20e..2df14d79dcb5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
@@ -36,8 +36,10 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @BeforeEach} methods are inherited from superclasses as long as
- * they are not overridden. Furthermore, {@code @BeforeEach} methods from
- * superclasses will be executed before {@code @BeforeEach} methods in subclasses.
+ * they are not overridden  or 'superseded' (i.e., replaced based on signature
+ * only, irrespective of Java's visibility rules). Furthermore,
+ * {@code @BeforeEach} methods from superclasses will be executed before
+ * {@code @BeforeEach} methods in subclasses.
  *
  * <p>Similarly, {@code @BeforeEach} methods declared as <em>interface default
  * methods</em> are inherited as long as they are not overridden, and

From 9533fcadbc23415dd5a47f9e0d57976c0a82b4f7 Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Fri, 1 Jul 2022 21:50:36 +0200
Subject: [PATCH 0875/1433] #2914: let private @BeforeAll and @AfterAll methods
 fail as well and fix formatting

---
 .../engine/descriptor/LifecycleMethodUtils.java        | 10 +++++++---
 .../InvalidLifecycleMethodConfigurationTests.java      |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
index ec1c8fcc95fc..9b9a43a73a20 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
@@ -37,11 +37,13 @@ private LifecycleMethodUtils() {
 	}
 
 	static List<Method> findBeforeAllMethods(Class<?> testClass, boolean requireStatic) {
-		return findMethodsAndAssertStatic(testClass, requireStatic, BeforeAll.class, HierarchyTraversalMode.TOP_DOWN);
+		return findMethodsAndAssertStaticAndNonPrivate(testClass, requireStatic, BeforeAll.class,
+			HierarchyTraversalMode.TOP_DOWN);
 	}
 
 	static List<Method> findAfterAllMethods(Class<?> testClass, boolean requireStatic) {
-		return findMethodsAndAssertStatic(testClass, requireStatic, AfterAll.class, HierarchyTraversalMode.BOTTOM_UP);
+		return findMethodsAndAssertStaticAndNonPrivate(testClass, requireStatic, AfterAll.class,
+			HierarchyTraversalMode.BOTTOM_UP);
 	}
 
 	static List<Method> findBeforeEachMethods(Class<?> testClass) {
@@ -81,12 +83,14 @@ private static void assertVoid(Class<? extends Annotation> annotationType, Metho
 		}
 	}
 
-	private static List<Method> findMethodsAndAssertStatic(Class<?> testClass, boolean requireStatic,
+	private static List<Method> findMethodsAndAssertStaticAndNonPrivate(Class<?> testClass, boolean requireStatic,
 			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
 		List<Method> methods = findMethodsAndCheckVoidReturnType(testClass, annotationType, traversalMode);
 		if (requireStatic) {
 			methods.forEach(method -> assertStatic(annotationType, method));
 		}
+		methods.forEach(method -> assertNonPrivate(annotationType, method));
+
 		return methods;
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
index c2838e6ad6e4..a4ef6b34f3b7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
@@ -116,7 +116,7 @@ static class TestCaseWithInvalidPrivateBeforeAllMethod {
 
 		// must not be private
 		@BeforeAll
-        private static void beforeAll() {
+		private static void beforeAll() {
 		}
 
 		@Test
@@ -138,8 +138,8 @@ void test() {
 
 	static class TestCaseWithInvalidPrivateAfterAllMethod {
 
-        // must not be private
-        @AfterAll
+		// must not be private
+		@AfterAll
 		private static void afterAll() {
 		}
 

From 07b4f51ec14167b24e39fc78877a17dcd9dc9de1 Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Sat, 2 Jul 2022 21:26:06 +0200
Subject: [PATCH 0876/1433] #2914: improve grammar and markup in javadoc
 according to review

---
 .../java/org/junit/jupiter/api/AfterAll.java    | 17 ++++++++---------
 .../java/org/junit/jupiter/api/AfterEach.java   |  4 ++--
 .../java/org/junit/jupiter/api/BeforeAll.java   | 17 ++++++++---------
 .../java/org/junit/jupiter/api/BeforeEach.java  |  4 ++--
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index c23c3276c259..a5ab2e1abc4d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -43,17 +43,16 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @AfterAll} methods are inherited from superclasses as long as
- * they are not <em>hidden</em> (default mode with {@code static} modifier) or
- * <em>overridden</em> or 'superseded' (i.e., replaced based on signature only,
- * irrespective of Java's visibility rules). Furthermore, {@code @AfterAll}
- * methods from superclasses will be executed after {@code @AfterAll} methods
- * in subclasses.
+ * they are not <em>hidden</em> (default mode with {@code static} modifier), or
+ * <em>overridden</em>, or <em>superseded</em> (i.e., replaced based on
+ * signature only, irrespective of Java's visibility rules). Furthermore,
+ * {@code @AfterAll} methods from superclasses will be executed before
+ * {@code @AfterAll} methods in subclasses.
  *
  * <p>Similarly, {@code @AfterAll} methods declared in an interface are
- * inherited as long as they are not <em>hidden</em> or <em>overridden</em>
- * (or 'superseded', see above), and {@code @AfterAll} methods from an
- * interface will be executed after {@code @AfterAll} methods in the class
- * that implements the interface.
+ * inherited as long as they are not <em>hidden</em> or <em>overridden</em>,
+ * and {@code @AfterAll} methods from an interface will be executed after
+ * {@code @AfterAll} methods in the class that implements the interface.
  *
  * <p>JUnit Jupiter does not guarantee the execution order of multiple
  * {@code @AfterAll} methods that are declared within a single test class or
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
index 7e670867cf53..c6340076e0f2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
@@ -36,8 +36,8 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @AfterEach} methods are inherited from superclasses as long as
- * they are not overridden  or 'superseded' (i.e., replaced based on signature
- * only, irrespective of Java's visibility rules). Furthermore,
+ * they are not overridden or <em>superseded</em> (i.e., replaced based on
+ * signature only, irrespective of Java's visibility rules). Furthermore,
  * {@code @AfterEach} methods from superclasses will be executed after
  * {@code @AfterEach} methods in subclasses.
  *
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index 5b270ce5e6ff..5c85c196d262 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -43,17 +43,16 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @BeforeAll} methods are inherited from superclasses as long as
- * they are not <em>hidden</em> (default mode with {@code static} modifier) or
- * <em>overridden</em> or 'superseded' (i.e., replaced based on signature only,
- * irrespective of Java's visibility rules). Furthermore, {@code @BeforeAll}
- * methods from superclasses will be executed before {@code @BeforeAll} methods
- * in subclasses.
+ * they are not <em>hidden</em> (default mode with {@code static} modifier), or
+ * <em>overridden</em>, or <em>superseded</em> (i.e., replaced based on
+ * signature only, irrespective of Java's visibility rules). Furthermore,
+ * {@code @BeforeAll} methods from superclasses will be executed before
+ * {@code @BeforeAll} methods in subclasses.
  *
  * <p>Similarly, {@code @BeforeAll} methods declared in an interface are
- * inherited as long as they are not <em>hidden</em> or <em>overridden</em>
- * (or 'superseded', see above), and {@code @BeforeAll} methods from an
- * interface will be executed before {@code @BeforeAll} methods in the class
- * that implements the interface.
+ * inherited as long as they are not <em>hidden</em> or <em>overridden</em>,
+ * and {@code @BeforeAll} methods from an interface will be executed before
+ * {@code @BeforeAll} methods in the class that implements the interface.
  *
  * <p>JUnit Jupiter does not guarantee the execution order of multiple
  * {@code @BeforeAll} methods that are declared within a single test class or
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
index 2df14d79dcb5..b6247315b40f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
@@ -36,8 +36,8 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @BeforeEach} methods are inherited from superclasses as long as
- * they are not overridden  or 'superseded' (i.e., replaced based on signature
- * only, irrespective of Java's visibility rules). Furthermore,
+ * they are not overridden or <em>superseded</em> (i.e., replaced based on
+ * signature only, irrespective of Java's visibility rules). Furthermore,
  * {@code @BeforeEach} methods from superclasses will be executed before
  * {@code @BeforeEach} methods in subclasses.
  *

From a2381a6f73960b0061e600dff0d52dd2adb5c71e Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Mon, 4 Jul 2022 10:07:03 +0200
Subject: [PATCH 0877/1433] #2914: describe bug fix as a potentially breaking
 change in release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
index 47f0077a6351..da5660cb4fdc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
@@ -48,6 +48,11 @@ on GitHub.
   executes the test code in the same thread as the calling code, and `SEPARATE_THREAD`
   which executes it in a separate thread.
 
+==== Deprecations and Breaking Changes
+
+* Private lifecycle methods now correctly lead to an exception. Despite being a bug fix,
+  this is technically a breaking change as there might be existing user code with private
+  lifecycle methods which will now start to fail.
 
 [[release-notes-5.9.0-RC1-junit-vintage]]
 === JUnit Vintage

From 67c5f40a347a46c24a301954dd14b24f2f2053eb Mon Sep 17 00:00:00 2001
From: Matthias Merdes <matthias.merdes@heigit.org>
Date: Mon, 4 Jul 2022 10:18:42 +0200
Subject: [PATCH 0878/1433] #2914: explain 'superseding' for lifecycle methods
 in user guide

---
 .../docs/asciidoc/user-guide/extensions.adoc  | 24 +++++++++++--------
 .../asciidoc/user-guide/writing-tests.adoc    |  8 +++----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index 2656ce8374ea..b77f400348e7 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -799,27 +799,31 @@ callbacks implemented by `Extension2`. `Extension1` is therefore said to _wrap_
 JUnit Jupiter also guarantees _wrapping_ behavior within class and interface hierarchies
 for user-supplied _lifecycle methods_ (see <<writing-tests-classes-and-methods>>).
 
-* `@BeforeAll` methods are inherited from superclasses as long as they are not _hidden_ or
-  _overridden_. Furthermore, `@BeforeAll` methods from superclasses will be executed
-  **before** `@BeforeAll` methods in subclasses.
+* `@BeforeAll` methods are inherited from superclasses as long as they are not _hidden_, or
+  _overridden_, or _superseded_ (i.e., replaced based on signature only, irrespective of
+  Java's visibility rules). Furthermore, `@BeforeAll` methods from superclasses will be
+  executed **before** `@BeforeAll` methods in subclasses.
 ** Similarly, `@BeforeAll` methods declared in an interface are inherited as long as they
    are not _hidden_ or _overridden_, and `@BeforeAll` methods from an interface will be
    executed **before** `@BeforeAll` methods in the class that implements the interface.
-* `@AfterAll` methods are inherited from superclasses as long as they are not _hidden_ or
-  _overridden_. Furthermore, `@AfterAll` methods from superclasses will be executed
-  **after** `@AfterAll` methods in subclasses.
+* `@AfterAll` methods are inherited from superclasses as long as they are not _hidden_, or
+  _overridden_, or _superseded_ (i.e., replaced based on signature only, irrespective of
+  Java's visibility rules). Furthermore, `@AfterAll` methods from superclasses will be
+  executed **after** `@AfterAll` methods in subclasses.
 ** Similarly, `@AfterAll` methods declared in an interface are inherited as long as they
    are not _hidden_ or _overridden_, and `@AfterAll` methods from an interface will be
    executed **after** `@AfterAll` methods in the class that implements the interface.
 * `@BeforeEach` methods are inherited from superclasses as long as they are not
-  _overridden_. Furthermore, `@BeforeEach` methods from superclasses will be executed
-  **before** `@BeforeEach` methods in subclasses.
+  _overridden_ or _superseded_ (i.e., replaced based on signature only, irrespective of
+  Java's visibility rules). Furthermore, `@BeforeEach` methods from superclasses will be
+  executed **before** `@BeforeEach` methods in subclasses.
 ** Similarly, `@BeforeEach` methods declared as interface default methods are inherited as
    long as they are not _overridden_, and `@BeforeEach` default methods will be executed
    **before** `@BeforeEach` methods in the class that implements the interface.
 * `@AfterEach` methods are inherited from superclasses as long as they are not
-  _overridden_. Furthermore, `@AfterEach` methods from superclasses will be executed
-  **after** `@AfterEach` methods in subclasses.
+  _overridden_ or _superseded_ (i.e., replaced based on signature only, irrespective of
+  Java's visibility rules). Furthermore, `@AfterEach` methods from superclasses will be
+  executed **after** `@AfterEach` methods in subclasses.
 ** Similarly, `@AfterEach` methods declared as interface default methods are inherited as
    long as they are not _overridden_, and `@AfterEach` default methods will be executed
    **after** `@AfterEach` methods in the class that implements the interface.
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 2099006c940c..08486bfc9a86 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -34,10 +34,10 @@ in the `junit-jupiter-api` module.
 | `@TestInstance`          | Used to configure the <<writing-tests-test-instance-lifecycle, test instance lifecycle>> for the annotated test class. Such annotations are _inherited_.
 | `@DisplayName`           | Declares a custom <<writing-tests-display-names,display name>> for the test class or test method. Such annotations are not _inherited_.
 | `@DisplayNameGeneration` | Declares a custom <<writing-tests-display-name-generator,display name generator>> for the test class. Such annotations are _inherited_.
-| `@BeforeEach`            | Denotes that the annotated method should be executed _before_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@Before`. Such methods are _inherited_ unless they are _overridden_.
-| `@AfterEach`             | Denotes that the annotated method should be executed _after_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@After`. Such methods are _inherited_ unless they are _overridden_.
-| `@BeforeAll`             | Denotes that the annotated method should be executed _before_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@BeforeClass`. Such methods are _inherited_ (unless they are _hidden_ or _overridden_) and must be `static` (unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used).
-| `@AfterAll`              | Denotes that the annotated method should be executed _after_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@AfterClass`. Such methods are _inherited_ (unless they are _hidden_ or _overridden_) and must be `static` (unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used).
+| `@BeforeEach`            | Denotes that the annotated method should be executed _before_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@Before`. Such methods are _inherited_ unless they are _overridden_ or _superseded_ (i.e., replaced based on signature only, irrespective of Java's visibility rules).
+| `@AfterEach`             | Denotes that the annotated method should be executed _after_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@After`. Such methods are _inherited_ unless they are _overridden_ or _superseded_ (i.e., replaced based on signature only, irrespective of Java's visibility rules).
+| `@BeforeAll`             | Denotes that the annotated method should be executed _before_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@BeforeClass`. Such methods are _inherited_ (unless they are _hidden_, or _overridden_, or _superseded_, i.e., replaced based on signature only, irrespective of Java's visibility rules) and must be `static` (unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used).
+| `@AfterAll`              | Denotes that the annotated method should be executed _after_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@AfterClass`. Such methods are _inherited_ (unless they are _hidden_, or _overridden_, or _superseded_, i.e., replaced based on signature only, irrespective of Java's visibility rules) and must be `static` (unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used).
 | `@Nested`                | Denotes that the annotated class is a non-static <<writing-tests-nested,nested test class>>. On Java 8 through Java 15, `@BeforeAll` and `@AfterAll` methods cannot be used directly in a `@Nested` test class unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used. Beginning with Java 16, `@BeforeAll` and `@AfterAll` methods can be declared as `static` in a `@Nested` test class with either test instance lifecycle mode. Such annotations are not _inherited_.
 | `@Tag`                   | Used to declare <<writing-tests-tagging-and-filtering,tags for filtering tests>>, either at the class or method level; analogous to test groups in TestNG or Categories in JUnit 4. Such annotations are _inherited_ at the class level but not at the method level.
 | `@Disabled`              | Used to <<writing-tests-disabling,disable>> a test class or test method; analogous to JUnit 4's `@Ignore`. Such annotations are not _inherited_.

From 0a2c3e57d2cd423c342b707837c29ec8126036ac Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 4 Jul 2022 15:09:47 +0200
Subject: [PATCH 0879/1433] Fix @EnabledIf/@DisabledIf unit tests

---
 .../api/condition/MethodBasedCondition.java   |  8 +--
 .../condition/DisabledIfConditionTests.java   | 52 +++++++++----------
 .../condition/DisabledIfIntegrationTests.java | 21 +++-----
 .../condition/EnabledIfConditionTests.java    | 52 +++++++++----------
 .../condition/EnabledIfIntegrationTests.java  | 23 ++++----
 5 files changed, 74 insertions(+), 82 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index 952a7ecd2dd4..a7b269db570e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -19,6 +19,7 @@
 import java.lang.reflect.Method;
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -91,12 +92,13 @@ private boolean acceptsExtensionContextOrNoArguments(Method method) {
 	}
 
 	private ConditionEvaluationResult buildConditionEvaluationResult(boolean methodResult, A annotation) {
-		String defaultReason = format("Condition provided in %s evaluated to %s", this.annotationType, methodResult);
+		Supplier<String> defaultReason = () -> format("@%s(\"%s\") evaluated to %s",
+			this.annotationType.getSimpleName(), this.methodName.apply(annotation), methodResult);
 		if (isEnabled(methodResult)) {
-			return enabled(defaultReason);
+			return enabled(defaultReason.get());
 		}
 		String customReason = this.customDisabledReason.apply(annotation);
-		return StringUtils.isNotBlank(customReason) ? disabled(customReason) : disabled(defaultReason);
+		return StringUtils.isNotBlank(customReason) ? disabled(customReason) : disabled(defaultReason.get());
 	}
 
 	protected abstract boolean isEnabled(boolean methodResult);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
index f2daefee0b31..c8fdbd9b86e5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api.condition;
 
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 
@@ -61,7 +60,8 @@ void disabledBecauseStaticConditionMethodReturnsTrue() {
 	void enabledBecauseStaticConditionMethodReturnsFalse() {
 		evaluateCondition();
 		assertEnabled();
-		assertReasonContains("Condition provided in @DisabledIf evaluates to false");
+		assertReasonContains("""
+				@DisabledIf("staticMethodThatReturnsFalse") evaluated to false""");
 	}
 
 	/**
@@ -71,7 +71,8 @@ void enabledBecauseStaticConditionMethodReturnsFalse() {
 	void disabledBecauseConditionMethodReturnsTrue() {
 		evaluateCondition();
 		assertDisabled();
-		assertReasonContains("Condition provided in @DisabledIf evaluates to true");
+		assertReasonContains("""
+				@DisabledIf("methodThatReturnsTrue") evaluated to true""");
 	}
 
 	/**
@@ -81,32 +82,31 @@ void disabledBecauseConditionMethodReturnsTrue() {
 	void enabledBecauseConditionMethodReturnsFalse() {
 		evaluateCondition();
 		assertEnabled();
-		assertReasonContains("Condition provided in @DisabledIf evaluates to false");
+		assertReasonContains("""
+				@DisabledIf("methodThatReturnsFalse") evaluated to false""");
 	}
 
-	@Nested
-	class ExternalConditionMethod {
-
-		/**
-		 * @see DisabledIfIntegrationTests.ExternalConditionMethod#disabledBecauseConditionMethodReturnsTrue()
-		 */
-		@Test
-		void disabledBecauseConditionMethodReturnsTrue() {
-			evaluateCondition();
-			assertDisabled();
-			assertReasonContains("Condition provided in @DisabledIf evaluates to true");
-		}
-
-		/**
-		 * @see DisabledIfIntegrationTests.ExternalConditionMethod#enabledBecauseConditionMethodReturnsFalse()
-		 */
-		@Test
-		void enabledBecauseConditionMethodReturnsFalse() {
-			evaluateCondition();
-			assertEnabled();
-			assertReasonContains("Condition provided in @DisabledIf evaluates to false");
-		}
+	/**
+	 * @see DisabledIfIntegrationTests.ExternalConditionMethod#disabledBecauseStaticExternalConditionMethodReturnsTrue()
+	 */
+	@Test
+	void disabledBecauseStaticExternalConditionMethodReturnsTrue() {
+		evaluateCondition();
+		assertDisabled();
+		assertReasonContains("""
+				@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue") evaluated to true""");
+	}
 
+	/**
+	 * @see DisabledIfIntegrationTests.ExternalConditionMethod#enabledBecauseStaticExternalConditionMethodReturnsFalse()
+	 */
+	@Test
+	void enabledBecauseStaticExternalConditionMethodReturnsFalse() {
+		evaluateCondition();
+		assertEnabled();
+		assertReasonContains(
+			"""
+					@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse") evaluated to false""");
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
index 6315c3f89a79..26ff4be04a03 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
@@ -50,20 +50,15 @@ void disabledBecauseConditionMethodReturnsTrue() {
 	void enabledBecauseConditionMethodReturnsFalse() {
 	}
 
-	@Nested
-	class ExternalConditionMethod {
-
-		@Test
-		@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
-		void disabledBecauseConditionMethodReturnsTrue() {
-			fail("Should be disabled");
-		}
-
-		@Test
-		@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
-		void enabledBecauseConditionMethodReturnsFalse() {
-		}
+	@Test
+	@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
+	void disabledBecauseStaticExternalConditionMethodReturnsTrue() {
+		fail("Should be disabled");
+	}
 
+	@Test
+	@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
+	void enabledBecauseStaticExternalConditionMethodReturnsFalse() {
 	}
 
 	@Nested
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
index 0fb03b2b3da4..840e4a912d61 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api.condition;
 
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 
@@ -51,7 +50,8 @@ void enabledBecauseAnnotationIsNotPresent() {
 	void enabledBecauseStaticConditionMethodReturnsTrue() {
 		evaluateCondition();
 		assertEnabled();
-		assertReasonContains("Condition provided in @EnabledIf evaluates to true");
+		assertReasonContains("""
+				@EnabledIf("staticMethodThatReturnsTrue") evaluated to true""");
 	}
 
 	/**
@@ -71,7 +71,8 @@ void disabledBecauseStaticConditionMethodReturnsFalse() {
 	void enabledBecauseConditionMethodReturnsTrue() {
 		evaluateCondition();
 		assertEnabled();
-		assertReasonContains("Condition provided in @EnabledIf evaluates to true");
+		assertReasonContains("""
+				@EnabledIf("methodThatReturnsTrue") evaluated to true""");
 	}
 
 	/**
@@ -81,32 +82,31 @@ void enabledBecauseConditionMethodReturnsTrue() {
 	void disabledBecauseConditionMethodReturnsFalse() {
 		evaluateCondition();
 		assertDisabled();
-		assertReasonContains("Condition provided in @EnabledIf evaluates to false");
+		assertReasonContains("""
+				@EnabledIf("methodThatReturnsFalse") evaluated to false""");
 	}
 
-	@Nested
-	class ExternalConditionMethod {
-
-		/**
-		 * @see EnabledIfIntegrationTests.ExternalConditionMethod#enabledBecauseConditionMethodReturnsTrue()
-		 */
-		@Test
-		void enabledBecauseConditionMethodReturnsTrue() {
-			evaluateCondition();
-			assertEnabled();
-			assertReasonContains("Condition provided in @EnabledIf evaluates to true");
-		}
-
-		/**
-		 * @see EnabledIfIntegrationTests.ExternalConditionMethod#disabledBecauseConditionMethodReturnsFalse()
-		 */
-		@Test
-		void disabledBecauseConditionMethodReturnsFalse() {
-			evaluateCondition();
-			assertDisabled();
-			assertReasonContains("Condition provided in @EnabledIf evaluates to false");
-		}
+	/**
+	 * @see EnabledIfIntegrationTests.ExternalConditionMethod#enabledBecauseStaticExternalConditionMethodReturnsTrue()
+	 */
+	@Test
+	void enabledBecauseStaticExternalConditionMethodReturnsTrue() {
+		evaluateCondition();
+		assertEnabled();
+		assertReasonContains("""
+				@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue") evaluated to true""");
+	}
 
+	/**
+	 * @see EnabledIfIntegrationTests.ExternalConditionMethod#disabledBecauseStaticExternalConditionMethodReturnsFalse()
+	 */
+	@Test
+	void disabledBecauseStaticExternalConditionMethodReturnsFalse() {
+		evaluateCondition();
+		assertDisabled();
+		assertReasonContains(
+			"""
+					@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse") evaluated to false""");
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
index be7827ab894e..8b8df8820cf1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
@@ -50,20 +50,15 @@ void disabledBecauseConditionMethodReturnsFalse() {
 		fail("Should be disabled");
 	}
 
-	@Nested
-	class ExternalConditionMethod {
-
-		@Test
-		@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
-		void enabledBecauseConditionMethodReturnsTrue() {
-		}
-
-		@Test
-		@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
-		void disabledBecauseConditionMethodReturnsFalse() {
-			fail("Should be disabled");
-		}
+	@Test
+	@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
+	void enabledBecauseStaticExternalConditionMethodReturnsTrue() {
+	}
 
+	@Test
+	@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
+	void disabledBecauseStaticExternalConditionMethodReturnsFalse() {
+		fail("Should be disabled");
 	}
 
 	@Nested
@@ -71,7 +66,7 @@ void disabledBecauseConditionMethodReturnsFalse() {
 	class ConditionallyDisabledClass {
 
 		@Test
-		void disabledBecauseConditionMethodReturnsTrue() {
+		void disabledBecauseConditionMethodReturnsFalse() {
 			fail("Should be disabled");
 		}
 

From f5485fac746ca5fb9bf8a5a32a28c7291204f9e5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 4 Jul 2022 16:53:35 +0200
Subject: [PATCH 0880/1433] Polishing

---
 .../release-notes-5.9.0-RC1.adoc              | 12 ++--
 .../docs/asciidoc/user-guide/extensions.adoc  |  4 +-
 .../asciidoc/user-guide/writing-tests.adoc    |  8 +--
 .../java/org/junit/jupiter/api/AfterAll.java  |  2 +-
 .../java/org/junit/jupiter/api/AfterEach.java |  4 +-
 .../java/org/junit/jupiter/api/BeforeAll.java |  2 +-
 .../org/junit/jupiter/api/BeforeEach.java     |  4 +-
 .../descriptor/LifecycleMethodUtils.java      | 59 ++++++++++---------
 ...eMethodOverridingAndSupersedingTests.java} | 58 ++++++++++++++++--
 ...cycleMethodInDifferentPackageTestCase.java | 32 ++++++++++
 10 files changed, 134 insertions(+), 51 deletions(-)
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/{LifecycleMethodSupersedingTests.java => LifecycleMethodOverridingAndSupersedingTests.java} (65%)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/subpackage/SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
index da5660cb4fdc..1a0631f69193 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
@@ -30,6 +30,13 @@ on GitHub.
 [[release-notes-5.9.0-RC1-junit-jupiter]]
 === JUnit Jupiter
 
+==== Deprecations and Breaking Changes
+
+* Private lifecycle methods (annotated with `@BeforeAll`, `@AfterAll`, `@BeforeEach`, or
+  `@AfterEach`) now correctly lead to an exception. Although this is a bug fix, it is
+  technically also a breaking change since there might be existing user code with
+  `private` lifecycle methods which will now start to fail.
+
 ==== New Features and Improvements
 
 * Three new `abort` methods have been added to the `Assumptions` class. These are
@@ -48,11 +55,6 @@ on GitHub.
   executes the test code in the same thread as the calling code, and `SEPARATE_THREAD`
   which executes it in a separate thread.
 
-==== Deprecations and Breaking Changes
-
-* Private lifecycle methods now correctly lead to an exception. Despite being a bug fix,
-  this is technically a breaking change as there might be existing user code with private
-  lifecycle methods which will now start to fail.
 
 [[release-notes-5.9.0-RC1-junit-vintage]]
 === JUnit Vintage
diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index b77f400348e7..a1fee08b8303 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -799,14 +799,14 @@ callbacks implemented by `Extension2`. `Extension1` is therefore said to _wrap_
 JUnit Jupiter also guarantees _wrapping_ behavior within class and interface hierarchies
 for user-supplied _lifecycle methods_ (see <<writing-tests-classes-and-methods>>).
 
-* `@BeforeAll` methods are inherited from superclasses as long as they are not _hidden_, or
+* `@BeforeAll` methods are inherited from superclasses as long as they are not _hidden_,
   _overridden_, or _superseded_ (i.e., replaced based on signature only, irrespective of
   Java's visibility rules). Furthermore, `@BeforeAll` methods from superclasses will be
   executed **before** `@BeforeAll` methods in subclasses.
 ** Similarly, `@BeforeAll` methods declared in an interface are inherited as long as they
    are not _hidden_ or _overridden_, and `@BeforeAll` methods from an interface will be
    executed **before** `@BeforeAll` methods in the class that implements the interface.
-* `@AfterAll` methods are inherited from superclasses as long as they are not _hidden_, or
+* `@AfterAll` methods are inherited from superclasses as long as they are not _hidden_,
   _overridden_, or _superseded_ (i.e., replaced based on signature only, irrespective of
   Java's visibility rules). Furthermore, `@AfterAll` methods from superclasses will be
   executed **after** `@AfterAll` methods in subclasses.
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 08486bfc9a86..d775251366ba 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -34,10 +34,10 @@ in the `junit-jupiter-api` module.
 | `@TestInstance`          | Used to configure the <<writing-tests-test-instance-lifecycle, test instance lifecycle>> for the annotated test class. Such annotations are _inherited_.
 | `@DisplayName`           | Declares a custom <<writing-tests-display-names,display name>> for the test class or test method. Such annotations are not _inherited_.
 | `@DisplayNameGeneration` | Declares a custom <<writing-tests-display-name-generator,display name generator>> for the test class. Such annotations are _inherited_.
-| `@BeforeEach`            | Denotes that the annotated method should be executed _before_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@Before`. Such methods are _inherited_ unless they are _overridden_ or _superseded_ (i.e., replaced based on signature only, irrespective of Java's visibility rules).
-| `@AfterEach`             | Denotes that the annotated method should be executed _after_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@After`. Such methods are _inherited_ unless they are _overridden_ or _superseded_ (i.e., replaced based on signature only, irrespective of Java's visibility rules).
-| `@BeforeAll`             | Denotes that the annotated method should be executed _before_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@BeforeClass`. Such methods are _inherited_ (unless they are _hidden_, or _overridden_, or _superseded_, i.e., replaced based on signature only, irrespective of Java's visibility rules) and must be `static` (unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used).
-| `@AfterAll`              | Denotes that the annotated method should be executed _after_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@AfterClass`. Such methods are _inherited_ (unless they are _hidden_, or _overridden_, or _superseded_, i.e., replaced based on signature only, irrespective of Java's visibility rules) and must be `static` (unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used).
+| `@BeforeEach`            | Denotes that the annotated method should be executed _before_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@Before`. Such methods are _inherited_ – unless they are _overridden_ or _superseded_ (i.e., replaced based on signature only, irrespective of Java's visibility rules).
+| `@AfterEach`             | Denotes that the annotated method should be executed _after_ *each* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, or `@TestFactory` method in the current class; analogous to JUnit 4's `@After`. Such methods are _inherited_ – unless they are _overridden_ or _superseded_ (i.e., replaced based on signature only, irrespective of Java's visibility rules).
+| `@BeforeAll`             | Denotes that the annotated method should be executed _before_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@BeforeClass`. Such methods are _inherited_ – unless they are _hidden_, _overridden_, or _superseded_, (i.e., replaced based on signature only, irrespective of Java's visibility rules) – and must be `static` unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used.
+| `@AfterAll`              | Denotes that the annotated method should be executed _after_ *all* `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current class; analogous to JUnit 4's `@AfterClass`. Such methods are _inherited_ – unless they are _hidden_, _overridden_, or _superseded_, (i.e., replaced based on signature only, irrespective of Java's visibility rules) – and must be `static` unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used.
 | `@Nested`                | Denotes that the annotated class is a non-static <<writing-tests-nested,nested test class>>. On Java 8 through Java 15, `@BeforeAll` and `@AfterAll` methods cannot be used directly in a `@Nested` test class unless the "per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used. Beginning with Java 16, `@BeforeAll` and `@AfterAll` methods can be declared as `static` in a `@Nested` test class with either test instance lifecycle mode. Such annotations are not _inherited_.
 | `@Tag`                   | Used to declare <<writing-tests-tagging-and-filtering,tags for filtering tests>>, either at the class or method level; analogous to test groups in TestNG or Categories in JUnit 4. Such annotations are _inherited_ at the class level but not at the method level.
 | `@Disabled`              | Used to <<writing-tests-disabling,disable>> a test class or test method; analogous to JUnit 4's `@Ignore`. Such annotations are not _inherited_.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index a5ab2e1abc4d..d356d261c9ff 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -43,7 +43,7 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @AfterAll} methods are inherited from superclasses as long as
- * they are not <em>hidden</em> (default mode with {@code static} modifier), or
+ * they are not <em>hidden</em> (default mode with {@code static} modifier),
  * <em>overridden</em>, or <em>superseded</em> (i.e., replaced based on
  * signature only, irrespective of Java's visibility rules). Furthermore,
  * {@code @AfterAll} methods from superclasses will be executed before
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
index c6340076e0f2..3e0cab029463 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
@@ -35,8 +35,8 @@
  *
  * <h2>Inheritance and Execution Order</h2>
  *
- * <p>{@code @AfterEach} methods are inherited from superclasses as long as
- * they are not overridden or <em>superseded</em> (i.e., replaced based on
+ * <p>{@code @AfterEach} methods are inherited from superclasses as long as they
+ * are not <em>overridden</em> or <em>superseded</em> (i.e., replaced based on
  * signature only, irrespective of Java's visibility rules). Furthermore,
  * {@code @AfterEach} methods from superclasses will be executed after
  * {@code @AfterEach} methods in subclasses.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index 5c85c196d262..9b3b2878281c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -43,7 +43,7 @@
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @BeforeAll} methods are inherited from superclasses as long as
- * they are not <em>hidden</em> (default mode with {@code static} modifier), or
+ * they are not <em>hidden</em> (default mode with {@code static} modifier),
  * <em>overridden</em>, or <em>superseded</em> (i.e., replaced based on
  * signature only, irrespective of Java's visibility rules). Furthermore,
  * {@code @BeforeAll} methods from superclasses will be executed before
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
index b6247315b40f..8d8d2a0b4173 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
@@ -35,8 +35,8 @@
  *
  * <h2>Inheritance and Execution Order</h2>
  *
- * <p>{@code @BeforeEach} methods are inherited from superclasses as long as
- * they are not overridden or <em>superseded</em> (i.e., replaced based on
+ * <p>{@code @BeforeEach} methods are inherited from superclasses as long as they
+ * are not <em>overridden</em> or <em>superseded</em> (i.e., replaced based on
  * signature only, irrespective of Java's visibility rules). Furthermore,
  * {@code @BeforeEach} methods from superclasses will be executed before
  * {@code @BeforeEach} methods in subclasses.
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
index 9b9a43a73a20..28efaaa8eba0 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
@@ -54,6 +54,36 @@ static List<Method> findAfterEachMethods(Class<?> testClass) {
 		return findMethodsAndAssertNonStaticAndNonPrivate(testClass, AfterEach.class, HierarchyTraversalMode.BOTTOM_UP);
 	}
 
+	private static List<Method> findMethodsAndAssertStaticAndNonPrivate(Class<?> testClass, boolean requireStatic,
+			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
+
+		List<Method> methods = findMethodsAndCheckVoidReturnType(testClass, annotationType, traversalMode);
+		if (requireStatic) {
+			methods.forEach(method -> assertStatic(annotationType, method));
+		}
+		methods.forEach(method -> assertNonPrivate(annotationType, method));
+		return methods;
+	}
+
+	private static List<Method> findMethodsAndAssertNonStaticAndNonPrivate(Class<?> testClass,
+			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
+
+		List<Method> methods = findMethodsAndCheckVoidReturnType(testClass, annotationType, traversalMode);
+		methods.forEach(method -> {
+			assertNonStatic(annotationType, method);
+			assertNonPrivate(annotationType, method);
+		});
+		return methods;
+	}
+
+	private static List<Method> findMethodsAndCheckVoidReturnType(Class<?> testClass,
+			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
+
+		List<Method> methods = findAnnotatedMethods(testClass, annotationType, traversalMode);
+		methods.forEach(method -> assertVoid(annotationType, method));
+		return methods;
+	}
+
 	private static void assertStatic(Class<? extends Annotation> annotationType, Method method) {
 		if (ReflectionUtils.isNotStatic(method)) {
 			throw new JUnitException(String.format(
@@ -83,33 +113,4 @@ private static void assertVoid(Class<? extends Annotation> annotationType, Metho
 		}
 	}
 
-	private static List<Method> findMethodsAndAssertStaticAndNonPrivate(Class<?> testClass, boolean requireStatic,
-			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
-		List<Method> methods = findMethodsAndCheckVoidReturnType(testClass, annotationType, traversalMode);
-		if (requireStatic) {
-			methods.forEach(method -> assertStatic(annotationType, method));
-		}
-		methods.forEach(method -> assertNonPrivate(annotationType, method));
-
-		return methods;
-	}
-
-	private static List<Method> findMethodsAndAssertNonStaticAndNonPrivate(Class<?> testClass,
-			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
-		List<Method> methods = findMethodsAndCheckVoidReturnType(testClass, annotationType, traversalMode);
-		methods.forEach(method -> {
-			assertNonStatic(annotationType, method);
-			assertNonPrivate(annotationType, method);
-		});
-
-		return methods;
-	}
-
-	private static List<Method> findMethodsAndCheckVoidReturnType(Class<?> testClass,
-			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
-		List<Method> methods = findAnnotatedMethods(testClass, annotationType, traversalMode);
-		methods.forEach(method -> assertVoid(annotationType, method));
-		return methods;
-	}
-
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodSupersedingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
similarity index 65%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodSupersedingTests.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
index cfc92c17974d..2204151b8ee5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodSupersedingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
@@ -26,17 +26,18 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.engine.subpackage.SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase;
 
 /**
- * Integration tests that explicitly demonstrate the shadowing/overriding
+ * Integration tests that explicitly demonstrate the overriding and superseding
  * rules for lifecycle methods in the {@link JupiterTestEngine}.
  *
  * @since 5.9
  */
-class LifecycleMethodSupersedingTests {
+class LifecycleMethodOverridingAndSupersedingTests {
 
 	@Nested
-	@DisplayName("A package-private lifecycle super-method can be superseded by")
+	@DisplayName("A package-private lifecycle super-method can be overridden by")
 	class PackagePrivateSuperClassTests {
 
 		@Nested
@@ -44,6 +45,7 @@ class PackagePrivateSuperClassTests {
 		class ProtectedExtendsPackagePrivateLifecycleMethod
 				extends SuperClassWithPackagePrivateLifecycleMethodTestCase {
 
+			@Override
 			@BeforeEach
 			protected void beforeEach() {
 			}
@@ -55,6 +57,7 @@ protected void beforeEach() {
 		class PackagePrivateExtendsPackagePrivateLifecycleMethod
 				extends SuperClassWithPackagePrivateLifecycleMethodTestCase {
 
+			@Override
 			@BeforeEach
 			void beforeEach() {
 			}
@@ -65,6 +68,7 @@ void beforeEach() {
 		@DisplayName("a public lifecycle method in the derived class")
 		class PublicExtendsPackagePrivateLifecycleMethod extends SuperClassWithPackagePrivateLifecycleMethodTestCase {
 
+			@Override
 			@BeforeEach
 			public void beforeEach() {
 			}
@@ -73,13 +77,55 @@ public void beforeEach() {
 	}
 
 	@Nested
-	@DisplayName("A protected lifecycle super-method can be superseded by")
+	@DisplayName("A package-private lifecycle super-method from a different package can be superseded by")
+	class PackagePrivateSuperClassInDifferentPackageTests {
+
+		@Nested
+		@DisplayName("a protected lifecycle method in the derived class")
+		class ProtectedExtendsPackagePrivateLifecycleMethod
+				extends SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase {
+
+			// @Override
+			@BeforeEach
+			protected void beforeEach() {
+			}
+
+		}
+
+		@Nested
+		@DisplayName("a package-private lifecycle method in the derived class")
+		class PackagePrivateExtendsPackagePrivateLifecycleMethod
+				extends SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase {
+
+			// @Override
+			@BeforeEach
+			void beforeEach() {
+			}
+
+		}
+
+		@Nested
+		@DisplayName("a public lifecycle method in the derived class")
+		class PublicExtendsPackagePrivateLifecycleMethod
+				extends SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase {
+
+			// @Override
+			@BeforeEach
+			public void beforeEach() {
+			}
+
+		}
+	}
+
+	@Nested
+	@DisplayName("A protected lifecycle super-method can be overridden by")
 	class ProtectedSuperClassTests {
 
 		@Nested
 		@DisplayName("a protected lifecycle method in the derived class")
 		class ProtectedExtendsPackagePrivate extends SuperClassWithProtectedLifecycleMethodTestCase {
 
+			@Override
 			@BeforeEach
 			protected void beforeEach() {
 			}
@@ -90,6 +136,7 @@ protected void beforeEach() {
 		@DisplayName("a public lifecycle method in the derived class")
 		class PublicExtendsPackagePrivate extends SuperClassWithProtectedLifecycleMethodTestCase {
 
+			@Override
 			@BeforeEach
 			public void beforeEach() {
 			}
@@ -98,13 +145,14 @@ public void beforeEach() {
 	}
 
 	@Nested
-	@DisplayName("A public lifecycle super-method can be superseded by")
+	@DisplayName("A public lifecycle super-method can be overridden by")
 	class PublicSuperClassTests {
 
 		@Nested
 		@DisplayName("a public lifecycle method in the derived class")
 		class PublicExtendsPackagePrivate extends SuperClassWithPublicLifecycleMethodTestCase {
 
+			@Override
 			@BeforeEach
 			public void beforeEach() {
 			}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/subpackage/SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/subpackage/SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase.java
new file mode 100644
index 000000000000..90c8ecc39ccf
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/subpackage/SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.subpackage;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @since 5.9
+ */
+public class SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase {
+
+	@BeforeEach
+	void beforeEach() {
+		fail();
+	}
+
+	@Test
+	void test() {
+	}
+
+}

From 20459877747d2d9af81f40ccf24b1d44ba14b2c1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 4 Jul 2022 17:39:28 +0200
Subject: [PATCH 0881/1433] Document limitation of
 AbstractExecutionConditionTests

---
 .../api/condition/AbstractExecutionConditionTests.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
index 14b1b5075ee6..a61cd0c48bf9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
@@ -40,6 +40,11 @@
  * Abstract base class for unit testing a concrete {@link ExecutionCondition}
  * implementation.
  *
+ * <p><strong>WARNING</strong>: this abstract base class currently does not
+ * support tests in {@code @Nested} test classes within the
+ * {@linkplain #getTestClass() test class}, since {@link #beforeEach(TestInfo)}
+ * instantiates the test class using the no-args default constructor.
+ *
  * @since 5.1
  */
 @TestInstance(Lifecycle.PER_CLASS)

From a5483229c88ab165c628b8917e39b9d45fcb8a9a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Jul 2022 21:39:57 +0200
Subject: [PATCH 0882/1433] Release 5.9.0-RC1

---
 README.md                                       |  2 +-
 .../release-notes/release-notes-5.9.0-RC1.adoc  | 17 ++++++++++++++---
 gradle.properties                               |  6 +++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 4b1858d97b87..06c77c6cfa13 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 ## Latest Releases
 
 - General Availability (GA): [JUnit 5.8.2](https://github.com/junit-team/junit5/releases/tag/r5.8.2) (November 28, 2021)
-- Preview (Milestone/Release Candidate): [JUnit 5.9.0-M1](https://github.com/junit-team/junit5/releases/tag/r5.9.0-M1) (May 15, 2022)
+- Preview (Milestone/Release Candidate): [JUnit 5.9.0-RC1](https://github.com/junit-team/junit5/releases/tag/r5.9.0-RC1) (July 4, 2022)
 
 ## Documentation
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
index 1a0631f69193..cdef20e54d11 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
@@ -1,9 +1,20 @@
 [[release-notes-5.9.0-RC1]]
 == 5.9.0-RC1
 
-*Date of Release:* July ❓, 2022
-
-*Scope:* ❓
+*Date of Release:* July 4, 2022
+
+*Scope:*
+
+* XML reports in new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
+format
+* Configurable cleanup mode for `@TempDir`
+* Configurable thread mode for `@Timeout`
+* Conditional execution based on OS architectures
+* New `TestInstancePreConstructCallback` extension API
+* Reusable parameter resolution for custom extension methods via `ExecutableInvoker`
+* Parameter injection for `@MethodSource` methods
+* New `IterationSelector`
+* Various improvements to `ConsoleLauncher`
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/61?closed=1+[5.9 RC1] milestone page in the JUnit repository
diff --git a/gradle.properties b/gradle.properties
index 85e59570b686..7ae89ca2f278 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.9.0-SNAPSHOT
+version         = 5.9.0-RC1
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.9.0-SNAPSHOT
+platformVersion = 1.9.0-RC1
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.9.0-SNAPSHOT
+vintageVersion  = 5.9.0-RC1
 
 defaultBuiltBy  = JUnit Team
 

From 7416e56237d3eefc890d3b36164a1b4a22fd5941 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 4 Jul 2022 21:54:54 +0200
Subject: [PATCH 0883/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 7ae89ca2f278..85e59570b686 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.9.0-RC1
+version         = 5.9.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.9.0-RC1
+platformVersion = 1.9.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.9.0-RC1
+vintageVersion  = 5.9.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From e625ef54fe8a3e9b7a7b2c751d15e3983223ba28 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Jul 2022 20:56:21 +0200
Subject: [PATCH 0884/1433] Upgradle to 7.5-rc-4

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e7fb1af96c9..a948f2a644ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d10d8e6206d613313379834f3ed94ec7b781790f22edd44b0f2afa76708e2050
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-3-bin.zip
+distributionSha256Sum=d98c4322d882e7b115fbf2a33ccd3e03677653b88c4f245e33cbea28b531a173
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From ad7758052cbe2a707ed311b9b86d2b9fdc73d4f4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 8 Jul 2022 22:13:40 +0200
Subject: [PATCH 0885/1433] Revert "Upgradle to 7.5-rc-4"

This reverts commit e625ef54fe8a3e9b7a7b2c751d15e3983223ba28.
---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a948f2a644ee..1e7fb1af96c9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d98c4322d882e7b115fbf2a33ccd3e03677653b88c4f245e33cbea28b531a173
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-4-bin.zip
+distributionSha256Sum=d10d8e6206d613313379834f3ed94ec7b781790f22edd44b0f2afa76708e2050
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 21c229b99b58d8343ea907da0443bc61072a8f35 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 12 Jul 2022 14:55:47 +0200
Subject: [PATCH 0886/1433] Upgradle to 7.5-rc-5

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e7fb1af96c9..7fc7385e68ed 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d10d8e6206d613313379834f3ed94ec7b781790f22edd44b0f2afa76708e2050
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-3-bin.zip
+distributionSha256Sum=c0bbfe570634634271f472aa30ec8d059a2e97b920be687d4c6446efbad9cc58
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From dafaabf27350d7b49a32bcbf9e9df76854824d3e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 12 Jul 2022 19:58:58 +0200
Subject: [PATCH 0887/1433] Stabilize test on Windows

---
 documentation/src/test/java/example/TimeoutDemo.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/documentation/src/test/java/example/TimeoutDemo.java b/documentation/src/test/java/example/TimeoutDemo.java
index 0980a8fd1ff7..066bbf8d40c2 100644
--- a/documentation/src/test/java/example/TimeoutDemo.java
+++ b/documentation/src/test/java/example/TimeoutDemo.java
@@ -27,15 +27,15 @@ void setUp() {
 	}
 
 	@Test
-	@Timeout(value = 100, unit = TimeUnit.MILLISECONDS)
-	void failsIfExecutionTimeExceeds100Milliseconds() {
-		// fails if execution time exceeds 100 milliseconds
+	@Timeout(value = 500, unit = TimeUnit.MILLISECONDS)
+	void failsIfExecutionTimeExceeds500Milliseconds() {
+		// fails if execution time exceeds 500 milliseconds
 	}
 
 	@Test
-	@Timeout(value = 100, unit = TimeUnit.MILLISECONDS, threadMode = ThreadMode.SEPARATE_THREAD)
-	void failsIfExecutionTimeExceeds100MillisecondsInSeparateThread() {
-		// fails if execution time exceeds 100 milliseconds, the test code is executed in a separate thread
+	@Timeout(value = 500, unit = TimeUnit.MILLISECONDS, threadMode = ThreadMode.SEPARATE_THREAD)
+	void failsIfExecutionTimeExceeds500MillisecondsInSeparateThread() {
+		// fails if execution time exceeds 500 milliseconds, the test code is executed in a separate thread
 	}
 
 }

From 49ca772ba6c6bf6ef7ea146ceda8dd54f287026e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 15 Jul 2022 19:22:01 +0200
Subject: [PATCH 0888/1433] Polish Javadoc for @EnabledIf and @DisabledIf

---
 .../jupiter/api/condition/DisabledIf.java     | 22 +++++++++----------
 .../jupiter/api/condition/EnabledIf.java      | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
index 8db9dd047a0a..56ef7a7fb194 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
@@ -22,12 +22,12 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
- * {@code @DisabledIf} is used to signal that the annotated test class or
- * test method is <em>disabled</em> only if the provided condition
- * evaluates to {@code true}.
+ * {@code @DisabledIf} is used to signal that the annotated test class or test
+ * method is <em>disabled</em> only if the provided
+ * {@linkplain #value() condition} evaluates to {@code true}.
  *
- * <p>When applied at the class level, all test methods within that class
- * will be disabled on the same condition.
+ * <p>When applied at the class level, all test methods within that class will
+ * be disabled on the same condition.
  *
  * <p>If a test method is disabled via this annotation, that does not prevent
  * the test class from being instantiated. Rather, it prevents the execution of
@@ -71,14 +71,14 @@
 public @interface DisabledIf {
 
 	/**
-	 * The name of a method within the test class or in external classes
-	 * to use as a condition for the container's execution.
+	 * The name of a method within the test class or in an external class to use
+	 * as a condition for the test's or container's execution.
 	 *
-	 * <p>Condition methods must be static if located outside the test class,
-	 * or if {@code @DisabledIf} is used at class level.
+	 * <p>Condition methods must be static if located outside the test class or
+	 * if {@code @DisabledIf} is used at the class level.
 	 *
-	 * <p>Condition methods in external classes must be referenced by <em>fully
-	 * qualified method name</em> &mdash; for example,
+	 * <p>A condition method in an external class must be referenced by its
+	 * <em>fully qualified method name</em> &mdash; for example,
 	 * {@code com.example.Conditions#isEncryptionSupported}.
 	 */
 	String value();
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
index 1b7a84bd4f22..f4b9fa99249c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
@@ -22,12 +22,12 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
- * {@code @EnabledIf} is used to signal that the annotated test class or
- * test method is <em>enabled</em> only if the provided condition
- * evaluates to {@code true}.
+ * {@code @EnabledIf} is used to signal that the annotated test class or test
+ * method is <em>enabled</em> only if the provided
+ * {@linkplain #value() condition} evaluates to {@code true}.
  *
- * <p>When applied at the class level, all test methods within that class
- * will be disabled on the same condition.
+ * <p>When applied at the class level, all test methods within that class will
+ * be enabled on the same condition.
  *
  * <p>If a test method is disabled via this annotation, that does not prevent
  * the test class from being instantiated. Rather, it prevents the execution of
@@ -71,14 +71,14 @@
 public @interface EnabledIf {
 
 	/**
-	 * The name of a method within the test class or in external classes
-	 * to use as a condition for the container's execution.
+	 * The name of a method within the test class or in an external class to use
+	 * as a condition for the test's or container's execution.
 	 *
-	 * <p>Condition methods must be static if located outside the test class,
-	 * or if {@code @EnabledIf} is used at class level.
+	 * <p>Condition methods must be static if located outside the test class or
+	 * if {@code @EnabledIf} is used at the class level.
 	 *
-	 * <p>Condition methods in external classes must be referenced by <em>fully
-	 * qualified method name</em> &mdash; for example,
+	 * <p>A condition method in an external class must be referenced by its
+	 * <em>fully qualified method name</em> &mdash; for example,
 	 * {@code com.example.Conditions#isEncryptionSupported}.
 	 */
 	String value();

From 08b102c905b187d058f942c9bd27df27cb4e86a3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 17 Jul 2022 18:21:19 +0200
Subject: [PATCH 0889/1433] Upgradle to 7.5

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7fc7385e68ed..012d6d90445b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c0bbfe570634634271f472aa30ec8d059a2e97b920be687d4c6446efbad9cc58
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-5-bin.zip
+distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From e91e5dc26b86d0fc0a92f747f0b5dcdc9e5fbec2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 17 Jul 2022 18:27:51 +0200
Subject: [PATCH 0890/1433] Introduce AssertionFailureBuilder (#2972)

Resolves #2967.
---
 .../docs/asciidoc/release-notes/index.adoc    |   2 +
 .../release-notes/release-notes-5.9.0.adoc    |  59 +++++
 .../junit/jupiter/api/AssertArrayEquals.java  |  34 +--
 .../junit/jupiter/api/AssertDoesNotThrow.java |  11 +-
 .../org/junit/jupiter/api/AssertEquals.java   |   9 +-
 .../org/junit/jupiter/api/AssertFalse.java    |  18 +-
 .../junit/jupiter/api/AssertInstanceOf.java   |  16 +-
 .../jupiter/api/AssertIterableEquals.java     |  34 +--
 .../junit/jupiter/api/AssertLinesMatch.java   |  12 +-
 .../junit/jupiter/api/AssertNotEquals.java    |  31 +--
 .../org/junit/jupiter/api/AssertNotNull.java  |  12 +-
 .../org/junit/jupiter/api/AssertNotSame.java  |  13 +-
 .../org/junit/jupiter/api/AssertNull.java     |  21 +-
 .../org/junit/jupiter/api/AssertSame.java     |  14 +-
 .../org/junit/jupiter/api/AssertThrows.java   |  24 +-
 .../jupiter/api/AssertThrowsExactly.java      |  23 +-
 .../org/junit/jupiter/api/AssertTimeout.java  |  23 +-
 .../org/junit/jupiter/api/AssertTrue.java     |  18 +-
 .../jupiter/api/AssertionFailureBuilder.java  | 205 ++++++++++++++++++
 .../org/junit/jupiter/api/AssertionUtils.java |  83 -------
 .../api/AssertInstanceOfAssertionsTests.java  |   2 +-
 .../api/AssertThrowsAssertionsTests.java      |  55 +++--
 .../AssertThrowsExactlyAssertionsTests.java   |  72 +++---
 .../junit/jupiter/api/AssertionTestUtils.java |   7 -
 24 files changed, 516 insertions(+), 282 deletions(-)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index a1306096ed19..6cca6088e477 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.9.0.adoc[]
+
 include::{basedir}/release-notes-5.9.0-RC1.adoc[]
 
 include::{basedir}/release-notes-5.9.0-M1.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
new file mode 100644
index 000000000000..9d09d8642765
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
@@ -0,0 +1,59 @@
+[[release-notes-5.9.0]]
+== 5.9.0
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/62?closed=1+[5.9.0] milestone page in the JUnit repository on
+GitHub.
+
+
+[[release-notes-5.9.0-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.0-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* `AssertionFailureBuilder` allows reusing Jupiter's logic for creating failure messages
+  to assist in writing custom assertion methods.
+
+
+[[release-notes-5.9.0-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
index 0f28b904e663..2a2f8f6d2042 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
@@ -10,11 +10,8 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.formatIndexes;
-import static org.junit.jupiter.api.AssertionUtils.formatValues;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 import static org.junit.platform.commons.util.ReflectionUtils.isArray;
 
 import java.util.ArrayDeque;
@@ -406,30 +403,41 @@ private static void assertArraysNotNull(Object expected, Object actual, Deque<In
 	}
 
 	private static void failExpectedArrayIsNull(Deque<Integer> indexes, Object messageOrSupplier) {
-		fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "expected array was <null>" + formatIndexes(indexes));
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("expected array was <null>" + formatIndexes(indexes)) //
+				.buildAndThrow();
 	}
 
 	private static void failActualArrayIsNull(Deque<Integer> indexes, Object messageOrSupplier) {
-		fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "actual array was <null>" + formatIndexes(indexes));
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("actual array was <null>" + formatIndexes(indexes)) //
+				.buildAndThrow();
 	}
 
 	private static void assertArraysHaveSameLength(int expected, int actual, Deque<Integer> indexes,
 			Object messageOrSupplier) {
 
 		if (expected != actual) {
-			String prefix = buildPrefix(nullSafeGet(messageOrSupplier));
-			String message = "array lengths differ" + formatIndexes(indexes) + ", expected: <" + expected
-					+ "> but was: <" + actual + ">";
-			fail(prefix + message);
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason("array lengths differ" + formatIndexes(indexes)) //
+					.expected(expected) //
+					.actual(actual) //
+					.buildAndThrow();
 		}
 	}
 
 	private static void failArraysNotEqual(Object expected, Object actual, Deque<Integer> indexes,
 			Object messageOrSupplier) {
 
-		String prefix = buildPrefix(nullSafeGet(messageOrSupplier));
-		String message = "array contents differ" + formatIndexes(indexes) + ", " + formatValues(expected, actual);
-		fail(prefix + message);
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("array contents differ" + formatIndexes(indexes)) //
+				.expected(expected) //
+				.actual(actual) //
+				.buildAndThrow();
 	}
 
 	private static Deque<Integer> nullSafeIndexes(Deque<Integer> indexes, int newIndex) {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
index e64b136772ff..d11a3e0e6dbf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
@@ -10,8 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.Supplier;
 
@@ -78,9 +77,11 @@ private static <T> T assertDoesNotThrow(ThrowingSupplier<T> supplier, Object mes
 	}
 
 	private static AssertionFailedError createAssertionFailedError(Object messageOrSupplier, Throwable t) {
-		String message = buildPrefix(nullSafeGet(messageOrSupplier)) + "Unexpected exception thrown: "
-				+ t.getClass().getName() + buildSuffix(t.getMessage());
-		return new AssertionFailedError(message, t);
+		return assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("Unexpected exception thrown: " + t.getClass().getName() + buildSuffix(t.getMessage())) //
+				.cause(t) //
+				.build();
 	}
 
 	private static String buildSuffix(String message) {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
index 8a06b335599c..9afd4b1072c5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
@@ -10,8 +10,8 @@
 
 package org.junit.jupiter.api;
 
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.doublesAreEqual;
-import static org.junit.jupiter.api.AssertionUtils.failNotEqual;
 import static org.junit.jupiter.api.AssertionUtils.floatsAreEqual;
 import static org.junit.jupiter.api.AssertionUtils.objectsAreEqual;
 
@@ -189,4 +189,11 @@ static void assertEquals(Object expected, Object actual, Supplier<String> messag
 		}
 	}
 
+	private static void failNotEqual(Object expected, Object actual, Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.expected(expected) //
+				.actual(actual) //
+				.buildAndThrow();
+	}
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
index 604c26e98af6..8364cb64615b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
@@ -10,9 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
@@ -25,8 +23,6 @@
  */
 class AssertFalse {
 
-	private static final String EXPECTED_FALSE = "expected: <false> but was: <true>";
-
 	private AssertFalse() {
 		/* no-op */
 	}
@@ -37,13 +33,13 @@ static void assertFalse(boolean condition) {
 
 	static void assertFalse(boolean condition, String message) {
 		if (condition) {
-			fail(buildPrefix(message) + EXPECTED_FALSE, false, true);
+			failNotFalse(message);
 		}
 	}
 
 	static void assertFalse(boolean condition, Supplier<String> messageSupplier) {
 		if (condition) {
-			fail(buildPrefix(nullSafeGet(messageSupplier)) + EXPECTED_FALSE, false, true);
+			failNotFalse(messageSupplier);
 		}
 	}
 
@@ -59,4 +55,12 @@ static void assertFalse(BooleanSupplier booleanSupplier, Supplier<String> messag
 		assertFalse(booleanSupplier.getAsBoolean(), messageSupplier);
 	}
 
+	private static void failNotFalse(Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.expected(false) //
+				.actual(true) //
+				.buildAndThrow();
+	}
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
index fd491bc25c0c..f1891d138c83 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
@@ -10,14 +10,10 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.format;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.Supplier;
 
-import org.opentest4j.AssertionFailedError;
-
 /**
  * {@code AssertInstanceOf} is a collection of utility methods that support
  * asserting that an object is of an expected type &mdash; in other words, if it
@@ -45,10 +41,12 @@ static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Supplie
 
 	private static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Object messageOrSupplier) {
 		if (!expectedType.isInstance(actualValue)) {
-			String reason = (actualValue == null ? "Unexpected null value" : "Unexpected type");
-			String message = buildPrefix(nullSafeGet(messageOrSupplier))
-					+ format(expectedType, actualValue == null ? null : actualValue.getClass(), reason);
-			throw new AssertionFailedError(message);
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason(actualValue == null ? "Unexpected null value" : "Unexpected type") //
+					.expected(expectedType) //
+					.actual(actualValue == null ? null : actualValue.getClass()) //
+					.buildAndThrow();
 		}
 		return expectedType.cast(actualValue);
 	}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
index dd581398d4d6..a569d2105b90 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
@@ -10,11 +10,8 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.formatIndexes;
-import static org.junit.jupiter.api.AssertionUtils.formatValues;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -139,11 +136,17 @@ private static void assertIterablesNotNull(Object expected, Object actual, Deque
 	}
 
 	private static void failExpectedIterableIsNull(Deque<Integer> indexes, Object messageOrSupplier) {
-		fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "expected iterable was <null>" + formatIndexes(indexes));
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("expected iterable was <null>" + formatIndexes(indexes)) //
+				.buildAndThrow();
 	}
 
 	private static void failActualIterableIsNull(Deque<Integer> indexes, Object messageOrSupplier) {
-		fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "actual iterable was <null>" + formatIndexes(indexes));
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("actual iterable was <null>" + formatIndexes(indexes)) //
+				.buildAndThrow();
 	}
 
 	private static void assertIteratorsAreEmpty(Iterator<?> expected, Iterator<?> actual, int processed,
@@ -156,19 +159,24 @@ private static void assertIteratorsAreEmpty(Iterator<?> expected, Iterator<?> ac
 			AtomicInteger actualCount = new AtomicInteger(processed);
 			actual.forEachRemaining(e -> actualCount.incrementAndGet());
 
-			String prefix = buildPrefix(nullSafeGet(messageOrSupplier));
-			String message = "iterable lengths differ" + formatIndexes(indexes) + ", expected: <" + expectedCount.get()
-					+ "> but was: <" + actualCount.get() + ">";
-			fail(prefix + message);
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason("iterable lengths differ" + formatIndexes(indexes)) //
+					.expected(expectedCount.get()) //
+					.actual(actualCount.get()) //
+					.buildAndThrow();
 		}
 	}
 
 	private static void failIterablesNotEqual(Object expected, Object actual, Deque<Integer> indexes,
 			Object messageOrSupplier) {
 
-		String prefix = buildPrefix(nullSafeGet(messageOrSupplier));
-		String message = "iterable contents differ" + formatIndexes(indexes) + ", " + formatValues(expected, actual);
-		fail(prefix + message);
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("iterable contents differ" + formatIndexes(indexes)) //
+				.expected(expected) //
+				.actual(actual) //
+				.buildAndThrow();
 	}
 
 	private final static class Pair {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
index 8b55d54d12e2..1479728830ed 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
@@ -12,8 +12,7 @@
 
 import static java.lang.String.format;
 import static java.lang.String.join;
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.platform.commons.util.Preconditions.condition;
 import static org.junit.platform.commons.util.Preconditions.notNull;
 
@@ -195,8 +194,13 @@ String snippet(String line) {
 
 		void fail(String format, Object... args) {
 			String newLine = System.lineSeparator();
-			String message = buildPrefix(nullSafeGet(messageOrSupplier)) + format(format, args);
-			AssertionUtils.fail(message, join(newLine, expectedLines), join(newLine, actualLines));
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason(format(format, args)) //
+					.expected(join(newLine, expectedLines)) //
+					.actual(join(newLine, actualLines)) //
+					.includeValuesInMessage(false) //
+					.buildAndThrow();
 		}
 	}
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
index 3bdb087dd9f6..1e8be26c6a5e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
@@ -10,11 +10,9 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.doublesAreEqual;
-import static org.junit.jupiter.api.AssertionUtils.fail;
 import static org.junit.jupiter.api.AssertionUtils.floatsAreEqual;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 import static org.junit.jupiter.api.AssertionUtils.objectsAreEqual;
 
 import java.util.function.Supplier;
@@ -52,7 +50,7 @@ static void assertNotEquals(byte unexpected, byte actual, String message) {
 	 */
 	static void assertNotEquals(byte unexpected, byte actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -77,7 +75,7 @@ static void assertNotEquals(short unexpected, short actual, String message) {
 	 */
 	static void assertNotEquals(short unexpected, short actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -102,7 +100,7 @@ static void assertNotEquals(int unexpected, int actual, String message) {
 	 */
 	static void assertNotEquals(int unexpected, int actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -127,7 +125,7 @@ static void assertNotEquals(long unexpected, long actual, String message) {
 	 */
 	static void assertNotEquals(long unexpected, long actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -152,7 +150,7 @@ static void assertNotEquals(float unexpected, float actual, String message) {
 	 */
 	static void assertNotEquals(float unexpected, float actual, Supplier<String> messageSupplier) {
 		if (floatsAreEqual(unexpected, actual)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -177,7 +175,7 @@ static void assertNotEquals(float unexpected, float actual, float delta, String
 	 */
 	static void assertNotEquals(float unexpected, float actual, float delta, Supplier<String> messageSupplier) {
 		if (floatsAreEqual(unexpected, actual, delta)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -202,7 +200,7 @@ static void assertNotEquals(double unexpected, double actual, String message) {
 	 */
 	static void assertNotEquals(double unexpected, double actual, Supplier<String> messageSupplier) {
 		if (doublesAreEqual(unexpected, actual)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -227,7 +225,7 @@ static void assertNotEquals(double unexpected, double actual, double delta, Stri
 	 */
 	static void assertNotEquals(double unexpected, double actual, double delta, Supplier<String> messageSupplier) {
 		if (doublesAreEqual(unexpected, actual, delta)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -252,7 +250,7 @@ static void assertNotEquals(char unexpected, char actual, String message) {
 	 */
 	static void assertNotEquals(char unexpected, char actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -268,12 +266,15 @@ static void assertNotEquals(Object unexpected, Object actual, String message) {
 
 	static void assertNotEquals(Object unexpected, Object actual, Supplier<String> messageSupplier) {
 		if (objectsAreEqual(unexpected, actual)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
-	private static void failEqual(Object actual, String message) {
-		fail(buildPrefix(message) + "expected: not equal but was: <" + actual + ">");
+	private static void failEqual(Object actual, Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("expected: not equal but was: <" + actual + ">") //
+				.buildAndThrow();
 	}
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
index eebd9329cf4a..71be7b88a72f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
@@ -10,8 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.Supplier;
 
@@ -39,11 +38,14 @@ static void assertNotNull(Object actual, String message) {
 
 	static void assertNotNull(Object actual, Supplier<String> messageSupplier) {
 		if (actual == null) {
-			failNull(nullSafeGet(messageSupplier));
+			failNull(messageSupplier);
 		}
 	}
 
-	private static void failNull(String message) {
-		Assertions.fail(buildPrefix(message) + "expected: not <null>");
+	private static void failNull(Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("expected: not <null>") //
+				.buildAndThrow();
 	}
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
index a3652c39292e..753e734c2a34 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
@@ -10,9 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.Supplier;
 
@@ -40,12 +38,15 @@ static void assertNotSame(Object unexpected, Object actual, String message) {
 
 	static void assertNotSame(Object unexpected, Object actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failSame(actual, nullSafeGet(messageSupplier));
+			failSame(actual, messageSupplier);
 		}
 	}
 
-	private static void failSame(Object actual, String message) {
-		fail(buildPrefix(message) + "expected: not same but was: <" + actual + ">");
+	private static void failSame(Object actual, Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("expected: not same but was: <" + actual + ">") //
+				.buildAndThrow();
 	}
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
index b3a43b24844f..4a9e92b2d4a0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
@@ -10,10 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
-import static org.junit.jupiter.api.AssertionUtils.format;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.Supplier;
 
@@ -41,18 +38,16 @@ static void assertNull(Object actual, String message) {
 
 	static void assertNull(Object actual, Supplier<String> messageSupplier) {
 		if (actual != null) {
-			failNotNull(actual, nullSafeGet(messageSupplier));
+			failNotNull(actual, messageSupplier);
 		}
 	}
 
-	private static void failNotNull(Object actual, String message) {
-		String stringRepresentation = actual.toString();
-		if (stringRepresentation == null || stringRepresentation.equals("null")) {
-			fail(format(null, actual, message), null, actual);
-		}
-		else {
-			fail(buildPrefix(message) + "expected: <null> but was: <" + actual + ">", null, actual);
-		}
+	private static void failNotNull(Object actual, Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.expected(null) //
+				.actual(actual) //
+				.buildAndThrow();
 	}
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
index 6f8a790dc237..c080b3e01f65 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
@@ -10,9 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.fail;
-import static org.junit.jupiter.api.AssertionUtils.format;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.Supplier;
 
@@ -40,12 +38,16 @@ static void assertSame(Object expected, Object actual, String message) {
 
 	static void assertSame(Object expected, Object actual, Supplier<String> messageSupplier) {
 		if (expected != actual) {
-			failNotSame(expected, actual, nullSafeGet(messageSupplier));
+			failNotSame(expected, actual, messageSupplier);
 		}
 	}
 
-	private static void failNotSame(Object expected, Object actual, String message) {
-		fail(format(expected, actual, message), expected, actual);
+	private static void failNotSame(Object expected, Object actual, Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.expected(expected) //
+				.actual(actual) //
+				.buildAndThrow();
 	}
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
index 9be0d9a2f1d1..d4e8b19d3498 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
@@ -10,16 +10,14 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.format;
+import static java.lang.String.format;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.getCanonicalName;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 
 import java.util.function.Supplier;
 
 import org.junit.jupiter.api.function.Executable;
 import org.junit.platform.commons.util.UnrecoverableExceptions;
-import org.opentest4j.AssertionFailedError;
 
 /**
  * {@code AssertThrows} is a collection of utility methods that support asserting
@@ -60,15 +58,19 @@ private static <T extends Throwable> T assertThrows(Class<T> expectedType, Execu
 			}
 			else {
 				UnrecoverableExceptions.rethrowIfUnrecoverable(actualException);
-				String message = buildPrefix(nullSafeGet(messageOrSupplier))
-						+ format(expectedType, actualException.getClass(), "Unexpected exception type thrown");
-				throw new AssertionFailedError(message, actualException);
+				throw assertionFailure() //
+						.message(messageOrSupplier) //
+						.expected(expectedType) //
+						.actual(actualException.getClass()) //
+						.reason("Unexpected exception type thrown") //
+						.cause(actualException) //
+						.build();
 			}
 		}
-
-		String message = buildPrefix(nullSafeGet(messageOrSupplier))
-				+ String.format("Expected %s to be thrown, but nothing was thrown.", getCanonicalName(expectedType));
-		throw new AssertionFailedError(message);
+		throw assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason(format("Expected %s to be thrown, but nothing was thrown.", getCanonicalName(expectedType))) //
+				.build();
 	}
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
index f40a05f273f0..39a4c2169367 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
@@ -10,16 +10,14 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.format;
+import static java.lang.String.format;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.getCanonicalName;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 
 import java.util.function.Supplier;
 
 import org.junit.jupiter.api.function.Executable;
 import org.junit.platform.commons.util.UnrecoverableExceptions;
-import org.opentest4j.AssertionFailedError;
 
 /**
  * {@code AssertThrowsExactly} is a collection of utility methods that support asserting
@@ -60,15 +58,20 @@ private static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType
 			}
 			else {
 				UnrecoverableExceptions.rethrowIfUnrecoverable(actualException);
-				String message = buildPrefix(nullSafeGet(messageOrSupplier))
-						+ format(expectedType, actualException.getClass(), "Unexpected exception type thrown");
-				throw new AssertionFailedError(message, actualException);
+				throw assertionFailure() //
+						.message(messageOrSupplier) //
+						.expected(expectedType) //
+						.actual(actualException.getClass()) //
+						.reason("Unexpected exception type thrown") //
+						.cause(actualException) //
+						.build();
 			}
 		}
 
-		String message = buildPrefix(nullSafeGet(messageOrSupplier))
-				+ String.format("Expected %s to be thrown, but nothing was thrown.", getCanonicalName(expectedType));
-		throw new AssertionFailedError(message);
+		throw assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason(format("Expected %s to be thrown, but nothing was thrown.", getCanonicalName(expectedType))) //
+				.build();
 	}
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index d5634c578d31..81268f7eafec 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -10,9 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.time.Duration;
 import java.util.concurrent.ExecutionException;
@@ -30,7 +28,6 @@
 import org.junit.jupiter.api.function.ThrowingSupplier;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.ExceptionUtils;
-import org.opentest4j.AssertionFailedError;
 
 /**
  * {@code AssertTimeout} is a collection of utility methods that support asserting
@@ -87,8 +84,11 @@ private static <T> T assertTimeout(Duration timeout, ThrowingSupplier<T> supplie
 
 		long timeElapsed = System.currentTimeMillis() - start;
 		if (timeElapsed > timeoutInMillis) {
-			fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "execution exceeded timeout of " + timeoutInMillis
-					+ " ms by " + (timeElapsed - timeoutInMillis) + " ms");
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason("execution exceeded timeout of " + timeoutInMillis + " ms by "
+							+ (timeElapsed - timeoutInMillis) + " ms") //
+					.buildAndThrow();
 		}
 		return result;
 	}
@@ -147,19 +147,18 @@ private static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplie
 				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
 			}
 			catch (TimeoutException ex) {
-				String message = buildPrefix(nullSafeGet(messageOrSupplier)) + "execution timed out after "
-						+ timeoutInMillis + " ms";
+				AssertionFailureBuilder failure = assertionFailure() //
+						.message(messageOrSupplier) //
+						.reason("execution timed out after " + timeoutInMillis + " ms");
 
 				Thread thread = threadReference.get();
 				if (thread != null) {
 					ExecutionTimeoutException exception = new ExecutionTimeoutException(
 						"Execution timed out in thread " + thread.getName());
 					exception.setStackTrace(thread.getStackTrace());
-					throw new AssertionFailedError(message, exception);
-				}
-				else {
-					throw new AssertionFailedError(message);
+					failure.cause(exception);
 				}
+				throw failure.build();
 			}
 			catch (ExecutionException ex) {
 				throw ExceptionUtils.throwAsUncheckedException(ex.getCause());
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
index 92e4451db0f2..3d250a46f68e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
@@ -10,9 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
@@ -25,8 +23,6 @@
  */
 class AssertTrue {
 
-	private static final String EXPECTED_TRUE = "expected: <true> but was: <false>";
-
 	private AssertTrue() {
 		/* no-op */
 	}
@@ -37,13 +33,13 @@ static void assertTrue(boolean condition) {
 
 	static void assertTrue(boolean condition, String message) {
 		if (!condition) {
-			fail(buildPrefix(message) + EXPECTED_TRUE, true, false);
+			failNotTrue(message);
 		}
 	}
 
 	static void assertTrue(boolean condition, Supplier<String> messageSupplier) {
 		if (!condition) {
-			fail(buildPrefix(nullSafeGet(messageSupplier)) + EXPECTED_TRUE, true, false);
+			failNotTrue(messageSupplier);
 		}
 	}
 
@@ -59,4 +55,12 @@ static void assertTrue(BooleanSupplier booleanSupplier, Supplier<String> message
 		assertTrue(booleanSupplier.getAsBoolean(), messageSupplier);
 	}
 
+	private static void failNotTrue(Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.expected(true) //
+				.actual(false) //
+				.buildAndThrow();
+	}
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java
new file mode 100644
index 000000000000..b1df82fab85c
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.apiguardian.api.API.Status.STABLE;
+import static org.junit.jupiter.api.AssertionUtils.getCanonicalName;
+
+import java.util.function.Supplier;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.util.StringUtils;
+import org.opentest4j.AssertionFailedError;
+
+/**
+ * Builder for {@link AssertionFailedError AssertionFailedErrors}.
+ * <p>
+ * Using this builder ensures consistency in how failure message are formatted
+ * within JUnit Jupiter and for custom user-defined assertions.
+ *
+ * @since 5.9
+ * @see AssertionFailedError
+ */
+@API(status = STABLE, since = "5.9")
+public class AssertionFailureBuilder {
+
+	private Object message;
+	private Throwable cause;
+	private boolean mismatch;
+	private Object expected;
+	private Object actual;
+	private String reason;
+	private boolean includeValuesInMessage = true;
+
+	/**
+	 * Create a new {@code AssertionFailureBuilder}.
+	 */
+	public static AssertionFailureBuilder assertionFailure() {
+		return new AssertionFailureBuilder();
+	}
+
+	private AssertionFailureBuilder() {
+	}
+
+	/**
+	 * Set the user-defined message of the assertion.
+	 * <p>
+	 * The {@code message} may be passed as a {@link Supplier} or plain
+	 * {@link String}. If any other type is passed, it is converted to
+	 * {@code String} as per {@link StringUtils#nullSafeToString(Object)}.
+	 *
+	 * @param message the user-defined failure message; may be {@code null}
+	 * @return this builder for method chaining
+	 */
+	public AssertionFailureBuilder message(Object message) {
+		this.message = message;
+		return this;
+	}
+
+	/**
+	 * Set the reason why the assertion failed.
+	 *
+	 * @param reason the failure reason; may be {@code null}
+	 * @return this builder for method chaining
+	 */
+	public AssertionFailureBuilder reason(String reason) {
+		this.reason = reason;
+		return this;
+	}
+
+	/**
+	 * Set the cause of the assertion failure.
+	 *
+	 * @param cause the failure cause; may be {@code null}
+	 * @return this builder for method chaining
+	 */
+	public AssertionFailureBuilder cause(Throwable cause) {
+		this.cause = cause;
+		return this;
+	}
+
+	/**
+	 * Set the expected value of the assertion.
+	 *
+	 * @param expected the expected value; may be {@code null}
+	 * @return this builder for method chaining
+	 */
+	public AssertionFailureBuilder expected(Object expected) {
+		this.mismatch = true;
+		this.expected = expected;
+		return this;
+	}
+
+	/**
+	 * Set the actual value of the assertion.
+	 *
+	 * @param actual the actual value; may be {@code null}
+	 * @return this builder for method chaining
+	 */
+	public AssertionFailureBuilder actual(Object actual) {
+		this.mismatch = true;
+		this.actual = actual;
+		return this;
+	}
+
+	/**
+	 * Set whether to include the actual and expected values in the generated
+	 * failure message.
+	 *
+	 * @param includeValuesInMessage whether to include the actual and expected
+	 *                               values
+	 * @return this builder for method chaining
+	 */
+	public AssertionFailureBuilder includeValuesInMessage(boolean includeValuesInMessage) {
+		this.includeValuesInMessage = includeValuesInMessage;
+		return this;
+	}
+
+	/**
+	 * Build the {@link AssertionFailedError AssertionFailedError} and throw it.
+	 *
+	 * @throws AssertionFailedError always
+	 */
+	public void buildAndThrow() throws AssertionFailedError {
+		throw build();
+	}
+
+	/**
+	 * Build the {@link AssertionFailedError AssertionFailedError} without
+	 * throwing it.
+	 *
+	 * @return the built assertion failure
+	 */
+	public AssertionFailedError build() {
+		String reason = nullSafeGet(this.reason);
+		if (mismatch && includeValuesInMessage) {
+			reason = (reason == null ? "" : reason + ", ") + formatValues(expected, actual);
+		}
+		String message = nullSafeGet(this.message);
+		if (reason != null) {
+			message = buildPrefix(message) + reason;
+		}
+		return mismatch //
+				? new AssertionFailedError(message, expected, actual, cause) //
+				: new AssertionFailedError(message, cause);
+	}
+
+	private static String nullSafeGet(Object messageOrSupplier) {
+		if (messageOrSupplier == null) {
+			return null;
+		}
+		if (messageOrSupplier instanceof Supplier) {
+			Object message = ((Supplier<?>) messageOrSupplier).get();
+			return StringUtils.nullSafeToString(message);
+		}
+		return StringUtils.nullSafeToString(messageOrSupplier);
+	}
+
+	private static String buildPrefix(String message) {
+		return (StringUtils.isNotBlank(message) ? message + " ==> " : "");
+	}
+
+	private static String formatValues(Object expected, Object actual) {
+		String expectedString = toString(expected);
+		String actualString = toString(actual);
+		if (expectedString.equals(actualString)) {
+			return String.format("expected: %s but was: %s", formatClassAndValue(expected, expectedString),
+				formatClassAndValue(actual, actualString));
+		}
+		return String.format("expected: <%s> but was: <%s>", expectedString, actualString);
+	}
+
+	private static String formatClassAndValue(Object value, String valueString) {
+		// If the value is null, return <null> instead of null<null>.
+		if (value == null) {
+			return "<null>";
+		}
+		String classAndHash = getClassName(value) + toHash(value);
+		// if it's a class, there's no need to repeat the class name contained in the valueString.
+		return (value instanceof Class ? "<" + classAndHash + ">" : classAndHash + "<" + valueString + ">");
+	}
+
+	private static String toString(Object obj) {
+		if (obj instanceof Class) {
+			return getCanonicalName((Class<?>) obj);
+		}
+		return StringUtils.nullSafeToString(obj);
+	}
+
+	private static String toHash(Object obj) {
+		return (obj == null ? "" : "@" + Integer.toHexString(System.identityHashCode(obj)));
+	}
+
+	private static String getClassName(Object obj) {
+		return (obj == null ? "null"
+				: obj instanceof Class ? getCanonicalName((Class<?>) obj) : obj.getClass().getName());
+	}
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
index 524f8142901b..c591c217dadb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
@@ -15,7 +15,6 @@
 import java.util.Deque;
 import java.util.function.Supplier;
 
-import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.commons.util.UnrecoverableExceptions;
 import org.opentest4j.AssertionFailedError;
 
@@ -51,52 +50,10 @@ static void fail(Supplier<String> messageSupplier) {
 		throw new AssertionFailedError(nullSafeGet(messageSupplier));
 	}
 
-	static void fail(String message, Object expected, Object actual) {
-		throw new AssertionFailedError(message, expected, actual);
-	}
-
-	/**
-	 * Typically used for {@code assertEquals()}.
-	 */
-	static void failNotEqual(Object expected, Object actual, String message) {
-		fail(format(expected, actual, message), expected, actual);
-	}
-
-	/**
-	 * Typically used for {@code assertEquals()}.
-	 */
-	static void failNotEqual(Object expected, Object actual, Supplier<String> messageSupplier) {
-		fail(format(expected, actual, nullSafeGet(messageSupplier)), expected, actual);
-	}
-
 	static String nullSafeGet(Supplier<String> messageSupplier) {
 		return (messageSupplier != null ? messageSupplier.get() : null);
 	}
 
-	/**
-	 * Alternative to {@link #nullSafeGet(Supplier)} that is used to avoid
-	 * wrapping a String in a lambda expression.
-	 *
-	 * @param messageOrSupplier an object that is either a {@code String} or
-	 * {@code Supplier<String>}
-	 */
-	static String nullSafeGet(Object messageOrSupplier) {
-		if (messageOrSupplier instanceof String) {
-			return (String) messageOrSupplier;
-		}
-		if (messageOrSupplier instanceof Supplier) {
-			Object message = ((Supplier<?>) messageOrSupplier).get();
-			if (message != null) {
-				return message.toString();
-			}
-		}
-		return null;
-	}
-
-	static String buildPrefix(String message) {
-		return (StringUtils.isNotBlank(message) ? message + " ==> " : "");
-	}
-
 	static String getCanonicalName(Class<?> clazz) {
 		try {
 			String canonicalName = clazz.getCanonicalName();
@@ -108,46 +65,6 @@ static String getCanonicalName(Class<?> clazz) {
 		}
 	}
 
-	static String format(Object expected, Object actual, String message) {
-		return buildPrefix(message) + formatValues(expected, actual);
-	}
-
-	static String formatValues(Object expected, Object actual) {
-		String expectedString = toString(expected);
-		String actualString = toString(actual);
-		if (expectedString.equals(actualString)) {
-			return String.format("expected: %s but was: %s", formatClassAndValue(expected, expectedString),
-				formatClassAndValue(actual, actualString));
-		}
-		return String.format("expected: <%s> but was: <%s>", expectedString, actualString);
-	}
-
-	private static String formatClassAndValue(Object value, String valueString) {
-		// If the value is null, return <null> instead of null<null>.
-		if (value == null) {
-			return "<null>";
-		}
-		String classAndHash = getClassName(value) + toHash(value);
-		// if it's a class, there's no need to repeat the class name contained in the valueString.
-		return (value instanceof Class ? "<" + classAndHash + ">" : classAndHash + "<" + valueString + ">");
-	}
-
-	private static String toString(Object obj) {
-		if (obj instanceof Class) {
-			return getCanonicalName((Class<?>) obj);
-		}
-		return StringUtils.nullSafeToString(obj);
-	}
-
-	private static String toHash(Object obj) {
-		return (obj == null ? "" : "@" + Integer.toHexString(System.identityHashCode(obj)));
-	}
-
-	private static String getClassName(Object obj) {
-		return (obj == null ? "null"
-				: obj instanceof Class ? getCanonicalName((Class<?>) obj) : obj.getClass().getName());
-	}
-
 	static String formatIndexes(Deque<Integer> indexes) {
 		if (indexes == null || indexes.isEmpty()) {
 			return "";
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
index bdf0b8476f71..12ba2fa92f9f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
@@ -93,7 +93,7 @@ private <T> void assertInstanceOfSucceeds(Class<T> expectedType, Object actualVa
 
 	private void assertInstanceOfFails(Class<?> expectedType, Object actualValue, String unexpectedSort) {
 		String valueType = actualValue == null ? "null" : actualValue.getClass().getCanonicalName();
-		String expectedMessage = String.format("Unexpected %s ==> expected: <%s> but was: <%s>", unexpectedSort,
+		String expectedMessage = String.format("Unexpected %s, expected: <%s> but was: <%s>", unexpectedSort,
 			expectedType.getCanonicalName(), valueType);
 
 		assertThrowsWithMessage(expectedMessage, () -> assertInstanceOf(expectedType, actualValue));
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
index 5239f0f1c944..302914794a38 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageContains;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith;
@@ -19,6 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
+import java.io.Serial;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.concurrent.ExecutionException;
@@ -32,6 +34,7 @@
  *
  * @since 5.0
  */
+@SuppressWarnings("ExcessiveLambdaUsage")
 class AssertThrowsAssertionsTests {
 
 	private static final Executable nix = () -> {
@@ -63,7 +66,7 @@ void assertThrowsWithMethodReferenceForVoidReturnType() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsThrowable() {
-		EnigmaThrowable enigmaThrowable = assertThrows(EnigmaThrowable.class, (Executable) () -> {
+		EnigmaThrowable enigmaThrowable = assertThrows(EnigmaThrowable.class, () -> {
 			throw new EnigmaThrowable();
 		});
 		assertNotNull(enigmaThrowable);
@@ -71,7 +74,7 @@ void assertThrowsWithExecutableThatThrowsThrowable() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsThrowableWithMessage() {
-		EnigmaThrowable enigmaThrowable = assertThrows(EnigmaThrowable.class, (Executable) () -> {
+		EnigmaThrowable enigmaThrowable = assertThrows(EnigmaThrowable.class, () -> {
 			throw new EnigmaThrowable();
 		}, "message");
 		assertNotNull(enigmaThrowable);
@@ -79,7 +82,7 @@ void assertThrowsWithExecutableThatThrowsThrowableWithMessage() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsThrowableWithMessageSupplier() {
-		EnigmaThrowable enigmaThrowable = assertThrows(EnigmaThrowable.class, (Executable) () -> {
+		EnigmaThrowable enigmaThrowable = assertThrows(EnigmaThrowable.class, () -> {
 			throw new EnigmaThrowable();
 		}, () -> "message");
 		assertNotNull(enigmaThrowable);
@@ -87,7 +90,7 @@ void assertThrowsWithExecutableThatThrowsThrowableWithMessageSupplier() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsCheckedException() {
-		IOException exception = assertThrows(IOException.class, (Executable) () -> {
+		IOException exception = assertThrows(IOException.class, () -> {
 			throw new IOException();
 		});
 		assertNotNull(exception);
@@ -95,7 +98,7 @@ void assertThrowsWithExecutableThatThrowsCheckedException() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsRuntimeException() {
-		IllegalStateException illegalStateException = assertThrows(IllegalStateException.class, (Executable) () -> {
+		IllegalStateException illegalStateException = assertThrows(IllegalStateException.class, () -> {
 			throw new IllegalStateException();
 		});
 		assertNotNull(illegalStateException);
@@ -104,7 +107,7 @@ void assertThrowsWithExecutableThatThrowsRuntimeException() {
 	@Test
 	void assertThrowsWithExecutableThatThrowsError() {
 		StackOverflowError stackOverflowError = assertThrows(StackOverflowError.class,
-			(Executable) AssertionTestUtils::recurseIndefinitely);
+			AssertionTestUtils::recurseIndefinitely);
 		assertNotNull(stackOverflowError);
 	}
 
@@ -146,88 +149,92 @@ void assertThrowsWithExecutableThatDoesNotThrowAnExceptionWithMessageSupplier()
 	@Test
 	void assertThrowsWithExecutableThatThrowsAnUnexpectedException() {
 		try {
-			assertThrows(IllegalStateException.class, (Executable) () -> {
+			assertThrows(IllegalStateException.class, () -> {
 				throw new NumberFormatException();
 			});
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+			assertThat(ex).hasCauseInstanceOf(NumberFormatException.class);
 		}
 	}
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsAnUnexpectedExceptionWithMessageString() {
 		try {
-			assertThrows(IllegalStateException.class, (Executable) () -> {
+			assertThrows(IllegalStateException.class, () -> {
 				throw new NumberFormatException();
 			}, "Custom message");
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
 			// Should look something like this:
-			// Custom message ==> Unexpected exception type thrown ==> expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
+			// Custom message ==> Unexpected exception type thrown, expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
 			assertMessageStartsWith(ex, "Custom message ==> ");
-			assertMessageContains(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+			assertThat(ex).hasCauseInstanceOf(NumberFormatException.class);
 		}
 	}
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsAnUnexpectedExceptionWithMessageSupplier() {
 		try {
-			assertThrows(IllegalStateException.class, (Executable) () -> {
+			assertThrows(IllegalStateException.class, () -> {
 				throw new NumberFormatException();
 			}, () -> "Custom message");
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
 			// Should look something like this:
-			// Custom message ==> Unexpected exception type thrown ==> expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
+			// Custom message ==> Unexpected exception type thrown, expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
 			assertMessageStartsWith(ex, "Custom message ==> ");
-			assertMessageContains(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+			assertThat(ex).hasCauseInstanceOf(NumberFormatException.class);
 		}
 	}
 
 	@Test
-	@SuppressWarnings("serial")
 	void assertThrowsWithExecutableThatThrowsInstanceOfAnonymousInnerClassAsUnexpectedException() {
 		try {
-			assertThrows(IllegalStateException.class, (Executable) () -> {
+			assertThrows(IllegalStateException.class, () -> {
 				throw new NumberFormatException() {
 				};
 			});
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			// As of the time of this writing, the class name of the above anonymous inner
 			// class is org.junit.jupiter.api.AssertionsAssertThrowsTests$2; however, hard
 			// coding "$2" is fragile. So we just check for the presence of the "$"
 			// appended to this class's name.
 			assertMessageContains(ex, "but was: <" + getClass().getName() + "$");
+			assertThat(ex).hasCauseInstanceOf(NumberFormatException.class);
 		}
 	}
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpectedException() {
 		try {
-			assertThrows(IllegalStateException.class, (Executable) () -> {
+			assertThrows(IllegalStateException.class, () -> {
 				throw new LocalException();
 			});
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			// The following verifies that the canonical name is used (i.e., "." instead of "$").
 			assertMessageContains(ex, "but was: <" + LocalException.class.getName().replace("$", ".") + ">");
+			assertThat(ex).hasCauseInstanceOf(LocalException.class);
 		}
 	}
 
@@ -241,7 +248,7 @@ void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoad
 				EnigmaThrowable.class.getName());
 
 			try {
-				assertThrows(enigmaThrowableClass, (Executable) () -> {
+				assertThrows(enigmaThrowableClass, () -> {
 					throw new EnigmaThrowable();
 				});
 				expectAssertionFailedError();
@@ -249,23 +256,25 @@ void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoad
 			catch (AssertionFailedError ex) {
 				// Example Output:
 				//
-				// Unexpected exception type thrown ==>
+				// Unexpected exception type thrown,
 				// expected: <org.junit.jupiter.api.EnigmaThrowable@5d3411d>
 				// but was: <org.junit.jupiter.api.EnigmaThrowable@2471cca7>
 
-				assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+				assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 				// The presence of the "@" sign is sufficient to indicate that the hash was
 				// generated to disambiguate between the two identical class names.
 				assertMessageContains(ex, "expected: <org.junit.jupiter.api.EnigmaThrowable@");
 				assertMessageContains(ex, "but was: <org.junit.jupiter.api.EnigmaThrowable@");
+				assertThat(ex).hasCauseInstanceOf(EnigmaThrowable.class);
 			}
 		}
 	}
 
 	// -------------------------------------------------------------------------
 
-	@SuppressWarnings("serial")
 	private static class LocalException extends RuntimeException {
+		@Serial
+		private static final long serialVersionUID = 1L;
 	}
 
 	private static class EnigmaClassLoader extends URLClassLoader {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
index d3f05d52d18a..8d810e16d4c6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageContains;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith;
@@ -19,6 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 
 import java.io.IOException;
+import java.io.Serial;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.concurrent.ExecutionException;
@@ -32,6 +34,7 @@
  *
  * @since 5.8
  */
+@SuppressWarnings("ExcessiveLambdaUsage")
 class AssertThrowsExactlyAssertionsTests {
 
 	private static final Executable nix = () -> {
@@ -39,7 +42,7 @@ class AssertThrowsExactlyAssertionsTests {
 
 	@Test
 	void assertThrowsExactlyTheSpecifiedExceptionClass() {
-		var actual = assertThrowsExactly(EnigmaThrowable.class, (Executable) () -> {
+		var actual = assertThrowsExactly(EnigmaThrowable.class, () -> {
 			throw new EnigmaThrowable();
 		});
 		assertNotNull(actual);
@@ -48,30 +51,32 @@ void assertThrowsExactlyTheSpecifiedExceptionClass() {
 	@Test
 	void assertThrowsExactlyWithTheExpectedChildException() {
 		try {
-			assertThrowsExactly(RuntimeException.class, (Executable) () -> {
+			assertThrowsExactly(RuntimeException.class, () -> {
 				throw new Exception();
 			});
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.RuntimeException>");
 			assertMessageContains(ex, "but was: <java.lang.Exception>");
+			assertThat(ex).hasCauseExactlyInstanceOf(Exception.class);
 		}
 	}
 
 	@Test
 	void assertThrowsExactlyWithTheExpectedParentException() {
 		try {
-			assertThrowsExactly(RuntimeException.class, (Executable) () -> {
+			assertThrowsExactly(RuntimeException.class, () -> {
 				throw new NumberFormatException();
 			});
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.RuntimeException>");
 			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+			assertThat(ex).hasCauseExactlyInstanceOf(NumberFormatException.class);
 		}
 	}
 
@@ -101,7 +106,7 @@ void assertThrowsWithMethodReferenceForVoidReturnType() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsThrowable() {
-		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, (Executable) () -> {
+		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, () -> {
 			throw new EnigmaThrowable();
 		});
 		assertNotNull(enigmaThrowable);
@@ -109,7 +114,7 @@ void assertThrowsWithExecutableThatThrowsThrowable() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsThrowableWithMessage() {
-		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, (Executable) () -> {
+		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, () -> {
 			throw new EnigmaThrowable();
 		}, "message");
 		assertNotNull(enigmaThrowable);
@@ -117,7 +122,7 @@ void assertThrowsWithExecutableThatThrowsThrowableWithMessage() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsThrowableWithMessageSupplier() {
-		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, (Executable) () -> {
+		EnigmaThrowable enigmaThrowable = assertThrowsExactly(EnigmaThrowable.class, () -> {
 			throw new EnigmaThrowable();
 		}, () -> "message");
 		assertNotNull(enigmaThrowable);
@@ -125,7 +130,7 @@ void assertThrowsWithExecutableThatThrowsThrowableWithMessageSupplier() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsCheckedException() {
-		IOException exception = assertThrowsExactly(IOException.class, (Executable) () -> {
+		IOException exception = assertThrowsExactly(IOException.class, () -> {
 			throw new IOException();
 		});
 		assertNotNull(exception);
@@ -133,17 +138,16 @@ void assertThrowsWithExecutableThatThrowsCheckedException() {
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsRuntimeException() {
-		IllegalStateException illegalStateException = assertThrowsExactly(IllegalStateException.class,
-			(Executable) () -> {
-				throw new IllegalStateException();
-			});
+		IllegalStateException illegalStateException = assertThrowsExactly(IllegalStateException.class, () -> {
+			throw new IllegalStateException();
+		});
 		assertNotNull(illegalStateException);
 	}
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsError() {
 		StackOverflowError stackOverflowError = assertThrowsExactly(StackOverflowError.class,
-			(Executable) AssertionTestUtils::recurseIndefinitely);
+			AssertionTestUtils::recurseIndefinitely);
 		assertNotNull(stackOverflowError);
 	}
 
@@ -185,88 +189,92 @@ void assertThrowsWithExecutableThatDoesNotThrowAnExceptionWithMessageSupplier()
 	@Test
 	void assertThrowsWithExecutableThatThrowsAnUnexpectedException() {
 		try {
-			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+			assertThrowsExactly(IllegalStateException.class, () -> {
 				throw new NumberFormatException();
 			});
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+			assertThat(ex).hasCauseExactlyInstanceOf(NumberFormatException.class);
 		}
 	}
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsAnUnexpectedExceptionWithMessageString() {
 		try {
-			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+			assertThrowsExactly(IllegalStateException.class, () -> {
 				throw new NumberFormatException();
 			}, "Custom message");
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
 			// Should look something like this:
-			// Custom message ==> Unexpected exception type thrown ==> expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
+			// Custom message ==> Unexpected exception type thrown, expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
 			assertMessageStartsWith(ex, "Custom message ==> ");
-			assertMessageContains(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+			assertThat(ex).hasCauseExactlyInstanceOf(NumberFormatException.class);
 		}
 	}
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsAnUnexpectedExceptionWithMessageSupplier() {
 		try {
-			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+			assertThrowsExactly(IllegalStateException.class, () -> {
 				throw new NumberFormatException();
 			}, () -> "Custom message");
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
 			// Should look something like this:
-			// Custom message ==> Unexpected exception type thrown ==> expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
+			// Custom message ==> Unexpected exception type thrown, expected: <java.lang.IllegalStateException> but was: <java.lang.NumberFormatException>
 			assertMessageStartsWith(ex, "Custom message ==> ");
-			assertMessageContains(ex, "Unexpected exception type thrown ==> ");
+			assertMessageContains(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			assertMessageContains(ex, "but was: <java.lang.NumberFormatException>");
+			assertThat(ex).hasCauseExactlyInstanceOf(NumberFormatException.class);
 		}
 	}
 
 	@Test
-	@SuppressWarnings("serial")
 	void assertThrowsWithExecutableThatThrowsInstanceOfAnonymousInnerClassAsUnexpectedException() {
 		try {
-			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+			assertThrowsExactly(IllegalStateException.class, () -> {
 				throw new NumberFormatException() {
 				};
 			});
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			// As of the time of this writing, the class name of the above anonymous inner
 			// class is org.junit.jupiter.api.AssertThrowsExactlyAssertionsTests$2; however, hard
 			// coding "$2" is fragile. So we just check for the presence of the "$"
 			// appended to this class's name.
 			assertMessageContains(ex, "but was: <" + getClass().getName() + "$");
+			assertThat(ex).hasCauseInstanceOf(NumberFormatException.class);
 		}
 	}
 
 	@Test
 	void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpectedException() {
 		try {
-			assertThrowsExactly(IllegalStateException.class, (Executable) () -> {
+			assertThrowsExactly(IllegalStateException.class, () -> {
 				throw new LocalException();
 			});
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
-			assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+			assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 			assertMessageContains(ex, "expected: <java.lang.IllegalStateException>");
 			// The following verifies that the canonical name is used (i.e., "." instead of "$").
 			assertMessageContains(ex, "but was: <" + LocalException.class.getName().replace("$", ".") + ">");
+			assertThat(ex).hasCauseExactlyInstanceOf(LocalException.class);
 		}
 	}
 
@@ -280,7 +288,7 @@ void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoad
 				EnigmaThrowable.class.getName());
 
 			try {
-				assertThrowsExactly(enigmaThrowableClass, (Executable) () -> {
+				assertThrowsExactly(enigmaThrowableClass, () -> {
 					throw new EnigmaThrowable();
 				});
 				expectAssertionFailedError();
@@ -288,23 +296,25 @@ void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoad
 			catch (AssertionFailedError ex) {
 				// Example Output:
 				//
-				// Unexpected exception type thrown ==>
+				// Unexpected exception type thrown,
 				// expected: <org.junit.jupiter.api.EnigmaThrowable@5d3411d>
 				// but was: <org.junit.jupiter.api.EnigmaThrowable@2471cca7>
 
-				assertMessageStartsWith(ex, "Unexpected exception type thrown ==> ");
+				assertMessageStartsWith(ex, "Unexpected exception type thrown, ");
 				// The presence of the "@" sign is sufficient to indicate that the hash was
 				// generated to disambiguate between the two identical class names.
 				assertMessageContains(ex, "expected: <org.junit.jupiter.api.EnigmaThrowable@");
 				assertMessageContains(ex, "but was: <org.junit.jupiter.api.EnigmaThrowable@");
+				assertThat(ex).hasCauseExactlyInstanceOf(EnigmaThrowable.class);
 			}
 		}
 	}
 
 	// -------------------------------------------------------------------------
 
-	@SuppressWarnings("serial")
 	private static class LocalException extends RuntimeException {
+		@Serial
+		private static final long serialVersionUID = 1L;
 	}
 
 	private static class EnigmaClassLoader extends URLClassLoader {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
index bb14bfb0cbc3..94c39bef39bf 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
@@ -66,13 +66,6 @@ static void assertMessageContains(Throwable ex, String msg) throws AssertionErro
 		}
 	}
 
-	static void assertMessageDoesNotContain(Throwable ex, String msg) throws AssertionError {
-		if (ex.getMessage().contains(msg)) {
-			throw new AssertionError(
-				"Exception message should contain [" + msg + "], but was [" + ex.getMessage() + "].");
-		}
-	}
-
 	static void assertExpectedAndActualValues(AssertionFailedError ex, Object expected, Object actual)
 			throws AssertionError {
 		if (!wrapsEqualValue(ex.getExpected(), expected)) {

From 5407208ba97865eeabc0fa53593e98a95620ec36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Jul 2022 17:12:35 +0200
Subject: [PATCH 0891/1433] Bump com.gradle.enterprise from 3.10.2 to 3.10.3
 (#2981)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c71a37eb46e8..1b3ced7b5dcf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.10.2"
+		id("com.gradle.enterprise") version "3.10.3"
 		id("com.gradle.enterprise.test-distribution") version "2.3.5" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"

From 5fdb138924f59703a6a4fcd0cdcde6d1a224a950 Mon Sep 17 00:00:00 2001
From: Kirill Gavrilov <gavvvr@users.noreply.github.com>
Date: Fri, 22 Jul 2022 02:18:07 +0300
Subject: [PATCH 0892/1433] Fix @ArgumentsSource annotation name in user guide
 (#2980)

---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index d775251366ba..568c72b689aa 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1851,7 +1851,7 @@ if they exceed the configured maximum length. The limit is configurable via the
 `junit.jupiter.params.displayname.argument.maxlength` configuration parameter and defaults
 to 512 characters.
 
-When using `@MethodSource` or `@ArgumentSource`, you can provide custom names for
+When using `@MethodSource` or `@ArgumentsSource`, you can provide custom names for
 arguments using the `{Named}` API. A custom name will be used if the argument is included
 in the invocation display name, like in the example below.
 

From be5566839aa593101c3ffe10bd529d062ef068c7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 26 Jul 2022 16:13:15 +0200
Subject: [PATCH 0893/1433] Use suite events for more accurate reporting
 (#2985)

In 4.13 testSuiteStarted/Finished were introduced. While top-level test
class events were already reported at the appropriate time, events for
intermediate levels such as iterations of the `Parameterized` runner or
classes executed by the `Suite` runner were created synthetically when
the first test was started and the last test was finished, respectively.
---
 .../release-notes/release-notes-5.9.0.adoc    |  3 +-
 .../vintage/engine/JUnit4VersionCheck.java    |  2 +-
 .../engine/execution/RunListenerAdapter.java  | 34 ++++++--
 .../vintage/engine/execution/TestRun.java     |  4 +
 .../VintageTestEngineExecutionTests.java      | 80 +++++++++++++++++++
 .../junit4/ParameterizedTimingTestCase.java   | 68 ++++++++++++++++
 ...eterizedWithAfterParamFailureTestCase.java | 49 ++++++++++++
 ...terizedWithBeforeParamFailureTestCase.java | 49 ++++++++++++
 8 files changed, 281 insertions(+), 8 deletions(-)
 create mode 100644 junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTimingTestCase.java
 create mode 100644 junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithAfterParamFailureTestCase.java
 create mode 100644 junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithBeforeParamFailureTestCase.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
index 9d09d8642765..320a2643e515 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
@@ -56,4 +56,5 @@ GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* More accurate reporting of intermediate start/finish events, e.g. iterations of the
+  `Parameterized` runner and classes executed indirectly via the `Suite` runner.
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
index 0ffa68ac0f82..dafea5acd5d8 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
@@ -51,7 +51,7 @@ static void checkSupported(Supplier<String> versionSupplier) {
 		}
 	}
 
-	private static BigDecimal parseVersion(String versionString) {
+	static BigDecimal parseVersion(String versionString) {
 		try {
 			Matcher matcher = versionPattern.matcher(versionString);
 			if (matcher.matches()) {
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
index 1a8494a095f7..40760f923480 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
@@ -54,6 +54,15 @@ public void testRunStarted(Description description) {
 		}
 	}
 
+	@Override
+	public void testSuiteStarted(Description description) {
+		RunnerTestDescriptor runnerTestDescriptor = testRun.getRunnerTestDescriptor();
+		// runnerTestDescriptor is reported in testRunStarted
+		if (!runnerTestDescriptor.getDescription().equals(description)) {
+			testStarted(lookupOrRegisterNextTestDescriptor(description), EventType.REPORTED);
+		}
+	}
+
 	@Override
 	public void testIgnored(Description description) {
 		testIgnored(lookupOrRegisterNextTestDescriptor(description), determineReasonForIgnoredTest(description));
@@ -80,17 +89,29 @@ public void testFinished(Description description) {
 	}
 
 	@Override
-	public void testRunFinished(Result result) {
+	public void testSuiteFinished(Description description) {
 		RunnerTestDescriptor runnerTestDescriptor = testRun.getRunnerTestDescriptor();
-		if (testRun.isNotSkipped(runnerTestDescriptor)) {
-			if (testRun.isNotStarted(runnerTestDescriptor)) {
-				fireExecutionStarted(runnerTestDescriptor, EventType.SYNTHETIC);
+		// runnerTestDescriptor is reported in testRunFinished
+		if (!runnerTestDescriptor.getDescription().equals(description)) {
+			reportContainerFinished(lookupOrRegisterNextTestDescriptor(description));
+		}
+	}
+
+	@Override
+	public void testRunFinished(Result result) {
+		reportContainerFinished(testRun.getRunnerTestDescriptor());
+	}
+
+	private void reportContainerFinished(TestDescriptor containerTestDescriptor) {
+		if (testRun.isNotSkipped(containerTestDescriptor)) {
+			if (testRun.isNotStarted(containerTestDescriptor)) {
+				fireExecutionStarted(containerTestDescriptor, EventType.SYNTHETIC);
 			}
 			testRun.getInProgressTestDescriptorsWithSyntheticStartEvents().stream() //
 					.filter(this::canFinish) //
 					.forEach(this::fireExecutionFinished);
-			if (testRun.isNotFinished(runnerTestDescriptor)) {
-				fireExecutionFinished(runnerTestDescriptor);
+			if (testRun.isNotFinished(containerTestDescriptor)) {
+				fireExecutionFinished(containerTestDescriptor);
 			}
 		}
 	}
@@ -143,6 +164,7 @@ private void handleFailure(Failure failure, Function<Throwable, TestExecutionRes
 			testStarted(testDescriptor, EventType.SYNTHETIC);
 		}
 		if (testRun.isNotFinished(testDescriptor) && testDescriptor.isContainer()
+				&& testRun.hasSyntheticStartEvent(testDescriptor)
 				&& testRun.isDescendantOfRunnerTestDescriptor(testDescriptor)) {
 			testFinished(testDescriptor);
 		}
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
index ddb3a27f7dd9..53820bf6c543 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
@@ -91,6 +91,10 @@ boolean isDescendantOfRunnerTestDescriptor(TestDescriptor testDescriptor) {
 		return runnerDescendants.contains(testDescriptor);
 	}
 
+	boolean hasSyntheticStartEvent(TestDescriptor testDescriptor) {
+		return inProgressDescriptors.get(testDescriptor) == EventType.SYNTHETIC;
+	}
+
 	Optional<VintageTestDescriptor> lookupNextTestDescriptor(Description description) {
 		return lookupUnambiguouslyOrApplyFallback(description, VintageDescriptors::getNextUnstarted);
 	}
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
index b5614f9cd51f..50643844ed99 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
@@ -11,6 +11,7 @@
 package org.junit.vintage.engine;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
@@ -31,6 +32,10 @@
 import static org.junit.runner.Description.createSuiteDescription;
 import static org.junit.runner.Description.createTestDescription;
 
+import java.math.BigDecimal;
+
+import junit.runner.Version;
+
 import org.assertj.core.api.Condition;
 import org.junit.AssumptionViolatedException;
 import org.junit.jupiter.api.Test;
@@ -80,6 +85,9 @@
 import org.junit.vintage.engine.samples.junit4.JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions;
 import org.junit.vintage.engine.samples.junit4.MalformedJUnit4TestCase;
 import org.junit.vintage.engine.samples.junit4.ParameterizedTestCase;
+import org.junit.vintage.engine.samples.junit4.ParameterizedTimingTestCase;
+import org.junit.vintage.engine.samples.junit4.ParameterizedWithAfterParamFailureTestCase;
+import org.junit.vintage.engine.samples.junit4.ParameterizedWithBeforeParamFailureTestCase;
 import org.junit.vintage.engine.samples.junit4.PlainJUnit4TestCaseWithFiveTestMethods;
 import org.junit.vintage.engine.samples.junit4.PlainJUnit4TestCaseWithLifecycleMethods;
 import org.junit.vintage.engine.samples.junit4.PlainJUnit4TestCaseWithSingleTestWhichFails;
@@ -455,6 +463,74 @@ void executesIgnoredParameterizedTestCase() {
 			event(engine(), finishedSuccessfully()));
 	}
 
+	@Test
+	void executesParameterizedTimingTestCase() {
+		assumeTrue(atLeastJUnit4_13(), "@BeforeParam and @AfterParam were introduced in JUnit 4.13");
+
+		Class<?> testClass = ParameterizedTimingTestCase.class;
+
+		var events = execute(testClass).allEvents().debug();
+
+		var firstParamStartedEvent = events.filter(event(container("[foo]"), started())::matches).findFirst() //
+				.orElseThrow(() -> new AssertionError("No start event for [foo]"));
+		var firstParamFinishedEvent = events.filter(
+			event(container("[foo]"), finishedSuccessfully())::matches).findFirst() //
+				.orElseThrow(() -> new AssertionError("No finish event for [foo]"));
+		var secondParamStartedEvent = events.filter(event(container("[bar]"), started())::matches).findFirst() //
+				.orElseThrow(() -> new AssertionError("No start event for [bar]"));
+		var secondParamFinishedEvent = events.filter(
+			event(container("[bar]"), finishedSuccessfully())::matches).findFirst() //
+				.orElseThrow(() -> new AssertionError("No finish event for [bar]"));
+
+		assertThat(ParameterizedTimingTestCase.EVENTS.get("beforeParam(foo)")).isAfterOrEqualTo(
+			firstParamStartedEvent.getTimestamp());
+		assertThat(ParameterizedTimingTestCase.EVENTS.get("afterParam(foo)")).isBeforeOrEqualTo(
+			firstParamFinishedEvent.getTimestamp());
+		assertThat(ParameterizedTimingTestCase.EVENTS.get("beforeParam(bar)")).isAfterOrEqualTo(
+			secondParamStartedEvent.getTimestamp());
+		assertThat(ParameterizedTimingTestCase.EVENTS.get("afterParam(bar)")).isBeforeOrEqualTo(
+			secondParamFinishedEvent.getTimestamp());
+	}
+
+	@Test
+	void executesParameterizedWithAfterParamFailureTestCase() {
+		assumeTrue(atLeastJUnit4_13(), "@AfterParam was introduced in JUnit 4.13");
+
+		Class<?> testClass = ParameterizedWithAfterParamFailureTestCase.class;
+
+		execute(testClass).allEvents().assertEventsMatchExactly( //
+			event(engine(), started()), //
+			event(container(testClass), started()), //
+			event(container("[foo]"), started()), //
+			event(test("test[foo]"), started()), //
+			event(test("test[foo]"), finishedSuccessfully()), //
+			event(container("[foo]"), finishedWithFailure(instanceOf(AssertionError.class))), //
+			event(container("[bar]"), started()), //
+			event(test("test[bar]"), started()), //
+			event(test("test[bar]"),
+				finishedWithFailure(instanceOf(AssertionError.class), message("expected:<[foo]> but was:<[bar]>"))), //
+			event(container("[bar]"), finishedWithFailure(instanceOf(AssertionError.class))), //
+			event(container(testClass), finishedSuccessfully()), //
+			event(engine(), finishedSuccessfully()));
+	}
+
+	@Test
+	void executesParameterizedWithBeforeParamFailureTestCase() {
+		assumeTrue(atLeastJUnit4_13(), "@BeforeParam was introduced in JUnit 4.13");
+
+		Class<?> testClass = ParameterizedWithBeforeParamFailureTestCase.class;
+
+		execute(testClass).allEvents().assertEventsMatchExactly( //
+			event(engine(), started()), //
+			event(container(testClass), started()), //
+			event(container("[foo]"), started()), //
+			event(container("[foo]"), finishedWithFailure(instanceOf(AssertionError.class))), //
+			event(container("[bar]"), started()), //
+			event(container("[bar]"), finishedWithFailure(instanceOf(AssertionError.class))), //
+			event(container(testClass), finishedSuccessfully()), //
+			event(engine(), finishedSuccessfully()));
+	}
+
 	@Test
 	void executesJUnit4TestCaseWithExceptionThrowingRunner() {
 		Class<?> testClass = JUnit4TestCaseWithExceptionThrowingRunner.class;
@@ -806,4 +882,8 @@ private static LauncherDiscoveryRequest request(Class<?> testClass) {
 		return LauncherDiscoveryRequestBuilder.request().selectors(selectClass(testClass)).build();
 	}
 
+	private static boolean atLeastJUnit4_13() {
+		return JUnit4VersionCheck.parseVersion(Version.id()).compareTo(new BigDecimal("4.13")) >= 0;
+	}
+
 }
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTimingTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTimingTestCase.java
new file mode 100644
index 000000000000..9b283b7184c5
--- /dev/null
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTimingTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.vintage.engine.samples.junit4;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.Instant;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.AfterParam;
+import org.junit.runners.Parameterized.BeforeParam;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * @since 5.9
+ */
+@RunWith(Parameterized.class)
+public class ParameterizedTimingTestCase {
+
+	public static Map<String, Instant> EVENTS = new LinkedHashMap<>();
+
+	@BeforeClass
+	public static void beforeClass() throws Exception {
+		EVENTS.clear();
+	}
+
+	@BeforeParam
+	public static void beforeParam(String param) throws Exception {
+		EVENTS.put("beforeParam(" + param + ")", Instant.now());
+		Thread.sleep(100);
+	}
+
+	@AfterParam
+	public static void afterParam(String param) throws Exception {
+		Thread.sleep(100);
+		System.out.println("ParameterizedTimingTestCase.afterParam");
+		EVENTS.put("afterParam(" + param + ")", Instant.now());
+	}
+
+	@Parameters(name = "{0}")
+	public static Iterable<String> parameters() {
+		return List.of("foo", "bar");
+	}
+
+	@Parameter
+	public String value;
+
+	@Test
+	public void test() {
+		assertEquals("foo", value);
+	}
+
+}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithAfterParamFailureTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithAfterParamFailureTestCase.java
new file mode 100644
index 000000000000..adbda57c66d8
--- /dev/null
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithAfterParamFailureTestCase.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.vintage.engine.samples.junit4;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.AfterParam;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * @since 5.9
+ */
+@RunWith(Parameterized.class)
+public class ParameterizedWithAfterParamFailureTestCase {
+
+	@AfterParam
+	public static void afterParam() {
+		fail();
+	}
+
+	@Parameters(name = "{0}")
+	public static Iterable<String> parameters() {
+		return List.of("foo", "bar");
+	}
+
+	@Parameter
+	public String value;
+
+	@Test
+	public void test() {
+		assertEquals("foo", value);
+	}
+
+}
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithBeforeParamFailureTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithBeforeParamFailureTestCase.java
new file mode 100644
index 000000000000..0faa44830050
--- /dev/null
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithBeforeParamFailureTestCase.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.vintage.engine.samples.junit4;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.BeforeParam;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * @since 5.9
+ */
+@RunWith(Parameterized.class)
+public class ParameterizedWithBeforeParamFailureTestCase {
+
+	@BeforeParam
+	public static void beforeParam() {
+		fail();
+	}
+
+	@Parameters(name = "{0}")
+	public static Iterable<String> parameters() {
+		return List.of("foo", "bar");
+	}
+
+	@Parameter
+	public String value;
+
+	@Test
+	public void test() {
+		assertEquals("foo", value);
+	}
+
+}

From 2aaf24c35d0ec3cb6c84ed6bb53469347de09605 Mon Sep 17 00:00:00 2001
From: Cal Jacobson <cj81499@users.noreply.github.com>
Date: Tue, 26 Jul 2022 09:27:14 -0500
Subject: [PATCH 0894/1433] Improve debug mode detection in JUnit Jupiter
 (#2973)

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../docs/asciidoc/user-guide/writing-tests.adoc    |  3 ++-
 .../junit/platform/commons/util/RuntimeUtils.java  | 14 ++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 568c72b689aa..92432cc8a935 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2177,7 +2177,8 @@ JUnit Jupiter supports the `junit.jupiter.execution.timeout.mode` configuration
 to configure when timeouts are applied. There are three modes: `enabled`, `disabled`,
 and `disabled_on_debug`. The default mode is `enabled`.
 A VM runtime is considered to run in debug mode when one of its input parameters starts
-with `-agentlib:jdwp`. This heuristic is queried by the `disabled_on_debug` mode.
+with `-agentlib:jdwp` or `-Xrunjdwp`.
+This heuristic is queried by the `disabled_on_debug` mode.
 
 
 [[writing-tests-parallel-execution]]
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
index 13f0ccfeeb11..020f23226b01 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
@@ -40,16 +40,10 @@ private RuntimeUtils() {
 	 * Try to determine whether the VM was started in debug mode or not.
 	 */
 	public static boolean isDebugMode() {
-		Optional<List<String>> optionalArguments = getInputArguments();
-		if (!optionalArguments.isPresent()) {
-			return false;
-		}
-		for (String argument : optionalArguments.get()) {
-			if (argument.startsWith("-agentlib:jdwp")) {
-				return true;
-			}
-		}
-		return false;
+		return getInputArguments() //
+				.map(args -> args.stream().anyMatch(
+					arg -> arg.startsWith("-agentlib:jdwp") || arg.startsWith("-Xrunjdwp"))) //
+				.orElse(false);
 	}
 
 	/**

From d3f8e4ad9e43b12741c3614451daba496bc35323 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 26 Jul 2022 21:00:52 +0200
Subject: [PATCH 0895/1433] Prepare 5.9 release notes

---
 .../release-notes/release-notes-5.9.0-M1.adoc | 111 ----------------
 .../release-notes-5.9.0-RC1.adoc              |  73 -----------
 .../release-notes/release-notes-5.9.0.adoc    | 118 +++++++++++++++---
 3 files changed, 102 insertions(+), 200 deletions(-)
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
deleted file mode 100644
index 3be365ceacb8..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
+++ /dev/null
@@ -1,111 +0,0 @@
-[[release-notes-5.9.0-M1]]
-== 5.9.0-M1
-
-*Date of Release:* May 15, 2022
-
-*Scope:*
-
-* XML reports in new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
-  format
-* Configurable cleanup mode for `@TempDir`
-* New `TestInstancePreConstructCallback` extension API
-* Reusable parameter resolution for custom extension methods via `ExecutableInvoker`
-* New `IterationSelector`
-* Various improvements to `ConsoleLauncher`
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/58?closed=1+[5.9 M1] milestone page in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.9.0-M1-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* Fixed handling of global post-discovery filters that apply to `@Suite` classes.
-* Since the Turkish language has special characters such as 'ı' and 'İ', the uppercase
-  conversion in `DefaultParallelExecutionConfigurationStrategy#getStrategy` previously
-  caused all tests to finish with exit code -1. This has been fixed by using the root
-  locale instead of the default one.
-
-==== Deprecations and Breaking Changes
-
-* `ConfigurationParameters.size()` has been deprecated in favor of the new `keySet()`
-  method.
-
-==== New Features and Improvements
-
-* Support for the https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
-  format which supports all features of the JUnit Platform such as hierarchical test
-  structures, display names, tags, etc. Please refer to the
-  <<../user-guide/index.adoc#junit-platform-reporting-open-test-reporting, User Guide>>
-  for instructions on how to enable such reports in your build.
-* `ConfigurationParameters` has a new `keySet()` method which allows you to retrieve all
-  configuration parameter keys.
-* New `IterationSelector` for selecting a subset of a test's or container's iterations.
-* `ParallelExecutionConfiguration` allows configuring the `saturate` predicate of the
-  `ForkJoinPool` used for parallel test execution.
-* JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
-  resolution time a fully running set of dependencies is calculated, avoiding the need for
-  these to be manually specified.
-* JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
-* New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if no tests
-  are discovered.
-* The output color for the `ConsoleLauncher` can now be customized. The option
-  `--single-color` will apply a built-in monochrome style, while `--color-palette` will
-  accept a properties file. See the
-  <<../user-guide/index.adoc#running-tests-console-launcher-color-customization,
-  User Guide>> for details.
-* The default theme for the `ConsoleLauncher` is now determined by the charset reported by
-  the system console on Java 17 and later.
-* New `--list-engines` option added to the `ConsoleLauncher` which displays all registered
-  test engine implementations.
-* Configuring included `EngineFilters` that do not match any registered `TestEngine`
-  results in an error to avoid misconfiguration – for example, due to typos.
-
-
-[[release-notes-5.9.0-M1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* When cleaning up a `@TempDir`, only one retry attempt will be made to delete directories.
-* Since the Turkish language has special characters such as 'ı' and 'İ', the uppercase
-  conversion in `DefaultParallelExecutionConfigurationStrategy#getStrategy` previously
-  caused all tests to finish with exit code -1. This has been fixed by using the root
-  locale instead of the default one.
-
-==== Deprecations and Breaking Changes
-
-* `@TempDir` fields are no longer allowed to be declared as `final`.
-  - This improves diagnostics for failures resulting from a user-declared `static final`
-    `@TempDir` field by throwing an exception with an informative error message.
-
-==== New Features and Improvements
-
-* `@TempDir` now includes a `cleanup` mode attribute for preventing a temporary directory
-  from being deleted after a test. The default cleanup mode can be configured via a
-  configuration parameter.
-* Support for FreeBSD and OpenBSD operating systems in `@EnabledOnOs` and `@DisabledOnOs`.
-* New `MATCH_NONE` mode for `@EnumSource` that selects only those enum constants whose
-  names match none of the supplied patterns.
-* The `@Order` annotation is now a `STABLE` API.
-* New `TestInstancePreConstructCallback` extension API that is called prior to test
-  instance construction – symmetric to the existing `TestInstancePreDestroyCallback`
-  extension API.
-* Extensions can now leverage registered `ParameterResolver` extensions when invoking
-  methods and constructors via the new `ExecutableInvoker` API available in the
-  `ExtensionContext`.
-* A subset of the invocations of parameterized or dynamic tests can now be selected via
-  the new `IterationSelector` discovery selector when launching the JUnit Platform.
-* `JAVA_19` and `JAVA_20` have been added to the `JRE` enum for use with JRE-based
-  execution conditions.
-* `@MethodSource` factory methods can now accept arguments resolved by registered
-  `ParameterResolver` extensions.
-
-
-[[release-notes-5.9.0-M1-junit-vintage]]
-=== JUnit Vintage
-
-No changes.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
deleted file mode 100644
index cdef20e54d11..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-RC1.adoc
+++ /dev/null
@@ -1,73 +0,0 @@
-[[release-notes-5.9.0-RC1]]
-== 5.9.0-RC1
-
-*Date of Release:* July 4, 2022
-
-*Scope:*
-
-* XML reports in new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
-format
-* Configurable cleanup mode for `@TempDir`
-* Configurable thread mode for `@Timeout`
-* Conditional execution based on OS architectures
-* New `TestInstancePreConstructCallback` extension API
-* Reusable parameter resolution for custom extension methods via `ExecutableInvoker`
-* Parameter injection for `@MethodSource` methods
-* New `IterationSelector`
-* Various improvements to `ConsoleLauncher`
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/61?closed=1+[5.9 RC1] milestone page in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.9.0-RC1-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* Absolute path entries are now supported in JUnit's Platform Console Launcher on Windows.
-* Attempts to load a `Class` for an invalid class name representing an extremely large
-  multidimensional array now fail within a reasonable amount of time.
-* Fix concurrency issue in classpath scanning.
-
-==== New Features and Improvements
-
-* New public factory method to instantiate an `ExecutionRequest`.
-* Documentation for overriding the JUnit version used in Spring Boot applications. See the
-  <<../user-guide/index.adoc#running-tests-build-spring-boot, User Guide>> for details.
-
-
-[[release-notes-5.9.0-RC1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Deprecations and Breaking Changes
-
-* Private lifecycle methods (annotated with `@BeforeAll`, `@AfterAll`, `@BeforeEach`, or
-  `@AfterEach`) now correctly lead to an exception. Although this is a bug fix, it is
-  technically also a breaking change since there might be existing user code with
-  `private` lifecycle methods which will now start to fail.
-
-==== New Features and Improvements
-
-* Three new `abort` methods have been added to the `Assumptions` class. These are
-  analogous to the `fail` methods in the `Assertions` class, but instead of failing they
-  abort the test or container.
-* Support for enabling/disabling tests based on the system's hardware architecture via new
-  `architectures` attributes in `@EnabledOnOs` and `@DisabledOnOs`.
-* Default `@MethodSource` factory methods can now accept arguments. A _default_ factory
-  method is a method declared in the test class with the same name as the
-  `@ParameterizedTest` method that is inferred as the factory method when no explicit
-  factory method is specified in the `@MethodSource` annotation.
-* Thread mode can be set on `@Timeout` annotation. It allows to configure whether test
-  code is executed in the thread of the calling code or in a separate thread. The three
-  modes are: `INFERRED` (default) which resolves the thread mode configured via the
-  property `junit.jupiter.execution.timeout.thread.mode.default`, `SAME_THREAD` that
-  executes the test code in the same thread as the calling code, and `SEPARATE_THREAD`
-  which executes it in a separate thread.
-
-
-[[release-notes-5.9.0-RC1-junit-vintage]]
-=== JUnit Vintage
-
-No changes.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
index 320a2643e515..06c77728fa2b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
@@ -1,9 +1,20 @@
 [[release-notes-5.9.0]]
 == 5.9.0
 
-*Date of Release:* ❓
+*Date of Release:* July 26, 2022
 
-*Scope:* ❓
+*Scope:*
+
+* XML reports in new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
+format
+* Configurable cleanup mode for `@TempDir`
+* Configurable thread mode for `@Timeout`
+* Conditional execution based on OS architectures
+* New `TestInstancePreConstructCallback` extension API
+* Reusable parameter resolution for custom extension methods via `ExecutableInvoker`
+* Parameter injection for `@MethodSource` methods
+* New `IterationSelector`
+* Various improvements to `ConsoleLauncher`
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/62?closed=1+[5.9.0] milestone page in the JUnit repository on
@@ -15,15 +26,53 @@ GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Fixed handling of global post-discovery filters that apply to `@Suite` classes.
+* Since the Turkish language has special characters such as 'ı' and 'İ', the uppercase
+  conversion in `DefaultParallelExecutionConfigurationStrategy#getStrategy` previously
+  caused all tests to finish with exit code -1. This has been fixed by using the root
+  locale instead of the default one.
+* Absolute path entries are now supported in JUnit's Platform Console Launcher on Windows.
+* Attempts to load a `Class` for an invalid class name representing an extremely large
+  multidimensional array now fail within a reasonable amount of time.
+* Fix concurrency issue in classpath scanning.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* `ConfigurationParameters.size()` has been deprecated in favor of the new `keySet()`
+  method.
 
 ==== New Features and Improvements
 
-* ❓
+* Support for the https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
+  format which supports all features of the JUnit Platform such as hierarchical test
+  structures, display names, tags, etc. Please refer to the
+  <<../user-guide/index.adoc#junit-platform-reporting-open-test-reporting, User Guide>>
+  for instructions on how to enable such reports in your build.
+* `ConfigurationParameters` has a new `keySet()` method which allows you to retrieve all
+  configuration parameter keys.
+* New `IterationSelector` for selecting a subset of a test's or container's iterations.
+* `ParallelExecutionConfiguration` allows configuring the `saturate` predicate of the
+  `ForkJoinPool` used for parallel test execution.
+* JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
+  resolution time a fully running set of dependencies is calculated, avoiding the need for
+  these to be manually specified.
+* JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
+* New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if no tests
+  are discovered.
+* The output color for the `ConsoleLauncher` can now be customized. The option
+  `--single-color` will apply a built-in monochrome style, while `--color-palette` will
+  accept a properties file. See the
+  <<../user-guide/index.adoc#running-tests-console-launcher-color-customization,
+  User Guide>> for details.
+* The default theme for the `ConsoleLauncher` is now determined by the charset reported by
+  the system console on Java 17 and later.
+* New `--list-engines` option added to the `ConsoleLauncher` which displays all registered
+  test engine implementations.
+* Configuring included `EngineFilters` that do not match any registered `TestEngine`
+  results in an error to avoid misconfiguration – for example, due to typos.
+* New public factory method to instantiate an `ExecutionRequest`.
+* Documentation for overriding the JUnit version used in Spring Boot applications. See the
+  <<../user-guide/index.adoc#running-tests-build-spring-boot, User Guide>> for details.
 
 
 [[release-notes-5.9.0-junit-jupiter]]
@@ -31,30 +80,67 @@ GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* When cleaning up a `@TempDir`, only one retry attempt will be made to delete directories.
+* Since the Turkish language has special characters such as 'ı' and 'İ', the uppercase
+  conversion in `DefaultParallelExecutionConfigurationStrategy#getStrategy` previously
+  caused all tests to finish with exit code -1. This has been fixed by using the root
+  locale instead of the default one.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* `@TempDir` fields are no longer allowed to be declared as `final`.
+  - This improves diagnostics for failures resulting from a user-declared `static final`
+    `@TempDir` field by throwing an exception with an informative error message.
+* Private lifecycle methods (annotated with `@BeforeAll`, `@AfterAll`, `@BeforeEach`, or
+  `@AfterEach`) now correctly lead to an exception. Although this is a bug fix, it is
+  technically also a breaking change since there might be existing user code with
+  `private` lifecycle methods which will now start to fail.
 
 ==== New Features and Improvements
 
+* `@TempDir` now includes a `cleanup` mode attribute for preventing a temporary directory
+  from being deleted after a test. The default cleanup mode can be configured via a
+  configuration parameter.
+* Support for FreeBSD and OpenBSD operating systems in `@EnabledOnOs` and `@DisabledOnOs`.
+* New `MATCH_NONE` mode for `@EnumSource` that selects only those enum constants whose
+  names match none of the supplied patterns.
+* The `@Order` annotation is now a `STABLE` API.
+* New `TestInstancePreConstructCallback` extension API that is called prior to test
+  instance construction – symmetric to the existing `TestInstancePreDestroyCallback`
+  extension API.
+* Extensions can now leverage registered `ParameterResolver` extensions when invoking
+  methods and constructors via the new `ExecutableInvoker` API available in the
+  `ExtensionContext`.
+* A subset of the invocations of parameterized or dynamic tests can now be selected via
+  the new `IterationSelector` discovery selector when launching the JUnit Platform.
+* `JAVA_19` and `JAVA_20` have been added to the `JRE` enum for use with JRE-based
+  execution conditions.
+* `@MethodSource` factory methods can now accept arguments resolved by registered
+  `ParameterResolver` extensions.
 * `AssertionFailureBuilder` allows reusing Jupiter's logic for creating failure messages
   to assist in writing custom assertion methods.
+* Three new `abort` methods have been added to the `Assumptions` class. These are
+  analogous to the `fail` methods in the `Assertions` class, but instead of failing they
+  abort the test or container.
+* Support for enabling/disabling tests based on the system's hardware architecture via new
+  `architectures` attributes in `@EnabledOnOs` and `@DisabledOnOs`.
+* Default `@MethodSource` factory methods can now accept arguments. A _default_ factory
+  method is a method declared in the test class with the same name as the
+  `@ParameterizedTest` method that is inferred as the factory method when no explicit
+  factory method is specified in the `@MethodSource` annotation.
+* Thread mode can be set on `@Timeout` annotation. It allows to configure whether test
+  code is executed in the thread of the calling code or in a separate thread. The three
+  modes are: `INFERRED` (default) which resolves the thread mode configured via the
+  property `junit.jupiter.execution.timeout.thread.mode.default`, `SAME_THREAD` that
+  executes the test code in the same thread as the calling code, and `SEPARATE_THREAD`
+  which executes it in a separate thread.
 
 
 [[release-notes-5.9.0-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * More accurate reporting of intermediate start/finish events, e.g. iterations of the
-  `Parameterized` runner and classes executed indirectly via the `Suite` runner.
+  `Parameterized` runner and classes executed indirectly via the `Suite` runner, when
+  running with JUnit 4.13 or later.

From 3ed71dff121ff4cfe6355195f274244c7acea0bd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 26 Jul 2022 21:08:02 +0200
Subject: [PATCH 0896/1433] Release 5.9

---
 README.md         | 4 ++--
 gradle.properties | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 06c77c6cfa13..aa04df17a909 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.8.2](https://github.com/junit-team/junit5/releases/tag/r5.8.2) (November 28, 2021)
-- Preview (Milestone/Release Candidate): [JUnit 5.9.0-RC1](https://github.com/junit-team/junit5/releases/tag/r5.9.0-RC1) (July 4, 2022)
+- General Availability (GA): [JUnit 5.9.0](https://github.com/junit-team/junit5/releases/tag/r5.9.0) (July 26, 2022)
+- Preview (Milestone/Release Candidate): n/a
 
 ## Documentation
 
diff --git a/gradle.properties b/gradle.properties
index 85e59570b686..05e31a8013af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.9.0-SNAPSHOT
+version         = 5.9.0
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.9.0-SNAPSHOT
+platformVersion = 1.9.0
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.9.0-SNAPSHOT
+vintageVersion  = 5.9.0
 
 defaultBuiltBy  = JUnit Team
 

From 2e0e34f6f317a30ba9e2689e4e31784e32044d12 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 26 Jul 2022 21:32:21 +0200
Subject: [PATCH 0897/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 05e31a8013af..9677b589bc3f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.9.0
+version         = 5.10.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.9.0
+platformVersion = 1.10.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.9.0
+vintageVersion  = 5.10.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From f5c406c54d42e96e3100b9482f08c3f96da77ca8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 26 Jul 2022 22:29:41 +0200
Subject: [PATCH 0898/1433] Remove obsolete include directives

---
 documentation/src/docs/asciidoc/release-notes/index.adoc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 6cca6088e477..4923e46ba7fa 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -18,10 +18,6 @@ include::{includedir}/link-attributes.adoc[]
 
 include::{basedir}/release-notes-5.9.0.adoc[]
 
-include::{basedir}/release-notes-5.9.0-RC1.adoc[]
-
-include::{basedir}/release-notes-5.9.0-M1.adoc[]
-
 include::{basedir}/release-notes-5.8.2.adoc[]
 
 include::{basedir}/release-notes-5.8.1.adoc[]

From 762a351cdeafef218c0ab82c82cc5b5abcdaac03 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Wed, 27 Jul 2022 07:45:58 +0200
Subject: [PATCH 0899/1433] Fix documentation typo (#2986)

---
 documentation/src/docs/asciidoc/user-guide/running-tests.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 3fcb484f7193..4a5d1bd57e6b 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -527,7 +527,7 @@ link:https://ant.apache.org/manual/Tasks/junitlauncher.html[`junitlauncher` task
 link:https://spring.io/projects/spring-boot[Spring Boot] provides automatic support for
 managing the version of JUnit used in your project. In addition, the
 `spring-boot-starter-test` artifact automatically includes testing libraries such as JUnit
-Jupiter, AspectJ, Mockito, etc.
+Jupiter, AssertJ, Mockito, etc.
 
 If your build relies on dependency management support from Spring Boot, you should not
 import the <<dependency-metadata-junit-bom,`junit-bom`>> in your build script since that

From aa9615e5603607adc2d7d40a242a2a4cc6c50603 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 29 Jul 2022 09:21:28 +0200
Subject: [PATCH 0900/1433] Remove GH Actions specific env vars (#2992)

This avoids capturing nested Gradle builds in the jobs summary.
---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index cb70596eb53d..a1ee801a05b7 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -52,6 +52,12 @@ tasks.withType<Test>().configureEach {
 	// Track OS as input so that tests are executed on all configured operating systems on CI
 	trackOperationSystemAsInput()
 
+	// Avoid passing unnecessary environment variables to the JVM (from GitHub Actions)
+	if (isCiServer) {
+		environment.remove("RUNNER_TEMP")
+		environment.remove("GITHUB_ACTION")
+	}
+
 	jvmArgumentProviders += CommandLineArgumentProvider {
 		listOf(
 			"-Djunit.platform.reporting.open.xml.enabled=true",

From 87cda9832374872a7b484e774898583209728e82 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 4 Aug 2022 11:12:59 +0300
Subject: [PATCH 0901/1433] Ensure ReflectionUtils.findMethods() returns
 distinct methods

Closes #2993
---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.9.1.adoc    | 60 +++++++++++++++++++
 .../commons/support/ReflectionSupport.java    |  4 +-
 .../commons/util/ReflectionUtils.java         |  1 +
 .../commons/util/ReflectionUtilsTests.java    | 25 ++++++++
 5 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 4923e46ba7fa..e4be51b9779a 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.9.1.adoc[]
+
 include::{basedir}/release-notes-5.9.0.adoc[]
 
 include::{basedir}/release-notes-5.8.2.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
new file mode 100644
index 000000000000..4236da2f18d1
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -0,0 +1,60 @@
+[[release-notes-5.9.1]]
+== 5.9.1
+
+*Date of Release:* ❓
+
+*Scope:* Minor bug fixes since 5.9.0
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/63?closed=1+[5.9.1] milestone page in the JUnit repository
+on GitHub.
+
+
+[[release-notes-5.9.1-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* `ReflectionSupport.findMethods(...)` now returns a distinct set of methods.
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.1-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* A `@ParameterizedTest` method configured with a `@MethodSource` annotation that
+  references a factory method inherited from multiple interfaces no longer fails with an
+  exception stating that multiple factory methods with the same name were found.
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.1-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
index f0741d0b5c9e..ae11ea789ed0 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
@@ -282,8 +282,8 @@ public static Optional<Method> findMethod(Class<?> clazz, String methodName, Cla
 	}
 
 	/**
-	 * Find all {@linkplain Method methods} of the supplied class or interface
-	 * that match the specified {@code predicate}.
+	 * Find all distinct {@linkplain Method methods} of the supplied class or
+	 * interface that match the specified {@code predicate}.
 	 *
 	 * <p>The results will not contain instance methods that are <em>overridden</em>
 	 * or {@code static} methods that are <em>hidden</em>.
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 654bef9a68e0..31dd5cdc8572 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -1418,6 +1418,7 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 		// @formatter:off
 		return findAllMethodsInHierarchy(clazz, traversalMode).stream()
 				.filter(predicate)
+				.distinct()
 				// unmodifiable since returned by public, non-internal method(s)
 				.collect(toUnmodifiableList());
 		// @formatter:on
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 041a459c61ad..9744850a9da6 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -1074,6 +1074,16 @@ private static void assertOneFooMethodIn(Class<?> clazz) {
 		assertThat(findMethods(clazz, isFooMethod)).hasSize(1);
 	}
 
+	/**
+	 * @since 1.9.1
+	 * @see https://github.com/junit-team/junit5/issues/2993
+	 */
+	@Test
+	void findMethodsFindsDistinctMethodsDeclaredInMultipleInterfaces() {
+		Predicate<Method> isStringsMethod = method -> method.getName().equals("strings");
+		assertThat(findMethods(DoubleInheritedInterfaceMethodTestCase.class, isStringsMethod)).hasSize(1);
+	}
+
 	@Test
 	void findMethodsInObject() {
 		var methods = findMethods(Object.class, method -> true);
@@ -1427,6 +1437,21 @@ void methodWithMultidimensionalObjectArray(Double[][][][][] data) {
 	void methodWithParameterizedMap(Map<String, String> map) {
 	}
 
+	interface StringsInterface1 {
+		static Stream<String> strings() {
+			return Stream.of("abc", "def");
+		}
+	}
+
+	interface StringsInterface2 extends StringsInterface1 {
+	}
+
+	/**
+	 * Inherits strings() from interfaces StringsInterface1 and StringsInterface2.
+	 */
+	static class DoubleInheritedInterfaceMethodTestCase implements StringsInterface1, StringsInterface2 {
+	}
+
 	interface Generic<X, Y, Z extends X> {
 
 		X foo();

From 685dd96f2fcd3098596ecf2d87dbe2260379526a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 8 Aug 2022 13:11:50 +0200
Subject: [PATCH 0902/1433] Make build cache URL configurable

---
 settings.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1b3ced7b5dcf..63ef445d5280 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,6 +38,7 @@ dependencyResolutionManagement {
 
 val gradleEnterpriseServer = "https://ge.junit.org"
 val isCiServer = System.getenv("CI") != null
+val junitBuildCacheUrl: String? by extra
 val junitBuildCacheUsername: String? by extra
 val junitBuildCachePassword: String? by extra
 
@@ -79,7 +80,7 @@ buildCache {
 		isEnabled = !isCiServer
 	}
 	remote<HttpBuildCache> {
-		url = uri("$gradleEnterpriseServer/cache/")
+		url = uri(junitBuildCacheUrl ?: "$gradleEnterpriseServer/cache/")
 		isPush = isCiServer && !junitBuildCacheUsername.isNullOrEmpty() && !junitBuildCachePassword.isNullOrEmpty()
 		credentials {
 			username = junitBuildCacheUsername?.ifEmpty { null }

From d8ad474005ff28eb2d67785ac3b12b469a284b55 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 8 Aug 2022 13:31:22 +0200
Subject: [PATCH 0903/1433] Upgradle to 7.5.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 012d6d90445b..b916c04dbb24 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From d3d0d2ca0d4e9a3acd8ed38b77ae51d5e26c2656 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 13 Aug 2022 17:52:09 +0200
Subject: [PATCH 0904/1433] Fix regression in @MethodSource factory method
 resolution

JUnit Jupiter 5.9.0 introduced a regression regarding @MethodSource
factory method resolution for a @ParameterizedTest. Specifically, if
@Test, @TestFactory, or @TestTemplate methods existed with the same name
as the designated @MethodSource factory method, an exception was thrown
incorrectly stating that multiple factory methods with the same name
were found.

This commit addresses this by filtering out @Test, @TestFactory, and
@TestTemplate methods when searching for an appropriate @MethodSource
factory method.

Closes #3001
---
 .../release-notes/release-notes-5.9.1.adoc    |  4 ++
 .../provider/MethodArgumentsProvider.java     | 21 +++++-
 .../ParameterizedTestIntegrationTests.java    | 67 +++++++++++++++++--
 3 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
index 4236da2f18d1..d4e13d291128 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -34,6 +34,10 @@ on GitHub.
 * A `@ParameterizedTest` method configured with a `@MethodSource` annotation that
   references a factory method inherited from multiple interfaces no longer fails with an
   exception stating that multiple factory methods with the same name were found.
+* A `@ParameterizedTest` method configured with a `@MethodSource` annotation that
+  references a factory method whose name is the same as other test methods in the same
+  class no longer fails with an exception stating that multiple factory methods with the
+  same name were found.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 4be203387d09..f8df21bacdf1 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -12,12 +12,17 @@
 
 import static java.lang.String.format;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
+import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.JUnitException;
@@ -72,10 +77,15 @@ private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodN
 				methodParameters, className)));
 	}
 
+	/**
+	 * Find all methods in the given {@code testClass} with the desired {@code factoryMethodName},
+	 * ignoring the {@code testMethod} itself as well as any {@code @Test}, {@code @TestTemplate},
+	 * or {@code @TestFactory} methods with the same name.
+	 */
 	private Method getFactoryMethodBySimpleName(Class<?> testClass, Method testMethod, String factoryMethodName) {
-		// Find all methods with the desired factory method name, but ignore the test method itself.
-		List<Method> methods = ReflectionUtils.findMethods(testClass,
-			factoryMethod -> factoryMethodName.equals(factoryMethod.getName()) && !testMethod.equals(factoryMethod));
+		Predicate<Method> isFactoryMethod = candidate -> factoryMethodName.equals(candidate.getName())
+				&& !(testMethod.equals(candidate) || isTestMethod(candidate));
+		List<Method> methods = ReflectionUtils.findMethods(testClass, isFactoryMethod);
 		Preconditions.condition(methods.size() > 0,
 			() -> format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName()));
 		Preconditions.condition(methods.size() == 1,
@@ -84,6 +94,11 @@ private Method getFactoryMethodBySimpleName(Class<?> testClass, Method testMetho
 		return methods.get(0);
 	}
 
+	private boolean isTestMethod(Method candidate) {
+		return isAnnotated(candidate, Test.class) || isAnnotated(candidate, TestTemplate.class)
+				|| isAnnotated(candidate, TestFactory.class);
+	}
+
 	private Class<?> loadRequiredClass(String className) {
 		return ReflectionUtils.tryToLoadClass(className).getOrThrow(
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 50aa14fc2732..4682db4193d5 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -12,9 +12,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.within;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 import static org.junit.jupiter.api.Named.named;
 import static org.junit.jupiter.engine.discovery.JupiterUniqueIdBuilder.appendTestTemplateInvocationSegment;
 import static org.junit.jupiter.engine.discovery.JupiterUniqueIdBuilder.uniqueIdForTestTemplateMethod;
@@ -53,13 +56,17 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.TestReporter;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
@@ -722,11 +729,6 @@ void reportsContainerWithAssumptionFailureInMethodSourceAsAborted() {
 							message("Assumption failed: nothing to test"))));
 		}
 
-		private EngineExecutionResults execute(String methodName, Class<?>... methodParameterTypes) {
-			return ParameterizedTestIntegrationTests.this.execute(MethodSourceTestCase.class, methodName,
-				methodParameterTypes);
-		}
-
 		@Test
 		void namedParameters() {
 			execute("namedParameters", String.class).allEvents().assertThatEvents() //
@@ -745,6 +747,27 @@ void nameParametersAlias() {
 						event(test(), displayName("default name"), finishedWithFailure(message("default name"))));
 		}
 
+		/**
+		 * @since 5.9.1
+		 * @see https://github.com/junit-team/junit5/issues/3001
+		 */
+		@Test
+		void duplicateMethodNames() {
+			// It is sufficient to assert that 8 tests started and finished, because
+			// without the fix for #3001 the 4 parameterized tests would fail. In
+			// other words, we're not really testing the support for @RepeatedTest
+			// and @TestFactory, but their presence also contributes to the bug
+			// reported in #3001.
+			ParameterizedTestIntegrationTests.this.execute(selectClass(DuplicateMethodNamesMethodSourceTestCase.class))//
+					.testEvents()//
+					.assertStatistics(stats -> stats.started(8).failed(0).finished(8));
+		}
+
+		private EngineExecutionResults execute(String methodName, Class<?>... methodParameterTypes) {
+			return ParameterizedTestIntegrationTests.this.execute(MethodSourceTestCase.class, methodName,
+				methodParameterTypes);
+		}
+
 	}
 
 	@Nested
@@ -1251,6 +1274,40 @@ static List<String> assumptionFailureInMethodSourceFactoryMethod() {
 
 	}
 
+	/**
+	 * @since 5.9.1
+	 * @see https://github.com/junit-team/junit5/issues/3001
+	 */
+	static class DuplicateMethodNamesMethodSourceTestCase {
+
+		@ParameterizedTest
+		@MethodSource
+		void test(String value) {
+			assertEquals(1, value.length());
+		}
+
+		@ParameterizedTest
+		@MethodSource("test")
+		void anotherTest(String value) {
+			assertEquals(1, value.length());
+		}
+
+		@RepeatedTest(2)
+		void test(TestReporter testReporter) {
+			assertNotNull(testReporter);
+		}
+
+		@TestFactory
+		Stream<DynamicTest> test(TestInfo testInfo) {
+			return test().map(value -> dynamicTest(value, () -> assertEquals(1, value.length())));
+		}
+
+		private static Stream<String> test() {
+			return Stream.of("a", "b");
+		}
+
+	}
+
 	static class UnusedArgumentsTestCase {
 
 		@ParameterizedTest

From d03d6b9b8af923d7ba66d8430eb397f5873ac8b3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 14 Aug 2022 14:27:23 +0200
Subject: [PATCH 0905/1433] Improve diagnostics when multiple @MethodSource
 factory methods are detected

---
 .../jupiter/params/provider/MethodArgumentsProvider.java   | 4 ++--
 .../params/provider/MethodArgumentsProviderTests.java      | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index f8df21bacdf1..885ad510a811 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -89,8 +89,8 @@ private Method getFactoryMethodBySimpleName(Class<?> testClass, Method testMetho
 		Preconditions.condition(methods.size() > 0,
 			() -> format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName()));
 		Preconditions.condition(methods.size() == 1,
-			() -> format("Several factory methods named [%s] were found in class [%s]", factoryMethodName,
-				testClass.getName()));
+			() -> format("%d factory methods named [%s] were found in class [%s]: %s", methods.size(),
+				factoryMethodName, testClass.getName(), methods));
 		return methods.get(0);
 	}
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 1a32fa1f35a7..27450a474a1f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -395,8 +395,11 @@ void throwsExceptionWhenSeveralFactoryMethodsWithSameNameAreAvailable() {
 			var exception = assertThrows(PreconditionViolationException.class,
 				() -> provideArguments("stringStreamProviderWithOrWithoutParameter").toArray());
 
-			assertThat(exception.getMessage()).isEqualTo(
-				"Several factory methods named [stringStreamProviderWithOrWithoutParameter] were found in class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]");
+			assertThat(exception.getMessage())//
+					.startsWith("2 factory methods named [stringStreamProviderWithOrWithoutParameter] were found in "
+							+ "class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]: ")//
+					.contains("stringStreamProviderWithOrWithoutParameter()",
+						"stringStreamProviderWithOrWithoutParameter(java.lang.String)");
 		}
 
 		@Test

From 8f9460f2bad44bd74ebbb957d125735af7e9ee38 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 14 Aug 2022 15:23:05 +0200
Subject: [PATCH 0906/1433] Introduce CollectionUtils.isConvertibleToStream()

---
 .../commons/util/CollectionUtils.java         | 29 +++++++++
 .../commons/util/CollectionUtilsTests.java    | 61 +++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index c8f677b1b325..32c89dcc26a8 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -112,6 +112,34 @@ public static <T> Set<T> toSet(T[] values) {
 		return collectingAndThen(toList(), Collections::unmodifiableList);
 	}
 
+	/**
+	 * Determine if an instance of the supplied type can be converted into a
+	 * {@code Stream}.
+	 *
+	 * <p>If this method returns {@code true}, {@link #toStream(Object)} can
+	 * successfully convert an object of the specified type into a stream. See
+	 * {@link #toStream(Object)} for supported types.
+	 *
+	 * @param type the type to check; may be {@code null}
+	 * @return {@code true} if an instance of the type can be converted into a stream
+	 * @since 1.9.1
+	 * @see #toStream(Object)
+	 */
+	@API(status = INTERNAL, since = "1.9.1")
+	public static boolean isConvertibleToStream(Class<?> type) {
+		if (type == null || type == void.class) {
+			return false;
+		}
+		return (Stream.class.isAssignableFrom(type)//
+				|| DoubleStream.class.isAssignableFrom(type)//
+				|| IntStream.class.isAssignableFrom(type)//
+				|| LongStream.class.isAssignableFrom(type)//
+				|| Iterable.class.isAssignableFrom(type)//
+				|| Iterator.class.isAssignableFrom(type)//
+				|| Object[].class.isAssignableFrom(type)//
+				|| (type.isArray() && type.getComponentType().isPrimitive()));
+	}
+
 	/**
 	 * Convert an object of one of the following supported types into a {@code Stream}.
 	 *
@@ -131,6 +159,7 @@ public static <T> Set<T> toSet(T[] values) {
 	 * @return the resulting stream
 	 * @throws PreconditionViolationException if the supplied object is {@code null}
 	 * or not one of the supported types
+	 * @see #isConvertibleToStream(Object)
 	 */
 	public static Stream<?> toStream(Object object) {
 		Preconditions.notNull(object, "Object must not be null");
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index e8093659ee2b..db8bdad2433f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -33,6 +34,10 @@
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**
@@ -75,6 +80,62 @@ void toUnmodifiableListThrowsOnMutation() {
 		assertThrows(UnsupportedOperationException.class, numbers::clear);
 	}
 
+	@ParameterizedTest
+	@ValueSource(classes = { //
+			Stream.class, //
+			DoubleStream.class, //
+			IntStream.class, //
+			LongStream.class, //
+			Collection.class, //
+			Iterable.class, //
+			Iterator.class, //
+			Object[].class, //
+			String[].class, //
+			int[].class, //
+			double[].class, //
+			char[].class //
+	})
+	void isConvertibleToStreamForSupportedTypes(Class<?> type) {
+		assertThat(CollectionUtils.isConvertibleToStream(type)).isTrue();
+	}
+
+	@ParameterizedTest
+	@MethodSource("objectsConvertibleToStreams")
+	void isConvertibleToStreamForSupportedTypesFromObjects(Object object) {
+		assertThat(CollectionUtils.isConvertibleToStream(object.getClass())).isTrue();
+	}
+
+	static Stream<Object> objectsConvertibleToStreams() {
+		return Stream.of(//
+			Stream.of("cat", "dog"), //
+			DoubleStream.of(42.3), //
+			IntStream.of(99), //
+			LongStream.of(100000000), //
+			Set.of(1, 2, 3), //
+			Arguments.of((Object) new Object[] { 9, 8, 7 }), //
+			new int[] { 5, 10, 15 }//
+		);
+	}
+
+	@ParameterizedTest
+	@ValueSource(classes = { //
+			void.class, //
+			Void.class, //
+			Object.class, //
+			Integer.class, //
+			String.class, //
+			int.class, //
+			boolean.class //
+	})
+	void isConvertibleToStreamForUnsupportedTypes(Class<?> type) {
+		assertThat(CollectionUtils.isConvertibleToStream(type)).isFalse();
+	}
+
+	@Test
+	void isConvertibleToStreamForNull() {
+		assertThat(CollectionUtils.isConvertibleToStream(null)).isFalse();
+	}
+
 	@Test
 	void toStreamWithNull() {
 		Exception exception = assertThrows(PreconditionViolationException.class, () -> CollectionUtils.toStream(null));

From d1f6edee15ccacfbb931c5f98a2eacc04ede5f56 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 14 Aug 2022 16:31:39 +0200
Subject: [PATCH 0907/1433] Revise fix for @MethodSource factory method
 resolution

This commit revises the fix for the @MethodSource factory method
resolution regression by also ignoring candidate factory methods (i.e.,
those with the same name as the designated factory method) with an
invalid return type. Such methods may in fact be local utility methods
that are not intended to be used as a factory method.

Closes #3001
---
 .../release-notes/release-notes-5.9.1.adoc    |  6 +--
 .../provider/MethodArgumentsProvider.java     | 38 +++++++++++++------
 .../ParameterizedTestIntegrationTests.java    | 19 ++++++++--
 .../MethodArgumentsProviderTests.java         | 22 ++++++-----
 4 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
index d4e13d291128..f0fb4b21c945 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -35,9 +35,9 @@ on GitHub.
   references a factory method inherited from multiple interfaces no longer fails with an
   exception stating that multiple factory methods with the same name were found.
 * A `@ParameterizedTest` method configured with a `@MethodSource` annotation that
-  references a factory method whose name is the same as other test methods in the same
-  class no longer fails with an exception stating that multiple factory methods with the
-  same name were found.
+  references a factory method whose name is the same as other non-factory methods in the
+  same class no longer fails with an exception stating that multiple factory methods with
+  the same name were found.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 885ad510a811..a4696a2739ec 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -11,8 +11,10 @@
 package org.junit.jupiter.params.provider;
 
 import static java.lang.String.format;
+import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
+import static org.junit.platform.commons.util.CollectionUtils.isConvertibleToStream;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -78,20 +80,34 @@ private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodN
 	}
 
 	/**
-	 * Find all methods in the given {@code testClass} with the desired {@code factoryMethodName},
-	 * ignoring the {@code testMethod} itself as well as any {@code @Test}, {@code @TestTemplate},
+	 * Find all methods in the given {@code testClass} with the desired {@code factoryMethodName}
+	 * which have return types that can be converted to a {@link Stream}, ignoring the
+	 * {@code testMethod} itself as well as any {@code @Test}, {@code @TestTemplate},
 	 * or {@code @TestFactory} methods with the same name.
 	 */
 	private Method getFactoryMethodBySimpleName(Class<?> testClass, Method testMethod, String factoryMethodName) {
-		Predicate<Method> isFactoryMethod = candidate -> factoryMethodName.equals(candidate.getName())
-				&& !(testMethod.equals(candidate) || isTestMethod(candidate));
-		List<Method> methods = ReflectionUtils.findMethods(testClass, isFactoryMethod);
-		Preconditions.condition(methods.size() > 0,
-			() -> format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName()));
-		Preconditions.condition(methods.size() == 1,
-			() -> format("%d factory methods named [%s] were found in class [%s]: %s", methods.size(),
-				factoryMethodName, testClass.getName(), methods));
-		return methods.get(0);
+		Predicate<Method> isCandidate = candidate -> factoryMethodName.equals(candidate.getName())
+				&& !testMethod.equals(candidate);
+		List<Method> candidates = ReflectionUtils.findMethods(testClass, isCandidate);
+		Predicate<Method> isFactoryMethod = method -> isConvertibleToStream(method.getReturnType())
+				&& !isTestMethod(method);
+		List<Method> factoryMethods = candidates.stream().filter(isFactoryMethod).collect(toList());
+		Preconditions.condition(factoryMethods.size() > 0, () -> {
+			// If we didn't find the factory method using the isFactoryMethod Predicate, perhaps
+			// the specified factory method has an invalid return type or is a test method.
+			// In that case, we report the invalid candidates that were found.
+			if (candidates.size() > 0) {
+				return format(
+					"Could not find valid factory method [%s] in class [%s] but found the following invalid candidates: %s",
+					factoryMethodName, testClass.getName(), candidates);
+			}
+			// Otherwise, report that we didn't find anything.
+			return format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName());
+		});
+		Preconditions.condition(factoryMethods.size() == 1,
+			() -> format("%d factory methods named [%s] were found in class [%s]: %s", factoryMethods.size(),
+				factoryMethodName, testClass.getName(), factoryMethods));
+		return factoryMethods.get(0);
 	}
 
 	private boolean isTestMethod(Method candidate) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 4682db4193d5..56f35329262d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -1283,13 +1283,13 @@ static class DuplicateMethodNamesMethodSourceTestCase {
 		@ParameterizedTest
 		@MethodSource
 		void test(String value) {
-			assertEquals(1, value.length());
+			test(1, value);
 		}
 
 		@ParameterizedTest
 		@MethodSource("test")
 		void anotherTest(String value) {
-			assertEquals(1, value.length());
+			assertTrue(test(value, 1));
 		}
 
 		@RepeatedTest(2)
@@ -1299,9 +1299,22 @@ void test(TestReporter testReporter) {
 
 		@TestFactory
 		Stream<DynamicTest> test(TestInfo testInfo) {
-			return test().map(value -> dynamicTest(value, () -> assertEquals(1, value.length())));
+			return test().map(value -> dynamicTest(value, () -> test(1, value)));
 		}
 
+		// neither a test method nor a factory method.
+		// intentionally void.
+		private void test(int expectedLength, String value) {
+			assertEquals(expectedLength, value.length());
+		}
+
+		// neither a test method nor a factory method.
+		// intentionally non-void and also not convertible to a Stream.
+		private boolean test(String value, int expectedLength) {
+			return (value.length() == expectedLength);
+		}
+
+		// legitimate factory method.
 		private static Stream<String> test() {
 			return Stream.of("a", "b");
 		}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 27450a474a1f..21f14662ecc9 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -48,12 +48,24 @@ class MethodArgumentsProviderTests {
 
 	private MutableExtensionRegistry extensionRegistry;
 
+	@Test
+	void throwsExceptionWhenFactoryMethodDoesNotExist() {
+		var exception = assertThrows(JUnitException.class, () -> provideArguments("unknownMethod").toArray());
+
+		assertThat(exception.getMessage()).isEqualTo(
+			"Could not find factory method [unknownMethod] in class [" + TestCase.class.getName() + "]");
+	}
+
 	@Test
 	void throwsExceptionForIllegalReturnType() {
 		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments("providerWithIllegalReturnType").toArray());
 
-		assertThat(exception).hasMessageContaining("Cannot convert instance of java.lang.Integer into a Stream");
+		assertThat(exception.getMessage())//
+				.containsSubsequence("Could not find valid factory method [providerWithIllegalReturnType] in class [",
+					TestCase.class.getName() + "]", //
+					"but found the following invalid candidates: ", //
+					"[static java.lang.Object org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase.providerWithIllegalReturnType()]");
 	}
 
 	@Test
@@ -194,14 +206,6 @@ void providesArgumentsFromNonStaticFactoryMethodWhenStaticIsNotRequired() {
 		assertThat(arguments).containsExactly(array("foo"), array("bar"));
 	}
 
-	@Test
-	void throwsExceptionWhenFactoryMethodDoesNotExist() {
-		var exception = assertThrows(JUnitException.class, () -> provideArguments("unknownMethod").toArray());
-
-		assertThat(exception.getMessage()).contains("Could not find factory method [unknownMethod] in class [",
-			TestCase.class.getName());
-	}
-
 	@Test
 	void providesArgumentsUsingDefaultFactoryMethodName() throws Exception {
 		Class<?> testClass = DefaultFactoryMethodNameTestCase.class;

From 6740766ec3acbf834e86a4d96a4a6736acc9dcb9 Mon Sep 17 00:00:00 2001
From: Kir Merzlikin <kirmerzlikin@gmail.com>
Date: Wed, 24 Aug 2022 00:26:23 +0300
Subject: [PATCH 0908/1433] Fix header support in @CsvSource for records
 supplied via value attribute

Previously, when parsing the `value` attribute of the `@CsvSource`
annotation with `useHeadersInDisplayName` set to true,
`CsvArgumentsProvider` didn't handle headers correctly. After parsing
the first line with headers, instead of moving to the next line, it
tried to validate a not-yet-parsed CSV record which lead to an
exception being thrown. This was due to the missing `continue`
statement in the `for` loop.

Now, with `continue` added, as soon as headers are parsed, the `for`
loop is advanced to the next iteration and to the next line of CSV
input, containing the expected CSV record.

Fixes #3010
Closes #3011
---
 .../params/provider/CsvArgumentsProvider.java  |  1 +
 .../provider/CsvArgumentsProviderTests.java    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 7f475a23081f..7a2999eaaf56 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -95,6 +95,7 @@ private Stream<Arguments> parseValueArray() {
 				// Lazily retrieve headers if necessary.
 				if (useHeadersInDisplayName && headers == null) {
 					headers = getHeaders(this.csvParser);
+					continue;
 				}
 				Preconditions.notNull(csvRecord,
 					() -> "Record at index " + index + " contains invalid CSV: \"" + input + "\"");
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 872ff28397e8..a62a3c713f87 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -353,6 +353,24 @@ void supportsCsvHeadersWhenUsingTextBlockAttribute() {
 			array("FRUIT = banana", "RANK = 2"));
 	}
 
+	@Test
+	void supportsCsvHeadersWhenUsingValueAttribute() {
+		var annotation = csvSource().useHeadersInDisplayName(true).lines("FRUIT, RANK", "apple, 1",
+			"banana, 2").build();
+
+		var arguments = provideArguments(annotation);
+		Stream<String[]> argumentsAsStrings = arguments.map(array -> {
+			String[] strings = new String[array.length];
+			for (int i = 0; i < array.length; i++) {
+				strings[i] = String.valueOf(array[i]);
+			}
+			return strings;
+		});
+
+		assertThat(argumentsAsStrings).containsExactly(array("FRUIT = apple", "RANK = 1"),
+			array("FRUIT = banana", "RANK = 2"));
+	}
+
 	@Test
 	void throwsExceptionIfColumnCountExceedsHeaderCount() {
 		var annotation = csvSource().useHeadersInDisplayName(true).textBlock("""

From e83cdf02b2301b90145ccbb4789924a2c737c8db Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 24 Aug 2022 10:18:33 +0200
Subject: [PATCH 0909/1433] Polishing

See #3011
---
 .../provider/CsvArgumentsProviderTests.java   | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index a62a3c713f87..2fb55af504e6 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -334,31 +334,21 @@ void honorsCommentCharacterWhenUsingTextBlockAttribute() {
 
 	@Test
 	void supportsCsvHeadersWhenUsingTextBlockAttribute() {
-		var annotation = csvSource().useHeadersInDisplayName(true).textBlock("""
+		supportsCsvHeaders(csvSource().useHeadersInDisplayName(true).textBlock("""
 				FRUIT, RANK
 				apple, 1
 				banana, 2
-				""").build();
-
-		var arguments = provideArguments(annotation);
-		Stream<String[]> argumentsAsStrings = arguments.map(array -> {
-			String[] strings = new String[array.length];
-			for (int i = 0; i < array.length; i++) {
-				strings[i] = String.valueOf(array[i]);
-			}
-			return strings;
-		});
-
-		assertThat(argumentsAsStrings).containsExactly(array("FRUIT = apple", "RANK = 1"),
-			array("FRUIT = banana", "RANK = 2"));
+				""").build());
 	}
 
 	@Test
 	void supportsCsvHeadersWhenUsingValueAttribute() {
-		var annotation = csvSource().useHeadersInDisplayName(true).lines("FRUIT, RANK", "apple, 1",
-			"banana, 2").build();
+		supportsCsvHeaders(csvSource().useHeadersInDisplayName(true)//
+				.lines("FRUIT, RANK", "apple, 1", "banana, 2").build());
+	}
 
-		var arguments = provideArguments(annotation);
+	private void supportsCsvHeaders(CsvSource csvSource) {
+		var arguments = provideArguments(csvSource);
 		Stream<String[]> argumentsAsStrings = arguments.map(array -> {
 			String[] strings = new String[array.length];
 			for (int i = 0; i < array.length; i++) {

From 61edb2948e36c154bcb154b46f2c7142c459fdfb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 24 Aug 2022 10:23:30 +0200
Subject: [PATCH 0910/1433] Document fix for #3010 in the release notes

---
 .../src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
index f0fb4b21c945..8827a8633af6 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -31,6 +31,8 @@ on GitHub.
 
 ==== Bug Fixes
 
+* Headers provided via the `value` attribute in `@CsvSource` for a `@ParameterizedTest`
+  are now properly parsed when the `useHeadersInDisplayName` attribute is set to `true`.
 * A `@ParameterizedTest` method configured with a `@MethodSource` annotation that
   references a factory method inherited from multiple interfaces no longer fails with an
   exception stating that multiple factory methods with the same name were found.

From e9dff5bc534348667a5e7575af86b8fd38e738c3 Mon Sep 17 00:00:00 2001
From: Kir Merzlikin <kirmerzlikin@gmail.com>
Date: Wed, 24 Aug 2022 13:41:24 +0300
Subject: [PATCH 0911/1433] Fix method reference in CollectionUtils javadoc

---
 .../java/org/junit/platform/commons/util/CollectionUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index 32c89dcc26a8..a3f83b2f6656 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -159,7 +159,7 @@ public static boolean isConvertibleToStream(Class<?> type) {
 	 * @return the resulting stream
 	 * @throws PreconditionViolationException if the supplied object is {@code null}
 	 * or not one of the supported types
-	 * @see #isConvertibleToStream(Object)
+	 * @see #isConvertibleToStream(Class)
 	 */
 	public static Stream<?> toStream(Object object) {
 		Preconditions.notNull(object, "Object must not be null");

From d6fd86e1b6ab781d687511087e973f4de362c266 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 3 Sep 2022 12:35:47 +0200
Subject: [PATCH 0912/1433] Update test-retry plugin to 1.4.1

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ef4f4f161e5e..5ab34e817b7f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-	implementation("org.gradle:test-retry-gradle-plugin:1.3.1")
+	implementation("org.gradle:test-retry-gradle-plugin:1.4.1")
 	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3.5") // keep in sync with root settings.gradle.kts
 }
 

From ee6c95550a265132ee26f528d8ba20660610b86c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 3 Sep 2022 15:48:58 +0200
Subject: [PATCH 0913/1433] Remove obsolete Jenkins-specific config

---
 .../projects/gradle-kotlin-extensions/build.gradle.kts         | 3 ---
 .../projects/gradle-missing-engine/build.gradle.kts            | 3 ---
 .../projects/gradle-starter/build.gradle.kts                   | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts
index c5245e8a531e..c79b5ff77427 100644
--- a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts
@@ -9,9 +9,6 @@ repositories {
 	mavenCentral()
 }
 
-// don't use `build` as target to prevent Jenkins picking up
-project.buildDir = file("bin")
-
 // grab jupiter version from system environment
 val jupiterVersion = System.getenv("JUNIT_JUPITER_VERSION")
 
diff --git a/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts
index 29906a0122be..022b1d3a71eb 100644
--- a/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts
@@ -2,9 +2,6 @@ plugins {
 	java
 }
 
-// don't use `build` as target to prevent Jenkins picking up
-buildDir = file("bin")
-
 // grab jupiter version from system environment
 val jupiterVersion: String = System.getenv("JUNIT_JUPITER_VERSION")
 val vintageVersion: String = System.getenv("JUNIT_VINTAGE_VERSION")
diff --git a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
index fc89adfbd7eb..b1e87656b938 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
@@ -2,9 +2,6 @@ plugins {
 	java
 }
 
-// don't use `build` as target to prevent Jenkins picking up
-buildDir = file("bin")
-
 // grab jupiter version from system environment
 val jupiterVersion: String = System.getenv("JUNIT_JUPITER_VERSION")
 val vintageVersion: String = System.getenv("JUNIT_VINTAGE_VERSION")

From e1283332882f7060b4a90e371c9834aec13e0683 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 3 Sep 2022 15:49:58 +0200
Subject: [PATCH 0914/1433] Add build tool integration tests for
 open-test-reporting on JDK 8

---
 .../platform-tooling-support-tests.gradle.kts |   2 +
 .../projects/ant-starter/build.xml            |   3 +
 .../projects/gradle-starter/build.gradle.kts  |   9 +
 .../projects/maven-starter/pom.xml            |  15 ++
 .../support/tests/AntStarterTests.java        |  11 +-
 .../support/tests/GradleStarterTests.java     |  11 +-
 .../support/tests/MavenStarterTests.java      |  11 +-
 .../tooling/support/tests/XmlAssertions.java  | 158 ++++++++++++++++++
 8 files changed, 211 insertions(+), 9 deletions(-)
 create mode 100644 platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 56dd772c6069..cb2a80ecaba8 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -40,6 +40,7 @@ dependencies {
 	testImplementation(libs.ant) {
 		because("we reference Ant's main class")
 	}
+	testImplementation(libs.bundles.xmlunit)
 
 	thirdPartyJars(libs.junit4)
 	thirdPartyJars(libs.assertj)
@@ -51,6 +52,7 @@ dependencies {
 	antJars(libs.bundles.ant)
 	antJars(projects.junitPlatformConsoleStandalone)
 	antJars(projects.junitPlatformLauncher)
+	antJars(projects.junitPlatformReporting)
 
 	mavenDistribution(libs.maven) {
 		artifact {
diff --git a/platform-tooling-support-tests/projects/ant-starter/build.xml b/platform-tooling-support-tests/projects/ant-starter/build.xml
index 953cd72f852f..6c805ceb1ad7 100644
--- a/platform-tooling-support-tests/projects/ant-starter/build.xml
+++ b/platform-tooling-support-tests/projects/ant-starter/build.xml
@@ -52,8 +52,11 @@
     <target name="test.console.launcher" depends="compile">
         <java classpathref="test.classpath" classname="org.junit.platform.console.ConsoleLauncher" fork="true">
             <arg value="--scan-classpath"/>
+            <arg value="--include-engine=junit-jupiter"/>
             <arg value="--disable-ansi-colors"/>
             <arg line="--reports-dir build/test-report"/>
+            <arg value="--config=junit.platform.reporting.open.xml.enabled=true"/>
+            <arg value="--config=junit.platform.reporting.output.dir=build/test-report"/>
         </java>
         <junitreport todir="build/test-report">
             <fileset dir="build/test-report">
diff --git a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
index b1e87656b938..33068798beb2 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
@@ -22,6 +22,7 @@ repositories {
 
 dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter:$jupiterVersion")
+	testRuntimeOnly("org.junit.platform:junit-platform-reporting:$platformVersion")
 }
 
 tasks.test {
@@ -35,6 +36,14 @@ tasks.test {
 		html.isEnabled = true
 	}
 
+	val outputDir = reports.junitXml.outputLocation
+	jvmArgumentProviders += CommandLineArgumentProvider {
+		listOf(
+			"-Djunit.platform.reporting.open.xml.enabled=true",
+			"-Djunit.platform.reporting.output.dir=${outputDir.get().asFile.absolutePath}"
+		)
+	}
+
 	doFirst {
 		println("Using Java version: ${JavaVersion.current()}")
 	}
diff --git a/platform-tooling-support-tests/projects/maven-starter/pom.xml b/platform-tooling-support-tests/projects/maven-starter/pom.xml
index 21259e2fb99f..ad598a0fdec8 100644
--- a/platform-tooling-support-tests/projects/maven-starter/pom.xml
+++ b/platform-tooling-support-tests/projects/maven-starter/pom.xml
@@ -12,6 +12,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <junit.jupiter.version>${env.JUNIT_JUPITER_VERSION}</junit.jupiter.version>
+        <junit.platform.version>${env.JUNIT_PLATFORM_VERSION}</junit.platform.version>
     </properties>
 
     <dependencies>
@@ -21,6 +22,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-reporting</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -32,6 +39,14 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
+                <configuration>
+                    <properties>
+                        <configurationParameters>
+                            junit.platform.reporting.open.xml.enabled = true
+                            junit.platform.reporting.output.dir = ${project.build.directory}/surefire-reports
+                        </configurationParameters>
+                    </properties>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
index 900e3e8c8736..371dfe77d598 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
+import static platform.tooling.support.tests.XmlAssertions.verifyContainsExpectedStartedOpenTestReport;
 
 import java.util.List;
 
@@ -29,13 +30,14 @@ class AntStarterTests {
 
 	@Test
 	void ant_starter() {
-		var result = Request.builder() //
+		var request = Request.builder() //
 				.setTool(new Java()) //
 				.setProject("ant-starter") //
 				.addArguments("-cp", System.getProperty("antJars"), Main.class.getName()) //
 				.addArguments("-verbose") //
-				.build() //
-				.run();
+				.build();
+
+		var result = request.run();
 
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
@@ -54,5 +56,8 @@ void ant_starter() {
 			"     \\[java\\] \\[         0 tests failed          \\]", //
 			">> TAIL >>"), //
 			result.getOutputLines("out"));
+
+		var testResultsDir = Request.WORKSPACE.resolve(request.getWorkspace()).resolve("build/test-report");
+		verifyContainsExpectedStartedOpenTestReport(testResultsDir);
 	}
 }
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
index 975a6f3d0986..076c998ca40b 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static platform.tooling.support.Helper.TOOL_TIMEOUT;
+import static platform.tooling.support.tests.XmlAssertions.verifyContainsExpectedStartedOpenTestReport;
 
 import java.nio.file.Paths;
 
@@ -34,20 +35,24 @@ class GradleStarterTests {
 
 	@Test
 	void gradle_wrapper() {
-		var result = Request.builder() //
+		var request = Request.builder() //
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setProject("gradle-starter") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--stacktrace") //
 				.setTimeout(TOOL_TIMEOUT) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
-				.build() //
-				.run();
+				.build();
+
+		var result = request.run();
 
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assertEquals(0, result.getExitCode());
 		assertTrue(result.getOutputLines("out").stream().anyMatch(line -> line.contains("BUILD SUCCESSFUL")));
 		assertThat(result.getOutput("out")).contains("Using Java version: 1.8");
+
+		var testResultsDir = Request.WORKSPACE.resolve(request.getWorkspace()).resolve("build/test-results/test");
+		verifyContainsExpectedStartedOpenTestReport(testResultsDir);
 	}
 }
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
index e7c4b9b520cd..f4caa516af2e 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static platform.tooling.support.Helper.TOOL_TIMEOUT;
+import static platform.tooling.support.tests.XmlAssertions.verifyContainsExpectedStartedOpenTestReport;
 
 import org.junit.jupiter.api.Test;
 import org.opentest4j.TestAbortedException;
@@ -30,15 +31,16 @@ class MavenStarterTests {
 
 	@Test
 	void verifyMavenStarterProject() {
-		var result = Request.builder() //
+		var request = Request.builder() //
 				.setTool(Request.maven()) //
 				.setProject("maven-starter") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("--update-snapshots", "--batch-mode", "verify") //
 				.setTimeout(TOOL_TIMEOUT) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
-				.build() //
-				.run();
+				.build();
+
+		var result = request.run();
 
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
@@ -47,5 +49,8 @@ void verifyMavenStarterProject() {
 		assertTrue(result.getOutputLines("out").contains("[INFO] BUILD SUCCESS"));
 		assertTrue(result.getOutputLines("out").contains("[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0"));
 		assertThat(result.getOutput("out")).contains("Using Java version: 1.8");
+
+		var testResultsDir = Request.WORKSPACE.resolve(request.getWorkspace()).resolve("target/surefire-reports");
+		verifyContainsExpectedStartedOpenTestReport(testResultsDir);
 	}
 }
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java
new file mode 100644
index 000000000000..976920ae03bd
--- /dev/null
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package platform.tooling.support.tests;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.xmlunit.assertj3.XmlAssert;
+import org.xmlunit.placeholder.PlaceholderDifferenceEvaluator;
+
+class XmlAssertions {
+
+	static void verifyContainsExpectedStartedOpenTestReport(Path testResultsDir) {
+		try (var files = Files.list(testResultsDir)) {
+			Path xmlFile = files.filter(it -> it.getFileName().toString().startsWith("junit-platform-events-")) //
+					.findAny() //
+					.orElseThrow(() -> new AssertionError("Missing open-test-reporting XML file in " + testResultsDir));
+			verifyContent(xmlFile);
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
+	}
+
+	private static void verifyContent(Path xmlFile) {
+		var expected = """
+				        <e:events xmlns="https://schemas.opentest4j.org/reporting/core/0.1.0" xmlns:e="https://schemas.opentest4j.org/reporting/events/0.1.0" xmlns:java="https://schemas.opentest4j.org/reporting/java/0.1.0"
+				                  xmlns:junit="https://schemas.junit.org/open-test-reporting" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				                  xsi:schemaLocation="https://schemas.junit.org/open-test-reporting https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd">
+				          <infrastructure>
+				            <hostName>${xmlunit.ignore}</hostName>
+				            <userName>${xmlunit.ignore}</userName>
+				            <operatingSystem>${xmlunit.ignore}</operatingSystem>
+				            <cpuCores>${xmlunit.ignore}</cpuCores>
+				            <java:javaVersion>${xmlunit.ignore}</java:javaVersion>
+				            <java:fileEncoding>${xmlunit.ignore}</java:fileEncoding>
+				            <java:heapSize max="${xmlunit.isNumber}"/>
+				          </infrastructure>
+				          <e:started id="1" name="JUnit Jupiter" time="${xmlunit.isDateTime}">
+				            <metadata>
+				              <junit:uniqueId>[engine:junit-jupiter]</junit:uniqueId>
+				              <junit:legacyReportingName>JUnit Jupiter</junit:legacyReportingName>
+				              <junit:type>CONTAINER</junit:type>
+				            </metadata>
+				          </e:started>
+				          <e:started id="2" name="CalculatorTests" parentId="1" time="${xmlunit.isDateTime}">
+				            <metadata>
+				              <junit:uniqueId>[engine:junit-jupiter]/[class:com.example.project.CalculatorTests]</junit:uniqueId>
+				              <junit:legacyReportingName>com.example.project.CalculatorTests</junit:legacyReportingName>
+				              <junit:type>CONTAINER</junit:type>
+				            </metadata>
+				            <sources>
+				              <java:classSource className="com.example.project.CalculatorTests"/>
+				            </sources>
+				          </e:started>
+				          <e:started id="3" name="1 + 1 = 2" parentId="2" time="${xmlunit.isDateTime}">
+				            <metadata>
+				              <junit:uniqueId>[engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[method:addsTwoNumbers()]</junit:uniqueId>
+				              <junit:legacyReportingName>addsTwoNumbers()</junit:legacyReportingName>
+				              <junit:type>TEST</junit:type>
+				            </metadata>
+				            <sources>
+				              <java:methodSource className="com.example.project.CalculatorTests" methodName="addsTwoNumbers" methodParameterTypes=""/>
+				            </sources>
+				          </e:started>
+				          <e:finished id="3" time="${xmlunit.isDateTime}">
+				            <result status="SUCCESSFUL"/>
+				          </e:finished>
+				          <e:started id="4" name="add(int, int, int)" parentId="2" time="${xmlunit.isDateTime}">
+				            <metadata>
+				              <junit:uniqueId>[engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]</junit:uniqueId>
+				              <junit:legacyReportingName>add(int, int, int)</junit:legacyReportingName>
+				              <junit:type>CONTAINER</junit:type>
+				            </metadata>
+				            <sources>
+				              <java:methodSource className="com.example.project.CalculatorTests" methodName="add" methodParameterTypes="int, int, int"/>
+				            </sources>
+				          </e:started>
+				          <e:started id="5" name="0 + 1 = 1" parentId="4" time="${xmlunit.isDateTime}">
+				            <metadata>
+				              <junit:uniqueId>[engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#1]</junit:uniqueId>
+				              <junit:legacyReportingName>add(int, int, int)[1]</junit:legacyReportingName>
+				              <junit:type>TEST</junit:type>
+				            </metadata>
+				            <sources>
+				              <java:methodSource className="com.example.project.CalculatorTests" methodName="add" methodParameterTypes="int, int, int"/>
+				            </sources>
+				          </e:started>
+				          <e:finished id="5" time="${xmlunit.isDateTime}">
+				            <result status="SUCCESSFUL"/>
+				          </e:finished>
+				          <e:started id="6" name="1 + 2 = 3" parentId="4" time="${xmlunit.isDateTime}">
+				            <metadata>
+				              <junit:uniqueId>[engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#2]</junit:uniqueId>
+				              <junit:legacyReportingName>add(int, int, int)[2]</junit:legacyReportingName>
+				              <junit:type>TEST</junit:type>
+				            </metadata>
+				            <sources>
+				              <java:methodSource className="com.example.project.CalculatorTests" methodName="add" methodParameterTypes="int, int, int"/>
+				            </sources>
+				          </e:started>
+				          <e:finished id="6" time="${xmlunit.isDateTime}">
+				            <result status="SUCCESSFUL"/>
+				          </e:finished>
+				          <e:started id="7" name="49 + 51 = 100" parentId="4" time="${xmlunit.isDateTime}">
+				            <metadata>
+				              <junit:uniqueId>[engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#3]</junit:uniqueId>
+				              <junit:legacyReportingName>add(int, int, int)[3]</junit:legacyReportingName>
+				              <junit:type>TEST</junit:type>
+				            </metadata>
+				            <sources>
+				              <java:methodSource className="com.example.project.CalculatorTests" methodName="add" methodParameterTypes="int, int, int"/>
+				            </sources>
+				          </e:started>
+				          <e:finished id="7" time="${xmlunit.isDateTime}">
+				            <result status="SUCCESSFUL"/>
+				          </e:finished>
+				          <e:started id="8" name="1 + 100 = 101" parentId="4" time="${xmlunit.isDateTime}">
+				            <metadata>
+				              <junit:uniqueId>[engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#4]</junit:uniqueId>
+				              <junit:legacyReportingName>add(int, int, int)[4]</junit:legacyReportingName>
+				              <junit:type>TEST</junit:type>
+				            </metadata>
+				            <sources>
+				              <java:methodSource className="com.example.project.CalculatorTests" methodName="add" methodParameterTypes="int, int, int"/>
+				            </sources>
+				          </e:started>
+				          <e:finished id="8" time="${xmlunit.isDateTime}">
+				            <result status="SUCCESSFUL"/>
+				          </e:finished>
+				          <e:finished id="4" time="${xmlunit.isDateTime}">
+				            <result status="SUCCESSFUL"/>
+				          </e:finished>
+				          <e:finished id="2" time="${xmlunit.isDateTime}">
+				            <result status="SUCCESSFUL"/>
+				          </e:finished>
+				          <e:finished id="1" time="${xmlunit.isDateTime}">
+				            <result status="SUCCESSFUL"/>
+				          </e:finished>
+				        </e:events>
+				""";
+
+		XmlAssert.assertThat(xmlFile).and(expected) //
+				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator()) //
+				.ignoreWhitespace() //
+				.areIdentical();
+	}
+}

From 9f60baafeb1320670f192e8dec8c8002442eff2d Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Wed, 7 Sep 2022 12:31:29 +0200
Subject: [PATCH 0915/1433] Fix formatting of `assertTimeoutPreemptively()` in
 user guide (#3023)

---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 92432cc8a935..83014d4668b3 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -270,7 +270,7 @@ include::{testDir}/example/AssertionsDemo.java[tags=user_guide]
 [WARNING]
 .Preemptive Timeouts with `assertTimeoutPreemptively()`
 ====
-The various`assertTimeoutPreemptively()` methods in the `Assertions` class execute
+The various `assertTimeoutPreemptively()` methods in the `Assertions` class execute
 the provided `executable` or `supplier` in a different thread than that of the calling
 code. This behavior can lead to undesirable side effects if the code that is executed
 within the `executable` or `supplier` relies on `java.lang.ThreadLocal` storage.

From e98b714b0ffd5fbbaf7e9a65478c4911c2a3cbd0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Sep 2022 12:46:35 +0200
Subject: [PATCH 0916/1433] Fix custom reporting output dir on Windows (#3024)

---
 .../user-guide/advanced-topics/junit-platform-reporting.adoc    | 2 +-
 platform-tooling-support-tests/projects/maven-starter/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
index c6d89a0edba8..655d6bc7903b 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc
@@ -114,7 +114,7 @@ XML reports as follows:
 					<properties>
 						<configurationParameters>
 							junit.platform.reporting.open.xml.enabled = true
-							junit.platform.reporting.output.dir = ${project.build.directory}/surefire-reports
+							junit.platform.reporting.output.dir = target/surefire-reports
 						</configurationParameters>
 					</properties>
 				</configuration>
diff --git a/platform-tooling-support-tests/projects/maven-starter/pom.xml b/platform-tooling-support-tests/projects/maven-starter/pom.xml
index ad598a0fdec8..9ec72ae39829 100644
--- a/platform-tooling-support-tests/projects/maven-starter/pom.xml
+++ b/platform-tooling-support-tests/projects/maven-starter/pom.xml
@@ -43,7 +43,7 @@
                     <properties>
                         <configurationParameters>
                             junit.platform.reporting.open.xml.enabled = true
-                            junit.platform.reporting.output.dir = ${project.build.directory}/surefire-reports
+                            junit.platform.reporting.output.dir = target/surefire-reports
                         </configurationParameters>
                     </properties>
                 </configuration>

From 883b6a63bd83776b2ed43684e91acb5534c97359 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Sep 2022 10:29:28 +0200
Subject: [PATCH 0917/1433] Update to Gradle Enterprise plugin 3.11.1

Closes #3002.
---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 5ab34e817b7f..9fd96fb5833b 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	implementation("org.gradle:test-retry-gradle-plugin:1.4.1")
-	compileOnly("com.gradle.enterprise:test-distribution-gradle-plugin:2.3.5") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.11.1") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 63ef445d5280..74bb84d09465 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,8 +5,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.10.3"
-		id("com.gradle.enterprise.test-distribution") version "2.3.5" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise") version "3.11.1" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7.2"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"
@@ -21,7 +20,6 @@ pluginManagement {
 
 plugins {
 	id("com.gradle.enterprise")
-	id("com.gradle.enterprise.test-distribution")
 	id("com.gradle.common-custom-user-data-gradle-plugin")
 }
 

From 107d63b389874c00096119732c5500baa7d18394 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Sep 2022 10:30:53 +0200
Subject: [PATCH 0918/1433] Bump CCUD Gradle plugin from 1.7.2 to 1.8.1 (#3031)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 74bb84d09465..6cc4aa4ef877 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.11.1" // keep in sync with buildSrc/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7.2"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.1"
 		id("org.ajoberstar.git-publish") version "3.0.0"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From 78c85979974509b14020419bc950905640d84066 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Sep 2022 11:55:37 +0200
Subject: [PATCH 0919/1433] Fix build with for JDK 20-ea+14 toolchain

Issue: #3029
---
 .../src/main/kotlin/java-toolchain-conventions.gradle.kts  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index e72c2244497b..daab6ae2c567 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -18,4 +18,11 @@ project.pluginManager.withPlugin("java") {
 			languageVersion.set(defaultLanguageVersion)
 		})
 	}
+	if (javaLanguageVersion.asInt() >= 20) {
+		tasks.compileJava {
+			options.compilerArgs.add(
+				"-Xlint:-options" // see https://github.com/junit-team/junit5/issues/3029
+			)
+		}
+	}
 }

From 9571128cf351ba0cfa3819a4fae8c21216cfd618 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Sep 2022 12:00:58 +0200
Subject: [PATCH 0920/1433] Fix build

---
 buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index daab6ae2c567..0c05bc1c94d1 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -19,7 +19,7 @@ project.pluginManager.withPlugin("java") {
 		})
 	}
 	if (javaLanguageVersion.asInt() >= 20) {
-		tasks.compileJava {
+		tasks.named<JavaCompile>("compileJava") {
 			options.compilerArgs.add(
 				"-Xlint:-options" // see https://github.com/junit-team/junit5/issues/3029
 			)

From d874aa450f02414e1f32ea17e52b4af9bd974cd6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Sep 2022 13:53:49 +0200
Subject: [PATCH 0921/1433] Adjust all compile tasks with --release=8

---
 .../kotlin/java-toolchain-conventions.gradle.kts   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index 0c05bc1c94d1..c85e77e260f2 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -11,6 +11,13 @@ project.pluginManager.withPlugin("java") {
 	}
 	tasks.withType<JavaCompile>().configureEach {
 		outputs.cacheIf { javaLanguageVersion == defaultLanguageVersion }
+		doFirst {
+			if (options.release.orNull == 8 && javaLanguageVersion.asInt() >= 20) {
+				options.compilerArgs.add(
+					"-Xlint:-options" // see https://github.com/junit-team/junit5/issues/3029
+				)
+			}
+		}
 	}
 	tasks.withType<GroovyCompile>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor {
@@ -18,11 +25,4 @@ project.pluginManager.withPlugin("java") {
 			languageVersion.set(defaultLanguageVersion)
 		})
 	}
-	if (javaLanguageVersion.asInt() >= 20) {
-		tasks.named<JavaCompile>("compileJava") {
-			options.compilerArgs.add(
-				"-Xlint:-options" // see https://github.com/junit-team/junit5/issues/3029
-			)
-		}
-	}
 }

From 89c12f3bb4a2ddf5076f90393bb0b22f2aa54d8d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Sep 2022 14:40:51 +0200
Subject: [PATCH 0922/1433] Stabilize timeout test

---
 .../junit/jupiter/engine/extension/TimeoutExtensionTests.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 38249d9b03ec..449ee09a085f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -376,7 +376,7 @@ void separateThreadHandlesInvocationExceptions() {
 
 			Execution execution = findExecution(results.testEvents(), "test()");
 			assertThat(execution.getDuration()) //
-					.isLessThanOrEqualTo(Duration.ofMillis(10));
+					.isLessThan(Duration.ofSeconds(5));
 			assertThat(execution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
 					.isInstanceOf(RuntimeException.class) //
 					.hasMessage("Oppps!");
@@ -723,7 +723,7 @@ void test() {
 
 	static class ExceptionInSeparateThreadTestCase {
 		@Test
-		@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		@Timeout(value = 5, unit = SECONDS, threadMode = SEPARATE_THREAD)
 		void test() {
 			throw new RuntimeException("Oppps!");
 		}

From 9893f78a98b849424e3aa7977495410e24fa97ab Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 11 Sep 2022 17:18:58 +0200
Subject: [PATCH 0923/1433] Retry tests in new JVM on Windows

---
 platform-tests/platform-tests.gradle.kts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 8f67df13a8bf..cca78db6b588 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.PathSensitivity.NONE
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
+import org.gradle.internal.os.OperatingSystem
 
 plugins {
 	`java-library-conventions`
@@ -61,6 +62,11 @@ tasks {
 			excludeTags("exclude")
 		}
 		jvmArgs("-Xmx1g")
+		distribution {
+			// Retry in a new JVM on Windows to improve chances of successful retries when
+			// cached resources are used (e.g. in ClasspathScannerTests)
+			retryInSameJvm.set(!OperatingSystem.current().isWindows)
+		}
 	}
 	test {
 		// Additional inputs for remote execution with Test Distribution

From 687db889e3e2068411524eb402562faaf4ec30a9 Mon Sep 17 00:00:00 2001
From: Gilberto J Requena <gilberto.requena@syncier.com>
Date: Mon, 15 Aug 2022 19:39:27 +0200
Subject: [PATCH 0924/1433] Fix incorrect timeout failure when assertion fails
 in separate thread

Fixes #3000.
---
 .../org/junit/jupiter/api/AssertTimeout.java  | 144 +++++++++++++-----
 .../org/junit/jupiter/api/Assertions.java     |  32 ++++
 .../SeparateThreadTimeoutInvocation.java      |  19 ++-
 .../api/AssertTimeoutAssertionsTests.java     |  35 +++++
 .../SeparateThreadTimeoutInvocationTest.java  |   3 +-
 .../extension/TimeoutExtensionTests.java      |  35 ++++-
 6 files changed, 223 insertions(+), 45 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 81268f7eafec..c0c8f018a02e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -10,7 +10,10 @@
 
 package org.junit.jupiter.api;
 
+import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.ASSERTION_EXCEPTION;
+import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.MASKED_TIMEOUT_EXCEPTION;
 import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
+import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
 
 import java.time.Duration;
 import java.util.concurrent.ExecutionException;
@@ -112,27 +115,55 @@ static void assertTimeoutPreemptively(Duration timeout, Executable executable, S
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier) {
-		return assertTimeoutPreemptively(timeout, supplier, (Object) null);
+		return new PreemptiveTimeoutAssertionExecutor<T>(timeout, supplier, null).executeThrowing(ASSERTION_EXCEPTION);
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier, String message) {
-		return assertTimeoutPreemptively(timeout, supplier, (Object) message);
+		return new PreemptiveTimeoutAssertionExecutor<T>(timeout, supplier, message).executeThrowing(
+			ASSERTION_EXCEPTION);
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
 			Supplier<String> messageSupplier) {
+		return new PreemptiveTimeoutAssertionExecutor<T>(timeout, supplier, messageSupplier).executeThrowing(
+			ASSERTION_EXCEPTION);
+	}
 
-		return assertTimeoutPreemptively(timeout, supplier, (Object) messageSupplier);
+	static <T> T assertTimeoutPreemptivelyThrowingTimeoutException(Duration timeout, ThrowingSupplier<T> supplier,
+			Supplier<String> messageSupplier) {
+		return new PreemptiveTimeoutAssertionExecutor<T>(timeout, supplier, messageSupplier).executeThrowing(
+			MASKED_TIMEOUT_EXCEPTION);
 	}
 
-	private static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
-			Object messageOrSupplier) {
+	static class PreemptiveTimeoutAssertionExecutor<T> {
+		private final Duration timeout;
+		private final ThrowingSupplier<T> supplier;
+		private final Object messageOrSupplier;
+
+		PreemptiveTimeoutAssertionExecutor(Duration timeout, ThrowingSupplier<T> supplier, Object messageOrSupplier) {
+			this.timeout = timeout;
+			this.supplier = supplier;
+			this.messageOrSupplier = messageOrSupplier;
+		}
 
-		AtomicReference<Thread> threadReference = new AtomicReference<>();
-		ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
+		T executeThrowing(Throwing throwing) {
+			AtomicReference<Thread> threadReference = new AtomicReference<>();
+			ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
 
-		try {
-			Future<T> future = executorService.submit(() -> {
+			try {
+				Future<T> future = submitTask(supplier, threadReference, executorService);
+				FutureResolverWithExceptionHandling<T> resolver = createFutureResolver(messageOrSupplier,
+					threadReference, throwing);
+				return resolver.resolveFutureAndHandleException(future, timeout.toMillis());
+			}
+			finally {
+				executorService.shutdownNow();
+			}
+		}
+
+		private Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<Thread> threadReference,
+				ExecutorService executorService) {
+			return executorService.submit(() -> {
 				try {
 					threadReference.set(Thread.currentThread());
 					return supplier.get();
@@ -141,34 +172,26 @@ private static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplie
 					throw ExceptionUtils.throwAsUncheckedException(throwable);
 				}
 			});
+		}
 
-			long timeoutInMillis = timeout.toMillis();
-			try {
-				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
-			}
-			catch (TimeoutException ex) {
-				AssertionFailureBuilder failure = assertionFailure() //
-						.message(messageOrSupplier) //
-						.reason("execution timed out after " + timeoutInMillis + " ms");
-
-				Thread thread = threadReference.get();
-				if (thread != null) {
-					ExecutionTimeoutException exception = new ExecutionTimeoutException(
-						"Execution timed out in thread " + thread.getName());
-					exception.setStackTrace(thread.getStackTrace());
-					failure.cause(exception);
-				}
-				throw failure.build();
-			}
-			catch (ExecutionException ex) {
-				throw ExceptionUtils.throwAsUncheckedException(ex.getCause());
-			}
-			catch (Throwable ex) {
-				throw ExceptionUtils.throwAsUncheckedException(ex);
+		private FutureResolverWithExceptionHandling<T> createFutureResolver(Object messageOrSupplier,
+				AtomicReference<Thread> threadReference, Throwing throwing) {
+			FutureResolverWithExceptionHandling<T> resolver;
+			switch (throwing) {
+				case MASKED_TIMEOUT_EXCEPTION:
+					resolver = new TimeoutPropagatingFutureResolver<>();
+					break;
+				case ASSERTION_EXCEPTION:
+					resolver = new AssertiveFutureResolver<>(threadReference, messageOrSupplier);
+					break;
+				default:
+					throw new IllegalStateException("Unexpected value: " + throwing);
 			}
+			return resolver;
 		}
-		finally {
-			executorService.shutdownNow();
+
+		enum Throwing {
+			ASSERTION_EXCEPTION, MASKED_TIMEOUT_EXCEPTION
 		}
 	}
 
@@ -194,4 +217,57 @@ public Thread newThread(Runnable r) {
 		}
 	}
 
+	private abstract static class FutureResolverWithExceptionHandling<T> {
+		T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis) {
+			try {
+				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
+			}
+			catch (TimeoutException ex) {
+				handleTimeoutAndThrow(ex, timeoutInMillis);
+				return null;
+			}
+			catch (ExecutionException ex) {
+				throw throwAsUncheckedException(ex.getCause());
+			}
+			catch (Throwable ex) {
+				throw throwAsUncheckedException(ex);
+			}
+		}
+
+		protected abstract void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis);
+	}
+
+	private static class AssertiveFutureResolver<T> extends FutureResolverWithExceptionHandling<T> {
+
+		private final AtomicReference<Thread> threadReference;
+		private final Object messageOrSupplier;
+
+		private AssertiveFutureResolver(AtomicReference<Thread> threadReference, Object messageOrSupplier) {
+			this.threadReference = threadReference;
+			this.messageOrSupplier = messageOrSupplier;
+		}
+
+		@Override
+		protected void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
+			AssertionFailureBuilder failure = assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason("execution timed out after " + timeoutInMillis + " ms");
+
+			Thread thread = threadReference.get();
+			if (thread != null) {
+				ExecutionTimeoutException exception = new ExecutionTimeoutException(
+					"Execution timed out in thread " + thread.getName());
+				exception.setStackTrace(thread.getStackTrace());
+				failure.cause(exception);
+			}
+			throw failure.build();
+		}
+	}
+
+	private static class TimeoutPropagatingFutureResolver<T> extends FutureResolverWithExceptionHandling<T> {
+		@Override
+		protected void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
+			throw throwAsUncheckedException(ex);
+		}
+	}
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index fa6585771612..ec46e79cd1c0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.api;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.time.Duration;
@@ -3523,6 +3524,37 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 		return AssertTimeout.assertTimeoutPreemptively(timeout, supplier, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that execution of the supplied {@code supplier}
+	 * completes before the given {@code timeout} is exceeded.
+	 *
+	 * <p>If the assertion passes then the {@code supplier}'s result is returned.
+	 *
+	 * <p>In the case the assertion does not pass, a {@code TimeoutException} will be
+	 * thrown.
+	 *
+	 * <p>Note: the {@code supplier} will be executed in a different thread than
+	 * that of the calling code. Furthermore, execution of the {@code supplier} will
+	 * be preemptively aborted if the timeout is exceeded. See the
+	 * {@linkplain Assertions Preemptive Timeouts} section of the class-level
+	 * Javadoc for a discussion of possible undesirable side effects.
+	 *
+	 * <p>If necessary, the failure message will be retrieved lazily from the
+	 * supplied {@code messageSupplier}.
+	 *
+	 * @see #assertTimeoutPreemptively(Duration, Executable)
+	 * @see #assertTimeoutPreemptively(Duration, Executable, String)
+	 * @see #assertTimeoutPreemptively(Duration, Executable, Supplier)
+	 * @see #assertTimeoutPreemptively(Duration, ThrowingSupplier)
+	 * @see #assertTimeoutPreemptively(Duration, ThrowingSupplier, String)
+	 * @see #assertTimeout(Duration, Executable, Supplier)
+	 */
+	@API(status = INTERNAL)
+	public static <T> T assertTimeoutPreemptivelyThrowingTimeoutException(Duration timeout,
+			ThrowingSupplier<T> supplier, Supplier<String> messageSupplier) {
+		return AssertTimeout.assertTimeoutPreemptivelyThrowingTimeoutException(timeout, supplier, messageSupplier);
+	}
+
 	// --- assertInstanceOf ----------------------------------------------------
 
 	/**
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
index 1860f413455d..bda2d685aaa5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
@@ -10,13 +10,12 @@
 
 package org.junit.jupiter.engine.extension;
 
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptivelyThrowingTimeoutException;
 
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 
 import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
-import org.opentest4j.AssertionFailedError;
 
 /**
  * @since 5.9
@@ -37,12 +36,18 @@ class SeparateThreadTimeoutInvocation<T> implements Invocation<T> {
 	@Override
 	public T proceed() throws Throwable {
 		try {
-			return assertTimeoutPreemptively(timeout.toDuration(), delegate::proceed, descriptionSupplier);
+			return assertTimeoutPreemptivelyThrowingTimeoutException(timeout.toDuration(), delegate::proceed,
+				descriptionSupplier);
 		}
-		catch (AssertionFailedError failure) {
-			TimeoutException exception = TimeoutExceptionFactory.create(descriptionSupplier.get(), timeout, null);
-			exception.initCause(failure.getCause());
-			throw exception;
+		catch (Throwable failure) {
+			if (failure instanceof TimeoutException) {
+				TimeoutException exception = TimeoutExceptionFactory.create(descriptionSupplier.get(), timeout, null);
+				exception.initCause(failure.getCause());
+				throw exception;
+			}
+			else {
+				throw failure;
+			}
 		}
 	}
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index 424317ed6b3b..512d1013eeda 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -19,12 +19,14 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTimeout;
 import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptivelyThrowingTimeoutException;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.condition.OS.WINDOWS;
 
 import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -314,6 +316,39 @@ void assertTimeoutPreemptivelyUsesThreadsWithSpecificNamePrefix() {
 			"Thread name does not match the expected prefix");
 	}
 
+	@Test
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesAfterTheTimeout() {
+		assertThrows(TimeoutException.class,
+			() -> assertTimeoutPreemptivelyThrowingTimeoutException(PREEMPTIVE_TIMEOUT, () -> {
+				waitForInterrupt();
+				return "Tempus Fugit";
+			}, () -> "Tempus Fugit"));
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatThrowsAnAssertionFailedError() {
+		AssertionFailedError exception = assertThrows(AssertionFailedError.class,
+			() -> assertTimeoutPreemptivelyThrowingTimeoutException(ofMillis(500), () -> fail("enigma"),
+				() -> "Tempus Fugit"));
+		assertMessageEquals(exception, "enigma");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatThrowsAnException() {
+		RuntimeException exception = assertThrows(RuntimeException.class,
+			() -> assertTimeoutPreemptivelyThrowingTimeoutException(ofMillis(500),
+				() -> ExceptionUtils.throwAsUncheckedException(new RuntimeException(":(")), () -> "Tempus Fugit"));
+		assertMessageEquals(exception, ":(");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesBeforeTimeout() {
+		var result = assertTimeoutPreemptivelyThrowingTimeoutException(PREEMPTIVE_TIMEOUT, () -> "Tempus Fugit",
+			() -> "Tempus Fugit");
+
+		assertThat(result).isEqualTo("Tempus Fugit");
+	}
+
 	/**
 	 * Take a nap for 100 milliseconds.
 	 */
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
index a5355fa63682..5f8e867b3c86 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
@@ -47,8 +47,7 @@ void throwsTimeoutException() {
 
 		assertThatThrownBy(invocation::proceed) //
 				.hasMessage("method() timed out after " + PREEMPTIVE_TIMEOUT_MILLIS + " milliseconds") //
-				.isInstanceOf(TimeoutException.class) //
-				.hasRootCauseMessage("Execution timed out in thread " + threadName.get());
+				.isInstanceOf(TimeoutException.class);
 	}
 
 	@Test
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 449ee09a085f..183543711789 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -60,6 +60,7 @@
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 import org.junit.platform.testkit.engine.Events;
 import org.junit.platform.testkit.engine.Execution;
+import org.opentest4j.AssertionFailedError;
 
 /**
  * @since 5.5
@@ -382,13 +383,29 @@ void separateThreadHandlesInvocationExceptions() {
 					.hasMessage("Oppps!");
 		}
 
+		@Test
+		@DisplayName("propagates assertion exceptions")
+		void separateThreadHandlesOpenTestFailedAssertion() {
+			EngineExecutionResults results = executeTestsForClass(FailedAssertionInSeparateThreadTestCase.class);
+
+			Execution openTestFailure = findExecution(results.testEvents(), "testOpenTestAssertion()");
+			assertThat(openTestFailure.getDuration()) //
+					.isLessThan(Duration.ofSeconds(5));
+			assertThat(openTestFailure.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(AssertionFailedError.class);
+
+			Execution javaLangFailure = findExecution(results.testEvents(), "testJavaLangAssertion()");
+			assertThat(javaLangFailure.getDuration()) //
+					.isLessThan(Duration.ofSeconds(5));
+			assertThat(javaLangFailure.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+					.isInstanceOf(AssertionError.class);
+		}
+
 		@Test
 		@DisplayName("when one test is stuck \"forever\" the next tests should not get stuck")
 		void oneThreadStuckForever() {
 			EngineExecutionResults results = executeTestsForClass(OneTestStuckForeverAndTheOthersNotTestCase.class);
 
-			results.allEvents().debug();
-
 			Execution stuckExecution = findExecution(results.testEvents(), "stuck()");
 			assertThat(stuckExecution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
 					.isInstanceOf(TimeoutException.class) //
@@ -729,6 +746,20 @@ void test() {
 		}
 	}
 
+	static class FailedAssertionInSeparateThreadTestCase {
+		@Test
+		@Timeout(value = 5, unit = SECONDS, threadMode = SEPARATE_THREAD)
+		void testOpenTestAssertion() {
+			throw new AssertionFailedError();
+		}
+
+		@Test
+		@Timeout(value = 5, unit = SECONDS, threadMode = SEPARATE_THREAD)
+		void testJavaLangAssertion() {
+			throw new AssertionError();
+		}
+	}
+
 	@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 	static class TimeoutExceededOnClassLevelTestCase {
 		@Test

From d02f97590df04025235924824984cc782d1648d7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 14:37:50 +0200
Subject: [PATCH 0925/1433] Use constants for
 PreemptiveTimeoutAssertionExecutor instances

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index c0c8f018a02e..afb1d2a70d41 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.ASSERTION_EXCEPTION;
+import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.ASSERTION_ERROR;
 import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.MASKED_TIMEOUT_EXCEPTION;
 import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
@@ -40,6 +40,11 @@
  */
 class AssertTimeout {
 
+	private static final PreemptiveTimeoutAssertionExecutor ASSERTION_ERROR_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor(
+		ASSERTION_ERROR);
+	private static final PreemptiveTimeoutAssertionExecutor TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor(
+		MASKED_TIMEOUT_EXCEPTION);
+
 	private AssertTimeout() {
 		/* no-op */
 	}
@@ -115,38 +120,31 @@ static void assertTimeoutPreemptively(Duration timeout, Executable executable, S
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier) {
-		return new PreemptiveTimeoutAssertionExecutor<T>(timeout, supplier, null).executeThrowing(ASSERTION_EXCEPTION);
+		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, null);
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier, String message) {
-		return new PreemptiveTimeoutAssertionExecutor<T>(timeout, supplier, message).executeThrowing(
-			ASSERTION_EXCEPTION);
+		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, message);
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
 			Supplier<String> messageSupplier) {
-		return new PreemptiveTimeoutAssertionExecutor<T>(timeout, supplier, messageSupplier).executeThrowing(
-			ASSERTION_EXCEPTION);
+		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, messageSupplier);
 	}
 
 	static <T> T assertTimeoutPreemptivelyThrowingTimeoutException(Duration timeout, ThrowingSupplier<T> supplier,
 			Supplier<String> messageSupplier) {
-		return new PreemptiveTimeoutAssertionExecutor<T>(timeout, supplier, messageSupplier).executeThrowing(
-			MASKED_TIMEOUT_EXCEPTION);
+		return TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, messageSupplier);
 	}
 
-	static class PreemptiveTimeoutAssertionExecutor<T> {
-		private final Duration timeout;
-		private final ThrowingSupplier<T> supplier;
-		private final Object messageOrSupplier;
+	static class PreemptiveTimeoutAssertionExecutor {
+		private final Throwing throwing;
 
-		PreemptiveTimeoutAssertionExecutor(Duration timeout, ThrowingSupplier<T> supplier, Object messageOrSupplier) {
-			this.timeout = timeout;
-			this.supplier = supplier;
-			this.messageOrSupplier = messageOrSupplier;
+		PreemptiveTimeoutAssertionExecutor(Throwing throwing) {
+			this.throwing = throwing;
 		}
 
-		T executeThrowing(Throwing throwing) {
+		<T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object messageOrSupplier) {
 			AtomicReference<Thread> threadReference = new AtomicReference<>();
 			ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
 
@@ -161,7 +159,7 @@ T executeThrowing(Throwing throwing) {
 			}
 		}
 
-		private Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<Thread> threadReference,
+		private <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<Thread> threadReference,
 				ExecutorService executorService) {
 			return executorService.submit(() -> {
 				try {
@@ -174,14 +172,14 @@ private Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<Threa
 			});
 		}
 
-		private FutureResolverWithExceptionHandling<T> createFutureResolver(Object messageOrSupplier,
+		private <T> FutureResolverWithExceptionHandling<T> createFutureResolver(Object messageOrSupplier,
 				AtomicReference<Thread> threadReference, Throwing throwing) {
 			FutureResolverWithExceptionHandling<T> resolver;
 			switch (throwing) {
 				case MASKED_TIMEOUT_EXCEPTION:
 					resolver = new TimeoutPropagatingFutureResolver<>();
 					break;
-				case ASSERTION_EXCEPTION:
+				case ASSERTION_ERROR:
 					resolver = new AssertiveFutureResolver<>(threadReference, messageOrSupplier);
 					break;
 				default:
@@ -191,7 +189,7 @@ private FutureResolverWithExceptionHandling<T> createFutureResolver(Object messa
 		}
 
 		enum Throwing {
-			ASSERTION_EXCEPTION, MASKED_TIMEOUT_EXCEPTION
+			ASSERTION_ERROR, MASKED_TIMEOUT_EXCEPTION
 		}
 	}
 

From d19cc1b8e6d284d20ca86e03bb504ac92e9f2919 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 14:40:18 +0200
Subject: [PATCH 0926/1433] Move generics to method

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index afb1d2a70d41..2ba3338a5023 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -150,8 +150,8 @@ <T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object mes
 
 			try {
 				Future<T> future = submitTask(supplier, threadReference, executorService);
-				FutureResolverWithExceptionHandling<T> resolver = createFutureResolver(messageOrSupplier,
-					threadReference, throwing);
+				FutureResolverWithExceptionHandling resolver = createFutureResolver(messageOrSupplier, threadReference,
+					throwing);
 				return resolver.resolveFutureAndHandleException(future, timeout.toMillis());
 			}
 			finally {
@@ -172,20 +172,16 @@ private <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<T
 			});
 		}
 
-		private <T> FutureResolverWithExceptionHandling<T> createFutureResolver(Object messageOrSupplier,
+		private FutureResolverWithExceptionHandling createFutureResolver(Object messageOrSupplier,
 				AtomicReference<Thread> threadReference, Throwing throwing) {
-			FutureResolverWithExceptionHandling<T> resolver;
 			switch (throwing) {
 				case MASKED_TIMEOUT_EXCEPTION:
-					resolver = new TimeoutPropagatingFutureResolver<>();
-					break;
+					return new TimeoutPropagatingFutureResolver<>();
 				case ASSERTION_ERROR:
-					resolver = new AssertiveFutureResolver<>(threadReference, messageOrSupplier);
-					break;
+					return new AssertiveFutureResolver<>(threadReference, messageOrSupplier);
 				default:
 					throw new IllegalStateException("Unexpected value: " + throwing);
 			}
-			return resolver;
 		}
 
 		enum Throwing {
@@ -215,8 +211,8 @@ public Thread newThread(Runnable r) {
 		}
 	}
 
-	private abstract static class FutureResolverWithExceptionHandling<T> {
-		T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis) {
+	private abstract static class FutureResolverWithExceptionHandling {
+		<T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis) {
 			try {
 				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
 			}
@@ -235,7 +231,7 @@ T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis) {
 		protected abstract void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis);
 	}
 
-	private static class AssertiveFutureResolver<T> extends FutureResolverWithExceptionHandling<T> {
+	private static class AssertiveFutureResolver<T> extends FutureResolverWithExceptionHandling {
 
 		private final AtomicReference<Thread> threadReference;
 		private final Object messageOrSupplier;
@@ -262,7 +258,7 @@ protected void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis)
 		}
 	}
 
-	private static class TimeoutPropagatingFutureResolver<T> extends FutureResolverWithExceptionHandling<T> {
+	private static class TimeoutPropagatingFutureResolver<T> extends FutureResolverWithExceptionHandling {
 		@Override
 		protected void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
 			throw throwAsUncheckedException(ex);

From 1fe42344488d28b4b13aab4dc7382eb3ad3f6dc3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 14:45:08 +0200
Subject: [PATCH 0927/1433] Simplify interface

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 2ba3338a5023..3162d9d0ce6b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -152,7 +152,7 @@ <T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object mes
 				Future<T> future = submitTask(supplier, threadReference, executorService);
 				FutureResolverWithExceptionHandling resolver = createFutureResolver(messageOrSupplier, threadReference,
 					throwing);
-				return resolver.resolveFutureAndHandleException(future, timeout.toMillis());
+				return resolveFutureAndHandleException(future, timeout.toMillis(), resolver);
 			}
 			finally {
 				executorService.shutdownNow();
@@ -172,13 +172,30 @@ private <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<T
 			});
 		}
 
+		private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis,
+				FutureResolverWithExceptionHandling resolver) {
+			try {
+				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
+			}
+			catch (TimeoutException ex) {
+				resolver.handleTimeoutAndThrow(ex, timeoutInMillis);
+				return null;
+			}
+			catch (ExecutionException ex) {
+				throw throwAsUncheckedException(ex.getCause());
+			}
+			catch (Throwable ex) {
+				throw throwAsUncheckedException(ex);
+			}
+		}
+
 		private FutureResolverWithExceptionHandling createFutureResolver(Object messageOrSupplier,
 				AtomicReference<Thread> threadReference, Throwing throwing) {
 			switch (throwing) {
 				case MASKED_TIMEOUT_EXCEPTION:
-					return new TimeoutPropagatingFutureResolver<>();
+					return new TimeoutPropagatingFutureResolver();
 				case ASSERTION_ERROR:
-					return new AssertiveFutureResolver<>(threadReference, messageOrSupplier);
+					return new AssertiveFutureResolver(threadReference, messageOrSupplier);
 				default:
 					throw new IllegalStateException("Unexpected value: " + throwing);
 			}
@@ -211,27 +228,11 @@ public Thread newThread(Runnable r) {
 		}
 	}
 
-	private abstract static class FutureResolverWithExceptionHandling {
-		<T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis) {
-			try {
-				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
-			}
-			catch (TimeoutException ex) {
-				handleTimeoutAndThrow(ex, timeoutInMillis);
-				return null;
-			}
-			catch (ExecutionException ex) {
-				throw throwAsUncheckedException(ex.getCause());
-			}
-			catch (Throwable ex) {
-				throw throwAsUncheckedException(ex);
-			}
-		}
-
-		protected abstract void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis);
+	private interface FutureResolverWithExceptionHandling {
+		void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis);
 	}
 
-	private static class AssertiveFutureResolver<T> extends FutureResolverWithExceptionHandling {
+	private static class AssertiveFutureResolver implements FutureResolverWithExceptionHandling {
 
 		private final AtomicReference<Thread> threadReference;
 		private final Object messageOrSupplier;
@@ -242,7 +243,7 @@ private AssertiveFutureResolver(AtomicReference<Thread> threadReference, Object
 		}
 
 		@Override
-		protected void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
+		public void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
 			AssertionFailureBuilder failure = assertionFailure() //
 					.message(messageOrSupplier) //
 					.reason("execution timed out after " + timeoutInMillis + " ms");
@@ -258,9 +259,9 @@ protected void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis)
 		}
 	}
 
-	private static class TimeoutPropagatingFutureResolver<T> extends FutureResolverWithExceptionHandling {
+	private static class TimeoutPropagatingFutureResolver implements FutureResolverWithExceptionHandling {
 		@Override
-		protected void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
+		public void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
 			throw throwAsUncheckedException(ex);
 		}
 	}

From 36550401836858a1e6987b06d4c15f3ed95c19d0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 14:49:47 +0200
Subject: [PATCH 0928/1433] Use Supplier

---
 .../org/junit/jupiter/api/AssertTimeout.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 3162d9d0ce6b..b87fb1e26a7b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -150,8 +150,8 @@ <T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object mes
 
 			try {
 				Future<T> future = submitTask(supplier, threadReference, executorService);
-				FutureResolverWithExceptionHandling resolver = createFutureResolver(messageOrSupplier, threadReference,
-					throwing);
+				FutureResolverWithExceptionHandling resolver = createFutureResolver(messageOrSupplier,
+					threadReference::get, throwing);
 				return resolveFutureAndHandleException(future, timeout.toMillis(), resolver);
 			}
 			finally {
@@ -190,12 +190,12 @@ private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMi
 		}
 
 		private FutureResolverWithExceptionHandling createFutureResolver(Object messageOrSupplier,
-				AtomicReference<Thread> threadReference, Throwing throwing) {
+				Supplier<Thread> thread, Throwing throwing) {
 			switch (throwing) {
 				case MASKED_TIMEOUT_EXCEPTION:
 					return new TimeoutPropagatingFutureResolver();
 				case ASSERTION_ERROR:
-					return new AssertiveFutureResolver(threadReference, messageOrSupplier);
+					return new AssertiveFutureResolver(thread, messageOrSupplier);
 				default:
 					throw new IllegalStateException("Unexpected value: " + throwing);
 			}
@@ -234,11 +234,11 @@ private interface FutureResolverWithExceptionHandling {
 
 	private static class AssertiveFutureResolver implements FutureResolverWithExceptionHandling {
 
-		private final AtomicReference<Thread> threadReference;
+		private final Supplier<Thread> threadSupplier;
 		private final Object messageOrSupplier;
 
-		private AssertiveFutureResolver(AtomicReference<Thread> threadReference, Object messageOrSupplier) {
-			this.threadReference = threadReference;
+		private AssertiveFutureResolver(Supplier<Thread> threadSupplier, Object messageOrSupplier) {
+			this.threadSupplier = threadSupplier;
 			this.messageOrSupplier = messageOrSupplier;
 		}
 
@@ -248,7 +248,7 @@ public void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
 					.message(messageOrSupplier) //
 					.reason("execution timed out after " + timeoutInMillis + " ms");
 
-			Thread thread = threadReference.get();
+			Thread thread = threadSupplier.get();
 			if (thread != null) {
 				ExecutionTimeoutException exception = new ExecutionTimeoutException(
 					"Execution timed out in thread " + thread.getName());

From 254bb5e20c4f4fed129dd1fd972d5a6c5a180353 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 14:58:46 +0200
Subject: [PATCH 0929/1433] Simplify to TimeoutFailureFactory

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 48 ++++++++-----------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index b87fb1e26a7b..5e39f2cb9894 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -11,7 +11,7 @@
 package org.junit.jupiter.api;
 
 import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.ASSERTION_ERROR;
-import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.MASKED_TIMEOUT_EXCEPTION;
+import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.TIMEOUT_EXCEPTION;
 import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
 
@@ -30,7 +30,7 @@
 import org.junit.jupiter.api.function.Executable;
 import org.junit.jupiter.api.function.ThrowingSupplier;
 import org.junit.platform.commons.JUnitException;
-import org.junit.platform.commons.util.ExceptionUtils;
+import org.opentest4j.AssertionFailedError;
 
 /**
  * {@code AssertTimeout} is a collection of utility methods that support asserting
@@ -43,7 +43,7 @@ class AssertTimeout {
 	private static final PreemptiveTimeoutAssertionExecutor ASSERTION_ERROR_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor(
 		ASSERTION_ERROR);
 	private static final PreemptiveTimeoutAssertionExecutor TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor(
-		MASKED_TIMEOUT_EXCEPTION);
+		TIMEOUT_EXCEPTION);
 
 	private AssertTimeout() {
 		/* no-op */
@@ -87,7 +87,7 @@ private static <T> T assertTimeout(Duration timeout, ThrowingSupplier<T> supplie
 			result = supplier.get();
 		}
 		catch (Throwable ex) {
-			ExceptionUtils.throwAsUncheckedException(ex);
+			throwAsUncheckedException(ex);
 		}
 
 		long timeElapsed = System.currentTimeMillis() - start;
@@ -150,9 +150,9 @@ <T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object mes
 
 			try {
 				Future<T> future = submitTask(supplier, threadReference, executorService);
-				FutureResolverWithExceptionHandling resolver = createFutureResolver(messageOrSupplier,
-					threadReference::get, throwing);
-				return resolveFutureAndHandleException(future, timeout.toMillis(), resolver);
+				TimeoutFailureFactory<?> factory = createTimeoutFailureFactory(messageOrSupplier, threadReference::get,
+					throwing);
+				return resolveFutureAndHandleException(future, timeout.toMillis(), factory);
 			}
 			finally {
 				executorService.shutdownNow();
@@ -167,19 +167,18 @@ private <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<T
 					return supplier.get();
 				}
 				catch (Throwable throwable) {
-					throw ExceptionUtils.throwAsUncheckedException(throwable);
+					throw throwAsUncheckedException(throwable);
 				}
 			});
 		}
 
 		private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis,
-				FutureResolverWithExceptionHandling resolver) {
+				TimeoutFailureFactory<?> factory) {
 			try {
 				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
 			}
 			catch (TimeoutException ex) {
-				resolver.handleTimeoutAndThrow(ex, timeoutInMillis);
-				return null;
+				throw throwAsUncheckedException(factory.handleTimeout(ex, timeoutInMillis));
 			}
 			catch (ExecutionException ex) {
 				throw throwAsUncheckedException(ex.getCause());
@@ -189,11 +188,11 @@ private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMi
 			}
 		}
 
-		private FutureResolverWithExceptionHandling createFutureResolver(Object messageOrSupplier,
-				Supplier<Thread> thread, Throwing throwing) {
+		private TimeoutFailureFactory<?> createTimeoutFailureFactory(Object messageOrSupplier, Supplier<Thread> thread,
+				Throwing throwing) {
 			switch (throwing) {
-				case MASKED_TIMEOUT_EXCEPTION:
-					return new TimeoutPropagatingFutureResolver();
+				case TIMEOUT_EXCEPTION:
+					return (e, __) -> e;
 				case ASSERTION_ERROR:
 					return new AssertiveFutureResolver(thread, messageOrSupplier);
 				default:
@@ -202,7 +201,7 @@ private FutureResolverWithExceptionHandling createFutureResolver(Object messageO
 		}
 
 		enum Throwing {
-			ASSERTION_ERROR, MASKED_TIMEOUT_EXCEPTION
+			ASSERTION_ERROR, TIMEOUT_EXCEPTION
 		}
 	}
 
@@ -228,11 +227,11 @@ public Thread newThread(Runnable r) {
 		}
 	}
 
-	private interface FutureResolverWithExceptionHandling {
-		void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis);
+	private interface TimeoutFailureFactory<T extends Throwable> {
+		T handleTimeout(TimeoutException ex, long timeoutInMillis);
 	}
 
-	private static class AssertiveFutureResolver implements FutureResolverWithExceptionHandling {
+	private static class AssertiveFutureResolver implements TimeoutFailureFactory<AssertionFailedError> {
 
 		private final Supplier<Thread> threadSupplier;
 		private final Object messageOrSupplier;
@@ -243,7 +242,7 @@ private AssertiveFutureResolver(Supplier<Thread> threadSupplier, Object messageO
 		}
 
 		@Override
-		public void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
+		public AssertionFailedError handleTimeout(TimeoutException ex, long timeoutInMillis) {
 			AssertionFailureBuilder failure = assertionFailure() //
 					.message(messageOrSupplier) //
 					.reason("execution timed out after " + timeoutInMillis + " ms");
@@ -255,14 +254,7 @@ public void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
 				exception.setStackTrace(thread.getStackTrace());
 				failure.cause(exception);
 			}
-			throw failure.build();
-		}
-	}
-
-	private static class TimeoutPropagatingFutureResolver implements FutureResolverWithExceptionHandling {
-		@Override
-		public void handleTimeoutAndThrow(TimeoutException ex, long timeoutInMillis) {
-			throw throwAsUncheckedException(ex);
+			return failure.build();
 		}
 	}
 }

From 7f5a974fc8804ecf75f8b48a29b6c8fc227537e4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 15:04:06 +0200
Subject: [PATCH 0930/1433] Make TimeoutFailureFactory implementations
 stateless

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 5e39f2cb9894..1c32567a43bf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -150,9 +150,9 @@ <T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object mes
 
 			try {
 				Future<T> future = submitTask(supplier, threadReference, executorService);
-				TimeoutFailureFactory<?> factory = createTimeoutFailureFactory(messageOrSupplier, threadReference::get,
-					throwing);
-				return resolveFutureAndHandleException(future, timeout.toMillis(), factory);
+				TimeoutFailureFactory<?> factory = createTimeoutFailureFactory(throwing);
+				return resolveFutureAndHandleException(future, timeout.toMillis(), messageOrSupplier,
+					threadReference::get, factory);
 			}
 			finally {
 				executorService.shutdownNow();
@@ -172,13 +172,14 @@ private <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<T
 			});
 		}
 
-		private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis,
-				TimeoutFailureFactory<?> factory) {
+		private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis, Object messageOrSupplier,
+				Supplier<Thread> threadSupplier, TimeoutFailureFactory<?> factory) {
 			try {
 				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
 			}
 			catch (TimeoutException ex) {
-				throw throwAsUncheckedException(factory.handleTimeout(ex, timeoutInMillis));
+				throw throwAsUncheckedException(
+					factory.handleTimeout(ex, timeoutInMillis, messageOrSupplier, threadSupplier));
 			}
 			catch (ExecutionException ex) {
 				throw throwAsUncheckedException(ex.getCause());
@@ -188,13 +189,12 @@ private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMi
 			}
 		}
 
-		private TimeoutFailureFactory<?> createTimeoutFailureFactory(Object messageOrSupplier, Supplier<Thread> thread,
-				Throwing throwing) {
+		private TimeoutFailureFactory<?> createTimeoutFailureFactory(Throwing throwing) {
 			switch (throwing) {
 				case TIMEOUT_EXCEPTION:
-					return (e, __) -> e;
+					return (e, __, ___, ____) -> e;
 				case ASSERTION_ERROR:
-					return new AssertiveFutureResolver(thread, messageOrSupplier);
+					return new AssertiveFutureResolver();
 				default:
 					throw new IllegalStateException("Unexpected value: " + throwing);
 			}
@@ -216,7 +216,7 @@ private static class ExecutionTimeoutException extends JUnitException {
 
 	/**
 	 * The thread factory used for preemptive timeout.
-	 *
+	 * <p>
 	 * The factory creates threads with meaningful names, helpful for debugging purposes.
 	 */
 	private static class TimeoutThreadFactory implements ThreadFactory {
@@ -228,21 +228,15 @@ public Thread newThread(Runnable r) {
 	}
 
 	private interface TimeoutFailureFactory<T extends Throwable> {
-		T handleTimeout(TimeoutException ex, long timeoutInMillis);
+		T handleTimeout(TimeoutException ex, long timeoutInMillis, Object messageOrSupplier,
+				Supplier<Thread> threadSupplier);
 	}
 
 	private static class AssertiveFutureResolver implements TimeoutFailureFactory<AssertionFailedError> {
 
-		private final Supplier<Thread> threadSupplier;
-		private final Object messageOrSupplier;
-
-		private AssertiveFutureResolver(Supplier<Thread> threadSupplier, Object messageOrSupplier) {
-			this.threadSupplier = threadSupplier;
-			this.messageOrSupplier = messageOrSupplier;
-		}
-
 		@Override
-		public AssertionFailedError handleTimeout(TimeoutException ex, long timeoutInMillis) {
+		public AssertionFailedError handleTimeout(TimeoutException ex, long timeoutInMillis, Object messageOrSupplier,
+				Supplier<Thread> threadSupplier) {
 			AssertionFailureBuilder failure = assertionFailure() //
 					.message(messageOrSupplier) //
 					.reason("execution timed out after " + timeoutInMillis + " ms");

From f1809ddb4e1d6a33c31e11610b704070cf8abbf5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 15:07:46 +0200
Subject: [PATCH 0931/1433] Delete Throwing enum

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 34 +++++--------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 1c32567a43bf..d6cdb6d70a78 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -10,8 +10,6 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.ASSERTION_ERROR;
-import static org.junit.jupiter.api.AssertTimeout.PreemptiveTimeoutAssertionExecutor.Throwing.TIMEOUT_EXCEPTION;
 import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
 
@@ -41,9 +39,9 @@
 class AssertTimeout {
 
 	private static final PreemptiveTimeoutAssertionExecutor ASSERTION_ERROR_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor(
-		ASSERTION_ERROR);
+		new AssertiveFutureResolver());
 	private static final PreemptiveTimeoutAssertionExecutor TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor(
-		TIMEOUT_EXCEPTION);
+		(e, __, ___, ____) -> e);
 
 	private AssertTimeout() {
 		/* no-op */
@@ -138,10 +136,10 @@ static <T> T assertTimeoutPreemptivelyThrowingTimeoutException(Duration timeout,
 	}
 
 	static class PreemptiveTimeoutAssertionExecutor {
-		private final Throwing throwing;
+		private final TimeoutFailureFactory<?> failureFactory;
 
-		PreemptiveTimeoutAssertionExecutor(Throwing throwing) {
-			this.throwing = throwing;
+		PreemptiveTimeoutAssertionExecutor(TimeoutFailureFactory<?> failureFactory) {
+			this.failureFactory = failureFactory;
 		}
 
 		<T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object messageOrSupplier) {
@@ -150,9 +148,8 @@ <T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object mes
 
 			try {
 				Future<T> future = submitTask(supplier, threadReference, executorService);
-				TimeoutFailureFactory<?> factory = createTimeoutFailureFactory(throwing);
 				return resolveFutureAndHandleException(future, timeout.toMillis(), messageOrSupplier,
-					threadReference::get, factory);
+					threadReference::get);
 			}
 			finally {
 				executorService.shutdownNow();
@@ -173,13 +170,13 @@ private <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<T
 		}
 
 		private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis, Object messageOrSupplier,
-				Supplier<Thread> threadSupplier, TimeoutFailureFactory<?> factory) {
+				Supplier<Thread> threadSupplier) {
 			try {
 				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
 			}
 			catch (TimeoutException ex) {
 				throw throwAsUncheckedException(
-					factory.handleTimeout(ex, timeoutInMillis, messageOrSupplier, threadSupplier));
+					failureFactory.handleTimeout(ex, timeoutInMillis, messageOrSupplier, threadSupplier));
 			}
 			catch (ExecutionException ex) {
 				throw throwAsUncheckedException(ex.getCause());
@@ -188,21 +185,6 @@ private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMi
 				throw throwAsUncheckedException(ex);
 			}
 		}
-
-		private TimeoutFailureFactory<?> createTimeoutFailureFactory(Throwing throwing) {
-			switch (throwing) {
-				case TIMEOUT_EXCEPTION:
-					return (e, __, ___, ____) -> e;
-				case ASSERTION_ERROR:
-					return new AssertiveFutureResolver();
-				default:
-					throw new IllegalStateException("Unexpected value: " + throwing);
-			}
-		}
-
-		enum Throwing {
-			ASSERTION_ERROR, TIMEOUT_EXCEPTION
-		}
 	}
 
 	private static class ExecutionTimeoutException extends JUnitException {

From b080a16875acfb0b54da716574331277066298cc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 15:15:53 +0200
Subject: [PATCH 0932/1433] Declare and handle TimeoutException directly

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 29 +++++++++----------
 .../org/junit/jupiter/api/Assertions.java     |  3 +-
 .../SeparateThreadTimeoutInvocation.java      | 13 +++------
 .../api/AssertTimeoutAssertionsTests.java     |  3 +-
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index d6cdb6d70a78..65d8923be60a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -38,9 +38,9 @@
  */
 class AssertTimeout {
 
-	private static final PreemptiveTimeoutAssertionExecutor ASSERTION_ERROR_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor(
-		new AssertiveFutureResolver());
-	private static final PreemptiveTimeoutAssertionExecutor TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor(
+	private static final PreemptiveTimeoutAssertionExecutor<AssertionFailedError> ASSERTION_ERROR_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor<>(
+		new AssertionTimeoutFailureFactory());
+	private static final PreemptiveTimeoutAssertionExecutor<TimeoutException> TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor<>(
 		(e, __, ___, ____) -> e);
 
 	private AssertTimeout() {
@@ -131,23 +131,23 @@ static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> sup
 	}
 
 	static <T> T assertTimeoutPreemptivelyThrowingTimeoutException(Duration timeout, ThrowingSupplier<T> supplier,
-			Supplier<String> messageSupplier) {
+			Supplier<String> messageSupplier) throws TimeoutException {
 		return TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, messageSupplier);
 	}
 
-	static class PreemptiveTimeoutAssertionExecutor {
-		private final TimeoutFailureFactory<?> failureFactory;
+	static class PreemptiveTimeoutAssertionExecutor<T extends Throwable> {
+		private final TimeoutFailureFactory<T> failureFactory;
 
-		PreemptiveTimeoutAssertionExecutor(TimeoutFailureFactory<?> failureFactory) {
+		PreemptiveTimeoutAssertionExecutor(TimeoutFailureFactory<T> failureFactory) {
 			this.failureFactory = failureFactory;
 		}
 
-		<T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object messageOrSupplier) {
+		<V> V executeThrowing(Duration timeout, ThrowingSupplier<V> supplier, Object messageOrSupplier) throws T {
 			AtomicReference<Thread> threadReference = new AtomicReference<>();
 			ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
 
 			try {
-				Future<T> future = submitTask(supplier, threadReference, executorService);
+				Future<V> future = submitTask(supplier, threadReference, executorService);
 				return resolveFutureAndHandleException(future, timeout.toMillis(), messageOrSupplier,
 					threadReference::get);
 			}
@@ -156,7 +156,7 @@ <T> T executeThrowing(Duration timeout, ThrowingSupplier<T> supplier, Object mes
 			}
 		}
 
-		private <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<Thread> threadReference,
+		private <V> Future<V> submitTask(ThrowingSupplier<V> supplier, AtomicReference<Thread> threadReference,
 				ExecutorService executorService) {
 			return executorService.submit(() -> {
 				try {
@@ -169,14 +169,13 @@ private <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<T
 			});
 		}
 
-		private <T> T resolveFutureAndHandleException(Future<T> future, long timeoutInMillis, Object messageOrSupplier,
-				Supplier<Thread> threadSupplier) {
+		private <V> V resolveFutureAndHandleException(Future<V> future, long timeoutInMillis, Object messageOrSupplier,
+				Supplier<Thread> threadSupplier) throws T {
 			try {
 				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
 			}
 			catch (TimeoutException ex) {
-				throw throwAsUncheckedException(
-					failureFactory.handleTimeout(ex, timeoutInMillis, messageOrSupplier, threadSupplier));
+				throw failureFactory.handleTimeout(ex, timeoutInMillis, messageOrSupplier, threadSupplier);
 			}
 			catch (ExecutionException ex) {
 				throw throwAsUncheckedException(ex.getCause());
@@ -214,7 +213,7 @@ T handleTimeout(TimeoutException ex, long timeoutInMillis, Object messageOrSuppl
 				Supplier<Thread> threadSupplier);
 	}
 
-	private static class AssertiveFutureResolver implements TimeoutFailureFactory<AssertionFailedError> {
+	private static class AssertionTimeoutFailureFactory implements TimeoutFailureFactory<AssertionFailedError> {
 
 		@Override
 		public AssertionFailedError handleTimeout(TimeoutException ex, long timeoutInMillis, Object messageOrSupplier,
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index ec46e79cd1c0..aab2f3dd3447 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeoutException;
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -3551,7 +3552,7 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 	 */
 	@API(status = INTERNAL)
 	public static <T> T assertTimeoutPreemptivelyThrowingTimeoutException(Duration timeout,
-			ThrowingSupplier<T> supplier, Supplier<String> messageSupplier) {
+			ThrowingSupplier<T> supplier, Supplier<String> messageSupplier) throws TimeoutException {
 		return AssertTimeout.assertTimeoutPreemptivelyThrowingTimeoutException(timeout, supplier, messageSupplier);
 	}
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
index bda2d685aaa5..71033b3df887 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
@@ -39,15 +39,10 @@ public T proceed() throws Throwable {
 			return assertTimeoutPreemptivelyThrowingTimeoutException(timeout.toDuration(), delegate::proceed,
 				descriptionSupplier);
 		}
-		catch (Throwable failure) {
-			if (failure instanceof TimeoutException) {
-				TimeoutException exception = TimeoutExceptionFactory.create(descriptionSupplier.get(), timeout, null);
-				exception.initCause(failure.getCause());
-				throw exception;
-			}
-			else {
-				throw failure;
-			}
+		catch (TimeoutException failure) {
+			TimeoutException exception = TimeoutExceptionFactory.create(descriptionSupplier.get(), timeout, null);
+			exception.initCause(failure.getCause());
+			throw exception;
 		}
 	}
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index 512d1013eeda..f6409b3229cd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -342,7 +342,8 @@ void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThat
 	}
 
 	@Test
-	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesBeforeTimeout() {
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesBeforeTimeout()
+			throws Exception {
 		var result = assertTimeoutPreemptivelyThrowingTimeoutException(PREEMPTIVE_TIMEOUT, () -> "Tempus Fugit",
 			() -> "Tempus Fugit");
 

From ba962a4fca521766acf18442b3bcfc98f42ffe10 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 15:32:06 +0200
Subject: [PATCH 0933/1433] Pass cause to TimeoutFailureFactory

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 65d8923be60a..4dd754524ee0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -175,7 +175,13 @@ private <V> V resolveFutureAndHandleException(Future<V> future, long timeoutInMi
 				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
 			}
 			catch (TimeoutException ex) {
-				throw failureFactory.handleTimeout(ex, timeoutInMillis, messageOrSupplier, threadSupplier);
+				Thread thread = threadSupplier.get();
+				ExecutionTimeoutException cause = null;
+				if (thread != null) {
+					cause = new ExecutionTimeoutException("Execution timed out in thread " + thread.getName());
+					cause.setStackTrace(thread.getStackTrace());
+				}
+				throw failureFactory.handleTimeout(ex, timeoutInMillis, messageOrSupplier, cause);
 			}
 			catch (ExecutionException ex) {
 				throw throwAsUncheckedException(ex.getCause());
@@ -209,27 +215,19 @@ public Thread newThread(Runnable r) {
 	}
 
 	private interface TimeoutFailureFactory<T extends Throwable> {
-		T handleTimeout(TimeoutException ex, long timeoutInMillis, Object messageOrSupplier,
-				Supplier<Thread> threadSupplier);
+		T handleTimeout(TimeoutException exception, long timeoutInMillis, Object messageOrSupplier, Throwable cause);
 	}
 
 	private static class AssertionTimeoutFailureFactory implements TimeoutFailureFactory<AssertionFailedError> {
 
 		@Override
-		public AssertionFailedError handleTimeout(TimeoutException ex, long timeoutInMillis, Object messageOrSupplier,
-				Supplier<Thread> threadSupplier) {
-			AssertionFailureBuilder failure = assertionFailure() //
+		public AssertionFailedError handleTimeout(TimeoutException exception, long timeoutInMillis,
+				Object messageOrSupplier, Throwable cause) {
+			return assertionFailure() //
 					.message(messageOrSupplier) //
-					.reason("execution timed out after " + timeoutInMillis + " ms");
-
-			Thread thread = threadSupplier.get();
-			if (thread != null) {
-				ExecutionTimeoutException exception = new ExecutionTimeoutException(
-					"Execution timed out in thread " + thread.getName());
-				exception.setStackTrace(thread.getStackTrace());
-				failure.cause(exception);
-			}
-			return failure.build();
+					.reason("execution timed out after " + timeoutInMillis + " ms") //
+					.cause(cause) //
+					.build();
 		}
 	}
 }

From ab93ecefe90c8f8753ab9093c5a116c31755adeb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 15:33:16 +0200
Subject: [PATCH 0934/1433] Pass duration to TimeoutFailureFactory

---
 .../java/org/junit/jupiter/api/AssertTimeout.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 4dd754524ee0..7c1314ac7113 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -148,8 +148,7 @@ <V> V executeThrowing(Duration timeout, ThrowingSupplier<V> supplier, Object mes
 
 			try {
 				Future<V> future = submitTask(supplier, threadReference, executorService);
-				return resolveFutureAndHandleException(future, timeout.toMillis(), messageOrSupplier,
-					threadReference::get);
+				return resolveFutureAndHandleException(future, timeout, messageOrSupplier, threadReference::get);
 			}
 			finally {
 				executorService.shutdownNow();
@@ -169,10 +168,10 @@ private <V> Future<V> submitTask(ThrowingSupplier<V> supplier, AtomicReference<T
 			});
 		}
 
-		private <V> V resolveFutureAndHandleException(Future<V> future, long timeoutInMillis, Object messageOrSupplier,
+		private <V> V resolveFutureAndHandleException(Future<V> future, Duration timeout, Object messageOrSupplier,
 				Supplier<Thread> threadSupplier) throws T {
 			try {
-				return future.get(timeoutInMillis, TimeUnit.MILLISECONDS);
+				return future.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
 			}
 			catch (TimeoutException ex) {
 				Thread thread = threadSupplier.get();
@@ -181,7 +180,7 @@ private <V> V resolveFutureAndHandleException(Future<V> future, long timeoutInMi
 					cause = new ExecutionTimeoutException("Execution timed out in thread " + thread.getName());
 					cause.setStackTrace(thread.getStackTrace());
 				}
-				throw failureFactory.handleTimeout(ex, timeoutInMillis, messageOrSupplier, cause);
+				throw failureFactory.handleTimeout(ex, timeout, messageOrSupplier, cause);
 			}
 			catch (ExecutionException ex) {
 				throw throwAsUncheckedException(ex.getCause());
@@ -215,17 +214,17 @@ public Thread newThread(Runnable r) {
 	}
 
 	private interface TimeoutFailureFactory<T extends Throwable> {
-		T handleTimeout(TimeoutException exception, long timeoutInMillis, Object messageOrSupplier, Throwable cause);
+		T handleTimeout(TimeoutException exception, Duration timeout, Object messageOrSupplier, Throwable cause);
 	}
 
 	private static class AssertionTimeoutFailureFactory implements TimeoutFailureFactory<AssertionFailedError> {
 
 		@Override
-		public AssertionFailedError handleTimeout(TimeoutException exception, long timeoutInMillis,
+		public AssertionFailedError handleTimeout(TimeoutException exception, Duration timeout,
 				Object messageOrSupplier, Throwable cause) {
 			return assertionFailure() //
 					.message(messageOrSupplier) //
-					.reason("execution timed out after " + timeoutInMillis + " ms") //
+					.reason("execution timed out after " + timeout.toMillis() + " ms") //
 					.cause(cause) //
 					.build();
 		}

From f7696e4bfacc89d971aa80e5b8a55ef899ace029 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 15:36:38 +0200
Subject: [PATCH 0935/1433] Pass supplier to TimeoutFailureFactory

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 7c1314ac7113..d24a6ef55211 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -122,7 +122,7 @@ static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> sup
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier, String message) {
-		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, message);
+		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, () -> message);
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
@@ -142,13 +142,14 @@ static class PreemptiveTimeoutAssertionExecutor<T extends Throwable> {
 			this.failureFactory = failureFactory;
 		}
 
-		<V> V executeThrowing(Duration timeout, ThrowingSupplier<V> supplier, Object messageOrSupplier) throws T {
+		<V> V executeThrowing(Duration timeout, ThrowingSupplier<V> supplier, Supplier<String> messageSupplier)
+				throws T {
 			AtomicReference<Thread> threadReference = new AtomicReference<>();
 			ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
 
 			try {
 				Future<V> future = submitTask(supplier, threadReference, executorService);
-				return resolveFutureAndHandleException(future, timeout, messageOrSupplier, threadReference::get);
+				return resolveFutureAndHandleException(future, timeout, messageSupplier, threadReference::get);
 			}
 			finally {
 				executorService.shutdownNow();
@@ -168,8 +169,8 @@ private <V> Future<V> submitTask(ThrowingSupplier<V> supplier, AtomicReference<T
 			});
 		}
 
-		private <V> V resolveFutureAndHandleException(Future<V> future, Duration timeout, Object messageOrSupplier,
-				Supplier<Thread> threadSupplier) throws T {
+		private <V> V resolveFutureAndHandleException(Future<V> future, Duration timeout,
+				Supplier<String> messageSupplier, Supplier<Thread> threadSupplier) throws T {
 			try {
 				return future.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
 			}
@@ -180,7 +181,7 @@ private <V> V resolveFutureAndHandleException(Future<V> future, Duration timeout
 					cause = new ExecutionTimeoutException("Execution timed out in thread " + thread.getName());
 					cause.setStackTrace(thread.getStackTrace());
 				}
-				throw failureFactory.handleTimeout(ex, timeout, messageOrSupplier, cause);
+				throw failureFactory.handleTimeout(ex, timeout, messageSupplier, cause);
 			}
 			catch (ExecutionException ex) {
 				throw throwAsUncheckedException(ex.getCause());
@@ -214,16 +215,17 @@ public Thread newThread(Runnable r) {
 	}
 
 	private interface TimeoutFailureFactory<T extends Throwable> {
-		T handleTimeout(TimeoutException exception, Duration timeout, Object messageOrSupplier, Throwable cause);
+		T handleTimeout(TimeoutException exception, Duration timeout, Supplier<String> messageSupplier,
+				Throwable cause);
 	}
 
 	private static class AssertionTimeoutFailureFactory implements TimeoutFailureFactory<AssertionFailedError> {
 
 		@Override
 		public AssertionFailedError handleTimeout(TimeoutException exception, Duration timeout,
-				Object messageOrSupplier, Throwable cause) {
+				Supplier<String> messageSupplier, Throwable cause) {
 			return assertionFailure() //
-					.message(messageOrSupplier) //
+					.message(messageSupplier) //
 					.reason("execution timed out after " + timeout.toMillis() + " ms") //
 					.cause(cause) //
 					.build();

From ea17fa254363e69a12cc00bbc2cbaaea8c9714a9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 15:58:22 +0200
Subject: [PATCH 0936/1433] Allow specifying a TimeoutFailureFactory directly

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 18 ++++++-------
 .../org/junit/jupiter/api/Assertions.java     | 18 ++++++++-----
 .../SeparateThreadTimeoutInvocation.java      | 17 ++++++-------
 .../api/AssertTimeoutAssertionsTests.java     | 25 ++++++++++---------
 .../extension/TimeoutExtensionTests.java      |  6 ++++-
 5 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index d24a6ef55211..dd77693ce4d8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
+import org.junit.jupiter.api.Assertions.TimeoutFailureFactory;
 import org.junit.jupiter.api.function.Executable;
 import org.junit.jupiter.api.function.ThrowingSupplier;
 import org.junit.platform.commons.JUnitException;
@@ -40,8 +41,6 @@ class AssertTimeout {
 
 	private static final PreemptiveTimeoutAssertionExecutor<AssertionFailedError> ASSERTION_ERROR_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor<>(
 		new AssertionTimeoutFailureFactory());
-	private static final PreemptiveTimeoutAssertionExecutor<TimeoutException> TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor<>(
-		(e, __, ___, ____) -> e);
 
 	private AssertTimeout() {
 		/* no-op */
@@ -122,7 +121,8 @@ static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> sup
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier, String message) {
-		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, () -> message);
+		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier,
+			message == null ? null : () -> message);
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
@@ -130,9 +130,10 @@ static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> sup
 		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, messageSupplier);
 	}
 
-	static <T> T assertTimeoutPreemptivelyThrowingTimeoutException(Duration timeout, ThrowingSupplier<T> supplier,
-			Supplier<String> messageSupplier) throws TimeoutException {
-		return TIMEOUT_EXCEPTION_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, messageSupplier);
+	static <T, E extends Throwable> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
+			Supplier<String> messageSupplier, TimeoutFailureFactory<E> failureFactory) throws E {
+		return new PreemptiveTimeoutAssertionExecutor<>(failureFactory).executeThrowing(timeout, supplier,
+			messageSupplier);
 	}
 
 	static class PreemptiveTimeoutAssertionExecutor<T extends Throwable> {
@@ -214,11 +215,6 @@ public Thread newThread(Runnable r) {
 		}
 	}
 
-	private interface TimeoutFailureFactory<T extends Throwable> {
-		T handleTimeout(TimeoutException exception, Duration timeout, Supplier<String> messageSupplier,
-				Throwable cause);
-	}
-
 	private static class AssertionTimeoutFailureFactory implements TimeoutFailureFactory<AssertionFailedError> {
 
 		@Override
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index aab2f3dd3447..f7b225d31d86 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -3531,8 +3531,9 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 	 *
 	 * <p>If the assertion passes then the {@code supplier}'s result is returned.
 	 *
-	 * <p>In the case the assertion does not pass, a {@code TimeoutException} will be
-	 * thrown.
+	 * <p>In the case the assertion does not pass, the supplied
+	 * {@link TimeoutFailureFactory} is invoked to create an exception which is
+	 * then thrown.
 	 *
 	 * <p>Note: the {@code supplier} will be executed in a different thread than
 	 * that of the calling code. Furthermore, execution of the {@code supplier} will
@@ -3550,10 +3551,10 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 	 * @see #assertTimeoutPreemptively(Duration, ThrowingSupplier, String)
 	 * @see #assertTimeout(Duration, Executable, Supplier)
 	 */
-	@API(status = INTERNAL)
-	public static <T> T assertTimeoutPreemptivelyThrowingTimeoutException(Duration timeout,
-			ThrowingSupplier<T> supplier, Supplier<String> messageSupplier) throws TimeoutException {
-		return AssertTimeout.assertTimeoutPreemptivelyThrowingTimeoutException(timeout, supplier, messageSupplier);
+	@API(status = INTERNAL, since = "5.9.1")
+	public static <T, E extends Throwable> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
+			Supplier<String> messageSupplier, TimeoutFailureFactory<E> failureFactory) throws E {
+		return AssertTimeout.assertTimeoutPreemptively(timeout, supplier, messageSupplier, failureFactory);
 	}
 
 	// --- assertInstanceOf ----------------------------------------------------
@@ -3605,4 +3606,9 @@ public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue,
 		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue, messageSupplier);
 	}
 
+	@API(status = INTERNAL, since = "5.9.1")
+	public interface TimeoutFailureFactory<T extends Throwable> {
+		T handleTimeout(TimeoutException exception, Duration timeout, Supplier<String> messageSupplier,
+				Throwable cause);
+	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
index 71033b3df887..59233fb2b8b2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.engine.extension;
 
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptivelyThrowingTimeoutException;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
 
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
@@ -35,14 +35,11 @@ class SeparateThreadTimeoutInvocation<T> implements Invocation<T> {
 
 	@Override
 	public T proceed() throws Throwable {
-		try {
-			return assertTimeoutPreemptivelyThrowingTimeoutException(timeout.toDuration(), delegate::proceed,
-				descriptionSupplier);
-		}
-		catch (TimeoutException failure) {
-			TimeoutException exception = TimeoutExceptionFactory.create(descriptionSupplier.get(), timeout, null);
-			exception.initCause(failure.getCause());
-			throw exception;
-		}
+		return assertTimeoutPreemptively(timeout.toDuration(), delegate::proceed, descriptionSupplier,
+			(e, __, messageSupplier, cause) -> {
+				TimeoutException exception = TimeoutExceptionFactory.create(messageSupplier.get(), timeout, null);
+				exception.initCause(cause);
+				return exception;
+			});
 	}
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index f6409b3229cd..ba5ef967a077 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -19,7 +19,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTimeout;
 import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptivelyThrowingTimeoutException;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.condition.OS.WINDOWS;
@@ -42,6 +41,8 @@
 class AssertTimeoutAssertionsTests {
 
 	private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(WINDOWS.isCurrentOs() ? 1000 : 100);
+	private static final Assertions.TimeoutFailureFactory<TimeoutException> TIMEOUT_EXCEPTION_FACTORY = (__, ___, ____,
+			_____) -> new TimeoutException();
 
 	private static ThreadLocal<AtomicBoolean> changed = ThreadLocal.withInitial(() -> new AtomicBoolean(false));
 
@@ -318,34 +319,34 @@ void assertTimeoutPreemptivelyUsesThreadsWithSpecificNamePrefix() {
 
 	@Test
 	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesAfterTheTimeout() {
-		assertThrows(TimeoutException.class,
-			() -> assertTimeoutPreemptivelyThrowingTimeoutException(PREEMPTIVE_TIMEOUT, () -> {
-				waitForInterrupt();
-				return "Tempus Fugit";
-			}, () -> "Tempus Fugit"));
+		assertThrows(TimeoutException.class, () -> Assertions.assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
+			waitForInterrupt();
+			return "Tempus Fugit";
+		}, () -> "Tempus Fugit", TIMEOUT_EXCEPTION_FACTORY));
 	}
 
 	@Test
 	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatThrowsAnAssertionFailedError() {
 		AssertionFailedError exception = assertThrows(AssertionFailedError.class,
-			() -> assertTimeoutPreemptivelyThrowingTimeoutException(ofMillis(500), () -> fail("enigma"),
-				() -> "Tempus Fugit"));
+			() -> Assertions.assertTimeoutPreemptively(ofMillis(500), () -> fail("enigma"), () -> "Tempus Fugit",
+				TIMEOUT_EXCEPTION_FACTORY));
 		assertMessageEquals(exception, "enigma");
 	}
 
 	@Test
 	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatThrowsAnException() {
 		RuntimeException exception = assertThrows(RuntimeException.class,
-			() -> assertTimeoutPreemptivelyThrowingTimeoutException(ofMillis(500),
-				() -> ExceptionUtils.throwAsUncheckedException(new RuntimeException(":(")), () -> "Tempus Fugit"));
+			() -> Assertions.assertTimeoutPreemptively(ofMillis(500),
+				() -> ExceptionUtils.throwAsUncheckedException(new RuntimeException(":(")), () -> "Tempus Fugit",
+				TIMEOUT_EXCEPTION_FACTORY));
 		assertMessageEquals(exception, ":(");
 	}
 
 	@Test
 	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesBeforeTimeout()
 			throws Exception {
-		var result = assertTimeoutPreemptivelyThrowingTimeoutException(PREEMPTIVE_TIMEOUT, () -> "Tempus Fugit",
-			() -> "Tempus Fugit");
+		var result = Assertions.assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> "Tempus Fugit",
+			() -> "Tempus Fugit", TIMEOUT_EXCEPTION_FACTORY);
 
 		assertThat(result).isEqualTo("Tempus Fugit");
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 183543711789..442d34c83e0a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -349,9 +349,13 @@ void timeoutExceededInSeparateThread() {
 			EngineExecutionResults results = executeTestsForClass(TimeoutExceedingSeparateThreadTestCase.class);
 
 			Execution execution = findExecution(results.testEvents(), "testMethod()");
-			assertThat(execution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow()) //
+			Throwable failure = execution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow();
+			assertThat(failure) //
 					.isInstanceOf(TimeoutException.class) //
 					.hasMessage("testMethod() timed out after 10 milliseconds");
+			assertThat(failure.getCause()) //
+					.hasMessageStartingWith("Execution timed out in ") //
+					.hasStackTraceContaining(TimeoutExceedingSeparateThreadTestCase.class.getName() + ".testMethod");
 		}
 
 		@Test

From 7f422a561ebdce7f94c03fffe345e20d11466553 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 16:01:01 +0200
Subject: [PATCH 0937/1433] Remove unused parameter from TimeoutFailureFactory

---
 .../src/main/java/org/junit/jupiter/api/AssertTimeout.java  | 6 +++---
 .../src/main/java/org/junit/jupiter/api/Assertions.java     | 4 +---
 .../engine/extension/SeparateThreadTimeoutInvocation.java   | 2 +-
 .../org/junit/jupiter/api/AssertTimeoutAssertionsTests.java | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index dd77693ce4d8..ff12f010f17e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -182,7 +182,7 @@ private <V> V resolveFutureAndHandleException(Future<V> future, Duration timeout
 					cause = new ExecutionTimeoutException("Execution timed out in thread " + thread.getName());
 					cause.setStackTrace(thread.getStackTrace());
 				}
-				throw failureFactory.handleTimeout(ex, timeout, messageSupplier, cause);
+				throw failureFactory.createTimeoutFailure(timeout, messageSupplier, cause);
 			}
 			catch (ExecutionException ex) {
 				throw throwAsUncheckedException(ex.getCause());
@@ -218,8 +218,8 @@ public Thread newThread(Runnable r) {
 	private static class AssertionTimeoutFailureFactory implements TimeoutFailureFactory<AssertionFailedError> {
 
 		@Override
-		public AssertionFailedError handleTimeout(TimeoutException exception, Duration timeout,
-				Supplier<String> messageSupplier, Throwable cause) {
+		public AssertionFailedError createTimeoutFailure(Duration timeout, Supplier<String> messageSupplier,
+				Throwable cause) {
 			return assertionFailure() //
 					.message(messageSupplier) //
 					.reason("execution timed out after " + timeout.toMillis() + " ms") //
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index f7b225d31d86..c8a26f9a9829 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -19,7 +19,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.TimeoutException;
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -3608,7 +3607,6 @@ public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue,
 
 	@API(status = INTERNAL, since = "5.9.1")
 	public interface TimeoutFailureFactory<T extends Throwable> {
-		T handleTimeout(TimeoutException exception, Duration timeout, Supplier<String> messageSupplier,
-				Throwable cause);
+		T createTimeoutFailure(Duration timeout, Supplier<String> messageSupplier, Throwable cause);
 	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
index 59233fb2b8b2..16f22d1b09f6 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
@@ -36,7 +36,7 @@ class SeparateThreadTimeoutInvocation<T> implements Invocation<T> {
 	@Override
 	public T proceed() throws Throwable {
 		return assertTimeoutPreemptively(timeout.toDuration(), delegate::proceed, descriptionSupplier,
-			(e, __, messageSupplier, cause) -> {
+			(__, messageSupplier, cause) -> {
 				TimeoutException exception = TimeoutExceptionFactory.create(messageSupplier.get(), timeout, null);
 				exception.initCause(cause);
 				return exception;
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index ba5ef967a077..e0a17bfa96db 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -41,8 +41,8 @@
 class AssertTimeoutAssertionsTests {
 
 	private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(WINDOWS.isCurrentOs() ? 1000 : 100);
-	private static final Assertions.TimeoutFailureFactory<TimeoutException> TIMEOUT_EXCEPTION_FACTORY = (__, ___, ____,
-			_____) -> new TimeoutException();
+	private static final Assertions.TimeoutFailureFactory<TimeoutException> TIMEOUT_EXCEPTION_FACTORY = (__, ___,
+			____) -> new TimeoutException();
 
 	private static ThreadLocal<AtomicBoolean> changed = ThreadLocal.withInitial(() -> new AtomicBoolean(false));
 

From fa0f91d6ebcfab945f6697164bd3a49c056958df Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 16:04:16 +0200
Subject: [PATCH 0938/1433] Add Javadoc

---
 .../main/java/org/junit/jupiter/api/Assertions.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index c8a26f9a9829..e30cf6e043ed 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -3605,8 +3605,21 @@ public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue,
 		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue, messageSupplier);
 	}
 
+	/**
+	 * Factory for timeout failures.
+	 *
+	 * @param <T> The type of error or exception created
+	 * @since 5.9.1
+	 * @see Assertions#assertTimeoutPreemptively(Duration, ThrowingSupplier, Supplier, TimeoutFailureFactory)
+	 */
 	@API(status = INTERNAL, since = "5.9.1")
 	public interface TimeoutFailureFactory<T extends Throwable> {
+
+		/**
+		 * Create a failure for the given timeout, message, and cause.
+		 *
+		 * @return timeout failure; never {@code null}
+		 */
 		T createTimeoutFailure(Duration timeout, Supplier<String> messageSupplier, Throwable cause);
 	}
 }

From c05cb99dd64f5fc882b4abd3f8090197156c3d30 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 16:11:54 +0200
Subject: [PATCH 0939/1433] Avoid extra instance creation

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 119 ++++++++----------
 1 file changed, 50 insertions(+), 69 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index ff12f010f17e..f02648bf65d6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -39,9 +39,6 @@
  */
 class AssertTimeout {
 
-	private static final PreemptiveTimeoutAssertionExecutor<AssertionFailedError> ASSERTION_ERROR_TIMEOUT_EXECUTOR = new PreemptiveTimeoutAssertionExecutor<>(
-		new AssertionTimeoutFailureFactory());
-
 	private AssertTimeout() {
 		/* no-op */
 	}
@@ -117,82 +114,79 @@ static void assertTimeoutPreemptively(Duration timeout, Executable executable, S
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier) {
-		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, null);
+		return assertTimeoutPreemptively(timeout, supplier, null, AssertTimeout::createAssertionFailure);
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier, String message) {
-		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier,
-			message == null ? null : () -> message);
+		return assertTimeoutPreemptively(timeout, supplier, message == null ? null : () -> message,
+			AssertTimeout::createAssertionFailure);
 	}
 
 	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
 			Supplier<String> messageSupplier) {
-		return ASSERTION_ERROR_TIMEOUT_EXECUTOR.executeThrowing(timeout, supplier, messageSupplier);
+		return assertTimeoutPreemptively(timeout, supplier, messageSupplier, AssertTimeout::createAssertionFailure);
 	}
 
 	static <T, E extends Throwable> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
 			Supplier<String> messageSupplier, TimeoutFailureFactory<E> failureFactory) throws E {
-		return new PreemptiveTimeoutAssertionExecutor<>(failureFactory).executeThrowing(timeout, supplier,
-			messageSupplier);
-	}
-
-	static class PreemptiveTimeoutAssertionExecutor<T extends Throwable> {
-		private final TimeoutFailureFactory<T> failureFactory;
+		AtomicReference<Thread> threadReference = new AtomicReference<>();
+		ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
 
-		PreemptiveTimeoutAssertionExecutor(TimeoutFailureFactory<T> failureFactory) {
-			this.failureFactory = failureFactory;
+		try {
+			Future<T> future = submitTask(supplier, threadReference, executorService);
+			return resolveFutureAndHandleException(future, timeout, messageSupplier, threadReference::get,
+				failureFactory);
 		}
+		finally {
+			executorService.shutdownNow();
+		}
+	}
 
-		<V> V executeThrowing(Duration timeout, ThrowingSupplier<V> supplier, Supplier<String> messageSupplier)
-				throws T {
-			AtomicReference<Thread> threadReference = new AtomicReference<>();
-			ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
-
+	private static <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<Thread> threadReference,
+			ExecutorService executorService) {
+		return executorService.submit(() -> {
 			try {
-				Future<V> future = submitTask(supplier, threadReference, executorService);
-				return resolveFutureAndHandleException(future, timeout, messageSupplier, threadReference::get);
+				threadReference.set(Thread.currentThread());
+				return supplier.get();
 			}
-			finally {
-				executorService.shutdownNow();
+			catch (Throwable throwable) {
+				throw throwAsUncheckedException(throwable);
 			}
-		}
+		});
+	}
 
-		private <V> Future<V> submitTask(ThrowingSupplier<V> supplier, AtomicReference<Thread> threadReference,
-				ExecutorService executorService) {
-			return executorService.submit(() -> {
-				try {
-					threadReference.set(Thread.currentThread());
-					return supplier.get();
-				}
-				catch (Throwable throwable) {
-					throw throwAsUncheckedException(throwable);
-				}
-			});
+	private static <T, E extends Throwable> T resolveFutureAndHandleException(Future<T> future, Duration timeout,
+			Supplier<String> messageSupplier, Supplier<Thread> threadSupplier, TimeoutFailureFactory<E> failureFactory)
+			throws E {
+		try {
+			return future.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
 		}
-
-		private <V> V resolveFutureAndHandleException(Future<V> future, Duration timeout,
-				Supplier<String> messageSupplier, Supplier<Thread> threadSupplier) throws T {
-			try {
-				return future.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
-			}
-			catch (TimeoutException ex) {
-				Thread thread = threadSupplier.get();
-				ExecutionTimeoutException cause = null;
-				if (thread != null) {
-					cause = new ExecutionTimeoutException("Execution timed out in thread " + thread.getName());
-					cause.setStackTrace(thread.getStackTrace());
-				}
-				throw failureFactory.createTimeoutFailure(timeout, messageSupplier, cause);
-			}
-			catch (ExecutionException ex) {
-				throw throwAsUncheckedException(ex.getCause());
-			}
-			catch (Throwable ex) {
-				throw throwAsUncheckedException(ex);
+		catch (TimeoutException ex) {
+			Thread thread = threadSupplier.get();
+			ExecutionTimeoutException cause = null;
+			if (thread != null) {
+				cause = new ExecutionTimeoutException("Execution timed out in thread " + thread.getName());
+				cause.setStackTrace(thread.getStackTrace());
 			}
+			throw failureFactory.createTimeoutFailure(timeout, messageSupplier, cause);
+		}
+		catch (ExecutionException ex) {
+			throw throwAsUncheckedException(ex.getCause());
+		}
+		catch (Throwable ex) {
+			throw throwAsUncheckedException(ex);
 		}
 	}
 
+	private static AssertionFailedError createAssertionFailure(Duration timeout, Supplier<String> messageSupplier,
+			Throwable cause) {
+		return assertionFailure() //
+				.message(messageSupplier) //
+				.reason("execution timed out after " + timeout.toMillis() + " ms") //
+				.cause(cause) //
+				.build();
+	}
+
 	private static class ExecutionTimeoutException extends JUnitException {
 
 		private static final long serialVersionUID = 1L;
@@ -214,17 +208,4 @@ public Thread newThread(Runnable r) {
 			return new Thread(r, "junit-timeout-thread-" + threadNumber.getAndIncrement());
 		}
 	}
-
-	private static class AssertionTimeoutFailureFactory implements TimeoutFailureFactory<AssertionFailedError> {
-
-		@Override
-		public AssertionFailedError createTimeoutFailure(Duration timeout, Supplier<String> messageSupplier,
-				Throwable cause) {
-			return assertionFailure() //
-					.message(messageSupplier) //
-					.reason("execution timed out after " + timeout.toMillis() + " ms") //
-					.cause(cause) //
-					.build();
-		}
-	}
 }

From 11f8f765da25ce848be14c0d7313ae33db8b72f8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 16:22:22 +0200
Subject: [PATCH 0940/1433] Extract AssertTimeoutPreemptively from
 AssertTimeout

---
 .../org/junit/jupiter/api/AssertTimeout.java  | 125 ---------
 .../api/AssertTimeoutPreemptively.java        | 156 +++++++++++
 .../org/junit/jupiter/api/Assertions.java     |  14 +-
 .../api/AssertTimeoutAssertionsTests.java     | 221 +--------------
 ...ertTimeoutPreemptivelyAssertionsTests.java | 255 ++++++++++++++++++
 5 files changed, 420 insertions(+), 351 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index f02648bf65d6..93c7c11f8a71 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -14,22 +14,10 @@
 import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
 
 import java.time.Duration;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
-import org.junit.jupiter.api.Assertions.TimeoutFailureFactory;
 import org.junit.jupiter.api.function.Executable;
 import org.junit.jupiter.api.function.ThrowingSupplier;
-import org.junit.platform.commons.JUnitException;
-import org.opentest4j.AssertionFailedError;
 
 /**
  * {@code AssertTimeout} is a collection of utility methods that support asserting
@@ -95,117 +83,4 @@ private static <T> T assertTimeout(Duration timeout, ThrowingSupplier<T> supplie
 		return result;
 	}
 
-	static void assertTimeoutPreemptively(Duration timeout, Executable executable) {
-		assertTimeoutPreemptively(timeout, executable, (String) null);
-	}
-
-	static void assertTimeoutPreemptively(Duration timeout, Executable executable, String message) {
-		assertTimeoutPreemptively(timeout, () -> {
-			executable.execute();
-			return null;
-		}, message);
-	}
-
-	static void assertTimeoutPreemptively(Duration timeout, Executable executable, Supplier<String> messageSupplier) {
-		assertTimeoutPreemptively(timeout, () -> {
-			executable.execute();
-			return null;
-		}, messageSupplier);
-	}
-
-	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier) {
-		return assertTimeoutPreemptively(timeout, supplier, null, AssertTimeout::createAssertionFailure);
-	}
-
-	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier, String message) {
-		return assertTimeoutPreemptively(timeout, supplier, message == null ? null : () -> message,
-			AssertTimeout::createAssertionFailure);
-	}
-
-	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
-			Supplier<String> messageSupplier) {
-		return assertTimeoutPreemptively(timeout, supplier, messageSupplier, AssertTimeout::createAssertionFailure);
-	}
-
-	static <T, E extends Throwable> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
-			Supplier<String> messageSupplier, TimeoutFailureFactory<E> failureFactory) throws E {
-		AtomicReference<Thread> threadReference = new AtomicReference<>();
-		ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
-
-		try {
-			Future<T> future = submitTask(supplier, threadReference, executorService);
-			return resolveFutureAndHandleException(future, timeout, messageSupplier, threadReference::get,
-				failureFactory);
-		}
-		finally {
-			executorService.shutdownNow();
-		}
-	}
-
-	private static <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<Thread> threadReference,
-			ExecutorService executorService) {
-		return executorService.submit(() -> {
-			try {
-				threadReference.set(Thread.currentThread());
-				return supplier.get();
-			}
-			catch (Throwable throwable) {
-				throw throwAsUncheckedException(throwable);
-			}
-		});
-	}
-
-	private static <T, E extends Throwable> T resolveFutureAndHandleException(Future<T> future, Duration timeout,
-			Supplier<String> messageSupplier, Supplier<Thread> threadSupplier, TimeoutFailureFactory<E> failureFactory)
-			throws E {
-		try {
-			return future.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
-		}
-		catch (TimeoutException ex) {
-			Thread thread = threadSupplier.get();
-			ExecutionTimeoutException cause = null;
-			if (thread != null) {
-				cause = new ExecutionTimeoutException("Execution timed out in thread " + thread.getName());
-				cause.setStackTrace(thread.getStackTrace());
-			}
-			throw failureFactory.createTimeoutFailure(timeout, messageSupplier, cause);
-		}
-		catch (ExecutionException ex) {
-			throw throwAsUncheckedException(ex.getCause());
-		}
-		catch (Throwable ex) {
-			throw throwAsUncheckedException(ex);
-		}
-	}
-
-	private static AssertionFailedError createAssertionFailure(Duration timeout, Supplier<String> messageSupplier,
-			Throwable cause) {
-		return assertionFailure() //
-				.message(messageSupplier) //
-				.reason("execution timed out after " + timeout.toMillis() + " ms") //
-				.cause(cause) //
-				.build();
-	}
-
-	private static class ExecutionTimeoutException extends JUnitException {
-
-		private static final long serialVersionUID = 1L;
-
-		ExecutionTimeoutException(String message) {
-			super(message);
-		}
-	}
-
-	/**
-	 * The thread factory used for preemptive timeout.
-	 * <p>
-	 * The factory creates threads with meaningful names, helpful for debugging purposes.
-	 */
-	private static class TimeoutThreadFactory implements ThreadFactory {
-		private static final AtomicInteger threadNumber = new AtomicInteger(1);
-
-		public Thread newThread(Runnable r) {
-			return new Thread(r, "junit-timeout-thread-" + threadNumber.getAndIncrement());
-		}
-	}
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java
new file mode 100644
index 000000000000..94534171dd01
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
+import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
+
+import java.time.Duration;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.function.Executable;
+import org.junit.jupiter.api.function.ThrowingSupplier;
+import org.junit.platform.commons.JUnitException;
+import org.opentest4j.AssertionFailedError;
+
+/**
+ * {@code AssertTimeout} is a collection of utility methods that support asserting
+ * the execution of the code under test did not take longer than the timeout duration
+ * using a preemptive approach.
+ *
+ * @since 5.9.1
+ */
+class AssertTimeoutPreemptively {
+
+	static void assertTimeoutPreemptively(Duration timeout, Executable executable) {
+		assertTimeoutPreemptively(timeout, executable, (String) null);
+	}
+
+	static void assertTimeoutPreemptively(Duration timeout, Executable executable, String message) {
+		assertTimeoutPreemptively(timeout, () -> {
+			executable.execute();
+			return null;
+		}, message);
+	}
+
+	static void assertTimeoutPreemptively(Duration timeout, Executable executable, Supplier<String> messageSupplier) {
+		assertTimeoutPreemptively(timeout, () -> {
+			executable.execute();
+			return null;
+		}, messageSupplier);
+	}
+
+	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier) {
+		return assertTimeoutPreemptively(timeout, supplier, null, AssertTimeoutPreemptively::createAssertionFailure);
+	}
+
+	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier, String message) {
+		return assertTimeoutPreemptively(timeout, supplier, message == null ? null : () -> message,
+			AssertTimeoutPreemptively::createAssertionFailure);
+	}
+
+	static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
+			Supplier<String> messageSupplier) {
+		return assertTimeoutPreemptively(timeout, supplier, messageSupplier,
+			AssertTimeoutPreemptively::createAssertionFailure);
+	}
+
+	static <T, E extends Throwable> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
+			Supplier<String> messageSupplier, Assertions.TimeoutFailureFactory<E> failureFactory) throws E {
+		AtomicReference<Thread> threadReference = new AtomicReference<>();
+		ExecutorService executorService = Executors.newSingleThreadExecutor(new TimeoutThreadFactory());
+
+		try {
+			Future<T> future = submitTask(supplier, threadReference, executorService);
+			return resolveFutureAndHandleException(future, timeout, messageSupplier, threadReference::get,
+				failureFactory);
+		}
+		finally {
+			executorService.shutdownNow();
+		}
+	}
+
+	private static <T> Future<T> submitTask(ThrowingSupplier<T> supplier, AtomicReference<Thread> threadReference,
+			ExecutorService executorService) {
+		return executorService.submit(() -> {
+			try {
+				threadReference.set(Thread.currentThread());
+				return supplier.get();
+			}
+			catch (Throwable throwable) {
+				throw throwAsUncheckedException(throwable);
+			}
+		});
+	}
+
+	private static <T, E extends Throwable> T resolveFutureAndHandleException(Future<T> future, Duration timeout,
+			Supplier<String> messageSupplier, Supplier<Thread> threadSupplier,
+			Assertions.TimeoutFailureFactory<E> failureFactory) throws E {
+		try {
+			return future.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
+		}
+		catch (TimeoutException ex) {
+			Thread thread = threadSupplier.get();
+			ExecutionTimeoutException cause = null;
+			if (thread != null) {
+				cause = new ExecutionTimeoutException("Execution timed out in thread " + thread.getName());
+				cause.setStackTrace(thread.getStackTrace());
+			}
+			throw failureFactory.createTimeoutFailure(timeout, messageSupplier, cause);
+		}
+		catch (ExecutionException ex) {
+			throw throwAsUncheckedException(ex.getCause());
+		}
+		catch (Throwable ex) {
+			throw throwAsUncheckedException(ex);
+		}
+	}
+
+	private static AssertionFailedError createAssertionFailure(Duration timeout, Supplier<String> messageSupplier,
+			Throwable cause) {
+		return assertionFailure() //
+				.message(messageSupplier) //
+				.reason("execution timed out after " + timeout.toMillis() + " ms") //
+				.cause(cause) //
+				.build();
+	}
+
+	private static class ExecutionTimeoutException extends JUnitException {
+
+		private static final long serialVersionUID = 1L;
+
+		ExecutionTimeoutException(String message) {
+			super(message);
+		}
+	}
+
+	/**
+	 * The thread factory used for preemptive timeout.
+	 * <p>
+	 * The factory creates threads with meaningful names, helpful for debugging purposes.
+	 */
+	private static class TimeoutThreadFactory implements ThreadFactory {
+		private static final AtomicInteger threadNumber = new AtomicInteger(1);
+
+		public Thread newThread(Runnable r) {
+			return new Thread(r, "junit-timeout-thread-" + threadNumber.getAndIncrement());
+		}
+	}
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index e30cf6e043ed..62fefbe630fb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -3396,7 +3396,7 @@ public static <T> T assertTimeout(Duration timeout, ThrowingSupplier<T> supplier
 	 * @see #assertTimeout(Duration, Executable)
 	 */
 	public static void assertTimeoutPreemptively(Duration timeout, Executable executable) {
-		AssertTimeout.assertTimeoutPreemptively(timeout, executable);
+		AssertTimeoutPreemptively.assertTimeoutPreemptively(timeout, executable);
 	}
 
 	/**
@@ -3419,7 +3419,7 @@ public static void assertTimeoutPreemptively(Duration timeout, Executable execut
 	 * @see #assertTimeout(Duration, Executable, String)
 	 */
 	public static void assertTimeoutPreemptively(Duration timeout, Executable executable, String message) {
-		AssertTimeout.assertTimeoutPreemptively(timeout, executable, message);
+		AssertTimeoutPreemptively.assertTimeoutPreemptively(timeout, executable, message);
 	}
 
 	/**
@@ -3444,7 +3444,7 @@ public static void assertTimeoutPreemptively(Duration timeout, Executable execut
 	 */
 	public static void assertTimeoutPreemptively(Duration timeout, Executable executable,
 			Supplier<String> messageSupplier) {
-		AssertTimeout.assertTimeoutPreemptively(timeout, executable, messageSupplier);
+		AssertTimeoutPreemptively.assertTimeoutPreemptively(timeout, executable, messageSupplier);
 	}
 
 	// --- supplier - preemptively ---
@@ -3469,7 +3469,7 @@ public static void assertTimeoutPreemptively(Duration timeout, Executable execut
 	 * @see #assertTimeout(Duration, Executable)
 	 */
 	public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier) {
-		return AssertTimeout.assertTimeoutPreemptively(timeout, supplier);
+		return AssertTimeoutPreemptively.assertTimeoutPreemptively(timeout, supplier);
 	}
 
 	/**
@@ -3494,7 +3494,7 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 	 * @see #assertTimeout(Duration, Executable, String)
 	 */
 	public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier, String message) {
-		return AssertTimeout.assertTimeoutPreemptively(timeout, supplier, message);
+		return AssertTimeoutPreemptively.assertTimeoutPreemptively(timeout, supplier, message);
 	}
 
 	/**
@@ -3521,7 +3521,7 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 	 */
 	public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
 			Supplier<String> messageSupplier) {
-		return AssertTimeout.assertTimeoutPreemptively(timeout, supplier, messageSupplier);
+		return AssertTimeoutPreemptively.assertTimeoutPreemptively(timeout, supplier, messageSupplier);
 	}
 
 	/**
@@ -3553,7 +3553,7 @@ public static <T> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier
 	@API(status = INTERNAL, since = "5.9.1")
 	public static <T, E extends Throwable> T assertTimeoutPreemptively(Duration timeout, ThrowingSupplier<T> supplier,
 			Supplier<String> messageSupplier, TimeoutFailureFactory<E> failureFactory) throws E {
-		return AssertTimeout.assertTimeoutPreemptively(timeout, supplier, messageSupplier, failureFactory);
+		return AssertTimeoutPreemptively.assertTimeoutPreemptively(timeout, supplier, messageSupplier, failureFactory);
 	}
 
 	// --- assertInstanceOf ----------------------------------------------------
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index e0a17bfa96db..0dfd4e7d6e13 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -11,40 +11,28 @@
 package org.junit.jupiter.api;
 
 import static java.time.Duration.ofMillis;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTimeout;
-import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.condition.OS.WINDOWS;
 
-import java.time.Duration;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.function.Executable;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.opentest4j.AssertionFailedError;
 
 /**
- * Unit tests for JUnit Jupiter {@link Assertions}.
+ * Unit tests for {@link AssertTimeout}.
  *
  * @since 5.0
  */
 class AssertTimeoutAssertionsTests {
 
-	private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(WINDOWS.isCurrentOs() ? 1000 : 100);
-	private static final Assertions.TimeoutFailureFactory<TimeoutException> TIMEOUT_EXCEPTION_FACTORY = (__, ___,
-			____) -> new TimeoutException();
-
-	private static ThreadLocal<AtomicBoolean> changed = ThreadLocal.withInitial(() -> new AtomicBoolean(false));
+	private static final ThreadLocal<AtomicBoolean> changed = ThreadLocal.withInitial(() -> new AtomicBoolean(false));
 
 	private final Executable nix = () -> {
 	};
@@ -166,191 +154,6 @@ void assertTimeoutWithMessageSupplierForSupplierThatCompletesAfterTheTimeout() {
 		assertMessageStartsWith(error, "Tempus Fugit ==> execution exceeded timeout of 10 ms by");
 	}
 
-	// -- executable - preemptively ---
-
-	@Test
-	void assertTimeoutPreemptivelyForExecutableThatCompletesBeforeTheTimeout() {
-		changed.get().set(false);
-		assertTimeoutPreemptively(ofMillis(500), () -> changed.get().set(true));
-		assertFalse(changed.get().get(), "should have executed in a different thread");
-		assertTimeoutPreemptively(ofMillis(500), nix, "message");
-		assertTimeoutPreemptively(ofMillis(500), nix, () -> "message");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyForExecutableThatThrowsAnException() {
-		RuntimeException exception = assertThrows(RuntimeException.class,
-			() -> assertTimeoutPreemptively(ofMillis(500), () -> {
-				throw new RuntimeException("not this time");
-			}));
-		assertMessageEquals(exception, "not this time");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyForExecutableThatThrowsAnAssertionFailedError() {
-		AssertionFailedError exception = assertThrows(AssertionFailedError.class,
-			() -> assertTimeoutPreemptively(ofMillis(500), () -> fail("enigma")));
-		assertMessageEquals(exception, "enigma");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyForExecutableThatCompletesAfterTheTimeout() {
-		AssertionFailedError error = assertThrows(AssertionFailedError.class,
-			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt));
-		assertMessageEquals(error, "execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
-		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
-		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyWithMessageForExecutableThatCompletesAfterTheTimeout() {
-		AssertionFailedError error = assertThrows(AssertionFailedError.class,
-			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt, "Tempus Fugit"));
-		assertMessageEquals(error,
-			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
-		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
-		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyWithMessageSupplierForExecutableThatCompletesAfterTheTimeout() {
-		AssertionFailedError error = assertThrows(AssertionFailedError.class,
-			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt,
-				() -> "Tempus" + " " + "Fugit"));
-		assertMessageEquals(error,
-			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
-		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
-		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyWithMessageSupplierForExecutableThatCompletesBeforeTheTimeout() {
-		assertTimeoutPreemptively(ofMillis(500), nix, () -> "Tempus" + " " + "Fugit");
-	}
-
-	// -- supplier - preemptively ---
-
-	@Test
-	void assertTimeoutPreemptivelyForSupplierThatCompletesBeforeTheTimeout() {
-		changed.get().set(false);
-		String result = assertTimeoutPreemptively(ofMillis(500), () -> {
-			changed.get().set(true);
-			return "Tempus Fugit";
-		});
-		assertFalse(changed.get().get(), "should have executed in a different thread");
-		assertEquals("Tempus Fugit", result);
-		assertEquals("Tempus Fugit", assertTimeoutPreemptively(ofMillis(500), () -> "Tempus Fugit", "message"));
-		assertEquals("Tempus Fugit", assertTimeoutPreemptively(ofMillis(500), () -> "Tempus Fugit", () -> "message"));
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyForSupplierThatThrowsAnException() {
-		RuntimeException exception = assertThrows(RuntimeException.class, () -> {
-			assertTimeoutPreemptively(ofMillis(500), () -> {
-				ExceptionUtils.throwAsUncheckedException(new RuntimeException("not this time"));
-				return "Tempus Fugit";
-			});
-		});
-		assertMessageEquals(exception, "not this time");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyForSupplierThatThrowsAnAssertionFailedError() {
-		AssertionFailedError exception = assertThrows(AssertionFailedError.class, () -> {
-			assertTimeoutPreemptively(ofMillis(500), () -> {
-				fail("enigma");
-				return "Tempus Fugit";
-			});
-		});
-		assertMessageEquals(exception, "enigma");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyForSupplierThatCompletesAfterTheTimeout() {
-		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
-			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
-				waitForInterrupt();
-				return "Tempus Fugit";
-			});
-		});
-
-		assertMessageEquals(error, "execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
-		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
-		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyWithMessageForSupplierThatCompletesAfterTheTimeout() {
-		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
-			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
-				waitForInterrupt();
-				return "Tempus Fugit";
-			}, "Tempus Fugit");
-		});
-
-		assertMessageEquals(error,
-			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
-		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
-		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyWithMessageSupplierForSupplierThatCompletesAfterTheTimeout() {
-		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
-			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
-				waitForInterrupt();
-				return "Tempus Fugit";
-			}, () -> "Tempus" + " " + "Fugit");
-		});
-
-		assertMessageEquals(error,
-			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
-		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
-		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyUsesThreadsWithSpecificNamePrefix() {
-		AtomicReference<String> threadName = new AtomicReference<>("");
-		assertTimeoutPreemptively(ofMillis(1000), () -> threadName.set(Thread.currentThread().getName()));
-		assertTrue(threadName.get().startsWith("junit-timeout-thread-"),
-			"Thread name does not match the expected prefix");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesAfterTheTimeout() {
-		assertThrows(TimeoutException.class, () -> Assertions.assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
-			waitForInterrupt();
-			return "Tempus Fugit";
-		}, () -> "Tempus Fugit", TIMEOUT_EXCEPTION_FACTORY));
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatThrowsAnAssertionFailedError() {
-		AssertionFailedError exception = assertThrows(AssertionFailedError.class,
-			() -> Assertions.assertTimeoutPreemptively(ofMillis(500), () -> fail("enigma"), () -> "Tempus Fugit",
-				TIMEOUT_EXCEPTION_FACTORY));
-		assertMessageEquals(exception, "enigma");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatThrowsAnException() {
-		RuntimeException exception = assertThrows(RuntimeException.class,
-			() -> Assertions.assertTimeoutPreemptively(ofMillis(500),
-				() -> ExceptionUtils.throwAsUncheckedException(new RuntimeException(":(")), () -> "Tempus Fugit",
-				TIMEOUT_EXCEPTION_FACTORY));
-		assertMessageEquals(exception, ":(");
-	}
-
-	@Test
-	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesBeforeTimeout()
-			throws Exception {
-		var result = Assertions.assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> "Tempus Fugit",
-			() -> "Tempus Fugit", TIMEOUT_EXCEPTION_FACTORY);
-
-		assertThat(result).isEqualTo("Tempus Fugit");
-	}
-
 	/**
 	 * Take a nap for 100 milliseconds.
 	 */
@@ -362,24 +165,4 @@ private void nap() throws InterruptedException {
 		} while (System.currentTimeMillis() - start < 100);
 	}
 
-	private void waitForInterrupt() {
-		try {
-			assertFalse(Thread.interrupted(), "Already interrupted");
-			new CountDownLatch(1).await();
-		}
-		catch (InterruptedException ignore) {
-			// ignore
-		}
-	}
-
-	/**
-	 * Assert the given stack trace elements contain an element with the given class name and method name.
-	 */
-	private static void assertStackTraceContains(StackTraceElement[] stackTrace, String className, String methodName) {
-		assertThat(stackTrace).anySatisfy(element -> {
-			assertThat(element.getClassName()).endsWith(className);
-			assertThat(element.getMethodName()).isEqualTo(methodName);
-		});
-	}
-
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java
new file mode 100644
index 000000000000..1f4d453cd698
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api;
+
+import static java.time.Duration.ofMillis;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.AssertionTestUtils.assertMessageEquals;
+import static org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.condition.OS.WINDOWS;
+
+import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.jupiter.api.function.Executable;
+import org.junit.platform.commons.util.ExceptionUtils;
+import org.opentest4j.AssertionFailedError;
+
+/**
+ * Unit tests for {@link AssertTimeoutPreemptively}.
+ *
+ * @since 5.0
+ */
+class AssertTimeoutPreemptivelyAssertionsTests {
+
+	private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(WINDOWS.isCurrentOs() ? 1000 : 100);
+	private static final Assertions.TimeoutFailureFactory<TimeoutException> TIMEOUT_EXCEPTION_FACTORY = (__, ___,
+			____) -> new TimeoutException();
+
+	private static final ThreadLocal<AtomicBoolean> changed = ThreadLocal.withInitial(() -> new AtomicBoolean(false));
+
+	private final Executable nix = () -> {
+	};
+
+	// --- executable ----------------------------------------------------------
+
+	@Test
+	void assertTimeoutPreemptivelyForExecutableThatCompletesBeforeTheTimeout() {
+		changed.get().set(false);
+		assertTimeoutPreemptively(ofMillis(500), () -> changed.get().set(true));
+		assertFalse(changed.get().get(), "should have executed in a different thread");
+		assertTimeoutPreemptively(ofMillis(500), nix, "message");
+		assertTimeoutPreemptively(ofMillis(500), nix, () -> "message");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyForExecutableThatThrowsAnException() {
+		RuntimeException exception = assertThrows(RuntimeException.class,
+			() -> assertTimeoutPreemptively(ofMillis(500), () -> {
+				throw new RuntimeException("not this time");
+			}));
+		assertMessageEquals(exception, "not this time");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyForExecutableThatThrowsAnAssertionFailedError() {
+		AssertionFailedError exception = assertThrows(AssertionFailedError.class,
+			() -> assertTimeoutPreemptively(ofMillis(500), () -> fail("enigma")));
+		assertMessageEquals(exception, "enigma");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyForExecutableThatCompletesAfterTheTimeout() {
+		AssertionFailedError error = assertThrows(AssertionFailedError.class,
+			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt));
+		assertMessageEquals(error, "execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
+		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
+		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyWithMessageForExecutableThatCompletesAfterTheTimeout() {
+		AssertionFailedError error = assertThrows(AssertionFailedError.class,
+			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt, "Tempus Fugit"));
+		assertMessageEquals(error,
+			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
+		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
+		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyWithMessageSupplierForExecutableThatCompletesAfterTheTimeout() {
+		AssertionFailedError error = assertThrows(AssertionFailedError.class,
+			() -> assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, this::waitForInterrupt,
+				() -> "Tempus" + " " + "Fugit"));
+		assertMessageEquals(error,
+			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
+		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
+		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyWithMessageSupplierForExecutableThatCompletesBeforeTheTimeout() {
+		assertTimeoutPreemptively(ofMillis(500), nix, () -> "Tempus" + " " + "Fugit");
+	}
+
+	// --- supplier ------------------------------------------------------------
+
+	@Test
+	void assertTimeoutPreemptivelyForSupplierThatCompletesBeforeTheTimeout() {
+		changed.get().set(false);
+		String result = assertTimeoutPreemptively(ofMillis(500), () -> {
+			changed.get().set(true);
+			return "Tempus Fugit";
+		});
+		assertFalse(changed.get().get(), "should have executed in a different thread");
+		assertEquals("Tempus Fugit", result);
+		assertEquals("Tempus Fugit", assertTimeoutPreemptively(ofMillis(500), () -> "Tempus Fugit", "message"));
+		assertEquals("Tempus Fugit", assertTimeoutPreemptively(ofMillis(500), () -> "Tempus Fugit", () -> "message"));
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyForSupplierThatThrowsAnException() {
+		RuntimeException exception = assertThrows(RuntimeException.class, () -> {
+			assertTimeoutPreemptively(ofMillis(500), () -> {
+				ExceptionUtils.throwAsUncheckedException(new RuntimeException("not this time"));
+				return "Tempus Fugit";
+			});
+		});
+		assertMessageEquals(exception, "not this time");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyForSupplierThatThrowsAnAssertionFailedError() {
+		AssertionFailedError exception = assertThrows(AssertionFailedError.class, () -> {
+			assertTimeoutPreemptively(ofMillis(500), () -> {
+				fail("enigma");
+				return "Tempus Fugit";
+			});
+		});
+		assertMessageEquals(exception, "enigma");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyForSupplierThatCompletesAfterTheTimeout() {
+		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
+			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
+				waitForInterrupt();
+				return "Tempus Fugit";
+			});
+		});
+
+		assertMessageEquals(error, "execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
+		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
+		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyWithMessageForSupplierThatCompletesAfterTheTimeout() {
+		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
+			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
+				waitForInterrupt();
+				return "Tempus Fugit";
+			}, "Tempus Fugit");
+		});
+
+		assertMessageEquals(error,
+			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
+		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
+		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyWithMessageSupplierForSupplierThatCompletesAfterTheTimeout() {
+		AssertionFailedError error = assertThrows(AssertionFailedError.class, () -> {
+			assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
+				waitForInterrupt();
+				return "Tempus Fugit";
+			}, () -> "Tempus" + " " + "Fugit");
+		});
+
+		assertMessageEquals(error,
+			"Tempus Fugit ==> execution timed out after " + PREEMPTIVE_TIMEOUT.toMillis() + " ms");
+		assertMessageStartsWith(error.getCause(), "Execution timed out in ");
+		assertStackTraceContains(error.getCause().getStackTrace(), "CountDownLatch", "await");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyUsesThreadsWithSpecificNamePrefix() {
+		AtomicReference<String> threadName = new AtomicReference<>("");
+		assertTimeoutPreemptively(ofMillis(1000), () -> threadName.set(Thread.currentThread().getName()));
+		assertTrue(threadName.get().startsWith("junit-timeout-thread-"),
+			"Thread name does not match the expected prefix");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesAfterTheTimeout() {
+		assertThrows(TimeoutException.class, () -> Assertions.assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> {
+			waitForInterrupt();
+			return "Tempus Fugit";
+		}, () -> "Tempus Fugit", TIMEOUT_EXCEPTION_FACTORY));
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatThrowsAnAssertionFailedError() {
+		AssertionFailedError exception = assertThrows(AssertionFailedError.class,
+			() -> Assertions.assertTimeoutPreemptively(ofMillis(500), () -> fail("enigma"), () -> "Tempus Fugit",
+				TIMEOUT_EXCEPTION_FACTORY));
+		assertMessageEquals(exception, "enigma");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatThrowsAnException() {
+		RuntimeException exception = assertThrows(RuntimeException.class,
+			() -> Assertions.assertTimeoutPreemptively(ofMillis(500),
+				() -> ExceptionUtils.throwAsUncheckedException(new RuntimeException(":(")), () -> "Tempus Fugit",
+				TIMEOUT_EXCEPTION_FACTORY));
+		assertMessageEquals(exception, ":(");
+	}
+
+	@Test
+	void assertTimeoutPreemptivelyThrowingTimeoutExceptionWithMessageForSupplierThatCompletesBeforeTimeout()
+			throws Exception {
+		var result = Assertions.assertTimeoutPreemptively(PREEMPTIVE_TIMEOUT, () -> "Tempus Fugit",
+			() -> "Tempus Fugit", TIMEOUT_EXCEPTION_FACTORY);
+
+		assertThat(result).isEqualTo("Tempus Fugit");
+	}
+
+	private void waitForInterrupt() {
+		try {
+			assertFalse(Thread.interrupted(), "Already interrupted");
+			new CountDownLatch(1).await();
+		}
+		catch (InterruptedException ignore) {
+			// ignore
+		}
+	}
+
+	/**
+	 * Assert the given stack trace elements contain an element with the given class name and method name.
+	 */
+	private static void assertStackTraceContains(StackTraceElement[] stackTrace, String className, String methodName) {
+		assertThat(stackTrace).anySatisfy(element -> {
+			assertThat(element.getClassName()).endsWith(className);
+			assertThat(element.getMethodName()).isEqualTo(methodName);
+		});
+	}
+}

From 3d96304afdfa328c086d2e39e5e61fd8bc103d71 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 16:24:58 +0200
Subject: [PATCH 0941/1433] Reinstate test

---
 .../engine/extension/SeparateThreadTimeoutInvocationTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
index 5f8e867b3c86..a5355fa63682 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
@@ -47,7 +47,8 @@ void throwsTimeoutException() {
 
 		assertThatThrownBy(invocation::proceed) //
 				.hasMessage("method() timed out after " + PREEMPTIVE_TIMEOUT_MILLIS + " milliseconds") //
-				.isInstanceOf(TimeoutException.class);
+				.isInstanceOf(TimeoutException.class) //
+				.hasRootCauseMessage("Execution timed out in thread " + threadName.get());
 	}
 
 	@Test

From 8f6776fe0e13647d80aab87898f4e211569c47fd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 9 Sep 2022 16:30:16 +0200
Subject: [PATCH 0942/1433] Add to release notes

---
 .../src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
index 8827a8633af6..8457ce84a733 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -40,6 +40,8 @@ on GitHub.
   references a factory method whose name is the same as other non-factory methods in the
   same class no longer fails with an exception stating that multiple factory methods with
   the same name were found.
+* Assertion failures thrown from methods with applied timeouts using `ThreadMode.SEPARATE`
+  are now properly reported.
 
 ==== Deprecations and Breaking Changes
 

From 3a5da52a0b3f5af5aeb9d9914643b1274d3f854e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 10 Sep 2022 10:55:18 +0200
Subject: [PATCH 0943/1433] Attempt to stabilize test on Windows

---
 .../junit/jupiter/engine/extension/TimeoutExtensionTests.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 442d34c83e0a..012074155dbe 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -352,7 +352,7 @@ void timeoutExceededInSeparateThread() {
 			Throwable failure = execution.getTerminationInfo().getExecutionResult().getThrowable().orElseThrow();
 			assertThat(failure) //
 					.isInstanceOf(TimeoutException.class) //
-					.hasMessage("testMethod() timed out after 10 milliseconds");
+					.hasMessage("testMethod() timed out after 100 milliseconds");
 			assertThat(failure.getCause()) //
 					.hasMessageStartingWith("Execution timed out in ") //
 					.hasStackTraceContaining(TimeoutExceedingSeparateThreadTestCase.class.getName() + ".testMethod");
@@ -721,7 +721,7 @@ void testMethod() throws InterruptedException {
 
 	static class TimeoutExceedingSeparateThreadTestCase {
 		@Test
-		@Timeout(value = 10, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
+		@Timeout(value = 100, unit = MILLISECONDS, threadMode = SEPARATE_THREAD)
 		void testMethod() throws InterruptedException {
 			Thread.sleep(1000);
 		}

From 34ccae7301ae80324432763ecf645b42dc224fdc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 16 Sep 2022 13:39:12 +0200
Subject: [PATCH 0944/1433] Fix running tests in documentation from IntelliJ
 IDEA

---
 documentation/documentation.gradle.kts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index a8a96bd98f1c..721a35e1b06d 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -48,6 +48,9 @@ dependencies {
 	testRuntimeOnly(libs.apiguardian) {
 		because("it's required to generate API tables")
 	}
+	testRuntimeOnly(libs.openTestReporting.events) {
+		because("it's required to run tests via IntelliJ which does not consumed the shadowed jar of junit-platform-reporting")
+	}
 
 	testImplementation(libs.classgraph) {
 		because("ApiReportGenerator needs it")

From 34176c7abb43fb70d1b46dffc43f8ecda80a3084 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 16 Sep 2022 16:43:32 +0200
Subject: [PATCH 0945/1433] Introduce @EnabledInNativeImage &
 @DisabledInNativeImage conditions for GraalVM

Closes: #2830
---
 .../src/docs/asciidoc/link-attributes.adoc    |  6 +-
 .../asciidoc/user-guide/writing-tests.adoc    | 15 ++++
 .../example/ConditionalTestExecutionDemo.java | 16 ++++
 .../java/org/junit/jupiter/api/Disabled.java  |  2 +
 .../api/condition/DisabledForJreRange.java    | 16 ++--
 .../jupiter/api/condition/DisabledIf.java     |  6 +-
 .../DisabledIfEnvironmentVariable.java        | 16 ++--
 .../condition/DisabledIfSystemProperty.java   | 16 ++--
 .../api/condition/DisabledInNativeImage.java  | 76 +++++++++++++++++++
 .../jupiter/api/condition/DisabledOnJre.java  | 14 ++--
 .../jupiter/api/condition/DisabledOnOs.java   | 10 ++-
 .../api/condition/EnabledForJreRange.java     | 16 ++--
 .../jupiter/api/condition/EnabledIf.java      |  6 +-
 .../EnabledIfEnvironmentVariable.java         | 16 ++--
 .../condition/EnabledIfSystemProperty.java    | 16 ++--
 .../api/condition/EnabledInNativeImage.java   | 76 +++++++++++++++++++
 .../jupiter/api/condition/EnabledOnJre.java   | 14 ++--
 .../jupiter/api/condition/EnabledOnOs.java    | 10 ++-
 .../api/extension/ExecutionCondition.java     | 16 ++--
 19 files changed, 289 insertions(+), 74 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 820c808abb47..025ab6fc86d4 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -119,17 +119,19 @@ endif::[]
 :TestWatcher:                                {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/extension/TestWatcher.html[TestWatcher]
 // Jupiter Conditions
 :DisabledForJreRange:                        {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledForJreRange.html[@DisabledForJreRange]
+:DisabledIf:                                 {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledIf.html[@DisabledIf]
 :DisabledIfEnvironmentVariable:              {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.html[@DisabledIfEnvironmentVariable]
 :DisabledIfSystemProperty:                   {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledIfSystemProperty.html[@DisabledIfSystemProperty]
+:DisabledInNativeImage:                      {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledInNativeImage.html[@DisabledInNativeImage]
 :DisabledOnJre:                              {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledOnJre.html[@DisabledOnJre]
 :DisabledOnOs:                               {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledOnOs.html[@DisabledOnOs]
-:DisabledIf:                                 {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledIf.html[@DisabledIf]
 :EnabledForJreRange:                         {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/EnabledForJreRange.html[@EnabledForJreRange]
+:EnabledIf:                                  {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/EnabledIf.html[@EnabledIf]
 :EnabledIfEnvironmentVariable:               {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.html[@EnabledIfEnvironmentVariable]
 :EnabledIfSystemProperty:                    {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/EnabledIfSystemProperty.html[@EnabledIfSystemProperty]
+:EnabledInNativeImage:                       {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/EnabledInNativeImage.html[@EnabledInNativeImage]
 :EnabledOnJre:                               {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/EnabledOnJre.html[@EnabledOnJre]
 :EnabledOnOs:                                {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/EnabledOnOs.html[@EnabledOnOs]
-:EnabledIf:                                  {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/EnabledIf.html[@EnabledIf]
 :JRE:                                        {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/condition/JRE.html[JRE]
 // Jupiter I/O
 :TempDir:                                    {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/io/TempDir.html[@TempDir]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 83014d4668b3..6fb1838f63ec 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -453,6 +453,21 @@ half open ranges.
 include::{testDir}/example/ConditionalTestExecutionDemo.java[tags=user_guide_jre]
 ----
 
+[[writing-tests-conditional-execution-native]]
+==== Native Image Conditions
+
+A container or test may be enabled or disabled within a
+https://www.graalvm.org/reference-manual/native-image/[GraalVM native image] via the
+`{EnabledInNativeImage}` and `{DisabledInNativeImage}` annotations. These annotations are
+typically used when running tests within a native image using the Gradle and Maven
+plug-ins from the GraalVM https://graalvm.github.io/native-build-tools/latest/[Native
+Build Tools] project.
+
+[source,java,indent=0]
+----
+include::{testDir}/example/ConditionalTestExecutionDemo.java[tags=user_guide_native]
+----
+
 [[writing-tests-conditional-execution-system-properties]]
 ==== System Property Conditions
 
diff --git a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
index d4dea7b4f31f..a85031a1117c 100644
--- a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
+++ b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
@@ -28,12 +28,14 @@
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.DisabledInNativeImage;
 import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.EnabledIf;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledInNativeImage;
 import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 
@@ -153,6 +155,20 @@ void notFromJava8to11() {
 	}
 	// end::user_guide_jre[]
 
+	// tag::user_guide_native[]
+	@Test
+	@EnabledInNativeImage
+	void onlyWithinNativeImage() {
+		// ...
+	}
+
+	@Test
+	@DisabledInNativeImage
+	void neverWithinNativeImage() {
+		// ...
+	}
+	// end::user_guide_native[]
+
 	// tag::user_guide_system_property[]
 	@Test
 	@EnabledIfSystemProperty(named = "os.arch", matches = ".*64.*")
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
index 8961e0bdea7a..88b6f16d4b54 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
@@ -48,6 +48,8 @@
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
  * @see org.junit.jupiter.api.condition.EnabledOnOs
  * @see org.junit.jupiter.api.condition.DisabledOnOs
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.extension.ExecutionCondition
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
index 5c8cf34c34a6..be2edd9642e6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
@@ -51,17 +51,19 @@
  *
  * @since 5.6
  * @see JRE
- * @see org.junit.jupiter.api.condition.EnabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnJre
- * @see org.junit.jupiter.api.condition.DisabledOnJre
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  * @see org.junit.jupiter.api.condition.EnabledOnOs
  * @see org.junit.jupiter.api.condition.DisabledOnOs
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledOnJre
+ * @see org.junit.jupiter.api.condition.DisabledOnJre
+ * @see org.junit.jupiter.api.condition.EnabledForJreRange
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
  * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
index 56ef7a7fb194..0eb3bc627911 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
@@ -57,10 +57,12 @@
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
  * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
index e4583598c057..c32b693c5b03 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
@@ -52,17 +52,19 @@
  * given element.
  *
  * @since 5.1
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
  * @see org.junit.jupiter.api.condition.EnabledOnJre
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnOs
- * @see org.junit.jupiter.api.condition.DisabledOnOs
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
+ * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
index cda6efd2ce08..84f7c717f886 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
@@ -52,17 +52,19 @@
  * given element.
  *
  * @since 5.1
- * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
  * @see org.junit.jupiter.api.condition.EnabledOnJre
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnOs
- * @see org.junit.jupiter.api.condition.DisabledOnOs
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
+ * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java
new file mode 100644
index 000000000000..a51fa19a81ec
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.condition;
+
+import static org.apiguardian.api.API.Status.STABLE;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code @DisabledInNativeImage} is used to signal that the annotated test class
+ * or test method is only <em>disabled</em> when executing within a GraalVM native
+ * image.
+ *
+ * <p>When applied at the class level, all test methods within that class will
+ * be disabled within a native image.
+ *
+ * <p>If a test method is disabled via this annotation, that does not prevent
+ * the test class from being instantiated. Rather, it prevents the execution of
+ * the test method and method-level lifecycle callbacks such as {@code @BeforeEach}
+ * methods, {@code @AfterEach} methods, and corresponding extension APIs.
+ *
+ * <p>This annotation may be used as a meta-annotation in order to create a
+ * custom <em>composed annotation</em> that inherits the semantics of this
+ * annotation.
+ *
+ * <h2>Technical Details</h2>
+ *
+ * <p>JUnit detects whether tests are executing within a GraalVM native image by
+ * checking for the presence of the {@code org.graalvm.nativeimage.imagecode}
+ * system property (see
+ * <a href="https://github.com/oracle/graal/blob/master/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java">org.graalvm.nativeimage.ImageInfo</a>
+ * for details). The GraalVM compiler sets the property to {@code buildtime} while
+ * compiling a native image; the property is set to {@code runtime} while a native
+ * image is executing; and the Gradle and Maven plug-ins in the GraalVM
+ * <a href="https://graalvm.github.io/native-build-tools/latest/">Native Build Tools</a>
+ * project set the property to {@code agent} while executing tests with the GraalVM
+ * <a href="https://www.graalvm.org/reference-manual/native-image/metadata/AutomaticMetadataCollection/">tracing agent</a>.
+ *
+ * @since 5.9.1
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
+ * @see org.junit.jupiter.api.condition.EnabledOnJre
+ * @see org.junit.jupiter.api.condition.DisabledOnJre
+ * @see org.junit.jupiter.api.condition.EnabledForJreRange
+ * @see org.junit.jupiter.api.condition.DisabledForJreRange
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.Disabled
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@DisabledIfSystemProperty(named = "org.graalvm.nativeimage.imagecode", matches = ".+", //
+		disabledReason = "Currently executing within a GraalVM native image")
+@API(status = STABLE, since = "5.9.1")
+public @interface DisabledInNativeImage {
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
index 3fdf227cfa02..dac3c3a46c4a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
@@ -51,17 +51,19 @@
  *
  * @since 5.1
  * @see JRE
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
  * @see org.junit.jupiter.api.condition.EnabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnOs
- * @see org.junit.jupiter.api.condition.DisabledOnOs
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
  * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index 529aee6b1fc5..52b60f486cff 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -56,17 +56,19 @@
  *
  * @since 5.1
  * @see OS
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  * @see org.junit.jupiter.api.condition.EnabledOnOs
  * @see org.junit.jupiter.api.condition.EnabledOnJre
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
  * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
index 89f92c7ca758..e18d02c67bc9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
@@ -51,17 +51,19 @@
  *
  * @since 5.6
  * @see JRE
- * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnJre
- * @see org.junit.jupiter.api.condition.DisabledOnJre
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  * @see org.junit.jupiter.api.condition.EnabledOnOs
  * @see org.junit.jupiter.api.condition.DisabledOnOs
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledOnJre
+ * @see org.junit.jupiter.api.condition.DisabledOnJre
+ * @see org.junit.jupiter.api.condition.DisabledForJreRange
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
  * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
index f4b9fa99249c..3005a8f0a460 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
@@ -57,10 +57,12 @@
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
  * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
index 2898881c08ee..7eca6dffc9bd 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
@@ -51,17 +51,19 @@
  * given element.
  *
  * @since 5.1
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
  * @see org.junit.jupiter.api.condition.EnabledOnJre
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnOs
- * @see org.junit.jupiter.api.condition.DisabledOnOs
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
+ * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
index 428aa55676da..f26b972ce6e7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
@@ -51,17 +51,19 @@
  * given element.
  *
  * @since 5.1
- * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
  * @see org.junit.jupiter.api.condition.EnabledOnJre
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnOs
- * @see org.junit.jupiter.api.condition.DisabledOnOs
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java
new file mode 100644
index 000000000000..81fd19cbf338
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.condition;
+
+import static org.apiguardian.api.API.Status.STABLE;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code @EnabledInNativeImage} is used to signal that the annotated test class
+ * or test method is only <em>enabled</em> when executing within a GraalVM native
+ * image.
+ *
+ * <p>When applied at the class level, all test methods within that class will
+ * be enabled within a native image.
+ *
+ * <p>If a test method is disabled via this annotation, that does not prevent
+ * the test class from being instantiated. Rather, it prevents the execution of
+ * the test method and method-level lifecycle callbacks such as {@code @BeforeEach}
+ * methods, {@code @AfterEach} methods, and corresponding extension APIs.
+ *
+ * <p>This annotation may be used as a meta-annotation in order to create a
+ * custom <em>composed annotation</em> that inherits the semantics of this
+ * annotation.
+ *
+ * <h2>Technical Details</h2>
+ *
+ * <p>JUnit detects whether tests are executing within a GraalVM native image by
+ * checking for the presence of the {@code org.graalvm.nativeimage.imagecode}
+ * system property (see
+ * <a href="https://github.com/oracle/graal/blob/master/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java">org.graalvm.nativeimage.ImageInfo</a>
+ * for details). The GraalVM compiler sets the property to {@code buildtime} while
+ * compiling a native image; the property is set to {@code runtime} while a native
+ * image is executing; and the Gradle and Maven plug-ins in the GraalVM
+ * <a href="https://graalvm.github.io/native-build-tools/latest/">Native Build Tools</a>
+ * project set the property to {@code agent} while executing tests with the GraalVM
+ * <a href="https://www.graalvm.org/reference-manual/native-image/metadata/AutomaticMetadataCollection/">tracing agent</a>.
+ *
+ * @since 5.9.1
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
+ * @see org.junit.jupiter.api.condition.EnabledOnJre
+ * @see org.junit.jupiter.api.condition.DisabledOnJre
+ * @see org.junit.jupiter.api.condition.EnabledForJreRange
+ * @see org.junit.jupiter.api.condition.DisabledForJreRange
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
+ * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.Disabled
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@EnabledIfSystemProperty(named = "org.graalvm.nativeimage.imagecode", matches = ".+", //
+		disabledReason = "Not currently executing within a GraalVM native image")
+@API(status = STABLE, since = "5.9.1")
+public @interface EnabledInNativeImage {
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
index adca5ff552ac..d8210bf71f8b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
@@ -51,17 +51,19 @@
  *
  * @since 5.1
  * @see JRE
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnOs
- * @see org.junit.jupiter.api.condition.DisabledOnOs
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
  * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index 7db330c896ca..e0c17deda556 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -56,17 +56,19 @@
  *
  * @since 5.1
  * @see OS
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  * @see org.junit.jupiter.api.condition.DisabledOnOs
  * @see org.junit.jupiter.api.condition.EnabledOnJre
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
  * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
  * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.EnabledIf
- * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
index ca7d725c8068..4edc1dafb849 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
@@ -36,16 +36,20 @@
  *
  * @since 5.0
  * @see org.junit.jupiter.api.Disabled
- * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
- * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
- * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledOnOs
+ * @see org.junit.jupiter.api.condition.DisabledOnOs
  * @see org.junit.jupiter.api.condition.EnabledOnJre
  * @see org.junit.jupiter.api.condition.DisabledOnJre
  * @see org.junit.jupiter.api.condition.EnabledForJreRange
  * @see org.junit.jupiter.api.condition.DisabledForJreRange
- * @see org.junit.jupiter.api.condition.EnabledOnOs
- * @see org.junit.jupiter.api.condition.DisabledOnOs
+ * @see org.junit.jupiter.api.condition.EnabledInNativeImage
+ * @see org.junit.jupiter.api.condition.DisabledInNativeImage
+ * @see org.junit.jupiter.api.condition.EnabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.DisabledIfSystemProperty
+ * @see org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable
+ * @see org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
  */
 @FunctionalInterface
 @API(status = STABLE, since = "5.0")

From e7a4a80bd79d6d25faccfc3c7683396d176be769 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 16 Sep 2022 16:57:15 +0200
Subject: [PATCH 0946/1433] Document #2830 in the release notes for 5.9.1

---
 .../src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
index 8457ce84a733..3c68595cc318 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -49,8 +49,8 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
-
+* New `@EnabledInNativeImage` and `@DisabledInNativeImage` annotations for enabling and
+  disabling tests within a GraalVM native image.
 
 [[release-notes-5.9.1-junit-vintage]]
 === JUnit Vintage

From ced9b01a7c4cc415d4dc520fc2bc13520eb8d11a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 16 Sep 2022 18:40:57 +0200
Subject: [PATCH 0947/1433] Add failing integration test for execution on
 GraalVM native image

---
 .../platform-tooling-support-tests.gradle.kts |  3 +
 .../projects/graalvm-starter/build.gradle.kts | 29 ++++++++++
 .../graalvm-starter/settings.gradle.kts       | 11 ++++
 .../java/com/example/project/Calculator.java  | 19 ++++++
 .../com/example/project/CalculatorTests.java  | 41 +++++++++++++
 .../projects/gradle-starter/build.gradle.kts  |  8 ---
 .../support/tests/GraalVmStarterTests.java    | 58 +++++++++++++++++++
 7 files changed, 161 insertions(+), 8 deletions(-)
 create mode 100644 platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
 create mode 100644 platform-tooling-support-tests/projects/graalvm-starter/settings.gradle.kts
 create mode 100644 platform-tooling-support-tests/projects/graalvm-starter/src/main/java/com/example/project/Calculator.java
 create mode 100644 platform-tooling-support-tests/projects/graalvm-starter/src/test/java/com/example/project/CalculatorTests.java
 create mode 100644 platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index cb2a80ecaba8..8a27b7b936b0 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -109,6 +109,9 @@ tasks.test {
 
 	distribution {
 		requirements.add("jdk=8")
+		localOnly {
+			includeClasses.add("platform.tooling.support.tests.GraalVmStarterTests") // GraalVM is not installed on Test Distribution agents
+		}
 	}
 	jvmArgumentProviders += JavaHomeDir(project, 8)
 }
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts b/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
new file mode 100644
index 000000000000..edd8bd7b7474
--- /dev/null
+++ b/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
@@ -0,0 +1,29 @@
+plugins {
+	java
+	id("org.graalvm.buildtools.native")
+}
+
+val jupiterVersion: String = System.getenv("JUNIT_JUPITER_VERSION")
+val platformVersion: String = System.getenv("JUNIT_PLATFORM_VERSION")
+
+repositories {
+	maven { url = uri(file(System.getProperty("maven.repo"))) }
+	mavenCentral()
+}
+
+dependencies {
+	testImplementation("org.junit.jupiter:junit-jupiter:$jupiterVersion")
+	testRuntimeOnly("org.junit.platform:junit-platform-reporting:$platformVersion")
+}
+
+tasks.test {
+	useJUnitPlatform()
+
+	val outputDir = reports.junitXml.outputLocation
+	jvmArgumentProviders += CommandLineArgumentProvider {
+		listOf(
+			"-Djunit.platform.reporting.open.xml.enabled=true",
+			"-Djunit.platform.reporting.output.dir=${outputDir.get().asFile.absolutePath}"
+		)
+	}
+}
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/settings.gradle.kts b/platform-tooling-support-tests/projects/graalvm-starter/settings.gradle.kts
new file mode 100644
index 000000000000..c928064e495a
--- /dev/null
+++ b/platform-tooling-support-tests/projects/graalvm-starter/settings.gradle.kts
@@ -0,0 +1,11 @@
+pluginManagement {
+    plugins {
+        id("org.graalvm.buildtools.native") version "0.9.13"
+    }
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "graalvm-starter"
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/src/main/java/com/example/project/Calculator.java b/platform-tooling-support-tests/projects/graalvm-starter/src/main/java/com/example/project/Calculator.java
new file mode 100644
index 000000000000..b90710f2c68d
--- /dev/null
+++ b/platform-tooling-support-tests/projects/graalvm-starter/src/main/java/com/example/project/Calculator.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package com.example.project;
+
+public class Calculator {
+
+	public int add(int a, int b) {
+		return a + b;
+	}
+
+}
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/src/test/java/com/example/project/CalculatorTests.java b/platform-tooling-support-tests/projects/graalvm-starter/src/test/java/com/example/project/CalculatorTests.java
new file mode 100644
index 000000000000..7f043f0dd3ea
--- /dev/null
+++ b/platform-tooling-support-tests/projects/graalvm-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package com.example.project;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class CalculatorTests {
+
+	@Test
+	@DisplayName("1 + 1 = 2")
+	void addsTwoNumbers() {
+		Calculator calculator = new Calculator();
+		assertEquals(2, calculator.add(1, 1), "1 + 1 should equal 2");
+	}
+
+	@ParameterizedTest(name = "{0} + {1} = {2}")
+	@CsvSource({
+			"0,    1,   1",
+			"1,    2,   3",
+			"49,  51, 100",
+			"1,  100, 101"
+	})
+	void add(int first, int second, int expectedResult) {
+		Calculator calculator = new Calculator();
+		assertEquals(expectedResult, calculator.add(first, second),
+				() -> first + " + " + second + " should equal " + expectedResult);
+	}
+}
diff --git a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
index 33068798beb2..dfc4a31ad87e 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
@@ -7,14 +7,6 @@ val jupiterVersion: String = System.getenv("JUNIT_JUPITER_VERSION")
 val vintageVersion: String = System.getenv("JUNIT_VINTAGE_VERSION")
 val platformVersion: String = System.getenv("JUNIT_PLATFORM_VERSION")
 
-// emit default file encoding to a file
-file("file.encoding.txt").writeText(System.getProperty("file.encoding"))
-file("junit.versions.txt").writeText("""
-jupiterVersion=$jupiterVersion
-vintageVersion=$vintageVersion
-platformVersion=$platformVersion
-""")
-
 repositories {
 	maven { url = uri(file(System.getProperty("maven.repo"))) }
 	mavenCentral()
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
new file mode 100644
index 000000000000..0d3c8dd5bced
--- /dev/null
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package platform.tooling.support.tests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
+import static platform.tooling.support.tests.XmlAssertions.verifyContainsExpectedStartedOpenTestReport;
+
+import java.nio.file.Paths;
+
+import de.sormuras.bartholdy.tool.GradleWrapper;
+
+import org.junit.jupiter.api.Test;
+
+import platform.tooling.support.MavenRepo;
+import platform.tooling.support.Request;
+
+/**
+ * @since 1.9.1
+ */
+class GraalVmStarterTests {
+
+	@Test
+	void runsTestsInNativeImage() {
+		var request = Request.builder() //
+				.setTool(new GradleWrapper(Paths.get(".."))) //
+				.setProject("graalvm-starter") //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
+				.addArguments("javaToolchains", "nativeTest", "--no-daemon", "--stacktrace") //
+				.setTimeout(TOOL_TIMEOUT) //
+				.build();
+
+		var result = request.run();
+
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+
+		assumeFalse(
+			result.getOutputLines("err").stream().anyMatch(line -> line.contains("No compatible toolchains found")),
+			"Abort test if GraalVM is not installed");
+
+		assertEquals(0, result.getExitCode());
+		assertTrue(result.getOutputLines("out").stream().anyMatch(line -> line.contains("BUILD SUCCESSFUL")));
+
+		var testResultsDir = Request.WORKSPACE.resolve(request.getWorkspace()).resolve("build/test-results/test");
+		verifyContainsExpectedStartedOpenTestReport(testResultsDir);
+	}
+}

From e05a0e6f9faf8566ae949f95cb08472d678dfb6d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 16 Sep 2022 18:41:16 +0200
Subject: [PATCH 0948/1433] Refactor OpenTestReportGeneratingListener to work
 in native images

Fixes #3035.
---
 .../release-notes/release-notes-5.9.1.adoc         |  2 ++
 .../open/xml/OpenTestReportGeneratingListener.java | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
index 3c68595cc318..1fa43bc7dfcd 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -16,6 +16,8 @@ on GitHub.
 ==== Bug Fixes
 
 * `ReflectionSupport.findMethods(...)` now returns a distinct set of methods.
+* Execution in GraalVM native images no longer requires `--initialize-at-build-time` for
+  `OpenTestReportGeneratingListener`.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 73967cb55582..b826a63a5296 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -90,12 +90,6 @@ public class OpenTestReportGeneratingListener implements TestExecutionListener {
 	static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
 	static final String OUTPUT_DIR_PROPERTY_NAME = "junit.platform.reporting.output.dir";
 
-	private static final NamespaceRegistry NAMESPACE_REGISTRY = NamespaceRegistry.builder(Namespace.REPORTING_CORE) //
-			.add("e", Namespace.REPORTING_EVENTS) //
-			.add("java", Namespace.REPORTING_JAVA) //
-			.add("junit", JUnitFactory.NAMESPACE, "https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd") //
-			.build();
-
 	private final AtomicInteger idCounter = new AtomicInteger();
 	private final Map<UniqueId, String> inProgressIds = new ConcurrentHashMap<>();
 	private DocumentWriter<Events> eventsFileWriter = DocumentWriter.noop();
@@ -107,10 +101,16 @@ public OpenTestReportGeneratingListener() {
 	public void testPlanExecutionStarted(TestPlan testPlan) {
 		ConfigurationParameters config = testPlan.getConfigurationParameters();
 		if (isEnabled(config)) {
+			NamespaceRegistry namespaceRegistry = NamespaceRegistry.builder(Namespace.REPORTING_CORE) //
+					.add("e", Namespace.REPORTING_EVENTS) //
+					.add("java", Namespace.REPORTING_JAVA) //
+					.add("junit", JUnitFactory.NAMESPACE,
+						"https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd") //
+					.build();
 			Path eventsXml = OutputDir.create(config.get(OUTPUT_DIR_PROPERTY_NAME)) //
 					.createFile("junit-platform-events", "xml");
 			try {
-				eventsFileWriter = Events.createDocumentWriter(NAMESPACE_REGISTRY, eventsXml);
+				eventsFileWriter = Events.createDocumentWriter(namespaceRegistry, eventsXml);
 				reportInfrastructure();
 			}
 			catch (Exception e) {

From f68fde1074dde23c9149d6a6d512d7c65bb5fa9b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 16 Sep 2022 18:43:43 +0200
Subject: [PATCH 0949/1433] Install GraalVM for main CI build on Linux

---
 .github/workflows/main.yml                                 | 7 +++++++
 .../projects/graalvm-starter/gradle.properties             | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 platform-tooling-support-tests/projects/graalvm-starter/gradle.properties

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43754d118b7c..f7a7ef835937 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,6 +27,13 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install graphviz
+    - name: Install GraalVM
+      uses: graalvm/setup-graalvm@v1
+      with:
+        version: 'latest'
+        java-version: '17'
+        components: 'native-image'
+        github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Build
       uses: ./.github/actions/main-build
       with:
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/gradle.properties b/platform-tooling-support-tests/projects/graalvm-starter/gradle.properties
new file mode 100644
index 000000000000..83d0ce01114f
--- /dev/null
+++ b/platform-tooling-support-tests/projects/graalvm-starter/gradle.properties
@@ -0,0 +1 @@
+org.gradle.java.installations.fromEnv=GRAALVM_HOME

From 04c5f22753294c942e3b6bf82d84a1fd2e9e4f1f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 17 Sep 2022 13:27:02 +0200
Subject: [PATCH 0950/1433] Increase timeout for GraalVM test

Timed out on CI
---
 .../platform/tooling/support/tests/GraalVmStarterTests.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
index 0d3c8dd5bced..526393d13a47 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
@@ -14,10 +14,10 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 import static platform.tooling.support.tests.XmlAssertions.verifyContainsExpectedStartedOpenTestReport;
 
 import java.nio.file.Paths;
+import java.time.Duration;
 
 import de.sormuras.bartholdy.tool.GradleWrapper;
 
@@ -38,7 +38,7 @@ void runsTestsInNativeImage() {
 				.setProject("graalvm-starter") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("javaToolchains", "nativeTest", "--no-daemon", "--stacktrace") //
-				.setTimeout(TOOL_TIMEOUT) //
+				.setTimeout(Duration.ofMinutes(5)) //
 				.build();
 
 		var result = request.run();

From 3972f23dc33885697d388a751fbfd950f647a020 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 19 Sep 2022 18:15:28 +0200
Subject: [PATCH 0951/1433] Link to all 5.9 milestone pages

... because it otherwise looks like 5.9.0 only addressed 3 issues.
---
 .../docs/asciidoc/release-notes/release-notes-5.9.0.adoc    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
index 06c77728fa2b..aa292b95a634 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
@@ -17,8 +17,10 @@ format
 * Various improvements to `ConsoleLauncher`
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/62?closed=1+[5.9.0] milestone page in the JUnit repository on
-GitHub.
+link:{junit5-repo}+/milestone/58?closed=1+[5.9 M1],
+link:{junit5-repo}+/milestone/61?closed=1+[5.9 RC1], and
+link:{junit5-repo}+/milestone/62?closed=1+[5.9 GA] milestone pages in the JUnit repository
+on GitHub.
 
 
 [[release-notes-5.9.0-junit-platform]]

From ef0361bca95089cc597f48606749e50458c8dcce Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 19 Sep 2022 18:26:14 +0200
Subject: [PATCH 0952/1433] Update scope for 5.9.1

---
 .../src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
index 1fa43bc7dfcd..d5af9f07f5e9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -3,7 +3,7 @@
 
 *Date of Release:* ❓
 
-*Scope:* Minor bug fixes since 5.9.0
+*Scope:* Minor enhancements and bug fixes since 5.9.0
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/63?closed=1+[5.9.1] milestone page in the JUnit repository

From 7b3b94beffa09cf1a70bdb8e95b75d849cf18997 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 20 Sep 2022 14:51:48 +0200
Subject: [PATCH 0953/1433] Suppress "serial" warnings for anonymous inner
 classes in tests

---
 .../java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java  | 1 +
 .../junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
index 302914794a38..3874cc0cd464 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
@@ -201,6 +201,7 @@ void assertThrowsWithExecutableThatThrowsAnUnexpectedExceptionWithMessageSupplie
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	void assertThrowsWithExecutableThatThrowsInstanceOfAnonymousInnerClassAsUnexpectedException() {
 		try {
 			assertThrows(IllegalStateException.class, () -> {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
index 8d810e16d4c6..a2ba7e75c4cb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
@@ -241,6 +241,7 @@ void assertThrowsWithExecutableThatThrowsAnUnexpectedExceptionWithMessageSupplie
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	void assertThrowsWithExecutableThatThrowsInstanceOfAnonymousInnerClassAsUnexpectedException() {
 		try {
 			assertThrowsExactly(IllegalStateException.class, () -> {

From 36db81b010dbc45697cd1daa39f42e72c03a9b72 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 20 Sep 2022 19:32:03 +0200
Subject: [PATCH 0954/1433] Prepare release notes for 5.9.1

---
 .../release-notes/release-notes-5.9.1.adoc    | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
index d5af9f07f5e9..3c82815368e1 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.1.adoc
@@ -1,9 +1,13 @@
 [[release-notes-5.9.1]]
 == 5.9.1
 
-*Date of Release:* ❓
+*Date of Release:* September 20, 2022
 
-*Scope:* Minor enhancements and bug fixes since 5.9.0
+*Scope:*
+
+* New `@EnabledInNativeImage` and `@DisabledInNativeImage` annotations for testing in
+  GraalVM native images.
+* Minor bug fixes and enhancements since 5.9.0
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/63?closed=1+[5.9.1] milestone page in the JUnit repository
@@ -19,14 +23,6 @@ on GitHub.
 * Execution in GraalVM native images no longer requires `--initialize-at-build-time` for
   `OpenTestReportGeneratingListener`.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
-
 
 [[release-notes-5.9.1-junit-jupiter]]
 === JUnit Jupiter
@@ -45,26 +41,13 @@ on GitHub.
 * Assertion failures thrown from methods with applied timeouts using `ThreadMode.SEPARATE`
   are now properly reported.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * New `@EnabledInNativeImage` and `@DisabledInNativeImage` annotations for enabling and
   disabling tests within a GraalVM native image.
 
+
 [[release-notes-5.9.1-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes.

From 45869d20663201433e757b93faf1d50346382590 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 20 Sep 2022 20:32:41 +0200
Subject: [PATCH 0955/1433] Release 5.9.1

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aa04df17a909..ecf74ef5e4d5 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.9.0](https://github.com/junit-team/junit5/releases/tag/r5.9.0) (July 26, 2022)
+- General Availability (GA): [JUnit 5.9.1](https://github.com/junit-team/junit5/releases/tag/r5.9.1) (September 20, 2022)
 - Preview (Milestone/Release Candidate): n/a
 
 ## Documentation

From 82d2fa15aff7c896d6b3bfad0bead693675331bd Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Wed, 6 Jul 2022 00:15:09 +0200
Subject: [PATCH 0956/1433] Fix display name and improve assertions for
 `@TempDir` test case

Closes #2966
---
 .../TempDirectoryPerDeclarationTests.java         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index fdcdb166f0e1..4e1321c82a43 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.engine.extension;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -410,12 +411,16 @@ class FileAndPathInjection {
 		Path pathTempDir;
 
 		@Test
-		@DisplayName("and injected File and Path reference the same temp directory")
+		@DisplayName("and injected File and Path do not reference the same temp directory")
 		void checkFile(@TempDir File tempDir, @TempDir Path ref) {
-			assertNotNull(tempDir);
-			assertNotNull(ref);
-			assertNotNull(this.fileTempDir);
-			assertNotNull(this.pathTempDir);
+			assertFileAndPathAreNotEqual(tempDir, ref);
+			assertFileAndPathAreNotEqual(this.fileTempDir, this.pathTempDir);
+		}
+
+		private static void assertFileAndPathAreNotEqual(File tempDir, Path ref) {
+			Path path = tempDir.toPath();
+			assertNotEquals(ref.toAbsolutePath(), path.toAbsolutePath());
+			assertTrue(Files.exists(path));
 		}
 
 	}

From 51adc5a694ba9b421aae6aa3785c96c88c058191 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Sat, 23 Jul 2022 11:20:01 +0200
Subject: [PATCH 0957/1433] Add missing display name for test

See #2966
---
 .../engine/extension/TempDirectoryPerDeclarationTests.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 4e1321c82a43..d331ac3f9a47 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -193,6 +193,7 @@ void canBeUsedViaStaticFieldInsideNestedTestClasses() {
 	}
 
 	@Test
+	@DisplayName("only attempts to delete undeletable directories once")
 	void onlyAttemptsToDeleteUndeletableDirectoriesOnce() {
 		var results = executeTestsForClass(UndeletableDirectoryTestCase.class);
 

From df7f074d5fb9af326deb2d9cc3186042544d586f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 22 Sep 2022 17:10:11 +0200
Subject: [PATCH 0958/1433] Polish display names in tests

---
 .../extension/TempDirectoryPerContextTests.java       | 11 +++++------
 .../extension/TempDirectoryPerDeclarationTests.java   | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index d03ee596aff2..5997eb2ed4df 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -98,21 +98,21 @@ void tempDirectoryDoesNotPreventUserFromDeletingTempDir() {
 	}
 
 	@Test
-	@DisplayName("is capable of removal of a read-only file")
+	@DisplayName("is capable of removing a read-only file")
 	void nonWritableFileDoesNotCauseFailure() {
 		executeTestsForClass(NonWritableFileDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(1).succeeded(1));
 	}
 
 	@Test
-	@DisplayName("is capable of removal of non-executable, non-writable, or non-readable directories and folders")
+	@DisplayName("is capable of removing non-executable, non-writable, or non-readable directories and folders")
 	void nonMintPermissionsContentDoesNotCauseFailure() {
 		executeTestsForClass(NonMintPermissionContentInTempDirectoryDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(13).succeeded(13));
 	}
 
 	@Test
-	@DisplayName("is capable of removal when its permissions were been changed")
+	@DisplayName("is capable of removing a directory when its permissions have been changed")
 	void nonMintPermissionsDoNotCauseFailure() {
 		executeTestsForClass(NonMintTempDirectoryPermissionsDoNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(42).succeeded(42));
@@ -120,7 +120,7 @@ void nonMintPermissionsDoNotCauseFailure() {
 
 	@Test
 	@DisabledOnOs(OS.WINDOWS)
-	@DisplayName("is capable of removal of a read-only file in a read-only dir")
+	@DisplayName("is capable of removing a read-only file in a read-only dir")
 	void readOnlyFileInReadOnlyDirDoesNotCauseFailure() {
 		executeTestsForClass(ReadOnlyFileInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(1).succeeded(1));
@@ -128,7 +128,7 @@ void readOnlyFileInReadOnlyDirDoesNotCauseFailure() {
 
 	@Test
 	@DisabledOnOs(OS.WINDOWS)
-	@DisplayName("is capable of removal of a read-only file in a dir in a read-only dir")
+	@DisplayName("is capable of removing a read-only file in a dir in a read-only dir")
 	void readOnlyFileInNestedReadOnlyDirDoesNotCauseFailure() {
 		executeTestsForClass(ReadOnlyFileInDirInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(1).succeeded(1));
@@ -784,7 +784,6 @@ static class FileInjectionTestCase {
 		Path pathTempDir;
 
 		@Test
-		@DisplayName("and injected File and Path reference the same temp directory")
 		void checkFile(@TempDir File tempDir, @TempDir Path ref) {
 			assertFileAndPathAreEqual(tempDir, ref);
 			assertFileAndPathAreEqual(this.fileTempDir, this.pathTempDir);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index d331ac3f9a47..40bf1f02072a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -142,21 +142,21 @@ void tempDirectoryDoesNotPreventUserFromDeletingTempDir() {
 	}
 
 	@Test
-	@DisplayName("is capable of removal of a read-only file")
+	@DisplayName("is capable of removing a read-only file")
 	void nonWritableFileDoesNotCauseFailure() {
 		executeTestsForClass(NonWritableFileDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(1).succeeded(1));
 	}
 
 	@Test
-	@DisplayName("is capable of removal of non-executable, non-writable, or non-readable directories and folders")
+	@DisplayName("is capable of removing non-executable, non-writable, or non-readable directories and folders")
 	void nonMintPermissionsContentDoesNotCauseFailure() {
 		executeTestsForClass(NonMintPermissionContentInTempDirectoryDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(13).succeeded(13));
 	}
 
 	@Test
-	@DisplayName("is capable of removal when its permissions were been changed")
+	@DisplayName("is capable of removing a directory when its permissions have been changed")
 	void nonMintPermissionsDoNotCauseFailure() {
 		executeTestsForClass(NonMintTempDirectoryPermissionsDoNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(42).succeeded(42));
@@ -164,7 +164,7 @@ void nonMintPermissionsDoNotCauseFailure() {
 
 	@Test
 	@DisabledOnOs(OS.WINDOWS)
-	@DisplayName("is capable of removal of a read-only file in a read-only dir")
+	@DisplayName("is capable of removing a read-only file in a read-only dir")
 	void readOnlyFileInReadOnlyDirDoesNotCauseFailure() {
 		executeTestsForClass(ReadOnlyFileInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(1).succeeded(1));
@@ -172,7 +172,7 @@ void readOnlyFileInReadOnlyDirDoesNotCauseFailure() {
 
 	@Test
 	@DisabledOnOs(OS.WINDOWS)
-	@DisplayName("is capable of removal of a read-only file in a dir in a read-only dir")
+	@DisplayName("is capable of removing a read-only file in a dir in a read-only dir")
 	void readOnlyFileInNestedReadOnlyDirDoesNotCauseFailure() {
 		executeTestsForClass(ReadOnlyFileInDirInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
 				.assertStatistics(stats -> stats.started(1).succeeded(1));

From 38f796ce60d85827897b3b91f01529df917aa3a2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 23 Sep 2022 09:54:10 +0200
Subject: [PATCH 0959/1433] Enable ModuleUtilsTests

---
 .../java/org/junit/platform/commons/util/ModuleUtilsTests.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
index 533cb17d61ca..bf7de6e69e35 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
@@ -12,7 +12,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -23,7 +22,6 @@
 class ModuleUtilsTests {
 
 	@Test
-	@Disabled("modules")
 	void isJavaPlatformModuleSystemAvailable() {
 		boolean expected;
 		try {

From 517bfd56ad8ba8d22609b5055f4bb46a3d38c953 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Sep 2022 11:04:05 +0200
Subject: [PATCH 0960/1433] Update git-publish plugin

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6cc4aa4ef877..90fd6956e57d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
 	plugins {
 		id("com.gradle.enterprise") version "3.11.1" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.1"
-		id("org.ajoberstar.git-publish") version "3.0.0"
+		id("org.ajoberstar.git-publish") version "4.1.1"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "3.3.2"

From 7be64fc82404f6185973475470055b4fbb1cd4f6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Sep 2022 19:35:12 +0200
Subject: [PATCH 0961/1433] Extract ExecJarAction

---
 .../org/junit/gradle/java/ExecJarAction.kt    | 27 +++++++++++++++++++
 .../junit-platform-commons.gradle.kts         | 23 ++++++++--------
 .../junit-platform-console.gradle.kts         | 23 +++++++---------
 3 files changed, 48 insertions(+), 25 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt

diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt b/buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt
new file mode 100644
index 000000000000..afc97f404fcc
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt
@@ -0,0 +1,27 @@
+package org.junit.gradle.java
+
+import org.gradle.api.Action
+import org.gradle.api.Task
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.jvm.tasks.Jar
+import org.gradle.jvm.toolchain.JavaLauncher
+import org.gradle.jvm.toolchain.JavaToolchainService
+import org.gradle.jvm.toolchain.JavaToolchainSpec
+import org.gradle.process.ExecOperations
+import javax.inject.Inject
+
+abstract class ExecJarAction @Inject constructor(private val operations: ExecOperations): Action<Task> {
+
+    abstract val javaLauncher: Property<JavaLauncher>
+
+    abstract val args: ListProperty<String>
+
+    override fun execute(t: Task) {
+        operations.exec {
+            executable = javaLauncher.get()
+                .metadata.installationPath.file("bin/jar").asFile.absolutePath
+            args = this@ExecJarAction.args.get()
+        }
+    }
+}
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 54ffb5efc50e..69c9f5396e0a 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -1,3 +1,5 @@
+import org.junit.gradle.java.ExecJarAction
+
 plugins {
 	`java-library-conventions`
 	`java-multi-release-sources`
@@ -16,18 +18,15 @@ dependencies {
 tasks.jar {
 	val release9ClassesDir = sourceSets.mainRelease9.get().output.classesDirs.singleFile
 	inputs.dir(release9ClassesDir).withPathSensitivity(PathSensitivity.RELATIVE)
-	doLast {
-		exec {
-			executable = project.the<JavaToolchainService>().launcherFor(java.toolchain).get()
-				.metadata.installationPath.file("bin/jar").asFile.absolutePath
-			args(
-				"--update",
-				"--file", archiveFile.get().asFile.absolutePath,
-				"--release", "9",
-				"-C", release9ClassesDir.absolutePath, "."
-			)
-		}
-	}
+	doLast(objects.newInstance(ExecJarAction::class).apply {
+		javaLauncher.set(project.the<JavaToolchainService>().launcherFor(java.toolchain))
+		args.addAll(
+			"--update",
+			"--file", archiveFile.get().asFile.absolutePath,
+			"--release", "9",
+			"-C", release9ClassesDir.absolutePath, "."
+		)
+	})
 }
 
 eclipse {
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 94b664a06135..6c9841368607 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -38,19 +38,16 @@ tasks {
 			into("META-INF")
 		}
 		from(sourceSets.mainRelease9.get().output.classesDirs)
-		doLast {
-			exec {
-				executable = project.the<JavaToolchainService>().launcherFor(java.toolchain).get()
-					.metadata.installationPath.file("bin/jar").asFile.absolutePath
-				args(
-					"--update",
-					"--file", archiveFile.get().asFile.absolutePath,
-					"--main-class", "org.junit.platform.console.ConsoleLauncher",
-					"--release", "17",
-					"-C", release17ClassesDir.absolutePath, "."
-				)
-			}
-		}
+		doLast(objects.newInstance(org.junit.gradle.java.ExecJarAction::class).apply {
+			javaLauncher.set(project.the<JavaToolchainService>().launcherFor(java.toolchain))
+			args.addAll(
+				"--update",
+				"--file", archiveFile.get().asFile.absolutePath,
+				"--main-class", "org.junit.platform.console.ConsoleLauncher",
+				"--release", "17",
+				"-C", release17ClassesDir.absolutePath, "."
+			)
+		})
 	}
 	jar {
 		manifest {

From f323c082d49269f31347ed19c5f252d1211387c1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Oct 2022 13:31:03 +0200
Subject: [PATCH 0962/1433] Extract CommandLineArgumentProviders to top-level
 classes

---
 .../java-library-conventions.gradle.kts       | 46 ++-----------------
 .../gradle/java/ModulePathArgumentProvider.kt | 31 +++++++++++++
 .../java/PatchModuleArgumentProvider.kt       | 38 +++++++++++++++
 3 files changed, 73 insertions(+), 42 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
 create mode 100644 buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 66e07ffbe00d..91782145117d 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -1,5 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.api.tasks.PathSensitivity.RELATIVE
+import org.junit.gradle.java.ModulePathArgumentProvider
+import org.junit.gradle.java.PatchModuleArgumentProvider
 
 plugins {
 	`java-library`
@@ -156,8 +157,8 @@ val compileModule by tasks.registering(JavaCompile::class) {
 			"-Werror", // Terminates compilation when warnings occur.
 			"--module-version", "${project.version}",
 	))
-	options.compilerArgumentProviders.add(ModulePathArgumentProvider())
-	options.compilerArgumentProviders.addAll(modularProjects.map { PatchModuleArgumentProvider(it) })
+	options.compilerArgumentProviders.add(ModulePathArgumentProvider(project, modularProjects))
+	options.compilerArgumentProviders.addAll(modularProjects.map { PatchModuleArgumentProvider(project, it) })
 	modularity.inferModulePath.set(false)
 }
 
@@ -215,45 +216,6 @@ tasks.compileTestJava {
 	))
 }
 
-inner class ModulePathArgumentProvider : CommandLineArgumentProvider, Named {
-	@get:CompileClasspath
-	val modulePath: Provider<Configuration> = configurations.compileClasspath
-	override fun asArguments() = listOf(
-									"--module-path",
-									modulePath.get().asPath,
-									"--module-source-path",
-									files(modularProjects.map { "${it.projectDir}/src/module" }).asPath
-								)
-	@Internal
-	override fun getName() = "module-path"
-}
-
-inner class PatchModuleArgumentProvider(it: Project) : CommandLineArgumentProvider, Named {
-
-	@get:Input
-	val module: String = it.javaModuleName
-
-	@get:InputFiles
-	@get:PathSensitive(RELATIVE)
-	val patch: Provider<FileCollection> = provider {
-		if (it == project)
-			files(sourceSets.matching { it.name.startsWith("main") }.map { it.output })
-		else
-			files(it.sourceSets["main"].java.srcDirs)
-	}
-
-	override fun asArguments(): List<String> {
-		val path = patch.get().filter { it.exists() }.asPath
-		if (path.isEmpty()) {
-			return emptyList()
-		}
-		return listOf("--patch-module", "$module=$path")
-	}
-
-	@Internal
-	override fun getName() = "patch-module($module)"
-}
-
 afterEvaluate {
 	configurations {
 		apiElements {
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt b/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
new file mode 100644
index 000000000000..8883a303d2e5
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
@@ -0,0 +1,31 @@
+package org.junit.gradle.java
+
+import org.gradle.api.Named
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.*
+import org.gradle.kotlin.dsl.get
+import org.gradle.process.CommandLineArgumentProvider
+
+class ModulePathArgumentProvider(project: Project, modularProjects: List<Project>) : CommandLineArgumentProvider,
+    Named {
+
+    @get:CompileClasspath
+    val modulePath: Provider<Configuration> = project.configurations.named("compileClasspath")
+
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    val moduleSourceDirs: FileCollection = project.files(modularProjects.map { "${it.projectDir}/src/module" })
+
+    override fun asArguments() = listOf(
+        "--module-path",
+        modulePath.get().asPath,
+        "--module-source-path",
+        moduleSourceDirs.asPath
+    )
+
+    @Internal
+    override fun getName() = "module-path"
+}
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt b/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
new file mode 100644
index 000000000000..822910fd7f5d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
@@ -0,0 +1,38 @@
+package org.junit.gradle.java
+
+import javaModuleName
+import org.gradle.api.Named
+import org.gradle.api.Project
+import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.*
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.the
+import org.gradle.process.CommandLineArgumentProvider
+
+class PatchModuleArgumentProvider(compiledProject: Project, patchModuleProject: Project) : CommandLineArgumentProvider,
+	Named {
+
+	@get:Input
+	val module: String = patchModuleProject.javaModuleName
+
+	@get:InputFiles
+	@get:PathSensitive(PathSensitivity.RELATIVE)
+	val patch: Provider<FileCollection> = compiledProject.provider {
+		if (patchModuleProject == compiledProject)
+			compiledProject.files(compiledProject.the<SourceSetContainer>().matching { it.name.startsWith("main") }.map { it.output })
+		else
+			patchModuleProject.files(patchModuleProject.the<SourceSetContainer>()["main"].java.srcDirs)
+	}
+
+	override fun asArguments(): List<String> {
+		val path = patch.get().filter { it.exists() }.asPath
+		if (path.isEmpty()) {
+			return emptyList()
+		}
+		return listOf("--patch-module", "$module=$path")
+	}
+
+	@Internal
+	override fun getName() = "patch-module($module)"
+}

From e018f60963d36b25f845f59278f511332dc7fa72 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Oct 2022 13:32:08 +0200
Subject: [PATCH 0963/1433] Configure BND to be compatible with configuration
 cache

---
 .../main/kotlin/osgi-conventions.gradle.kts   | 109 +++++++++---------
 1 file changed, 57 insertions(+), 52 deletions(-)

diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index 2ad2fb578893..ad80ec1755f1 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -10,60 +10,65 @@ val importAPIGuardian = "org.apiguardian.*;resolution:=\"optional\""
 // This task enhances `jar` and `shadowJar` tasks with the bnd
 // `BundleTaskExtension` extension which allows for generating OSGi
 // metadata into the jar
-tasks.withType<Jar>().matching {
-	task: Jar -> task.name == "jar" || task.name == "shadowJar"
+tasks.withType<Jar>().matching { task: Jar ->
+	task.name == "jar" || task.name == "shadowJar"
 }.configureEach {
-	val bte = extensions.create<BundleTaskExtension>(BundleTaskExtension.NAME, this)
-
 	extra["importAPIGuardian"] = importAPIGuardian
 
-	// These are bnd instructions necessary for generating OSGi metadata.
-	// We've generalized these so that they are widely applicable limiting
-	// module configurations to special cases.
-	bte.setBnd("""
-			# Set the Bundle-SymbolicName to the archiveBaseName.
-			# We don't use the archiveClassifier which Bnd will use
-			# in the default Bundle-SymbolicName value.
-			Bundle-SymbolicName: ${'$'}{task.archiveBaseName}
-
-			# Set the Bundle-Name from the project description
-			Bundle-Name: ${'$'}{project.description}
-
-			# These are the general rules for package imports.
-			Import-Package: \
-				${importAPIGuardian},\
-				org.junit.platform.commons.logging;status=INTERNAL,\
-				kotlin.*;resolution:="optional",\
-				*
-
-			# This tells bnd not to complain if a module doesn't actually import
-			# the kotlin and apiguardian packages, but enough modules do to make it a default.
-			-fixupmessages.kotlin.import: "Unused Import-Package instructions: \\[kotlin.*\\]";is:=ignore
-			-fixupmessages.apiguardian.import: "Unused Import-Package instructions: \\[org.apiguardian.*\\]";is:=ignore
-
-			# This tells bnd to ignore classes it finds in `META-INF/versions/`
-			# because bnd doesn't yet support multi-release jars.
-			-fixupmessages.wrong.dir: "Classes found in the wrong directory: \\{META-INF/versions/...";is:=ignore
-
-			# Don't scan for Class.forName package imports.
-			# See https://bnd.bndtools.org/instructions/noclassforname.html
-			-noclassforname: true
-
-			# Don't add all the extra headers bnd normally adds.
-			# See https://bnd.bndtools.org/instructions/noextraheaders.html
-			-noextraheaders: true
-
-			# Don't add the Private-Package header.
-			# See https://bnd.bndtools.org/instructions/removeheaders.html
-			-removeheaders: Private-Package
-
-			# Instruct the APIGuardianAnnotations how to operate.
-			# See https://bnd.bndtools.org/instructions/export-apiguardian.html
-			-export-apiguardian: *;version=${'$'}{versionmask;===;${'$'}{version_cleanup;${'$'}{task.archiveVersion}}}
-		""")
-
-	// Do the actual work putting OSGi stuff in the jar.
-	doLast(bte.buildAction())
+	extensions.create<BundleTaskExtension>(BundleTaskExtension.NAME, this).apply {
+		properties.set(provider {
+			mapOf("project.description" to project.description)
+		})
+		// These are bnd instructions necessary for generating OSGi metadata.
+		// We've generalized these so that they are widely applicable limiting
+		// module configurations to special cases.
+		setBnd(
+			"""
+				# Set the Bundle-SymbolicName to the archiveBaseName.
+				# We don't use the archiveClassifier which Bnd will use
+				# in the default Bundle-SymbolicName value.
+				Bundle-SymbolicName: ${'$'}{task.archiveBaseName}
+
+				# Set the Bundle-Name from the project description
+				Bundle-Name: ${'$'}{project.description}
+
+				# These are the general rules for package imports.
+				Import-Package: \
+					${importAPIGuardian},\
+					org.junit.platform.commons.logging;status=INTERNAL,\
+					kotlin.*;resolution:="optional",\
+					*
+
+				# This tells bnd not to complain if a module doesn't actually import
+				# the kotlin and apiguardian packages, but enough modules do to make it a default.
+				-fixupmessages.kotlin.import: "Unused Import-Package instructions: \\[kotlin.*\\]";is:=ignore
+				-fixupmessages.apiguardian.import: "Unused Import-Package instructions: \\[org.apiguardian.*\\]";is:=ignore
+
+				# This tells bnd to ignore classes it finds in `META-INF/versions/`
+				# because bnd doesn't yet support multi-release jars.
+				-fixupmessages.wrong.dir: "Classes found in the wrong directory: \\{META-INF/versions/...";is:=ignore
+
+				# Don't scan for Class.forName package imports.
+				# See https://bnd.bndtools.org/instructions/noclassforname.html
+				-noclassforname: true
+
+				# Don't add all the extra headers bnd normally adds.
+				# See https://bnd.bndtools.org/instructions/noextraheaders.html
+				-noextraheaders: true
+
+				# Don't add the Private-Package header.
+				# See https://bnd.bndtools.org/instructions/removeheaders.html
+				-removeheaders: Private-Package
+
+				# Instruct the APIGuardianAnnotations how to operate.
+				# See https://bnd.bndtools.org/instructions/export-apiguardian.html
+				-export-apiguardian: *;version=${'$'}{versionmask;===;${'$'}{version_cleanup;${'$'}{task.archiveVersion}}}
+			"""
+		)
+
+		// Do the actual work putting OSGi stuff in the jar.
+		doLast(buildAction())
+	}
 }
 
 // Bnd's Resolve task uses a properties file for its configuration. This
@@ -90,7 +95,7 @@ val osgiVerification by configurations.creating {
 // that its metadata is valid. If the metadata is invalid this task will
 // fail.
 val verifyOSGi by tasks.registering(Resolve::class) {
-	bndrun.fileProvider(osgiProperties.map{ it.outputFile })
+	bndrun.fileProvider(osgiProperties.map { it.outputFile })
 	outputBndrun.set(layout.buildDirectory.file("resolvedOSGiProperties.bndrun"))
 	isReportOptional = false
 	// By default bnd will use jars found in:

From 8747727ef9915e82027f3dbc4e8f8d894ca6d750 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Oct 2022 13:32:54 +0200
Subject: [PATCH 0964/1433] Move local variables into Action for configuration
 cache compatibility

---
 .../src/main/kotlin/java-toolchain-conventions.gradle.kts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index c85e77e260f2..672865e45f51 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -1,8 +1,8 @@
-val javaToolchainVersion: String? by project
-val defaultLanguageVersion = JavaLanguageVersion.of(17)
-val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: defaultLanguageVersion
-
 project.pluginManager.withPlugin("java") {
+	val javaToolchainVersion: String? by project
+	val defaultLanguageVersion = JavaLanguageVersion.of(17)
+	val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: defaultLanguageVersion
+
 	val extension = the<JavaPluginExtension>()
 	val javaToolchainService = the<JavaToolchainService>()
 	extension.toolchain.languageVersion.set(javaLanguageVersion)

From e41d80d6e6762eead5f13fa9f7b0b67ffcbff9d2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Oct 2022 13:35:32 +0200
Subject: [PATCH 0965/1433] Use local variable instead of project's extra
 properties

---
 buildSrc/src/main/kotlin/build-metadata.gradle.kts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/kotlin/build-metadata.gradle.kts b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
index 5d189fba246e..561077e2a879 100644
--- a/buildSrc/src/main/kotlin/build-metadata.gradle.kts
+++ b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
@@ -4,15 +4,13 @@ import java.time.OffsetDateTime
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
-val buildTimeAndDate: OffsetDateTime by extra {
-
-	// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against
-	// in order to achieve reproducible builds
-	//
-	// More details - https://reproducible-builds.org/docs/source-date-epoch/
-
+val buildTimeAndDate =
 	if (System.getenv().containsKey("SOURCE_DATE_EPOCH")) {
 
+		// SOURCE_DATE_EPOCH is a UNIX timestamp for pinning build metadata against
+		// in order to achieve reproducible builds
+		//
+		// More details - https://reproducible-builds.org/docs/source-date-epoch/
 		val sourceDateEpoch = System.getenv("SOURCE_DATE_EPOCH").toLong()
 
 		Instant.ofEpochSecond(sourceDateEpoch).atOffset(ZoneOffset.UTC)
@@ -20,7 +18,6 @@ val buildTimeAndDate: OffsetDateTime by extra {
 	} else {
 		OffsetDateTime.now()
 	}
-}
 
 val buildDate: String by extra { DateTimeFormatter.ISO_LOCAL_DATE.format(buildTimeAndDate) }
 val buildTime: String by extra { DateTimeFormatter.ofPattern("HH:mm:ss.SSSZ").format(buildTimeAndDate) }

From bb4a9349fa8ee84b46dbcec65405b3cc0a321665 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 24 Sep 2022 20:00:10 +0200
Subject: [PATCH 0966/1433] Extract top-level task class

---
 .../junit/gradle/java/WriteArtifactsFile.kt   | 36 +++++++++++++++++++
 ...nit-platform-console-standalone.gradle.kts | 18 +++-------
 2 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt

diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt b/buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt
new file mode 100644
index 000000000000..12107fc8f824
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt
@@ -0,0 +1,36 @@
+package org.junit.gradle.java
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ModuleVersionIdentifier
+import org.gradle.api.artifacts.ResolvedArtifact
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
+import org.gradle.api.provider.SetProperty
+import org.gradle.api.tasks.*
+
+abstract class WriteArtifactsFile : DefaultTask() {
+
+    @get:OutputFile
+    abstract val outputFile: RegularFileProperty
+
+    @get:Input
+    abstract val moduleVersions: SetProperty<ModuleVersionIdentifier>
+
+    fun from(configuration: Provider<Configuration>) {
+        moduleVersions.addAll(configuration.map {
+            it.resolvedConfiguration.resolvedArtifacts.map { it.moduleVersion.id }
+        })
+    }
+
+    @TaskAction
+    fun writeFile() {
+        outputFile.get().asFile.printWriter().use { out ->
+            moduleVersions.get()
+                .map { "${it.group}:${it.name}:${it.version}" }
+                .sorted()
+                .forEach(out::println)
+        }
+    }
+}
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index ca8d74cc0420..6a42539e5a98 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -1,3 +1,5 @@
+import org.junit.gradle.java.WriteArtifactsFile
+
 plugins {
 	`java-library-conventions`
 	`shadow-conventions`
@@ -26,19 +28,9 @@ tasks {
 			attributes("Main-Class" to "org.junit.platform.console.ConsoleLauncher")
 		}
 	}
-	val shadowedArtifactsFile by registering {
-		inputs.files(configurations.shadowed).withNormalizer(ClasspathNormalizer::class)
-		val outputFile = layout.buildDirectory.file("shadowed-artifacts")
-		outputs.file(outputFile)
-		doFirst {
-			outputFile.get().asFile.printWriter().use { out ->
-				configurations.shadowed.get().resolvedConfiguration.resolvedArtifacts
-					.map { it.moduleVersion.id }
-					.map { "${it.group}:${it.name}:${it.version}" }
-					.sorted()
-					.forEach(out::println)
-			}
-		}
+	val shadowedArtifactsFile by registering(WriteArtifactsFile::class) {
+		from(configurations.shadowed)
+		outputFile.set(layout.buildDirectory.file("shadowed-artifacts"))
 	}
 	shadowJar {
 		// https://github.com/junit-team/junit5/issues/2557

From e8843ecf2e3e7fd5393636c58b101eb39f76c1a3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Oct 2022 15:40:45 +0200
Subject: [PATCH 0967/1433] Resolve warning

---
 buildSrc/settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 44425d9c15fc..29744ec1bcde 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -1 +1 @@
-// intentionally left blank
+rootProject.name = "buildSrc"

From 13c197424d259285961fd5c0ae8d9175d4a7209f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Oct 2022 17:28:51 +0200
Subject: [PATCH 0968/1433] Use jacoco-report-aggregation plugin (#3049)

---
 build.gradle.kts                              | 41 +++------------
 .../jacoco-aggregation-conventions.gradle.kts | 30 +++++++++++
 .../main/kotlin/jacoco-conventions.gradle.kts | 51 +------------------
 .../kotlin/jacoco-java-conventions.gradle.kts | 32 ++++++++++++
 .../java-library-conventions.gradle.kts       |  2 +-
 .../junit/gradle/jacoco/JacocoConventions.kt  |  5 ++
 .../main/kotlin/shadow-conventions.gradle.kts | 18 ++++---
 .../junit-platform-commons.gradle.kts         |  4 ++
 .../junit-platform-console.gradle.kts         |  3 ++
 9 files changed, 96 insertions(+), 90 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/org/junit/gradle/jacoco/JacocoConventions.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index cce12d0ae060..5379f61f82be 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 	`base-conventions`
 	`build-metadata`
 	`dependency-update-check`
-	`jacoco-conventions`
+	`jacoco-aggregation-conventions`
 	`temp-maven-repo`
 }
 
@@ -47,6 +47,12 @@ val vintageProjects by extra(listOf(
 val mavenizedProjects by extra(platformProjects + jupiterProjects + vintageProjects)
 val modularProjects by extra(mavenizedProjects - listOf(projects.junitPlatformConsoleStandalone.dependencyProject))
 
+dependencies {
+	(modularProjects + listOf(projects.platformTests.dependencyProject)).forEach {
+		jacocoAggregation(project(it.path))
+	}
+}
+
 nexusPublishing {
 	packageGroup.set("org.junit")
 	repositories {
@@ -57,36 +63,3 @@ nexusPublishing {
 nohttp {
 	source.exclude("buildSrc/build/generated-sources/**")
 }
-
-val jacocoTestProjects = listOf(
-	projects.junitJupiterEngine,
-	projects.junitJupiterMigrationsupport,
-	projects.junitJupiterParams,
-	projects.junitVintageEngine,
-	projects.platformTests
-).map { it.dependencyProject }
-val jacocoClassesDir by extra(file("$buildDir/jacoco/classes"))
-
-val jacocoRootReport by tasks.registering(JacocoReport::class) {
-	modularProjects.forEach {
-		dependsOn(it.tasks.named("extractJar"))
-		it.pluginManager.withPlugin("java") {
-			sourceDirectories.from(it.the<SourceSetContainer>()["main"].allSource.srcDirs)
-		}
-	}
-	classDirectories.from(files(jacocoClassesDir))
-	reports {
-		html.required.set(true)
-		xml.required.set(true)
-		csv.required.set(false)
-	}
-}
-
-afterEvaluate {
-	jacocoRootReport {
-		jacocoTestProjects.forEach {
-			executionData(it.tasks.withType<Test>().map { task -> task.the<JacocoTaskExtension>().destinationFile })
-			dependsOn(it.tasks.withType<Test>())
-		}
-	}
-}
diff --git a/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
new file mode 100644
index 000000000000..4032dd1f7012
--- /dev/null
+++ b/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
@@ -0,0 +1,30 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.attributes.LibraryElements
+import org.gradle.api.attributes.LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE
+import org.gradle.api.attributes.TestSuiteType
+import org.gradle.kotlin.dsl.invoke
+import org.gradle.kotlin.dsl.`jacoco-report-aggregation`
+import org.gradle.kotlin.dsl.named
+import org.gradle.testing.jacoco.plugins.JacocoCoverageReport
+import org.junit.gradle.jacoco.JacocoConventions.COVERAGE_CLASSES
+
+plugins {
+	id("jacoco-conventions")
+	`jacoco-report-aggregation`
+}
+
+configurations {
+	allCodeCoverageReportClassDirectories {
+		attributes {
+			attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements::class, COVERAGE_CLASSES))
+		}
+	}
+}
+
+reporting {
+	reports {
+		create<JacocoCoverageReport>("jacocoRootReport") {
+			testType.set(TestSuiteType.UNIT_TEST)
+		}
+	}
+}
diff --git a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
index 7e0f5a1410f6..03e5c8851345 100644
--- a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
@@ -1,5 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
 	jacoco
 }
@@ -10,51 +8,6 @@ jacoco {
 	toolVersion = requiredVersionFromLibs("jacoco")
 }
 
-tasks {
-	withType<Test>().configureEach {
-		configure<JacocoTaskExtension> {
-			isEnabled = enableJaCoCo
-		}
-	}
-	withType<JacocoReport>().configureEach {
-		enabled = enableJaCoCo
-	}
-}
-
-pluginManager.withPlugin("java") {
-
-	val jacocoClassesDir: File by rootProject.extra
-
-	val jar by tasks.existing(Jar::class)
-
-	val extractJar by tasks.registering(Copy::class) {
-		from(zipTree(jar.map { it.archiveFile }))
-		into(jacocoClassesDir)
-		include("**/*.class")
-		// don't version-specific classes of MR JARs
-		exclude("META-INF/versions/**")
-		includeEmptyDirs = false
-		onlyIf { jar.get().enabled }
-	}
-
-	jar {
-		finalizedBy(extractJar)
-	}
-
-	tasks.named<JacocoReport>("jacocoTestReport") {
-		enabled = false
-	}
-
-	pluginManager.withPlugin("com.github.johnrengelman.shadow") {
-
-		val shadowJar by tasks.existing(ShadowJar::class) {
-			finalizedBy(extractJar)
-		}
-		extractJar {
-			from(zipTree(shadowJar.map { it.archiveFile }))
-			// don't report coverage for shadowed classes
-			exclude("**/shadow/**")
-			onlyIf { shadowJar.get().enabled }
-		}
-	}
+tasks.withType<JacocoReport>().configureEach {
+	enabled = enableJaCoCo
 }
diff --git a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
new file mode 100644
index 000000000000..80998793e8d7
--- /dev/null
+++ b/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
@@ -0,0 +1,32 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.attributes.LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE
+import org.junit.gradle.jacoco.JacocoConventions.COVERAGE_CLASSES
+
+plugins {
+	java
+	id("jacoco-conventions")
+}
+
+val mavenizedProjects: List<Project> by rootProject.extra
+val enableJaCoCo = project.hasProperty("enableJaCoCo")
+
+tasks.withType<Test>().configureEach {
+	configure<JacocoTaskExtension> {
+		isEnabled = enableJaCoCo
+	}
+}
+
+val codeCoverageClassesJar by tasks.registering(Jar::class) {
+	from(tasks.jar.map { zipTree(it.archiveFile) })
+	archiveClassifier.set("jacoco")
+	enabled = project in mavenizedProjects
+	duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
+configurations.create("codeCoverageReportClasses") {
+	isCanBeResolved = false
+	isCanBeConsumed = true
+	isTransitive = false
+	attributes.attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements::class, COVERAGE_CLASSES))
+	outgoing.artifact(codeCoverageClassesJar)
+}
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 91782145117d..fb3d2128c27e 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 	idea
 	checkstyle
 	id("base-conventions")
-	id("jacoco-conventions")
+	id("jacoco-java-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/jacoco/JacocoConventions.kt b/buildSrc/src/main/kotlin/org/junit/gradle/jacoco/JacocoConventions.kt
new file mode 100644
index 000000000000..04d223f3c3bd
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/junit/gradle/jacoco/JacocoConventions.kt
@@ -0,0 +1,5 @@
+package org.junit.gradle.jacoco
+
+object JacocoConventions {
+    const val COVERAGE_CLASSES = "coverage-classes"
+}
diff --git a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
index 44c5bacec51d..19028422c41e 100644
--- a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
@@ -5,12 +5,14 @@ plugins {
 
 val shadowed by configurations.creating
 
-configurations.forEach { configuration ->
-	configuration.outgoing.apply {
-		val removed = artifacts.removeIf { it.classifier.isNullOrEmpty() }
-		if (removed) {
-			artifact(tasks.shadowJar) {
-				classifier = ""
+configurations {
+	listOf(apiElements, runtimeElements).forEach {
+		it.configure {
+			outgoing {
+				artifacts.clear()
+				artifact(tasks.shadowJar) {
+					classifier = ""
+				}
 			}
 		}
 	}
@@ -54,6 +56,10 @@ tasks {
 		dependsOn(shadowJar)
 		enabled = false
 	}
+	named<Jar>("codeCoverageClassesJar") {
+		from(shadowJar.map { zipTree(it.archiveFile) })
+		exclude("**/shadow/**")
+	}
 	test {
 		dependsOn(shadowJar)
 		// in order to run the test against the shadowJar
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 69c9f5396e0a..7856ccd8fc78 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -29,6 +29,10 @@ tasks.jar {
 	})
 }
 
+tasks.codeCoverageClassesJar {
+	exclude("org/junit/platform/commons/util/ModuleUtils.class")
+}
+
 eclipse {
 	classpath {
 		sourceSets -= project.sourceSets.mainRelease9.get()
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 6c9841368607..05489f3857a4 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -49,6 +49,9 @@ tasks {
 			)
 		})
 	}
+	codeCoverageClassesJar {
+		exclude("org/junit/platform/console/options/ConsoleUtils.class")
+	}
 	jar {
 		manifest {
 			attributes("Main-Class" to "org.junit.platform.console.ConsoleLauncher")

From 27e4bfdec53f5f66fb0882ce32c8b02c33699371 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Oct 2022 21:38:17 +0200
Subject: [PATCH 0969/1433] Make `assemble` configuration cache compatible

---
 .../java-library-conventions.gradle.kts       |  4 +-
 .../gradle/java/ModulePathArgumentProvider.kt | 20 ++++++--
 .../java/PatchModuleArgumentProvider.kt       | 51 +++++++++++--------
 3 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index fb3d2128c27e..77fc7d334a66 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -157,8 +157,8 @@ val compileModule by tasks.registering(JavaCompile::class) {
 			"-Werror", // Terminates compilation when warnings occur.
 			"--module-version", "${project.version}",
 	))
-	options.compilerArgumentProviders.add(ModulePathArgumentProvider(project, modularProjects))
-	options.compilerArgumentProviders.addAll(modularProjects.map { PatchModuleArgumentProvider(project, it) })
+	options.compilerArgumentProviders.add(objects.newInstance(ModulePathArgumentProvider::class, project, modularProjects))
+	options.compilerArgumentProviders.addAll(modularProjects.map { objects.newInstance(PatchModuleArgumentProvider::class, project, it) })
 	modularity.inferModulePath.set(false)
 }
 
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt b/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
index 8883a303d2e5..adb478c42f82 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
+++ b/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
@@ -3,25 +3,35 @@ package org.junit.gradle.java
 import org.gradle.api.Named
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
+import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.gradle.kotlin.dsl.get
 import org.gradle.process.CommandLineArgumentProvider
+import javax.inject.Inject
 
-class ModulePathArgumentProvider(project: Project, modularProjects: List<Project>) : CommandLineArgumentProvider,
-    Named {
+abstract class ModulePathArgumentProvider @Inject constructor(project: Project, modularProjects: List<Project>) :
+    CommandLineArgumentProvider, Named {
 
     @get:CompileClasspath
-    val modulePath: Provider<Configuration> = project.configurations.named("compileClasspath")
+    abstract val modulePath: ConfigurableFileCollection
 
     @get:InputFiles
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    val moduleSourceDirs: FileCollection = project.files(modularProjects.map { "${it.projectDir}/src/module" })
+    abstract val moduleSourceDirs: ConfigurableFileCollection
+
+    init {
+        modulePath.from(project.configurations.named("compileClasspath"))
+        modularProjects.forEach {
+            moduleSourceDirs.from(project.files("${it.projectDir}/src/module"))
+        }
+    }
 
     override fun asArguments() = listOf(
         "--module-path",
-        modulePath.get().asPath,
+        modulePath.asPath,
         "--module-source-path",
         moduleSourceDirs.asPath
     )
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt b/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
index 822910fd7f5d..f13fd8b9a83b 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
+++ b/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
@@ -3,36 +3,45 @@ package org.junit.gradle.java
 import javaModuleName
 import org.gradle.api.Named
 import org.gradle.api.Project
+import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
+import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.the
 import org.gradle.process.CommandLineArgumentProvider
+import javax.inject.Inject
 
-class PatchModuleArgumentProvider(compiledProject: Project, patchModuleProject: Project) : CommandLineArgumentProvider,
-	Named {
+abstract class PatchModuleArgumentProvider @Inject constructor(compiledProject: Project, patchModuleProject: Project) :
+    CommandLineArgumentProvider, Named {
 
-	@get:Input
-	val module: String = patchModuleProject.javaModuleName
+    @get:Input
+    abstract val module: Property<String>
 
-	@get:InputFiles
-	@get:PathSensitive(PathSensitivity.RELATIVE)
-	val patch: Provider<FileCollection> = compiledProject.provider {
-		if (patchModuleProject == compiledProject)
-			compiledProject.files(compiledProject.the<SourceSetContainer>().matching { it.name.startsWith("main") }.map { it.output })
-		else
-			patchModuleProject.files(patchModuleProject.the<SourceSetContainer>()["main"].java.srcDirs)
-	}
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val patch: ConfigurableFileCollection
 
-	override fun asArguments(): List<String> {
-		val path = patch.get().filter { it.exists() }.asPath
-		if (path.isEmpty()) {
-			return emptyList()
-		}
-		return listOf("--patch-module", "$module=$path")
-	}
+    init {
+        module.convention(patchModuleProject.javaModuleName)
+        patch.from(compiledProject.provider {
+            if (patchModuleProject == compiledProject)
+                compiledProject.files(compiledProject.the<SourceSetContainer>().matching { it.name.startsWith("main") }
+                    .map { it.output })
+            else
+                patchModuleProject.files(patchModuleProject.the<SourceSetContainer>()["main"].java.srcDirs)
+        })
+    }
 
-	@Internal
-	override fun getName() = "patch-module($module)"
+    override fun asArguments(): List<String> {
+        val path = patch.filter { it.exists() }.asPath
+        if (path.isEmpty()) {
+            return emptyList()
+        }
+        return listOf("--patch-module", "${module.get()}=$path")
+    }
+
+    @Internal
+    override fun getName() = "patch-module(${module.get()})"
 }

From d8c3f9d90160955c4032c3e5f2bada4f1c0a6fb0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 1 Oct 2022 21:51:00 +0200
Subject: [PATCH 0970/1433] Use providers.exec

---
 buildSrc/src/main/kotlin/build-metadata.gradle.kts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/build-metadata.gradle.kts b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
index 561077e2a879..ad58b4898de5 100644
--- a/buildSrc/src/main/kotlin/build-metadata.gradle.kts
+++ b/buildSrc/src/main/kotlin/build-metadata.gradle.kts
@@ -1,4 +1,3 @@
-import org.codehaus.groovy.runtime.ProcessGroovyMethods
 import java.time.Instant
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
@@ -22,6 +21,8 @@ val buildTimeAndDate =
 val buildDate: String by extra { DateTimeFormatter.ISO_LOCAL_DATE.format(buildTimeAndDate) }
 val buildTime: String by extra { DateTimeFormatter.ofPattern("HH:mm:ss.SSSZ").format(buildTimeAndDate) }
 val buildRevision: String by extra {
-	ProcessGroovyMethods.getText(ProcessGroovyMethods.execute("git rev-parse --verify HEAD"))
+	providers.exec {
+		commandLine("git", "rev-parse", "--verify", "HEAD")
+	}.standardOutput.asText.get()
 }
 val builtByValue by extra { project.findProperty("builtBy") ?: project.property("defaultBuiltBy") }

From 981c8eca51be2144065d9d97d34079a0f8f48e94 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 2 Oct 2022 11:46:19 +0200
Subject: [PATCH 0971/1433] Extract RunConsoleLauncher task

---
 .../junit/gradle/exec/RunConsoleLauncher.kt   | 86 +++++++++++++++++++
 documentation/documentation.gradle.kts        | 67 +++------------
 2 files changed, 99 insertions(+), 54 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt

diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt b/buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt
new file mode 100644
index 000000000000..88889bcfbb1f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt
@@ -0,0 +1,86 @@
+package org.junit.gradle.exec
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Classpath
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.SourceSetContainer
+import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.the
+import org.gradle.process.CommandLineArgumentProvider
+import org.gradle.process.ExecOperations
+import trackOperationSystemAsInput
+import java.io.ByteArrayOutputStream
+import javax.inject.Inject
+
+abstract class RunConsoleLauncher @Inject constructor(private val execOperations: ExecOperations): DefaultTask() {
+
+    @get:Classpath
+    abstract val runtimeClasspath: ConfigurableFileCollection
+
+    @get:Input
+    abstract val args: ListProperty<String>
+
+    @get:OutputDirectory
+    abstract val reportsDir: DirectoryProperty
+
+    @get:Internal
+    abstract val debugging: Property<Boolean>
+
+    @get:Internal
+    abstract val hideOutput: Property<Boolean>
+
+    init {
+        runtimeClasspath.from(project.the<SourceSetContainer>()["test"].runtimeClasspath)
+        reportsDir.convention(project.layout.buildDirectory.dir("test-results"))
+
+        debugging.convention(
+            project.providers.gradleProperty("consoleLauncherTestDebug")
+            .map { it != "false" }
+            .orElse(false)
+        )
+        outputs.cacheIf { !debugging.get() }
+        outputs.upToDateWhen { !debugging.get() }
+
+        hideOutput.convention(debugging.map { !it })
+
+        trackOperationSystemAsInput()
+    }
+
+    @TaskAction
+    fun execute() {
+        val output = ByteArrayOutputStream()
+        val result = execOperations.javaexec {
+            classpath = runtimeClasspath
+            mainClass.set("org.junit.platform.console.ConsoleLauncher")
+            args("--scan-classpath")
+            args("--config=junit.platform.reporting.open.xml.enabled=true")
+            args(this@RunConsoleLauncher.args.get())
+            argumentProviders += CommandLineArgumentProvider {
+                listOf(
+                    "--reports-dir=${reportsDir.get()}",
+                    "--config=junit.platform.reporting.output.dir=${reportsDir.get()}"
+
+                )
+            }
+            systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
+            debug = debugging.get()
+            if (hideOutput.get()) {
+                standardOutput = output
+                errorOutput = output
+            }
+            isIgnoreExitValue = true
+        }
+        if (result.exitValue != 0 && hideOutput.get()) {
+            System.out.write(output.toByteArray())
+            System.out.flush()
+        }
+        result.rethrowFailure().assertNormalExitValue()
+    }
+}
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 721a35e1b06d..bb832b1c668d 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -2,6 +2,7 @@ import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.junit.gradle.exec.ClasspathSystemPropertyProvider
+import org.junit.gradle.exec.RunConsoleLauncher
 import org.junit.gradle.javadoc.ModuleSpecificJavadocFileOption
 import java.io.ByteArrayOutputStream
 import java.nio.file.Files
@@ -114,63 +115,21 @@ require(externalModulesWithoutModularJavadoc.values.all { it.endsWith("/") }) {
 
 tasks {
 
-	val consoleLauncherTest by registering {
-		val runtimeClasspath = sourceSets["test"].runtimeClasspath
-		inputs.files(runtimeClasspath).withNormalizer(ClasspathNormalizer::class)
-		val reportsDir = file("$buildDir/test-results")
-		outputs.dir(reportsDir)
-
-		val debugging = providers.gradleProperty("consoleLauncherTestDebug")
-			.map { it != "false" }
-			.orElse(false)
-		outputs.cacheIf { !debugging.get() }
-		outputs.upToDateWhen { !debugging.get() }
-
-		// Track OS as input so that tests are executed on all configured operating systems on CI
-		trackOperationSystemAsInput()
-		doFirst {
-			val output = ByteArrayOutputStream()
-			val result = javaexec {
-				debug = project.findProperty("debug") == "true"
-				classpath = runtimeClasspath
-				mainClass.set("org.junit.platform.console.ConsoleLauncher")
-				args("--scan-classpath")
-				args("--config", "enableHttpServer=true")
-				args("--include-classname", ".*Tests")
-				args("--include-classname", ".*Demo")
-				args("--exclude-tag", "exclude")
-				args("--reports-dir", reportsDir)
-				args("--config=junit.platform.reporting.output.dir=${reportsDir}")
-				args("--config=junit.platform.reporting.open.xml.enabled=true")
-				systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
-				debug = debugging.get()
-				if (!debugging.get()) {
-					standardOutput = output
-					errorOutput = output
-				}
-				isIgnoreExitValue = true
-			}
-			if (result.exitValue != 0 && !debugging.get()) {
-				System.out.write(output.toByteArray())
-				System.out.flush()
-			}
-			result.rethrowFailure().assertNormalExitValue()
-		}
+	val consoleLauncherTest by registering(RunConsoleLauncher::class) {
+		args.addAll("--config", "enableHttpServer=true")
+		args.addAll("--include-classname", ".*Tests")
+		args.addAll("--include-classname", ".*Demo")
+		args.addAll("--exclude-tag", "exclude")
 	}
 
-	register<JavaExec>("consoleLauncher") {
-		val reportsDir = file("$buildDir/console-launcher")
-		outputs.dir(reportsDir)
+	register<RunConsoleLauncher>("consoleLauncher") {
+		hideOutput.set(false)
+		reportsDir.set(layout.buildDirectory.dir("console-launcher"))
 		outputs.upToDateWhen { false }
-		classpath = sourceSets["test"].runtimeClasspath
-		mainClass.set("org.junit.platform.console.ConsoleLauncher")
-		args("--scan-classpath")
-		args("--config", "enableHttpServer=true")
-		args("--include-classname", ".*Tests")
-		args("--include-classname", ".*Demo")
-		args("--exclude-tag", "exclude")
-		args("--reports-dir", reportsDir)
-		systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
+		args.addAll("--config", "enableHttpServer=true")
+		args.addAll("--include-classname", ".*Tests")
+		args.addAll("--include-classname", ".*Demo")
+		args.addAll("--exclude-tag", "exclude")
 	}
 
 	test {

From 2332b18ded93d50abd1df17e4281e1e0b18f6c95 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 2 Oct 2022 11:46:36 +0200
Subject: [PATCH 0972/1433] Make verifyOSGi configuration cache compatible

---
 buildSrc/src/main/kotlin/osgi-conventions.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
index ad80ec1755f1..3a2bf7c6db66 100644
--- a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
@@ -106,6 +106,7 @@ val verifyOSGi by tasks.registering(Resolve::class) {
 	// can use them to validate the metadata without causing those to
 	// end up in the dependencies of those projects.
 	bundles(osgiVerification)
+	properties.empty()
 }
 
 tasks.check {

From 95de1574e7cbe6e99a3d79e927845dada0ef62c6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 8 Oct 2022 17:39:26 +0200
Subject: [PATCH 0973/1433] Delete obsolete files when unzipping Maven
 distribution

---
 .../platform-tooling-support-tests.gradle.kts                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 8a27b7b936b0..e3c28c4c8429 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
 	}
 }
 
-val unzipMavenDistribution by tasks.registering(Copy::class) {
+val unzipMavenDistribution by tasks.registering(Sync::class) {
 	from(zipTree(mavenDistribution.elements.map { it.single() }))
 	into(layout.buildDirectory.dir("maven-distribution"))
 }

From 43acc46104ce63ac12b6374b9e423e1c9d4fc05a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 8 Oct 2022 17:45:28 +0200
Subject: [PATCH 0974/1433] Update dependencies and plugins

---
 buildSrc/build.gradle.kts |  6 +++---
 gradle/libs.versions.toml | 22 +++++++++++-----------
 settings.gradle.kts       |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9fd96fb5833b..77473648993a 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	`kotlin-dsl`
-	id("com.github.ben-manes.versions") version "0.39.0"
+	id("com.github.ben-manes.versions") version "0.42.0"
 }
 
 repositories {
@@ -12,8 +12,8 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.3.1")
-	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
-	implementation("com.github.ben-manes:gradle-versions-plugin:0.39.0")
+	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.11.0")
+	implementation("com.github.ben-manes:gradle-versions-plugin:0.42.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	implementation("org.gradle:test-retry-gradle-plugin:1.4.1")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.11.1") // keep in sync with root settings.gradle.kts
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6bfa0b03406f..5a54da32ab60 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,29 +5,29 @@ asciidoctor-pdf = "1.5.3"
 assertj = "3.23.1"
 checkstyle = "9.0"
 jacoco = "0.8.7"
-jmh = "1.33"
+jmh = "1.35"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 ktlint = "0.43.0"
-log4j = "2.17.1"
+log4j = "2.19.0"
 opentest4j = "1.2.0"
 openTestReporting = "0.1.0-M1"
 surefire = "2.22.2"
-xmlunit = "2.8.4"
+xmlunit = "2.9.0"
 
 [libraries]
 ant = { module = "org.apache.ant:ant", version.ref = "ant" }
 ant-junit = { module = "org.apache.ant:ant-junit", version.ref = "ant" }
 ant-junitlauncher = { module = "org.apache.ant:ant-junitlauncher", version.ref = "ant" }
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "0.23.1" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.0.0" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.3.1" }
-classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.132" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.149" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
-groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.1" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.5" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
@@ -35,16 +35,16 @@ jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "1.6.2" }
 junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.13.2" } }
-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
-maven = { module = "org.apache.maven:apache-maven", version = "3.8.5" }
-mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.1.0" }
+maven = { module = "org.apache.maven:apache-maven", version = "3.8.6" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.8.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }
-picocli = { module = "info.picocli:picocli", version = "4.6.2" }
-slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "1.7.32" }
+picocli = { module = "info.picocli:picocli", version = "4.6.3" }
+slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.3" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 90fd6956e57d..ffe8e69da413 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -12,7 +12,7 @@ pluginManagement {
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "3.3.2"
 		id("org.asciidoctor.jvm.pdf") version "3.3.2"
-		id("me.champeau.jmh") version "0.6.6"
+		id("me.champeau.jmh") version "0.6.8"
 		id("io.spring.nohttp") version "0.0.10"
 		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 	}

From 4a87980a44a6e4870ef154e49b1b462e7ce539ab Mon Sep 17 00:00:00 2001
From: Etienne Dysli Metref <etienne.dysli@gmail.com>
Date: Thu, 6 Oct 2022 18:44:48 +0200
Subject: [PATCH 0975/1433] Document concurrency for TestExecutionListener
 implementations

Add a note about concurrency considerations for
`TestExecutionListener` implementations to this interface's Javadoc.

Issue: #2539
Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../junit/platform/launcher/TestExecutionListener.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
index f64f47382d1b..95d3e88c5d47 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
@@ -46,6 +46,12 @@
  * {@link #testPlanExecutionStarted(TestPlan)} and
  * {@link #testPlanExecutionFinished(TestPlan)}.
  *
+ * <p>Note on concurrency: {@link #testPlanExecutionStarted(TestPlan)} and
+ * {@link #testPlanExecutionFinished(TestPlan)} are always called from the same
+ * thread. It is safe to assume that there is at most one {@code TestPlan}
+ * instance at a time. All other methods could be called from different threads
+ * concurrently in case one or multiple test engines execute tests in parallel.
+ *
  * @since 1.0
  * @see Launcher
  * @see TestPlan
@@ -58,6 +64,8 @@ public interface TestExecutionListener {
 	 * Called when the execution of the {@link TestPlan} has started,
 	 * <em>before</em> any test has been executed.
 	 *
+	 * <p>Called from the same thread as {@link #testPlanExecutionFinished(TestPlan)}.
+	 *
 	 * @param testPlan describes the tree of tests about to be executed
 	 */
 	default void testPlanExecutionStarted(TestPlan testPlan) {
@@ -67,6 +75,8 @@ default void testPlanExecutionStarted(TestPlan testPlan) {
 	 * Called when the execution of the {@link TestPlan} has finished,
 	 * <em>after</em> all tests have been executed.
 	 *
+	 * <p>Called from the same thread as {@link #testPlanExecutionStarted(TestPlan)}.
+	 *
 	 * @param testPlan describes the tree of tests that have been executed
 	 */
 	default void testPlanExecutionFinished(TestPlan testPlan) {

From bd145aee9356be6e1d4cd1f03c596fc63de4adf0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 14 Oct 2022 13:00:20 +0200
Subject: [PATCH 0976/1433] Document need to install JDK 8 on Silicon Macs
 (#3059)

Resolves #3058.

Co-authored-by: Sam Brannen <sbrannen@vmware.com>
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index ecf74ef5e4d5..3ad848a48ac6 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,10 @@ task outputs from previous CI builds.
 You need [JDK 17] to build JUnit 5. [Gradle toolchains] are used to detect and
 potentially download additional JDKs for compilation and test execution.
 
+Note: If you're working on a machine with an Apple Silicon processor, you'll need to
+download and install a JDK 8 distribution manually (or via [SDKMAN!] or [asdf]) --
+for example, one from [Zulu] or [Liberica].
+
 All modules can be _built_ with the [Gradle Wrapper] using the following command.
 
 `gradlew clean assemble`
@@ -92,6 +96,7 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 <https://oss.sonatype.org/content/repositories/snapshots/org/junit/> for snapshots.
 
 
+[asdf]: https://asdf-vm.com/
 [Codecov]: https://codecov.io/gh/junit-team/junit5
 [CONTRIBUTING.md]: https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md
 [Dependency Metadata]: https://junit.org/junit5/docs/current/user-guide/#dependency-metadata
@@ -101,7 +106,10 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 [JaCoCo]: https://www.eclemma.org/jacoco/
 [Javadoc]: https://junit.org/junit5/docs/current/api/
 [JDK 17]: https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot
+[Liberica]: https://bell-sw.com/pages/downloads/
 [Release Notes]: https://junit.org/junit5/docs/current/release-notes/
 [Samples]: https://github.com/junit-team/junit5-samples
+[SDKMAN!]: https://sdkman.io/jdks
 [StackOverflow]: https://stackoverflow.com/questions/tagged/junit5
 [User Guide]: https://junit.org/junit5/docs/current/user-guide/
+[Zulu]: https://www.azul.com/downloads/?version=java-8-lts&os=macos&architecture=arm-64-bit&package=jdk#download-openjdk

From 21018062818ff2dc765fb1f06339509fa2bf51a8 Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Sat, 15 Oct 2022 14:44:14 +0200
Subject: [PATCH 0977/1433] Fix fallback to ForkJoinPools Java 7 constructor on
 Java 9 and higher

When an invalid ParallelExecutionConfiguration is provided on Java 9+ the
`ForkJoinPoolHierarchicalTestExecutorService` will fall back to using the
since Java 7 constructor. As a result misconfiguration goes unnoticed.

Separated the exceptions thrown by finding the Java 9+ constructor from those
thrown by invoking the constructor with an invalid configuration. The former
can be ignored, the latter should not be.

Fixes #3045.
---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes-5.10.0-M1.adoc              | 58 +++++++++++++++++++
 ...inPoolHierarchicalTestExecutorService.java | 43 ++++++++++----
 ...lHierarchicalTestExecutorServiceTests.java | 44 ++++++++++++++
 4 files changed, 135 insertions(+), 12 deletions(-)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
 create mode 100644 platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index e4be51b9779a..3a6c339159d9 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.10.0-M1.adoc[]
+
 include::{basedir}/release-notes-5.9.1.adoc[]
 
 include::{basedir}/release-notes-5.9.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
new file mode 100644
index 000000000000..f9685e1b45bf
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.10.0-M1️]]
+== 5.10.0-M1️
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/5.10.0-M1️?closed=1+[5.10.0-M1️] milestone page in the JUnit repository on
+GitHub.
+
+
+[[release-notes-5.10.0-M1️-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* Fixed fallback to ForkJoinPools Java 7 constructor on Java 9 and higher
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.10.0-M1️-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.10.0-M1️-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
index f32c443e2ca9..1d0c93d04e68 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
@@ -19,6 +19,8 @@
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory;
 import java.util.concurrent.ForkJoinTask;
@@ -26,6 +28,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.RecursiveAction;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
@@ -81,18 +84,32 @@ private static ParallelExecutionConfiguration createConfiguration(ConfigurationP
 
 	private ForkJoinPool createForkJoinPool(ParallelExecutionConfiguration configuration) {
 		ForkJoinWorkerThreadFactory threadFactory = new WorkerThreadFactory();
-		return Try.call(() -> {
-			// Try to use constructor available in Java >= 9
-			Constructor<ForkJoinPool> constructor = ForkJoinPool.class.getDeclaredConstructor(Integer.TYPE,
-				ForkJoinWorkerThreadFactory.class, UncaughtExceptionHandler.class, Boolean.TYPE, Integer.TYPE,
-				Integer.TYPE, Integer.TYPE, Predicate.class, Long.TYPE, TimeUnit.class);
-			return constructor.newInstance(configuration.getParallelism(), threadFactory, null, false,
-				configuration.getCorePoolSize(), configuration.getMaxPoolSize(), configuration.getMinimumRunnable(),
-				configuration.getSaturatePredicate(), configuration.getKeepAliveSeconds(), TimeUnit.SECONDS);
-		}).orElseTry(() -> {
-			// Fallback for Java 8
-			return new ForkJoinPool(configuration.getParallelism(), threadFactory, null, false);
-		}).getOrThrow(cause -> new JUnitException("Failed to create ForkJoinPool", cause));
+		// Try to use constructor available in Java >= 9
+		Callable<ForkJoinPool> constructorInvocation = sinceJava9Constructor() //
+				.map(sinceJava9ConstructorInvocation(configuration, threadFactory))
+				// Fallback for Java 8
+				.orElse(sinceJava7ConstructorInvocation(configuration, threadFactory));
+		return Try.call(constructorInvocation) //
+				.getOrThrow(cause -> new JUnitException("Failed to create ForkJoinPool", cause));
+	}
+
+	private static Optional<Constructor<ForkJoinPool>> sinceJava9Constructor() {
+		return Try.call(() -> ForkJoinPool.class.getDeclaredConstructor(Integer.TYPE, ForkJoinWorkerThreadFactory.class,
+			UncaughtExceptionHandler.class, Boolean.TYPE, Integer.TYPE, Integer.TYPE, Integer.TYPE, Predicate.class,
+			Long.TYPE, TimeUnit.class)) //
+				.toOptional();
+	}
+
+	private static Function<Constructor<ForkJoinPool>, Callable<ForkJoinPool>> sinceJava9ConstructorInvocation(
+			ParallelExecutionConfiguration configuration, ForkJoinWorkerThreadFactory threadFactory) {
+		return constructor -> () -> constructor.newInstance(configuration.getParallelism(), threadFactory, null, false,
+			configuration.getCorePoolSize(), configuration.getMaxPoolSize(), configuration.getMinimumRunnable(),
+			configuration.getSaturatePredicate(), configuration.getKeepAliveSeconds(), TimeUnit.SECONDS);
+	}
+
+	private static Callable<ForkJoinPool> sinceJava7ConstructorInvocation(ParallelExecutionConfiguration configuration,
+			ForkJoinWorkerThreadFactory threadFactory) {
+		return () -> new ForkJoinPool(configuration.getParallelism(), threadFactory, null, false);
 	}
 
 	@Override
@@ -199,6 +216,7 @@ static class WorkerThreadFactory implements ForkJoinPool.ForkJoinWorkerThreadFac
 		public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
 			return new WorkerThread(pool, contextClassLoader);
 		}
+
 	}
 
 	static class WorkerThread extends ForkJoinWorkerThread {
@@ -207,6 +225,7 @@ static class WorkerThread extends ForkJoinWorkerThread {
 			super(pool);
 			setContextClassLoader(contextClassLoader);
 		}
+
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
new file mode 100644
index 000000000000..07f9a1f05a50
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.engine.support.hierarchical;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.platform.commons.JUnitException;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class ForkJoinPoolHierarchicalTestExecutorServiceTests {
+
+	@Mock
+	ParallelExecutionConfiguration configuration;
+
+	@Test
+	void exceptionsFromInvalidConfigurationAreNotSwallowed() {
+		when(configuration.getParallelism()).thenReturn(2);
+		when(configuration.getMaxPoolSize()).thenReturn(1); // invalid, should be > parallelism
+		when(configuration.getCorePoolSize()).thenReturn(1);
+		when(configuration.getMinimumRunnable()).thenReturn(1);
+		when(configuration.getSaturatePredicate()).thenReturn(__ -> true);
+		when(configuration.getKeepAliveSeconds()).thenReturn(0);
+
+		JUnitException exception = assertThrows(JUnitException.class,
+			() -> new ForkJoinPoolHierarchicalTestExecutorService(configuration));
+		assertThat(exception).hasMessage("Failed to create ForkJoinPool");
+		assertThat(exception).rootCause().isInstanceOf(IllegalArgumentException.class);
+	}
+
+}

From aa29dfdf23df5174405be26b59173c1639422072 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 18 Oct 2022 16:49:33 +0200
Subject: [PATCH 0978/1433] Update Gradle Enterprise Gradle plugin to 3.11.2

Closes #3065.
Closes #3066.
---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 77473648993a..1d96984da57c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.42.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	implementation("org.gradle:test-retry-gradle-plugin:1.4.1")
-	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.11.1") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.11.2") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ffe8e69da413..532b3fed4f17 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.11.1" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise") version "3.11.2" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.1"
 		id("org.ajoberstar.git-publish") version "4.1.1"
 		kotlin("jvm") version "1.5.31"

From c84e02a403cb203935ef623a80d085fe06037625 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 19 Oct 2022 19:05:56 +0200
Subject: [PATCH 0979/1433] Archive trace files per job

---
 .github/workflows/cross-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index fcea6360c17a..e0f310f26665 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -48,5 +48,5 @@ jobs:
       - name: Upload Test Distribution trace files
         uses: actions/upload-artifact@v2
         with:
-          name: Test Distribution trace files
+          name: Test Distribution trace files (${{ github.job }})
           path: '**/build/test-results/*/trace.json'

From 8841a051ba5883a2cfeefcfc9221c7ef2b124e29 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 19 Oct 2022 19:17:25 +0200
Subject: [PATCH 0980/1433] Archive trace files per JDK version

---
 .github/workflows/cross-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index e0f310f26665..f52f8e27f432 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -48,5 +48,5 @@ jobs:
       - name: Upload Test Distribution trace files
         uses: actions/upload-artifact@v2
         with:
-          name: Test Distribution trace files (${{ github.job }})
+          name: "Test Distribution trace files (OpenJDK ${{ matrix.jdk }})"
           path: '**/build/test-results/*/trace.json'

From c2781e939f084d48046e80b7c5fe412f8a66aca1 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Thu, 20 Oct 2022 11:41:12 +0000
Subject: [PATCH 0981/1433] Update `checkout` and `setup-java` actions to `v3`

---
 .github/actions/run-gradle/action.yml           |  2 +-
 .github/actions/setup-test-jdk/action.yml       |  2 +-
 .github/workflows/codeql-analysis.yml           |  2 +-
 .github/workflows/cross-version.yml             |  2 +-
 .github/workflows/gradle-wrapper-validation.yml |  2 +-
 .github/workflows/main.yml                      | 10 +++++-----
 .github/workflows/reproducible-build.yml        |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
index cdd702d0a0ab..501393593a6c 100644
--- a/.github/actions/run-gradle/action.yml
+++ b/.github/actions/run-gradle/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v3
       id: setup-gradle-jdk
       with:
         distribution: temurin
diff --git a/.github/actions/setup-test-jdk/action.yml b/.github/actions/setup-test-jdk/action.yml
index 8dc70985295b..4e8c96266c69 100644
--- a/.github/actions/setup-test-jdk/action.yml
+++ b/.github/actions/setup-test-jdk/action.yml
@@ -3,7 +3,7 @@ description: Sets up the JDK required to run platform-tooling-support-tests
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v3
       with:
         distribution: temurin
         java-version: 8
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3d2321519793..0bb949702e2d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -22,7 +22,7 @@ jobs:
         language: ['java', 'javascript']
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index f52f8e27f432..765b49bcb72c 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
       - name: Set up Test JDK
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index ce98fe801382..b41829549ff3 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
       - name: Validate Gradle wrapper
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f7a7ef835937..ee232a823fd8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 1
     - name: Install Graphviz
@@ -49,7 +49,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 1
     - name: Build
@@ -59,7 +59,7 @@ jobs:
     runs-on: macos-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 1
     - name: Build
@@ -72,7 +72,7 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && (startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main')
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 1
     - name: Publish
@@ -90,7 +90,7 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 1
     - name: Install Graphviz
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 3a9d1fe3267f..3327cc7fb47b 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 1
     - name: Restore Gradle cache and display toolchains

From d71e4a43a9c14496f08c063fec3353e89ba68eb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 07:47:36 +0200
Subject: [PATCH 0982/1433] Update
 com.gradle.common-custom-user-data-gradle-plugin to 1.8.2 (#3074)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 532b3fed4f17..0561246e903d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.11.2" // keep in sync with buildSrc/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.1"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
 		id("org.ajoberstar.git-publish") version "4.1.1"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading

From 9fe7a803fe613470927877e8096cdca100b41802 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Oct 2022 11:37:29 +0200
Subject: [PATCH 0983/1433] Fix broken links and character set in 5.10 M1
 release notes

---
 .../release-notes/release-notes-5.10.0-M1.adoc   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index f9685e1b45bf..3b9edfa7decf 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -1,21 +1,21 @@
-[[release-notes-5.10.0-M1️]]
-== 5.10.0-M1️
+[[release-notes-5.10.0-M1]]
+== 5.10.0-M1
 
 *Date of Release:* ❓
 
 *Scope:* ❓
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/5.10.0-M1️?closed=1+[5.10.0-M1️] milestone page in the JUnit repository on
-GitHub.
+link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1] milestone page in the JUnit
+repository on GitHub.
 
 
-[[release-notes-5.10.0-M1️-junit-platform]]
+[[release-notes-5.10.0-M1-junit-platform]]
 === JUnit Platform
 
 ==== Bug Fixes
 
-* Fixed fallback to ForkJoinPools Java 7 constructor on Java 9 and higher
+* Fixed fallback to ForkJoinPool's Java 7 constructor on Java 9 and higher.
 
 ==== Deprecations and Breaking Changes
 
@@ -26,7 +26,7 @@ GitHub.
 * ❓
 
 
-[[release-notes-5.10.0-M1️-junit-jupiter]]
+[[release-notes-5.10.0-M1-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -42,7 +42,7 @@ GitHub.
 * ❓
 
 
-[[release-notes-5.10.0-M1️-junit-vintage]]
+[[release-notes-5.10.0-M1-junit-vintage]]
 === JUnit Vintage
 
 ==== Bug Fixes

From 6e6175e1030eb6e99b22092712952cb415bb5de9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Oct 2022 13:45:23 +0200
Subject: [PATCH 0984/1433] Polish release notes for 5.10.0-M1

---
 .../docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 3b9edfa7decf..e776106993ae 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -15,7 +15,10 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* Fixed fallback to ForkJoinPool's Java 7 constructor on Java 9 and higher.
+* The Java 7 based constructor for `ForkJoinPool` is no longer accidentally used on Java 9
+  or higher when invalid `ParallelExecutionConfiguration` is provided. Instead, an
+  exception is thrown for invalid configuration, thereby preventing invalid configuration
+  from being silently ignored.
 
 ==== Deprecations and Breaking Changes
 

From bc98426d5aef9a8fb6b7f7d3f22db098025986d3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Oct 2022 14:01:49 +0200
Subject: [PATCH 0985/1433] Prune release notes for 5.10

---
 .../docs/asciidoc/release-notes/index.adoc    |   8 +-
 .../release-notes/release-notes-5.8.0.adoc    |  21 ---
 .../release-notes/release-notes-5.8.1.adoc    |  62 --------
 .../release-notes/release-notes-5.8.2.adoc    |  45 ------
 .../release-notes/release-notes-5.9.0.adoc    | 137 +-----------------
 5 files changed, 6 insertions(+), 267 deletions(-)
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 3a6c339159d9..a0b2217eef7c 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -8,7 +8,7 @@ Stefan Bechtold; Sam Brannen; Johannes Link; Matthias Merdes; Marc Philipp; Juli
 :numbered!:
 //
 
-This document contains the _change log_ for all JUnit 5 releases since 5.8 GA.
+This document contains the _change log_ for all JUnit 5 releases since 5.9 GA.
 
 Please refer to the <<../user-guide/index.adoc#user-guide,User Guide>> for comprehensive
 reference documentation for programmers writing tests, extension authors, and engine
@@ -21,9 +21,3 @@ include::{basedir}/release-notes-5.10.0-M1.adoc[]
 include::{basedir}/release-notes-5.9.1.adoc[]
 
 include::{basedir}/release-notes-5.9.0.adoc[]
-
-include::{basedir}/release-notes-5.8.2.adoc[]
-
-include::{basedir}/release-notes-5.8.1.adoc[]
-
-include::{basedir}/release-notes-5.8.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
deleted file mode 100644
index fc0763c6e355..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0.adoc
+++ /dev/null
@@ -1,21 +0,0 @@
-[[release-notes-5.8.0]]
-== 5.8.0
-
-*Date of Release:* September 12, 2021
-
-*Scope:*
-
-* Declarative test suites via `@Suite` classes
-* `LauncherSession` and accompanying listener
-* New `UniqueIdTrackingListener`
-* More fine-grained Java Flight Recorder events
-* Java Flight Recorder support on Java 8 Update 262 or higher
-* Test class ordering
-* `@TempDir` can be used to create multiple temporary directories
-* Extension registration via `@ExtendWith` on fields and parameters
-* Auto-close support for arguments in `@ParameterizedTest` methods
-* Memory and performance optimizations
-* Numerous bug fixes and minor improvements
-
-For complete details consult the
-https://junit.org/junit5/docs/5.8.0/release-notes/index.html[5.8.0 Release Notes] online.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
deleted file mode 100644
index 8a54b4f541d9..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.1.adoc
+++ /dev/null
@@ -1,62 +0,0 @@
-[[release-notes-5.8.1]]
-== 5.8.1
-
-*Date of Release:* September 22, 2021
-
-*Scope:*
-
-* Support for _text blocks_ in `@CsvSource`
-* Java 18 support in the `JRE` enum
-* Access to the `ExecutionMode` in the `ExtensionContext`
-* Minor bug fixes and enhancements since 5.8.0
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/59?closed=1+[5.8.1] milestone page in the JUnit repository on
-GitHub.
-
-
-[[release-notes-5.8.1-junit-platform]]
-=== JUnit Platform
-
-==== Deprecations and Breaking Changes
-
-* `@UseTechnicalNames` has been deprecated in favor of the new `@Suite` support which does
-  not require the use of technical names. See the warning in
-  <<../user-guide/index.adoc#running-tests-junit-platform-runner, Using JUnit 4 to run the
-  JUnit Platform>> for details.
-
-==== New Features and Improvements
-
-* `ReflectionSupport.findNestedClasses(..)` is now thread-safe with regard to cycle
-  detection.
-
-
-[[release-notes-5.8.1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* `assertLinesMatch()` in `Assertions` no longer fails with a `NoSuchElementException` if
-  a limited fast-forward followed by at least one more expected line exceeds the remaining
-  actual lines.
-* `assertLinesMatch()` in `Assertions` now handles fast-forwards with leading and trailing
-  spaces correctly and no longer throws an `IndexOutOfBoundsException`.
-
-==== New Features and Improvements
-
-* `JAVA_18` has been added to the `JRE` enum for use with JRE-based execution conditions.
-* CSV content in `@CsvSource` can now be supplied as a _text block_ instead of an array of
-  strings. See the
-  <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvSource, User
-  Guide>> for details and an example.
-* The `ExecutionMode` for the current test or container is now accessible via the
-  `ExtensionContext`.
-
-
-[[release-notes-5.8.1-junit-vintage]]
-=== JUnit Vintage
-
-==== Bug Fixes
-
-* Relaxed version constraint in published Gradle Module Metadata to allow downgrading the
-  `junit:junit` dependency from 4.13.2.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
deleted file mode 100644
index 831cc74ae286..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.2.adoc
+++ /dev/null
@@ -1,45 +0,0 @@
-[[release-notes-5.8.2]]
-== 5.8.2
-
-*Date of Release:* November 28, 2021
-
-*Scope:*
-
-* Text blocks in `@CsvSource` are treated like CSV files
-* CSV headers in display names for `@CsvSource` and `@CsvFileSource`
-* Custom quote character support in `@CsvSource` and `@CsvFileSource`
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/60?closed=1+[5.8.2] milestone page in the JUnit repository on
-GitHub.
-
-
-[[release-notes-5.8.2-junit-platform]]
-=== JUnit Platform
-
-No changes.
-
-
-[[release-notes-5.8.2-junit-jupiter]]
-=== JUnit Jupiter
-
-==== New Features and Improvements
-
-* Text blocks in `@CsvSource` are now treated like complete CSV files, including support
-  for comments beginning with a `+++#+++` symbol as well as support for new lines within
-  quoted strings. See the
-  <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvSource, User
-  Guide>> for details and examples.
-* CSV headers can now be used in display names in parameterized tests. See
-  <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvSource,
-  `@CsvSource`>> and
-  <<../user-guide/index.adoc#writing-tests-parameterized-tests-sources-CsvFileSource,
-  `@CsvFileSource`>> in the User Guide for details and examples.
-* The quote character for _quoted strings_ in `@CsvSource` and `@CsvFileSource` is now
-  configurable via a new `quoteCharacter` attribute in each annotation.
-
-
-[[release-notes-5.8.2-junit-vintage]]
-=== JUnit Vintage
-
-No changes.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
index aa292b95a634..e5ee0004d778 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0.adoc
@@ -5,8 +5,8 @@
 
 *Scope:*
 
-* XML reports in new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
-format
+* XML reports in the new https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
+  format
 * Configurable cleanup mode for `@TempDir`
 * Configurable thread mode for `@Timeout`
 * Conditional execution based on OS architectures
@@ -15,134 +15,7 @@ format
 * Parameter injection for `@MethodSource` methods
 * New `IterationSelector`
 * Various improvements to `ConsoleLauncher`
+* Numerous bug fixes and minor improvements
 
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/58?closed=1+[5.9 M1],
-link:{junit5-repo}+/milestone/61?closed=1+[5.9 RC1], and
-link:{junit5-repo}+/milestone/62?closed=1+[5.9 GA] milestone pages in the JUnit repository
-on GitHub.
-
-
-[[release-notes-5.9.0-junit-platform]]
-=== JUnit Platform
-
-==== Bug Fixes
-
-* Fixed handling of global post-discovery filters that apply to `@Suite` classes.
-* Since the Turkish language has special characters such as 'ı' and 'İ', the uppercase
-  conversion in `DefaultParallelExecutionConfigurationStrategy#getStrategy` previously
-  caused all tests to finish with exit code -1. This has been fixed by using the root
-  locale instead of the default one.
-* Absolute path entries are now supported in JUnit's Platform Console Launcher on Windows.
-* Attempts to load a `Class` for an invalid class name representing an extremely large
-  multidimensional array now fail within a reasonable amount of time.
-* Fix concurrency issue in classpath scanning.
-
-==== Deprecations and Breaking Changes
-
-* `ConfigurationParameters.size()` has been deprecated in favor of the new `keySet()`
-  method.
-
-==== New Features and Improvements
-
-* Support for the https://github.com/ota4j-team/open-test-reporting[Open Test Reporting]
-  format which supports all features of the JUnit Platform such as hierarchical test
-  structures, display names, tags, etc. Please refer to the
-  <<../user-guide/index.adoc#junit-platform-reporting-open-test-reporting, User Guide>>
-  for instructions on how to enable such reports in your build.
-* `ConfigurationParameters` has a new `keySet()` method which allows you to retrieve all
-  configuration parameter keys.
-* New `IterationSelector` for selecting a subset of a test's or container's iterations.
-* `ParallelExecutionConfiguration` allows configuring the `saturate` predicate of the
-  `ForkJoinPool` used for parallel test execution.
-* JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at
-  resolution time a fully running set of dependencies is calculated, avoiding the need for
-  these to be manually specified.
-* JUnit Platform Standalone Console JAR now also includes the JUnit Platform Suite Engine.
-* New `failIfNoTests` attribute added to `@Suite`. This will fail the suite if no tests
-  are discovered.
-* The output color for the `ConsoleLauncher` can now be customized. The option
-  `--single-color` will apply a built-in monochrome style, while `--color-palette` will
-  accept a properties file. See the
-  <<../user-guide/index.adoc#running-tests-console-launcher-color-customization,
-  User Guide>> for details.
-* The default theme for the `ConsoleLauncher` is now determined by the charset reported by
-  the system console on Java 17 and later.
-* New `--list-engines` option added to the `ConsoleLauncher` which displays all registered
-  test engine implementations.
-* Configuring included `EngineFilters` that do not match any registered `TestEngine`
-  results in an error to avoid misconfiguration – for example, due to typos.
-* New public factory method to instantiate an `ExecutionRequest`.
-* Documentation for overriding the JUnit version used in Spring Boot applications. See the
-  <<../user-guide/index.adoc#running-tests-build-spring-boot, User Guide>> for details.
-
-
-[[release-notes-5.9.0-junit-jupiter]]
-=== JUnit Jupiter
-
-==== Bug Fixes
-
-* When cleaning up a `@TempDir`, only one retry attempt will be made to delete directories.
-* Since the Turkish language has special characters such as 'ı' and 'İ', the uppercase
-  conversion in `DefaultParallelExecutionConfigurationStrategy#getStrategy` previously
-  caused all tests to finish with exit code -1. This has been fixed by using the root
-  locale instead of the default one.
-
-==== Deprecations and Breaking Changes
-
-* `@TempDir` fields are no longer allowed to be declared as `final`.
-  - This improves diagnostics for failures resulting from a user-declared `static final`
-    `@TempDir` field by throwing an exception with an informative error message.
-* Private lifecycle methods (annotated with `@BeforeAll`, `@AfterAll`, `@BeforeEach`, or
-  `@AfterEach`) now correctly lead to an exception. Although this is a bug fix, it is
-  technically also a breaking change since there might be existing user code with
-  `private` lifecycle methods which will now start to fail.
-
-==== New Features and Improvements
-
-* `@TempDir` now includes a `cleanup` mode attribute for preventing a temporary directory
-  from being deleted after a test. The default cleanup mode can be configured via a
-  configuration parameter.
-* Support for FreeBSD and OpenBSD operating systems in `@EnabledOnOs` and `@DisabledOnOs`.
-* New `MATCH_NONE` mode for `@EnumSource` that selects only those enum constants whose
-  names match none of the supplied patterns.
-* The `@Order` annotation is now a `STABLE` API.
-* New `TestInstancePreConstructCallback` extension API that is called prior to test
-  instance construction – symmetric to the existing `TestInstancePreDestroyCallback`
-  extension API.
-* Extensions can now leverage registered `ParameterResolver` extensions when invoking
-  methods and constructors via the new `ExecutableInvoker` API available in the
-  `ExtensionContext`.
-* A subset of the invocations of parameterized or dynamic tests can now be selected via
-  the new `IterationSelector` discovery selector when launching the JUnit Platform.
-* `JAVA_19` and `JAVA_20` have been added to the `JRE` enum for use with JRE-based
-  execution conditions.
-* `@MethodSource` factory methods can now accept arguments resolved by registered
-  `ParameterResolver` extensions.
-* `AssertionFailureBuilder` allows reusing Jupiter's logic for creating failure messages
-  to assist in writing custom assertion methods.
-* Three new `abort` methods have been added to the `Assumptions` class. These are
-  analogous to the `fail` methods in the `Assertions` class, but instead of failing they
-  abort the test or container.
-* Support for enabling/disabling tests based on the system's hardware architecture via new
-  `architectures` attributes in `@EnabledOnOs` and `@DisabledOnOs`.
-* Default `@MethodSource` factory methods can now accept arguments. A _default_ factory
-  method is a method declared in the test class with the same name as the
-  `@ParameterizedTest` method that is inferred as the factory method when no explicit
-  factory method is specified in the `@MethodSource` annotation.
-* Thread mode can be set on `@Timeout` annotation. It allows to configure whether test
-  code is executed in the thread of the calling code or in a separate thread. The three
-  modes are: `INFERRED` (default) which resolves the thread mode configured via the
-  property `junit.jupiter.execution.timeout.thread.mode.default`, `SAME_THREAD` that
-  executes the test code in the same thread as the calling code, and `SEPARATE_THREAD`
-  which executes it in a separate thread.
-
-
-[[release-notes-5.9.0-junit-vintage]]
-=== JUnit Vintage
-
-==== New Features and Improvements
-
-* More accurate reporting of intermediate start/finish events, e.g. iterations of the
-  `Parameterized` runner and classes executed indirectly via the `Suite` runner, when
-  running with JUnit 4.13 or later.
+For complete details consult the
+https://junit.org/junit5/docs/5.9.0/release-notes/index.html[5.9.0 Release Notes] online.

From 6bb86a5b9c0868b39ae7d76bb73a6d47fcbc24f9 Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <rien.korstanje@gmail.com>
Date: Wed, 26 Oct 2022 13:50:54 +0200
Subject: [PATCH 0986/1433] Replace warning emoji in release notes template
 with VERSION
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The release notes template uses ⚠️ as a version placeholder. This symbol
consists of `U+26A0` (the triangle) and `U+FE0F` (the emoji indicator).

Depending on your IDE, this is rendered as ⚠ followed by an invisible
character. So it is relatively easy to search for and replace only
`U+26A0`, leaving in place `U+FE0F`.

See: https://github.com/junit-team/junit5/commit/21018062818ff2dc765fb1f06339509fa2bf51a8#r87940423

By replacing ⚠️ with `VERSION` we can avoid this problem.

Closes #3077
---
 .../release-notes/release-notes-TEMPLATE.adoc      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
index 17790483e124..812dd4a7ad07 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
@@ -1,18 +1,18 @@
-// TODO: replace all occurrences of ⚠️ with appropriate values, delete this comment, and
+// TODO: replace all occurrences of VERSION with appropriate values, delete this comment, and
 // 'include:' this new file in index.adoc.
-[[release-notes-⚠️]]
-== ⚠️
+[[release-notes-VERSION]]
+== VERSION
 
 *Date of Release:* ❓
 
 *Scope:* ❓
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/⚠️?closed=1+[⚠️] milestone page in the JUnit repository on
+link:{junit5-repo}+/milestone/VERSION?closed=1+[VERSION] milestone page in the JUnit repository on
 GitHub.
 
 
-[[release-notes-⚠️-junit-platform]]
+[[release-notes-VERSION-junit-platform]]
 === JUnit Platform
 
 ==== Bug Fixes
@@ -28,7 +28,7 @@ GitHub.
 * ❓
 
 
-[[release-notes-⚠️-junit-jupiter]]
+[[release-notes-VERSION-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -44,7 +44,7 @@ GitHub.
 * ❓
 
 
-[[release-notes-⚠️-junit-vintage]]
+= [[release-notes-VERSION-junit-vintage]]
 === JUnit Vintage
 
 ==== Bug Fixes

From 1a15cb41a5b2c83f339b76e19b53dba70fe96a5a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Oct 2022 14:45:39 +0200
Subject: [PATCH 0987/1433] Revise release notes template regarding GitHub
 milestone number

---
 .../release-notes/release-notes-TEMPLATE.adoc   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
index 812dd4a7ad07..283e02cbc8df 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
@@ -1,5 +1,14 @@
-// TODO: replace all occurrences of VERSION with appropriate values, delete this comment, and
-// 'include:' this new file in index.adoc.
+// TODO:
+//
+// 1) Replace all occurrences of VERSION with an appropriate value (for example, 5.10.0-M1,
+//    5.10.0-RC1, 5.10.0).
+// 2) Replace MILESTONE_NUMBER with the appropriate milestone number. This is an integer
+//    which you can determine via https://github.com/junit-team/junit5/milestones/. If a
+//    GitHub milestone does not yet exist for the given VERSION, you will need to create
+//    a new GitHub milestone or ask a member of the JUnit team to create it for you.
+// 3) Delete this comment.
+// 4) 'include:' this new file in index.adoc.
+//
 [[release-notes-VERSION]]
 == VERSION
 
@@ -8,8 +17,8 @@
 *Scope:* ❓
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/VERSION?closed=1+[VERSION] milestone page in the JUnit repository on
-GitHub.
+link:{junit5-repo}+/milestone/MILESTONE_NUMBER?closed=1+[VERSION] milestone page in the
+JUnit repository on GitHub.
 
 
 [[release-notes-VERSION-junit-platform]]

From 93b6bf05a647f54edebc369f67b1bd69eb11e709 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 27 Oct 2022 16:11:08 +0200
Subject: [PATCH 0988/1433] Revise release notes template TODOs

---
 .../release-notes/release-notes-TEMPLATE.adoc      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
index 283e02cbc8df..ef56e8c27ff9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-TEMPLATE.adoc
@@ -1,13 +1,17 @@
 // TODO:
 //
-// 1) Replace all occurrences of VERSION with an appropriate value (for example, 5.10.0-M1,
-//    5.10.0-RC1, 5.10.0).
-// 2) Replace MILESTONE_NUMBER with the appropriate milestone number. This is an integer
+// 1) Make a copy of this template file, replacing TEMPLATE in the file name with the
+//    current version (for example, 5.10.0-M1, 5.10.0-RC1, 5.10.0).
+// 2) Open the new file for editing.
+// 3) Replace all occurrences of VERSION with the current version (for example, 5.10.0-M1,
+//    5.10.0-RC1, 5.10.0). The same version must be used in the file name and within the
+//    file.
+// 4) Replace MILESTONE_NUMBER with the appropriate milestone number. This is an integer
 //    which you can determine via https://github.com/junit-team/junit5/milestones/. If a
 //    GitHub milestone does not yet exist for the given VERSION, you will need to create
 //    a new GitHub milestone or ask a member of the JUnit team to create it for you.
-// 3) Delete this comment.
-// 4) 'include:' this new file in index.adoc.
+// 5) 'include:' this new file in index.adoc.
+// 6) Delete this entire comment block.
 //
 [[release-notes-VERSION]]
 == VERSION

From 2896f57f2251a2ac3fe0c473354a1695a752bc13 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 30 Oct 2022 17:59:26 +0100
Subject: [PATCH 0989/1433] Add 5.9.2 release notes

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.9.2.adoc    | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index a0b2217eef7c..8f5734c9dba8 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -18,6 +18,8 @@ include::{includedir}/link-attributes.adoc[]
 
 include::{basedir}/release-notes-5.10.0-M1.adoc[]
 
+include::{basedir}/release-notes-5.9.2.adoc[]
+
 include::{basedir}/release-notes-5.9.1.adoc[]
 
 include::{basedir}/release-notes-5.9.0.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
new file mode 100644
index 000000000000..2e7cc80a3df4
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.9.2]]
+== 5.9.2
+
+*Date of Release:* ❓
+
+*Scope:* Bug fixes and enhancements since 5.9.1
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestones/5.9.2+[5.9.2] milestone page in the
+JUnit repository on GitHub.
+
+
+[[release-notes-5.9.2-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.2-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+= [[release-notes-5.9.2-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From 11a49e56a74c6aa55cd99af1a393232ff30d3ae6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 23 Oct 2022 18:24:23 +0200
Subject: [PATCH 0990/1433] Avoid unnecessarily parsing unique IDs

---
 .../release-notes/release-notes-5.9.2.adoc    |  3 +-
 .../engine/OverloadedTestMethodTests.java     |  3 +-
 .../console/tasks/TreePrintingListener.java   | 12 ++---
 .../jfr/FlightRecordingExecutionListener.java |  6 +--
 .../org/junit/platform/launcher/TestPlan.java | 47 +++++++++++++++----
 .../core/ExecutionListenerAdapter.java        |  2 +-
 .../launcher/core/InternalTestPlan.java       | 13 +++++
 .../LegacyXmlReportGeneratingListener.java    |  5 +-
 .../junit/platform/runner/JUnitPlatform.java  |  2 +-
 .../runner/JUnitPlatformRunnerListener.java   |  3 +-
 .../runner/JUnitPlatformTestTree.java         |  7 +--
 .../DefaultLauncherEngineFilterTests.java     | 12 ++---
 .../launcher/core/DefaultLauncherTests.java   | 26 +++++-----
 .../core/ExecutionListenerAdapterTests.java   |  2 +-
 .../launcher/core/LauncherFactoryTests.java   | 13 ++---
 ...TestExecutionListenerIntegrationTests.java |  4 +-
 .../legacy/LegacyReportingUtilsTests.java     |  4 +-
 ...egacyXmlReportGeneratingListenerTests.java |  7 +--
 .../legacy/xml/XmlReportDataTests.java        | 19 ++++----
 .../legacy/xml/XmlReportWriterTests.java      | 16 +++----
 .../runner/JUnitPlatformRunnerTests.java      |  4 +-
 settings.gradle.kts                           |  1 -
 22 files changed, 131 insertions(+), 80 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index 2e7cc80a3df4..9b5209784dfa 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -23,7 +23,8 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* Introduce `TestPlan.getTestIdentifier(UniqueId)` and `TestPlan.getChildren(UniqueId)` to
+  avoid parsing unique IDs unnecessarily during test execution.
 
 
 [[release-notes-5.9.2-junit-jupiter]]
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
index cf54b3b9a7a0..f2b2557cab1c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
@@ -18,6 +18,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.testkit.engine.Event;
 import org.junit.platform.testkit.engine.Events;
@@ -40,7 +41,7 @@ void executeTestCaseWithOverloadedMethodsAndThenRerunOnlyOneOfTheMethodsSelected
 			event -> event.getTestDescriptor().getUniqueId().toString().contains(TestInfo.class.getName())).findFirst();
 		assertTrue(first.isPresent());
 		TestIdentifier testIdentifier = TestIdentifier.from(first.get().getTestDescriptor());
-		String uniqueId = testIdentifier.getUniqueId();
+		UniqueId uniqueId = testIdentifier.getUniqueIdObject();
 
 		tests = executeTests(selectUniqueId(uniqueId)).testEvents();
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
index 936d32545bc3..0c51a1f2790f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
@@ -17,6 +17,7 @@
 
 import org.junit.platform.console.options.Theme;
 import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
@@ -27,7 +28,7 @@
  */
 class TreePrintingListener implements TestExecutionListener {
 
-	private final Map<String, TreeNode> nodesByUniqueId = new ConcurrentHashMap<>();
+	private final Map<UniqueId, TreeNode> nodesByUniqueId = new ConcurrentHashMap<>();
 	private TreeNode root;
 	private final TreePrinter treePrinter;
 
@@ -35,15 +36,14 @@ class TreePrintingListener implements TestExecutionListener {
 		this.treePrinter = new TreePrinter(out, theme, colorPalette);
 	}
 
-	private TreeNode addNode(TestIdentifier testIdentifier, Supplier<TreeNode> nodeSupplier) {
+	private void addNode(TestIdentifier testIdentifier, Supplier<TreeNode> nodeSupplier) {
 		TreeNode node = nodeSupplier.get();
-		nodesByUniqueId.put(testIdentifier.getUniqueId(), node);
-		testIdentifier.getParentId().map(nodesByUniqueId::get).orElse(root).addChild(node);
-		return node;
+		nodesByUniqueId.put(testIdentifier.getUniqueIdObject(), node);
+		testIdentifier.getParentIdObject().map(nodesByUniqueId::get).orElse(root).addChild(node);
 	}
 
 	private TreeNode getNode(TestIdentifier testIdentifier) {
-		return nodesByUniqueId.get(testIdentifier.getUniqueId());
+		return nodesByUniqueId.get(testIdentifier.getUniqueIdObject());
 	}
 
 	@Override
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
index 6df356e6925c..b4c3e006c29c 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
@@ -42,7 +42,7 @@
 public class FlightRecordingExecutionListener implements TestExecutionListener {
 
 	private final AtomicReference<TestPlanExecutionEvent> testPlanExecutionEvent = new AtomicReference<>();
-	private final Map<String, TestExecutionEvent> testExecutionEvents = new ConcurrentHashMap<>();
+	private final Map<org.junit.platform.engine.UniqueId, TestExecutionEvent> testExecutionEvents = new ConcurrentHashMap<>();
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan plan) {
@@ -70,7 +70,7 @@ public void executionSkipped(TestIdentifier test, String reason) {
 	@Override
 	public void executionStarted(TestIdentifier test) {
 		TestExecutionEvent event = new TestExecutionEvent();
-		testExecutionEvents.put(test.getUniqueId(), event);
+		testExecutionEvents.put(test.getUniqueIdObject(), event);
 		event.initialize(test);
 		event.begin();
 	}
@@ -78,7 +78,7 @@ public void executionStarted(TestIdentifier test) {
 	@Override
 	public void executionFinished(TestIdentifier test, TestExecutionResult result) {
 		Optional<Throwable> throwable = result.getThrowable();
-		TestExecutionEvent event = testExecutionEvents.remove(test.getUniqueId());
+		TestExecutionEvent event = testExecutionEvents.remove(test.getUniqueIdObject());
 		event.end();
 		event.result = result.getStatus().toString();
 		event.exceptionClass = throwable.map(Throwable::getClass).orElse(null);
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index 8184d8c5ab25..9862307ee947 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -158,7 +158,7 @@ public Set<TestIdentifier> getRoots() {
 	 */
 	public Optional<TestIdentifier> getParent(TestIdentifier child) {
 		Preconditions.notNull(child, "child must not be null");
-		return child.getParentId().map(this::getTestIdentifier);
+		return child.getParentIdObject().map(this::getTestIdentifier);
 	}
 
 	/**
@@ -166,11 +166,11 @@ public Optional<TestIdentifier> getParent(TestIdentifier child) {
 	 *
 	 * @param parent the identifier to look up the children for; never {@code null}
 	 * @return an unmodifiable set of the parent's children, potentially empty
-	 * @see #getChildren(String)
+	 * @see #getChildren(UniqueId)
 	 */
 	public Set<TestIdentifier> getChildren(TestIdentifier parent) {
 		Preconditions.notNull(parent, "parent must not be null");
-		return getChildren(parent.getUniqueId());
+		return getChildren(parent.getUniqueIdObject());
 	}
 
 	/**
@@ -180,11 +180,26 @@ public Set<TestIdentifier> getChildren(TestIdentifier parent) {
 	 * {@code null} or blank
 	 * @return an unmodifiable set of the parent's children, potentially empty
 	 * @see #getChildren(TestIdentifier)
+	 * @deprecated Use {@link #getChildren(UniqueId)}
 	 */
+	@API(status = DEPRECATED, since = "1.10")
+	@Deprecated
 	public Set<TestIdentifier> getChildren(String parentId) {
 		Preconditions.notBlank(parentId, "parent ID must not be null or blank");
-		UniqueId uniqueId = UniqueId.parse(parentId);
-		return children.containsKey(uniqueId) ? unmodifiableSet(children.get(uniqueId)) : emptySet();
+		return getChildren(UniqueId.parse(parentId));
+	}
+
+	/**
+	 * Get the children of the supplied unique ID.
+	 *
+	 * @param parentId the unique ID to look up the children for; never
+	 * {@code null}
+	 * @return an unmodifiable set of the parent's children, potentially empty
+	 * @see #getChildren(TestIdentifier)
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public Set<TestIdentifier> getChildren(UniqueId parentId) {
+		return children.containsKey(parentId) ? unmodifiableSet(children.get(parentId)) : emptySet();
 	}
 
 	/**
@@ -195,13 +210,29 @@ public Set<TestIdentifier> getChildren(String parentId) {
 	 * @return the identifier with the supplied unique ID; never {@code null}
 	 * @throws PreconditionViolationException if no {@code TestIdentifier}
 	 * with the supplied unique ID is present in this test plan
+	 * @deprecated Use {@link #getTestIdentifier(UniqueId)}
 	 */
+	@API(status = DEPRECATED, since = "1.10")
+	@Deprecated
 	public TestIdentifier getTestIdentifier(String uniqueId) throws PreconditionViolationException {
 		Preconditions.notBlank(uniqueId, "unique ID must not be null or blank");
-		UniqueId uniqueIdObject = UniqueId.parse(uniqueId);
-		Preconditions.condition(allIdentifiers.containsKey(uniqueIdObject),
+		return getTestIdentifier(UniqueId.parse(uniqueId));
+	}
+
+	/**
+	 * Get the {@link TestIdentifier} with the supplied unique ID.
+	 *
+	 * @param uniqueId the unique ID to look up the identifier for; never
+	 * {@code null}
+	 * @return the identifier with the supplied unique ID; never {@code null}
+	 * @throws PreconditionViolationException if no {@code TestIdentifier}
+	 * with the supplied unique ID is present in this test plan
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public TestIdentifier getTestIdentifier(UniqueId uniqueId) {
+		Preconditions.notNull(uniqueId, () -> "uniqueId must not be null");
+		return Preconditions.notNull(allIdentifiers.get(uniqueId),
 			() -> "No TestIdentifier with unique ID [" + uniqueId + "] has been added to this TestPlan.");
-		return allIdentifiers.get(uniqueIdObject);
 	}
 
 	/**
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
index f739dfcfe0ee..800e9c0aa5a8 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
@@ -62,7 +62,7 @@ public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry e
 	}
 
 	private TestIdentifier getTestIdentifier(TestDescriptor testDescriptor) {
-		return this.testPlan.getTestIdentifier(testDescriptor.getUniqueId().toString());
+		return this.testPlan.getTestIdentifier(testDescriptor.getUniqueId());
 	}
 
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
index 836669b8cb23..051d2521ac70 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
@@ -16,6 +16,7 @@
 import java.util.function.Predicate;
 
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 
@@ -80,16 +81,28 @@ public Set<TestIdentifier> getChildren(TestIdentifier parent) {
 		return delegate.getChildren(parent);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public Set<TestIdentifier> getChildren(String parentId) {
 		return delegate.getChildren(parentId);
 	}
 
+	@Override
+	public Set<TestIdentifier> getChildren(UniqueId parentId) {
+		return delegate.getChildren(parentId);
+	}
+
+	@SuppressWarnings("deprecation")
 	@Override
 	public TestIdentifier getTestIdentifier(String uniqueId) throws PreconditionViolationException {
 		return delegate.getTestIdentifier(uniqueId);
 	}
 
+	@Override
+	public TestIdentifier getTestIdentifier(UniqueId uniqueId) {
+		return delegate.getTestIdentifier(uniqueId);
+	}
+
 	@Override
 	public long countTestIdentifiers(Predicate<? super TestIdentifier> predicate) {
 		return delegate.countTestIdentifiers(predicate);
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
index 49a78541ee9c..927b9cd6b93d 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
@@ -24,7 +24,6 @@
 
 import org.apiguardian.api.API;
 import org.junit.platform.engine.TestExecutionResult;
-import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
@@ -107,7 +106,7 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult
 
 	private void writeXmlReportInCaseOfRoot(TestIdentifier testIdentifier) {
 		if (isRoot(testIdentifier)) {
-			String rootName = UniqueId.parse(testIdentifier.getUniqueId()).getSegments().get(0).getValue();
+			String rootName = testIdentifier.getUniqueIdObject().getSegments().get(0).getValue();
 			writeXmlReportSafely(testIdentifier, rootName);
 		}
 	}
@@ -123,7 +122,7 @@ private void writeXmlReportSafely(TestIdentifier testIdentifier, String rootName
 	}
 
 	private boolean isRoot(TestIdentifier testIdentifier) {
-		return !testIdentifier.getParentId().isPresent();
+		return !testIdentifier.getParentIdObject().isPresent();
 	}
 
 	private void printException(String message, Exception exception) {
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index 588e44e1026f..b48e6e518d4c 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -191,7 +191,7 @@ public void filter(Filter filter) throws NoTestsRemainException {
 	private LauncherDiscoveryRequest createDiscoveryRequestForUniqueIds(Set<TestIdentifier> testIdentifiers) {
 		// @formatter:off
 		List<DiscoverySelector> selectors = testIdentifiers.stream()
-				.map(TestIdentifier::getUniqueId)
+				.map(TestIdentifier::getUniqueIdObject)
 				.map(DiscoverySelectors::selectUniqueId)
 				.collect(toList());
 		// @formatter:on
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
index f91d6a886f5e..afe01547ad7d 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
@@ -15,6 +15,7 @@
 
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestExecutionResult.Status;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
@@ -37,7 +38,7 @@ class JUnitPlatformRunnerListener implements TestExecutionListener {
 
 	@Override
 	public void dynamicTestRegistered(TestIdentifier testIdentifier) {
-		String parentId = testIdentifier.getParentId().get();
+		UniqueId parentId = testIdentifier.getParentIdObject().get();
 		testTree.addDynamicDescription(testIdentifier, parentId);
 	}
 
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
index 107b8bd95654..8bec10b327e6 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
@@ -25,6 +25,7 @@
 import org.junit.platform.commons.util.AnnotationUtils;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.junit.platform.launcher.TestIdentifier;
@@ -86,7 +87,7 @@ private void buildDescriptionTree(Description suiteDescription, TestPlan testPla
 		testPlan.getRoots().forEach(testIdentifier -> buildDescription(testIdentifier, suiteDescription, testPlan));
 	}
 
-	void addDynamicDescription(TestIdentifier newIdentifier, String parentId) {
+	void addDynamicDescription(TestIdentifier newIdentifier, UniqueId parentId) {
 		Description parent = getDescription(this.testPlan.getTestIdentifier(parentId));
 		buildDescription(newIdentifier, parent, this.testPlan);
 	}
@@ -103,9 +104,9 @@ private Description createJUnit4Description(TestIdentifier identifier, TestPlan
 		String name = nameExtractor.apply(identifier);
 		if (identifier.isTest()) {
 			String containerName = testPlan.getParent(identifier).map(nameExtractor).orElse("<unrooted>");
-			return Description.createTestDescription(containerName, name, identifier.getUniqueId());
+			return Description.createTestDescription(containerName, name, identifier.getUniqueIdObject());
 		}
-		return Description.createSuiteDescription(name, identifier.getUniqueId());
+		return Description.createSuiteDescription(name, identifier.getUniqueIdObject());
 	}
 
 	private String getTechnicalName(TestIdentifier testIdentifier) {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java
index 8d805b8fcf5e..38cdb0e29a73 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java
@@ -55,8 +55,8 @@ void launcherWillNotExecuteEnginesIfNotIncludedByAnEngineFilter() {
 
 		assertThat(testPlan.getRoots()).hasSize(1);
 		var rootIdentifier = testPlan.getRoots().iterator().next();
-		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
-		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
+		assertThat(testPlan.getChildren(rootIdentifier.getUniqueIdObject())).hasSize(1);
+		assertThat(testPlan.getChildren(UniqueId.forEngine("first"))).hasSize(1);
 	}
 
 	@Test
@@ -118,8 +118,8 @@ void launcherWillNotExecuteEnginesExplicitlyExcludedByAnEngineFilter() {
 
 		assertThat(testPlan.getRoots()).hasSize(1);
 		var rootIdentifier = testPlan.getRoots().iterator().next();
-		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
-		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
+		assertThat(testPlan.getChildren(rootIdentifier.getUniqueIdObject())).hasSize(1);
+		assertThat(testPlan.getChildren(UniqueId.forEngine("first"))).hasSize(1);
 	}
 
 	@Test
@@ -143,8 +143,8 @@ void launcherWillExecuteEnginesHonoringBothIncludeAndExcludeEngineFilters() {
 
 		assertThat(testPlan.getRoots()).hasSize(1);
 		var rootIdentifier = testPlan.getRoots().iterator().next();
-		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
-		assertThat(testPlan.getChildren(UniqueId.forEngine("first").toString())).hasSize(1);
+		assertThat(testPlan.getChildren(rootIdentifier.getUniqueIdObject())).hasSize(1);
+		assertThat(testPlan.getChildren(UniqueId.forEngine("first"))).hasSize(1);
 	}
 
 	@Test
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 209e9d945bb1..53d862cd2feb 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -346,8 +346,8 @@ void discoverTestPlanForSingleEngine() {
 
 		assertThat(testPlan.getRoots()).hasSize(1);
 		var rootIdentifier = testPlan.getRoots().iterator().next();
-		assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(2);
-		assertThat(testPlan.getChildren("[engine:myEngine]")).hasSize(2);
+		assertThat(testPlan.getChildren(rootIdentifier.getUniqueIdObject())).hasSize(2);
+		assertThat(testPlan.getChildren(UniqueId.parse("[engine:myEngine]"))).hasSize(2);
 	}
 
 	@Test
@@ -363,8 +363,8 @@ void discoverTestPlanForMultipleEngines() {
 			request().selectors(selectUniqueId(test1.getUniqueId()), selectUniqueId(test2.getUniqueId())).build());
 
 		assertThat(testPlan.getRoots()).hasSize(2);
-		assertThat(testPlan.getChildren(UniqueId.forEngine("engine1").toString())).hasSize(1);
-		assertThat(testPlan.getChildren(UniqueId.forEngine("engine2").toString())).hasSize(1);
+		assertThat(testPlan.getChildren(UniqueId.forEngine("engine1"))).hasSize(1);
+		assertThat(testPlan.getChildren(UniqueId.forEngine("engine2"))).hasSize(1);
 	}
 
 	@Test
@@ -387,8 +387,8 @@ void launcherAppliesPostDiscoveryFilters() {
 					.filters(includeWithUniqueIdContainsTest, includeWithUniqueIdContains1) //
 					.build());
 
-		assertThat(testPlan.getChildren(UniqueId.forEngine("myEngine").toString())).hasSize(1);
-		assertThat(testPlan.getTestIdentifier(test1.getUniqueId().toString())).isNotNull();
+		assertThat(testPlan.getChildren(UniqueId.forEngine("myEngine"))).hasSize(1);
+		assertThat(testPlan.getTestIdentifier(test1.getUniqueId())).isNotNull();
 	}
 
 	@Test
@@ -535,12 +535,12 @@ public void execute(ExecutionRequest request) {
 		inOrder.verify(listener).testPlanExecutionStarted(testPlanArgumentCaptor.capture());
 
 		var testPlan = testPlanArgumentCaptor.getValue();
-		var engineTestIdentifier = testPlan.getTestIdentifier(engineId.toString());
-		var containerAndTestIdentifier = testPlan.getTestIdentifier(containerAndTestId.toString());
-		var dynamicTestIdentifier = testPlan.getTestIdentifier(dynamicTestId.toString());
-		assertThat(engineTestIdentifier.getParentId()).isEmpty();
-		assertThat(containerAndTestIdentifier.getParentId()).contains(engineId.toString());
-		assertThat(dynamicTestIdentifier.getParentId()).contains(containerAndTestId.toString());
+		var engineTestIdentifier = testPlan.getTestIdentifier(engineId);
+		var containerAndTestIdentifier = testPlan.getTestIdentifier(containerAndTestId);
+		var dynamicTestIdentifier = testPlan.getTestIdentifier(dynamicTestId);
+		assertThat(engineTestIdentifier.getParentIdObject()).isEmpty();
+		assertThat(containerAndTestIdentifier.getParentIdObject()).contains(engineId);
+		assertThat(dynamicTestIdentifier.getParentIdObject()).contains(containerAndTestId);
 
 		inOrder.verify(listener).executionStarted(engineTestIdentifier);
 		inOrder.verify(listener).executionStarted(containerAndTestIdentifier);
@@ -579,7 +579,7 @@ void testPlanThrowsExceptionWhenModified() {
 		var launcher = createLauncher(engine);
 		var testPlan = launcher.discover(request().build());
 		var engineIdentifier = getOnlyElement(testPlan.getRoots());
-		var engineUniqueId = UniqueId.parse(engineIdentifier.getUniqueId());
+		var engineUniqueId = engineIdentifier.getUniqueIdObject();
 		assertThat(testPlan.getChildren(engineIdentifier)).hasSize(1);
 
 		var addedIdentifier = TestIdentifier.from(
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
index b36a8d235974..3d9e46241246 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
@@ -39,7 +39,7 @@ void testReportingEntryPublished() {
 		var discoveryResult = new LauncherDiscoveryResult(Map.of(mock(TestEngine.class), testDescriptor),
 			mock(ConfigurationParameters.class));
 		var testPlan = InternalTestPlan.from(discoveryResult);
-		var testIdentifier = testPlan.getTestIdentifier(testDescriptor.getUniqueId().toString());
+		var testIdentifier = testPlan.getTestIdentifier(testDescriptor.getUniqueId());
 
 		//not yet spyable with mockito? -> https://github.com/mockito/mockito/issues/146
 		var testExecutionListener = new MockTestExecutionListener();
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 70333283e96b..78f5b8f74e13 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.LauncherSessionListener;
@@ -114,10 +115,10 @@ void createWithPostDiscoveryFilters() {
 				.addPostDiscoveryFilters(TagFilter.includeTags("test-post-discovery")).build();
 
 		var testPlan = LauncherFactory.create(config).discover(discoveryRequest);
-		final var vintage = testPlan.getChildren("[engine:junit-vintage]");
+		final var vintage = testPlan.getChildren(UniqueId.parse("[engine:junit-vintage]"));
 		assertThat(vintage).isEmpty();
 
-		final var jupiter = testPlan.getChildren("[engine:junit-jupiter]");
+		final var jupiter = testPlan.getChildren(UniqueId.parse("[engine:junit-jupiter]"));
 		assertThat(jupiter).hasSize(1);
 	}
 
@@ -135,10 +136,10 @@ void applyPostDiscoveryFiltersViaServiceApi() {
 					.build();
 
 			var testPlan = LauncherFactory.create(config).discover(discoveryRequest);
-			final var vintage = testPlan.getChildren("[engine:junit-vintage]");
+			final var vintage = testPlan.getChildren(UniqueId.parse("[engine:junit-vintage]"));
 			assertThat(vintage).isEmpty();
 
-			final var jupiter = testPlan.getChildren("[engine:junit-jupiter]");
+			final var jupiter = testPlan.getChildren(UniqueId.parse("[engine:junit-jupiter]"));
 			assertThat(jupiter).hasSize(1);
 		}
 		finally {
@@ -160,10 +161,10 @@ void notApplyIfDisabledPostDiscoveryFiltersViaServiceApi() {
 					.enablePostDiscoveryFilterAutoRegistration(false).build();
 
 			var testPlan = LauncherFactory.create(config).discover(discoveryRequest);
-			final var vintage = testPlan.getChildren("[engine:junit-vintage]");
+			final var vintage = testPlan.getChildren(UniqueId.parse("[engine:junit-vintage]"));
 			assertThat(vintage).hasSize(1);
 
-			final var jupiter = testPlan.getChildren("[engine:junit-jupiter]");
+			final var jupiter = testPlan.getChildren(UniqueId.parse("[engine:junit-jupiter]"));
 			assertThat(jupiter).hasSize(1);
 		}
 		finally {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
index b4a5b727c30c..9877c612ea34 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
@@ -65,7 +65,7 @@ void interceptsStream(String configParam, Supplier<PrintStream> printStreamSuppl
 		var listener = mock(TestExecutionListener.class);
 		doAnswer(invocation -> {
 			TestIdentifier testIdentifier = invocation.getArgument(0);
-			if (testIdentifier.getUniqueId().equals(test.getUniqueId().toString())) {
+			if (testIdentifier.getUniqueIdObject().equals(test.getUniqueId())) {
 				printStreamSupplier.get().print("123");
 			}
 			return null;
@@ -83,7 +83,7 @@ void interceptsStream(String configParam, Supplier<PrintStream> printStreamSuppl
 		var inOrder = inOrder(listener);
 		inOrder.verify(listener).testPlanExecutionStarted(testPlanArgumentCaptor.capture());
 		var testPlan = testPlanArgumentCaptor.getValue();
-		var testIdentifier = testPlan.getTestIdentifier(test.getUniqueId().toString());
+		var testIdentifier = testPlan.getTestIdentifier(test.getUniqueId());
 
 		var reportEntryArgumentCaptor = ArgumentCaptor.forClass(ReportEntry.class);
 		inOrder.verify(listener).reportingEntryPublished(same(testIdentifier), reportEntryArgumentCaptor.capture());
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
index cc329d465e5b..3ce0a11735f7 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
@@ -73,14 +73,14 @@ void legacyReportingClassNameForDescendantOfTestIdentifierWithClassSourceIsClass
 
 	private String getClassName(UniqueId uniqueId) {
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
-		return LegacyReportingUtils.getClassName(testPlan, testPlan.getTestIdentifier(uniqueId.toString()));
+		return LegacyReportingUtils.getClassName(testPlan, testPlan.getTestIdentifier(uniqueId));
 	}
 
 	@SuppressWarnings("deprecation")
 	private String getClassNameFromOldLocation(UniqueId uniqueId) {
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
 		return org.junit.platform.launcher.listeners.LegacyReportingUtils.getClassName(testPlan,
-			testPlan.getTestIdentifier(uniqueId.toString()));
+			testPlan.getTestIdentifier(uniqueId));
 	}
 
 	private TestDescriptor createTestDescriptor(UniqueId uniqueId, String displayName, TestSource source) {
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 3927e44c6b57..285b59224e45 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -395,14 +395,15 @@ void printsExceptionWhenReportCouldNotBeWritten() throws Exception {
 	@Test
 	void writesReportEntriesToSystemOutElement() throws Exception {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
-		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
+		var childUniqueId = UniqueId.root("child", "test");
+		engineDescriptor.addChild(new TestDescriptorStub(childUniqueId, "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
 
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
 
 		listener.testPlanExecutionStarted(testPlan);
-		var testIdentifier = testPlan.getTestIdentifier("[child:test]");
+		var testIdentifier = testPlan.getTestIdentifier(childUniqueId);
 		listener.executionStarted(testIdentifier);
 		listener.reportingEntryPublished(testIdentifier, ReportEntry.from("foo", "bar"));
 		Map<String, String> map = new LinkedHashMap<>();
@@ -410,7 +411,7 @@ void writesReportEntriesToSystemOutElement() throws Exception {
 		map.put("qux", "foo");
 		listener.reportingEntryPublished(testIdentifier, ReportEntry.from(map));
 		listener.executionFinished(testIdentifier, successful());
-		listener.executionFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());
+		listener.executionFinished(testPlan.getTestIdentifier(engineDescriptor.getUniqueId()), successful());
 
 		var testsuite = readValidXmlFile(tempDirectory.resolve("TEST-engine.xml"));
 
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index 8eb7598a581e..6618df01ad29 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -35,11 +35,12 @@ class XmlReportDataTests {
 	@Test
 	void resultsOfTestIdentifierWithoutAnyReportedEventsAreEmpty() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
-		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
+		var childUniqueId = UniqueId.root("child", "test");
+		engineDescriptor.addChild(new TestDescriptorStub(childUniqueId, "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		var results = reportData.getResults(testPlan.getTestIdentifier("[child:test]"));
+		var results = reportData.getResults(testPlan.getTestIdentifier(childUniqueId));
 
 		assertThat(results).isEmpty();
 	}
@@ -47,14 +48,15 @@ void resultsOfTestIdentifierWithoutAnyReportedEventsAreEmpty() {
 	@Test
 	void resultsOfTestIdentifierWithoutReportedEventsContainsOnlyFailureOfAncestor() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
-		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
+		var childUniqueId = UniqueId.root("child", "test");
+		engineDescriptor.addChild(new TestDescriptorStub(childUniqueId, "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var failureOfAncestor = failed(new RuntimeException("failed!"));
-		reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), failureOfAncestor);
+		reportData.markFinished(testPlan.getTestIdentifier(engineDescriptor.getUniqueId()), failureOfAncestor);
 
-		var results = reportData.getResults(testPlan.getTestIdentifier("[child:test]"));
+		var results = reportData.getResults(testPlan.getTestIdentifier(childUniqueId));
 
 		assertThat(results).containsExactly(failureOfAncestor);
 	}
@@ -62,13 +64,14 @@ void resultsOfTestIdentifierWithoutReportedEventsContainsOnlyFailureOfAncestor()
 	@Test
 	void resultsOfTestIdentifierWithoutReportedEventsContainsOnlySuccessOfAncestor() {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
-		engineDescriptor.addChild(new TestDescriptorStub(UniqueId.root("child", "test"), "test"));
+		var childUniqueId = UniqueId.root("child", "test");
+		engineDescriptor.addChild(new TestDescriptorStub(childUniqueId, "test"));
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());
+		reportData.markFinished(testPlan.getTestIdentifier(engineDescriptor.getUniqueId()), successful());
 
-		var results = reportData.getResults(testPlan.getTestIdentifier("[child:test]"));
+		var results = reportData.getResults(testPlan.getTestIdentifier(childUniqueId));
 
 		assertThat(results).containsExactly(successful());
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index 4fb44c5f653d..19037e239f41 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -76,7 +76,7 @@ void writesReportEntry() throws Exception {
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), ReportEntry.from("myKey", "myValue"));
-		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), successful());
+		reportData.markFinished(testPlan.getTestIdentifier(uniqueId), successful());
 
 		var testsuite = writeXmlReport(testPlan, reportData);
 
@@ -99,7 +99,7 @@ void writesCapturedOutput() throws Exception {
 			"foo", "bar"));
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), reportEntry);
 		reportData.addReportEntry(TestIdentifier.from(testDescriptor), ReportEntry.from(Map.of("baz", "qux")));
-		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), successful());
+		reportData.markFinished(testPlan.getTestIdentifier(uniqueId), successful());
 
 		var testsuite = writeXmlReport(testPlan, reportData);
 
@@ -122,7 +122,7 @@ void writesEmptySkippedElementForSkippedTestWithoutReason() throws Exception {
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		reportData.markSkipped(testPlan.getTestIdentifier(uniqueId.toString()), null);
+		reportData.markSkipped(testPlan.getTestIdentifier(uniqueId), null);
 
 		var testsuite = writeXmlReport(testPlan, reportData);
 
@@ -152,7 +152,7 @@ public String getLegacyReportingName() {
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(null));
+		reportData.markFinished(testPlan.getTestIdentifier(uniqueId), failed(null));
 
 		var testsuite = writeXmlReport(testPlan, reportData);
 
@@ -172,7 +172,7 @@ void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exce
 		var testPlan = TestPlan.from(Set.of(engineDescriptor), configParams);
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
-		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(new NullPointerException()));
+		reportData.markFinished(testPlan.getTestIdentifier(uniqueId), failed(new NullPointerException()));
 
 		var testsuite = writeXmlReport(testPlan, reportData);
 
@@ -190,7 +190,7 @@ void writesValidXmlEvenIfExceptionMessageContainsCData() throws Exception {
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
-		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
+		reportData.markFinished(testPlan.getTestIdentifier(uniqueId), failed(assertionError));
 
 		var testsuite = writeXmlReport(testPlan, reportData);
 
@@ -206,7 +206,7 @@ void escapesInvalidCharactersInSystemPropertiesAndExceptionMessages() throws Exc
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("expected: <A> but was: <B\0>");
-		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
+		reportData.markFinished(testPlan.getTestIdentifier(uniqueId), failed(assertionError));
 
 		System.setProperty("foo.bar", "\1");
 		Match testsuite;
@@ -235,7 +235,7 @@ void doesNotReopenCDataWithinCDataContent() throws Exception {
 
 		var reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
 		var assertionError = new AssertionError("<foo><![CDATA[bar]]></foo>");
-		reportData.markFinished(testPlan.getTestIdentifier(uniqueId.toString()), failed(assertionError));
+		reportData.markFinished(testPlan.getTestIdentifier(uniqueId), failed(assertionError));
 		Writer assertingWriter = new StringWriter() {
 
 			@SuppressWarnings("NullableProblems")
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index 8c2921607f9b..8e519514ed68 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -760,11 +760,11 @@ void failingTest() {
 	// -------------------------------------------------------------------------
 
 	private static Description suiteDescription(String uniqueId) {
-		return createSuiteDescription(uniqueId, uniqueId);
+		return createSuiteDescription(uniqueId, UniqueId.parse(uniqueId));
 	}
 
 	private static Description testDescription(String uniqueId) {
-		return createTestDescription(uniqueId, uniqueId, uniqueId);
+		return createTestDescription(uniqueId, uniqueId, UniqueId.parse(uniqueId));
 	}
 
 	private TestDescriptor testDescriptorWithTags(String... tag) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0561246e903d..f87f2924fec1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -64,7 +64,6 @@ gradleEnterprise {
 		}
 
 		val enableTestDistribution = providers.gradleProperty("enableTestDistribution")
-			.forUseAtConfigurationTime()
 			.map(String::toBoolean)
 			.getOrElse(false)
 		if (enableTestDistribution) {

From 242f3b3ef84cfd96c9de26992588812a68cdef8b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 30 Oct 2022 19:35:49 +0100
Subject: [PATCH 0991/1433] Use accessors to add dependencies

---
 .../main/kotlin/testing-conventions.gradle.kts  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index a1ee801a05b7..983883983ef9 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -3,6 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
+	`java-library`
 	id("org.gradle.test-retry")
 }
 
@@ -67,17 +68,17 @@ tasks.withType<Test>().configureEach {
 }
 
 dependencies {
-	"testImplementation"(dependencyFromLibs("assertj"))
-	"testImplementation"(dependencyFromLibs("mockito"))
+	testImplementation(dependencyFromLibs("assertj"))
+	testImplementation(dependencyFromLibs("mockito"))
 
 	if (!project.name.startsWith("junit-jupiter")) {
-		"testImplementation"(project(":junit-jupiter"))
+		testImplementation(project(":junit-jupiter"))
 	}
-	"testImplementation"(testFixtures(project(":junit-jupiter-api")))
+	testImplementation(testFixtures(project(":junit-jupiter-api")))
 
-	"testRuntimeOnly"(project(":junit-platform-engine"))
-	"testRuntimeOnly"(project(":junit-platform-jfr"))
-	"testRuntimeOnly"(project(":junit-platform-reporting"))
+	testRuntimeOnly(project(":junit-platform-engine"))
+	testRuntimeOnly(project(":junit-platform-jfr"))
+	testRuntimeOnly(project(":junit-platform-reporting"))
 
-	"testRuntimeOnly"(bundleFromLibs("log4j"))
+	testRuntimeOnly(bundleFromLibs("log4j"))
 }

From b979cd7ca434744dac7a7e512d7878f1bcaf36cc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 9 Nov 2022 10:06:40 +0100
Subject: [PATCH 0992/1433] Upgradle to 7.6-rc-2

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 60756 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties |   5 +++--
 gradlew                                  |  12 ++++++++----
 gradlew.bat                              |   1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 36524
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

delta 35766
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%0DG<S^qW!A-@`soL|Nd&|btslc<LhQ&mX>K?7GHTj
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
VwlMN}`%er%aGR6olj~j${vQ;P=LY})

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b916c04dbb24..853555789b62 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionSha256Sum=1a0c892659d3eec2a33ab23857784ee3c9674b681cab068f67780da412d3f61f
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6c206..65dcd68d65c8 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd49d40..93e3f59f135d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

From ea6ddf8fff3600a58ef3334ded01a758346aeb26 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 11 Nov 2022 17:22:58 +0100
Subject: [PATCH 0993/1433] Upgradle to 7.6-rc-3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 853555789b62..ac6c0bad2fd6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=1a0c892659d3eec2a33ab23857784ee3c9674b681cab068f67780da412d3f61f
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-2-bin.zip
+distributionSha256Sum=21e2bf8e6c6ac310182c817776ffc6cca80142f5de4b2b4151f9f72b9ec35b50
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From cb8ca446859cd11662eff22cb5eccbcf2cd890c6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 13 Nov 2022 15:37:11 +0100
Subject: [PATCH 0994/1433] Fix build when JaCoCo is enabled

---
 .../jacoco-aggregation-conventions.gradle.kts       | 13 -------------
 .../main/kotlin/jacoco-java-conventions.gradle.kts  |  5 ++---
 .../org/junit/gradle/jacoco/JacocoConventions.kt    |  5 -----
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 buildSrc/src/main/kotlin/org/junit/gradle/jacoco/JacocoConventions.kt

diff --git a/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
index 4032dd1f7012..cd32b2d65517 100644
--- a/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
@@ -1,26 +1,13 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.api.attributes.LibraryElements
-import org.gradle.api.attributes.LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE
 import org.gradle.api.attributes.TestSuiteType
 import org.gradle.kotlin.dsl.invoke
 import org.gradle.kotlin.dsl.`jacoco-report-aggregation`
-import org.gradle.kotlin.dsl.named
 import org.gradle.testing.jacoco.plugins.JacocoCoverageReport
-import org.junit.gradle.jacoco.JacocoConventions.COVERAGE_CLASSES
 
 plugins {
 	id("jacoco-conventions")
 	`jacoco-report-aggregation`
 }
 
-configurations {
-	allCodeCoverageReportClassDirectories {
-		attributes {
-			attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements::class, COVERAGE_CLASSES))
-		}
-	}
-}
-
 reporting {
 	reports {
 		create<JacocoCoverageReport>("jacocoRootReport") {
diff --git a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
index 80998793e8d7..265ff8937069 100644
--- a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
@@ -1,6 +1,5 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.attributes.LibraryElements.CLASSES
 import org.gradle.api.attributes.LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE
-import org.junit.gradle.jacoco.JacocoConventions.COVERAGE_CLASSES
 
 plugins {
 	java
@@ -27,6 +26,6 @@ configurations.create("codeCoverageReportClasses") {
 	isCanBeResolved = false
 	isCanBeConsumed = true
 	isTransitive = false
-	attributes.attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements::class, COVERAGE_CLASSES))
+	attributes.attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements::class, CLASSES))
 	outgoing.artifact(codeCoverageClassesJar)
 }
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/jacoco/JacocoConventions.kt b/buildSrc/src/main/kotlin/org/junit/gradle/jacoco/JacocoConventions.kt
deleted file mode 100644
index 04d223f3c3bd..000000000000
--- a/buildSrc/src/main/kotlin/org/junit/gradle/jacoco/JacocoConventions.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.junit.gradle.jacoco
-
-object JacocoConventions {
-    const val COVERAGE_CLASSES = "coverage-classes"
-}

From 247da8e4a68f41cd16c26dc25a9065e6117d79af Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 14 Nov 2022 08:11:24 +0100
Subject: [PATCH 0995/1433] Avoid using deprecated URL constructor

---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc  | 2 +-
 documentation/src/test/java/example/session/HttpTests.java     | 3 ++-
 .../jupiter/params/converter/DefaultArgumentConverter.java     | 2 +-
 .../params/converter/DefaultArgumentConverterTests.java        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 6fb1838f63ec..ed470800a8a9 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1666,7 +1666,7 @@ integral types: `byte`, `short`, `int`, `long`, and their boxed counterparts.
 | `java.math.BigDecimal`     | `"123.456e789"`                          -> `new BigDecimal("123.456e789")`
 | `java.math.BigInteger`     | `"1234567890123456789"`                  -> `new BigInteger("1234567890123456789")`
 | `java.net.URI`             | `"https://junit.org/"`                   -> `URI.create("https://junit.org/")`
-| `java.net.URL`             | `"https://junit.org/"`                   -> `new URL("https://junit.org/")`
+| `java.net.URL`             | `"https://junit.org/"`                   -> `URI.create("https://junit.org/").toURL()`
 | `java.nio.charset.Charset` | `"UTF-8"`                                -> `Charset.forName("UTF-8")`
 | `java.nio.file.Path`       | `"/path/to/file"`                        -> `Paths.get("/path/to/file")`
 | `java.time.Duration`       | `"PT3S"`                                 -> `Duration.ofSeconds(3)`
diff --git a/documentation/src/test/java/example/session/HttpTests.java b/documentation/src/test/java/example/session/HttpTests.java
index 01477b6b0d75..7ae8c3d88f19 100644
--- a/documentation/src/test/java/example/session/HttpTests.java
+++ b/documentation/src/test/java/example/session/HttpTests.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 
 import org.junit.jupiter.api.Test;
@@ -24,7 +25,7 @@ class HttpTests {
 	void respondsWith204() throws Exception {
 		String host = System.getProperty("http.server.host"); // <1>
 		String port = System.getProperty("http.server.port"); // <2>
-		URL url = new URL("http://" + host + ":" + port + "/test");
+		URL url = URI.create("http://" + host + ":" + port + "/test").toURL();
 
 		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 		connection.setRequestMethod("GET");
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index bed208d512ee..8dc45d1661e7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -289,7 +289,7 @@ private static Class<?> toClass(String type) {
 
 		private static URL toURL(String url) {
 			try {
-				return new URL(url);
+				return URI.create(url).toURL();
 			}
 			catch (MalformedURLException ex) {
 				throw new ArgumentConversionException(
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 4a8d75cede13..259cbb10cb7e 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -184,7 +184,7 @@ void convertsStringToURI() {
 
 	@Test
 	void convertsStringToURL() throws Exception {
-		assertConverts("https://junit.org/junit5", URL.class, new URL("https://junit.org/junit5"));
+		assertConverts("https://junit.org/junit5", URL.class, URI.create("https://junit.org/junit5").toURL());
 	}
 
 	// --- java.time -----------------------------------------------------------

From 8617495e25801eaab7ba3228db4f66319bb1acb5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 14 Nov 2022 10:46:32 +0100
Subject: [PATCH 0996/1433] Remove JDK 18 coverage as it is EOL

---
 .github/workflows/cross-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 765b49bcb72c..24cd9fee5da4 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -19,7 +19,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [18, 19, 20]
+        jdk: [19, 20]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:

From 078661efb5df29b286852722bc1564ab0bf4cb0d Mon Sep 17 00:00:00 2001
From: jminkhar <48157922+jminkhar@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:33:54 +0100
Subject: [PATCH 0997/1433] Supply invocation index for @ParameterizedTest to
 test author (#3085)

Resolves #3085 by adding `ArgumentsAccessor.getInvocationIndex()`
---
 .../release-notes-5.10.0-M1.adoc              |  2 +-
 .../params/ParameterizedTestExtension.java    |  6 +--
 .../ParameterizedTestInvocationContext.java   |  7 ++-
 .../ParameterizedTestMethodContext.java       | 14 +++---
 .../ParameterizedTestParameterResolver.java   |  7 ++-
 .../params/aggregator/ArgumentsAccessor.java  |  4 ++
 .../aggregator/DefaultArgumentsAccessor.java  |  9 +++-
 .../AggregatorIntegrationTests.java           | 11 ++++
 .../DefaultArgumentsAccessorTests.java        | 50 +++++++++----------
 .../ArgumentsAccessorKotlinTests.kt           | 14 +++---
 10 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index e776106993ae..5623ae04cac9 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -42,7 +42,7 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* New `ArgumentsAccessor.getInvocationIndex` method to supply index of a `@ParameterizedTest` invocation.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
index 1df2deed467b..adb5d4138f6d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -92,7 +92,7 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 				.map(arguments -> consumedArguments(arguments, methodContext))
 				.map(arguments -> {
 					invocationCount.incrementAndGet();
-					return createInvocationContext(formatter, methodContext, arguments);
+					return createInvocationContext(formatter, methodContext, arguments, invocationCount.intValue());
 				})
 				.onClose(() ->
 						Preconditions.condition(invocationCount.get() > 0,
@@ -122,8 +122,8 @@ private ExtensionContext.Store getStore(ExtensionContext context) {
 	}
 
 	private TestTemplateInvocationContext createInvocationContext(ParameterizedTestNameFormatter formatter,
-			ParameterizedTestMethodContext methodContext, Object[] arguments) {
-		return new ParameterizedTestInvocationContext(formatter, methodContext, arguments);
+			ParameterizedTestMethodContext methodContext, Object[] arguments, int invocationIndex) {
+		return new ParameterizedTestInvocationContext(formatter, methodContext, arguments, invocationIndex);
 	}
 
 	private ParameterizedTestNameFormatter createNameFormatter(ExtensionContext extensionContext, Method templateMethod,
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
index 1110cc196c4a..760d69d29d7a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
@@ -25,12 +25,14 @@ class ParameterizedTestInvocationContext implements TestTemplateInvocationContex
 	private final ParameterizedTestNameFormatter formatter;
 	private final ParameterizedTestMethodContext methodContext;
 	private final Object[] arguments;
+	private final int invocationIndex;
 
 	ParameterizedTestInvocationContext(ParameterizedTestNameFormatter formatter,
-			ParameterizedTestMethodContext methodContext, Object[] arguments) {
+			ParameterizedTestMethodContext methodContext, Object[] arguments, int invocationIndex) {
 		this.formatter = formatter;
 		this.methodContext = methodContext;
 		this.arguments = arguments;
+		this.invocationIndex = invocationIndex;
 	}
 
 	@Override
@@ -40,7 +42,8 @@ public String getDisplayName(int invocationIndex) {
 
 	@Override
 	public List<Extension> getAdditionalExtensions() {
-		return singletonList(new ParameterizedTestParameterResolver(this.methodContext, this.arguments));
+		return singletonList(
+			new ParameterizedTestParameterResolver(this.methodContext, this.arguments, this.invocationIndex));
 	}
 
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
index d9dc2ed4e556..efea58bc01b3 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
@@ -161,8 +161,8 @@ int indexOfFirstAggregator() {
 	 * Resolve the parameter for the supplied context using the supplied
 	 * arguments.
 	 */
-	Object resolve(ParameterContext parameterContext, Object[] arguments) {
-		return getResolver(parameterContext).resolve(parameterContext, arguments);
+	Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex) {
+		return getResolver(parameterContext).resolve(parameterContext, arguments, invocationIndex);
 	}
 
 	private Resolver getResolver(ParameterContext parameterContext) {
@@ -213,9 +213,7 @@ Resolver createResolver(ParameterContext parameterContext) {
 	}
 
 	interface Resolver {
-
-		Object resolve(ParameterContext parameterContext, Object[] arguments);
-
+		Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex);
 	}
 
 	static class Converter implements Resolver {
@@ -229,7 +227,7 @@ static class Converter implements Resolver {
 		}
 
 		@Override
-		public Object resolve(ParameterContext parameterContext, Object[] arguments) {
+		public Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex) {
 			Object argument = arguments[parameterContext.getIndex()];
 			try {
 				return this.argumentConverter.convert(argument, parameterContext);
@@ -252,8 +250,8 @@ static class Aggregator implements Resolver {
 		}
 
 		@Override
-		public Object resolve(ParameterContext parameterContext, Object[] arguments) {
-			ArgumentsAccessor accessor = new DefaultArgumentsAccessor(arguments);
+		public Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex) {
+			ArgumentsAccessor accessor = new DefaultArgumentsAccessor(invocationIndex, arguments);
 			try {
 				return this.argumentsAggregator.aggregateArguments(accessor, parameterContext);
 			}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
index ca5ba2ba2596..7f2146ac405b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
@@ -34,10 +34,13 @@ class ParameterizedTestParameterResolver implements ParameterResolver, AfterTest
 
 	private final ParameterizedTestMethodContext methodContext;
 	private final Object[] arguments;
+	private final int invocationIndex;
 
-	ParameterizedTestParameterResolver(ParameterizedTestMethodContext methodContext, Object[] arguments) {
+	ParameterizedTestParameterResolver(ParameterizedTestMethodContext methodContext, Object[] arguments,
+			int invocationIndex) {
 		this.methodContext = methodContext;
 		this.arguments = arguments;
+		this.invocationIndex = invocationIndex;
 	}
 
 	@Override
@@ -69,7 +72,7 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 	@Override
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
 			throws ParameterResolutionException {
-		return this.methodContext.resolve(parameterContext, extractPayloads(this.arguments));
+		return this.methodContext.resolve(parameterContext, extractPayloads(this.arguments), this.invocationIndex);
 	}
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
index e31c8080fecb..08139bc1ca90 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
@@ -188,4 +188,8 @@ public interface ArgumentsAccessor {
 	 */
 	List<Object> toList();
 
+	/**
+	 * Get the index of the current test invocation.
+	 */
+	int getInvocationIndex();
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
index 65f53071cc75..d42102fd359f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
@@ -36,10 +36,12 @@
 public class DefaultArgumentsAccessor implements ArgumentsAccessor {
 
 	private final Object[] arguments;
+	private final int invocationIndex;
 
-	public DefaultArgumentsAccessor(Object... arguments) {
+	public DefaultArgumentsAccessor(int invocationIndex, Object... arguments) {
 		Preconditions.notNull(arguments, "Arguments array must not be null");
 		this.arguments = arguments;
+		this.invocationIndex = invocationIndex;
 	}
 
 	@Override
@@ -126,4 +128,9 @@ public List<Object> toList() {
 		return Collections.unmodifiableList(Arrays.asList(this.arguments));
 	}
 
+	@Override
+	public int getInvocationIndex() {
+		return this.invocationIndex;
+	}
+
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
index 9df38a3a5c1d..a7d65ff8b94c 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
@@ -208,6 +208,17 @@ private EngineExecutionResults execute(DiscoverySelector... selectors) {
 		return EngineTestKit.execute("junit-jupiter", request().selectors(selectors).build());
 	}
 
+	@ParameterizedTest
+	@CsvSource({ "first", "second" })
+	void argumentsAccessorInvocationIndex(ArgumentsAccessor arguments) {
+		if ("first".equals(arguments.getString(0))) {
+			assertEquals(1, arguments.getInvocationIndex());
+		}
+		if ("second".equals(arguments.getString(0))) {
+			assertEquals(2, arguments.getInvocationIndex());
+		}
+	}
+
 	// -------------------------------------------------------------------------
 
 	public static class Person {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
index 33c3c3b88c83..cebb627a9cc2 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
@@ -31,53 +31,53 @@ class DefaultArgumentsAccessorTests {
 
 	@Test
 	void argumentsMustNotBeNull() {
-		assertThrows(PreconditionViolationException.class, () -> new DefaultArgumentsAccessor((Object[]) null));
+		assertThrows(PreconditionViolationException.class, () -> new DefaultArgumentsAccessor(1, (Object[]) null));
 	}
 
 	@Test
 	void indexMustNotBeNegative() {
-		ArgumentsAccessor arguments = new DefaultArgumentsAccessor(1, 2);
+		ArgumentsAccessor arguments = new DefaultArgumentsAccessor(1, 1, 2);
 		Exception exception = assertThrows(PreconditionViolationException.class, () -> arguments.get(-1));
 		assertThat(exception.getMessage()).containsSubsequence("index must be", ">= 0");
 	}
 
 	@Test
 	void indexMustBeSmallerThanLength() {
-		ArgumentsAccessor arguments = new DefaultArgumentsAccessor(1, 2);
+		ArgumentsAccessor arguments = new DefaultArgumentsAccessor(1, 1, 2);
 		Exception exception = assertThrows(PreconditionViolationException.class, () -> arguments.get(2));
 		assertThat(exception.getMessage()).containsSubsequence("index must be", "< 2");
 	}
 
 	@Test
 	void getNull() {
-		assertNull(new DefaultArgumentsAccessor(new Object[] { null }).get(0));
+		assertNull(new DefaultArgumentsAccessor(1, new Object[] { null }).get(0));
 	}
 
 	@Test
 	void getWithNullCastToWrapperType() {
-		assertNull(new DefaultArgumentsAccessor((Object[]) new Integer[] { null }).get(0, Integer.class));
+		assertNull(new DefaultArgumentsAccessor(1, (Object[]) new Integer[] { null }).get(0, Integer.class));
 	}
 
 	@Test
 	void get() {
-		assertEquals(1, new DefaultArgumentsAccessor(1).get(0));
+		assertEquals(1, new DefaultArgumentsAccessor(1, 1).get(0));
 	}
 
 	@Test
 	void getWithCast() {
-		assertEquals(Integer.valueOf(1), new DefaultArgumentsAccessor(1).get(0, Integer.class));
-		assertEquals(Character.valueOf('A'), new DefaultArgumentsAccessor('A').get(0, Character.class));
+		assertEquals(Integer.valueOf(1), new DefaultArgumentsAccessor(1, 1).get(0, Integer.class));
+		assertEquals(Character.valueOf('A'), new DefaultArgumentsAccessor(1, 'A').get(0, Character.class));
 	}
 
 	@Test
 	void getWithCastToPrimitiveType() {
 		Exception exception = assertThrows(ArgumentAccessException.class,
-			() -> new DefaultArgumentsAccessor(1).get(0, int.class));
+			() -> new DefaultArgumentsAccessor(1, 1).get(0, int.class));
 		assertThat(exception.getMessage()).isEqualTo(
 			"Argument at index [0] with value [1] and type [java.lang.Integer] could not be converted or cast to type [int].");
 
 		exception = assertThrows(ArgumentAccessException.class,
-			() -> new DefaultArgumentsAccessor(new Object[] { null }).get(0, int.class));
+			() -> new DefaultArgumentsAccessor(1, new Object[] { null }).get(0, int.class));
 		assertThat(exception.getMessage()).isEqualTo(
 			"Argument at index [0] with value [null] and type [null] could not be converted or cast to type [int].");
 	}
@@ -85,59 +85,59 @@ void getWithCastToPrimitiveType() {
 	@Test
 	void getWithCastToIncompatibleType() {
 		Exception exception = assertThrows(ArgumentAccessException.class,
-			() -> new DefaultArgumentsAccessor(1).get(0, Character.class));
+			() -> new DefaultArgumentsAccessor(1, 1).get(0, Character.class));
 		assertThat(exception.getMessage()).isEqualTo(
 			"Argument at index [0] with value [1] and type [java.lang.Integer] could not be converted or cast to type [java.lang.Character].");
 	}
 
 	@Test
 	void getCharacter() {
-		assertEquals(Character.valueOf('A'), new DefaultArgumentsAccessor('A', 'B').getCharacter(0));
+		assertEquals(Character.valueOf('A'), new DefaultArgumentsAccessor(1, 'A', 'B').getCharacter(0));
 	}
 
 	@Test
 	void getBoolean() {
-		assertEquals(Boolean.TRUE, new DefaultArgumentsAccessor(true, false).getBoolean(0));
+		assertEquals(Boolean.TRUE, new DefaultArgumentsAccessor(1, true, false).getBoolean(0));
 	}
 
 	@Test
 	void getByte() {
-		assertEquals(Byte.valueOf((byte) 42), new DefaultArgumentsAccessor((byte) 42).getByte(0));
+		assertEquals(Byte.valueOf((byte) 42), new DefaultArgumentsAccessor(1, (byte) 42).getByte(0));
 	}
 
 	@Test
 	void getShort() {
-		assertEquals(Short.valueOf((short) 42), new DefaultArgumentsAccessor((short) 42).getShort(0));
+		assertEquals(Short.valueOf((short) 42), new DefaultArgumentsAccessor(1, (short) 42).getShort(0));
 	}
 
 	@Test
 	void getInteger() {
-		assertEquals(Integer.valueOf(42), new DefaultArgumentsAccessor(42).getInteger(0));
+		assertEquals(Integer.valueOf(42), new DefaultArgumentsAccessor(1, 42).getInteger(0));
 	}
 
 	@Test
 	void getLong() {
-		assertEquals(Long.valueOf(42L), new DefaultArgumentsAccessor(42L).getLong(0));
+		assertEquals(Long.valueOf(42L), new DefaultArgumentsAccessor(1, 42L).getLong(0));
 	}
 
 	@Test
 	void getFloat() {
-		assertEquals(Float.valueOf(42.0f), new DefaultArgumentsAccessor(42.0f).getFloat(0));
+		assertEquals(Float.valueOf(42.0f), new DefaultArgumentsAccessor(1, 42.0f).getFloat(0));
 	}
 
 	@Test
 	void getDouble() {
-		assertEquals(Double.valueOf(42.0), new DefaultArgumentsAccessor(42.0).getDouble(0));
+		assertEquals(Double.valueOf(42.0), new DefaultArgumentsAccessor(1, 42.0).getDouble(0));
 	}
 
 	@Test
 	void getString() {
-		assertEquals("foo", new DefaultArgumentsAccessor("foo", "bar").getString(0));
+		assertEquals("foo", new DefaultArgumentsAccessor(1, "foo", "bar").getString(0));
 	}
 
 	@Test
 	void toArray() {
-		var arguments = new DefaultArgumentsAccessor("foo", "bar");
+		var arguments = new DefaultArgumentsAccessor(1, "foo", "bar");
 		var copy = arguments.toArray();
 		assertArrayEquals(new String[] { "foo", "bar" }, copy);
 
@@ -148,7 +148,7 @@ void toArray() {
 
 	@Test
 	void toList() {
-		var arguments = new DefaultArgumentsAccessor("foo", "bar");
+		var arguments = new DefaultArgumentsAccessor(1, "foo", "bar");
 		var copy = arguments.toList();
 		assertIterableEquals(Arrays.asList("foo", "bar"), copy);
 
@@ -158,9 +158,9 @@ void toList() {
 
 	@Test
 	void size() {
-		assertEquals(0, new DefaultArgumentsAccessor().size());
-		assertEquals(1, new DefaultArgumentsAccessor(42).size());
-		assertEquals(5, new DefaultArgumentsAccessor('a', 'b', 'c', 'd', 'e').size());
+		assertEquals(0, new DefaultArgumentsAccessor(1).size());
+		assertEquals(1, new DefaultArgumentsAccessor(1, 42).size());
+		assertEquals(5, new DefaultArgumentsAccessor(1, 'a', 'b', 'c', 'd', 'e').size());
 	}
 
 }
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
index 6c1aa9e2e84a..69464e54ef7a 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
@@ -21,14 +21,14 @@ class ArgumentsAccessorKotlinTests {
 
     @Test
     fun `get() with reified type and index`() {
-        assertEquals(1, DefaultArgumentsAccessor(1).get<Int>(0))
-        assertEquals('A', DefaultArgumentsAccessor('A').get<Char>(0))
+        assertEquals(1, DefaultArgumentsAccessor(0, 1).get<Int>(0))
+        assertEquals('A', DefaultArgumentsAccessor(0, 'A').get<Char>(0))
     }
 
     @Test
     fun `get() with reified type and index for incompatible type`() {
         val exception = assertThrows<ArgumentAccessException> {
-            DefaultArgumentsAccessor(Integer.valueOf(1)).get<Char>(0)
+            DefaultArgumentsAccessor(0, Integer.valueOf(1)).get<Char>(0)
         }
 
         assertThat(exception).hasMessage(
@@ -38,13 +38,13 @@ class ArgumentsAccessorKotlinTests {
 
     @Test
     fun `get() with index`() {
-        assertEquals(1, DefaultArgumentsAccessor(1).get(0))
-        assertEquals('A', DefaultArgumentsAccessor('A').get(0))
+        assertEquals(1, DefaultArgumentsAccessor(0, 1).get(0))
+        assertEquals('A', DefaultArgumentsAccessor(0, 'A').get(0))
     }
 
     @Test
     fun `get() with index and class reference`() {
-        assertEquals(1, DefaultArgumentsAccessor(1).get(0, Integer::class.java))
-        assertEquals('A', DefaultArgumentsAccessor('A').get(0, Character::class.java))
+        assertEquals(1, DefaultArgumentsAccessor(0, 1).get(0, Integer::class.java))
+        assertEquals('A', DefaultArgumentsAccessor(0, 'A').get(0, Character::class.java))
     }
 }

From 535cf619cae51b71d5fefc48c8dd03104962d7d8 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Mon, 14 Nov 2022 18:30:42 +0100
Subject: [PATCH 0998/1433] Small improvements and documentation following PR
 #3085

---
 .../release-notes-5.10.0-M1.adoc              |  3 ++-
 .../asciidoc/user-guide/writing-tests.adoc    |  3 +++
 .../ParameterizedTestMethodContext.java       |  2 ++
 .../aggregator/DefaultArgumentsAccessor.java  |  5 ++--
 .../AggregatorIntegrationTests.java           | 25 +++++++++++--------
 .../ArgumentsAccessorKotlinTests.kt           | 14 +++++------
 6 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 5623ae04cac9..1a7edb11fc3c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -42,7 +42,8 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
-* New `ArgumentsAccessor.getInvocationIndex` method to supply index of a `@ParameterizedTest` invocation.
+* New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
+  `@ParameterizedTest` invocation.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index ed470800a8a9..514965f8dd44 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1769,6 +1769,9 @@ this API, you can access the provided arguments through a single argument passed
 test method. In addition, type conversion is supported as discussed in
 <<writing-tests-parameterized-tests-argument-conversion-implicit>>.
 
+Besides, you can retrieve the current test invocation index with
+`ArgumentsAccessor.getInvocationIndex()`.
+
 [source,java,indent=0]
 ----
 include::{testDir}/example/ParameterizedTestDemo.java[tags=ArgumentsAccessor_example]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
index efea58bc01b3..2b87411e61ec 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
@@ -213,7 +213,9 @@ Resolver createResolver(ParameterContext parameterContext) {
 	}
 
 	interface Resolver {
+
 		Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex);
+
 	}
 
 	static class Converter implements Resolver {
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
index d42102fd359f..f3ea65aa7610 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
@@ -35,13 +35,14 @@
 @API(status = INTERNAL, since = "5.2")
 public class DefaultArgumentsAccessor implements ArgumentsAccessor {
 
-	private final Object[] arguments;
 	private final int invocationIndex;
+	private final Object[] arguments;
 
 	public DefaultArgumentsAccessor(int invocationIndex, Object... arguments) {
+		Preconditions.condition(invocationIndex >= 1, () -> "invocation index must be >= 1");
 		Preconditions.notNull(arguments, "Arguments array must not be null");
-		this.arguments = arguments;
 		this.invocationIndex = invocationIndex;
+		this.arguments = arguments;
 	}
 
 	@Override
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
index a7d65ff8b94c..3090bfcf2166 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
@@ -184,6 +184,20 @@ void reportsExceptionForErroneousAggregator() {
 					message("Error aggregating arguments for parameter at index 0: something went horribly wrong"))));
 	}
 
+	@ParameterizedTest
+	@CsvSource({ //
+			"first", //
+			"second" //
+	})
+	void argumentsAccessorInvocationIndex(ArgumentsAccessor arguments) {
+		if ("first".equals(arguments.getString(0))) {
+			assertEquals(1, arguments.getInvocationIndex());
+		}
+		if ("second".equals(arguments.getString(0))) {
+			assertEquals(2, arguments.getInvocationIndex());
+		}
+	}
+
 	private void testPersonAggregator(Person person) {
 		if (person.firstName.equals("Jane")) {
 			assertEquals("Jane Doe", person.getFullName());
@@ -208,17 +222,6 @@ private EngineExecutionResults execute(DiscoverySelector... selectors) {
 		return EngineTestKit.execute("junit-jupiter", request().selectors(selectors).build());
 	}
 
-	@ParameterizedTest
-	@CsvSource({ "first", "second" })
-	void argumentsAccessorInvocationIndex(ArgumentsAccessor arguments) {
-		if ("first".equals(arguments.getString(0))) {
-			assertEquals(1, arguments.getInvocationIndex());
-		}
-		if ("second".equals(arguments.getString(0))) {
-			assertEquals(2, arguments.getInvocationIndex());
-		}
-	}
-
 	// -------------------------------------------------------------------------
 
 	public static class Person {
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
index 69464e54ef7a..bef2cfba33be 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
@@ -21,14 +21,14 @@ class ArgumentsAccessorKotlinTests {
 
     @Test
     fun `get() with reified type and index`() {
-        assertEquals(1, DefaultArgumentsAccessor(0, 1).get<Int>(0))
-        assertEquals('A', DefaultArgumentsAccessor(0, 'A').get<Char>(0))
+        assertEquals(1, DefaultArgumentsAccessor(1, 1).get<Int>(0))
+        assertEquals('A', DefaultArgumentsAccessor(1, 'A').get<Char>(0))
     }
 
     @Test
     fun `get() with reified type and index for incompatible type`() {
         val exception = assertThrows<ArgumentAccessException> {
-            DefaultArgumentsAccessor(0, Integer.valueOf(1)).get<Char>(0)
+            DefaultArgumentsAccessor(1, Integer.valueOf(1)).get<Char>(0)
         }
 
         assertThat(exception).hasMessage(
@@ -38,13 +38,13 @@ class ArgumentsAccessorKotlinTests {
 
     @Test
     fun `get() with index`() {
-        assertEquals(1, DefaultArgumentsAccessor(0, 1).get(0))
-        assertEquals('A', DefaultArgumentsAccessor(0, 'A').get(0))
+        assertEquals(1, DefaultArgumentsAccessor(1, 1).get(0))
+        assertEquals('A', DefaultArgumentsAccessor(1, 'A').get(0))
     }
 
     @Test
     fun `get() with index and class reference`() {
-        assertEquals(1, DefaultArgumentsAccessor(0, 1).get(0, Integer::class.java))
-        assertEquals('A', DefaultArgumentsAccessor(0, 'A').get(0, Character::class.java))
+        assertEquals(1, DefaultArgumentsAccessor(1, 1).get(0, Integer::class.java))
+        assertEquals('A', DefaultArgumentsAccessor(1, 'A').get(0, Character::class.java))
     }
 }

From 143beb449a1bd4798670dd3469cd40928d5d7d63 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Mon, 14 Nov 2022 19:03:43 +0100
Subject: [PATCH 0999/1433] Document cases where `@EnabledIf`/`@DisabledIf`
 require `static` condition methods

Resolves #3068
---
 .../src/docs/asciidoc/user-guide/writing-tests.adoc  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 514965f8dd44..64f8be9e1af0 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -538,10 +538,18 @@ package example;
 include::{testDir}/example/ExternalCustomConditionDemo.java[tags=user_guide_external_custom_condition]
 ----
 
-NOTE: When `@EnabledIf` or `@DisabledIf` is used at class level, the condition method must
-always be `static`. Condition methods located in external classes must also be `static`.
+[NOTE]
+====
+There are several cases where a condition method would need to be `static`:
+
+- when `@EnabledIf` or `@DisabledIf` is used at class level
+- when `@EnabledIf` or `@DisabledIf` is used on a `@ParameterizedTest` or a
+  `@TestTemplate` method
+- when the condition method is located in an external class
+
 In any other case, you can use either static methods or instance methods as condition
 methods.
+====
 
 [TIP]
 ====

From bdfba9a5b23f9f63ff27097042eb5a5b52edc35c Mon Sep 17 00:00:00 2001
From: William Degrange <william.degrange@outlook.com>
Date: Sat, 9 Jul 2022 18:26:33 +0200
Subject: [PATCH 1000/1433] Allow `DisplayNameGenerator` methods to return
 `null` to signal to fall back to the default generator

Fixes #2969
Closes #2974
---
 .../jupiter/api/DisplayNameGenerator.java     | 12 ++++++--
 .../engine/descriptor/DisplayNameUtils.java   | 29 ++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index e23fd31e39db..1008f51bc6ac 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -74,29 +74,35 @@ public interface DisplayNameGenerator {
 	/**
 	 * Generate a display name for the given top-level or {@code static} nested test class.
 	 *
+	 * If {@code null} is generated, the default generator will be used to generate the display name.
+	 *
 	 * @param testClass the class to generate a name for; never {@code null}
-	 * @return the display name for the class; never {@code null} or blank
+	 * @return the display name for the class; never blank
 	 */
 	String generateDisplayNameForClass(Class<?> testClass);
 
 	/**
 	 * Generate a display name for the given {@link Nested @Nested} inner test class.
 	 *
+	 * If {@code null} is generated, the default generator will be used to generate the display name.
+	 *
 	 * @param nestedClass the class to generate a name for; never {@code null}
-	 * @return the display name for the nested class; never {@code null} or blank
+	 * @return the display name for the nested class; never blank
 	 */
 	String generateDisplayNameForNestedClass(Class<?> nestedClass);
 
 	/**
 	 * Generate a display name for the given method.
 	 *
+	 * If {@code null} is generated, the default generator will be used to generate the display name.
+	 *
 	 * @implNote The class instance supplied as {@code testClass} may differ from
 	 * the class returned by {@code testMethod.getDeclaringClass()} &mdash; for
 	 * example, when a test method is inherited from a superclass.
 	 *
 	 * @param testClass the class the test method is invoked on; never {@code null}
 	 * @param testMethod method to generate a display name for; never {@code null}
-	 * @return the display name for the test; never {@code null} or blank
+	 * @return the display name for the test; never blank
 	 */
 	String generateDisplayNameForMethod(Class<?> testClass, Method testMethod);
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
index 6e580ef3baac..460ebb7d69b1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -15,6 +15,7 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.junit.jupiter.api.DisplayName;
@@ -90,21 +91,36 @@ static String determineDisplayName(AnnotatedElement element, Supplier<String> di
 
 	static String determineDisplayNameForMethod(Class<?> testClass, Method testMethod,
 			JupiterConfiguration configuration) {
-		DisplayNameGenerator generator = getDisplayNameGenerator(testClass, configuration);
-		return determineDisplayName(testMethod, () -> generator.generateDisplayNameForMethod(testClass, testMethod));
+		return determineDisplayName(testMethod,
+			createDisplayNameSupplierForMethod(testClass, testMethod, configuration));
 	}
 
 	static Supplier<String> createDisplayNameSupplierForClass(Class<?> testClass, JupiterConfiguration configuration) {
-		return () -> getDisplayNameGenerator(testClass, configuration).generateDisplayNameForClass(testClass);
+		return createDisplayNameSupplier(testClass, configuration,
+			generator -> generator.generateDisplayNameForClass(testClass));
 	}
 
 	static Supplier<String> createDisplayNameSupplierForNestedClass(Class<?> testClass,
 			JupiterConfiguration configuration) {
-		return () -> getDisplayNameGenerator(testClass, configuration).generateDisplayNameForNestedClass(testClass);
+		return createDisplayNameSupplier(testClass, configuration,
+			generator -> generator.generateDisplayNameForNestedClass(testClass));
 	}
 
-	private static DisplayNameGenerator getDisplayNameGenerator(Class<?> testClass,
+	static Supplier<String> createDisplayNameSupplierForMethod(Class<?> testClass, Method testMethod,
 			JupiterConfiguration configuration) {
+		return createDisplayNameSupplier(testClass, configuration,
+			generator -> generator.generateDisplayNameForMethod(testClass, testMethod));
+	}
+
+	private static Supplier<String> createDisplayNameSupplier(Class<?> testClass, JupiterConfiguration configuration,
+			Function<DisplayNameGenerator, String> generatorFunction) {
+		Preconditions.notNull(generatorFunction, "DisplayNameGenerator function must not be null");
+		return () -> getOptionalDisplayNameGenerator(testClass) //
+				.map(generatorFunction) //
+				.orElseGet(() -> generatorFunction.apply(configuration.getDefaultDisplayNameGenerator()));
+	}
+
+	private static Optional<DisplayNameGenerator> getOptionalDisplayNameGenerator(Class<?> testClass) {
 		Preconditions.notNull(testClass, "Test class must not be null");
 
 		return AnnotationUtils.findAnnotation(testClass, DisplayNameGeneration.class, true) //
@@ -123,8 +139,7 @@ private static DisplayNameGenerator getDisplayNameGenerator(Class<?> testClass,
 						return indicativeSentencesGenerator;
 					}
 					return ReflectionUtils.newInstance(displayNameGeneratorClass);
-				}) //
-				.orElseGet(configuration::getDefaultDisplayNameGenerator);
+				});
 	}
 
 }

From 4ee85e205fd77a349913c61e719e6a83207ee067 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Wed, 16 Nov 2022 13:04:03 +0100
Subject: [PATCH 1001/1433] Polish and add tests for PR #2974

---
 .../jupiter/api/DisplayNameGenerator.java     |  6 +-
 .../engine/descriptor/DisplayNameUtils.java   |  7 +--
 .../descriptor/DisplayNameUtilsTests.java     | 61 +++++++++++++++++++
 3 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 1008f51bc6ac..7b67189b56cb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -74,7 +74,7 @@ public interface DisplayNameGenerator {
 	/**
 	 * Generate a display name for the given top-level or {@code static} nested test class.
 	 *
-	 * If {@code null} is generated, the default generator will be used to generate the display name.
+	 * <p>If it returns {@code null}, the default display name generator will be used instead.
 	 *
 	 * @param testClass the class to generate a name for; never {@code null}
 	 * @return the display name for the class; never blank
@@ -84,7 +84,7 @@ public interface DisplayNameGenerator {
 	/**
 	 * Generate a display name for the given {@link Nested @Nested} inner test class.
 	 *
-	 * If {@code null} is generated, the default generator will be used to generate the display name.
+	 * <p>If it returns {@code null}, the default display name generator will be used instead.
 	 *
 	 * @param nestedClass the class to generate a name for; never {@code null}
 	 * @return the display name for the nested class; never blank
@@ -94,7 +94,7 @@ public interface DisplayNameGenerator {
 	/**
 	 * Generate a display name for the given method.
 	 *
-	 * If {@code null} is generated, the default generator will be used to generate the display name.
+	 * <p>If it returns {@code null}, the default display name generator will be used instead.
 	 *
 	 * @implNote The class instance supplied as {@code testClass} may differ from
 	 * the class returned by {@code testMethod.getDeclaringClass()} &mdash; for
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
index 460ebb7d69b1..d4a479af4eca 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -106,7 +106,7 @@ static Supplier<String> createDisplayNameSupplierForNestedClass(Class<?> testCla
 			generator -> generator.generateDisplayNameForNestedClass(testClass));
 	}
 
-	static Supplier<String> createDisplayNameSupplierForMethod(Class<?> testClass, Method testMethod,
+	private static Supplier<String> createDisplayNameSupplierForMethod(Class<?> testClass, Method testMethod,
 			JupiterConfiguration configuration) {
 		return createDisplayNameSupplier(testClass, configuration,
 			generator -> generator.generateDisplayNameForMethod(testClass, testMethod));
@@ -114,13 +114,12 @@ static Supplier<String> createDisplayNameSupplierForMethod(Class<?> testClass, M
 
 	private static Supplier<String> createDisplayNameSupplier(Class<?> testClass, JupiterConfiguration configuration,
 			Function<DisplayNameGenerator, String> generatorFunction) {
-		Preconditions.notNull(generatorFunction, "DisplayNameGenerator function must not be null");
-		return () -> getOptionalDisplayNameGenerator(testClass) //
+		return () -> findDisplayNameGenerator(testClass) //
 				.map(generatorFunction) //
 				.orElseGet(() -> generatorFunction.apply(configuration.getDefaultDisplayNameGenerator()));
 	}
 
-	private static Optional<DisplayNameGenerator> getOptionalDisplayNameGenerator(Class<?> testClass) {
+	private static Optional<DisplayNameGenerator> findDisplayNameGenerator(Class<?> testClass) {
 		Preconditions.notNull(testClass, "Test class must not be null");
 
 		return AnnotationUtils.findAnnotation(testClass, DisplayNameGeneration.class, true) //
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
index ec8894e67f47..f9947698e7e1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
@@ -101,6 +101,15 @@ void shouldGetDisplayNameFromDefaultDisplayNameGenerator() {
 
 				assertThat(displayName.get()).isEqualTo("class-display-name");
 			}
+
+			@Test
+			void shouldFallbackOnDefaultDisplayNameGeneratorWhenNullIsGenerated() {
+				when(configuration.getDefaultDisplayNameGenerator()).thenReturn(new CustomDisplayNameGenerator());
+				Supplier<String> displayName = DisplayNameUtils.createDisplayNameSupplierForClass(
+					NullDisplayNameTestCase.class, configuration);
+
+				assertThat(displayName.get()).isEqualTo("class-display-name");
+			}
 		}
 	}
 
@@ -126,6 +135,15 @@ void shouldGetDisplayNameFromDefaultDisplayNameGenerator() {
 
 			assertThat(displayName.get()).isEqualTo("nested-class-display-name");
 		}
+
+		@Test
+		void shouldFallbackOnDefaultDisplayNameGeneratorWhenNullIsGenerated() {
+			when(configuration.getDefaultDisplayNameGenerator()).thenReturn(new CustomDisplayNameGenerator());
+			Supplier<String> displayName = DisplayNameUtils.createDisplayNameSupplierForNestedClass(
+				NullDisplayNameTestCase.NestedTestCase.class, configuration);
+
+			assertThat(displayName.get()).isEqualTo("nested-class-display-name");
+		}
 	}
 
 	@Nested
@@ -153,6 +171,17 @@ void shouldGetDisplayNameFromDefaultNameGenerator() throws Exception {
 
 			assertThat(displayName).isEqualTo("method-display-name");
 		}
+
+		@Test
+		void shouldFallbackOnDefaultDisplayNameGeneratorWhenNullIsGenerated() throws Exception {
+			Method method = NullDisplayNameTestCase.class.getDeclaredMethod("test");
+			when(configuration.getDefaultDisplayNameGenerator()).thenReturn(new CustomDisplayNameGenerator());
+
+			String displayName = DisplayNameUtils.determineDisplayNameForMethod(NullDisplayNameTestCase.class, method,
+				configuration);
+
+			assertThat(displayName).isEqualTo("method-display-name");
+		}
 	}
 
 	private LogRecord firstWarningLogRecord(LogRecordListener listener) throws AssertionError {
@@ -188,4 +217,36 @@ static class NotDisplayNameTestCase {
 	class NestedTestCase {
 	}
 
+	@DisplayNameGeneration(value = NullDisplayNameGenerator.class)
+	static class NullDisplayNameTestCase {
+
+		@Test
+		void test() {
+		}
+
+		@Nested
+		class NestedTestCase {
+		}
+
+	}
+
+	static class NullDisplayNameGenerator implements DisplayNameGenerator {
+
+		@Override
+		public String generateDisplayNameForClass(Class<?> testClass) {
+			return null;
+		}
+
+		@Override
+		public String generateDisplayNameForNestedClass(Class<?> nestedClass) {
+			return null;
+		}
+
+		@Override
+		public String generateDisplayNameForMethod(Class<?> testClass, Method testMethod) {
+			return null;
+		}
+
+	}
+
 }

From 4836c4d7ccd7a9133a93da1435b9314adc9e9cae Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Wed, 16 Nov 2022 13:09:12 +0100
Subject: [PATCH 1002/1433] Add release note entry for PR #2974

---
 .../docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 1a7edb11fc3c..d62c0f7566cf 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -44,6 +44,8 @@ repository on GitHub.
 
 * New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
   `@ParameterizedTest` invocation.
+* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal
+  to fall back to the default display name generator.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]

From 27cf0f47d6d43ad9d6c3e84ee2c78b693c573771 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 24 Nov 2022 09:55:58 +0100
Subject: [PATCH 1003/1433] Upgradle to 7.6-rc-4

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac6c0bad2fd6..ef8402bda221 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=21e2bf8e6c6ac310182c817776ffc6cca80142f5de4b2b4151f9f72b9ec35b50
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-3-bin.zip
+distributionSha256Sum=eb93e4f8abf8db59d5bd1bbdd716f971d010bfc82fd01fe46905d499305718a0
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From a0126ddc44fb7db666d6d5d8e9e71ac3065c9f13 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 25 Nov 2022 18:30:32 +0100
Subject: [PATCH 1004/1433] Upgradle to 7.6

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ef8402bda221..adb6acbd81b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=eb93e4f8abf8db59d5bd1bbdd716f971d010bfc82fd01fe46905d499305718a0
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-4-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 54d77f7258191ebf99e1f92159d61814ce40c60e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 25 Nov 2022 18:37:54 +0100
Subject: [PATCH 1005/1433] Fix reporting of Enclosed Parameterized tests in
 Vintage engine

Fixes #3083.
---
 .../release-notes/release-notes-5.9.2.adoc    |  3 +-
 .../engine/execution/RunListenerAdapter.java  |  2 +-
 .../VintageTestEngineExecutionTests.java      | 34 +++++++++++
 ...thParameterizedChildrenJUnit4TestCase.java | 59 +++++++++++++++++++
 4 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index 9b5209784dfa..b39189182338 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -48,7 +48,8 @@ JUnit repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Fix reporting of `Parameterized` tests when used in combination with the `Enclosed`
+  runner.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
index 40760f923480..f9baebfc0161 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
@@ -93,7 +93,7 @@ public void testSuiteFinished(Description description) {
 		RunnerTestDescriptor runnerTestDescriptor = testRun.getRunnerTestDescriptor();
 		// runnerTestDescriptor is reported in testRunFinished
 		if (!runnerTestDescriptor.getDescription().equals(description)) {
-			reportContainerFinished(lookupOrRegisterNextTestDescriptor(description));
+			reportContainerFinished(lookupOrRegisterCurrentTestDescriptor(description));
 		}
 	}
 
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
index 50643844ed99..615de6f00be8 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
@@ -62,6 +62,7 @@
 import org.junit.vintage.engine.samples.junit4.CompletelyDynamicTestCase;
 import org.junit.vintage.engine.samples.junit4.EmptyIgnoredTestCase;
 import org.junit.vintage.engine.samples.junit4.EnclosedJUnit4TestCase;
+import org.junit.vintage.engine.samples.junit4.EnclosedWithParameterizedChildrenJUnit4TestCase;
 import org.junit.vintage.engine.samples.junit4.IgnoredJUnit4TestCase;
 import org.junit.vintage.engine.samples.junit4.IgnoredParameterizedTestCase;
 import org.junit.vintage.engine.samples.junit4.JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase;
@@ -172,6 +173,39 @@ void executesEnclosedJUnit4TestCase() {
 			event(engine(), finishedSuccessfully()));
 	}
 
+	@Test
+	void executesEnclosedWithParameterizedChildrenJUnit4TestCase() {
+		Class<?> testClass = EnclosedWithParameterizedChildrenJUnit4TestCase.class;
+		String commonNestedClassPrefix = EnclosedWithParameterizedChildrenJUnit4TestCase.class.getName()
+				+ "$NestedTestCase";
+
+		execute(testClass).allEvents().debug().assertEventsMatchExactly( //
+			event(engine(), started()), //
+			event(container(testClass), started()), //
+			event(container(commonNestedClassPrefix), started()), //
+			event(container("[0]"), started()), //
+			event(test("test[0]"), started()), //
+			event(test("test[0]"), finishedSuccessfully()), //
+			event(container("[0]"), finishedSuccessfully()), //
+			event(container("[1]"), started()), //
+			event(test("test[1]"), started()), //
+			event(test("test[1]"), finishedSuccessfully()), //
+			event(container("[1]"), finishedSuccessfully()), //
+			event(container(commonNestedClassPrefix), finishedSuccessfully()), //
+			event(container(commonNestedClassPrefix), started()), //
+			event(container("[0]"), started()), //
+			event(test("test[0]"), started()), //
+			event(test("test[0]"), finishedSuccessfully()), //
+			event(container("[0]"), finishedSuccessfully()), //
+			event(container("[1]"), started()), //
+			event(test("test[1]"), started()), //
+			event(test("test[1]"), finishedSuccessfully()), //
+			event(container("[1]"), finishedSuccessfully()), //
+			event(container(commonNestedClassPrefix), finishedSuccessfully()), //
+			event(container(testClass), finishedSuccessfully()), //
+			event(engine(), finishedSuccessfully()));
+	}
+
 	@Test
 	void executesJUnit4SuiteWithJUnit3SuiteWithSingleTestCase() {
 		Class<?> junit4SuiteClass = JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.class;
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java
new file mode 100644
index 000000000000..1bed0ac24673
--- /dev/null
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.vintage.engine.samples.junit4;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+// Source: https://github.com/junit-team/junit5/issues/3083
+@RunWith(Enclosed.class)
+public class EnclosedWithParameterizedChildrenJUnit4TestCase {
+
+	@RunWith(Parameterized.class)
+	public static class NestedTestCase1 {
+
+		@Parameters
+		public static Collection<Object[]> data() {
+			return Arrays.asList(new Object[] { 1, 2 }, new Object[] { 3, 4 });
+		}
+
+		@SuppressWarnings("unused")
+		public NestedTestCase1(final int a, final int b) {
+		}
+
+		@Test
+		public void test() {
+		}
+	}
+
+	@RunWith(Parameterized.class)
+	public static class NestedTestCase2 {
+
+		@Parameters
+		public static Collection<Object[]> data() {
+			return Arrays.asList(new Object[] { 1, 2 }, new Object[] { 3, 4 });
+		}
+
+		@SuppressWarnings("unused")
+		public NestedTestCase2(final int a, final int b) {
+		}
+
+		@Test
+		public void test() {
+		}
+	}
+}

From b3827e21d2b29517566980172fbc6b2c6d9ca6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Prinet?= <jprinet@gradle.com>
Date: Tue, 29 Nov 2022 16:41:39 +0100
Subject: [PATCH 1006/1433] Document shadowJar cache miss (#3097)

Document build cache miss to ease detection of (new) performance
regression.
---
 buildSrc/src/main/kotlin/java-library-conventions.gradle.kts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index 77fc7d334a66..e2df86c8984f 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -194,6 +194,10 @@ tasks.jar {
 	}
 }
 
+tasks.withType<ShadowJar>().configureEach {
+	outputs.doNotCacheIf("Shadow jar contains a Manifest with Build-Time") { true }
+}
+
 tasks.withType<JavaCompile>().configureEach {
 	options.encoding = "UTF-8"
 }

From 16de26ffe8d2c01661c5dd7d1673e2510c0be8ba Mon Sep 17 00:00:00 2001
From: Ndione24 <47160424+Ndione24@users.noreply.github.com>
Date: Fri, 16 Dec 2022 17:28:15 +0100
Subject: [PATCH 1007/1433] Add `Stream` counterparts to `ReflectionSupport`
 utility methods returning `List` (#3084)

Resolves https://github.com/junit-team/junit5/issues/2779
---
 .../release-notes-5.10.0-M1.adoc              |   3 +-
 .../engine/descriptor/ExtensionUtils.java     |   4 +-
 .../discovery/ClassSelectorResolver.java      |   4 +-
 .../commons/support/ReflectionSupport.java    | 158 ++++++++++++++++++
 .../commons/util/ReflectionUtils.java         |  90 +++++++++-
 5 files changed, 244 insertions(+), 15 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index d62c0f7566cf..13d2fac24501 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -26,8 +26,7 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
-
+*  All utility methods from `ReflectionSupport` now have counterparts returning `Stream` instead of `List`
 
 [[release-notes-5.10.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index 810d7e5a0a18..e5da1c415bdb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -15,8 +15,8 @@
 import static org.junit.platform.commons.util.AnnotationUtils.findRepeatableAnnotations;
 import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
 import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.TOP_DOWN;
-import static org.junit.platform.commons.util.ReflectionUtils.findFields;
 import static org.junit.platform.commons.util.ReflectionUtils.getDeclaredConstructor;
+import static org.junit.platform.commons.util.ReflectionUtils.streamFields;
 import static org.junit.platform.commons.util.ReflectionUtils.tryToReadFieldValue;
 
 import java.lang.reflect.AnnotatedElement;
@@ -93,7 +93,7 @@ static void registerExtensionsFromFields(ExtensionRegistrar registrar, Class<?>
 
 		Predicate<Field> predicate = (instance == null ? ReflectionUtils::isStatic : ReflectionUtils::isNotStatic);
 
-		findFields(clazz, predicate, TOP_DOWN).stream()//
+		streamFields(clazz, predicate, TOP_DOWN)//
 				.sorted(orderComparator)//
 				.forEach(field -> {
 					List<Class<? extends Extension>> extensionTypes = streamExtensionTypes(field).collect(toList());
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
index 18f7107b992b..9aaf7c28879b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
@@ -13,7 +13,7 @@
 import static java.util.function.Predicate.isEqual;
 import static java.util.stream.Collectors.toCollection;
 import static org.junit.jupiter.engine.discovery.predicates.IsTestClassWithTests.isTestOrTestFactoryOrTestTemplateMethod;
-import static org.junit.platform.commons.support.ReflectionSupport.findNestedClasses;
+import static org.junit.platform.commons.support.ReflectionSupport.streamNestedClasses;
 import static org.junit.platform.commons.util.FunctionUtils.where;
 import static org.junit.platform.commons.util.ReflectionUtils.findMethods;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
@@ -135,7 +135,7 @@ private Resolution toResolution(Optional<? extends ClassBasedTestDescriptor> tes
 			return Resolution.match(Match.exact(it, () -> {
 				Stream<DiscoverySelector> methods = findMethods(testClass, isTestOrTestFactoryOrTestTemplateMethod).stream()
 						.map(method -> selectMethod(testClasses, method));
-				Stream<NestedClassSelector> nestedClasses = findNestedClasses(testClass, isNestedTestClass).stream()
+				Stream<NestedClassSelector> nestedClasses = streamNestedClasses(testClass, isNestedTestClass)
 						.map(nestedClass -> DiscoverySelectors.selectNestedClass(testClasses, nestedClass));
 				return Stream.concat(methods, nestedClasses).collect(toCollection((Supplier<Set<DiscoverySelector>>) LinkedHashSet::new));
 			}));
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
index ae11ea789ed0..f8265680b2b0 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
@@ -114,6 +115,31 @@ public static List<Class<?>> findAllClassesInClasspathRoot(URI root, Predicate<C
 		return ReflectionUtils.findAllClassesInClasspathRoot(root, classFilter, classNameFilter);
 	}
 
+	/**
+	 * Find all {@linkplain Class classes} in the supplied classpath {@code root}
+	 * that match the specified {@code classFilter} and {@code classNameFilter}
+	 * predicates.
+	 *
+	 * <p>The classpath scanning algorithm searches recursively in subpackages
+	 * beginning with the root of the classpath.
+	 *
+	 * @param root the URI for the classpath root in which to scan; never
+	 * {@code null}
+	 * @param classFilter the class type filter; never {@code null}
+	 * @param classNameFilter the class name filter; never {@code null}
+	 * @return a stream of all such classes found; never {@code null}
+	 * but potentially empty
+	 * @since 1.10
+	 * @see #findAllClassesInPackage(String, Predicate, Predicate)
+	 * @see #findAllClassesInModule(String, Predicate, Predicate)
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public static Stream<Class<?>> streamAllClassesInClasspathRoot(URI root, Predicate<Class<?>> classFilter,
+			Predicate<String> classNameFilter) {
+
+		return ReflectionUtils.streamAllClassesInClasspathRoot(root, classFilter, classNameFilter);
+	}
+
 	/**
 	 * Find all {@linkplain Class classes} in the supplied {@code basePackageName}
 	 * that match the specified {@code classFilter} and {@code classNameFilter}
@@ -138,6 +164,32 @@ public static List<Class<?>> findAllClassesInPackage(String basePackageName, Pre
 		return ReflectionUtils.findAllClassesInPackage(basePackageName, classFilter, classNameFilter);
 	}
 
+	/**
+	 * Find all {@linkplain Class classes} in the supplied {@code basePackageName}
+	 * that match the specified {@code classFilter} and {@code classNameFilter}
+	 * predicates.
+	 *
+	 * <p>The classpath scanning algorithm searches recursively in subpackages
+	 * beginning within the supplied base package.
+	 *
+	 * @param basePackageName the name of the base package in which to start
+	 * scanning; must not be {@code null} and must be valid in terms of Java
+	 * syntax
+	 * @param classFilter the class type filter; never {@code null}
+	 * @param classNameFilter the class name filter; never {@code null}
+	 * @return a stream of all such classes found; never {@code null}
+	 * but potentially empty
+	 * @since 1.10
+	 * @see #findAllClassesInClasspathRoot(URI, Predicate, Predicate)
+	 * @see #findAllClassesInModule(String, Predicate, Predicate)
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public static Stream<Class<?>> streamAllClassesInPackage(String basePackageName, Predicate<Class<?>> classFilter,
+			Predicate<String> classNameFilter) {
+
+		return ReflectionUtils.streamAllClassesInPackage(basePackageName, classFilter, classNameFilter);
+	}
+
 	/**
 	 * Find all {@linkplain Class classes} in the supplied {@code moduleName}
 	 * that match the specified {@code classFilter} and {@code classNameFilter}
@@ -162,6 +214,31 @@ public static List<Class<?>> findAllClassesInModule(String moduleName, Predicate
 		return ReflectionUtils.findAllClassesInModule(moduleName, classFilter, classNameFilter);
 	}
 
+	/**
+	 * Find all {@linkplain Class classes} in the supplied {@code moduleName}
+	 * that match the specified {@code classFilter} and {@code classNameFilter}
+	 * predicates.
+	 *
+	 * <p>The module-path scanning algorithm searches recursively in all
+	 * packages contained in the module.
+	 *
+	 * @param moduleName the name of the module to scan; never {@code null} or
+	 * <em>empty</em>
+	 * @param classFilter the class type filter; never {@code null}
+	 * @param classNameFilter the class name filter; never {@code null}
+	 * @return a stream of all such classes found; never {@code null}
+	 * but potentially empty
+	 * @since 1.10
+	 * @see #findAllClassesInClasspathRoot(URI, Predicate, Predicate)
+	 * @see #findAllClassesInPackage(String, Predicate, Predicate)
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public static Stream<Class<?>> streamAllClassesInModule(String moduleName, Predicate<Class<?>> classFilter,
+			Predicate<String> classNameFilter) {
+
+		return ReflectionUtils.streamAllClassesInModule(moduleName, classFilter, classNameFilter);
+	}
+
 	/**
 	 * Create a new instance of the specified {@link Class} by invoking
 	 * the constructor whose argument list matches the types of the supplied
@@ -225,6 +302,31 @@ public static List<Field> findFields(Class<?> clazz, Predicate<Field> predicate,
 			ReflectionUtils.HierarchyTraversalMode.valueOf(traversalMode.name()));
 	}
 
+	/**
+	 * Find all {@linkplain Field fields} of the supplied class or interface
+	 * that match the specified {@code predicate}.
+	 *
+	 * <p>Fields declared in the same class or interface will be ordered using
+	 * an algorithm that is deterministic but intentionally nonobvious.
+	 *
+	 * <p>The results will not contain fields that are <em>hidden</em> or
+	 * {@linkplain Field#isSynthetic() synthetic}.
+	 *
+	 * @param clazz the class or interface in which to find the fields; never {@code null}
+	 * @param predicate the field filter; never {@code null}
+	 * @param traversalMode the hierarchy traversal mode; never {@code null}
+	 * @return a stream of all such fields found; never {@code null}
+	 * but potentially empty
+	 * @since 1.10
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public static Stream<Field> streamFields(Class<?> clazz, Predicate<Field> predicate,
+			HierarchyTraversalMode traversalMode) {
+		Preconditions.notNull(traversalMode, "HierarchyTraversalMode must not be null");
+		return ReflectionUtils.streamFields(clazz, predicate,
+			ReflectionUtils.HierarchyTraversalMode.valueOf(traversalMode.name()));
+	}
+
 	/**
 	 * Try to read the value of a potentially inaccessible field.
 	 *
@@ -307,6 +409,34 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 			ReflectionUtils.HierarchyTraversalMode.valueOf(traversalMode.name()));
 	}
 
+	/**
+	 * Find all distinct {@linkplain Method methods} of the supplied class or
+	 * interface that match the specified {@code predicate}.
+	 *
+	 * <p>The results will not contain instance methods that are <em>overridden</em>
+	 * or {@code static} methods that are <em>hidden</em>.
+	 *
+	 * <p>If you're are looking for methods annotated with a certain annotation
+	 * type, consider using
+	 * {@link AnnotationSupport#findAnnotatedMethods(Class, Class, HierarchyTraversalMode)}.
+	 *
+	 * @param clazz the class or interface in which to find the methods; never {@code null}
+	 * @param predicate the method filter; never {@code null}
+	 * @param traversalMode the hierarchy traversal mode; never {@code null}
+	 * @return a stream of all such methods found; never {@code null}
+	 * @since 1.10
+	 * but potentially empty
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public static Stream<Method> streamMethods(Class<?> clazz, Predicate<Method> predicate,
+			HierarchyTraversalMode traversalMode) {
+
+		Preconditions.notNull(traversalMode, "HierarchyTraversalMode must not be null");
+
+		return ReflectionUtils.streamMethods(clazz, predicate,
+			ReflectionUtils.HierarchyTraversalMode.valueOf(traversalMode.name()));
+	}
+
 	/**
 	 * Find all nested classes within the supplied class, or inherited by the
 	 * supplied class, that conform to the supplied predicate.
@@ -333,4 +463,32 @@ public static List<Class<?>> findNestedClasses(Class<?> clazz, Predicate<Class<?
 		return ReflectionUtils.findNestedClasses(clazz, predicate);
 	}
 
+	/**
+	 * Find all nested classes within the supplied class, or inherited by the
+	 * supplied class, that conform to the supplied predicate.
+	 *
+	 * <p>This method does <strong>not</strong> search for nested classes
+	 * recursively.
+	 *
+	 * <p>As of JUnit Platform 1.6, this method detects cycles in <em>inner</em>
+	 * class hierarchies &mdash; from the supplied class up to the outermost
+	 * enclosing class &mdash; and throws a {@link JUnitException} if such a cycle
+	 * is detected. Cycles within inner class hierarchies <em>below</em> the
+	 * supplied class are not detected by this method.
+	 *
+	 * @param clazz the class to be searched; never {@code null}
+	 * @param predicate the predicate against which the list of nested classes is
+	 * checked; never {@code null}
+	 * @return a stream of all such classes found; never {@code null}
+	 * but potentially empty
+	 * @throws JUnitException if a cycle is detected within an inner class hierarchy
+	 * @since 1.10
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public static Stream<Class<?>> streamNestedClasses(Class<?> clazz, Predicate<Class<?>> predicate)
+			throws JUnitException {
+
+		return ReflectionUtils.streamNestedClasses(clazz, predicate);
+	}
+
 }
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 31dd5cdc8572..e1b54cb65286 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -51,6 +51,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
@@ -997,6 +998,15 @@ public static List<Class<?>> findAllClassesInClasspathRoot(URI root, Predicate<C
 		return findAllClassesInClasspathRoot(root, ClassFilter.of(classNameFilter, classFilter));
 	}
 
+	/**
+	 * @since 1.10
+	 * @see org.junit.platform.commons.support.ReflectionSupport#streamAllClassesInClasspathRoot(URI, Predicate, Predicate)
+	 */
+	public static Stream<Class<?>> streamAllClassesInClasspathRoot(URI root, Predicate<Class<?>> classFilter,
+			Predicate<String> classNameFilter) {
+		return streamAllClassesInClasspathRoot(root, ClassFilter.of(classNameFilter, classFilter));
+	}
+
 	/**
 	 * @since 1.1
 	 */
@@ -1004,6 +1014,13 @@ public static List<Class<?>> findAllClassesInClasspathRoot(URI root, ClassFilter
 		return Collections.unmodifiableList(classpathScanner.scanForClassesInClasspathRoot(root, classFilter));
 	}
 
+	/**
+	 * @since 1.10
+	 */
+	public static Stream<Class<?>> streamAllClassesInClasspathRoot(URI root, ClassFilter classFilter) {
+		return findAllClassesInClasspathRoot(root, classFilter).stream();
+	}
+
 	/**
 	 * @see org.junit.platform.commons.support.ReflectionSupport#findAllClassesInPackage(String, Predicate, Predicate)
 	 */
@@ -1013,6 +1030,15 @@ public static List<Class<?>> findAllClassesInPackage(String basePackageName, Pre
 		return findAllClassesInPackage(basePackageName, ClassFilter.of(classNameFilter, classFilter));
 	}
 
+	/**
+	 * since 1.10
+	 * @see org.junit.platform.commons.support.ReflectionSupport#streamAllClassesInPackage(String, Predicate, Predicate)
+	 */
+	public static Stream<Class<?>> streamAllClassesInPackage(String basePackageName, Predicate<Class<?>> classFilter,
+			Predicate<String> classNameFilter) {
+		return streamAllClassesInPackage(basePackageName, ClassFilter.of(classNameFilter, classFilter));
+	}
+
 	/**
 	 * @since 1.1
 	 */
@@ -1020,6 +1046,13 @@ public static List<Class<?>> findAllClassesInPackage(String basePackageName, Cla
 		return Collections.unmodifiableList(classpathScanner.scanForClassesInPackage(basePackageName, classFilter));
 	}
 
+	/**
+	 * @since 1.10
+	 */
+	public static Stream<Class<?>> streamAllClassesInPackage(String basePackageName, ClassFilter classFilter) {
+		return findAllClassesInPackage(basePackageName, classFilter).stream();
+	}
+
 	/**
 	 * @since 1.1.1
 	 * @see org.junit.platform.commons.support.ReflectionSupport#findAllClassesInModule(String, Predicate, Predicate)
@@ -1030,6 +1063,15 @@ public static List<Class<?>> findAllClassesInModule(String moduleName, Predicate
 		return findAllClassesInModule(moduleName, ClassFilter.of(classNameFilter, classFilter));
 	}
 
+	/**
+	 * @since 1.10
+	 * @see org.junit.platform.commons.support.ReflectionSupport#streamAllClassesInModule(String, Predicate, Predicate)
+	 */
+	public static Stream<Class<?>> streamAllClassesInModule(String moduleName, Predicate<Class<?>> classFilter,
+			Predicate<String> classNameFilter) {
+		return streamAllClassesInModule(moduleName, ClassFilter.of(classNameFilter, classFilter));
+	}
+
 	/**
 	 * @since 1.1.1
 	 */
@@ -1037,6 +1079,13 @@ public static List<Class<?>> findAllClassesInModule(String moduleName, ClassFilt
 		return Collections.unmodifiableList(ModuleUtils.findAllClassesInModule(moduleName, classFilter));
 	}
 
+	/**
+	 * @since 1.10
+	 */
+	public static Stream<Class<?>> streamAllClassesInModule(String moduleName, ClassFilter classFilter) {
+		return findAllClassesInModule(moduleName, classFilter).stream();
+	}
+
 	/**
 	 * @see org.junit.platform.commons.support.ReflectionSupport#findNestedClasses(Class, Predicate)
 	 */
@@ -1049,6 +1098,15 @@ public static List<Class<?>> findNestedClasses(Class<?> clazz, Predicate<Class<?
 		return Collections.unmodifiableList(new ArrayList<>(candidates));
 	}
 
+	/**
+	 * since 1.10
+	 * @see org.junit.platform.commons.support.ReflectionSupport#findNestedClasses(Class, Predicate)
+	 * @see org.junit.platform.commons.support.ReflectionSupport#streamNestedClasses(Class, Predicate)
+	 */
+	public static Stream<Class<?>> streamNestedClasses(Class<?> clazz, Predicate<Class<?>> predicate) {
+		return findNestedClasses(clazz, predicate).stream();
+	}
+
 	private static void findNestedClasses(Class<?> clazz, Predicate<Class<?>> predicate, Set<Class<?>> candidates) {
 		if (!isSearchable(clazz)) {
 			return;
@@ -1178,20 +1236,25 @@ public static List<Constructor<?>> findConstructors(Class<?> clazz, Predicate<Co
 
 	/**
 	 * @see org.junit.platform.commons.support.ReflectionSupport#findFields(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
+	 * @see org.junit.platform.commons.support.ReflectionSupport#streamFields(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
 	 */
 	public static List<Field> findFields(Class<?> clazz, Predicate<Field> predicate,
 			HierarchyTraversalMode traversalMode) {
+		return streamFields(clazz, predicate, traversalMode).collect(toUnmodifiableList());
+	}
+
+	/**
+	 * @since 1.10
+	 * @see org.junit.platform.commons.support.ReflectionSupport#streamFields(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
+	 */
+	public static Stream<Field> streamFields(Class<?> clazz, Predicate<Field> predicate,
+			HierarchyTraversalMode traversalMode) {
 
 		Preconditions.notNull(clazz, "Class must not be null");
 		Preconditions.notNull(predicate, "Predicate must not be null");
 		Preconditions.notNull(traversalMode, "HierarchyTraversalMode must not be null");
 
-		// @formatter:off
-		return findAllFieldsInHierarchy(clazz, traversalMode).stream()
-				.filter(predicate)
-				// unmodifiable since returned by public, non-internal method(s)
-				.collect(toUnmodifiableList());
-		// @formatter:on
+		return findAllFieldsInHierarchy(clazz, traversalMode).stream().filter(predicate);
 	}
 
 	private static List<Field> findAllFieldsInHierarchy(Class<?> clazz, HierarchyTraversalMode traversalMode) {
@@ -1407,10 +1470,21 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 
 	/**
 	 * @see org.junit.platform.commons.support.ReflectionSupport#findMethods(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
+	 * @see org.junit.platform.commons.support.ReflectionSupport#streamMethods(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
 	 */
 	public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predicate,
 			HierarchyTraversalMode traversalMode) {
 
+		return streamMethods(clazz, predicate, traversalMode).collect(toUnmodifiableList());
+	}
+
+	/**
+	 * @since 1.10
+	 * @see org.junit.platform.commons.support.ReflectionSupport#streamMethods(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
+	 */
+	public static Stream<Method> streamMethods(Class<?> clazz, Predicate<Method> predicate,
+			HierarchyTraversalMode traversalMode) {
+
 		Preconditions.notNull(clazz, "Class must not be null");
 		Preconditions.notNull(predicate, "Predicate must not be null");
 		Preconditions.notNull(traversalMode, "HierarchyTraversalMode must not be null");
@@ -1418,9 +1492,7 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 		// @formatter:off
 		return findAllMethodsInHierarchy(clazz, traversalMode).stream()
 				.filter(predicate)
-				.distinct()
-				// unmodifiable since returned by public, non-internal method(s)
-				.collect(toUnmodifiableList());
+				.distinct();
 		// @formatter:on
 	}
 

From d7a52e37ff72339b3ced1860f28dd1cb6f89c768 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Fri, 16 Dec 2022 17:33:36 +0100
Subject: [PATCH 1008/1433] Edit comments and release notes added in #3084

---
 .../release-notes-5.10.0-M1.adoc              |  3 ++-
 .../commons/support/ReflectionSupport.java    | 20 ++++++++++---------
 .../commons/util/ReflectionUtils.java         |  3 ---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 13d2fac24501..bac9bd3832a1 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -26,7 +26,8 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
-*  All utility methods from `ReflectionSupport` now have counterparts returning `Stream` instead of `List`
+* All utility methods from `ReflectionSupport` now have counterparts returning `Stream`
+  instead of `List`.
 
 [[release-notes-5.10.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
index f8265680b2b0..6a292eb6789c 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
@@ -130,8 +130,8 @@ public static List<Class<?>> findAllClassesInClasspathRoot(URI root, Predicate<C
 	 * @return a stream of all such classes found; never {@code null}
 	 * but potentially empty
 	 * @since 1.10
-	 * @see #findAllClassesInPackage(String, Predicate, Predicate)
-	 * @see #findAllClassesInModule(String, Predicate, Predicate)
+	 * @see #streamAllClassesInPackage(String, Predicate, Predicate)
+	 * @see #streamAllClassesInModule(String, Predicate, Predicate)
 	 */
 	@API(status = MAINTAINED, since = "1.10")
 	public static Stream<Class<?>> streamAllClassesInClasspathRoot(URI root, Predicate<Class<?>> classFilter,
@@ -180,8 +180,8 @@ public static List<Class<?>> findAllClassesInPackage(String basePackageName, Pre
 	 * @return a stream of all such classes found; never {@code null}
 	 * but potentially empty
 	 * @since 1.10
-	 * @see #findAllClassesInClasspathRoot(URI, Predicate, Predicate)
-	 * @see #findAllClassesInModule(String, Predicate, Predicate)
+	 * @see #streamAllClassesInClasspathRoot(URI, Predicate, Predicate)
+	 * @see #streamAllClassesInModule(String, Predicate, Predicate)
 	 */
 	@API(status = MAINTAINED, since = "1.10")
 	public static Stream<Class<?>> streamAllClassesInPackage(String basePackageName, Predicate<Class<?>> classFilter,
@@ -229,8 +229,8 @@ public static List<Class<?>> findAllClassesInModule(String moduleName, Predicate
 	 * @return a stream of all such classes found; never {@code null}
 	 * but potentially empty
 	 * @since 1.10
-	 * @see #findAllClassesInClasspathRoot(URI, Predicate, Predicate)
-	 * @see #findAllClassesInPackage(String, Predicate, Predicate)
+	 * @see #streamAllClassesInClasspathRoot(URI, Predicate, Predicate)
+	 * @see #streamAllClassesInPackage(String, Predicate, Predicate)
 	 */
 	@API(status = MAINTAINED, since = "1.10")
 	public static Stream<Class<?>> streamAllClassesInModule(String moduleName, Predicate<Class<?>> classFilter,
@@ -322,7 +322,9 @@ public static List<Field> findFields(Class<?> clazz, Predicate<Field> predicate,
 	@API(status = MAINTAINED, since = "1.10")
 	public static Stream<Field> streamFields(Class<?> clazz, Predicate<Field> predicate,
 			HierarchyTraversalMode traversalMode) {
+
 		Preconditions.notNull(traversalMode, "HierarchyTraversalMode must not be null");
+
 		return ReflectionUtils.streamFields(clazz, predicate,
 			ReflectionUtils.HierarchyTraversalMode.valueOf(traversalMode.name()));
 	}
@@ -390,7 +392,7 @@ public static Optional<Method> findMethod(Class<?> clazz, String methodName, Cla
 	 * <p>The results will not contain instance methods that are <em>overridden</em>
 	 * or {@code static} methods that are <em>hidden</em>.
 	 *
-	 * <p>If you're are looking for methods annotated with a certain annotation
+	 * <p>If you are looking for methods annotated with a certain annotation
 	 * type, consider using
 	 * {@link AnnotationSupport#findAnnotatedMethods(Class, Class, HierarchyTraversalMode)}.
 	 *
@@ -416,7 +418,7 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 	 * <p>The results will not contain instance methods that are <em>overridden</em>
 	 * or {@code static} methods that are <em>hidden</em>.
 	 *
-	 * <p>If you're are looking for methods annotated with a certain annotation
+	 * <p>If you are looking for methods annotated with a certain annotation
 	 * type, consider using
 	 * {@link AnnotationSupport#findAnnotatedMethods(Class, Class, HierarchyTraversalMode)}.
 	 *
@@ -424,8 +426,8 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 	 * @param predicate the method filter; never {@code null}
 	 * @param traversalMode the hierarchy traversal mode; never {@code null}
 	 * @return a stream of all such methods found; never {@code null}
-	 * @since 1.10
 	 * but potentially empty
+	 * @since 1.10
 	 */
 	@API(status = MAINTAINED, since = "1.10")
 	public static Stream<Method> streamMethods(Class<?> clazz, Predicate<Method> predicate,
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index e1b54cb65286..927dfa7929f4 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -1100,7 +1100,6 @@ public static List<Class<?>> findNestedClasses(Class<?> clazz, Predicate<Class<?
 
 	/**
 	 * since 1.10
-	 * @see org.junit.platform.commons.support.ReflectionSupport#findNestedClasses(Class, Predicate)
 	 * @see org.junit.platform.commons.support.ReflectionSupport#streamNestedClasses(Class, Predicate)
 	 */
 	public static Stream<Class<?>> streamNestedClasses(Class<?> clazz, Predicate<Class<?>> predicate) {
@@ -1236,7 +1235,6 @@ public static List<Constructor<?>> findConstructors(Class<?> clazz, Predicate<Co
 
 	/**
 	 * @see org.junit.platform.commons.support.ReflectionSupport#findFields(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
-	 * @see org.junit.platform.commons.support.ReflectionSupport#streamFields(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
 	 */
 	public static List<Field> findFields(Class<?> clazz, Predicate<Field> predicate,
 			HierarchyTraversalMode traversalMode) {
@@ -1470,7 +1468,6 @@ public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predica
 
 	/**
 	 * @see org.junit.platform.commons.support.ReflectionSupport#findMethods(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
-	 * @see org.junit.platform.commons.support.ReflectionSupport#streamMethods(Class, Predicate, org.junit.platform.commons.support.HierarchyTraversalMode)
 	 */
 	public static List<Method> findMethods(Class<?> clazz, Predicate<Method> predicate,
 			HierarchyTraversalMode traversalMode) {

From ce3e79239df781f58aaf9db31043df579acc9e4d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 13:42:02 +0100
Subject: [PATCH 1009/1433] Use Foojay resolver plugin for JDK
 auto-provisioning

Apple Silicon compatible JDKs (and others) can now be provisioned
automatically by Gradle.
---
 README.md           | 8 --------
 settings.gradle.kts | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 3ad848a48ac6..ecf74ef5e4d5 100644
--- a/README.md
+++ b/README.md
@@ -65,10 +65,6 @@ task outputs from previous CI builds.
 You need [JDK 17] to build JUnit 5. [Gradle toolchains] are used to detect and
 potentially download additional JDKs for compilation and test execution.
 
-Note: If you're working on a machine with an Apple Silicon processor, you'll need to
-download and install a JDK 8 distribution manually (or via [SDKMAN!] or [asdf]) --
-for example, one from [Zulu] or [Liberica].
-
 All modules can be _built_ with the [Gradle Wrapper] using the following command.
 
 `gradlew clean assemble`
@@ -96,7 +92,6 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 <https://oss.sonatype.org/content/repositories/snapshots/org/junit/> for snapshots.
 
 
-[asdf]: https://asdf-vm.com/
 [Codecov]: https://codecov.io/gh/junit-team/junit5
 [CONTRIBUTING.md]: https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md
 [Dependency Metadata]: https://junit.org/junit5/docs/current/user-guide/#dependency-metadata
@@ -106,10 +101,7 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 [JaCoCo]: https://www.eclemma.org/jacoco/
 [Javadoc]: https://junit.org/junit5/docs/current/api/
 [JDK 17]: https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot
-[Liberica]: https://bell-sw.com/pages/downloads/
 [Release Notes]: https://junit.org/junit5/docs/current/release-notes/
 [Samples]: https://github.com/junit-team/junit5-samples
-[SDKMAN!]: https://sdkman.io/jdks
 [StackOverflow]: https://stackoverflow.com/questions/tagged/junit5
 [User Guide]: https://junit.org/junit5/docs/current/user-guide/
-[Zulu]: https://www.azul.com/downloads/?version=java-8-lts&os=macos&architecture=arm-64-bit&package=jdk#download-openjdk
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f87f2924fec1..d0b5ca113862 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,6 +7,7 @@ pluginManagement {
 	plugins {
 		id("com.gradle.enterprise") version "3.11.2" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
+		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
@@ -21,6 +22,7 @@ pluginManagement {
 plugins {
 	id("com.gradle.enterprise")
 	id("com.gradle.common-custom-user-data-gradle-plugin")
+	id("org.gradle.toolchains.foojay-resolver-convention")
 }
 
 dependencyResolutionManagement {

From 5e853e3d139b1bccd977014d04ce5dd77c4a518e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 13:42:22 +0100
Subject: [PATCH 1010/1433] Simplify recommended Gradle commands

---
 README.md | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index ecf74ef5e4d5..9834087675fa 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ builds of the next OpenJDK.
 Code coverage using [JaCoCo] for the latest build is available on [Codecov].
 
 A code coverage report can also be generated locally via the [Gradle Wrapper] by
-executing `gradlew -PenableJaCoCo clean jacocoRootReport`. The results will be available
+executing `./gradlew -PenableJaCoCo clean jacocoRootReport`. The results will be available
 in `build/reports/jacoco/jacocoRootReport/html/index.html`.
 
 ## Gradle Enterprise
@@ -65,23 +65,16 @@ task outputs from previous CI builds.
 You need [JDK 17] to build JUnit 5. [Gradle toolchains] are used to detect and
 potentially download additional JDKs for compilation and test execution.
 
-All modules can be _built_ with the [Gradle Wrapper] using the following command.
+All modules can be _built_ and _tested_ with the [Gradle Wrapper] using the following command.
 
-`gradlew clean assemble`
-
-All modules can be _tested_ with the [Gradle Wrapper] using the following command.
-
-`gradlew clean test`
-
-Since Gradle has excellent incremental build support, you can usually omit executing the
-`clean` task.
+`./gradlew build`
 
 ## Installing in Local Maven Repository
 
 All modules can be _installed_ with the [Gradle Wrapper] in a local Maven repository for
 consumption in other projects via the following command.
 
-`gradlew clean publishToMavenLocal`
+`./gradlew publishToMavenLocal`
 
 ## Dependency Metadata
 
@@ -100,7 +93,7 @@ See also <https://repo1.maven.org/maven2/org/junit/> for releases and
 [Gradle Wrapper]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:using_wrapper
 [JaCoCo]: https://www.eclemma.org/jacoco/
 [Javadoc]: https://junit.org/junit5/docs/current/api/
-[JDK 17]: https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot
+[JDK 17]: https://foojay.io/almanac/java-17/
 [Release Notes]: https://junit.org/junit5/docs/current/release-notes/
 [Samples]: https://github.com/junit-team/junit5-samples
 [StackOverflow]: https://stackoverflow.com/questions/tagged/junit5

From 324802d8d0e189a4bddac5a2f93e4c52d2431f5b Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Fri, 30 Dec 2022 15:49:13 +0100
Subject: [PATCH 1011/1433] Limit max pool size for parallel execution via
 config param (#3044)

JUnit Jupiter (and The JUnit Platform) now support limiting the maximum
number of concurrently executing tests via the
`junit.jupiter.execution.parallel.config.fixed.max-pool-size`
configuration parameter.

With Java 9+ the `ForkJoinPool` used by JUnit can be configured with a
maximum pool size. While the number of concurrently executing tests may
exceed the configured parallelism when tests become blocked, it will
not exceed the maximum pool size.

Additionally, because the `ForkJoinPool` will by default reject tasks
that would exceed the maximum pool size the
`junit.jupiter.execution.parallel.config.fixed.saturate` property has
been added and will default to `true`. There appears to be no reason to
ever set this `false` but it is there should someone depend on the old
behavior.

These changes were intentionally not made to the `dynamic` strategy to
limit the scope of this pull request. While I can reasonably predict
what behavior users of the `fixed` strategy might expect, I can not say
the same about the `dynamic` strategy.

Fixes #3026.
Fixes #2545.
Fixes #1858.
---
 .../release-notes-5.10.0-M1.adoc              |  9 +++-
 .../asciidoc/user-guide/writing-tests.adoc    | 32 ++++++++++----
 .../org/junit/jupiter/engine/Constants.java   | 36 ++++++++++++++++
 ...DefaultParallelExecutionConfiguration.java | 11 ++++-
 ...arallelExecutionConfigurationStrategy.java | 42 +++++++++++++++++--
 ...elExecutionConfigurationStrategyTests.java | 24 +++++++----
 6 files changed, 133 insertions(+), 21 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index bac9bd3832a1..690ad04a7f4b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -26,6 +26,8 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
+* Support for limiting the `max-pool-size` for parallel execution via a configuration parameter
+
 * All utility methods from `ReflectionSupport` now have counterparts returning `Stream`
   instead of `List`.
 
@@ -38,10 +40,15 @@ repository on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* The `fixed` parallel execution strategy now allows the thread pool to be saturated by
+  default.
 
 ==== New Features and Improvements
 
+* New `junit.jupiter.execution.parallel.config.fixed.max-pool-size` configuration
+  parameter to set the maximum pool size.
+* New `junit.jupiter.execution.parallel.config.fixed.saturate` configuration
+  parameter to disable pool saturation.
 * New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
   `@ParameterizedTest` invocation.
 * `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 64f8be9e1af0..b3e1dd56d832 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2347,6 +2347,8 @@ configuration parameter to one of the following options.
 `fixed`::
   Uses the mandatory `junit.jupiter.execution.parallel.config.fixed.parallelism`
   configuration parameter as the desired parallelism.
+  The optional `junit.jupiter.execution.parallel.config.fixed.max-pool-size`
+  configuration parameter can be used to limit the maximum number of threads.
 
 `custom`::
   Allows you to specify a custom `{ParallelExecutionConfigurationStrategy}`
@@ -2357,13 +2359,15 @@ If no configuration strategy is set, JUnit Jupiter uses the `dynamic` configurat
 strategy with a factor of `1`. Consequently, the desired parallelism will be equal to the
 number of available processors/cores.
 
-.Parallelism does not imply maximum number of concurrent threads
-NOTE: JUnit Jupiter does not guarantee that the number of concurrently executing tests
-will not exceed the configured parallelism. For example, when using one of the
-synchronization mechanisms described in the next section, the `ForkJoinPool` that is used
-behind the scenes may spawn additional threads to ensure execution continues with
-sufficient parallelism. Thus, if you require such guarantees in a test class, please use
-your own means of controlling concurrency.
+.Parallelism alone does not imply maximum number of concurrent threads
+NOTE: By default JUnit Jupiter does not guarantee that the number of concurrently
+executing tests will not exceed the configured parallelism. For example, when using one
+of the synchronization mechanisms described in the next section, the `ForkJoinPool` that
+is used behind the scenes may spawn additional threads to ensure execution continues with
+sufficient parallelism.
+If you require such guarantees, with Java 9+, it is possible to limit the maximum number
+of concurrent threads by controlling the maximum pool size of the `fixed` and `custom`
+strategies.
 
 [[writing-tests-parallel-execution-config-properties]]
 ===== Relevant properties
@@ -2415,6 +2419,20 @@ The following table lists relevant properties for configuring parallel execution
 | a positive integer
 | no default value
 
+| ```junit.jupiter.execution.parallel.config.fixed.max-pool-size```
+| Desired maximum pool size of the underlying fork-join pool for the ```fixed```
+  configuration strategy
+| a positive integer, must greater than or equal to `junit.jupiter.execution.parallel.config.fixed.parallelism`
+| 256 + the value of `junit.jupiter.execution.parallel.config.fixed.parallelism`
+
+| ```junit.jupiter.execution.parallel.config.fixed.saturate```
+| Disable saturation of the underlying fork-join pool for the ```fixed``` configuration
+  strategy
+|
+  * `true`
+  * `false`
+| ```true```
+
 | ```junit.jupiter.execution.parallel.config.custom.class```
 | Fully qualified class name of the _ParallelExecutionConfigurationStrategy_ to be
   used for the ```custom``` configuration strategy
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index b68a9bdbb2ba..074a2569b307 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -15,7 +15,9 @@
 import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.engine.support.hierarchical.DefaultParallelExecutionConfigurationStrategy.CONFIG_CUSTOM_CLASS_PROPERTY_NAME;
 import static org.junit.platform.engine.support.hierarchical.DefaultParallelExecutionConfigurationStrategy.CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME;
+import static org.junit.platform.engine.support.hierarchical.DefaultParallelExecutionConfigurationStrategy.CONFIG_FIXED_MAX_POOL_SIZE_PROPERTY_NAME;
 import static org.junit.platform.engine.support.hierarchical.DefaultParallelExecutionConfigurationStrategy.CONFIG_FIXED_PARALLELISM_PROPERTY_NAME;
+import static org.junit.platform.engine.support.hierarchical.DefaultParallelExecutionConfigurationStrategy.CONFIG_FIXED_SATURATE_PROPERTY_NAME;
 import static org.junit.platform.engine.support.hierarchical.DefaultParallelExecutionConfigurationStrategy.CONFIG_STRATEGY_PROPERTY_NAME;
 
 import org.apiguardian.api.API;
@@ -166,6 +168,40 @@ public final class Constants {
 	public static final String PARALLEL_CONFIG_FIXED_PARALLELISM_PROPERTY_NAME = PARALLEL_CONFIG_PREFIX
 			+ CONFIG_FIXED_PARALLELISM_PROPERTY_NAME;
 
+	/**
+	 * Property name used to configure the maximum pool size of the underlying
+	 * fork-join pool for the {@code fixed} configuration strategy: {@value}
+	 *
+	 * <p>Value must be an integer and greater than or equal to
+	 * {@value #PARALLEL_CONFIG_FIXED_PARALLELISM_PROPERTY_NAME}; defaults to
+	 * {@code 256 + fixed.parallelism}.
+	 *
+	 * <p>Note: This property only takes affect on Java 9+.
+	 *
+	 * @since 5.10
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
+	public static final String PARALLEL_CONFIG_FIXED_MAX_POOL_SIZE_PROPERTY_NAME = PARALLEL_CONFIG_PREFIX
+			+ CONFIG_FIXED_MAX_POOL_SIZE_PROPERTY_NAME;
+
+	/**
+	 * Property name used to disable saturation of the underlying fork-join pool
+	 * for the {@code fixed} configuration strategy: {@value}
+	 *
+	 * <p>When set to {@code false} the underlying fork-join pool will reject
+	 * additional tasks if all available workers are busy and the maximum
+	 * pool-size would be exceeded.
+
+	 * <p>Value must either {@code true} or {@code false}; defaults to {@code true}.
+	 *
+	 * <p>Note: This property only takes affect on Java 9+.
+	 *
+	 * @since 5.10
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
+	public static final String PARALLEL_CONFIG_FIXED_SATURATE_PROPERTY_NAME = PARALLEL_CONFIG_PREFIX
+			+ CONFIG_FIXED_SATURATE_PROPERTY_NAME;
+
 	/**
 	 * Property name used to set the factor to be multiplied with the number of
 	 * available processors/cores to determine the desired parallelism for the
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
index 961f7d727f64..d2413bb2742a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
@@ -10,6 +10,9 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
+import java.util.concurrent.ForkJoinPool;
+import java.util.function.Predicate;
+
 /**
  * @since 1.3
  */
@@ -20,14 +23,16 @@ class DefaultParallelExecutionConfiguration implements ParallelExecutionConfigur
 	private final int maxPoolSize;
 	private final int corePoolSize;
 	private final int keepAliveSeconds;
+	private final Predicate<? super ForkJoinPool> saturate;
 
 	DefaultParallelExecutionConfiguration(int parallelism, int minimumRunnable, int maxPoolSize, int corePoolSize,
-			int keepAliveSeconds) {
+			int keepAliveSeconds, Predicate<? super ForkJoinPool> saturate) {
 		this.parallelism = parallelism;
 		this.minimumRunnable = minimumRunnable;
 		this.maxPoolSize = maxPoolSize;
 		this.corePoolSize = corePoolSize;
 		this.keepAliveSeconds = keepAliveSeconds;
+		this.saturate = saturate;
 	}
 
 	@Override
@@ -55,4 +60,8 @@ public int getKeepAliveSeconds() {
 		return keepAliveSeconds;
 	}
 
+	@Override
+	public Predicate<? super ForkJoinPool> getSaturatePredicate() {
+		return saturate;
+	}
 }
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
index 5160e6c796ee..58efdad6f307 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
@@ -42,8 +42,14 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter
 					() -> new JUnitException(String.format("Configuration parameter '%s' must be set",
 						CONFIG_FIXED_PARALLELISM_PROPERTY_NAME)));
 
-			return new DefaultParallelExecutionConfiguration(parallelism, parallelism, 256 + parallelism, parallelism,
-				KEEP_ALIVE_SECONDS);
+			int maxPoolSize = configurationParameters.get(CONFIG_FIXED_MAX_POOL_SIZE_PROPERTY_NAME,
+				Integer::valueOf).orElse(parallelism + 256);
+
+			boolean saturate = configurationParameters.get(CONFIG_FIXED_SATURATE_PROPERTY_NAME,
+				Boolean::valueOf).orElse(true);
+
+			return new DefaultParallelExecutionConfiguration(parallelism, parallelism, maxPoolSize, parallelism,
+				KEEP_ALIVE_SECONDS, __ -> saturate);
 		}
 	},
 
@@ -66,7 +72,7 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter
 				factor.multiply(BigDecimal.valueOf(Runtime.getRuntime().availableProcessors())).intValue());
 
 			return new DefaultParallelExecutionConfiguration(parallelism, parallelism, 256 + parallelism, parallelism,
-				KEEP_ALIVE_SECONDS);
+				KEEP_ALIVE_SECONDS, null);
 		}
 	},
 
@@ -114,6 +120,36 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter
 	 */
 	public static final String CONFIG_FIXED_PARALLELISM_PROPERTY_NAME = "fixed.parallelism";
 
+	/**
+	 * Property name used to configure the maximum pool size of the underlying
+	 * fork-join pool for the {@link #FIXED} configuration strategy.
+	 *
+	 * <p>Value must be an integer and greater than or equal to
+	 * {@value #CONFIG_FIXED_PARALLELISM_PROPERTY_NAME}; defaults to
+	 * {@code 256 + fixed.parallelism}.
+	 *
+	 * @since 1.10
+	 * @see #FIXED
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static final String CONFIG_FIXED_MAX_POOL_SIZE_PROPERTY_NAME = "fixed.max-pool-size";
+
+	/**
+	 * Property name used to disable saturation of the underlying fork-join pool
+	 * for the {@link #FIXED} configuration strategy.
+	 *
+	 * <p>When set to {@code false} the underlying fork-join pool will reject
+	 * additional tasks if all available workers are busy and the maximum
+	 * pool-size would be exceeded.
+	 * <p>Value must either {@code true} or {@code false}; defaults to {@code true}.
+	 *
+	 * @since 1.10
+	 * @see #FIXED
+	 * @see #CONFIG_FIXED_MAX_POOL_SIZE_PROPERTY_NAME
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static final String CONFIG_FIXED_SATURATE_PROPERTY_NAME = "fixed.saturate";
+
 	/**
 	 * Property name of the factor used to determine the desired parallelism for the
 	 * {@link #DYNAMIC} configuration strategy.
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
index 309dc9d8d473..8df66936a7b1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
@@ -17,8 +17,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.Optional;
-import java.util.concurrent.ForkJoinPool;
-import java.util.function.Predicate;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -51,7 +49,20 @@ void fixedStrategyCreatesValidConfiguration() {
 		assertThat(configuration.getMinimumRunnable()).isEqualTo(42);
 		assertThat(configuration.getMaxPoolSize()).isEqualTo(256 + 42);
 		assertThat(configuration.getKeepAliveSeconds()).isEqualTo(30);
-		assertThat(configuration.getSaturatePredicate()).isNull();
+		assertThat(configuration.getSaturatePredicate().test(null)).isTrue();
+	}
+
+	@Test
+	void fixedSaturateStrategyCreatesValidConfiguration() {
+		when(configParams.get("fixed.parallelism")).thenReturn(Optional.of("42"));
+		when(configParams.get("fixed.max-pool-size")).thenReturn(Optional.of("42"));
+		when(configParams.get("fixed.saturate")).thenReturn(Optional.of("false"));
+
+		ParallelExecutionConfigurationStrategy strategy = DefaultParallelExecutionConfigurationStrategy.FIXED;
+		var configuration = strategy.createConfiguration(configParams);
+		assertThat(configuration.getParallelism()).isEqualTo(42);
+		assertThat(configuration.getMaxPoolSize()).isEqualTo(42);
+		assertThat(configuration.getSaturatePredicate().test(null)).isFalse();
 	}
 
 	@Test
@@ -183,12 +194,7 @@ void customStrategyThrowsExceptionWhenClassDoesNotExist() {
 	static class CustomParallelExecutionConfigurationStrategy implements ParallelExecutionConfigurationStrategy {
 		@Override
 		public ParallelExecutionConfiguration createConfiguration(ConfigurationParameters configurationParameters) {
-			return new DefaultParallelExecutionConfiguration(1, 2, 3, 4, 5) {
-				@Override
-				public Predicate<? super ForkJoinPool> getSaturatePredicate() {
-					return __ -> true;
-				}
-			};
+			return new DefaultParallelExecutionConfiguration(1, 2, 3, 4, 5, __ -> true);
 		}
 	}
 

From fe1997419d4fd5b0424a5e992a26f1826d2250c2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 16:12:57 +0100
Subject: [PATCH 1012/1433] Update Gradle Enterprise plugin to 3.12.1

The Gradle Enterprise plugin now includes test retry functionality so
the Test Retry plugin is removed to avoid conflict.

Closes #3113.
Closes #3114.
---
 buildSrc/build.gradle.kts                               | 3 +--
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 2 +-
 settings.gradle.kts                                     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 1d96984da57c..24951abd3b60 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,8 +15,7 @@ dependencies {
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.11.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.42.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-	implementation("org.gradle:test-retry-gradle-plugin:1.4.1")
-	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.11.2") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.1") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index 983883983ef9..d5a105f8a462 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -1,10 +1,10 @@
+import com.gradle.enterprise.gradleplugin.testretry.retry
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
 	`java-library`
-	id("org.gradle.test-retry")
 }
 
 tasks.withType<Test>().configureEach {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d0b5ca113862..91c857de5aa2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.11.2" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise") version "3.12.1" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"

From 25940207e98e9b75cfe4e1b3ca5fce199d3d11d4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 17:09:06 +0100
Subject: [PATCH 1013/1433] Update dependencies

---
 buildSrc/build.gradle.kts |  2 +-
 gradle/libs.versions.toml | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 24951abd3b60..264ec0670c53 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
 	implementation(kotlin("gradle-plugin"))
-	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.3.1")
+	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.11.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.42.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5a54da32ab60..a7b913277885 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ asciidoctor-pdf = "1.5.3"
 assertj = "3.23.1"
 checkstyle = "9.0"
 jacoco = "0.8.7"
-jmh = "1.35"
+jmh = "1.36"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
@@ -21,30 +21,30 @@ ant = { module = "org.apache.ant:ant", version.ref = "ant" }
 ant-junit = { module = "org.apache.ant:ant-junit", version.ref = "ant" }
 ant-junitlauncher = { module = "org.apache.ant:ant-junitlauncher", version.ref = "ant" }
 apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apiguardian" }
-archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.0.0" }
+archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.0.1" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
-bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.3.1" }
-classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.149" }
+bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.4.0" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.153" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
-groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.5" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.7" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
-joox = { module = "org.jooq:joox", version = "1.6.2" }
+joox = { module = "org.jooq:joox", version = "2.0.0" }
 junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.13.2" } }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.8.6" }
-mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.8.0" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.11.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }
-picocli = { module = "info.picocli:picocli", version = "4.6.3" }
-slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.3" }
+picocli = { module = "info.picocli:picocli", version = "4.7.0" }
+slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.6" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }

From 1f116a18c4e6bcedcaf51a6d5addbbf80aa4eb32 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 19:09:52 +0100
Subject: [PATCH 1014/1433] Fix Asciidoctor syntax

---
 .../src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index b39189182338..927d2596c9c8 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -43,7 +43,7 @@ JUnit repository on GitHub.
 * ❓
 
 
-= [[release-notes-5.9.2-junit-vintage]]
+[[release-notes-5.9.2-junit-vintage]]
 === JUnit Vintage
 
 ==== Bug Fixes

From fff8319e82c7b8062e36997dbf71b0352880da6a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 19:12:00 +0100
Subject: [PATCH 1015/1433] Update security policy

---
 SECURITY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 0e51f7ff7479..fca52da512fa 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,8 +4,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 5.7.x   | :white_check_mark: |
-| < 5.7   | :x:                |
+| 5.9.x   | :white_check_mark: |
+| < 5.9   | :x:                |
 
 ## Reporting a Vulnerability
 

From 1e819d667787a47e75620db561c89392fc82bbfc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 19:37:15 +0100
Subject: [PATCH 1016/1433] Simplify access to JavaToolchainService

---
 junit-platform-commons/junit-platform-commons.gradle.kts        | 2 +-
 junit-platform-console/junit-platform-console.gradle.kts        | 2 +-
 junit-platform-jfr/junit-platform-jfr.gradle.kts                | 2 +-
 junit-vintage-engine/junit-vintage-engine.gradle.kts            | 2 +-
 .../platform-tooling-support-tests.gradle.kts                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 7856ccd8fc78..393d655e86d7 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -19,7 +19,7 @@ tasks.jar {
 	val release9ClassesDir = sourceSets.mainRelease9.get().output.classesDirs.singleFile
 	inputs.dir(release9ClassesDir).withPathSensitivity(PathSensitivity.RELATIVE)
 	doLast(objects.newInstance(ExecJarAction::class).apply {
-		javaLauncher.set(project.the<JavaToolchainService>().launcherFor(java.toolchain))
+		javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
 		args.addAll(
 			"--update",
 			"--file", archiveFile.get().asFile.absolutePath,
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 05489f3857a4..6006a8c880af 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -39,7 +39,7 @@ tasks {
 		}
 		from(sourceSets.mainRelease9.get().output.classesDirs)
 		doLast(objects.newInstance(org.junit.gradle.java.ExecJarAction::class).apply {
-			javaLauncher.set(project.the<JavaToolchainService>().launcherFor(java.toolchain))
+			javaLauncher.set(project.javaToolchains.launcherFor(java.toolchain))
 			args.addAll(
 				"--update",
 				"--file", archiveFile.get().asFile.absolutePath,
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index 4bf6d89688d8..00198d86a540 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -21,7 +21,7 @@ javaLibrary {
 
 tasks {
 	compileJava {
-		javaCompiler.set(project.the<JavaToolchainService>().compilerFor {
+		javaCompiler.set(project.javaToolchains.compilerFor {
 			languageVersion.set(JavaLanguageVersion.of(8))
 		})
 	}
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 0bb61a54d686..b92fffa50337 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
 
 tasks {
 	compileTestFixturesGroovy {
-		javaLauncher.set(project.the<JavaToolchainService>().launcherFor {
+		javaLauncher.set(project.javaToolchains.launcherFor {
 			// Groovy 2.x (used for Spock tests) does not support current JDKs
 			languageVersion.set(JavaLanguageVersion.of(8))
 		})
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index e3c28c4c8429..7796f6f7475d 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -128,7 +128,7 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 	val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
 			.value(project.provider {
 				try {
-					project.the<JavaToolchainService>().launcherFor {
+					project.javaToolchains.launcherFor {
 						languageVersion.set(JavaLanguageVersion.of(version))
 					}.get()
 				} catch (e: NoToolchainAvailableException) {

From 22fe4a9776898a9b1bdb19ce227eecb685db6d47 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 1 Jan 2023 16:44:01 +0100
Subject: [PATCH 1017/1433] Add JRE.JAVA_21 (#3119)

Additionally, add coverage for running on JDK 21-ea.
---
 .github/workflows/cross-version.yml           |  2 +-
 .../release-notes/release-notes-5.9.2.adoc    |  2 +-
 gradle.properties                             |  2 +-
 .../org/junit/jupiter/api/condition/JRE.java  | 12 ++-
 .../DisabledForJreRangeConditionTests.java    |  6 +-
 .../DisabledForJreRangeIntegrationTests.java  |  3 +-
 .../DisabledOnJreConditionTests.java          | 15 +++-
 .../DisabledOnJreIntegrationTests.java        | 12 ++-
 .../EnabledForJreRangeConditionTests.java     |  6 +-
 .../EnabledForJreRangeIntegrationTests.java   |  5 +-
 .../condition/EnabledOnJreConditionTests.java | 15 +++-
 .../EnabledOnJreIntegrationTests.java         | 15 +++-
 .../junit/jupiter/api/condition/JRETests.java | 77 ++++---------------
 13 files changed, 90 insertions(+), 82 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 24cd9fee5da4..b1bd27ed0efb 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -19,7 +19,7 @@ jobs:
   openjdk:
     strategy:
       matrix:
-        jdk: [19, 20]
+        jdk: [19, 20, 21]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index 927d2596c9c8..488d8e761f62 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -40,7 +40,7 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* `JAVA_21` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-5.9.2-junit-vintage]]
diff --git a/gradle.properties b/gradle.properties
index 9677b589bc3f..1a6d11cf2f54 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19,JDK20
+org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19,JDK20,JDK21
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index 6e7150ec56f3..10ec0d5f4284 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -138,12 +138,20 @@ public enum JRE {
 	@API(status = STABLE, since = "5.9")
 	JAVA_20,
 
+	/**
+	 * Java 20.
+	 *
+	 * @since 5.9.2
+	 */
+	@API(status = STABLE, since = "5.9.2")
+	JAVA_21,
+
 	/**
 	 * A JRE version other than {@link #JAVA_8}, {@link #JAVA_9},
 	 * {@link #JAVA_10}, {@link #JAVA_11}, {@link #JAVA_12},
 	 * {@link #JAVA_13}, {@link #JAVA_14}, {@link #JAVA_15},
 	 * {@link #JAVA_16}, {@link #JAVA_17}, {@link #JAVA_18},
-	 * {@link #JAVA_19}, or {@link #JAVA_20}.
+	 * {@link #JAVA_19}, {@link #JAVA_20}, or {@link #JAVA_21}.
 	 */
 	OTHER;
 
@@ -197,6 +205,8 @@ private static JRE determineCurrentVersion() {
 					return JAVA_19;
 				case 20:
 					return JAVA_20;
+				case 21:
+					return JAVA_21;
 				default:
 					return OTHER;
 			}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index c4a4d8dc7275..dbc8d674eba1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -113,8 +114,9 @@ void javaMin18() {
 	@Test
 	void other() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()));
+		assertDisabledOnCurrentJreIf(
+			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index d05c043ecf78..2901dbaf001e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
@@ -82,7 +83,7 @@ void javaMin18() {
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index 187f763fad94..11a330fa1d4d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -196,14 +197,24 @@ void java20() {
 		assertDisabledOnCurrentJreIf(onJava20());
 	}
 
+	/**
+	 * @see DisabledOnJreIntegrationTests#java21()
+	 */
+	@Test
+	void java21() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(onJava21());
+	}
+
 	/**
 	 * @see DisabledOnJreIntegrationTests#other()
 	 */
 	@Test
 	void other() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()));
+		assertDisabledOnCurrentJreIf(
+			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 42c24ddbf5e1..4df14f6a612b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -37,6 +38,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.JAVA_20;
+import static org.junit.jupiter.api.condition.JRE.JAVA_21;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -64,7 +66,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@DisabledOnJre(value = { JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17,
-			JAVA_18, JAVA_19, JAVA_20, OTHER }, disabledReason = "Disabled on every JRE")
+			JAVA_18, JAVA_19, JAVA_20, JAVA_21, OTHER }, disabledReason = "Disabled on every JRE")
 	void disabledOnAllJavaVersions() {
 		fail("should be disabled");
 	}
@@ -147,11 +149,17 @@ void java20() {
 		assertFalse(onJava20());
 	}
 
+	@Test
+	@DisabledOnJre(JAVA_21)
+	void java21() {
+		assertFalse(onJava21());
+	}
+
 	@Test
 	@DisabledOnJre(OTHER)
 	void other() {
 		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 9d5e506c30f0..2d07d65284f8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -112,8 +113,9 @@ void javaMin18() {
 	@Test
 	void other() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()));
+		assertEnabledOnCurrentJreIf(
+			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()));
 	}
 
 	private void assertEnabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index d3900f82899e..cd2295aca560 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
@@ -77,7 +78,7 @@ void javaMax18() {
 	@Test
 	@EnabledForJreRange(min = JAVA_18)
 	void javaMin18() {
-		assertTrue(onJava18() || onJava19() || onJava20());
+		assertTrue(onJava18() || onJava19() || onJava20() || onJava21());
 		assertFalse(onJava17());
 	}
 
@@ -85,7 +86,7 @@ void javaMin18() {
 	@EnabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index e2f217f118d3..0c1973cf1eb4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -195,14 +196,24 @@ void java20() {
 		assertEnabledOnCurrentJreIf(onJava20());
 	}
 
+	/**
+	 * @see EnabledOnJreIntegrationTests#java21()
+	 */
+	@Test
+	void java21() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(onJava21());
+	}
+
 	/**
 	 * @see EnabledOnJreIntegrationTests#other()
 	 */
 	@Test
 	void other() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()));
+		assertEnabledOnCurrentJreIf(
+			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()));
 		assertCustomDisabledReasonIs("Disabled on almost every JRE");
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index 7ba00a917fc4..5a44a77f9265 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.JAVA_20;
+import static org.junit.jupiter.api.condition.JRE.JAVA_21;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -52,7 +53,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17, JAVA_18,
-			JAVA_19, JAVA_20, OTHER })
+			JAVA_19, JAVA_20, JAVA_21, OTHER })
 	void enabledOnAllJavaVersions() {
 	}
 
@@ -134,11 +135,17 @@ void java20() {
 		assertTrue(onJava20());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_21)
+	void java21() {
+		assertTrue(onJava21());
+	}
+
 	@Test
 	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
 	void other() {
 		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20());
+				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21());
 	}
 
 	static boolean onJava8() {
@@ -193,4 +200,8 @@ static boolean onJava20() {
 		return JAVA_VERSION.startsWith("20");
 	}
 
+	static boolean onJava21() {
+		return JAVA_VERSION.startsWith("21");
+	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
index da6d7d4db6ce..9587ad3ee778 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
@@ -11,18 +11,11 @@
 package org.junit.jupiter.api.condition;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.condition.JRE.JAVA_10;
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-import static org.junit.jupiter.api.condition.JRE.JAVA_12;
-import static org.junit.jupiter.api.condition.JRE.JAVA_13;
-import static org.junit.jupiter.api.condition.JRE.JAVA_14;
-import static org.junit.jupiter.api.condition.JRE.JAVA_15;
-import static org.junit.jupiter.api.condition.JRE.JAVA_16;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-import static org.junit.jupiter.api.condition.JRE.JAVA_9;
+import static org.junit.jupiter.api.condition.JRE.JAVA_20;
+import static org.junit.jupiter.api.condition.JRE.JAVA_21;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
 
 import org.junit.jupiter.api.Test;
@@ -34,60 +27,6 @@
  */
 public class JRETests {
 
-	@Test
-	@EnabledOnJre(JAVA_8)
-	void java8() {
-		assertEquals(JAVA_8, JRE.currentVersion());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_9)
-	void java9() {
-		assertEquals(JAVA_9, JRE.currentVersion());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_10)
-	void java10() {
-		assertEquals(JAVA_10, JRE.currentVersion());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_11)
-	void java11() {
-		assertEquals(JAVA_11, JRE.currentVersion());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_12)
-	void java12() {
-		assertEquals(JAVA_12, JRE.currentVersion());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_13)
-	void java13() {
-		assertEquals(JAVA_13, JRE.currentVersion());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_14)
-	void java14() {
-		assertEquals(JAVA_14, JRE.currentVersion());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_15)
-	void java15() {
-		assertEquals(JAVA_15, JRE.currentVersion());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_16)
-	void java16() {
-		assertEquals(JAVA_16, JRE.currentVersion());
-	}
-
 	@Test
 	@EnabledOnJre(JAVA_17)
 	void java17() {
@@ -106,6 +45,18 @@ void java19() {
 		assertEquals(JAVA_19, JRE.currentVersion());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_20)
+	void java20() {
+		assertEquals(JAVA_20, JRE.currentVersion());
+	}
+
+	@Test
+	@EnabledOnJre(JAVA_21)
+	void java21() {
+		assertEquals(JAVA_21, JRE.currentVersion());
+	}
+
 	@Test
 	@EnabledOnJre(OTHER)
 	void other() {

From 7212e5a42dcd5db655d59c4900bb306a4f15a048 Mon Sep 17 00:00:00 2001
From: MartinWitt <wittlinger.martin@gmail.com>
Date: Tue, 3 Jan 2023 08:33:22 +0100
Subject: [PATCH 1018/1433] Make inner class static to avoid code smell (#3123)

---
 .../org/junit/platform/launcher/core/StreamInterceptor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
index 66209be947d6..3c7fdec7e7f2 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
@@ -93,7 +93,7 @@ public void write(byte[] buf, int off, int len) {
 		super.write(buf, off, len);
 	}
 
-	class RewindableByteArrayOutputStream extends ByteArrayOutputStream {
+	static class RewindableByteArrayOutputStream extends ByteArrayOutputStream {
 
 		private final Deque<Integer> markedPositions = new ArrayDeque<>();
 

From 50e097a315737f3ec9963c59f623e5d900e391e6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 16:13:14 +0100
Subject: [PATCH 1019/1433] Move release notes for #3044 to 5.9.2

Closes #2545.
---
 .../asciidoc/release-notes/release-notes-5.10.0-M1.adoc  | 9 +--------
 .../docs/asciidoc/release-notes/release-notes-5.9.2.adoc | 9 ++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 690ad04a7f4b..bac9bd3832a1 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -26,8 +26,6 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
-* Support for limiting the `max-pool-size` for parallel execution via a configuration parameter
-
 * All utility methods from `ReflectionSupport` now have counterparts returning `Stream`
   instead of `List`.
 
@@ -40,15 +38,10 @@ repository on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* The `fixed` parallel execution strategy now allows the thread pool to be saturated by
-  default.
+* ❓
 
 ==== New Features and Improvements
 
-* New `junit.jupiter.execution.parallel.config.fixed.max-pool-size` configuration
-  parameter to set the maximum pool size.
-* New `junit.jupiter.execution.parallel.config.fixed.saturate` configuration
-  parameter to disable pool saturation.
 * New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
   `@ParameterizedTest` invocation.
 * `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index 488d8e761f62..6f0900a06b3f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -25,6 +25,8 @@ JUnit repository on GitHub.
 
 * Introduce `TestPlan.getTestIdentifier(UniqueId)` and `TestPlan.getChildren(UniqueId)` to
   avoid parsing unique IDs unnecessarily during test execution.
+* Support for limiting the `max-pool-size` for parallel execution via a configuration
+  parameter
 
 
 [[release-notes-5.9.2-junit-jupiter]]
@@ -36,10 +38,15 @@ JUnit repository on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* The `fixed` parallel execution strategy now allows the thread pool to be saturated by
+  default.
 
 ==== New Features and Improvements
 
+* New `junit.jupiter.execution.parallel.config.fixed.max-pool-size` configuration
+  parameter to set the maximum pool size.
+* New `junit.jupiter.execution.parallel.config.fixed.saturate` configuration parameter to
+  disable pool saturation.
 * `JAVA_21` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 

From 17b91804ccfe9b469ed6a800d91b730fcb97a7ba Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Fri, 6 Jan 2023 16:17:30 +0100
Subject: [PATCH 1020/1433] Stop further suite discovery when encountering a
 cycle (#3116)

It is relatively easy to create a test suite that contains itself by
accident. E.g:

```java
package org.example.tag;

@tag("fast")
public class FastTest {
    @test
    public void test() {
        System.out.println("I am fast test");
    }
}
```
```java
package org.example.tag;

@tag("slow")
public class SlowTest {
    @test
    public void test() {
        System.out.println("I am slow test");
    }
}
```
```java
package org.example.tag;

@SelectPackages("org.example.tag")
@IncludeTags("fast")
@suite
public class TestSuite {
}
```

This configuration will result in a a long stack trace with a message
explaining that the suite contained a cycle.

```
Configuration error: The suite configuration may not contain a cycle [[engine:junit-platform-suite]/[suite:org.example.tag.TestSuite]/[engine:junit-platform-suite]/[suite:org.example.tag.TestSuite]]
```

And it is is not immediately apparent how a user should resolve this
problem. This example could be resolved by explicitly excluding the
suite engine by adding `@ExcludeEngine("junit-platform-suite")`. This
prevents further discovery.  But when multiple suites are involved this
may not be right action.

Fortunately the suite itself is aware of the cycle and as stopping
further discovery is the only reasonable action. This means that this
can be done without any sort of explicit configuration.

Fixes #3115.
---
 .../release-notes/release-notes-5.9.2.adoc    |  1 +
 .../junit-platform-suite-engine.adoc          |  2 +-
 .../suite/engine/ClassSelectorResolver.java   | 28 ++++++++++++
 .../suite/engine/SuiteTestDescriptor.java     | 24 +----------
 .../suite/engine/SuiteEngineTests.java        | 42 ++++++++++++++++++
 .../engine/SuiteTestDescriptorTests.java      | 17 --------
 .../suite/engine/testsuites/CyclicSuite.java  |  3 +-
 .../engine/testsuites/EmptyCyclicSuite.java   | 24 +++++++++++
 .../testsuites/ThreePartCyclicSuite.java      | 43 +++++++++++++++++++
 9 files changed, 142 insertions(+), 42 deletions(-)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyCyclicSuite.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/ThreePartCyclicSuite.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index 6f0900a06b3f..538b687907aa 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -27,6 +27,7 @@ JUnit repository on GitHub.
   avoid parsing unique IDs unnecessarily during test execution.
 * Support for limiting the `max-pool-size` for parallel execution via a configuration
   parameter
+* Quietly stop further suite discovery when encountering a cycle in a test suite
 
 
 [[release-notes-5.9.2-junit-jupiter]]
diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-suite-engine.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-suite-engine.adoc
index 18be01cd9091..d38a312d799f 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-suite-engine.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-suite-engine.adoc
@@ -20,7 +20,7 @@ you need _at least one_ other test engine and its dependencies on the classpath.
   `TestEngine` API for declarative test suites
 
 NOTE: Both of the required dependencies are aggregated in the `junit-platform-suite`
-artifact which can be declard in _test_ scope instead of declaring explicit dependencies
+artifact which can be declared in _test_ scope instead of declaring explicit dependencies
 on `junit-platform-suite-api` and `junit-platform-suite-engine`.
 
 [[junit-platform-suite-engine-setup-transitive-dependencies]]
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
index 44730efa5624..0d849470a594 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
@@ -16,6 +16,8 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 
+import org.junit.platform.commons.logging.Logger;
+import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
@@ -30,6 +32,8 @@
  */
 final class ClassSelectorResolver implements SelectorResolver {
 
+	private static final Logger log = LoggerFactory.getLogger(ClassSelectorResolver.class);
+
 	private static final IsSuiteClass isSuiteClass = new IsSuiteClass();
 
 	private final Predicate<String> classNameFilter;
@@ -94,7 +98,31 @@ private static Resolution toResolution(Optional<SuiteTestDescriptor> suite) {
 
 	private Optional<SuiteTestDescriptor> newSuiteDescriptor(Class<?> suiteClass, TestDescriptor parent) {
 		UniqueId id = parent.getUniqueId().append(SuiteTestDescriptor.SEGMENT_TYPE, suiteClass.getName());
+		if (containsCycle(id)) {
+			log.config(() -> createConfigContainsCycleMessage(suiteClass, id));
+			return Optional.empty();
+		}
+
 		return Optional.of(new SuiteTestDescriptor(id, suiteClass, configurationParameters));
 	}
 
+	private static boolean containsCycle(UniqueId id) {
+		List<Segment> segments = id.getSegments();
+		List<Segment> engineAndSuiteSegment = segments.subList(segments.size() - 2, segments.size());
+		List<Segment> ancestorSegments = segments.subList(0, segments.size() - 2);
+		for (int i = 0; i < ancestorSegments.size() - 1; i++) {
+			List<Segment> candidate = ancestorSegments.subList(i, i + 2);
+			if (engineAndSuiteSegment.equals(candidate)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static String createConfigContainsCycleMessage(Class<?> suiteClass, UniqueId suiteId) {
+		return String.format(
+			"The suite configuration of [%s] resulted in a cycle [%s] and will not be discovered a second time.",
+			suiteClass.getName(), suiteId);
+	}
+
 }
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index aa7c354f9a87..30d0e239668d 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -10,14 +10,9 @@
 
 package org.junit.platform.suite.engine;
 
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.counting;
-import static java.util.stream.Collectors.groupingBy;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder.request;
 
-import java.util.function.Supplier;
-
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.StringUtils;
@@ -26,7 +21,6 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
-import org.junit.platform.engine.UniqueId.Segment;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
 import org.junit.platform.engine.support.descriptor.ClassSource;
@@ -60,28 +54,12 @@ final class SuiteTestDescriptor extends AbstractTestDescriptor {
 	private SuiteLauncher launcher;
 
 	SuiteTestDescriptor(UniqueId id, Class<?> suiteClass, ConfigurationParameters configurationParameters) {
-		super(requireNoCycles(id), getSuiteDisplayName(suiteClass), ClassSource.from(suiteClass));
+		super(id, getSuiteDisplayName(suiteClass), ClassSource.from(suiteClass));
 		this.configurationParameters = configurationParameters;
 		this.failIfNoTests = getFailIfNoTests(suiteClass);
 		this.suiteClass = suiteClass;
 	}
 
-	private static UniqueId requireNoCycles(UniqueId id) {
-		// @formatter:off
-		boolean containsCycle = id.getSegments().stream()
-				.filter(segment -> SuiteTestDescriptor.SEGMENT_TYPE.equals(segment.getType()))
-				.map(Segment::getValue)
-				.collect(groupingBy(identity(), counting()))
-				.values()
-				.stream()
-				.anyMatch(count -> count > 1);
-		// @formatter:on
-		Supplier<String> message = () -> String.format(
-			"Configuration error: The suite configuration may not contain a cycle [%s]", id);
-		Preconditions.condition(!containsCycle, message);
-		return id;
-	}
-
 	private static Boolean getFailIfNoTests(Class<?> suiteClass) {
 		// @formatter:off
 		return findAnnotation(suiteClass, Suite.class)
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index e0b7862fb22b..2b56f9d53240 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -22,6 +22,7 @@
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
 import static org.junit.platform.testkit.engine.EventConditions.test;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
@@ -39,7 +40,9 @@
 import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 import org.junit.platform.suite.engine.testcases.TaggedTestTestCase;
 import org.junit.platform.suite.engine.testsuites.AbstractSuite;
+import org.junit.platform.suite.engine.testsuites.CyclicSuite;
 import org.junit.platform.suite.engine.testsuites.DynamicSuite;
+import org.junit.platform.suite.engine.testsuites.EmptyCyclicSuite;
 import org.junit.platform.suite.engine.testsuites.EmptyDynamicTestSuite;
 import org.junit.platform.suite.engine.testsuites.EmptyDynamicTestWithFailIfNoTestFalseSuite;
 import org.junit.platform.suite.engine.testsuites.EmptyTestCaseSuite;
@@ -50,6 +53,7 @@
 import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
 import org.junit.platform.suite.engine.testsuites.SuiteDisplayNameSuite;
 import org.junit.platform.suite.engine.testsuites.SuiteSuite;
+import org.junit.platform.suite.engine.testsuites.ThreePartCyclicSuite;
 import org.junit.platform.testkit.engine.EngineTestKit;
 
 /**
@@ -350,4 +354,42 @@ void pruneAfterPostDiscoveryFilters() {
 		// @formatter:on
 	}
 
+	@Test
+	void cyclicSuite() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(CyclicSuite.class))
+				.execute()
+				.allEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(SingleTestTestCase.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
+	@Test
+	void emptyCyclicSuite() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(EmptyCyclicSuite.class))
+				.execute()
+				.allEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(container(EmptyCyclicSuite.class), finishedWithFailure(message(
+						"Suite [org.junit.platform.suite.engine.testsuites.EmptyCyclicSuite] did not discover any tests"
+				))));
+		// @formatter:on
+	}
+
+	@Test
+	void threePartCyclicSuite() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(ThreePartCyclicSuite.PartA.class))
+				.execute()
+				.allEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(SingleTestTestCase.class.getName()), finishedSuccessfully()));
+		// @formatter:on
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index b0ce53036796..5d5fcdabe0c0 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -25,14 +25,12 @@
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
 import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
 import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
-import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.suite.api.Suite;
 import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
-import org.junit.platform.suite.engine.testsuites.CyclicSuite;
 import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
 
 /**
@@ -90,21 +88,6 @@ void discoveryPlanCanNotBeModifiedAfterDiscovery() {
 		});
 	}
 
-	@Test
-	void suitesMayNotContainACycle() {
-		// @formatter:off
-		UniqueId expectedCycle = suiteId
-				.append("engine", SuiteEngineDescriptor.ENGINE_ID)
-				.append(SuiteTestDescriptor.SEGMENT_TYPE, CyclicSuite.class.getName())
-				.append("engine", SuiteEngineDescriptor.ENGINE_ID)
-				.append(SuiteTestDescriptor.SEGMENT_TYPE, CyclicSuite.class.getName());
-		// @formatter:on
-		suite.addDiscoveryRequestFrom(CyclicSuite.class);
-		JUnitException exception = assertThrows(JUnitException.class, suite::discover);
-		assertEquals("Configuration error: The suite configuration may not contain a cycle [" + expectedCycle + "]",
-			exception.getCause().getCause().getCause().getMessage());
-	}
-
 	@Test
 	void suiteMayRegisterTests() {
 		assertTrue(suite.mayRegisterTests());
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
index 1897e743fec6..8b6124ef938a 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
@@ -13,12 +13,13 @@
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
 
 /**
  * @since 1.8
  */
 @Suite
 @IncludeClassNamePatterns(".*")
-@SelectClasses(CyclicSuite.class)
+@SelectClasses({ CyclicSuite.class, SingleTestTestCase.class })
 public class CyclicSuite {
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyCyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyCyclicSuite.java
new file mode 100644
index 000000000000..d28e1375ec5b
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyCyclicSuite.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+/**
+ * @since 1.9.2
+ */
+@Suite
+@IncludeClassNamePatterns(".*")
+@SelectClasses(EmptyCyclicSuite.class)
+public class EmptyCyclicSuite {
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/ThreePartCyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/ThreePartCyclicSuite.java
new file mode 100644
index 000000000000..d080b5075b1d
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/ThreePartCyclicSuite.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.SingleTestTestCase;
+
+/**
+ * @since 1.9.2
+ */
+public class ThreePartCyclicSuite {
+
+	@Suite
+	@IncludeClassNamePatterns(".*")
+	@SelectClasses({ PartB.class })
+	public static class PartA {
+
+	}
+
+	@Suite
+	@IncludeClassNamePatterns(".*")
+	@SelectClasses({ PartC.class })
+	public static class PartB {
+
+	}
+
+	@Suite
+	@IncludeClassNamePatterns(".*")
+	@SelectClasses({ PartB.class, SingleTestTestCase.class })
+	public static class PartC {
+
+	}
+}

From 6bc885a40cd5a4182120930bc26fc1ab7f83ab12 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 16:19:18 +0100
Subject: [PATCH 1021/1433] Document minimum requirements for test engines
 (#3118)

This commit adds a subsection to the User Guide documenting the
requirements for test engines for interoperability with IDEs and build
tools.
---
 .../user-guide/advanced-topics/engines.adoc   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/engines.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/engines.adoc
index 3c06d5af1736..460a6fd4ba3c 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/engines.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/engines.adoc
@@ -78,3 +78,45 @@ For example, the `junit-jupiter-engine` module registers its
 `org.junit.jupiter.engine.JupiterTestEngine` in a file named
 `org.junit.platform.engine.TestEngine` within the `/META-INF/services` folder in the
 `junit-jupiter-engine` JAR.
+
+[[test-engines-requirements]]
+==== Requirements
+
+NOTE: The words "must", "must not", "required", "shall", "shall not", "should", "should
+not", "recommended",  "may", and "optional" in this section are to be interpreted as
+described in https://www.ietf.org/rfc/rfc2119.txt[RFC 2119.]
+
+[[test-engines-requirements-mandatory]]
+===== Mandatory requirements
+
+For interoperability with build tools and IDEs, `TestEngine` implementations must adhere
+to the following requirements:
+
+* The `TestDescriptor` returned from `TestEngine.discover()` _must_ be the root of a tree
+  of `TestDescriptor` instances. This implies that there _must not_ be any cycles between
+  a node and its descendants.
+* A `TestEngine` _must_ be able to discover `UniqueIdSelectors` for any unique ID that it
+  previously generated and returned from `TestEngine.discover()`. This enables selecting a
+  subset of tests to execute or rerun.
+* The `executionSkipped`, `executionStarted`, and `executionFinished` methods of the
+  `EngineExecutionListener` passed to `TestEngine.execute()` _must_ be called for every
+  `TestDescriptor` node in the tree returned from `TestEngine.discover()` at most
+  once. Parent nodes _must_ be reported as started before their children and as finished
+  after their children. If a node is reported as skipped, there _must not_ be any events
+  reported for its descendants.
+
+[[test-engines-requirements-enhanced-compatibility]]
+===== Enhanced compatibility
+
+Adhering to the following requirements is optional but recommended for enhanced
+compatibility with build tools and IDEs:
+
+* Unless to indicate an empty discovery result, the `TestDescriptor` returned from
+  `TestEngine.discover()` _should_ have children rather than being completely dynamic.
+  This allows tools to display the structure of the tests and to select a subset of tests
+  to execute.
+* When resolving `UniqueIdSelectors`, a `TestEngine` _should_ only return `TestDescriptor`
+  instances with matching unique IDs including their ancestors but _may_ return additional
+  siblings or other nodes that are required for the execution of the selected tests.
+* `TestEngines` _should_ support <<running-tests-tags, tagging>> tests and containers so
+  that tag filters can be applied when discovering tests.

From aed3bda9223ccb7fd2964f7314a9297920f80e21 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 16:20:02 +0100
Subject: [PATCH 1022/1433] Document Maven Surefire/Failsafe version alignment
 (#3125)

Resolves #3093.
---
 .../asciidoc/user-guide/running-tests.adoc    | 34 ++++++---
 gradle/libs.versions.toml                     |  2 +-
 .../maven-surefire-compatibility/pom.xml      | 74 +++++++++++++++++++
 .../java/com/example/project/DummyTests.java  | 26 +++++++
 .../MavenSurefireCompatibilityTests.java      | 70 ++++++++++++++++++
 5 files changed, 196 insertions(+), 10 deletions(-)
 create mode 100644 platform-tooling-support-tests/projects/maven-surefire-compatibility/pom.xml
 create mode 100644 platform-tooling-support-tests/projects/maven-surefire-compatibility/src/test/java/com/example/project/DummyTests.java
 create mode 100644 platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 4a5d1bd57e6b..e88d0056e5fe 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -244,14 +244,6 @@ additional dependency to the runtime classpath.
 [[running-tests-build-maven]]
 ==== Maven
 
-[WARNING]
-.The JUnit Platform Maven Surefire Provider has been discontinued
-====
-The `junit-platform-surefire-provider`, which was originally developed by the JUnit team,
-was deprecated in JUnit Platform 1.3 and discontinued in 1.4. Please use Maven Surefire's
-native support instead.
-====
-
 Starting with https://issues.apache.org/jira/browse/SUREFIRE-1330[version 2.22.0], Maven
 Surefire and Maven Failsafe provide
 https://maven.apache.org/surefire/maven-surefire-plugin/examples/junit-platform.html[native support]
@@ -259,7 +251,31 @@ for executing tests on the JUnit Platform. The `pom.xml` file in the
 `{junit5-jupiter-starter-maven}` project demonstrates how to use the Maven Surefire plugin
 and can serve as a starting point for configuring your Maven build.
 
-NOTE: See <<running-tests-build-spring-boot>> for details on how to override the version
+[WARNING]
+.Use Maven Surefire/Failsafe 3.0.0-M4 or later to avoid interoperability issues
+====
+Maven Surefire/Failsafe 3.0.0-M4
+https://issues.apache.org/jira/browse/SUREFIRE-1585[introduced support] for aligning the
+version of the JUnit Platform Launcher it uses with the JUnit Platform version found on
+the test runtime classpath. Therefore, it is recommended to use version 3.0.0-M4 or later
+to avoid interoperability issues.
+
+Alternatively, you can add a test dependency on the matching version of the JUnit Platform
+Launcher to your Maven build as follows.
+
+[source,xml]
+[subs=attributes+]
+----
+<dependency>
+    <groupId>org.junit.platform</groupId>
+    <artifactId>junit-platform-launcher</artifactId>
+    <version>{platform-version}</version>
+    <scope>test</scope>
+</dependency>
+----
+====
+
+TIP: See <<running-tests-build-spring-boot>> for details on how to override the version
 of JUnit used in your Spring Boot application.
 
 [[running-tests-build-maven-engines-configure]]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a7b913277885..3c1dc9dfe837 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ ktlint = "0.43.0"
 log4j = "2.19.0"
 opentest4j = "1.2.0"
 openTestReporting = "0.1.0-M1"
-surefire = "2.22.2"
+surefire = "3.0.0-M7"
 xmlunit = "2.9.0"
 
 [libraries]
diff --git a/platform-tooling-support-tests/projects/maven-surefire-compatibility/pom.xml b/platform-tooling-support-tests/projects/maven-surefire-compatibility/pom.xml
new file mode 100644
index 000000000000..2eda3ba4d826
--- /dev/null
+++ b/platform-tooling-support-tests/projects/maven-surefire-compatibility/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>maven-surefire-compatibility</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
+        <junit.jupiter.version>${env.JUNIT_JUPITER_VERSION}</junit.jupiter.version>
+        <junit.platform.version>${env.JUNIT_PLATFORM_VERSION}</junit.platform.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <properties>
+                        <configurationParameters>
+                            junit.platform.listeners.uid.tracking.enabled = true
+                        </configurationParameters>
+                    </properties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>local-temp</id>
+            <url>file://${maven.repo}</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <profiles>
+        <profile>
+            <id>manual-platform-dependency</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.junit.platform</groupId>
+                    <artifactId>junit-platform-launcher</artifactId>
+                    <version>${junit.platform.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/platform-tooling-support-tests/projects/maven-surefire-compatibility/src/test/java/com/example/project/DummyTests.java b/platform-tooling-support-tests/projects/maven-surefire-compatibility/src/test/java/com/example/project/DummyTests.java
new file mode 100644
index 000000000000..d9ac6e1d531d
--- /dev/null
+++ b/platform-tooling-support-tests/projects/maven-surefire-compatibility/src/test/java/com/example/project/DummyTests.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015-2021 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package com.example.project;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class DummyTests {
+
+	@Test
+	void test() {
+	}
+
+}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java
new file mode 100644
index 000000000000..2965b6f03351
--- /dev/null
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package platform.tooling.support.tests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
+
+import java.io.IOException;
+import java.nio.file.Files;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.opentest4j.TestAbortedException;
+
+import platform.tooling.support.Helper;
+import platform.tooling.support.MavenRepo;
+import platform.tooling.support.Request;
+
+/**
+ * @since 1.9.2
+ */
+class MavenSurefireCompatibilityTests {
+
+	@ParameterizedTest
+	@CsvSource(delimiter = '|', nullValues = "<none>", textBlock = """
+			2.22.2   | --activate-profiles=manual-platform-dependency
+			3.0.0-M4 | <none>
+			""")
+	void testMavenSurefireCompatibilityProject(String surefireVersion, String extraArg) throws IOException {
+		var extraArgs = extraArg == null ? new Object[0] : new Object[] { extraArg };
+		var request = Request.builder() //
+				.setTool(Request.maven()) //
+				.setProject("maven-surefire-compatibility") //
+				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
+				.addArguments("-Dsurefire.version=" + surefireVersion) //
+				.addArguments("--update-snapshots", "--batch-mode", "test") //
+				.addArguments(extraArgs) //
+				.setTimeout(TOOL_TIMEOUT) //
+				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.build();
+
+		var result = request.run();
+
+		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
+
+		assertEquals(0, result.getExitCode());
+		assertEquals("", result.getOutput("err"));
+
+		var output = result.getOutputLines("out");
+		assertTrue(output.contains("[INFO] BUILD SUCCESS"));
+		assertTrue(output.contains("[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0"));
+
+		var targetDir = Request.WORKSPACE.resolve(request.getWorkspace()).resolve("target");
+		try (var stream = Files.list(targetDir)) {
+			assertThat(stream.filter(file -> file.getFileName().toString().startsWith("junit-platform-unique-ids"))) //
+					.hasSize(1);
+		}
+	}
+}

From f19cd20fd4b313167061730666d2c26256eb4a82 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 1 Jan 2023 17:40:41 +0100
Subject: [PATCH 1023/1433] Use toolchains for Kotlin tasks

---
 .../kotlin/java-toolchain-conventions.gradle.kts   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
index 672865e45f51..87c334d2621e 100644
--- a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+
 project.pluginManager.withPlugin("java") {
 	val javaToolchainVersion: String? by project
 	val defaultLanguageVersion = JavaLanguageVersion.of(17)
@@ -5,10 +7,21 @@ project.pluginManager.withPlugin("java") {
 
 	val extension = the<JavaPluginExtension>()
 	val javaToolchainService = the<JavaToolchainService>()
+
 	extension.toolchain.languageVersion.set(javaLanguageVersion)
+
+	pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
+		configure<KotlinJvmProjectExtension> {
+			jvmToolchain {
+				languageVersion.set(javaLanguageVersion)
+			}
+		}
+	}
+
 	tasks.withType<JavaExec>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor(extension.toolchain))
 	}
+
 	tasks.withType<JavaCompile>().configureEach {
 		outputs.cacheIf { javaLanguageVersion == defaultLanguageVersion }
 		doFirst {
@@ -19,6 +32,7 @@ project.pluginManager.withPlugin("java") {
 			}
 		}
 	}
+
 	tasks.withType<GroovyCompile>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor {
 			// Groovy does not yet support JDK 19, see https://issues.apache.org/jira/browse/GROOVY-10569

From cc218a9231bf334ff4b5a7c2e94510f164b44b95 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 1 Jan 2023 17:41:41 +0100
Subject: [PATCH 1024/1433] Use same JVM target for Java and Kotlin compile
 tasks

---
 buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index 08402295ff04..163190944bae 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -20,8 +20,7 @@ afterEvaluate {
 			kotlinOptions.jvmTarget = extension.mainJavaVersion.toString()
 		}
 		named<KotlinCompile>("compileTestKotlin") {
-			// The Kotlin compiler does not yet support JDK 17 and later (see https://kotlinlang.org/docs/compiler-reference.html#jvm-target-version)
-			kotlinOptions.jvmTarget = minOf(JavaVersion.VERSION_16, extension.testJavaVersion).toString()
+			kotlinOptions.jvmTarget = extension.testJavaVersion.toString()
 		}
 	}
 }

From 63eec7f85070ddaa3eef1763b19509e3b961189e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 18:26:13 +0100
Subject: [PATCH 1025/1433] Move release notes for #3045 to 5.9.2

---
 .../docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc | 5 +----
 .../src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index bac9bd3832a1..2888418350d5 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -15,10 +15,7 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* The Java 7 based constructor for `ForkJoinPool` is no longer accidentally used on Java 9
-  or higher when invalid `ParallelExecutionConfiguration` is provided. Instead, an
-  exception is thrown for invalid configuration, thereby preventing invalid configuration
-  from being silently ignored.
+* ❓
 
 ==== Deprecations and Breaking Changes
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index 538b687907aa..02483f2af786 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -15,7 +15,10 @@ JUnit repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* The Java 7 based constructor for `ForkJoinPool` is no longer accidentally used on Java 9
+  or higher when invalid `ParallelExecutionConfiguration` is provided. Instead, an
+  exception is thrown for invalid configuration, thereby preventing invalid configuration
+  from being silently ignored.
 
 ==== Deprecations and Breaking Changes
 

From e762e03bd07109e8d0a68389c223564890f24055 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 18:52:45 +0100
Subject: [PATCH 1026/1433] Restrict publishing to GitHub Pages to a single
 concurrent job

---
 .github/workflows/main.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ee232a823fd8..e95422c6c55d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -85,7 +85,10 @@ jobs:
 
   update_documentation:
     name: Update Snapshot Documentation
-    needs: linux
+    concurrency:
+      group: github-pages
+      cancel-in-progress: true
+    needs: Linux
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:

From fab3b9b98348f2e908ac6e3c524133b029183eee Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 18:55:08 +0100
Subject: [PATCH 1027/1433] Update upload-artifact action

---
 .github/actions/main-build/action.yml | 2 +-
 .github/workflows/cross-version.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/main-build/action.yml b/.github/actions/main-build/action.yml
index 4b51887efcd8..a7817cd314f0 100644
--- a/.github/actions/main-build/action.yml
+++ b/.github/actions/main-build/action.yml
@@ -12,7 +12,7 @@ runs:
     - uses: ./.github/actions/run-gradle
       with:
         arguments: ${{ inputs.arguments }}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:
         name: Test Distribution trace files (${{ github.job }})
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index b1bd27ed0efb..a752dcad2022 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -46,7 +46,7 @@ jobs:
             -Dscan.tag.JDK_${{ matrix.jdk }}
             build
       - name: Upload Test Distribution trace files
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: "Test Distribution trace files (OpenJDK ${{ matrix.jdk }})"
           path: '**/build/test-results/*/trace.json'

From 3daa2c5c69c81ab1f807b39dc1077c885351538e Mon Sep 17 00:00:00 2001
From: JUnit Team <team@junit.org>
Date: Fri, 6 Jan 2023 19:25:19 +0100
Subject: [PATCH 1028/1433] Update copyright

---
 documentation/src/main/java/example/domain/Person.java          | 2 +-
 documentation/src/main/java/example/registration/WebClient.java | 2 +-
 .../src/main/java/example/registration/WebResponse.java         | 2 +-
 .../src/main/java/example/registration/WebServerExtension.java  | 2 +-
 documentation/src/main/java/example/util/Calculator.java        | 2 +-
 documentation/src/main/java/example/util/ListWriter.java        | 2 +-
 documentation/src/main/java/example/util/StringUtils.java       | 2 +-
 documentation/src/test/java/example/AssertionsDemo.java         | 2 +-
 documentation/src/test/java/example/AssumptionsDemo.java        | 2 +-
 .../src/test/java/example/ConditionalTestExecutionDemo.java     | 2 +-
 documentation/src/test/java/example/CustomTestEngine.java       | 2 +-
 documentation/src/test/java/example/DisabledClassDemo.java      | 2 +-
 documentation/src/test/java/example/DisabledTestsDemo.java      | 2 +-
 documentation/src/test/java/example/DisplayNameDemo.java        | 2 +-
 .../src/test/java/example/DisplayNameGeneratorDemo.java         | 2 +-
 documentation/src/test/java/example/DocumentationTestSuite.java | 2 +-
 documentation/src/test/java/example/DynamicTestsDemo.java       | 2 +-
 documentation/src/test/java/example/ExampleTestCase.java        | 2 +-
 .../src/test/java/example/ExternalCustomConditionDemo.java      | 2 +-
 .../src/test/java/example/ExternalMethodSourceDemo.java         | 2 +-
 documentation/src/test/java/example/Fast.java                   | 2 +-
 documentation/src/test/java/example/FastTest.java               | 2 +-
 documentation/src/test/java/example/HamcrestAssertionsDemo.java | 2 +-
 documentation/src/test/java/example/IgnoredTestsDemo.java       | 2 +-
 documentation/src/test/java/example/JUnit4Tests.java            | 2 +-
 documentation/src/test/java/example/JUnitPlatformClassDemo.java | 2 +-
 documentation/src/test/java/example/JUnitPlatformSuiteDemo.java | 2 +-
 .../test/java/example/MethodSourceParameterResolutionDemo.java  | 2 +-
 .../src/test/java/example/MyFirstJUnitJupiterTests.java         | 2 +-
 .../src/test/java/example/OrderedNestedTestClassesDemo.java     | 2 +-
 documentation/src/test/java/example/OrderedTestsDemo.java       | 2 +-
 documentation/src/test/java/example/ParameterizedTestDemo.java  | 2 +-
 documentation/src/test/java/example/PollingTimeoutDemo.java     | 2 +-
 documentation/src/test/java/example/RepeatedTestsDemo.java      | 2 +-
 documentation/src/test/java/example/SharedResourcesDemo.java    | 2 +-
 documentation/src/test/java/example/SlowTests.java              | 2 +-
 documentation/src/test/java/example/StandardTests.java          | 2 +-
 documentation/src/test/java/example/SuiteDemo.java              | 2 +-
 documentation/src/test/java/example/TaggingDemo.java            | 2 +-
 documentation/src/test/java/example/TempDirCleanupModeDemo.java | 2 +-
 documentation/src/test/java/example/TempDirectoryDemo.java      | 2 +-
 documentation/src/test/java/example/TestInfoDemo.java           | 2 +-
 documentation/src/test/java/example/TestReporterDemo.java       | 2 +-
 documentation/src/test/java/example/TestTemplateDemo.java       | 2 +-
 documentation/src/test/java/example/TestingAStackDemo.java      | 2 +-
 documentation/src/test/java/example/TimeoutDemo.java            | 2 +-
 documentation/src/test/java/example/UsingTheLauncherDemo.java   | 2 +-
 .../src/test/java/example/callbacks/AbstractDatabaseTests.java  | 2 +-
 .../java/example/callbacks/BrokenLifecycleMethodConfigDemo.java | 2 +-
 .../src/test/java/example/callbacks/DatabaseTestsDemo.java      | 2 +-
 documentation/src/test/java/example/callbacks/Extension1.java   | 2 +-
 documentation/src/test/java/example/callbacks/Extension2.java   | 2 +-
 documentation/src/test/java/example/callbacks/Logger.java       | 2 +-
 .../test/java/example/defaultmethods/ComparableContract.java    | 2 +-
 .../src/test/java/example/defaultmethods/EqualsContract.java    | 2 +-
 .../src/test/java/example/defaultmethods/StringTests.java       | 2 +-
 .../src/test/java/example/defaultmethods/Testable.java          | 2 +-
 .../test/java/example/exception/IgnoreIOExceptionExtension.java | 2 +-
 .../src/test/java/example/exception/IgnoreIOExceptionTests.java | 2 +-
 .../test/java/example/exception/MultipleHandlersTestCase.java   | 2 +-
 .../java/example/exception/RecordStateOnErrorExtension.java     | 2 +-
 documentation/src/test/java/example/extensions/Random.java      | 2 +-
 .../src/test/java/example/extensions/RandomNumberDemo.java      | 2 +-
 .../src/test/java/example/extensions/RandomNumberExtension.java | 2 +-
 .../src/test/java/example/interceptor/SwingEdtInterceptor.java  | 2 +-
 .../src/test/java/example/registration/DocumentationDemo.java   | 2 +-
 .../src/test/java/example/registration/WebServerDemo.java       | 2 +-
 .../test/java/example/session/GlobalSetupTeardownListener.java  | 2 +-
 documentation/src/test/java/example/session/HttpTests.java      | 2 +-
 .../src/test/java/example/testinterface/TestInterfaceDemo.java  | 2 +-
 .../example/testinterface/TestInterfaceDynamicTestsDemo.java    | 2 +-
 .../test/java/example/testinterface/TestLifecycleLogger.java    | 2 +-
 .../test/java/example/testinterface/TimeExecutionLogger.java    | 2 +-
 .../test/java/example/testkit/EngineTestKitAllEventsDemo.java   | 2 +-
 .../java/example/testkit/EngineTestKitFailedMethodDemo.java     | 2 +-
 .../java/example/testkit/EngineTestKitSkippedMethodDemo.java    | 2 +-
 .../test/java/example/testkit/EngineTestKitStatisticsDemo.java  | 2 +-
 documentation/src/test/java/example/timing/TimingExtension.java | 2 +-
 .../src/test/java/example/timing/TimingExtensionTests.java      | 2 +-
 documentation/src/test/java/extensions/ExpectToFail.java        | 2 +-
 .../test/java/org/junit/api/tools/AbstractApiReportWriter.java  | 2 +-
 documentation/src/test/java/org/junit/api/tools/ApiReport.java  | 2 +-
 .../src/test/java/org/junit/api/tools/ApiReportGenerator.java   | 2 +-
 .../src/test/java/org/junit/api/tools/ApiReportWriter.java      | 2 +-
 .../test/java/org/junit/api/tools/AsciidocApiReportWriter.java  | 2 +-
 .../src/test/java/org/junit/api/tools/HtmlApiReportWriter.java  | 2 +-
 .../test/java/org/junit/api/tools/MarkdownApiReportWriter.java  | 2 +-
 documentation/src/test/kotlin/example/FibonacciCalculator.kt    | 2 +-
 documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt   | 2 +-
 .../src/test/kotlin/example/registration/KotlinWebServerDemo.kt | 2 +-
 .../src/main/java/org/junit/jupiter/api/AfterAll.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/AfterEach.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertAll.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertArrayEquals.java  | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertEquals.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertFalse.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertInstanceOf.java   | 2 +-
 .../main/java/org/junit/jupiter/api/AssertIterableEquals.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertLinesMatch.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotEquals.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotNull.java      | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNotSame.java      | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertNull.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertSame.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertThrows.java       | 2 +-
 .../main/java/org/junit/jupiter/api/AssertThrowsExactly.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertTimeout.java      | 2 +-
 .../java/org/junit/jupiter/api/AssertTimeoutPreemptively.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertTrue.java         | 2 +-
 .../java/org/junit/jupiter/api/AssertionFailureBuilder.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/AssertionUtils.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/Assertions.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/Assumptions.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/BeforeAll.java          | 2 +-
 .../src/main/java/org/junit/jupiter/api/BeforeEach.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/ClassDescriptor.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/ClassOrderer.java       | 2 +-
 .../main/java/org/junit/jupiter/api/ClassOrdererContext.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/Disabled.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/DisplayName.java        | 2 +-
 .../main/java/org/junit/jupiter/api/DisplayNameGeneration.java  | 2 +-
 .../main/java/org/junit/jupiter/api/DisplayNameGenerator.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicContainer.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicNode.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/DynamicTest.java        | 2 +-
 .../org/junit/jupiter/api/IndicativeSentencesGeneration.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodDescriptor.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/MethodOrderer.java      | 2 +-
 .../main/java/org/junit/jupiter/api/MethodOrdererContext.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/Named.java              | 2 +-
 .../src/main/java/org/junit/jupiter/api/Nested.java             | 2 +-
 .../src/main/java/org/junit/jupiter/api/Order.java              | 2 +-
 .../src/main/java/org/junit/jupiter/api/RepeatedTest.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/RepetitionInfo.java     | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java  | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java | 2 +-
 junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestClassOrder.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestFactory.java        | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestInfo.java           | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestInstance.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestMethodOrder.java    | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestReporter.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/TestTemplate.java       | 2 +-
 .../src/main/java/org/junit/jupiter/api/Timeout.java            | 2 +-
 .../api/condition/AbstractOsBasedExecutionCondition.java        | 2 +-
 .../api/condition/AbstractRepeatableAnnotationCondition.java    | 2 +-
 .../junit/jupiter/api/condition/BooleanExecutionCondition.java  | 2 +-
 .../org/junit/jupiter/api/condition/DisabledForJreRange.java    | 2 +-
 .../jupiter/api/condition/DisabledForJreRangeCondition.java     | 2 +-
 .../main/java/org/junit/jupiter/api/condition/DisabledIf.java   | 2 +-
 .../org/junit/jupiter/api/condition/DisabledIfCondition.java    | 2 +-
 .../jupiter/api/condition/DisabledIfEnvironmentVariable.java    | 2 +-
 .../api/condition/DisabledIfEnvironmentVariableCondition.java   | 2 +-
 .../jupiter/api/condition/DisabledIfEnvironmentVariables.java   | 2 +-
 .../junit/jupiter/api/condition/DisabledIfSystemProperties.java | 2 +-
 .../junit/jupiter/api/condition/DisabledIfSystemProperty.java   | 2 +-
 .../api/condition/DisabledIfSystemPropertyCondition.java        | 2 +-
 .../org/junit/jupiter/api/condition/DisabledInNativeImage.java  | 2 +-
 .../java/org/junit/jupiter/api/condition/DisabledOnJre.java     | 2 +-
 .../org/junit/jupiter/api/condition/DisabledOnJreCondition.java | 2 +-
 .../main/java/org/junit/jupiter/api/condition/DisabledOnOs.java | 2 +-
 .../org/junit/jupiter/api/condition/DisabledOnOsCondition.java  | 2 +-
 .../org/junit/jupiter/api/condition/EnabledForJreRange.java     | 2 +-
 .../jupiter/api/condition/EnabledForJreRangeCondition.java      | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledIf.java    | 2 +-
 .../org/junit/jupiter/api/condition/EnabledIfCondition.java     | 2 +-
 .../jupiter/api/condition/EnabledIfEnvironmentVariable.java     | 2 +-
 .../api/condition/EnabledIfEnvironmentVariableCondition.java    | 2 +-
 .../jupiter/api/condition/EnabledIfEnvironmentVariables.java    | 2 +-
 .../junit/jupiter/api/condition/EnabledIfSystemProperties.java  | 2 +-
 .../junit/jupiter/api/condition/EnabledIfSystemProperty.java    | 2 +-
 .../jupiter/api/condition/EnabledIfSystemPropertyCondition.java | 2 +-
 .../org/junit/jupiter/api/condition/EnabledInNativeImage.java   | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledOnJre.java | 2 +-
 .../org/junit/jupiter/api/condition/EnabledOnJreCondition.java  | 2 +-
 .../main/java/org/junit/jupiter/api/condition/EnabledOnOs.java  | 2 +-
 .../org/junit/jupiter/api/condition/EnabledOnOsCondition.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/condition/JRE.java      | 2 +-
 .../org/junit/jupiter/api/condition/MethodBasedCondition.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/condition/OS.java       | 2 +-
 .../java/org/junit/jupiter/api/extension/AfterAllCallback.java  | 2 +-
 .../java/org/junit/jupiter/api/extension/AfterEachCallback.java | 2 +-
 .../junit/jupiter/api/extension/AfterTestExecutionCallback.java | 2 +-
 .../java/org/junit/jupiter/api/extension/BeforeAllCallback.java | 2 +-
 .../org/junit/jupiter/api/extension/BeforeEachCallback.java     | 2 +-
 .../jupiter/api/extension/BeforeTestExecutionCallback.java      | 2 +-
 .../junit/jupiter/api/extension/ConditionEvaluationResult.java  | 2 +-
 .../jupiter/api/extension/DynamicTestInvocationContext.java     | 2 +-
 .../java/org/junit/jupiter/api/extension/ExecutableInvoker.java | 2 +-
 .../org/junit/jupiter/api/extension/ExecutionCondition.java     | 2 +-
 .../main/java/org/junit/jupiter/api/extension/ExtendWith.java   | 2 +-
 .../main/java/org/junit/jupiter/api/extension/Extension.java    | 2 +-
 .../jupiter/api/extension/ExtensionConfigurationException.java  | 2 +-
 .../java/org/junit/jupiter/api/extension/ExtensionContext.java  | 2 +-
 .../junit/jupiter/api/extension/ExtensionContextException.java  | 2 +-
 .../main/java/org/junit/jupiter/api/extension/Extensions.java   | 2 +-
 .../org/junit/jupiter/api/extension/InvocationInterceptor.java  | 2 +-
 .../api/extension/LifecycleMethodExecutionExceptionHandler.java | 2 +-
 .../java/org/junit/jupiter/api/extension/ParameterContext.java  | 2 +-
 .../jupiter/api/extension/ParameterResolutionException.java     | 2 +-
 .../java/org/junit/jupiter/api/extension/ParameterResolver.java | 2 +-
 .../jupiter/api/extension/ReflectiveInvocationContext.java      | 2 +-
 .../java/org/junit/jupiter/api/extension/RegisterExtension.java | 2 +-
 .../jupiter/api/extension/TestExecutionExceptionHandler.java    | 2 +-
 .../org/junit/jupiter/api/extension/TestInstanceFactory.java    | 2 +-
 .../junit/jupiter/api/extension/TestInstanceFactoryContext.java | 2 +-
 .../junit/jupiter/api/extension/TestInstancePostProcessor.java  | 2 +-
 .../jupiter/api/extension/TestInstancePreConstructCallback.java | 2 +-
 .../jupiter/api/extension/TestInstancePreDestroyCallback.java   | 2 +-
 .../java/org/junit/jupiter/api/extension/TestInstances.java     | 2 +-
 .../junit/jupiter/api/extension/TestInstantiationException.java | 2 +-
 .../jupiter/api/extension/TestTemplateInvocationContext.java    | 2 +-
 .../api/extension/TestTemplateInvocationContextProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/api/extension/TestWatcher.java  | 2 +-
 .../api/extension/support/TypeBasedParameterResolver.java       | 2 +-
 .../main/java/org/junit/jupiter/api/function/Executable.java    | 2 +-
 .../java/org/junit/jupiter/api/function/ThrowingConsumer.java   | 2 +-
 .../java/org/junit/jupiter/api/function/ThrowingSupplier.java   | 2 +-
 .../src/main/java/org/junit/jupiter/api/io/CleanupMode.java     | 2 +-
 .../src/main/java/org/junit/jupiter/api/io/TempDir.java         | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Execution.java | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ExecutionMode.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Isolated.java  | 2 +-
 .../java/org/junit/jupiter/api/parallel/ResourceAccessMode.java | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ResourceLock.java  | 2 +-
 .../main/java/org/junit/jupiter/api/parallel/ResourceLocks.java | 2 +-
 .../src/main/java/org/junit/jupiter/api/parallel/Resources.java | 2 +-
 .../src/main/kotlin/org/junit/jupiter/api/Assertions.kt         | 2 +-
 .../api/extension/ExtensionContextParameterResolver.java        | 2 +-
 .../java/org/junit/jupiter/api/fixtures/TrackLogRecords.java    | 2 +-
 .../src/main/java/org/junit/jupiter/engine/Constants.java       | 2 +-
 .../main/java/org/junit/jupiter/engine/JupiterTestEngine.java   | 2 +-
 .../jupiter/engine/config/CachingJupiterConfiguration.java      | 2 +-
 .../jupiter/engine/config/DefaultJupiterConfiguration.java      | 2 +-
 .../engine/config/EnumConfigurationParameterConverter.java      | 2 +-
 .../config/InstantiatingConfigurationParameterConverter.java    | 2 +-
 .../org/junit/jupiter/engine/config/JupiterConfiguration.java   | 2 +-
 .../jupiter/engine/descriptor/AbstractExtensionContext.java     | 2 +-
 .../jupiter/engine/descriptor/ClassBasedTestDescriptor.java     | 2 +-
 .../junit/jupiter/engine/descriptor/ClassExtensionContext.java  | 2 +-
 .../junit/jupiter/engine/descriptor/ClassTestDescriptor.java    | 2 +-
 .../engine/descriptor/DefaultDynamicTestInvocationContext.java  | 2 +-
 .../engine/descriptor/DefaultTestInstanceFactoryContext.java    | 2 +-
 .../org/junit/jupiter/engine/descriptor/DisplayNameUtils.java   | 2 +-
 .../engine/descriptor/DynamicContainerTestDescriptor.java       | 2 +-
 .../jupiter/engine/descriptor/DynamicDescendantFilter.java      | 2 +-
 .../jupiter/engine/descriptor/DynamicExtensionContext.java      | 2 +-
 .../jupiter/engine/descriptor/DynamicNodeTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/DynamicTestTestDescriptor.java    | 2 +-
 .../org/junit/jupiter/engine/descriptor/ExtensionUtils.java     | 2 +-
 .../java/org/junit/jupiter/engine/descriptor/Filterable.java    | 2 +-
 .../jupiter/engine/descriptor/JupiterEngineDescriptor.java      | 2 +-
 .../engine/descriptor/JupiterEngineExtensionContext.java        | 2 +-
 .../junit/jupiter/engine/descriptor/JupiterTestDescriptor.java  | 2 +-
 .../junit/jupiter/engine/descriptor/LifecycleMethodUtils.java   | 2 +-
 .../jupiter/engine/descriptor/MethodBasedTestDescriptor.java    | 2 +-
 .../junit/jupiter/engine/descriptor/MethodExtensionContext.java | 2 +-
 .../junit/jupiter/engine/descriptor/MethodSourceSupport.java    | 2 +-
 .../jupiter/engine/descriptor/NestedClassTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/TestFactoryTestDescriptor.java    | 2 +-
 .../jupiter/engine/descriptor/TestInstanceLifecycleUtils.java   | 2 +-
 .../jupiter/engine/descriptor/TestMethodTestDescriptor.java     | 2 +-
 .../jupiter/engine/descriptor/TestTemplateExtensionContext.java | 2 +-
 .../engine/descriptor/TestTemplateInvocationTestDescriptor.java | 2 +-
 .../jupiter/engine/descriptor/TestTemplateTestDescriptor.java   | 2 +-
 .../engine/discovery/AbstractAnnotatedDescriptorWrapper.java    | 2 +-
 .../junit/jupiter/engine/discovery/AbstractOrderingVisitor.java | 2 +-
 .../junit/jupiter/engine/discovery/ClassOrderingVisitor.java    | 2 +-
 .../junit/jupiter/engine/discovery/ClassSelectorResolver.java   | 2 +-
 .../junit/jupiter/engine/discovery/DefaultClassDescriptor.java  | 2 +-
 .../jupiter/engine/discovery/DefaultClassOrdererContext.java    | 2 +-
 .../junit/jupiter/engine/discovery/DefaultMethodDescriptor.java | 2 +-
 .../jupiter/engine/discovery/DefaultMethodOrdererContext.java   | 2 +-
 .../jupiter/engine/discovery/DiscoverySelectorResolver.java     | 2 +-
 .../java/org/junit/jupiter/engine/discovery/MethodFinder.java   | 2 +-
 .../junit/jupiter/engine/discovery/MethodOrderingVisitor.java   | 2 +-
 .../junit/jupiter/engine/discovery/MethodSelectorResolver.java  | 2 +-
 .../junit/jupiter/engine/discovery/predicates/IsInnerClass.java | 2 +-
 .../jupiter/engine/discovery/predicates/IsNestedTestClass.java  | 2 +-
 .../engine/discovery/predicates/IsPotentialTestContainer.java   | 2 +-
 .../engine/discovery/predicates/IsTestClassWithTests.java       | 2 +-
 .../engine/discovery/predicates/IsTestFactoryMethod.java        | 2 +-
 .../junit/jupiter/engine/discovery/predicates/IsTestMethod.java | 2 +-
 .../engine/discovery/predicates/IsTestTemplateMethod.java       | 2 +-
 .../jupiter/engine/discovery/predicates/IsTestableMethod.java   | 2 +-
 .../junit/jupiter/engine/execution/AfterEachMethodAdapter.java  | 2 +-
 .../junit/jupiter/engine/execution/BeforeEachMethodAdapter.java | 2 +-
 .../jupiter/engine/execution/ConditionEvaluationException.java  | 2 +-
 .../org/junit/jupiter/engine/execution/ConditionEvaluator.java  | 2 +-
 .../junit/jupiter/engine/execution/ConstructorInvocation.java   | 2 +-
 .../jupiter/engine/execution/DefaultExecutableInvoker.java      | 2 +-
 .../junit/jupiter/engine/execution/DefaultParameterContext.java | 2 +-
 .../junit/jupiter/engine/execution/DefaultTestInstances.java    | 2 +-
 .../junit/jupiter/engine/execution/ExtensionValuesStore.java    | 2 +-
 .../jupiter/engine/execution/InterceptingExecutableInvoker.java | 2 +-
 .../jupiter/engine/execution/InvocationInterceptorChain.java    | 2 +-
 .../jupiter/engine/execution/JupiterEngineExecutionContext.java | 2 +-
 .../org/junit/jupiter/engine/execution/MethodInvocation.java    | 2 +-
 .../org/junit/jupiter/engine/execution/NamespaceAwareStore.java | 2 +-
 .../jupiter/engine/execution/ParameterResolutionUtils.java      | 2 +-
 .../junit/jupiter/engine/execution/TestInstancesProvider.java   | 2 +-
 .../org/junit/jupiter/engine/extension/DisabledCondition.java   | 2 +-
 .../org/junit/jupiter/engine/extension/ExtensionRegistrar.java  | 2 +-
 .../org/junit/jupiter/engine/extension/ExtensionRegistry.java   | 2 +-
 .../jupiter/engine/extension/MutableExtensionRegistry.java      | 2 +-
 .../engine/extension/RepeatedTestDisplayNameFormatter.java      | 2 +-
 .../junit/jupiter/engine/extension/RepeatedTestExtension.java   | 2 +-
 .../jupiter/engine/extension/RepeatedTestInvocationContext.java | 2 +-
 .../engine/extension/RepetitionInfoParameterResolver.java       | 2 +-
 .../jupiter/engine/extension/SameThreadTimeoutInvocation.java   | 2 +-
 .../engine/extension/SeparateThreadTimeoutInvocation.java       | 2 +-
 .../java/org/junit/jupiter/engine/extension/TempDirectory.java  | 2 +-
 .../jupiter/engine/extension/TestInfoParameterResolver.java     | 2 +-
 .../jupiter/engine/extension/TestReporterParameterResolver.java | 2 +-
 .../junit/jupiter/engine/extension/TimeoutConfiguration.java    | 2 +-
 .../org/junit/jupiter/engine/extension/TimeoutDuration.java     | 2 +-
 .../junit/jupiter/engine/extension/TimeoutDurationParser.java   | 2 +-
 .../junit/jupiter/engine/extension/TimeoutExceptionFactory.java | 2 +-
 .../org/junit/jupiter/engine/extension/TimeoutExtension.java    | 2 +-
 .../jupiter/engine/extension/TimeoutInvocationFactory.java      | 2 +-
 .../engine/support/JupiterThrowableCollectorFactory.java        | 2 +-
 .../support/OpenTest4JAndJUnit4AwareThrowableCollector.java     | 2 +-
 junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java  | 2 +-
 junit-jupiter-engine/src/test/java/example/B_TestCase.java      | 2 +-
 .../src/test/java/org/junit/jupiter/JupiterTestSuite.java       | 2 +-
 .../java/org/junit/jupiter/api/AssertAllAssertionsTests.java    | 2 +-
 .../org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java | 2 +-
 .../junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java    | 2 +-
 .../java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java | 2 +-
 .../java/org/junit/jupiter/api/AssertFalseAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java  | 2 +-
 .../junit/jupiter/api/AssertIterableEqualsAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java  | 2 +-
 .../org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java   | 2 +-
 .../org/junit/jupiter/api/AssertNotNullAssertionsTests.java     | 2 +-
 .../org/junit/jupiter/api/AssertNotSameAssertionsTests.java     | 2 +-
 .../java/org/junit/jupiter/api/AssertNullAssertionsTests.java   | 2 +-
 .../java/org/junit/jupiter/api/AssertSameAssertionsTests.java   | 2 +-
 .../java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java | 2 +-
 .../junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java   | 2 +-
 .../org/junit/jupiter/api/AssertTimeoutAssertionsTests.java     | 2 +-
 .../jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java   | 2 +-
 .../java/org/junit/jupiter/api/AssertTrueAssertionsTests.java   | 2 +-
 .../src/test/java/org/junit/jupiter/api/AssertionTestUtils.java | 2 +-
 .../src/test/java/org/junit/jupiter/api/AssumptionsTests.java   | 2 +-
 .../jupiter/api/DisplayNameGenerationInheritanceTestCase.java   | 2 +-
 .../java/org/junit/jupiter/api/DisplayNameGenerationTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/api/DynamicTestTests.java   | 2 +-
 .../src/test/java/org/junit/jupiter/api/EnigmaThrowable.java    | 2 +-
 .../test/java/org/junit/jupiter/api/FailAssertionsTests.java    | 2 +-
 .../api/IndicativeSentencesGenerationInheritanceTestCase.java   | 2 +-
 .../junit/jupiter/api/IndicativeSentencesNestedTestCase.java    | 2 +-
 .../junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java  | 2 +-
 .../src/test/java/org/junit/jupiter/api/IterableFactory.java    | 2 +-
 .../jupiter/api/condition/AbstractExecutionConditionTests.java  | 2 +-
 .../api/condition/DisabledForJreRangeConditionTests.java        | 2 +-
 .../api/condition/DisabledForJreRangeIntegrationTests.java      | 2 +-
 .../junit/jupiter/api/condition/DisabledIfConditionTests.java   | 2 +-
 .../condition/DisabledIfEnvironmentVariableConditionTests.java  | 2 +-
 .../DisabledIfEnvironmentVariableIntegrationTests.java          | 2 +-
 .../junit/jupiter/api/condition/DisabledIfIntegrationTests.java | 2 +-
 .../api/condition/DisabledIfSystemPropertyConditionTests.java   | 2 +-
 .../api/condition/DisabledIfSystemPropertyIntegrationTests.java | 2 +-
 .../jupiter/api/condition/DisabledOnJreConditionTests.java      | 2 +-
 .../jupiter/api/condition/DisabledOnJreIntegrationTests.java    | 2 +-
 .../junit/jupiter/api/condition/DisabledOnOsConditionTests.java | 2 +-
 .../jupiter/api/condition/DisabledOnOsIntegrationTests.java     | 2 +-
 .../jupiter/api/condition/EnabledForJreRangeConditionTests.java | 2 +-
 .../api/condition/EnabledForJreRangeIntegrationTests.java       | 2 +-
 .../junit/jupiter/api/condition/EnabledIfConditionTests.java    | 2 +-
 .../condition/EnabledIfEnvironmentVariableConditionTests.java   | 2 +-
 .../condition/EnabledIfEnvironmentVariableIntegrationTests.java | 2 +-
 .../junit/jupiter/api/condition/EnabledIfIntegrationTests.java  | 2 +-
 .../api/condition/EnabledIfSystemPropertyConditionTests.java    | 2 +-
 .../api/condition/EnabledIfSystemPropertyIntegrationTests.java  | 2 +-
 .../junit/jupiter/api/condition/EnabledOnJreConditionTests.java | 2 +-
 .../jupiter/api/condition/EnabledOnJreIntegrationTests.java     | 2 +-
 .../junit/jupiter/api/condition/EnabledOnOsConditionTests.java  | 2 +-
 .../jupiter/api/condition/EnabledOnOsIntegrationTests.java      | 2 +-
 .../src/test/java/org/junit/jupiter/api/condition/JRETests.java | 2 +-
 .../org/junit/jupiter/api/condition/StaticConditionMethods.java | 2 +-
 .../api/extension/CloseableResourceIntegrationTests.java        | 2 +-
 .../api/extension/ExecutableInvokerIntegrationTests.java        | 2 +-
 .../jupiter/api/extension/ExtensionComposabilityTests.java      | 2 +-
 .../org/junit/jupiter/api/extension/KitchenSinkExtension.java   | 2 +-
 .../api/extension/support/TypeBasedParameterResolverTests.java  | 2 +-
 .../junit/jupiter/api/subpackage/SubclassedAssertionsTests.java | 2 +-
 .../jupiter/api/subpackage/SubclassedAssumptionsTests.java      | 2 +-
 .../junit/jupiter/engine/AbstractJupiterTestEngineTests.java    | 2 +-
 .../org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java    | 2 +-
 .../engine/BeforeAllAndAfterAllComposedAnnotationTests.java     | 2 +-
 .../engine/BeforeEachAndAfterEachComposedAnnotationTests.java   | 2 +-
 .../org/junit/jupiter/engine/DefaultExecutionModeTests.java     | 2 +-
 .../test/java/org/junit/jupiter/engine/DefaultMethodTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/engine/DisabledTests.java   | 2 +-
 .../org/junit/jupiter/engine/DynamicNodeGenerationTests.java    | 2 +-
 .../java/org/junit/jupiter/engine/ExceptionHandlingTests.java   | 2 +-
 .../java/org/junit/jupiter/engine/FailedAssumptionsTests.java   | 2 +-
 .../engine/InvalidLifecycleMethodConfigurationTests.java        | 2 +-
 .../org/junit/jupiter/engine/JupiterTestEngineBasicTests.java   | 2 +-
 .../engine/LifecycleMethodOverridingAndSupersedingTests.java    | 2 +-
 .../junit/jupiter/engine/MultipleTestableAnnotationsTests.java  | 2 +-
 .../java/org/junit/jupiter/engine/NestedTestClassesTests.java   | 2 +-
 .../org/junit/jupiter/engine/NestedWithInheritanceTests.java    | 2 +-
 .../jupiter/engine/NestedWithSeparateInheritanceTests.java      | 2 +-
 .../jupiter/engine/NonVoidTestableMethodIntegrationTests.java   | 2 +-
 .../org/junit/jupiter/engine/OverloadedTestMethodTests.java     | 2 +-
 .../src/test/java/org/junit/jupiter/engine/RecordTests.java     | 2 +-
 .../src/test/java/org/junit/jupiter/engine/ReportingTests.java  | 2 +-
 .../test/java/org/junit/jupiter/engine/SealedClassTests.java    | 2 +-
 .../java/org/junit/jupiter/engine/StandardTestClassTests.java   | 2 +-
 .../engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java    | 2 +-
 .../org/junit/jupiter/engine/TestClassInheritanceTests.java     | 2 +-
 .../jupiter/engine/TestInstanceLifecycleConfigurationTests.java | 2 +-
 .../junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java  | 2 +-
 .../org/junit/jupiter/engine/TestInstanceLifecycleTests.java    | 2 +-
 .../org/junit/jupiter/engine/TestTemplateInvocationTests.java   | 2 +-
 .../junit/jupiter/engine/bridge/AbstractNonGenericTests.java    | 2 +-
 .../org/junit/jupiter/engine/bridge/AbstractNumberTests.java    | 2 +-
 .../java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java | 2 +-
 .../org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java | 2 +-
 .../junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java  | 2 +-
 .../java/org/junit/jupiter/engine/bridge/NumberResolver.java    | 2 +-
 .../java/org/junit/jupiter/engine/bridge/NumberTestGroup.java   | 2 +-
 .../org/junit/jupiter/engine/bridge/PackagePrivateParent.java   | 2 +-
 .../jupiter/engine/config/CachingJupiterConfigurationTests.java | 2 +-
 .../jupiter/engine/config/DefaultJupiterConfigurationTests.java | 2 +-
 .../InstantiatingConfigurationParameterConverterTests.java      | 2 +-
 .../jupiter/engine/descriptor/CustomDisplayNameGenerator.java   | 2 +-
 .../junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java  | 2 +-
 .../junit/jupiter/engine/descriptor/ExtensionContextTests.java  | 2 +-
 .../jupiter/engine/descriptor/JupiterTestDescriptorTests.java   | 2 +-
 .../jupiter/engine/descriptor/LifecycleMethodUtilsTests.java    | 2 +-
 .../engine/descriptor/TestFactoryTestDescriptorTests.java       | 2 +-
 .../engine/descriptor/TestInstanceLifecycleUtilsTests.java      | 2 +-
 .../descriptor/TestTemplateInvocationTestDescriptorTests.java   | 2 +-
 .../engine/descriptor/TestTemplateTestDescriptorTests.java      | 2 +-
 .../engine/descriptor/subpackage/Class1WithTestCases.java       | 2 +-
 .../engine/descriptor/subpackage/Class2WithTestCases.java       | 2 +-
 .../descriptor/subpackage/ClassWithStaticInnerTestCases.java    | 2 +-
 .../engine/descriptor/subpackage/ClassWithoutTestCases.java     | 2 +-
 .../engine/discovery/DiscoverySelectorResolverTests.java        | 2 +-
 .../java/org/junit/jupiter/engine/discovery/DiscoveryTests.java | 2 +-
 .../jupiter/engine/discovery/predicates/IsInnerClassTests.java  | 2 +-
 .../engine/discovery/predicates/IsNestedTestClassTests.java     | 2 +-
 .../discovery/predicates/IsPotentialTestContainerTests.java     | 2 +-
 .../engine/discovery/predicates/IsTestClassWithTestsTests.java  | 2 +-
 .../engine/discovery/predicates/IsTestFactoryMethodTests.java   | 2 +-
 .../jupiter/engine/discovery/predicates/IsTestMethodTests.java  | 2 +-
 .../engine/discovery/predicates/IsTestTemplateMethodTests.java  | 2 +-
 .../engine/execution/AbstractExecutableInvokerTests.java        | 2 +-
 .../jupiter/engine/execution/DefaultExecutableInvokerTests.java | 2 +-
 .../jupiter/engine/execution/DefaultTestInstancesTests.java     | 2 +-
 .../jupiter/engine/execution/DynamicTestIntegrationTests.java   | 2 +-
 .../engine/execution/ExtensionContextStoreConcurrencyTests.java | 2 +-
 .../jupiter/engine/execution/ExtensionContextStoreTests.java    | 2 +-
 .../jupiter/engine/execution/ExtensionValuesStoreTests.java     | 2 +-
 .../engine/execution/InterceptingExecutableInvokerTests.java    | 2 +-
 .../engine/execution/JupiterEngineExecutionContextTests.java    | 2 +-
 .../jupiter/engine/execution/ParameterResolutionUtilsTests.java | 2 +-
 .../UniqueIdParsingForArrayParameterIntegrationTests.java       | 2 +-
 .../engine/execution/injection/sample/CustomAnnotation.java     | 2 +-
 .../injection/sample/CustomAnnotationParameterResolver.java     | 2 +-
 .../jupiter/engine/execution/injection/sample/CustomType.java   | 2 +-
 .../execution/injection/sample/CustomTypeParameterResolver.java | 2 +-
 .../execution/injection/sample/DoubleParameterResolver.java     | 2 +-
 .../execution/injection/sample/LongParameterResolver.java       | 2 +-
 .../injection/sample/MapOfListsTypeBasedParameterResolver.java  | 2 +-
 .../injection/sample/MapOfStringsParameterResolver.java         | 2 +-
 .../injection/sample/NullIntegerParameterResolver.java          | 2 +-
 .../execution/injection/sample/NumberParameterResolver.java     | 2 +-
 .../injection/sample/PrimitiveArrayParameterResolver.java       | 2 +-
 .../injection/sample/PrimitiveIntegerParameterResolver.java     | 2 +-
 .../junit/jupiter/engine/extension/BeforeAndAfterAllTests.java  | 2 +-
 .../junit/jupiter/engine/extension/BeforeAndAfterEachTests.java | 2 +-
 .../extension/BeforeAndAfterTestExecutionCallbackTests.java     | 2 +-
 .../jupiter/engine/extension/CloseablePathCleanupTests.java     | 2 +-
 .../org/junit/jupiter/engine/extension/EnigmaException.java     | 2 +-
 .../engine/extension/EventuallyInterruptibleInvocation.java     | 2 +-
 .../junit/jupiter/engine/extension/ExecutionConditionTests.java | 2 +-
 .../engine/extension/ExtensionContextExecutionTests.java        | 2 +-
 .../ExtensionRegistrationViaParametersAndFieldsTests.java       | 2 +-
 .../junit/jupiter/engine/extension/ExtensionRegistryTests.java  | 2 +-
 .../jupiter/engine/extension/InvocationInterceptorTests.java    | 2 +-
 .../LifecycleMethodExecutionExceptionHandlerTests.java          | 2 +-
 .../org/junit/jupiter/engine/extension/OrderedClassTests.java   | 2 +-
 .../org/junit/jupiter/engine/extension/OrderedMethodTests.java  | 2 +-
 .../OrderedProgrammaticExtensionRegistrationTests.java          | 2 +-
 .../junit/jupiter/engine/extension/ParameterResolverTests.java  | 2 +-
 .../extension/ProgrammaticExtensionRegistrationTests.java       | 2 +-
 .../junit/jupiter/engine/extension/RandomlyOrderedTests.java    | 2 +-
 .../org/junit/jupiter/engine/extension/RepeatedTestTests.java   | 2 +-
 .../engine/extension/SameThreadTimeoutInvocationTests.java      | 2 +-
 .../engine/extension/SeparateThreadTimeoutInvocationTest.java   | 2 +-
 .../junit/jupiter/engine/extension/ServiceLoaderExtension.java  | 2 +-
 .../jupiter/engine/extension/TempDirectoryCleanupTests.java     | 2 +-
 .../jupiter/engine/extension/TempDirectoryPerContextTests.java  | 2 +-
 .../engine/extension/TempDirectoryPerDeclarationTests.java      | 2 +-
 .../engine/extension/TempDirectoryPreconditionTests.java        | 2 +-
 .../engine/extension/TestExecutionExceptionHandlerTests.java    | 2 +-
 .../engine/extension/TestInfoParameterResolverTests.java        | 2 +-
 .../jupiter/engine/extension/TestInstanceFactoryTests.java      | 2 +-
 .../TestInstancePostProcessorAndPreDestroyCallbackTests.java    | 2 +-
 .../engine/extension/TestInstancePostProcessorTests.java        | 2 +-
 .../engine/extension/TestInstancePreConstructCallbackTests.java | 2 +-
 .../engine/extension/TestInstancePreDestroyCallbackTests.java   | 2 +-
 .../TestInstancePreDestroyCallbackUtilityMethodTests.java       | 2 +-
 .../engine/extension/TestReporterParameterResolverTests.java    | 2 +-
 .../org/junit/jupiter/engine/extension/TestWatcherTests.java    | 2 +-
 .../jupiter/engine/extension/TimeoutConfigurationTests.java     | 2 +-
 .../jupiter/engine/extension/TimeoutDurationParserTests.java    | 2 +-
 .../junit/jupiter/engine/extension/TimeoutDurationTests.java    | 2 +-
 .../jupiter/engine/extension/TimeoutExceptionFactoryTest.java   | 2 +-
 .../junit/jupiter/engine/extension/TimeoutExtensionTests.java   | 2 +-
 .../jupiter/engine/extension/TimeoutInvocationFactoryTest.java  | 2 +-
 .../jupiter/engine/extension/sub/AlwaysDisabledCondition.java   | 2 +-
 .../engine/extension/sub/AnotherAlwaysDisabledCondition.java    | 2 +-
 .../jupiter/engine/extension/sub/SystemPropertyCondition.java   | 2 +-
 ...PackagePrivateLifecycleMethodInDifferentPackageTestCase.java | 2 +-
 .../OpenTest4JAndJUnit4AwareThrowableCollectorTests.java        | 2 +-
 .../org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt | 2 +-
 .../test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt  | 2 +-
 .../kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt   | 2 +-
 .../jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt      | 2 +-
 .../jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt     | 2 +-
 .../jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt    | 2 +-
 .../junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java  | 2 +-
 .../jupiter/migrationsupport/EnableJUnit4MigrationSupport.java  | 2 +-
 .../jupiter/migrationsupport/conditions/IgnoreCondition.java    | 2 +-
 .../migrationsupport/rules/EnableRuleMigrationSupport.java      | 2 +-
 .../migrationsupport/rules/ExpectedExceptionSupport.java        | 2 +-
 .../jupiter/migrationsupport/rules/ExternalResourceSupport.java | 2 +-
 .../junit/jupiter/migrationsupport/rules/TestRuleSupport.java   | 2 +-
 .../junit/jupiter/migrationsupport/rules/VerifierSupport.java   | 2 +-
 .../migrationsupport/rules/adapter/AbstractTestRuleAdapter.java | 2 +-
 .../rules/adapter/ExpectedExceptionAdapter.java                 | 2 +-
 .../migrationsupport/rules/adapter/ExternalResourceAdapter.java | 2 +-
 .../rules/adapter/GenericBeforeAndAfterAdvice.java              | 2 +-
 .../jupiter/migrationsupport/rules/adapter/VerifierAdapter.java | 2 +-
 .../rules/member/AbstractTestRuleAnnotatedMember.java           | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedField.java   | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedMember.java  | 2 +-
 .../migrationsupport/rules/member/TestRuleAnnotatedMethod.java  | 2 +-
 .../migrationsupport/JupiterMigrationSupportTestSuite.java      | 2 +-
 .../conditions/IgnoreAnnotationIntegrationTests.java            | 2 +-
 .../migrationsupport/conditions/IgnoreConditionTests.java       | 2 +-
 .../migrationsupport/rules/AbstractTestRuleAdapterTests.java    | 2 +-
 .../rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java | 2 +-
 .../migrationsupport/rules/ExpectedExceptionSupportTests.java   | 2 +-
 ...esourceSupportForDifferentDeclaredReturnTypesRulesTests.java | 2 +-
 ...ExternalResourceSupportForMixedMethodAndFieldRulesTests.java | 2 +-
 .../ExternalResourceSupportForMultipleFieldRulesTests.java      | 2 +-
 .../ExternalResourceSupportForMultipleMethodRulesTests.java     | 2 +-
 .../ExternalResourceSupportForTemporaryFolderFieldTests.java    | 2 +-
 .../rules/ExternalResourceSupportWithInheritanceTests.java      | 2 +-
 .../rules/ExternalResourceWithoutAdapterTests.java              | 2 +-
 .../jupiter/migrationsupport/rules/FailAfterAllHelper.java      | 2 +-
 .../rules/LauncherBasedEnableRuleMigrationSupportTests.java     | 2 +-
 .../rules/VerifierSupportForMixedMethodAndFieldRulesTests.java  | 2 +-
 .../rules/WrongExtendWithForVerifierFieldTests.java             | 2 +-
 .../rules/WrongExtendWithForVerifierMethodTests.java            | 2 +-
 .../main/java/org/junit/jupiter/params/ParameterizedTest.java   | 2 +-
 .../org/junit/jupiter/params/ParameterizedTestExtension.java    | 2 +-
 .../jupiter/params/ParameterizedTestInvocationContext.java      | 2 +-
 .../junit/jupiter/params/ParameterizedTestMethodContext.java    | 2 +-
 .../junit/jupiter/params/ParameterizedTestNameFormatter.java    | 2 +-
 .../jupiter/params/ParameterizedTestParameterResolver.java      | 2 +-
 .../java/org/junit/jupiter/params/aggregator/AggregateWith.java | 2 +-
 .../jupiter/params/aggregator/ArgumentAccessException.java      | 2 +-
 .../org/junit/jupiter/params/aggregator/ArgumentsAccessor.java  | 2 +-
 .../params/aggregator/ArgumentsAggregationException.java        | 2 +-
 .../junit/jupiter/params/aggregator/ArgumentsAggregator.java    | 2 +-
 .../jupiter/params/aggregator/DefaultArgumentsAccessor.java     | 2 +-
 .../jupiter/params/converter/ArgumentConversionException.java   | 2 +-
 .../org/junit/jupiter/params/converter/ArgumentConverter.java   | 2 +-
 .../java/org/junit/jupiter/params/converter/ConvertWith.java    | 2 +-
 .../jupiter/params/converter/DefaultArgumentConverter.java      | 2 +-
 .../params/converter/FallbackStringToObjectConverter.java       | 2 +-
 .../jupiter/params/converter/JavaTimeArgumentConverter.java     | 2 +-
 .../jupiter/params/converter/JavaTimeConversionPattern.java     | 2 +-
 .../junit/jupiter/params/converter/SimpleArgumentConverter.java | 2 +-
 .../junit/jupiter/params/converter/TypedArgumentConverter.java  | 2 +-
 .../main/java/org/junit/jupiter/params/provider/Arguments.java  | 2 +-
 .../org/junit/jupiter/params/provider/ArgumentsProvider.java    | 2 +-
 .../java/org/junit/jupiter/params/provider/ArgumentsSource.java | 2 +-
 .../org/junit/jupiter/params/provider/ArgumentsSources.java     | 2 +-
 .../org/junit/jupiter/params/provider/CsvArgumentsProvider.java | 2 +-
 .../junit/jupiter/params/provider/CsvFileArgumentsProvider.java | 2 +-
 .../java/org/junit/jupiter/params/provider/CsvFileSource.java   | 2 +-
 .../org/junit/jupiter/params/provider/CsvParserFactory.java     | 2 +-
 .../org/junit/jupiter/params/provider/CsvParsingException.java  | 2 +-
 .../main/java/org/junit/jupiter/params/provider/CsvSource.java  | 2 +-
 .../junit/jupiter/params/provider/EmptyArgumentsProvider.java   | 2 +-
 .../java/org/junit/jupiter/params/provider/EmptySource.java     | 2 +-
 .../junit/jupiter/params/provider/EnumArgumentsProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/params/provider/EnumSource.java | 2 +-
 .../junit/jupiter/params/provider/MethodArgumentsProvider.java  | 2 +-
 .../java/org/junit/jupiter/params/provider/MethodSource.java    | 2 +-
 .../org/junit/jupiter/params/provider/NullAndEmptySource.java   | 2 +-
 .../junit/jupiter/params/provider/NullArgumentsProvider.java    | 2 +-
 .../main/java/org/junit/jupiter/params/provider/NullEnum.java   | 2 +-
 .../main/java/org/junit/jupiter/params/provider/NullSource.java | 2 +-
 .../junit/jupiter/params/provider/ValueArgumentsProvider.java   | 2 +-
 .../java/org/junit/jupiter/params/provider/ValueSource.java     | 2 +-
 .../org/junit/jupiter/params/support/AnnotationConsumer.java    | 2 +-
 .../jupiter/params/support/AnnotationConsumerInitializer.java   | 2 +-
 .../org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt    | 2 +-
 .../junit/jupiter/params/ParameterizedTestExtensionTests.java   | 2 +-
 .../junit/jupiter/params/ParameterizedTestIntegrationTests.java | 2 +-
 .../jupiter/params/ParameterizedTestMethodContextTests.java     | 2 +-
 .../jupiter/params/ParameterizedTestNameFormatterTests.java     | 2 +-
 .../java/org/junit/jupiter/params/ParameterizedTestSuite.java   | 2 +-
 .../jupiter/params/aggregator/AggregatorIntegrationTests.java   | 2 +-
 .../params/aggregator/DefaultArgumentsAccessorTests.java        | 2 +-
 .../jupiter/params/converter/DefaultArgumentConverterTests.java | 2 +-
 .../params/converter/FallbackStringToObjectConverterTests.java  | 2 +-
 .../params/converter/JavaTimeArgumentConverterTests.java        | 2 +-
 .../jupiter/params/converter/TypedArgumentConverterTests.java   | 2 +-
 .../java/org/junit/jupiter/params/provider/ArgumentsTests.java  | 2 +-
 .../jupiter/params/provider/CsvArgumentsProviderTests.java      | 2 +-
 .../jupiter/params/provider/CsvFileArgumentsProviderTests.java  | 2 +-
 .../jupiter/params/provider/EnumArgumentsProviderTests.java     | 2 +-
 .../java/org/junit/jupiter/params/provider/EnumSourceTests.java | 2 +-
 .../jupiter/params/provider/MethodArgumentsProviderTests.java   | 2 +-
 .../junit/jupiter/params/provider/MockCsvAnnotationBuilder.java | 2 +-
 .../jupiter/params/provider/ValueArgumentsProviderTests.java    | 2 +-
 .../jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt   | 2 +-
 .../org/junit/jupiter/params/aggregator/DisplayNameTests.kt     | 2 +-
 .../main/java/org/junit/platform/commons/JUnitException.java    | 2 +-
 .../junit/platform/commons/PreconditionViolationException.java  | 2 +-
 .../java/org/junit/platform/commons/annotation/Testable.java    | 2 +-
 .../src/main/java/org/junit/platform/commons/function/Try.java  | 2 +-
 .../org/junit/platform/commons/logging/LogRecordListener.java   | 2 +-
 .../main/java/org/junit/platform/commons/logging/Logger.java    | 2 +-
 .../java/org/junit/platform/commons/logging/LoggerFactory.java  | 2 +-
 .../org/junit/platform/commons/support/AnnotationSupport.java   | 2 +-
 .../java/org/junit/platform/commons/support/ClassSupport.java   | 2 +-
 .../junit/platform/commons/support/HierarchyTraversalMode.java  | 2 +-
 .../org/junit/platform/commons/support/ModifierSupport.java     | 2 +-
 .../org/junit/platform/commons/support/ReflectionSupport.java   | 2 +-
 .../java/org/junit/platform/commons/support/SearchOption.java   | 2 +-
 .../java/org/junit/platform/commons/util/AnnotationUtils.java   | 2 +-
 .../org/junit/platform/commons/util/BlacklistedExceptions.java  | 2 +-
 .../java/org/junit/platform/commons/util/ClassFileVisitor.java  | 2 +-
 .../main/java/org/junit/platform/commons/util/ClassFilter.java  | 2 +-
 .../java/org/junit/platform/commons/util/ClassLoaderUtils.java  | 2 +-
 .../platform/commons/util/ClassNamePatternFilterUtils.java      | 2 +-
 .../main/java/org/junit/platform/commons/util/ClassUtils.java   | 2 +-
 .../java/org/junit/platform/commons/util/ClasspathScanner.java  | 2 +-
 .../java/org/junit/platform/commons/util/CloseablePath.java     | 2 +-
 .../java/org/junit/platform/commons/util/CollectionUtils.java   | 2 +-
 .../java/org/junit/platform/commons/util/ExceptionUtils.java    | 2 +-
 .../java/org/junit/platform/commons/util/FunctionUtils.java     | 2 +-
 .../src/main/java/org/junit/platform/commons/util/LruCache.java | 2 +-
 .../main/java/org/junit/platform/commons/util/ModuleUtils.java  | 2 +-
 .../main/java/org/junit/platform/commons/util/PackageUtils.java | 2 +-
 .../platform/commons/util/PreconditionViolationException.java   | 2 +-
 .../java/org/junit/platform/commons/util/Preconditions.java     | 2 +-
 .../java/org/junit/platform/commons/util/ReflectionUtils.java   | 2 +-
 .../main/java/org/junit/platform/commons/util/RuntimeUtils.java | 2 +-
 .../main/java/org/junit/platform/commons/util/StringUtils.java  | 2 +-
 .../java/org/junit/platform/commons/util/ToStringBuilder.java   | 2 +-
 .../junit/platform/commons/util/UnrecoverableExceptions.java    | 2 +-
 .../main/java9/org/junit/platform/commons/util/ModuleUtils.java | 2 +-
 .../junit/platform/commons/test/ConcurrencyTestingUtils.java    | 2 +-
 .../main/java/org/junit/platform/console/ConsoleLauncher.java   | 2 +-
 .../junit/platform/console/ConsoleLauncherExecutionResult.java  | 2 +-
 .../org/junit/platform/console/options/AvailableOptions.java    | 2 +-
 .../platform/console/options/ClasspathEntriesConverter.java     | 2 +-
 .../org/junit/platform/console/options/CommandLineOptions.java  | 2 +-
 .../platform/console/options/CommandLineOptionsParser.java      | 2 +-
 .../java/org/junit/platform/console/options/ConsoleUtils.java   | 2 +-
 .../main/java/org/junit/platform/console/options/Details.java   | 2 +-
 .../console/options/PicocliCommandLineOptionsParser.java        | 2 +-
 .../org/junit/platform/console/options/SelectorConverter.java   | 2 +-
 .../src/main/java/org/junit/platform/console/options/Theme.java | 2 +-
 .../src/main/java/org/junit/platform/console/tasks/Color.java   | 2 +-
 .../java/org/junit/platform/console/tasks/ColorPalette.java     | 2 +-
 .../org/junit/platform/console/tasks/ConsoleTestExecutor.java   | 2 +-
 .../console/tasks/CustomContextClassLoaderExecutor.java         | 2 +-
 .../junit/platform/console/tasks/DiscoveryRequestCreator.java   | 2 +-
 .../org/junit/platform/console/tasks/FlatPrintingListener.java  | 2 +-
 .../src/main/java/org/junit/platform/console/tasks/Style.java   | 2 +-
 .../main/java/org/junit/platform/console/tasks/TreeNode.java    | 2 +-
 .../main/java/org/junit/platform/console/tasks/TreePrinter.java | 2 +-
 .../org/junit/platform/console/tasks/TreePrintingListener.java  | 2 +-
 .../platform/console/tasks/VerboseTreePrintingListener.java     | 2 +-
 .../java17/org/junit/platform/console/options/ConsoleUtils.java | 2 +-
 .../org/junit/platform/console/ConsoleLauncherToolProvider.java | 2 +-
 .../main/java/org/junit/platform/engine/CompositeFilter.java    | 2 +-
 .../java/org/junit/platform/engine/ConfigurationParameters.java | 2 +-
 .../main/java/org/junit/platform/engine/DiscoveryFilter.java    | 2 +-
 .../main/java/org/junit/platform/engine/DiscoverySelector.java  | 2 +-
 .../java/org/junit/platform/engine/EngineDiscoveryListener.java | 2 +-
 .../java/org/junit/platform/engine/EngineDiscoveryRequest.java  | 2 +-
 .../java/org/junit/platform/engine/EngineExecutionListener.java | 2 +-
 .../main/java/org/junit/platform/engine/ExecutionRequest.java   | 2 +-
 .../src/main/java/org/junit/platform/engine/Filter.java         | 2 +-
 .../src/main/java/org/junit/platform/engine/FilterResult.java   | 2 +-
 .../org/junit/platform/engine/SelectorResolutionResult.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestDescriptor.java | 2 +-
 .../src/main/java/org/junit/platform/engine/TestEngine.java     | 2 +-
 .../java/org/junit/platform/engine/TestExecutionResult.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestSource.java     | 2 +-
 .../src/main/java/org/junit/platform/engine/TestTag.java        | 2 +-
 .../src/main/java/org/junit/platform/engine/UniqueId.java       | 2 +-
 .../src/main/java/org/junit/platform/engine/UniqueIdFormat.java | 2 +-
 .../platform/engine/discovery/AbstractClassNameFilter.java      | 2 +-
 .../org/junit/platform/engine/discovery/ClassNameFilter.java    | 2 +-
 .../java/org/junit/platform/engine/discovery/ClassSelector.java | 2 +-
 .../platform/engine/discovery/ClasspathResourceSelector.java    | 2 +-
 .../junit/platform/engine/discovery/ClasspathRootSelector.java  | 2 +-
 .../org/junit/platform/engine/discovery/DirectorySelector.java  | 2 +-
 .../org/junit/platform/engine/discovery/DiscoverySelectors.java | 2 +-
 .../junit/platform/engine/discovery/ExcludeClassNameFilter.java | 2 +-
 .../platform/engine/discovery/ExcludePackageNameFilter.java     | 2 +-
 .../java/org/junit/platform/engine/discovery/FilePosition.java  | 2 +-
 .../java/org/junit/platform/engine/discovery/FileSelector.java  | 2 +-
 .../junit/platform/engine/discovery/IncludeClassNameFilter.java | 2 +-
 .../platform/engine/discovery/IncludePackageNameFilter.java     | 2 +-
 .../org/junit/platform/engine/discovery/IterationSelector.java  | 2 +-
 .../org/junit/platform/engine/discovery/MethodSelector.java     | 2 +-
 .../org/junit/platform/engine/discovery/ModuleSelector.java     | 2 +-
 .../junit/platform/engine/discovery/NestedClassSelector.java    | 2 +-
 .../junit/platform/engine/discovery/NestedMethodSelector.java   | 2 +-
 .../org/junit/platform/engine/discovery/PackageNameFilter.java  | 2 +-
 .../org/junit/platform/engine/discovery/PackageSelector.java    | 2 +-
 .../org/junit/platform/engine/discovery/UniqueIdSelector.java   | 2 +-
 .../java/org/junit/platform/engine/discovery/UriSelector.java   | 2 +-
 .../java/org/junit/platform/engine/reporting/ReportEntry.java   | 2 +-
 .../engine/support/config/PrefixedConfigurationParameters.java  | 2 +-
 .../engine/support/descriptor/AbstractTestDescriptor.java       | 2 +-
 .../junit/platform/engine/support/descriptor/ClassSource.java   | 2 +-
 .../engine/support/descriptor/ClasspathResourceSource.java      | 2 +-
 .../platform/engine/support/descriptor/CompositeTestSource.java | 2 +-
 .../platform/engine/support/descriptor/DefaultUriSource.java    | 2 +-
 .../platform/engine/support/descriptor/DirectorySource.java     | 2 +-
 .../platform/engine/support/descriptor/EngineDescriptor.java    | 2 +-
 .../junit/platform/engine/support/descriptor/FilePosition.java  | 2 +-
 .../junit/platform/engine/support/descriptor/FileSource.java    | 2 +-
 .../platform/engine/support/descriptor/FileSystemSource.java    | 2 +-
 .../junit/platform/engine/support/descriptor/MethodSource.java  | 2 +-
 .../junit/platform/engine/support/descriptor/PackageSource.java | 2 +-
 .../junit/platform/engine/support/descriptor/ResourceUtils.java | 2 +-
 .../org/junit/platform/engine/support/descriptor/UriSource.java | 2 +-
 .../support/discovery/ClassContainerSelectorResolver.java       | 2 +-
 .../support/discovery/EngineDiscoveryRequestResolution.java     | 2 +-
 .../support/discovery/EngineDiscoveryRequestResolver.java       | 2 +-
 .../platform/engine/support/discovery/SelectorResolver.java     | 2 +-
 .../engine/support/filter/ClasspathScanningSupport.java         | 2 +-
 .../platform/engine/support/hierarchical/CompositeLock.java     | 2 +-
 .../hierarchical/DefaultParallelExecutionConfiguration.java     | 2 +-
 .../DefaultParallelExecutionConfigurationStrategy.java          | 2 +-
 .../engine/support/hierarchical/EngineExecutionContext.java     | 2 +-
 .../platform/engine/support/hierarchical/ExclusiveResource.java | 2 +-
 .../ForkJoinPoolHierarchicalTestExecutorService.java            | 2 +-
 .../engine/support/hierarchical/HierarchicalTestEngine.java     | 2 +-
 .../engine/support/hierarchical/HierarchicalTestExecutor.java   | 2 +-
 .../support/hierarchical/HierarchicalTestExecutorService.java   | 2 +-
 .../junit/platform/engine/support/hierarchical/LockManager.java | 2 +-
 .../org/junit/platform/engine/support/hierarchical/Node.java    | 2 +-
 .../engine/support/hierarchical/NodeExecutionAdvisor.java       | 2 +-
 .../platform/engine/support/hierarchical/NodeTestTask.java      | 2 +-
 .../engine/support/hierarchical/NodeTestTaskContext.java        | 2 +-
 .../platform/engine/support/hierarchical/NodeTreeWalker.java    | 2 +-
 .../junit/platform/engine/support/hierarchical/NodeUtils.java   | 2 +-
 .../org/junit/platform/engine/support/hierarchical/NopLock.java | 2 +-
 .../support/hierarchical/OpenTest4JAwareThrowableCollector.java | 2 +-
 .../support/hierarchical/ParallelExecutionConfiguration.java    | 2 +-
 .../hierarchical/ParallelExecutionConfigurationStrategy.java    | 2 +-
 .../platform/engine/support/hierarchical/ResourceLock.java      | 2 +-
 .../hierarchical/SameThreadHierarchicalTestExecutorService.java | 2 +-
 .../junit/platform/engine/support/hierarchical/SingleLock.java  | 2 +-
 .../engine/support/hierarchical/SingleTestExecutor.java         | 2 +-
 .../engine/support/hierarchical/ThrowableCollector.java         | 2 +-
 .../engine/support/hierarchical/DemoEngineExecutionContext.java | 2 +-
 .../hierarchical/DemoHierarchicalContainerDescriptor.java       | 2 +-
 .../support/hierarchical/DemoHierarchicalEngineDescriptor.java  | 2 +-
 .../support/hierarchical/DemoHierarchicalTestDescriptor.java    | 2 +-
 .../engine/support/hierarchical/DemoHierarchicalTestEngine.java | 2 +-
 .../java/org/junit/platform/fakes/TestDescriptorStub.java       | 2 +-
 .../java/org/junit/platform/fakes/TestEngineSpy.java            | 2 +-
 .../java/org/junit/platform/fakes/TestEngineStub.java           | 2 +-
 .../junit/platform/jfr/FlightRecordingDiscoveryListener.java    | 2 +-
 .../junit/platform/jfr/FlightRecordingExecutionListener.java    | 2 +-
 .../src/main/java/org/junit/platform/jfr/UniqueId.java          | 2 +-
 .../java/org/junit/platform/launcher/EngineDiscoveryResult.java | 2 +-
 .../src/main/java/org/junit/platform/launcher/EngineFilter.java | 2 +-
 .../src/main/java/org/junit/platform/launcher/Launcher.java     | 2 +-
 .../java/org/junit/platform/launcher/LauncherConstants.java     | 2 +-
 .../org/junit/platform/launcher/LauncherDiscoveryListener.java  | 2 +-
 .../org/junit/platform/launcher/LauncherDiscoveryRequest.java   | 2 +-
 .../main/java/org/junit/platform/launcher/LauncherSession.java  | 2 +-
 .../org/junit/platform/launcher/LauncherSessionListener.java    | 2 +-
 .../java/org/junit/platform/launcher/PostDiscoveryFilter.java   | 2 +-
 .../src/main/java/org/junit/platform/launcher/TagFilter.java    | 2 +-
 .../java/org/junit/platform/launcher/TestExecutionListener.java | 2 +-
 .../main/java/org/junit/platform/launcher/TestIdentifier.java   | 2 +-
 .../src/main/java/org/junit/platform/launcher/TestPlan.java     | 2 +-
 .../launcher/core/CompositeEngineExecutionListener.java         | 2 +-
 .../platform/launcher/core/CompositeTestExecutionListener.java  | 2 +-
 .../junit/platform/launcher/core/DefaultDiscoveryRequest.java   | 2 +-
 .../java/org/junit/platform/launcher/core/DefaultLauncher.java  | 2 +-
 .../org/junit/platform/launcher/core/DefaultLauncherConfig.java | 2 +-
 .../junit/platform/launcher/core/DefaultLauncherSession.java    | 2 +-
 .../launcher/core/DelegatingEngineExecutionListener.java        | 2 +-
 .../platform/launcher/core/EngineDiscoveryErrorDescriptor.java  | 2 +-
 .../platform/launcher/core/EngineDiscoveryOrchestrator.java     | 2 +-
 .../platform/launcher/core/EngineDiscoveryResultValidator.java  | 2 +-
 .../platform/launcher/core/EngineExecutionOrchestrator.java     | 2 +-
 .../java/org/junit/platform/launcher/core/EngineFilterer.java   | 2 +-
 .../org/junit/platform/launcher/core/EngineIdValidator.java     | 2 +-
 .../junit/platform/launcher/core/ExecutionListenerAdapter.java  | 2 +-
 .../java/org/junit/platform/launcher/core/InternalLauncher.java | 2 +-
 .../java/org/junit/platform/launcher/core/InternalTestPlan.java | 2 +-
 .../java/org/junit/platform/launcher/core/LauncherConfig.java   | 2 +-
 .../platform/launcher/core/LauncherConfigurationParameters.java | 2 +-
 .../platform/launcher/core/LauncherDiscoveryRequestBuilder.java | 2 +-
 .../junit/platform/launcher/core/LauncherDiscoveryResult.java   | 2 +-
 .../java/org/junit/platform/launcher/core/LauncherFactory.java  | 2 +-
 .../java/org/junit/platform/launcher/core/ListenerRegistry.java | 2 +-
 .../launcher/core/OutcomeDelayingEngineExecutionListener.java   | 2 +-
 .../org/junit/platform/launcher/core/ServiceLoaderRegistry.java | 2 +-
 .../platform/launcher/core/ServiceLoaderTestEngineRegistry.java | 2 +-
 .../junit/platform/launcher/core/SessionPerRequestLauncher.java | 2 +-
 .../launcher/core/StreamInterceptingTestExecutionListener.java  | 2 +-
 .../org/junit/platform/launcher/core/StreamInterceptor.java     | 2 +-
 .../org/junit/platform/launcher/core/TestEngineFormatter.java   | 2 +-
 .../junit/platform/launcher/listeners/LegacyReportingUtils.java | 2 +-
 .../org/junit/platform/launcher/listeners/LoggingListener.java  | 2 +-
 .../launcher/listeners/MutableTestExecutionSummary.java         | 2 +-
 .../java/org/junit/platform/launcher/listeners/OutputDir.java   | 2 +-
 .../platform/launcher/listeners/SummaryGeneratingListener.java  | 2 +-
 .../junit/platform/launcher/listeners/TestExecutionSummary.java | 2 +-
 .../platform/launcher/listeners/UniqueIdTrackingListener.java   | 2 +-
 .../discovery/AbortOnFailureLauncherDiscoveryListener.java      | 2 +-
 .../listeners/discovery/CompositeLauncherDiscoveryListener.java | 2 +-
 .../listeners/discovery/LauncherDiscoveryListeners.java         | 2 +-
 .../listeners/discovery/LoggingLauncherDiscoveryListener.java   | 2 +-
 .../listeners/session/CompositeLauncherSessionListener.java     | 2 +-
 .../launcher/listeners/session/LauncherSessionListeners.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/DequeStack.java   | 2 +-
 .../org/junit/platform/launcher/tagexpression/Operator.java     | 2 +-
 .../org/junit/platform/launcher/tagexpression/Operators.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseResult.java  | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseResults.java | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParseStatus.java  | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Parser.java  | 2 +-
 .../org/junit/platform/launcher/tagexpression/ShuntingYard.java | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Stack.java   | 2 +-
 .../junit/platform/launcher/tagexpression/TagExpression.java    | 2 +-
 .../junit/platform/launcher/tagexpression/TagExpressions.java   | 2 +-
 .../java/org/junit/platform/launcher/tagexpression/Token.java   | 2 +-
 .../org/junit/platform/launcher/tagexpression/TokenWith.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/Tokenizer.java    | 2 +-
 .../launcher/core/ConfigurationParametersFactoryForTests.java   | 2 +-
 .../launcher/core/LauncherFactoryForTestingPurposesOnly.java    | 2 +-
 .../junit/platform/reporting/legacy/LegacyReportingUtils.java   | 2 +-
 .../reporting/legacy/xml/LegacyXmlReportGeneratingListener.java | 2 +-
 .../org/junit/platform/reporting/legacy/xml/XmlReportData.java  | 2 +-
 .../junit/platform/reporting/legacy/xml/XmlReportWriter.java    | 2 +-
 .../org/junit/platform/reporting/open/xml/JUnitFactory.java     | 2 +-
 .../junit/platform/reporting/open/xml/LegacyReportingName.java  | 2 +-
 .../reporting/open/xml/OpenTestReportGeneratingListener.java    | 2 +-
 .../main/java/org/junit/platform/reporting/open/xml/Type.java   | 2 +-
 .../java/org/junit/platform/reporting/open/xml/UniqueId.java    | 2 +-
 .../src/main/java/org/junit/platform/runner/JUnitPlatform.java  | 2 +-
 .../org/junit/platform/runner/JUnitPlatformRunnerListener.java  | 2 +-
 .../java/org/junit/platform/runner/JUnitPlatformTestTree.java   | 2 +-
 .../org/junit/platform/suite/api/ConfigurationParameter.java    | 2 +-
 .../org/junit/platform/suite/api/ConfigurationParameters.java   | 2 +-
 .../suite/api/DisableParentConfigurationParameters.java         | 2 +-
 .../org/junit/platform/suite/api/ExcludeClassNamePatterns.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/ExcludeEngines.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/ExcludePackages.java | 2 +-
 .../src/main/java/org/junit/platform/suite/api/ExcludeTags.java | 2 +-
 .../org/junit/platform/suite/api/IncludeClassNamePatterns.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/IncludeEngines.java  | 2 +-
 .../main/java/org/junit/platform/suite/api/IncludePackages.java | 2 +-
 .../src/main/java/org/junit/platform/suite/api/IncludeTags.java | 2 +-
 .../main/java/org/junit/platform/suite/api/SelectClasses.java   | 2 +-
 .../org/junit/platform/suite/api/SelectClasspathResource.java   | 2 +-
 .../org/junit/platform/suite/api/SelectClasspathResources.java  | 2 +-
 .../java/org/junit/platform/suite/api/SelectDirectories.java    | 2 +-
 .../src/main/java/org/junit/platform/suite/api/SelectFile.java  | 2 +-
 .../src/main/java/org/junit/platform/suite/api/SelectFiles.java | 2 +-
 .../main/java/org/junit/platform/suite/api/SelectModules.java   | 2 +-
 .../main/java/org/junit/platform/suite/api/SelectPackages.java  | 2 +-
 .../src/main/java/org/junit/platform/suite/api/SelectUris.java  | 2 +-
 .../src/main/java/org/junit/platform/suite/api/Suite.java       | 2 +-
 .../java/org/junit/platform/suite/api/SuiteDisplayName.java     | 2 +-
 .../java/org/junit/platform/suite/api/UseTechnicalNames.java    | 2 +-
 .../platform/suite/commons/AdditionalDiscoverySelectors.java    | 2 +-
 .../suite/commons/SuiteLauncherDiscoveryRequestBuilder.java     | 2 +-
 .../org/junit/platform/suite/engine/ClassSelectorResolver.java  | 2 +-
 .../junit/platform/suite/engine/DiscoverySelectorResolver.java  | 2 +-
 .../junit/platform/suite/engine/IsPotentialTestContainer.java   | 2 +-
 .../main/java/org/junit/platform/suite/engine/IsSuiteClass.java | 2 +-
 .../junit/platform/suite/engine/NoTestsDiscoveredException.java | 2 +-
 .../org/junit/platform/suite/engine/SuiteEngineDescriptor.java  | 2 +-
 .../java/org/junit/platform/suite/engine/SuiteLauncher.java     | 2 +-
 .../org/junit/platform/suite/engine/SuiteTestDescriptor.java    | 2 +-
 .../java/org/junit/platform/suite/engine/SuiteTestEngine.java   | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Assertions.java | 2 +-
 .../junit/platform/testkit/engine/EngineExecutionResults.java   | 2 +-
 .../java/org/junit/platform/testkit/engine/EngineTestKit.java   | 2 +-
 .../src/main/java/org/junit/platform/testkit/engine/Event.java  | 2 +-
 .../java/org/junit/platform/testkit/engine/EventConditions.java | 2 +-
 .../java/org/junit/platform/testkit/engine/EventStatistics.java | 2 +-
 .../main/java/org/junit/platform/testkit/engine/EventType.java  | 2 +-
 .../src/main/java/org/junit/platform/testkit/engine/Events.java | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Execution.java  | 2 +-
 .../org/junit/platform/testkit/engine/ExecutionRecorder.java    | 2 +-
 .../main/java/org/junit/platform/testkit/engine/Executions.java | 2 +-
 .../java/org/junit/platform/testkit/engine/TerminationInfo.java | 2 +-
 .../platform/testkit/engine/TestExecutionResultConditions.java  | 2 +-
 .../main/java/org/junit/vintage/engine/JUnit4VersionCheck.java  | 2 +-
 .../main/java/org/junit/vintage/engine/VintageTestEngine.java   | 2 +-
 .../org/junit/vintage/engine/descriptor/DescriptionUtils.java   | 2 +-
 .../main/java/org/junit/vintage/engine/descriptor/OrFilter.java | 2 +-
 .../org/junit/vintage/engine/descriptor/RunnerDecorator.java    | 2 +-
 .../java/org/junit/vintage/engine/descriptor/RunnerRequest.java | 2 +-
 .../junit/vintage/engine/descriptor/RunnerTestDescriptor.java   | 2 +-
 .../org/junit/vintage/engine/descriptor/TestSourceProvider.java | 2 +-
 .../vintage/engine/descriptor/VintageEngineDescriptor.java      | 2 +-
 .../junit/vintage/engine/descriptor/VintageTestDescriptor.java  | 2 +-
 .../junit/vintage/engine/discovery/ClassSelectorResolver.java   | 2 +-
 .../discovery/DefensiveAllDefaultPossibilitiesBuilder.java      | 2 +-
 .../engine/discovery/FilterableIgnoringRunnerDecorator.java     | 2 +-
 .../junit/vintage/engine/discovery/IgnoringRunnerDecorator.java | 2 +-
 .../vintage/engine/discovery/IsPotentialJUnit4TestClass.java    | 2 +-
 .../vintage/engine/discovery/IsPotentialJUnit4TestMethod.java   | 2 +-
 .../junit/vintage/engine/discovery/MethodSelectorResolver.java  | 2 +-
 .../engine/discovery/RunnerTestDescriptorPostProcessor.java     | 2 +-
 .../java/org/junit/vintage/engine/discovery/UniqueIdFilter.java | 2 +-
 .../org/junit/vintage/engine/discovery/VintageDiscoverer.java   | 2 +-
 .../main/java/org/junit/vintage/engine/execution/EventType.java | 2 +-
 .../org/junit/vintage/engine/execution/RunListenerAdapter.java  | 2 +-
 .../java/org/junit/vintage/engine/execution/RunnerExecutor.java | 2 +-
 .../main/java/org/junit/vintage/engine/execution/TestRun.java   | 2 +-
 .../java/org/junit/vintage/engine/support/UniqueIdReader.java   | 2 +-
 .../org/junit/vintage/engine/support/UniqueIdStringifier.java   | 2 +-
 .../java/org/junit/vintage/engine/JUnit4ParameterizedTests.java | 2 +-
 .../java/org/junit/vintage/engine/JUnit4VersionCheckTests.java  | 2 +-
 .../junit/vintage/engine/VintageLauncherIntegrationTests.java   | 2 +-
 .../org/junit/vintage/engine/VintageTestEngineBasicTests.java   | 2 +-
 .../junit/vintage/engine/VintageTestEngineDiscoveryTests.java   | 2 +-
 .../junit/vintage/engine/VintageTestEngineExecutionTests.java   | 2 +-
 .../org/junit/vintage/engine/VintageTestEngineTestSuite.java    | 2 +-
 .../java/org/junit/vintage/engine/VintageUniqueIdBuilder.java   | 2 +-
 .../junit/vintage/engine/descriptor/DescriptionUtilsTests.java  | 2 +-
 .../java/org/junit/vintage/engine/descriptor/OrFilterTests.java | 2 +-
 .../vintage/engine/descriptor/TestSourceProviderTests.java      | 2 +-
 .../vintage/engine/descriptor/VintageTestDescriptorTests.java   | 2 +-
 .../engine/discovery/IsPotentialJUnit4TestClassTests.java       | 2 +-
 .../discovery/RunnerTestDescriptorPostProcessorTests.java       | 2 +-
 .../junit/vintage/engine/discovery/VintageDiscovererTests.java  | 2 +-
 .../java/org/junit/vintage/engine/execution/TestRunTests.java   | 2 +-
 .../org/junit/vintage/engine/support/UniqueIdReaderTests.java   | 2 +-
 .../junit/vintage/engine/support/UniqueIdStringifierTests.java  | 2 +-
 .../samples/PlainOldJavaClassWithoutAnyTestsTestCase.java       | 2 +-
 .../vintage/engine/samples/junit3/AbstractJUnit3TestCase.java   | 2 +-
 .../engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java | 2 +-
 .../JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java  | 2 +-
 .../vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java | 2 +-
 .../junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java     | 2 +-
 .../vintage/engine/samples/junit4/AbstractJUnit4TestCase.java   | 2 +-
 .../junit4/AbstractJunit4TestCaseWithConstructorParameter.java  | 2 +-
 .../org/junit/vintage/engine/samples/junit4/Categories.java     | 2 +-
 .../engine/samples/junit4/CompletelyDynamicTestCase.java        | 2 +-
 .../vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java   | 2 +-
 .../junit/vintage/engine/samples/junit4/ConfigurableRunner.java | 2 +-
 .../org/junit/vintage/engine/samples/junit4/DynamicRunner.java  | 2 +-
 .../vintage/engine/samples/junit4/EmptyIgnoredTestCase.java     | 2 +-
 .../vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java   | 2 +-
 .../junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java | 2 +-
 .../vintage/engine/samples/junit4/ExceptionThrowingRunner.java  | 2 +-
 .../vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java    | 2 +-
 .../junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java    | 2 +-
 .../engine/samples/junit4/IgnoredParameterizedTestCase.java     | 2 +-
 .../engine/samples/junit4/JUnit4ParameterizedTestCase.java      | 2 +-
 .../junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java     | 2 +-
 .../junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java     | 2 +-
 ...iteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java | 2 +-
 ...it4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java | 2 +-
 .../samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java  | 2 +-
 .../samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java    | 2 +-
 .../junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java    | 2 +-
 ...iteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java | 2 +-
 .../JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java    | 2 +-
 ...stCaseWithFailingDescriptionThatIsNotReportedAsFinished.java | 2 +-
 ...it4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java | 2 +-
 ...uiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java | 2 +-
 .../engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java      | 2 +-
 .../JUnit4TestCaseWithAssumptionFailureInBeforeClass.java       | 2 +-
 .../JUnit4TestCaseWithDistinguishableOverloadedMethod.java      | 2 +-
 ...JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java | 2 +-
 .../samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java     | 2 +-
 .../samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java    | 2 +-
 .../junit4/JUnit4TestCaseWithExceptionThrowingRunner.java       | 2 +-
 ...stCaseWithFailingDescriptionThatIsNotReportedAsFinished.java | 2 +-
 .../JUnit4TestCaseWithIndistinguishableOverloadedMethod.java    | 2 +-
 .../samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java   | 2 +-
 ...it4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java | 2 +-
 ...estCaseWithRunnerWithDuplicateChangingChildDescriptions.java | 2 +-
 .../vintage/engine/samples/junit4/MalformedJUnit4TestCase.java  | 2 +-
 .../vintage/engine/samples/junit4/NotFilterableRunner.java      | 2 +-
 .../vintage/engine/samples/junit4/ParameterizedTestCase.java    | 2 +-
 .../engine/samples/junit4/ParameterizedTimingTestCase.java      | 2 +-
 .../junit4/ParameterizedWithAfterParamFailureTestCase.java      | 2 +-
 .../junit4/ParameterizedWithBeforeParamFailureTestCase.java     | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java  | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java | 2 +-
 .../PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java   | 2 +-
 .../junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java     | 2 +-
 .../junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java | 2 +-
 .../samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java   | 2 +-
 .../engine/samples/junit4/RunnerThatOnlyReportsFailures.java    | 2 +-
 .../junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java        | 2 +-
 .../engine/samples/junit4/SingleFailingTheoryTestCase.java      | 2 +-
 .../samples/junit4/TestCaseRunWithJUnitPlatformRunner.java      | 2 +-
 .../src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java | 2 +-
 platform-tests/src/test/java/DefaultPackageTestCase.java        | 2 +-
 .../src/test/java/org/junit/jupiter/api/condition/OSTests.java  | 2 +-
 .../src/test/java/org/junit/jupiter/extensions/Heavyweight.java | 2 +-
 .../java/org/junit/jupiter/extensions/HeavyweightTests.java     | 2 +-
 .../java/org/junit/platform/AbstractEqualsAndHashCodeTests.java | 2 +-
 .../test/java/org/junit/platform/JUnitPlatformTestSuite.java    | 2 +-
 .../src/test/java/org/junit/platform/TestEngineTests.java       | 2 +-
 .../platform/commons/annotation/TestableAnnotationTests.java    | 2 +-
 .../test/java/org/junit/platform/commons/function/TryTests.java | 2 +-
 .../junit/platform/commons/support/AnnotationSupportTests.java  | 2 +-
 .../org/junit/platform/commons/support/ClassSupportTests.java   | 2 +-
 .../junit/platform/commons/support/ModifierSupportTests.java    | 2 +-
 .../junit/platform/commons/support/PreconditionAssertions.java  | 2 +-
 .../junit/platform/commons/support/ReflectionSupportTests.java  | 2 +-
 .../org/junit/platform/commons/util/AnnotationUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ClassLoaderUtilsTests.java  | 2 +-
 .../platform/commons/util/ClassNamePatternFilterUtilsTests.java | 2 +-
 .../java/org/junit/platform/commons/util/ClassUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ClasspathScannerTests.java  | 2 +-
 .../org/junit/platform/commons/util/CollectionUtilsTests.java   | 2 +-
 .../org/junit/platform/commons/util/ExceptionUtilsTests.java    | 2 +-
 .../org/junit/platform/commons/util/FunctionUtilsTests.java     | 2 +-
 .../java/org/junit/platform/commons/util/LruCacheTests.java     | 2 +-
 .../java/org/junit/platform/commons/util/ModuleUtilsTests.java  | 2 +-
 .../java/org/junit/platform/commons/util/PackageUtilsTests.java | 2 +-
 .../org/junit/platform/commons/util/PreconditionsTests.java     | 2 +-
 .../org/junit/platform/commons/util/ReflectionUtilsTests.java   | 2 +-
 .../util/ReflectionUtilsWithGenericTypeHierarchiesTests.java    | 2 +-
 .../java/org/junit/platform/commons/util/RuntimeUtilsTests.java | 2 +-
 .../org/junit/platform/commons/util/SerializationUtils.java     | 2 +-
 .../java/org/junit/platform/commons/util/StringUtilsTests.java  | 2 +-
 .../org/junit/platform/commons/util/ToStringBuilderTests.java   | 2 +-
 .../platform/commons/util/classes/AExecutionConditionClass.java | 2 +-
 .../commons/util/classes/ATestExecutionListenerClass.java       | 2 +-
 .../org/junit/platform/commons/util/classes/AVanillaEmpty.java  | 2 +-
 .../platform/commons/util/classes/BExecutionConditionClass.java | 2 +-
 .../commons/util/classes/BTestExecutionListenerClass.java       | 2 +-
 .../org/junit/platform/commons/util/classes/BVanillaEmpty.java  | 2 +-
 .../java/org/junit/platform/console/ConsoleDetailsTests.java    | 2 +-
 .../platform/console/ConsoleLauncherExecutionResultTests.java   | 2 +-
 .../junit/platform/console/ConsoleLauncherIntegrationTests.java | 2 +-
 .../java/org/junit/platform/console/ConsoleLauncherTests.java   | 2 +-
 .../java/org/junit/platform/console/ConsoleLauncherWrapper.java | 2 +-
 .../junit/platform/console/ConsoleLauncherWrapperResult.java    | 2 +-
 .../org/junit/platform/console/options/ConsoleUtilsTests.java   | 2 +-
 .../console/options/PicocliCommandLineOptionsParserTests.java   | 2 +-
 .../java/org/junit/platform/console/options/ThemeTests.java     | 2 +-
 .../platform/console/subpackage/ContainerForInnerTest.java      | 2 +-
 .../platform/console/subpackage/ContainerForInnerTests.java     | 2 +-
 .../console/subpackage/ContainerForStaticNestedTest.java        | 2 +-
 .../console/subpackage/ContainerForStaticNestedTests.java       | 2 +-
 .../java/org/junit/platform/console/subpackage/SecondTest.java  | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Test.java   | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Test1.java  | 2 +-
 .../test/java/org/junit/platform/console/subpackage/Tests.java  | 2 +-
 .../java/org/junit/platform/console/subpackage/ThirdTests.java  | 2 +-
 .../org/junit/platform/console/tasks/ColorPaletteTests.java     | 2 +-
 .../junit/platform/console/tasks/ConsoleTestExecutorTests.java  | 2 +-
 .../console/tasks/CustomContextClassLoaderExecutorTests.java    | 2 +-
 .../platform/console/tasks/DiscoveryRequestCreatorTests.java    | 2 +-
 .../junit/platform/console/tasks/FlatPrintingListenerTests.java | 2 +-
 .../java/org/junit/platform/console/tasks/TreeNodeTests.java    | 2 +-
 .../java/org/junit/platform/console/tasks/TreePrinterTests.java | 2 +-
 .../junit/platform/console/tasks/VerboseTreeListenerTests.java  | 2 +-
 .../java/org/junit/platform/engine/FilterCompositionTests.java  | 2 +-
 .../java/org/junit/platform/engine/TestDescriptorTests.java     | 2 +-
 .../src/test/java/org/junit/platform/engine/TestTagTests.java   | 2 +-
 .../java/org/junit/platform/engine/UniqueIdFormatTests.java     | 2 +-
 .../src/test/java/org/junit/platform/engine/UniqueIdTests.java  | 2 +-
 .../junit/platform/engine/discovery/ClassNameFilterTests.java   | 2 +-
 .../org/junit/platform/engine/discovery/ClassSelectorTests.java | 2 +-
 .../engine/discovery/ClasspathResourceSelectorTests.java        | 2 +-
 .../platform/engine/discovery/ClasspathRootSelectorTests.java   | 2 +-
 .../junit/platform/engine/discovery/DirectorySelectorTests.java | 2 +-
 .../platform/engine/discovery/DiscoverySelectorsTests.java      | 2 +-
 .../org/junit/platform/engine/discovery/FilePositionTests.java  | 2 +-
 .../org/junit/platform/engine/discovery/FileSelectorTests.java  | 2 +-
 .../junit/platform/engine/discovery/MethodSelectorTests.java    | 2 +-
 .../junit/platform/engine/discovery/ModuleSelectorTests.java    | 2 +-
 .../platform/engine/discovery/NestedClassSelectorTests.java     | 2 +-
 .../platform/engine/discovery/NestedMethodSelectorTests.java    | 2 +-
 .../junit/platform/engine/discovery/PackageNameFilterTests.java | 2 +-
 .../junit/platform/engine/discovery/PackageSelectorTests.java   | 2 +-
 .../junit/platform/engine/discovery/UniqueIdSelectorTests.java  | 2 +-
 .../org/junit/platform/engine/discovery/UriSelectorTests.java   | 2 +-
 .../support/config/PrefixedConfigurationParametersTests.java    | 2 +-
 .../engine/support/descriptor/AbstractTestDescriptorTests.java  | 2 +-
 .../engine/support/descriptor/AbstractTestSourceTests.java      | 2 +-
 .../platform/engine/support/descriptor/ClassSourceTests.java    | 2 +-
 .../engine/support/descriptor/ClasspathResourceSourceTests.java | 2 +-
 .../engine/support/descriptor/CompositeTestSourceTests.java     | 2 +-
 .../engine/support/descriptor/DefaultUriSourceTests.java        | 2 +-
 .../engine/support/descriptor/DemoClassTestDescriptor.java      | 2 +-
 .../engine/support/descriptor/DemoMethodTestDescriptor.java     | 2 +-
 .../platform/engine/support/descriptor/FilePositionTests.java   | 2 +-
 .../engine/support/descriptor/FileSystemSourceTests.java        | 2 +-
 .../platform/engine/support/descriptor/MethodSourceTests.java   | 2 +-
 .../platform/engine/support/descriptor/PackageSourceTests.java  | 2 +-
 .../engine/support/hierarchical/CompositeLockTests.java         | 2 +-
 .../DefaultParallelExecutionConfigurationStrategyTests.java     | 2 +-
 .../ForkJoinPoolHierarchicalTestExecutorServiceTests.java       | 2 +-
 .../support/hierarchical/HierarchicalTestExecutorTests.java     | 2 +-
 .../platform/engine/support/hierarchical/LockManagerTests.java  | 2 +-
 .../platform/engine/support/hierarchical/MemoryLeakTests.java   | 2 +-
 .../support/hierarchical/NodeTreeWalkerIntegrationTests.java    | 2 +-
 .../support/hierarchical/ParallelExecutionIntegrationTests.java | 2 +-
 .../engine/support/hierarchical/ResourceLockSupport.java        | 2 +-
 .../hierarchical/SameThreadExecutionIntegrationTests.java       | 2 +-
 .../platform/engine/support/hierarchical/SingleLockTests.java   | 2 +-
 .../engine/support/hierarchical/SingleTestExecutorTests.java    | 2 +-
 .../engine/support/hierarchical/ThrowableCollectorTests.java    | 2 +-
 .../jfr/FlightRecordingDiscoveryListenerIntegrationTests.java   | 2 +-
 .../jfr/FlightRecordingExecutionListenerIntegrationTests.java   | 2 +-
 .../java/org/junit/platform/launcher/DiscoveryFilterStub.java   | 2 +-
 .../src/test/java/org/junit/platform/launcher/FilterStub.java   | 2 +-
 .../org/junit/platform/launcher/PostDiscoveryFilterStub.java    | 2 +-
 .../test/java/org/junit/platform/launcher/TagFilterTests.java   | 2 +-
 .../java/org/junit/platform/launcher/TagIntegrationTests.java   | 2 +-
 .../java/org/junit/platform/launcher/TestIdentifierTests.java   | 2 +-
 .../junit/platform/launcher/TestLauncherDiscoveryListener.java  | 2 +-
 .../junit/platform/launcher/TestLauncherSessionListener.java    | 2 +-
 .../test/java/org/junit/platform/launcher/TestPlanTests.java    | 2 +-
 .../org/junit/platform/launcher/TestPostDiscoveryTagFilter.java | 2 +-
 .../launcher/core/CompositeEngineExecutionListenerTests.java    | 2 +-
 .../launcher/core/CompositeTestExecutionListenerTests.java      | 2 +-
 .../launcher/core/DefaultLauncherEngineFilterTests.java         | 2 +-
 .../org/junit/platform/launcher/core/DefaultLauncherTests.java  | 2 +-
 .../launcher/core/EngineDiscoveryResultValidatorTests.java      | 2 +-
 .../platform/launcher/core/ExecutionListenerAdapterTests.java   | 2 +-
 .../org/junit/platform/launcher/core/LauncherConfigTests.java   | 2 +-
 .../launcher/core/LauncherConfigurationParametersTests.java     | 2 +-
 .../launcher/core/LauncherDiscoveryRequestBuilderTests.java     | 2 +-
 .../org/junit/platform/launcher/core/LauncherFactoryTests.java  | 2 +-
 .../org/junit/platform/launcher/core/LauncherSessionTests.java  | 2 +-
 .../org/junit/platform/launcher/core/ListenerRegistryTests.java | 2 +-
 ...StreamInterceptingTestExecutionListenerIntegrationTests.java | 2 +-
 .../junit/platform/launcher/core/StreamInterceptorTests.java    | 2 +-
 .../launcher/listeners/AnotherUnusedTestExecutionListener.java  | 2 +-
 .../platform/launcher/listeners/NoopTestExecutionListener.java  | 2 +-
 .../org/junit/platform/launcher/listeners/OutputDirTests.java   | 2 +-
 .../platform/launcher/listeners/SummaryGenerationTests.java     | 2 +-
 .../listeners/UniqueIdTrackingListenerIntegrationTests.java     | 2 +-
 .../launcher/listeners/UnusedTestExecutionListener.java         | 2 +-
 .../discovery/AbortOnFailureLauncherDiscoveryListenerTests.java | 2 +-
 .../discovery/AbstractLauncherDiscoveryListenerTests.java       | 2 +-
 .../discovery/LoggingLauncherDiscoveryListenerTests.java        | 2 +-
 .../junit/platform/launcher/tagexpression/ParserErrorTests.java | 2 +-
 .../org/junit/platform/launcher/tagexpression/ParserTests.java  | 2 +-
 .../platform/launcher/tagexpression/TagExpressionsTests.java    | 2 +-
 .../org/junit/platform/launcher/tagexpression/TokenTests.java   | 2 +-
 .../junit/platform/launcher/tagexpression/TokenizerTests.java   | 2 +-
 .../platform/reporting/legacy/LegacyReportingUtilsTests.java    | 2 +-
 .../junit/platform/reporting/legacy/xml/IncrementingClock.java  | 2 +-
 .../legacy/xml/LegacyXmlReportGeneratingListenerTests.java      | 2 +-
 .../platform/reporting/legacy/xml/XmlReportAssertions.java      | 2 +-
 .../junit/platform/reporting/legacy/xml/XmlReportDataTests.java | 2 +-
 .../platform/reporting/legacy/xml/XmlReportWriterTests.java     | 2 +-
 .../open/xml/OpenTestReportGeneratingListenerTests.java         | 2 +-
 .../org/junit/platform/runner/JUnitPlatformRunnerTests.java     | 2 +-
 .../commons/SuiteLauncherDiscoveryRequestBuilderTests.java      | 2 +-
 .../java/org/junit/platform/suite/engine/SuiteEngineTests.java  | 2 +-
 .../junit/platform/suite/engine/SuiteTestDescriptorTests.java   | 2 +-
 .../platform/suite/engine/testcases/DynamicTestsTestCase.java   | 2 +-
 .../suite/engine/testcases/EmptyDynamicTestsTestCase.java       | 2 +-
 .../platform/suite/engine/testcases/EmptyTestTestCase.java      | 2 +-
 .../platform/suite/engine/testcases/JUnit4TestsTestCase.java    | 2 +-
 .../platform/suite/engine/testcases/MultipleTestsTestCase.java  | 2 +-
 .../platform/suite/engine/testcases/SingleTestTestCase.java     | 2 +-
 .../platform/suite/engine/testcases/TaggedTestTestCase.java     | 2 +-
 .../junit/platform/suite/engine/testsuites/AbstractSuite.java   | 2 +-
 .../org/junit/platform/suite/engine/testsuites/CyclicSuite.java | 2 +-
 .../junit/platform/suite/engine/testsuites/DynamicSuite.java    | 2 +-
 .../platform/suite/engine/testsuites/EmptyCyclicSuite.java      | 2 +-
 .../platform/suite/engine/testsuites/EmptyDynamicTestSuite.java | 2 +-
 .../testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java  | 2 +-
 .../platform/suite/engine/testsuites/EmptyTestCaseSuite.java    | 2 +-
 .../testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java     | 2 +-
 .../platform/suite/engine/testsuites/MultiEngineSuite.java      | 2 +-
 .../junit/platform/suite/engine/testsuites/MultipleSuite.java   | 2 +-
 .../org/junit/platform/suite/engine/testsuites/NestedSuite.java | 2 +-
 .../platform/suite/engine/testsuites/SelectClassesSuite.java    | 2 +-
 .../platform/suite/engine/testsuites/SuiteDisplayNameSuite.java | 2 +-
 .../org/junit/platform/suite/engine/testsuites/SuiteSuite.java  | 2 +-
 .../platform/suite/engine/testsuites/ThreePartCyclicSuite.java  | 2 +-
 .../org/junit/platform/testkit/engine/EngineTestKitTests.java   | 2 +-
 .../java/org/junit/platform/testkit/engine/EventsTests.java     | 2 +-
 .../platform/testkit/engine/ExecutionsIntegrationTests.java     | 2 +-
 .../testkit/engine/NestedContainerEventConditionTests.java      | 2 +-
 .../src/main/java/platform/tooling/support/Helper.java          | 2 +-
 .../src/main/java/platform/tooling/support/MavenRepo.java       | 2 +-
 .../src/main/java/platform/tooling/support/Request.java         | 2 +-
 .../src/main/java/platform/tooling/support/ThirdPartyJars.java  | 2 +-
 .../src/test/java/platform/tooling/support/HelperTests.java     | 2 +-
 .../java/platform/tooling/support/tests/AntStarterTests.java    | 2 +-
 .../test/java/platform/tooling/support/tests/ArchUnitTests.java | 2 +-
 .../platform/tooling/support/tests/GraalVmStarterTests.java     | 2 +-
 .../tooling/support/tests/GradleKotlinExtensionsTests.java      | 2 +-
 .../tooling/support/tests/GradleMissingEngineTests.java         | 2 +-
 .../platform/tooling/support/tests/GradleModuleFileTests.java   | 2 +-
 .../java/platform/tooling/support/tests/GradleStarterTests.java | 2 +-
 .../tooling/support/tests/JarContainsManifestFirstTests.java    | 2 +-
 .../platform/tooling/support/tests/JarDescribeModuleTests.java  | 2 +-
 .../java/platform/tooling/support/tests/JavaVersionsTests.java  | 2 +-
 .../test/java/platform/tooling/support/tests/ManifestTests.java | 2 +-
 .../java/platform/tooling/support/tests/MavenPomFileTests.java  | 2 +-
 .../java/platform/tooling/support/tests/MavenStarterTests.java  | 2 +-
 .../tooling/support/tests/MavenSurefireCompatibilityTests.java  | 2 +-
 .../platform/tooling/support/tests/ModularUserGuideTests.java   | 2 +-
 .../platform/tooling/support/tests/MultiReleaseJarTests.java    | 2 +-
 .../tooling/support/tests/PackageCyclesDetectionTests.java      | 2 +-
 .../java/platform/tooling/support/tests/StandaloneTests.java    | 2 +-
 .../java/platform/tooling/support/tests/ToolProviderTests.java  | 2 +-
 .../tooling/support/tests/VintageGradleIntegrationTests.java    | 2 +-
 .../tooling/support/tests/VintageMavenIntegrationTests.java     | 2 +-
 .../test/java/platform/tooling/support/tests/XmlAssertions.java | 2 +-
 src/spotless/eclipse-public-license-2.0.java                    | 2 +-
 1240 files changed, 1240 insertions(+), 1240 deletions(-)

diff --git a/documentation/src/main/java/example/domain/Person.java b/documentation/src/main/java/example/domain/Person.java
index 2baf09e52879..b628febd36cf 100644
--- a/documentation/src/main/java/example/domain/Person.java
+++ b/documentation/src/main/java/example/domain/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebClient.java b/documentation/src/main/java/example/registration/WebClient.java
index 153222b66248..b907c2c58e95 100644
--- a/documentation/src/main/java/example/registration/WebClient.java
+++ b/documentation/src/main/java/example/registration/WebClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebResponse.java b/documentation/src/main/java/example/registration/WebResponse.java
index 39c71a400436..598239f44c24 100644
--- a/documentation/src/main/java/example/registration/WebResponse.java
+++ b/documentation/src/main/java/example/registration/WebResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/registration/WebServerExtension.java b/documentation/src/main/java/example/registration/WebServerExtension.java
index adcae9157bcc..80fefe787b89 100644
--- a/documentation/src/main/java/example/registration/WebServerExtension.java
+++ b/documentation/src/main/java/example/registration/WebServerExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/Calculator.java b/documentation/src/main/java/example/util/Calculator.java
index c096b71e1877..98291f6a78fe 100644
--- a/documentation/src/main/java/example/util/Calculator.java
+++ b/documentation/src/main/java/example/util/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/ListWriter.java b/documentation/src/main/java/example/util/ListWriter.java
index 3420f34a1601..88fb73137ff6 100644
--- a/documentation/src/main/java/example/util/ListWriter.java
+++ b/documentation/src/main/java/example/util/ListWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/main/java/example/util/StringUtils.java b/documentation/src/main/java/example/util/StringUtils.java
index 2a09131c8469..b622aa3efb90 100644
--- a/documentation/src/main/java/example/util/StringUtils.java
+++ b/documentation/src/main/java/example/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/AssertionsDemo.java b/documentation/src/test/java/example/AssertionsDemo.java
index 18f398c9577e..a9cd383df6c1 100644
--- a/documentation/src/test/java/example/AssertionsDemo.java
+++ b/documentation/src/test/java/example/AssertionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/AssumptionsDemo.java b/documentation/src/test/java/example/AssumptionsDemo.java
index 0f6755c67bec..41438feabb2f 100644
--- a/documentation/src/test/java/example/AssumptionsDemo.java
+++ b/documentation/src/test/java/example/AssumptionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
index a85031a1117c..146443c260c1 100644
--- a/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
+++ b/documentation/src/test/java/example/ConditionalTestExecutionDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/CustomTestEngine.java b/documentation/src/test/java/example/CustomTestEngine.java
index e14c4821e7b1..a1d0eb31bb47 100644
--- a/documentation/src/test/java/example/CustomTestEngine.java
+++ b/documentation/src/test/java/example/CustomTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisabledClassDemo.java b/documentation/src/test/java/example/DisabledClassDemo.java
index a4c8168aa2d8..a2453a2aac27 100644
--- a/documentation/src/test/java/example/DisabledClassDemo.java
+++ b/documentation/src/test/java/example/DisabledClassDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisabledTestsDemo.java b/documentation/src/test/java/example/DisabledTestsDemo.java
index 72d146f793b3..e1a7f6c0ad68 100644
--- a/documentation/src/test/java/example/DisabledTestsDemo.java
+++ b/documentation/src/test/java/example/DisabledTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisplayNameDemo.java b/documentation/src/test/java/example/DisplayNameDemo.java
index eda1c9347586..c9ee6fed5ddc 100644
--- a/documentation/src/test/java/example/DisplayNameDemo.java
+++ b/documentation/src/test/java/example/DisplayNameDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DisplayNameGeneratorDemo.java b/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
index f5170e4c5bc5..f1483d15c67e 100644
--- a/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
+++ b/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DocumentationTestSuite.java b/documentation/src/test/java/example/DocumentationTestSuite.java
index 52b5659b29cd..b3bc6dd0029b 100644
--- a/documentation/src/test/java/example/DocumentationTestSuite.java
+++ b/documentation/src/test/java/example/DocumentationTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/DynamicTestsDemo.java b/documentation/src/test/java/example/DynamicTestsDemo.java
index 78081a93690b..8a8d9bef9ac0 100644
--- a/documentation/src/test/java/example/DynamicTestsDemo.java
+++ b/documentation/src/test/java/example/DynamicTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ExampleTestCase.java b/documentation/src/test/java/example/ExampleTestCase.java
index 70669434358c..2a898b33e08b 100644
--- a/documentation/src/test/java/example/ExampleTestCase.java
+++ b/documentation/src/test/java/example/ExampleTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ExternalCustomConditionDemo.java b/documentation/src/test/java/example/ExternalCustomConditionDemo.java
index afa135502243..024b07d27854 100644
--- a/documentation/src/test/java/example/ExternalCustomConditionDemo.java
+++ b/documentation/src/test/java/example/ExternalCustomConditionDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ExternalMethodSourceDemo.java b/documentation/src/test/java/example/ExternalMethodSourceDemo.java
index 93c35a6eb567..1d8299367e9b 100644
--- a/documentation/src/test/java/example/ExternalMethodSourceDemo.java
+++ b/documentation/src/test/java/example/ExternalMethodSourceDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/Fast.java b/documentation/src/test/java/example/Fast.java
index 0908da76d652..1e7c78e6f6b6 100644
--- a/documentation/src/test/java/example/Fast.java
+++ b/documentation/src/test/java/example/Fast.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/FastTest.java b/documentation/src/test/java/example/FastTest.java
index 9d5fcd7e4722..af31b49d5699 100644
--- a/documentation/src/test/java/example/FastTest.java
+++ b/documentation/src/test/java/example/FastTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/HamcrestAssertionsDemo.java b/documentation/src/test/java/example/HamcrestAssertionsDemo.java
index 6b74a22df88a..8fa219829ce3 100644
--- a/documentation/src/test/java/example/HamcrestAssertionsDemo.java
+++ b/documentation/src/test/java/example/HamcrestAssertionsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/IgnoredTestsDemo.java b/documentation/src/test/java/example/IgnoredTestsDemo.java
index 75289a0948fc..96fca01c8ade 100644
--- a/documentation/src/test/java/example/IgnoredTestsDemo.java
+++ b/documentation/src/test/java/example/IgnoredTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnit4Tests.java b/documentation/src/test/java/example/JUnit4Tests.java
index 86babd497881..d229e639fa2d 100644
--- a/documentation/src/test/java/example/JUnit4Tests.java
+++ b/documentation/src/test/java/example/JUnit4Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnitPlatformClassDemo.java b/documentation/src/test/java/example/JUnitPlatformClassDemo.java
index be2844623c05..0bf0aeb06220 100644
--- a/documentation/src/test/java/example/JUnitPlatformClassDemo.java
+++ b/documentation/src/test/java/example/JUnitPlatformClassDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java b/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
index 7dd7296ed015..b563204fff2b 100644
--- a/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
+++ b/documentation/src/test/java/example/JUnitPlatformSuiteDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/MethodSourceParameterResolutionDemo.java b/documentation/src/test/java/example/MethodSourceParameterResolutionDemo.java
index 36ea8701d907..45b35dbcc964 100644
--- a/documentation/src/test/java/example/MethodSourceParameterResolutionDemo.java
+++ b/documentation/src/test/java/example/MethodSourceParameterResolutionDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java b/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
index d1ddbc5b77bc..77632abc3be5 100644
--- a/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
+++ b/documentation/src/test/java/example/MyFirstJUnitJupiterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java b/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java
index 194bfcbe3828..b5e987daca65 100644
--- a/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java
+++ b/documentation/src/test/java/example/OrderedNestedTestClassesDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/OrderedTestsDemo.java b/documentation/src/test/java/example/OrderedTestsDemo.java
index 10399dff02be..2ee01d3335cf 100644
--- a/documentation/src/test/java/example/OrderedTestsDemo.java
+++ b/documentation/src/test/java/example/OrderedTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/ParameterizedTestDemo.java b/documentation/src/test/java/example/ParameterizedTestDemo.java
index 0a35327b10e5..3afd887265e2 100644
--- a/documentation/src/test/java/example/ParameterizedTestDemo.java
+++ b/documentation/src/test/java/example/ParameterizedTestDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/PollingTimeoutDemo.java b/documentation/src/test/java/example/PollingTimeoutDemo.java
index 88708cf270f1..a10b7cec8edd 100644
--- a/documentation/src/test/java/example/PollingTimeoutDemo.java
+++ b/documentation/src/test/java/example/PollingTimeoutDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/RepeatedTestsDemo.java b/documentation/src/test/java/example/RepeatedTestsDemo.java
index a414d053e036..ccf468456466 100644
--- a/documentation/src/test/java/example/RepeatedTestsDemo.java
+++ b/documentation/src/test/java/example/RepeatedTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/SharedResourcesDemo.java b/documentation/src/test/java/example/SharedResourcesDemo.java
index b71d3e500ed1..be3d12b3ce99 100644
--- a/documentation/src/test/java/example/SharedResourcesDemo.java
+++ b/documentation/src/test/java/example/SharedResourcesDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/SlowTests.java b/documentation/src/test/java/example/SlowTests.java
index 10e88d044160..f3c711e7b393 100644
--- a/documentation/src/test/java/example/SlowTests.java
+++ b/documentation/src/test/java/example/SlowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/StandardTests.java b/documentation/src/test/java/example/StandardTests.java
index a2bd484c237e..4a6a660ea932 100644
--- a/documentation/src/test/java/example/StandardTests.java
+++ b/documentation/src/test/java/example/StandardTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/SuiteDemo.java b/documentation/src/test/java/example/SuiteDemo.java
index 182d863900cd..617806b3d035 100644
--- a/documentation/src/test/java/example/SuiteDemo.java
+++ b/documentation/src/test/java/example/SuiteDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TaggingDemo.java b/documentation/src/test/java/example/TaggingDemo.java
index 3ec3c925b1c1..ebe9594b1c2d 100644
--- a/documentation/src/test/java/example/TaggingDemo.java
+++ b/documentation/src/test/java/example/TaggingDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TempDirCleanupModeDemo.java b/documentation/src/test/java/example/TempDirCleanupModeDemo.java
index ed164c25a377..84c05b4b7999 100644
--- a/documentation/src/test/java/example/TempDirCleanupModeDemo.java
+++ b/documentation/src/test/java/example/TempDirCleanupModeDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index d41b6983d85d..70ce582217c3 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestInfoDemo.java b/documentation/src/test/java/example/TestInfoDemo.java
index 2360fb07bb47..ac8f044edf17 100644
--- a/documentation/src/test/java/example/TestInfoDemo.java
+++ b/documentation/src/test/java/example/TestInfoDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestReporterDemo.java b/documentation/src/test/java/example/TestReporterDemo.java
index 2a2f68cbe687..dbd78d94aa94 100644
--- a/documentation/src/test/java/example/TestReporterDemo.java
+++ b/documentation/src/test/java/example/TestReporterDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestTemplateDemo.java b/documentation/src/test/java/example/TestTemplateDemo.java
index 4378ededc314..5f0c56a24a37 100644
--- a/documentation/src/test/java/example/TestTemplateDemo.java
+++ b/documentation/src/test/java/example/TestTemplateDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TestingAStackDemo.java b/documentation/src/test/java/example/TestingAStackDemo.java
index d46ff8bf253a..ab7b8339c989 100644
--- a/documentation/src/test/java/example/TestingAStackDemo.java
+++ b/documentation/src/test/java/example/TestingAStackDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/TimeoutDemo.java b/documentation/src/test/java/example/TimeoutDemo.java
index 066bbf8d40c2..8700f23e4bad 100644
--- a/documentation/src/test/java/example/TimeoutDemo.java
+++ b/documentation/src/test/java/example/TimeoutDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/UsingTheLauncherDemo.java b/documentation/src/test/java/example/UsingTheLauncherDemo.java
index a4629c04a111..403e9084c610 100644
--- a/documentation/src/test/java/example/UsingTheLauncherDemo.java
+++ b/documentation/src/test/java/example/UsingTheLauncherDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java b/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
index 8010fd31c696..a6eef4489d07 100644
--- a/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
+++ b/documentation/src/test/java/example/callbacks/AbstractDatabaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java b/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
index 6e4880eb4537..03da5ff8f086 100644
--- a/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
+++ b/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java b/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
index b7eb652907b4..792c778810c3 100644
--- a/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
+++ b/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Extension1.java b/documentation/src/test/java/example/callbacks/Extension1.java
index b1658aa451dc..f0f5e697ba8a 100644
--- a/documentation/src/test/java/example/callbacks/Extension1.java
+++ b/documentation/src/test/java/example/callbacks/Extension1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Extension2.java b/documentation/src/test/java/example/callbacks/Extension2.java
index b7ad2849598a..a7cc878f1f76 100644
--- a/documentation/src/test/java/example/callbacks/Extension2.java
+++ b/documentation/src/test/java/example/callbacks/Extension2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/callbacks/Logger.java b/documentation/src/test/java/example/callbacks/Logger.java
index 7bfe2399bc5b..ab2271256b3f 100644
--- a/documentation/src/test/java/example/callbacks/Logger.java
+++ b/documentation/src/test/java/example/callbacks/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/ComparableContract.java b/documentation/src/test/java/example/defaultmethods/ComparableContract.java
index c5580d303d80..f72d80f8894c 100644
--- a/documentation/src/test/java/example/defaultmethods/ComparableContract.java
+++ b/documentation/src/test/java/example/defaultmethods/ComparableContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/EqualsContract.java b/documentation/src/test/java/example/defaultmethods/EqualsContract.java
index c986a0b6f619..36e30258ca92 100644
--- a/documentation/src/test/java/example/defaultmethods/EqualsContract.java
+++ b/documentation/src/test/java/example/defaultmethods/EqualsContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/StringTests.java b/documentation/src/test/java/example/defaultmethods/StringTests.java
index 85aaac73afb1..1449f28f8dbd 100644
--- a/documentation/src/test/java/example/defaultmethods/StringTests.java
+++ b/documentation/src/test/java/example/defaultmethods/StringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/defaultmethods/Testable.java b/documentation/src/test/java/example/defaultmethods/Testable.java
index f1ac340faf34..84bf397b87eb 100644
--- a/documentation/src/test/java/example/defaultmethods/Testable.java
+++ b/documentation/src/test/java/example/defaultmethods/Testable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java b/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
index 266f39292cc8..f2010d1b8efb 100644
--- a/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
+++ b/documentation/src/test/java/example/exception/IgnoreIOExceptionExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java b/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
index 6df8ce4a72e0..ca706586e858 100644
--- a/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
+++ b/documentation/src/test/java/example/exception/IgnoreIOExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java b/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
index 709231a6bcaa..3db997fe97a0 100644
--- a/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
+++ b/documentation/src/test/java/example/exception/MultipleHandlersTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java b/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
index 5b2804684915..ed4c76979b32 100644
--- a/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
+++ b/documentation/src/test/java/example/exception/RecordStateOnErrorExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/extensions/Random.java b/documentation/src/test/java/example/extensions/Random.java
index 9d83f3d4da94..4b9a904d0bb1 100644
--- a/documentation/src/test/java/example/extensions/Random.java
+++ b/documentation/src/test/java/example/extensions/Random.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/extensions/RandomNumberDemo.java b/documentation/src/test/java/example/extensions/RandomNumberDemo.java
index 24db76bc013f..d52af0a65ef8 100644
--- a/documentation/src/test/java/example/extensions/RandomNumberDemo.java
+++ b/documentation/src/test/java/example/extensions/RandomNumberDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/extensions/RandomNumberExtension.java b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
index f3ed2c9f2631..98f1d1ace3f8 100644
--- a/documentation/src/test/java/example/extensions/RandomNumberExtension.java
+++ b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java b/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
index 5970b80b9dd7..b12094f382b9 100644
--- a/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
+++ b/documentation/src/test/java/example/interceptor/SwingEdtInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/registration/DocumentationDemo.java b/documentation/src/test/java/example/registration/DocumentationDemo.java
index c5cf431bce48..973b4f1967e3 100644
--- a/documentation/src/test/java/example/registration/DocumentationDemo.java
+++ b/documentation/src/test/java/example/registration/DocumentationDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/registration/WebServerDemo.java b/documentation/src/test/java/example/registration/WebServerDemo.java
index 0ade52412975..25a6b2797305 100644
--- a/documentation/src/test/java/example/registration/WebServerDemo.java
+++ b/documentation/src/test/java/example/registration/WebServerDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
index 6d3417817d45..595be12b4717 100644
--- a/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
+++ b/documentation/src/test/java/example/session/GlobalSetupTeardownListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/session/HttpTests.java b/documentation/src/test/java/example/session/HttpTests.java
index 7ae8c3d88f19..cbdf5367cdfd 100644
--- a/documentation/src/test/java/example/session/HttpTests.java
+++ b/documentation/src/test/java/example/session/HttpTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java b/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
index e37ee55e4bf2..b24ab3413733 100644
--- a/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
+++ b/documentation/src/test/java/example/testinterface/TestInterfaceDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java b/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
index 41cce3456765..694192dbabf0 100644
--- a/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
+++ b/documentation/src/test/java/example/testinterface/TestInterfaceDynamicTestsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java b/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
index 1d4ccbe818a1..b269bfb69a1b 100644
--- a/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
+++ b/documentation/src/test/java/example/testinterface/TestLifecycleLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java b/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
index 1f0d28276e6e..b3a53feae91a 100644
--- a/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
+++ b/documentation/src/test/java/example/testinterface/TimeExecutionLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
index 2a8991c45f93..5df68019e433 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitAllEventsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
index fe13c967edb0..40ea51ba8a80 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
index 401e76881bb7..1d06770f1a25 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitSkippedMethodDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
index 0f0d92d5be0d..b9576352389b 100644
--- a/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
+++ b/documentation/src/test/java/example/testkit/EngineTestKitStatisticsDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/timing/TimingExtension.java b/documentation/src/test/java/example/timing/TimingExtension.java
index c82321201a5e..b6b51d61ce99 100644
--- a/documentation/src/test/java/example/timing/TimingExtension.java
+++ b/documentation/src/test/java/example/timing/TimingExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/example/timing/TimingExtensionTests.java b/documentation/src/test/java/example/timing/TimingExtensionTests.java
index cf84479e7450..ee84b196b066 100644
--- a/documentation/src/test/java/example/timing/TimingExtensionTests.java
+++ b/documentation/src/test/java/example/timing/TimingExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/extensions/ExpectToFail.java b/documentation/src/test/java/extensions/ExpectToFail.java
index fb14a7d110eb..8dd21a717caa 100644
--- a/documentation/src/test/java/extensions/ExpectToFail.java
+++ b/documentation/src/test/java/extensions/ExpectToFail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
index 29b2909d3cd7..6b9a143ca463 100644
--- a/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/AbstractApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReport.java b/documentation/src/test/java/org/junit/api/tools/ApiReport.java
index 3d8a6fb498fc..b21e63e8face 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReport.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java b/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
index 637513538d5f..7bdb6c21b40d 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReportGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
index 30c430d05fe1..c231d1b4ba43 100644
--- a/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/ApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
index ce688064103e..05748d36aee3 100644
--- a/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/AsciidocApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
index c27ca6b9cee0..48193368370e 100644
--- a/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/HtmlApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java b/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
index a6296d1a3c1c..6294ac58179b 100644
--- a/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
+++ b/documentation/src/test/java/org/junit/api/tools/MarkdownApiReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/FibonacciCalculator.kt b/documentation/src/test/kotlin/example/FibonacciCalculator.kt
index 281cb7d492ef..33ddbe089ff1 100644
--- a/documentation/src/test/kotlin/example/FibonacciCalculator.kt
+++ b/documentation/src/test/kotlin/example/FibonacciCalculator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
index 64afa0de38cd..2870ae95ac25 100644
--- a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
+++ b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
index 3f23480c7798..52a390fe7e0f 100644
--- a/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
+++ b/documentation/src/test/kotlin/example/registration/KotlinWebServerDemo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index d356d261c9ff..061ee118c4c5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
index 3e0cab029463..df5a522e114f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
index 6424dd14b2cf..601e9ecf8d9c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
index 2a2f8f6d2042..45d37399c0e1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
index d11a3e0e6dbf..2d424aa7ed39 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
index 9afd4b1072c5..2a46cea309f3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
index 8364cb64615b..5291a6ac6ead 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
index f1891d138c83..2f265f3fc237 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
index a569d2105b90..b837c449bca2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
index 1479728830ed..03e79081bd9e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
index 1e8be26c6a5e..5a37b059a0fc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
index 71be7b88a72f..43787ab8c27b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
index 753e734c2a34..66f795c7a75a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotSame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
index 4a9e92b2d4a0..53ceb4ce099a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
index c080b3e01f65..feafa36231c9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertSame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
index d4e8b19d3498..b61570647cb5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrows.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
index 39a4c2169367..8a669388b709 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertThrowsExactly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
index 93c7c11f8a71..bfd1f66806ba 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java
index 94534171dd01..4ff96b71556d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
index 3d250a46f68e..cf4f94277a93 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTrue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java
index b1df82fab85c..8d0341d3cb46 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionFailureBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
index c591c217dadb..48a74da2ce96 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 62fefbe630fb..1240caa55aa2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
index d98a44d254e2..d0448a89778e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assumptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index 9b3b2878281c..01b56d393c1a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
index 8d8d2a0b4173..79d0f73f0b4d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
index 7496c1caa876..5ad667d13c5c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 0ebdbef03653..04017c02d9a5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
index cc4d169eade8..1ec2e9b899c1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
index 88b6f16d4b54..9a7717053491 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Disabled.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
index 5b250299829e..e99ee34c75fc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
index 04adf0b37798..bb0e1bf9f70a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGeneration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 7b67189b56cb..6586a84aff51 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
index bae75ee8304d..dcc48186c5ec 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
index 819f1e2b0f52..c1a151779f7f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
index 62a018985741..935951663d48 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
index 1f8c916d664a..6925a2b69809 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
index 256326781eec..20550832e137 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 89950bf4dfa4..7818020d4b6e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
index 970e0ba10620..cb585b709416 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
index 1b7cb774ce7d..6dee03e4a1ea 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Named.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
index cde1fb6b07ec..1627010af1a0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Nested.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
index e8203fb3cbb4..5b48253fe0c0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Order.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
index e66dae0bb5fa..298de922599b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
index b75e401f17d8..89f5d1f0340f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
index bd6a232cae41..0def1ed38dcb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
index 7ac55cb3eede..0d6526ecd9b8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Tags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
index 2e3e53fec736..53c520bd2f2a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
index a0e17823dd51..15eedf5659ae 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
index 45818bb6f142..96b1f5248a03 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
index cfb73b39eb49..c7949d1cbb78 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
index 96ebcbc1ed29..0e6ae3758b63 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
index 622ce030b182..2e6a571eed1c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestMethodOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
index 6ae826528479..6b5b349b62de 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
index d4daf9d8411d..24f8208a7229 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
index 74faf89b360f..18f0d34c48a4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java
index ec483e07f192..0a82b367c684 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractOsBasedExecutionCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
index 36c86d7427b9..5463f23c16e4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractRepeatableAnnotationCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
index 8124255ce253..a4f7ac18f6ab 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/BooleanExecutionCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
index be2edd9642e6..57341bfaf79c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
index 1fb2ba57b743..90e157d13d0a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRangeCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
index 0eb3bc627911..8ab454fb6a17 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
index 04932ebbf4b1..1998f8840d3e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
index c32b693c5b03..a98c31bb4e0a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
index 03a452d235b8..de9a85154e4c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
index 0ad4b39c6131..deef2a4a8fa0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
index e5134a9313b6..ff6877bf1a06 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
index 84f7c717f886..c8bfe4fc8cdf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
index 5cb6a73f9e3d..c2e17250374e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java
index a51fa19a81ec..a96399e799be 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledInNativeImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
index dac3c3a46c4a..ef1b5d8a5387 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
index b78cba9e8e26..a2bacd66911d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index 52b60f486cff..5f1e08d70a59 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
index 9500989171d5..90ec208976af 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
index e18d02c67bc9..9e3154d85385 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
index 9d1aaae5a51f..5a7c9e5417d3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRangeCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
index 3005a8f0a460..18e8a8395c46 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
index a19f6d76d77c..3ebaa594dc9a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
index 7eca6dffc9bd..d7cab6c3dddf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
index cdd7ded016b2..13848432aa0d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
index fda577afa14f..3589ed58b217 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
index 5da673a61946..f33bdfae4790 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
index f26b972ce6e7..cd658e4e0aad 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
index c6d9e632addb..af8c7cb903cb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java
index 81fd19cbf338..33641509e7a0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledInNativeImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
index d8210bf71f8b..c5ca85ea4dbb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
index 0e81c803787f..2bd865351d20 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index e0c17deda556..2805fc40025e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
index be61ace4f8d4..092342f7a2ac 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index 10ec0d5f4284..b42bc90e90c3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index a7b269db570e..403304792e75 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
index f0ea46685b02..5acb383e3137 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
index aa6240fd3b4a..cdf4c267c468 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterAllCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
index b07965047d78..6c26cc11743c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterEachCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
index f1be46050bcb..817744a167fe 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AfterTestExecutionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
index fb5c86f98122..ae78aa2ddc10 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeAllCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
index b133ca23298c..2ba5b378abe5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeEachCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
index 3dfcec8ac981..9a25088158ad 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
index 0f89cf1a3e1b..e01c5ac66b43 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
index aee09435610b..a040ae804347 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/DynamicTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java
index f14d8cc1e961..7cfad263ad5b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
index 4edc1dafb849..9747a1e4d82c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutionCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
index b1819de7bf6c..dbee47c2c483 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
index 600eb74b0eb7..fa1d255e65c1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
index 6631cde0bab8..f4204b49427c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionConfigurationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index 55c7fad2e50f..e58f585fdf59 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
index be16215c49d6..957c0ed6910f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
index 0f1e73320d46..a683dea9ff2c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
index 4771ecddcd4b..5d4bbdb2935b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
index d19355e4ff78..7b7eb21084ab 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
index c80242cfb821..1bce9ffbe16c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
index afdb3bc3c051..5e34e82330ce 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
index f85beccfee34..3ce4fdb4ba82 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
index fb0ac752931f..90666658ad6f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
index 6c0058d60a05..c3f89728f385 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
index a6bb2b638049..cfd03f746b32 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestExecutionExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
index fc1eaf0411ab..beb98895641b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
index 22a04b91f060..99af882dfc06 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstanceFactoryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
index 78aeed9c4d48..a2ec718e48e8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
index 935318723a64..0bad10b8c447 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreConstructCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
index 705c9055ab88..1feab18515e8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
index e9eb29129427..d2bab8067aa9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstances.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
index 3311e8943945..e8c5920bf3aa 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
index 4d775d529393..268b5c474e52 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
index 469e47bdd4fd..f7e0d61b31b6 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
index e2efd5114c64..a720af0e061e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
index a3a0f40c2278..0346fc0bb3ba 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
index 0e98ee489e6e..c6309581f83e 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/Executable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
index bf937eb35583..a5f74507466f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
index 8c35fcae626a..573dffe70f12 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/function/ThrowingSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
index 016dc5b09e7c..59472e28dcf4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 762c8d6defc9..8d0e6dad480a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index ad67864faf9b..86d051c6b5bc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
index 989455659cf4..b0b7752a6c4b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
index ff4eaa06cea1..5dc97602e4ff 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
index 3ded110722ed..30378f53d160 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
index ddac32f503e2..4f7f97d403fb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
index fe4d18661660..f15bfbc38797 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
index 5421662c8674..ccdbaefe1627 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
index 60e82a8fb4a2..d0f5af1e218b 100644
--- a/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
+++ b/junit-jupiter-api/src/main/kotlin/org/junit/jupiter/api/Assertions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
index 275f46b3f08a..836aabab88f8 100644
--- a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
+++ b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/ExtensionContextParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
index 52885647d71c..ef33de69dda6 100644
--- a/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
+++ b/junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/fixtures/TrackLogRecords.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index 074a2569b307..f99d61d82947 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
index cc3ffa3d98fd..dbd799b7f5b2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index 76c566f77d39..ebf547344bdc 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index a21a9c7ef249..ae8a4944904f 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
index 6ee650d10ed7..75fd3f99f708 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/EnumConfigurationParameterConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
index 2aada5cae621..7f77d47122ce 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index 0ae65007d888..d0027c15e70b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
index 5ed8ce41c398..90b6a9326797 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index 7dfa614dc2b5..d1fed9511f38 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
index 5fbcb0e5f925..57d40a86edbb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
index c294c99c7639..2296129809d8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
index ca0d47800af5..f6e272bc3e99 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultDynamicTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
index 5a15bbfc611a..affdf5b57545 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DefaultTestInstanceFactoryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
index d4a479af4eca..168f09353224 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
index 811a11205c83..a72981df70d3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicContainerTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
index d08c3ba0d3e9..48e45e0bb11d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicDescendantFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
index 4e0c3cb72a70..92ec7b24abeb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
index 8619bb1fba58..bf5bde6c63dd 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
index f8252afbac23..3fc75d00c0ed 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicTestTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
index e5da1c415bdb..a5d576cf508d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ExtensionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
index 827151de5bb3..a9ca7ad14dc4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Filterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
index 0aa9d9056770..3a87753ca530 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
index 14c042e3c8be..26eb83f7fa50 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
index 0b17e0b07a2d..5492e8a6890e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
index 28efaaa8eba0..27c90790b140 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
index 356b22a5ef1b..bb0d3907501d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
index b10be186c15d..22db33b33de3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
index 14f4c517d0c4..fd461ba479cf 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
index 4cb82ea99614..f750e2f5c432 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
index 49461ccf607a..671cc6b63fc6 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
index 4ec69200e5d2..8aae97f9b754 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
index 253e093e579e..c5c784b06abc 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
index 164552deaba5..5a3506f8ea6a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
index a6bdd8c09e65..4d522615dcaa 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
index 8d44338c722b..885a07d93636 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
index 463f077c2d52..31666b8c2ecb 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractAnnotatedDescriptorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
index 03da534699d8..e19e5c967d82 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/AbstractOrderingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
index b1a154a3ac11..0b8ea6d09c13 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassOrderingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
index 9aaf7c28879b..1a597810d628 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
index e6f0b220a5a1..b11c1b0270e0 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
index cc26708bf419..2c8c8743bca2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultClassOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
index b4a5cba81e04..a8cdd12c575a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
index f70c675d465b..fd51d4b7cd64 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DefaultMethodOrdererContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
index 2c5de8cc58c4..42771f96d1a7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
index c7b0c5bfee81..648ad453b3dd 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
index f3fd6d867890..e1e7c8afab03 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
index 01a51ab5056c..62698001ee5b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
index 968c4054e8c6..c46822be0edc 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
index ff7dd1ac24c1..ceaa9f3de12b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
index c35d02204fc8..525e9aaf6aa3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
index e55ecffa9789..edec7724a83e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
index 77b40190fe11..186d5ab6333f 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
index da014aca0664..9d30765d1ce5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
index 2136aff69e47..70a4391a6912 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
index f793ccda36b0..e8906f0d55ac 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
index d80ba914a472..2b9dff6876d3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/AfterEachMethodAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
index 0f0f03dcfeaf..709e35e80759 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/BeforeEachMethodAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
index 02f56c677ac2..ddafc0a4ad21 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
index 1a6dba0f7bea..fb5e0ff2ace8 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConditionEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
index f5af1cefdbaa..4100d667a780 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ConstructorInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultExecutableInvoker.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultExecutableInvoker.java
index 0c13e3ef03a6..2276cc94273b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultExecutableInvoker.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultExecutableInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
index f14efc5a4568..900289b3b39f 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultParameterContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
index b03b3f4a3c86..dc611f69975d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/DefaultTestInstances.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
index 5b06d7eae56a..133e3d6b0156 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java
index 50aaf7dba71e..b0a1fdb28283 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
index c45a9f2dbfe3..f622a386360c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InvocationInterceptorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
index daf0eeb6f837..a31c9c02ad27 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
index d2cd8f77aae4..a8bb6ae7dc14 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/MethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
index 0f343b713ecd..1b56304505f1 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java
index a2ebffad05ea..87e121a3a496 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
index c8e93a9f30cb..1f5819a68282 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/TestInstancesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
index a2464b72da94..6279cac68e13 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
index 703fd3fef2dc..e555aecde0bd 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
index 915a64197d79..d859d6b82323 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 58ce3cf285b7..2856cdc3a628 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
index b1c2df6bdd5d..1b2657fdac28 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestDisplayNameFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
index 1ddd7e01acc2..ce561b5867af 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
index bd82bdc5fe2e..1ec271b73cb2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
index ec44504ef4f2..be104eed997d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java
index 7cb93b5dff07..e620151dffd7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
index 16f22d1b09f6..9453577a472a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 4b33f7ed1743..ba5f53d71971 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
index adaa7bf76fb1..1fdd3c7b9e5a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
index cac64e58fadf..ffa5cf066e2a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
index 799255432b4e..1391d4cd293e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
index 553964d18bb8..eb058aef673e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
index 6b19159c0cb3..9412983b6495 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutDurationParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactory.java
index 4c94a3c0a281..82c39e5d9a87 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
index 4f1de2fdfe17..9efe2255e9d3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java
index 2af93e782d8c..08f6851f1943 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
index a218d7e2d126..49a80ddb6c33 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/JupiterThrowableCollectorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
index 238e0219f54b..5df8ff6a9074 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java b/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
index cb6da73a100e..3b10c68b5d56 100644
--- a/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
+++ b/junit-jupiter-engine/src/test/java/DefaultPackageTestCase.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/example/B_TestCase.java b/junit-jupiter-engine/src/test/java/example/B_TestCase.java
index 9020f1894469..95ab9959760f 100644
--- a/junit-jupiter-engine/src/test/java/example/B_TestCase.java
+++ b/junit-jupiter-engine/src/test/java/example/B_TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
index b8021fb769d5..470fb7be4461 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/JupiterTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
index a99eb1ca51b6..ac8d045eeb25 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
index b67c52ec79e4..5900e356a2ad 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
index 5238db6275b9..77bc9ce42eec 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
index a68f5c47fcab..8c09c72c925d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
index 7b711bad2e5b..ee2f2f61a34c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertFalseAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
index 12ba2fa92f9f..70d5882b3915 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertInstanceOfAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
index dc3d10b3e250..843f2af7dcd9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
index 3080cc2d4221..97263cd66343 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
index 5755fa66c5fb..1606c6be17e8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotEqualsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
index 2854a3d28939..bf234197f224 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotNullAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
index da8cb57915bb..4429f33b4bad 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
index 145b25aa1e6f..e97ed12f3bd5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertNullAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
index 4143b41b2a76..e9ab08de1a49 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
index 3874cc0cd464..7a807db61d55 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
index a2ba7e75c4cb..79c1f32876d8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
index 0dfd4e7d6e13..65ef3620eeb5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java
index 1f4d453cd698..c1570e6a004c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutPreemptivelyAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
index faeadabe0569..edbda5c9b01c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTrueAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
index 94c39bef39bf..3db358427077 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertionTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
index 3e9cba4d55f9..badeff93f66c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
index 7f68db1e0c7d..427ebdfc1fd0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationInheritanceTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
index 1f3f468f86d5..a02a9adfe1a2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
index b4c586b43948..91a49501f0e1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
index 9e4061ced067..c3ce961104ff 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/EnigmaThrowable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
index 599b088b1925..fa2edce64b6b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java
index 1b60dbd8f0b6..1a506ee02968 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesGenerationInheritanceTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
index e3edd5b758f8..8b6db62d1b20 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesNestedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
index f9764f89eef8..d1cdbcdbbb98 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IndicativeSentencesTopLevelTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
index 9e02a3c4643a..0bf31285d9b7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/IterableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
index a61cd0c48bf9..7a21eb3b7e6c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index dbc8d674eba1..9ccce353304a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index 2901dbaf001e..bcca45f99859 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
index c8fdbd9b86e5..fc1524d89192 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
index 5a8946b77224..07a3e78242c8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
index 50b9714ee3f2..cbc06823cc52 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariableIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
index 26ff4be04a03..c783d3229387 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
index 6933a1773b0f..d7be117713aa 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
index 927d04c7d00f..7dd479d362f2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfSystemPropertyIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index 11a330fa1d4d..35fa2e52bd85 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 4df14f6a612b..12ece2e580a9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
index d6c4af6998f3..bab7f53dc24b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
index 859fd018e742..d5a27e7ed29d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnOsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 2d07d65284f8..f894695285d2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index cd2295aca560..5007240e7f2a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
index 840e4a912d61..ec249667d8be 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
index 1c38c1eba721..c90c28c226f8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
index 09b9050c112b..2e0224c310bd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariableIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
index 8b8df8820cf1..60eac3adcb41 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
index dc5529d4c26b..399687ddfe58 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
index 7af53e704efc..2a6010e38af1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfSystemPropertyIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index 0c1973cf1eb4..9c4bb4c2a143 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index 5a44a77f9265..a7a414486727 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
index ddfccaebeb93..267e5e69f53c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
index 8e8f8b1c8f6d..5e7b15c6b740 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnOsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
index 9587ad3ee778..f915146cfee4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
index f4d8e378b2d0..1175c870824c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/StaticConditionMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
index f9e35c4d3a57..f96e1b6341d2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExecutableInvokerIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExecutableInvokerIntegrationTests.java
index a9c25aff5145..82a96d168e0a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExecutableInvokerIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExecutableInvokerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
index f8db055077e1..1ac243cfc520 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/ExtensionComposabilityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
index 2a9b874637fb..1740f609d951 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/KitchenSinkExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
index 75950433a3cb..3c02d637d0f7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
index 9fcde033ed49..0efa28c947bc 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssertionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
index 08ad11b8ab62..0d5cc0bb062c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/subpackage/SubclassedAssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
index 856780e0dbaa..69264f903287 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
index 7fe62961777d..38bef70a8411 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/AtypicalJvmMethodNameTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
index 8161147d2852..2cbbf64ad53d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeAllAndAfterAllComposedAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
index b6c671a8665b..e6c3804877ee 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/BeforeEachAndAfterEachComposedAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
index 8fe90401e8ff..7dd37e1ea3ca 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultExecutionModeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
index c784f1dd8bff..45d86c7c1773 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DefaultMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
index b66f56895f02..63f433671e64 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
index b6857d0f26f3..87dcf40c4fc6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/DynamicNodeGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
index 107e3e9c8fb6..b1662d658fdc 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
index 276b022254ca..726eb885b82e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/FailedAssumptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
index a4ef6b34f3b7..87cffb5af787 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
index 22038843e8a5..5358e434e834 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/JupiterTestEngineBasicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
index 2204151b8ee5..a7d093a1b79f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
index ee6dd3bf778e..f8ded8659782 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/MultipleTestableAnnotationsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
index 87114faf8994..2788b157021e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
index bf4c5ef3a674..529026ecdbf8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
index 4528405018a9..8b69ac205dee 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NestedWithSeparateInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
index 5c5659e7a6c9..8f44af792f38 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
index f2b2557cab1c..6f17f3678cd8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/OverloadedTestMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java
index 776cd53ebd2c..f5a05db35c2e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/RecordTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
index fb623569cdc5..ca909b8db483 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java
index 6faf5e0cdd14..e1e0f7dc36a0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/SealedClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
index 61f622aeee5a..230d5ebc1d3d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java
index 473dda4b393b..4264860252da 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
index 21a885ba49d7..12aa4566ac36 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
index 0d80fc60c299..87260717f3d6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
index e785ea5751a1..50d059df5093 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleKotlinTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
index b72d4e497db8..91548496d9ea 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
index 8c129f4e1aac..5b63eee0c373 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/TestTemplateInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
index 7058c4b58741..0bc7550085bb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNonGenericTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
index 1f644e595084..afecac3326b5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/AbstractNumberTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
index 516ee7646acb..13150e88b212 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/BridgeMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
index edd08cfe9f42..bd3cb864ed5f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithBridgeMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
index 620d695b68bc..2a5169126c2a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/ChildWithoutBridgeMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
index e6ca05fd4dc4..114d6a6100e2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
index 49bf69a03cdd..5f2146f65c7f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/NumberTestGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
index ece447bf5ff5..909139a09ae1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/bridge/PackagePrivateParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
index 72717bffd608..8c7fc8681bf5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
index 584f65f1d8ae..1f527013eb08 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
index 0ff5eb56c9dc..6923183aedce 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
index bd74cbf208c4..40ef487c7815 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/CustomDisplayNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
index f9947698e7e1..1a14ef7379d7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
index 61703eb251b9..e9075148b54d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
index 0c540d8f7e72..05a3bd435214 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
index ccf78cd02f47..a77ec6abb918 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
index a88700f06044..530454f56bc5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
index d22845ecc42d..080e42840be8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
index 67182614032a..78d92bfcb2c3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
index a370c4c2e961..b808248cb804 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
index d5043609a6b5..25091d05bd80 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class1WithTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
index 0be3cb79fb67..2732b2742e53 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/Class2WithTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
index 58f9e7321676..139f38e6f287 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithStaticInnerTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
index 0e0b253030cf..bb0d49fecd0c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/subpackage/ClassWithoutTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
index 207c6c8f0ae4..0798a2ca9e67 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
index 2ea7f18a35f5..3ab385d7eded 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoveryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
index 8c7c734b119f..99a4116617ea 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsInnerClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
index e5e7b20938e8..9ce907e8582f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsNestedTestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
index a513ef5eb9f1..09fee4aa77b5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsPotentialTestContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
index 4a5cb17432f2..53537e9afe61 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestClassWithTestsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
index ba9706e970b7..e814cee4c496 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestFactoryMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
index 6c41992e2707..f4d211f84fdd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
index 6a28c9bbf0e1..a260e0d6cbc3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/predicates/IsTestTemplateMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
index 4841213b3a5e..f633790b34ac 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultExecutableInvokerTests.java
index aa1f264f741e..ab54aade988c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultExecutableInvokerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultExecutableInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
index ac439d333230..d3881a3dfcea 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DefaultTestInstancesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
index 1ebdd27c2626..c03c65813145 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/DynamicTestIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
index b3bde4a57706..f09fb6990655 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
index 0d62b1d4dfca..16f40334473d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
index 97a7b215a407..04d6fc009ece 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvokerTests.java
index a270e28d487c..544317661154 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvokerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
index 4d86c68f7f68..50696360fcfb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
index 31dbb1657c40..8bdcbb2adeb3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
index 3ddaecfc0b79..a5184a8484d2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/UniqueIdParsingForArrayParameterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
index d371b025b9c6..01d89a574f3c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
index 14f631cb55f0..b24aad8b792a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomAnnotationParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
index cf9a1f6d50a8..e9df48a082c3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
index dddcffa24033..2907826621d4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/CustomTypeParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
index e5f26ad0f96d..3f4ee2c5487c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/DoubleParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
index bf2857364305..9b796003a4f9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/LongParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
index 54b11d6bd4b6..ce4f0f6ff0bb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfListsTypeBasedParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
index 617e8d087dc7..d8f94f09c90e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
index 7aa08b57deaf..c44c9dd27876 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NullIntegerParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
index 245d86e4b565..f1c826ae522a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/NumberParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
index 161fb68b2209..2c6ce89a5c1e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveArrayParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
index 4732cdcbdad1..9893412bad23 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/injection/sample/PrimitiveIntegerParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
index 5546fd35dd3a..57a128e46f1c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
index d40a133316e3..93f03748c33c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
index 15619e87133c..a06ceed8158d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index 0daa108be3c0..a2d6b710dfe7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
index cbd0362b2dd6..db1823b1abb2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EnigmaException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
index ae1d146b5723..811bde21c6b4 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/EventuallyInterruptibleInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
index 12c6d81fa3b7..33422f049fa9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
index 6ffa4f7ff187..f87d38cbd995 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionContextExecutionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
index 836fbc085f51..5b8a208d0492 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
index 07094380bc8f..b7000fbc63da 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
index 01e3d10ebb7b..c04636c2367c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/InvocationInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
index 323d88a212b1..4214dcfb5679 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/LifecycleMethodExecutionExceptionHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
index 1bd1b9156113..09026c6b1362 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
index e6187b55aee3..ed86fd2a2448 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
index 24f83c5f9f73..6d74a431d4b7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
index ef6ae8fcff11..9809dc3af816 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
index 16be2561acb3..5ae50c4cf50d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
index b6997ca15455..dc2d5329c469 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RandomlyOrderedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
index af28805f4673..44514c06374a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocationTests.java
index f4af4da6c0ad..81630493d66e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SameThreadTimeoutInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
index a5355fa63682..8ea41562ddf6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
index 5785cdcba363..abaf97bd92d3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ServiceLoaderExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
index 9a4b8fb1fd01..ddaaa214f786 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryCleanupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index 5997eb2ed4df..60c9f383bda9 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 40bf1f02072a..6cc8336bb202 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
index 56539b997b8e..4a5b020e0fde 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPreconditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
index 366d2a4f4ea0..1c4409c03dd3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
index 070ec9c06051..ba4610797714 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInfoParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
index ddd25f01c166..b773e9eefbf6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
index 256a41257a9b..2b684fa941b3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
index 26142267cf45..225e89de951b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
index d6975a2c096b..100cb30fddb2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreConstructCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
index 7dda92365286..a20d3460b5af 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
index 54a3ed110dcd..4ffff6264b37 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePreDestroyCallbackUtilityMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
index 394ab6b09006..2dbc6e8e723e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
index 315f70642145..4c446f6fa094 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
index 5df3617b92f0..94b9e756eb00 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
index b3195c7bad3b..7eee8ae416a0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
index 1fc87607fc68..494ea9dfa6ee 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java
index 75de6f895309..95aa77c42c42 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
index 012074155dbe..6fc772440c22 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java
index 6fc152a368d9..31dda7730477 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
index 0b820dfb60dc..9e9533e45223 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AlwaysDisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
index cce8fa3f6d61..d8846b32aa58 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/AnotherAlwaysDisabledCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
index 79d126531464..f2f2cab45200 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/sub/SystemPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/subpackage/SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/subpackage/SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase.java
index 90c8ecc39ccf..c2d184262083 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/subpackage/SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/subpackage/SuperClassWithPackagePrivateLifecycleMethodInDifferentPackageTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
index fa8ea0a99b7d..a3b492b8e254 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
index 94d1cfc111f6..9170c22c9e7d 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertTimeoutAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
index 7e44ea799b3f..d283aad8eeaf 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
index 2234f5dce3fd..00023d0a5723 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinFailAssertionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
index 79489fb84221..1b919a9f2ae0 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/ArbitraryNamingKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
index a6aa021e858a..f5c4e5b88dbd 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerClassKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
index 67a14a37e923..b5845f9ae0fb 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/engine/kotlin/InstancePerMethodKotlinTestCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java b/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
index c50399eea78b..e80608fb41b4 100644
--- a/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
+++ b/junit-jupiter-engine/src/testFixtures/java/org/junit/jupiter/engine/discovery/JupiterUniqueIdBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
index 6bf825945f20..a5ee8bc8824c 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/EnableJUnit4MigrationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
index bc0e47b6c5d1..477cedcb6213 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
index f28802c5003f..c215ecc808a6 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
index 66280212ac8e..538a053b1e32 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
index 34789798babb..f31d6bc1f9dd 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
index df82a22a9017..99a24d9b438b 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
index ba0dbc96631a..dca4784fddba 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
index 9f24bbf5976c..223f609e225c 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
index f0c5041dcb38..1b1971b2d04d 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
index 4295952113f9..b6905f42da2d 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
index 202148eeb52b..ad384ce9f47a 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
index aef447ef4bb7..ec00fc823e2c 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
index b6409a85babd..c7dcdd6830ce 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
index cab356a3448b..7a8dd0c501ba 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
index 01506885103e..0004b905fdf5 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
index 2950842bba1e..75fc5ad6ee5c 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
index 35513bee0a74..f37c15b81a90 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
index fb18f895de66..3befccdf3373 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreAnnotationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
index 1b5d14b43c76..95be5fb351e8 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/conditions/IgnoreConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
index 642d0dc8f107..4829db6d1634 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
index 461b84ec5d20..00185dfd91be 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
index f1df8401212e..548459026e3f 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
index 9715660fa1de..96629e2ec313 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
index 6108ceda7a02..45a5e81e7413 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
index 110309901ecf..28bedf135ffb 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
index 9789c2dcf15c..7e15b4abc866 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
index ff03a0d6d09a..4119170dba5f 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
index 3d639ce44e2c..dc6f4fcaee05 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
index c6a730abe9c5..67c395b46a58 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
index 99b3abcfcf62..08d51f17968a 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
index 4ef4ef732c97..37774078b0f0 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
index 109c6608fe71..a42db4c56638 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
index 0a0d43702a08..9b559cc0a2e6 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
index 023a78a723ca..9d566a581b77 100644
--- a/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
+++ b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index eeb0bdb7b31d..1fcdd80bb829 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
index adb5d4138f6d..113eb550e727 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
index 760d69d29d7a..c30892adfade 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
index 2b87411e61ec..5f3b159af785 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
index 07f308070563..4d8899d89639 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
index 7f2146ac405b..15bd6b34deaa 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
index d4c5f8d6e859..57a0b88f3201 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/AggregateWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
index 6f143a759cf4..ce439621dae8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
index 08139bc1ca90..38d9e21a84c4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
index 379c9aac1b94..10b96762420f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
index 5779699497ca..52887ed5de94 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAggregator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
index f3ea65aa7610..d5990c4716e3 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
index eee4c0120a59..0bd9513c9cbf 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
index f7b4a75739cc..d17589655ae4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
index 46b4d121b1e3..42be3c88f65d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/ConvertWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index 8dc45d1661e7..0db0027c89dc 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
index 67d20dd30e9b..be2ea7d1370b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
index c049b8a59f04..7c1defaa3180 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
index f491fbf72fdc..bbfab9e6f006 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
index 6cb2a32ea2e1..dc1a32ea8742 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index f6ea5ad66858..505ba540c33a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
index 98d1aa082496..da3371f3795c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/Arguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
index 2fb7ff668955..e57f5423cb5d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
index 757a11344c5d..04f7849d91e0 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
index 706910de1bab..320c8ad8232e 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ArgumentsSources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 7a2999eaaf56..ceecaccb2ab7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index 10112978b59d..14650f66e26d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 84a980638b3d..6c0a765c54e6 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
index aa31d3cc1963..b31f522309f6 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
index 6e47ffb1eae1..252670610966 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParsingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index f1930dcedbee..be44973c9031 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
index ac6d1b01358f..8debbb3a86ff 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
index 65b2ad69fd51..99023a73e9dd 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
index 6985bb8c838f..a4853eeb9339 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
index 59b1ebfedb8a..c518c1581536 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index a4696a2739ec..35d97c6dc9c7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index 26d70432d85b..2d0ffe9eb8a5 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
index 09ad77c258ab..ebbd4162ae63 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullAndEmptySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
index b33bd5d88431..569dffded498 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
index f314531d8cb0..f040c26c9c83 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
index 841af2641408..283e78bf212c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
index a8ee833916db..8bda32cf50e4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
index ee047975faed..bc63eb037203 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
index 731d77f0ac54..4930441cd4fd 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
index 2ea65af2fafa..a9e2f01a6a32 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt b/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
index 4601274c701d..bd1ef56d1169 100644
--- a/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
+++ b/junit-jupiter-params/src/main/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index a02039e1a46a..12f044db13e0 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 56f35329262d..24d2a711960d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
index befc91a2f9f5..038c350210da 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestMethodContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
index 5cbea3c75e10..c7a7616bd6c6 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
index 43f8145e64af..dd3a68eb74a5 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
index 3090bfcf2166..3e63bb310416 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/AggregatorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
index cebb627a9cc2..f56beb375dc5 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 259cbb10cb7e..12ad9cca0703 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
index b88a48cde398..1d2cd21a6fdf 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
index 0180957c5394..3bb890746dd9 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
index 0f82f5e7e73c..2a59392cb56f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
index e8ff584e033d..48958cf40eb2 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ArgumentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 2fb55af504e6..67acc181a2d2 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
index 44b11dbe3b95..1933e502656f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
index 135df1f40f6f..87a8dfd15c69 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
index cb85817bfd80..f36a31407aca 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 21f14662ecc9..bf7c8b5e2536 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
index 7fca4048c19a..629709cbb17b 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MockCsvAnnotationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
index 835aec70bcfa..b9416ba418ce 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
index bef2cfba33be..d30f8f8e2cbd 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
index 080eeb2c8dd7..96b717ad5044 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/DisplayNameTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
index ae91f0e61602..20c6d94370d4 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/JUnitException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
index e5b8b91191a1..e858ad26b13d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/PreconditionViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
index c1b8781a09d5..476289b28110 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/annotation/Testable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
index c7c54f43e840..9d7c5997b532 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
index d0b7feabe56a..3b0c357f5090 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LogRecordListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
index 1d5302fccc0d..5283e18d3b25 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
index 511d4d897437..5e06b26fb32d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/logging/LoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
index 657546f25c23..037c9ee509aa 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
index 3e6648e8c959..5039fd87c7e1 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ClassSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
index 9222d590043c..aefcb1e41bf6 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/HierarchyTraversalMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
index 4e9085e35c6e..7dbb748931fa 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ModifierSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
index 6a292eb6789c..dffe8ea5033b 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
index 760db041aee4..005167ccfa55 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
index 316474484a66..9da0cb5650d6 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
index a84c333a00ba..2c82dd500dd3 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/BlacklistedExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
index 2502cabed5b8..a6844206fe0d 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFileVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
index e5961ee8b869..63c15fb70da3 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
index 5c3f332fe372..0bd035b9ecd5 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
index 1e1778c1b044..cea745d1568f 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
index c9d5c7cb5050..41c44ddbf54e 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
index 9c943195d90d..c4589503d12a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClasspathScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
index 3ad49fe7f0e6..e6bb3ddd27df 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CloseablePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index a3f83b2f6656..dc6bf37a3677 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
index 5bffb9b903eb..d8177037278b 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
index 6720886c39dd..492df5c6b3ff 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/FunctionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
index 5245a7b1a13b..dc95539624fa 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/LruCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
index e875a3e55644..b230c9213471 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ModuleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
index 971bdf14ab81..2156b2df739c 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PackageUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
index bfb58e40a7bd..67dcdde4cbe7 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/PreconditionViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
index 58ee0a70470e..6e64150c2db0 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Preconditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 927dfa7929f4..71d51d53463f 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
index 020f23226b01..cdbdc1fb2cd2 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/RuntimeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
index c853d73c4349..11155c0c822f 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
index 130714a2e182..72695f508a73 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ToStringBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
index 77eac841ad75..dd730e30919f 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/UnrecoverableExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java b/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
index 40255dc28c73..ff2b056653b2 100644
--- a/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
+++ b/junit-platform-commons/src/main/java9/org/junit/platform/commons/util/ModuleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java
index 68a65c1fd03d..70dabdf010a8 100644
--- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/ConcurrencyTestingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index 672293ad56bd..d697987c9d10 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
index cce1b8293f70..23dd8225471f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index 97a33b4bec98..fce8ad509aff 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ClasspathEntriesConverter.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ClasspathEntriesConverter.java
index 754321708dd9..8ea5670c7d39 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ClasspathEntriesConverter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ClasspathEntriesConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index e8575e1c232a..4321acbcd598 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
index 63ca43c7c120..b460540e4add 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
index 80d58d813730..da43806a57f8 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ConsoleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
index f445509c705b..7e6e4bdd850d 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
index f6d488693ea0..a064c1285fdf 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
index 706b1fc7ea19..65f338daa2eb 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
index d7fd622aac88..8981def9035e 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/Theme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
index 687eaeb6a743..d330be01b716 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
index 069d56410b56..a587980f362a 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ColorPalette.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index 0db8008d6a0b..a9e540a38c35 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
index 7eff60123106..19794e9bece7 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
index 76368f3867a9..2fb1ea03a74b 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
index e1849cc5001d..bb68bbff4366 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
index f1c1b64d1969..31f530b85c02 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Style.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
index dd9cc61fc0dc..40fdbf9345ef 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
index a713aaf4a27b..4f72afff6079 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
index 0c51a1f2790f..685ddff5c894 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
index a411528de916..9031a383f64f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java b/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
index 8daae7d7ed68..89698f1019f6 100644
--- a/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
+++ b/junit-platform-console/src/main/java17/org/junit/platform/console/options/ConsoleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
index 98486c7873d5..d0a830a4f939 100644
--- a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
+++ b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
index ecc941371d70..41522e850bf8 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/CompositeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
index c7fd8852c920..7c859ab31c62 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
index b9038b876fb4..68b5b1d588a0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoveryFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
index e7e88fd08a29..06c222ac6c1c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/DiscoverySelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
index abab7c04d299..615ce857d5d6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
index df34b36d6529..e5062594c29c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
index 1a0838a19a9f..315548ff3b98 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
index 385e40714a41..2c77f1fd5d66 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/ExecutionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
index ee4ace269305..2d77ff1efd2b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/Filter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
index 9c5d2d79e94c..622205aa3bf9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/FilterResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
index 52656ace8061..2229101742aa 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
index a2cffcf5592b..b16a8d4319e2 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
index c8201707eeb4..401fa19363c8 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
index 1006f81062f7..6509ecd47b41 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestExecutionResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
index b6b175726e7b..0f3d873869a0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
index b5e1166d86d3..9a32e07f9261 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index f239ef5c038c..f4d516cf79d3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
index cf931f79af22..f89dddd98a84 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueIdFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
index d3b23410cd88..d8512db329f7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/AbstractClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
index d5942fd2999e..ae4049899b9c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
index b33f981f89ea..30f6906994d7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
index c4f714478ec6..b257e6c26ce0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
index 0e5a2740283e..b9d03f484737 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
index 9885c3584161..167da07b1237 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 729dca58e6f7..77336370a366 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
index 03fd04b9df96..8a3aa725af21 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludeClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
index dab9dde7b273..37fb11ca864d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ExcludePackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
index f5b3969fed2a..4245187ae651 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FilePosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
index 6f9ed604d81d..78bf501c6d8d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
index 55a286caf5df..5cd49e1413e0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludeClassNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
index 3666df39a37e..2ceb30f4a142 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IncludePackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
index 58e53de73aca..fe9ff20acfdf 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index d8010f0ad6b5..ff7e627ac4d7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
index 3288b5c7638c..68825eb0d84b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
index 1fd221f54f80..5d463eabe438 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index a879cf09d68e..28f00afa88c1 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
index e77fbe828393..55a808efa828 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageNameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
index f1ac80b7ad6e..781fc2af0906 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
index c328d8cf6d43..4fee909e7746 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
index 23d181bba6fd..c673851d11e0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
index e98086b5cf1b..6e114191d110 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/reporting/ReportEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
index 071c591410f3..f50e9a32a48f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
index ff5de7e844c3..dd0a53e8378a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
index 66cabecb6daf..89f33addb0fd 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClassSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
index 39201a188813..0a288d3257b4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
index b3bd968951d7..3fa3ccc9e6f3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/CompositeTestSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
index d0c56ca14582..dd7a602a3d49 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DefaultUriSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
index 5d7f808749a5..c64c2dba18a3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/DirectorySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
index 058c7c8e56ce..fbf57519c458 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/EngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
index 4635d12387ea..a0fb2c943453 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FilePosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
index cfa3c114ba9a..7e4ab6c9d989 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
index 335ff3225b1f..2a4c976d04bc 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/FileSystemSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
index 5492bbd90f3a..977bd4f8fbf8 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/MethodSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
index f714ed70085c..b19dc3b3d9a3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
index 15b014848a15..ae9cfdd2f35d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
index 689de827e870..fb6829e5c232 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
index 927d157955a5..886743da69ae 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ClassContainerSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
index 8b2a5b3de5e2..81c618f965c4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
index c88df82865e7..344f917ca9e6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
index e32fca8c9541..93bc2b1d647f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
index b3b5f39839a8..9169ea77ead6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
index 53b5b4b929e6..41b08d5fa3ae 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/CompositeLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
index d2413bb2742a..f00735a7b69d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
index 58efdad6f307..52f03cb6dee2 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
index 2dbb21a9871a..4a3748d96e53 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/EngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
index 64412dc6b7a5..1674101c4c4c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
index 1d0c93d04e68..84ef2561ea27 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
index fb60a2308e4f..44ff65f3a581 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
index 5b781b663df3..e1535dc116e7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
index f8767e118c82..b4290a77d0e3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
index b9d8778ca195..1b5b37b024ea 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/LockManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
index f5468f11bb96..691d5140a68e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
index 5918c7b96d51..0a86036135f3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
index 1fa542d8f0d4..34df1e0c0acc 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
index c3b6e93f9a44..35a34af81313 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTaskContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
index 00521be8ee4b..2bb59d5099f9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
index f0212d11f7b9..b76ba240ddb5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
index fea1c84987b6..df6f64fc3707 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NopLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
index 4526824e688f..53b9e2168d70 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/OpenTest4JAwareThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
index aa39d56e6b0b..4707889644ec 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
index a68551aa5f82..181ae46332a6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
index c471858dab33..9ec55b8f7fca 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
index 841d3c75f020..c1844da90ace 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
index 5c8666b586a2..5d104e8d9284 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
index c252fbe3b05d..6c87fb116517 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
index d934be5284b4..5a1e9d56d470 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ThrowableCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
index e7e96f29b9f9..8d3c74a71b8b 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoEngineExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
index b11ec5481d56..09c0b622c601 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalContainerDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
index 2d499a9706e5..1d14b7710182 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
index 60c31b622c40..130aba4ad691 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
index 1f58a1edb609..97f23ce1ed8d 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/engine/support/hierarchical/DemoHierarchicalTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
index a179e00962dd..49907eece1e0 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestDescriptorStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
index 4e5607828d5c..2cb30350c351 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
index f4140988aca6..3ef7186545df 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
index 1db552486b12..d506a562f320 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
index b4c3e006c29c..be66660299cc 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/FlightRecordingExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
index dd783ad6d4e2..653226e69ede 100644
--- a/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
+++ b/junit-platform-jfr/src/main/java/org/junit/platform/jfr/UniqueId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
index fe937d846a16..39c703720dad 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
index e0519879e188..6013abb28732 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
index 5ad899165d37..2c3a96df09fd 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index 33c1923b1f77..b4f5916f00c1 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index b0337bf8cd25..90062041a169 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
index a76abb63b6c0..1a91c9cc4a9e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
index da968fc9f08d..b8e71c8d0426 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
index ebdd60288b0b..96af16434669 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
index 45328f2fdd75..7c31d55c5a00 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/PostDiscoveryFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
index ab69315eaa05..7389aa53584d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TagFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
index 95d3e88c5d47..fed40da48355 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
index beaf8128dc56..20eaf35624d1 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index 9862307ee947..0557b8650a4a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
index c99a44f57cbd..fc3cf56183e8 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
index 399745ac6362..a8c5d7ade41a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
index 53f27acb05f7..422f9592374e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index 258513847e39..3b0dc3e03f91 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
index fd90412a2984..500cdde224ff 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
index e443c48b19dc..79f6d815fc76 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
index 14fac9ecfc9c..e2f410533602 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingEngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
index 75beb3922aa3..50a4df10b05c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryErrorDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
index 94dcc7813395..4bb7f3193149 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryOrchestrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
index a917588358db..a5441ae65462 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index 982d62a91371..35e174e46ecd 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java
index 98d2e6afc6ac..04f0d24fcabe 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
index e7c434ae261f..adf3739b39e0 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
index 800e9c0aa5a8..f2d87e4bfea8 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ExecutionListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
index 3b2e0001bd4a..453be6931729 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
index 051d2521ac70..20a1557195fe 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalTestPlan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
index efc23d181baa..0a622b168f6b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
index 2f220916d3f6..5d6b95edd9ee 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 42e23f00ab6f..24be659b290a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
index 94122c8f9ca6..9e6d3e7a3bdc 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 309cc883c5ed..3ac0b4c8330d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
index bcc30d678176..1fab26cd1cdf 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ListenerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
index e4754b87dd56..9b55df04d521 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/OutcomeDelayingEngineExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
index 936d79c0ec74..47ccd2f23095 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
index 0d691e4b07a6..00233a6b44db 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
index 76b8671079b1..9c0b7dd47e60 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
index ddcfaff3158d..be0e6a41e1ae 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
index 3c7fdec7e7f2..aa72890f359f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StreamInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java
index bc5e2ca9723f..0c5beba2b06e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/TestEngineFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
index a751ae3d117c..4ab5097a9d33 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LegacyReportingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
index 2325df03b3b4..949d36572f22 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/LoggingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
index 1e95f1ae754e..96f341443ce4 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/MutableTestExecutionSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
index a76785ee4667..14080b1f7e27 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/OutputDir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
index e32db1ceb02b..a161fc503162 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
index 9c9be35bb398..3a996d0163c7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/TestExecutionSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
index f644ec3711d0..379dccdb6f73 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
index 94f96b2c9a3e..b41816c4cc03 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
index 277126cac864..1484696628da 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
index 71a32a808947..c64f28fc20a2 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
index 770903f0211e..b3a674d51802 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
index 4039fec43d3d..a79f93f8cfee 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
index 2e7b901c18f5..f200e01adc54 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/LauncherSessionListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
index b2cf0a2ccc3c..c49df5f640b3 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/DequeStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
index 2b22142e0580..936b53c57203 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
index 4793a6ed4d99..a8685088cb10 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Operators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
index fc766a8b5011..1c0a13469bac 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
index 49e25ce6005f..ceb19b32b8d1 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
index 1f3036e6144a..52f8fd154368 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ParseStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
index a783fa55b1bd..c3b3000a4c93 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
index 3be8a21cc47b..063574ff6bd7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/ShuntingYard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
index 2433acce5fa7..ab7d8b738fd2 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Stack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
index 5d9c1c29f1a4..823191bcf9ab 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
index d551581fded5..a9f8e04aef9f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TagExpressions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
index e7190e0823cc..f06a60ca97de 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Token.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
index 0f0d20ad8fdd..a580df8769f2 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/TokenWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
index a0f618ca217c..65d13c11811b 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/tagexpression/Tokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
index dcf316dd25a1..4444022d2df5 100644
--- a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
+++ b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/ConfigurationParametersFactoryForTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
index 39eff221aa6f..93002b81fe5f 100644
--- a/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
+++ b/junit-platform-launcher/src/testFixtures/java/org/junit/platform/launcher/core/LauncherFactoryForTestingPurposesOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
index 4b55976dfc63..fd8968f4f829 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/LegacyReportingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
index 927b9cd6b93d..10d902884eb2 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
index 9d8fc64c3489..1f7993531af7 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
index c61ed924c4f1..fd9dd98ded2f 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/legacy/xml/XmlReportWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
index 3a622f0e7e29..382404bdd7a1 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
index 316bbaa775c0..a81214a70c4e 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/LegacyReportingName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index b826a63a5296..05c452880a90 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
index 851486f435d9..49f8d32cbb92 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/Type.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
index 92a83a283296..4d3ef7b61e81 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/UniqueId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
index b48e6e518d4c..bbc87847f7c1 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
index afe01547ad7d..039117187dd4 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformRunnerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
index 8bec10b327e6..cb32dfebc477 100644
--- a/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
+++ b/junit-platform-runner/src/main/java/org/junit/platform/runner/JUnitPlatformTestTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
index 5dfc28eb24fd..0ab3693bbd80 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
index b458701acd09..0f12270a0eb9 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
index 6ed05a4764ac..d1eed0eebe7c 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
index 93b9a5132620..3aa18b8bdc63 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeClassNamePatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
index 217890b82ee1..e65acb5c7a5c 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeEngines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
index f8e5d95efc69..22b7736c2a0b 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludePackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
index b40367d400dc..9d55090efc67 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ExcludeTags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
index 3f2f1949c21d..5d75fedbb6d9 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeClassNamePatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
index 4a7258349173..4117947fbf99 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeEngines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
index d36e4c66fd48..7635d1dc3bc6 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludePackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
index 2e79ccd4afa1..744dc75a30ed 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/IncludeTags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
index af6ba7f2c40f..9d0a8d3c661a 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
index 08c7a3d1204c..64d6cc3d4e18 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
index c0be5d431892..a8860b9c0a4e 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
index d63020417db5..30d32a533d61 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
index 4fc48cdaf390..88be94546bc1 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
index 232e1b4406da..4f4c8fd44ff7 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
index 833b995cdfb0..12f90de77417 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
index 57986a22ae40..c2d5eafff60b 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectPackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
index bdf929623e17..82512f2faea5 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
index 5df5c0892ffc..739d65826de4 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
index c474a1dff93e..3cd11cb9ef4e 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SuiteDisplayName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
index 561b8dc17772..12b1180841a2 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/UseTechnicalNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
index 91866aa08c19..99dffdaf15f8 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index 147539a0fc07..fabe88911782 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
index 0d849470a594..441dc3f836c9 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/ClassSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
index 79f9d8cbf98f..f9c20e5acca9 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/DiscoverySelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
index 3a9cbcdc0a26..9e6816af646a 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsPotentialTestContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
index 948f06751529..f336c03fa746 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/IsSuiteClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/NoTestsDiscoveredException.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/NoTestsDiscoveredException.java
index 5307c8dc3a64..966cfcbe025e 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/NoTestsDiscoveredException.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/NoTestsDiscoveredException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
index 31b4b49a99ed..3c351b2eba46 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
index 7be8d79703b8..af776ef84f46 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
index 30d0e239668d..52cb4e1166fe 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
index e7c54bac8726..96b353392b27 100644
--- a/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
+++ b/junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
index 9ef8358f6085..74015e8818eb 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
index 6475a0a73b67..bce1db1c4a88 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineExecutionResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index a41f358c4455..195c223ffcb1 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
index 65b9ceaf5fe3..63c69409b381 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
index 931e39e67ec3..f1aa473435c0 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
index f1db3d05a9ab..fda7d1d8b2ef 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
index dc22e3e26600..1fed5b9b67ba 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
index a981a94100a9..01481ac30fce 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Events.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
index 7f1e4b4066a1..be14554e79b7 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Execution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
index 0db82a47852f..b11a1e44b8fb 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
index b87fc9b8fc24..6ef7a89e29d3 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/Executions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
index 4b70aca9beb7..e3875c8ce0d3 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TerminationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
index 8c7bcbf72c29..21ff73e7e4b5 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/TestExecutionResultConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
index dafea5acd5d8..8c5f1f276015 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/JUnit4VersionCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
index bce12f52d451..fb52f79bf06e 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
index 59f20cea9026..3cc89c7e33e8 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/DescriptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
index 39e1046146de..5bf9bf713ee5 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/OrFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
index 87f5fbfd9237..d81b64f1f41c 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
index 5390b5c94ae0..bb9037c2b7e0 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
index 56b03e625b83..0ad3c5f9b6a0 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
index 31886aa782a9..e5b327a2d1dc 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/TestSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
index 6af85def05f6..9e0450fa9a01 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
index 6b06a9e4c5e6..d8a64ba7c293 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/VintageTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
index 3700e5f92b40..a2d1e7d4c80c 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/ClassSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
index 1d4b6fe9d533..0da94f689fde 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/DefensiveAllDefaultPossibilitiesBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
index d586dfca6bb4..636ef2554802 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/FilterableIgnoringRunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
index dacdba625de9..3b5597e51169 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IgnoringRunnerDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
index ca4b12ad2f9e..91b9b1837adb 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
index 6c92c551046f..d382a606496d 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
index c37a744591d4..724e9a0231f9 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/MethodSelectorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
index 9f10e5fe2ba0..b9948537521a 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
index 2a68fd5d57af..24685c55aed6 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/UniqueIdFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
index b899aef37f58..427526bfeb14 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/discovery/VintageDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
index 3ebc5c802296..949cc4363330 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
index f9baebfc0161..9cefb8faee30 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
index 87c12c274e1b..23fad4dea5c5 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/RunnerExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
index 53820bf6c543..1e46e0e4a9e3 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/execution/TestRun.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
index 9c7fb87717bc..35a90736a831 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
index 5a0f815a3ff3..6c2846e1ac47 100644
--- a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
+++ b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/support/UniqueIdStringifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
index d6bec3b2ecfb..bb533dbc1fc5 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4ParameterizedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
index b9ca1e7355eb..4df0e86a7ba5 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/JUnit4VersionCheckTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
index 9b204236f5be..cb12669aef13 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageLauncherIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
index 2bbf685e67ed..e78df198bc8c 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineBasicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
index a8d07f7f1b52..b89470cf92bc 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineDiscoveryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
index 615de6f00be8..66af815aff99 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineExecutionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
index 76a12af05ea2..62f9f6c80897 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageTestEngineTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
index fdc3e813b804..88fdd91502a9 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/VintageUniqueIdBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
index fc3083c8bf1a..10247cb75e30 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/DescriptionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
index 307c78c7a802..572b4e7f5ba9 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/OrFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
index 8e6c74444f39..8211f75983e2 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/TestSourceProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
index 7690c47d4ced..58be5a839128 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/descriptor/VintageTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
index 65ccd5ea1037..442daa53d3d8 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/IsPotentialJUnit4TestClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
index 9a3cc044f941..6b64d1afa10f 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/RunnerTestDescriptorPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
index 70294b3ce48f..754c34b03a3d 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/discovery/VintageDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
index dd48ef2550ae..69272fd511db 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/execution/TestRunTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
index 90341229dcdd..3ea9cca2abc8 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
index f3b423b461eb..6ec8e41a0b36 100644
--- a/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
+++ b/junit-vintage-engine/src/test/java/org/junit/vintage/engine/support/UniqueIdStringifierTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
index 107b07c3f887..cad6044ab55e 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/PlainOldJavaClassWithoutAnyTestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
index 7a90cc206ada..ec7f01e9322c 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/AbstractJUnit3TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
index 2c37a851c288..0171e86ed846 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3ParallelSuiteWithSubsuites.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
index 283290e8ce54..a253e2f4d571 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSingleTestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
index 351ec840fea7..cb070d7738f7 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/JUnit3SuiteWithSubsuites.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
index d05dc143f2a0..17918c65bb5a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit3/PlainJUnit3TestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
index 31cc165b9e2f..6c18d8fbee90 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
index 958db3e27d14..b25e11801918 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/AbstractJunit4TestCaseWithConstructorParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
index 1d61e5507991..9cc5794815a8 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/Categories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
index 0dd49cb5326f..2331a56b6037 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/CompletelyDynamicTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
index 0dc636545d2e..e659b5953a20 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConcreteJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
index b500ac4ed8ba..47400e9465da 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ConfigurableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
index 822a881afd99..20f3238abe0b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/DynamicRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
index b62cc734179d..69f53e2d9956 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EmptyIgnoredTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
index d4cc092db6a3..dec70cc9c8a3 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java
index 1bed0ac24673..dce4f50c723a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/EnclosedWithParameterizedChildrenJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
index 082d24beff0d..146d659ca116 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
index eef9d8bd293a..19d53de56896 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
index 21a6f2a19d01..dd19ad0ad46b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredJUnit4TestCaseWithNotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
index 38371372d03e..0c127b5bc363 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/IgnoredParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
index d031e2428590..705f2b891915 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4ParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
index 4c7d2a5620bb..5b8a1284a004 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithFilterableChildRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
index 1c8b4812107a..04c4aed2ed34 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index 0f437a9df3cf..271cda1804c0 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
index 6f057ff1ecfa..66b0273f44a6 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
index 7c0ca261da93..01dd3aebddd5 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
index 012fe8f5776d..c1f1279a5053 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithIgnoredJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
index 7e9a628c79bb..aa4c409480a8 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit3SuiteWithSingleTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index 1ba923d1a560..6f2e3673091c 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
index e94a473c1159..56bc1bd23452 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
index 63f2221184fc..7e4dc1b0d22a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
index e368fe3bff07..b784ffde17fd 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithJUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
index 6dd5ac07244b..a6e652024510 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
index 6996b22ab070..4cf0eed133d1 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4SuiteWithTwoTestCases.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
index aafbd4915e4e..f06d3fe81998 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithAssumptionFailureInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
index 33fc9d48bed5..10f77db2df12 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithDistinguishableOverloadedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
index 802d23c5a720..090e04011b10 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorCollectorStoringMultipleFailures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
index 9c0029bb2a37..2cb44e601759 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInAfterClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
index 7a3e05f8897b..dd3afe5eb616 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithErrorInBeforeClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
index 3428266f3123..443296756b6b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithExceptionThrowingRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
index 98e29bbbc0a8..b1816d2ad44a 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithFailingDescriptionThatIsNotReportedAsFinished.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
index ff5fc5b4de62..6d4099db0615 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithIndistinguishableOverloadedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
index aa2af4f8bbae..9ece2415312f 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithNotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
index 1c279a3773e3..8906ce6864a3 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
index c8906f9792ed..aa039daf1a65 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/JUnit4TestCaseWithRunnerWithDuplicateChangingChildDescriptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
index 567d58d9830f..87480a21960b 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/MalformedJUnit4TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
index e14dc1430879..4eb6bea4069e 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/NotFilterableRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
index 8fe64bc90895..ec09442767f3 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTimingTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTimingTestCase.java
index 9b283b7184c5..a9905cbe96fd 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTimingTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedTimingTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithAfterParamFailureTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithAfterParamFailureTestCase.java
index adbda57c66d8..a6852f992030 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithAfterParamFailureTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithAfterParamFailureTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithBeforeParamFailureTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithBeforeParamFailureTestCase.java
index 0faa44830050..515f8d4ea633 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithBeforeParamFailureTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/ParameterizedWithBeforeParamFailureTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
index d23fc97d69ec..08fe68db3f08 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithFiveTestMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
index b1bebc7f2c7f..c629a21707a5 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithLifecycleMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
index 6a983af10af9..6ac3601bf9d6 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleInheritedTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
index 7eb944ef63b9..de6ac2b1ac0e 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichFails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
index 456c21b1492d..fb80eb65be49 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithSingleTestWhichIsIgnored.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
index db54c9bd3b05..ffd2cdc0c0cc 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/PlainJUnit4TestCaseWithTwoTestMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
index 3425fbc48bb2..dd94df329162 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerThatOnlyReportsFailures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
index 8fe637ff2005..1cf2140d57cd 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/RunnerWithCustomUniqueIdsAndDisplayNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
index bc448b7b7e4c..1718b50acbcf 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/SingleFailingTheoryTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
index 24e4a5d25b99..e4074c2f4fa7 100644
--- a/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
+++ b/junit-vintage-engine/src/testFixtures/java/org/junit/vintage/engine/samples/junit4/TestCaseRunWithJUnitPlatformRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java b/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
index e74589c0fc84..97136ecdb9a4 100644
--- a/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
+++ b/platform-tests/src/jmh/java/org/junit/jupiter/jmh/AssertionBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/DefaultPackageTestCase.java b/platform-tests/src/test/java/DefaultPackageTestCase.java
index 6d77e4eb7013..8018c935f497 100644
--- a/platform-tests/src/test/java/DefaultPackageTestCase.java
+++ b/platform-tests/src/test/java/DefaultPackageTestCase.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java b/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
index 5c4ff657964a..714869b603d7 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/api/condition/OSTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
index facddc9c270f..dd2df97c8510 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/Heavyweight.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java
index dc0f5af28a60..2d316392c079 100644
--- a/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java
+++ b/platform-tests/src/test/java/org/junit/jupiter/extensions/HeavyweightTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java b/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
index d7c7bffe67b7..8fdd06ae2021 100644
--- a/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
index 2921f47053a5..48633071c35a 100644
--- a/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/JUnitPlatformTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java b/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
index 6bcc4fb67c3c..fc3e8f13df41 100644
--- a/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/TestEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java b/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
index 29181e5b3e12..611a30bf6cff 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/annotation/TestableAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
index 51d4819053bd..52d466ffe15a 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
index 7758c0e48c9c..8675d0384d17 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/AnnotationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
index c9ad70889c01..05352fa97e15 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ClassSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
index 50a7221d35a6..9bc39a1a9f09 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ModifierSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java b/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
index 0e3cb4fb4031..bd7a3fe17638 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/PreconditionAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index e2629e05043a..efa4e8105cfe 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
index e591c46e20c6..478491014be1 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/AnnotationUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
index bce8b8c6c267..87d793a051cc 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
index 575c649480bf..7f0d6a7f34ff 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
index 4d54305c1f25..015e60b40cb3 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
index e3de9a5f4be4..69c2a8f778fe 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index db8bdad2433f..f2c4745cc7af 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
index d7395b41a653..b3750f5290c8 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
index 523cff7b3a8f..a543c6528482 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
index 59a7d3f61f17..7d7d6168c2a3 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/LruCacheTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
index bf7de6e69e35..5b8a42b547a9 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ModuleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
index 3f0a5ab3455f..009ba2c5ce16 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PackageUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
index 3978a0c57342..b525437b19d9 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/PreconditionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 9744850a9da6..d667bce7767b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
index 1ba6577e08ba..8e8bb060be53 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsWithGenericTypeHierarchiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
index 69aa54c40ae8..4174ab46b576 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/RuntimeUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
index 4feda4bcb7e8..f6989b4e9f62 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/SerializationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
index 55ce3b2faa30..d74b1d523e21 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/StringUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
index e35c98952a85..9802f344c582 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
index e1940461af57..d9d4b2ff73dd 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AExecutionConditionClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
index 774346f3a08f..99ad33e0b01e 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/ATestExecutionListenerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
index 40e7a28173ab..bda71e43b3ec 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/AVanillaEmpty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
index dadae6fdc9bb..a06b33004175 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BExecutionConditionClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
index 65337f4fcf4f..f8e9f5f2428d 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BTestExecutionListenerClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
index 041e7ecf4fe6..0ddbb17213a9 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/BVanillaEmpty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
index 499c3396a0e7..1ed5017d39f7 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleDetailsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
index 475bf2cd91fa..fd9be9511ab9 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
index 3e2241004a83..b8ccb37f3582 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index 8b1af287fdcc..c22e94e14e8b 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
index 22846b4e9ae0..1740d07912f3 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
index 539ae4bf8feb..bad59d3f0037 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/ConsoleUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ConsoleUtilsTests.java
index 7d5103411f8b..09e807eb902e 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/ConsoleUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ConsoleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
index fc88a9cd28d7..ed793dcf6159 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
index fb3f50e7e11d..8c96fed4c58d 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ThemeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
index 2c8c529b0b0b..b8181cae63d5 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
index 5ba1915f7067..410e9d8bd139 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForInnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
index 1ed70aaf00ab..8143890bb2d3 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
index 2ff762c5cbfb..c13387258398 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ContainerForStaticNestedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
index 91956de9b0e4..56bccb3ee8bd 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/SecondTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
index b57598e9a897..bcecdc12595a 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
index 67532b15a312..d554e0b23d55 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Test1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
index 5ddb93d4ef27..52142a320f42 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
index 3b2f64094feb..9de75239692c 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/subpackage/ThirdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
index cb1c8236b476..a5dd82529432 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index 44136d8a48ec..02c270af9d9c 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
index 8f50daf56c3c..ef53d1fe001e 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index f815943a57a1..3456eb8f2068 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
index 274e977ac960..a79bd43f85ae 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/FlatPrintingListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
index 91ede1d7be4b..a1256833c2d4 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
index 018ea4af911d..f7d5982754fc 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreePrinterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
index aa212b4754e9..2d140433a36a 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/VerboseTreeListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
index 899db26dd186..422d86df3ea7 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/FilterCompositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
index 48483a410be8..a98e1ec35af0 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/TestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
index 87c8edb7a1a0..d334b2f9a4a0 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/TestTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
index 552b3b0505ca..6913a7dc289c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdFormatTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
index b34a72b4a104..9c87d2611314 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/UniqueIdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
index efbed09ad0d0..622f00413342 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassNameFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
index c1a647583336..6da64efdb35b 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
index e8b26215d5ac..1755982663c3 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
index 061e50d76629..3f23e8aabc91 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
index d83dc4da9ef1..59f6522bb54a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index fb3f2c754fd9..db65c530b831 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
index acfd9538991f..bd5afe94a2c8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
index c85fedfb8c6b..2d4b47d1d410 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 63ff2ebf27ac..4f6b54125ccf 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
index 18c24ebc5b60..a637a6c77e4f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
index 59bf7933d3bc..c58b24b52a30 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
index 06bf615d2120..2c547172a95f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
index 6cfee25cfbe8..68c20f76c35f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageNameFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
index ba712020b39b..3de77a7b70e0 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
index 9c117b176750..13084e5fb2ef 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
index 9039e95fb739..1405c8e4e6c2 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
index 226ba8a8e1f5..5875c3491a69 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/config/PrefixedConfigurationParametersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
index 1057ea8df19e..abbc0f1e9f69 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
index 7cc4406b58c2..50dc4a1ad938 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
index 25ee76fa05d1..2d5b6eadffa1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
index fc931a9069aa..cb1f75bda45c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
index 439c5a0d9eb3..6984fa14718d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
index b9ec159450ca..bb488afb85a9 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
index 57b3ef9aecf1..8531561cd6f2 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoClassTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
index e928dc3dca0c..9b73b713b1f8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DemoMethodTestDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
index 77ca484940f1..943184689139 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
index bdf036f8f025..f89d127acaa5 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
index f112676af433..44c7f064d692 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
index d084834384a8..b7217e6d9ea4 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
index c277c3e88a91..8f1ddee3b755 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/CompositeLockTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
index 8df66936a7b1..5fcf9b4cb82d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
index 07f9a1f05a50..868386f83899 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
index 10f0e1511886..80d46102f08e 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
index 973d3127c3ea..342978f0a62a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/LockManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
index 441095b22582..ef706b918d95 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/MemoryLeakTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
index cb10e1bbe932..e78138018f75 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalkerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
index b4443e496a0a..ca7433377bf1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
index 349b5f3fb9be..59f02ffa6e7d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ResourceLockSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
index 714ea701d7ad..9a17de1a825b 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SameThreadExecutionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
index c6966e449daa..382a82fc054d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleLockTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
index f745bb4d12d8..2160099a67be 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
index e8b9b5154516..868e4804f72d 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ThrowableCollectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
index 66816363079a..9dfdc786b147 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
index c5f679b8c654..d75732ba8f0b 100644
--- a/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
index 986346bb80dd..1ca8e6b475b0 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/DiscoveryFilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
index 5be517289660..04c7eab08c43 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/FilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java b/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
index 997506420635..d16a7bbdd597 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/PostDiscoveryFilterStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
index 365480de8bb4..14d966ee9b93 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
index dfa99569327f..fd9809c1c558 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TagIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
index 31cab1236a66..8d007f4528ed 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestIdentifierTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
index 413473825a82..489f63caaeb3 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
index 25af4a121d65..02a39507d6ac 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherSessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
index b73d7426f637..b5a0145511de 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
index 85957bc761cd..5ba0aada6c64 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPostDiscoveryTagFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
index 4d8e786e44e9..b6ff9bac6307 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
index c1fffe2ef0b7..9cfc55503a6b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java
index 38cdb0e29a73..85732038f6de 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 53d862cd2feb..dce04470cd5c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
index 243accab2d65..e9421a24871e 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
index 3d9e46241246..7fb8ea2ef334 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
index 0955c89a65fd..63182980a0b5 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
index 97ce4573c39e..31154cfa322b 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherConfigurationParametersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
index c45d8e2c9307..f75ee1017fd3 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 78f5b8f74e13..d33d88956201 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
index b74b8ad1fb29..9cc2063d9b9f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
index 076a428de099..664076d24abd 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ListenerRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
index 9877c612ea34..cd70637eed3c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptingTestExecutionListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
index 8ed11146236e..c3ba0f96604d 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/StreamInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
index 89d4a42c3f0f..c3d6cfaccd8a 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
index 14438f62c8ca..d471e6e745c2 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/OutputDirTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/OutputDirTests.java
index 8700f9ed2efa..a876c5bf4d2f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/OutputDirTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/OutputDirTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index 4671332bcf34..76df87ffb241 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
index 56535d77bee0..86943a9cc093 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UniqueIdTrackingListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
index 933b915987f5..cbf7e6f9bea9 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
index f5d6bf59ec8a..0ee89659d92a 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbortOnFailureLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
index c5467c549d9c..1666f66f48d4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
index ed52d557b252..4cdecfa28760 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
index a686fe959924..3691dce22f1a 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserErrorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
index 24f887cf957e..4b15ba0fb46e 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/ParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
index 82e81aef34dc..852ed6af2f69 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TagExpressionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
index 4fee75a93057..387d2986aafa 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
index 319440c3fa4f..94aa30442a61 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/tagexpression/TokenizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
index 3ce0a11735f7..35931e1baf9c 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
index 8f10736e40e8..d46dad4a88a3 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/IncrementingClock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 285b59224e45..a0bcf137d122 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
index 4534538e442c..22b3d7d08a4b 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index 6618df01ad29..65fd5acd0d92 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index 19037e239f41..4c278dc6b2fa 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
index 7287f168064d..99398dbc31e8 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index 8e519514ed68..30bdb61aa671 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index 3d10535e8956..7a985b601ee1 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index 2b56f9d53240..4c44d1c04e3f 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
index 5d5fcdabe0c0..627de28d8de6 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
index 6d857c2f20df..7972eee2d96f 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/DynamicTestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyDynamicTestsTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyDynamicTestsTestCase.java
index f3c77b7b6ee3..be17ec51e4f0 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyDynamicTestsTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyDynamicTestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyTestTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyTestTestCase.java
index ec5f1290eeea..1251644af9ca 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyTestTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/EmptyTestTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/JUnit4TestsTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/JUnit4TestsTestCase.java
index 7ac88ca12567..208d48bb30a5 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/JUnit4TestsTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/JUnit4TestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
index a25db296e23e..41ddbbbb4c63 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/MultipleTestsTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
index 561b28ae0f15..bb6116ebd210 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/SingleTestTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/TaggedTestTestCase.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/TaggedTestTestCase.java
index 44813086481e..0ecc4d9c347f 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/TaggedTestTestCase.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testcases/TaggedTestTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
index e544f0c4edc7..c648e904fba7 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/AbstractSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
index 8b6124ef938a..df2636d58b84 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/CyclicSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
index d75f0f5c5ea3..525498e44714 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/DynamicSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyCyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyCyclicSuite.java
index d28e1375ec5b..38554f36eedf 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyCyclicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyCyclicSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestSuite.java
index ecb4873f71e2..b57904850597 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java
index bfec545c56c6..d1f87c65d968 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyDynamicTestWithFailIfNoTestFalseSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseSuite.java
index 1d80d8881b43..55b72d396344 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java
index 44e3896b2ca8..f1d5bf564409 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/EmptyTestCaseWithFailIfNoTestFalseSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultiEngineSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultiEngineSuite.java
index 656e08f273ce..ac12777b88fa 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultiEngineSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultiEngineSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
index 48676d211aff..c05368ddf20e 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/MultipleSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
index f131dcbd377b..7d07a8661f27 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/NestedSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
index c0c7b455df3b..1d9df39efbaf 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectClassesSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
index 920b871d22e3..436e822d9c9a 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteDisplayNameSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
index 027a30018608..205c71c8fce3 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SuiteSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/ThreePartCyclicSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/ThreePartCyclicSuite.java
index d080b5075b1d..febbba584991 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/ThreePartCyclicSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/ThreePartCyclicSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
index c6ac6e49a239..61c18d5e773c 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EngineTestKitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
index b5f4dec98f0f..aeda1baadbf9 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/EventsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
index fcbda4ce96d0..ea609b601039 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/ExecutionsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
index a8571bfef83a..c16b2e264459 100644
--- a/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/testkit/engine/NestedContainerEventConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
index 7254a869d9bd..517e4e5fe175 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
index 1a6dec0cc569..8764aea0b3c1 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/MavenRepo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
index e38dccf0b864..03e2cf13691a 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java
index c921cb99be7b..02b256e4551e 100644
--- a/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java
+++ b/platform-tooling-support-tests/src/main/java/platform/tooling/support/ThirdPartyJars.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
index bfde5041e292..fad952bf6253 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
index 371dfe77d598..4125ae2c00dc 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
index b0cbd859cb40..2b26d8897cb2 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
index 526393d13a47..463dd0643b62 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
index 961737ac0fb3..2b5411be11b9 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
index 5fab1fa4f9aa..c82360af1be6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
index 5b6680228855..008e4bfba5bc 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
index 076c998ca40b..69d884cc706d 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
index f25204e8ebde..ee2d7fae37d3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
index 3ed7bda3efe1..aeb3f7bd2447 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarDescribeModuleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
index 23d72b4fd733..dce1cfd6e41f 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
index 006fc7ed72f5..4fabbb75a062 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
index c34995fb89b6..5b5b6f428b94 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
index f4caa516af2e..26a7d371cfd3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java
index 2965b6f03351..f346969b1d6c 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index 1cfc95855574..3c2fc9fe17ad 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
index 0a8fdb4b26a6..438ca769d65d 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
index 45a7d5bac9ab..1162db674359 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index c02c91a67584..6bd095431836 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
index 779c5eb33f51..33243c0a90cd 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
index b4bd053697ec..2a1fad0ed689 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
index 3b94f1c893d6..624e239cf49a 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java
index 976920ae03bd..312cdacafcdd 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/src/spotless/eclipse-public-license-2.0.java b/src/spotless/eclipse-public-license-2.0.java
index f05cfbf6309c..9bbea1d478a3 100644
--- a/src/spotless/eclipse-public-license-2.0.java
+++ b/src/spotless/eclipse-public-license-2.0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which

From d3237d79d4ee56d740f8a6f71ef142596a6a862d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 19:46:12 +0100
Subject: [PATCH 1029/1433] Format integration test projects with Spotless as
 well

---
 .../platform-tooling-support-tests.gradle.kts | 16 +++++++++-
 .../java/com/example/project/Calculator.java  |  2 +-
 .../com/example/project/CalculatorTests.java  | 14 ++++-----
 .../java/com/example/project/Calculator.java  |  2 +-
 .../com/example/project/CalculatorTests.java  | 14 ++++-----
 .../project/ExtensionFunctionsTests.kt        |  3 +-
 .../src/test/java/FooTests.java               | 12 ++++----
 .../java/com/example/project/Calculator.java  |  2 +-
 .../com/example/project/CalculatorTests.java  | 14 ++++-----
 .../test/java/JUnitPlatformCommonsTests.java  | 10 +++++++
 .../java/com/example/project/Calculator.java  |  2 +-
 .../com/example/project/CalculatorTests.java  | 14 ++++-----
 .../java/com/example/project/DummyTests.java  |  2 +-
 .../integration/JupiterIntegrationTests.java  |  8 ++---
 .../integration/ModuleUtilsTests.java         |  4 +--
 .../src/standalone/JupiterIntegration.java    |  2 +-
 .../standalone/JupiterParamsIntegration.java  |  2 +-
 .../src/standalone/SuiteIntegration.java      |  2 +-
 .../src/standalone/VintageIntegration.java    |  2 +-
 .../java/com/example/vintage/VintageTest.java | 29 ++++++++++++-------
 20 files changed, 93 insertions(+), 63 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 7796f6f7475d..f594af846257 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -2,7 +2,7 @@ import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.jvm.toolchain.internal.NoToolchainAvailableException
 
 plugins {
-	`java-library-conventions`
+	`kotlin-library-conventions`
 	`testing-conventions`
 }
 
@@ -10,6 +10,20 @@ javaLibrary {
 	mainJavaVersion = JavaVersion.VERSION_11
 }
 
+spotless {
+	java {
+		target(files(project.java.sourceSets.map { it.allJava }), "projects/**/*.java")
+	}
+	kotlin {
+		target("projects/**/*.kt")
+	}
+	format("projects") {
+		target("projects/**/*.gradle.kts", "projects/**/*.md")
+		trimTrailingWhitespace()
+		endWithNewline()
+	}
+}
+
 val thirdPartyJars by configurations.creating
 val antJars by configurations.creating
 val mavenDistribution by configurations.creating
diff --git a/platform-tooling-support-tests/projects/ant-starter/src/main/java/com/example/project/Calculator.java b/platform-tooling-support-tests/projects/ant-starter/src/main/java/com/example/project/Calculator.java
index 91436757229c..6feca6bfc04b 100644
--- a/platform-tooling-support-tests/projects/ant-starter/src/main/java/com/example/project/Calculator.java
+++ b/platform-tooling-support-tests/projects/ant-starter/src/main/java/com/example/project/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/ant-starter/src/test/java/com/example/project/CalculatorTests.java b/platform-tooling-support-tests/projects/ant-starter/src/test/java/com/example/project/CalculatorTests.java
index b0dfc0524564..695282baccc8 100644
--- a/platform-tooling-support-tests/projects/ant-starter/src/test/java/com/example/project/CalculatorTests.java
+++ b/platform-tooling-support-tests/projects/ant-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -27,15 +27,15 @@ void addsTwoNumbers() {
 	}
 
 	@ParameterizedTest(name = "{0} + {1} = {2}")
-	@CsvSource({
-			"0,    1,   1",
-			"1,    2,   3",
-			"49,  51, 100",
-			"1,  100, 101"
+	@CsvSource({ //
+			"0,    1,   1", //
+			"1,    2,   3", //
+			"49,  51, 100", //
+			"1,  100, 101" //
 	})
 	void add(int first, int second, int expectedResult) {
 		Calculator calculator = new Calculator();
 		assertEquals(expectedResult, calculator.add(first, second),
-				() -> first + " + " + second + " should equal " + expectedResult);
+			() -> first + " + " + second + " should equal " + expectedResult);
 	}
 }
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/src/main/java/com/example/project/Calculator.java b/platform-tooling-support-tests/projects/graalvm-starter/src/main/java/com/example/project/Calculator.java
index b90710f2c68d..6feca6bfc04b 100644
--- a/platform-tooling-support-tests/projects/graalvm-starter/src/main/java/com/example/project/Calculator.java
+++ b/platform-tooling-support-tests/projects/graalvm-starter/src/main/java/com/example/project/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/src/test/java/com/example/project/CalculatorTests.java b/platform-tooling-support-tests/projects/graalvm-starter/src/test/java/com/example/project/CalculatorTests.java
index 7f043f0dd3ea..695282baccc8 100644
--- a/platform-tooling-support-tests/projects/graalvm-starter/src/test/java/com/example/project/CalculatorTests.java
+++ b/platform-tooling-support-tests/projects/graalvm-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -27,15 +27,15 @@ void addsTwoNumbers() {
 	}
 
 	@ParameterizedTest(name = "{0} + {1} = {2}")
-	@CsvSource({
-			"0,    1,   1",
-			"1,    2,   3",
-			"49,  51, 100",
-			"1,  100, 101"
+	@CsvSource({ //
+			"0,    1,   1", //
+			"1,    2,   3", //
+			"49,  51, 100", //
+			"1,  100, 101" //
 	})
 	void add(int first, int second, int expectedResult) {
 		Calculator calculator = new Calculator();
 		assertEquals(expectedResult, calculator.add(first, second),
-				() -> first + " + " + second + " should equal " + expectedResult);
+			() -> first + " + " + second + " should equal " + expectedResult);
 	}
 }
diff --git a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/src/test/kotlin/com/example/project/ExtensionFunctionsTests.kt b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/src/test/kotlin/com/example/project/ExtensionFunctionsTests.kt
index b74c92e28f70..0de75b1f9116 100644
--- a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/src/test/kotlin/com/example/project/ExtensionFunctionsTests.kt
+++ b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/src/test/kotlin/com/example/project/ExtensionFunctionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -7,7 +7,6 @@
  *
  * https://www.eclipse.org/legal/epl-v20.html
  */
-
 package com.example.project
 
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/platform-tooling-support-tests/projects/gradle-missing-engine/src/test/java/FooTests.java b/platform-tooling-support-tests/projects/gradle-missing-engine/src/test/java/FooTests.java
index 79025029964a..86d922c20f4f 100644
--- a/platform-tooling-support-tests/projects/gradle-missing-engine/src/test/java/FooTests.java
+++ b/platform-tooling-support-tests/projects/gradle-missing-engine/src/test/java/FooTests.java
@@ -1,5 +1,6 @@
+
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -7,7 +8,6 @@
  *
  * https://www.eclipse.org/legal/epl-v20.html
  */
-
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.junit.jupiter.api.Assertions;
@@ -15,8 +15,8 @@
 
 class FooTests {
 
-    @Test
-    void test() {
-        fail("This test must not be executed!");
-    }
+	@Test
+	void test() {
+		fail("This test must not be executed!");
+	}
 }
diff --git a/platform-tooling-support-tests/projects/gradle-starter/src/main/java/com/example/project/Calculator.java b/platform-tooling-support-tests/projects/gradle-starter/src/main/java/com/example/project/Calculator.java
index 91436757229c..6feca6bfc04b 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/src/main/java/com/example/project/Calculator.java
+++ b/platform-tooling-support-tests/projects/gradle-starter/src/main/java/com/example/project/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java b/platform-tooling-support-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java
index b0dfc0524564..695282baccc8 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java
+++ b/platform-tooling-support-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -27,15 +27,15 @@ void addsTwoNumbers() {
 	}
 
 	@ParameterizedTest(name = "{0} + {1} = {2}")
-	@CsvSource({
-			"0,    1,   1",
-			"1,    2,   3",
-			"49,  51, 100",
-			"1,  100, 101"
+	@CsvSource({ //
+			"0,    1,   1", //
+			"1,    2,   3", //
+			"49,  51, 100", //
+			"1,  100, 101" //
 	})
 	void add(int first, int second, int expectedResult) {
 		Calculator calculator = new Calculator();
 		assertEquals(expectedResult, calculator.add(first, second),
-				() -> first + " + " + second + " should equal " + expectedResult);
+			() -> first + " + " + second + " should equal " + expectedResult);
 	}
 }
diff --git a/platform-tooling-support-tests/projects/java-versions/src/test/java/JUnitPlatformCommonsTests.java b/platform-tooling-support-tests/projects/java-versions/src/test/java/JUnitPlatformCommonsTests.java
index 9207c79941fa..53a15919c631 100644
--- a/platform-tooling-support-tests/projects/java-versions/src/test/java/JUnitPlatformCommonsTests.java
+++ b/platform-tooling-support-tests/projects/java-versions/src/test/java/JUnitPlatformCommonsTests.java
@@ -1,3 +1,13 @@
+
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java b/platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java
index 91436757229c..6feca6bfc04b 100644
--- a/platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java
+++ b/platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java b/platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java
index b0dfc0524564..695282baccc8 100644
--- a/platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java
+++ b/platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -27,15 +27,15 @@ void addsTwoNumbers() {
 	}
 
 	@ParameterizedTest(name = "{0} + {1} = {2}")
-	@CsvSource({
-			"0,    1,   1",
-			"1,    2,   3",
-			"49,  51, 100",
-			"1,  100, 101"
+	@CsvSource({ //
+			"0,    1,   1", //
+			"1,    2,   3", //
+			"49,  51, 100", //
+			"1,  100, 101" //
 	})
 	void add(int first, int second, int expectedResult) {
 		Calculator calculator = new Calculator();
 		assertEquals(expectedResult, calculator.add(first, second),
-				() -> first + " + " + second + " should equal " + expectedResult);
+			() -> first + " + " + second + " should equal " + expectedResult);
 	}
 }
diff --git a/platform-tooling-support-tests/projects/maven-surefire-compatibility/src/test/java/com/example/project/DummyTests.java b/platform-tooling-support-tests/projects/maven-surefire-compatibility/src/test/java/com/example/project/DummyTests.java
index d9ac6e1d531d..a695ded160b5 100644
--- a/platform-tooling-support-tests/projects/maven-surefire-compatibility/src/test/java/com/example/project/DummyTests.java
+++ b/platform-tooling-support-tests/projects/maven-surefire-compatibility/src/test/java/com/example/project/DummyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/JupiterIntegrationTests.java b/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/JupiterIntegrationTests.java
index 2542b21a8011..311153970b7c 100644
--- a/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/JupiterIntegrationTests.java
+++ b/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/JupiterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -42,10 +42,8 @@ void moduleIsNamed() {
 	@Test
 	void resolve() {
 		var selector = DiscoverySelectors.selectClass(getClass());
-		var testPlan = LauncherFactory.create().discover(request()
-				.selectors(selector)
-				.filters(includeEngines("junit-jupiter"))
-				.build());
+		var testPlan = LauncherFactory.create().discover(
+			request().selectors(selector).filters(includeEngines("junit-jupiter")).build());
 
 		var engine = testPlan.getRoots().iterator().next();
 
diff --git a/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/ModuleUtilsTests.java b/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/ModuleUtilsTests.java
index a4f0442a40c2..50cecc69625f 100644
--- a/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/ModuleUtilsTests.java
+++ b/platform-tooling-support-tests/projects/multi-release-jar/default/src/test/java/integration/integration/ModuleUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -19,9 +19,9 @@
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
+import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.ClassFilter;
 import org.junit.platform.commons.util.ModuleUtils;
-import org.junit.platform.commons.PreconditionViolationException;
 
 /**
  * Unit tests for {@link ModuleUtils}.
diff --git a/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterIntegration.java b/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterIntegration.java
index fbedffaffe6a..04505d934cca 100644
--- a/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterIntegration.java
+++ b/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterIntegration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterParamsIntegration.java b/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterParamsIntegration.java
index d94a2f54ddd0..270b9a163a5c 100644
--- a/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterParamsIntegration.java
+++ b/platform-tooling-support-tests/projects/standalone/src/standalone/JupiterParamsIntegration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/standalone/src/standalone/SuiteIntegration.java b/platform-tooling-support-tests/projects/standalone/src/standalone/SuiteIntegration.java
index 811ec0f7bc10..a06fc90fbb99 100644
--- a/platform-tooling-support-tests/projects/standalone/src/standalone/SuiteIntegration.java
+++ b/platform-tooling-support-tests/projects/standalone/src/standalone/SuiteIntegration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/standalone/src/standalone/VintageIntegration.java b/platform-tooling-support-tests/projects/standalone/src/standalone/VintageIntegration.java
index 16bcab6704c6..3fb2886391c6 100644
--- a/platform-tooling-support-tests/projects/standalone/src/standalone/VintageIntegration.java
+++ b/platform-tooling-support-tests/projects/standalone/src/standalone/VintageIntegration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
diff --git a/platform-tooling-support-tests/projects/vintage/src/test/java/com/example/vintage/VintageTest.java b/platform-tooling-support-tests/projects/vintage/src/test/java/com/example/vintage/VintageTest.java
index bf8e0873de5d..186bbf2eff6a 100644
--- a/platform-tooling-support-tests/projects/vintage/src/test/java/com/example/vintage/VintageTest.java
+++ b/platform-tooling-support-tests/projects/vintage/src/test/java/com/example/vintage/VintageTest.java
@@ -1,18 +1,27 @@
 /*
- * This Java source file was generated by the Gradle 'init' task.
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
  */
+
 package com.example.vintage;
 
-import org.junit.Test;
 import static org.junit.Assert.*;
 
+import org.junit.Test;
+
 public class VintageTest {
-    @Test
-    public void success() {
-        // pass
-    }
-    @Test
-    public void failure() {
-        fail("expected to fail");
-    }
+	@Test
+	public void success() {
+		// pass
+	}
+
+	@Test
+	public void failure() {
+		fail("expected to fail");
+	}
 }

From ed36105a8924d85123c6f9da7a9dd87897ec1579 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 19:46:26 +0100
Subject: [PATCH 1030/1433] Remove duplicate copyright comment

---
 .../LifecycleMethodOverridingAndSupersedingTests.java  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
index a7d093a1b79f..f2a584fe02a1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/LifecycleMethodOverridingAndSupersedingTests.java
@@ -10,16 +10,6 @@
 
 package org.junit.jupiter.engine;
 
-/*
- * Copyright 2015-2022 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.junit.jupiter.api.BeforeEach;

From 4b2b7745032ea41ece12d736321fc25efc676e07 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 6 Jan 2023 20:01:03 +0100
Subject: [PATCH 1031/1433] Update codecov-action

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e95422c6c55d..b1e40cf13fbe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
           jacocoRootReport
           prepareDocsForUploadToGhPages
     - name: Upload to Codecov.io
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
 
   Windows:
     runs-on: windows-latest

From d30ccfd94ea904f73cce50bf101f9cb1d10d14a8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 19 Dec 2022 19:28:31 +0100
Subject: [PATCH 1032/1433] Polish Javadoc

---
 .../main/java/org/junit/jupiter/params/provider/EnumSource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
index c518c1581536..2a215ae10865 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
@@ -29,7 +29,7 @@
 import org.junit.platform.commons.util.Preconditions;
 
 /**
- * {@code @EnumSource} is an {@link ArgumentsSource} for constants of a
+ * {@code @EnumSource} is an {@link ArgumentsSource} for constants of
  * an {@link Enum}.
  *
  * <p>The enum constants will be provided as arguments to the annotated

From d16f2b543d724b1be47091082149f8574ec25182 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Sun, 4 Dec 2022 17:10:30 +0100
Subject: [PATCH 1033/1433] Introduce new `@MethodSource` syntax to
 differentiate overloaded local factory methods

Closes #3080
Closes #3101
---
 .../release-notes/release-notes-5.9.2.adoc    |  3 +-
 .../asciidoc/user-guide/writing-tests.adoc    |  8 ++-
 .../provider/MethodArgumentsProvider.java     | 56 ++++++++++++++++---
 .../MethodArgumentsProviderTests.java         | 14 +++++
 .../commons/util/ReflectionUtils.java         | 43 ++++++++++----
 .../commons/util/ReflectionUtilsTests.java    | 21 +++++++
 6 files changed, 124 insertions(+), 21 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index 02483f2af786..c8d865954962 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -38,7 +38,8 @@ JUnit repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Introduce new `@MethodSource` syntax to add the possibility to explicitly select
+  an overloaded local factory method without specifying its fully qualified name
 
 ==== Deprecations and Breaking Changes
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index b3e1dd56d832..7b0c29a35a36 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1406,9 +1406,11 @@ include::{testDir}/example/ExternalMethodSourceDemo.java[tags=external_MethodSou
 Factory methods can declare parameters, which will be provided by registered
 implementations of the `ParameterResolver` extension API. In the following example, the
 factory method is referenced by its name since there is only one such method in the test
-class. If there are several methods with the same name, the factory method must be
-referenced by its fully qualified method name – for example,
-`@MethodSource("example.MyTests#factoryMethodWithArguments(java.lang.String)")`.
+class. If there are several local methods with the same name, parameters can also be
+provided to differentiate them – for example, `@MethodSource("factoryMethod()")` or
+`@MethodSource("factoryMethod(java.lang.String)")`. Alternatively, the factory method
+can be referenced by its fully qualified method name, e.g.
+`@MethodSource("example.MyTests#factoryMethod(java.lang.String)")`.
 
 [source,java,indent=0]
 ----
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 35d97c6dc9c7..786450dc1861 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -62,10 +63,21 @@ private Method getFactoryMethod(ExtensionContext context, String factoryMethodNa
 		if (StringUtils.isBlank(factoryMethodName)) {
 			factoryMethodName = testMethod.getName();
 		}
-		if (factoryMethodName.contains(".") || factoryMethodName.contains("#")) {
+		if (looksLikeAFullyQualifiedMethodName(factoryMethodName)) {
 			return getFactoryMethodByFullyQualifiedName(factoryMethodName);
 		}
-		return getFactoryMethodBySimpleName(context.getRequiredTestClass(), testMethod, factoryMethodName);
+		return getFactoryMethodBySimpleOrQualifiedName(context.getRequiredTestClass(), testMethod, factoryMethodName);
+	}
+
+	private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodName) {
+		if (factoryMethodName.contains("#")) {
+			return true;
+		}
+		if (factoryMethodName.contains(".") && factoryMethodName.contains("(")) {
+			// Excluding cases of simple method names with parameters
+			return factoryMethodName.indexOf(".") < factoryMethodName.indexOf("(");
+		}
+		return factoryMethodName.contains(".");
 	}
 
 	private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
@@ -79,19 +91,41 @@ private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodN
 				methodParameters, className)));
 	}
 
+	private Method getFactoryMethodBySimpleOrQualifiedName(Class<?> testClass, Method testMethod,
+			String simpleOrQualifiedMethodName) {
+		String[] methodParts = ReflectionUtils.parseQualifiedMethodName(simpleOrQualifiedMethodName);
+		String methodSimpleName = methodParts[0];
+		String methodParameters = methodParts[1];
+
+		List<Method> factoryMethods = findFactoryMethodsBySimpleName(testClass, testMethod, methodSimpleName);
+		if (factoryMethods.size() == 1) {
+			return factoryMethods.get(0);
+		}
+
+		List<Method> exactMatches = filterFactoryMethodsWithMatchingParameters(factoryMethods,
+			simpleOrQualifiedMethodName, methodParameters);
+		Preconditions.condition(exactMatches.size() == 1,
+			() -> format("%d factory methods named [%s] were found in class [%s]: %s", factoryMethods.size(),
+				simpleOrQualifiedMethodName, testClass.getName(), factoryMethods));
+		return exactMatches.get(0);
+	}
+
 	/**
 	 * Find all methods in the given {@code testClass} with the desired {@code factoryMethodName}
 	 * which have return types that can be converted to a {@link Stream}, ignoring the
 	 * {@code testMethod} itself as well as any {@code @Test}, {@code @TestTemplate},
 	 * or {@code @TestFactory} methods with the same name.
 	 */
-	private Method getFactoryMethodBySimpleName(Class<?> testClass, Method testMethod, String factoryMethodName) {
+	private List<Method> findFactoryMethodsBySimpleName(Class<?> testClass, Method testMethod,
+			String factoryMethodName) {
 		Predicate<Method> isCandidate = candidate -> factoryMethodName.equals(candidate.getName())
 				&& !testMethod.equals(candidate);
 		List<Method> candidates = ReflectionUtils.findMethods(testClass, isCandidate);
+
 		Predicate<Method> isFactoryMethod = method -> isConvertibleToStream(method.getReturnType())
 				&& !isTestMethod(method);
 		List<Method> factoryMethods = candidates.stream().filter(isFactoryMethod).collect(toList());
+
 		Preconditions.condition(factoryMethods.size() > 0, () -> {
 			// If we didn't find the factory method using the isFactoryMethod Predicate, perhaps
 			// the specified factory method has an invalid return type or is a test method.
@@ -104,10 +138,18 @@ private Method getFactoryMethodBySimpleName(Class<?> testClass, Method testMetho
 			// Otherwise, report that we didn't find anything.
 			return format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName());
 		});
-		Preconditions.condition(factoryMethods.size() == 1,
-			() -> format("%d factory methods named [%s] were found in class [%s]: %s", factoryMethods.size(),
-				factoryMethodName, testClass.getName(), factoryMethods));
-		return factoryMethods.get(0);
+		return factoryMethods;
+	}
+
+	private static List<Method> filterFactoryMethodsWithMatchingParameters(List<Method> factoryMethods,
+			String factoryMethodName, String factoryMethodParameters) {
+		if (!factoryMethodName.endsWith(")")) {
+			// If parameters are not specified, no choice is made
+			return factoryMethods;
+		}
+		Predicate<Method> hasRequiredParameters = method -> factoryMethodParameters.equals(
+			ClassUtils.nullSafeToString(method.getParameterTypes()));
+		return factoryMethods.stream().filter(hasRequiredParameters).collect(toList());
 	}
 
 	private boolean isTestMethod(Method candidate) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index bf7c8b5e2536..43587e39b46d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -394,6 +394,20 @@ void providesArgumentsUsingFullyQualifiedNameWithParameter() {
 			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
 		}
 
+		@Test
+		void providesArgumentsUsingSimpleNameWithoutParameter() {
+			var arguments = provideArguments("stringStreamProviderWithOrWithoutParameter()");
+
+			assertThat(arguments).containsExactly(array("foo"), array("bar"));
+		}
+
+		@Test
+		void providesArgumentsUsingSimpleNameWithParameter() {
+			var arguments = provideArguments("stringStreamProviderWithOrWithoutParameter(java.lang.String)");
+
+			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
+		}
+
 		@Test
 		void throwsExceptionWhenSeveralFactoryMethodsWithSameNameAreAvailable() {
 			var exception = assertThrows(PreconditionViolationException.class,
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 71d51d53463f..b5f02f3d1671 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -910,21 +910,44 @@ public static String[] parseFullyQualifiedMethodName(String fullyQualifiedMethod
 					+ "and then the method name, optionally followed by a parameter list enclosed in parentheses.");
 
 		String className = fullyQualifiedMethodName.substring(0, indexOfFirstHashtag);
-		String methodPart = fullyQualifiedMethodName.substring(indexOfFirstHashtag + 1);
-		String methodName = methodPart;
+		String qualifiedMethodName = fullyQualifiedMethodName.substring(indexOfFirstHashtag + 1);
+		String[] methodPart = parseQualifiedMethodName(qualifiedMethodName);
+
+		return new String[] { className, methodPart[0], methodPart[1] };
+	}
+
+	/**
+	 * Parse the supplied method name into a 2-element {@code String[]} with
+	 * the following content.
+	 *
+	 * <ul>
+	 *   <li>index {@code 0}: the name of the method</li>
+	 *   <li>index {@code 1}: a comma-separated list of parameter types, or a
+	 *       blank string if the method does not declare any formal parameters</li>
+	 * </ul>
+	 *
+	 * @param qualifiedMethodName a qualified method name, never {@code null} or blank
+	 * @return a 2-element array of strings containing the parsed values
+	 */
+	@API(status = INTERNAL, since = "1.9")
+	public static String[] parseQualifiedMethodName(String qualifiedMethodName) {
+		String methodName = qualifiedMethodName;
 		String methodParameters = "";
 
-		if (methodPart.endsWith("()")) {
-			methodName = methodPart.substring(0, methodPart.length() - 2);
+		if (qualifiedMethodName.endsWith("()")) {
+			methodName = qualifiedMethodName.substring(0, qualifiedMethodName.length() - 2);
 		}
-		else if (methodPart.endsWith(")")) {
-			int indexOfLastOpeningParenthesis = methodPart.lastIndexOf('(');
-			if ((indexOfLastOpeningParenthesis > 0) && (indexOfLastOpeningParenthesis < methodPart.length() - 1)) {
-				methodName = methodPart.substring(0, indexOfLastOpeningParenthesis);
-				methodParameters = methodPart.substring(indexOfLastOpeningParenthesis + 1, methodPart.length() - 1);
+		else if (qualifiedMethodName.endsWith(")")) {
+			int indexOfLastOpeningParenthesis = qualifiedMethodName.lastIndexOf('(');
+			if ((indexOfLastOpeningParenthesis > 0)
+					&& (indexOfLastOpeningParenthesis < qualifiedMethodName.length() - 1)) {
+				methodName = qualifiedMethodName.substring(0, indexOfLastOpeningParenthesis);
+				methodParameters = qualifiedMethodName.substring(indexOfLastOpeningParenthesis + 1,
+					qualifiedMethodName.length() - 1);
 			}
 		}
-		return new String[] { className, methodName, methodParameters };
+
+		return new String[] { methodName, methodParameters };
 	}
 
 	/**
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index d667bce7767b..a9e3c4ece463 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -55,6 +55,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.logging.LogRecordListener;
@@ -700,6 +702,25 @@ void parseFullyQualifiedMethodNameForMethodWithMultipleParameters() {
 				.containsExactly("com.example.Test", "method", "int, java.lang.Object");
 	}
 
+	@ParameterizedTest
+	@ValueSource(strings = { "method", "method()" })
+	void parseSimpleMethodNameForMethodWithoutParameters(String methodName) {
+		assertThat(ReflectionUtils.parseQualifiedMethodName(methodName))//
+				.containsExactly("method", "");
+	}
+
+	@Test
+	void parseSimpleMethodNameForMethodWithSingleParameter() {
+		assertThat(ReflectionUtils.parseQualifiedMethodName("method(java.lang.Object)"))//
+				.containsExactly("method", "java.lang.Object");
+	}
+
+	@Test
+	void parseSimpleMethodNameForMethodWithMultipleParameters() {
+		assertThat(ReflectionUtils.parseQualifiedMethodName("method(int, java.lang.Object)"))//
+				.containsExactly("method", "int, java.lang.Object");
+	}
+
 	@Test
 	@SuppressWarnings("deprecation")
 	void getOutermostInstancePreconditions() {

From 29ca89eafed4e7103a6301440730baf980b975b8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 8 Jan 2023 18:22:32 +0100
Subject: [PATCH 1034/1433] Fix bug and polish contribution

This commit fixes a bug regarding whitespace in parameter lists for
local factory methods specified via `@MethodSource`. Specifically,
whitespace is now supported.

For example, @MethodSource("data(int, java.lang.String)") is now
supported (note the space after the comma).

As a side note, whitespace in parameter lists was already supported for
a fully qualified method name.

See #3080, #3101
---
 .../release-notes/release-notes-5.9.2.adoc    |  4 +-
 .../provider/MethodArgumentsProvider.java     | 38 ++++++++++++++-----
 .../MethodArgumentsProviderTests.java         | 28 +++++++++++++-
 .../commons/util/ReflectionUtils.java         |  2 +-
 4 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index c8d865954962..c9dc04a3d87e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -38,8 +38,8 @@ JUnit repository on GitHub.
 
 ==== Bug Fixes
 
-* Introduce new `@MethodSource` syntax to add the possibility to explicitly select
-  an overloaded local factory method without specifying its fully qualified name
+* New `@MethodSource` syntax for explicitly selecting an overloaded local factory method
+  without specifying its fully qualified name.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 786450dc1861..a02649c3c3e4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -11,13 +11,14 @@
 package org.junit.jupiter.params.provider;
 
 import static java.lang.String.format;
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
 import static org.junit.platform.commons.util.CollectionUtils.isConvertibleToStream;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -28,7 +29,6 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.JUnitException;
-import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -50,7 +50,7 @@ public void accept(MethodSource annotation) {
 	public Stream<Arguments> provideArguments(ExtensionContext context) {
 		Object testInstance = context.getTestInstance().orElse(null);
 		// @formatter:off
-		return Arrays.stream(this.methodNames)
+		return stream(this.methodNames)
 				.map(factoryMethodName -> getFactoryMethod(context, factoryMethodName))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
@@ -73,11 +73,20 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa
 		if (factoryMethodName.contains("#")) {
 			return true;
 		}
-		if (factoryMethodName.contains(".") && factoryMethodName.contains("(")) {
-			// Excluding cases of simple method names with parameters
-			return factoryMethodName.indexOf(".") < factoryMethodName.indexOf("(");
+		int indexOfDot = factoryMethodName.indexOf(".");
+		if (indexOfDot == -1) {
+			return false;
 		}
-		return factoryMethodName.contains(".");
+		int indexOfOpeningParenthesis = factoryMethodName.indexOf("(");
+		if (indexOfOpeningParenthesis > 0) {
+			// Exclude simple method names with parameters
+			return indexOfDot < indexOfOpeningParenthesis;
+		}
+		// If we get this far, we conclude the supplied factory method name "looks"
+		// like it was intended to be a fully qualified method name, even if the
+		// syntax is invalid. We do this in order to provide better diagnostics for
+		// the user when a fully qualified method name is in fact invalid.
+		return true;
 	}
 
 	private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
@@ -143,12 +152,21 @@ private List<Method> findFactoryMethodsBySimpleName(Class<?> testClass, Method t
 
 	private static List<Method> filterFactoryMethodsWithMatchingParameters(List<Method> factoryMethods,
 			String factoryMethodName, String factoryMethodParameters) {
+
 		if (!factoryMethodName.endsWith(")")) {
-			// If parameters are not specified, no choice is made
+			// If parameters are not specified, nothing is filtered.
 			return factoryMethods;
 		}
-		Predicate<Method> hasRequiredParameters = method -> factoryMethodParameters.equals(
-			ClassUtils.nullSafeToString(method.getParameterTypes()));
+
+		// Compare against canonical parameter list, ignoring whitespace.
+		String parameterList = factoryMethodParameters.replaceAll("\\s+", "");
+		Predicate<Method> hasRequiredParameters = method -> {
+			if (parameterList.isEmpty()) {
+				return method.getParameterCount() == 0;
+			}
+			return parameterList.equals(stream(method.getParameterTypes()).map(Class::getName).collect(joining(",")));
+		};
+
 		return factoryMethods.stream().filter(hasRequiredParameters).collect(toList());
 	}
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 43587e39b46d..c8fd3444e5c4 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -37,6 +37,7 @@
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
+import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -408,16 +409,25 @@ void providesArgumentsUsingSimpleNameWithParameter() {
 			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
 		}
 
+		@ParameterizedTest
+		@ValueSource(strings = { "java.lang.String,java.lang.String", "java.lang.String, java.lang.String",
+				"java.lang.String,    java.lang.String" })
+		void providesArgumentsUsingSimpleNameWithMultipleParameters(String params) {
+			var arguments = provideArguments("stringStreamProviderWithOrWithoutParameter(" + params + ")");
+			assertThat(arguments).containsExactly(array("foo!!"), array("bar!!"));
+		}
+
 		@Test
 		void throwsExceptionWhenSeveralFactoryMethodsWithSameNameAreAvailable() {
 			var exception = assertThrows(PreconditionViolationException.class,
 				() -> provideArguments("stringStreamProviderWithOrWithoutParameter").toArray());
 
 			assertThat(exception.getMessage())//
-					.startsWith("2 factory methods named [stringStreamProviderWithOrWithoutParameter] were found in "
+					.startsWith("3 factory methods named [stringStreamProviderWithOrWithoutParameter] were found in "
 							+ "class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]: ")//
 					.contains("stringStreamProviderWithOrWithoutParameter()",
-						"stringStreamProviderWithOrWithoutParameter(java.lang.String)");
+						"stringStreamProviderWithOrWithoutParameter(java.lang.String)",
+						"stringStreamProviderWithOrWithoutParameter(java.lang.String,java.lang.String)");
 		}
 
 		@Test
@@ -428,6 +438,16 @@ void providesArgumentsUsingFactoryMethodSelectedViaFullyQualifiedNameWithParamet
 			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
 		}
 
+		@ParameterizedTest
+		@ValueSource(strings = { "java.lang.String,java.lang.String", "java.lang.String, java.lang.String",
+				"java.lang.String,    java.lang.String" })
+		void providesArgumentsUsingFactoryMethodSelectedViaFullyQualifiedNameWithMultipleParameters(String params) {
+			var arguments = provideArguments(
+				TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter(" + params + ")");
+
+			assertThat(arguments).containsExactly(array("foo!!"), array("bar!!"));
+		}
+
 		@Test
 		void providesArgumentsUsingFactoryMethodSelectedViaFullyQualifiedNameWithoutParameter() {
 			var arguments = provideArguments(
@@ -522,6 +542,10 @@ static Stream<String> stringStreamProviderWithOrWithoutParameter(String paramete
 			return stringStreamProviderWithParameter(parameter);
 		}
 
+		static Stream<String> stringStreamProviderWithOrWithoutParameter(String parameter1, String parameter2) {
+			return stringStreamProviderWithParameter(parameter1 + parameter2);
+		}
+
 		// @ParameterizedTest
 		// @MethodSource // use default, inferred factory method
 		void overloadedStringStreamProvider(Object parameter) {
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index b5f02f3d1671..2ab8835cc278 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -929,7 +929,7 @@ public static String[] parseFullyQualifiedMethodName(String fullyQualifiedMethod
 	 * @param qualifiedMethodName a qualified method name, never {@code null} or blank
 	 * @return a 2-element array of strings containing the parsed values
 	 */
-	@API(status = INTERNAL, since = "1.9")
+	@API(status = INTERNAL, since = "1.9.2")
 	public static String[] parseQualifiedMethodName(String qualifiedMethodName) {
 		String methodName = qualifiedMethodName;
 		String methodParameters = "";

From 7eecff8734be28d270fc81c5bbdd96a336289a73 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 8 Jan 2023 18:43:00 +0100
Subject: [PATCH 1035/1433] Prepare 5.9.2 release notes

---
 .../release-notes/release-notes-5.9.2.adoc    | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index c9dc04a3d87e..1ee7580a7059 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -1,13 +1,13 @@
 [[release-notes-5.9.2]]
 == 5.9.2
 
-*Date of Release:* ❓
+*Date of Release:* January ❓, 2023
 
 *Scope:* Bug fixes and enhancements since 5.9.1
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestones/5.9.2+[5.9.2] milestone page in the
-JUnit repository on GitHub.
+link:{junit5-repo}+/milestones/5.9.2+[5.9.2] milestone page in the JUnit repository on
+GitHub.
 
 
 [[release-notes-5.9.2-junit-platform]]
@@ -20,17 +20,14 @@ JUnit repository on GitHub.
   exception is thrown for invalid configuration, thereby preventing invalid configuration
   from being silently ignored.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
-* Introduce `TestPlan.getTestIdentifier(UniqueId)` and `TestPlan.getChildren(UniqueId)` to
-  avoid parsing unique IDs unnecessarily during test execution.
+* New `TestPlan.getTestIdentifier(UniqueId)` and `TestPlan.getChildren(UniqueId)` methods
+  to avoid parsing unique IDs unnecessarily during test execution.
 * Support for limiting the `max-pool-size` for parallel execution via a configuration
-  parameter
-* Quietly stop further suite discovery when encountering a cycle in a test suite
+  parameter.
+* Suite discovery now ignores cycles encountered in a test suite and logs an informational
+  message at `CONFIG` level instead of throwing an exception.
 
 
 [[release-notes-5.9.2-junit-jupiter]]
@@ -48,11 +45,11 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
+* `JAVA_21` has been added to the `JRE` enum for use with JRE-based execution conditions.
 * New `junit.jupiter.execution.parallel.config.fixed.max-pool-size` configuration
   parameter to set the maximum pool size.
 * New `junit.jupiter.execution.parallel.config.fixed.saturate` configuration parameter to
   disable pool saturation.
-* `JAVA_21` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-5.9.2-junit-vintage]]
@@ -60,13 +57,5 @@ JUnit repository on GitHub.
 
 ==== Bug Fixes
 
-* Fix reporting of `Parameterized` tests when used in combination with the `Enclosed`
-  runner.
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+* `Parameterized` tests are now properly reported when used in combination with the
+  `Enclosed` runner.

From 3991765f6111dbbdeb6f2d0cd63d2cccfa1d3412 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 10 Jan 2023 12:00:36 +0100
Subject: [PATCH 1036/1433] Release 5.9.2

---
 README.md                                                       | 2 +-
 .../src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9834087675fa..37241253e2d2 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.9.1](https://github.com/junit-team/junit5/releases/tag/r5.9.1) (September 20, 2022)
+- General Availability (GA): [JUnit 5.9.2](https://github.com/junit-team/junit5/releases/tag/r5.9.1) (January 10, 2023)
 - Preview (Milestone/Release Candidate): n/a
 
 ## Documentation
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
index 1ee7580a7059..249e805dd0f0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.2.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.9.2]]
 == 5.9.2
 
-*Date of Release:* January ❓, 2023
+*Date of Release:* January 10, 2023
 
 *Scope:* Bug fixes and enhancements since 5.9.1
 

From 87648fd975e865ae17df9980318441ac0ea1620e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 10 Jan 2023 15:15:06 +0100
Subject: [PATCH 1037/1433] Update Gradle Enterprise plugin to 3.12.2

Closes #3126.
Closes #3127.
---
 buildSrc/build.gradle.kts | 2 +-
 settings.gradle.kts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 264ec0670c53..bb98afbee24f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.11.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.42.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.1") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.2") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 91c857de5aa2..5ecc1fc291a1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.12.1" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise") version "3.12.2" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"

From 90a0ccf2087e3573f3629c216aaaceff5691780a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 14:39:56 +0100
Subject: [PATCH 1038/1433] Call TestExecutionListener finish methods in
 reverse order

To allow for multiple listeners that depend on each other to be called
in an order consistent with Jupiter's lifecycle callbacks.

Issue: #3082
---
 .../commons/util/CollectionUtils.java         | 12 +++
 .../core/CompositeTestExecutionListener.java  | 34 ++++---
 .../launcher/core/IterationOrder.java         | 35 +++++++
 .../commons/util/CollectionUtilsTests.java    |  9 ++
 .../CompositeTestExecutionListenerTests.java  | 96 +++++++++++--------
 5 files changed, 135 insertions(+), 51 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/IterationOrder.java

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index dc6bf37a3677..4c4b68c125da 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -24,7 +24,9 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.stream.Collector;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
@@ -203,4 +205,14 @@ public static Stream<?> toStream(Object object) {
 			"Cannot convert instance of " + object.getClass().getName() + " into a Stream: " + object);
 	}
 
+	/**
+	 * Call the supplied action on each element of the supplied {@link List} from last to first element.
+	 */
+	@API(status = INTERNAL, since = "1.9.2")
+	public static <T> void forEachInReverseOrder(List<T> list, Consumer<? super T> action) {
+		for (ListIterator<T> iterator = list.listIterator(list.size()); iterator.hasPrevious();) {
+			action.accept(iterator.previous());
+		}
+	}
+
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
index a8c5d7ade41a..977bc4a30739 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeTestExecutionListener.java
@@ -43,54 +43,61 @@ class CompositeTestExecutionListener implements TestExecutionListener {
 
 	@Override
 	public void dynamicTestRegistered(TestIdentifier testIdentifier) {
-		notifyEach(testExecutionListeners, listener -> listener.dynamicTestRegistered(testIdentifier),
+		notifyEach(testExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.dynamicTestRegistered(testIdentifier),
 			() -> "dynamicTestRegistered(" + testIdentifier + ")");
 	}
 
 	@Override
 	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
-		notifyEach(testExecutionListeners, listener -> listener.executionSkipped(testIdentifier, reason),
+		notifyEach(testExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.executionSkipped(testIdentifier, reason),
 			() -> "executionSkipped(" + testIdentifier + ", " + reason + ")");
 	}
 
 	@Override
 	public void executionStarted(TestIdentifier testIdentifier) {
-		notifyEach(eagerTestExecutionListeners, listener -> listener.executionJustStarted(testIdentifier),
+		notifyEach(eagerTestExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.executionJustStarted(testIdentifier),
 			() -> "executionJustStarted(" + testIdentifier + ")");
-		notifyEach(testExecutionListeners, listener -> listener.executionStarted(testIdentifier),
-			() -> "executionStarted(" + testIdentifier + ")");
+		notifyEach(testExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.executionStarted(testIdentifier), () -> "executionStarted(" + testIdentifier + ")");
 	}
 
 	@Override
 	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-		notifyEach(eagerTestExecutionListeners,
+		notifyEach(eagerTestExecutionListeners, IterationOrder.REVERSED,
 			listener -> listener.executionJustFinished(testIdentifier, testExecutionResult),
 			() -> "executionJustFinished(" + testIdentifier + ", " + testExecutionResult + ")");
-		notifyEach(testExecutionListeners, listener -> listener.executionFinished(testIdentifier, testExecutionResult),
+		notifyEach(testExecutionListeners, IterationOrder.REVERSED,
+			listener -> listener.executionFinished(testIdentifier, testExecutionResult),
 			() -> "executionFinished(" + testIdentifier + ", " + testExecutionResult + ")");
 	}
 
 	@Override
 	public void testPlanExecutionStarted(TestPlan testPlan) {
-		notifyEach(testExecutionListeners, listener -> listener.testPlanExecutionStarted(testPlan),
+		notifyEach(testExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.testPlanExecutionStarted(testPlan),
 			() -> "testPlanExecutionStarted(" + testPlan + ")");
 	}
 
 	@Override
 	public void testPlanExecutionFinished(TestPlan testPlan) {
-		notifyEach(testExecutionListeners, listener -> listener.testPlanExecutionFinished(testPlan),
+		notifyEach(testExecutionListeners, IterationOrder.REVERSED,
+			listener -> listener.testPlanExecutionFinished(testPlan),
 			() -> "testPlanExecutionFinished(" + testPlan + ")");
 	}
 
 	@Override
 	public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
-		notifyEach(testExecutionListeners, listener -> listener.reportingEntryPublished(testIdentifier, entry),
+		notifyEach(testExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.reportingEntryPublished(testIdentifier, entry),
 			() -> "reportingEntryPublished(" + testIdentifier + ", " + entry + ")");
 	}
 
-	private static <T extends TestExecutionListener> void notifyEach(List<T> listeners, Consumer<T> consumer,
-			Supplier<String> description) {
-		listeners.forEach(listener -> {
+	private static <T extends TestExecutionListener> void notifyEach(List<T> listeners, IterationOrder iterationOrder,
+			Consumer<T> consumer, Supplier<String> description) {
+		iterationOrder.forEach(listeners, listener -> {
 			try {
 				consumer.accept(listener);
 			}
@@ -109,4 +116,5 @@ default void executionJustStarted(TestIdentifier testIdentifier) {
 		default void executionJustFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
 		}
 	}
+
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/IterationOrder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/IterationOrder.java
new file mode 100644
index 000000000000..40308c574c22
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/IterationOrder.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+enum IterationOrder {
+
+	ORIGINAL {
+		@Override
+		<T> void forEach(List<T> listeners, Consumer<T> action) {
+			listeners.forEach(action);
+		}
+	},
+
+	REVERSED {
+		@Override
+		<T> void forEach(List<T> listeners, Consumer<T> action) {
+			forEachInReverseOrder(listeners, action);
+		}
+	};
+
+	abstract <T> void forEach(List<T> listeners, Consumer<T> action);
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index f2c4745cc7af..03fc6d512fb5 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -277,4 +277,13 @@ private void toStreamWithPrimitiveArray(Object primitiveArray) {
 		}
 	}
 
+	@Test
+	void iteratesListElementsInReverseOrder() {
+		var items = List.of("foo", "bar", "baz");
+		var result = new ArrayList<>();
+
+		CollectionUtils.forEachInReverseOrder(items, result::add);
+
+		assertThat(result).containsExactly("baz", "bar", "foo");
+	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
index 9cfc55503a6b..efbd0cd1f61c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 
 import java.util.ArrayList;
@@ -33,6 +34,7 @@
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.core.CompositeTestExecutionListener.EagerTestExecutionListener;
+import org.mockito.InOrder;
 
 @TrackLogRecords
 class CompositeTestExecutionListenerTests {
@@ -41,9 +43,7 @@ class CompositeTestExecutionListenerTests {
 
 	@Test
 	void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(LogRecordListener logRecordListener) {
-		var testIdentifier = getSampleMethodTestIdentifier();
-
-		compositeTestExecutionListener().dynamicTestRegistered(testIdentifier);
+		compositeTestExecutionListener().dynamicTestRegistered(anyTestIdentifier());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"dynamicTestRegistered");
@@ -51,27 +51,21 @@ void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(Log
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionStartedListenerMethodFails(LogRecordListener logRecordListener) {
-		var testIdentifier = getSampleMethodTestIdentifier();
-
-		compositeTestExecutionListener().executionStarted(testIdentifier);
+		compositeTestExecutionListener().executionStarted(anyTestIdentifier());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class, "executionStarted");
 	}
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionSkippedListenerMethodFails(LogRecordListener logRecordListener) {
-		var testIdentifier = getSampleMethodTestIdentifier();
-
-		compositeTestExecutionListener().executionSkipped(testIdentifier, "deliberately skipped container");
+		compositeTestExecutionListener().executionSkipped(anyTestIdentifier(), "deliberately skipped container");
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class, "executionSkipped");
 	}
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionFinishedListenerMethodFails(LogRecordListener logRecordListener) {
-		var testIdentifier = getSampleMethodTestIdentifier();
-
-		compositeTestExecutionListener().executionFinished(testIdentifier, mock(TestExecutionResult.class));
+		compositeTestExecutionListener().executionFinished(anyTestIdentifier(), anyTestExecutionResult());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class, "executionFinished");
 	}
@@ -79,9 +73,7 @@ void shouldNotThrowExceptionButLogIfExecutionFinishedListenerMethodFails(LogReco
 	@Test
 	void shouldNotThrowExceptionButLogIfReportingEntryPublishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		var testIdentifier = getSampleMethodTestIdentifier();
-
-		compositeTestExecutionListener().reportingEntryPublished(testIdentifier, ReportEntry.from("one", "two"));
+		compositeTestExecutionListener().reportingEntryPublished(anyTestIdentifier(), ReportEntry.from("one", "two"));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"reportingEntryPublished");
@@ -90,10 +82,7 @@ void shouldNotThrowExceptionButLogIfReportingEntryPublishedListenerMethodFails(
 	@Test
 	void shouldNotThrowExceptionButLogIfTesPlanExecutionStartedListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		var testDescriptor = getDemoMethodTestDescriptor();
-
-		compositeTestExecutionListener().testPlanExecutionStarted(
-			TestPlan.from(Set.of(testDescriptor), mock(ConfigurationParameters.class)));
+		compositeTestExecutionListener().testPlanExecutionStarted(anyTestPlan());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"testPlanExecutionStarted");
@@ -102,10 +91,7 @@ void shouldNotThrowExceptionButLogIfTesPlanExecutionStartedListenerMethodFails(
 	@Test
 	void shouldNotThrowExceptionButLogIfTesPlanExecutionFinishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		var testDescriptor = getDemoMethodTestDescriptor();
-
-		compositeTestExecutionListener().testPlanExecutionFinished(
-			TestPlan.from(Set.of(testDescriptor), mock(ConfigurationParameters.class)));
+		compositeTestExecutionListener().testPlanExecutionFinished(anyTestPlan());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingTestExecutionListener.class,
 			"testPlanExecutionFinished");
@@ -116,8 +102,7 @@ void shouldNotThrowExceptionButLogIfExecutionJustStartedEagerTestListenerMethodF
 			LogRecordListener logRecordListener) {
 		listeners.add(new ThrowingEagerTestExecutionListener());
 
-		var testIdentifier = getSampleMethodTestIdentifier();
-		compositeTestExecutionListener().executionStarted(testIdentifier);
+		compositeTestExecutionListener().executionStarted(anyTestIdentifier());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEagerTestExecutionListener.class,
 			"executionJustStarted");
@@ -128,8 +113,7 @@ void shouldNotThrowExceptionButLogIfExecutionJustFinishedEagerTestListenerMethod
 			LogRecordListener logRecordListener) {
 		listeners.add(new ThrowingEagerTestExecutionListener());
 
-		var testIdentifier = getSampleMethodTestIdentifier();
-		compositeTestExecutionListener().executionFinished(testIdentifier, mock(TestExecutionResult.class));
+		compositeTestExecutionListener().executionFinished(anyTestIdentifier(), anyTestExecutionResult());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEagerTestExecutionListener.class,
 			"executionJustFinished");
@@ -144,8 +128,8 @@ public void executionStarted(TestIdentifier testIdentifier) {
 				throw new OutOfMemoryError();
 			}
 		});
-		var testIdentifier = getSampleMethodTestIdentifier();
-		assertThatThrownBy(() -> compositeTestExecutionListener().executionStarted(testIdentifier)).isInstanceOf(
+
+		assertThatThrownBy(() -> compositeTestExecutionListener().executionStarted(anyTestIdentifier())).isInstanceOf(
 			OutOfMemoryError.class);
 
 		assertNotLogs(logRecordListener);
@@ -159,13 +143,42 @@ public void executionJustStarted(TestIdentifier testIdentifier) {
 				throw new OutOfMemoryError();
 			}
 		});
-		var testIdentifier = getSampleMethodTestIdentifier();
-		assertThatThrownBy(() -> compositeTestExecutionListener().executionStarted(testIdentifier)).isInstanceOf(
+
+		assertThatThrownBy(() -> compositeTestExecutionListener().executionStarted(anyTestIdentifier())).isInstanceOf(
 			OutOfMemoryError.class);
 
 		assertNotLogs(logRecordListener);
 	}
 
+	@Test
+	void callsListenersInReverseOrderForFinishedEvents() {
+		listeners.clear();
+		var firstListener = mock(TestExecutionListener.class, "firstListener");
+		var secondListener = mock(TestExecutionListener.class, "secondListener");
+		listeners.add(firstListener);
+		listeners.add(secondListener);
+
+		var testPlan = anyTestPlan();
+		var testIdentifier = anyTestIdentifier();
+		var testExecutionResult = anyTestExecutionResult();
+
+		var composite = compositeTestExecutionListener();
+		composite.testPlanExecutionStarted(testPlan);
+		composite.executionStarted(testIdentifier);
+		composite.executionFinished(testIdentifier, testExecutionResult);
+		composite.testPlanExecutionFinished(testPlan);
+
+		InOrder inOrder = inOrder(firstListener, secondListener);
+		inOrder.verify(firstListener).testPlanExecutionStarted(testPlan);
+		inOrder.verify(secondListener).testPlanExecutionStarted(testPlan);
+		inOrder.verify(firstListener).executionStarted(testIdentifier);
+		inOrder.verify(secondListener).executionStarted(testIdentifier);
+		inOrder.verify(secondListener).executionFinished(testIdentifier, testExecutionResult);
+		inOrder.verify(firstListener).executionFinished(testIdentifier, testExecutionResult);
+		inOrder.verify(secondListener).testPlanExecutionFinished(testPlan);
+		inOrder.verify(firstListener).testPlanExecutionFinished(testPlan);
+	}
+
 	private TestExecutionListener compositeTestExecutionListener() {
 		return new CompositeTestExecutionListener(listeners);
 	}
@@ -179,9 +192,12 @@ private void assertNotLogs(LogRecordListener logRecordListener) throws Assertion
 		assertThat(logRecordListener.stream(CompositeTestExecutionListener.class, Level.WARNING).count()).isZero();
 	}
 
-	private TestIdentifier getSampleMethodTestIdentifier() {
-		var demoMethodTestDescriptor = getDemoMethodTestDescriptor();
-		return TestIdentifier.from(demoMethodTestDescriptor);
+	private static TestExecutionResult anyTestExecutionResult() {
+		return TestExecutionResult.successful();
+	}
+
+	private static TestIdentifier anyTestIdentifier() {
+		return TestIdentifier.from(anyTestDescriptor());
 	}
 
 	private void assertThatTestListenerErrorLogged(LogRecordListener logRecordListener, Class<?> listenerClass,
@@ -190,10 +206,14 @@ private void assertThatTestListenerErrorLogged(LogRecordListener logRecordListen
 			"TestExecutionListener [" + listenerClass.getName() + "] threw exception for method: " + methodName);
 	}
 
-	private DemoMethodTestDescriptor getDemoMethodTestDescriptor() {
-		var method = ReflectionUtils.findMethod(this.getClass(), "getDemoMethodTestDescriptor",
-			new Class<?>[0]).orElseThrow();
-		return new DemoMethodTestDescriptor(UniqueId.root("method", "unique_id"), this.getClass(), method);
+	private static TestPlan anyTestPlan() {
+		return TestPlan.from(Set.of(anyTestDescriptor()), mock(ConfigurationParameters.class));
+	}
+
+	private static DemoMethodTestDescriptor anyTestDescriptor() {
+		var testClass = CompositeTestExecutionListenerTests.class;
+		var method = ReflectionUtils.findMethod(testClass, "anyTestDescriptor", new Class<?>[0]).orElseThrow();
+		return new DemoMethodTestDescriptor(UniqueId.root("method", "unique_id"), testClass, method);
 	}
 
 	private static class ThrowingEagerTestExecutionListener extends ThrowingTestExecutionListener

From 33650724629c453992dd32ccff2203fb6ef8ed99 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 14:42:17 +0100
Subject: [PATCH 1039/1433] Call EngineExecutionListener.executionFinished
 method in reverse order

Issue: #3082
---
 .../CompositeEngineExecutionListener.java     | 21 ++++---
 ...CompositeEngineExecutionListenerTests.java | 63 ++++++++++++-------
 2 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
index fc3cf56183e8..29311c9b0773 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CompositeEngineExecutionListener.java
@@ -35,38 +35,41 @@ class CompositeEngineExecutionListener implements EngineExecutionListener {
 
 	@Override
 	public void dynamicTestRegistered(TestDescriptor testDescriptor) {
-		notifyEach(engineExecutionListeners, listener -> listener.dynamicTestRegistered(testDescriptor),
+		notifyEach(engineExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.dynamicTestRegistered(testDescriptor),
 			() -> "dynamicTestRegistered(" + testDescriptor + ")");
 	}
 
 	@Override
 	public void executionSkipped(TestDescriptor testDescriptor, String reason) {
-		notifyEach(engineExecutionListeners, listener -> listener.executionSkipped(testDescriptor, reason),
+		notifyEach(engineExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.executionSkipped(testDescriptor, reason),
 			() -> "executionSkipped(" + testDescriptor + ", " + reason + ")");
 	}
 
 	@Override
 	public void executionStarted(TestDescriptor testDescriptor) {
-		notifyEach(engineExecutionListeners, listener -> listener.executionStarted(testDescriptor),
-			() -> "executionStarted(" + testDescriptor + ")");
+		notifyEach(engineExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.executionStarted(testDescriptor), () -> "executionStarted(" + testDescriptor + ")");
 	}
 
 	@Override
 	public void executionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
-		notifyEach(engineExecutionListeners,
+		notifyEach(engineExecutionListeners, IterationOrder.REVERSED,
 			listener -> listener.executionFinished(testDescriptor, testExecutionResult),
 			() -> "executionFinished(" + testDescriptor + ", " + testExecutionResult + ")");
 	}
 
 	@Override
 	public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry entry) {
-		notifyEach(engineExecutionListeners, listener -> listener.reportingEntryPublished(testDescriptor, entry),
+		notifyEach(engineExecutionListeners, IterationOrder.ORIGINAL,
+			listener -> listener.reportingEntryPublished(testDescriptor, entry),
 			() -> "reportingEntryPublished(" + testDescriptor + ", " + entry + ")");
 	}
 
-	private static <T extends EngineExecutionListener> void notifyEach(List<T> listeners, Consumer<T> consumer,
-			Supplier<String> description) {
-		listeners.forEach(listener -> {
+	private static <T extends EngineExecutionListener> void notifyEach(List<T> listeners, IterationOrder iterationOrder,
+			Consumer<T> consumer, Supplier<String> description) {
+		iterationOrder.forEach(listeners, listener -> {
 			try {
 				consumer.accept(listener);
 			}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
index b6ff9bac6307..1e1791fa9ead 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 
 import java.util.ArrayList;
@@ -29,6 +30,7 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.DemoMethodTestDescriptor;
+import org.mockito.InOrder;
 
 @TrackLogRecords
 class CompositeEngineExecutionListenerTests {
@@ -38,9 +40,7 @@ class CompositeEngineExecutionListenerTests {
 
 	@Test
 	void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(LogRecordListener logRecordListener) {
-		var testDescriptor = getSampleMethodTestDescriptor();
-
-		compositeTestExecutionListener().dynamicTestRegistered(testDescriptor);
+		compositeEngineExecutionListener().dynamicTestRegistered(anyTestDescriptor());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class,
 			"dynamicTestRegistered");
@@ -48,27 +48,21 @@ void shouldNotThrowExceptionButLogIfDynamicTestRegisteredListenerMethodFails(Log
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionStartedListenerMethodFails(LogRecordListener logRecordListener) {
-		var testDescriptor = getSampleMethodTestDescriptor();
-
-		compositeTestExecutionListener().executionStarted(testDescriptor);
+		compositeEngineExecutionListener().executionStarted(anyTestDescriptor());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class, "executionStarted");
 	}
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionSkippedListenerMethodFails(LogRecordListener logRecordListener) {
-		var testDescriptor = getSampleMethodTestDescriptor();
-
-		compositeTestExecutionListener().executionSkipped(testDescriptor, "deliberately skipped container");
+		compositeEngineExecutionListener().executionSkipped(anyTestDescriptor(), "deliberately skipped container");
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class, "executionSkipped");
 	}
 
 	@Test
 	void shouldNotThrowExceptionButLogIfExecutionFinishedListenerMethodFails(LogRecordListener logRecordListener) {
-		var testDescriptor = getSampleMethodTestDescriptor();
-
-		compositeTestExecutionListener().executionFinished(testDescriptor, mock(TestExecutionResult.class));
+		compositeEngineExecutionListener().executionFinished(anyTestDescriptor(), anyTestExecutionResult());
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class,
 			"executionFinished");
@@ -77,9 +71,7 @@ void shouldNotThrowExceptionButLogIfExecutionFinishedListenerMethodFails(LogReco
 	@Test
 	void shouldNotThrowExceptionButLogIfReportingEntryPublishedListenerMethodFails(
 			LogRecordListener logRecordListener) {
-		var testDescriptor = getSampleMethodTestDescriptor();
-
-		compositeTestExecutionListener().reportingEntryPublished(testDescriptor, ReportEntry.from("one", "two"));
+		compositeEngineExecutionListener().reportingEntryPublished(anyTestDescriptor(), ReportEntry.from("one", "two"));
 
 		assertThatTestListenerErrorLogged(logRecordListener, ThrowingEngineExecutionListener.class,
 			"reportingEntryPublished");
@@ -94,14 +86,37 @@ public void executionStarted(TestDescriptor testDescriptor) {
 				throw new OutOfMemoryError();
 			}
 		});
-		var testDescriptor = getSampleMethodTestDescriptor();
-		assertThatThrownBy(() -> compositeTestExecutionListener().executionStarted(testDescriptor)).isInstanceOf(
+		var testDescriptor = anyTestDescriptor();
+
+		assertThatThrownBy(() -> compositeEngineExecutionListener().executionStarted(testDescriptor)).isInstanceOf(
 			OutOfMemoryError.class);
 
 		assertNotLogs(logRecordListener);
 	}
 
-	private EngineExecutionListener compositeTestExecutionListener() {
+	@Test
+	void callsListenersInReverseOrderForFinishedEvents() {
+		listeners.clear();
+		var firstListener = mock(EngineExecutionListener.class, "firstListener");
+		var secondListener = mock(EngineExecutionListener.class, "secondListener");
+		listeners.add(firstListener);
+		listeners.add(secondListener);
+
+		var testDescriptor = anyTestDescriptor();
+		var testExecutionResult = anyTestExecutionResult();
+
+		var composite = compositeEngineExecutionListener();
+		composite.executionStarted(testDescriptor);
+		composite.executionFinished(testDescriptor, testExecutionResult);
+
+		InOrder inOrder = inOrder(firstListener, secondListener);
+		inOrder.verify(firstListener).executionStarted(testDescriptor);
+		inOrder.verify(secondListener).executionStarted(testDescriptor);
+		inOrder.verify(secondListener).executionFinished(testDescriptor, testExecutionResult);
+		inOrder.verify(firstListener).executionFinished(testDescriptor, testExecutionResult);
+	}
+
+	private EngineExecutionListener compositeEngineExecutionListener() {
 		return new CompositeEngineExecutionListener(listeners);
 	}
 
@@ -114,8 +129,8 @@ private void assertNotLogs(LogRecordListener logRecordListener) throws Assertion
 		assertThat(logRecordListener.stream(CompositeEngineExecutionListener.class, Level.WARNING).count()).isZero();
 	}
 
-	private TestDescriptor getSampleMethodTestDescriptor() {
-		return getDemoMethodTestDescriptor();
+	private static TestExecutionResult anyTestExecutionResult() {
+		return mock(TestExecutionResult.class);
 	}
 
 	private void assertThatTestListenerErrorLogged(LogRecordListener logRecordListener, Class<?> listenerClass,
@@ -124,10 +139,10 @@ private void assertThatTestListenerErrorLogged(LogRecordListener logRecordListen
 			"EngineExecutionListener [" + listenerClass.getName() + "] threw exception for method: " + methodName);
 	}
 
-	private DemoMethodTestDescriptor getDemoMethodTestDescriptor() {
-		var method = ReflectionUtils.findMethod(this.getClass(), "getDemoMethodTestDescriptor",
-			new Class<?>[0]).orElseThrow();
-		return new DemoMethodTestDescriptor(UniqueId.root("method", "unique_id"), this.getClass(), method);
+	private static TestDescriptor anyTestDescriptor() {
+		var testClass = CompositeEngineExecutionListenerTests.class;
+		var method = ReflectionUtils.findMethod(testClass, "anyTestDescriptor", new Class<?>[0]).orElseThrow();
+		return new DemoMethodTestDescriptor(UniqueId.root("method", "unique_id"), testClass, method);
 	}
 
 	private static class ThrowingEngineExecutionListener implements EngineExecutionListener {

From a51b850e87c948c279ef8ef79bc31b6a51c8e858 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 14:50:49 +0100
Subject: [PATCH 1040/1433] Call LauncherDiscoveryListener.class finish methods
 in reverse order

---
 .../CompositeLauncherDiscoveryListener.java   |  6 +-
 ...mpositeLauncherDiscoveryListenerTests.java | 58 +++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListenerTests.java

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
index 1484696628da..f2931001de2a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListener.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.launcher.listeners.discovery;
 
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -40,7 +42,7 @@ public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
 
 	@Override
 	public void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
-		listeners.forEach(delegate -> delegate.launcherDiscoveryFinished(request));
+		forEachInReverseOrder(listeners, delegate -> delegate.launcherDiscoveryFinished(request));
 	}
 
 	@Override
@@ -50,7 +52,7 @@ public void engineDiscoveryStarted(UniqueId engineId) {
 
 	@Override
 	public void engineDiscoveryFinished(UniqueId engineId, EngineDiscoveryResult result) {
-		listeners.forEach(delegate -> delegate.engineDiscoveryFinished(engineId, result));
+		forEachInReverseOrder(listeners, delegate -> delegate.engineDiscoveryFinished(engineId, result));
 	}
 
 	@Override
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListenerTests.java
new file mode 100644
index 000000000000..71091aae7b7c
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/CompositeLauncherDiscoveryListenerTests.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.listeners.discovery;
+
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.SelectorResolutionResult;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.launcher.EngineDiscoveryResult;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.mockito.InOrder;
+
+class CompositeLauncherDiscoveryListenerTests {
+
+	@Test
+	void callsListenersInReverseOrderForFinishedEvents() {
+		var firstListener = mock(LauncherDiscoveryListener.class, "firstListener");
+		var secondListener = mock(LauncherDiscoveryListener.class, "secondListener");
+
+		var launcherDiscoveryRequest = mock(LauncherDiscoveryRequest.class);
+		var engineId = UniqueId.forEngine("engine");
+		var engineDiscoveryResult = EngineDiscoveryResult.successful();
+		var selector = selectUniqueId(engineId);
+		var selectorResolutionResult = SelectorResolutionResult.resolved();
+
+		var composite = new CompositeLauncherDiscoveryListener(List.of(firstListener, secondListener));
+		composite.launcherDiscoveryStarted(launcherDiscoveryRequest);
+		composite.engineDiscoveryStarted(engineId);
+		composite.selectorProcessed(engineId, selector, selectorResolutionResult);
+		composite.engineDiscoveryFinished(engineId, engineDiscoveryResult);
+		composite.launcherDiscoveryFinished(launcherDiscoveryRequest);
+
+		InOrder inOrder = inOrder(firstListener, secondListener);
+		inOrder.verify(firstListener).launcherDiscoveryStarted(launcherDiscoveryRequest);
+		inOrder.verify(secondListener).launcherDiscoveryStarted(launcherDiscoveryRequest);
+		inOrder.verify(firstListener).engineDiscoveryStarted(engineId);
+		inOrder.verify(secondListener).engineDiscoveryStarted(engineId);
+		inOrder.verify(secondListener).selectorProcessed(engineId, selector, selectorResolutionResult);
+		inOrder.verify(secondListener).engineDiscoveryFinished(engineId, engineDiscoveryResult);
+		inOrder.verify(firstListener).engineDiscoveryFinished(engineId, engineDiscoveryResult);
+		inOrder.verify(secondListener).launcherDiscoveryFinished(launcherDiscoveryRequest);
+		inOrder.verify(firstListener).launcherDiscoveryFinished(launcherDiscoveryRequest);
+	}
+}

From b91532a35fa2621119dd43328c9e2fd36233dd3b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 14:54:50 +0100
Subject: [PATCH 1041/1433] Call LauncherSessionListener closed method in
 reverse order

Issue: #3082
---
 .../CompositeLauncherSessionListener.java     |  4 +-
 .../launcher/core/LauncherSessionTests.java   | 12 +++---
 ...CompositeLauncherSessionListenerTests.java | 42 +++++++++++++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListenerTests.java

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
index a79f93f8cfee..ac538accdf7f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListener.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.launcher.listeners.session;
 
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -36,6 +38,6 @@ public void launcherSessionOpened(LauncherSession session) {
 
 	@Override
 	public void launcherSessionClosed(LauncherSession session) {
-		listeners.forEach(delegate -> delegate.launcherSessionClosed(session));
+		forEachInReverseOrder(listeners, delegate -> delegate.launcherSessionClosed(session));
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
index 9cc2063d9b9f..761eba797723 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java
@@ -26,8 +26,8 @@
 
 class LauncherSessionTests {
 
-	LauncherSessionListener firstSessionListener = mock(LauncherSessionListener.class);
-	LauncherSessionListener secondSessionListener = mock(LauncherSessionListener.class);
+	LauncherSessionListener firstSessionListener = mock(LauncherSessionListener.class, "firstSessionListener");
+	LauncherSessionListener secondSessionListener = mock(LauncherSessionListener.class, "secondSessionListener");
 	LauncherConfig launcherConfig = createLauncherConfigBuilderWithDisabledServiceLoading() //
 			.addLauncherSessionListeners(firstSessionListener, secondSessionListener) //
 			.addTestEngines(new TestEngineStub()) //
@@ -44,22 +44,22 @@ void callsRegisteredListenersWhenLauncherIsUsedDirectly() {
 		var launcherSession = ArgumentCaptor.forClass(LauncherSession.class);
 		inOrder.verify(firstSessionListener).launcherSessionOpened(launcherSession.capture());
 		inOrder.verify(secondSessionListener).launcherSessionOpened(launcherSession.getValue());
-		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
 		inOrder.verify(secondSessionListener).launcherSessionClosed(launcherSession.getValue());
+		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
 
 		launcher.execute(testPlan);
 
 		inOrder.verify(firstSessionListener).launcherSessionOpened(launcherSession.capture());
 		inOrder.verify(secondSessionListener).launcherSessionOpened(launcherSession.getValue());
-		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
 		inOrder.verify(secondSessionListener).launcherSessionClosed(launcherSession.getValue());
+		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
 
 		launcher.execute(request);
 
 		inOrder.verify(firstSessionListener).launcherSessionOpened(launcherSession.capture());
 		inOrder.verify(secondSessionListener).launcherSessionOpened(launcherSession.getValue());
-		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
 		inOrder.verify(secondSessionListener).launcherSessionClosed(launcherSession.getValue());
+		inOrder.verify(firstSessionListener).launcherSessionClosed(launcherSession.getValue());
 	}
 
 	@Test
@@ -87,8 +87,8 @@ void callsRegisteredListenersWhenLauncherIsUsedViaSession() {
 
 		session.close();
 
-		inOrder.verify(firstSessionListener).launcherSessionClosed(session);
 		inOrder.verify(secondSessionListener).launcherSessionClosed(session);
+		inOrder.verify(firstSessionListener).launcherSessionClosed(session);
 		verifyNoMoreInteractions(firstSessionListener, secondSessionListener);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListenerTests.java
new file mode 100644
index 000000000000..ecfcfa215d4d
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/session/CompositeLauncherSessionListenerTests.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.listeners.session;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
+import org.mockito.InOrder;
+
+public class CompositeLauncherSessionListenerTests {
+
+	@Test
+	void callsListenersInReverseOrderForClosedEvents() {
+		var firstListener = mock(LauncherSessionListener.class, "firstListener");
+		var secondListener = mock(LauncherSessionListener.class, "secondListener");
+
+		var launcherSession = mock(LauncherSession.class);
+
+		var composite = new CompositeLauncherSessionListener(List.of(firstListener, secondListener));
+		composite.launcherSessionOpened(launcherSession);
+		composite.launcherSessionClosed(launcherSession);
+
+		InOrder inOrder = inOrder(firstListener, secondListener);
+		inOrder.verify(firstListener).launcherSessionOpened(launcherSession);
+		inOrder.verify(secondListener).launcherSessionOpened(launcherSession);
+		inOrder.verify(secondListener).launcherSessionClosed(launcherSession);
+		inOrder.verify(firstListener).launcherSessionClosed(launcherSession);
+	}
+}

From 85e79f8e04d972e30a61476500fa17d4b6d9885d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 15:04:00 +0100
Subject: [PATCH 1042/1433] Reuse CollectionUtils.forEachInReverseOrder

---
 .../descriptor/ClassBasedTestDescriptor.java   |  7 ++++---
 .../descriptor/JupiterTestDescriptor.java      |  4 +++-
 .../descriptor/MethodBasedTestDescriptor.java  | 18 ++++++++++--------
 .../descriptor/TestMethodTestDescriptor.java   |  3 ++-
 .../engine/extension/ExtensionRegistry.java    | 17 -----------------
 .../extension/MutableExtensionRegistry.java    |  1 -
 6 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
index d1fed9511f38..6005c99deb34 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.engine.descriptor.LifecycleMethodUtils.findBeforeEachMethods;
 import static org.junit.jupiter.engine.descriptor.TestInstanceLifecycleUtils.getTestInstanceLifecycle;
 import static org.junit.jupiter.engine.support.JupiterThrowableCollectorFactory.createThrowableCollector;
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -457,15 +458,15 @@ private void invokeAfterAllCallbacks(JupiterEngineExecutionContext context) {
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ThrowableCollector throwableCollector = context.getThrowableCollector();
 
-		registry.getReversedExtensions(AfterAllCallback.class)//
-				.forEach(extension -> throwableCollector.execute(() -> extension.afterAll(extensionContext)));
+		forEachInReverseOrder(registry.getExtensions(AfterAllCallback.class), //
+			extension -> throwableCollector.execute(() -> extension.afterAll(extensionContext)));
 	}
 
 	private void invokeTestInstancePreDestroyCallbacks(JupiterEngineExecutionContext context) {
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ThrowableCollector throwableCollector = context.getThrowableCollector();
 
-		context.getExtensionRegistry().getReversedExtensions(TestInstancePreDestroyCallback.class).forEach(
+		forEachInReverseOrder(context.getExtensionRegistry().getExtensions(TestInstancePreDestroyCallback.class), //
 			extension -> throwableCollector.execute(() -> extension.preDestroyTestInstance(extensionContext)));
 	}
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
index 5492e8a6890e..541844b0da8f 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java
@@ -107,7 +107,9 @@ static Set<TestTag> getTags(AnnotatedElement element) {
 	<E extends Extension> void invokeExecutionExceptionHandlers(Class<E> handlerType, ExtensionRegistry registry,
 			Throwable throwable, ExceptionHandlerInvoker<E> handlerInvoker) {
 
-		invokeExecutionExceptionHandlers(registry.getReversedExtensions(handlerType), throwable, handlerInvoker);
+		List<E> extensions = registry.getExtensions(handlerType);
+		Collections.reverse(extensions);
+		invokeExecutionExceptionHandlers(extensions, throwable, handlerInvoker);
 	}
 
 	private <E extends Extension> void invokeExecutionExceptionHandlers(List<E> exceptionHandlers, Throwable throwable,
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
index bb0d3907501d..d3c523a39f0e 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
@@ -12,6 +12,7 @@
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.jupiter.engine.descriptor.DisplayNameUtils.determineDisplayNameForMethod;
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
 
 import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
@@ -25,7 +26,6 @@
 import org.junit.jupiter.api.extension.TestWatcher;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
-import org.junit.jupiter.engine.extension.ExtensionRegistry;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ClassUtils;
@@ -123,13 +123,9 @@ public void nodeSkipped(JupiterEngineExecutionContext context, TestDescriptor de
 	protected void invokeTestWatchers(JupiterEngineExecutionContext context, boolean reverseOrder,
 			Consumer<TestWatcher> callback) {
 
-		ExtensionRegistry registry = context.getExtensionRegistry();
+		List<TestWatcher> watchers = context.getExtensionRegistry().getExtensions(TestWatcher.class);
 
-		List<TestWatcher> watchers = reverseOrder //
-				? registry.getReversedExtensions(TestWatcher.class)
-				: registry.getExtensions(TestWatcher.class);
-
-		watchers.forEach(watcher -> {
+		Consumer<TestWatcher> action = watcher -> {
 			try {
 				callback.accept(watcher);
 			}
@@ -143,7 +139,13 @@ protected void invokeTestWatchers(JupiterEngineExecutionContext context, boolean
 							extensionContext.getRequiredTestMethod()),
 						getDisplayName()));
 			}
-		});
+		};
+		if (reverseOrder) {
+			forEachInReverseOrder(watchers, action);
+		}
+		else {
+			watchers.forEach(action);
+		}
 	}
 
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
index c5c784b06abc..252714e266c4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.engine.descriptor.ExtensionUtils.populateNewExtensionRegistryFromExtendWithAnnotation;
 import static org.junit.jupiter.engine.descriptor.ExtensionUtils.registerExtensionsFromExecutableParameters;
 import static org.junit.jupiter.engine.support.JupiterThrowableCollectorFactory.createThrowableCollector;
+import static org.junit.platform.commons.util.CollectionUtils.forEachInReverseOrder;
 
 import java.lang.reflect.Method;
 
@@ -272,7 +273,7 @@ private <T extends Extension> void invokeAllAfterMethodsOrCallbacks(Class<T> typ
 		ExtensionContext extensionContext = context.getExtensionContext();
 		ThrowableCollector throwableCollector = context.getThrowableCollector();
 
-		registry.getReversedExtensions(type).forEach(callback -> {
+		forEachInReverseOrder(registry.getExtensions(type), callback -> {
 			throwableCollector.execute(() -> callbackInvoker.invoke(callback, extensionContext));
 		});
 	}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
index d859d6b82323..1c20bf0be12a 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/ExtensionRegistry.java
@@ -14,7 +14,6 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -36,7 +35,6 @@ public interface ExtensionRegistry {
 	 * in this registry or one of its ancestors.
 	 *
 	 * @param extensionType the type of {@link Extension} to stream
-	 * @see #getReversedExtensions(Class)
 	 * @see #getExtensions(Class)
 	 */
 	<E extends Extension> Stream<E> stream(Class<E> extensionType);
@@ -46,25 +44,10 @@ public interface ExtensionRegistry {
 	 * in this registry or one of its ancestors.
 	 *
 	 * @param extensionType the type of {@link Extension} to get
-	 * @see #getReversedExtensions(Class)
 	 * @see #stream(Class)
 	 */
 	default <E extends Extension> List<E> getExtensions(Class<E> extensionType) {
 		return stream(extensionType).collect(toCollection(ArrayList::new));
 	}
 
-	/**
-	 * Get all {@code Extensions} of the specified type that are present
-	 * in this registry or one of its ancestors, in reverse order.
-	 *
-	 * @param extensionType the type of {@link Extension} to get
-	 * @see #getExtensions(Class)
-	 * @see #stream(Class)
-	 */
-	default <E extends Extension> List<E> getReversedExtensions(Class<E> extensionType) {
-		List<E> extensions = getExtensions(extensionType);
-		Collections.reverse(extensions);
-		return extensions;
-	}
-
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
index 2856cdc3a628..0a1433505c7b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/MutableExtensionRegistry.java
@@ -130,7 +130,6 @@ public <E extends Extension> Stream<E> stream(Class<E> extensionType) {
 	 * <p>Extensions in ancestors are ignored.
 	 *
 	 * @param extensionType the type of {@link Extension} to stream
-	 * @see #getReversedExtensions(Class)
 	 */
 	private <E extends Extension> Stream<E> streamLocal(Class<E> extensionType) {
 		// @formatter:off

From ba7e42d29d609bf332cddc59897f48da47c377dc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 15:14:45 +0100
Subject: [PATCH 1043/1433] Optimize common cases

---
 .../commons/util/CollectionUtils.java         |  7 +++++
 .../commons/util/CollectionUtilsTests.java    | 28 +++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
index 4c4b68c125da..3d08f95a8d35 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java
@@ -210,6 +210,13 @@ public static Stream<?> toStream(Object object) {
 	 */
 	@API(status = INTERNAL, since = "1.9.2")
 	public static <T> void forEachInReverseOrder(List<T> list, Consumer<? super T> action) {
+		if (list.isEmpty()) {
+			return;
+		}
+		if (list.size() == 1) {
+			action.accept(list.get(0));
+			return;
+		}
 		for (ListIterator<T> iterator = list.listIterator(list.size()); iterator.hasPrevious();) {
 			action.accept(iterator.previous());
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
index 03fc6d512fb5..63563e8071ce 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java
@@ -34,8 +34,13 @@
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.converter.ArgumentConversionException;
+import org.junit.jupiter.params.converter.ArgumentConverter;
+import org.junit.jupiter.params.converter.ConvertWith;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -277,13 +282,26 @@ private void toStreamWithPrimitiveArray(Object primitiveArray) {
 		}
 	}
 
-	@Test
-	void iteratesListElementsInReverseOrder() {
-		var items = List.of("foo", "bar", "baz");
+	@ParameterizedTest
+	@CsvSource(delimiter = '|', nullValues = "N/A", textBlock = """
+			        foo,bar,baz | baz,bar,foo
+			        foo,bar     | bar,foo
+			        foo         | foo
+			        N/A         | N/A
+			""")
+	void iteratesListElementsInReverseOrder(@ConvertWith(CommaSeparator.class) List<String> input,
+			@ConvertWith(CommaSeparator.class) List<String> expected) {
 		var result = new ArrayList<>();
 
-		CollectionUtils.forEachInReverseOrder(items, result::add);
+		CollectionUtils.forEachInReverseOrder(input, result::add);
 
-		assertThat(result).containsExactly("baz", "bar", "foo");
+		assertEquals(expected, result);
+	}
+
+	private static class CommaSeparator implements ArgumentConverter {
+		@Override
+		public Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+			return source == null ? List.of() : List.of(((String) source).split(","));
+		}
 	}
 }

From e68580dd1009f5c2dcfe08c61597ad5e3b82abfc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 30 Dec 2022 15:37:24 +0100
Subject: [PATCH 1044/1433] Document listener method pair ordering change in
 release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 2888418350d5..5036080544ab 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -25,6 +25,11 @@ repository on GitHub.
 
 * All utility methods from `ReflectionSupport` now have counterparts returning `Stream`
   instead of `List`.
+* For consistency with Jupiter lifecycle callbacks, listener method pairs for started/
+  finished and opened/closed events are now called using "wrap" semantics, i.e. the latter
+  methods are called in reverse order compared to the former when multiple listeners are
+  registered. This affects the following listener interfaces: `TestExecutionListener`,
+  `EngineExecutionListener`, `LauncherDiscoveryListener`, and `LauncherSessionListener`.
 
 [[release-notes-5.10.0-M1-junit-jupiter]]
 === JUnit Jupiter

From 10015d996f67a67f4c45c30d04f0c0d1566bfa83 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Tue, 10 Jan 2023 15:46:14 +0100
Subject: [PATCH 1045/1433] Document how `TestExecutionListener` are called
 (#3092)

Resolves #3061.
---
 .../asciidoc/user-guide/advanced-topics/launcher-api.adoc    | 5 +++++
 .../org/junit/platform/launcher/TestExecutionListener.java   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
index 2c8b25e7c9c2..4fcd0996c9df 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
@@ -71,6 +71,11 @@ There is no return value for the `execute()` method, but you can use a
 `{SummaryGeneratingListener}`, `{LegacyXmlReportGeneratingListener}`, and
 `{UniqueIdTrackingListener}`.
 
+NOTE: All `TestExecutionListener` methods are called sequentially. Methods for start
+events are called in registration order while methods for finish events are called in
+reverse order.
+Test case execution won't start before all `executionStarted` calls have returned.
+
 [[launcher-api-engines-custom]]
 ==== Registering a TestEngine
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
index fed40da48355..548395c43cfa 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestExecutionListener.java
@@ -25,6 +25,11 @@
  * Concrete implementations may therefore override one or more of these methods
  * to be notified of the selected events.
  *
+ * <p>All {@code TestExecutionListener} methods are called sequentially. Methods
+ * for start events are called in registration order while methods for finish
+ * events are called in reverse order. Test case execution won't start before
+ * all {@link #executionStarted(TestIdentifier)} calls have returned.
+ *
  * <p>JUnit provides two example implementations.
  *
  * <ul>

From 5f268d6bea1875f9e1ce0bf1f3b9263538532197 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 16 Jan 2023 15:00:43 +0100
Subject: [PATCH 1046/1433] Fix link to JUnit 5.9.2 release

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 37241253e2d2..7b4bb98a40c3 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.9.2](https://github.com/junit-team/junit5/releases/tag/r5.9.1) (January 10, 2023)
+- General Availability (GA): [JUnit 5.9.2](https://github.com/junit-team/junit5/releases/tag/r5.9.2) (January 10, 2023)
 - Preview (Milestone/Release Candidate): n/a
 
 ## Documentation

From 0af991027f25f1edc58c49496cd3bb4de44d391e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 20 Jan 2023 13:35:27 +0100
Subject: [PATCH 1047/1433] Migrate to Mockito.mock(T...) where feasible

---
 .../AbstractExecutionConditionTests.java          |  2 +-
 .../support/TypeBasedParameterResolverTests.java  |  6 +++---
 .../config/CachingJupiterConfigurationTests.java  |  2 +-
 .../config/DefaultJupiterConfigurationTests.java  | 12 ++++++------
 ...atingConfigurationParameterConverterTests.java | 14 +++++++-------
 .../engine/descriptor/DisplayNameUtilsTests.java  |  6 +++---
 .../engine/descriptor/ExtensionContextTests.java  |  2 +-
 .../descriptor/JupiterTestDescriptorTests.java    |  2 +-
 .../TestFactoryTestDescriptorTests.java           | 12 +++++-------
 .../TestInstanceLifecycleUtilsTests.java          | 15 ++++++---------
 ...TestTemplateInvocationTestDescriptorTests.java |  4 ++--
 .../TestTemplateTestDescriptorTests.java          |  2 +-
 .../discovery/DiscoverySelectorResolverTests.java |  4 ++--
 .../execution/AbstractExecutableInvokerTests.java |  6 +++---
 .../JupiterEngineExecutionContextTests.java       | 14 +++++++-------
 .../execution/ParameterResolutionUtilsTests.java  |  6 +++---
 .../extension/CloseablePathCleanupTests.java      |  2 +-
 .../engine/extension/ExtensionRegistryTests.java  |  2 +-
 .../TestReporterParameterResolverTests.java       |  8 +++-----
 .../extension/TimeoutConfigurationTests.java      |  2 +-
 .../ParameterizedTestNameFormatterTests.java      |  6 ++----
 .../converter/TypedArgumentConverterTests.java    |  4 ++--
 .../provider/EnumArgumentsProviderTests.java      |  3 +--
 .../provider/MethodArgumentsProviderTests.java    |  2 +-
 .../ConsoleLauncherExecutionResultTests.java      |  2 +-
 .../platform/console/tasks/ColorPaletteTests.java |  3 +--
 ...rallelExecutionConfigurationStrategyTests.java |  2 +-
 .../junit/platform/launcher/TestPlanTests.java    |  2 +-
 .../CompositeEngineExecutionListenerTests.java    |  2 +-
 .../core/CompositeTestExecutionListenerTests.java |  3 +--
 .../core/ExecutionListenerAdapterTests.java       |  5 +----
 .../listeners/SummaryGenerationTests.java         |  3 +--
 .../legacy/LegacyReportingUtilsTests.java         |  5 ++---
 .../LegacyXmlReportGeneratingListenerTests.java   |  7 +++----
 .../reporting/legacy/xml/XmlReportDataTests.java  |  2 +-
 .../legacy/xml/XmlReportWriterTests.java          |  2 +-
 .../platform/runner/JUnitPlatformRunnerTests.java |  7 +++----
 37 files changed, 82 insertions(+), 101 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
index 7a21eb3b7e6c..7e02a7d3360b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java
@@ -50,7 +50,7 @@
 @TestInstance(Lifecycle.PER_CLASS)
 abstract class AbstractExecutionConditionTests {
 
-	private final ExtensionContext context = mock(ExtensionContext.class);
+	private final ExtensionContext context = mock();
 
 	private ConditionEvaluationResult result;
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
index 3c02d637d0f7..40a333efb5d8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.lang.annotation.ElementType;
@@ -32,7 +33,6 @@
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.ReflectionUtils;
-import org.mockito.Mockito;
 
 /**
  * @since 5.6
@@ -86,13 +86,13 @@ void resolve() {
 	}
 
 	private static ParameterContext parameterContext(Parameter parameter) {
-		ParameterContext parameterContext = Mockito.mock(ParameterContext.class);
+		ParameterContext parameterContext = mock();
 		when(parameterContext.getParameter()).thenReturn(parameter);
 		return parameterContext;
 	}
 
 	private static ExtensionContext extensionContext() {
-		ExtensionContext extensionContext = Mockito.mock(ExtensionContext.class);
+		ExtensionContext extensionContext = mock();
 		when(extensionContext.getDisplayName()).thenReturn("Displaying");
 		return extensionContext;
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
index 8c7fc8681bf5..cb4f88f73b47 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
@@ -34,7 +34,7 @@
  */
 class CachingJupiterConfigurationTests {
 
-	private final JupiterConfiguration delegate = mock(JupiterConfiguration.class);
+	private final JupiterConfiguration delegate = mock();
 	private final JupiterConfiguration cache = new CachingJupiterConfiguration(delegate);
 
 	@Test
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
index 1f527013eb08..2592fe256b35 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
@@ -45,14 +45,14 @@ void getDefaultTestInstanceLifecyclePreconditions() {
 
 	@Test
 	void getDefaultTestInstanceLifecycleWithNoConfigParamSet() {
-		JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock(ConfigurationParameters.class));
+		JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock());
 		Lifecycle lifecycle = configuration.getDefaultTestInstanceLifecycle();
 		assertThat(lifecycle).isEqualTo(PER_METHOD);
 	}
 
 	@Test
 	void getDefaultTempDirCleanupModeWithNoConfigParamSet() {
-		JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock(ConfigurationParameters.class));
+		JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock());
 		CleanupMode cleanupMode = configuration.getDefaultTempDirCleanupMode();
 		assertThat(cleanupMode).isEqualTo(ALWAYS);
 	}
@@ -74,7 +74,7 @@ void getDefaultTestInstanceLifecycleWithConfigParamSet() {
 
 	@Test
 	void shouldGetDefaultDisplayNameGeneratorWithConfigParamSet() {
-		ConfigurationParameters parameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters parameters = mock();
 		String key = Constants.DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME;
 		when(parameters.get(key)).thenReturn(Optional.of(CustomDisplayNameGenerator.class.getName()));
 		JupiterConfiguration configuration = new DefaultJupiterConfiguration(parameters);
@@ -86,7 +86,7 @@ void shouldGetDefaultDisplayNameGeneratorWithConfigParamSet() {
 
 	@Test
 	void shouldGetStandardAsDefaultDisplayNameGeneratorWithoutConfigParamSet() {
-		ConfigurationParameters parameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters parameters = mock();
 		String key = Constants.DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME;
 		when(parameters.get(key)).thenReturn(Optional.empty());
 		JupiterConfiguration configuration = new DefaultJupiterConfiguration(parameters);
@@ -98,7 +98,7 @@ void shouldGetStandardAsDefaultDisplayNameGeneratorWithoutConfigParamSet() {
 
 	@Test
 	void shouldGetNothingAsDefaultTestMethodOrderWithoutConfigParamSet() {
-		ConfigurationParameters parameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters parameters = mock();
 		String key = Constants.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME;
 		when(parameters.get(key)).thenReturn(Optional.empty());
 		JupiterConfiguration configuration = new DefaultJupiterConfiguration(parameters);
@@ -109,7 +109,7 @@ void shouldGetNothingAsDefaultTestMethodOrderWithoutConfigParamSet() {
 	}
 
 	private void assertDefaultConfigParam(String configValue, Lifecycle expected) {
-		ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+		ConfigurationParameters configParams = mock();
 		when(configParams.get(KEY)).thenReturn(Optional.ofNullable(configValue));
 		Lifecycle lifecycle = new DefaultJupiterConfiguration(configParams).getDefaultTestInstanceLifecycle();
 		assertThat(lifecycle).isEqualTo(expected);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
index 6923183aedce..5848cda93b4a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java
@@ -38,7 +38,7 @@ class InstantiatingConfigurationParameterConverterTests {
 	@Test
 	void shouldInstantiateConfiguredClass(LogRecordListener listener) {
 
-		ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters configurationParameters = mock();
 		when(configurationParameters.get(KEY)).thenReturn(Optional.of(CustomDisplayNameGenerator.class.getName()));
 
 		InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -54,7 +54,7 @@ void shouldInstantiateConfiguredClass(LogRecordListener listener) {
 
 	@Test
 	void shouldReturnEmptyOptionalIfNoConfigurationFound() {
-		ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters configurationParameters = mock();
 		when(configurationParameters.get(KEY)).thenReturn(Optional.empty());
 
 		InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -66,7 +66,7 @@ void shouldReturnEmptyOptionalIfNoConfigurationFound() {
 
 	@Test
 	void shouldReturnEmptyOptionalIfConfigurationIsBlank() {
-		ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters configurationParameters = mock();
 		when(configurationParameters.get(KEY)).thenReturn(Optional.of(""));
 
 		InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -78,7 +78,7 @@ void shouldReturnEmptyOptionalIfConfigurationIsBlank() {
 
 	@Test
 	void shouldTrimAndInstantiateConfiguredClass(LogRecordListener listener) {
-		ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters configurationParameters = mock();
 		String classNameWithSpaces = " " + CustomDisplayNameGenerator.class.getName() + "  ";
 		when(configurationParameters.get(KEY)).thenReturn(Optional.of(classNameWithSpaces));
 
@@ -95,7 +95,7 @@ void shouldTrimAndInstantiateConfiguredClass(LogRecordListener listener) {
 
 	@Test
 	void shouldReturnEmptyOptionalIfNoClassFound(LogRecordListener listener) {
-		ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters configurationParameters = mock();
 		when(configurationParameters.get(KEY)).thenReturn(Optional.of("random-string"));
 
 		InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -111,7 +111,7 @@ void shouldReturnEmptyOptionalIfNoClassFound(LogRecordListener listener) {
 
 	@Test
 	void shouldReturnEmptyOptionalIfClassFoundIsNotATypeOfExpectedType(LogRecordListener listener) {
-		ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters configurationParameters = mock();
 		when(configurationParameters.get(KEY)).thenReturn(Optional.of(Object.class.getName()));
 
 		InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -127,7 +127,7 @@ void shouldReturnEmptyOptionalIfClassFoundIsNotATypeOfExpectedType(LogRecordList
 
 	@Test
 	void shouldReturnEmptyOptionalIfClassNameIsNotFullyQualified(LogRecordListener listener) {
-		ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
+		ConfigurationParameters configurationParameters = mock();
 		when(configurationParameters.get(KEY)).thenReturn(
 			Optional.of(CustomDisplayNameGenerator.class.getSimpleName()));
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
index 1a14ef7379d7..5a8679e4acd7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java
@@ -71,7 +71,7 @@ void shouldGetDisplayNameFromSupplierIfNoDisplayNameAnnotationPresent() {
 		@Nested
 		class ClassDisplayNameSupplierTests {
 
-			private JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+			private JupiterConfiguration configuration = mock();
 
 			@Test
 			void shouldGetDisplayNameFromDisplayNameGenerationAnnotation() {
@@ -116,7 +116,7 @@ void shouldFallbackOnDefaultDisplayNameGeneratorWhenNullIsGenerated() {
 	@Nested
 	class NestedClassDisplayNameTests {
 
-		private JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+		private JupiterConfiguration configuration = mock();
 
 		@Test
 		void shouldGetDisplayNameFromDisplayNameGenerationAnnotation() {
@@ -149,7 +149,7 @@ void shouldFallbackOnDefaultDisplayNameGeneratorWhenNullIsGenerated() {
 	@Nested
 	class MethodDisplayNameTests {
 
-		private JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+		private JupiterConfiguration configuration = mock();
 
 		@Test
 		void shouldGetDisplayNameFromDisplayNameGenerationAnnotation() throws Exception {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
index e9075148b54d..af140f29f877 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java
@@ -59,7 +59,7 @@
  */
 public class ExtensionContextTests {
 
-	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+	private final JupiterConfiguration configuration = mock();
 
 	@BeforeEach
 	void setUp() {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
index 05a3bd435214..ecd65438b861 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java
@@ -53,7 +53,7 @@ class JupiterTestDescriptorTests {
 
 	private static final UniqueId uniqueId = UniqueId.root("enigma", "foo");
 
-	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+	private final JupiterConfiguration configuration = mock();
 
 	@BeforeEach
 	void setUp() {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
index 530454f56bc5..7718e771ae2f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
-import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.ClasspathResourceSource;
@@ -39,7 +38,6 @@
 import org.junit.platform.engine.support.descriptor.FileSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.junit.platform.engine.support.descriptor.UriSource;
-import org.junit.platform.engine.support.hierarchical.Node;
 import org.junit.platform.engine.support.hierarchical.OpenTest4JAwareThrowableCollector;
 
 /**
@@ -134,17 +132,17 @@ class Streams {
 
 		@BeforeEach
 		void before() throws Exception {
-			jupiterConfiguration = mock(JupiterConfiguration.class);
+			jupiterConfiguration = mock();
 			when(jupiterConfiguration.getDefaultDisplayNameGenerator()).thenReturn(new DisplayNameGenerator.Standard());
 
-			extensionContext = mock(ExtensionContext.class);
+			extensionContext = mock();
 			isClosed = false;
 
 			context = new JupiterEngineExecutionContext(null, null) //
 					.extend() //
 					.withThrowableCollector(new OpenTest4JAwareThrowableCollector()) //
 					.withExtensionContext(extensionContext) //
-					.withExtensionRegistry(mock(MutableExtensionRegistry.class)) //
+					.withExtensionRegistry(mock()) //
 					.build();
 
 			Method testMethod = CustomStreamTestCase.class.getDeclaredMethod("customStream");
@@ -158,7 +156,7 @@ void streamsFromTestFactoriesShouldBeClosed() {
 			Stream<DynamicTest> dynamicTestStream = Stream.empty();
 			prepareMockForTestInstanceWithCustomStream(dynamicTestStream);
 
-			descriptor.invokeTestMethod(context, mock(Node.DynamicTestExecutor.class));
+			descriptor.invokeTestMethod(context, mock());
 
 			assertTrue(isClosed);
 		}
@@ -168,7 +166,7 @@ void streamsFromTestFactoriesShouldBeClosedWhenTheyThrow() {
 			Stream<Integer> integerStream = Stream.of(1, 2);
 			prepareMockForTestInstanceWithCustomStream(integerStream);
 
-			descriptor.invokeTestMethod(context, mock(Node.DynamicTestExecutor.class));
+			descriptor.invokeTestMethod(context, mock());
 
 			assertTrue(isClosed);
 		}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
index 080e42840be8..46fab2deece5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java
@@ -50,7 +50,7 @@ class TestInstanceLifecycleUtilsTests {
 	@Test
 	void getTestInstanceLifecyclePreconditions() {
 		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-			() -> getTestInstanceLifecycle(null, new DefaultJupiterConfiguration(mock(ConfigurationParameters.class))));
+			() -> getTestInstanceLifecycle(null, new DefaultJupiterConfiguration(mock())));
 		assertThat(exception).hasMessage("testClass must not be null");
 
 		exception = assertThrows(PreconditionViolationException.class,
@@ -60,14 +60,13 @@ void getTestInstanceLifecyclePreconditions() {
 
 	@Test
 	void getTestInstanceLifecycleWithNoConfigParamSet() {
-		Lifecycle lifecycle = getTestInstanceLifecycle(getClass(),
-			new DefaultJupiterConfiguration(mock(ConfigurationParameters.class)));
+		Lifecycle lifecycle = getTestInstanceLifecycle(getClass(), new DefaultJupiterConfiguration(mock()));
 		assertThat(lifecycle).isEqualTo(PER_METHOD);
 	}
 
 	@Test
 	void getTestInstanceLifecycleWithConfigParamSet() {
-		ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+		ConfigurationParameters configParams = mock();
 		when(configParams.get(KEY)).thenReturn(Optional.of(PER_CLASS.name().toLowerCase()));
 		Lifecycle lifecycle = getTestInstanceLifecycle(getClass(), new DefaultJupiterConfiguration(configParams));
 		assertThat(lifecycle).isEqualTo(PER_CLASS);
@@ -75,7 +74,7 @@ void getTestInstanceLifecycleWithConfigParamSet() {
 
 	@Test
 	void getTestInstanceLifecycleWithLocalConfigThatOverridesCustomDefaultSetViaConfigParam() {
-		ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+		ConfigurationParameters configParams = mock();
 		when(configParams.get(KEY)).thenReturn(Optional.of(PER_CLASS.name().toLowerCase()));
 		Lifecycle lifecycle = getTestInstanceLifecycle(TestCase.class, new DefaultJupiterConfiguration(configParams));
 		assertThat(lifecycle).isEqualTo(PER_METHOD);
@@ -84,16 +83,14 @@ void getTestInstanceLifecycleWithLocalConfigThatOverridesCustomDefaultSetViaConf
 	@Test
 	void getTestInstanceLifecycleFromMetaAnnotationWithNoConfigParamSet() {
 		Class<?> testClass = BaseMetaAnnotatedTestCase.class;
-		Lifecycle lifecycle = getTestInstanceLifecycle(testClass,
-			new DefaultJupiterConfiguration(mock(ConfigurationParameters.class)));
+		Lifecycle lifecycle = getTestInstanceLifecycle(testClass, new DefaultJupiterConfiguration(mock()));
 		assertThat(lifecycle).isEqualTo(PER_CLASS);
 	}
 
 	@Test
 	void getTestInstanceLifecycleFromSpecializedClassWithNoConfigParamSet() {
 		Class<?> testClass = SpecializedTestCase.class;
-		Lifecycle lifecycle = getTestInstanceLifecycle(testClass,
-			new DefaultJupiterConfiguration(mock(ConfigurationParameters.class)));
+		Lifecycle lifecycle = getTestInstanceLifecycle(testClass, new DefaultJupiterConfiguration(mock()));
 		assertThat(lifecycle).isEqualTo(PER_CLASS);
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
index 78d92bfcb2c3..b00060eb8e0b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptorTests.java
@@ -31,11 +31,11 @@ class TestTemplateInvocationTestDescriptorTests {
 	void invocationsDoNotDeclareExclusiveResources() throws Exception {
 		Class<MyTestCase> testClass = MyTestCase.class;
 		Method testTemplateMethod = testClass.getDeclaredMethod("testTemplate");
-		JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+		JupiterConfiguration configuration = mock();
 		when(configuration.getDefaultDisplayNameGenerator()).thenReturn(new DisplayNameGenerator.Standard());
 		TestTemplateTestDescriptor parent = new TestTemplateTestDescriptor(UniqueId.root("segment", "template"),
 			testClass, testTemplateMethod, configuration);
-		TestTemplateInvocationContext invocationContext = mock(TestTemplateInvocationContext.class);
+		TestTemplateInvocationContext invocationContext = mock();
 		when(invocationContext.getDisplayName(anyInt())).thenReturn("invocation");
 
 		TestTemplateInvocationTestDescriptor testDescriptor = new TestTemplateInvocationTestDescriptor(
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
index b808248cb804..f9649ddac33f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptorTests.java
@@ -32,7 +32,7 @@
  * @since 5.0
  */
 class TestTemplateTestDescriptorTests {
-	private JupiterConfiguration jupiterConfiguration = mock(JupiterConfiguration.class);
+	private JupiterConfiguration jupiterConfiguration = mock();
 
 	@Test
 	void inheritsTagsFromParent() throws Exception {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
index 0798a2ca9e67..a71d0665e14b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
@@ -91,8 +91,8 @@
  */
 class DiscoverySelectorResolverTests {
 
-	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
-	private final LauncherDiscoveryListener discoveryListener = mock(LauncherDiscoveryListener.class);
+	private final JupiterConfiguration configuration = mock();
+	private final LauncherDiscoveryListener discoveryListener = mock();
 	private final JupiterEngineDescriptor engineDescriptor = new JupiterEngineDescriptor(engineId(), configuration);
 
 	@BeforeEach
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
index f633790b34ac..786782339281 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/AbstractExecutableInvokerTests.java
@@ -37,12 +37,12 @@ abstract class AbstractExecutableInvokerTests {
 
 	private static final String ENIGMA = "enigma";
 
-	protected final MethodSource instance = mock(MethodSource.class);
+	protected final MethodSource instance = mock();
 	protected Method method;
 
-	protected final ExtensionContext extensionContext = mock(ExtensionContext.class);
+	protected final ExtensionContext extensionContext = mock();
 
-	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+	private final JupiterConfiguration configuration = mock();
 
 	protected final MutableExtensionRegistry extensionRegistry = MutableExtensionRegistry.createRegistryWithDefaultExtensions(
 		configuration);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
index 50696360fcfb..d6e619d886bd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContextTests.java
@@ -35,9 +35,9 @@
  */
 class JupiterEngineExecutionContextTests {
 
-	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+	private final JupiterConfiguration configuration = mock();
 
-	private final EngineExecutionListener engineExecutionListener = mock(EngineExecutionListener.class);
+	private final EngineExecutionListener engineExecutionListener = mock();
 
 	private final JupiterEngineExecutionContext originalContext = new JupiterEngineExecutionContext(
 		engineExecutionListener, configuration);
@@ -51,10 +51,10 @@ void executionListenerIsHandedOnWhenContextIsExtended() {
 
 	@Test
 	void extendWithAllAttributes() {
-		ExtensionContext extensionContext = mock(ExtensionContext.class);
+		ExtensionContext extensionContext = mock();
 		MutableExtensionRegistry extensionRegistry = MutableExtensionRegistry.createRegistryWithDefaultExtensions(
 			configuration);
-		TestInstancesProvider testInstancesProvider = mock(TestInstancesProvider.class);
+		TestInstancesProvider testInstancesProvider = mock();
 		JupiterEngineExecutionContext newContext = originalContext.extend() //
 				.withExtensionContext(extensionContext) //
 				.withExtensionRegistry(extensionRegistry) //
@@ -68,11 +68,11 @@ void extendWithAllAttributes() {
 
 	@Test
 	void canOverrideAttributeWhenContextIsExtended() {
-		ExtensionContext extensionContext = mock(ExtensionContext.class);
+		ExtensionContext extensionContext = mock();
 		MutableExtensionRegistry extensionRegistry = MutableExtensionRegistry.createRegistryWithDefaultExtensions(
 			configuration);
-		TestInstancesProvider testInstancesProvider = mock(TestInstancesProvider.class);
-		ExtensionContext newExtensionContext = mock(ExtensionContext.class);
+		TestInstancesProvider testInstancesProvider = mock();
+		ExtensionContext newExtensionContext = mock();
 
 		JupiterEngineExecutionContext newContext = originalContext.extend() //
 				.withExtensionContext(extensionContext) //
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
index 8bdcbb2adeb3..1c371f6f775f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java
@@ -43,12 +43,12 @@ class ParameterResolutionUtilsTests {
 
 	private static final String ENIGMA = "enigma";
 
-	private final MethodSource instance = mock(MethodSource.class);
+	private final MethodSource instance = mock();
 	private Method method;
 
-	private final ExtensionContext extensionContext = mock(ExtensionContext.class);
+	private final ExtensionContext extensionContext = mock();
 
-	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+	private final JupiterConfiguration configuration = mock();
 
 	private final MutableExtensionRegistry extensionRegistry = MutableExtensionRegistry.createRegistryWithDefaultExtensions(
 		configuration);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index a2d6b710dfe7..7d9557609345 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -44,7 +44,7 @@
  */
 class CloseablePathCleanupTests extends AbstractJupiterTestEngineTests {
 
-	private final ExtensionContext extensionContext = mock(ExtensionContext.class);
+	private final ExtensionContext extensionContext = mock();
 
 	private TempDirectory.CloseablePath closeablePath;
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
index b7000fbc63da..cbe91c6ea9f6 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistryTests.java
@@ -41,7 +41,7 @@ class ExtensionRegistryTests {
 
 	private static final int NUM_DEFAULT_EXTENSIONS = 6;
 
-	private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+	private final JupiterConfiguration configuration = mock();
 
 	private MutableExtensionRegistry registry = createRegistryWithDefaultExtensions(configuration);
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
index 2dbc6e8e723e..6acbcafa6126 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestReporterParameterResolverTests.java
@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Method;
@@ -20,10 +21,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestReporter;
-import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.platform.commons.util.ReflectionUtils;
-import org.mockito.Mockito;
 
 /**
  * @since 5.0
@@ -45,8 +44,7 @@ void supports() {
 	void resolve() {
 		Parameter parameter = findParameterOfMethod("methodWithTestReporterParameter", TestReporter.class);
 
-		TestReporter testReporter = this.resolver.resolveParameter(parameterContext(parameter),
-			Mockito.mock(ExtensionContext.class));
+		TestReporter testReporter = this.resolver.resolveParameter(parameterContext(parameter), mock());
 		assertNotNull(testReporter);
 	}
 
@@ -56,7 +54,7 @@ private Parameter findParameterOfMethod(String methodName, Class<?>... parameter
 	}
 
 	private static ParameterContext parameterContext(Parameter parameter) {
-		ParameterContext parameterContext = Mockito.mock(ParameterContext.class);
+		ParameterContext parameterContext = mock();
 		when(parameterContext.getParameter()).thenReturn(parameter);
 		return parameterContext;
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
index 94b9e756eb00..d37d922fb9ad 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
@@ -47,7 +47,7 @@
  */
 class TimeoutConfigurationTests {
 
-	ExtensionContext extensionContext = mock(ExtensionContext.class);
+	ExtensionContext extensionContext = mock();
 	TimeoutConfiguration config = new TimeoutConfiguration(extensionContext);
 
 	@Test
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
index c7a7616bd6c6..e83f88fc0f62 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
@@ -229,13 +229,11 @@ void truncatesArgumentsThatExceedMaxLength() {
 	}
 
 	private static ParameterizedTestNameFormatter formatter(String pattern, String displayName) {
-		return new ParameterizedTestNameFormatter(pattern, displayName, mock(ParameterizedTestMethodContext.class),
-			512);
+		return new ParameterizedTestNameFormatter(pattern, displayName, mock(), 512);
 	}
 
 	private static ParameterizedTestNameFormatter formatter(String pattern, int argumentMaxLength) {
-		return new ParameterizedTestNameFormatter(pattern, "display name", mock(ParameterizedTestMethodContext.class),
-			argumentMaxLength);
+		return new ParameterizedTestNameFormatter(pattern, "display name", mock(), argumentMaxLength);
 	}
 
 	private static ParameterizedTestNameFormatter formatter(String pattern, String displayName, Method method) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
index 2a59392cb56f..c32a0313968e 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java
@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.lang.annotation.ElementType;
@@ -30,7 +31,6 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.ReflectionUtils;
-import org.mockito.Mockito;
 
 /**
  * Tests for {@link TypedArgumentConverter}.
@@ -92,7 +92,7 @@ void targetTypeMismatch() {
 		}
 
 		private ParameterContext parameterContext(Parameter parameter) {
-			ParameterContext parameterContext = Mockito.mock(ParameterContext.class);
+			ParameterContext parameterContext = mock();
 			when(parameterContext.getParameter()).thenReturn(parameter);
 			return parameterContext;
 		}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
index 87a8dfd15c69..eb265d3e8ffc 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java
@@ -24,14 +24,13 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.provider.EnumSource.Mode;
 import org.junit.platform.commons.PreconditionViolationException;
-import org.mockito.Mockito;
 
 /**
  * @since 5.0
  */
 class EnumArgumentsProviderTests {
 
-	private ExtensionContext extensionContext = Mockito.mock(ExtensionContext.class);
+	private ExtensionContext extensionContext = mock();
 
 	@Test
 	void providesAllEnumConstants() {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index c8fd3444e5c4..9d05eb9ac07d 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -366,7 +366,7 @@ class ParameterResolution {
 
 		@BeforeEach
 		void registerParameterResolver() {
-			JupiterConfiguration configuration = mock(JupiterConfiguration.class);
+			JupiterConfiguration configuration = mock();
 			extensionRegistry = createRegistryWithDefaultExtensions(configuration);
 			extensionRegistry.registerExtension(StringResolver.class);
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
index fd9be9511ab9..1d37cfc93e5b 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
@@ -24,7 +24,7 @@
 class ConsoleLauncherExecutionResultTests {
 
 	private final CommandLineOptions options = new CommandLineOptions();
-	private final TestExecutionSummary summary = mock(TestExecutionSummary.class);
+	private final TestExecutionSummary summary = mock();
 
 	@Test
 	void hasStatusCode0ForNoTotalFailures() {
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
index a5dd82529432..3a0909c35edb 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ColorPaletteTests.java
@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.console.options.Theme;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
@@ -187,7 +186,7 @@ void flat_single_color() {
 
 		private void demoTestRun(TestExecutionListener listener) {
 			TestDescriptor testDescriptor = new TestDescriptorStub(UniqueId.forEngine("demo-engine"), "My Test");
-			TestPlan testPlan = TestPlan.from(List.of(testDescriptor), mock(ConfigurationParameters.class));
+			TestPlan testPlan = TestPlan.from(List.of(testDescriptor), mock());
 			listener.testPlanExecutionStarted(testPlan);
 			listener.executionStarted(TestIdentifier.from(testDescriptor));
 			listener.executionFinished(TestIdentifier.from(testDescriptor), TestExecutionResult.successful());
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
index 5fcf9b4cb82d..b6cb64223aa9 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
@@ -30,7 +30,7 @@
  */
 class DefaultParallelExecutionConfigurationStrategyTests {
 
-	private ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+	private ConfigurationParameters configParams = mock();
 
 	@BeforeEach
 	void setUp() {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
index b5a0145511de..866e085aa438 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
@@ -23,7 +23,7 @@
 
 class TestPlanTests {
 
-	private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+	private final ConfigurationParameters configParams = mock();
 
 	private EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("foo"), "Foo");
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
index 1e1791fa9ead..4935d038d107 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeEngineExecutionListenerTests.java
@@ -130,7 +130,7 @@ private void assertNotLogs(LogRecordListener logRecordListener) throws Assertion
 	}
 
 	private static TestExecutionResult anyTestExecutionResult() {
-		return mock(TestExecutionResult.class);
+		return mock();
 	}
 
 	private void assertThatTestListenerErrorLogged(LogRecordListener logRecordListener, Class<?> listenerClass,
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
index efbd0cd1f61c..009a2ad74c64 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/CompositeTestExecutionListenerTests.java
@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.platform.commons.logging.LogRecordListener;
 import org.junit.platform.commons.util.ReflectionUtils;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
@@ -207,7 +206,7 @@ private void assertThatTestListenerErrorLogged(LogRecordListener logRecordListen
 	}
 
 	private static TestPlan anyTestPlan() {
-		return TestPlan.from(Set.of(anyTestDescriptor()), mock(ConfigurationParameters.class));
+		return TestPlan.from(Set.of(anyTestDescriptor()), mock());
 	}
 
 	private static DemoMethodTestDescriptor anyTestDescriptor() {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
index 7fb8ea2ef334..c120c5c79349 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/ExecutionListenerAdapterTests.java
@@ -17,9 +17,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.util.ReflectionUtils;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
-import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.DemoMethodTestDescriptor;
@@ -36,8 +34,7 @@ class ExecutionListenerAdapterTests {
 	void testReportingEntryPublished() {
 		var testDescriptor = getSampleMethodTestDescriptor();
 
-		var discoveryResult = new LauncherDiscoveryResult(Map.of(mock(TestEngine.class), testDescriptor),
-			mock(ConfigurationParameters.class));
+		var discoveryResult = new LauncherDiscoveryResult(Map.of(mock(), testDescriptor), mock());
 		var testPlan = InternalTestPlan.from(discoveryResult);
 		var testIdentifier = testPlan.getTestIdentifier(testDescriptor.getUniqueId());
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
index 76df87ffb241..7c947bf1d8d7 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/SummaryGenerationTests.java
@@ -25,7 +25,6 @@
 
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
@@ -40,7 +39,7 @@
 class SummaryGenerationTests {
 
 	private final SummaryGeneratingListener listener = new SummaryGeneratingListener();
-	private final TestPlan testPlan = TestPlan.from(List.of(), mock(ConfigurationParameters.class));
+	private final TestPlan testPlan = TestPlan.from(List.of(), mock());
 
 	@Test
 	void emptyReport() {
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
index 35931e1baf9c..2cf36b309f4a 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/LegacyReportingUtilsTests.java
@@ -16,7 +16,6 @@
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.UniqueId;
@@ -72,13 +71,13 @@ void legacyReportingClassNameForDescendantOfTestIdentifierWithClassSourceIsClass
 	}
 
 	private String getClassName(UniqueId uniqueId) {
-		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock());
 		return LegacyReportingUtils.getClassName(testPlan, testPlan.getTestIdentifier(uniqueId));
 	}
 
 	@SuppressWarnings("deprecation")
 	private String getClassNameFromOldLocation(UniqueId uniqueId) {
-		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock());
 		return org.junit.platform.launcher.listeners.LegacyReportingUtils.getClassName(testPlan,
 			testPlan.getTestIdentifier(uniqueId));
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index a0bcf137d122..1ae505f8ba54 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -42,7 +42,6 @@
 import org.joox.Match;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
@@ -370,7 +369,7 @@ void printsExceptionWhenReportsDirCannotBeCreated() throws Exception {
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(reportsDir, new PrintWriter(out));
 
-		listener.testPlanExecutionStarted(TestPlan.from(Set.of(), mock(ConfigurationParameters.class)));
+		listener.testPlanExecutionStarted(TestPlan.from(Set.of(), mock()));
 
 		assertThat(out.toString()).containsSubsequence("Could not create reports directory",
 			"FileAlreadyExistsException", "at ");
@@ -386,7 +385,7 @@ void printsExceptionWhenReportCouldNotBeWritten() throws Exception {
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
 
-		listener.testPlanExecutionStarted(TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class)));
+		listener.testPlanExecutionStarted(TestPlan.from(Set.of(engineDescriptor), mock()));
 		listener.executionFinished(TestIdentifier.from(engineDescriptor), successful());
 
 		assertThat(out.toString()).containsSubsequence("Could not write XML report", "Exception", "at ");
@@ -397,7 +396,7 @@ void writesReportEntriesToSystemOutElement() throws Exception {
 		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 		var childUniqueId = UniqueId.root("child", "test");
 		engineDescriptor.addChild(new TestDescriptorStub(childUniqueId, "test"));
-		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock(ConfigurationParameters.class));
+		var testPlan = TestPlan.from(Set.of(engineDescriptor), mock());
 
 		var out = new StringWriter();
 		var listener = new LegacyXmlReportGeneratingListener(tempDirectory, new PrintWriter(out));
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
index 65fd5acd0d92..fb88bc9f872b 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportDataTests.java
@@ -30,7 +30,7 @@
  */
 class XmlReportDataTests {
 
-	private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+	private final ConfigurationParameters configParams = mock();
 
 	@Test
 	void resultsOfTestIdentifierWithoutAnyReportedEventsAreEmpty() {
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
index 4c278dc6b2fa..8487afb1bceb 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/XmlReportWriterTests.java
@@ -48,7 +48,7 @@
  */
 class XmlReportWriterTests {
 
-	private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+	private final ConfigurationParameters configParams = mock();
 
 	private EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("engine"), "Engine");
 
diff --git a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
index 30bdb61aa671..a515e6dd2990 100644
--- a/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/runner/JUnitPlatformRunnerTests.java
@@ -465,7 +465,7 @@ void convertsTestIdentifiersIntoDescriptions() {
 			TestDescriptor container2 = new TestDescriptorStub(UniqueId.root("root", "container2"), "container2");
 			container2.addChild(new TestDescriptorStub(UniqueId.root("root", "test2a"), "test2a"));
 			container2.addChild(new TestDescriptorStub(UniqueId.root("root", "test2b"), "test2b"));
-			var testPlan = TestPlan.from(List.of(container1, container2), mock(ConfigurationParameters.class));
+			var testPlan = TestPlan.from(List.of(container1, container2), mock());
 
 			var launcher = mock(Launcher.class);
 			when(launcher.discover(any())).thenReturn(testPlan);
@@ -502,7 +502,7 @@ private static <T> void assertExcludes(Filter<T> filter, T excluded) {
 	@Nested
 	class Filtering {
 
-		private final ConfigurationParameters configParams = mock(ConfigurationParameters.class);
+		private final ConfigurationParameters configParams = mock();
 
 		@Test
 		void appliesFilter() throws Exception {
@@ -777,8 +777,7 @@ private TestDescriptor testDescriptorWithTags(String... tag) {
 	private LauncherDiscoveryRequest instantiateRunnerAndCaptureGeneratedRequest(Class<?> testClass) {
 		var launcher = mock(Launcher.class);
 		var captor = ArgumentCaptor.forClass(LauncherDiscoveryRequest.class);
-		when(launcher.discover(captor.capture())).thenReturn(
-			TestPlan.from(Set.of(), mock(ConfigurationParameters.class)));
+		when(launcher.discover(captor.capture())).thenReturn(TestPlan.from(Set.of(), mock()));
 
 		new JUnitPlatform(testClass, launcher);
 

From 30cfc3b29ffd9466ded7ed3cd99f81a65b9eabb6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 23 Jan 2023 13:56:47 +0100
Subject: [PATCH 1048/1433] Polishing

---
 .../jupiter/params/ParameterizedTestExtension.java   |  2 +-
 .../params/provider/MethodArgumentsProvider.java     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
index 113eb550e727..0aa5664cafc3 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -150,10 +150,10 @@ protected static Stream<? extends Arguments> arguments(ArgumentsProvider provide
 	}
 
 	private Object[] consumedArguments(Object[] arguments, ParameterizedTestMethodContext methodContext) {
-		int parameterCount = methodContext.getParameterCount();
 		if (methodContext.hasAggregator()) {
 			return arguments;
 		}
+		int parameterCount = methodContext.getParameterCount();
 		return arguments.length > parameterCount ? Arrays.copyOf(arguments, parameterCount) : arguments;
 	}
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index a02649c3c3e4..ac47b462fc59 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -73,14 +73,14 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa
 		if (factoryMethodName.contains("#")) {
 			return true;
 		}
-		int indexOfDot = factoryMethodName.indexOf(".");
-		if (indexOfDot == -1) {
+		int indexOfFirstDot = factoryMethodName.indexOf('.');
+		if (indexOfFirstDot == -1) {
 			return false;
 		}
-		int indexOfOpeningParenthesis = factoryMethodName.indexOf("(");
-		if (indexOfOpeningParenthesis > 0) {
-			// Exclude simple method names with parameters
-			return indexOfDot < indexOfOpeningParenthesis;
+		int indexOfLastOpeningParenthesis = factoryMethodName.lastIndexOf('(');
+		if (indexOfLastOpeningParenthesis > 0) {
+			// Exclude simple/local method names with parameters
+			return indexOfFirstDot < indexOfLastOpeningParenthesis;
 		}
 		// If we get this far, we conclude the supplied factory method name "looks"
 		// like it was intended to be a fully qualified method name, even if the

From a0eb8e2bd9aa00445d442f0ea46e37551728ab83 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 23 Jan 2023 17:17:24 +0100
Subject: [PATCH 1049/1433] Fix issues with @MethodSource local factory method
 lookups

Prior to this commit, parameters were not validated in local
@MethodSource factory methods which lead to incorrect configuration
being silently ignored or confusing error messages when the specified
factory method was overloaded. In addition, the syntax for local
@MethodSource factory methods did not support canonical array names.

This commit addresses these issues by treating local factory method
resolution the same as the existing support for resolving a fully
qualified method name for a factory method.

These changes make the recently introduced parseQualifiedMethodName()
method in ReflectionUtils obsolete. This commit therefore removes that
method as well.

Closes #3130
Closes #3131
---
 .../provider/MethodArgumentsProvider.java     |  88 +++----
 .../MethodArgumentsProviderTests.java         | 239 ++++++++++++++----
 .../commons/util/ReflectionUtils.java         |  43 +---
 .../commons/util/ReflectionUtilsTests.java    |  21 --
 4 files changed, 242 insertions(+), 149 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index ac47b462fc59..9c1b88cd1d93 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -12,7 +12,6 @@
 
 import static java.lang.String.format;
 import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
@@ -48,25 +47,33 @@ public void accept(MethodSource annotation) {
 
 	@Override
 	public Stream<Arguments> provideArguments(ExtensionContext context) {
+		Class<?> testClass = context.getRequiredTestClass();
+		Method testMethod = context.getRequiredTestMethod();
 		Object testInstance = context.getTestInstance().orElse(null);
 		// @formatter:off
 		return stream(this.methodNames)
-				.map(factoryMethodName -> getFactoryMethod(context, factoryMethodName))
+				.map(factoryMethodName -> getFactoryMethod(testClass, testMethod, factoryMethodName))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
 				.map(MethodArgumentsProvider::toArguments);
 		// @formatter:on
 	}
 
-	private Method getFactoryMethod(ExtensionContext context, String factoryMethodName) {
-		Method testMethod = context.getRequiredTestMethod();
-		if (StringUtils.isBlank(factoryMethodName)) {
-			factoryMethodName = testMethod.getName();
+	private Method getFactoryMethod(Class<?> testClass, Method testMethod, String factoryMethodName) {
+		if (!StringUtils.isBlank(factoryMethodName)) {
+			if (looksLikeAFullyQualifiedMethodName(factoryMethodName)) {
+				return getFactoryMethodByFullyQualifiedName(factoryMethodName);
+			}
+			else if (looksLikeALocalQualifiedMethodName(factoryMethodName)) {
+				return getFactoryMethodByFullyQualifiedName(testClass.getName() + "#" + factoryMethodName);
+			}
 		}
-		if (looksLikeAFullyQualifiedMethodName(factoryMethodName)) {
-			return getFactoryMethodByFullyQualifiedName(factoryMethodName);
+		else {
+			// User did not provide a factory method name, so we search for a
+			// factory method with the same name as the parameterized test method.
+			factoryMethodName = testMethod.getName();
 		}
-		return getFactoryMethodBySimpleOrQualifiedName(context.getRequiredTestClass(), testMethod, factoryMethodName);
+		return findFactoryMethodBySimpleName(testClass, testMethod, factoryMethodName);
 	}
 
 	private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodName) {
@@ -89,6 +96,18 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa
 		return true;
 	}
 
+	private static boolean looksLikeALocalQualifiedMethodName(String factoryMethodName) {
+		// This method is intended to be called after looksLikeAFullyQualifiedMethodName()
+		// and therefore does not check for the absence of '#' and does not reason about
+		// the presence or absence of a fully qualified class name.
+		if (factoryMethodName.endsWith("()")) {
+			return true;
+		}
+		int indexOfLastOpeningParenthesis = factoryMethodName.lastIndexOf('(');
+		return (indexOfLastOpeningParenthesis > 0)
+				&& (indexOfLastOpeningParenthesis < factoryMethodName.lastIndexOf(')'));
+	}
+
 	private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
@@ -100,33 +119,17 @@ private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodN
 				methodParameters, className)));
 	}
 
-	private Method getFactoryMethodBySimpleOrQualifiedName(Class<?> testClass, Method testMethod,
-			String simpleOrQualifiedMethodName) {
-		String[] methodParts = ReflectionUtils.parseQualifiedMethodName(simpleOrQualifiedMethodName);
-		String methodSimpleName = methodParts[0];
-		String methodParameters = methodParts[1];
-
-		List<Method> factoryMethods = findFactoryMethodsBySimpleName(testClass, testMethod, methodSimpleName);
-		if (factoryMethods.size() == 1) {
-			return factoryMethods.get(0);
-		}
-
-		List<Method> exactMatches = filterFactoryMethodsWithMatchingParameters(factoryMethods,
-			simpleOrQualifiedMethodName, methodParameters);
-		Preconditions.condition(exactMatches.size() == 1,
-			() -> format("%d factory methods named [%s] were found in class [%s]: %s", factoryMethods.size(),
-				simpleOrQualifiedMethodName, testClass.getName(), factoryMethods));
-		return exactMatches.get(0);
-	}
-
 	/**
 	 * Find all methods in the given {@code testClass} with the desired {@code factoryMethodName}
 	 * which have return types that can be converted to a {@link Stream}, ignoring the
 	 * {@code testMethod} itself as well as any {@code @Test}, {@code @TestTemplate},
 	 * or {@code @TestFactory} methods with the same name.
+	 * @return the factory method, if found
+	 * @throws org.junit.platform.commons.PreconditionViolationException if the
+	 * factory method was not found or if multiple competing factory methods with
+	 * the same name were found
 	 */
-	private List<Method> findFactoryMethodsBySimpleName(Class<?> testClass, Method testMethod,
-			String factoryMethodName) {
+	private Method findFactoryMethodBySimpleName(Class<?> testClass, Method testMethod, String factoryMethodName) {
 		Predicate<Method> isCandidate = candidate -> factoryMethodName.equals(candidate.getName())
 				&& !testMethod.equals(candidate);
 		List<Method> candidates = ReflectionUtils.findMethods(testClass, isCandidate);
@@ -147,27 +150,10 @@ private List<Method> findFactoryMethodsBySimpleName(Class<?> testClass, Method t
 			// Otherwise, report that we didn't find anything.
 			return format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName());
 		});
-		return factoryMethods;
-	}
-
-	private static List<Method> filterFactoryMethodsWithMatchingParameters(List<Method> factoryMethods,
-			String factoryMethodName, String factoryMethodParameters) {
-
-		if (!factoryMethodName.endsWith(")")) {
-			// If parameters are not specified, nothing is filtered.
-			return factoryMethods;
-		}
-
-		// Compare against canonical parameter list, ignoring whitespace.
-		String parameterList = factoryMethodParameters.replaceAll("\\s+", "");
-		Predicate<Method> hasRequiredParameters = method -> {
-			if (parameterList.isEmpty()) {
-				return method.getParameterCount() == 0;
-			}
-			return parameterList.equals(stream(method.getParameterTypes()).map(Class::getName).collect(joining(",")));
-		};
-
-		return factoryMethods.stream().filter(hasRequiredParameters).collect(toList());
+		Preconditions.condition(factoryMethods.size() == 1,
+			() -> format("%d factory methods named [%s] were found in class [%s]: %s", factoryMethods.size(),
+				factoryMethodName, testClass.getName(), factoryMethods));
+		return factoryMethods.get(0);
 	}
 
 	private boolean isTestMethod(Method candidate) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 9d05eb9ac07d..281670a4435f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.engine.extension.MutableExtensionRegistry.createRegistryWithDefaultExtensions;
 import static org.junit.jupiter.params.provider.MethodArgumentsProviderTests.DefaultFactoryMethodNameTestCase.TEST_METHOD;
+import static org.junit.platform.commons.util.ReflectionUtils.findMethod;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -23,6 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
@@ -34,7 +36,6 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
-import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -208,9 +209,9 @@ void providesArgumentsFromNonStaticFactoryMethodWhenStaticIsNotRequired() {
 	}
 
 	@Test
-	void providesArgumentsUsingDefaultFactoryMethodName() throws Exception {
+	void providesArgumentsUsingDefaultFactoryMethodName() {
 		Class<?> testClass = DefaultFactoryMethodNameTestCase.class;
-		var testMethod = testClass.getDeclaredMethod(TEST_METHOD, String.class);
+		var testMethod = findMethod(testClass, TEST_METHOD, String.class).get();
 		var arguments = provideArguments(testClass, testMethod, false, "");
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"));
@@ -364,31 +365,34 @@ void providesArgumentsUsing2dObjectArray() {
 	@Nested
 	class ParameterResolution {
 
+		private final Method testMethod = findMethod(TestCase.class, "test").get();
+
 		@BeforeEach
 		void registerParameterResolver() {
-			JupiterConfiguration configuration = mock();
-			extensionRegistry = createRegistryWithDefaultExtensions(configuration);
+			extensionRegistry = createRegistryWithDefaultExtensions(mock());
 			extensionRegistry.registerExtension(StringResolver.class);
+			extensionRegistry.registerExtension(StringArrayResolver.class);
+			extensionRegistry.registerExtension(IntArrayResolver.class);
 		}
 
 		@Test
-		void providesArgumentsUsingDefaultFactoryMethodWithParameter() throws Exception {
-			Class<?> testClass = TestCase.class;
-			var testMethod = testClass.getDeclaredMethod("overloadedStringStreamProvider", Object.class);
-			var arguments = provideArguments(testClass, testMethod, false, "");
+		void providesArgumentsInferringDefaultFactoryMethodThatAcceptsArgument() {
+			Method testMethod = findMethod(TestCase.class, "overloadedStringStreamProvider", Object.class).get();
+			String factoryMethodName = ""; // signals to use default
+			var arguments = provideArguments(testMethod, factoryMethodName);
 
 			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
 		}
 
 		@Test
-		void providesArgumentsUsingFactoryMethodWithParameter() {
+		void providesArgumentsUsingSimpleNameForFactoryMethodThatAcceptsArgumentWithoutSpecifyingParameterList() {
 			var arguments = provideArguments("stringStreamProviderWithParameter");
 
 			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
 		}
 
 		@Test
-		void providesArgumentsUsingFullyQualifiedNameWithParameter() {
+		void providesArgumentsUsingFullyQualifiedNameSpecifyingParameter() {
 			var arguments = provideArguments(
 				TestCase.class.getName() + "#stringStreamProviderWithParameter(java.lang.String)");
 
@@ -396,66 +400,170 @@ void providesArgumentsUsingFullyQualifiedNameWithParameter() {
 		}
 
 		@Test
-		void providesArgumentsUsingSimpleNameWithoutParameter() {
-			var arguments = provideArguments("stringStreamProviderWithOrWithoutParameter()");
+		void providesArgumentsUsingLocalQualifiedNameSpecifyingParameter() {
+			var arguments = provideArguments(testMethod, "stringStreamProviderWithParameter(java.lang.String)");
+
+			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
+		}
+
+		@Test
+		void providesArgumentsUsingFullyQualifiedNameForOverloadedFactoryMethodSpecifyingEmptyParameterList() {
+			var arguments = provideArguments(
+				TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter()");
 
 			assertThat(arguments).containsExactly(array("foo"), array("bar"));
 		}
 
 		@Test
-		void providesArgumentsUsingSimpleNameWithParameter() {
-			var arguments = provideArguments("stringStreamProviderWithOrWithoutParameter(java.lang.String)");
+		void providesArgumentsUsingLocalQualifiedNameForOverloadedFactoryMethodSpecifyingEmptyParameterList() {
+			var arguments = provideArguments(this.testMethod, "stringStreamProviderWithOrWithoutParameter()");
+
+			assertThat(arguments).containsExactly(array("foo"), array("bar"));
+		}
+
+		@Test
+		void providesArgumentsUsingFullyQualifiedNameForOverloadedFactoryMethodSpecifyingParameter() {
+			var arguments = provideArguments(
+				TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter(java.lang.String)");
 
 			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
 		}
 
-		@ParameterizedTest
-		@ValueSource(strings = { "java.lang.String,java.lang.String", "java.lang.String, java.lang.String",
-				"java.lang.String,    java.lang.String" })
-		void providesArgumentsUsingSimpleNameWithMultipleParameters(String params) {
-			var arguments = provideArguments("stringStreamProviderWithOrWithoutParameter(" + params + ")");
-			assertThat(arguments).containsExactly(array("foo!!"), array("bar!!"));
+		@Test
+		void providesArgumentsUsingLocalQualifiedNameForOverloadedFactoryMethodSpecifyingParameter() {
+			var arguments = provideArguments(testMethod,
+				"stringStreamProviderWithOrWithoutParameter(java.lang.String)");
+
+			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
 		}
 
 		@Test
-		void throwsExceptionWhenSeveralFactoryMethodsWithSameNameAreAvailable() {
-			var exception = assertThrows(PreconditionViolationException.class,
-				() -> provideArguments("stringStreamProviderWithOrWithoutParameter").toArray());
+		void failsToProvideArgumentsUsingFullyQualifiedNameSpecifyingInvalidParameterType() {
+			String method = TestCase.class.getName() + "#stringStreamProviderWithParameter(example.FooBar)";
+			var exception = assertThrows(JUnitException.class, () -> provideArguments(method).toArray());
 
-			assertThat(exception.getMessage())//
-					.startsWith("3 factory methods named [stringStreamProviderWithOrWithoutParameter] were found in "
-							+ "class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]: ")//
-					.contains("stringStreamProviderWithOrWithoutParameter()",
-						"stringStreamProviderWithOrWithoutParameter(java.lang.String)",
-						"stringStreamProviderWithOrWithoutParameter(java.lang.String,java.lang.String)");
+			assertThat(exception).hasMessage("""
+					Failed to load parameter type [example.FooBar] for method [stringStreamProviderWithParameter] \
+					in class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase].""");
 		}
 
 		@Test
-		void providesArgumentsUsingFactoryMethodSelectedViaFullyQualifiedNameWithParameter() {
-			var arguments = provideArguments(
-				TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter(java.lang.String)");
+		void failsToProvideArgumentsUsingLocalQualifiedNameSpecifyingInvalidParameterType() {
+			var method = "stringStreamProviderWithParameter(example.FooBar)";
+			var exception = assertThrows(JUnitException.class,
+				() -> provideArguments(this.testMethod, method).toArray());
 
-			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
+			assertThat(exception).hasMessage("""
+					Failed to load parameter type [example.FooBar] for method [stringStreamProviderWithParameter] \
+					in class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase].""");
+		}
+
+		@Test
+		void failsToProvideArgumentsUsingFullyQualifiedNameSpecifyingIncorrectParameterType() {
+			String method = TestCase.class.getName() + "#stringStreamProviderWithParameter(java.lang.Integer)";
+			var exception = assertThrows(JUnitException.class, () -> provideArguments(method).toArray());
+
+			assertThat(exception).hasMessage("""
+					Could not find factory method [stringStreamProviderWithParameter(java.lang.Integer)] in \
+					class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]""");
+		}
+
+		@Test
+		void failsToProvideArgumentsUsingLocalQualifiedNameSpecifyingIncorrectParameterType() {
+			var method = "stringStreamProviderWithParameter(java.lang.Integer)";
+			var exception = assertThrows(JUnitException.class,
+				() -> provideArguments(this.testMethod, method).toArray());
+
+			assertThat(exception).hasMessage("""
+					Could not find factory method [stringStreamProviderWithParameter(java.lang.Integer)] in \
+					class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]""");
+		}
+
+		@ParameterizedTest
+		@ValueSource(strings = {
+				"org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase#stringStreamProviderWithArrayParameter(java.lang.String[])",
+				"org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase#stringStreamProviderWithArrayParameter([Ljava.lang.String;)", })
+		void providesArgumentsUsingFullyQualifiedNameSpecifyingObjectArrayParameter(String method) {
+			var arguments = provideArguments(method);
+
+			assertThat(arguments).containsExactly(array("foo :)"), array("bar :)"));
+		}
+
+		@ParameterizedTest
+		@ValueSource(strings = { //
+				"stringStreamProviderWithArrayParameter(java.lang.String[])",
+				"stringStreamProviderWithArrayParameter([Ljava.lang.String;)" })
+		void providesArgumentsUsingLocalQualifiedNameSpecifyingObjectArrayParameter(String method) {
+			var arguments = provideArguments(this.testMethod, method);
+
+			assertThat(arguments).containsExactly(array("foo :)"), array("bar :)"));
+		}
+
+		@ParameterizedTest
+		@ValueSource(strings = {
+				"org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase#stringStreamProviderWithArrayParameter(int[])",
+				"org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase#stringStreamProviderWithArrayParameter([I)", })
+		void providesArgumentsUsingFullyQualifiedNameSpecifyingPrimitiveArrayParameter(String method) {
+			var arguments = provideArguments(method);
+
+			assertThat(arguments).containsExactly(array("foo 42"), array("bar 42"));
+		}
+
+		@ParameterizedTest
+		@ValueSource(strings = { //
+				"stringStreamProviderWithArrayParameter(int[])", //
+				"stringStreamProviderWithArrayParameter([I)" })
+		void providesArgumentsUsingLocalQualifiedNameSpecifyingPrimitiveArrayParameter(String method) {
+			var arguments = provideArguments(this.testMethod, method);
+
+			assertThat(arguments).containsExactly(array("foo 42"), array("bar 42"));
 		}
 
 		@ParameterizedTest
 		@ValueSource(strings = { "java.lang.String,java.lang.String", "java.lang.String, java.lang.String",
 				"java.lang.String,    java.lang.String" })
-		void providesArgumentsUsingFactoryMethodSelectedViaFullyQualifiedNameWithMultipleParameters(String params) {
-			var arguments = provideArguments(
-				TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter(" + params + ")");
+		void providesArgumentsUsingFullyQualifiedNameSpecifyingMultipleParameters(String params) {
+			var method = TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter(" + params + ")";
+			var arguments = provideArguments(method);
 
 			assertThat(arguments).containsExactly(array("foo!!"), array("bar!!"));
 		}
 
+		@ParameterizedTest
+		@ValueSource(strings = { "java.lang.String,java.lang.String", "java.lang.String, java.lang.String",
+				"java.lang.String,    java.lang.String" })
+		void providesArgumentsUsingLocalQualifiedNameSpecifyingMultipleParameters(String params) {
+			var arguments = provideArguments(this.testMethod,
+				"stringStreamProviderWithOrWithoutParameter(" + params + ")");
+
+			assertThat(arguments).containsExactly(array("foo!!"), array("bar!!"));
+		}
+
+		/**
+		 * In contrast to {@link #failsToProvideArgumentsUsingLocalQualifiedNameForOverloadedFactoryMethodWhenParameterListIsNotSpecified()},
+		 * using the fully qualified method name without specifying the parameter list "selects"
+		 * the overloaded method that accepts zero arguments.
+		 */
 		@Test
-		void providesArgumentsUsingFactoryMethodSelectedViaFullyQualifiedNameWithoutParameter() {
-			var arguments = provideArguments(
-				TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter()");
+		void providesArgumentsUsingFullyQualifiedNameForOverloadedFactoryMethodWhenParameterListIsNotSpecified() {
+			var arguments = provideArguments(TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter");
 
 			assertThat(arguments).containsExactly(array("foo"), array("bar"));
 		}
 
+		@Test
+		void failsToProvideArgumentsUsingLocalQualifiedNameForOverloadedFactoryMethodWhenParameterListIsNotSpecified() {
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments("stringStreamProviderWithOrWithoutParameter").toArray());
+
+			assertThat(exception.getMessage())//
+					.startsWith("3 factory methods named [stringStreamProviderWithOrWithoutParameter] were found in "
+							+ "class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]: ")//
+					.contains("stringStreamProviderWithOrWithoutParameter()",
+						"stringStreamProviderWithOrWithoutParameter(java.lang.String)",
+						"stringStreamProviderWithOrWithoutParameter(java.lang.String,java.lang.String)");
+		}
+
 	}
 
 	// -------------------------------------------------------------------------
@@ -464,12 +572,16 @@ private static Object[] array(Object... objects) {
 		return objects;
 	}
 
-	private Stream<Object[]> provideArguments(String... methodNames) {
-		return provideArguments(TestCase.class, null, false, methodNames);
+	private Stream<Object[]> provideArguments(String... factoryMethodNames) {
+		return provideArguments(TestCase.class, null, false, factoryMethodNames);
+	}
+
+	private Stream<Object[]> provideArguments(Method testMethod, String factoryMethodName) {
+		return provideArguments(TestCase.class, testMethod, false, factoryMethodName);
 	}
 
 	private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod, boolean allowNonStaticMethod,
-			String... methodNames) {
+			String... factoryMethodNames) {
 
 		if (testMethod == null) {
 			try {
@@ -483,7 +595,7 @@ private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod,
 
 		var methodSource = mock(MethodSource.class);
 
-		when(methodSource.value()).thenReturn(methodNames);
+		when(methodSource.value()).thenReturn(factoryMethodNames);
 
 		var extensionContext = mock(ExtensionContext.class);
 		when(extensionContext.getTestClass()).thenReturn(Optional.of(testClass));
@@ -518,6 +630,9 @@ void testDefaultFactoryMethodName(String param) {
 
 	static class TestCase {
 
+		void test() {
+		}
+
 		// --- Invalid ---------------------------------------------------------
 
 		static Object providerWithIllegalReturnType() {
@@ -534,6 +649,16 @@ static Stream<String> stringStreamProviderWithParameter(String parameter) {
 			return Stream.of("foo" + parameter, "bar" + parameter);
 		}
 
+		static Stream<String> stringStreamProviderWithArrayParameter(String[] parameter) {
+			String suffix = Arrays.stream(parameter).collect(Collectors.joining());
+			return Stream.of("foo " + suffix, "bar " + suffix);
+		}
+
+		static Stream<String> stringStreamProviderWithArrayParameter(int[] parameter) {
+			return stringStreamProviderWithArrayParameter(
+				Arrays.stream(parameter).mapToObj(String::valueOf).toArray(String[]::new));
+		}
+
 		static Stream<String> stringStreamProviderWithOrWithoutParameter() {
 			return stringStreamProvider();
 		}
@@ -698,4 +823,30 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 		}
 	}
 
+	static class StringArrayResolver implements ParameterResolver {
+
+		@Override
+		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+			return parameterContext.getParameter().getType() == String[].class;
+		}
+
+		@Override
+		public String[] resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+			return new String[] { ":", ")" };
+		}
+	}
+
+	static class IntArrayResolver implements ParameterResolver {
+
+		@Override
+		public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+			return parameterContext.getParameter().getType() == int[].class;
+		}
+
+		@Override
+		public int[] resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+			return new int[] { 4, 2 };
+		}
+	}
+
 }
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 2ab8835cc278..71d51d53463f 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -910,44 +910,21 @@ public static String[] parseFullyQualifiedMethodName(String fullyQualifiedMethod
 					+ "and then the method name, optionally followed by a parameter list enclosed in parentheses.");
 
 		String className = fullyQualifiedMethodName.substring(0, indexOfFirstHashtag);
-		String qualifiedMethodName = fullyQualifiedMethodName.substring(indexOfFirstHashtag + 1);
-		String[] methodPart = parseQualifiedMethodName(qualifiedMethodName);
-
-		return new String[] { className, methodPart[0], methodPart[1] };
-	}
-
-	/**
-	 * Parse the supplied method name into a 2-element {@code String[]} with
-	 * the following content.
-	 *
-	 * <ul>
-	 *   <li>index {@code 0}: the name of the method</li>
-	 *   <li>index {@code 1}: a comma-separated list of parameter types, or a
-	 *       blank string if the method does not declare any formal parameters</li>
-	 * </ul>
-	 *
-	 * @param qualifiedMethodName a qualified method name, never {@code null} or blank
-	 * @return a 2-element array of strings containing the parsed values
-	 */
-	@API(status = INTERNAL, since = "1.9.2")
-	public static String[] parseQualifiedMethodName(String qualifiedMethodName) {
-		String methodName = qualifiedMethodName;
+		String methodPart = fullyQualifiedMethodName.substring(indexOfFirstHashtag + 1);
+		String methodName = methodPart;
 		String methodParameters = "";
 
-		if (qualifiedMethodName.endsWith("()")) {
-			methodName = qualifiedMethodName.substring(0, qualifiedMethodName.length() - 2);
+		if (methodPart.endsWith("()")) {
+			methodName = methodPart.substring(0, methodPart.length() - 2);
 		}
-		else if (qualifiedMethodName.endsWith(")")) {
-			int indexOfLastOpeningParenthesis = qualifiedMethodName.lastIndexOf('(');
-			if ((indexOfLastOpeningParenthesis > 0)
-					&& (indexOfLastOpeningParenthesis < qualifiedMethodName.length() - 1)) {
-				methodName = qualifiedMethodName.substring(0, indexOfLastOpeningParenthesis);
-				methodParameters = qualifiedMethodName.substring(indexOfLastOpeningParenthesis + 1,
-					qualifiedMethodName.length() - 1);
+		else if (methodPart.endsWith(")")) {
+			int indexOfLastOpeningParenthesis = methodPart.lastIndexOf('(');
+			if ((indexOfLastOpeningParenthesis > 0) && (indexOfLastOpeningParenthesis < methodPart.length() - 1)) {
+				methodName = methodPart.substring(0, indexOfLastOpeningParenthesis);
+				methodParameters = methodPart.substring(indexOfLastOpeningParenthesis + 1, methodPart.length() - 1);
 			}
 		}
-
-		return new String[] { methodName, methodParameters };
+		return new String[] { className, methodName, methodParameters };
 	}
 
 	/**
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index a9e3c4ece463..d667bce7767b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -55,8 +55,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.jupiter.api.io.TempDir;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.logging.LogRecordListener;
@@ -702,25 +700,6 @@ void parseFullyQualifiedMethodNameForMethodWithMultipleParameters() {
 				.containsExactly("com.example.Test", "method", "int, java.lang.Object");
 	}
 
-	@ParameterizedTest
-	@ValueSource(strings = { "method", "method()" })
-	void parseSimpleMethodNameForMethodWithoutParameters(String methodName) {
-		assertThat(ReflectionUtils.parseQualifiedMethodName(methodName))//
-				.containsExactly("method", "");
-	}
-
-	@Test
-	void parseSimpleMethodNameForMethodWithSingleParameter() {
-		assertThat(ReflectionUtils.parseQualifiedMethodName("method(java.lang.Object)"))//
-				.containsExactly("method", "java.lang.Object");
-	}
-
-	@Test
-	void parseSimpleMethodNameForMethodWithMultipleParameters() {
-		assertThat(ReflectionUtils.parseQualifiedMethodName("method(int, java.lang.Object)"))//
-				.containsExactly("method", "int, java.lang.Object");
-	}
-
 	@Test
 	@SuppressWarnings("deprecation")
 	void getOutermostInstancePreconditions() {

From ac31e9a7d58973db73496244dab4defe17ae563e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 23 Jan 2023 21:00:50 +0100
Subject: [PATCH 1050/1433] Document fixes for @MethodSource local factory
 method names in release notes

Closes #3130
Closes #3131
---
 .../release-notes/release-notes-5.10.0-M1.adoc         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 5036080544ab..daea2f4ed0f6 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -36,7 +36,15 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Parameter types for _local_ `@MethodSource` factory method names are now validated. For
+  example, `@MethodSource("myFactory(example.NonexistentType)")` will now result in an
+  exception stating that `example.NonexistentType` cannot be resolved to a valid type.
+* The syntax for parameter types in _local_ `@MethodSource` factory method names now
+  supports canonical array names -- for example, you may now specify `int[]` as in
+  `@MethodSource("myFactory(int[])"` instead of the _binary_ name `[I` as in
+  `@MethodSource("myFactory([I)"` (which was already supported) and
+  `@MethodSource("myFactory(java.lang.String[])` instead of
+  `@MethodSource("myFactory([Ljava.lang.String;)`.
 
 ==== Deprecations and Breaking Changes
 

From ec2efb95f3cf8fcc03d4ac556166d6cf1ae0bcb9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 11:56:46 +0100
Subject: [PATCH 1051/1433] Fix tests on latest JDK 21-ea

---
 .../platform/commons/support/ReflectionSupportTests.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index efa4e8105cfe..1e522ea2e4b8 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -48,7 +48,7 @@ class ReflectionSupportTests {
 	void loadClassDelegates() {
 		assertEquals(ReflectionUtils.loadClass("-"), ReflectionSupport.loadClass("-"));
 		assertEquals(ReflectionUtils.loadClass("A"), ReflectionSupport.loadClass("A"));
-		assertEquals(ReflectionUtils.loadClass("java.io.Bits"), ReflectionSupport.loadClass("java.io.Bits"));
+		assertEquals(ReflectionUtils.loadClass("java.nio.Bits"), ReflectionSupport.loadClass("java.nio.Bits"));
 	}
 
 	@Test
@@ -64,7 +64,7 @@ void tryToLoadClassDelegates() {
 			ReflectionSupport.tryToLoadClass("-").toOptional());
 		assertEquals(ReflectionUtils.tryToLoadClass("A").toOptional(),
 			ReflectionSupport.tryToLoadClass("A").toOptional());
-		assertEquals(ReflectionUtils.tryToLoadClass("java.io.Bits"), ReflectionSupport.tryToLoadClass("java.io.Bits"));
+		assertEquals(ReflectionUtils.tryToLoadClass("java.nio.Bits"), ReflectionSupport.tryToLoadClass("java.nio.Bits"));
 	}
 
 	@Test

From 8e734429192c11030c597258c33d9fb834f60af8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 11:58:28 +0100
Subject: [PATCH 1052/1433] Avoid aborting other jobs in the matrix on failure

---
 .github/workflows/cross-version.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index a752dcad2022..a6a6e0c3fde0 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -18,6 +18,7 @@ env:
 jobs:
   openjdk:
     strategy:
+      fail-fast: false
       matrix:
         jdk: [19, 20, 21]
     name: "OpenJDK ${{ matrix.jdk }}"

From 3c7612589c3ab198bfabf0f654092ae8b8086cac Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 12:02:40 +0100
Subject: [PATCH 1053/1433] Fix formatting

---
 .../junit/platform/commons/support/ReflectionSupportTests.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index 1e522ea2e4b8..f14ff26e1fc4 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -64,7 +64,8 @@ void tryToLoadClassDelegates() {
 			ReflectionSupport.tryToLoadClass("-").toOptional());
 		assertEquals(ReflectionUtils.tryToLoadClass("A").toOptional(),
 			ReflectionSupport.tryToLoadClass("A").toOptional());
-		assertEquals(ReflectionUtils.tryToLoadClass("java.nio.Bits"), ReflectionSupport.tryToLoadClass("java.nio.Bits"));
+		assertEquals(ReflectionUtils.tryToLoadClass("java.nio.Bits"),
+			ReflectionSupport.tryToLoadClass("java.nio.Bits"));
 	}
 
 	@Test

From 712e8c2a392cf996a0e525758ad20ec226fb78fb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 1 Jan 2023 17:38:36 +0100
Subject: [PATCH 1054/1433] Upgradle to 8.0-rc-1

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 61574 -> 61608 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
GIT binary patch
delta 5094
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

delta 5107
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
I6Xdi10eY*&F8}}l

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index adb6acbd81b8..15248c813cfc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=d5bb29e784426547e4f455fbc0e6512d7a6a67d7d890cf24d601309287128b79
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65c8..79a61d421cc4 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

From 7622fb5438b3c52d658fe151eb24059fa46b5381 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 1 Jan 2023 17:37:03 +0100
Subject: [PATCH 1055/1433] Replace usage of deprecated API

---
 buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts  | 2 +-
 buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts             | 2 +-
 .../projects/gradle-starter/build.gradle.kts                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts b/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
index 9b3155ab764c..fb71c3e95003 100644
--- a/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
@@ -27,7 +27,7 @@ listOf(9, 17).forEach { javaVersion ->
 			options.release.set(javaVersion)
 		}
 
-		named<Checkstyle>("checkstyle${sourceSet.name.capitalize()}").configure {
+		named<Checkstyle>("checkstyle${sourceSet.name.replaceFirstChar(Char::titlecase)}").configure {
 			configFile = rootProject.file("src/checkstyle/checkstyleMain.xml")
 		}
 
diff --git a/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts b/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
index d180a3a85628..4d81a8a986ce 100644
--- a/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
+++ b/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
@@ -22,7 +22,7 @@ subprojects {
 			}
 		}
 		tasks.withType<PublishToMavenRepository>().configureEach {
-			if (name.endsWith("To${tempRepoName.capitalize()}Repository")) {
+			if (name.endsWith("To${tempRepoName.replaceFirstChar(Char::titlecase)}Repository")) {
 				dependsOn(clearTempRepoDir)
 			}
 		}
diff --git a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
index dfc4a31ad87e..801d838b4f63 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
@@ -25,7 +25,7 @@ tasks.test {
 	}
 
 	reports {
-		html.isEnabled = true
+		html.required.set(true)
 	}
 
 	val outputDir = reports.junitXml.outputLocation

From f8bd59bff273ee3fc4bbb383155de45296e4e275 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 1 Jan 2023 17:42:04 +0100
Subject: [PATCH 1056/1433] Update Asciidoctor plugin

---
 documentation/documentation.gradle.kts | 15 +++++++++------
 settings.gradle.kts                    |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index bb832b1c668d..760c6c3d00d6 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -1,3 +1,4 @@
+import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
@@ -190,7 +191,8 @@ tasks {
 		// Temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
 		inputs.dir(sourceDir).withPropertyName("sourceDir").withPathSensitivity(RELATIVE)
 
-		attributes(mapOf(
+		attributeProviders += AsciidoctorAttributeProvider {
+			mapOf(
 				"jupiter-version" to version,
 				"platform-version" to project.property("platformVersion"),
 				"vintage-version" to project.property("vintageVersion"),
@@ -202,10 +204,10 @@ tasks {
 				"release-branch" to releaseBranch,
 				"docs-version" to docsVersion,
 				"revnumber" to version,
-				"consoleLauncherOptionsFile" to consoleLauncherOptionsFile,
-				"experimentalApisTableFile" to experimentalApisTableFile,
-				"deprecatedApisTableFile" to deprecatedApisTableFile,
-				"standaloneConsoleLauncherShadowedArtifactsFile" to standaloneConsoleLauncherShadowedArtifactsFile,
+				"consoleLauncherOptionsFile" to consoleLauncherOptionsFile.get(),
+				"experimentalApisTableFile" to experimentalApisTableFile.get(),
+				"deprecatedApisTableFile" to deprecatedApisTableFile.get(),
+				"standaloneConsoleLauncherShadowedArtifactsFile" to standaloneConsoleLauncherShadowedArtifactsFile.get(),
 				"outdir" to outputDir.absolutePath,
 				"source-highlighter" to "rouge",
 				"tabsize" to "4",
@@ -215,7 +217,8 @@ tasks {
 				"idprefix" to "",
 				"idseparator" to "-",
 				"jdk-javadoc-base-url" to jdkJavadocBaseUrl
-		))
+			)
+		}
 
 		sourceSets["test"].apply {
 			attributes(mapOf(
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5ecc1fc291a1..d249e493f2a4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,8 +11,8 @@ pluginManagement {
 		id("org.ajoberstar.git-publish") version "4.1.1"
 		kotlin("jvm") version "1.5.31"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
-		id("org.asciidoctor.jvm.convert") version "3.3.2"
-		id("org.asciidoctor.jvm.pdf") version "3.3.2"
+		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
+		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"
 		id("me.champeau.jmh") version "0.6.8"
 		id("io.spring.nohttp") version "0.0.10"
 		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"

From 49159f24b8cc8a1956e73d2d47979726690f93bd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 1 Jan 2023 18:11:32 +0100
Subject: [PATCH 1057/1433] Update CodeQL action

---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0bb949702e2d..ab55ec8760ee 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@v3
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
     - name: Build
@@ -35,4 +35,4 @@ jobs:
           -Dscan.tag.CodeQL
           allMainClasses
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

From 17785a6320fe8c2fc218506f6fd5c69e6834cd61 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 10 Jan 2023 15:22:50 +0100
Subject: [PATCH 1058/1433] Upgrade to v0.0.11 of the nohttp plugin

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index d249e493f2a4..67422dd27eaf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,7 +14,7 @@ pluginManagement {
 		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
 		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"
 		id("me.champeau.jmh") version "0.6.8"
-		id("io.spring.nohttp") version "0.0.10"
+		id("io.spring.nohttp") version "0.0.11"
 		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 	}
 }

From 353a7c7456293aa74a864edcfc986a6f279255bf Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 17 Jan 2023 17:01:57 +0100
Subject: [PATCH 1059/1433] Upgradle to 8.0-rc-2

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 15248c813cfc..7bcc7d13f585 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d5bb29e784426547e4f455fbc0e6512d7a6a67d7d890cf24d601309287128b79
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
+distributionSha256Sum=28ebe9afc20564bcdc39bfe36f6b60a373e40be2c3c307a0028b545b8ccf6ba0
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 895f433fe82a153e8082ee1a415601c2e14247e9 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 11:33:29 +0100
Subject: [PATCH 1060/1433] Adjust error message to changes in Gradle 8.0-rc-2

---
 .../platform/tooling/support/tests/GraalVmStarterTests.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
index 463dd0643b62..9ea078c54ea9 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
@@ -46,7 +46,7 @@ void runsTestsInNativeImage() {
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assumeFalse(
-			result.getOutputLines("err").stream().anyMatch(line -> line.contains("No compatible toolchains found")),
+			result.getOutputLines("err").stream().anyMatch(line -> line.contains("No matching toolchains found")),
 			"Abort test if GraalVM is not installed");
 
 		assertEquals(0, result.getExitCode());

From 523cb348abf150fa7341a884d2d722031b98fff1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 11:44:29 +0100
Subject: [PATCH 1061/1433] Allow updating non-Gradle dependencies as well

---
 .github/dependabot.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 29a1155627e6..c5203a78301d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,8 +8,6 @@ registries:
 updates:
   - package-ecosystem: "gradle"
     directory: "/"
-    allow:
-      - dependency-name: "com.gradle*"
     registries:
       - gradle-plugin-portal
     schedule:

From 809780237f994f3a270a61635da06f86baafd9d4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 11:45:49 +0100
Subject: [PATCH 1062/1433] Simplify configuration to use defaults

---
 .github/dependabot.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c5203a78301d..a30db9d8d95f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,6 +10,3 @@ updates:
     directory: "/"
     registries:
       - gradle-plugin-portal
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 10

From 99b9128a94276eca7e91a6ef8b2ef6ddfeef2f96 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 11:46:32 +0100
Subject: [PATCH 1063/1433] Enable dependency updates for GitHub Actions

---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a30db9d8d95f..36bb88a65d26 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,3 +10,5 @@ updates:
     directory: "/"
     registries:
       - gradle-plugin-portal
+  - package-ecosystem: "github-actions"
+    directory: "/"

From 892e1eb201cf92cd387086c20d3a5910bf1dd16d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 12:56:05 +0100
Subject: [PATCH 1064/1433] Re-add mandatory schedule config

---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 36bb88a65d26..a6f0f7d26fdb 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,5 +10,9 @@ updates:
     directory: "/"
     registries:
       - gradle-plugin-portal
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
+    schedule:
+      interval: "weekly"

From 61a9a783cc9a4b91c20795bb84d734106d0faf1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Jan 2023 12:19:47 +0000
Subject: [PATCH 1065/1433] Bump com.github.ben-manes.versions from 0.42.0 to
 0.44.0 (#3138)

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index bb98afbee24f..64e5292c6cb3 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	`kotlin-dsl`
-	id("com.github.ben-manes.versions") version "0.42.0"
+	id("com.github.ben-manes.versions") version "0.44.0"
 }
 
 repositories {

From 77960fe3f0321c9cc68c29a3f8da622f2e40deb7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 13:28:57 +0100
Subject: [PATCH 1066/1433] Ignore pushes to dependabot branches as per
 official recommendation

---
 .github/workflows/codeql-analysis.yml           | 10 ++++++++--
 .github/workflows/cross-version.yml             |  4 +++-
 .github/workflows/gradle-wrapper-validation.yml | 12 +++++++++++-
 .github/workflows/main.yml                      |  4 +++-
 .github/workflows/reproducible-build.yml        |  8 +++++---
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ab55ec8760ee..25a776070ca5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,10 +2,16 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main, releases/**]
+    branches:
+      - main
+      - 'releases/**'
+    branches-ignore:
+      - dependabot/**
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main, releases/**]
+    branches:
+      - main
+      - 'releases/**'
   schedule:
     - cron: '0 19 * * 3'
 
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index a6a6e0c3fde0..06160035048b 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -4,7 +4,9 @@ on:
   push:
     branches:
       - main
-      - 'releases/*'
+      - 'releases/**'
+    branches-ignore:
+      - dependabot/**
   pull_request:
     branches:
       - '*'
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index b41829549ff3..faa1c8477977 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,5 +1,15 @@
 name: "Validate Gradle Wrapper"
-on: [push, pull_request]
+
+on:
+  push:
+    branches:
+      - main
+      - 'releases/**'
+    branches-ignore:
+      - dependabot/**
+  pull_request:
+    branches:
+      - '*'
 
 jobs:
   validation:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b1e40cf13fbe..641f44128a68 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,9 @@ on:
   push:
     branches:
       - main
-      - 'releases/*'
+      - 'releases/**'
+    branches-ignore:
+      - dependabot/**
   pull_request:
     branches:
       - '*'
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 3327cc7fb47b..26b093d9f1c6 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -3,11 +3,13 @@ name: Reproducible build
 on:
   push:
     branches:
-    - main
-    - 'releases/*'
+      - main
+      - 'releases/**'
+    branches-ignore:
+      - dependabot/**
   pull_request:
     branches:
-    - '*'
+      - '*'
 
 env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

From ee47106fbfdec6ad77610f81f48dbdb84a3f236a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 13:29:11 +0100
Subject: [PATCH 1067/1433] Configure IDEA commit message warnings

---
 .idea/vcs.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index fb8322da259f..178ac9238035 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="BodyLimit" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="SubjectBodySeparation" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
   <component name="GitSharedSettings">
     <option name="synchronizeBranchProtectionRules" value="false" />
   </component>

From f04ebbf3072c64202e26a95c8f7522e764adc6bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Jan 2023 12:30:03 +0000
Subject: [PATCH 1068/1433] Bump gradle-versions-plugin from 0.42.0 to 0.44.0
 (#3137)

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 64e5292c6cb3..d20b4e5b9b2c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.11.0")
-	implementation("com.github.ben-manes:gradle-versions-plugin:0.42.0")
+	implementation("com.github.ben-manes:gradle-versions-plugin:0.44.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.2") // keep in sync with root settings.gradle.kts
 }

From 8c823e637e9c554256f125fd1b57ebd80da3ded6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Jan 2023 12:30:16 +0000
Subject: [PATCH 1069/1433] Bump jvm from 1.5.31 to 1.8.0 (#3136)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 67422dd27eaf..0f6ac2c4f56c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"
-		kotlin("jvm") version "1.5.31"
+		kotlin("jvm") version "1.8.0"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
 		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"

From c0ee4f8dfaf5148ac9fce427e8aa9532fee191fd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 14:01:17 +0100
Subject: [PATCH 1070/1433] Remove invalid config

---
 .github/workflows/codeql-analysis.yml           | 2 --
 .github/workflows/cross-version.yml             | 2 --
 .github/workflows/gradle-wrapper-validation.yml | 2 --
 .github/workflows/main.yml                      | 2 --
 .github/workflows/reproducible-build.yml        | 2 --
 5 files changed, 10 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 25a776070ca5..cddd98a1e054 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - 'releases/**'
-    branches-ignore:
-      - dependabot/**
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 06160035048b..4786e5b3c07f 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - 'releases/**'
-    branches-ignore:
-      - dependabot/**
   pull_request:
     branches:
       - '*'
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index faa1c8477977..de5d0346a9f6 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - 'releases/**'
-    branches-ignore:
-      - dependabot/**
   pull_request:
     branches:
       - '*'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 641f44128a68..f66220f261d1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - 'releases/**'
-    branches-ignore:
-      - dependabot/**
   pull_request:
     branches:
       - '*'
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index 26b093d9f1c6..f7e365c436ce 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - 'releases/**'
-    branches-ignore:
-      - dependabot/**
   pull_request:
     branches:
       - '*'

From 4c6f81592abe66917260965219ff68f8f2c8b317 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Jan 2023 11:56:31 +0000
Subject: [PATCH 1071/1433] Bump spotless-plugin-gradle from 6.11.0 to 6.14.0

Bumps [spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.11.0 to 6.14.0.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/gradle/6.11.0...gradle/6.14.0)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-plugin-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index d20b4e5b9b2c..b3fa9bb68f0f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
-	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.11.0")
+	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.14.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.44.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.2") // keep in sync with root settings.gradle.kts

From 4fbd3157bd844378de2c42aaacea927e5a144c2c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 13:08:04 +0100
Subject: [PATCH 1072/1433] Update ktlint

---
 .editorconfig                                                  | 3 +++
 gradle/libs.versions.toml                                      | 2 +-
 .../test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..063e4a874109
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3c1dc9dfe837..9628dd4e764f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ jmh = "1.36"
 junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
-ktlint = "0.43.0"
+ktlint = "0.48.2"
 log4j = "2.19.0"
 opentest4j = "1.2.0"
 openTestReporting = "0.1.0-M1"
diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
index d283aad8eeaf..3386acf06b5d 100644
--- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
+++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt
@@ -217,7 +217,8 @@ class KotlinAssertionsTests {
             vararg exceptionTypes: KClass<out Throwable>
         ) =
             AssertAllAssertionsTests.assertExpectedExceptionTypes(
-                multipleFailuresError, *exceptionTypes.map { it.java }.toTypedArray()
+                multipleFailuresError,
+                *exceptionTypes.map { it.java }.toTypedArray()
             )
     }
 }

From 4288cf1233b4af6002e922cb9ddd1b159fe2c9b3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 28 Jan 2023 13:56:34 +0100
Subject: [PATCH 1073/1433] Restore current import order

---
 .../platform/console/options/SelectorConverter.java   |  1 +
 .../tooling/support/tests/AntStarterTests.java        |  1 +
 .../tooling/support/tests/GradleModuleFileTests.java  |  1 +
 .../support/tests/JarContainsManifestFirstTests.java  |  1 +
 .../tooling/support/tests/MavenPomFileTests.java      |  1 +
 .../support/tests/PackageCyclesDetectionTests.java    |  1 +
 src/eclipse/junit-eclipse.importorder                 | 11 ++++++++---
 7 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
index 65f338daa2eb..72ea077e67bd 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java
@@ -36,6 +36,7 @@
 import org.junit.platform.engine.discovery.ModuleSelector;
 import org.junit.platform.engine.discovery.PackageSelector;
 import org.junit.platform.engine.discovery.UriSelector;
+
 import picocli.CommandLine.ITypeConverter;
 
 class SelectorConverter {
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
index 4125ae2c00dc..d891716c51d3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java
@@ -21,6 +21,7 @@
 
 import org.apache.tools.ant.Main;
 import org.junit.jupiter.api.Test;
+
 import platform.tooling.support.Request;
 
 /**
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
index 008e4bfba5bc..8c72f4ee63e3 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java
@@ -16,6 +16,7 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+
 import platform.tooling.support.MavenRepo;
 
 /**
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
index ee2d7fae37d3..05c824ced1e6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java
@@ -19,6 +19,7 @@
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+
 import platform.tooling.support.MavenRepo;
 
 /**
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
index 5b5b6f428b94..db91462c78f7 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java
@@ -16,6 +16,7 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+
 import platform.tooling.support.MavenRepo;
 
 /**
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
index 1162db674359..78f35146f372 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java
@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+
 import platform.tooling.support.MavenRepo;
 
 /**
diff --git a/src/eclipse/junit-eclipse.importorder b/src/eclipse/junit-eclipse.importorder
index daded8e1f6af..56cb0619d774 100644
--- a/src/eclipse/junit-eclipse.importorder
+++ b/src/eclipse/junit-eclipse.importorder
@@ -2,6 +2,11 @@
 0=java
 1=javax
 2=jdk
-3=com
-4=io
-5=org
+3=aQute
+4=junit
+5=de
+6=com
+7=example
+8=extensions
+9=io
+10=org

From 3c262cc4fbd739eada198db79bce87a7cb8609c7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 14 Nov 2022 08:16:12 +0100
Subject: [PATCH 1074/1433] Remove duplication

---
 .../launcher/core/LauncherFactoryTests.java   | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index d33d88956201..5b6368f79eaf 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -124,12 +124,7 @@ void createWithPostDiscoveryFilters() {
 
 	@Test
 	void applyPostDiscoveryFiltersViaServiceApi() {
-		final var current = Thread.currentThread().getContextClassLoader();
-		try {
-			var url = getClass().getClassLoader().getResource("testservices/");
-			var classLoader = new URLClassLoader(new URL[] { url }, current);
-			Thread.currentThread().setContextClassLoader(classLoader);
-
+		withTestServices(() -> {
 			var discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
 
 			var config = LauncherConfig.builder()//
@@ -141,20 +136,12 @@ void applyPostDiscoveryFiltersViaServiceApi() {
 
 			final var jupiter = testPlan.getChildren(UniqueId.parse("[engine:junit-jupiter]"));
 			assertThat(jupiter).hasSize(1);
-		}
-		finally {
-			Thread.currentThread().setContextClassLoader(current);
-		}
+		});
 	}
 
 	@Test
 	void notApplyIfDisabledPostDiscoveryFiltersViaServiceApi() {
-		final var current = Thread.currentThread().getContextClassLoader();
-		try {
-			var url = getClass().getClassLoader().getResource("testservices/");
-			var classLoader = new URLClassLoader(new URL[] { url }, current);
-			Thread.currentThread().setContextClassLoader(classLoader);
-
+		withTestServices(() -> {
 			var discoveryRequest = createLauncherDiscoveryRequestForBothStandardEngineExampleClasses();
 
 			var config = LauncherConfig.builder()//
@@ -166,10 +153,7 @@ void notApplyIfDisabledPostDiscoveryFiltersViaServiceApi() {
 
 			final var jupiter = testPlan.getChildren(UniqueId.parse("[engine:junit-jupiter]"));
 			assertThat(jupiter).hasSize(1);
-		}
-		finally {
-			Thread.currentThread().setContextClassLoader(current);
-		}
+		});
 	}
 
 	@Test

From fa4760231c517218268147fa349c82743c1f8f91 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 11 Nov 2022 16:29:56 +0100
Subject: [PATCH 1075/1433] Introduce LauncherInterceptor

---
 .../platform/launcher/LauncherConstants.java  |  2 +
 .../launcher/LauncherInterceptor.java         | 57 ++++++++++++
 .../core/CloseableInternalLauncher.java       | 19 ++++
 .../launcher/core/DefaultLauncherSession.java | 71 +++++++--------
 .../DelegatingCloseableInternalLauncher.java  | 30 +++++++
 .../core/DelegatingInternalLauncher.java      | 63 ++++++++++++++
 .../core/InterceptingInternalLauncher.java    | 86 +++++++++++++++++++
 .../launcher/core/LauncherFactory.java        | 36 ++++++--
 .../core/SessionPerRequestLauncher.java       | 37 +++-----
 .../launcher/TestLauncherInterceptor1.java    | 23 +++++
 .../launcher/TestLauncherInterceptor2.java    | 23 +++++
 .../launcher/core/LauncherFactoryTests.java   | 84 ++++++++++++++++++
 ...unit.platform.launcher.LauncherInterceptor |  2 +
 13 files changed, 461 insertions(+), 72 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableInternalLauncher.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableInternalLauncher.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingInternalLauncher.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingInternalLauncher.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor2.java
 create mode 100644 platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherInterceptor

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index b4f5916f00c1..218bf3a077ed 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -135,6 +135,8 @@ public class LauncherConstants {
 	 */
 	public static final String DEACTIVATE_ALL_LISTENERS_PATTERN = ClassNamePatternFilterUtils.DEACTIVATE_ALL_PATTERN;
 
+	public static final String ENABLE_LAUNCHER_INTERCEPTORS = "junit.platform.launcher.interceptors.enabled";
+
 	private LauncherConstants() {
 		/* no-op */
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
new file mode 100644
index 000000000000..cf91b3d67d10
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+
+/**
+ * Interceptor for test discovery and execution by a {@link Launcher}.
+ *
+ * <p>Interceptors are instantiated once per {@link LauncherSession} and closed
+ * when the session is about to be closed.
+ *
+ * @since 1.10
+ * @see Launcher
+ * @see LauncherSession
+ * @see LauncherConstants#ENABLE_LAUNCHER_INTERCEPTORS
+ */
+@API(status = EXPERIMENTAL, since = "1.10")
+public interface LauncherInterceptor {
+
+	/**
+	 * Intercept the supplied invocation.
+	 *
+	 * <p>Implementations must call {@link Invocation#proceed()} exactly once.
+	 *
+	 * @param invocation the intercepted invocation; never {@code null}
+	 * @return the result of the invocation
+	 */
+	<T> T intercept(Invocation<T> invocation);
+
+	/**
+	 * Closes this interceptor.
+	 *
+	 * <p>Any resources held by this interceptor should be released by this
+	 * method.
+	 */
+	void close();
+
+	/**
+	 * An invocation that can be intercepted.
+	 *
+	 * <p>This interface is not intended to be implemented by clients.
+	 */
+	interface Invocation<T> {
+		T proceed();
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableInternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableInternalLauncher.java
new file mode 100644
index 000000000000..110057708947
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableInternalLauncher.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+/**
+ * @since 1.10
+ */
+interface CloseableInternalLauncher extends InternalLauncher, AutoCloseable {
+	@Override
+	void close();
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
index 79f6d815fc76..a8fa1150fa5f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
@@ -10,10 +10,13 @@
 
 package org.junit.platform.launcher.core;
 
+import java.util.List;
+
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherInterceptor;
 import org.junit.platform.launcher.LauncherSession;
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -27,8 +30,9 @@ class DefaultLauncherSession implements LauncherSession {
 	private final DelegatingLauncher launcher;
 	private final LauncherSessionListener listener;
 
-	DefaultLauncherSession(Launcher launcher, LauncherSessionListener listener) {
-		this.launcher = new DelegatingLauncher(launcher);
+	DefaultLauncherSession(InternalLauncher launcher, LauncherSessionListener listener,
+			List<LauncherInterceptor> interceptors) {
+		this.launcher = new DelegatingLauncher(InterceptingInternalLauncher.decorate(launcher, interceptors));
 		this.listener = listener;
 		listener.launcherSessionOpened(this);
 	}
@@ -44,55 +48,31 @@ LauncherSessionListener getListener() {
 
 	@Override
 	public void close() {
-		if (launcher.getDelegate() != ClosedLauncher.INSTANCE) {
-			launcher.setDelegate(ClosedLauncher.INSTANCE);
+		if (launcher.isClosed()) {
+			launcher.close();
 			listener.launcherSessionClosed(this);
 		}
 	}
 
-	private static class DelegatingLauncher implements Launcher {
-
-		private Launcher delegate;
-
-		DelegatingLauncher(Launcher delegate) {
-			this.delegate = delegate;
-		}
-
-		public Launcher getDelegate() {
-			return delegate;
-		}
-
-		public void setDelegate(Launcher delegate) {
-			this.delegate = delegate;
-		}
-
-		@Override
-		public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
-			delegate.registerLauncherDiscoveryListeners(listeners);
-		}
-
-		@Override
-		public void registerTestExecutionListeners(TestExecutionListener... listeners) {
-			delegate.registerTestExecutionListeners(listeners);
-		}
+	private static class DelegatingLauncher extends DelegatingInternalLauncher<CloseableInternalLauncher>
+			implements CloseableInternalLauncher {
 
-		@Override
-		public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
-			return delegate.discover(launcherDiscoveryRequest);
+		DelegatingLauncher(CloseableInternalLauncher delegate) {
+			super(delegate);
 		}
 
-		@Override
-		public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecutionListener... listeners) {
-			delegate.execute(launcherDiscoveryRequest, listeners);
+		boolean isClosed() {
+			return delegate != ClosedLauncher.INSTANCE;
 		}
 
 		@Override
-		public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
-			delegate.execute(testPlan, listeners);
+		public void close() {
+			delegate.close();
+			delegate = ClosedLauncher.INSTANCE;
 		}
 	}
 
-	private static class ClosedLauncher implements Launcher {
+	private static class ClosedLauncher implements CloseableInternalLauncher {
 
 		static final ClosedLauncher INSTANCE = new ClosedLauncher();
 
@@ -123,5 +103,20 @@ public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecu
 		public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 			throw new PreconditionViolationException("Launcher session has already been closed");
 		}
+
+		@Override
+		public ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
+			throw new PreconditionViolationException("Launcher session has already been closed");
+		}
+
+		@Override
+		public ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
+			throw new PreconditionViolationException("Launcher session has already been closed");
+		}
+
+		@Override
+		public void close() {
+			// do nothing
+		}
 	}
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableInternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableInternalLauncher.java
new file mode 100644
index 000000000000..1282cf7ac7d9
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableInternalLauncher.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+/**
+ * @since 1.10
+ */
+class DelegatingCloseableInternalLauncher<T extends InternalLauncher> extends DelegatingInternalLauncher<T>
+		implements CloseableInternalLauncher {
+
+	private final Runnable onClose;
+
+	public DelegatingCloseableInternalLauncher(T delegate, Runnable onClose) {
+		super(delegate);
+		this.onClose = onClose;
+	}
+
+	@Override
+	public final void close() {
+		onClose.run();
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingInternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingInternalLauncher.java
new file mode 100644
index 000000000000..c4078ff94ae8
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingInternalLauncher.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
+
+/**
+ * @since 1.10
+ */
+class DelegatingInternalLauncher<T extends InternalLauncher> implements InternalLauncher {
+
+	protected T delegate;
+
+	DelegatingInternalLauncher(T delegate) {
+		this.delegate = delegate;
+	}
+
+	@Override
+	public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
+		delegate.registerLauncherDiscoveryListeners(listeners);
+	}
+
+	@Override
+	public void registerTestExecutionListeners(TestExecutionListener... listeners) {
+		delegate.registerTestExecutionListeners(listeners);
+	}
+
+	@Override
+	public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
+		return delegate.discover(launcherDiscoveryRequest);
+	}
+
+	@Override
+	public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecutionListener... listeners) {
+		delegate.execute(launcherDiscoveryRequest, listeners);
+	}
+
+	@Override
+	public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
+		delegate.execute(testPlan, listeners);
+	}
+
+	@Override
+	public ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
+		return delegate.getTestExecutionListenerRegistry();
+	}
+
+	@Override
+	public ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
+		return delegate.getLauncherDiscoveryListenerRegistry();
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingInternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingInternalLauncher.java
new file mode 100644
index 000000000000..4524a88fb5de
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingInternalLauncher.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherInterceptor;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
+
+/**
+ * @since 1.10
+ */
+class InterceptingInternalLauncher extends DelegatingCloseableInternalLauncher<InternalLauncher> {
+
+	static CloseableInternalLauncher decorate(InternalLauncher launcher, List<LauncherInterceptor> interceptors) {
+		return composite(interceptors) //
+				.map(combinedInterceptor -> (CloseableInternalLauncher) new InterceptingInternalLauncher(launcher,
+					combinedInterceptor)) //
+				.orElse(new DelegatingCloseableInternalLauncher<>(launcher, () -> {
+					// do nothing
+				}));
+	}
+
+	private static Optional<LauncherInterceptor> composite(List<LauncherInterceptor> interceptors) {
+		if (interceptors.isEmpty()) {
+			return Optional.empty();
+		}
+		return Optional.of(interceptors.stream() //
+				.skip(1) //
+				.reduce(interceptors.get(0), (a, b) -> new LauncherInterceptor() {
+					@Override
+					public void close() {
+						try {
+							a.close();
+						}
+						finally {
+							b.close();
+						}
+					}
+
+					@Override
+					public <T> T intercept(Invocation<T> invocation) {
+						return a.intercept(() -> b.intercept(invocation));
+					}
+				}));
+	}
+
+	private final LauncherInterceptor interceptor;
+
+	private InterceptingInternalLauncher(InternalLauncher delegate, LauncherInterceptor interceptor) {
+		super(delegate, interceptor::close);
+		this.interceptor = interceptor;
+	}
+
+	@Override
+	public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
+		return interceptor.intercept(() -> super.discover(launcherDiscoveryRequest));
+	}
+
+	@Override
+	public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecutionListener... listeners) {
+		interceptor.intercept(() -> {
+			super.execute(launcherDiscoveryRequest, listeners);
+			return null;
+		});
+	}
+
+	@Override
+	public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
+		interceptor.intercept(() -> {
+			super.execute(testPlan, listeners);
+			return null;
+		});
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 3ac0b4c8330d..140cb4c58632 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -10,9 +10,11 @@
 
 package org.junit.platform.launcher.core;
 
+import static java.util.Collections.emptyList;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.launcher.LauncherConstants.DEACTIVATE_LISTENERS_PATTERN_PROPERTY_NAME;
+import static org.junit.platform.launcher.LauncherConstants.ENABLE_LAUNCHER_INTERCEPTORS;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -29,6 +31,7 @@
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.LauncherInterceptor;
 import org.junit.platform.launcher.LauncherSession;
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.PostDiscoveryFilter;
@@ -95,7 +98,9 @@ public static LauncherSession openSession() throws PreconditionViolationExceptio
 	 */
 	@API(status = EXPERIMENTAL, since = "1.8")
 	public static LauncherSession openSession(LauncherConfig config) throws PreconditionViolationException {
-		return new DefaultLauncherSession(createDefaultLauncher(config), createLauncherSessionListener(config));
+		LauncherConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
+		return new DefaultLauncherSession(createDefaultLauncher(config, configurationParameters),
+			createLauncherSessionListener(config), collectLauncherInterceptors(configurationParameters));
 	}
 
 	/**
@@ -122,10 +127,13 @@ public static Launcher create() throws PreconditionViolationException {
 	 */
 	@API(status = EXPERIMENTAL, since = "1.3")
 	public static Launcher create(LauncherConfig config) throws PreconditionViolationException {
-		return new SessionPerRequestLauncher(createDefaultLauncher(config), createLauncherSessionListener(config));
+		LauncherConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
+		return new SessionPerRequestLauncher(createDefaultLauncher(config, configurationParameters),
+			createLauncherSessionListener(config), () -> collectLauncherInterceptors(configurationParameters));
 	}
 
-	private static DefaultLauncher createDefaultLauncher(LauncherConfig config) {
+	private static DefaultLauncher createDefaultLauncher(LauncherConfig config,
+			LauncherConfigurationParameters configurationParameters) {
 		Preconditions.notNull(config, "LauncherConfig must not be null");
 
 		Set<TestEngine> engines = collectTestEngines(config);
@@ -134,11 +142,21 @@ private static DefaultLauncher createDefaultLauncher(LauncherConfig config) {
 		DefaultLauncher launcher = new DefaultLauncher(engines, filters);
 
 		registerLauncherDiscoveryListeners(config, launcher);
-		registerTestExecutionListeners(config, launcher);
+		registerTestExecutionListeners(config, launcher, configurationParameters);
 
 		return launcher;
 	}
 
+	private static List<LauncherInterceptor> collectLauncherInterceptors(
+			LauncherConfigurationParameters configurationParameters) {
+		if (configurationParameters.getBoolean(ENABLE_LAUNCHER_INTERCEPTORS).orElse(false)) {
+			List<LauncherInterceptor> interceptors = new ArrayList<>();
+			SERVICE_LOADER_REGISTRY.load(LauncherInterceptor.class).forEach(interceptors::add);
+			return interceptors;
+		}
+		return emptyList();
+	}
+
 	private static Set<TestEngine> collectTestEngines(LauncherConfig config) {
 		Set<TestEngine> engines = new LinkedHashSet<>();
 		if (config.isTestEngineAutoRegistrationEnabled()) {
@@ -174,16 +192,18 @@ private static void registerLauncherDiscoveryListeners(LauncherConfig config, La
 		config.getAdditionalLauncherDiscoveryListeners().forEach(launcher::registerLauncherDiscoveryListeners);
 	}
 
-	private static void registerTestExecutionListeners(LauncherConfig config, Launcher launcher) {
+	private static void registerTestExecutionListeners(LauncherConfig config, Launcher launcher,
+			LauncherConfigurationParameters configurationParameters) {
 		if (config.isTestExecutionListenerAutoRegistrationEnabled()) {
-			loadAndFilterTestExecutionListeners().forEach(launcher::registerTestExecutionListeners);
+			loadAndFilterTestExecutionListeners(configurationParameters).forEach(
+				launcher::registerTestExecutionListeners);
 		}
 		config.getAdditionalTestExecutionListeners().forEach(launcher::registerTestExecutionListeners);
 	}
 
-	private static Stream<TestExecutionListener> loadAndFilterTestExecutionListeners() {
+	private static Stream<TestExecutionListener> loadAndFilterTestExecutionListeners(
+			ConfigurationParameters configurationParameters) {
 		Iterable<TestExecutionListener> listeners = SERVICE_LOADER_REGISTRY.load(TestExecutionListener.class);
-		ConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
 		String deactivatedListenersPattern = configurationParameters.get(
 			DEACTIVATE_LISTENERS_PATTERN_PROPERTY_NAME).orElse(null);
 		// @formatter:off
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
index 9c0b7dd47e60..7de4df66d5e7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
@@ -10,8 +10,11 @@
 
 package org.junit.platform.launcher.core;
 
-import org.junit.platform.launcher.LauncherDiscoveryListener;
+import java.util.List;
+import java.util.function.Supplier;
+
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherInterceptor;
 import org.junit.platform.launcher.LauncherSession;
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -20,24 +23,16 @@
 /**
  * @since 1.8
  */
-class SessionPerRequestLauncher implements InternalLauncher {
+class SessionPerRequestLauncher extends DelegatingInternalLauncher<InternalLauncher> {
 
-	private final InternalLauncher delegate;
 	private final LauncherSessionListener sessionListener;
+	private final Supplier<List<LauncherInterceptor>> interceptorFactory;
 
-	SessionPerRequestLauncher(InternalLauncher delegate, LauncherSessionListener sessionListener) {
-		this.delegate = delegate;
+	SessionPerRequestLauncher(InternalLauncher delegate, LauncherSessionListener sessionListener,
+			Supplier<List<LauncherInterceptor>> interceptorFactory) {
+		super(delegate);
 		this.sessionListener = sessionListener;
-	}
-
-	@Override
-	public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
-		delegate.registerLauncherDiscoveryListeners(listeners);
-	}
-
-	@Override
-	public void registerTestExecutionListeners(TestExecutionListener... listeners) {
-		delegate.registerTestExecutionListeners(listeners);
+		this.interceptorFactory = interceptorFactory;
 	}
 
 	@Override
@@ -61,17 +56,7 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 		}
 	}
 
-	@Override
-	public ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
-		return delegate.getTestExecutionListenerRegistry();
-	}
-
-	@Override
-	public ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
-		return delegate.getLauncherDiscoveryListenerRegistry();
-	}
-
 	private LauncherSession createSession() {
-		return new DefaultLauncherSession(delegate, sessionListener);
+		return new DefaultLauncherSession(delegate, sessionListener, interceptorFactory.get());
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
new file mode 100644
index 000000000000..7bd8f95ff690
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+public class TestLauncherInterceptor1 implements LauncherInterceptor {
+
+	@Override
+	public <T> T intercept(Invocation<T> invocation) {
+		return invocation.proceed();
+	}
+
+	@Override
+	public void close() {
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor2.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor2.java
new file mode 100644
index 000000000000..bdc198e3ee06
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor2.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+public class TestLauncherInterceptor2 implements LauncherInterceptor {
+
+	@Override
+	public <T> T intercept(Invocation<T> invocation) {
+		return invocation.proceed();
+	}
+
+	@Override
+	public void close() {
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 5b6368f79eaf..36baca65a79d 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -14,22 +14,32 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.launcher.LauncherConstants.ENABLE_LAUNCHER_INTERCEPTORS;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.engine.EngineDiscoveryRequest;
+import org.junit.platform.engine.ExecutionRequest;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
+import org.junit.platform.fakes.TestEngineSpy;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TagFilter;
+import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestLauncherDiscoveryListener;
+import org.junit.platform.launcher.TestLauncherInterceptor1;
+import org.junit.platform.launcher.TestLauncherInterceptor2;
 import org.junit.platform.launcher.TestLauncherSessionListener;
 import org.junit.platform.launcher.listeners.AnotherUnusedTestExecutionListener;
 import org.junit.platform.launcher.listeners.NoopTestExecutionListener;
@@ -198,6 +208,80 @@ void discoversLauncherSessionListenerViaServiceApiByDefault() {
 		});
 	}
 
+	@Test
+	void appliesLauncherInterceptorsToTestDiscovery() {
+		withTestServices(() -> withSystemProperty(ENABLE_LAUNCHER_INTERCEPTORS, "true", () -> {
+			var engine = new TestEngineSpy() {
+				@Override
+				public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
+					throw new RuntimeException("from discovery");
+				}
+			};
+			var config = LauncherConfig.builder() //
+					.enableTestEngineAutoRegistration(false) //
+					.addTestEngines(engine) //
+					.build();
+			var launcher = LauncherFactory.create(config);
+			var request = request().build();
+
+			var exception = assertThrows(RuntimeException.class, () -> launcher.discover(request));
+
+			assertThat(exception) //
+					.hasRootCauseMessage("from discovery") //
+					.hasStackTraceContaining(TestLauncherInterceptor1.class.getName() + ".intercept(") //
+					.hasStackTraceContaining(TestLauncherInterceptor2.class.getName() + ".intercept(");
+		}));
+	}
+
+	@Test
+	void appliesLauncherInterceptorsToTestExecution() {
+		withTestServices(() -> withSystemProperty(ENABLE_LAUNCHER_INTERCEPTORS, "true", () -> {
+			var engine = new TestEngineSpy() {
+				@Override
+				public void execute(ExecutionRequest request) {
+					throw new RuntimeException("from execution");
+				}
+			};
+			var config = LauncherConfig.builder() //
+					.enableTestEngineAutoRegistration(false) //
+					.addTestEngines(engine) //
+					.build();
+			var launcher = LauncherFactory.create(config);
+			var request = request().build();
+
+			AtomicReference<TestExecutionResult> result = new AtomicReference<>();
+			launcher.execute(request, new TestExecutionListener() {
+				@Override
+				public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+					if (testIdentifier.getParentId().isEmpty()) {
+						result.set(testExecutionResult);
+					}
+				}
+			});
+
+			assertThat(result.get().getThrowable().orElseThrow()) //
+					.hasRootCauseMessage("from execution") //
+					.hasStackTraceContaining(TestLauncherInterceptor1.class.getName() + ".intercept(") //
+					.hasStackTraceContaining(TestLauncherInterceptor2.class.getName() + ".intercept(");
+		}));
+	}
+
+	private static void withSystemProperty(String key, String value, Runnable runnable) {
+		var oldValue = System.getProperty(key);
+		System.setProperty(key, value);
+		try {
+			runnable.run();
+		}
+		finally {
+			if (oldValue == null) {
+				System.clearProperty(key);
+			}
+			else {
+				System.setProperty(key, oldValue);
+			}
+		}
+	}
+
 	private static void withTestServices(Runnable runnable) {
 		var current = Thread.currentThread().getContextClassLoader();
 		try {
diff --git a/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherInterceptor b/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherInterceptor
new file mode 100644
index 000000000000..2aa385ca1c2f
--- /dev/null
+++ b/platform-tests/src/test/resources/testservices/META-INF/services/org.junit.platform.launcher.LauncherInterceptor
@@ -0,0 +1,2 @@
+org.junit.platform.launcher.TestLauncherInterceptor1
+org.junit.platform.launcher.TestLauncherInterceptor2

From a13b99a6484b909e1a91c1aed281f2399af2ca68 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 15 Nov 2022 21:14:23 +0100
Subject: [PATCH 1076/1433] Create interceptors before launcher

So they can influence the class loader used to load test engines etc.
---
 .../junit/platform/fakes/TestEngineSpy.java   |  16 ++-
 ...alLauncher.java => CloseableLauncher.java} |   4 +-
 .../launcher/core/DefaultLauncher.java        |  23 +---
 .../launcher/core/DefaultLauncherSession.java |  45 ++-----
 .../DelegatingCloseableInternalLauncher.java  |  30 -----
 .../core/DelegatingCloseableLauncher.java     |  41 +++++++
 ...lLauncher.java => DelegatingLauncher.java} |  14 +--
 ...java => InterceptingClosableLauncher.java} |  27 +++--
 .../launcher/core/LauncherFactory.java        |  10 +-
 ...her.java => LauncherListenerRegistry.java} |  12 +-
 .../core/SessionPerRequestLauncher.java       |  28 ++++-
 .../launcher/InterceptedTestEngine.java       |  22 ++++
 .../TestLauncherDiscoveryListener.java        |  16 +--
 .../launcher/TestLauncherInterceptor1.java    |  24 ++++
 .../launcher/core/DefaultLauncherTests.java   |  21 ++--
 .../launcher/core/LauncherFactoryTests.java   | 112 +++++++++++++-----
 .../AnotherUnusedTestExecutionListener.java   |   8 +-
 .../listeners/NoopTestExecutionListener.java  |   8 +-
 .../UnusedTestExecutionListener.java          |   8 +-
 .../org.junit.platform.engine.TestEngine      |   1 +
 .../testservices/junit-platform.properties    |   1 -
 .../projects/standalone/expected-err.txt      |   4 +-
 22 files changed, 293 insertions(+), 182 deletions(-)
 rename junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/{CloseableInternalLauncher.java => CloseableLauncher.java} (79%)
 delete mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableInternalLauncher.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableLauncher.java
 rename junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/{DelegatingInternalLauncher.java => DelegatingLauncher.java} (76%)
 rename junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/{InterceptingInternalLauncher.java => InterceptingClosableLauncher.java} (68%)
 rename junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/{InternalLauncher.java => LauncherListenerRegistry.java} (63%)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/InterceptedTestEngine.java
 create mode 100644 platform-tests/src/test/resources/intercepted-testservices/META-INF/services/org.junit.platform.engine.TestEngine
 delete mode 100644 platform-tests/src/test/resources/testservices/junit-platform.properties

diff --git a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
index 2cb30350c351..cdf6c136345a 100644
--- a/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
+++ b/junit-platform-engine/src/testFixtures/java/org/junit/platform/fakes/TestEngineSpy.java
@@ -21,19 +21,27 @@
  */
 public class TestEngineSpy implements TestEngine {
 
-	public static final String ID = TestEngineSpy.class.getSimpleName();
+	private final String id;
 
 	public ExecutionRequest requestForExecution;
 
+	public TestEngineSpy() {
+		this(TestEngineSpy.class.getSimpleName());
+	}
+
+	public TestEngineSpy(String id) {
+		this.id = id;
+	}
+
 	@Override
 	public String getId() {
-		return ID;
+		return id;
 	}
 
 	@Override
 	public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
-		var engineUniqueId = UniqueId.forEngine(ID);
-		var engineDescriptor = new TestDescriptorStub(engineUniqueId, ID);
+		var engineUniqueId = UniqueId.forEngine(id);
+		var engineDescriptor = new TestDescriptorStub(engineUniqueId, id);
 		var testDescriptor = new TestDescriptorStub(engineUniqueId.append("test", "test"), "test");
 		engineDescriptor.addChild(testDescriptor);
 		return engineDescriptor;
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableInternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableLauncher.java
similarity index 79%
rename from junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableInternalLauncher.java
rename to junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableLauncher.java
index 110057708947..1cc023471b22 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableInternalLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableLauncher.java
@@ -10,10 +10,12 @@
 
 package org.junit.platform.launcher.core;
 
+import org.junit.platform.launcher.Launcher;
+
 /**
  * @since 1.10
  */
-interface CloseableInternalLauncher extends InternalLauncher, AutoCloseable {
+interface CloseableLauncher extends Launcher, AutoCloseable {
 	@Override
 	void close();
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
index 3b0dc3e03f91..9f21595d0d64 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncher.java
@@ -35,12 +35,11 @@
  * @see Launcher
  * @see LauncherFactory
  */
-class DefaultLauncher implements InternalLauncher {
+class DefaultLauncher implements Launcher {
 
-	private final ListenerRegistry<LauncherDiscoveryListener> launcherDiscoveryListenerRegistry = ListenerRegistry.forLauncherDiscoveryListeners();
-	private final ListenerRegistry<TestExecutionListener> testExecutionListenerRegistry = ListenerRegistry.forTestExecutionListeners();
+	private final LauncherListenerRegistry listenerRegistry = new LauncherListenerRegistry();
 	private final EngineExecutionOrchestrator executionOrchestrator = new EngineExecutionOrchestrator(
-		testExecutionListenerRegistry);
+		listenerRegistry.testExecutionListeners);;
 	private final EngineDiscoveryOrchestrator discoveryOrchestrator;
 
 	/**
@@ -59,17 +58,17 @@ class DefaultLauncher implements InternalLauncher {
 		Preconditions.containsNoNullElements(postDiscoveryFilters,
 			"PostDiscoveryFilter array must not contain null elements");
 		this.discoveryOrchestrator = new EngineDiscoveryOrchestrator(testEngines,
-			unmodifiableCollection(postDiscoveryFilters), launcherDiscoveryListenerRegistry);
+			unmodifiableCollection(postDiscoveryFilters), listenerRegistry.launcherDiscoveryListeners);
 	}
 
 	@Override
 	public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
-		this.launcherDiscoveryListenerRegistry.addAll(listeners);
+		this.listenerRegistry.launcherDiscoveryListeners.addAll(listeners);
 	}
 
 	@Override
 	public void registerTestExecutionListeners(TestExecutionListener... listeners) {
-		this.testExecutionListenerRegistry.addAll(listeners);
+		this.listenerRegistry.testExecutionListeners.addAll(listeners);
 	}
 
 	@Override
@@ -95,16 +94,6 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 		execute((InternalTestPlan) testPlan, listeners);
 	}
 
-	@Override
-	public ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
-		return testExecutionListenerRegistry;
-	}
-
-	@Override
-	public ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
-		return launcherDiscoveryListenerRegistry;
-	}
-
 	private LauncherDiscoveryResult discover(LauncherDiscoveryRequest discoveryRequest,
 			EngineDiscoveryOrchestrator.Phase phase) {
 		return discoveryOrchestrator.discover(discoveryRequest, phase);
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
index a8fa1150fa5f..0a4436dd5ed1 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
@@ -11,6 +11,7 @@
 package org.junit.platform.launcher.core;
 
 import java.util.List;
+import java.util.function.Supplier;
 
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.launcher.Launcher;
@@ -27,12 +28,16 @@
  */
 class DefaultLauncherSession implements LauncherSession {
 
-	private final DelegatingLauncher launcher;
+	private final DelegatingCloseableLauncher<CloseableLauncher> launcher;
 	private final LauncherSessionListener listener;
 
-	DefaultLauncherSession(InternalLauncher launcher, LauncherSessionListener listener,
-			List<LauncherInterceptor> interceptors) {
-		this.launcher = new DelegatingLauncher(InterceptingInternalLauncher.decorate(launcher, interceptors));
+	DefaultLauncherSession(Supplier<Launcher> launcherSupplier, List<LauncherInterceptor> interceptors,
+			LauncherSessionListener listener) {
+		CloseableLauncher closeableLauncher = InterceptingClosableLauncher.decorate(launcherSupplier, interceptors);
+		this.launcher = new DelegatingCloseableLauncher<>(closeableLauncher, delegate -> {
+			delegate.close();
+			return ClosedLauncher.INSTANCE;
+		});
 		this.listener = listener;
 		listener.launcherSessionOpened(this);
 	}
@@ -48,31 +53,13 @@ LauncherSessionListener getListener() {
 
 	@Override
 	public void close() {
-		if (launcher.isClosed()) {
+		if (!launcher.isClosed()) {
 			launcher.close();
 			listener.launcherSessionClosed(this);
 		}
 	}
 
-	private static class DelegatingLauncher extends DelegatingInternalLauncher<CloseableInternalLauncher>
-			implements CloseableInternalLauncher {
-
-		DelegatingLauncher(CloseableInternalLauncher delegate) {
-			super(delegate);
-		}
-
-		boolean isClosed() {
-			return delegate != ClosedLauncher.INSTANCE;
-		}
-
-		@Override
-		public void close() {
-			delegate.close();
-			delegate = ClosedLauncher.INSTANCE;
-		}
-	}
-
-	private static class ClosedLauncher implements CloseableInternalLauncher {
+	private static class ClosedLauncher implements CloseableLauncher {
 
 		static final ClosedLauncher INSTANCE = new ClosedLauncher();
 
@@ -104,16 +91,6 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 			throw new PreconditionViolationException("Launcher session has already been closed");
 		}
 
-		@Override
-		public ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
-			throw new PreconditionViolationException("Launcher session has already been closed");
-		}
-
-		@Override
-		public ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
-			throw new PreconditionViolationException("Launcher session has already been closed");
-		}
-
 		@Override
 		public void close() {
 			// do nothing
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableInternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableInternalLauncher.java
deleted file mode 100644
index 1282cf7ac7d9..000000000000
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableInternalLauncher.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.launcher.core;
-
-/**
- * @since 1.10
- */
-class DelegatingCloseableInternalLauncher<T extends InternalLauncher> extends DelegatingInternalLauncher<T>
-		implements CloseableInternalLauncher {
-
-	private final Runnable onClose;
-
-	public DelegatingCloseableInternalLauncher(T delegate, Runnable onClose) {
-		super(delegate);
-		this.onClose = onClose;
-	}
-
-	@Override
-	public final void close() {
-		onClose.run();
-	}
-}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableLauncher.java
new file mode 100644
index 000000000000..a6ea513acf03
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableLauncher.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import java.util.function.Function;
+
+import org.junit.platform.launcher.Launcher;
+
+/**
+ * @since 1.10
+ */
+class DelegatingCloseableLauncher<T extends Launcher> extends DelegatingLauncher<T> implements CloseableLauncher {
+
+	private final Function<? super T, ? extends T> onClose;
+	private boolean closed;
+
+	public DelegatingCloseableLauncher(T delegate, Function<? super T, ? extends T> onClose) {
+		super(delegate);
+		this.onClose = onClose;
+	}
+
+	@Override
+	public final void close() {
+		if (!closed) {
+			this.closed = true;
+			delegate = this.onClose.apply(this.delegate);
+		}
+	}
+
+	public boolean isClosed() {
+		return closed;
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingInternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingLauncher.java
similarity index 76%
rename from junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingInternalLauncher.java
rename to junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingLauncher.java
index c4078ff94ae8..3e226af1255d 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingInternalLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingLauncher.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.launcher.core;
 
+import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -18,11 +19,11 @@
 /**
  * @since 1.10
  */
-class DelegatingInternalLauncher<T extends InternalLauncher> implements InternalLauncher {
+class DelegatingLauncher<T extends Launcher> implements Launcher {
 
 	protected T delegate;
 
-	DelegatingInternalLauncher(T delegate) {
+	DelegatingLauncher(T delegate) {
 		this.delegate = delegate;
 	}
 
@@ -51,13 +52,4 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 		delegate.execute(testPlan, listeners);
 	}
 
-	@Override
-	public ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry() {
-		return delegate.getTestExecutionListenerRegistry();
-	}
-
-	@Override
-	public ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry() {
-		return delegate.getLauncherDiscoveryListenerRegistry();
-	}
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingInternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingClosableLauncher.java
similarity index 68%
rename from junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingInternalLauncher.java
rename to junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingClosableLauncher.java
index 4524a88fb5de..20dbf2f6ed06 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingInternalLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingClosableLauncher.java
@@ -10,9 +10,13 @@
 
 package org.junit.platform.launcher.core;
 
+import static java.util.function.Function.identity;
+
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
+import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.LauncherInterceptor;
 import org.junit.platform.launcher.TestExecutionListener;
@@ -21,15 +25,15 @@
 /**
  * @since 1.10
  */
-class InterceptingInternalLauncher extends DelegatingCloseableInternalLauncher<InternalLauncher> {
+class InterceptingClosableLauncher extends DelegatingCloseableLauncher<Launcher> {
 
-	static CloseableInternalLauncher decorate(InternalLauncher launcher, List<LauncherInterceptor> interceptors) {
-		return composite(interceptors) //
-				.map(combinedInterceptor -> (CloseableInternalLauncher) new InterceptingInternalLauncher(launcher,
-					combinedInterceptor)) //
-				.orElse(new DelegatingCloseableInternalLauncher<>(launcher, () -> {
-					// do nothing
-				}));
+	static CloseableLauncher decorate(Supplier<Launcher> launcherSupplier, List<LauncherInterceptor> interceptors) {
+		Optional<LauncherInterceptor> combinedInterceptor = composite(interceptors);
+		Launcher launcher = combinedInterceptor.map(it -> it.intercept(launcherSupplier::get)).orElseGet(
+			launcherSupplier);
+		return combinedInterceptor //
+				.map(it -> (CloseableLauncher) new InterceptingClosableLauncher(launcher, it)) //
+				.orElse(new DelegatingCloseableLauncher<>(launcher, identity()));
 	}
 
 	private static Optional<LauncherInterceptor> composite(List<LauncherInterceptor> interceptors) {
@@ -58,8 +62,11 @@ public <T> T intercept(Invocation<T> invocation) {
 
 	private final LauncherInterceptor interceptor;
 
-	private InterceptingInternalLauncher(InternalLauncher delegate, LauncherInterceptor interceptor) {
-		super(delegate, interceptor::close);
+	private InterceptingClosableLauncher(Launcher delegate, LauncherInterceptor interceptor) {
+		super(delegate, it -> {
+			interceptor.close();
+			return it;
+		});
 		this.interceptor = interceptor;
 	}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 140cb4c58632..77edab9bbc67 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -98,9 +98,10 @@ public static LauncherSession openSession() throws PreconditionViolationExceptio
 	 */
 	@API(status = EXPERIMENTAL, since = "1.8")
 	public static LauncherSession openSession(LauncherConfig config) throws PreconditionViolationException {
+		Preconditions.notNull(config, "LauncherConfig must not be null");
 		LauncherConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
-		return new DefaultLauncherSession(createDefaultLauncher(config, configurationParameters),
-			createLauncherSessionListener(config), collectLauncherInterceptors(configurationParameters));
+		return new DefaultLauncherSession(() -> createDefaultLauncher(config, configurationParameters),
+			collectLauncherInterceptors(configurationParameters), createLauncherSessionListener(config));
 	}
 
 	/**
@@ -127,15 +128,14 @@ public static Launcher create() throws PreconditionViolationException {
 	 */
 	@API(status = EXPERIMENTAL, since = "1.3")
 	public static Launcher create(LauncherConfig config) throws PreconditionViolationException {
+		Preconditions.notNull(config, "LauncherConfig must not be null");
 		LauncherConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
-		return new SessionPerRequestLauncher(createDefaultLauncher(config, configurationParameters),
+		return new SessionPerRequestLauncher(() -> createDefaultLauncher(config, configurationParameters),
 			createLauncherSessionListener(config), () -> collectLauncherInterceptors(configurationParameters));
 	}
 
 	private static DefaultLauncher createDefaultLauncher(LauncherConfig config,
 			LauncherConfigurationParameters configurationParameters) {
-		Preconditions.notNull(config, "LauncherConfig must not be null");
-
 		Set<TestEngine> engines = collectTestEngines(config);
 		List<PostDiscoveryFilter> filters = collectPostDiscoveryFilters(config);
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherListenerRegistry.java
similarity index 63%
rename from junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
rename to junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherListenerRegistry.java
index 453be6931729..17b21b141f07 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InternalLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherListenerRegistry.java
@@ -10,16 +10,10 @@
 
 package org.junit.platform.launcher.core;
 
-import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.TestExecutionListener;
 
-/**
- * @since 1.8
- */
-interface InternalLauncher extends Launcher {
-
-	ListenerRegistry<TestExecutionListener> getTestExecutionListenerRegistry();
-
-	ListenerRegistry<LauncherDiscoveryListener> getLauncherDiscoveryListenerRegistry();
+class LauncherListenerRegistry {
+	final ListenerRegistry<LauncherDiscoveryListener> launcherDiscoveryListeners = ListenerRegistry.forLauncherDiscoveryListeners();
+	final ListenerRegistry<TestExecutionListener> testExecutionListeners = ListenerRegistry.forTestExecutionListeners();
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
index 7de4df66d5e7..1955bc625e56 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
@@ -13,6 +13,8 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.LauncherInterceptor;
 import org.junit.platform.launcher.LauncherSession;
@@ -23,18 +25,30 @@
 /**
  * @since 1.8
  */
-class SessionPerRequestLauncher extends DelegatingInternalLauncher<InternalLauncher> {
+class SessionPerRequestLauncher implements Launcher {
 
+	private final LauncherListenerRegistry listenerRegistry = new LauncherListenerRegistry();
+	private final Supplier<Launcher> launcherSupplier;
 	private final LauncherSessionListener sessionListener;
 	private final Supplier<List<LauncherInterceptor>> interceptorFactory;
 
-	SessionPerRequestLauncher(InternalLauncher delegate, LauncherSessionListener sessionListener,
+	SessionPerRequestLauncher(Supplier<Launcher> launcherSupplier, LauncherSessionListener sessionListener,
 			Supplier<List<LauncherInterceptor>> interceptorFactory) {
-		super(delegate);
+		this.launcherSupplier = launcherSupplier;
 		this.sessionListener = sessionListener;
 		this.interceptorFactory = interceptorFactory;
 	}
 
+	@Override
+	public void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners) {
+		listenerRegistry.launcherDiscoveryListeners.addAll(listeners);
+	}
+
+	@Override
+	public void registerTestExecutionListeners(TestExecutionListener... listeners) {
+		listenerRegistry.testExecutionListeners.addAll(listeners);
+	}
+
 	@Override
 	public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
 		try (LauncherSession session = createSession()) {
@@ -57,6 +71,12 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 	}
 
 	private LauncherSession createSession() {
-		return new DefaultLauncherSession(delegate, sessionListener, interceptorFactory.get());
+		LauncherSession session = new DefaultLauncherSession(launcherSupplier, interceptorFactory.get(),
+			sessionListener);
+		Launcher launcher = session.getLauncher();
+		listenerRegistry.launcherDiscoveryListeners.getListeners().forEach(
+			launcher::registerLauncherDiscoveryListeners);
+		listenerRegistry.testExecutionListeners.getListeners().forEach(launcher::registerTestExecutionListeners);
+		return session;
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/InterceptedTestEngine.java b/platform-tests/src/test/java/org/junit/platform/launcher/InterceptedTestEngine.java
new file mode 100644
index 000000000000..dc57b1ff7a22
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/InterceptedTestEngine.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+import org.junit.platform.fakes.TestEngineSpy;
+
+public class InterceptedTestEngine extends TestEngineSpy {
+
+	public static final String ID = "intercepted-engine";
+
+	public InterceptedTestEngine() {
+		super(ID);
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
index 489f63caaeb3..7a5be0c967a4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherDiscoveryListener.java
@@ -11,20 +11,10 @@
 package org.junit.platform.launcher;
 
 public class TestLauncherDiscoveryListener implements LauncherDiscoveryListener {
+	public static boolean called;
 
 	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		return getClass() == obj.getClass();
-	}
-
-	@Override
-	public int hashCode() {
-		return 1;
+	public void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
+		called = true;
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
index 7bd8f95ff690..585ccf74b6c4 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
@@ -10,8 +10,23 @@
 
 package org.junit.platform.launcher;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
 public class TestLauncherInterceptor1 implements LauncherInterceptor {
 
+	private final ClassLoader originalClassLoader;
+	private final URLClassLoader replacedClassLoader;
+
+	public TestLauncherInterceptor1() {
+		originalClassLoader = Thread.currentThread().getContextClassLoader();
+		var url = getClass().getClassLoader().getResource("intercepted-testservices/");
+		replacedClassLoader = new URLClassLoader(new URL[] { url }, originalClassLoader);
+		Thread.currentThread().setContextClassLoader(replacedClassLoader);
+	}
+
 	@Override
 	public <T> T intercept(Invocation<T> invocation) {
 		return invocation.proceed();
@@ -19,5 +34,14 @@ public <T> T intercept(Invocation<T> invocation) {
 
 	@Override
 	public void close() {
+		try {
+			replacedClassLoader.close();
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
+		finally {
+			Thread.currentThread().setContextClassLoader(originalClassLoader);
+		}
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index dce04470cd5c..e0e7a3c4bf57 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -76,17 +76,20 @@ class DefaultLauncherTests {
 
 	@Test
 	void constructLauncherWithoutAnyEngines() {
+		var launcher = createLauncher();
+
 		Throwable exception = assertThrows(PreconditionViolationException.class,
-			LauncherFactoryForTestingPurposesOnly::createLauncher);
+			() -> launcher.discover(request().build()));
 
 		assertThat(exception).hasMessageContaining("Cannot create Launcher without at least one TestEngine");
 	}
 
 	@Test
 	void constructLauncherWithMultipleTestEnginesWithDuplicateIds() {
-		var exception = assertThrows(JUnitException.class,
-			() -> createLauncher(new DemoHierarchicalTestEngine("dummy id"),
-				new DemoHierarchicalTestEngine("dummy id")));
+		var launcher = createLauncher(new DemoHierarchicalTestEngine("dummy id"),
+			new DemoHierarchicalTestEngine("dummy id"));
+
+		var exception = assertThrows(JUnitException.class, () -> launcher.discover(request().build()));
 
 		assertThat(exception).hasMessageContaining("multiple engines with the same ID");
 	}
@@ -486,11 +489,11 @@ public Type getType() {
 
 	@Test
 	void reportsDynamicTestDescriptorsCorrectly() {
-		var engineId = UniqueId.forEngine(TestEngineSpy.ID);
+		var engineId = UniqueId.forEngine("engine");
 		var containerAndTestId = engineId.append("c&t", "c&t");
 		var dynamicTestId = containerAndTestId.append("test", "test");
 
-		var engine = new TestEngineSpy() {
+		var engine = new TestEngineSpy(engineId.getLastSegment().getValue()) {
 
 			@Override
 			public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
@@ -595,7 +598,8 @@ void testPlanThrowsExceptionWhenModified() {
 	@TrackLogRecords
 	void thirdPartyEngineUsingReservedEngineIdPrefixEmitsWarning(LogRecordListener listener) {
 		var id = "junit-using-reserved-prefix";
-		createLauncher(new TestEngineStub(id));
+		var launcher = createLauncher(new TestEngineStub(id));
+		launcher.discover(request().build());
 		assertThat(listener.stream(EngineIdValidator.class, Level.WARNING).map(LogRecord::getMessage)) //
 				.containsExactly(
 					"Third-party TestEngine implementations are forbidden to use the reserved 'junit-' prefix for their ID: '"
@@ -614,7 +618,8 @@ void thirdPartyEngineClaimingToBeVintageResultsInException() {
 
 	private void assertImposter(String id) {
 		TestEngine impostor = new TestEngineStub(id);
-		Exception exception = assertThrows(JUnitException.class, () -> createLauncher(impostor));
+		var launcher = createLauncher(impostor);
+		Exception exception = assertThrows(JUnitException.class, () -> launcher.discover(request().build()));
 		assertThat(exception).hasMessage(
 			"Third-party TestEngine '%s' is forbidden to use the reserved '%s' TestEngine ID.",
 			impostor.getClass().getName(), id);
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 36baca65a79d..072c6119e369 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -12,11 +12,16 @@
 
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.launcher.LauncherConstants.DEACTIVATE_LISTENERS_PATTERN_PROPERTY_NAME;
 import static org.junit.platform.launcher.LauncherConstants.ENABLE_LAUNCHER_INTERCEPTORS;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.concurrent.atomic.AtomicReference;
@@ -31,7 +36,7 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.fakes.TestEngineSpy;
-import org.junit.platform.launcher.LauncherDiscoveryListener;
+import org.junit.platform.launcher.InterceptedTestEngine;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TagFilter;
@@ -56,24 +61,41 @@ void preconditions() {
 	}
 
 	@Test
-	void noopTestExecutionListenerIsLoadedViaServiceApi() {
+	void testExecutionListenerIsLoadedViaServiceApi() {
 		withTestServices(() -> {
-			var launcher = (InternalLauncher) LauncherFactory.create();
-			var listeners = launcher.getTestExecutionListenerRegistry().getListeners();
-			var listener = listeners.stream().filter(NoopTestExecutionListener.class::isInstance).findFirst();
-			assertThat(listener).isPresent();
+			var config = LauncherConfig.builder() //
+					.addTestEngines(new TestEngineSpy()) //
+					.enableTestEngineAutoRegistration(false) //
+					.build();
+			var launcher = LauncherFactory.create(config);
+
+			NoopTestExecutionListener.called = false;
+
+			launcher.execute(request().build());
+
+			assertTrue(NoopTestExecutionListener.called);
 		});
 	}
 
 	@Test
-	void unusedTestExecutionListenerIsNotLoadedViaServiceApi() {
+	void testExecutionListenersExcludedViaConfigParametersIsNotLoadedViaServiceApi() {
 		withTestServices(() -> {
-			var launcher = (InternalLauncher) LauncherFactory.create();
-			var listeners = launcher.getTestExecutionListenerRegistry().getListeners();
+			var value = "org.junit.*.launcher.listeners.Unused*,org.junit.*.launcher.listeners.AnotherUnused*";
+			withSystemProperty(DEACTIVATE_LISTENERS_PATTERN_PROPERTY_NAME, value, () -> {
+				var config = LauncherConfig.builder() //
+						.addTestEngines(new TestEngineSpy()) //
+						.enableTestEngineAutoRegistration(false) //
+						.build();
+				var launcher = LauncherFactory.create(config);
+
+				UnusedTestExecutionListener.called = false;
+				AnotherUnusedTestExecutionListener.called = false;
 
-			assertThat(listeners).filteredOn(AnotherUnusedTestExecutionListener.class::isInstance).isEmpty();
-			assertThat(listeners).filteredOn(UnusedTestExecutionListener.class::isInstance).isEmpty();
-			assertThat(listeners).filteredOn(NoopTestExecutionListener.class::isInstance).isNotEmpty();
+				launcher.execute(request().build());
+
+				assertFalse(UnusedTestExecutionListener.called);
+				assertFalse(AnotherUnusedTestExecutionListener.called);
+			});
 		});
 	}
 
@@ -169,45 +191,70 @@ void notApplyIfDisabledPostDiscoveryFiltersViaServiceApi() {
 	@Test
 	void doesNotDiscoverLauncherDiscoverRequestListenerViaServiceApiWhenDisabled() {
 		withTestServices(() -> {
-			var launcher = (InternalLauncher) LauncherFactory.create(
-				LauncherConfig.builder().enableLauncherDiscoveryListenerAutoRegistration(false).build());
-			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListenerRegistry().getCompositeListener();
+			var config = LauncherConfig.builder() //
+					.enableLauncherDiscoveryListenerAutoRegistration(false) //
+					.build();
+			var launcher = LauncherFactory.create(config);
+			TestLauncherDiscoveryListener.called = false;
+
+			launcher.discover(request().build());
 
-			assertThat(launcherDiscoveryListener).isSameAs(LauncherDiscoveryListener.NOOP);
+			assertFalse(TestLauncherDiscoveryListener.called);
 		});
 	}
 
 	@Test
 	void discoversLauncherDiscoverRequestListenerViaServiceApiByDefault() {
 		withTestServices(() -> {
-			var launcher = (InternalLauncher) LauncherFactory.create();
-			var launcherDiscoveryListener = launcher.getLauncherDiscoveryListenerRegistry().getCompositeListener();
+			var launcher = LauncherFactory.create();
+			TestLauncherDiscoveryListener.called = false;
+
+			launcher.discover(request().build());
 
-			assertThat(launcherDiscoveryListener.getClass().getSimpleName()).startsWith("Composite");
-			assertThat(launcherDiscoveryListener).extracting("listeners").asList() //
-					.contains(new TestLauncherDiscoveryListener());
+			assertTrue(TestLauncherDiscoveryListener.called);
 		});
 	}
 
 	@Test
 	void doesNotDiscoverLauncherSessionListenerViaServiceApiWhenDisabled() {
 		withTestServices(() -> {
-			var session = (DefaultLauncherSession) LauncherFactory.openSession(
-				LauncherConfig.builder().enableLauncherSessionListenerAutoRegistration(false).build());
+			try (var session = (DefaultLauncherSession) LauncherFactory.openSession(
+				LauncherConfig.builder().enableLauncherSessionListenerAutoRegistration(false).build())) {
 
-			assertThat(session.getListener()).isSameAs(LauncherSessionListener.NOOP);
+				assertThat(session.getListener()).isSameAs(LauncherSessionListener.NOOP);
+			}
 		});
 	}
 
 	@Test
 	void discoversLauncherSessionListenerViaServiceApiByDefault() {
 		withTestServices(() -> {
-			var session = (DefaultLauncherSession) LauncherFactory.openSession();
-
-			assertThat(session.getListener()).isEqualTo(new TestLauncherSessionListener());
+			try (var session = (DefaultLauncherSession) LauncherFactory.openSession()) {
+				assertThat(session.getListener()).isEqualTo(new TestLauncherSessionListener());
+			}
 		});
 	}
 
+	@Test
+	void createsLauncherInterceptorsBeforeDiscoveringTestEngines() {
+		withTestServices(() -> withSystemProperty(ENABLE_LAUNCHER_INTERCEPTORS, "true", () -> {
+			var config = LauncherConfig.builder() //
+					.enableTestEngineAutoRegistration(true) //
+					.build();
+			var request = request().build();
+
+			var testPlan = LauncherFactory.create(config).discover(request);
+
+			assertThat(testPlan.getRoots()) //
+					.map(TestIdentifier::getUniqueIdObject) //
+					.map(UniqueId::getLastSegment) //
+					.map(UniqueId.Segment::getValue) //
+					.describedAs(
+						"Intercepted test engine is added by class loader created by TestLauncherInterceptor1").contains(
+							InterceptedTestEngine.ID);
+		}));
+	}
+
 	@Test
 	void appliesLauncherInterceptorsToTestDiscovery() {
 		withTestServices(() -> withSystemProperty(ENABLE_LAUNCHER_INTERCEPTORS, "true", () -> {
@@ -266,6 +313,7 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult
 		}));
 	}
 
+	@SuppressWarnings("SameParameterValue")
 	private static void withSystemProperty(String key, String value, Runnable runnable) {
 		var oldValue = System.getProperty(key);
 		System.setProperty(key, value);
@@ -284,12 +332,14 @@ private static void withSystemProperty(String key, String value, Runnable runnab
 
 	private static void withTestServices(Runnable runnable) {
 		var current = Thread.currentThread().getContextClassLoader();
-		try {
-			var url = LauncherFactoryTests.class.getClassLoader().getResource("testservices/");
-			var classLoader = new URLClassLoader(new URL[] { url }, current);
+		var url = LauncherFactoryTests.class.getClassLoader().getResource("testservices/");
+		try (var classLoader = new URLClassLoader(new URL[] { url }, current)) {
 			Thread.currentThread().setContextClassLoader(classLoader);
 			runnable.run();
 		}
+		catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
 		finally {
 			Thread.currentThread().setContextClassLoader(current);
 		}
@@ -304,6 +354,7 @@ private LauncherDiscoveryRequest createLauncherDiscoveryRequestForBothStandardEn
 		// @formatter:on
 	}
 
+	@SuppressWarnings("NewClassNamingConvention")
 	public static class JUnit4Example {
 
 		@org.junit.Test
@@ -312,6 +363,7 @@ public void testJ4() {
 
 	}
 
+	@SuppressWarnings("NewClassNamingConvention")
 	static class JUnit5Example {
 
 		@Tag("test-post-discovery")
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
index c3d6cfaccd8a..a0ca73ca6361 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/AnotherUnusedTestExecutionListener.java
@@ -11,7 +11,13 @@
 package org.junit.platform.launcher.listeners;
 
 import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
 
 public class AnotherUnusedTestExecutionListener implements TestExecutionListener {
-	// empty on purpose
+	public static boolean called;
+
+	@Override
+	public void testPlanExecutionStarted(TestPlan testPlan) {
+		called = true;
+	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
index d471e6e745c2..268dd599c80f 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/NoopTestExecutionListener.java
@@ -11,10 +11,16 @@
 package org.junit.platform.launcher.listeners;
 
 import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
 
 /**
  * @since 1.0
  */
 public class NoopTestExecutionListener implements TestExecutionListener {
-	// empty on purpose
+	public static boolean called;
+
+	@Override
+	public void testPlanExecutionStarted(TestPlan testPlan) {
+		called = true;
+	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
index cbf7e6f9bea9..53353c2ff3ff 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/UnusedTestExecutionListener.java
@@ -11,7 +11,13 @@
 package org.junit.platform.launcher.listeners;
 
 import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
 
 public class UnusedTestExecutionListener implements TestExecutionListener {
-	// empty on purpose
+	public static boolean called;
+
+	@Override
+	public void testPlanExecutionStarted(TestPlan testPlan) {
+		called = true;
+	}
 }
diff --git a/platform-tests/src/test/resources/intercepted-testservices/META-INF/services/org.junit.platform.engine.TestEngine b/platform-tests/src/test/resources/intercepted-testservices/META-INF/services/org.junit.platform.engine.TestEngine
new file mode 100644
index 000000000000..c27ba1c33eee
--- /dev/null
+++ b/platform-tests/src/test/resources/intercepted-testservices/META-INF/services/org.junit.platform.engine.TestEngine
@@ -0,0 +1 @@
+org.junit.platform.launcher.InterceptedTestEngine
diff --git a/platform-tests/src/test/resources/testservices/junit-platform.properties b/platform-tests/src/test/resources/testservices/junit-platform.properties
deleted file mode 100644
index 7b87d3ca34ff..000000000000
--- a/platform-tests/src/test/resources/testservices/junit-platform.properties
+++ /dev/null
@@ -1 +0,0 @@
-junit.platform.execution.listeners.deactivate=org.junit.*.launcher.listeners.Unused*,org.junit.*.launcher.listeners.AnotherUnused*
\ No newline at end of file
diff --git a/platform-tooling-support-tests/projects/standalone/expected-err.txt b/platform-tooling-support-tests/projects/standalone/expected-err.txt
index 46cdad9ec4b2..5788d5f3db68 100644
--- a/platform-tooling-support-tests/projects/standalone/expected-err.txt
+++ b/platform-tooling-support-tests/projects/standalone/expected-err.txt
@@ -1,3 +1,5 @@
+.+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
+.+ Loaded LauncherSessionListener instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry loadTestEngines
 .+ Discovered TestEngines:
 - junit-jupiter .+
@@ -9,8 +11,6 @@
 .+ Loaded LauncherDiscoveryListener instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded TestExecutionListener instances: .+
-.+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
-.+ Loaded LauncherSessionListener instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry loadTestEngines
 .+ Discovered TestEngines:
 - junit-jupiter .+

From 7a056cd80940114502216a5fad97716aedc40e75 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 16 Nov 2022 07:57:54 +0100
Subject: [PATCH 1077/1433] Load interceptors before session listeners

---
 .../launcher/LauncherInterceptor.java         | 40 ++++++++
 .../launcher/core/CloseableLauncher.java      | 21 -----
 .../launcher/core/DefaultLauncherSession.java | 38 ++++----
 .../core/DelegatingCloseableLauncher.java     | 41 --------
 .../launcher/core/DelegatingLauncher.java     |  6 +-
 .../core/InterceptingClosableLauncher.java    | 93 -------------------
 .../launcher/core/InterceptingLauncher.java   | 51 ++++++++++
 .../launcher/core/LauncherFactory.java        |  6 +-
 .../core/SessionPerRequestLauncher.java       | 11 ++-
 ...ceptorInjectedLauncherSessionListener.java | 35 +++++++
 .../launcher/TestLauncherInterceptor1.java    |  4 +-
 .../launcher/TestLauncherInterceptor2.java    | 10 +-
 .../launcher/core/LauncherFactoryTests.java   |  5 +
 ....platform.launcher.LauncherSessionListener |  1 +
 .../projects/standalone/expected-err.txt      |  2 +
 .../support/tests/StandaloneTests.java        |  3 +
 16 files changed, 181 insertions(+), 186 deletions(-)
 delete mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableLauncher.java
 delete mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableLauncher.java
 delete mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingClosableLauncher.java
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingLauncher.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/launcher/InterceptorInjectedLauncherSessionListener.java
 create mode 100644 platform-tests/src/test/resources/intercepted-testservices/META-INF/services/org.junit.platform.launcher.LauncherSessionListener

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
index cf91b3d67d10..a8a4111dd327 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
@@ -11,6 +11,9 @@
 package org.junit.platform.launcher;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.util.List;
 
 import org.apiguardian.api.API;
 
@@ -28,6 +31,18 @@
 @API(status = EXPERIMENTAL, since = "1.10")
 public interface LauncherInterceptor {
 
+	LauncherInterceptor NOOP = new LauncherInterceptor() {
+		@Override
+		public <T> T intercept(Invocation<T> invocation) {
+			return invocation.proceed();
+		}
+
+		@Override
+		public void close() {
+			// do nothing
+		}
+	};
+
 	/**
 	 * Intercept the supplied invocation.
 	 *
@@ -54,4 +69,29 @@ public interface LauncherInterceptor {
 	interface Invocation<T> {
 		T proceed();
 	}
+
+	@API(status = INTERNAL, since = "1.10")
+	static LauncherInterceptor composite(List<LauncherInterceptor> interceptors) {
+		if (interceptors.isEmpty()) {
+			return NOOP;
+		}
+		return interceptors.stream() //
+				.skip(1) //
+				.reduce(interceptors.get(0), (a, b) -> new LauncherInterceptor() {
+					@Override
+					public void close() {
+						try {
+							a.close();
+						}
+						finally {
+							b.close();
+						}
+					}
+
+					@Override
+					public <T> T intercept(Invocation<T> invocation) {
+						return a.intercept(() -> b.intercept(invocation));
+					}
+				});
+	}
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableLauncher.java
deleted file mode 100644
index 1cc023471b22..000000000000
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/CloseableLauncher.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.launcher.core;
-
-import org.junit.platform.launcher.Launcher;
-
-/**
- * @since 1.10
- */
-interface CloseableLauncher extends Launcher, AutoCloseable {
-	@Override
-	void close();
-}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
index 0a4436dd5ed1..42969448616e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
@@ -28,17 +28,23 @@
  */
 class DefaultLauncherSession implements LauncherSession {
 
-	private final DelegatingCloseableLauncher<CloseableLauncher> launcher;
+	private final LauncherInterceptor interceptor;
 	private final LauncherSessionListener listener;
-
-	DefaultLauncherSession(Supplier<Launcher> launcherSupplier, List<LauncherInterceptor> interceptors,
-			LauncherSessionListener listener) {
-		CloseableLauncher closeableLauncher = InterceptingClosableLauncher.decorate(launcherSupplier, interceptors);
-		this.launcher = new DelegatingCloseableLauncher<>(closeableLauncher, delegate -> {
-			delegate.close();
-			return ClosedLauncher.INSTANCE;
-		});
-		this.listener = listener;
+	private final DelegatingLauncher launcher;
+
+	DefaultLauncherSession(List<LauncherInterceptor> interceptors, Supplier<LauncherSessionListener> listenerSupplier,
+			Supplier<Launcher> launcherSupplier) {
+		interceptor = LauncherInterceptor.composite(interceptors);
+		Launcher launcher;
+		if (interceptor == LauncherInterceptor.NOOP) {
+			this.listener = listenerSupplier.get();
+			launcher = launcherSupplier.get();
+		}
+		else {
+			this.listener = interceptor.intercept(listenerSupplier::get);
+			launcher = new InterceptingLauncher(interceptor.intercept(launcherSupplier::get), interceptor);
+		}
+		this.launcher = new DelegatingLauncher(launcher);
 		listener.launcherSessionOpened(this);
 	}
 
@@ -53,13 +59,14 @@ LauncherSessionListener getListener() {
 
 	@Override
 	public void close() {
-		if (!launcher.isClosed()) {
-			launcher.close();
+		if (launcher.delegate != ClosedLauncher.INSTANCE) {
+			launcher.delegate = ClosedLauncher.INSTANCE;
 			listener.launcherSessionClosed(this);
+			interceptor.close();
 		}
 	}
 
-	private static class ClosedLauncher implements CloseableLauncher {
+	private static class ClosedLauncher implements Launcher {
 
 		static final ClosedLauncher INSTANCE = new ClosedLauncher();
 
@@ -90,10 +97,5 @@ public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecu
 		public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 			throw new PreconditionViolationException("Launcher session has already been closed");
 		}
-
-		@Override
-		public void close() {
-			// do nothing
-		}
 	}
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableLauncher.java
deleted file mode 100644
index a6ea513acf03..000000000000
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingCloseableLauncher.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.launcher.core;
-
-import java.util.function.Function;
-
-import org.junit.platform.launcher.Launcher;
-
-/**
- * @since 1.10
- */
-class DelegatingCloseableLauncher<T extends Launcher> extends DelegatingLauncher<T> implements CloseableLauncher {
-
-	private final Function<? super T, ? extends T> onClose;
-	private boolean closed;
-
-	public DelegatingCloseableLauncher(T delegate, Function<? super T, ? extends T> onClose) {
-		super(delegate);
-		this.onClose = onClose;
-	}
-
-	@Override
-	public final void close() {
-		if (!closed) {
-			this.closed = true;
-			delegate = this.onClose.apply(this.delegate);
-		}
-	}
-
-	public boolean isClosed() {
-		return closed;
-	}
-}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingLauncher.java
index 3e226af1255d..d4332b52fe35 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DelegatingLauncher.java
@@ -19,11 +19,11 @@
 /**
  * @since 1.10
  */
-class DelegatingLauncher<T extends Launcher> implements Launcher {
+class DelegatingLauncher implements Launcher {
 
-	protected T delegate;
+	protected Launcher delegate;
 
-	DelegatingLauncher(T delegate) {
+	DelegatingLauncher(Launcher delegate) {
 		this.delegate = delegate;
 	}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingClosableLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingClosableLauncher.java
deleted file mode 100644
index 20dbf2f6ed06..000000000000
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingClosableLauncher.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.launcher.core;
-
-import static java.util.function.Function.identity;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import org.junit.platform.launcher.Launcher;
-import org.junit.platform.launcher.LauncherDiscoveryRequest;
-import org.junit.platform.launcher.LauncherInterceptor;
-import org.junit.platform.launcher.TestExecutionListener;
-import org.junit.platform.launcher.TestPlan;
-
-/**
- * @since 1.10
- */
-class InterceptingClosableLauncher extends DelegatingCloseableLauncher<Launcher> {
-
-	static CloseableLauncher decorate(Supplier<Launcher> launcherSupplier, List<LauncherInterceptor> interceptors) {
-		Optional<LauncherInterceptor> combinedInterceptor = composite(interceptors);
-		Launcher launcher = combinedInterceptor.map(it -> it.intercept(launcherSupplier::get)).orElseGet(
-			launcherSupplier);
-		return combinedInterceptor //
-				.map(it -> (CloseableLauncher) new InterceptingClosableLauncher(launcher, it)) //
-				.orElse(new DelegatingCloseableLauncher<>(launcher, identity()));
-	}
-
-	private static Optional<LauncherInterceptor> composite(List<LauncherInterceptor> interceptors) {
-		if (interceptors.isEmpty()) {
-			return Optional.empty();
-		}
-		return Optional.of(interceptors.stream() //
-				.skip(1) //
-				.reduce(interceptors.get(0), (a, b) -> new LauncherInterceptor() {
-					@Override
-					public void close() {
-						try {
-							a.close();
-						}
-						finally {
-							b.close();
-						}
-					}
-
-					@Override
-					public <T> T intercept(Invocation<T> invocation) {
-						return a.intercept(() -> b.intercept(invocation));
-					}
-				}));
-	}
-
-	private final LauncherInterceptor interceptor;
-
-	private InterceptingClosableLauncher(Launcher delegate, LauncherInterceptor interceptor) {
-		super(delegate, it -> {
-			interceptor.close();
-			return it;
-		});
-		this.interceptor = interceptor;
-	}
-
-	@Override
-	public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
-		return interceptor.intercept(() -> super.discover(launcherDiscoveryRequest));
-	}
-
-	@Override
-	public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecutionListener... listeners) {
-		interceptor.intercept(() -> {
-			super.execute(launcherDiscoveryRequest, listeners);
-			return null;
-		});
-	}
-
-	@Override
-	public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
-		interceptor.intercept(() -> {
-			super.execute(testPlan, listeners);
-			return null;
-		});
-	}
-}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingLauncher.java
new file mode 100644
index 000000000000..043d4e9688f5
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/InterceptingLauncher.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherInterceptor;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
+
+/**
+ * @since 1.10
+ */
+class InterceptingLauncher extends DelegatingLauncher {
+
+	private final LauncherInterceptor interceptor;
+
+	InterceptingLauncher(Launcher delegate, LauncherInterceptor interceptor) {
+		super(delegate);
+		this.interceptor = interceptor;
+	}
+
+	@Override
+	public TestPlan discover(LauncherDiscoveryRequest launcherDiscoveryRequest) {
+		return interceptor.intercept(() -> super.discover(launcherDiscoveryRequest));
+	}
+
+	@Override
+	public void execute(LauncherDiscoveryRequest launcherDiscoveryRequest, TestExecutionListener... listeners) {
+		interceptor.intercept(() -> {
+			super.execute(launcherDiscoveryRequest, listeners);
+			return null;
+		});
+	}
+
+	@Override
+	public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
+		interceptor.intercept(() -> {
+			super.execute(testPlan, listeners);
+			return null;
+		});
+	}
+}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 77edab9bbc67..eb60ce260404 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -100,8 +100,8 @@ public static LauncherSession openSession() throws PreconditionViolationExceptio
 	public static LauncherSession openSession(LauncherConfig config) throws PreconditionViolationException {
 		Preconditions.notNull(config, "LauncherConfig must not be null");
 		LauncherConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
-		return new DefaultLauncherSession(() -> createDefaultLauncher(config, configurationParameters),
-			collectLauncherInterceptors(configurationParameters), createLauncherSessionListener(config));
+		return new DefaultLauncherSession(collectLauncherInterceptors(configurationParameters),
+			() -> createLauncherSessionListener(config), () -> createDefaultLauncher(config, configurationParameters));
 	}
 
 	/**
@@ -131,7 +131,7 @@ public static Launcher create(LauncherConfig config) throws PreconditionViolatio
 		Preconditions.notNull(config, "LauncherConfig must not be null");
 		LauncherConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
 		return new SessionPerRequestLauncher(() -> createDefaultLauncher(config, configurationParameters),
-			createLauncherSessionListener(config), () -> collectLauncherInterceptors(configurationParameters));
+			() -> createLauncherSessionListener(config), () -> collectLauncherInterceptors(configurationParameters));
 	}
 
 	private static DefaultLauncher createDefaultLauncher(LauncherConfig config,
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
index 1955bc625e56..167efb6443ec 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/SessionPerRequestLauncher.java
@@ -29,13 +29,14 @@ class SessionPerRequestLauncher implements Launcher {
 
 	private final LauncherListenerRegistry listenerRegistry = new LauncherListenerRegistry();
 	private final Supplier<Launcher> launcherSupplier;
-	private final LauncherSessionListener sessionListener;
+	private final Supplier<LauncherSessionListener> sessionListenerSupplier;
 	private final Supplier<List<LauncherInterceptor>> interceptorFactory;
 
-	SessionPerRequestLauncher(Supplier<Launcher> launcherSupplier, LauncherSessionListener sessionListener,
+	SessionPerRequestLauncher(Supplier<Launcher> launcherSupplier,
+			Supplier<LauncherSessionListener> sessionListenerSupplier,
 			Supplier<List<LauncherInterceptor>> interceptorFactory) {
 		this.launcherSupplier = launcherSupplier;
-		this.sessionListener = sessionListener;
+		this.sessionListenerSupplier = sessionListenerSupplier;
 		this.interceptorFactory = interceptorFactory;
 	}
 
@@ -71,8 +72,8 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 	}
 
 	private LauncherSession createSession() {
-		LauncherSession session = new DefaultLauncherSession(launcherSupplier, interceptorFactory.get(),
-			sessionListener);
+		LauncherSession session = new DefaultLauncherSession(interceptorFactory.get(), sessionListenerSupplier,
+			launcherSupplier);
 		Launcher launcher = session.getLauncher();
 		listenerRegistry.launcherDiscoveryListeners.getListeners().forEach(
 			launcher::registerLauncherDiscoveryListeners);
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/InterceptorInjectedLauncherSessionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/InterceptorInjectedLauncherSessionListener.java
new file mode 100644
index 000000000000..87cd780ba6f9
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/InterceptorInjectedLauncherSessionListener.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class InterceptorInjectedLauncherSessionListener implements LauncherSessionListener {
+
+	public static int CALLS;
+
+	public InterceptorInjectedLauncherSessionListener() {
+		assertEquals(TestLauncherInterceptor1.CLASSLOADER_NAME,
+			Thread.currentThread().getContextClassLoader().getName());
+		assertTrue(TestLauncherInterceptor2.INTERCEPTING);
+	}
+
+	@Override
+	public void launcherSessionOpened(LauncherSession session) {
+		CALLS++;
+	}
+
+    @Override
+    public void launcherSessionClosed(LauncherSession session) {
+        assertEquals(TestLauncherInterceptor1.CLASSLOADER_NAME, Thread.currentThread().getContextClassLoader().getName());
+    }
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
index 585ccf74b6c4..6ff0dc7046dd 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor1.java
@@ -17,13 +17,15 @@
 
 public class TestLauncherInterceptor1 implements LauncherInterceptor {
 
+	public static final String CLASSLOADER_NAME = "interceptor-loader";
+
 	private final ClassLoader originalClassLoader;
 	private final URLClassLoader replacedClassLoader;
 
 	public TestLauncherInterceptor1() {
 		originalClassLoader = Thread.currentThread().getContextClassLoader();
 		var url = getClass().getClassLoader().getResource("intercepted-testservices/");
-		replacedClassLoader = new URLClassLoader(new URL[] { url }, originalClassLoader);
+		replacedClassLoader = new URLClassLoader(CLASSLOADER_NAME, new URL[] { url }, originalClassLoader);
 		Thread.currentThread().setContextClassLoader(replacedClassLoader);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor2.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor2.java
index bdc198e3ee06..04f9ad3e29a0 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor2.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestLauncherInterceptor2.java
@@ -12,9 +12,17 @@
 
 public class TestLauncherInterceptor2 implements LauncherInterceptor {
 
+	public static boolean INTERCEPTING;
+
 	@Override
 	public <T> T intercept(Invocation<T> invocation) {
-		return invocation.proceed();
+		INTERCEPTING = true;
+		try {
+			return invocation.proceed();
+		}
+		finally {
+			INTERCEPTING = false;
+		}
 	}
 
 	@Override
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index 072c6119e369..e769149edfff 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -37,6 +37,7 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.fakes.TestEngineSpy;
 import org.junit.platform.launcher.InterceptedTestEngine;
+import org.junit.platform.launcher.InterceptorInjectedLauncherSessionListener;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TagFilter;
@@ -257,6 +258,7 @@ void createsLauncherInterceptorsBeforeDiscoveringTestEngines() {
 
 	@Test
 	void appliesLauncherInterceptorsToTestDiscovery() {
+		InterceptorInjectedLauncherSessionListener.CALLS = 0;
 		withTestServices(() -> withSystemProperty(ENABLE_LAUNCHER_INTERCEPTORS, "true", () -> {
 			var engine = new TestEngineSpy() {
 				@Override
@@ -277,11 +279,13 @@ public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId
 					.hasRootCauseMessage("from discovery") //
 					.hasStackTraceContaining(TestLauncherInterceptor1.class.getName() + ".intercept(") //
 					.hasStackTraceContaining(TestLauncherInterceptor2.class.getName() + ".intercept(");
+			assertThat(InterceptorInjectedLauncherSessionListener.CALLS).isEqualTo(1);
 		}));
 	}
 
 	@Test
 	void appliesLauncherInterceptorsToTestExecution() {
+		InterceptorInjectedLauncherSessionListener.CALLS = 0;
 		withTestServices(() -> withSystemProperty(ENABLE_LAUNCHER_INTERCEPTORS, "true", () -> {
 			var engine = new TestEngineSpy() {
 				@Override
@@ -310,6 +314,7 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult
 					.hasRootCauseMessage("from execution") //
 					.hasStackTraceContaining(TestLauncherInterceptor1.class.getName() + ".intercept(") //
 					.hasStackTraceContaining(TestLauncherInterceptor2.class.getName() + ".intercept(");
+			assertThat(InterceptorInjectedLauncherSessionListener.CALLS).isEqualTo(1);
 		}));
 	}
 
diff --git a/platform-tests/src/test/resources/intercepted-testservices/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/platform-tests/src/test/resources/intercepted-testservices/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 000000000000..170360744b1c
--- /dev/null
+++ b/platform-tests/src/test/resources/intercepted-testservices/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.junit.platform.launcher.InterceptorInjectedLauncherSessionListener
diff --git a/platform-tooling-support-tests/projects/standalone/expected-err.txt b/platform-tooling-support-tests/projects/standalone/expected-err.txt
index 5788d5f3db68..cc4b8df06ddd 100644
--- a/platform-tooling-support-tests/projects/standalone/expected-err.txt
+++ b/platform-tooling-support-tests/projects/standalone/expected-err.txt
@@ -1,4 +1,6 @@
 .+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
+.+ Loaded LauncherInterceptor instances: ..
+.+ org.junit.platform.launcher.core.ServiceLoaderRegistry load
 .+ Loaded LauncherSessionListener instances: ..
 .+ org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry loadTestEngines
 .+ Discovered TestEngines:
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 6bd095431836..97f322765d28 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -120,6 +120,7 @@ void test() throws IOException {
 				.addArguments("--show-version") //
 				.addArguments("-enableassertions") //
 				.addArguments("-Djava.util.logging.config.file=logging.properties") //
+				.addArguments("-Djunit.platform.launcher.interceptors.enabled=true") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
 				.addArguments("--scan-class-path") //
 				.addArguments("--disable-banner") //
@@ -153,6 +154,7 @@ void testOnJava8() throws IOException {
 				.addArguments("--show-version") //
 				.addArguments("-enableassertions") //
 				.addArguments("-Djava.util.logging.config.file=logging.properties") //
+				.addArguments("-Djunit.platform.launcher.interceptors.enabled=true") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
 				.addArguments("--scan-class-path") //
 				.addArguments("--disable-banner") //
@@ -187,6 +189,7 @@ void testOnJava8SelectPackage() throws IOException {
 				.addArguments("--show-version") //
 				.addArguments("-enableassertions") //
 				.addArguments("-Djava.util.logging.config.file=logging.properties") //
+				.addArguments("-Djunit.platform.launcher.interceptors.enabled=true") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
 				.addArguments("--select-package", "standalone") //
 				.addArguments("--disable-banner") //

From 39bf72bf5ab8152a18aaeca95a83b86dcb3cacc4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 23 Jan 2023 09:37:10 +0100
Subject: [PATCH 1078/1433] Increase compatibility with GraalVM

- Avoid early static initialization during native image compilation
  where possible
- Use and document `--initialize-at-build-time` build argument
---
 .../release-notes/release-notes-5.10.0-M1.adoc       |  3 ++-
 .../platform/launcher/core/EngineIdValidator.java    |  9 ++++++---
 .../platform/launcher/core/LauncherFactory.java      | 12 +++++-------
 .../launcher/core/ServiceLoaderRegistry.java         | 11 +++++++----
 .../core/ServiceLoaderTestEngineRegistry.java        |  9 ++++++---
 .../InterceptorInjectedLauncherSessionListener.java  |  9 +++++----
 .../projects/graalvm-starter/build.gradle.kts        |  9 +++++++++
 7 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index daea2f4ed0f6..716d9b3ce7e6 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -19,7 +19,8 @@ repository on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* Building native images with GraalVM now requires configuring the build arg
+  `--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig`.
 
 ==== New Features and Improvements
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
index adf3739b39e0..abeeb298acaa 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineIdValidator.java
@@ -23,8 +23,6 @@
  */
 class EngineIdValidator {
 
-	private static final Logger logger = LoggerFactory.getLogger(EngineIdValidator.class);
-
 	private EngineIdValidator() {
 	}
 
@@ -33,7 +31,7 @@ static Iterable<TestEngine> validate(Iterable<TestEngine> testEngines) {
 		for (TestEngine testEngine : testEngines) {
 			// check usage of reserved id prefix
 			if (!validateReservedIds(testEngine)) {
-				logger.warn(() -> String.format(
+				getLogger().warn(() -> String.format(
 					"Third-party TestEngine implementations are forbidden to use the reserved 'junit-' prefix for their ID: '%s'",
 					testEngine.getId()));
 			}
@@ -47,6 +45,11 @@ static Iterable<TestEngine> validate(Iterable<TestEngine> testEngines) {
 		return testEngines;
 	}
 
+	private static Logger getLogger() {
+		// Not a constant to avoid problems with building GraalVM native images
+		return LoggerFactory.getLogger(EngineIdValidator.class);
+	}
+
 	// https://github.com/junit-team/junit5/issues/1557
 	private static boolean validateReservedIds(TestEngine testEngine) {
 		String engineId = testEngine.getId();
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index eb60ce260404..172db2b89a34 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -66,8 +66,6 @@
 @API(status = STABLE, since = "1.0")
 public class LauncherFactory {
 
-	private static final ServiceLoaderRegistry SERVICE_LOADER_REGISTRY = new ServiceLoaderRegistry();
-
 	private LauncherFactory() {
 		/* no-op */
 	}
@@ -151,7 +149,7 @@ private static List<LauncherInterceptor> collectLauncherInterceptors(
 			LauncherConfigurationParameters configurationParameters) {
 		if (configurationParameters.getBoolean(ENABLE_LAUNCHER_INTERCEPTORS).orElse(false)) {
 			List<LauncherInterceptor> interceptors = new ArrayList<>();
-			SERVICE_LOADER_REGISTRY.load(LauncherInterceptor.class).forEach(interceptors::add);
+			ServiceLoaderRegistry.load(LauncherInterceptor.class).forEach(interceptors::add);
 			return interceptors;
 		}
 		return emptyList();
@@ -169,7 +167,7 @@ private static Set<TestEngine> collectTestEngines(LauncherConfig config) {
 	private static LauncherSessionListener createLauncherSessionListener(LauncherConfig config) {
 		ListenerRegistry<LauncherSessionListener> listenerRegistry = ListenerRegistry.forLauncherSessionListeners();
 		if (config.isLauncherSessionListenerAutoRegistrationEnabled()) {
-			SERVICE_LOADER_REGISTRY.load(LauncherSessionListener.class).forEach(listenerRegistry::add);
+			ServiceLoaderRegistry.load(LauncherSessionListener.class).forEach(listenerRegistry::add);
 		}
 		config.getAdditionalLauncherSessionListeners().forEach(listenerRegistry::add);
 		return listenerRegistry.getCompositeListener();
@@ -178,7 +176,7 @@ private static LauncherSessionListener createLauncherSessionListener(LauncherCon
 	private static List<PostDiscoveryFilter> collectPostDiscoveryFilters(LauncherConfig config) {
 		List<PostDiscoveryFilter> filters = new ArrayList<>();
 		if (config.isPostDiscoveryFilterAutoRegistrationEnabled()) {
-			SERVICE_LOADER_REGISTRY.load(PostDiscoveryFilter.class).forEach(filters::add);
+			ServiceLoaderRegistry.load(PostDiscoveryFilter.class).forEach(filters::add);
 		}
 		filters.addAll(config.getAdditionalPostDiscoveryFilters());
 		return filters;
@@ -186,7 +184,7 @@ private static List<PostDiscoveryFilter> collectPostDiscoveryFilters(LauncherCon
 
 	private static void registerLauncherDiscoveryListeners(LauncherConfig config, Launcher launcher) {
 		if (config.isLauncherDiscoveryListenerAutoRegistrationEnabled()) {
-			SERVICE_LOADER_REGISTRY.load(LauncherDiscoveryListener.class).forEach(
+			ServiceLoaderRegistry.load(LauncherDiscoveryListener.class).forEach(
 				launcher::registerLauncherDiscoveryListeners);
 		}
 		config.getAdditionalLauncherDiscoveryListeners().forEach(launcher::registerLauncherDiscoveryListeners);
@@ -203,7 +201,7 @@ private static void registerTestExecutionListeners(LauncherConfig config, Launch
 
 	private static Stream<TestExecutionListener> loadAndFilterTestExecutionListeners(
 			ConfigurationParameters configurationParameters) {
-		Iterable<TestExecutionListener> listeners = SERVICE_LOADER_REGISTRY.load(TestExecutionListener.class);
+		Iterable<TestExecutionListener> listeners = ServiceLoaderRegistry.load(TestExecutionListener.class);
 		String deactivatedListenersPattern = configurationParameters.get(
 			DEACTIVATE_LISTENERS_PATTERN_PROPERTY_NAME).orElse(null);
 		// @formatter:off
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
index 47ccd2f23095..54b446cce41a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderRegistry.java
@@ -24,13 +24,16 @@
  */
 class ServiceLoaderRegistry {
 
-	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderRegistry.class);
-
-	<T> Iterable<T> load(Class<T> serviceProviderClass) {
+	static <T> Iterable<T> load(Class<T> serviceProviderClass) {
 		Iterable<T> listeners = ServiceLoader.load(serviceProviderClass, ClassLoaderUtils.getDefaultClassLoader());
-		logger.config(() -> "Loaded " + serviceProviderClass.getSimpleName() + " instances: "
+		getLogger().config(() -> "Loaded " + serviceProviderClass.getSimpleName() + " instances: "
 				+ stream(listeners.spliterator(), false).map(Object::toString).collect(toList()));
 		return listeners;
 	}
 
+	private static Logger getLogger() {
+		// Not a constant to avoid problems with building GraalVM native images
+		return LoggerFactory.getLogger(ServiceLoaderRegistry.class);
+	}
+
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
index 00233a6b44db..9959e6e3a2e7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/ServiceLoaderTestEngineRegistry.java
@@ -29,13 +29,16 @@ public final class ServiceLoaderTestEngineRegistry {
 	public ServiceLoaderTestEngineRegistry() {
 	}
 
-	private static final Logger logger = LoggerFactory.getLogger(ServiceLoaderTestEngineRegistry.class);
-
 	public Iterable<TestEngine> loadTestEngines() {
 		Iterable<TestEngine> testEngines = ServiceLoader.load(TestEngine.class,
 			ClassLoaderUtils.getDefaultClassLoader());
-		logger.config(() -> TestEngineFormatter.format("Discovered TestEngines", testEngines));
+		getLogger().config(() -> TestEngineFormatter.format("Discovered TestEngines", testEngines));
 		return testEngines;
 	}
 
+	private static Logger getLogger() {
+		// Not a constant to avoid problems with building GraalVM native images
+		return LoggerFactory.getLogger(ServiceLoaderTestEngineRegistry.class);
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/InterceptorInjectedLauncherSessionListener.java b/platform-tests/src/test/java/org/junit/platform/launcher/InterceptorInjectedLauncherSessionListener.java
index 87cd780ba6f9..bbaed89e2e91 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/InterceptorInjectedLauncherSessionListener.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/InterceptorInjectedLauncherSessionListener.java
@@ -28,8 +28,9 @@ public void launcherSessionOpened(LauncherSession session) {
 		CALLS++;
 	}
 
-    @Override
-    public void launcherSessionClosed(LauncherSession session) {
-        assertEquals(TestLauncherInterceptor1.CLASSLOADER_NAME, Thread.currentThread().getContextClassLoader().getName());
-    }
+	@Override
+	public void launcherSessionClosed(LauncherSession session) {
+		assertEquals(TestLauncherInterceptor1.CLASSLOADER_NAME,
+			Thread.currentThread().getContextClassLoader().getName());
+	}
 }
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts b/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
index edd8bd7b7474..cd346c7f1ac5 100644
--- a/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
@@ -27,3 +27,12 @@ tasks.test {
 		)
 	}
 }
+
+graalvmNative {
+	binaries {
+		named("test") {
+			buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig")
+			buildArgs.add("-H:+ReportExceptionStackTraces")
+		}
+	}
+}

From 872146d6035e44f66e00195b43161b65d23f09b8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 31 Jan 2023 15:08:29 +0100
Subject: [PATCH 1079/1433] Document LauncherInterceptor

---
 .../src/docs/asciidoc/link-attributes.adoc    |  1 +
 .../release-notes-5.10.0-M1.adoc              |  5 ++
 .../advanced-topics/launcher-api.adoc         | 18 ++++++
 .../asciidoc/user-guide/running-tests.adoc    |  5 +-
 .../example/CustomLauncherInterceptor.java    | 55 +++++++++++++++++++
 .../platform/launcher/LauncherConstants.java  | 11 ++++
 .../launcher/LauncherInterceptor.java         | 31 ++++++++++-
 7 files changed, 123 insertions(+), 3 deletions(-)
 create mode 100644 documentation/src/test/java/example/CustomLauncherInterceptor.java

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 025ab6fc86d4..224d99ea4bdd 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -33,6 +33,7 @@ endif::[]
 :LauncherDiscoveryRequest:                   {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/LauncherDiscoveryRequest.html[LauncherDiscoveryRequest]
 :LauncherDiscoveryRequestBuilder:            {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.html[LauncherDiscoveryRequestBuilder]
 :LauncherFactory:                            {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/core/LauncherFactory.html[LauncherFactory]
+:LauncherInterceptor:                        {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/LauncherInterceptor.html[LauncherInterceptor]
 :LauncherSession:                            {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/LauncherSession.html[LauncherSession]
 :LauncherSessionListener:                    {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/LauncherSessionListener.html[LauncherSessionListener]
 :LoggingListener:                            {javadoc-root}/org.junit.platform.launcher/org/junit/platform/launcher/listeners/LoggingListener.html[LoggingListener]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 716d9b3ce7e6..15f400b83b4e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -31,6 +31,11 @@ repository on GitHub.
   methods are called in reverse order compared to the former when multiple listeners are
   registered. This affects the following listener interfaces: `TestExecutionListener`,
   `EngineExecutionListener`, `LauncherDiscoveryListener`, and `LauncherSessionListener`.
+* Introduce `LauncherInterceptor` SPI for intercepting the creation of instances of
+  `Launcher` and `LauncherSessionlistener` as well as calls for `discover` and `execute`
+  of the former. Please refer to the
+  <<../user-guide/index.adoc#launcher-api-launcher-interceptors-custom, User Guide>> for
+  details.
 
 [[release-notes-5.10.0-M1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
index 4fcd0996c9df..8f98a7e825b1 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
@@ -163,6 +163,24 @@ include::{testDir}/example/session/HttpTests.java[tags=user_guide]
 <3> Send a request to the server
 <4> Check the status code of the response
 
+[[launcher-api-launcher-interceptors-custom]]
+==== Registering a LauncherInterceptor
+
+In order to intercept the creation of instances of `{Launcher}` and
+`{LauncherSessionListener}` and calls to the `discover` and `execute` methods of the
+former, clients can registercustom implementations of `{LauncherInterceptor}` via Java's
+`{ServiceLoader}` mechanism by additionally setting the
+`junit.platform.launcher.interceptors.enabled` <<running-tests-config-params,
+configuration parameter>> to `true`.
+
+A typical use case is to create a custom replace the `ClassLoader` used by the JUnit
+Platform to load test classes and engine implementations.
+
+[source,java]
+----
+include::{testDir}/example/CustomLauncherInterceptor.java[tags=user_guide]
+----
+
 [[launcher-api-launcher-discovery-listeners-custom]]
 ==== Registering a LauncherDiscoveryListener
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index e88d0056e5fe..cdff368b4f3a 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -979,7 +979,7 @@ because particularly when
 to attribute it to a specific test or container.
 
 [[running-tests-listeners]]
-=== Using Listeners
+=== Using Listeners and Interceptors
 
 The JUnit Platform provides the following listener APIs that allow JUnit, third parties,
 and custom user code to react to events fired at various points during the discovery and
@@ -987,6 +987,8 @@ execution of a `TestPlan`.
 
 * `{LauncherSessionListener}`: receives events when a `{LauncherSession}` is opened and
   closed.
+* `{LauncherInterceptor}`: intercepts test discovery and execution in the context of a
+  `LauncherSession`.
 * `{LauncherDiscoveryListener}`: receives events that occur during test discovery.
 * `{TestExecutionListener}`: receives events that occur during test execution.
 
@@ -1003,6 +1005,7 @@ For details on registering and configuring listeners, see the following sections
 guide.
 
 * <<launcher-api-launcher-session-listeners-custom>>
+* <<launcher-api-launcher-interceptors-custom>>
 * <<launcher-api-launcher-discovery-listeners-custom>>
 * <<launcher-api-listeners-custom>>
 * <<launcher-api-listeners-config>>
diff --git a/documentation/src/test/java/example/CustomLauncherInterceptor.java b/documentation/src/test/java/example/CustomLauncherInterceptor.java
new file mode 100644
index 000000000000..149cf7e45440
--- /dev/null
+++ b/documentation/src/test/java/example/CustomLauncherInterceptor.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package example;
+
+// tag::user_guide[]
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.platform.launcher.LauncherInterceptor;
+
+public class CustomLauncherInterceptor implements LauncherInterceptor {
+
+	private final URLClassLoader customClassLoader;
+
+	public CustomLauncherInterceptor() throws Exception {
+		ClassLoader parent = Thread.currentThread().getContextClassLoader();
+		customClassLoader = new URLClassLoader(new URL[] { URI.create("some.jar").toURL() }, parent);
+	}
+
+	@Override
+	public <T> T intercept(Invocation<T> invocation) {
+		Thread currentThread = Thread.currentThread();
+		ClassLoader originalClassLoader = currentThread.getContextClassLoader();
+		currentThread.setContextClassLoader(customClassLoader);
+		try {
+			return invocation.proceed();
+		}
+		finally {
+			currentThread.setContextClassLoader(originalClassLoader);
+		}
+	}
+
+	@Override
+	public void close() {
+		try {
+			customClassLoader.close();
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException("Failed to close custom class loader", e);
+		}
+	}
+}
+// end::user_guide[]
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index 218bf3a077ed..12f52e2edf05 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.launcher;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
@@ -135,6 +136,16 @@ public class LauncherConstants {
 	 */
 	public static final String DEACTIVATE_ALL_LISTENERS_PATTERN = ClassNamePatternFilterUtils.DEACTIVATE_ALL_PATTERN;
 
+	/**
+	 * Property name used to enable support for
+	 * {@link LauncherInterceptor} instances to be registered via the
+	 * {@link java.util.ServiceLoader ServiceLoader} mechanism: {@value}
+	 *
+	 * <p>By default, interceptor registration is disabled.
+	 *
+	 * @see LauncherInterceptor
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
 	public static final String ENABLE_LAUNCHER_INTERCEPTORS = "junit.platform.launcher.interceptors.enabled";
 
 	private LauncherConstants() {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
index a8a4111dd327..7f4c0e17c70f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
@@ -18,10 +18,37 @@
 import org.apiguardian.api.API;
 
 /**
- * Interceptor for test discovery and execution by a {@link Launcher}.
+ * Interceptor for test discovery and execution by a {@link Launcher} in the
+ * context of a {@link LauncherSession}.
  *
  * <p>Interceptors are instantiated once per {@link LauncherSession} and closed
- * when the session is about to be closed.
+ * after the session is closed. They can
+ * {@linkplain #intercept(Invocation) intercept} the following invocations:
+ * <ul>
+ *     <li>
+ *         creation of {@link LauncherSessionListener} instances registered via the
+ *         {@link java.util.ServiceLoader ServiceLoader} mechanism
+ *     </li>
+ *     <li>
+ *         creation of {@link Launcher} instances
+ *     </li>
+ *     <li>
+ *         calls to {@link Launcher#discover(LauncherDiscoveryRequest)},
+ *         {@link Launcher#execute(TestPlan, TestExecutionListener...)}, and
+ *         {@link Launcher#execute(LauncherDiscoveryRequest, TestExecutionListener...)}
+ *     </li>
+ * </ul>
+ *
+ * <p>Implementations of this interface can be registered via the
+ * {@link java.util.ServiceLoader ServiceLoader} mechanism by additionally
+ * setting the {@value LauncherConstants#ENABLE_LAUNCHER_INTERCEPTORS}
+ * configuration parameter to {@code true}.
+ *
+ * <p>A typical use case is to create a custom {@link ClassLoader} in the
+ * constructor of the implementing class, replace the
+ * {@link Thread#setContextClassLoader(ClassLoader) contextClassLoader} of the
+ * current thread while {@link #intercept(Invocation) intercepting} invocations,
+ * and close the custom {@code ClassLoader} in {@link #close()}
  *
  * @since 1.10
  * @see Launcher

From 700c2d4f25b48bfc4970f99d3198af5e8c5e3f37 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 31 Jan 2023 15:49:28 +0100
Subject: [PATCH 1080/1433] Hide implementation details

---
 .../launcher/LauncherInterceptor.java         | 39 ------------------
 .../launcher/core/DefaultLauncherSession.java | 40 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
index 7f4c0e17c70f..262a1d539809 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherInterceptor.java
@@ -11,9 +11,6 @@
 package org.junit.platform.launcher;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
-import static org.apiguardian.api.API.Status.INTERNAL;
-
-import java.util.List;
 
 import org.apiguardian.api.API;
 
@@ -58,18 +55,6 @@
 @API(status = EXPERIMENTAL, since = "1.10")
 public interface LauncherInterceptor {
 
-	LauncherInterceptor NOOP = new LauncherInterceptor() {
-		@Override
-		public <T> T intercept(Invocation<T> invocation) {
-			return invocation.proceed();
-		}
-
-		@Override
-		public void close() {
-			// do nothing
-		}
-	};
-
 	/**
 	 * Intercept the supplied invocation.
 	 *
@@ -97,28 +82,4 @@ interface Invocation<T> {
 		T proceed();
 	}
 
-	@API(status = INTERNAL, since = "1.10")
-	static LauncherInterceptor composite(List<LauncherInterceptor> interceptors) {
-		if (interceptors.isEmpty()) {
-			return NOOP;
-		}
-		return interceptors.stream() //
-				.skip(1) //
-				.reduce(interceptors.get(0), (a, b) -> new LauncherInterceptor() {
-					@Override
-					public void close() {
-						try {
-							a.close();
-						}
-						finally {
-							b.close();
-						}
-					}
-
-					@Override
-					public <T> T intercept(Invocation<T> invocation) {
-						return a.intercept(() -> b.intercept(invocation));
-					}
-				});
-	}
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
index 42969448616e..b3743ac253a7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/DefaultLauncherSession.java
@@ -28,15 +28,27 @@
  */
 class DefaultLauncherSession implements LauncherSession {
 
+	private static final LauncherInterceptor NOOP_INTERCEPTOR = new LauncherInterceptor() {
+		@Override
+		public <T> T intercept(Invocation<T> invocation) {
+			return invocation.proceed();
+		}
+
+		@Override
+		public void close() {
+			// do nothing
+		}
+	};
+
 	private final LauncherInterceptor interceptor;
 	private final LauncherSessionListener listener;
 	private final DelegatingLauncher launcher;
 
 	DefaultLauncherSession(List<LauncherInterceptor> interceptors, Supplier<LauncherSessionListener> listenerSupplier,
 			Supplier<Launcher> launcherSupplier) {
-		interceptor = LauncherInterceptor.composite(interceptors);
+		interceptor = composite(interceptors);
 		Launcher launcher;
-		if (interceptor == LauncherInterceptor.NOOP) {
+		if (interceptor == NOOP_INTERCEPTOR) {
 			this.listener = listenerSupplier.get();
 			launcher = launcherSupplier.get();
 		}
@@ -98,4 +110,28 @@ public void execute(TestPlan testPlan, TestExecutionListener... listeners) {
 			throw new PreconditionViolationException("Launcher session has already been closed");
 		}
 	}
+
+	private static LauncherInterceptor composite(List<LauncherInterceptor> interceptors) {
+		if (interceptors.isEmpty()) {
+			return NOOP_INTERCEPTOR;
+		}
+		return interceptors.stream() //
+				.skip(1) //
+				.reduce(interceptors.get(0), (a, b) -> new LauncherInterceptor() {
+					@Override
+					public void close() {
+						try {
+							a.close();
+						}
+						finally {
+							b.close();
+						}
+					}
+
+					@Override
+					public <T> T intercept(Invocation<T> invocation) {
+						return a.intercept(() -> b.intercept(invocation));
+					}
+				});
+	}
 }

From 5b04c9492ab565f7a85bdf1789f7116f374a7a0d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 6 Feb 2023 12:59:27 +0100
Subject: [PATCH 1081/1433] Upgradle to 8.0-rc-3

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7bcc7d13f585..6bf23e12bda4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=28ebe9afc20564bcdc39bfe36f6b60a373e40be2c3c307a0028b545b8ccf6ba0
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-2-bin.zip
+distributionSha256Sum=9fb87bbe73f963a4c23daede3a5ed78e7ae770f3e980d3cb15d8df04518b542d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From c0ebe649b2772cfae172ab9a2b531c1728d7b4a0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 14 Feb 2023 08:56:42 +0100
Subject: [PATCH 1082/1433] Upgradle to 8.0

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6bf23e12bda4..c9b0f7a0a4ec 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9fb87bbe73f963a4c23daede3a5ed78e7ae770f3e980d3cb15d8df04518b542d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-3-bin.zip
+distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 07e788a249b37db4a1ffd6fd3d3217b9b182811f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 14 Feb 2023 13:01:32 +0100
Subject: [PATCH 1083/1433] Fix --scan without access key

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index d5a105f8a462..fb3a60defb20 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -1,4 +1,5 @@
 import com.gradle.enterprise.gradleplugin.testretry.retry
+import com.gradle.enterprise.gradleplugin.testselection.internal.PredictiveTestSelectionExtensionInternal
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
 import org.gradle.internal.os.OperatingSystem
@@ -37,6 +38,10 @@ tasks.withType<Test>().configureEach {
 	}
 	predictiveSelection {
 		enabled.set(providers.gradleProperty("enablePredictiveTestSelection").map(String::toBoolean).orElse(true))
+
+        // Ensure PTS works when publishing Build Scans to scans.gradle.com
+		this as PredictiveTestSelectionExtensionInternal
+		server.set(uri("https://ge.junit.org"))
 	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 	// Required until ASM officially supports the JDK 14

From 988594eb57b30b9ca8dccc89eb2f0f589db5dca1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 15 Feb 2023 18:56:26 +0100
Subject: [PATCH 1084/1433] Fix formatting

---
 buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
index fb3a60defb20..3a2c6a5e164d 100644
--- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts
@@ -39,7 +39,7 @@ tasks.withType<Test>().configureEach {
 	predictiveSelection {
 		enabled.set(providers.gradleProperty("enablePredictiveTestSelection").map(String::toBoolean).orElse(true))
 
-        // Ensure PTS works when publishing Build Scans to scans.gradle.com
+		// Ensure PTS works when publishing Build Scans to scans.gradle.com
 		this as PredictiveTestSelectionExtensionInternal
 		server.set(uri("https://ge.junit.org"))
 	}

From 1711f1c7b9fca4d269c46046624e9b5b3136e861 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 16 Feb 2023 13:21:13 +0100
Subject: [PATCH 1085/1433] Disable CodeQL Java check due to Kotlin 1.8.10 not
 yet being supported

---
 .github/workflows/codeql-analysis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cddd98a1e054..61e9b0b52914 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ['java', 'javascript']
+        language:
+          # - java # Currently broken because it doesn't support Kotlin 1.8.10, yet (https://github.com/github/codeql/discussions/11460#discussioncomment-4879731)
+          - javascript
     steps:
     - name: Check out repository
       uses: actions/checkout@v3

From 98631e34f90c79e6d55d2c8f83e42cd0de2fc48f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:01:39 +0100
Subject: [PATCH 1086/1433] Bump Spotless from 6.14.0 to 6.15.0 (#3154)

Bumps [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.14.0 to 6.15.0.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/gradle/6.14.0...gradle/6.15.0)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-plugin-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b3fa9bb68f0f..a947c105fadf 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
-	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.14.0")
+	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.15.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.44.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.2") // keep in sync with root settings.gradle.kts

From e89c798df0bff645fb0f70c1af230f5bbc82c23a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:02:04 +0100
Subject: [PATCH 1087/1433] Bump Kotlin from 1.8.0 to 1.8.10 (#3145)

Bumps Kotlin Gradle plugin from 1.8.0 to 1.8.10.

---
updated-dependencies:
- dependency-name: jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0f6ac2c4f56c..69afba8a852d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"
-		kotlin("jvm") version "1.8.0"
+		kotlin("jvm") version "1.8.10"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
 		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"

From 9264ec7c7d0998590236cebaa8542a02865b6722 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:07:55 +0100
Subject: [PATCH 1088/1433] Bump com.github.ben-manes.versions from 0.44.0 to
 0.45.0 (#3144)

Bumps com.github.ben-manes.versions from 0.44.0 to 0.45.0.

---
updated-dependencies:
- dependency-name: com.github.ben-manes.versions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index a947c105fadf..678acfa3d06f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	`kotlin-dsl`
-	id("com.github.ben-manes.versions") version "0.44.0"
+	id("com.github.ben-manes.versions") version "0.45.0"
 }
 
 repositories {

From 919ca032be57e95651f756b9f0e7ba947548c415 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:08:12 +0100
Subject: [PATCH 1089/1433] Bump com.gradle.enterprise from 3.12.2 to 3.12.3
 (#3147)

Bumps com.gradle.enterprise from 3.12.2 to 3.12.3.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 69afba8a852d..4270d9d8df17 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.12.2" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise") version "3.12.3" // keep in sync with buildSrc/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"

From cae2bff03d63c956f6f7e06f18128babad44fdd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:08:42 +0100
Subject: [PATCH 1090/1433] Bump gradle-enterprise-gradle-plugin in buildSrc to
 3.12.3 (#3146)

Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.12.2 to 3.12.3.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 678acfa3d06f..4ffac612a5b4 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.15.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.44.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.2") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.3") // keep in sync with root settings.gradle.kts
 }
 
 tasks {

From 4b1de7de4afc50f84116ca69c30011f4ac622282 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Thu, 16 Feb 2023 15:56:47 +0100
Subject: [PATCH 1091/1433] Replace buildSrc with an included build (#3151)

- moved `buildSrc` to `gradle/plugins`
- added `junitbuild` as group to all plugins
- moved build logic classes from `org.junit.gradle` package
  to `junitbuild` package

Resolves #3149.
---
 .gitignore                                           |  3 +--
 build.gradle.kts                                     | 12 ++++++------
 buildSrc/settings.gradle.kts                         |  1 -
 buildSrc/src/main/kotlin/base-conventions.gradle.kts |  6 ------
 documentation/documentation.gradle.kts               |  8 ++++----
 {buildSrc => gradle/plugins}/build.gradle.kts        |  4 ++--
 gradle/plugins/settings.gradle.kts                   |  0
 .../plugins}/src/main/kotlin/JavaLibraryExtension.kt |  0
 .../plugins}/src/main/kotlin/License.kt              |  0
 .../plugins}/src/main/kotlin/ProjectExtensions.kt    |  0
 .../plugins}/src/main/kotlin/TaskExtensions.kt       |  0
 .../kotlin/junitbuild.base-conventions.gradle.kts    |  6 ++++++
 .../main/kotlin/junitbuild.build-metadata.gradle.kts |  0
 .../junitbuild.dependency-update-check.gradle.kts    |  0
 ...itbuild.jacoco-aggregation-conventions.gradle.kts |  2 +-
 .../kotlin/junitbuild.jacoco-conventions.gradle.kts  |  0
 .../junitbuild.jacoco-java-conventions.gradle.kts    |  2 +-
 .../junitbuild.java-library-conventions.gradle.kts   | 12 ++++++------
 .../junitbuild.java-multi-release-sources.gradle.kts |  2 +-
 .../kotlin/junitbuild.java-repackage-jars.gradle.kts |  0
 .../junitbuild.java-toolchain-conventions.gradle.kts |  0
 .../junitbuild.junit4-compatibility.gradle.kts       |  2 +-
 .../junitbuild.kotlin-library-conventions.gradle.kts |  2 +-
 .../kotlin/junitbuild.osgi-conventions.gradle.kts    |  0
 .../junitbuild.publishing-conventions.gradle.kts     |  2 +-
 .../kotlin/junitbuild.shadow-conventions.gradle.kts  |  2 +-
 .../junitbuild.spotless-conventions.gradle.kts       |  0
 .../kotlin/junitbuild.temp-maven-repo.gradle.kts     |  0
 .../kotlin/junitbuild.testing-conventions.gradle.kts |  0
 .../exec/ClasspathSystemPropertyProvider.kt          |  2 +-
 .../kotlin/junitbuild}/exec/RunConsoleLauncher.kt    |  2 +-
 .../main/kotlin/junitbuild}/java/ExecJarAction.kt    |  2 +-
 .../junitbuild}/java/ModulePathArgumentProvider.kt   |  2 +-
 .../junitbuild}/java/PatchModuleArgumentProvider.kt  |  2 +-
 .../kotlin/junitbuild}/java/WriteArtifactsFile.kt    |  2 +-
 .../javadoc/ModuleSpecificJavadocFileOption.kt       |  2 +-
 junit-bom/junit-bom.gradle.kts                       |  2 +-
 junit-jupiter-api/junit-jupiter-api.gradle.kts       |  2 +-
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts |  4 ++--
 .../junit-jupiter-migrationsupport.gradle.kts        |  6 +++---
 junit-jupiter-params/junit-jupiter-params.gradle.kts |  6 +++---
 junit-jupiter/junit-jupiter.gradle.kts               |  2 +-
 .../junit-platform-commons.gradle.kts                |  8 ++++----
 .../junit-platform-console-standalone.gradle.kts     |  6 +++---
 .../junit-platform-console.gradle.kts                | 10 +++++-----
 .../junit-platform-engine.gradle.kts                 |  2 +-
 junit-platform-jfr/junit-platform-jfr.gradle.kts     |  2 +-
 .../junit-platform-launcher.gradle.kts               |  2 +-
 .../junit-platform-reporting.gradle.kts              |  4 ++--
 .../junit-platform-runner.gradle.kts                 |  4 ++--
 .../junit-platform-suite-api.gradle.kts              |  2 +-
 .../junit-platform-suite-commons.gradle.kts          |  2 +-
 .../junit-platform-suite-engine.gradle.kts           |  2 +-
 junit-platform-suite/junit-platform-suite.gradle.kts |  2 +-
 .../junit-platform-testkit.gradle.kts                |  2 +-
 junit-vintage-engine/junit-vintage-engine.gradle.kts |  6 +++---
 platform-tests/platform-tests.gradle.kts             |  6 +++---
 .../platform-tooling-support-tests.gradle.kts        |  4 ++--
 settings.gradle.kts                                  |  1 +
 59 files changed, 83 insertions(+), 84 deletions(-)
 delete mode 100644 buildSrc/settings.gradle.kts
 delete mode 100644 buildSrc/src/main/kotlin/base-conventions.gradle.kts
 rename {buildSrc => gradle/plugins}/build.gradle.kts (94%)
 create mode 100644 gradle/plugins/settings.gradle.kts
 rename {buildSrc => gradle/plugins}/src/main/kotlin/JavaLibraryExtension.kt (100%)
 rename {buildSrc => gradle/plugins}/src/main/kotlin/License.kt (100%)
 rename {buildSrc => gradle/plugins}/src/main/kotlin/ProjectExtensions.kt (100%)
 rename {buildSrc => gradle/plugins}/src/main/kotlin/TaskExtensions.kt (100%)
 create mode 100644 gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts
 rename buildSrc/src/main/kotlin/build-metadata.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.build-metadata.gradle.kts (100%)
 rename buildSrc/src/main/kotlin/dependency-update-check.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts (100%)
 rename buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts (90%)
 rename buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts (100%)
 rename buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts (95%)
 rename buildSrc/src/main/kotlin/java-library-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts (96%)
 rename buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts (96%)
 rename buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts (100%)
 rename buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts (100%)
 rename buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts (90%)
 rename buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts (92%)
 rename buildSrc/src/main/kotlin/osgi-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts (100%)
 rename buildSrc/src/main/kotlin/publishing-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts (98%)
 rename buildSrc/src/main/kotlin/shadow-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts (96%)
 rename buildSrc/src/main/kotlin/spotless-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts (100%)
 rename buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts (100%)
 rename buildSrc/src/main/kotlin/testing-conventions.gradle.kts => gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts (100%)
 rename {buildSrc/src/main/kotlin/org/junit/gradle => gradle/plugins/src/main/kotlin/junitbuild}/exec/ClasspathSystemPropertyProvider.kt (92%)
 rename {buildSrc/src/main/kotlin/org/junit/gradle => gradle/plugins/src/main/kotlin/junitbuild}/exec/RunConsoleLauncher.kt (98%)
 rename {buildSrc/src/main/kotlin/org/junit/gradle => gradle/plugins/src/main/kotlin/junitbuild}/java/ExecJarAction.kt (96%)
 rename {buildSrc/src/main/kotlin/org/junit/gradle => gradle/plugins/src/main/kotlin/junitbuild}/java/ModulePathArgumentProvider.kt (97%)
 rename {buildSrc/src/main/kotlin/org/junit/gradle => gradle/plugins/src/main/kotlin/junitbuild}/java/PatchModuleArgumentProvider.kt (98%)
 rename {buildSrc/src/main/kotlin/org/junit/gradle => gradle/plugins/src/main/kotlin/junitbuild}/java/WriteArtifactsFile.kt (97%)
 rename {buildSrc/src/main/kotlin/org/junit/gradle => gradle/plugins/src/main/kotlin/junitbuild}/javadoc/ModuleSpecificJavadocFileOption.kt (96%)

diff --git a/.gitignore b/.gitignore
index e5f0af67bde0..6d276115b4be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 # Gradle
 .gradle
-/build/
-/*/build/
+build
 
 # Ignore Gradle GUI config
 gradle-app.setting
diff --git a/build.gradle.kts b/build.gradle.kts
index 5379f61f82be..0fc9203523f2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
 	id("io.spring.nohttp")
 	id("io.github.gradle-nexus.publish-plugin")
-	`base-conventions`
-	`build-metadata`
-	`dependency-update-check`
-	`jacoco-aggregation-conventions`
-	`temp-maven-repo`
+	id("junitbuild.base-conventions")
+	id("junitbuild.build-metadata")
+	id("junitbuild.dependency-update-check")
+	id("junitbuild.jacoco-aggregation-conventions")
+	id("junitbuild.temp-maven-repo")
 }
 
 description = "JUnit 5"
@@ -61,5 +61,5 @@ nexusPublishing {
 }
 
 nohttp {
-	source.exclude("buildSrc/build/generated-sources/**")
+	source.exclude("**/.gradle/**", "gradle/plugins/build/generated-sources/**")
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
deleted file mode 100644
index 29744ec1bcde..000000000000
--- a/buildSrc/settings.gradle.kts
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "buildSrc"
diff --git a/buildSrc/src/main/kotlin/base-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-conventions.gradle.kts
deleted file mode 100644
index 0c4c4c5f7a29..000000000000
--- a/buildSrc/src/main/kotlin/base-conventions.gradle.kts
+++ /dev/null
@@ -1,6 +0,0 @@
-plugins {
-	eclipse
-	idea
-	id("java-toolchain-conventions")
-	id("spotless-conventions")
-}
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 760c6c3d00d6..a357d9f2d421 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -2,9 +2,9 @@ import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.junit.gradle.exec.ClasspathSystemPropertyProvider
-import org.junit.gradle.exec.RunConsoleLauncher
-import org.junit.gradle.javadoc.ModuleSpecificJavadocFileOption
+import junitbuild.exec.ClasspathSystemPropertyProvider
+import junitbuild.exec.RunConsoleLauncher
+import junitbuild.javadoc.ModuleSpecificJavadocFileOption
 import java.io.ByteArrayOutputStream
 import java.nio.file.Files
 
@@ -12,7 +12,7 @@ plugins {
 	id("org.asciidoctor.jvm.convert")
 	id("org.asciidoctor.jvm.pdf")
 	id("org.ajoberstar.git-publish")
-	`kotlin-library-conventions`
+	id("junitbuild.kotlin-library-conventions")
 }
 
 val modularProjects: List<Project> by rootProject
diff --git a/buildSrc/build.gradle.kts b/gradle/plugins/build.gradle.kts
similarity index 94%
rename from buildSrc/build.gradle.kts
rename to gradle/plugins/build.gradle.kts
index 4ffac612a5b4..5afee3e2d70d 100644
--- a/buildSrc/build.gradle.kts
+++ b/gradle/plugins/build.gradle.kts
@@ -20,11 +20,11 @@ dependencies {
 
 tasks {
 	withType<JavaCompile>().configureEach {
-		options.release.set(8)
+		options.release.set(11)
 	}
 	withType<KotlinCompile>().configureEach {
 		kotlinOptions {
-			jvmTarget = "1.8"
+			jvmTarget = "11"
 			allWarningsAsErrors = true
 		}
 	}
diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/buildSrc/src/main/kotlin/JavaLibraryExtension.kt b/gradle/plugins/src/main/kotlin/JavaLibraryExtension.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/JavaLibraryExtension.kt
rename to gradle/plugins/src/main/kotlin/JavaLibraryExtension.kt
diff --git a/buildSrc/src/main/kotlin/License.kt b/gradle/plugins/src/main/kotlin/License.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/License.kt
rename to gradle/plugins/src/main/kotlin/License.kt
diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/gradle/plugins/src/main/kotlin/ProjectExtensions.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/ProjectExtensions.kt
rename to gradle/plugins/src/main/kotlin/ProjectExtensions.kt
diff --git a/buildSrc/src/main/kotlin/TaskExtensions.kt b/gradle/plugins/src/main/kotlin/TaskExtensions.kt
similarity index 100%
rename from buildSrc/src/main/kotlin/TaskExtensions.kt
rename to gradle/plugins/src/main/kotlin/TaskExtensions.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts
new file mode 100644
index 000000000000..4bd5a4660201
--- /dev/null
+++ b/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts
@@ -0,0 +1,6 @@
+plugins {
+	eclipse
+	idea
+	id("junitbuild.java-toolchain-conventions")
+	id("junitbuild.spotless-conventions")
+}
diff --git a/buildSrc/src/main/kotlin/build-metadata.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.build-metadata.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/build-metadata.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.build-metadata.gradle.kts
diff --git a/buildSrc/src/main/kotlin/dependency-update-check.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/dependency-update-check.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
diff --git a/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
similarity index 90%
rename from buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
index cd32b2d65517..e611a9f622d1 100644
--- a/buildSrc/src/main/kotlin/jacoco-aggregation-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.kotlin.dsl.`jacoco-report-aggregation`
 import org.gradle.testing.jacoco.plugins.JacocoCoverageReport
 
 plugins {
-	id("jacoco-conventions")
+	id("junitbuild.jacoco-conventions")
 	`jacoco-report-aggregation`
 }
 
diff --git a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
similarity index 95%
rename from buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
index 265ff8937069..42f7c754fd4e 100644
--- a/buildSrc/src/main/kotlin/jacoco-java-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.api.attributes.LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE
 
 plugins {
 	java
-	id("jacoco-conventions")
+	id("junitbuild.jacoco-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
similarity index 96%
rename from buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
index e2df86c8984f..bb586e37605c 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
@@ -1,14 +1,14 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.junit.gradle.java.ModulePathArgumentProvider
-import org.junit.gradle.java.PatchModuleArgumentProvider
+import junitbuild.java.ModulePathArgumentProvider
+import junitbuild.java.PatchModuleArgumentProvider
 
 plugins {
 	`java-library`
 	eclipse
 	idea
 	checkstyle
-	id("base-conventions")
-	id("jacoco-java-conventions")
+	id("junitbuild.base-conventions")
+	id("junitbuild.jacoco-java-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
@@ -42,8 +42,8 @@ java {
 
 if (project in mavenizedProjects) {
 
-	apply(plugin = "publishing-conventions")
-	apply(plugin = "osgi-conventions")
+	apply(plugin = "junitbuild.publishing-conventions")
+	apply(plugin = "junitbuild.osgi-conventions")
 
 	java {
 		withJavadocJar()
diff --git a/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
similarity index 96%
rename from buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
index fb71c3e95003..7f2af9d50e7e 100644
--- a/buildSrc/src/main/kotlin/java-multi-release-sources.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
diff --git a/buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/java-repackage-jars.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts
diff --git a/buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/java-toolchain-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
similarity index 90%
rename from buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
index 89ca169b699e..e43c938e5ca4 100644
--- a/buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 			strictly("4.12")
 		}
 	}
-	pluginManager.withPlugin("osgi-conventions") {
+	pluginManager.withPlugin("junitbuild.osgi-conventions") {
 		val junit4Osgi = requiredVersionFromLibs("junit4Osgi")
 		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:${junit4Osgi}")
 	}
diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
similarity index 92%
rename from buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
index 163190944bae..bfb33224a709 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 	kotlin("jvm")
 }
 
diff --git a/buildSrc/src/main/kotlin/osgi-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/osgi-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
similarity index 98%
rename from buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
index c4e28d5bb3a9..7f8b617b3084 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 	`maven-publish`
 	signing
-	id("base-conventions")
+	id("junitbuild.base-conventions")
 }
 
 val isSnapshot = project.version.toString().contains("SNAPSHOT")
diff --git a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
similarity index 96%
rename from buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
index 19028422c41e..d9f93aa3839d 100644
--- a/buildSrc/src/main/kotlin/shadow-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	id("java-library-conventions")
+	id("junitbuild.java-library-conventions")
 	id("com.github.johnrengelman.shadow")
 }
 
diff --git a/buildSrc/src/main/kotlin/spotless-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/spotless-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/temp-maven-repo.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/testing-conventions.gradle.kts
rename to gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/exec/ClasspathSystemPropertyProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
similarity index 92%
rename from buildSrc/src/main/kotlin/org/junit/gradle/exec/ClasspathSystemPropertyProvider.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
index 9c6423dca171..2faeb2acaeef 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/exec/ClasspathSystemPropertyProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.exec
+package junitbuild.exec
 
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.Classpath
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
similarity index 98%
rename from buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
index 88889bcfbb1f..4ba265061662 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/exec/RunConsoleLauncher.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.exec
+package junitbuild.exec
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
similarity index 96%
rename from buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
index afc97f404fcc..a900b9c646c3 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/ExecJarAction.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.Action
 import org.gradle.api.Task
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
index adb478c42f82..3133c35a2ead 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/ModulePathArgumentProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.Named
 import org.gradle.api.Project
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
similarity index 98%
rename from buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
index f13fd8b9a83b..93210bfc41a7 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/PatchModuleArgumentProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import javaModuleName
 import org.gradle.api.Named
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
index 12107fc8f824..d0b56930cf08 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/java/WriteArtifactsFile.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.java
+package junitbuild.java
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
diff --git a/buildSrc/src/main/kotlin/org/junit/gradle/javadoc/ModuleSpecificJavadocFileOption.kt b/gradle/plugins/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
similarity index 96%
rename from buildSrc/src/main/kotlin/org/junit/gradle/javadoc/ModuleSpecificJavadocFileOption.kt
rename to gradle/plugins/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
index e9391b22d1b8..f4c6f124b65e 100644
--- a/buildSrc/src/main/kotlin/org/junit/gradle/javadoc/ModuleSpecificJavadocFileOption.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
@@ -1,4 +1,4 @@
-package org.junit.gradle.javadoc
+package junitbuild.javadoc
 
 import org.gradle.external.javadoc.JavadocOptionFileOption
 import org.gradle.external.javadoc.internal.JavadocOptionFileWriterContext
diff --git a/junit-bom/junit-bom.gradle.kts b/junit-bom/junit-bom.gradle.kts
index fae23ee37eab..485bb50d2ea3 100644
--- a/junit-bom/junit-bom.gradle.kts
+++ b/junit-bom/junit-bom.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
 	`java-platform`
-	`publishing-conventions`
+	id("junitbuild.publishing-conventions")
 }
 
 description = "${rootProject.description} (Bill of Materials)"
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index d28dec7bf358..e4f2869ae39f 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`kotlin-library-conventions`
+	id("junitbuild.kotlin-library-conventions")
 	`java-test-fixtures`
 }
 
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index e15a42bf136e..7ce27bcf32e7 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -1,8 +1,8 @@
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
-	`kotlin-library-conventions`
-	`testing-conventions`
+	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.testing-conventions")
 	groovy
 	`java-test-fixtures`
 }
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index ff570cc7c87c..e9b8e0c049fd 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
-	`testing-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
+	id("junitbuild.testing-conventions")
 }
 
 description = "JUnit Jupiter Migration Support"
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 528ef09c7435..44e065e118ed 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-	`kotlin-library-conventions`
-	`shadow-conventions`
-	`testing-conventions`
+	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.shadow-conventions")
+	id("junitbuild.testing-conventions")
 }
 
 description = "JUnit Jupiter Params"
diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts
index 181698f09437..83230d0b4226 100644
--- a/junit-jupiter/junit-jupiter.gradle.kts
+++ b/junit-jupiter/junit-jupiter.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Jupiter (Aggregator)"
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 393d655e86d7..3ffc32815fb2 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -1,9 +1,9 @@
-import org.junit.gradle.java.ExecJarAction
+import junitbuild.java.ExecJarAction
 
 plugins {
-	`java-library-conventions`
-	`java-multi-release-sources`
-	`java-repackage-jars`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.java-multi-release-sources")
+	id("junitbuild.java-repackage-jars")
 	`java-test-fixtures`
 }
 
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 6a42539e5a98..61d35dedab17 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -1,8 +1,8 @@
-import org.junit.gradle.java.WriteArtifactsFile
+import junitbuild.java.WriteArtifactsFile
 
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
 }
 
 description = "JUnit Platform Console Standalone"
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 6006a8c880af..d7bec605761e 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
-	`java-multi-release-sources`
-	`java-repackage-jars`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
+	id("junitbuild.java-multi-release-sources")
+	id("junitbuild.java-repackage-jars")
 }
 
 description = "JUnit Platform Console"
@@ -38,7 +38,7 @@ tasks {
 			into("META-INF")
 		}
 		from(sourceSets.mainRelease9.get().output.classesDirs)
-		doLast(objects.newInstance(org.junit.gradle.java.ExecJarAction::class).apply {
+		doLast(objects.newInstance(junitbuild.java.ExecJarAction::class).apply {
 			javaLauncher.set(project.javaToolchains.launcherFor(java.toolchain))
 			args.addAll(
 				"--update",
diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
index 6c780cea7658..416b227b00c1 100644
--- a/junit-platform-engine/junit-platform-engine.gradle.kts
+++ b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 	`java-test-fixtures`
 }
 
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index 00198d86a540..c0df2b512652 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Flight Recorder Support"
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
index d51d0df34677..228ecb35b734 100644
--- a/junit-platform-launcher/junit-platform-launcher.gradle.kts
+++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 	`java-test-fixtures`
 }
 
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index 144c3fbe5bbc..84eb0fa0f75c 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-	`java-library-conventions`
-	`shadow-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.shadow-conventions")
 }
 
 description = "JUnit Platform Reporting"
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index 78205ecebbed..c62d027f6c67 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
 }
 
 description = "JUnit Platform Runner"
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
index 7be1b0a2a9ce..cc5eb1d08bb7 100644
--- a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
+++ b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite API"
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
index 8f578b0b9c30..f65b677db193 100644
--- a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
+++ b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite Commons"
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
index 12e7f6746752..36abcdbc088d 100644
--- a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
+++ b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite Engine"
diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
index 8615483d2723..83e475a2a689 100644
--- a/junit-platform-suite/junit-platform-suite.gradle.kts
+++ b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Suite (Aggregator)"
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
index 6a574bcf3882..38e89344db34 100644
--- a/junit-platform-testkit/junit-platform-testkit.gradle.kts
+++ b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	`java-library-conventions`
+	id("junitbuild.java-library-conventions")
 }
 
 description = "JUnit Platform Test Kit"
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index b92fffa50337..9f68f7de0475 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
-	`testing-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
+	id("junitbuild.testing-conventions")
 	`java-test-fixtures`
 	groovy
 }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index cca78db6b588..7ec818dc927f 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -3,9 +3,9 @@ import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
-	`java-library-conventions`
-	`junit4-compatibility`
-	`testing-conventions`
+	id("junitbuild.java-library-conventions")
+	id("junitbuild.junit4-compatibility")
+	id("junitbuild.testing-conventions")
 	id("me.champeau.jmh")
 }
 
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index f594af846257..61bec5e11ec0 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -2,8 +2,8 @@ import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.jvm.toolchain.internal.NoToolchainAvailableException
 
 plugins {
-	`kotlin-library-conventions`
-	`testing-conventions`
+	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.testing-conventions")
 }
 
 javaLibrary {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4270d9d8df17..96269d277097 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,6 +2,7 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 
 pluginManagement {
 	repositories {
+		includeBuild("gradle/plugins")
 		gradlePluginPortal()
 	}
 	plugins {

From 0fe3447b642ad9a7116ba34f1e5e68fba6a37c52 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 16 Feb 2023 17:51:06 +0100
Subject: [PATCH 1092/1433] Update comment after migrating buildSrc to included
 build

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 96269d277097..3418ab49c4f3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.12.3" // keep in sync with buildSrc/build.gradle.kts
+		id("com.gradle.enterprise") version "3.12.3" // keep in sync with gradle/plugins/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"

From 944354971030ef7987aafeb38120d8df6b6bebb3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 17 Feb 2023 22:14:30 +0100
Subject: [PATCH 1093/1433] Upgradle to 8.0.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c9b0f7a0a4ec..f396aaac2d31 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionSha256Sum=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From ba57321ed59d0c596facaf711499875a154c7be3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 07:57:29 +0100
Subject: [PATCH 1094/1433] Move build-related config and scripts to gradle
 directory

---
 .github/workflows/main.yml                                | 2 +-
 .github/workflows/reproducible-build.yml                  | 2 +-
 CONTRIBUTING.md                                           | 4 ++--
 build.gradle.kts                                          | 2 +-
 {src => gradle/config}/checkstyle/checkstyleMain.xml      | 0
 {src => gradle/config}/checkstyle/checkstyleTest.xml      | 0
 {src => gradle/config}/checkstyle/suppressions.xml        | 0
 .../config}/eclipse/junit-eclipse-formatter-settings.xml  | 0
 {src => gradle/config}/eclipse/junit-eclipse.importorder  | 0
 .../config}/spotless/eclipse-public-license-2.0.java      | 0
 gradle/plugins/src/main/kotlin/License.kt                 | 4 ++--
 .../kotlin/junitbuild.java-library-conventions.gradle.kts | 8 ++++----
 .../junitbuild.java-multi-release-sources.gradle.kts      | 2 +-
 .../kotlin/junitbuild.spotless-conventions.gradle.kts     | 8 +++-----
 {src => gradle/scripts}/checkBuildReproducibility.sh      | 0
 .../publishDocumentationSnapshotOnlyIfNecessary.sh        | 0
 platform-tests/platform-tests.gradle.kts                  | 2 +-
 17 files changed, 16 insertions(+), 18 deletions(-)
 rename {src => gradle/config}/checkstyle/checkstyleMain.xml (100%)
 rename {src => gradle/config}/checkstyle/checkstyleTest.xml (100%)
 rename {src => gradle/config}/checkstyle/suppressions.xml (100%)
 rename {src => gradle/config}/eclipse/junit-eclipse-formatter-settings.xml (100%)
 rename {src => gradle/config}/eclipse/junit-eclipse.importorder (100%)
 rename {src => gradle/config}/spotless/eclipse-public-license-2.0.java (100%)
 rename {src => gradle/scripts}/checkBuildReproducibility.sh (100%)
 rename {src => gradle/scripts}/publishDocumentationSnapshotOnlyIfNecessary.sh (100%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f66220f261d1..25b8e9db7f72 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -107,4 +107,4 @@ jobs:
     - name: Upload Documentation
       env:
         GRGIT_USER: ${{ secrets.GH_TOKEN }}
-      run: ./src/publishDocumentationSnapshotOnlyIfNecessary.sh
+      run: ./gradle/scripts/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml
index f7e365c436ce..a32a51ac0002 100644
--- a/.github/workflows/reproducible-build.yml
+++ b/.github/workflows/reproducible-build.yml
@@ -28,4 +28,4 @@ jobs:
     - name: Build and compare checksums
       shell: bash
       run: |
-        ./src/checkBuildReproducibility.sh
+        ./gradle/scripts/checkBuildReproducibility.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e2a44b38b935..2078c532b4c8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -71,8 +71,8 @@ Code formatting is enforced using the [Spotless](https://github.com/diffplug/spo
 Gradle plugin. You can use `gradle spotlessApply` to format new code and add missing
 license headers to source files. Formatter and import order settings for Eclipse are
 available in the repository under
-[src/eclipse/junit-eclipse-formatter-settings.xml](src/eclipse/junit-eclipse-formatter-settings.xml)
-and [src/eclipse/junit-eclipse.importorder](src/eclipse/junit-eclipse.importorder),
+[junit-eclipse-formatter-settings.xml](gradle/config/eclipse/junit-eclipse-formatter-settings.xml)
+and [junit-eclipse.importorder](gradle/config/eclipse/junit-eclipse.importorder),
 respectively. For IntelliJ IDEA there's a
 [plugin](https://plugins.jetbrains.com/plugin/6546) you can use in conjunction with the
 Eclipse settings.
diff --git a/build.gradle.kts b/build.gradle.kts
index 0fc9203523f2..c91646fd46bf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ description = "JUnit 5"
 val license by extra(License(
 	name = "Eclipse Public License v2.0",
 	url = uri("https://www.eclipse.org/legal/epl-v20.html"),
-	headerFile = file("src/spotless/eclipse-public-license-2.0.java")
+	headerFile = layout.projectDirectory.file("gradle/config/spotless/eclipse-public-license-2.0.java")
 ))
 
 val platformProjects by extra(listOf(
diff --git a/src/checkstyle/checkstyleMain.xml b/gradle/config/checkstyle/checkstyleMain.xml
similarity index 100%
rename from src/checkstyle/checkstyleMain.xml
rename to gradle/config/checkstyle/checkstyleMain.xml
diff --git a/src/checkstyle/checkstyleTest.xml b/gradle/config/checkstyle/checkstyleTest.xml
similarity index 100%
rename from src/checkstyle/checkstyleTest.xml
rename to gradle/config/checkstyle/checkstyleTest.xml
diff --git a/src/checkstyle/suppressions.xml b/gradle/config/checkstyle/suppressions.xml
similarity index 100%
rename from src/checkstyle/suppressions.xml
rename to gradle/config/checkstyle/suppressions.xml
diff --git a/src/eclipse/junit-eclipse-formatter-settings.xml b/gradle/config/eclipse/junit-eclipse-formatter-settings.xml
similarity index 100%
rename from src/eclipse/junit-eclipse-formatter-settings.xml
rename to gradle/config/eclipse/junit-eclipse-formatter-settings.xml
diff --git a/src/eclipse/junit-eclipse.importorder b/gradle/config/eclipse/junit-eclipse.importorder
similarity index 100%
rename from src/eclipse/junit-eclipse.importorder
rename to gradle/config/eclipse/junit-eclipse.importorder
diff --git a/src/spotless/eclipse-public-license-2.0.java b/gradle/config/spotless/eclipse-public-license-2.0.java
similarity index 100%
rename from src/spotless/eclipse-public-license-2.0.java
rename to gradle/config/spotless/eclipse-public-license-2.0.java
diff --git a/gradle/plugins/src/main/kotlin/License.kt b/gradle/plugins/src/main/kotlin/License.kt
index 4f4e78eaa5b2..9d83baeaf8c1 100644
--- a/gradle/plugins/src/main/kotlin/License.kt
+++ b/gradle/plugins/src/main/kotlin/License.kt
@@ -1,4 +1,4 @@
-import java.io.File
+import org.gradle.api.file.RegularFile
 import java.net.URI
 
-data class License(val name: String, val url: URI, val headerFile: File)
+data class License(val name: String, val url: URI, val headerFile: RegularFile)
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
index bb586e37605c..4961dccee0ff 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
@@ -267,21 +267,21 @@ afterEvaluate {
 
 checkstyle {
 	toolVersion = requiredVersionFromLibs("checkstyle")
-	configDirectory.set(rootProject.file("src/checkstyle"))
+	configDirectory.set(rootProject.layout.projectDirectory.dir("gradle/config/checkstyle"))
 }
 
 tasks {
 	checkstyleMain {
-		configFile = rootProject.file("src/checkstyle/checkstyleMain.xml")
+        config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleMain.xml"))
 	}
 	checkstyleTest {
-		configFile = rootProject.file("src/checkstyle/checkstyleTest.xml")
+        config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
 	}
 }
 
 pluginManager.withPlugin("java-test-fixtures") {
 	tasks.named<Checkstyle>("checkstyleTestFixtures") {
-		configFile = rootProject.file("src/checkstyle/checkstyleTest.xml")
+        config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
 	}
 	tasks.named<JavaCompile>("compileTestFixturesJava") {
 		options.release.set(extension.testJavaVersion.majorVersion.toInt())
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
index 7f2af9d50e7e..b78098f3743e 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
@@ -28,7 +28,7 @@ listOf(9, 17).forEach { javaVersion ->
 		}
 
 		named<Checkstyle>("checkstyle${sourceSet.name.replaceFirstChar(Char::titlecase)}").configure {
-			configFile = rootProject.file("src/checkstyle/checkstyleMain.xml")
+            config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleMain.xml"))
 		}
 
 		if (project in mavenizedProjects) {
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
index 9f82998c135c..026eebbf40a5 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
@@ -1,6 +1,3 @@
-import org.gradle.kotlin.dsl.extra
-import org.gradle.kotlin.dsl.provideDelegate
-
 plugins {
 	id("com.diffplug.spotless")
 }
@@ -25,8 +22,9 @@ spotless {
 
 	pluginManager.withPlugin("java") {
 
-		val importOrderConfigFile = rootProject.file("src/eclipse/junit-eclipse.importorder")
-		val javaFormatterConfigFile = rootProject.file("src/eclipse/junit-eclipse-formatter-settings.xml")
+        val configDir = rootProject.layout.projectDirectory.dir("gradle/config/eclipse")
+        val importOrderConfigFile = configDir.file("junit-eclipse.importorder")
+		val javaFormatterConfigFile = configDir.file("junit-eclipse-formatter-settings.xml")
 
 		java {
 			licenseHeaderFile(license.headerFile, "(package|import|open|module) ")
diff --git a/src/checkBuildReproducibility.sh b/gradle/scripts/checkBuildReproducibility.sh
similarity index 100%
rename from src/checkBuildReproducibility.sh
rename to gradle/scripts/checkBuildReproducibility.sh
diff --git a/src/publishDocumentationSnapshotOnlyIfNecessary.sh b/gradle/scripts/publishDocumentationSnapshotOnlyIfNecessary.sh
similarity index 100%
rename from src/publishDocumentationSnapshotOnlyIfNecessary.sh
rename to gradle/scripts/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 7ec818dc927f..2990064246c6 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -79,7 +79,7 @@ tasks {
 		}
 	}
 	checkstyleJmh { // use same style rules as defined for tests
-		configFile = rootProject.file("src/checkstyle/checkstyleTest.xml")
+		config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
 	}
 }
 

From 3d9c273e43e4a74f34eef32b4e3bdf50df6794df Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 16:03:13 +0100
Subject: [PATCH 1095/1433] Simplify build script

---
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 7ce27bcf32e7..8d9112ccba1a 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -33,9 +33,6 @@ tasks {
 		inputs.dir("src/test/resources").withPathSensitivity(RELATIVE)
 		systemProperty("developmentVersion", version)
 	}
-}
-
-tasks {
 	jar {
 		bundle {
 			bnd("""

From d6f8728265fcaac2e3160f9d390f660c8a4a1e46 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 16:12:16 +0100
Subject: [PATCH 1096/1433] Resolve warnings for configurations being
 resolvable and consumable

---
 documentation/documentation.gradle.kts             |  4 ++--
 .../kotlin/ConfigurationContainerExtensions.kt     | 14 ++++++++++++++
 .../junitbuild.junit4-compatibility.gradle.kts     |  2 +-
 .../kotlin/junitbuild.osgi-conventions.gradle.kts  |  2 +-
 .../junitbuild.shadow-conventions.gradle.kts       |  2 +-
 .../platform-tooling-support-tests.gradle.kts      |  6 +++---
 6 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 gradle/plugins/src/main/kotlin/ConfigurationContainerExtensions.kt

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index a357d9f2d421..01b138459d86 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -25,8 +25,8 @@ javaLibrary {
 	testJavaVersion = JavaVersion.VERSION_1_8
 }
 
-val apiReport by configurations.creating
-val standaloneConsoleLauncher by configurations.creating
+val apiReport by configurations.creatingResolvable
+val standaloneConsoleLauncher by configurations.creatingResolvable
 
 dependencies {
 	implementation(projects.junitJupiterApi) {
diff --git a/gradle/plugins/src/main/kotlin/ConfigurationContainerExtensions.kt b/gradle/plugins/src/main/kotlin/ConfigurationContainerExtensions.kt
new file mode 100644
index 000000000000..ebe7399e9f15
--- /dev/null
+++ b/gradle/plugins/src/main/kotlin/ConfigurationContainerExtensions.kt
@@ -0,0 +1,14 @@
+
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ConfigurationContainer
+import org.gradle.kotlin.dsl.NamedDomainObjectContainerCreatingDelegateProvider
+
+val ConfigurationContainer.creatingResolvable
+    get() = creatingResolvable {}
+
+fun ConfigurationContainer.creatingResolvable(configuration: Configuration.() -> Unit) =
+    NamedDomainObjectContainerCreatingDelegateProvider.of(this) {
+        isCanBeResolved = true
+        isCanBeConsumed = false
+        configuration()
+    }
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
index e43c938e5ca4..dd1e08fed717 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
@@ -2,7 +2,7 @@ plugins {
 	`java-library`
 }
 
-val junit_4_12 by configurations.creating {
+val junit_4_12 by configurations.creatingResolvable {
 	extendsFrom(configurations.testRuntimeClasspath.get())
 }
 
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
index 3a2bf7c6db66..d41f23f6ef64 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
@@ -87,7 +87,7 @@ val osgiProperties by tasks.registering(WriteProperties::class) {
 	property("-runblacklist", "org.apiguardian.api")
 }
 
-val osgiVerification by configurations.creating {
+val osgiVerification by configurations.creatingResolvable {
 	extendsFrom(configurations.runtimeClasspath.get())
 }
 
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
index d9f93aa3839d..9ae82635c4b3 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 	id("com.github.johnrengelman.shadow")
 }
 
-val shadowed by configurations.creating
+val shadowed by configurations.creatingResolvable
 
 configurations {
 	listOf(apiElements, runtimeElements).forEach {
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 61bec5e11ec0..21c6f6c08d11 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -24,9 +24,9 @@ spotless {
 	}
 }
 
-val thirdPartyJars by configurations.creating
-val antJars by configurations.creating
-val mavenDistribution by configurations.creating
+val thirdPartyJars by configurations.creatingResolvable
+val antJars by configurations.creatingResolvable
+val mavenDistribution by configurations.creatingResolvable
 
 dependencies {
 	implementation(libs.bartholdy) {

From 3d3b2a95167de053ae2104271eaab4fa12b422c4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 17:00:29 +0100
Subject: [PATCH 1097/1433] Remove unused imports

---
 .../src/main/kotlin/junitbuild/java/ExecJarAction.kt        | 3 ---
 .../kotlin/junitbuild/java/ModulePathArgumentProvider.kt    | 5 -----
 .../kotlin/junitbuild/java/PatchModuleArgumentProvider.kt   | 2 --
 .../src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt   | 6 +++---
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
index a900b9c646c3..8a3cf49ad70e 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
@@ -4,10 +4,7 @@ import org.gradle.api.Action
 import org.gradle.api.Task
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
-import org.gradle.jvm.tasks.Jar
 import org.gradle.jvm.toolchain.JavaLauncher
-import org.gradle.jvm.toolchain.JavaToolchainService
-import org.gradle.jvm.toolchain.JavaToolchainSpec
 import org.gradle.process.ExecOperations
 import javax.inject.Inject
 
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
index 3133c35a2ead..ec79fdfaade8 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
@@ -2,13 +2,8 @@ package junitbuild.java
 
 import org.gradle.api.Named
 import org.gradle.api.Project
-import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.FileCollection
-import org.gradle.api.provider.Property
-import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
-import org.gradle.kotlin.dsl.get
 import org.gradle.process.CommandLineArgumentProvider
 import javax.inject.Inject
 
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
index 93210bfc41a7..0c7f330f8adf 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
@@ -4,9 +4,7 @@ import javaModuleName
 import org.gradle.api.Named
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.Property
-import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.the
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
index d0b56930cf08..684c20364597 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
@@ -3,12 +3,12 @@ package junitbuild.java
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ModuleVersionIdentifier
-import org.gradle.api.artifacts.ResolvedArtifact
 import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.SetProperty
-import org.gradle.api.tasks.*
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
 
 abstract class WriteArtifactsFile : DefaultTask() {
 

From 19fa80afec41cbd88c981a4f9e426ac6a53f460c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 18:27:38 +0100
Subject: [PATCH 1098/1433] Ignore build output of included build to avoid
 unstable inputs

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c91646fd46bf..7662a5524b31 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,5 +61,5 @@ nexusPublishing {
 }
 
 nohttp {
-	source.exclude("**/.gradle/**", "gradle/plugins/build/generated-sources/**")
+	source.exclude("**/.gradle/**", "gradle/plugins/build/**")
 }

From 97d9c2ec57e24736788df8f732de9456d3edaacb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Feb 2023 07:53:10 +0100
Subject: [PATCH 1099/1433] Bump com.github.ben-manes:gradle-versions-plugin to
 0.45.0 (#3161)

Bumps [com.github.ben-manes:gradle-versions-plugin](https://github.com/ben-manes/gradle-versions-plugin) from 0.44.0 to 0.45.0.
- [Release notes](https://github.com/ben-manes/gradle-versions-plugin/releases)
- [Commits](https://github.com/ben-manes/gradle-versions-plugin/compare/v0.44.0...v0.45.0)

---
updated-dependencies:
- dependency-name: com.github.ben-manes:gradle-versions-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/plugins/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
index 5afee3e2d70d..823a90510165 100644
--- a/gradle/plugins/build.gradle.kts
+++ b/gradle/plugins/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.15.0")
-	implementation("com.github.ben-manes:gradle-versions-plugin:0.44.0")
+	implementation("com.github.ben-manes:gradle-versions-plugin:0.45.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.3") // keep in sync with root settings.gradle.kts
 }

From 40b715df632e2379b2acb2d6f8f94f16066f76e5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 17 Feb 2023 21:42:29 +0100
Subject: [PATCH 1100/1433] Make it possible to pass args to ConsoleLauncher
 Gradle task

The task can now be called as:

    :documentation:consoleLauncher --args="--help ..."
---
 .../junitbuild/exec/RunConsoleLauncher.kt     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
index 4ba265061662..bd07e328b672 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
@@ -1,22 +1,20 @@
 package junitbuild.exec
 
+import org.apache.tools.ant.types.Commandline
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Classpath
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.SourceSetContainer
-import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.*
+import org.gradle.api.tasks.options.Option
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.the
 import org.gradle.process.CommandLineArgumentProvider
 import org.gradle.process.ExecOperations
 import trackOperationSystemAsInput
 import java.io.ByteArrayOutputStream
+import java.util.*
 import javax.inject.Inject
 
 abstract class RunConsoleLauncher @Inject constructor(private val execOperations: ExecOperations): DefaultTask() {
@@ -27,6 +25,9 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
     @get:Input
     abstract val args: ListProperty<String>
 
+    @get:Input
+    abstract val commandLineArgs: ListProperty<String>
+
     @get:OutputDirectory
     abstract val reportsDir: DirectoryProperty
 
@@ -62,6 +63,7 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
             args("--scan-classpath")
             args("--config=junit.platform.reporting.open.xml.enabled=true")
             args(this@RunConsoleLauncher.args.get())
+            args(this@RunConsoleLauncher.commandLineArgs.get())
             argumentProviders += CommandLineArgumentProvider {
                 listOf(
                     "--reports-dir=${reportsDir.get()}",
@@ -83,4 +85,10 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
         }
         result.rethrowFailure().assertNormalExitValue()
     }
+
+    @Suppress("unused")
+    @Option(option = "args", description = "Additional command line arguments for the console launcher")
+    fun setCliArgs(args: String) {
+        commandLineArgs.set(Commandline.translateCommandline(args).toList())
+    }
 }

From 91b9308b0b637862327c354b60a1fa089c6e1c47 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 17 Feb 2023 22:03:18 +0100
Subject: [PATCH 1101/1433] Add --debug-jvm option to RunConsoleLauncher

---
 .../junitbuild/exec/RunConsoleLauncher.kt     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
index bd07e328b672..e8de805b8425 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
@@ -17,7 +17,7 @@ import java.io.ByteArrayOutputStream
 import java.util.*
 import javax.inject.Inject
 
-abstract class RunConsoleLauncher @Inject constructor(private val execOperations: ExecOperations): DefaultTask() {
+abstract class RunConsoleLauncher @Inject constructor(private val execOperations: ExecOperations) : DefaultTask() {
 
     @get:Classpath
     abstract val runtimeClasspath: ConfigurableFileCollection
@@ -41,11 +41,8 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
         runtimeClasspath.from(project.the<SourceSetContainer>()["test"].runtimeClasspath)
         reportsDir.convention(project.layout.buildDirectory.dir("test-results"))
 
-        debugging.convention(
-            project.providers.gradleProperty("consoleLauncherTestDebug")
-            .map { it != "false" }
-            .orElse(false)
-        )
+        debugging.convention(false)
+        commandLineArgs.convention(emptyList())
         outputs.cacheIf { !debugging.get() }
         outputs.upToDateWhen { !debugging.get() }
 
@@ -91,4 +88,14 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
     fun setCliArgs(args: String) {
         commandLineArgs.set(Commandline.translateCommandline(args).toList())
     }
+
+    @Suppress("unused")
+    @Option(
+        option = "debug-jvm",
+        description = "Enable debugging. The process is started suspended and listening on port 5005."
+    )
+    fun setDebug(enabled: Boolean) {
+        debugging.set(enabled)
+    }
+
 }

From d590e57d72a79a2e9dc9cb285f1ea81d981d6c4f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 20 Feb 2023 18:41:51 +0100
Subject: [PATCH 1102/1433] Use the configured Java toolchain to run the
 ConsoleLauncher

---
 .../src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
index e8de805b8425..2dc13d501b75 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
@@ -4,10 +4,13 @@ import org.apache.tools.ant.types.Commandline
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.options.Option
+import org.gradle.jvm.toolchain.JavaLauncher
+import org.gradle.jvm.toolchain.JavaToolchainService
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.the
 import org.gradle.process.CommandLineArgumentProvider
@@ -28,6 +31,9 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
     @get:Input
     abstract val commandLineArgs: ListProperty<String>
 
+    @get:Nested
+    abstract val javaLauncher: Property<JavaLauncher>
+
     @get:OutputDirectory
     abstract val reportsDir: DirectoryProperty
 
@@ -40,6 +46,7 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
     init {
         runtimeClasspath.from(project.the<SourceSetContainer>()["test"].runtimeClasspath)
         reportsDir.convention(project.layout.buildDirectory.dir("test-results"))
+        javaLauncher.set(project.the<JavaToolchainService>().launcherFor(project.the<JavaPluginExtension>().toolchain))
 
         debugging.convention(false)
         commandLineArgs.convention(emptyList())
@@ -55,6 +62,7 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
     fun execute() {
         val output = ByteArrayOutputStream()
         val result = execOperations.javaexec {
+            executable = javaLauncher.get().executablePath.asFile.absolutePath
             classpath = runtimeClasspath
             mainClass.set("org.junit.platform.console.ConsoleLauncher")
             args("--scan-classpath")

From 4e35f3fbe1d3a920224e8d6b3f6ef3204be498c0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 18:08:49 +0100
Subject: [PATCH 1103/1433] Compile main sources on module path as well

In order to detect JPMS issues the main sources are now compiled along
with the module descriptor but only the compiled module descriptor is
packaged in the jar.
---
 ...tbuild.java-library-conventions.gradle.kts | 28 +++++++++++++++++--
 .../junitbuild.shadow-conventions.gradle.kts  |  5 ++++
 .../junitbuild/java/ModuleCompileOptions.kt   |  7 +++++
 .../java/ModulePathArgumentProvider.kt        | 10 +++++--
 4 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 gradle/plugins/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt

diff --git a/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
index 4961dccee0ff..6c0e5462486c 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import junitbuild.java.ModuleCompileOptions
 import junitbuild.java.ModulePathArgumentProvider
 import junitbuild.java.PatchModuleArgumentProvider
 
@@ -21,6 +22,7 @@ val builtByValue: String by rootProject.extra
 val extension = extensions.create<JavaLibraryExtension>("javaLibrary")
 
 val moduleSourceDir = file("src/module/$javaModuleName")
+val combinedModuleSourceDir = layout.buildDirectory.dir("module")
 val moduleOutputDir = file("$buildDir/classes/java/module")
 val javaVersion = JavaVersion.current()
 
@@ -143,9 +145,17 @@ val allMainClasses by tasks.registering {
 	dependsOn(tasks.classes)
 }
 
+val prepareModuleSourceDir by tasks.registering(Sync::class) {
+    from(moduleSourceDir)
+    from(sourceSets.matching { it.name.startsWith("main") }.map { it.allJava })
+    into(combinedModuleSourceDir.map { it.dir(javaModuleName) })
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 val compileModule by tasks.registering(JavaCompile::class) {
 	dependsOn(allMainClasses)
-	source = fileTree(moduleSourceDir)
+    enabled = project in modularProjects
+	source = fileTree(combinedModuleSourceDir).builtBy(prepareModuleSourceDir)
 	destinationDirectory.set(moduleOutputDir)
 	sourceCompatibility = "9"
 	targetCompatibility = "9"
@@ -157,9 +167,23 @@ val compileModule by tasks.registering(JavaCompile::class) {
 			"-Werror", // Terminates compilation when warnings occur.
 			"--module-version", "${project.version}",
 	))
-	options.compilerArgumentProviders.add(objects.newInstance(ModulePathArgumentProvider::class, project, modularProjects))
+
+    val moduleOptions = objects.newInstance(ModuleCompileOptions::class)
+    extensions.add("moduleOptions", moduleOptions)
+    moduleOptions.modulePath.from(configurations.compileClasspath)
+
+	options.compilerArgumentProviders.add(objects.newInstance(ModulePathArgumentProvider::class, project, combinedModuleSourceDir, modularProjects).apply {
+        modulePath.from(moduleOptions.modulePath)
+    })
 	options.compilerArgumentProviders.addAll(modularProjects.map { objects.newInstance(PatchModuleArgumentProvider::class, project, it) })
+
 	modularity.inferModulePath.set(false)
+
+    doFirst {
+        options.allCompilerArgs.forEach {
+            logger.info(it)
+        }
+    }
 }
 
 tasks.withType<Jar>().configureEach {
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
index 9ae82635c4b3..4863c00576fa 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
@@ -1,3 +1,5 @@
+import junitbuild.java.ModuleCompileOptions
+
 plugins {
 	id("junitbuild.java-library-conventions")
 	id("com.github.johnrengelman.shadow")
@@ -66,4 +68,7 @@ tasks {
 		classpath -= sourceSets.main.get().output
 		classpath += files(shadowJar.map { it.archiveFile })
 	}
+    named<JavaCompile>("compileModule") {
+        the<ModuleCompileOptions>().modulePath.from(shadowed)
+    }
 }
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt
new file mode 100644
index 000000000000..13c6fde1c09d
--- /dev/null
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt
@@ -0,0 +1,7 @@
+package junitbuild.java
+
+import org.gradle.api.file.ConfigurableFileCollection
+
+abstract class ModuleCompileOptions {
+    abstract val modulePath: ConfigurableFileCollection
+}
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt b/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
index ec79fdfaade8..9d05430ad810 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
+++ b/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
@@ -3,11 +3,13 @@ package junitbuild.java
 import org.gradle.api.Named
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.Directory
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.gradle.process.CommandLineArgumentProvider
 import javax.inject.Inject
 
-abstract class ModulePathArgumentProvider @Inject constructor(project: Project, modularProjects: List<Project>) :
+abstract class ModulePathArgumentProvider @Inject constructor(project: Project, combinedModuleSourceDir: Provider<Directory>, modularProjects: List<Project>) :
     CommandLineArgumentProvider, Named {
 
     @get:CompileClasspath
@@ -18,9 +20,11 @@ abstract class ModulePathArgumentProvider @Inject constructor(project: Project,
     abstract val moduleSourceDirs: ConfigurableFileCollection
 
     init {
-        modulePath.from(project.configurations.named("compileClasspath"))
         modularProjects.forEach {
-            moduleSourceDirs.from(project.files("${it.projectDir}/src/module"))
+            if (it == project)
+                moduleSourceDirs.from(combinedModuleSourceDir)
+            else
+                moduleSourceDirs.from(project.files("${it.projectDir}/src/module"))
         }
     }
 

From 8be55d0dc4cc709a32b71eb8b934a9a9d0ed654f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 18:10:27 +0100
Subject: [PATCH 1104/1433] Manually add shadowed dependencies as modules
 during compilation

---
 junit-jupiter-params/junit-jupiter-params.gradle.kts        | 6 ++++++
 junit-platform-console/junit-platform-console.gradle.kts    | 4 +++-
 .../junit-platform-reporting.gradle.kts                     | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 44e065e118ed..6d98446d921d 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -48,4 +48,10 @@ tasks {
 			into("META-INF")
 		}
 	}
+	compileModule {
+		options.compilerArgs.addAll(listOf(
+			"--add-modules", "univocity.parsers",
+			"--add-reads", "${javaModuleName}=univocity.parsers"
+		))
+	}
 }
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index d7bec605761e..7893568a0967 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -25,7 +25,9 @@ tasks {
 	compileModule {
 		options.compilerArgs.addAll(listOf(
 			"--add-modules", "org.opentest4j.reporting.events",
-			"--add-reads", "org.junit.platform.reporting=org.opentest4j.reporting.events"
+			"--add-reads", "${project.projects.junitPlatformReporting.dependencyProject.javaModuleName}=org.opentest4j.reporting.events",
+			"--add-modules", "info.picocli",
+			"--add-reads", "${javaModuleName}=info.picocli"
 		))
 	}
 	shadowJar {
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
index 84eb0fa0f75c..b95816fcfc2d 100644
--- a/junit-platform-reporting/junit-platform-reporting.gradle.kts
+++ b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -25,4 +25,10 @@ tasks {
 			into("META-INF")
 		}
 	}
+	compileModule {
+		options.compilerArgs.addAll(listOf(
+			"--add-modules", "org.opentest4j.reporting.events",
+			"--add-reads", "${javaModuleName}=org.opentest4j.reporting.events"
+		))
+	}
 }

From a76e1a5da74f97e0ac335fc874265bb5454b2866 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 18:12:12 +0100
Subject: [PATCH 1105/1433] Suppress export warnings

Since these packages are opened for reflection to
org.junit.platform.commons the warnings can safely be ignored.
---
 .../org/junit/jupiter/api/condition/DisabledForJreRange.java     | 1 +
 .../main/java/org/junit/jupiter/api/condition/DisabledIf.java    | 1 +
 .../jupiter/api/condition/DisabledIfEnvironmentVariable.java     | 1 +
 .../junit/jupiter/api/condition/DisabledIfSystemProperty.java    | 1 +
 .../main/java/org/junit/jupiter/api/condition/DisabledOnJre.java | 1 +
 .../main/java/org/junit/jupiter/api/condition/DisabledOnOs.java  | 1 +
 .../java/org/junit/jupiter/api/condition/EnabledForJreRange.java | 1 +
 .../src/main/java/org/junit/jupiter/api/condition/EnabledIf.java | 1 +
 .../jupiter/api/condition/EnabledIfEnvironmentVariable.java      | 1 +
 .../org/junit/jupiter/api/condition/EnabledIfSystemProperty.java | 1 +
 .../main/java/org/junit/jupiter/api/condition/EnabledOnJre.java  | 1 +
 .../main/java/org/junit/jupiter/api/condition/EnabledOnOs.java   | 1 +
 .../main/java/org/junit/jupiter/params/ParameterizedTest.java    | 1 +
 .../jupiter/params/converter/JavaTimeConversionPattern.java      | 1 +
 .../java/org/junit/jupiter/params/provider/CsvFileSource.java    | 1 +
 .../main/java/org/junit/jupiter/params/provider/CsvSource.java   | 1 +
 .../main/java/org/junit/jupiter/params/provider/EmptySource.java | 1 +
 .../main/java/org/junit/jupiter/params/provider/EnumSource.java  | 1 +
 .../java/org/junit/jupiter/params/provider/MethodSource.java     | 1 +
 .../main/java/org/junit/jupiter/params/provider/NullSource.java  | 1 +
 .../main/java/org/junit/jupiter/params/provider/ValueSource.java | 1 +
 .../platform/engine/support/filter/ClasspathScanningSupport.java | 1 +
 22 files changed, 22 insertions(+)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
index 57341bfaf79c..a3b0762e0de5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
@@ -71,6 +71,7 @@
 @Documented
 @ExtendWith(DisabledForJreRangeCondition.class)
 @API(status = STABLE, since = "5.6")
+@SuppressWarnings("exports")
 public @interface DisabledForJreRange {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
index 8ab454fb6a17..06bdd569048a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java
@@ -70,6 +70,7 @@
 @Documented
 @ExtendWith(DisabledIfCondition.class)
 @API(status = STABLE, since = "5.7")
+@SuppressWarnings("exports")
 public @interface DisabledIf {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
index a98c31bb4e0a..0cc90eec72a4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java
@@ -73,6 +73,7 @@
 @Repeatable(DisabledIfEnvironmentVariables.class)
 @ExtendWith(DisabledIfEnvironmentVariableCondition.class)
 @API(status = STABLE, since = "5.1")
+@SuppressWarnings("exports")
 public @interface DisabledIfEnvironmentVariable {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
index c8bfe4fc8cdf..ac7d0937d848 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java
@@ -73,6 +73,7 @@
 @Repeatable(DisabledIfSystemProperties.class)
 @ExtendWith(DisabledIfSystemPropertyCondition.class)
 @API(status = STABLE, since = "5.1")
+@SuppressWarnings("exports")
 public @interface DisabledIfSystemProperty {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
index ef1b5d8a5387..2aa7f012c947 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java
@@ -71,6 +71,7 @@
 @Documented
 @ExtendWith(DisabledOnJreCondition.class)
 @API(status = STABLE, since = "5.1")
+@SuppressWarnings("exports")
 public @interface DisabledOnJre {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
index 5f1e08d70a59..f067c2290083 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java
@@ -76,6 +76,7 @@
 @Documented
 @ExtendWith(DisabledOnOsCondition.class)
 @API(status = STABLE, since = "5.1")
+@SuppressWarnings("exports")
 public @interface DisabledOnOs {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
index 9e3154d85385..b1efb7c88e0d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
@@ -71,6 +71,7 @@
 @Documented
 @ExtendWith(EnabledForJreRangeCondition.class)
 @API(status = STABLE, since = "5.6")
+@SuppressWarnings("exports")
 public @interface EnabledForJreRange {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
index 18e8a8395c46..5bd4b3df30e7 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIf.java
@@ -70,6 +70,7 @@
 @Documented
 @ExtendWith(EnabledIfCondition.class)
 @API(status = STABLE, since = "5.7")
+@SuppressWarnings("exports")
 public @interface EnabledIf {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
index d7cab6c3dddf..44cf3bf5940f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.java
@@ -72,6 +72,7 @@
 @Repeatable(EnabledIfEnvironmentVariables.class)
 @ExtendWith(EnabledIfEnvironmentVariableCondition.class)
 @API(status = STABLE, since = "5.1")
+@SuppressWarnings("exports")
 public @interface EnabledIfEnvironmentVariable {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
index cd658e4e0aad..26cbcc10743a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledIfSystemProperty.java
@@ -72,6 +72,7 @@
 @Repeatable(EnabledIfSystemProperties.class)
 @ExtendWith(EnabledIfSystemPropertyCondition.class)
 @API(status = STABLE, since = "5.1")
+@SuppressWarnings("exports")
 public @interface EnabledIfSystemProperty {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
index c5ca85ea4dbb..ab6e18a193e4 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnJre.java
@@ -71,6 +71,7 @@
 @Documented
 @ExtendWith(EnabledOnJreCondition.class)
 @API(status = STABLE, since = "5.1")
+@SuppressWarnings("exports")
 public @interface EnabledOnJre {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
index 2805fc40025e..de284cd68654 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledOnOs.java
@@ -76,6 +76,7 @@
 @Documented
 @ExtendWith(EnabledOnOsCondition.class)
 @API(status = STABLE, since = "5.1")
+@SuppressWarnings("exports")
 public @interface EnabledOnOs {
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index 1fcdd80bb829..61fd036c0d9a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -123,6 +123,7 @@
 @API(status = STABLE, since = "5.7")
 @TestTemplate
 @ExtendWith(ParameterizedTestExtension.class)
+@SuppressWarnings("exports")
 public @interface ParameterizedTest {
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
index bbfab9e6f006..b6c03e76ca67 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeConversionPattern.java
@@ -35,6 +35,7 @@
 @Documented
 @API(status = STABLE, since = "5.7")
 @ConvertWith(JavaTimeArgumentConverter.class)
+@SuppressWarnings("exports")
 public @interface JavaTimeConversionPattern {
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 6c0a765c54e6..177790713575 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -66,6 +66,7 @@
 @Documented
 @API(status = STABLE, since = "5.7")
 @ArgumentsSource(CsvFileArgumentsProvider.class)
+@SuppressWarnings("exports")
 public @interface CsvFileSource {
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index be44973c9031..f5985b458cfe 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -68,6 +68,7 @@
 @Documented
 @API(status = STABLE, since = "5.7")
 @ArgumentsSource(CsvArgumentsProvider.class)
+@SuppressWarnings("exports")
 public @interface CsvSource {
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
index 99023a73e9dd..553192a2d036 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
@@ -49,5 +49,6 @@
 @Documented
 @API(status = STABLE, since = "5.7")
 @ArgumentsSource(EmptyArgumentsProvider.class)
+@SuppressWarnings("exports")
 public @interface EmptySource {
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
index 2a215ae10865..ee98d2e5322a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumSource.java
@@ -51,6 +51,7 @@
 @Documented
 @API(status = STABLE, since = "5.7")
 @ArgumentsSource(EnumArgumentsProvider.class)
+@SuppressWarnings("exports")
 public @interface EnumSource {
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index 2d0ffe9eb8a5..dbd41bd66b7a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -104,6 +104,7 @@
 @Documented
 @API(status = STABLE, since = "5.7")
 @ArgumentsSource(MethodArgumentsProvider.class)
+@SuppressWarnings("exports")
 public @interface MethodSource {
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
index 283e78bf212c..c1b82b4842e4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/NullSource.java
@@ -39,5 +39,6 @@
 @Documented
 @API(status = STABLE, since = "5.7")
 @ArgumentsSource(NullArgumentsProvider.class)
+@SuppressWarnings("exports")
 public @interface NullSource {
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
index bc63eb037203..e349a07893ff 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueSource.java
@@ -42,6 +42,7 @@
 @Documented
 @API(status = STABLE, since = "5.7")
 @ArgumentsSource(ValueArgumentsProvider.class)
+@SuppressWarnings("exports")
 public @interface ValueSource {
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
index 9169ea77ead6..6699df7eddb6 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/filter/ClasspathScanningSupport.java
@@ -63,6 +63,7 @@ public static Predicate<String> buildClassNamePredicate(EngineDiscoveryRequest r
 	 * @deprecated Please use {@link org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolver} instead.
 	 */
 	@Deprecated
+	@SuppressWarnings("exports")
 	public static ClassFilter buildClassFilter(EngineDiscoveryRequest request, Predicate<Class<?>> classPredicate) {
 		return ClassFilter.of(buildClassNamePredicate(request), classPredicate);
 	}

From d7c3af599e75adb857e1fa70528a92165d99d3b3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 18:13:35 +0100
Subject: [PATCH 1106/1433] Add missing explicit constructors for exported
 types

With the exception of one deprecated type, public constructors are
added to exported types to make their existence explicit.
---
 .../jupiter/migrationsupport/conditions/IgnoreCondition.java   | 3 +++
 .../migrationsupport/rules/ExpectedExceptionSupport.java       | 3 +++
 .../migrationsupport/rules/ExternalResourceSupport.java        | 3 +++
 .../junit/jupiter/migrationsupport/rules/VerifierSupport.java  | 3 +++
 .../jupiter/params/converter/SimpleArgumentConverter.java      | 3 +++
 .../engine/support/hierarchical/SingleTestExecutor.java        | 1 +
 .../org/junit/platform/testkit/engine/ExecutionRecorder.java   | 3 +++
 7 files changed, 19 insertions(+)

diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
index 477cedcb6213..c73546afc46e 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/conditions/IgnoreCondition.java
@@ -38,6 +38,9 @@ public class IgnoreCondition implements ExecutionCondition {
 	private static final ConditionEvaluationResult ENABLED = //
 		ConditionEvaluationResult.enabled("@org.junit.Ignore is not present");
 
+	public IgnoreCondition() {
+	}
+
 	/**
 	 * Containers/tests are disabled if {@link Ignore @Ignore} is present on
 	 * the test class or method.
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
index 538a053b1e32..cd25a1190ff0 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java
@@ -46,6 +46,9 @@ public class ExpectedExceptionSupport implements AfterEachCallback, TestExecutio
 
 	private final TestRuleSupport support = new TestRuleSupport(ExpectedExceptionAdapter::new, ExpectedException.class);
 
+	public ExpectedExceptionSupport() {
+	}
+
 	@Override
 	public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
 		getStore(context).put(EXCEPTION_WAS_HANDLED, TRUE);
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
index f31d6bc1f9dd..43ceaea7ed32 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java
@@ -43,6 +43,9 @@ public class ExternalResourceSupport implements BeforeEachCallback, AfterEachCal
 
 	private final TestRuleSupport support = new TestRuleSupport(ExternalResourceAdapter::new, ExternalResource.class);
 
+	public ExternalResourceSupport() {
+	}
+
 	@Override
 	public void beforeEach(ExtensionContext context) throws Exception {
 		this.support.beforeEach(context);
diff --git a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
index dca4784fddba..73781be2910b 100644
--- a/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
+++ b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java
@@ -42,6 +42,9 @@ public class VerifierSupport implements AfterEachCallback {
 
 	private final TestRuleSupport support = new TestRuleSupport(VerifierAdapter::new, Verifier.class);
 
+	public VerifierSupport() {
+	}
+
 	@Override
 	public void afterEach(ExtensionContext context) throws Exception {
 		this.support.afterEach(context);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
index dc1a32ea8742..b6a0d15045f8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/SimpleArgumentConverter.java
@@ -28,6 +28,9 @@
 @API(status = STABLE, since = "5.7")
 public abstract class SimpleArgumentConverter implements ArgumentConverter {
 
+	public SimpleArgumentConverter() {
+	}
+
 	@Override
 	public final Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
 		return convert(source, context.getParameter().getType());
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
index 6c87fb116517..0496a61e4ded 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SingleTestExecutor.java
@@ -31,6 +31,7 @@
  */
 @Deprecated
 @API(status = DEPRECATED, since = "1.2")
+@SuppressWarnings("missing-explicit-ctor")
 public class SingleTestExecutor {
 
 	/**
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
index b11a1e44b8fb..15db74b2b7d6 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/ExecutionRecorder.java
@@ -37,6 +37,9 @@ public class ExecutionRecorder implements EngineExecutionListener {
 
 	private final List<Event> events = new CopyOnWriteArrayList<>();
 
+	public ExecutionRecorder() {
+	}
+
 	/**
 	 * Record an {@link Event} for a dynamically registered container
 	 * or test.

From 9494da3a4fa8110e5fa83aa1b4b29ed0f2ae695c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 18 Feb 2023 18:14:35 +0100
Subject: [PATCH 1107/1433] Make TestKit export module dependency on Launcher

Since types for the Launcher module are used in exported API of the
TestKit module the `requires` statement is changed to be `transitive`.
---
 .../src/module/org.junit.platform.testkit/module-info.java      | 2 +-
 .../jar-describe-module/junit-platform-testkit.expected.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
index c0ae31818be7..2a53f5ad647c 100644
--- a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
+++ b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
@@ -19,7 +19,7 @@
 	requires transitive org.assertj.core;
 	requires org.junit.platform.commons;
 	requires transitive org.junit.platform.engine;
-	requires org.junit.platform.launcher;
+	requires transitive org.junit.platform.launcher;
 	requires transitive org.opentest4j;
 
 	// exports org.junit.platform.testkit; empty package
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
index 2ad3e8d1c77b..c530e1bf68f8 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
@@ -5,6 +5,6 @@ requires org.apiguardian.api static transitive
 requires org.assertj.core transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine transitive
-requires org.junit.platform.launcher
+requires org.junit.platform.launcher transitive
 requires org.opentest4j transitive
 uses org.junit.platform.engine.TestEngine

From e0e8778e4842433bcefee156524f0d32b7b6e592 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Tue, 21 Feb 2023 09:16:25 +0100
Subject: [PATCH 1108/1433] Add support for concrete Collection/Map types to
 EmptySource (#3159)

This adds support for:
* `Collection` and subtypes with a public no-arg constructor
* `SortedSet`
* `NavigableSet`
* `Map` subtypes with a public no-arg constructor
* `SortedMap`
* `NavigableMap`

Resolves #2791.
---
 .../release-notes-5.10.0-M1.adoc              |   2 +
 .../asciidoc/user-guide/writing-tests.adoc    |  10 +-
 .../provider/EmptyArgumentsProvider.java      |  38 ++++
 .../jupiter/params/provider/EmptySource.java  |   9 +-
 .../ParameterizedTestIntegrationTests.java    | 166 ++++++++++++++++--
 5 files changed, 202 insertions(+), 23 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 15f400b83b4e..6fd5d6d7ef2b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -62,6 +62,8 @@ repository on GitHub.
   `@ParameterizedTest` invocation.
 * `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal
   to fall back to the default display name generator.
+* `@EmptySource` now supports additional types, including `Collection` and `Map` subtypes
+  with a public no-arg constructor.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 7b0c29a35a36..62642cb68f53 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1257,10 +1257,12 @@ for parameterized tests that accept a single argument.
   method.
    - `@NullSource` cannot be used for a parameter that has a primitive type.
 * `{EmptySource}`: provides a single _empty_ argument to the annotated `@ParameterizedTest`
-  method for parameters of the following types: `java.lang.String`, `java.util.List`,
-  `java.util.Set`, `java.util.Map`, primitive arrays (e.g., `int[]`, `char[][]`, etc.),
-  object arrays (e.g.,`String[]`, `Integer[][]`, etc.).
-   - Subtypes of the supported types are not supported.
+  method for parameters of the following types: `java.lang.String`, `java.util.Collection`
+  and subtypes with a public no-arg constructor, `java.util.List`, `java.util.Set`,
+  `java.util.SortedSet`, `java.util.NavigableSet`, `java.util.Map` and subtypes with a
+  public no-arg constructor, `java.util.SortedMap`, `java.util.NavigableMap`, primitive
+  arrays (e.g., `int[]`, `char[][]`, etc.), object arrays (e.g.,`String[]`, `Integer[][]`,
+  etc.).
 * `{NullAndEmptySource}`: a _composed annotation_ that combines the functionality of
   `@NullSource` and `@EmptySource`.
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
index 8debbb3a86ff..dc0f82b5b37f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptyArgumentsProvider.java
@@ -11,13 +11,21 @@
 package org.junit.jupiter.params.provider;
 
 import static org.junit.jupiter.params.provider.Arguments.arguments;
+import static org.junit.platform.commons.util.ReflectionUtils.newInstance;
 
 import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.Optional;
 import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -44,15 +52,36 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 		if (String.class.equals(parameterType)) {
 			return Stream.of(arguments(""));
 		}
+		if (Collection.class.equals(parameterType)) {
+			return Stream.of(arguments(Collections.emptySet()));
+		}
 		if (List.class.equals(parameterType)) {
 			return Stream.of(arguments(Collections.emptyList()));
 		}
 		if (Set.class.equals(parameterType)) {
 			return Stream.of(arguments(Collections.emptySet()));
 		}
+		if (SortedSet.class.equals(parameterType)) {
+			return Stream.of(arguments(Collections.emptySortedSet()));
+		}
+		if (NavigableSet.class.equals(parameterType)) {
+			return Stream.of(arguments(Collections.emptyNavigableSet()));
+		}
 		if (Map.class.equals(parameterType)) {
 			return Stream.of(arguments(Collections.emptyMap()));
 		}
+		if (SortedMap.class.equals(parameterType)) {
+			return Stream.of(arguments(Collections.emptySortedMap()));
+		}
+		if (NavigableMap.class.equals(parameterType)) {
+			return Stream.of(arguments(Collections.emptyNavigableMap()));
+		}
+		if (Collection.class.isAssignableFrom(parameterType) || Map.class.isAssignableFrom(parameterType)) {
+			Optional<Constructor<?>> defaultConstructor = getDefaultConstructor(parameterType);
+			if (defaultConstructor.isPresent()) {
+				return Stream.of(arguments(newInstance(defaultConstructor.get())));
+			}
+		}
 		if (parameterType.isArray()) {
 			Object array = Array.newInstance(parameterType.getComponentType(), 0);
 			return Stream.of(arguments(array));
@@ -63,4 +92,13 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 				testMethod.toGenericString(), parameterType.getName()));
 	}
 
+	private static Optional<Constructor<?>> getDefaultConstructor(Class<?> clazz) {
+		try {
+			return Optional.of(clazz.getConstructor());
+		}
+		catch (NoSuchMethodException e) {
+			return Optional.empty();
+		}
+	}
+
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
index 553192a2d036..cd1104a1d6e8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
@@ -27,13 +27,18 @@
  * <h2>Supported Parameter Types</h2>
  *
  * <p>This argument source will only provide an empty argument for the following
- * method parameter types. Subtypes of the supported types are not supported.
+ * method parameter types.
  *
  * <ul>
  * <li>{@link java.lang.String}</li>
+ * <li>{@link java.util.Collection} and subtypes with a public no-arg constructor</li>
  * <li>{@link java.util.List}</li>
  * <li>{@link java.util.Set}</li>
- * <li>{@link java.util.Map}</li>
+ * <li>{@link java.util.SortedSet}</li>
+ * <li>{@link java.util.NavigableSet}</li>
+ * <li>{@link java.util.Map} and subtypes with a public no-arg constructor</li>
+ * <li>{@link java.util.SortedMap}</li>
+ * <li>{@link java.util.NavigableMap}</li>
  * <li>primitive arrays &mdash; for example {@code int[]}, {@code char[][]}, etc.</li>
  * <li>object arrays &mdash; for example {@code String[]}, {@code Integer[][]}, etc.</li>
  * </ul>
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index 24d2a711960d..e4da1e737710 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -43,12 +43,21 @@
 import java.lang.annotation.Target;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
 import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.AfterAll;
@@ -459,24 +468,78 @@ void executesWithEmptySourceForStringAndTestInfo() {
 			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument=")));
 		}
 
+		/**
+		 * @since 5.10
+		 */
+		@Test
+		void executesWithEmptySourceForCollection() {
+			var results = execute("testWithEmptySourceForCollection", Collection.class);
+			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument=[]")));
+		}
+
 		@Test
 		void executesWithEmptySourceForList() {
 			var results = execute("testWithEmptySourceForList", List.class);
 			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument=[]")));
 		}
 
+		/**
+		 * @since 5.10
+		 */
+		@ParameterizedTest(name = "{1}")
+		@CsvSource({ //
+				"testWithEmptySourceForArrayList, java.util.ArrayList", //
+				"testWithEmptySourceForLinkedList, java.util.LinkedList"//
+		})
+		void executesWithEmptySourceForListSubtype(String methodName, Class<?> parameterType) {
+			var results = execute(methodName, parameterType);
+			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument=[]")));
+		}
+
 		@Test
 		void executesWithEmptySourceForSet() {
 			var results = execute("testWithEmptySourceForSet", Set.class);
 			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument=[]")));
 		}
 
+		/**
+		 * @since 5.10
+		 */
+		@ParameterizedTest(name = "{1}")
+		@CsvSource({ //
+				"testWithEmptySourceForSortedSet, java.util.SortedSet", //
+				"testWithEmptySourceForNavigableSet, java.util.NavigableSet", //
+				"testWithEmptySourceForHashSet, java.util.HashSet", //
+				"testWithEmptySourceForTreeSet, java.util.TreeSet", //
+				"testWithEmptySourceForLinkedHashSet, java.util.LinkedHashSet"//
+		})
+		void executesWithEmptySourceForSetSubtype(String methodName, Class<?> parameterType) {
+			var results = execute(methodName, parameterType);
+			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument=[]")));
+		}
+
 		@Test
 		void executesWithEmptySourceForMap() {
 			var results = execute("testWithEmptySourceForMap", Map.class);
 			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument={}")));
 		}
 
+		/**
+		 * @since 5.10
+		 */
+		@ParameterizedTest(name = "{1}")
+		@CsvSource({ //
+				"testWithEmptySourceForSortedMap, java.util.SortedMap", //
+				"testWithEmptySourceForNavigableMap, java.util.NavigableMap", //
+				"testWithEmptySourceForHashMap, java.util.HashMap", //
+				"testWithEmptySourceForTreeMap, java.util.TreeMap", //
+				"testWithEmptySourceForLinkedHashMap, java.util.LinkedHashMap"//
+		})
+		void executesWithEmptySourceForMapSubtype(String methodName, Class<?> parameterType) {
+			var results = execute(methodName, parameterType);
+			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument={}")));
+		}
+
 		@Test
 		void executesWithEmptySourceForOneDimensionalPrimitiveArray() {
 			var results = execute("testWithEmptySourceForOneDimensionalPrimitiveArray", int[].class);
@@ -515,10 +578,7 @@ void failsWithEmptySourceWithZeroFormalParameters() {
 		@ParameterizedTest(name = "{1}")
 		@CsvSource({ //
 				"testWithEmptySourceForPrimitive, int", //
-				"testWithEmptySourceForUnsupportedReferenceType, java.lang.Integer", //
-				"testWithEmptySourceForUnsupportedListSubtype, java.util.ArrayList", //
-				"testWithEmptySourceForUnsupportedSetSubtype, java.util.HashSet", //
-				"testWithEmptySourceForUnsupportedMapSubtype, java.util.HashMap"//
+				"testWithEmptySourceForUnsupportedReferenceType, java.lang.Integer"//
 		})
 		void failsWithEmptySourceForUnsupportedType(String methodName, Class<?> parameterType) {
 			execute(methodName, parameterType).containerEvents().failed().assertEventsMatchExactly(//
@@ -561,6 +621,12 @@ void executesWithNullAndEmptySourceForList() {
 			assertNullAndEmpty(results);
 		}
 
+		@Test
+		void executesWithNullAndEmptySourceForArrayList() {
+			var results = execute("testWithNullAndEmptySourceForArrayList", ArrayList.class);
+			assertNullAndEmpty(results);
+		}
+
 		@Test
 		void executesWithNullAndEmptySourceForOneDimensionalPrimitiveArray() {
 			var results = execute("testWithNullAndEmptySourceForOneDimensionalPrimitiveArray", int[].class);
@@ -982,18 +1048,66 @@ void testWithEmptySourceForStringAndTestInfo(String argument, TestInfo testInfo)
 			assertThat(testInfo).isNotNull();
 		}
 
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForCollection(Collection<?> argument) {
+			assertThat(argument).isEmpty();
+		}
+
 		@ParameterizedTest
 		@EmptySource
 		void testWithEmptySourceForList(List<?> argument) {
 			assertThat(argument).isEmpty();
 		}
 
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForArrayList(ArrayList<?> argument) {
+			assertThat(argument).isEmpty();
+		}
+
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForLinkedList(LinkedList<?> argument) {
+			assertThat(argument).isEmpty();
+		}
+
 		@ParameterizedTest
 		@EmptySource
 		void testWithEmptySourceForSet(Set<?> argument) {
 			assertThat(argument).isEmpty();
 		}
 
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForSortedSet(SortedSet<?> argument) {
+			assertThat(argument).isEmpty();
+		}
+
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForNavigableSet(NavigableSet<?> argument) {
+			assertThat(argument).isEmpty();
+		}
+
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForHashSet(HashSet<?> argument) {
+			assertThat(argument).isEmpty();
+		}
+
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForTreeSet(TreeSet<?> argument) {
+			assertThat(argument).isEmpty();
+		}
+
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForLinkedHashSet(LinkedHashSet<?> argument) {
+			assertThat(argument).isEmpty();
+		}
+
 		@ParameterizedTest
 		@EmptySource
 		void testWithEmptySourceForMap(Map<?, ?> argument) {
@@ -1002,61 +1116,73 @@ void testWithEmptySourceForMap(Map<?, ?> argument) {
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForOneDimensionalPrimitiveArray(int[] argument) {
+		void testWithEmptySourceForSortedMap(SortedMap<?, ?> argument) {
 			assertThat(argument).isEmpty();
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForOneDimensionalStringArray(String[] argument) {
+		void testWithEmptySourceForNavigableMap(NavigableMap<?, ?> argument) {
 			assertThat(argument).isEmpty();
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForTwoDimensionalPrimitiveArray(int[][] argument) {
+		void testWithEmptySourceForHashMap(HashMap<?, ?> argument) {
 			assertThat(argument).isEmpty();
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForTwoDimensionalStringArray(String[][] argument) {
+		void testWithEmptySourceForTreeMap(TreeMap<?, ?> argument) {
 			assertThat(argument).isEmpty();
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceWithZeroFormalParameters() {
-			fail("should not have been executed");
+		void testWithEmptySourceForLinkedHashMap(LinkedHashMap<?, ?> argument) {
+			assertThat(argument).isEmpty();
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForPrimitive(int argument) {
-			fail("should not have been executed");
+		void testWithEmptySourceForOneDimensionalPrimitiveArray(int[] argument) {
+			assertThat(argument).isEmpty();
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForUnsupportedReferenceType(Integer argument) {
-			fail("should not have been executed");
+		void testWithEmptySourceForOneDimensionalStringArray(String[] argument) {
+			assertThat(argument).isEmpty();
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForUnsupportedListSubtype(ArrayList<?> argument) {
+		void testWithEmptySourceForTwoDimensionalPrimitiveArray(int[][] argument) {
+			assertThat(argument).isEmpty();
+		}
+
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceForTwoDimensionalStringArray(String[][] argument) {
+			assertThat(argument).isEmpty();
+		}
+
+		@ParameterizedTest
+		@EmptySource
+		void testWithEmptySourceWithZeroFormalParameters() {
 			fail("should not have been executed");
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForUnsupportedSetSubtype(HashSet<?> argument) {
+		void testWithEmptySourceForPrimitive(int argument) {
 			fail("should not have been executed");
 		}
 
 		@ParameterizedTest
 		@EmptySource
-		void testWithEmptySourceForUnsupportedMapSubtype(HashMap<?, ?> argument) {
+		void testWithEmptySourceForUnsupportedReferenceType(Integer argument) {
 			fail("should not have been executed");
 		}
 
@@ -1083,6 +1209,12 @@ void testWithNullAndEmptySourceForList(List<?> argument) {
 			assertTrue(argument == null || argument.isEmpty());
 		}
 
+		@ParameterizedTest
+		@NullAndEmptySource
+		void testWithNullAndEmptySourceForArrayList(ArrayList<?> argument) {
+			assertTrue(argument == null || argument.isEmpty());
+		}
+
 		@ParameterizedTest
 		@NullAndEmptySource
 		void testWithNullAndEmptySourceForOneDimensionalPrimitiveArray(int[] argument) {

From 4e64cf2a28481751ba19f7b57bc1e7db409e3e2a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 21 Feb 2023 20:06:14 +0100
Subject: [PATCH 1109/1433] Run timeout tests via Gradle test task so they can
 be retried

Since some of these tests occasionally fail on CI, in particular on
Windows, they are now run via Gradle so that they are retried on CI
automatically and reported as flaky rather than failing the build.
---
 documentation/documentation.gradle.kts             | 14 +++++++++++---
 .../src/test/java/example/AssertionsDemo.java      | 12 ++++++++++++
 documentation/src/test/java/example/SlowTests.java |  4 ++--
 .../src/test/java/example/TimeoutDemo.java         |  2 ++
 .../test/kotlin/example/KotlinAssertionsDemo.kt    |  5 +++++
 .../junitbuild.testing-conventions.gradle.kts      |  1 -
 .../junit-jupiter-engine.gradle.kts                |  1 +
 .../junit-vintage-engine.gradle.kts                |  1 +
 platform-tests/platform-tests.gradle.kts           |  1 +
 9 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 01b138459d86..c90891a62be6 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -13,6 +13,7 @@ plugins {
 	id("org.asciidoctor.jvm.pdf")
 	id("org.ajoberstar.git-publish")
 	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.testing-conventions")
 }
 
 val modularProjects: List<Project> by rootProject
@@ -37,7 +38,6 @@ dependencies {
 	// in reports generated by the ApiReportGenerator.
 	modularProjects.forEach { apiReport(it) }
 
-	testImplementation(projects.junitJupiter)
 	testImplementation(projects.junitJupiterMigrationsupport)
 	testImplementation(projects.junitPlatformConsole)
 	testImplementation(projects.junitPlatformRunner)
@@ -46,7 +46,6 @@ dependencies {
 	testImplementation(kotlin("stdlib"))
 
 	testImplementation(projects.junitVintageEngine)
-	testRuntimeOnly(libs.bundles.log4j)
 	testRuntimeOnly(libs.apiguardian) {
 		because("it's required to generate API tables")
 	}
@@ -121,6 +120,7 @@ tasks {
 		args.addAll("--include-classname", ".*Tests")
 		args.addAll("--include-classname", ".*Demo")
 		args.addAll("--exclude-tag", "exclude")
+		args.addAll("--exclude-tag", "timeout")
 	}
 
 	register<RunConsoleLauncher>("consoleLauncher") {
@@ -131,11 +131,19 @@ tasks {
 		args.addAll("--include-classname", ".*Tests")
 		args.addAll("--include-classname", ".*Demo")
 		args.addAll("--exclude-tag", "exclude")
+		args.addAll("--exclude-tag", "timeout")
 	}
 
 	test {
+		include("**/*Demo.class")
+		(options as JUnitPlatformOptions).apply {
+			includeEngines("junit-vintage")
+			includeTags("timeout")
+		}
+	}
+
+	check {
 		dependsOn(consoleLauncherTest)
-		exclude("**/*")
 	}
 
 	val generateConsoleLauncherOptions by registering(JavaExec::class) {
diff --git a/documentation/src/test/java/example/AssertionsDemo.java b/documentation/src/test/java/example/AssertionsDemo.java
index a9cd383df6c1..476434da44f6 100644
--- a/documentation/src/test/java/example/AssertionsDemo.java
+++ b/documentation/src/test/java/example/AssertionsDemo.java
@@ -27,6 +27,7 @@
 import example.domain.Person;
 import example.util.Calculator;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 class AssertionsDemo {
@@ -91,6 +92,9 @@ void exceptionTesting() {
 		assertEquals("/ by zero", exception.getMessage());
 	}
 
+	// end::user_guide[]
+	@Tag("timeout")
+	// tag::user_guide[]
 	@Test
 	void timeoutNotExceeded() {
 		// The following assertion succeeds.
@@ -99,6 +103,9 @@ void timeoutNotExceeded() {
 		});
 	}
 
+	// end::user_guide[]
+	@Tag("timeout")
+	// tag::user_guide[]
 	@Test
 	void timeoutNotExceededWithResult() {
 		// The following assertion succeeds, and returns the supplied object.
@@ -108,6 +115,9 @@ void timeoutNotExceededWithResult() {
 		assertEquals("a result", actualResult);
 	}
 
+	// end::user_guide[]
+	@Tag("timeout")
+	// tag::user_guide[]
 	@Test
 	void timeoutNotExceededWithMethod() {
 		// The following assertion invokes a method reference and returns an object.
@@ -116,6 +126,7 @@ void timeoutNotExceededWithMethod() {
 	}
 
 	// end::user_guide[]
+	@Tag("timeout")
 	@extensions.ExpectToFail
 	// tag::user_guide[]
 	@Test
@@ -129,6 +140,7 @@ void timeoutExceeded() {
 	}
 
 	// end::user_guide[]
+	@Tag("timeout")
 	@extensions.ExpectToFail
 	// tag::user_guide[]
 	@Test
diff --git a/documentation/src/test/java/example/SlowTests.java b/documentation/src/test/java/example/SlowTests.java
index f3c711e7b393..6fef77843145 100644
--- a/documentation/src/test/java/example/SlowTests.java
+++ b/documentation/src/test/java/example/SlowTests.java
@@ -10,15 +10,16 @@
 
 package example;
 
-// tag::user_guide[]
 import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
 import java.util.stream.IntStream;
 
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 
+@Tag("exclude")
 @Disabled
 class SlowTests {
 
@@ -123,4 +124,3 @@ private void foo() {
 		IntStream.range(1, 100_000_000).mapToDouble(i -> Math.pow(i, i)).map(Math::sqrt).max();
 	}
 }
-// end::user_guide[]
diff --git a/documentation/src/test/java/example/TimeoutDemo.java b/documentation/src/test/java/example/TimeoutDemo.java
index 8700f23e4bad..82e89ce48479 100644
--- a/documentation/src/test/java/example/TimeoutDemo.java
+++ b/documentation/src/test/java/example/TimeoutDemo.java
@@ -13,10 +13,12 @@
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.Timeout.ThreadMode;
 
+@Tag("timeout")
 // tag::user_guide[]
 class TimeoutDemo {
 
diff --git a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
index 2870ae95ac25..0ea73f7f99d8 100644
--- a/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
+++ b/documentation/src/test/kotlin/example/KotlinAssertionsDemo.kt
@@ -15,6 +15,7 @@ import example.domain.Person
 import example.util.Calculator
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertAll
 import org.junit.jupiter.api.assertDoesNotThrow
@@ -76,6 +77,9 @@ class KotlinAssertionsDemo {
         )
     }
 
+    // end::user_guide[]
+    @Tag("timeout")
+    // tag::user_guide[]
     @Test
     fun `timeout not exceeded testing`() {
         val fibonacciCalculator = FibonacciCalculator()
@@ -86,6 +90,7 @@ class KotlinAssertionsDemo {
     }
 
     // end::user_guide[]
+    @Tag("timeout")
     @extensions.ExpectToFail
     // tag::user_guide[]
     @Test
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
index 3a2c6a5e164d..a11546e4d937 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
@@ -79,7 +79,6 @@ dependencies {
 	if (!project.name.startsWith("junit-jupiter")) {
 		testImplementation(project(":junit-jupiter"))
 	}
-	testImplementation(testFixtures(project(":junit-jupiter-api")))
 
 	testRuntimeOnly(project(":junit-platform-engine"))
 	testRuntimeOnly(project(":junit-platform-jfr"))
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 8d9112ccba1a..daa45cd35487 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
 	testImplementation(libs.junit4)
 	testImplementation(libs.kotlinx.coroutines)
 	testImplementation(libs.groovy4)
+	testImplementation(testFixtures(projects.junitJupiterApi))
 
 	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 9f68f7de0475..c740522e0bf4 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
+	testImplementation(testFixtures(projects.junitJupiterApi))
 
 	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index 2990064246c6..ebdd20a6788a 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
 	testImplementation(libs.joox)
 	testImplementation(libs.openTestReporting.tooling)
 	testImplementation(libs.bundles.xmlunit)
+	testImplementation(testFixtures(projects.junitJupiterApi))
 
 	// --- Test run-time dependencies ---------------------------------------------
 	testRuntimeOnly(projects.junitVintageEngine)

From 8bb3a4c2981b190152d88d446be62d3f065b5901 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 27 Feb 2023 14:04:18 +0100
Subject: [PATCH 1110/1433] Prevent Dependabot from adding labels

---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a6f0f7d26fdb..96ab685e82d0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,7 +12,9 @@ updates:
       - gradle-plugin-portal
     schedule:
       interval: "weekly"
+    labels: [ ]
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+    labels: [ ]

From 6de4938892b7ca0954181cd0db82cfc987a74f8d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 28 Feb 2023 19:55:17 +0100
Subject: [PATCH 1111/1433] Add GH action to combine dependabot PRs

---
 .github/workflows/combine-prs.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/workflows/combine-prs.yml

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
new file mode 100644
index 000000000000..1669807c6890
--- /dev/null
+++ b/.github/workflows/combine-prs.yml
@@ -0,0 +1,15 @@
+name: Combine PRs
+
+on:
+  schedule:
+    - cron: '0 0 * * *' # Wednesday at 01:00
+  workflow_dispatch:
+
+jobs:
+  combine-prs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: combine-prs
+        uses: github.amrom.workers.devbine-prs@v2.0.0
+        with:
+          github_token: ${{ secrets.GH_TOKEN }}

From a2817c7d419691f0d4aad9fc53cafe912c877631 Mon Sep 17 00:00:00 2001
From: JUnit Build Master <team@junit.org>
Date: Tue, 28 Feb 2023 20:06:11 +0100
Subject: [PATCH 1112/1433] Update Gradle plugins (#3179)

* Bump me.champeau.jmh from 0.6.8 to 0.7.0
* Bump com.github.ben-manes.versions from 0.45.0 to 0.46.0
* Bump io.github.gradle-nexus.publish-plugin from 1.1.0 to 1.2.0
* Bump gradle.plugin.com.github.johnrengelman:shadow from 7.1.2 to 8.0.0
---
 gradle/plugins/build.gradle.kts | 4 ++--
 settings.gradle.kts             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
index 823a90510165..bc575c595282 100644
--- a/gradle/plugins/build.gradle.kts
+++ b/gradle/plugins/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	`kotlin-dsl`
-	id("com.github.ben-manes.versions") version "0.45.0"
+	id("com.github.ben-manes.versions") version "0.46.0"
 }
 
 repositories {
@@ -14,7 +14,7 @@ dependencies {
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.15.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.45.0")
-	implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+	implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.3") // keep in sync with root settings.gradle.kts
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3418ab49c4f3..07d42905f4fe 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,9 +14,9 @@ pluginManagement {
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
 		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"
-		id("me.champeau.jmh") version "0.6.8"
+		id("me.champeau.jmh") version "0.7.0"
 		id("io.spring.nohttp") version "0.0.11"
-		id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+		id("io.github.gradle-nexus.publish-plugin") version "1.2.0"
 	}
 }
 

From 739cb7c99e0a6a7dc9532ac676f5a689c574a80e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 07:48:11 +0100
Subject: [PATCH 1113/1433] Bump com.github.ben-manes:gradle-versions-plugin to
 0.46.0 (#3174)

Bumps [com.github.ben-manes:gradle-versions-plugin](https://github.com/ben-manes/gradle-versions-plugin) from 0.45.0 to 0.46.0.
- [Release notes](https://github.com/ben-manes/gradle-versions-plugin/releases)
- [Commits](https://github.com/ben-manes/gradle-versions-plugin/compare/v0.45.0...v0.46.0)

---
updated-dependencies:
- dependency-name: com.github.ben-manes:gradle-versions-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/plugins/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
index bc575c595282..e499f8cca6f5 100644
--- a/gradle/plugins/build.gradle.kts
+++ b/gradle/plugins/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.15.0")
-	implementation("com.github.ben-manes:gradle-versions-plugin:0.45.0")
+	implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.3") // keep in sync with root settings.gradle.kts
 }

From ac8a5bd6c70244a0a5ba8073469452d20af3f671 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 1 Mar 2023 20:02:33 +0100
Subject: [PATCH 1114/1433] Re-enable CodeQL check for Java (#3163)

---
 .github/workflows/codeql-analysis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 61e9b0b52914..82ee018479e3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         language:
-          # - java # Currently broken because it doesn't support Kotlin 1.8.10, yet (https://github.com/github/codeql/discussions/11460#discussioncomment-4879731)
+          - java
           - javascript
     steps:
     - name: Check out repository
@@ -33,6 +33,7 @@ jobs:
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
+        tools: latest
     - name: Build
       uses: ./.github/actions/run-gradle
       with:

From bac21211e4af9c97d208acf83bb943ae422addf3 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 4 Mar 2023 14:09:45 +0100
Subject: [PATCH 1115/1433] Upgradle to 8.0.2

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f396aaac2d31..19acfb4ef2f6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 6976f0dd4d5789dfd288ca9183ab05079e4fd98a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 4 Mar 2023 14:20:11 +0100
Subject: [PATCH 1116/1433] Fix comment

---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 1669807c6890..95cb7ed5dce5 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -2,7 +2,7 @@ name: Combine PRs
 
 on:
   schedule:
-    - cron: '0 0 * * *' # Wednesday at 01:00
+    - cron: '0 0 * * *' # Every day at 00:00 UTC
   workflow_dispatch:
 
 jobs:

From 557c419c1723791b7750543f69a64b4632102518 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Thu, 9 Mar 2023 08:28:23 +0100
Subject: [PATCH 1117/1433] Model parameters using org.gradlex.build-parameters
 (#3170)

Introduces the org.gradlex.build-parameters plugin to model parameters
that can be supplied to this build. For this the existing build logic
in gradle/plugins is moved to a submodule called 'common' and a new
module called 'build-parameters' is introduced. This way, build logic
can access build parameters using the `buildParameters` pre-compiled
accessor in Kotlin.

Occurences of project.findProperty as well as project.hasProperty
are replaced by properly modeled build parameters. Since validation
of parameters is not turned off, the build-parameters plugin will
fail the build is a parameter is supplied which is not modeled.
For that reason, any other parameters, such as signing or deployment
parameters that are supplied by developers only during releasing need to
be added before this can be merged.
---
 .editorconfig                                 |  3 +
 .github/actions/run-gradle/action.yml         |  2 +-
 .github/workflows/cross-version.yml           |  6 +-
 .github/workflows/main.yml                    |  8 +-
 README.md                                     |  2 +-
 build.gradle.kts                              |  2 +-
 documentation/documentation.gradle.kts        |  3 +-
 .../plugins/build-parameters/build.gradle.kts | 81 +++++++++++++++++++
 gradle/plugins/{ => common}/build.gradle.kts  |  1 +
 .../ConfigurationContainerExtensions.kt       |  0
 .../src/main/kotlin/JavaLibraryExtension.kt   |  0
 .../{ => common}/src/main/kotlin/License.kt   |  0
 .../src/main/kotlin/ProjectExtensions.kt      |  0
 .../src/main/kotlin/TaskExtensions.kt         |  0
 .../junitbuild.base-conventions.gradle.kts    |  0
 .../junitbuild.build-metadata.gradle.kts      |  0
 ...itbuild.dependency-update-check.gradle.kts |  0
 ....jacoco-aggregation-conventions.gradle.kts |  0
 .../junitbuild.jacoco-conventions.gradle.kts  |  5 +-
 ...itbuild.jacoco-java-conventions.gradle.kts |  4 +-
 ...tbuild.java-library-conventions.gradle.kts |  0
 ...uild.java-multi-release-sources.gradle.kts |  0
 .../junitbuild.java-repackage-jars.gradle.kts |  0
 ...uild.java-toolchain-conventions.gradle.kts |  7 +-
 ...junitbuild.junit4-compatibility.gradle.kts |  0
 ...uild.kotlin-library-conventions.gradle.kts |  0
 .../junitbuild.osgi-conventions.gradle.kts    |  0
 ...nitbuild.publishing-conventions.gradle.kts |  4 +-
 .../junitbuild.shadow-conventions.gradle.kts  |  0
 ...junitbuild.spotless-conventions.gradle.kts |  0
 .../junitbuild.temp-maven-repo.gradle.kts     |  0
 .../junitbuild.testing-conventions.gradle.kts | 21 +++--
 .../exec/ClasspathSystemPropertyProvider.kt   |  0
 .../junitbuild/exec/RunConsoleLauncher.kt     |  0
 .../kotlin/junitbuild/java/ExecJarAction.kt   |  0
 .../junitbuild/java/ModuleCompileOptions.kt   |  0
 .../java/ModulePathArgumentProvider.kt        |  0
 .../java/PatchModuleArgumentProvider.kt       |  0
 .../junitbuild/java/WriteArtifactsFile.kt     |  0
 .../ModuleSpecificJavadocFileOption.kt        |  0
 gradle/plugins/settings.gradle.kts            |  2 +
 .../platform-tooling-support-tests.gradle.kts |  5 +-
 settings.gradle.kts                           | 30 +++----
 43 files changed, 136 insertions(+), 50 deletions(-)
 create mode 100644 gradle/plugins/build-parameters/build.gradle.kts
 rename gradle/plugins/{ => common}/build.gradle.kts (94%)
 rename gradle/plugins/{ => common}/src/main/kotlin/ConfigurationContainerExtensions.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/JavaLibraryExtension.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/License.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/ProjectExtensions.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/TaskExtensions.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.base-conventions.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.build-metadata.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts (61%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts (90%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts (87%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts (94%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild.testing-conventions.gradle.kts (75%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild/java/ExecJarAction.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt (100%)
 rename gradle/plugins/{ => common}/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt (100%)

diff --git a/.editorconfig b/.editorconfig
index 063e4a874109..2a4ad4ec1b55 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,6 @@
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma = false
 ij_kotlin_allow_trailing_comma_on_call_site = false
+
+[*.kts]
+indent_style = tab
diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
index 501393593a6c..a4b1bc129f6c 100644
--- a/.github/actions/run-gradle/action.yml
+++ b/.github/actions/run-gradle/action.yml
@@ -19,7 +19,7 @@ runs:
       with:
         arguments: |
           -Porg.gradle.java.installations.auto-download=false
-          -PenablePredictiveTestSelection=${{ github.event_name == 'pull_request' }}
+          -Penterprise.predictiveTestSelection.enabled=${{ github.event_name == 'pull_request' }}
           "-Dscan.value.GitHub job=${{ github.job }}"
           javaToolchains
           ${{ inputs.arguments }}
diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 4786e5b3c07f..13c93692b87a 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -10,9 +10,9 @@ on:
       - '*'
 
 env:
-  ORG_GRADLE_PROJECT_enableTestDistribution: true
-  ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
-  ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
+  ENTERPRISE_TESTDISTRIBUTION_ENABLED: true
+  BUILDCACHE_USERNAME: ${{ secrets.BUILD_CACHE_USERNAME }}
+  BUILDCACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 25b8e9db7f72..676ec1a2f87a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,9 +10,9 @@ on:
       - '*'
 
 env:
-  ORG_GRADLE_PROJECT_enableTestDistribution: true
-  ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
-  ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
+  ENTERPRISE_TESTDISTRIBUTION_ENABLED: true
+  BUILDCACHE_USERNAME: ${{ secrets.BUILD_CACHE_USERNAME }}
+  BUILDCACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
@@ -38,7 +38,7 @@ jobs:
       uses: ./.github/actions/main-build
       with:
         arguments: |
-          -PenableJaCoCo
+          -Ptesting.enableJaCoCo
           build
           jacocoRootReport
           prepareDocsForUploadToGhPages
diff --git a/README.md b/README.md
index 7b4bb98a40c3..aa095c5e67be 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ builds of the next OpenJDK.
 Code coverage using [JaCoCo] for the latest build is available on [Codecov].
 
 A code coverage report can also be generated locally via the [Gradle Wrapper] by
-executing `./gradlew -PenableJaCoCo clean jacocoRootReport`. The results will be available
+executing `./gradlew -Ptesting.enableJaCoCo clean jacocoRootReport`. The results will be available
 in `build/reports/jacoco/jacocoRootReport/html/index.html`.
 
 ## Gradle Enterprise
diff --git a/build.gradle.kts b/build.gradle.kts
index 7662a5524b31..f1cf305950ea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,5 +61,5 @@ nexusPublishing {
 }
 
 nohttp {
-	source.exclude("**/.gradle/**", "gradle/plugins/build/**")
+	source.exclude("**/.gradle/**", "gradle/plugins/**/build/**")
 }
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index c90891a62be6..2c2ac600ba6a 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -12,6 +12,7 @@ plugins {
 	id("org.asciidoctor.jvm.convert")
 	id("org.asciidoctor.jvm.pdf")
 	id("org.ajoberstar.git-publish")
+	id("junitbuild.build-parameters")
 	id("junitbuild.kotlin-library-conventions")
 	id("junitbuild.testing-conventions")
 }
@@ -71,7 +72,7 @@ val snapshot = rootProject.version.toString().contains("SNAPSHOT")
 val docsVersion = if (snapshot) "snapshot" else rootProject.version
 val releaseBranch = if (snapshot) "HEAD" else "r${rootProject.version}"
 val docsDir = file("$buildDir/ghpages-docs")
-val replaceCurrentDocs = project.hasProperty("replaceCurrentDocs")
+val replaceCurrentDocs = buildParameters.documentation.replaceCurrentDocs
 val uploadPdfs = !snapshot
 val userGuidePdfFileName = "junit-user-guide-${rootProject.version}.pdf"
 val ota4jDocVersion = if (libs.versions.opentest4j.get().contains("SNAPSHOT")) "snapshot" else libs.versions.opentest4j.get()
diff --git a/gradle/plugins/build-parameters/build.gradle.kts b/gradle/plugins/build-parameters/build.gradle.kts
new file mode 100644
index 000000000000..d246161af8fa
--- /dev/null
+++ b/gradle/plugins/build-parameters/build.gradle.kts
@@ -0,0 +1,81 @@
+plugins {
+	id("org.gradlex.build-parameters") version "1.4.3"
+}
+
+group = "junitbuild"
+
+buildParameters {
+	pluginId("junitbuild.build-parameters")
+	bool("ci") {
+		description.set("Whether or not this build is running in a CI environment")
+		defaultValue.set(false)
+		fromEnvironment()
+	}
+	integer("javaToolchainVersion") {
+		description.set("Defines the Java toolchain version to use for compiling code")
+	}
+	group("buildCache") {
+		string("username") {
+			description.set("Username to authenticate with the remote build cache")
+			fromEnvironment()
+		}
+		string("password") {
+			description.set("Password to authenticate with the remote build cache")
+			fromEnvironment()
+		}
+		string("url") {
+			description.set("URL to the remote build cache")
+			fromEnvironment()
+		}
+	}
+	group("documentation") {
+		description.set("Parameters controlling how the documentation is built")
+		bool("replaceCurrentDocs") {
+			description.set("The documentation that is being deployed will replace what's currently deployed as 'current'")
+			defaultValue.set(false)
+		}
+	}
+	group("enterprise") {
+		description.set("Parameters controlling Gradle Enterprise features")
+		group("predictiveTestSelection") {
+			bool("enabled") {
+				description.set("Whether or not to use Predictive Test Selection for selecting tests to execute")
+				defaultValue.set(true)
+			}
+		}
+		group("testDistribution") {
+			bool("enabled") {
+				description.set("Whether or not to use Test Distribution for executing tests")
+				defaultValue.set(false)
+				fromEnvironment()
+			}
+			integer("maxLocalExecutors") {
+				description.set("How many local executors to use for executing tests")
+				defaultValue.set(1)
+			}
+			integer("maxRemoteExecutors") {
+				description.set("How many remote executors to request for executing tests")
+			}
+		}
+	}
+	group("testing") {
+		description.set("Testing related parameters")
+		bool("enableJaCoCo") {
+			description.set("Enables JaCoCo test coverage reporting")
+			defaultValue.set(false)
+		}
+		bool("enableJFR") {
+			description.set("Enables Java Flight Recorder functionality")
+			defaultValue.set(false)
+		}
+		integer("retries") {
+			description.set("Configures the number of times failing test are retried")
+		}
+	}
+}
+
+tasks {
+	withType<JavaCompile>().configureEach {
+		options.release.set(11)
+	}
+}
diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
similarity index 94%
rename from gradle/plugins/build.gradle.kts
rename to gradle/plugins/common/build.gradle.kts
index e499f8cca6f5..88ec294b01fd 100644
--- a/gradle/plugins/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -10,6 +10,7 @@ repositories {
 }
 
 dependencies {
+	implementation(project(":build-parameters"))
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.15.0")
diff --git a/gradle/plugins/src/main/kotlin/ConfigurationContainerExtensions.kt b/gradle/plugins/common/src/main/kotlin/ConfigurationContainerExtensions.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/ConfigurationContainerExtensions.kt
rename to gradle/plugins/common/src/main/kotlin/ConfigurationContainerExtensions.kt
diff --git a/gradle/plugins/src/main/kotlin/JavaLibraryExtension.kt b/gradle/plugins/common/src/main/kotlin/JavaLibraryExtension.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/JavaLibraryExtension.kt
rename to gradle/plugins/common/src/main/kotlin/JavaLibraryExtension.kt
diff --git a/gradle/plugins/src/main/kotlin/License.kt b/gradle/plugins/common/src/main/kotlin/License.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/License.kt
rename to gradle/plugins/common/src/main/kotlin/License.kt
diff --git a/gradle/plugins/src/main/kotlin/ProjectExtensions.kt b/gradle/plugins/common/src/main/kotlin/ProjectExtensions.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/ProjectExtensions.kt
rename to gradle/plugins/common/src/main/kotlin/ProjectExtensions.kt
diff --git a/gradle/plugins/src/main/kotlin/TaskExtensions.kt b/gradle/plugins/common/src/main/kotlin/TaskExtensions.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/TaskExtensions.kt
rename to gradle/plugins/common/src/main/kotlin/TaskExtensions.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.base-conventions.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.base-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.base-conventions.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.build-metadata.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.build-metadata.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.build-metadata.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.build-metadata.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
similarity index 61%
rename from gradle/plugins/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
index 03e5c8851345..ef29df71f8c0 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-conventions.gradle.kts
@@ -1,13 +1,12 @@
 plugins {
 	jacoco
+	id("junitbuild.build-parameters")
 }
 
-val enableJaCoCo = project.hasProperty("enableJaCoCo")
-
 jacoco {
 	toolVersion = requiredVersionFromLibs("jacoco")
 }
 
 tasks.withType<JacocoReport>().configureEach {
-	enabled = enableJaCoCo
+	enabled = buildParameters.testing.enableJaCoCo
 }
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
similarity index 90%
rename from gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
index 42f7c754fd4e..7bc6a3a8e214 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
@@ -3,15 +3,15 @@ import org.gradle.api.attributes.LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE
 
 plugins {
 	java
+	id("junitbuild.build-parameters")
 	id("junitbuild.jacoco-conventions")
 }
 
 val mavenizedProjects: List<Project> by rootProject.extra
-val enableJaCoCo = project.hasProperty("enableJaCoCo")
 
 tasks.withType<Test>().configureEach {
 	configure<JacocoTaskExtension> {
-		isEnabled = enableJaCoCo
+		isEnabled = buildParameters.testing.enableJaCoCo
 	}
 }
 
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.java-repackage-jars.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
similarity index 87%
rename from gradle/plugins/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
index 87c334d2621e..5cd96cf5180e 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
@@ -1,9 +1,12 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 
+plugins {
+	id("junitbuild.build-parameters")
+}
+
 project.pluginManager.withPlugin("java") {
-	val javaToolchainVersion: String? by project
 	val defaultLanguageVersion = JavaLanguageVersion.of(17)
-	val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: defaultLanguageVersion
+	val javaLanguageVersion = buildParameters.javaToolchainVersion.map { JavaLanguageVersion.of(it) }.getOrElse(defaultLanguageVersion)
 
 	val extension = the<JavaPluginExtension>()
 	val javaToolchainService = the<JavaToolchainService>()
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
similarity index 94%
rename from gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
index 7f8b617b3084..876612f0609c 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
@@ -2,10 +2,10 @@ plugins {
 	`maven-publish`
 	signing
 	id("junitbuild.base-conventions")
+	id("junitbuild.build-parameters")
 }
 
 val isSnapshot = project.version.toString().contains("SNAPSHOT")
-val isContinuousIntegrationEnvironment = System.getenv("CI")?.toBoolean() ?: false
 
 val jupiterProjects: List<Project> by rootProject
 val platformProjects: List<Project> by rootProject
@@ -43,7 +43,7 @@ tasks.withType<PublishToMavenLocal>().configureEach {
 signing {
 	useGpgCmd()
 	sign(publishing.publications)
-	isRequired = !(isSnapshot || isContinuousIntegrationEnvironment)
+	isRequired = !(isSnapshot || buildParameters.ci)
 }
 
 tasks.withType<Sign>().configureEach {
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
similarity index 75%
rename from gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
rename to gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
index a11546e4d937..032661be08d0 100644
--- a/gradle/plugins/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
@@ -6,6 +6,7 @@ import org.gradle.internal.os.OperatingSystem
 
 plugins {
 	`java-library`
+	id("junitbuild.build-parameters")
 }
 
 tasks.withType<Test>().configureEach {
@@ -17,18 +18,14 @@ tasks.withType<Test>().configureEach {
 		events = setOf(FAILED)
 		exceptionFormat = FULL
 	}
-	val isCiServer = System.getenv("CI") != null
 	retry {
-		maxRetries.set(providers.gradleProperty("retries").map(String::toInt).orElse(if (isCiServer) 2 else 0))
+		maxRetries.set(buildParameters.testing.retries.orElse(if (buildParameters.ci) 2 else 0))
 	}
 	distribution {
-		enabled.convention(providers.gradleProperty("enableTestDistribution")
-			.map(String::toBoolean)
-			.map { enabled -> enabled && (!isCiServer || System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNotBlank()) }
-			.orElse(false))
-		maxLocalExecutors.set(providers.gradleProperty("testDistribution.maxLocalExecutors").map(String::toInt).orElse(1))
-		maxRemoteExecutors.set(providers.gradleProperty("testDistribution.maxRemoteExecutors").map(String::toInt))
-		if (isCiServer) {
+		enabled.convention(buildParameters.enterprise.testDistribution.enabled && (!buildParameters.ci || System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNotBlank()))
+		maxLocalExecutors.set(buildParameters.enterprise.testDistribution.maxLocalExecutors)
+		maxRemoteExecutors.set(buildParameters.enterprise.testDistribution.maxRemoteExecutors)
+		if (buildParameters.ci) {
 			when {
 				OperatingSystem.current().isLinux -> requirements.add("os=linux")
 				OperatingSystem.current().isWindows -> requirements.add("os=windows")
@@ -37,7 +34,7 @@ tasks.withType<Test>().configureEach {
 		}
 	}
 	predictiveSelection {
-		enabled.set(providers.gradleProperty("enablePredictiveTestSelection").map(String::toBoolean).orElse(true))
+		enabled.set(buildParameters.enterprise.predictiveTestSelection.enabled)
 
 		// Ensure PTS works when publishing Build Scans to scans.gradle.com
 		this as PredictiveTestSelectionExtensionInternal
@@ -46,7 +43,7 @@ tasks.withType<Test>().configureEach {
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 	// Required until ASM officially supports the JDK 14
 	systemProperty("net.bytebuddy.experimental", true)
-	if (project.hasProperty("enableJFR")) {
+	if (buildParameters.testing.enableJFR) {
 		jvmArgs(
 			"-XX:+UnlockDiagnosticVMOptions",
 			"-XX:+DebugNonSafepoints",
@@ -59,7 +56,7 @@ tasks.withType<Test>().configureEach {
 	trackOperationSystemAsInput()
 
 	// Avoid passing unnecessary environment variables to the JVM (from GitHub Actions)
-	if (isCiServer) {
+	if (buildParameters.ci) {
 		environment.remove("RUNNER_TEMP")
 		environment.remove("GITHUB_ACTION")
 	}
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
rename to gradle/plugins/common/src/main/kotlin/junitbuild/exec/ClasspathSystemPropertyProvider.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
rename to gradle/plugins/common/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/java/ExecJarAction.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild/java/ExecJarAction.kt
rename to gradle/plugins/common/src/main/kotlin/junitbuild/java/ExecJarAction.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt
rename to gradle/plugins/common/src/main/kotlin/junitbuild/java/ModuleCompileOptions.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
rename to gradle/plugins/common/src/main/kotlin/junitbuild/java/ModulePathArgumentProvider.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
rename to gradle/plugins/common/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
rename to gradle/plugins/common/src/main/kotlin/junitbuild/java/WriteArtifactsFile.kt
diff --git a/gradle/plugins/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
rename to gradle/plugins/common/src/main/kotlin/junitbuild/javadoc/ModuleSpecificJavadocFileOption.kt
diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
index e69de29bb2d1..ac0f7bb49c42 100644
--- a/gradle/plugins/settings.gradle.kts
+++ b/gradle/plugins/settings.gradle.kts
@@ -0,0 +1,2 @@
+include("build-parameters")
+include("common")
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 21c6f6c08d11..5be604bd0a8d 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -2,6 +2,7 @@ import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.jvm.toolchain.internal.NoToolchainAvailableException
 
 plugins {
+	id("junitbuild.build-parameters")
 	id("junitbuild.kotlin-library-conventions")
 	id("junitbuild.testing-conventions")
 }
@@ -135,8 +136,6 @@ class MavenRepo(@get:InputDirectory @get:PathSensitive(RELATIVE) val repoDir: Fi
 }
 
 class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgumentProvider {
-	@Internal
-	val passToolchain = project.providers.gradleProperty("enableTestDistribution").map(String::toBoolean).orElse(false).map { !it }
 
 	@Internal
 	val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
@@ -151,7 +150,7 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 			})
 
 	override fun asArguments(): List<String> {
-		if (passToolchain.get()) {
+		if (buildParameters.enterprise.testDistribution.enabled) {
 			val metadata = javaLauncher.map { it.metadata }
 			val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
 			return javaHome?.let { listOf("-Djava.home.$version=$it") } ?: emptyList()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 07d42905f4fe..cc8b9fb0b8fc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,4 @@
+import buildparameters.BuildParametersExtension
 import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
 
 pluginManagement {
@@ -24,6 +25,7 @@ plugins {
 	id("com.gradle.enterprise")
 	id("com.gradle.common-custom-user-data-gradle-plugin")
 	id("org.gradle.toolchains.foojay-resolver-convention")
+	id("junitbuild.build-parameters")
 }
 
 dependencyResolutionManagement {
@@ -38,15 +40,11 @@ dependencyResolutionManagement {
 }
 
 val gradleEnterpriseServer = "https://ge.junit.org"
-val isCiServer = System.getenv("CI") != null
-val junitBuildCacheUrl: String? by extra
-val junitBuildCacheUsername: String? by extra
-val junitBuildCachePassword: String? by extra
 
 gradleEnterprise {
 	buildScan {
 		capture.isTaskInputFiles = true
-		isUploadInBackground = !isCiServer
+		isUploadInBackground = !buildParameters.ci
 
 		publishAlways()
 
@@ -58,7 +56,7 @@ gradleEnterprise {
 		}
 
 		obfuscation {
-			if (isCiServer) {
+			if (buildParameters.ci) {
 				username { "github" }
 			} else {
 				hostname { null }
@@ -66,10 +64,7 @@ gradleEnterprise {
 			}
 		}
 
-		val enableTestDistribution = providers.gradleProperty("enableTestDistribution")
-			.map(String::toBoolean)
-			.getOrElse(false)
-		if (enableTestDistribution) {
+		if (buildParameters.enterprise.testDistribution.enabled) {
 			tag("test-distribution")
 		}
 	}
@@ -77,14 +72,16 @@ gradleEnterprise {
 
 buildCache {
 	local {
-		isEnabled = !isCiServer
+		isEnabled = !buildParameters.ci
 	}
 	remote<HttpBuildCache> {
-		url = uri(junitBuildCacheUrl ?: "$gradleEnterpriseServer/cache/")
-		isPush = isCiServer && !junitBuildCacheUsername.isNullOrEmpty() && !junitBuildCachePassword.isNullOrEmpty()
+		url = uri(buildParameters.buildCache.url.getOrElse("$gradleEnterpriseServer/cache/"))
+		val buildCacheUsername = buildParameters.buildCache.username.map { it.ifBlank { null } }
+		val buildCachePassword = buildParameters.buildCache.password.map { it.ifBlank { null } }
+		isPush = buildParameters.ci && buildCacheUsername.isPresent && buildCachePassword.isPresent
 		credentials {
-			username = junitBuildCacheUsername?.ifEmpty { null }
-			password = junitBuildCachePassword?.ifEmpty { null }
+			username = buildCacheUsername.orNull
+			password = buildCachePassword.orNull
 		}
 	}
 }
@@ -132,4 +129,7 @@ rootProject.children.forEach { project ->
 	}
 }
 
+val buildParameters: BuildParametersExtension
+	get() = the()
+
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

From 3ba144efdb38181d13132a552988e69c35c619a2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 10 Mar 2023 17:42:26 +0100
Subject: [PATCH 1118/1433] Fix integration tests running on Test Distribution
 agents

The logic of passing the `java.home.8` system property was accidentally
inverted in #3170.
---
 .../platform-tooling-support-tests.gradle.kts             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 5be604bd0a8d..20cd17024bcb 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -151,11 +151,11 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 
 	override fun asArguments(): List<String> {
 		if (buildParameters.enterprise.testDistribution.enabled) {
-			val metadata = javaLauncher.map { it.metadata }
-			val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
-			return javaHome?.let { listOf("-Djava.home.$version=$it") } ?: emptyList()
+			return emptyList()
 		}
-		return emptyList()
+		val metadata = javaLauncher.map { it.metadata }
+		val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
+		return javaHome?.let { listOf("-Djava.home.$version=$it") } ?: emptyList()
 	}
 }
 

From cd043e3cf2c221dae04acf567f783dc51ee51b29 Mon Sep 17 00:00:00 2001
From: JUnit Builds <team@junit.org>
Date: Fri, 17 Mar 2023 11:58:15 +0100
Subject: [PATCH 1119/1433] Update dependencies (#3194)

* Bump com.gradle.enterprise from 3.12.3 to 3.12.4
* Bump com.diffplug.spotless:spotless-plugin-gradle from 6.15.0 to 6.16.0
* Bump ant from 1.10.12 to 1.10.13
---
 gradle/libs.versions.toml              | 2 +-
 gradle/plugins/common/build.gradle.kts | 4 ++--
 settings.gradle.kts                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9628dd4e764f..89551967cc86 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-ant = "1.10.12"
+ant = "1.10.13"
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
 assertj = "3.23.1"
diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index 88ec294b01fd..6732672e0adf 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -13,10 +13,10 @@ dependencies {
 	implementation(project(":build-parameters"))
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
-	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.15.0")
+	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.16.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
-	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.3") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.4") // keep in sync with root settings.gradle.kts
 }
 
 tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cc8b9fb0b8fc..0b6976d133f1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.12.3" // keep in sync with gradle/plugins/build.gradle.kts
+		id("com.gradle.enterprise") version "3.12.4" // keep in sync with gradle/plugins/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"

From 7210d99972475812c63425a874a32eb241651a78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Mar 2023 12:16:43 +0100
Subject: [PATCH 1120/1433] Bump common-custom-user-data-gradle-plugin from
 1.8.2 to 1.9 (#3183)

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0b6976d133f1..2a8f5ffce8d9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.12.4" // keep in sync with gradle/plugins/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.9"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"
 		kotlin("jvm") version "1.8.10"

From 43d8dac8903e1d2b7a89bb40c2d24c6e7d7824b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 06:01:13 +0000
Subject: [PATCH 1121/1433] Bump log4j from 2.19.0 to 2.20.0

Bumps `log4j` from 2.19.0 to 2.20.0.

Updates `org.apache.logging.log4j:log4j-core` from 2.19.0 to 2.20.0
- [Release notes](https://github.com/apache/logging-log4j2/releases)
- [Changelog](https://github.com/apache/logging-log4j2/blob/2.x/CHANGELOG.adoc)
- [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0)

Updates `org.apache.logging.log4j:log4j-jul` from 2.19.0 to 2.20.0
- [Release notes](https://github.com/apache/logging-log4j2/releases)
- [Changelog](https://github.com/apache/logging-log4j2/blob/2.x/CHANGELOG.adoc)
- [Commits](https://github.com/apache/logging-log4j2/compare/rel/2.19.0...rel/2.20.0)

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-jul
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 89551967cc86..a50049465b28 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ junit4 = "4.13.2"
 junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 ktlint = "0.48.2"
-log4j = "2.19.0"
+log4j = "2.20.0"
 opentest4j = "1.2.0"
 openTestReporting = "0.1.0-M1"
 surefire = "3.0.0-M7"

From b18b5a9481f59f64108df73529869f7b9a552f2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 06:01:15 +0000
Subject: [PATCH 1122/1433] Bump
 com.gradle.common-custom-user-data-gradle-plugin from 1.9 to 1.10

Bumps com.gradle.common-custom-user-data-gradle-plugin from 1.9 to 1.10.

---
updated-dependencies:
- dependency-name: com.gradle.common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2a8f5ffce8d9..064b7f8b8211 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
 	}
 	plugins {
 		id("com.gradle.enterprise") version "3.12.4" // keep in sync with gradle/plugins/build.gradle.kts
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.9"
+		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"
 		kotlin("jvm") version "1.8.10"

From cee1450d74565d593e0ebc86e7289106f12a21e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 06:06:00 +0000
Subject: [PATCH 1123/1433] Bump github.amrom.workers.devbine-prs from 2.0.0 to 2.0.3

Bumps [github.amrom.workers.devbine-prs](https://github.com/github.amrom.workers.devbine-prs) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/github.amrom.workers.devbine-prs/releases)
- [Commits](https://github.com/github.amrom.workers.devbine-prs/compare/v2.0.0...v2.0.3)

---
updated-dependencies:
- dependency-name: github.amrom.workers.devbine-prs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 95cb7ed5dce5..18deff854a67 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -10,6 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: combine-prs
-        uses: github.amrom.workers.devbine-prs@v2.0.0
+        uses: github.amrom.workers.devbine-prs@v2.0.3
         with:
           github_token: ${{ secrets.GH_TOKEN }}

From 0fcc03762edfe2b2a8a35b3bba838de729a1eebc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 11:09:55 +0000
Subject: [PATCH 1124/1433] Bump org.assertj:assertj-core from 3.23.1 to 3.24.2

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a50049465b28..3c3705ea4f41 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 ant = "1.10.13"
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
-assertj = "3.23.1"
+assertj = "3.24.2"
 checkstyle = "9.0"
 jacoco = "0.8.7"
 jmh = "1.36"

From 46350d09c9d0298ff6b1344bfcaec22e44c8e77c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 11:11:23 +0000
Subject: [PATCH 1125/1433] Bump com.diffplug.spotless:spotless-plugin-gradle
 from 6.16.0 to 6.17.0

Bumps [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.16.0 to 6.17.0.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/gradle/6.16.0...gradle/6.17.0)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-plugin-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/plugins/common/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index 6732672e0adf..123fba670a5f 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 	implementation(project(":build-parameters"))
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
-	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.16.0")
+	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.17.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.4") // keep in sync with root settings.gradle.kts

From a65be48157b23ae22be9685a6d65e349a9b49c52 Mon Sep 17 00:00:00 2001
From: JUnit Team <team@junit.org>
Date: Mon, 20 Mar 2023 12:30:36 +0100
Subject: [PATCH 1126/1433] Update formatting after Eclipse formatter update

---
 .../java/platform/tooling/support/tests/ManifestTests.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
index 4fabbb75a062..b09a64bc8bc6 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ManifestTests.java
@@ -56,8 +56,8 @@ void manifestEntriesAdhereToConventions(String module) throws Exception {
 				MavenVersion.parseMavenString(version).getOSGiVersion().toString());
 			switch (module) {
 				case "junit-platform-commons" -> assertValue(attributes, "Multi-Release", "true");
-				case "junit-platform-console" -> assertValue(attributes, "Main-Class",
-					"org.junit.platform.console.ConsoleLauncher");
+				case "junit-platform-console" ->
+					assertValue(attributes, "Main-Class", "org.junit.platform.console.ConsoleLauncher");
 			}
 			var domain = Domain.domain(manifest);
 			domain.getExportPackage().forEach((pkg, attrs) -> {

From acae66ddd329660ab6eed2d6b076b7df794ad1ac Mon Sep 17 00:00:00 2001
From: Gilberto J Requena <gilberto.requena@syncier.com>
Date: Sat, 9 Jul 2022 23:49:36 +0200
Subject: [PATCH 1127/1433] Introduce AnnotationBasedArgumentsProvider

Issue #2622
Closes #2978
---
 .../AnnotationBasedArgumentsProvider.java     | 67 +++++++++++++
 .../params/provider/CsvArgumentsProvider.java | 33 +++----
 .../provider/CsvFileArgumentsProvider.java    | 39 ++++----
 .../provider/EnumArgumentsProvider.java       | 20 ++--
 .../provider/MethodArgumentsProvider.java     | 14 +--
 .../provider/ValueArgumentsProvider.java      | 49 +++++-----
 .../AnnotationConsumerInitializer.java        | 48 +++++++---
 .../AnnotationBasedArgumentsProviderTest.java | 63 +++++++++++++
 .../provider/CsvArgumentsProviderTests.java   |  4 +-
 .../provider/ValueArgumentsProviderTests.java |  3 +-
 .../AnnotationConsumerInitializerTest.java    | 94 +++++++++++++++++++
 11 files changed, 327 insertions(+), 107 deletions(-)
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
 create mode 100644 junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java
 create mode 100644 junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
new file mode 100644
index 000000000000..8a04f7a0bbd9
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.provider;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.lang.annotation.Annotation;
+import java.util.stream.Stream;
+
+import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.support.AnnotationConsumer;
+import org.junit.platform.commons.util.Preconditions;
+
+/**
+ * The implementations of an {@code AnnotationBasedArgumentsProvider} are responsible
+ * for {@linkplain #provideArguments providing} a stream of arguments to be passed to
+ * a {@code @ParameterizedTest} method, by using the data given by an annotation.
+ *
+ * <p>An {@code ArgumentsProvider} can be registered via the
+ * {@link ArgumentsSource @ArgumentsSource} annotation.
+ *
+ * @since 5.9
+ * @see org.junit.jupiter.params.ParameterizedTest
+ * @see org.junit.jupiter.params.provider.ArgumentsSource
+ * @see org.junit.jupiter.params.provider.Arguments
+ * @see org.junit.jupiter.params.support.AnnotationConsumer
+ */
+@API(status = EXPERIMENTAL, since = "5.9")
+public abstract class AnnotationBasedArgumentsProvider<A extends Annotation>
+		implements ArgumentsProvider, AnnotationConsumer<A> {
+
+	private A annotation;
+
+	/**
+	 * @param annotation that provides the source of the parameters, never {@code null}
+	 */
+	@Override
+	public final void accept(A annotation) {
+		Preconditions.notNull(annotation, "annotation must not be null");
+		this.annotation = annotation;
+	}
+
+	@Override
+	public final Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+		Preconditions.notNull(context, "context must not be null");
+		return provideArguments(context, annotation);
+	}
+
+	/**
+	 * Provide a {@link Stream} of {@link Arguments} to be passed to a
+	 * {@code @ParameterizedTest} method, by using the data given by an annotation.
+	 *
+	 * @param context the current extension context; never {@code null}
+	 * @param annotation that provides the source of the parameters, never {@code null}
+	 * @return a stream of arguments; never {@code null}
+	 */
+	protected abstract Stream<? extends Arguments> provideArguments(ExtensionContext context, A annotation);
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index ceecaccb2ab7..3722aa2a0087 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -26,7 +26,6 @@
 
 import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.UnrecoverableExceptions;
@@ -34,33 +33,27 @@
 /**
  * @since 5.0
  */
-class CsvArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<CsvSource> {
+class CsvArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvSource> {
 
 	private static final String LINE_SEPARATOR = "\n";
 
-	private CsvSource annotation;
 	private Set<String> nullValues;
 	private CsvParser csvParser;
 
 	@Override
-	public void accept(CsvSource annotation) {
-		this.annotation = annotation;
+	public Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource annotation) {
 		this.nullValues = toSet(annotation.nullValues());
 		this.csvParser = createParserFor(annotation);
-	}
-
-	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-		final boolean textBlockDeclared = !this.annotation.textBlock().isEmpty();
-		Preconditions.condition(this.annotation.value().length > 0 ^ textBlockDeclared,
+		final boolean textBlockDeclared = !annotation.textBlock().isEmpty();
+		Preconditions.condition(annotation.value().length > 0 ^ textBlockDeclared,
 			() -> "@CsvSource must be declared with either `value` or `textBlock` but not both");
 
-		return textBlockDeclared ? parseTextBlock() : parseValueArray();
+		return textBlockDeclared ? parseTextBlock(annotation) : parseValueArray(annotation);
 	}
 
-	private Stream<Arguments> parseTextBlock() {
-		String textBlock = this.annotation.textBlock();
-		boolean useHeadersInDisplayName = this.annotation.useHeadersInDisplayName();
+	private Stream<Arguments> parseTextBlock(CsvSource annotation) {
+		String textBlock = annotation.textBlock();
+		boolean useHeadersInDisplayName = annotation.useHeadersInDisplayName();
 		List<Arguments> argumentsList = new ArrayList<>();
 
 		try {
@@ -76,20 +69,20 @@ private Stream<Arguments> parseTextBlock() {
 			}
 		}
 		catch (Throwable throwable) {
-			throw handleCsvException(throwable, this.annotation);
+			throw handleCsvException(throwable, annotation);
 		}
 
 		return argumentsList.stream();
 	}
 
-	private Stream<Arguments> parseValueArray() {
-		boolean useHeadersInDisplayName = this.annotation.useHeadersInDisplayName();
+	private Stream<Arguments> parseValueArray(CsvSource annotation) {
+		boolean useHeadersInDisplayName = annotation.useHeadersInDisplayName();
 		List<Arguments> argumentsList = new ArrayList<>();
 
 		try {
 			String[] headers = null;
 			AtomicInteger index = new AtomicInteger(0);
-			for (String input : this.annotation.value()) {
+			for (String input : annotation.value()) {
 				index.incrementAndGet();
 				String[] csvRecord = this.csvParser.parseLine(input + LINE_SEPARATOR);
 				// Lazily retrieve headers if necessary.
@@ -103,7 +96,7 @@ private Stream<Arguments> parseValueArray() {
 			}
 		}
 		catch (Throwable throwable) {
-			throw handleCsvException(throwable, this.annotation);
+			throw handleCsvException(throwable, annotation);
 		}
 
 		return argumentsList.stream();
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index 14650f66e26d..e78a52dc8e22 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -34,7 +34,6 @@
 import com.univocity.parsers.csv.CsvParser;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.Preconditions;
@@ -42,11 +41,10 @@
 /**
  * @since 5.0
  */
-class CsvFileArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<CsvFileSource> {
+class CsvFileArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvFileSource> {
 
 	private final InputStreamProvider inputStreamProvider;
 
-	private CsvFileSource annotation;
 	private List<Source> sources;
 	private Charset charset;
 	private int numLinesToSkip;
@@ -61,8 +59,18 @@ class CsvFileArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<
 	}
 
 	@Override
-	public void accept(CsvFileSource annotation) {
-		this.annotation = annotation;
+	public Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvFileSource annotation) {
+		initialize(annotation);
+		// @formatter:off
+		return Preconditions.notEmpty(this.sources, "Resources or files must not be empty")
+				.stream()
+				.map(source -> source.open(context))
+				.map(inputStream -> beginParsing(inputStream, annotation))
+				.flatMap(parser -> toStream(parser, annotation));
+		// @formatter:on
+	}
+
+	private void initialize(CsvFileSource annotation) {
 		Stream<Source> resources = Arrays.stream(annotation.resources()).map(inputStreamProvider::classpathResource);
 		Stream<Source> files = Arrays.stream(annotation.files()).map(inputStreamProvider::file);
 		this.sources = Stream.concat(resources, files).collect(toList());
@@ -80,29 +88,18 @@ private Charset getCharsetFrom(CsvFileSource annotation) {
 		}
 	}
 
-	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-		// @formatter:off
-		return Preconditions.notEmpty(this.sources, "Resources or files must not be empty")
-				.stream()
-				.map(source -> source.open(context))
-				.map(this::beginParsing)
-				.flatMap(this::toStream);
-		// @formatter:on
-	}
-
-	private CsvParser beginParsing(InputStream inputStream) {
+	private CsvParser beginParsing(InputStream inputStream, CsvFileSource annotation) {
 		try {
 			this.csvParser.beginParsing(inputStream, this.charset);
 		}
 		catch (Throwable throwable) {
-			handleCsvException(throwable, this.annotation);
+			handleCsvException(throwable, annotation);
 		}
 		return this.csvParser;
 	}
 
-	private Stream<Arguments> toStream(CsvParser csvParser) {
-		CsvParserIterator iterator = new CsvParserIterator(csvParser, this.annotation);
+	private Stream<Arguments> toStream(CsvParser csvParser, CsvFileSource annotation) {
+		CsvParserIterator iterator = new CsvParserIterator(csvParser, annotation);
 		return stream(spliteratorUnknownSize(iterator, Spliterator.ORDERED), false) //
 				.skip(this.numLinesToSkip) //
 				.onClose(() -> {
@@ -110,7 +107,7 @@ private Stream<Arguments> toStream(CsvParser csvParser) {
 						csvParser.stopParsing();
 					}
 					catch (Throwable throwable) {
-						handleCsvException(throwable, this.annotation);
+						handleCsvException(throwable, annotation);
 					}
 				});
 	}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
index a4853eeb9339..04bbf7f7ca0c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
@@ -19,24 +19,16 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.util.Preconditions;
 
 /**
  * @since 5.0
  */
-class EnumArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<EnumSource> {
-
-	private EnumSource enumSource;
-
-	@Override
-	public void accept(EnumSource enumSource) {
-		this.enumSource = enumSource;
-	}
+class EnumArgumentsProvider extends AnnotationBasedArgumentsProvider<EnumSource> {
 
 	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-		Set<? extends Enum<?>> constants = getEnumConstants(context);
+	public Stream<? extends Arguments> provideArguments(ExtensionContext context, EnumSource enumSource) {
+		Set<? extends Enum<?>> constants = getEnumConstants(context, enumSource);
 		EnumSource.Mode mode = enumSource.mode();
 		String[] declaredConstantNames = enumSource.names();
 		if (declaredConstantNames.length > 0) {
@@ -49,13 +41,13 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 		return constants.stream().map(Arguments::of);
 	}
 
-	private <E extends Enum<E>> Set<? extends E> getEnumConstants(ExtensionContext context) {
-		Class<E> enumClass = determineEnumClass(context);
+	private <E extends Enum<E>> Set<? extends E> getEnumConstants(ExtensionContext context, EnumSource enumSource) {
+		Class<E> enumClass = determineEnumClass(context, enumSource);
 		return EnumSet.allOf(enumClass);
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private <E extends Enum<E>> Class<E> determineEnumClass(ExtensionContext context) {
+	private <E extends Enum<E>> Class<E> determineEnumClass(ExtensionContext context, EnumSource enumSource) {
 		Class enumClass = enumSource.value();
 		if (enumClass.equals(NullEnum.class)) {
 			Method method = context.getRequiredTestMethod();
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 9c1b88cd1d93..a42677fd1ab2 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.Preconditions;
@@ -36,22 +35,15 @@
 /**
  * @since 5.0
  */
-class MethodArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<MethodSource> {
-
-	private String[] methodNames;
-
-	@Override
-	public void accept(MethodSource annotation) {
-		this.methodNames = annotation.value();
-	}
+class MethodArgumentsProvider extends AnnotationBasedArgumentsProvider<MethodSource> {
 
 	@Override
-	public Stream<Arguments> provideArguments(ExtensionContext context) {
+	public Stream<? extends Arguments> provideArguments(ExtensionContext context, MethodSource annotation) {
 		Class<?> testClass = context.getRequiredTestClass();
 		Method testMethod = context.getRequiredTestMethod();
 		Object testInstance = context.getTestInstance().orElse(null);
 		// @formatter:off
-		return stream(this.methodNames)
+		return stream(annotation.value())
 				.map(factoryMethodName -> getFactoryMethod(testClass, testMethod, factoryMethodName))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
index 8bda32cf50e4..3d7fc6f65ceb 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
@@ -19,48 +19,45 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.util.Preconditions;
 
 /**
  * @since 5.0
  */
-class ValueArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<ValueSource> {
-
-	private Object[] arguments;
+class ValueArgumentsProvider extends AnnotationBasedArgumentsProvider<ValueSource> {
 
 	@Override
-	public void accept(ValueSource source) {
+	public Stream<? extends Arguments> provideArguments(ExtensionContext context, ValueSource source) {
+		Object[] arguments = getArgumentsFromSource(source);
+
+		return Arrays.stream(arguments).map(Arguments::of);
+	}
+
+	private Object[] getArgumentsFromSource(ValueSource source) {
 		// @formatter:off
 		List<Object> arrays =
-				Stream.of(
-					source.shorts(),
-					source.bytes(),
-					source.ints(),
-					source.longs(),
-					source.floats(),
-					source.doubles(),
-					source.chars(),
-					source.booleans(),
-					source.strings(),
-					source.classes()
-				)
-				.filter(array -> Array.getLength(array) > 0)
-				.collect(toList());
+			Stream.of(
+				source.shorts(),
+				source.bytes(),
+				source.ints(),
+				source.longs(),
+				source.floats(),
+				source.doubles(),
+				source.chars(),
+				source.booleans(),
+				source.strings(),
+				source.classes()
+			)
+			.filter(array -> Array.getLength(array) > 0)
+			.collect(toList());
 		// @formatter:on
 
 		Preconditions.condition(arrays.size() == 1, () -> "Exactly one type of input must be provided in the @"
 				+ ValueSource.class.getSimpleName() + " annotation, but there were " + arrays.size());
 
 		Object originalArray = arrays.get(0);
-		arguments = IntStream.range(0, Array.getLength(originalArray)) //
+		return IntStream.range(0, Array.getLength(originalArray)) //
 				.mapToObj(index -> Array.get(originalArray, index)) //
 				.toArray();
 	}
-
-	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-		return Arrays.stream(arguments).map(Arguments::of);
-	}
-
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
index a9e2f01a6a32..a5cf81304c45 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
@@ -36,24 +36,46 @@ private AnnotationConsumerInitializer() {
 		/* no-op */
 	}
 
-	// @formatter:off
-	private static final Predicate<Method> isAnnotationConsumerAcceptMethod = method ->
-			method.getName().equals("accept")
-			&& method.getParameterCount() == 1
-			&& method.getParameterTypes()[0].isAnnotation();
-	// @formatter:on
+	private static final Predicate<Method> isAcceptOrProvideArgumentsMethod = method -> isAnnotationConsumerAcceptMethod(
+		method) || isAnnotationBasedArgumentsProviderMethod(method);
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public static <T> T initialize(AnnotatedElement annotatedElement, T instance) {
-		if (instance instanceof AnnotationConsumer) {
-			Method method = findMethods(instance.getClass(), isAnnotationConsumerAcceptMethod, BOTTOM_UP).get(0);
-			Class<? extends Annotation> annotationType = (Class<? extends Annotation>) method.getParameterTypes()[0];
+	public static <T> T initialize(AnnotatedElement annotatedElement, T annotationConsumerInstance) {
+		if (annotationConsumerInstance instanceof AnnotationConsumer) {
+			Method method = findMethods(annotationConsumerInstance.getClass(), isAcceptOrProvideArgumentsMethod,
+				BOTTOM_UP).get(0);
+			Class<? extends Annotation> annotationType = getAnnotationType(method);
 			Annotation annotation = AnnotationUtils.findAnnotation(annotatedElement, annotationType) //
-					.orElseThrow(() -> new JUnitException(instance.getClass().getName()
+					.orElseThrow(() -> new JUnitException(annotationConsumerInstance.getClass().getName()
 							+ " must be used with an annotation of type " + annotationType.getName()));
-			initializeAnnotationConsumer((AnnotationConsumer) instance, annotation);
+			initializeAnnotationConsumer((AnnotationConsumer) annotationConsumerInstance, annotation);
+		}
+		return annotationConsumerInstance;
+	}
+
+	private static boolean isAnnotationConsumerAcceptMethod(Method method) {
+		return isMethodWith(method, "accept", 1, 0);
+	}
+
+	private static boolean isAnnotationBasedArgumentsProviderMethod(Method method) {
+		return isMethodWith(method, "provideArguments", 2, 1);
+	}
+
+	// @formatter:off
+	private static boolean isMethodWith(Method method, String methodName, int parameterCount,
+			int annotationInParameterIndex) {
+		return method.getName().equals(methodName)
+				&& method.getParameterCount() == parameterCount
+				&& method.getParameterTypes()[annotationInParameterIndex].isAnnotation();
+	}
+	// @formatter:on
+
+	@SuppressWarnings({ "unchecked" })
+	private static Class<? extends Annotation> getAnnotationType(Method method) {
+		if (isAnnotationConsumerAcceptMethod(method)) {
+			return (Class<? extends Annotation>) method.getParameterTypes()[0];
 		}
-		return instance;
+		return (Class<? extends Annotation>) method.getParameterTypes()[1];
 	}
 
 	private static <A extends Annotation> void initializeAnnotationConsumer(AnnotationConsumer<A> instance,
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java
new file mode 100644
index 000000000000..4d2ea8215b02
--- /dev/null
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.provider;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.params.provider.MockCsvAnnotationBuilder.csvSource;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atMostOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+@DisplayName("AnnotationBasedArgumentsProvider")
+class AnnotationBasedArgumentsProviderTest {
+
+	private final AnnotationBasedArgumentsProvider<CsvSource> annotationBasedArgumentsProvider = new AnnotationBasedArgumentsProvider<>() {
+		@Override
+		protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource annotation) {
+			return Stream.empty();
+		}
+	};
+
+	@Test
+	@DisplayName("should throw exception when null annotation is provided to accept method")
+	void shouldThrowExceptionWhenNullAnnotationIsProvidedToAccept() {
+		assertThatThrownBy(() -> annotationBasedArgumentsProvider.accept(null)) //
+				.hasMessage("annotation must not be null");
+	}
+
+	@Test
+	@DisplayName("should throw exception when null context is provided to provideArguments method")
+	void shouldThrowExceptionWhenNullContextIsProvidedToProvideArguments() {
+		assertThatThrownBy(() -> annotationBasedArgumentsProvider.provideArguments(null)) //
+				.hasMessage("context must not be null");
+	}
+
+	@Test
+	@DisplayName("should invoke the provideArguments template method with the accepted annotation")
+	void shouldInvokeTemplateMethodWithTheAnnotationProvidedWithAccept() {
+		var spiedProvider = spy(annotationBasedArgumentsProvider);
+		var extensionContext = mock(ExtensionContext.class);
+		var annotation = csvSource("0", "1", "2");
+
+		annotationBasedArgumentsProvider.accept(annotation);
+		annotationBasedArgumentsProvider.provideArguments(extensionContext);
+
+		verify(spiedProvider, atMostOnce()).provideArguments(eq(extensionContext), eq(annotation));
+	}
+}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 67acc181a2d2..74be497abbaa 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -13,10 +13,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.jupiter.params.provider.MockCsvAnnotationBuilder.csvSource;
+import static org.mockito.Mockito.mock;
 
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 
@@ -378,7 +380,7 @@ void throwsExceptionIfColumnCountExceedsHeaderCount() {
 	private Stream<Object[]> provideArguments(CsvSource annotation) {
 		var provider = new CsvArgumentsProvider();
 		provider.accept(annotation);
-		return provider.provideArguments(null).map(Arguments::get);
+		return provider.provideArguments(mock(ExtensionContext.class)).map(Arguments::get);
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
index b9416ba418ce..88699a610f21 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
@@ -18,6 +18,7 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**
@@ -160,7 +161,7 @@ private static Stream<Object[]> provideArguments(short[] shorts, byte[] bytes, i
 
 		var provider = new ValueArgumentsProvider();
 		provider.accept(annotation);
-		return provider.provideArguments(null).map(Arguments::get);
+		return provider.provideArguments(mock(ExtensionContext.class)).map(Arguments::get);
 	}
 
 	private static Object[] array(Object... objects) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
new file mode 100644
index 000000000000..cb38fea558e9
--- /dev/null
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015-2022 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.params.support.AnnotationConsumerInitializer.initialize;
+import static org.mockito.Mockito.mock;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.provider.AnnotationBasedArgumentsProvider;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.platform.commons.JUnitException;
+
+@DisplayName("AnnotationConsumerInitializer")
+class AnnotationConsumerInitializerTest {
+
+	@Test
+	@DisplayName("should initialize annotation consumer")
+	void shouldInitializeAnnotationConsumer() throws NoSuchMethodException {
+		var instance = new SomeAnnotationConsumer();
+		var method = SubjectClass.class.getDeclaredMethod("foo");
+		var initialisedAnnotationConsumer = initialize(method, instance);
+
+		assertThat(initialisedAnnotationConsumer.annotation).isInstanceOf(CsvSource.class);
+	}
+
+	@Test
+	@DisplayName("should initialize annotation based arguments provider")
+	void shouldInitializeAnnotationBasedArgumentsProvider() throws NoSuchMethodException {
+		var instance = new SomeAnnotationBasedArgumentProvider();
+		var method = SubjectClass.class.getDeclaredMethod("foo");
+		var initialisedAnnotationConsumer = initialize(method, instance);
+
+		initialisedAnnotationConsumer.provideArguments(mock(ExtensionContext.class));
+
+		assertThat(initialisedAnnotationConsumer.assignedAnnotation).isInstanceOf(CsvSource.class);
+	}
+
+	@Test
+	@DisplayName("should throw exception when method is not annotated")
+	void shouldThrowExceptionWhenMethodIsNotAnnotated() throws NoSuchMethodException {
+		var instance = new SomeAnnotationConsumer();
+		var method = SubjectClass.class.getDeclaredMethod("noAnnotation");
+
+		assertThatThrownBy(() -> initialize(method, instance)).isInstanceOf(JUnitException.class);
+	}
+
+	private static class SomeAnnotationBasedArgumentProvider extends AnnotationBasedArgumentsProvider<CsvSource> {
+
+		CsvSource assignedAnnotation;
+
+		@Override
+		protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource annotation) {
+			assignedAnnotation = annotation;
+			return Stream.empty();
+		}
+	}
+
+	private static class SomeAnnotationConsumer implements AnnotationConsumer<CsvSource> {
+
+		CsvSource annotation;
+
+		@Override
+		public void accept(CsvSource csvSource) {
+			annotation = csvSource;
+		}
+	}
+
+	private static class SubjectClass {
+
+		@CsvSource("")
+		void foo() {
+
+		}
+
+		void noAnnotation() {
+
+		}
+	}
+}

From 8771694d835bc041afacc8abe3c663c05204267a Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Thu, 9 Mar 2023 19:31:56 +0100
Subject: [PATCH 1128/1433] Polish contribution

---
 .../AnnotationBasedArgumentsProvider.java     | 26 +++++++++----------
 .../provider/CsvFileArgumentsProvider.java    | 21 +++++++--------
 .../provider/MethodArgumentsProvider.java     |  3 ++-
 .../provider/ValueArgumentsProvider.java      |  1 -
 .../AnnotationBasedArgumentsProviderTest.java | 10 ++-----
 .../provider/CsvArgumentsProviderTests.java   |  3 +--
 .../provider/ValueArgumentsProviderTests.java |  3 +--
 .../AnnotationConsumerInitializerTest.java    | 15 +++++++----
 8 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
index 8a04f7a0bbd9..2dbfd70e6348 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -21,28 +21,26 @@
 import org.junit.platform.commons.util.Preconditions;
 
 /**
- * The implementations of an {@code AnnotationBasedArgumentsProvider} are responsible
- * for {@linkplain #provideArguments providing} a stream of arguments to be passed to
- * a {@code @ParameterizedTest} method, by using the data given by an annotation.
+ * {@code AnnotationBasedArgumentsProvider} is an abstract base class for
+ * {@link ArgumentsProvider} implementations that also need to consume an
+ * annotation in order to provide the arguments.
  *
- * <p>An {@code ArgumentsProvider} can be registered via the
- * {@link ArgumentsSource @ArgumentsSource} annotation.
- *
- * @since 5.9
+ * @since 5.10
  * @see org.junit.jupiter.params.ParameterizedTest
  * @see org.junit.jupiter.params.provider.ArgumentsSource
  * @see org.junit.jupiter.params.provider.Arguments
+ * @see org.junit.jupiter.params.provider.ArgumentsProvider
  * @see org.junit.jupiter.params.support.AnnotationConsumer
  */
-@API(status = EXPERIMENTAL, since = "5.9")
+@API(status = EXPERIMENTAL, since = "5.10")
 public abstract class AnnotationBasedArgumentsProvider<A extends Annotation>
 		implements ArgumentsProvider, AnnotationConsumer<A> {
 
+	public AnnotationBasedArgumentsProvider() {
+	}
+
 	private A annotation;
 
-	/**
-	 * @param annotation that provides the source of the parameters, never {@code null}
-	 */
 	@Override
 	public final void accept(A annotation) {
 		Preconditions.notNull(annotation, "annotation must not be null");
@@ -51,7 +49,6 @@ public final void accept(A annotation) {
 
 	@Override
 	public final Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-		Preconditions.notNull(context, "context must not be null");
 		return provideArguments(context, annotation);
 	}
 
@@ -60,8 +57,9 @@ public final Stream<? extends Arguments> provideArguments(ExtensionContext conte
 	 * {@code @ParameterizedTest} method, by using the data given by an annotation.
 	 *
 	 * @param context the current extension context; never {@code null}
-	 * @param annotation that provides the source of the parameters, never {@code null}
+	 * @param annotation the annotation used to specify the arguments; never {@code null}
 	 * @return a stream of arguments; never {@code null}
 	 */
 	protected abstract Stream<? extends Arguments> provideArguments(ExtensionContext context, A annotation);
+
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index e78a52dc8e22..f4ccca49432f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -45,7 +45,6 @@ class CsvFileArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvFileS
 
 	private final InputStreamProvider inputStreamProvider;
 
-	private List<Source> sources;
 	private Charset charset;
 	private int numLinesToSkip;
 	private CsvParser csvParser;
@@ -60,9 +59,16 @@ class CsvFileArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvFileS
 
 	@Override
 	public Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvFileSource annotation) {
-		initialize(annotation);
+		this.charset = getCharsetFrom(annotation);
+		this.numLinesToSkip = annotation.numLinesToSkip();
+		this.csvParser = createParserFor(annotation);
+
+		Stream<Source> resources = Arrays.stream(annotation.resources()).map(inputStreamProvider::classpathResource);
+		Stream<Source> files = Arrays.stream(annotation.files()).map(inputStreamProvider::file);
+		List<Source> sources = Stream.concat(resources, files).collect(toList());
+
 		// @formatter:off
-		return Preconditions.notEmpty(this.sources, "Resources or files must not be empty")
+		return Preconditions.notEmpty(sources, "Resources or files must not be empty")
 				.stream()
 				.map(source -> source.open(context))
 				.map(inputStream -> beginParsing(inputStream, annotation))
@@ -70,15 +76,6 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context, Cs
 		// @formatter:on
 	}
 
-	private void initialize(CsvFileSource annotation) {
-		Stream<Source> resources = Arrays.stream(annotation.resources()).map(inputStreamProvider::classpathResource);
-		Stream<Source> files = Arrays.stream(annotation.files()).map(inputStreamProvider::file);
-		this.sources = Stream.concat(resources, files).collect(toList());
-		this.charset = getCharsetFrom(annotation);
-		this.numLinesToSkip = annotation.numLinesToSkip();
-		this.csvParser = createParserFor(annotation);
-	}
-
 	private Charset getCharsetFrom(CsvFileSource annotation) {
 		try {
 			return Charset.forName(annotation.encoding());
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index a42677fd1ab2..6ad6069e9d3c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -42,8 +42,9 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context, Me
 		Class<?> testClass = context.getRequiredTestClass();
 		Method testMethod = context.getRequiredTestMethod();
 		Object testInstance = context.getTestInstance().orElse(null);
+		String[] methodNames = annotation.value();
 		// @formatter:off
-		return stream(annotation.value())
+		return stream(methodNames)
 				.map(factoryMethodName -> getFactoryMethod(testClass, testMethod, factoryMethodName))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
index 3d7fc6f65ceb..0845f03c51b5 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
@@ -29,7 +29,6 @@ class ValueArgumentsProvider extends AnnotationBasedArgumentsProvider<ValueSourc
 	@Override
 	public Stream<? extends Arguments> provideArguments(ExtensionContext context, ValueSource source) {
 		Object[] arguments = getArgumentsFromSource(source);
-
 		return Arrays.stream(arguments).map(Arguments::of);
 	}
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java
index 4d2ea8215b02..ae54960f289c 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -41,13 +41,6 @@ void shouldThrowExceptionWhenNullAnnotationIsProvidedToAccept() {
 				.hasMessage("annotation must not be null");
 	}
 
-	@Test
-	@DisplayName("should throw exception when null context is provided to provideArguments method")
-	void shouldThrowExceptionWhenNullContextIsProvidedToProvideArguments() {
-		assertThatThrownBy(() -> annotationBasedArgumentsProvider.provideArguments(null)) //
-				.hasMessage("context must not be null");
-	}
-
 	@Test
 	@DisplayName("should invoke the provideArguments template method with the accepted annotation")
 	void shouldInvokeTemplateMethodWithTheAnnotationProvidedWithAccept() {
@@ -60,4 +53,5 @@ void shouldInvokeTemplateMethodWithTheAnnotationProvidedWithAccept() {
 
 		verify(spiedProvider, atMostOnce()).provideArguments(eq(extensionContext), eq(annotation));
 	}
+
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
index 74be497abbaa..767768ce6bac 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java
@@ -18,7 +18,6 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 
@@ -380,7 +379,7 @@ void throwsExceptionIfColumnCountExceedsHeaderCount() {
 	private Stream<Object[]> provideArguments(CsvSource annotation) {
 		var provider = new CsvArgumentsProvider();
 		provider.accept(annotation);
-		return provider.provideArguments(mock(ExtensionContext.class)).map(Arguments::get);
+		return provider.provideArguments(mock()).map(Arguments::get);
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
index 88699a610f21..213178fa805a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java
@@ -18,7 +18,6 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**
@@ -161,7 +160,7 @@ private static Stream<Object[]> provideArguments(short[] shorts, byte[] bytes, i
 
 		var provider = new ValueArgumentsProvider();
 		provider.accept(annotation);
-		return provider.provideArguments(mock(ExtensionContext.class)).map(Arguments::get);
+		return provider.provideArguments(mock()).map(Arguments::get);
 	}
 
 	private static Object[] array(Object... objects) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
index cb38fea558e9..43da248a78a8 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v2.0 which
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.params.support.AnnotationConsumerInitializer.initialize;
 import static org.mockito.Mockito.mock;
 
+import java.util.Arrays;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.DisplayName;
@@ -35,7 +36,9 @@ void shouldInitializeAnnotationConsumer() throws NoSuchMethodException {
 		var method = SubjectClass.class.getDeclaredMethod("foo");
 		var initialisedAnnotationConsumer = initialize(method, instance);
 
-		assertThat(initialisedAnnotationConsumer.annotation).isInstanceOf(CsvSource.class);
+		assertThat(initialisedAnnotationConsumer.annotation) //
+				.isInstanceOf(CsvSource.class) //
+				.matches(annotation -> Arrays.equals(annotation.value(), new String[] { "a", "b" }));
 	}
 
 	@Test
@@ -45,9 +48,11 @@ void shouldInitializeAnnotationBasedArgumentsProvider() throws NoSuchMethodExcep
 		var method = SubjectClass.class.getDeclaredMethod("foo");
 		var initialisedAnnotationConsumer = initialize(method, instance);
 
-		initialisedAnnotationConsumer.provideArguments(mock(ExtensionContext.class));
+		initialisedAnnotationConsumer.provideArguments(mock());
 
-		assertThat(initialisedAnnotationConsumer.assignedAnnotation).isInstanceOf(CsvSource.class);
+		assertThat(initialisedAnnotationConsumer.assignedAnnotation) //
+				.isInstanceOf(CsvSource.class) //
+				.matches(annotation -> Arrays.equals(annotation.value(), new String[] { "a", "b" }));
 	}
 
 	@Test
@@ -82,7 +87,7 @@ public void accept(CsvSource csvSource) {
 
 	private static class SubjectClass {
 
-		@CsvSource("")
+		@CsvSource({ "a", "b" })
 		void foo() {
 
 		}

From 6df798ae272683cbef834d83f98cf2c191327cad Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Thu, 9 Mar 2023 19:32:27 +0100
Subject: [PATCH 1129/1433] Document new `AnnotationBasedArgumentsProvider` in
 user guide and release notes

---
 documentation/src/docs/asciidoc/link-attributes.adoc           | 3 +++
 .../docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc   | 2 ++
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc  | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 224d99ea4bdd..7bc5bc848b0b 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -138,13 +138,16 @@ endif::[]
 :TempDir:                                    {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/io/TempDir.html[@TempDir]
 // Jupiter Params
 :params-provider-package:                    {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/package-summary.html[org.junit.jupiter.params.provider]
+:AnnotationBasedArgumentsProvider:           {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.html[AnnotationBasedArgumentsProvider]
 :ArgumentsAccessor:                          {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/aggregator/ArgumentsAccessor.html[ArgumentsAccessor]
 :ArgumentsAggregator:                        {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/aggregator/ArgumentsAggregator.html[ArgumentsAggregator]
+:CsvArgumentsProvider:                       {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/CsvArgumentsProvider.html[CsvArgumentsProvider]
 :EmptySource:                                {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/EmptySource.html[@EmptySource]
 :MethodSource:                               {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/MethodSource.html[@MethodSource]
 :NullAndEmptySource:                         {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/NullAndEmptySource.html[@NullAndEmptySource]
 :NullSource:                                 {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/NullSource.html[@NullSource]
 :ParameterizedTest:                          {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/ParameterizedTest.html[@ParameterizedTest]
+:ValueArgumentsProvider:                     {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/ValueArgumentsProvider.html[ValueArgumentsProvider]
 // Jupiter Engine
 :junit-jupiter-engine:                       {javadoc-root}/org.junit.jupiter.engine/org/junit/jupiter/engine/package-summary.html[junit-jupiter-engine]
 // Jupiter Extension Implementations
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 6fd5d6d7ef2b..0a0b57d779df 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -64,6 +64,8 @@ repository on GitHub.
   to fall back to the default display name generator.
 * `@EmptySource` now supports additional types, including `Collection` and `Map` subtypes
   with a public no-arg constructor.
+* New `AnnotationBasedArgumentsProvider` that implements both `ArgumentsProvider` and
+  `AnnotationConsumer` interfaces.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 62642cb68f53..4187c34d578f 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1622,6 +1622,9 @@ include::{testDir}/example/ParameterizedTestDemo.java[tags=ArgumentsSource_examp
 include::{testDir}/example/ParameterizedTestDemo.java[tags=ArgumentsProvider_example]
 ----
 
+If you wish to implement a custom `ArgumentsProvider` that also consumes an annotation
+(like built-in providers such as `{ValueArgumentsProvider}` or `{CsvArgumentsProvider}`),
+you have the possibility to extend the `{AnnotationBasedArgumentsProvider}` class.
 
 [[writing-tests-parameterized-tests-argument-conversion]]
 ==== Argument Conversion

From 31689deb659278e54e4e7a8c438e70514ab96d1d Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Wed, 22 Mar 2023 17:45:29 +0100
Subject: [PATCH 1130/1433] Introduce `AnnotationBasedArgumentConverter`

This abstract base class has been created to mirror newly introduced `AnnotationBasedArgumentsProvider`.

Resolves #2622
---
 .../src/docs/asciidoc/link-attributes.adoc    |  1 +
 .../release-notes-5.10.0-M1.adoc              |  2 +
 .../asciidoc/user-guide/writing-tests.adoc    |  4 ++
 .../AnnotationBasedArgumentConverter.java     | 67 +++++++++++++++++++
 .../converter/JavaTimeArgumentConverter.java  | 15 +----
 .../AnnotationConsumerInitializer.java        | 45 +++++++------
 .../JavaTimeArgumentConverterTests.java       |  3 +-
 .../AnnotationConsumerInitializerTest.java    | 60 +++++++++++++++--
 8 files changed, 157 insertions(+), 40 deletions(-)
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index 7bc5bc848b0b..dc101db7079a 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -138,6 +138,7 @@ endif::[]
 :TempDir:                                    {javadoc-root}/org.junit.jupiter.api/org/junit/jupiter/api/io/TempDir.html[@TempDir]
 // Jupiter Params
 :params-provider-package:                    {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/package-summary.html[org.junit.jupiter.params.provider]
+:AnnotationBasedArgumentConverter:           {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/AnnotationBasedArgumentConverter.html[AnnotationBasedArgumentConverter]
 :AnnotationBasedArgumentsProvider:           {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.html[AnnotationBasedArgumentsProvider]
 :ArgumentsAccessor:                          {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/aggregator/ArgumentsAccessor.html[ArgumentsAccessor]
 :ArgumentsAggregator:                        {javadoc-root}/org.junit.jupiter.params/org/junit/jupiter/params/aggregator/ArgumentsAggregator.html[ArgumentsAggregator]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 0a0b57d779df..2f8ebd6bf778 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -66,6 +66,8 @@ repository on GitHub.
   with a public no-arg constructor.
 * New `AnnotationBasedArgumentsProvider` that implements both `ArgumentsProvider` and
   `AnnotationConsumer` interfaces.
+* New `AnnotationBasedArgumentConverter` that implements both `ArgumentConverter` and
+  `AnnotationConsumer` interfaces.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 4187c34d578f..a0fc45f2934c 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1772,6 +1772,10 @@ composed annotation `JavaTimeConversionPattern`.
 include::{testDir}/example/ParameterizedTestDemo.java[tags=explicit_java_time_converter]
 ----
 
+If you wish to implement a custom `ArgumentConverter` that also consumes an annotation
+(like `JavaTimeArgumentConverter`), you have the possibility to extend the
+`{AnnotationBasedArgumentConverter}` class.
+
 [[writing-tests-parameterized-tests-argument-aggregation]]
 ==== Argument Aggregation
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
new file mode 100644
index 000000000000..964c0c23616a
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.lang.annotation.Annotation;
+
+import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.params.support.AnnotationConsumer;
+import org.junit.platform.commons.util.Preconditions;
+
+/**
+ * {@code SimpleArgumentConverter} is an abstract base class for
+ * {@link ArgumentConverter} implementations that also need to consume an
+ * annotation in order to perform the conversion.
+ *
+ * @since 5.10
+ * @see ArgumentConverter
+ * @see AnnotationConsumer
+ * @see SimpleArgumentConverter
+ */
+@API(status = EXPERIMENTAL, since = "5.10")
+public abstract class AnnotationBasedArgumentConverter<A extends Annotation>
+		implements ArgumentConverter, AnnotationConsumer<A> {
+
+	public AnnotationBasedArgumentConverter() {
+	}
+
+	private A annotation;
+
+	@Override
+	public final void accept(A annotation) {
+		Preconditions.notNull(annotation, "annotation must not be null");
+		this.annotation = annotation;
+	}
+
+	@Override
+	public final Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
+		return convert(source, context.getParameter().getType(), annotation);
+	}
+
+	/**
+	 * Convert the supplied {@code source} object into the supplied
+	 * {@code targetType}.
+	 *
+	 * @param source the source object to convert; may be {@code null}
+	 * @param targetType the target type the source object should be converted
+	 * into; never {@code null}
+	 * @param annotation the annotation needed to convert the source; never {@code null}
+	 * @return the converted object; may be {@code null} but only if the target
+	 * type is a reference type
+	 * @throws ArgumentConversionException in case an error occurs during the
+	 * conversion
+	 */
+	protected abstract Object convert(Object source, Class<?> targetType, A annotation);
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
index 7c1defaa3180..aef6e5a44cc8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
@@ -27,13 +27,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.jupiter.params.support.AnnotationConsumer;
-
 /**
  * @since 5.0
  */
-class JavaTimeArgumentConverter extends SimpleArgumentConverter
-		implements AnnotationConsumer<JavaTimeConversionPattern> {
+class JavaTimeArgumentConverter extends AnnotationBasedArgumentConverter<JavaTimeConversionPattern> {
 
 	private static final Map<Class<?>, TemporalQuery<?>> TEMPORAL_QUERIES;
 	static {
@@ -52,15 +49,9 @@ class JavaTimeArgumentConverter extends SimpleArgumentConverter
 		TEMPORAL_QUERIES = Collections.unmodifiableMap(queries);
 	}
 
-	private String pattern;
-
-	@Override
-	public void accept(JavaTimeConversionPattern annotation) {
-		pattern = annotation.value();
-	}
-
 	@Override
-	public Object convert(Object input, Class<?> targetClass) throws ArgumentConversionException {
+	protected Object convert(Object input, Class<?> targetClass, JavaTimeConversionPattern annotation) {
+		String pattern = annotation.value();
 		if (!TEMPORAL_QUERIES.containsKey(targetClass)) {
 			throw new ArgumentConversionException("Cannot convert to " + targetClass.getName() + ": " + input);
 		}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
index a5cf81304c45..83d9fd8fd2b0 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
@@ -36,15 +36,10 @@ private AnnotationConsumerInitializer() {
 		/* no-op */
 	}
 
-	private static final Predicate<Method> isAcceptOrProvideArgumentsMethod = method -> isAnnotationConsumerAcceptMethod(
-		method) || isAnnotationBasedArgumentsProviderMethod(method);
-
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static <T> T initialize(AnnotatedElement annotatedElement, T annotationConsumerInstance) {
 		if (annotationConsumerInstance instanceof AnnotationConsumer) {
-			Method method = findMethods(annotationConsumerInstance.getClass(), isAcceptOrProvideArgumentsMethod,
-				BOTTOM_UP).get(0);
-			Class<? extends Annotation> annotationType = getAnnotationType(method);
+			Class<? extends Annotation> annotationType = findAnnotationType(annotationConsumerInstance);
 			Annotation annotation = AnnotationUtils.findAnnotation(annotatedElement, annotationType) //
 					.orElseThrow(() -> new JUnitException(annotationConsumerInstance.getClass().getName()
 							+ " must be used with an annotation of type " + annotationType.getName()));
@@ -53,7 +48,25 @@ public static <T> T initialize(AnnotatedElement annotatedElement, T annotationCo
 		return annotationConsumerInstance;
 	}
 
-	private static boolean isAnnotationConsumerAcceptMethod(Method method) {
+	private static <T> Class<? extends Annotation> findAnnotationType(T annotationConsumerInstance) {
+		Predicate<Method> hasAnnotationParameter = method -> isAnnotationConsumerMethod(method)
+				|| isAnnotationBasedArgumentsProviderMethod(method) || isAnnotationBasedArgumentConverterMethod(method);
+		Method method = findMethods(annotationConsumerInstance.getClass(), hasAnnotationParameter, BOTTOM_UP).get(0);
+		return getAnnotationType(method);
+	}
+
+	@SuppressWarnings("unchecked")
+	private static Class<? extends Annotation> getAnnotationType(Method method) {
+		if (isAnnotationConsumerMethod(method)) {
+			return (Class<? extends Annotation>) method.getParameterTypes()[0];
+		}
+		if (isAnnotationBasedArgumentsProviderMethod(method)) {
+			return (Class<? extends Annotation>) method.getParameterTypes()[1];
+		}
+		return (Class<? extends Annotation>) method.getParameterTypes()[2];
+	}
+
+	private static boolean isAnnotationConsumerMethod(Method method) {
 		return isMethodWith(method, "accept", 1, 0);
 	}
 
@@ -61,22 +74,16 @@ private static boolean isAnnotationBasedArgumentsProviderMethod(Method method) {
 		return isMethodWith(method, "provideArguments", 2, 1);
 	}
 
-	// @formatter:off
+	private static boolean isAnnotationBasedArgumentConverterMethod(Method method) {
+		return isMethodWith(method, "convert", 3, 2);
+	}
+
 	private static boolean isMethodWith(Method method, String methodName, int parameterCount,
 			int annotationInParameterIndex) {
-		return method.getName().equals(methodName)
-				&& method.getParameterCount() == parameterCount
+		return method.getName().equals(methodName) //
+				&& method.getParameterCount() == parameterCount //
 				&& method.getParameterTypes()[annotationInParameterIndex].isAnnotation();
 	}
-	// @formatter:on
-
-	@SuppressWarnings({ "unchecked" })
-	private static Class<? extends Annotation> getAnnotationType(Method method) {
-		if (isAnnotationConsumerAcceptMethod(method)) {
-			return (Class<? extends Annotation>) method.getParameterTypes()[0];
-		}
-		return (Class<? extends Annotation>) method.getParameterTypes()[1];
-	}
 
 	private static <A extends Annotation> void initializeAnnotationConsumer(AnnotationConsumer<A> instance,
 			A annotation) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
index 3bb890746dd9..5e3a54e2d271 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java
@@ -114,9 +114,8 @@ private Object convert(Object input, String pattern, Class<?> targetClass) {
 		var converter = new JavaTimeArgumentConverter();
 		var annotation = mock(JavaTimeConversionPattern.class);
 		when(annotation.value()).thenReturn(pattern);
-		converter.accept(annotation);
 
-		return converter.convert(input, targetClass);
+		return converter.convert(input, targetClass, annotation);
 	}
 
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
index 43da248a78a8..0c22504d9236 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
@@ -14,13 +14,18 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.params.support.AnnotationConsumerInitializer.initialize;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.params.converter.AnnotationBasedArgumentConverter;
+import org.junit.jupiter.params.converter.JavaTimeConversionPattern;
 import org.junit.jupiter.params.provider.AnnotationBasedArgumentsProvider;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -44,37 +49,74 @@ void shouldInitializeAnnotationConsumer() throws NoSuchMethodException {
 	@Test
 	@DisplayName("should initialize annotation based arguments provider")
 	void shouldInitializeAnnotationBasedArgumentsProvider() throws NoSuchMethodException {
-		var instance = new SomeAnnotationBasedArgumentProvider();
+		var instance = new SomeAnnotationBasedArgumentsProvider();
 		var method = SubjectClass.class.getDeclaredMethod("foo");
 		var initialisedAnnotationConsumer = initialize(method, instance);
 
 		initialisedAnnotationConsumer.provideArguments(mock());
 
-		assertThat(initialisedAnnotationConsumer.assignedAnnotation) //
+		assertThat(initialisedAnnotationConsumer.annotation) //
 				.isInstanceOf(CsvSource.class) //
 				.matches(annotation -> Arrays.equals(annotation.value(), new String[] { "a", "b" }));
 	}
 
+	@Test
+	@DisplayName("should initialize annotation based argument converter")
+	void shouldInitializeAnnotationBasedArgumentConverter() throws NoSuchMethodException {
+		var instance = new SomeAnnotationBasedArgumentConverter();
+		var parameter = SubjectClass.class.getDeclaredMethod("bar", LocalDate.class).getParameters()[0];
+		var initialisedAnnotationConsumer = initialize(parameter, instance);
+
+		ParameterContext parameterContext = mock();
+		when(parameterContext.getParameter()).thenReturn(parameter);
+		initialisedAnnotationConsumer.convert("source", parameterContext);
+
+		assertThat(initialisedAnnotationConsumer.annotation) //
+				.isInstanceOf(JavaTimeConversionPattern.class) //
+				.matches(annotation -> annotation.value().equals("pattern"));
+	}
+
 	@Test
 	@DisplayName("should throw exception when method is not annotated")
 	void shouldThrowExceptionWhenMethodIsNotAnnotated() throws NoSuchMethodException {
 		var instance = new SomeAnnotationConsumer();
-		var method = SubjectClass.class.getDeclaredMethod("noAnnotation");
+		var method = SubjectClass.class.getDeclaredMethod("noAnnotation", String.class);
 
 		assertThatThrownBy(() -> initialize(method, instance)).isInstanceOf(JUnitException.class);
 	}
 
-	private static class SomeAnnotationBasedArgumentProvider extends AnnotationBasedArgumentsProvider<CsvSource> {
+	@Test
+	@DisplayName("should throw exception when parameter is not annotated")
+	void shouldThrowExceptionWhenParameterIsNotAnnotated() throws NoSuchMethodException {
+		var instance = new SomeAnnotationConsumer();
+		var parameter = SubjectClass.class.getDeclaredMethod("noAnnotation", String.class).getParameters()[0];
+
+		assertThatThrownBy(() -> initialize(parameter, instance)).isInstanceOf(JUnitException.class);
+	}
+
+	private static class SomeAnnotationBasedArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvSource> {
 
-		CsvSource assignedAnnotation;
+		CsvSource annotation;
 
 		@Override
 		protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource annotation) {
-			assignedAnnotation = annotation;
+			this.annotation = annotation;
 			return Stream.empty();
 		}
 	}
 
+	private static class SomeAnnotationBasedArgumentConverter
+			extends AnnotationBasedArgumentConverter<JavaTimeConversionPattern> {
+
+		JavaTimeConversionPattern annotation;
+
+		@Override
+		protected Object convert(Object source, Class<?> targetType, JavaTimeConversionPattern annotation) {
+			this.annotation = annotation;
+			return null;
+		}
+	}
+
 	private static class SomeAnnotationConsumer implements AnnotationConsumer<CsvSource> {
 
 		CsvSource annotation;
@@ -92,7 +134,11 @@ void foo() {
 
 		}
 
-		void noAnnotation() {
+		void bar(@JavaTimeConversionPattern("pattern") LocalDate date) {
+
+		}
+
+		void noAnnotation(String param) {
 
 		}
 	}

From ee2926889fa36f5ed0adb889fb3996d40cdbfac3 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Wed, 22 Mar 2023 19:51:23 +0100
Subject: [PATCH 1131/1433] Refactor `AnnotationConsumerInitializer`

Following introduction of new `AnnotationConsumer` implementations (`AnnotationBasedArgumentsProvider` and `AnnotationBasedArgumentConverter`)
---
 .../AnnotationConsumerInitializer.java        | 73 +++++++++++--------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
index 83d9fd8fd2b0..b495f79c5b50 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.params.support;
 
+import static java.util.Arrays.asList;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.commons.util.ReflectionUtils.HierarchyTraversalMode.BOTTOM_UP;
 import static org.junit.platform.commons.util.ReflectionUtils.findMethods;
@@ -17,6 +18,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
+import java.util.List;
 import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
@@ -32,6 +34,11 @@
 @API(status = INTERNAL, since = "5.0")
 public final class AnnotationConsumerInitializer {
 
+	private static final List<AnnotationConsumingMethodSignature> annotationConsumingMethodSignatures = asList( //
+		new AnnotationConsumingMethodSignature("accept", 1, 0), //
+		new AnnotationConsumingMethodSignature("provideArguments", 2, 1), //
+		new AnnotationConsumingMethodSignature("convert", 3, 2));
+
 	private AnnotationConsumerInitializer() {
 		/* no-op */
 	}
@@ -39,7 +46,7 @@ private AnnotationConsumerInitializer() {
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static <T> T initialize(AnnotatedElement annotatedElement, T annotationConsumerInstance) {
 		if (annotationConsumerInstance instanceof AnnotationConsumer) {
-			Class<? extends Annotation> annotationType = findAnnotationType(annotationConsumerInstance);
+			Class<? extends Annotation> annotationType = findConsumedAnnotationType(annotationConsumerInstance);
 			Annotation annotation = AnnotationUtils.findAnnotation(annotatedElement, annotationType) //
 					.orElseThrow(() -> new JUnitException(annotationConsumerInstance.getClass().getName()
 							+ " must be used with an annotation of type " + annotationType.getName()));
@@ -48,41 +55,23 @@ public static <T> T initialize(AnnotatedElement annotatedElement, T annotationCo
 		return annotationConsumerInstance;
 	}
 
-	private static <T> Class<? extends Annotation> findAnnotationType(T annotationConsumerInstance) {
-		Predicate<Method> hasAnnotationParameter = method -> isAnnotationConsumerMethod(method)
-				|| isAnnotationBasedArgumentsProviderMethod(method) || isAnnotationBasedArgumentConverterMethod(method);
-		Method method = findMethods(annotationConsumerInstance.getClass(), hasAnnotationParameter, BOTTOM_UP).get(0);
+	private static <T> Class<? extends Annotation> findConsumedAnnotationType(T annotationConsumerInstance) {
+		Predicate<Method> consumesAnnotation = annotationConsumingMethodSignatures.stream() //
+				.map(signature -> (Predicate<Method>) signature::isMatchingWith) //
+				.reduce(method -> false, Predicate::or);
+		Method method = findMethods(annotationConsumerInstance.getClass(), consumesAnnotation, BOTTOM_UP).get(0);
 		return getAnnotationType(method);
 	}
 
 	@SuppressWarnings("unchecked")
 	private static Class<? extends Annotation> getAnnotationType(Method method) {
-		if (isAnnotationConsumerMethod(method)) {
-			return (Class<? extends Annotation>) method.getParameterTypes()[0];
-		}
-		if (isAnnotationBasedArgumentsProviderMethod(method)) {
-			return (Class<? extends Annotation>) method.getParameterTypes()[1];
-		}
-		return (Class<? extends Annotation>) method.getParameterTypes()[2];
-	}
-
-	private static boolean isAnnotationConsumerMethod(Method method) {
-		return isMethodWith(method, "accept", 1, 0);
-	}
-
-	private static boolean isAnnotationBasedArgumentsProviderMethod(Method method) {
-		return isMethodWith(method, "provideArguments", 2, 1);
-	}
-
-	private static boolean isAnnotationBasedArgumentConverterMethod(Method method) {
-		return isMethodWith(method, "convert", 3, 2);
-	}
+		int annotationIndex = annotationConsumingMethodSignatures.stream() //
+				.filter(signature -> signature.isMatchingWith(method)) //
+				.findFirst() //
+				.map(AnnotationConsumingMethodSignature::getAnnotationParameterIndex) //
+				.orElse(0);
 
-	private static boolean isMethodWith(Method method, String methodName, int parameterCount,
-			int annotationInParameterIndex) {
-		return method.getName().equals(methodName) //
-				&& method.getParameterCount() == parameterCount //
-				&& method.getParameterTypes()[annotationInParameterIndex].isAnnotation();
+		return (Class<? extends Annotation>) method.getParameterTypes()[annotationIndex];
 	}
 
 	private static <A extends Annotation> void initializeAnnotationConsumer(AnnotationConsumer<A> instance,
@@ -95,4 +84,28 @@ private static <A extends Annotation> void initializeAnnotationConsumer(Annotati
 		}
 	}
 
+	private static class AnnotationConsumingMethodSignature {
+
+		private final String methodName;
+		private final int parameterCount;
+		private final int annotationParameterIndex;
+
+		AnnotationConsumingMethodSignature(String methodName, int parameterCount, int annotationParameterIndex) {
+			this.methodName = methodName;
+			this.parameterCount = parameterCount;
+			this.annotationParameterIndex = annotationParameterIndex;
+		}
+
+		boolean isMatchingWith(Method method) {
+			return method.getName().equals(methodName) //
+					&& method.getParameterCount() == parameterCount //
+					&& method.getParameterTypes()[annotationParameterIndex].isAnnotation();
+		}
+
+		int getAnnotationParameterIndex() {
+			return annotationParameterIndex;
+		}
+
+	}
+
 }

From 8893a8ad6651c1c19e84f3400b83c5810067ddc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:03:17 +0000
Subject: [PATCH 1132/1433] Bump xmlunit from 2.9.0 to 2.9.1

Bumps `xmlunit` from 2.9.0 to 2.9.1.

Updates `org.xmlunit:xmlunit-assertj3` from 2.9.0 to 2.9.1
- [Release notes](https://github.com/xmlunit/xmlunit/releases)
- [Changelog](https://github.com/xmlunit/xmlunit/blob/main/RELEASE_NOTES.md)
- [Commits](https://github.com/xmlunit/xmlunit/compare/v2.9.0...v2.9.1)

Updates `org.xmlunit:xmlunit-placeholders` from 2.9.0 to 2.9.1
- [Release notes](https://github.com/xmlunit/xmlunit/releases)
- [Changelog](https://github.com/xmlunit/xmlunit/blob/main/RELEASE_NOTES.md)
- [Commits](https://github.com/xmlunit/xmlunit/compare/v2.9.0...v2.9.1)

---
updated-dependencies:
- dependency-name: org.xmlunit:xmlunit-assertj3
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.xmlunit:xmlunit-placeholders
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3c3705ea4f41..923927f3aa49 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ log4j = "2.20.0"
 opentest4j = "1.2.0"
 openTestReporting = "0.1.0-M1"
 surefire = "3.0.0-M7"
-xmlunit = "2.9.0"
+xmlunit = "2.9.1"
 
 [libraries]
 ant = { module = "org.apache.ant:ant", version.ref = "ant" }

From 81643825552e1cf287f7caab25d67493d26a65ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:03:19 +0000
Subject: [PATCH 1133/1433] Bump com.gradle.enterprise from 3.12.4 to 3.12.6

Bumps com.gradle.enterprise from 3.12.4 to 3.12.6.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 064b7f8b8211..bb610b13e6ee 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.12.4" // keep in sync with gradle/plugins/build.gradle.kts
+		id("com.gradle.enterprise") version "3.12.6" // keep in sync with gradle/plugins/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"

From 849e61d263c865a808066f8d72119232e7c242b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:03:27 +0000
Subject: [PATCH 1134/1433] Bump com.gradle:gradle-enterprise-gradle-plugin
 from 3.12.4 to 3.12.6

Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.12.4 to 3.12.6.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/plugins/common/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index 123fba670a5f..f07c0917e92c 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.17.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
-	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.4") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.6") // keep in sync with root settings.gradle.kts
 }
 
 tasks {

From a47cb448e3cb3869e364e04248b261669caeda4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:03:31 +0000
Subject: [PATCH 1135/1433] Bump org.apache.groovy:groovy from 4.0.7 to 4.0.10

Bumps [org.apache.groovy:groovy](https://github.com/apache/groovy) from 4.0.7 to 4.0.10.
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 923927f3aa49..ec74903eee48 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.4.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.153" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
-groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.7" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.10" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }

From d5a9364735829417c94b7fd66e809dc3042ddfed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 06:06:31 +0000
Subject: [PATCH 1136/1433] Bump github.amrom.workers.devbine-prs from 2.0.3 to 2.1.0

Bumps [github.amrom.workers.devbine-prs](https://github.com/github.amrom.workers.devbine-prs) from 2.0.3 to 2.1.0.
- [Release notes](https://github.com/github.amrom.workers.devbine-prs/releases)
- [Commits](https://github.com/github.amrom.workers.devbine-prs/compare/v2.0.3...v2.1.0)

---
updated-dependencies:
- dependency-name: github.amrom.workers.devbine-prs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 18deff854a67..eff6a10a2cf2 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -10,6 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: combine-prs
-        uses: github.amrom.workers.devbine-prs@v2.0.3
+        uses: github.amrom.workers.devbine-prs@v2.1.0
         with:
           github_token: ${{ secrets.GH_TOKEN }}

From e188b1eae321866f8fe87c9736f8c5d6e41cba24 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 27 Mar 2023 18:22:30 +0200
Subject: [PATCH 1137/1433] Update Groovy to 2.5.21

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ec74903eee48..9d5be3d62323 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.4.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.153" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.10" }
-groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.14" }
+groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }

From a5b642b5a44a4d4d5d63cf2b79854cb469149a6b Mon Sep 17 00:00:00 2001
From: Mahdi Hosseinzadeh <29678011+mahozad@users.noreply.github.com>
Date: Sun, 2 Apr 2023 17:08:56 +0330
Subject: [PATCH 1138/1433] Document `@MethodSource` as use case for
 `@TestInstance` per-class lifecycle

This commit documents another use case for TestInstace.PER_CLASS in Kotlin,
namely, using a regular simple class method as a factory method for @MethodSource
(which is used for parameterized tests).

Closes: #3219
---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 4 ++--
 .../src/main/java/org/junit/jupiter/api/TestInstance.java     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index a0fc45f2934c..e2431391e330 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -751,8 +751,8 @@ NOTE: Beginning with Java 16, `@BeforeAll` and `@AfterAll` methods can be declar
 `static` in `@Nested` test classes.
 
 If you are authoring tests using the Kotlin programming language, you may also find it
-easier to implement `@BeforeAll` and `@AfterAll` methods by switching to the "per-class"
-test instance lifecycle mode.
+easier to implement `@BeforeAll` and `@AfterAll` methods and also factory methods for
+`@MethodSource` by switching to the "per-class" test instance lifecycle mode.
 
 [[writing-tests-test-instance-lifecycle-changing-default]]
 ==== Changing the Default Test Instance Lifecycle
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
index 0e6ae3758b63..ac7840503c0f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
@@ -51,7 +51,8 @@
  * <li>Declaration of {@code @BeforeAll} and {@code @AfterAll} on interface
  * {@code default} methods.</li>
  * <li>Simplified declaration of non-static {@code @BeforeAll} and {@code @AfterAll}
- * methods in test classes implemented with the Kotlin programming language.</li>
+ * methods and also factory methods for {@code @MethodSource} in test classes
+ * implemented with the Kotlin programming language.</li>
  * </ul>
  *
  * <p>{@code @TestInstance} may also be used as a meta-annotation in order to

From 78aaadeae0fdf4d4eb4aee82ef1ba6a3cf5b8d1f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 2 Apr 2023 15:44:33 +0200
Subject: [PATCH 1139/1433] Polishing

---
 .../src/docs/asciidoc/user-guide/writing-tests.adoc          | 5 +++--
 .../src/main/java/org/junit/jupiter/api/TestInstance.java    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index e2431391e330..e22203936216 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -751,8 +751,9 @@ NOTE: Beginning with Java 16, `@BeforeAll` and `@AfterAll` methods can be declar
 `static` in `@Nested` test classes.
 
 If you are authoring tests using the Kotlin programming language, you may also find it
-easier to implement `@BeforeAll` and `@AfterAll` methods and also factory methods for
-`@MethodSource` by switching to the "per-class" test instance lifecycle mode.
+easier to implement non-static `@BeforeAll` and `@AfterAll` lifecycle methods as well as
+`@MethodSource` factory methods by switching to the "per-class" test instance lifecycle
+mode.
 
 [[writing-tests-test-instance-lifecycle-changing-default]]
 ==== Changing the Default Test Instance Lifecycle
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
index ac7840503c0f..5c57e95e4a14 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java
@@ -51,7 +51,7 @@
  * <li>Declaration of {@code @BeforeAll} and {@code @AfterAll} on interface
  * {@code default} methods.</li>
  * <li>Simplified declaration of non-static {@code @BeforeAll} and {@code @AfterAll}
- * methods and also factory methods for {@code @MethodSource} in test classes
+ * lifecycle methods as well as {@code @MethodSource} factory methods in test classes
  * implemented with the Kotlin programming language.</li>
  * </ul>
  *

From b56de5743cdb7fcda2afd01f8cb9b4bfac68c6e6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 2 Apr 2023 16:40:49 +0200
Subject: [PATCH 1140/1433] Rename test classes to adhere to naming policy

---
 ...ionTest.java => SeparateThreadTimeoutInvocationTests.java} | 4 ++--
 ...tionFactoryTest.java => TimeoutExceptionFactoryTests.java} | 2 +-
 ...ionFactoryTest.java => TimeoutInvocationFactoryTests.java} | 4 ++--
 ...erTest.java => AnnotationBasedArgumentsProviderTests.java} | 2 +-
 ...lizerTest.java => AnnotationConsumerInitializerTests.java} | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/{SeparateThreadTimeoutInvocationTest.java => SeparateThreadTimeoutInvocationTests.java} (97%)
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/{TimeoutExceptionFactoryTest.java => TimeoutExceptionFactoryTests.java} (98%)
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/{TimeoutInvocationFactoryTest.java => TimeoutInvocationFactoryTests.java} (98%)
 rename junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/{AnnotationBasedArgumentsProviderTest.java => AnnotationBasedArgumentsProviderTests.java} (97%)
 rename junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/{AnnotationConsumerInitializerTest.java => AnnotationConsumerInitializerTests.java} (99%)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java
similarity index 97%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java
index 8ea41562ddf6..7ec645925f5f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java
@@ -31,7 +31,7 @@
  * @since 5.9
  */
 @DisplayName("SeparateThreadTimeoutInvocation")
-class SeparateThreadTimeoutInvocationTest {
+class SeparateThreadTimeoutInvocationTests {
 
 	private static final long PREEMPTIVE_TIMEOUT_MILLIS = WINDOWS.isCurrentOs() ? 1000 : 100;
 
@@ -70,7 +70,7 @@ void shouldThrowInvocationException() {
 	}
 
 	private static <T> SeparateThreadTimeoutInvocation<T> aSeparateThreadInvocation(Invocation<T> invocation) {
-		var namespace = ExtensionContext.Namespace.create(SeparateThreadTimeoutInvocationTest.class);
+		var namespace = ExtensionContext.Namespace.create(SeparateThreadTimeoutInvocationTests.class);
 		var store = new NamespaceAwareStore(new ExtensionValuesStore(null), namespace);
 		var parameters = new TimeoutInvocationParameters<>(invocation,
 			new TimeoutDuration(PREEMPTIVE_TIMEOUT_MILLIS, MILLISECONDS), () -> "method()");
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTests.java
similarity index 98%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTests.java
index 95aa77c42c42..66ca3ce8d613 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExceptionFactoryTests.java
@@ -25,7 +25,7 @@
  * @since 5.9
  */
 @DisplayName("TimeoutExceptionFactory")
-class TimeoutExceptionFactoryTest {
+class TimeoutExceptionFactoryTests {
 
 	private static final TimeoutDuration tenMillisDuration = new TimeoutDuration(10, MILLISECONDS);
 	private static final Exception suppressedException = new Exception("Winke!");
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTests.java
similarity index 98%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java
rename to junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTests.java
index 31dda7730477..a6b2b650afbd 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTest.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTests.java
@@ -32,11 +32,11 @@
 
 @DisplayName("TimeoutInvocationFactory")
 @ExtendWith(MockitoExtension.class)
-class TimeoutInvocationFactoryTest {
+class TimeoutInvocationFactoryTests {
 
 	@Spy
 	private final Store store = new NamespaceAwareStore(new ExtensionValuesStore(null),
-		ExtensionContext.Namespace.create(TimeoutInvocationFactoryTest.class));
+		ExtensionContext.Namespace.create(TimeoutInvocationFactoryTests.class));
 	@Mock
 	private Invocation<String> invocation;
 	@Mock
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTests.java
similarity index 97%
rename from junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java
rename to junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTests.java
index ae54960f289c..757190eb9371 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTest.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTests.java
@@ -25,7 +25,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 @DisplayName("AnnotationBasedArgumentsProvider")
-class AnnotationBasedArgumentsProviderTest {
+class AnnotationBasedArgumentsProviderTests {
 
 	private final AnnotationBasedArgumentsProvider<CsvSource> annotationBasedArgumentsProvider = new AnnotationBasedArgumentsProvider<>() {
 		@Override
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTests.java
similarity index 99%
rename from junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
rename to junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTests.java
index 0c22504d9236..2faee8a27ff9 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTest.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTests.java
@@ -32,7 +32,7 @@
 import org.junit.platform.commons.JUnitException;
 
 @DisplayName("AnnotationConsumerInitializer")
-class AnnotationConsumerInitializerTest {
+class AnnotationConsumerInitializerTests {
 
 	@Test
 	@DisplayName("should initialize annotation consumer")

From 1c294651ab3965a8bfe8909f6efdc56c5a47c4f0 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 2 Apr 2023 17:27:45 +0200
Subject: [PATCH 1141/1433] Polishing

---
 .../release-notes-5.10.0-M1.adoc              | 35 ++++++++-------
 .../asciidoc/user-guide/writing-tests.adoc    | 14 +++---
 .../AnnotationBasedArgumentConverter.java     | 11 ++---
 .../converter/JavaTimeArgumentConverter.java  |  9 ++--
 .../AnnotationBasedArgumentsProvider.java     |  8 ++--
 .../params/provider/CsvArgumentsProvider.java |  2 +-
 .../provider/CsvFileArgumentsProvider.java    |  2 +-
 .../jupiter/params/provider/EmptySource.java  |  4 +-
 .../provider/EnumArgumentsProvider.java       |  2 +-
 .../provider/MethodArgumentsProvider.java     |  2 +-
 .../provider/ValueArgumentsProvider.java      |  2 +-
 .../ParameterizedTestIntegrationTests.java    | 44 +++++++++----------
 ...AnnotationBasedArgumentsProviderTests.java |  2 +-
 .../AnnotationConsumerInitializerTests.java   | 22 +++++-----
 14 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 2f8ebd6bf778..b1a7b61e62d7 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -24,19 +24,22 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
-* All utility methods from `ReflectionSupport` now have counterparts returning `Stream`
-  instead of `List`.
-* For consistency with Jupiter lifecycle callbacks, listener method pairs for started/
-  finished and opened/closed events are now called using "wrap" semantics, i.e. the latter
-  methods are called in reverse order compared to the former when multiple listeners are
-  registered. This affects the following listener interfaces: `TestExecutionListener`,
-  `EngineExecutionListener`, `LauncherDiscoveryListener`, and `LauncherSessionListener`.
-* Introduce `LauncherInterceptor` SPI for intercepting the creation of instances of
-  `Launcher` and `LauncherSessionlistener` as well as calls for `discover` and `execute`
-  of the former. Please refer to the
+* All utility methods in `ReflectionSupport` that return a `List` now have counterparts
+  which return a `Stream`.
+* For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
+  started/finished and opened/closed events are now invoked using "wrapping" semantics.
+  This means that finished/closed event methods are invoked in reverse order compared to
+  the corresponding started/opened event methods when multiple listeners are registered.
+  This affects the following listener interfaces:
+  `TestExecutionListener`, `EngineExecutionListener`, `LauncherDiscoveryListener`, and
+  `LauncherSessionListener`.
+* New `LauncherInterceptor` SPI for intercepting the creation of instances of `Launcher`
+  and `LauncherSessionlistener` as well as invocations of the `discover` and `execute`
+  methods of the former. Please refer to the
   <<../user-guide/index.adoc#launcher-api-launcher-interceptors-custom, User Guide>> for
   details.
 
+
 [[release-notes-5.10.0-M1-junit-jupiter]]
 === JUnit Jupiter
 
@@ -60,14 +63,14 @@ repository on GitHub.
 
 * New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
   `@ParameterizedTest` invocation.
-* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal
-  to fall back to the default display name generator.
+* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
+  fall back to the default display name generator.
 * `@EmptySource` now supports additional types, including `Collection` and `Map` subtypes
   with a public no-arg constructor.
-* New `AnnotationBasedArgumentsProvider` that implements both `ArgumentsProvider` and
-  `AnnotationConsumer` interfaces.
-* New `AnnotationBasedArgumentConverter` that implements both `ArgumentConverter` and
-  `AnnotationConsumer` interfaces.
+* New `AnnotationBasedArgumentsProvider` convenience base class which implements both
+  `ArgumentsProvider` and `AnnotationConsumer`.
+* New `AnnotationBasedArgumentConverter` convenience base class which implements both
+  `ArgumentConverter` and `AnnotationConsumer`.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index e22203936216..eefe3f682d85 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1257,13 +1257,13 @@ for parameterized tests that accept a single argument.
 * `{NullSource}`: provides a single `null` argument to the annotated `@ParameterizedTest`
   method.
    - `@NullSource` cannot be used for a parameter that has a primitive type.
-* `{EmptySource}`: provides a single _empty_ argument to the annotated `@ParameterizedTest`
-  method for parameters of the following types: `java.lang.String`, `java.util.Collection`
-  and subtypes with a public no-arg constructor, `java.util.List`, `java.util.Set`,
-  `java.util.SortedSet`, `java.util.NavigableSet`, `java.util.Map` and subtypes with a
-  public no-arg constructor, `java.util.SortedMap`, `java.util.NavigableMap`, primitive
-  arrays (e.g., `int[]`, `char[][]`, etc.), object arrays (e.g.,`String[]`, `Integer[][]`,
-  etc.).
+* `{EmptySource}`: provides a single _empty_ argument to the annotated
+  `@ParameterizedTest` method for parameters of the following types: `java.lang.String`,
+  `java.util.Collection` (and concrete subtypes with a `public` no-arg constructor),
+  `java.util.List`, `java.util.Set`, `java.util.SortedSet`, `java.util.NavigableSet`,
+  `java.util.Map` (and concrete subtypes with a `public` no-arg constructor,
+  `java.util.SortedMap`, `java.util.NavigableMap`, primitive arrays (e.g., `int[]`,
+  `char[][]`, etc.), object arrays (e.g.,`String[]`, `Integer[][]`, etc.).
 * `{NullAndEmptySource}`: a _composed annotation_ that combines the functionality of
   `@NullSource` and `@EmptySource`.
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
index 964c0c23616a..fa67ae7c8d74 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
@@ -46,22 +46,23 @@ public final void accept(A annotation) {
 
 	@Override
 	public final Object convert(Object source, ParameterContext context) throws ArgumentConversionException {
-		return convert(source, context.getParameter().getType(), annotation);
+		return convert(source, context.getParameter().getType(), this.annotation);
 	}
 
 	/**
-	 * Convert the supplied {@code source} object into the supplied
-	 * {@code targetType}.
+	 * Convert the supplied {@code source} object into the supplied {@code targetType},
+	 * based on metadata in the provided annotation.
 	 *
 	 * @param source the source object to convert; may be {@code null}
 	 * @param targetType the target type the source object should be converted
 	 * into; never {@code null}
-	 * @param annotation the annotation needed to convert the source; never {@code null}
+	 * @param annotation the annotation to process; never {@code null}
 	 * @return the converted object; may be {@code null} but only if the target
 	 * type is a reference type
 	 * @throws ArgumentConversionException in case an error occurs during the
 	 * conversion
 	 */
-	protected abstract Object convert(Object source, Class<?> targetType, A annotation);
+	protected abstract Object convert(Object source, Class<?> targetType, A annotation)
+			throws ArgumentConversionException;
 
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
index aef6e5a44cc8..3af740fa7a3c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java
@@ -51,12 +51,15 @@ class JavaTimeArgumentConverter extends AnnotationBasedArgumentConverter<JavaTim
 
 	@Override
 	protected Object convert(Object input, Class<?> targetClass, JavaTimeConversionPattern annotation) {
-		String pattern = annotation.value();
-		if (!TEMPORAL_QUERIES.containsKey(targetClass)) {
+		if (input == null) {
+			throw new ArgumentConversionException("Cannot convert null to " + targetClass.getName());
+		}
+		TemporalQuery<?> temporalQuery = TEMPORAL_QUERIES.get(targetClass);
+		if (temporalQuery == null) {
 			throw new ArgumentConversionException("Cannot convert to " + targetClass.getName() + ": " + input);
 		}
+		String pattern = annotation.value();
 		DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
-		TemporalQuery<?> temporalQuery = TEMPORAL_QUERIES.get(targetClass);
 		return formatter.parse(input.toString(), temporalQuery);
 	}
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
index 2dbfd70e6348..a4a5971ecff1 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProvider.java
@@ -49,15 +49,15 @@ public final void accept(A annotation) {
 
 	@Override
 	public final Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-		return provideArguments(context, annotation);
+		return provideArguments(context, this.annotation);
 	}
 
 	/**
-	 * Provide a {@link Stream} of {@link Arguments} to be passed to a
-	 * {@code @ParameterizedTest} method, by using the data given by an annotation.
+	 * Provide a {@link Stream} of {@link Arguments} &mdash; based on metadata in the
+	 * provided annotation &mdash; to be passed to a {@code @ParameterizedTest} method.
 	 *
 	 * @param context the current extension context; never {@code null}
-	 * @param annotation the annotation used to specify the arguments; never {@code null}
+	 * @param annotation the annotation to process; never {@code null}
 	 * @return a stream of arguments; never {@code null}
 	 */
 	protected abstract Stream<? extends Arguments> provideArguments(ExtensionContext context, A annotation);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 3722aa2a0087..4d715c96c240 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -41,7 +41,7 @@ class CsvArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvSource> {
 	private CsvParser csvParser;
 
 	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource annotation) {
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource annotation) {
 		this.nullValues = toSet(annotation.nullValues());
 		this.csvParser = createParserFor(annotation);
 		final boolean textBlockDeclared = !annotation.textBlock().isEmpty();
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index f4ccca49432f..30e389b39a0a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -58,7 +58,7 @@ class CsvFileArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvFileS
 	}
 
 	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvFileSource annotation) {
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvFileSource annotation) {
 		this.charset = getCharsetFrom(annotation);
 		this.numLinesToSkip = annotation.numLinesToSkip();
 		this.csvParser = createParserFor(annotation);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
index cd1104a1d6e8..4b628171deca 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EmptySource.java
@@ -31,12 +31,12 @@
  *
  * <ul>
  * <li>{@link java.lang.String}</li>
- * <li>{@link java.util.Collection} and subtypes with a public no-arg constructor</li>
+ * <li>{@link java.util.Collection} and concrete subtypes with a public no-arg constructor</li>
  * <li>{@link java.util.List}</li>
  * <li>{@link java.util.Set}</li>
  * <li>{@link java.util.SortedSet}</li>
  * <li>{@link java.util.NavigableSet}</li>
- * <li>{@link java.util.Map} and subtypes with a public no-arg constructor</li>
+ * <li>{@link java.util.Map} and concrete subtypes with a public no-arg constructor</li>
  * <li>{@link java.util.SortedMap}</li>
  * <li>{@link java.util.NavigableMap}</li>
  * <li>primitive arrays &mdash; for example {@code int[]}, {@code char[][]}, etc.</li>
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
index 04bbf7f7ca0c..303d3dab71ca 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/EnumArgumentsProvider.java
@@ -27,7 +27,7 @@
 class EnumArgumentsProvider extends AnnotationBasedArgumentsProvider<EnumSource> {
 
 	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context, EnumSource enumSource) {
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, EnumSource enumSource) {
 		Set<? extends Enum<?>> constants = getEnumConstants(context, enumSource);
 		EnumSource.Mode mode = enumSource.mode();
 		String[] declaredConstantNames = enumSource.names();
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 6ad6069e9d3c..b92e19d46b6d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -38,7 +38,7 @@
 class MethodArgumentsProvider extends AnnotationBasedArgumentsProvider<MethodSource> {
 
 	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context, MethodSource annotation) {
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, MethodSource annotation) {
 		Class<?> testClass = context.getRequiredTestClass();
 		Method testMethod = context.getRequiredTestMethod();
 		Object testInstance = context.getTestInstance().orElse(null);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
index 0845f03c51b5..1fe665290ec2 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
@@ -27,7 +27,7 @@
 class ValueArgumentsProvider extends AnnotationBasedArgumentsProvider<ValueSource> {
 
 	@Override
-	public Stream<? extends Arguments> provideArguments(ExtensionContext context, ValueSource source) {
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, ValueSource source) {
 		Object[] arguments = getArgumentsFromSource(source);
 		return Arrays.stream(arguments).map(Arguments::of);
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
index e4da1e737710..2f248bfdad42 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -487,10 +487,10 @@ void executesWithEmptySourceForList() {
 		 * @since 5.10
 		 */
 		@ParameterizedTest(name = "{1}")
-		@CsvSource({ //
-				"testWithEmptySourceForArrayList, java.util.ArrayList", //
-				"testWithEmptySourceForLinkedList, java.util.LinkedList"//
-		})
+		@CsvSource(textBlock = """
+				testWithEmptySourceForArrayList,  java.util.ArrayList
+				testWithEmptySourceForLinkedList, java.util.LinkedList
+				""")
 		void executesWithEmptySourceForListSubtype(String methodName, Class<?> parameterType) {
 			var results = execute(methodName, parameterType);
 			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument=[]")));
@@ -506,13 +506,13 @@ void executesWithEmptySourceForSet() {
 		 * @since 5.10
 		 */
 		@ParameterizedTest(name = "{1}")
-		@CsvSource({ //
-				"testWithEmptySourceForSortedSet, java.util.SortedSet", //
-				"testWithEmptySourceForNavigableSet, java.util.NavigableSet", //
-				"testWithEmptySourceForHashSet, java.util.HashSet", //
-				"testWithEmptySourceForTreeSet, java.util.TreeSet", //
-				"testWithEmptySourceForLinkedHashSet, java.util.LinkedHashSet"//
-		})
+		@CsvSource(textBlock = """
+				testWithEmptySourceForSortedSet,     java.util.SortedSet
+				testWithEmptySourceForNavigableSet,  java.util.NavigableSet
+				testWithEmptySourceForHashSet,       java.util.HashSet
+				testWithEmptySourceForTreeSet,       java.util.TreeSet
+				testWithEmptySourceForLinkedHashSet, java.util.LinkedHashSet
+				""")
 		void executesWithEmptySourceForSetSubtype(String methodName, Class<?> parameterType) {
 			var results = execute(methodName, parameterType);
 			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument=[]")));
@@ -528,13 +528,13 @@ void executesWithEmptySourceForMap() {
 		 * @since 5.10
 		 */
 		@ParameterizedTest(name = "{1}")
-		@CsvSource({ //
-				"testWithEmptySourceForSortedMap, java.util.SortedMap", //
-				"testWithEmptySourceForNavigableMap, java.util.NavigableMap", //
-				"testWithEmptySourceForHashMap, java.util.HashMap", //
-				"testWithEmptySourceForTreeMap, java.util.TreeMap", //
-				"testWithEmptySourceForLinkedHashMap, java.util.LinkedHashMap"//
-		})
+		@CsvSource(textBlock = """
+				testWithEmptySourceForSortedMap,     java.util.SortedMap
+				testWithEmptySourceForNavigableMap,  java.util.NavigableMap
+				testWithEmptySourceForHashMap,       java.util.HashMap
+				testWithEmptySourceForTreeMap,       java.util.TreeMap
+				testWithEmptySourceForLinkedHashMap, java.util.LinkedHashMap
+				""")
 		void executesWithEmptySourceForMapSubtype(String methodName, Class<?> parameterType) {
 			var results = execute(methodName, parameterType);
 			results.testEvents().succeeded().assertEventsMatchExactly(event(test(), displayName("[1] argument={}")));
@@ -576,10 +576,10 @@ void failsWithEmptySourceWithZeroFormalParameters() {
 		}
 
 		@ParameterizedTest(name = "{1}")
-		@CsvSource({ //
-				"testWithEmptySourceForPrimitive, int", //
-				"testWithEmptySourceForUnsupportedReferenceType, java.lang.Integer"//
-		})
+		@CsvSource(textBlock = """
+				testWithEmptySourceForPrimitive,                int
+				testWithEmptySourceForUnsupportedReferenceType, java.lang.Integer
+				""")
 		void failsWithEmptySourceForUnsupportedType(String methodName, Class<?> parameterType) {
 			execute(methodName, parameterType).containerEvents().failed().assertEventsMatchExactly(//
 				event(container(methodName), //
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTests.java
index 757190eb9371..fe37ddc7e557 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/AnnotationBasedArgumentsProviderTests.java
@@ -43,7 +43,7 @@ void shouldThrowExceptionWhenNullAnnotationIsProvidedToAccept() {
 
 	@Test
 	@DisplayName("should invoke the provideArguments template method with the accepted annotation")
-	void shouldInvokeTemplateMethodWithTheAnnotationProvidedWithAccept() {
+	void shouldInvokeTemplateMethodWithTheAnnotationProvidedToAccept() {
 		var spiedProvider = spy(annotationBasedArgumentsProvider);
 		var extensionContext = mock(ExtensionContext.class);
 		var annotation = csvSource("0", "1", "2");
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTests.java
index 2faee8a27ff9..18dce72c2f71 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTests.java
@@ -17,7 +17,6 @@
 import static org.mockito.Mockito.when;
 
 import java.time.LocalDate;
-import java.util.Arrays;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.DisplayName;
@@ -42,12 +41,12 @@ void shouldInitializeAnnotationConsumer() throws NoSuchMethodException {
 		var initialisedAnnotationConsumer = initialize(method, instance);
 
 		assertThat(initialisedAnnotationConsumer.annotation) //
-				.isInstanceOf(CsvSource.class) //
-				.matches(annotation -> Arrays.equals(annotation.value(), new String[] { "a", "b" }));
+				.isInstanceOfSatisfying(CsvSource.class, //
+					source -> assertThat(source.value()).containsExactly("a", "b"));
 	}
 
 	@Test
-	@DisplayName("should initialize annotation based arguments provider")
+	@DisplayName("should initialize annotation-based ArgumentsProvider")
 	void shouldInitializeAnnotationBasedArgumentsProvider() throws NoSuchMethodException {
 		var instance = new SomeAnnotationBasedArgumentsProvider();
 		var method = SubjectClass.class.getDeclaredMethod("foo");
@@ -56,12 +55,12 @@ void shouldInitializeAnnotationBasedArgumentsProvider() throws NoSuchMethodExcep
 		initialisedAnnotationConsumer.provideArguments(mock());
 
 		assertThat(initialisedAnnotationConsumer.annotation) //
-				.isInstanceOf(CsvSource.class) //
-				.matches(annotation -> Arrays.equals(annotation.value(), new String[] { "a", "b" }));
+				.isInstanceOfSatisfying(CsvSource.class, //
+					source -> assertThat(source.value()).containsExactly("a", "b"));
 	}
 
 	@Test
-	@DisplayName("should initialize annotation based argument converter")
+	@DisplayName("should initialize annotation-based ArgumentConverter")
 	void shouldInitializeAnnotationBasedArgumentConverter() throws NoSuchMethodException {
 		var instance = new SomeAnnotationBasedArgumentConverter();
 		var parameter = SubjectClass.class.getDeclaredMethod("bar", LocalDate.class).getParameters()[0];
@@ -72,8 +71,8 @@ void shouldInitializeAnnotationBasedArgumentConverter() throws NoSuchMethodExcep
 		initialisedAnnotationConsumer.convert("source", parameterContext);
 
 		assertThat(initialisedAnnotationConsumer.annotation) //
-				.isInstanceOf(JavaTimeConversionPattern.class) //
-				.matches(annotation -> annotation.value().equals("pattern"));
+				.isInstanceOfSatisfying(JavaTimeConversionPattern.class, //
+					annotation -> assertThat(annotation.value()).isEqualTo("pattern"));
 	}
 
 	@Test
@@ -127,19 +126,18 @@ public void accept(CsvSource csvSource) {
 		}
 	}
 
+	@SuppressWarnings("unused")
 	private static class SubjectClass {
 
 		@CsvSource({ "a", "b" })
 		void foo() {
-
 		}
 
 		void bar(@JavaTimeConversionPattern("pattern") LocalDate date) {
-
 		}
 
 		void noAnnotation(String param) {
-
 		}
 	}
+
 }

From 7c53d33c37464f5f64e452ffa55297c0a0012da0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 29 Mar 2023 16:25:38 +0200
Subject: [PATCH 1142/1433] Upgradle to 8.1-rc-2

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 19acfb4ef2f6..040100176a9c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=c8e041dcbf7b747bf967b607942d8cf9a7cf992f4c05c90b1c8826901c183617
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 848cf8699031d4e899283bc6b095c9d85f992afe Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 29 Mar 2023 16:25:51 +0200
Subject: [PATCH 1143/1433] Resolve deprecation warnings

---
 documentation/documentation.gradle.kts              | 13 +++++--------
 ...junitbuild.java-multi-release-sources.gradle.kts |  4 +++-
 .../kotlin/junitbuild.osgi-conventions.gradle.kts   |  4 ++--
 .../kotlin/junitbuild.temp-maven-repo.gradle.kts    |  6 ++----
 .../platform-tooling-support-tests.gradle.kts       |  3 ++-
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 2c2ac600ba6a..1088e55c40a7 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -1,10 +1,9 @@
-import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
-import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
-import org.gradle.api.tasks.PathSensitivity.RELATIVE
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import junitbuild.exec.ClasspathSystemPropertyProvider
 import junitbuild.exec.RunConsoleLauncher
 import junitbuild.javadoc.ModuleSpecificJavadocFileOption
+import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
+import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
+import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import java.io.ByteArrayOutputStream
 import java.nio.file.Files
 
@@ -236,10 +235,8 @@ tasks {
 			))
 			inputs.dir(java.srcDirs.first())
 			inputs.dir(resources.srcDirs.first())
-			withConvention(KotlinSourceSet::class) {
-				attributes(mapOf("kotlinTestDir" to kotlin.srcDirs.first()))
-				inputs.dir(kotlin.srcDirs.first())
-			}
+			attributes(mapOf("kotlinTestDir" to kotlin.srcDirs.first()))
+			inputs.dir(kotlin.srcDirs.first())
 		}
 
 		forkOptions {
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
index b78098f3743e..58d28949b127 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.configurationcache.extensions.capitalized
+
 plugins {
 	id("junitbuild.java-library-conventions")
 }
@@ -27,7 +29,7 @@ listOf(9, 17).forEach { javaVersion ->
 			options.release.set(javaVersion)
 		}
 
-		named<Checkstyle>("checkstyle${sourceSet.name.replaceFirstChar(Char::titlecase)}").configure {
+		named<Checkstyle>("checkstyle${sourceSet.name.capitalized()}").configure {
             config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleMain.xml"))
 		}
 
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
index d41f23f6ef64..ea432398c77b 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
@@ -75,7 +75,7 @@ tasks.withType<Jar>().matching { task: Jar ->
 // task writes out the properties necessary for it to verify the OSGi
 // metadata.
 val osgiProperties by tasks.registering(WriteProperties::class) {
-	setOutputFile(layout.buildDirectory.file("verifyOSGiProperties.bndrun"))
+	destinationFile.set(layout.buildDirectory.file("verifyOSGiProperties.bndrun"))
 	property("-standalone", true)
 	project.extensions.getByType(JavaLibraryExtension::class.java).let { javaLibrary ->
 		property("-runee", "JavaSE-${javaLibrary.mainJavaVersion}")
@@ -95,7 +95,7 @@ val osgiVerification by configurations.creatingResolvable {
 // that its metadata is valid. If the metadata is invalid this task will
 // fail.
 val verifyOSGi by tasks.registering(Resolve::class) {
-	bndrun.fileProvider(osgiProperties.map { it.outputFile })
+	bndrun.set(osgiProperties.flatMap { it.destinationFile })
 	outputBndrun.set(layout.buildDirectory.file("resolvedOSGiProperties.bndrun"))
 	isReportOptional = false
 	// By default bnd will use jars found in:
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
index 4d81a8a986ce..509b58f2c8c0 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
@@ -1,6 +1,4 @@
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
-import org.gradle.kotlin.dsl.*
+import org.gradle.configurationcache.extensions.capitalized
 
 val tempRepoName by extra("temp")
 val tempRepoDir by extra(file("$buildDir/repo"))
@@ -22,7 +20,7 @@ subprojects {
 			}
 		}
 		tasks.withType<PublishToMavenRepository>().configureEach {
-			if (name.endsWith("To${tempRepoName.replaceFirstChar(Char::titlecase)}Repository")) {
+			if (name.endsWith("To${tempRepoName.capitalized()}Repository")) {
 				dependsOn(clearTempRepoDir)
 			}
 		}
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 20cd17024bcb..7190c13879ef 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
+import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.jvm.toolchain.internal.NoToolchainAvailableException
 
 plugins {
@@ -97,7 +98,7 @@ tasks.test {
 		val tempRepoName: String by rootProject
 
 		(mavenizedProjects + projects.junitBom.dependencyProject)
-			.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalize()}Repository") }
+			.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalized()}Repository") }
 			.forEach { dependsOn(it) }
 	}
 

From 2ecbd6dc95b83499006a0ae396589705c20acaa4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 10 Apr 2023 18:54:39 +0200
Subject: [PATCH 1144/1433] Upgradle to 8.1-rc-3

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 61608 -> 62076 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..c1962a79e29d3e0ab67b14947c167a862655af9b 100644
GIT binary patch
delta 8979
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
F{TFmrHLU;u

delta 8469
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 040100176a9c..775aa4af68ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c8e041dcbf7b747bf967b607942d8cf9a7cf992f4c05c90b1c8826901c183617
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-2-bin.zip
+distributionSha256Sum=4087d4c8eb90335f7c635082424cf34480721544ad36b595dcf8c143c653c149
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d421cc4..aeb74cbb43e3 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

From 63218f38a4e8e0998e7a37eb4572785b377cb5c7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 10 Apr 2023 19:11:31 +0200
Subject: [PATCH 1145/1433] Resolve Gradle deprecation warnings

---
 .../main/kotlin/junitbuild.junit4-compatibility.gradle.kts   | 5 +++--
 junit-vintage-engine/junit-vintage-engine.gradle.kts         | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
index dd1e08fed717..d0d2a89ad577 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.junit4-compatibility.gradle.kts
@@ -20,8 +20,9 @@ dependencies {
 
 tasks {
 	val test_4_12 by registering(Test::class) {
-		classpath -= configurations.testRuntimeClasspath.get()
-		classpath += junit_4_12
+		val test by testing.suites.existing(JvmTestSuite::class)
+		testClassesDirs = files(test.map { it.sources.output.classesDirs })
+		classpath = files(test.map { it.sources.runtimeClasspath }) + junit_4_12
 	}
 	check {
 		dependsOn(test_4_12)
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index c740522e0bf4..90648ed0b888 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -62,11 +62,13 @@ tasks {
 		}
 	}
 	val testWithoutJUnit4 by registering(Test::class) {
+		val test by testing.suites.existing(JvmTestSuite::class)
 		(options as JUnitPlatformOptions).apply {
 			includeTags("missing-junit4")
 		}
 		setIncludes(listOf("**/JUnit4VersionCheckTests.class"))
-		classpath = classpath.filter {
+		testClassesDirs = files(test.map { it.sources.output.classesDirs })
+		classpath = files(test.map { it.sources.runtimeClasspath }).filter {
 			!it.name.startsWith("junit-4")
 		}
 	}

From 4b35d519d9eccb550fe6ef0e70a5877a9e300422 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 05:58:59 +0000
Subject: [PATCH 1146/1433] Bump org.mockito:mockito-junit-jupiter from 4.11.0
 to 5.2.0

Bumps [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) from 4.11.0 to 5.2.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.11.0...v5.2.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9d5be3d62323..467fa5d059c3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.8.6" }
-mockito = { module = "org.mockito:mockito-junit-jupiter", version = "4.11.0" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.2.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }

From aeb24f666a984ebde93063c931b7d34e0bad9517 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 05:59:02 +0000
Subject: [PATCH 1147/1433] Bump jvm from 1.8.10 to 1.8.20

Bumps jvm from 1.8.10 to 1.8.20.

---
updated-dependencies:
- dependency-name: jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index bb610b13e6ee..cac6080c9399 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,7 +11,7 @@ pluginManagement {
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"
-		kotlin("jvm") version "1.8.10"
+		kotlin("jvm") version "1.8.20"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
 		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"

From 2b6aa1f79e8892afd73c93a47a1d022d0060ddc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 05:59:09 +0000
Subject: [PATCH 1148/1433] Bump info.picocli:picocli from 4.7.0 to 4.7.1

Bumps [info.picocli:picocli](https://github.com/remkop/picocli) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/remkop/picocli/releases)
- [Changelog](https://github.com/remkop/picocli/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/remkop/picocli/compare/v4.7.0...v4.7.1)

---
updated-dependencies:
- dependency-name: info.picocli:picocli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 467fa5d059c3..d0d3e313af24 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.2.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }
-picocli = { module = "info.picocli:picocli", version = "4.7.0" }
+picocli = { module = "info.picocli:picocli", version = "4.7.1" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.6" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }

From c29b0c275ef0c9979276374f9111c2e6055c2072 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Apr 2023 06:01:32 +0000
Subject: [PATCH 1149/1433] Bump github.amrom.workers.devbine-prs from 2.1.0 to 3.0.1

Bumps [github.amrom.workers.devbine-prs](https://github.com/github.amrom.workers.devbine-prs) from 2.1.0 to 3.0.1.
- [Release notes](https://github.com/github.amrom.workers.devbine-prs/releases)
- [Commits](https://github.com/github.amrom.workers.devbine-prs/compare/v2.1.0...v3.0.1)

---
updated-dependencies:
- dependency-name: github.amrom.workers.devbine-prs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index eff6a10a2cf2..c3f4d177b853 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -10,6 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: combine-prs
-        uses: github.amrom.workers.devbine-prs@v2.1.0
+        uses: github.amrom.workers.devbine-prs@v3.0.1
         with:
           github_token: ${{ secrets.GH_TOKEN }}

From 8320f07a0c49d847c3d760c58f29f3d6553074c4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 10 Apr 2023 19:30:28 +0200
Subject: [PATCH 1150/1433] Update Mockito usage for varargs method

see https://github.com/mockito/mockito/releases/tag/v5.0.0
---
 .../junit/platform/console/ConsoleLauncherTests.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index c22e94e14e8b..b7f70803c15d 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -40,7 +40,7 @@ void displayHelp() {
 		options.setDisplayHelp(true);
 
 		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any())).thenReturn(options);
+		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
 		var exitCode = consoleLauncher.execute("--help").getExitCode();
@@ -56,7 +56,7 @@ void displayBanner() {
 		options.setDisplayHelp(true);
 
 		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any())).thenReturn(options);
+		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
 		var exitCode = consoleLauncher.execute("--help").getExitCode();
@@ -74,7 +74,7 @@ void disableBanner() {
 		options.setDisplayHelp(true);
 
 		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any())).thenReturn(options);
+		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
 		var exitCode = consoleLauncher.execute("--help", "--disable-banner").getExitCode();
@@ -86,7 +86,7 @@ void disableBanner() {
 	@Test
 	void executeWithUnknownCommandLineOption() {
 		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any())).thenReturn(new CommandLineOptions());
+		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(new CommandLineOptions());
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
 		var exitCode = consoleLauncher.execute("--all").getExitCode();
@@ -98,7 +98,7 @@ void executeWithUnknownCommandLineOption() {
 	@Test
 	void executeWithSupportedCommandLineOption() {
 		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any())).thenReturn(new CommandLineOptions());
+		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(new CommandLineOptions());
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
 		var exitCode = consoleLauncher.execute("--scan-classpath").getExitCode();

From 74d244ec4c355ae31dc8b6718816330967ba3bc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 17:42:33 +0000
Subject: [PATCH 1151/1433] Bump github.amrom.workers.devbine-prs from 2.1.0 to 3.1.0

Bumps [github.amrom.workers.devbine-prs](https://github.com/github.amrom.workers.devbine-prs) from 2.1.0 to 3.1.0.
- [Release notes](https://github.com/github.amrom.workers.devbine-prs/releases)
- [Commits](https://github.com/github.amrom.workers.devbine-prs/compare/v2.1.0...v3.1.0)

---
updated-dependencies:
- dependency-name: github.amrom.workers.devbine-prs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index c3f4d177b853..3beb5be2f9ec 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -10,6 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: combine-prs
-        uses: github.amrom.workers.devbine-prs@v3.0.1
+        uses: github.amrom.workers.devbine-prs@v3.1.0
         with:
           github_token: ${{ secrets.GH_TOKEN }}

From 0950ce0ef07dde8eead033968dfa1b20bfe4dd1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 17:43:05 +0000
Subject: [PATCH 1152/1433] Bump info.picocli:picocli from 4.7.0 to 4.7.2

Bumps [info.picocli:picocli](https://github.com/remkop/picocli) from 4.7.0 to 4.7.2.
- [Release notes](https://github.com/remkop/picocli/releases)
- [Changelog](https://github.com/remkop/picocli/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/remkop/picocli/compare/v4.7.0...v4.7.2)

---
updated-dependencies:
- dependency-name: info.picocli:picocli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d0d3e313af24..401efd06c22a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.2.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }
-picocli = { module = "info.picocli:picocli", version = "4.7.1" }
+picocli = { module = "info.picocli:picocli", version = "4.7.2" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.6" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }

From 7d486b1895a368d5f25dbaf31ed4d31fa2eee6e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 17:43:08 +0000
Subject: [PATCH 1153/1433] Bump org.apache.maven:apache-maven from 3.8.6 to
 3.9.1

Bumps [org.apache.maven:apache-maven](https://github.com/apache/maven) from 3.8.6 to 3.9.1.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.6...maven-3.9.1)

---
updated-dependencies:
- dependency-name: org.apache.maven:apache-maven
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 401efd06c22a..c954dc49460c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
-maven = { module = "org.apache.maven:apache-maven", version = "3.8.6" }
+maven = { module = "org.apache.maven:apache-maven", version = "3.9.1" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.2.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }

From be4999a051f76eb57ee171ecd7a07a37becc5f6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 18:09:46 +0000
Subject: [PATCH 1154/1433] Bump org.slf4j:slf4j-jdk14 from 2.0.6 to 2.0.7

Bumps [org.slf4j:slf4j-jdk14](https://github.com/qos-ch/slf4j) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.6...v_2.0.7)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-jdk14
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c954dc49460c..4cd9dd3ace23 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -44,7 +44,7 @@ opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j"
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }
 picocli = { module = "info.picocli:picocli", version = "4.7.2" }
-slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.6" }
+slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.7" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }

From c986961fb5fb3dfc6b510b66355a0aef098bf62f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 11 Apr 2023 11:09:12 +0200
Subject: [PATCH 1155/1433] Only use Stalebot for issues labeled with
 waiting-for-feedback

Co-authored-by: Sam Brannen <sam@sambrannen.com>
---
 .github/stale.yml | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index 2ef85c0b65a5..e99f9d303c4d 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -4,7 +4,7 @@
 
 pulls:
   # Number of days of inactivity before a Pull Request becomes stale
-  daysUntilStale: 60
+  daysUntilStale: 14
 
   # Number of days of inactivity before a Pull Request with the stale label is closed.
   # Set to false to disable. If disabled, Pull Request still need to be closed manually, but will remain marked as stale.
@@ -12,18 +12,14 @@ pulls:
 
   # Comment to post when marking as stale. Set to `false` to disable
   markComment: >
-    This pull request has been automatically marked as stale because it has not had recent activity.
-    Given the limited bandwidth of the team, it will be closed if no further activity occurs.
-    If you intend to work on this pull request, please reopen the PR.
-    Thank you for your contributions.
+    If you would like us to be able to process this pull request, please provide the requested information or make the requested changes.
+    If the information is not provided or the requested changes are not made within the next 3 weeks, we will be unable to proceed and this pull request will be closed.
   # Comment to post when closing a stale Pull Request.
   closeComment: >
-    This pull request has been automatically closed due to inactivity.
-    If you are still interested in contributing this, please ensure that
-    it is rebased against the latest branch (usually `main`), all review
-    comments have been addressed and the build is passing.
+    Closing due to lack of requested feedback.
+    If you would like to proceed with your contribution, please provide the requested information or make the requested changes, and we will re-open this pull request.
 issues:
-  daysUntilStale: 365
+  daysUntilStale: 14
 
   # Number of days of inactivity before an Issue with the stale label is closed.
   # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
@@ -31,17 +27,15 @@ issues:
 
   # Comment to post when marking as stale. Set to `false` to disable
   markComment: >
-    This issue has been automatically marked as stale because it has not had recent activity.
-    Given the limited bandwidth of the team, it will be automatically closed if no further
-    activity occurs.
-    Thank you for your contribution.
+    If you would like us to be able to process this issue, please provide the requested information.
+    If the information is not provided within the next 3 weeks, we will be unable to proceed and this issue will be closed.
   # Comment to post when closing a stale Issue.
   closeComment: >
-    This issue has been automatically closed due to inactivity. If you have a good use case for this
-    feature, please feel free to reopen the issue.
+    Closing due to lack of requested feedback.
+    If you would like to proceed with your contribution, please provide the requested information and we will re-open this issue.
 
 # Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
-#onlyLabels: []
+onlyLabels: ["status: waiting-for-feedback"]
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels: []

From aa9de6c716867c7a09dc3715ddded062554e1a42 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Tue, 11 Apr 2023 10:11:09 +0200
Subject: [PATCH 1156/1433] Prevent Combine PRs workflow execution on forks

---
 .github/workflows/combine-prs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 3beb5be2f9ec..1d139ed2f661 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   combine-prs:
+    if: github.repository == 'junit-team/junit5'
     runs-on: ubuntu-latest
     steps:
       - name: combine-prs

From 372183edc7f105fcf26a8e4040d77545a3f59880 Mon Sep 17 00:00:00 2001
From: Said Boudjelda <bmscomp@gmail.com>
Date: Thu, 13 Apr 2023 19:14:33 +0200
Subject: [PATCH 1157/1433] Upgradle to 8.1 (#3241)

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 775aa4af68ee..8196ca1994f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=4087d4c8eb90335f7c635082424cf34480721544ad36b595dcf8c143c653c149
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-3-bin.zip
+distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 30dc83561685dab2702035f7495f8fac430c3ba6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 14 Apr 2023 13:22:35 +0200
Subject: [PATCH 1158/1433] Add ConsoleLauncher option to print discovery
 result (#3164)

The new `--list-tests` option prints the result of test discovery.

Resolves #2854.

Co-authored-by: stoyanK7 <stoyank127@gmail.com>
---
 .../platform/console/ConsoleLauncher.java     |  26 ++-
 .../console/options/AvailableOptions.java     |   4 +
 .../console/options/CommandLineOptions.java   |   9 +
 .../console/tasks/ConsoleTestExecutor.java    |  33 ++-
 .../tasks/DetailsPrintingListener.java        |  27 +++
 .../console/tasks/FlatPrintingListener.java   |  13 +-
 .../platform/console/tasks/TreePrinter.java   |   7 +-
 .../console/tasks/TreePrintingListener.java   |  22 +-
 .../tasks/VerboseTreePrintingListener.java    |  48 +++-
 .../org/junit/platform/launcher/TestPlan.java |  57 ++++-
 .../platform/launcher/TestPlanTests.java      |  40 +++-
 .../support/tests/StandaloneTests.java        | 210 +++++++++++++++++-
 12 files changed, 464 insertions(+), 32 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/tasks/DetailsPrintingListener.java

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index d697987c9d10..a78633b656d1 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -75,6 +75,9 @@ ConsoleLauncherExecutionResult execute(String... args) {
 			if (!options.isBannerDisabled()) {
 				displayBanner(out);
 			}
+			if (options.isListTests()) {
+				return listTests(options, out);
+			}
 			if (options.isDisplayHelp()) {
 				commandLineOptionsParser.printHelp(out, options.isAnsiColorOutputDisabled());
 				return ConsoleLauncherExecutionResult.success();
@@ -115,17 +118,32 @@ private void displayEngine(PrintWriter out, TestEngine engine) {
 		out.println(engine.getId() + details);
 	}
 
+	private ConsoleLauncherExecutionResult listTests(CommandLineOptions options, PrintWriter out) {
+		try {
+			new ConsoleTestExecutor(options).discover(out);
+			return ConsoleLauncherExecutionResult.success();
+		}
+		catch (Exception exception) {
+			return handleTestExecutorException(exception, options);
+		}
+	}
+
 	private ConsoleLauncherExecutionResult executeTests(CommandLineOptions options, PrintWriter out) {
 		try {
 			TestExecutionSummary testExecutionSummary = new ConsoleTestExecutor(options).execute(out);
 			return ConsoleLauncherExecutionResult.forSummary(testExecutionSummary, options);
 		}
 		catch (Exception exception) {
-			exception.printStackTrace(err);
-			err.println();
-			commandLineOptionsParser.printHelp(out, options.isAnsiColorOutputDisabled());
-			return ConsoleLauncherExecutionResult.failed();
+			return handleTestExecutorException(exception, options);
 		}
 	}
 
+	private ConsoleLauncherExecutionResult handleTestExecutorException(Exception exception,
+			CommandLineOptions options) {
+		exception.printStackTrace(err);
+		err.println();
+		commandLineOptionsParser.printHelp(out, options.isAnsiColorOutputDisabled());
+		return ConsoleLauncherExecutionResult.failed();
+	}
+
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index fce8ad509aff..e80eed132b19 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -85,11 +85,15 @@ static class CommandOptions {
 		@Option(names = { "--h", "-help" }, help = true, hidden = true)
 		private boolean helpRequested2;
 
+		@Option(names = { "--list-tests" }, description = "List all observable tests.")
+		private boolean listTestsRequested;
+
 		@Option(names = { "--list-engines" }, description = "List all observable test engines.")
 		private boolean listEnginesRequested;
 
 		private void applyTo(CommandLineOptions result) {
 			result.setDisplayHelp(this.helpRequested || this.helpRequested2);
+			result.setListTests(this.listTestsRequested);
 			result.setListEngines(this.listEnginesRequested);
 		}
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index 4321acbcd598..f7d50c9bb9d0 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -49,6 +49,7 @@ public class CommandLineOptions {
 
 	private boolean displayHelp;
 	private boolean listEngines;
+	private boolean listTests;
 	private boolean ansiColorOutputDisabled;
 	private Path colorPalettePath;
 	private boolean isSingleColorPalette;
@@ -102,6 +103,14 @@ public void setListEngines(boolean listEngines) {
 		this.listEngines = listEngines;
 	}
 
+	public boolean isListTests() {
+		return listTests;
+	}
+
+	public void setListTests(boolean listTests) {
+		this.listTests = listTests;
+	}
+
 	public boolean isAnsiColorOutputDisabled() {
 		return this.ansiColorOutputDisabled;
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index a9e540a38c35..aebafa32134a 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -30,6 +30,7 @@
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.core.LauncherFactory;
 import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
@@ -54,10 +55,40 @@ public ConsoleTestExecutor(CommandLineOptions options) {
 		this.launcherSupplier = launcherSupplier;
 	}
 
+	public void discover(PrintWriter out) throws Exception {
+		new CustomContextClassLoaderExecutor(createCustomClassLoader()).invoke(() -> {
+			discoverTests(out);
+			return null;
+		});
+	}
+
 	public TestExecutionSummary execute(PrintWriter out) throws Exception {
 		return new CustomContextClassLoaderExecutor(createCustomClassLoader()).invoke(() -> executeTests(out));
 	}
 
+	private void discoverTests(PrintWriter out) {
+		Launcher launcher = launcherSupplier.get();
+		Optional<DetailsPrintingListener> commandLineTestPrinter = createDetailsPrintingListener(out);
+
+		LauncherDiscoveryRequest discoveryRequest = new DiscoveryRequestCreator().toDiscoveryRequest(options);
+		TestPlan testPlan = launcher.discover(discoveryRequest);
+
+		commandLineTestPrinter.ifPresent(printer -> printer.listTests(testPlan));
+		if (options.getDetails() != Details.NONE) {
+			printFoundTestsSummary(out, testPlan);
+		}
+	}
+
+	private static void printFoundTestsSummary(PrintWriter out, TestPlan testPlan) {
+		SummaryGeneratingListener summaryListener = new SummaryGeneratingListener();
+		summaryListener.testPlanExecutionStarted(testPlan);
+		TestExecutionSummary summary = summaryListener.getSummary();
+
+		out.printf("%n[%10d containers found ]%n[%10d tests found      ]%n%n", summary.getContainersFoundCount(),
+			summary.getTestsFoundCount());
+		out.flush();
+	}
+
 	private TestExecutionSummary executeTests(PrintWriter out) {
 		Launcher launcher = launcherSupplier.get();
 		SummaryGeneratingListener summaryListener = registerListeners(out, launcher);
@@ -104,7 +135,7 @@ private SummaryGeneratingListener registerListeners(PrintWriter out, Launcher la
 		return summaryListener;
 	}
 
-	private Optional<TestExecutionListener> createDetailsPrintingListener(PrintWriter out) {
+	private Optional<DetailsPrintingListener> createDetailsPrintingListener(PrintWriter out) {
 		ColorPalette colorPalette = getColorPalette();
 		Theme theme = options.getTheme();
 		switch (options.getDetails()) {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DetailsPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DetailsPrintingListener.java
new file mode 100644
index 000000000000..3eceb2721b6a
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DetailsPrintingListener.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.tasks;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
+
+/**
+ * @since 1.9
+ */
+@API(status = EXPERIMENTAL, since = "1.9")
+public interface DetailsPrintingListener extends TestExecutionListener {
+
+	void listTests(TestPlan testPlan);
+
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
index bb68bbff4366..f572d71d1907 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
@@ -16,14 +16,13 @@
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.reporting.ReportEntry;
-import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 
 /**
  * @since 1.0
  */
-class FlatPrintingListener implements TestExecutionListener {
+class FlatPrintingListener implements DetailsPrintingListener {
 
 	private static final Pattern LINE_START_PATTERN = Pattern.compile("(?m)^");
 
@@ -106,4 +105,14 @@ private static String indented(String message) {
 		return LINE_START_PATTERN.matcher(message).replaceAll(INDENTATION).trim();
 	}
 
+	@Override
+	public void listTests(TestPlan testPlan) {
+		testPlan.accept(new TestPlan.Visitor() {
+			@Override
+			public void visit(TestIdentifier testIdentifier) {
+				println(Style.valueOf(testIdentifier), "%s (%s)", testIdentifier.getDisplayName(),
+					testIdentifier.getUniqueId());
+			}
+		});
+	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
index 4f72afff6079..34de4f217854 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java
@@ -79,8 +79,11 @@ private void printVisible(TreeNode node, String indent, boolean continuous) {
 			out.print(" ");
 			out.print(duration);
 		}
-		out.print(" ");
-		out.print(icon);
+		boolean nodeIsBeingListed = node.duration == 0 && !node.result().isPresent() && !node.reason().isPresent();
+		if (!nodeIsBeingListed) {
+			out.print(" ");
+			out.print(icon);
+		}
 		node.result().ifPresent(result -> printThrowable(tabbed, result));
 		node.reason().ifPresent(reason -> printMessage(Style.SKIPPED, tabbed, reason));
 		node.reports.forEach(e -> printReportEntry(tabbed, e));
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
index 685ddff5c894..39d8126595fa 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrintingListener.java
@@ -13,20 +13,18 @@
 import java.io.PrintWriter;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 
 import org.junit.platform.console.options.Theme;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.reporting.ReportEntry;
-import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 
 /**
  * @since 1.0
  */
-class TreePrintingListener implements TestExecutionListener {
+class TreePrintingListener implements DetailsPrintingListener {
 
 	private final Map<UniqueId, TreeNode> nodesByUniqueId = new ConcurrentHashMap<>();
 	private TreeNode root;
@@ -36,8 +34,7 @@ class TreePrintingListener implements TestExecutionListener {
 		this.treePrinter = new TreePrinter(out, theme, colorPalette);
 	}
 
-	private void addNode(TestIdentifier testIdentifier, Supplier<TreeNode> nodeSupplier) {
-		TreeNode node = nodeSupplier.get();
+	private void addNode(TestIdentifier testIdentifier, TreeNode node) {
 		nodesByUniqueId.put(testIdentifier.getUniqueIdObject(), node);
 		testIdentifier.getParentIdObject().map(nodesByUniqueId::get).orElse(root).addChild(node);
 	}
@@ -58,7 +55,7 @@ public void testPlanExecutionFinished(TestPlan testPlan) {
 
 	@Override
 	public void executionStarted(TestIdentifier testIdentifier) {
-		addNode(testIdentifier, () -> new TreeNode(testIdentifier));
+		addNode(testIdentifier, new TreeNode(testIdentifier));
 	}
 
 	@Override
@@ -68,7 +65,7 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult
 
 	@Override
 	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
-		addNode(testIdentifier, () -> new TreeNode(testIdentifier, reason));
+		addNode(testIdentifier, new TreeNode(testIdentifier, reason));
 	}
 
 	@Override
@@ -76,4 +73,15 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
 		getNode(testIdentifier).addReportEntry(entry);
 	}
 
+	@Override
+	public void listTests(TestPlan testPlan) {
+		root = new TreeNode(testPlan.toString());
+		testPlan.accept(new TestPlan.Visitor() {
+			@Override
+			public void visit(TestIdentifier testIdentifier) {
+				addNode(testIdentifier, new TreeNode(testIdentifier));
+			}
+		});
+		treePrinter.print(root);
+	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
index 9031a383f64f..2dbd7e01d77a 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/VerboseTreePrintingListener.java
@@ -20,14 +20,13 @@
 import org.junit.platform.console.options.Theme;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.reporting.ReportEntry;
-import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 
 /**
  * @since 1.0
  */
-class VerboseTreePrintingListener implements TestExecutionListener {
+class VerboseTreePrintingListener implements DetailsPrintingListener {
 
 	private final PrintWriter out;
 	private final Theme theme;
@@ -60,9 +59,8 @@ class VerboseTreePrintingListener implements TestExecutionListener {
 	public void testPlanExecutionStarted(TestPlan testPlan) {
 		frames.push(System.currentTimeMillis());
 
-		long tests = testPlan.countTestIdentifiers(TestIdentifier::isTest);
-		printf(NONE, "%s", "Test plan execution started. Number of static tests: ");
-		printf(Style.TEST, "%d%n", tests);
+		String prefix = "Test plan execution started. Number of static tests: ";
+		printNumberOfTests(testPlan, prefix);
 		printf(Style.CONTAINER, "%s%n", theme.root());
 	}
 
@@ -70,8 +68,12 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 	public void testPlanExecutionFinished(TestPlan testPlan) {
 		frames.pop();
 
+		printNumberOfTests(testPlan, "Test plan execution finished. Number of all tests: ");
+	}
+
+	private void printNumberOfTests(TestPlan testPlan, String prefix) {
 		long tests = testPlan.countTestIdentifiers(TestIdentifier::isTest);
-		printf(NONE, "%s", "Test plan execution finished. Number of all tests: ");
+		printf(NONE, "%s", prefix);
 		printf(Style.TEST, "%d%n", tests);
 	}
 
@@ -186,4 +188,38 @@ private void printDetail(Style style, String detail, String format, Object... ar
 		printf(NONE, "%n");
 	}
 
+	@Override
+	public void listTests(TestPlan testPlan) {
+		frames.push(0L);
+		testPlan.accept(new TestPlan.Visitor() {
+			@Override
+			public void preVisitContainer(TestIdentifier testIdentifier) {
+				if (!testPlan.getChildren(testIdentifier).isEmpty()) {
+					printVerticals(theme.entry());
+					printf(Style.CONTAINER, " %s", testIdentifier.getDisplayName());
+					printf(NONE, "%n");
+					frames.push(0L);
+				}
+			}
+
+			@Override
+			public void visit(TestIdentifier testIdentifier) {
+				if (testPlan.getChildren(testIdentifier).isEmpty()) {
+					printVerticals(theme.entry());
+					printf(Style.valueOf(testIdentifier), " %s%n", testIdentifier.getDisplayName());
+					printDetails(testIdentifier);
+				}
+			}
+
+			@Override
+			public void postVisitContainer(TestIdentifier testIdentifier) {
+				if (!testPlan.getChildren(testIdentifier).isEmpty()) {
+					frames.pop();
+					printVerticals(theme.end());
+					printf(Style.CONTAINER, " %s%n", testIdentifier.getDisplayName());
+				}
+			}
+		});
+		frames.pop();
+	}
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
index 0557b8650a4a..a31ab12ecf04 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestPlan.java
@@ -14,6 +14,7 @@
 import static java.util.Collections.synchronizedSet;
 import static java.util.Collections.unmodifiableSet;
 import static org.apiguardian.api.API.Status.DEPRECATED;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
 import static org.apiguardian.api.API.Status.STABLE;
@@ -32,7 +33,6 @@
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
-import org.junit.platform.engine.TestDescriptor.Visitor;
 import org.junit.platform.engine.UniqueId;
 
 /**
@@ -91,7 +91,7 @@ public static TestPlan from(Collection<TestDescriptor> engineDescriptors,
 		Preconditions.notNull(configurationParameters, "Cannot create TestPlan from null ConfigurationParameters");
 		TestPlan testPlan = new TestPlan(engineDescriptors.stream().anyMatch(TestDescriptor::containsTests),
 			configurationParameters);
-		Visitor visitor = descriptor -> testPlan.addInternal(TestIdentifier.from(descriptor));
+		TestDescriptor.Visitor visitor = descriptor -> testPlan.addInternal(TestIdentifier.from(descriptor));
 		engineDescriptors.forEach(engineDescriptor -> engineDescriptor.accept(visitor));
 		return testPlan;
 	}
@@ -291,4 +291,57 @@ public ConfigurationParameters getConfigurationParameters() {
 		return this.configurationParameters;
 	}
 
+	/**
+	 * Accept the supplied {@link Visitor} for a depth-first traversal of the
+	 * test plan.
+	 *
+	 * @param visitor the visitor to accept; never {@code null}
+	 * @since 1.10
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public void accept(Visitor visitor) {
+		getRoots().forEach(it -> accept(visitor, it));
+	}
+
+	private void accept(Visitor visitor, TestIdentifier testIdentifier) {
+		if (testIdentifier.isContainer()) {
+			visitor.preVisitContainer(testIdentifier);
+		}
+		visitor.visit(testIdentifier);
+		getChildren(testIdentifier).forEach(it -> accept(visitor, it));
+		if (testIdentifier.isContainer()) {
+			visitor.postVisitContainer(testIdentifier);
+		}
+	}
+
+	/**
+	 * Visitor for {@link TestIdentifier TestIdentifiers} in a {@link TestPlan}.
+	 *
+	 * @since 1.10
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public interface Visitor {
+
+		/**
+		 * Called before visiting a container.
+		 *
+		 * @see TestIdentifier#isContainer()
+		 */
+		default void preVisitContainer(TestIdentifier testIdentifier) {
+		}
+
+		/**
+		 * Called for all test identifiers regardless of their type.
+		 */
+		default void visit(TestIdentifier testIdentifier) {
+		}
+
+		/**
+		 * Called after visiting a container.
+		 *
+		 * @see TestIdentifier#isContainer()
+		 */
+		default void postVisitContainer(TestIdentifier testIdentifier) {
+		}
+	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
index 866e085aa438..0f193577edd0 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TestPlanTests.java
@@ -11,8 +11,10 @@
 package org.junit.platform.launcher;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 
+import java.util.List;
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
@@ -20,12 +22,13 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
+import org.junit.platform.fakes.TestDescriptorStub;
 
 class TestPlanTests {
 
 	private final ConfigurationParameters configParams = mock();
 
-	private EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("foo"), "Foo");
+	private final EngineDescriptor engineDescriptor = new EngineDescriptor(UniqueId.forEngine("foo"), "Foo");
 
 	@Test
 	void doesNotContainTestsForEmptyContainers() {
@@ -77,4 +80,39 @@ public boolean mayRegisterTests() {
 		assertThat(testPlan.containsTests()).as("contains tests").isTrue();
 	}
 
+	@Test
+	void acceptsVisitorsInDepthFirstOrder() {
+		var container = new TestDescriptorStub(engineDescriptor.getUniqueId().append("container", "bar"), "Bar");
+		var test1 = new TestDescriptorStub(container.getUniqueId().append("test", "bar"), "Bar");
+		container.addChild(test1);
+		engineDescriptor.addChild(container);
+
+		var engineDescriptor2 = new EngineDescriptor(UniqueId.forEngine("baz"), "Baz");
+		var test2 = new TestDescriptorStub(engineDescriptor2.getUniqueId().append("test", "baz1"), "Baz");
+		var test3 = new TestDescriptorStub(engineDescriptor2.getUniqueId().append("test", "baz2"), "Baz");
+		engineDescriptor2.addChild(test2);
+		engineDescriptor2.addChild(test3);
+
+		var testPlan = TestPlan.from(List.of(engineDescriptor, engineDescriptor2), configParams);
+		var visitor = mock(TestPlan.Visitor.class);
+
+		testPlan.accept(visitor);
+
+		var inOrder = inOrder(visitor);
+
+		inOrder.verify(visitor).preVisitContainer(TestIdentifier.from(engineDescriptor));
+		inOrder.verify(visitor).visit(TestIdentifier.from(engineDescriptor));
+		inOrder.verify(visitor).preVisitContainer(TestIdentifier.from(container));
+		inOrder.verify(visitor).visit(TestIdentifier.from(container));
+		inOrder.verify(visitor).visit(TestIdentifier.from(test1));
+		inOrder.verify(visitor).postVisitContainer(TestIdentifier.from(container));
+		inOrder.verify(visitor).postVisitContainer(TestIdentifier.from(engineDescriptor));
+
+		inOrder.verify(visitor).preVisitContainer(TestIdentifier.from(engineDescriptor2));
+		inOrder.verify(visitor).visit(TestIdentifier.from(engineDescriptor2));
+		inOrder.verify(visitor).visit(TestIdentifier.from(test2));
+		inOrder.verify(visitor).visit(TestIdentifier.from(test3));
+		inOrder.verify(visitor).postVisitContainer(TestIdentifier.from(engineDescriptor2));
+	}
+
 }
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 97f322765d28..a12e268677bf 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -10,6 +10,7 @@
 
 package platform.tooling.support.tests;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -21,6 +22,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 
+import de.sormuras.bartholdy.Result;
 import de.sormuras.bartholdy.jdk.Jar;
 import de.sormuras.bartholdy.jdk.Javac;
 import de.sormuras.bartholdy.tool.Java;
@@ -113,7 +115,201 @@ void compile() throws Exception {
 
 	@Test
 	@Order(2)
-	void test() throws IOException {
+	void discoverTree() {
+		Result result = listTests("--details-theme=ascii");
+
+		var expected = """
+				.
+				+-- JUnit Jupiter
+				| +-- JupiterIntegration
+				| | +-- successful()
+				| | +-- fail()
+				| | +-- abort()
+				| | '-- disabled()
+				| +-- SuiteIntegration$SingleTestContainer
+				| | '-- successful()
+				| '-- JupiterParamsIntegration
+				|   '-- parameterizedTest(String)
+				+-- JUnit Vintage
+				| '-- VintageIntegration
+				|   +-- f4il
+				|   +-- ignored
+				|   '-- succ3ssful
+				'-- JUnit Platform Suite
+				  '-- SuiteIntegration
+				    '-- JUnit Jupiter
+				      '-- SuiteIntegration$SingleTestContainer
+				        '-- successful()
+
+				[        11 containers found ]
+				[         9 tests found      ]
+
+				""".stripIndent();
+		assertLinesMatch(expected.lines(), result.getOutputLines("out").stream());
+	}
+
+	@Test
+	@Order(2)
+	void discoverFlat() {
+		Result result = listTests("--details=flat");
+
+		var expected = """
+				JUnit Jupiter ([engine:junit-jupiter])
+				JupiterIntegration ([engine:junit-jupiter]/[class:standalone.JupiterIntegration])
+				successful() ([engine:junit-jupiter]/[class:standalone.JupiterIntegration]/[method:successful()])
+				fail() ([engine:junit-jupiter]/[class:standalone.JupiterIntegration]/[method:fail()])
+				abort() ([engine:junit-jupiter]/[class:standalone.JupiterIntegration]/[method:abort()])
+				disabled() ([engine:junit-jupiter]/[class:standalone.JupiterIntegration]/[method:disabled()])
+				SuiteIntegration$SingleTestContainer ([engine:junit-jupiter]/[class:standalone.SuiteIntegration$SingleTestContainer])
+				successful() ([engine:junit-jupiter]/[class:standalone.SuiteIntegration$SingleTestContainer]/[method:successful()])
+				JupiterParamsIntegration ([engine:junit-jupiter]/[class:standalone.JupiterParamsIntegration])
+				parameterizedTest(String) ([engine:junit-jupiter]/[class:standalone.JupiterParamsIntegration]/[test-template:parameterizedTest(java.lang.String)])
+				JUnit Vintage ([engine:junit-vintage])
+				VintageIntegration ([engine:junit-vintage]/[runner:standalone.VintageIntegration])
+				f4il ([engine:junit-vintage]/[runner:standalone.VintageIntegration]/[test:f4il(standalone.VintageIntegration)])
+				ignored ([engine:junit-vintage]/[runner:standalone.VintageIntegration]/[test:ignored(standalone.VintageIntegration)])
+				succ3ssful ([engine:junit-vintage]/[runner:standalone.VintageIntegration]/[test:succ3ssful(standalone.VintageIntegration)])
+				JUnit Platform Suite ([engine:junit-platform-suite])
+				SuiteIntegration ([engine:junit-platform-suite]/[suite:standalone.SuiteIntegration])
+				JUnit Jupiter ([engine:junit-platform-suite]/[suite:standalone.SuiteIntegration]/[engine:junit-jupiter])
+				SuiteIntegration$SingleTestContainer ([engine:junit-platform-suite]/[suite:standalone.SuiteIntegration]/[engine:junit-jupiter]/[class:standalone.SuiteIntegration$SingleTestContainer])
+				successful() ([engine:junit-platform-suite]/[suite:standalone.SuiteIntegration]/[engine:junit-jupiter]/[class:standalone.SuiteIntegration$SingleTestContainer]/[method:successful()])
+
+				[        11 containers found ]
+				[         9 tests found      ]
+
+				""".stripIndent();
+		assertLinesMatch(expected.lines(), result.getOutputLines("out").stream());
+	}
+
+	@Test
+	@Order(2)
+	void discoverVerbose() {
+		Result result = listTests("--details=verbose", "--details-theme=ascii");
+
+		var expected = """
+				+-- JUnit Jupiter
+				| +-- JupiterIntegration
+				| | +-- successful()
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-jupiter]/[class:standalone.JupiterIntegration]/[method:successful()]
+				| | |    parent: [engine:junit-jupiter]/[class:standalone.JupiterIntegration]
+				| | |    source: MethodSource [className = 'standalone.JupiterIntegration', methodName = 'successful', methodParameterTypes = '']
+				| | +-- fail()
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-jupiter]/[class:standalone.JupiterIntegration]/[method:fail()]
+				| | |    parent: [engine:junit-jupiter]/[class:standalone.JupiterIntegration]
+				| | |    source: MethodSource [className = 'standalone.JupiterIntegration', methodName = 'fail', methodParameterTypes = '']
+				| | +-- abort()
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-jupiter]/[class:standalone.JupiterIntegration]/[method:abort()]
+				| | |    parent: [engine:junit-jupiter]/[class:standalone.JupiterIntegration]
+				| | |    source: MethodSource [className = 'standalone.JupiterIntegration', methodName = 'abort', methodParameterTypes = '']
+				| | +-- disabled()
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-jupiter]/[class:standalone.JupiterIntegration]/[method:disabled()]
+				| | |    parent: [engine:junit-jupiter]/[class:standalone.JupiterIntegration]
+				| | |    source: MethodSource [className = 'standalone.JupiterIntegration', methodName = 'disabled', methodParameterTypes = '']
+				| '-- JupiterIntegration
+				| +-- SuiteIntegration$SingleTestContainer
+				| | +-- successful()
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-jupiter]/[class:standalone.SuiteIntegration$SingleTestContainer]/[method:successful()]
+				| | |    parent: [engine:junit-jupiter]/[class:standalone.SuiteIntegration$SingleTestContainer]
+				| | |    source: MethodSource [className = 'standalone.SuiteIntegration$SingleTestContainer', methodName = 'successful', methodParameterTypes = '']
+				| '-- SuiteIntegration$SingleTestContainer
+				| +-- JupiterParamsIntegration
+				| | +-- parameterizedTest(String)
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-jupiter]/[class:standalone.JupiterParamsIntegration]/[test-template:parameterizedTest(java.lang.String)]
+				| | |    parent: [engine:junit-jupiter]/[class:standalone.JupiterParamsIntegration]
+				| | |    source: MethodSource [className = 'standalone.JupiterParamsIntegration', methodName = 'parameterizedTest', methodParameterTypes = 'java.lang.String']
+				| '-- JupiterParamsIntegration
+				'-- JUnit Jupiter
+				+-- JUnit Vintage
+				| +-- VintageIntegration
+				| | +-- f4il
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-vintage]/[runner:standalone.VintageIntegration]/[test:f4il(standalone.VintageIntegration)]
+				| | |    parent: [engine:junit-vintage]/[runner:standalone.VintageIntegration]
+				| | |    source: MethodSource [className = 'standalone.VintageIntegration', methodName = 'f4il', methodParameterTypes = '']
+				| | +-- ignored
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-vintage]/[runner:standalone.VintageIntegration]/[test:ignored(standalone.VintageIntegration)]
+				| | |    parent: [engine:junit-vintage]/[runner:standalone.VintageIntegration]
+				| | |    source: MethodSource [className = 'standalone.VintageIntegration', methodName = 'ignored', methodParameterTypes = '']
+				| | +-- succ3ssful
+				| | |      tags: []
+				| | |  uniqueId: [engine:junit-vintage]/[runner:standalone.VintageIntegration]/[test:succ3ssful(standalone.VintageIntegration)]
+				| | |    parent: [engine:junit-vintage]/[runner:standalone.VintageIntegration]
+				| | |    source: MethodSource [className = 'standalone.VintageIntegration', methodName = 'succ3ssful', methodParameterTypes = '']
+				| '-- VintageIntegration
+				'-- JUnit Vintage
+				+-- JUnit Platform Suite
+				| +-- SuiteIntegration
+				| | +-- JUnit Jupiter
+				| | | +-- SuiteIntegration$SingleTestContainer
+				| | | | +-- successful()
+				| | | | |      tags: []
+				| | | | |  uniqueId: [engine:junit-platform-suite]/[suite:standalone.SuiteIntegration]/[engine:junit-jupiter]/[class:standalone.SuiteIntegration$SingleTestContainer]/[method:successful()]
+				| | | | |    parent: [engine:junit-platform-suite]/[suite:standalone.SuiteIntegration]/[engine:junit-jupiter]/[class:standalone.SuiteIntegration$SingleTestContainer]
+				| | | | |    source: MethodSource [className = 'standalone.SuiteIntegration$SingleTestContainer', methodName = 'successful', methodParameterTypes = '']
+				| | | '-- SuiteIntegration$SingleTestContainer
+				| | '-- JUnit Jupiter
+				| '-- SuiteIntegration
+				'-- JUnit Platform Suite
+
+				[        11 containers found ]
+				[         9 tests found      ]
+
+				""".stripIndent();
+		assertLinesMatch(expected.lines(), result.getOutputLines("out").stream());
+	}
+
+	@Test
+	@Order(2)
+	void discoverNone() {
+		Result result = listTests("--details=none");
+
+		assertThat(result.getOutputLines("out")).isEmpty();
+	}
+
+	@Test
+	@Order(2)
+	void discoverSummary() {
+		Result result = listTests("--details=summary");
+
+		var expected = """
+
+				[        11 containers found ]
+				[         9 tests found      ]
+
+				""".stripIndent();
+		assertLinesMatch(expected.lines(), result.getOutputLines("out").stream());
+	}
+
+	private static Result listTests(String... args) {
+		var result = Request.builder() //
+				.setTool(new Java()) //
+				.setProject("standalone") //
+				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
+				.addArguments("--list-tests") //
+				.addArguments("--scan-class-path") //
+				.addArguments("--disable-banner") //
+				.addArguments("--disable-ansi-colors") //
+				.addArguments("--include-classname", "standalone.*") //
+				.addArguments("--classpath", "bin") //
+				.addArguments((Object[]) args) //
+				.build() //
+				.run(false);
+
+		assertEquals(0, result.getExitCode(), String.join("\n", result.getOutputLines("out")));
+		return result;
+	}
+
+	@Test
+	@Order(3)
+	void execute() throws IOException {
 		var result = Request.builder() //
 				.setTool(new Java()) //
 				.setProject("standalone") //
@@ -145,8 +341,8 @@ void test() throws IOException {
 	}
 
 	@Test
-	@Order(3)
-	void testOnJava8() throws IOException {
+	@Order(4)
+	void executeOnJava8() throws IOException {
 		var result = Request.builder() //
 				.setTool(new Java()) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
@@ -179,9 +375,9 @@ void testOnJava8() throws IOException {
 	}
 
 	@Test
-	@Order(3)
+	@Order(5)
 	// https://github.com/junit-team/junit5/issues/2600
-	void testOnJava8SelectPackage() throws IOException {
+	void executeOnJava8SelectPackage() throws IOException {
 		var result = Request.builder() //
 				.setTool(new Java()) //
 				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
@@ -214,9 +410,9 @@ void testOnJava8SelectPackage() throws IOException {
 	}
 
 	@Test
-	@Order(5)
+	@Order(6)
 	@Disabled("https://github.com/junit-team/junit5/issues/1724")
-	void testWithJarredTestClasses() {
+	void executeWithJarredTestClasses() {
 		var jar = MavenRepo.jar("junit-platform-console-standalone");
 		var path = new ArrayList<String>();
 		// path.add("bin"); // "exploded" test classes are found, see also test() above

From f653ab0096678a65245bf78fdb303e8beb096f11 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 14 Apr 2023 14:17:35 +0200
Subject: [PATCH 1159/1433] Delete dead code

Co-authored-by: Christian Stein <sormuras@gmail.com>
---
 .../junit/platform/console/tasks/Color.java   | 83 -------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
deleted file mode 100644
index d330be01b716..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/Color.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.tasks;
-
-import org.junit.platform.engine.TestExecutionResult;
-import org.junit.platform.launcher.TestIdentifier;
-
-/**
- * @since 1.0
- */
-enum Color {
-
-	NONE(0),
-
-	BLACK(30),
-
-	RED(31),
-
-	GREEN(32),
-
-	YELLOW(33),
-
-	BLUE(34),
-
-	PURPLE(35),
-
-	CYAN(36),
-
-	WHITE(37);
-
-	static Color valueOf(TestExecutionResult result) {
-		switch (result.getStatus()) {
-			case SUCCESSFUL:
-				return Color.SUCCESSFUL;
-			case ABORTED:
-				return Color.ABORTED;
-			case FAILED:
-				return Color.FAILED;
-			default:
-				return Color.NONE;
-		}
-	}
-
-	static Color valueOf(TestIdentifier testIdentifier) {
-		return testIdentifier.isContainer() ? CONTAINER : TEST;
-	}
-
-	static final Color SUCCESSFUL = GREEN;
-
-	static final Color ABORTED = YELLOW;
-
-	static final Color FAILED = RED;
-
-	static final Color SKIPPED = PURPLE;
-
-	static final Color CONTAINER = CYAN;
-
-	static final Color TEST = BLUE;
-
-	static final Color DYNAMIC = PURPLE;
-
-	static final Color REPORTED = WHITE;
-
-	private final String ansiString;
-
-	Color(int ansiCode) {
-		this.ansiString = "\u001B[" + ansiCode + "m";
-	}
-
-	@Override
-	public String toString() {
-		return this.ansiString;
-	}
-
-}

From 68ad5ca8ef856c8298d6c2274b47a87dfbcc4392 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 14 Apr 2023 19:46:19 +0200
Subject: [PATCH 1160/1433] Remove superfluous checkbox for CI builds from PR
 template

Since CI builds show up as checks on the PR anyway, there's no need for
a checkbox.
---
 .github/PULL_REQUEST_TEMPLATE.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1bdc52cd3615..90d0d4bdaed2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,4 +16,3 @@ I hereby agree to the terms of the [JUnit Contributor License Agreement](https:/
 - [ ] Change is covered by [automated tests](https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md#tests) including corner cases, errors, and exception handling
 - [ ] Public API has [Javadoc](https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md#javadoc) and [`@API` annotations](https://apiguardian-team.github.io/apiguardian/docs/current/api/org/apiguardian/api/API.html)
 - [ ] Change is documented in the [User Guide](https://junit.org/junit5/docs/snapshot/user-guide/) and [Release Notes](https://junit.org/junit5/docs/snapshot/user-guide/#release-notes)
-- [ ] All [continuous integration builds](https://github.com/junit-team/junit5#continuous-integration-builds) pass

From ac7cb9aa9cf303b57122e850b10820e3cce5f02f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:59:14 +0000
Subject: [PATCH 1161/1433] Bump org.apache.groovy:groovy from 4.0.10 to 4.0.11

Bumps [org.apache.groovy:groovy](https://github.com/apache/groovy) from 4.0.10 to 4.0.11.
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4cd9dd3ace23..1a7cab1e23bf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.4.0" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.153" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
-groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.10" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.11" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }

From 68b21e8ed120d1cdf1849e4b9dc904b35ba25105 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:59:20 +0000
Subject: [PATCH 1162/1433] Bump com.diffplug.spotless:spotless-plugin-gradle
 from 6.17.0 to 6.18.0

Bumps [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.17.0 to 6.18.0.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/gradle/6.17.0...gradle/6.18.0)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-plugin-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/plugins/common/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index f07c0917e92c..684a9630d2ef 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 	implementation(project(":build-parameters"))
 	implementation(kotlin("gradle-plugin"))
 	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
-	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.17.0")
+	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
 	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.6") // keep in sync with root settings.gradle.kts

From 0458a2d32f3cc5e264cb4727ebad041685ba4ef6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:59:23 +0000
Subject: [PATCH 1163/1433] Bump io.github.gradle-nexus.publish-plugin from
 1.2.0 to 1.3.0

Bumps io.github.gradle-nexus.publish-plugin from 1.2.0 to 1.3.0.

---
updated-dependencies:
- dependency-name: io.github.gradle-nexus.publish-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index cac6080c9399..c5a67e154675 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,7 +17,7 @@ pluginManagement {
 		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"
 		id("me.champeau.jmh") version "0.7.0"
 		id("io.spring.nohttp") version "0.0.11"
-		id("io.github.gradle-nexus.publish-plugin") version "1.2.0"
+		id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 	}
 }
 

From 37617d26b1f534021175184c01d7eb0f51c309fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:59:25 +0000
Subject: [PATCH 1164/1433] Bump com.gradle.enterprise from 3.12.6 to 3.13

Bumps com.gradle.enterprise from 3.12.6 to 3.13.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c5a67e154675..632107e9de40 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.12.6" // keep in sync with gradle/plugins/build.gradle.kts
+		id("com.gradle.enterprise") version "3.13" // keep in sync with gradle/plugins/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		id("org.ajoberstar.git-publish") version "4.1.1"

From c576ac971051053fdb6205efaade43a675b46ff3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:59:32 +0000
Subject: [PATCH 1165/1433] Bump io.github.classgraph:classgraph from 4.8.153
 to 4.8.157

Bumps [io.github.classgraph:classgraph](https://github.com/classgraph/classgraph) from 4.8.153 to 4.8.157.
- [Release notes](https://github.com/classgraph/classgraph/releases)
- [Commits](https://github.com/classgraph/classgraph/compare/classgraph-4.8.153...classgraph-4.8.157)

---
updated-dependencies:
- dependency-name: io.github.classgraph:classgraph
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a7cab1e23bf..16a05f9e4423 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.0.1"
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.4.0" }
-classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.153" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.157" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.11" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }

From 0b915da343f254678f2f5bd0bc90ac4aa7760790 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 05:59:35 +0000
Subject: [PATCH 1166/1433] Bump com.gradle:gradle-enterprise-gradle-plugin
 from 3.12.6 to 3.13

Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.12.6 to 3.13.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/plugins/common/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index 684a9630d2ef..ad26d3bb9b5a 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")
 	implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
 	implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
-	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.6") // keep in sync with root settings.gradle.kts
+	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.13") // keep in sync with root settings.gradle.kts
 }
 
 tasks {

From 970e24312517d8b03232477a2f4baa48004960d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 06:04:02 +0000
Subject: [PATCH 1167/1433] Bump github.amrom.workers.devbine-prs from 3.1.0 to 3.1.1

Bumps [github.amrom.workers.devbine-prs](https://github.com/github.amrom.workers.devbine-prs) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/github.amrom.workers.devbine-prs/releases)
- [Commits](https://github.com/github.amrom.workers.devbine-prs/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: github.amrom.workers.devbine-prs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/combine-prs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
index 1d139ed2f661..826472911980 100644
--- a/.github/workflows/combine-prs.yml
+++ b/.github/workflows/combine-prs.yml
@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: combine-prs
-        uses: github.amrom.workers.devbine-prs@v3.1.0
+        uses: github.amrom.workers.devbine-prs@v3.1.1
         with:
           github_token: ${{ secrets.GH_TOKEN }}

From 291b5427b880272c95af06859c12b69be1228941 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 17 Apr 2023 19:35:04 +0200
Subject: [PATCH 1168/1433] Introduce testfeed details mode for ConsoleLauncher
 (#3244)

The new `testfeed` mode provides a concise real-time stream of test
execution events.

Co-authored-by: halitanildonmez <halitanil.donmez@gmail.com>
---
 .../release-notes-5.10.0-M1.adoc              |   2 +
 .../platform/console/options/Details.java     |  11 +-
 .../console/tasks/ConsoleTestExecutor.java    |   2 +
 .../tasks/DetailsPrintingListener.java        |  14 +-
 .../console/tasks/FlatPrintingListener.java   |   5 +-
 .../tasks/TestFeedPrintingListener.java       | 130 ++++++++++++++++++
 .../tasks/TestFeedPrintingListenerTests.java  | 115 ++++++++++++++++
 ...c-changeDisplayName-testfeed-ascii.out.txt |  16 +++
 ...changeDisplayName-testfeed-unicode.out.txt |  16 +++
 .../basic/Basic-empty-testfeed-ascii.out.txt  |  16 +++
 .../Basic-empty-testfeed-unicode.out.txt      |  16 +++
 ...ithMultiLineMessage-testfeed-ascii.out.txt |  21 +++
 ...hMultiLineMessage-testfeed-unicode.out.txt |  21 +++
 ...thSingleLineMessage-testfeed-ascii.out.txt |  18 +++
 ...SingleLineMessage-testfeed-unicode.out.txt |  18 +++
 ...esWithMultiMappings-testfeed-ascii.out.txt |  16 +++
 ...WithMultiMappings-testfeed-unicode.out.txt |  16 +++
 ...esWithSingleMapping-testfeed-ascii.out.txt |  16 +++
 ...WithSingleMapping-testfeed-unicode.out.txt |  16 +++
 ...ortMultipleMessages-testfeed-ascii.out.txt |  16 +++
 ...tMultipleMessages-testfeed-unicode.out.txt |  16 +++
 ...ryWithSingleMapping-testfeed-ascii.out.txt |  16 +++
 ...WithSingleMapping-testfeed-unicode.out.txt |  16 +++
 ...reportSingleMessage-testfeed-ascii.out.txt |  16 +++
 ...portSingleMessage-testfeed-unicode.out.txt |  16 +++
 ...ithMultiLineMessage-testfeed-ascii.out.txt |  19 +++
 ...hMultiLineMessage-testfeed-unicode.out.txt |  19 +++
 ...ithSingleLineReason-testfeed-ascii.out.txt |  16 +++
 ...hSingleLineReason-testfeed-unicode.out.txt |  16 +++
 .../support/tests/StandaloneTests.java        |  23 ++++
 30 files changed, 661 insertions(+), 13 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/tasks/TestFeedPrintingListener.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/console/tasks/TestFeedPrintingListenerTests.java
 create mode 100644 platform-tests/src/test/resources/console/details/basic/Basic-changeDisplayName-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/basic/Basic-changeDisplayName-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/basic/Basic-empty-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/basic/Basic-empty-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/fail/Fail-failWithMultiLineMessage-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/fail/Fail-failWithMultiLineMessage-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/fail/Fail-failWithSingleLineMessage-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/fail/Fail-failWithSingleLineMessage-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithMultiMappings-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithMultiMappings-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithSingleMapping-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithSingleMapping-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportMultipleMessages-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportMultipleMessages-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportSingleEntryWithSingleMapping-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportSingleEntryWithSingleMapping-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportSingleMessage-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/report/Report-reportSingleMessage-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/skip/Skip-skipWithMultiLineMessage-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/skip/Skip-skipWithMultiLineMessage-testfeed-unicode.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/skip/Skip-skipWithSingleLineReason-testfeed-ascii.out.txt
 create mode 100644 platform-tests/src/test/resources/console/details/skip/Skip-skipWithSingleLineReason-testfeed-unicode.out.txt

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index b1a7b61e62d7..dc23033cb043 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -38,6 +38,8 @@ repository on GitHub.
   methods of the former. Please refer to the
   <<../user-guide/index.adoc#launcher-api-launcher-interceptors-custom, User Guide>> for
   details.
+* The new `testfeed` details mode for `ConsoleLauncher` prints test execution events as
+  they occur in a concise format.
 
 
 [[release-notes-5.10.0-M1-junit-jupiter]]
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
index 7e6e4bdd850d..3482c6497fa9 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/Details.java
@@ -43,10 +43,17 @@ public enum Details {
 	/**
 	 * Combines {@link #TREE} and {@link #FLAT} modes.
 	 */
-	VERBOSE;
+	VERBOSE,
 
 	/**
-	 * Return lower case {@link #name} for easier usage in help text for
+	 * Test plan execution events are rendered as they occur in a concise format.
+	 *
+	 * @since 1.10
+	 */
+	TESTFEED;
+
+	/**
+	 * Return lower case {@link #name()} for easier usage in help text for
 	 * available options.
 	 */
 	@Override
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index aebafa32134a..1c5c6c18cac3 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -148,6 +148,8 @@ private Optional<DetailsPrintingListener> createDetailsPrintingListener(PrintWri
 				return Optional.of(new TreePrintingListener(out, colorPalette, theme));
 			case VERBOSE:
 				return Optional.of(new VerboseTreePrintingListener(out, colorPalette, 16, theme));
+			case TESTFEED:
+				return Optional.of(new TestFeedPrintingListener(out, colorPalette));
 			default:
 				return Optional.empty();
 		}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DetailsPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DetailsPrintingListener.java
index 3eceb2721b6a..ece60eb52fbf 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DetailsPrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DetailsPrintingListener.java
@@ -10,18 +10,18 @@
 
 package org.junit.platform.console.tasks;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import java.util.regex.Pattern;
 
-import org.apiguardian.api.API;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestPlan;
 
-/**
- * @since 1.9
- */
-@API(status = EXPERIMENTAL, since = "1.9")
-public interface DetailsPrintingListener extends TestExecutionListener {
+interface DetailsPrintingListener extends TestExecutionListener {
+
+	Pattern LINE_START_PATTERN = Pattern.compile("(?m)^");
 
 	void listTests(TestPlan testPlan);
 
+	static String indented(String message, String indentation) {
+		return LINE_START_PATTERN.matcher(message).replaceAll(indentation).trim();
+	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
index f572d71d1907..304cedc27a2f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/FlatPrintingListener.java
@@ -11,7 +11,6 @@
 package org.junit.platform.console.tasks;
 
 import java.io.PrintWriter;
-import java.util.regex.Pattern;
 
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.engine.TestExecutionResult;
@@ -24,8 +23,6 @@
  */
 class FlatPrintingListener implements DetailsPrintingListener {
 
-	private static final Pattern LINE_START_PATTERN = Pattern.compile("(?m)^");
-
 	static final String INDENTATION = "             ";
 
 	private final PrintWriter out;
@@ -102,7 +99,7 @@ private void println(Style style, String format, Object... args) {
 	 * @return indented message
 	 */
 	private static String indented(String message) {
-		return LINE_START_PATTERN.matcher(message).replaceAll(INDENTATION).trim();
+		return DetailsPrintingListener.indented(message, INDENTATION);
 	}
 
 	@Override
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TestFeedPrintingListener.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TestFeedPrintingListener.java
new file mode 100644
index 000000000000..c7c273c1a92e
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/TestFeedPrintingListener.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.tasks;
+
+import static org.junit.platform.engine.TestExecutionResult.Status.SUCCESSFUL;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.platform.commons.util.ExceptionUtils;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+class TestFeedPrintingListener implements DetailsPrintingListener {
+
+	private static final String INDENTATION = "\t";
+	private static final String STATUS_SEPARATOR = " :: ";
+
+	private final PrintWriter out;
+	private final ColorPalette colorPalette;
+	private TestPlan testPlan;
+
+	TestFeedPrintingListener(PrintWriter out, ColorPalette colorPalette) {
+		this.out = out;
+		this.colorPalette = colorPalette;
+	}
+
+	@Override
+	public void testPlanExecutionStarted(TestPlan testPlan) {
+		this.testPlan = testPlan;
+	}
+
+	@Override
+	public void testPlanExecutionFinished(TestPlan testPlan) {
+		this.testPlan = null;
+	}
+
+	@Override
+	public void executionSkipped(TestIdentifier testIdentifier, String reason) {
+		if (shouldPrint(testIdentifier)) {
+			String msg = formatTestIdentifier(testIdentifier);
+			String indentedReason = indented(String.format("Reason: %s", reason));
+			println(Style.SKIPPED,
+				String.format("%s" + STATUS_SEPARATOR + "SKIPPED%n" + INDENTATION + "%s", msg, indentedReason));
+		}
+	}
+
+	@Override
+	public void executionStarted(TestIdentifier testIdentifier) {
+		if (shouldPrint(testIdentifier)) {
+			String msg = formatTestIdentifier(testIdentifier);
+			println(Style.NONE, String.format("%s" + STATUS_SEPARATOR + "STARTED", msg));
+		}
+	}
+
+	@Override
+	public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+		TestExecutionResult.Status status = testExecutionResult.getStatus();
+		if (testExecutionResult.getThrowable().isPresent()) {
+			Style style = Style.valueOf(testExecutionResult);
+			String msg = formatTestIdentifier(testIdentifier);
+			Throwable throwable = testExecutionResult.getThrowable().get();
+			String stacktrace = indented(ExceptionUtils.readStackTrace(throwable));
+			println(style,
+				String.format("%s" + STATUS_SEPARATOR + "%s%n" + INDENTATION + "%s", msg, status, stacktrace));
+		}
+		else if (shouldPrint(testIdentifier) || testExecutionResult.getStatus() != SUCCESSFUL) {
+			Style style = Style.valueOf(testExecutionResult);
+			String msg = formatTestIdentifier(testIdentifier);
+			println(style, String.format("%s" + STATUS_SEPARATOR + "%s", msg, status));
+		}
+	}
+
+	private String formatTestIdentifier(TestIdentifier testIdentifier) {
+		return String.join(" > ", collectDisplayNames(testIdentifier.getUniqueIdObject()));
+	}
+
+	private void println(Style style, String message) {
+		this.out.println(colorPalette.paint(style, message));
+	}
+
+	private List<String> collectDisplayNames(UniqueId uniqueId) {
+		int size = uniqueId.getSegments().size();
+		List<String> displayNames = new ArrayList<>(size);
+		for (int i = 0; i < size; i++) {
+			displayNames.add(0, testPlan.getTestIdentifier(uniqueId).getDisplayName());
+			if (i < size - 1) {
+				uniqueId = uniqueId.removeLastSegment();
+			}
+		}
+		return displayNames;
+	}
+
+	private static String indented(String message) {
+		return DetailsPrintingListener.indented(message, INDENTATION);
+	}
+
+	@Override
+	public void listTests(TestPlan testPlan) {
+		this.testPlan = testPlan;
+		try {
+			testPlan.accept(new TestPlan.Visitor() {
+				@Override
+				public void visit(TestIdentifier testIdentifier) {
+					if (shouldPrint(testIdentifier)) {
+						println(Style.NONE, formatTestIdentifier(testIdentifier));
+					}
+				}
+			});
+		}
+		finally {
+			this.testPlan = null;
+		}
+	}
+
+	private static boolean shouldPrint(TestIdentifier testIdentifier) {
+		return testIdentifier.isTest();
+	}
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TestFeedPrintingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TestFeedPrintingListenerTests.java
new file mode 100644
index 000000000000..2006f269782c
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TestFeedPrintingListenerTests.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.tasks;
+
+import static org.junit.jupiter.api.Assertions.assertLinesMatch;
+import static org.junit.platform.commons.util.CollectionUtils.getOnlyElement;
+import static org.mockito.Mockito.mock;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collections;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.support.descriptor.EngineDescriptor;
+import org.junit.platform.fakes.TestDescriptorStub;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+import org.opentest4j.TestAbortedException;
+
+public class TestFeedPrintingListenerTests {
+
+	TestPlan testPlan;
+	TestIdentifier testIdentifier;
+
+	StringWriter stringWriter = new StringWriter();
+	TestFeedPrintingListener listener = new TestFeedPrintingListener(new PrintWriter(stringWriter), ColorPalette.NONE);
+
+	@BeforeEach
+	void prepareListener() {
+		var engineDescriptor = new EngineDescriptor(UniqueId.forEngine("demo-engine"), "Demo Engine");
+		var testDescriptor = new TestDescriptorStub(engineDescriptor.getUniqueId().append("type", "test"),
+			"%c ool test");
+		engineDescriptor.addChild(testDescriptor);
+
+		testPlan = TestPlan.from(Collections.singleton(engineDescriptor), mock());
+		testIdentifier = testPlan.getTestIdentifier(testDescriptor.getUniqueId());
+
+		listener.testPlanExecutionStarted(testPlan);
+	}
+
+	@Test
+	public void testExecutionSkipped() {
+		listener.executionSkipped(testIdentifier, "Test disabled");
+		assertLinesMatch( //
+			"""
+					Demo Engine > %c ool test :: SKIPPED
+					\tReason: Test disabled
+					""".lines(), //
+			actualLines() //
+		);
+	}
+
+	@Test
+	public void testExecutionFailed() {
+		listener.executionFinished(testIdentifier, TestExecutionResult.failed(new AssertionError("Boom!")));
+		assertLinesMatch( //
+			"""
+					Demo Engine > %c ool test :: FAILED
+					\tjava.lang.AssertionError: Boom!
+					>>>>
+					""".lines(), //
+			actualLines() //
+		);
+	}
+
+	@Test
+	public void testExecutionAborted() {
+		listener.executionFinished(testIdentifier, TestExecutionResult.aborted(new TestAbortedException("Boom!")));
+		assertLinesMatch( //
+			"""
+					Demo Engine > %c ool test :: ABORTED
+					\torg.opentest4j.TestAbortedException: Boom!
+					>>>>
+					""".lines(), //
+			actualLines() //
+		);
+	}
+
+	@Test
+	public void testExecutionSucceeded() {
+		listener.executionFinished(testIdentifier, TestExecutionResult.successful());
+		assertLinesMatch(Stream.of("Demo Engine > %c ool test :: SUCCESSFUL"), actualLines());
+	}
+
+	@Test
+	public void testExecutionFailedOfContainer() {
+		var engineIdentifier = getOnlyElement(testPlan.getRoots());
+		listener.executionFinished(engineIdentifier, TestExecutionResult.failed(new AssertionError("Boom!")));
+		assertLinesMatch( //
+			"""
+					Demo Engine :: FAILED
+					\tjava.lang.AssertionError: Boom!
+					>>>>
+					""".lines(), //
+			actualLines() //
+		);
+	}
+
+	private Stream<String> actualLines() {
+		return stringWriter.toString().lines();
+	}
+
+}
diff --git a/platform-tests/src/test/resources/console/details/basic/Basic-changeDisplayName-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/basic/Basic-changeDisplayName-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..2f012fcb626f
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/basic/Basic-changeDisplayName-testfeed-ascii.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Basic > .oO fancy display name Oo. :: STARTED
+JUnit Jupiter > Basic > .oO fancy display name Oo. :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/basic/Basic-changeDisplayName-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/basic/Basic-changeDisplayName-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..2f012fcb626f
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/basic/Basic-changeDisplayName-testfeed-unicode.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Basic > .oO fancy display name Oo. :: STARTED
+JUnit Jupiter > Basic > .oO fancy display name Oo. :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/basic/Basic-empty-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/basic/Basic-empty-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..f0a1a4753749
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/basic/Basic-empty-testfeed-ascii.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Basic > empty() :: STARTED
+JUnit Jupiter > Basic > empty() :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/basic/Basic-empty-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/basic/Basic-empty-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..f0a1a4753749
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/basic/Basic-empty-testfeed-unicode.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Basic > empty() :: STARTED
+JUnit Jupiter > Basic > empty() :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/fail/Fail-failWithMultiLineMessage-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/fail/Fail-failWithMultiLineMessage-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..426da32c7baa
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/fail/Fail-failWithMultiLineMessage-testfeed-ascii.out.txt
@@ -0,0 +1,21 @@
+JUnit Jupiter > Fail > failWithMultiLineMessage() :: STARTED
+JUnit Jupiter > Fail > failWithMultiLineMessage() :: FAILED
+	org.opentest4j.AssertionFailedError: multi
+	line
+	fail
+	message
+    	>> STACKTRACE >>
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         0 tests successful      ]
+[         1 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/fail/Fail-failWithMultiLineMessage-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/fail/Fail-failWithMultiLineMessage-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..426da32c7baa
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/fail/Fail-failWithMultiLineMessage-testfeed-unicode.out.txt
@@ -0,0 +1,21 @@
+JUnit Jupiter > Fail > failWithMultiLineMessage() :: STARTED
+JUnit Jupiter > Fail > failWithMultiLineMessage() :: FAILED
+	org.opentest4j.AssertionFailedError: multi
+	line
+	fail
+	message
+    	>> STACKTRACE >>
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         0 tests successful      ]
+[         1 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/fail/Fail-failWithSingleLineMessage-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/fail/Fail-failWithSingleLineMessage-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..6b2edfd9d889
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/fail/Fail-failWithSingleLineMessage-testfeed-ascii.out.txt
@@ -0,0 +1,18 @@
+JUnit Jupiter > Fail > failWithSingleLineMessage() :: STARTED
+JUnit Jupiter > Fail > failWithSingleLineMessage() :: FAILED
+	org.opentest4j.AssertionFailedError: single line fail message
+    	>> STACKTRACE >>
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         0 tests successful      ]
+[         1 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/fail/Fail-failWithSingleLineMessage-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/fail/Fail-failWithSingleLineMessage-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..6b2edfd9d889
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/fail/Fail-failWithSingleLineMessage-testfeed-unicode.out.txt
@@ -0,0 +1,18 @@
+JUnit Jupiter > Fail > failWithSingleLineMessage() :: STARTED
+JUnit Jupiter > Fail > failWithSingleLineMessage() :: FAILED
+	org.opentest4j.AssertionFailedError: single line fail message
+    	>> STACKTRACE >>
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         0 tests successful      ]
+[         1 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithMultiMappings-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithMultiMappings-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..686ec009300f
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithMultiMappings-testfeed-ascii.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportMultiEntriesWithMultiMappings(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportMultiEntriesWithMultiMappings(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithMultiMappings-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithMultiMappings-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..686ec009300f
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithMultiMappings-testfeed-unicode.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportMultiEntriesWithMultiMappings(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportMultiEntriesWithMultiMappings(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithSingleMapping-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithSingleMapping-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..1c6e7334ecca
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithSingleMapping-testfeed-ascii.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportMultiEntriesWithSingleMapping(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportMultiEntriesWithSingleMapping(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithSingleMapping-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithSingleMapping-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..1c6e7334ecca
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportMultiEntriesWithSingleMapping-testfeed-unicode.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportMultiEntriesWithSingleMapping(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportMultiEntriesWithSingleMapping(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportMultipleMessages-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportMultipleMessages-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..a7555e29c95b
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportMultipleMessages-testfeed-ascii.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportMultipleMessages(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportMultipleMessages(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportMultipleMessages-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportMultipleMessages-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..a7555e29c95b
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportMultipleMessages-testfeed-unicode.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportMultipleMessages(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportMultipleMessages(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportSingleEntryWithSingleMapping-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportSingleEntryWithSingleMapping-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..5a048e2a859b
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportSingleEntryWithSingleMapping-testfeed-ascii.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportSingleEntryWithSingleMapping(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportSingleEntryWithSingleMapping(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportSingleEntryWithSingleMapping-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportSingleEntryWithSingleMapping-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..5a048e2a859b
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportSingleEntryWithSingleMapping-testfeed-unicode.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportSingleEntryWithSingleMapping(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportSingleEntryWithSingleMapping(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportSingleMessage-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportSingleMessage-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..e696cc9f5018
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportSingleMessage-testfeed-ascii.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportSingleMessage(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportSingleMessage(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/report/Report-reportSingleMessage-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/report/Report-reportSingleMessage-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..e696cc9f5018
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/report/Report-reportSingleMessage-testfeed-unicode.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Report > reportSingleMessage(TestReporter) :: STARTED
+JUnit Jupiter > Report > reportSingleMessage(TestReporter) :: SUCCESSFUL
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         0 tests skipped         ]
+[         1 tests started         ]
+[         0 tests aborted         ]
+[         1 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/skip/Skip-skipWithMultiLineMessage-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/skip/Skip-skipWithMultiLineMessage-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..bec8a6780f7e
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/skip/Skip-skipWithMultiLineMessage-testfeed-ascii.out.txt
@@ -0,0 +1,19 @@
+JUnit Jupiter > Skip > skipWithMultiLineMessage() :: SKIPPED
+	Reason: multi
+	line
+	fail
+	message
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         1 tests skipped         ]
+[         0 tests started         ]
+[         0 tests aborted         ]
+[         0 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/skip/Skip-skipWithMultiLineMessage-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/skip/Skip-skipWithMultiLineMessage-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..bec8a6780f7e
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/skip/Skip-skipWithMultiLineMessage-testfeed-unicode.out.txt
@@ -0,0 +1,19 @@
+JUnit Jupiter > Skip > skipWithMultiLineMessage() :: SKIPPED
+	Reason: multi
+	line
+	fail
+	message
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         1 tests skipped         ]
+[         0 tests started         ]
+[         0 tests aborted         ]
+[         0 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/skip/Skip-skipWithSingleLineReason-testfeed-ascii.out.txt b/platform-tests/src/test/resources/console/details/skip/Skip-skipWithSingleLineReason-testfeed-ascii.out.txt
new file mode 100644
index 000000000000..0de37d968dd8
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/skip/Skip-skipWithSingleLineReason-testfeed-ascii.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Skip > skipWithSingleLineReason() :: SKIPPED
+	Reason: single line skip reason
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         1 tests skipped         ]
+[         0 tests started         ]
+[         0 tests aborted         ]
+[         0 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tests/src/test/resources/console/details/skip/Skip-skipWithSingleLineReason-testfeed-unicode.out.txt b/platform-tests/src/test/resources/console/details/skip/Skip-skipWithSingleLineReason-testfeed-unicode.out.txt
new file mode 100644
index 000000000000..0de37d968dd8
--- /dev/null
+++ b/platform-tests/src/test/resources/console/details/skip/Skip-skipWithSingleLineReason-testfeed-unicode.out.txt
@@ -0,0 +1,16 @@
+JUnit Jupiter > Skip > skipWithSingleLineReason() :: SKIPPED
+	Reason: single line skip reason
+
+Test run finished after [\d]+ ms
+[         2 containers found      ]
+[         0 containers skipped    ]
+[         2 containers started    ]
+[         0 containers aborted    ]
+[         2 containers successful ]
+[         0 containers failed     ]
+[         1 tests found           ]
+[         1 tests skipped         ]
+[         0 tests started         ]
+[         0 tests aborted         ]
+[         0 tests successful      ]
+[         0 tests failed          ]
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index a12e268677bf..e193618d5ef8 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -288,6 +288,29 @@ void discoverSummary() {
 		assertLinesMatch(expected.lines(), result.getOutputLines("out").stream());
 	}
 
+	@Test
+	@Order(2)
+	void discoverTestFeed() {
+		Result result = listTests("--details=testfeed");
+
+		var expected = """
+				JUnit Jupiter > JupiterIntegration > successful()
+				JUnit Jupiter > JupiterIntegration > fail()
+				JUnit Jupiter > JupiterIntegration > abort()
+				JUnit Jupiter > JupiterIntegration > disabled()
+				JUnit Jupiter > SuiteIntegration$SingleTestContainer > successful()
+				JUnit Vintage > VintageIntegration > f4il
+				JUnit Vintage > VintageIntegration > ignored
+				JUnit Vintage > VintageIntegration > succ3ssful
+				JUnit Platform Suite > SuiteIntegration > JUnit Jupiter > SuiteIntegration$SingleTestContainer > successful()
+
+				[        11 containers found ]
+				[         9 tests found      ]
+
+				""".stripIndent();
+		assertLinesMatch(expected.lines(), result.getOutputLines("out").stream());
+	}
+
 	private static Result listTests(String... args) {
 		var result = Request.builder() //
 				.setTool(new Java()) //

From 5b04f695442bb06a5407425f36b33b9c1dd91d46 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 16 Apr 2023 16:36:01 +0200
Subject: [PATCH 1169/1433] Include root cause when failing to delete file

Fixes #3236.
---
 .../release-notes-5.10.0-M1.adoc              |  2 +
 .../engine/extension/TempDirectory.java       |  1 +
 .../TempDirectoryPerDeclarationTests.java     | 51 +++++++++++++++++--
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index dc23033cb043..219e35a43526 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -56,6 +56,8 @@ repository on GitHub.
   `@MethodSource("myFactory([I)"` (which was already supported) and
   `@MethodSource("myFactory(java.lang.String[])` instead of
   `@MethodSource("myFactory([Ljava.lang.String;)`.
+* Exceptions thrown for undeletable files when cleaning up a temporary directory created
+  via `@TempDir` now include the root cause.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index ba5f53d71971..9fc7a37dc4c4 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -319,6 +319,7 @@ private void resetPermissionsAndTryToDeleteAgain(Path path, IOException exceptio
 						}
 						catch (Exception suppressed) {
 							exception.addSuppressed(suppressed);
+							failures.put(path, exception);
 						}
 					}
 					else {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 6cc8336bb202..100bbe939499 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -29,6 +29,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -55,7 +56,6 @@
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -200,7 +200,19 @@ void onlyAttemptsToDeleteUndeletableDirectoriesOnce() {
 		assertSingleFailedTest(results, //
 			instanceOf(IOException.class), //
 			message(it -> it.startsWith("Failed to delete temp directory")), //
-			suppressed(0, instanceOf(IOException.class), message("Simulated failure")), //
+			suppressed(0, instanceOf(DirectoryNotEmptyException.class)), //
+			suppressed(1, instanceOf(IOException.class), message("Simulated failure")));
+	}
+
+	@Test
+	@DisplayName("only attempts to delete undeletable files once")
+	void onlyAttemptsToDeleteUndeletableFilesOnce() {
+		var results = executeTestsForClass(UndeletableFileTestCase.class);
+
+		assertSingleFailedTest(results, //
+			instanceOf(IOException.class), //
+			message(it -> it.startsWith("Failed to delete temp directory")), //
+			suppressed(0, instanceOf(DirectoryNotEmptyException.class)), //
 			suppressed(1, instanceOf(IOException.class), message("Simulated failure")));
 	}
 
@@ -1014,16 +1026,45 @@ private static Map<String, Path> getTempDirs(TestInfo testInfo) {
 
 	static class UndeletableDirectoryTestCase {
 
+		static final Path UNDELETABLE_SUB_DIR = Path.of("undeletable");
+
 		@RegisterExtension
-		Extension injector = (BeforeEachCallback) context -> context //
+		BeforeEachCallback injector = context -> context //
 				.getStore(TempDirectory.NAMESPACE) //
 				.put(TempDirectory.FILE_OPERATIONS_KEY, (FileOperations) path -> {
-					throw new IOException("Simulated failure");
+					if (path.endsWith(UNDELETABLE_SUB_DIR)) {
+						throw new IOException("Simulated failure");
+					}
+					else {
+						Files.delete(path);
+					}
 				});
 
 		@Test
 		void test(@TempDir Path tempDir) throws Exception {
-			Files.createDirectory(tempDir.resolve("test-sub-dir"));
+			Files.createDirectory(tempDir.resolve(UNDELETABLE_SUB_DIR));
+		}
+	}
+
+	static class UndeletableFileTestCase {
+
+		static final Path UNDELETABLE_FILE = Path.of("undeletable");
+
+		@RegisterExtension
+		BeforeEachCallback injector = context -> context //
+				.getStore(TempDirectory.NAMESPACE) //
+				.put(TempDirectory.FILE_OPERATIONS_KEY, (FileOperations) path -> {
+					if (path.endsWith(UNDELETABLE_FILE)) {
+						throw new IOException("Simulated failure");
+					}
+					else {
+						Files.delete(path);
+					}
+				});
+
+		@Test
+		void test(@TempDir Path tempDir) throws Exception {
+			Files.createFile(tempDir.resolve(UNDELETABLE_FILE));
 		}
 	}
 }

From 4616b23c35ac7eb96c88f20094c481a92b5d7bd0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 16 Apr 2023 16:51:56 +0200
Subject: [PATCH 1170/1433] Improve error message when root could not be
 deleted

---
 .../jupiter/engine/extension/TempDirectory.java      | 12 ++++++------
 .../extension/TempDirectoryPerDeclarationTests.java  |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 9fc7a37dc4c4..624c9adbce80 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -30,6 +30,7 @@
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
@@ -341,13 +342,12 @@ private static void resetPermissions(Path path) {
 		}
 
 		private IOException createIOExceptionWithAttachedFailures(SortedMap<Path, IOException> failures) {
-			// @formatter:off
-			String joinedPaths = failures.keySet().stream()
-					.map(this::tryToDeleteOnExit)
-					.map(this::relativizeSafely)
-					.map(String::valueOf)
+			Path emptyPath = Paths.get("");
+			String joinedPaths = failures.keySet().stream() //
+					.map(this::tryToDeleteOnExit) //
+					.map(this::relativizeSafely) //
+					.map(path -> emptyPath.equals(path) ? "<root>" : path.toString()) //
 					.collect(joining(", "));
-			// @formatter:on
 			IOException exception = new IOException("Failed to delete temp directory " + dir.toAbsolutePath()
 					+ ". The following paths could not be deleted (see suppressed exceptions for details): "
 					+ joinedPaths);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 100bbe939499..16e19ed53f71 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -200,6 +200,8 @@ void onlyAttemptsToDeleteUndeletableDirectoriesOnce() {
 		assertSingleFailedTest(results, //
 			instanceOf(IOException.class), //
 			message(it -> it.startsWith("Failed to delete temp directory")), //
+			message(it -> it.endsWith(
+				"The following paths could not be deleted (see suppressed exceptions for details): <root>, undeletable")), //
 			suppressed(0, instanceOf(DirectoryNotEmptyException.class)), //
 			suppressed(1, instanceOf(IOException.class), message("Simulated failure")));
 	}
@@ -212,6 +214,8 @@ void onlyAttemptsToDeleteUndeletableFilesOnce() {
 		assertSingleFailedTest(results, //
 			instanceOf(IOException.class), //
 			message(it -> it.startsWith("Failed to delete temp directory")), //
+			message(it -> it.endsWith(
+				"The following paths could not be deleted (see suppressed exceptions for details): <root>, undeletable")), //
 			suppressed(0, instanceOf(DirectoryNotEmptyException.class)), //
 			suppressed(1, instanceOf(IOException.class), message("Simulated failure")));
 	}

From c9ae85af2c55e1b4748dc0348c5e5df1c4f5cd2a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 17 Apr 2023 19:19:35 +0200
Subject: [PATCH 1171/1433] Assert absolute path is included in failure message

---
 .../TempDirectoryPerDeclarationTests.java     | 78 +++++++++----------
 1 file changed, 36 insertions(+), 42 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 16e19ed53f71..c98e99e0514d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -53,6 +53,7 @@
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.TestReporter;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
@@ -63,6 +64,7 @@
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.Constants;
 import org.junit.jupiter.engine.extension.TempDirectory.FileOperations;
+import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
@@ -192,30 +194,26 @@ void canBeUsedViaStaticFieldInsideNestedTestClasses() {
 				.assertStatistics(stats -> stats.started(2).succeeded(2));
 	}
 
-	@Test
-	@DisplayName("only attempts to delete undeletable directories once")
-	void onlyAttemptsToDeleteUndeletableDirectoriesOnce() {
-		var results = executeTestsForClass(UndeletableDirectoryTestCase.class);
-
-		assertSingleFailedTest(results, //
-			instanceOf(IOException.class), //
-			message(it -> it.startsWith("Failed to delete temp directory")), //
-			message(it -> it.endsWith(
-				"The following paths could not be deleted (see suppressed exceptions for details): <root>, undeletable")), //
-			suppressed(0, instanceOf(DirectoryNotEmptyException.class)), //
-			suppressed(1, instanceOf(IOException.class), message("Simulated failure")));
+	@TestFactory
+	@DisplayName("only attempts to delete undeletable paths once")
+	Stream<DynamicTest> onlyAttemptsToDeleteUndeletablePathsOnce() {
+		return Stream.of( //
+			dynamicTest("directory", () -> onlyAttemptsToDeleteUndeletablePathOnce(UndeletableDirectoryTestCase.class)), //
+			dynamicTest("file", () -> onlyAttemptsToDeleteUndeletablePathOnce(UndeletableFileTestCase.class)) //
+		);
 	}
 
-	@Test
-	@DisplayName("only attempts to delete undeletable files once")
-	void onlyAttemptsToDeleteUndeletableFilesOnce() {
-		var results = executeTestsForClass(UndeletableFileTestCase.class);
+	private void onlyAttemptsToDeleteUndeletablePathOnce(Class<? extends UndeletableTestCase> testClass) {
+		var results = executeTestsForClass(testClass);
+
+		var tempDir = results.testEvents().reportingEntryPublished().stream().map(
+			it -> it.getPayload(ReportEntry.class).orElseThrow()).map(
+				it -> Path.of(it.getKeyValuePairs().get(UndeletableTestCase.TEMP_DIR))).findAny().orElseThrow();
 
 		assertSingleFailedTest(results, //
 			instanceOf(IOException.class), //
-			message(it -> it.startsWith("Failed to delete temp directory")), //
-			message(it -> it.endsWith(
-				"The following paths could not be deleted (see suppressed exceptions for details): <root>, undeletable")), //
+			message("Failed to delete temp directory " + tempDir.toAbsolutePath() + ". " + //
+					"The following paths could not be deleted (see suppressed exceptions for details): <root>, undeletable"), //
 			suppressed(0, instanceOf(DirectoryNotEmptyException.class)), //
 			suppressed(1, instanceOf(IOException.class), message("Simulated failure")));
 	}
@@ -1028,15 +1026,16 @@ private static Map<String, Path> getTempDirs(TestInfo testInfo) {
 		}
 	}
 
-	static class UndeletableDirectoryTestCase {
+	static class UndeletableTestCase {
 
-		static final Path UNDELETABLE_SUB_DIR = Path.of("undeletable");
+		static final Path UNDELETABLE_PATH = Path.of("undeletable");
+		static final String TEMP_DIR = "TEMP_DIR";
 
 		@RegisterExtension
 		BeforeEachCallback injector = context -> context //
 				.getStore(TempDirectory.NAMESPACE) //
 				.put(TempDirectory.FILE_OPERATIONS_KEY, (FileOperations) path -> {
-					if (path.endsWith(UNDELETABLE_SUB_DIR)) {
+					if (path.endsWith(UNDELETABLE_PATH)) {
 						throw new IOException("Simulated failure");
 					}
 					else {
@@ -1044,31 +1043,26 @@ static class UndeletableDirectoryTestCase {
 					}
 				});
 
-		@Test
-		void test(@TempDir Path tempDir) throws Exception {
-			Files.createDirectory(tempDir.resolve(UNDELETABLE_SUB_DIR));
+		@TempDir
+		Path tempDir;
+
+		@BeforeEach
+		void reportTempDir(TestReporter reporter) {
+			reporter.publishEntry(TEMP_DIR, tempDir.toString());
 		}
 	}
 
-	static class UndeletableFileTestCase {
-
-		static final Path UNDELETABLE_FILE = Path.of("undeletable");
-
-		@RegisterExtension
-		BeforeEachCallback injector = context -> context //
-				.getStore(TempDirectory.NAMESPACE) //
-				.put(TempDirectory.FILE_OPERATIONS_KEY, (FileOperations) path -> {
-					if (path.endsWith(UNDELETABLE_FILE)) {
-						throw new IOException("Simulated failure");
-					}
-					else {
-						Files.delete(path);
-					}
-				});
+	static class UndeletableDirectoryTestCase extends UndeletableTestCase {
+		@Test
+		void test() throws Exception {
+			Files.createDirectory(tempDir.resolve(UNDELETABLE_PATH));
+		}
+	}
 
+	static class UndeletableFileTestCase extends UndeletableTestCase {
 		@Test
-		void test(@TempDir Path tempDir) throws Exception {
-			Files.createFile(tempDir.resolve(UNDELETABLE_FILE));
+		void test() throws Exception {
+			Files.createFile(tempDir.resolve(UNDELETABLE_PATH));
 		}
 	}
 }

From ed5fe0b24ca6f7d104e05c91745c73726b6a69ef Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 17 Apr 2023 19:50:48 +0200
Subject: [PATCH 1172/1433] Fix Kotlin compiler warning

---
 settings.gradle.kts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 632107e9de40..4e8b6172e5c3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -76,12 +76,12 @@ buildCache {
 	}
 	remote<HttpBuildCache> {
 		url = uri(buildParameters.buildCache.url.getOrElse("$gradleEnterpriseServer/cache/"))
-		val buildCacheUsername = buildParameters.buildCache.username.map { it.ifBlank { null } }
-		val buildCachePassword = buildParameters.buildCache.password.map { it.ifBlank { null } }
-		isPush = buildParameters.ci && buildCacheUsername.isPresent && buildCachePassword.isPresent
+		val buildCacheUsername = buildParameters.buildCache.username.orNull?.ifBlank { null }
+		val buildCachePassword = buildParameters.buildCache.password.orNull?.ifBlank { null }
+		isPush = buildParameters.ci && buildCacheUsername != null && buildCachePassword != null
 		credentials {
-			username = buildCacheUsername.orNull
-			password = buildCachePassword.orNull
+			username = buildCacheUsername
+			password = buildCachePassword
 		}
 	}
 }

From ae32d4359de66cd32c76459580b1cc77113ff077 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 18 Apr 2023 08:51:59 +0200
Subject: [PATCH 1173/1433] Update JMH plugin to resolve Gradle deprecation
 warning

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4e8b6172e5c3..d25799ec35ce 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ pluginManagement {
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
 		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"
-		id("me.champeau.jmh") version "0.7.0"
+		id("me.champeau.jmh") version "0.7.1"
 		id("io.spring.nohttp") version "0.0.11"
 		id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 	}

From 2c5fec46c81c42e960bc5a57302a49cb6da10459 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 19 Apr 2023 15:44:54 +0200
Subject: [PATCH 1174/1433] Declare value links in Javadoc consistently with a
 '#'

---
 .../src/main/java/org/junit/jupiter/api/Timeout.java        | 4 ++--
 .../src/main/java/org/junit/platform/engine/UniqueId.java   | 2 +-
 .../DefaultParallelExecutionConfigurationStrategy.java      | 6 +++---
 .../java/org/junit/platform/launcher/LauncherConstants.java | 2 +-
 .../launcher/core/LauncherDiscoveryRequestBuilder.java      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
index 18f0d34c48a4..db9cc94cb5ae 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
@@ -50,9 +50,9 @@
  *     <dd>Default timeout for {@link Test @Test} methods</dd>
  *     <dt>{@value #DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link TestTemplate @TestTemplate} methods</dd>
- *     <dt>{@value DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
+ *     <dt>{@value #DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link TestFactory @TestFactory} methods</dd>
- *     <dt>{@value DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
+ *     <dt>{@value #DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for all lifecycle methods</dd>
  *     <dt>{@value #DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME}</dt>
  *     <dd>Default timeout for {@link BeforeAll @BeforeAll} methods</dd>
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index f4d516cf79d3..1e9b2e0379eb 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -174,7 +174,7 @@ public final UniqueId append(Segment segment) {
 	 * <p>This {@code UniqueId} will not be modified.
 	 *
 	 * <p>The engine ID will be stored in a {@link Segment} with
-	 * {@link Segment#getType type} {@value ENGINE_SEGMENT_TYPE}.
+	 * {@link Segment#getType type} {@value #ENGINE_SEGMENT_TYPE}.
 	 *
 	 * @param engineId the engine ID; never {@code null} or blank
 	 *
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
index 52f03cb6dee2..ffbbe310fd03 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
@@ -31,7 +31,7 @@
 public enum DefaultParallelExecutionConfigurationStrategy implements ParallelExecutionConfigurationStrategy {
 
 	/**
-	 * Uses the mandatory {@value CONFIG_FIXED_PARALLELISM_PROPERTY_NAME} configuration
+	 * Uses the mandatory {@value #CONFIG_FIXED_PARALLELISM_PROPERTY_NAME} configuration
 	 * parameter as the desired parallelism.
 	 */
 	FIXED {
@@ -55,7 +55,7 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter
 
 	/**
 	 * Computes the desired parallelism based on the number of available
-	 * processors/cores multiplied by the {@value CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME}
+	 * processors/cores multiplied by the {@value #CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME}
 	 * configuration parameter.
 	 */
 	DYNAMIC {
@@ -78,7 +78,7 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter
 
 	/**
 	 * Allows the specification of a custom {@link ParallelExecutionConfigurationStrategy}
-	 * implementation via the mandatory {@value CONFIG_CUSTOM_CLASS_PROPERTY_NAME}
+	 * implementation via the mandatory {@value #CONFIG_CUSTOM_CLASS_PROPERTY_NAME}
 	 * configuration parameter to determine the desired configuration.
 	 */
 	CUSTOM {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index 12f52e2edf05..8862cb28ea7e 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -65,7 +65,7 @@ public class LauncherConstants {
 	 * to use per thread and output type if output capturing is enabled:
 	 * {@value}
 	 *
-	 * <p>Value must be an integer; defaults to {@value CAPTURE_MAX_BUFFER_DEFAULT}.
+	 * <p>Value must be an integer; defaults to {@value #CAPTURE_MAX_BUFFER_DEFAULT}.
 	 *
 	 * @see #CAPTURE_MAX_BUFFER_DEFAULT
 	 */
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 24be659b290a..09b690a1d670 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -228,7 +228,7 @@ public LauncherDiscoveryRequestBuilder parentConfigurationParameters(
 	 * <p>In addition to the {@linkplain LauncherDiscoveryListener listeners}
 	 * registered using this method, this builder will add a default listener
 	 * to this request that can be specified using the
-	 * {@value LauncherDiscoveryRequestBuilder#DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME}
+	 * {@value #DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME}
 	 * configuration parameter.
 	 *
 	 * @param listeners the {@code LauncherDiscoveryListeners} to add; never

From c86b509dc36779214cf0a544d2b9e08c4f17fca6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 15 Apr 2023 17:43:39 +0200
Subject: [PATCH 1175/1433] Prototype for new @RepeatedTest(failureThreshold)
 feature

This commit is a working prototype for a new `failureThreshold` feature
in @RepeatedTest which allows a repeated test to be configured to skip
remaining repetitions after a certain number of failures have been
encountered.

Co-authored-by: Christian Stein <sormuras@gmail.com>
See: #2925
---
 .../org/junit/jupiter/api/RepeatedTest.java   |  2 +
 .../org/junit/jupiter/api/RepetitionInfo.java |  4 ++
 .../TestTemplateInvocationContext.java        |  4 ++
 .../TestTemplateInvocationTestDescriptor.java | 10 +++++
 .../extension/RepeatedTestExtension.java      | 12 +++++-
 .../RepeatedTestInvocationContext.java        | 17 ++++++--
 .../RepetitionInfoParameterResolver.java      | 40 +++++++++++++++++--
 .../engine/extension/RepeatedTestTests.java   |  9 +++++
 8 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
index 298de922599b..c05ee41d0318 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
@@ -152,4 +152,6 @@
 	 */
 	String name() default SHORT_DISPLAY_NAME;
 
+	int failureThreshold() default Integer.MAX_VALUE;
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
index 89f5d1f0340f..e1e50d62ba2b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
@@ -50,4 +50,8 @@ public interface RepetitionInfo {
 	 */
 	int getTotalRepetitions();
 
+	int getFailureThreshold();
+
+	int getFailureCount();
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
index 268b5c474e52..31ac3530fa2a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
@@ -66,4 +66,8 @@ default List<Extension> getAdditionalExtensions() {
 		return emptyList();
 	}
 
+	default boolean shouldBeSkipped() {
+		return false;
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
index 4d522615dcaa..46f0b8795f99 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
@@ -75,4 +75,14 @@ public void after(JupiterEngineExecutionContext context) {
 		// forget invocationContext so it can be garbage collected
 		invocationContext = null;
 	}
+
+	@Override
+	public SkipResult shouldBeSkipped(JupiterEngineExecutionContext context) throws Exception {
+		if (this.invocationContext.shouldBeSkipped()) {
+			return SkipResult.skip(
+				this.invocationContext.getClass().getSimpleName() + " signalled that the invocation should be skipped");
+		}
+		return super.shouldBeSkipped(context);
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
index ce561b5867af..f962224cba40 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
@@ -13,6 +13,7 @@
 import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
 
 import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
@@ -42,12 +43,14 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 		String displayName = context.getDisplayName();
 		RepeatedTest repeatedTest = AnnotationUtils.findAnnotation(testMethod, RepeatedTest.class).get();
 		int totalRepetitions = totalRepetitions(repeatedTest, testMethod);
+		int failureThreshold = failureThreshold(repeatedTest, testMethod);
+		AtomicInteger failureCount = new AtomicInteger();
 		RepeatedTestDisplayNameFormatter formatter = displayNameFormatter(repeatedTest, testMethod, displayName);
 
 		// @formatter:off
 		return IntStream
 				.rangeClosed(1, totalRepetitions)
-				.mapToObj(repetition -> new RepeatedTestInvocationContext(repetition, totalRepetitions, formatter));
+				.mapToObj(repetition -> new RepeatedTestInvocationContext(repetition, totalRepetitions, failureThreshold, failureCount, formatter));
 		// @formatter:on
 	}
 
@@ -58,6 +61,13 @@ private int totalRepetitions(RepeatedTest repeatedTest, Method method) {
 		return repetitions;
 	}
 
+	private int failureThreshold(RepeatedTest repeatedTest, Method method) {
+		int failureThreshold = repeatedTest.failureThreshold();
+		Preconditions.condition(failureThreshold > 0, () -> String.format(
+			"Configuration error: @RepeatedTest on method [%s] must be declared with a positive 'failureThreshold'.", method));
+		return failureThreshold;
+	}
+
 	private RepeatedTestDisplayNameFormatter displayNameFormatter(RepeatedTest repeatedTest, Method method,
 			String displayName) {
 		String pattern = Preconditions.notBlank(repeatedTest.name().trim(), () -> String.format(
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
index 1ec271b73cb2..71016d778061 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
@@ -13,6 +13,7 @@
 import static java.util.Collections.singletonList;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
@@ -26,13 +27,17 @@ class RepeatedTestInvocationContext implements TestTemplateInvocationContext {
 
 	private final int currentRepetition;
 	private final int totalRepetitions;
+	private final int failureThreshold;
+	private final AtomicInteger failureCount;
 	private final RepeatedTestDisplayNameFormatter formatter;
 
-	public RepeatedTestInvocationContext(int currentRepetition, int totalRepetitions,
-			RepeatedTestDisplayNameFormatter formatter) {
+	public RepeatedTestInvocationContext(int currentRepetition, int totalRepetitions, int failureThreshold,
+			AtomicInteger failureCount, RepeatedTestDisplayNameFormatter formatter) {
 
 		this.currentRepetition = currentRepetition;
 		this.totalRepetitions = totalRepetitions;
+		this.failureThreshold = failureThreshold;
+		this.failureCount = failureCount;
 		this.formatter = formatter;
 	}
 
@@ -43,7 +48,13 @@ public String getDisplayName(int invocationIndex) {
 
 	@Override
 	public List<Extension> getAdditionalExtensions() {
-		return singletonList(new RepetitionInfoParameterResolver(this.currentRepetition, this.totalRepetitions));
+		return singletonList(new RepetitionInfoParameterResolver(this.currentRepetition, this.totalRepetitions,
+			this.failureThreshold, this.failureCount));
+	}
+
+	@Override
+	public boolean shouldBeSkipped() {
+		return this.failureCount.get() >= this.failureThreshold;
 	}
 
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
index be104eed997d..ecbaa310df2d 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
@@ -10,10 +10,13 @@
 
 package org.junit.jupiter.engine.extension;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 import org.junit.jupiter.api.RepetitionInfo;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.TestWatcher;
 import org.junit.platform.commons.util.ToStringBuilder;
 
 /**
@@ -22,14 +25,19 @@
  *
  * @since 5.0
  */
-class RepetitionInfoParameterResolver implements ParameterResolver {
+class RepetitionInfoParameterResolver implements ParameterResolver, TestWatcher {
 
 	private final int currentRepetition;
 	private final int totalRepetitions;
+	private final int failureThreshold;
+	private final AtomicInteger failureCount;
 
-	public RepetitionInfoParameterResolver(int currentRepetition, int totalRepetitions) {
+	public RepetitionInfoParameterResolver(int currentRepetition, int totalRepetitions, int failureThreshold,
+			AtomicInteger failureCount) {
 		this.currentRepetition = currentRepetition;
 		this.totalRepetitions = totalRepetitions;
+		this.failureThreshold = failureThreshold;
+		this.failureCount = failureCount;
 	}
 
 	@Override
@@ -39,17 +47,28 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 
 	@Override
 	public RepetitionInfo resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
-		return new DefaultRepetitionInfo(this.currentRepetition, this.totalRepetitions);
+		return new DefaultRepetitionInfo(this.currentRepetition, this.totalRepetitions, this.failureThreshold,
+			this.failureCount.get());
+	}
+
+	@Override
+	public void testFailed(ExtensionContext context, Throwable cause) {
+		this.failureCount.incrementAndGet();
 	}
 
 	private static class DefaultRepetitionInfo implements RepetitionInfo {
 
 		private final int currentRepetition;
 		private final int totalRepetitions;
+		private final int failureThreshold;
+		private final int failureCount;
 
-		DefaultRepetitionInfo(int currentRepetition, int totalRepetitions) {
+		public DefaultRepetitionInfo(int currentRepetition, int totalRepetitions, int failureThreshold,
+				int failureCount) {
 			this.currentRepetition = currentRepetition;
 			this.totalRepetitions = totalRepetitions;
+			this.failureThreshold = failureThreshold;
+			this.failureCount = failureCount;
 		}
 
 		@Override
@@ -62,15 +81,28 @@ public int getTotalRepetitions() {
 			return this.totalRepetitions;
 		}
 
+		@Override
+		public int getFailureThreshold() {
+			return this.failureThreshold;
+		}
+
+		@Override
+		public int getFailureCount() {
+			return this.failureCount;
+		}
+
 		@Override
 		public String toString() {
 			// @formatter:off
 			return new ToStringBuilder(this)
 					.append("currentRepetition", this.currentRepetition)
 					.append("totalRepetitions", this.totalRepetitions)
+					.append("failureThreshold", this.failureThreshold)
+					.append("failureCount", this.failureCount)
 					.toString();
 			// @formatter:on
 		}
 
 	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
index 44514c06374a..e716ec5189f0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
 import static org.junit.platform.testkit.engine.EventConditions.container;
 import static org.junit.platform.testkit.engine.EventConditions.displayName;
@@ -172,5 +173,13 @@ void negativeRepeatCount() {
 		@RepeatedTest(0)
 		void zeroRepeatCount() {
 		}
+
+		@RepeatedTest(value = 10, failureThreshold = 2)
+		void failureThreshold(RepetitionInfo info) {
+			if (info.getCurrentRepetition() > 5) {
+				fail("Boom!");
+			}
+		}
+
 	}
 }

From 5b54e0d541a94ac6695edc01dcc042ca15b36f50 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 16 Apr 2023 16:07:08 +0200
Subject: [PATCH 1176/1433] Introduce failure threshold support in
 @RepeatedTest

This commit builds on the prototype from the previous commit and
finalizes support for failure thresholds in @RepeatedTest.

Specifically, this commit introduces a new `failureThreshold` attribute
in @RepeatedTest which allows a repeated test to be configured to skip
remaining repetitions after a certain number of failures have been
encountered.

Closes: #2925
Closes: #3250
---
 .../src/docs/asciidoc/link-attributes.adoc    |   2 +-
 .../release-notes-5.10.0-M1.adoc              |   8 +-
 .../asciidoc/user-guide/writing-tests.adoc    |  70 +++-
 .../test/java/example/RepeatedTestsDemo.java  |  17 +
 .../org/junit/jupiter/api/RepeatedTest.java   |  35 +-
 .../org/junit/jupiter/api/RepetitionInfo.java |  21 +-
 .../TestTemplateInvocationContext.java        |   4 -
 .../TestTemplateInvocationTestDescriptor.java |   9 -
 .../extension/DefaultRepetitionInfo.java      |  68 ++++
 .../extension/RepeatedTestExtension.java      |  14 +-
 .../RepeatedTestInvocationContext.java        |  25 +-
 .../engine/extension/RepetitionExtension.java |  72 ++++
 .../RepetitionInfoParameterResolver.java      | 108 ------
 .../engine/extension/RepeatedTestTests.java   | 334 ++++++++++++++----
 14 files changed, 563 insertions(+), 224 deletions(-)
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DefaultRepetitionInfo.java
 create mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java
 delete mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index dc101db7079a..d7d259e8f04c 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -153,7 +153,7 @@ endif::[]
 :junit-jupiter-engine:                       {javadoc-root}/org.junit.jupiter.engine/org/junit/jupiter/engine/package-summary.html[junit-jupiter-engine]
 // Jupiter Extension Implementations
 :DisabledCondition:                          {current-branch}/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DisabledCondition.java[DisabledCondition]
-:RepetitionInfoParameterResolver:            {current-branch}/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java[RepetitionInfoParameterResolver]
+:RepetitionExtension:                        {current-branch}/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java[RepetitionExtension]
 :TempDirectory:                              {current-branch}/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java[TempDirectory]
 :TestInfoParameterResolver:                  {current-branch}/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestInfoParameterResolver.java[TestInfoParameterResolver]
 :TestReporterParameterResolver:              {current-branch}/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TestReporterParameterResolver.java[TestReporterParameterResolver]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 219e35a43526..9e4437d1dd94 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -65,12 +65,16 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
+
+* `@RepeatedTest` can now be configured with a failure threshold which signifies the
+  number of failures after which remaining repetitions will be automatically skipped. See
+  the <<../user-guide/index.adoc#writing-tests-repeated-tests, User Guide>> for details.
 * New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
   `@ParameterizedTest` invocation.
-* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
-  fall back to the default display name generator.
 * `@EmptySource` now supports additional types, including `Collection` and `Map` subtypes
   with a public no-arg constructor.
+* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
+  fall back to the default display name generator.
 * New `AnnotationBasedArgumentsProvider` convenience base class which implements both
   `ArgumentsProvider` and `AnnotationConsumer`.
 * New `AnnotationBasedArgumentConverter` convenience base class which implements both
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index eefe3f682d85..9f26004ec5dd 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -862,13 +862,13 @@ following demonstrates how to have `TestInfo` injected into a test constructor,
 include::{testDir}/example/TestInfoDemo.java[tags=user_guide]
 ----
 
-* `{RepetitionInfoParameterResolver}`: if a method parameter in a `@RepeatedTest`,
-  `@BeforeEach`, or `@AfterEach` method is of type `{RepetitionInfo}`, the
-  `RepetitionInfoParameterResolver` will supply an instance of `RepetitionInfo`.
-  `RepetitionInfo` can then be used to retrieve information about the current repetition
-  and the total number of repetitions for the corresponding `@RepeatedTest`. Note,
-  however, that `RepetitionInfoParameterResolver` is not registered outside the context
-  of a `@RepeatedTest`. See <<writing-tests-repeated-tests-examples>>.
+* `{RepetitionExtension}`: if a method parameter in a `@RepeatedTest`, `@BeforeEach`, or
+  `@AfterEach` method is of type `{RepetitionInfo}`, the `RepetitionExtension` will supply
+  an instance of `RepetitionInfo`. `RepetitionInfo` can then be used to retrieve
+  information about the current repetition, the total number of repetitions, the number of
+  repetitions that have failed, and the failure threshold for the corresponding
+  `@RepeatedTest`. Note, however, that `RepetitionExtension` is not registered outside the
+  context of a `@RepeatedTest`. See <<writing-tests-repeated-tests-examples>>.
 
 * `{TestReporterParameterResolver}`: if a constructor or method parameter is of type
   `{TestReporter}`, the `TestReporterParameterResolver` will supply an instance of
@@ -1020,10 +1020,32 @@ void repeatedTest() {
 }
 ----
 
-In addition to specifying the number of repetitions, a custom display name can be
-configured for each repetition via the `name` attribute of the `@RepeatedTest`
-annotation. Furthermore, the display name can be a pattern composed of a combination of
-static text and dynamic placeholders. The following placeholders are currently supported.
+Since JUnit Jupiter 5.10, `@RepeatedTest` can be configured with a failure threshold which
+signifies the number of failures after which remaining repetitions will be automatically
+skipped. Set the `failureThreshold` attribute to a positive number less than the total
+number of repetitions in order to skip the invocations of remaining repetitions after the
+specified number of failures has been encountered.
+
+For example, if you are using `@RepeatedTest` to repeatedly invoke a test that you suspect
+to be _flaky_, a single failure is sufficient to demonstrate that the test is flaky, and
+there is no need to invoke the remaining repetitions. To support that specific use case,
+set `failureThreshold = 1`. You can alternatively set the threshold to a number greater
+than 1 depending on your use case.
+
+By default, the `failureThreshold` attribute is set to `Integer.MAX_VALUE`, signaling that
+no failure threshold will be applied, which effectively means that the specified number of
+repetitions will be invoked regardless of whether any repetitions fail.
+
+WARNING: If the repetitions of a `@RepeatedTest` method are executed in parallel, no
+guarantees can be made regarding the failure threshold. It is therefore recommended that a
+`@RepeatedTest` method be annotated with `@Execution(SAME_THREAD)` when parallel execution
+is configured. See <<writing-tests-parallel-execution>> for further details.
+
+In addition to specifying the number of repetitions and failure threshold, a custom
+display name can be configured for each repetition via the `name` attribute of the
+`@RepeatedTest` annotation. Furthermore, the display name can be a pattern composed of a
+combination of static text and dynamic placeholders. The following placeholders are
+currently supported.
 
 - `{displayName}`: display name of the `@RepeatedTest` method
 - `{currentRepetition}`: the current repetition count
@@ -1039,9 +1061,10 @@ latter is equal to `"{displayName} :: repetition {currentRepetition} of
 {totalRepetitions}"` which results in display names for individual repetitions like
 `repeatedTest() :: repetition 1 of 10`, `repeatedTest() :: repetition 2 of 10`, etc.
 
-In order to retrieve information about the current repetition and the total number of
-repetitions programmatically, a developer can choose to have an instance of
-`RepetitionInfo` injected into a `@RepeatedTest`, `@BeforeEach`, or `@AfterEach` method.
+In order to retrieve information about the current repetition, the total number of
+repetitions, the number of repetitions that have failed, and the failure threshold, a
+developer can choose to have an instance of `{RepetitionInfo}` injected into a
+`@RepeatedTest`, `@BeforeEach`, or `@AfterEach` method.
 
 [[writing-tests-repeated-tests-examples]]
 ==== Repeated Test Examples
@@ -1049,11 +1072,15 @@ repetitions programmatically, a developer can choose to have an instance of
 The `RepeatedTestsDemo` class at the end of this section demonstrates several examples of
 repeated tests.
 
-The `repeatedTest()` method is identical to example from the previous section; whereas,
+The `repeatedTest()` method is identical to the example from the previous section; whereas,
 `repeatedTestWithRepetitionInfo()` demonstrates how to have an instance of
 `RepetitionInfo` injected into a test to access the total number of repetitions for the
 current repeated test.
 
+`repeatedTestWithFailureThreshold()` demonstrates how to set a failure threshold and
+simulates an unexpected failure for every second repetition. The resulting behavior can be
+viewed in the `ConsoleLauncher` output at the end of this section.
+
 The next two methods demonstrate how to include a custom `@DisplayName` for the
 `@RepeatedTest` method in the display name of each repetition. `customDisplayName()`
 combines a custom display name with a custom pattern and then uses `TestInfo` to verify
@@ -1089,6 +1116,10 @@ INFO: About to execute repetition 2 of 5 for repeatedTestWithRepetitionInfo
 INFO: About to execute repetition 3 of 5 for repeatedTestWithRepetitionInfo
 INFO: About to execute repetition 4 of 5 for repeatedTestWithRepetitionInfo
 INFO: About to execute repetition 5 of 5 for repeatedTestWithRepetitionInfo
+INFO: About to execute repetition 1 of 8 for repeatedTestWithFailureThreshold
+INFO: About to execute repetition 2 of 8 for repeatedTestWithFailureThreshold
+INFO: About to execute repetition 3 of 8 for repeatedTestWithFailureThreshold
+INFO: About to execute repetition 4 of 8 for repeatedTestWithFailureThreshold
 INFO: About to execute repetition 1 of 1 for customDisplayName
 INFO: About to execute repetition 1 of 1 for customDisplayNameWithLongPattern
 INFO: About to execute repetition 1 of 5 for repeatedTestInGerman
@@ -1125,6 +1156,15 @@ When using the `ConsoleLauncher` with the unicode theme enabled, execution of
 │  │  ├─ repetition 3 of 5 ✔
 │  │  ├─ repetition 4 of 5 ✔
 │  │  └─ repetition 5 of 5 ✔
+│  ├─ repeatedTestWithFailureThreshold(RepetitionInfo) ✔
+│  │  ├─ repetition 1 of 8 ✔
+│  │  ├─ repetition 2 of 8 ✘ Boom!
+│  │  ├─ repetition 3 of 8 ✔
+│  │  ├─ repetition 4 of 8 ✘ Boom!
+│  │  ├─ repetition 5 of 8 ↷ Failure threshold [2] exceeded
+│  │  ├─ repetition 6 of 8 ↷ Failure threshold [2] exceeded
+│  │  ├─ repetition 7 of 8 ↷ Failure threshold [2] exceeded
+│  │  └─ repetition 8 of 8 ↷ Failure threshold [2] exceeded
 │  ├─ Repeat! ✔
 │  │  └─ Repeat! 1/1 ✔
 │  ├─ Details... ✔
diff --git a/documentation/src/test/java/example/RepeatedTestsDemo.java b/documentation/src/test/java/example/RepeatedTestsDemo.java
index ccf468456466..49bf59274aa7 100644
--- a/documentation/src/test/java/example/RepeatedTestsDemo.java
+++ b/documentation/src/test/java/example/RepeatedTestsDemo.java
@@ -12,6 +12,7 @@
 
 // tag::user_guide[]
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.logging.Logger;
 
@@ -21,6 +22,10 @@
 import org.junit.jupiter.api.RepetitionInfo;
 import org.junit.jupiter.api.TestInfo;
 
+// end::user_guide[]
+// Use fully-qualified names to avoid having them show up in the imports.
+@org.junit.jupiter.api.parallel.Execution(org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD)
+// tag::user_guide[]
 class RepeatedTestsDemo {
 
 	private Logger logger = // ...
@@ -47,6 +52,18 @@ void repeatedTestWithRepetitionInfo(RepetitionInfo repetitionInfo) {
 		assertEquals(5, repetitionInfo.getTotalRepetitions());
 	}
 
+	// end::user_guide[]
+	// Use fully-qualified name to avoid having it show up in the imports.
+	@org.junit.jupiter.api.Disabled("intentional failures would break the build")
+	// tag::user_guide[]
+	@RepeatedTest(value = 8, failureThreshold = 2)
+	void repeatedTestWithFailureThreshold(RepetitionInfo repetitionInfo) {
+		// Simulate unexpected failure every second repetition
+		if (repetitionInfo.getCurrentRepetition() % 2 == 0) {
+			fail("Boom!");
+		}
+	}
+
 	@RepeatedTest(value = 1, name = "{displayName} {currentRepetition}/{totalRepetitions}")
 	@DisplayName("Repeat!")
 	void customDisplayName(TestInfo testInfo) {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
index c05ee41d0318..05b51d6f1983 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepeatedTest.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
@@ -24,7 +25,7 @@
  * {@code @RepeatedTest} is used to signal that the annotated method is a
  * <em>test template</em> method that should be repeated a {@linkplain #value
  * specified number of times} with a configurable {@linkplain #name display
- * name}.
+ * name} and an optional {@linkplain #failureThreshold() failure threshold}.
  *
  * <p>Each invocation of the repeated test behaves like the execution of a
  * regular {@link Test @Test} method with full support for the same lifecycle
@@ -152,6 +153,38 @@
 	 */
 	String name() default SHORT_DISPLAY_NAME;
 
+	/**
+	 * Configures the number of failures after which remaining repetitions will
+	 * be automatically skipped.
+	 *
+	 * <p>Set this to a positive number less than the total {@linkplain #value()
+	 * number of repetitions} in order to skip the invocations of remaining
+	 * repetitions after the specified number of failures has been encountered.
+	 *
+	 * <p>For example, if you are using {@code @RepeatedTest} to repeatedly invoke
+	 * a test that you suspect to be <em>flaky</em>, a single failure is sufficient
+	 * to demonstrate that the test is flaky, and there is no need to invoke the
+	 * remaining repetitions. To support that specific use case, set
+	 * {@code failureThreshold = 1}. You can alternatively set the threshold to
+	 * a number greater than {@code 1} depending on your use case.
+	 *
+	 * <p>Defaults to {@link Integer#MAX_VALUE}, signaling that no failure
+	 * threshold will be applied, which effectively means that the specified
+	 * {@linkplain #value() number of repetitions} will be invoked regardless of
+	 * whether any repetitions fail.
+	 *
+	 * <p><strong>WARNING</strong>: if the repetitions of a {@code @RepeatedTest}
+	 * method are executed in parallel, no guarantees can be made regarding the
+	 * failure threshold. It is therefore recommended that a {@code @RepeatedTest}
+	 * method be annotated with
+	 * {@link org.junit.jupiter.api.parallel.Execution @Execution(SAME_THREAD)}
+	 * when parallel execution is configured.
+	 *
+	 * @since 5.10
+	 * @return the failure threshold; must be greater than zero and less than the
+	 * total number of repetitions
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
 	int failureThreshold() default Integer.MAX_VALUE;
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
index e1e50d62ba2b..77c214f92c19 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/RepetitionInfo.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
@@ -50,8 +51,24 @@ public interface RepetitionInfo {
 	 */
 	int getTotalRepetitions();
 
-	int getFailureThreshold();
-
+	/**
+	 * Get the current number of repetitions of the corresponding
+	 * {@link RepeatedTest @RepeatedTest} method that have ended in a failure.
+	 *
+	 * @since 5.10
+	 * @see #getFailureThreshold()
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
 	int getFailureCount();
 
+	/**
+	 * Get the configured failure threshold of the corresponding
+	 * {@link RepeatedTest @RepeatedTest} method.
+	 *
+	 * @since 5.10
+	 * @see RepeatedTest#failureThreshold()
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
+	int getFailureThreshold();
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
index 31ac3530fa2a..268b5c474e52 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestTemplateInvocationContext.java
@@ -66,8 +66,4 @@ default List<Extension> getAdditionalExtensions() {
 		return emptyList();
 	}
 
-	default boolean shouldBeSkipped() {
-		return false;
-	}
-
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
index 46f0b8795f99..ab45e058dfca 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java
@@ -76,13 +76,4 @@ public void after(JupiterEngineExecutionContext context) {
 		invocationContext = null;
 	}
 
-	@Override
-	public SkipResult shouldBeSkipped(JupiterEngineExecutionContext context) throws Exception {
-		if (this.invocationContext.shouldBeSkipped()) {
-			return SkipResult.skip(
-				this.invocationContext.getClass().getSimpleName() + " signalled that the invocation should be skipped");
-		}
-		return super.shouldBeSkipped(context);
-	}
-
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DefaultRepetitionInfo.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DefaultRepetitionInfo.java
new file mode 100644
index 000000000000..feca90ee7137
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/DefaultRepetitionInfo.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.RepetitionInfo;
+import org.junit.platform.commons.util.ToStringBuilder;
+
+/**
+ * Default implementation of {@link RepetitionInfo}.
+ */
+class DefaultRepetitionInfo implements RepetitionInfo {
+
+	final int currentRepetition;
+	final int totalRepetitions;
+	final AtomicInteger failureCount;
+	final int failureThreshold;
+
+	DefaultRepetitionInfo(int currentRepetition, int totalRepetitions, AtomicInteger failureCount,
+			int failureThreshold) {
+		this.currentRepetition = currentRepetition;
+		this.totalRepetitions = totalRepetitions;
+		this.failureCount = failureCount;
+		this.failureThreshold = failureThreshold;
+	}
+
+	@Override
+	public int getCurrentRepetition() {
+		return this.currentRepetition;
+	}
+
+	@Override
+	public int getTotalRepetitions() {
+		return this.totalRepetitions;
+	}
+
+	@Override
+	public int getFailureCount() {
+		return this.failureCount.get();
+	}
+
+	@Override
+	public int getFailureThreshold() {
+		return this.failureThreshold;
+	}
+
+	@Override
+	public String toString() {
+		// @formatter:off
+		return new ToStringBuilder(this)
+				.append("currentRepetition", this.currentRepetition)
+				.append("totalRepetitions", this.totalRepetitions)
+				.append("failureCount", this.failureCount)
+				.append("failureThreshold", this.failureThreshold)
+				.toString();
+		// @formatter:on
+	}
+
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
index f962224cba40..c50ba4bbf9a5 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestExtension.java
@@ -43,14 +43,15 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 		String displayName = context.getDisplayName();
 		RepeatedTest repeatedTest = AnnotationUtils.findAnnotation(testMethod, RepeatedTest.class).get();
 		int totalRepetitions = totalRepetitions(repeatedTest, testMethod);
-		int failureThreshold = failureThreshold(repeatedTest, testMethod);
 		AtomicInteger failureCount = new AtomicInteger();
+		int failureThreshold = failureThreshold(repeatedTest, testMethod);
 		RepeatedTestDisplayNameFormatter formatter = displayNameFormatter(repeatedTest, testMethod, displayName);
 
 		// @formatter:off
 		return IntStream
 				.rangeClosed(1, totalRepetitions)
-				.mapToObj(repetition -> new RepeatedTestInvocationContext(repetition, totalRepetitions, failureThreshold, failureCount, formatter));
+				.mapToObj(repetition -> new DefaultRepetitionInfo(repetition, totalRepetitions, failureCount, failureThreshold))
+				.map(repetitionInfo -> new RepeatedTestInvocationContext(repetitionInfo, formatter));
 		// @formatter:on
 	}
 
@@ -63,8 +64,13 @@ private int totalRepetitions(RepeatedTest repeatedTest, Method method) {
 
 	private int failureThreshold(RepeatedTest repeatedTest, Method method) {
 		int failureThreshold = repeatedTest.failureThreshold();
-		Preconditions.condition(failureThreshold > 0, () -> String.format(
-			"Configuration error: @RepeatedTest on method [%s] must be declared with a positive 'failureThreshold'.", method));
+		if (failureThreshold != Integer.MAX_VALUE) {
+			int repetitions = repeatedTest.value();
+			Preconditions.condition((failureThreshold > 0) && (failureThreshold < repetitions),
+				() -> String.format("Configuration error: @RepeatedTest on method [%s] must declare a "
+						+ "'failureThreshold' greater than zero and less than the total number of repetitions [%d].",
+					method, repetitions));
+		}
 		return failureThreshold;
 	}
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
index 71016d778061..46180ca046c3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepeatedTestInvocationContext.java
@@ -13,7 +13,6 @@
 import static java.util.Collections.singletonList;
 
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
@@ -25,36 +24,24 @@
  */
 class RepeatedTestInvocationContext implements TestTemplateInvocationContext {
 
-	private final int currentRepetition;
-	private final int totalRepetitions;
-	private final int failureThreshold;
-	private final AtomicInteger failureCount;
+	private final DefaultRepetitionInfo repetitionInfo;
 	private final RepeatedTestDisplayNameFormatter formatter;
 
-	public RepeatedTestInvocationContext(int currentRepetition, int totalRepetitions, int failureThreshold,
-			AtomicInteger failureCount, RepeatedTestDisplayNameFormatter formatter) {
+	public RepeatedTestInvocationContext(DefaultRepetitionInfo repetitionInfo,
+			RepeatedTestDisplayNameFormatter formatter) {
 
-		this.currentRepetition = currentRepetition;
-		this.totalRepetitions = totalRepetitions;
-		this.failureThreshold = failureThreshold;
-		this.failureCount = failureCount;
+		this.repetitionInfo = repetitionInfo;
 		this.formatter = formatter;
 	}
 
 	@Override
 	public String getDisplayName(int invocationIndex) {
-		return this.formatter.format(this.currentRepetition, this.totalRepetitions);
+		return this.formatter.format(this.repetitionInfo.currentRepetition, this.repetitionInfo.totalRepetitions);
 	}
 
 	@Override
 	public List<Extension> getAdditionalExtensions() {
-		return singletonList(new RepetitionInfoParameterResolver(this.currentRepetition, this.totalRepetitions,
-			this.failureThreshold, this.failureCount));
-	}
-
-	@Override
-	public boolean shouldBeSkipped() {
-		return this.failureCount.get() >= this.failureThreshold;
+		return singletonList(new RepetitionExtension(this.repetitionInfo));
 	}
 
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java
new file mode 100644
index 000000000000..1d667b299a29
--- /dev/null
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionExtension.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.junit.jupiter.api.extension.ConditionEvaluationResult.disabled;
+import static org.junit.jupiter.api.extension.ConditionEvaluationResult.enabled;
+
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.RepetitionInfo;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.TestWatcher;
+
+/**
+ * {@code RepetitionExtension} implements the following extension APIs to support
+ * repetitions of a {@link RepeatedTest @RepeatedTest} method.
+ *
+ * <ul>
+ * <li>{@link ParameterResolver} to resolve {@link RepetitionInfo} arguments</li>
+ * <li>{@link TestWatcher} to track the {@linkplain RepetitionInfo#getFailureCount()
+ * failure count}</li>
+ * <li>{@link ExecutionCondition} to disable the repetition if the
+ * {@linkplain RepetitionInfo#getFailureThreshold() failure threshold} has been
+ * exceeded</li>
+ * </ul>
+ *
+ * @since 5.0
+ */
+class RepetitionExtension implements ParameterResolver, TestWatcher, ExecutionCondition {
+
+	private final DefaultRepetitionInfo repetitionInfo;
+
+	RepetitionExtension(DefaultRepetitionInfo repetitionInfo) {
+		this.repetitionInfo = repetitionInfo;
+	}
+
+	@Override
+	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		return (parameterContext.getParameter().getType() == RepetitionInfo.class);
+	}
+
+	@Override
+	public RepetitionInfo resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		return this.repetitionInfo;
+	}
+
+	@Override
+	public void testFailed(ExtensionContext context, Throwable cause) {
+		this.repetitionInfo.failureCount.incrementAndGet();
+	}
+
+	@Override
+	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+		int failureThreshold = this.repetitionInfo.failureThreshold;
+		if (this.repetitionInfo.failureCount.get() >= failureThreshold) {
+			return disabled("Failure threshold [" + failureThreshold + "] exceeded");
+		}
+		return enabled("Failure threshold not exceeded");
+	}
+
+}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
deleted file mode 100644
index ecbaa310df2d..000000000000
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/RepetitionInfoParameterResolver.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.engine.extension;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.jupiter.api.RepetitionInfo;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ParameterContext;
-import org.junit.jupiter.api.extension.ParameterResolver;
-import org.junit.jupiter.api.extension.TestWatcher;
-import org.junit.platform.commons.util.ToStringBuilder;
-
-/**
- * {@link ParameterResolver} that resolves the {@link RepetitionInfo} for
- * the currently executing {@code @RepeatedTest}.
- *
- * @since 5.0
- */
-class RepetitionInfoParameterResolver implements ParameterResolver, TestWatcher {
-
-	private final int currentRepetition;
-	private final int totalRepetitions;
-	private final int failureThreshold;
-	private final AtomicInteger failureCount;
-
-	public RepetitionInfoParameterResolver(int currentRepetition, int totalRepetitions, int failureThreshold,
-			AtomicInteger failureCount) {
-		this.currentRepetition = currentRepetition;
-		this.totalRepetitions = totalRepetitions;
-		this.failureThreshold = failureThreshold;
-		this.failureCount = failureCount;
-	}
-
-	@Override
-	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
-		return (parameterContext.getParameter().getType() == RepetitionInfo.class);
-	}
-
-	@Override
-	public RepetitionInfo resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
-		return new DefaultRepetitionInfo(this.currentRepetition, this.totalRepetitions, this.failureThreshold,
-			this.failureCount.get());
-	}
-
-	@Override
-	public void testFailed(ExtensionContext context, Throwable cause) {
-		this.failureCount.incrementAndGet();
-	}
-
-	private static class DefaultRepetitionInfo implements RepetitionInfo {
-
-		private final int currentRepetition;
-		private final int totalRepetitions;
-		private final int failureThreshold;
-		private final int failureCount;
-
-		public DefaultRepetitionInfo(int currentRepetition, int totalRepetitions, int failureThreshold,
-				int failureCount) {
-			this.currentRepetition = currentRepetition;
-			this.totalRepetitions = totalRepetitions;
-			this.failureThreshold = failureThreshold;
-			this.failureCount = failureCount;
-		}
-
-		@Override
-		public int getCurrentRepetition() {
-			return this.currentRepetition;
-		}
-
-		@Override
-		public int getTotalRepetitions() {
-			return this.totalRepetitions;
-		}
-
-		@Override
-		public int getFailureThreshold() {
-			return this.failureThreshold;
-		}
-
-		@Override
-		public int getFailureCount() {
-			return this.failureCount;
-		}
-
-		@Override
-		public String toString() {
-			// @formatter:off
-			return new ToStringBuilder(this)
-					.append("currentRepetition", this.currentRepetition)
-					.append("totalRepetitions", this.totalRepetitions)
-					.append("failureThreshold", this.failureThreshold)
-					.append("failureCount", this.failureCount)
-					.toString();
-			// @formatter:on
-		}
-
-	}
-
-}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
index e716ec5189f0..8a8c8f2b2248 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
@@ -13,21 +13,38 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.engine.Constants.DEFAULT_PARALLEL_EXECUTION_MODE;
+import static org.junit.jupiter.engine.Constants.PARALLEL_CONFIG_FIXED_PARALLELISM_PROPERTY_NAME;
+import static org.junit.jupiter.engine.Constants.PARALLEL_CONFIG_STRATEGY_PROPERTY_NAME;
+import static org.junit.jupiter.engine.Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 import static org.junit.platform.testkit.engine.EventConditions.container;
 import static org.junit.platform.testkit.engine.EventConditions.displayName;
 import static org.junit.platform.testkit.engine.EventConditions.event;
+import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
+import static org.junit.platform.testkit.engine.EventConditions.skippedWithReason;
+import static org.junit.platform.testkit.engine.EventConditions.started;
+import static org.junit.platform.testkit.engine.EventConditions.test;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
 
+import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.RepetitionInfo;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.testkit.engine.Events;
 
 /**
@@ -38,37 +55,6 @@
  */
 class RepeatedTestTests extends AbstractJupiterTestEngineTests {
 
-	private static int fortyTwo = 0;
-
-	@BeforeEach
-	@AfterEach
-	void beforeAndAfterEach(TestInfo testInfo, RepetitionInfo repetitionInfo) {
-		if (testInfo.getTestMethod().get().getName().equals("repeatedOnce")) {
-			assertThat(repetitionInfo.getCurrentRepetition()).isEqualTo(1);
-			assertThat(repetitionInfo.getTotalRepetitions()).isEqualTo(1);
-		}
-		else if (testInfo.getTestMethod().get().getName().equals("repeatedFortyTwoTimes")) {
-			assertThat(repetitionInfo.getCurrentRepetition()).isBetween(1, 42);
-			assertThat(repetitionInfo.getTotalRepetitions()).isEqualTo(42);
-		}
-	}
-
-	@AfterAll
-	static void afterAll() {
-		assertEquals(42, fortyTwo);
-	}
-
-	@RepeatedTest(1)
-	void repeatedOnce(TestInfo testInfo) {
-		assertThat(testInfo.getDisplayName()).isEqualTo("repetition 1 of 1");
-	}
-
-	@RepeatedTest(42)
-	void repeatedFortyTwoTimes(TestInfo testInfo) {
-		assertThat(testInfo.getDisplayName()).matches("repetition \\d+ of 42");
-		fortyTwo++;
-	}
-
 	@RepeatedTest(1)
 	@DisplayName("Repeat!")
 	void customDisplayName(TestInfo testInfo) {
@@ -124,40 +110,219 @@ void injectRepetitionInfo(TestInfo testInfo, RepetitionInfo repetitionInfo) {
 		assertThat(repetitionInfo.getTotalRepetitions()).isEqualTo(5);
 	}
 
-	@RepeatedTest(1)
-	void failsContainerOnEmptyPattern() {
-		executeTest("testWithEmptyPattern").assertThatEvents() //
-				.haveExactly(1, event(container(), displayName("testWithEmptyPattern()"), //
-					finishedWithFailure(message(value -> value.contains("must be declared with a non-empty name")))));
-	}
+	@Nested
+	class LifecycleMethodTests {
 
-	@RepeatedTest(1)
-	void failsContainerOnBlankPattern() {
-		executeTest("testWithBlankPattern").assertThatEvents() //
-				.haveExactly(1, event(container(), displayName("testWithBlankPattern()"), //
-					finishedWithFailure(message(value -> value.contains("must be declared with a non-empty name")))));
-	}
+		private static int fortyTwo = 0;
 
-	@RepeatedTest(1)
-	void failsContainerOnNegativeRepeatCount() {
-		executeTest("negativeRepeatCount").assertThatEvents() //
-				.haveExactly(1, event(container(), displayName("negativeRepeatCount()"), //
-					finishedWithFailure(message(value -> value.contains("must be declared with a positive 'value'")))));
-	}
+		@AfterAll
+		static void afterAll() {
+			assertEquals(42, fortyTwo);
+		}
+
+		@BeforeEach
+		@AfterEach
+		void beforeAndAfterEach(TestInfo testInfo, RepetitionInfo repetitionInfo) {
+			switch (testInfo.getTestMethod().get().getName()) {
+				case "repeatedOnce": {
+					assertThat(repetitionInfo.getCurrentRepetition()).isEqualTo(1);
+					assertThat(repetitionInfo.getTotalRepetitions()).isEqualTo(1);
+					break;
+				}
+				case "repeatedFortyTwoTimes": {
+					assertThat(repetitionInfo.getCurrentRepetition()).isBetween(1, 42);
+					assertThat(repetitionInfo.getTotalRepetitions()).isEqualTo(42);
+					break;
+				}
+			}
+		}
+
+		@RepeatedTest(1)
+		void repeatedOnce(TestInfo testInfo) {
+			assertThat(testInfo.getDisplayName()).isEqualTo("repetition 1 of 1");
+		}
+
+		@RepeatedTest(42)
+		void repeatedFortyTwoTimes(TestInfo testInfo) {
+			assertThat(testInfo.getDisplayName()).matches("repetition \\d+ of 42");
+			fortyTwo++;
+		}
 
-	@RepeatedTest(1)
-	void failsContainerOnZeroRepeatCount() {
-		executeTest("zeroRepeatCount").assertThatEvents() //
-				.haveExactly(1, event(container(), displayName("zeroRepeatCount()"), //
-					finishedWithFailure(message(value -> value.contains("must be declared with a positive 'value'")))));
 	}
 
-	private Events executeTest(String methodName) {
-		return executeTests(selectMethod(TestCase.class, methodName)).allEvents();
+	@Nested
+	class FailureTests {
+
+		private static final Condition<Throwable> emptyPattern = message(
+			value -> value.contains("must be declared with a non-empty name"));
+
+		private static final Condition<Throwable> invalidRepetitionCount = message(
+			value -> value.contains("must be declared with a positive 'value'"));
+
+		private static final Condition<Throwable> invalidThreshold = message(value -> value.endsWith(
+			"must declare a 'failureThreshold' greater than zero and less than the total number of repetitions [10]."));
+
+		@BeforeEach
+		void resetCounter() {
+			TestCase.counter.set(0);
+		}
+
+		@Test
+		void failsContainerForEmptyPattern() {
+			executeTest("testWithEmptyPattern").assertThatEvents() //
+					.haveExactly(1, event(container(), displayName("testWithEmptyPattern()"), //
+						finishedWithFailure(emptyPattern)));
+		}
+
+		@Test
+		void failsContainerForBlankPattern() {
+			executeTest("testWithBlankPattern").assertThatEvents() //
+					.haveExactly(1, event(container(), displayName("testWithBlankPattern()"), //
+						finishedWithFailure(emptyPattern)));
+		}
+
+		@Test
+		void failsContainerForNegativeRepeatCount() {
+			executeTest("negativeRepeatCount").assertThatEvents() //
+					.haveExactly(1, event(container(), displayName("negativeRepeatCount()"), //
+						finishedWithFailure(invalidRepetitionCount)));
+		}
+
+		@Test
+		void failsContainerForZeroRepeatCount() {
+			executeTest("zeroRepeatCount").assertThatEvents() //
+					.haveExactly(1, event(container(), displayName("zeroRepeatCount()"), //
+						finishedWithFailure(invalidRepetitionCount)));
+		}
+
+		@Test
+		void failsContainerForFailureThresholdSetToNegativeValue() {
+			executeTest("failureThresholdSetToNegativeValue").assertThatEvents() //
+					.haveExactly(1, event(container(), displayName("failureThresholdSetToNegativeValue()"), //
+						finishedWithFailure(invalidThreshold)));
+		}
+
+		@Test
+		void failsContainerForFailureThresholdSetToZero() {
+			executeTest("failureThresholdSetToZero").assertThatEvents() //
+					.haveExactly(1, event(container(), displayName("failureThresholdSetToZero()"), //
+						finishedWithFailure(invalidThreshold)));
+		}
+
+		@Test
+		void failsContainerForFailureThresholdGreaterThanRepetitionCount() {
+			executeTest("failureThresholdGreaterThanRepetitionCount").assertThatEvents() //
+					.haveExactly(1, event(container(), displayName("failureThresholdGreaterThanRepetitionCount()"), //
+						finishedWithFailure(invalidThreshold)));
+		}
+
+		@Test
+		void failsContainerForFailureThresholdEqualToRepetitionCount() {
+			executeTest("failureThresholdEqualToRepetitionCount").assertThatEvents() //
+					.haveExactly(1, event(container(), displayName("failureThresholdEqualToRepetitionCount()"), //
+						finishedWithFailure(invalidThreshold)));
+		}
+
+		@Test
+		void failureThresholdEqualToRepetitionCountMinusOne() {
+			String methodName = "failureThresholdEqualToRepetitionCountMinusOne";
+			// @formatter:off
+			executeTest(methodName).assertEventsMatchLooselyInOrder(
+				event(container(methodName), started()),
+				event(test("test-template-invocation:#1"), finishedWithFailure(message("Boom!"))),
+				event(test("test-template-invocation:#2"), finishedWithFailure(message("Boom!"))),
+				event(test("test-template-invocation:#3"), skippedWithReason("Failure threshold [2] exceeded")),
+				event(container(methodName), finishedSuccessfully()));
+			// @formatter:on
+		}
+
+		@Test
+		void failureThreshold1() {
+			String methodName = "failureThreshold1";
+			// @formatter:off
+			executeTest(methodName).assertEventsMatchLooselyInOrder(
+				event(container(methodName), started()),
+				event(test("test-template-invocation:#1"), finishedSuccessfully()),
+				event(test("test-template-invocation:#2"), finishedWithFailure(message("Boom!"))),
+				event(test("test-template-invocation:#3"), skippedWithReason("Failure threshold [1] exceeded")),
+				event(container(methodName), finishedSuccessfully()));
+			// @formatter:on
+		}
+
+		@Test
+		void failureThreshold2() {
+			String methodName = "failureThreshold2";
+			// @formatter:off
+			executeTest(methodName).assertEventsMatchLooselyInOrder(
+				event(container(methodName), started()),
+				event(test("test-template-invocation:#1"), finishedSuccessfully()),
+				event(test("test-template-invocation:#2"), finishedWithFailure(message("Boom!"))),
+				event(test("test-template-invocation:#3"), finishedWithFailure(message("Boom!"))),
+				event(test("test-template-invocation:#4"), skippedWithReason("Failure threshold [2] exceeded")),
+				event(container(methodName), finishedSuccessfully()));
+			// @formatter:on
+		}
+
+		@Test
+		void failureThreshold3() {
+			String methodName = "failureThreshold3";
+			// @formatter:off
+			executeTest(methodName).assertEventsMatchLooselyInOrder(
+				event(container(methodName), started()),
+				event(test("test-template-invocation:#1"), finishedSuccessfully()),
+				event(test("test-template-invocation:#2"), finishedWithFailure(message("Boom!"))),
+				event(test("test-template-invocation:#3"), finishedSuccessfully()),
+				event(test("test-template-invocation:#4"), finishedWithFailure(message("Boom!"))),
+				event(test("test-template-invocation:#5"), finishedSuccessfully()),
+				event(test("test-template-invocation:#6"), finishedWithFailure(message("Boom!"))),
+				event(test("test-template-invocation:#7"), skippedWithReason("Failure threshold [3] exceeded")),
+				event(test("test-template-invocation:#8"), skippedWithReason("Failure threshold [3] exceeded")),
+				event(container(methodName), finishedSuccessfully()));
+			// @formatter:on
+		}
+
+		@Test
+		void failureThresholdWithConcurrentExecution() {
+			Class<TestCase> testClass = TestCase.class;
+			String methodName = "failureThresholdWithConcurrentExecution";
+			Method method = ReflectionUtils.findMethod(testClass, methodName).get();
+			LauncherDiscoveryRequest request = request()//
+					.selectors(selectMethod(testClass, method))//
+					.configurationParameter(PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true")//
+					.configurationParameter(DEFAULT_PARALLEL_EXECUTION_MODE, "concurrent")//
+					.configurationParameter(PARALLEL_CONFIG_STRATEGY_PROPERTY_NAME, "fixed")//
+					.configurationParameter(PARALLEL_CONFIG_FIXED_PARALLELISM_PROPERTY_NAME, "4")//
+					.build();
+
+			Events tests = executeTests(request).testEvents();
+
+			// There are 20 repetitions/tests in total.
+			assertThat(tests.dynamicallyRegistered().count()).as("registered").isEqualTo(20);
+			assertThat(tests.started().count() + tests.skipped().count()).as("started or skipped").isEqualTo(20);
+			// Would be 3 successful tests without parallel execution, but with race conditions
+			// and multiple threads we may encounter more; and yet we still should not
+			// encounter too many.
+			assertThat(tests.succeeded().count()).as("succeeded").isBetween(3L, 10L);
+			// Would be 3 failed tests without parallel execution, but with race conditions
+			// and multiple threads we may encounter more.
+			assertThat(tests.failed().count()).as("failed").isGreaterThanOrEqualTo(3);
+			// Would be 14 skipped tests without parallel execution, but with race conditions
+			// and multiple threads we may not encounter many.
+			assertThat(tests.skipped().count()).as("skipped").isGreaterThan(0);
+		}
+
+		private Events executeTest(String methodName) {
+			Class<TestCase> testClass = TestCase.class;
+			Method method = ReflectionUtils.findMethod(testClass, methodName).get();
+			return executeTests(selectMethod(testClass, method)).allEvents();
+		}
+
 	}
 
 	static class TestCase {
 
+		static final AtomicInteger counter = new AtomicInteger();
+
 		@RepeatedTest(value = 1, name = "")
 		void testWithEmptyPattern() {
 		}
@@ -174,12 +339,63 @@ void negativeRepeatCount() {
 		void zeroRepeatCount() {
 		}
 
-		@RepeatedTest(value = 10, failureThreshold = 2)
-		void failureThreshold(RepetitionInfo info) {
-			if (info.getCurrentRepetition() > 5) {
+		@RepeatedTest(value = 10, failureThreshold = -1)
+		void failureThresholdSetToNegativeValue() {
+			fail("Boom!");
+		}
+
+		@RepeatedTest(value = 10, failureThreshold = 0)
+		void failureThresholdSetToZero() {
+			fail("Boom!");
+		}
+
+		@RepeatedTest(value = 10, failureThreshold = 11)
+		void failureThresholdGreaterThanRepetitionCount() {
+			fail("Boom!");
+		}
+
+		@RepeatedTest(value = 10, failureThreshold = 10)
+		void failureThresholdEqualToRepetitionCount() {
+			fail("Boom!");
+		}
+
+		@RepeatedTest(value = 3, failureThreshold = 2)
+		void failureThresholdEqualToRepetitionCountMinusOne() {
+			fail("Boom!");
+		}
+
+		@RepeatedTest(value = 3, failureThreshold = 1)
+		void failureThreshold1() {
+			int count = counter.incrementAndGet();
+			if (count > 1) {
+				fail("Boom!");
+			}
+		}
+
+		@RepeatedTest(value = 4, failureThreshold = 2)
+		void failureThreshold2() {
+			int count = counter.incrementAndGet();
+			if (count > 1) {
+				fail("Boom!");
+			}
+		}
+
+		@RepeatedTest(value = 8, failureThreshold = 3)
+		void failureThreshold3() {
+			int count = counter.incrementAndGet();
+			if ((count > 1) && (count % 2 == 0)) {
+				fail("Boom!");
+			}
+		}
+
+		@RepeatedTest(value = 20, failureThreshold = 3)
+		void failureThresholdWithConcurrentExecution() {
+			int count = counter.incrementAndGet();
+			if ((count > 1) && (count % 2 == 0)) {
 				fail("Boom!");
 			}
 		}
 
 	}
+
 }

From 80f7fff2b21551105260357395a3419761bdcdb5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 21 Apr 2023 14:04:30 +0200
Subject: [PATCH 1177/1433] Promote experimental APIs

Resolves #3248.

Co-authored-by: Sam Brannen <sam@sambrannen.com>
Co-authored-by: Christian Stein <sormuras@gmail.com>
Co-authored-by: Matthias Merdes <mmerdes@users.noreply.github.com>
---
 .../org/junit/jupiter/api/Assertions.java     | 13 ++++---
 .../junit/jupiter/api/ClassDescriptor.java    |  4 +--
 .../org/junit/jupiter/api/ClassOrderer.java   |  3 +-
 .../jupiter/api/ClassOrdererContext.java      |  4 +--
 .../jupiter/api/DisplayNameGenerator.java     |  3 +-
 .../api/IndicativeSentencesGeneration.java    |  4 +--
 .../junit/jupiter/api/MethodDescriptor.java   |  3 +-
 .../org/junit/jupiter/api/MethodOrderer.java  |  5 ++-
 .../org/junit/jupiter/api/TestClassOrder.java |  4 +--
 .../org/junit/jupiter/api/condition/OS.java   |  3 +-
 .../api/extension/ExtensionContext.java       |  4 +--
 .../api/extension/InvocationInterceptor.java  |  7 ++--
 ...ecycleMethodExecutionExceptionHandler.java |  4 +--
 .../ReflectiveInvocationContext.java          |  4 +--
 .../TestInstancePreDestroyCallback.java       |  3 +-
 .../extension/TestInstantiationException.java |  4 +--
 .../support/TypeBasedParameterResolver.java   |  4 +--
 .../org/junit/jupiter/api/io/TempDir.java     |  3 +-
 .../junit/jupiter/api/parallel/Execution.java |  3 +-
 .../jupiter/api/parallel/ExecutionMode.java   |  4 +--
 .../junit/jupiter/api/parallel/Isolated.java  |  4 +--
 .../api/parallel/ResourceAccessMode.java      |  4 +--
 .../jupiter/api/parallel/ResourceLock.java    |  4 +--
 .../jupiter/api/parallel/ResourceLocks.java   |  4 +--
 .../junit/jupiter/api/parallel/Resources.java | 10 +++---
 .../org/junit/jupiter/engine/Constants.java   | 36 +++++++++----------
 .../jupiter/params/ParameterizedTest.java     |  3 +-
 .../converter/TypedArgumentConverter.java     |  4 +--
 .../params/provider/CsvFileSource.java        |  9 +++--
 .../jupiter/params/provider/CsvSource.java    | 11 +++---
 .../commons/support/AnnotationSupport.java    |  4 +--
 .../commons/support/SearchOption.java         |  4 +--
 .../console/options/AvailableOptions.java     |  4 +--
 .../console/ConsoleLauncherToolProvider.java  |  4 +--
 .../engine/EngineDiscoveryListener.java       |  4 +--
 .../engine/EngineDiscoveryRequest.java        |  3 +-
 .../engine/SelectorResolutionResult.java      |  4 +--
 .../org/junit/platform/engine/UniqueId.java   |  3 +-
 .../engine/discovery/DiscoverySelectors.java  |  4 +--
 .../PrefixedConfigurationParameters.java      |  4 +--
 .../EngineDiscoveryRequestResolver.java       |  8 ++---
 .../support/discovery/SelectorResolver.java   |  9 ++---
 ...arallelExecutionConfigurationStrategy.java |  3 +-
 .../hierarchical/ExclusiveResource.java       |  6 ++--
 ...inPoolHierarchicalTestExecutorService.java |  6 ++--
 .../hierarchical/HierarchicalTestEngine.java  |  6 ++--
 .../HierarchicalTestExecutorService.java      |  4 +--
 .../engine/support/hierarchical/Node.java     | 20 +++++------
 .../ParallelExecutionConfiguration.java       |  3 +-
 ...arallelExecutionConfigurationStrategy.java |  4 +--
 .../support/hierarchical/ResourceLock.java    |  4 +--
 ...ThreadHierarchicalTestExecutorService.java |  4 +--
 .../launcher/EngineDiscoveryResult.java       |  4 +--
 .../org/junit/platform/launcher/Launcher.java |  3 +-
 .../launcher/LauncherDiscoveryListener.java   |  5 +--
 .../launcher/LauncherDiscoveryRequest.java    |  3 +-
 .../platform/launcher/LauncherSession.java    |  4 +--
 .../launcher/LauncherSessionListener.java     |  4 +--
 .../launcher/core/LauncherConfig.java         | 21 ++++++-----
 .../core/LauncherDiscoveryRequestBuilder.java |  7 ++--
 .../launcher/core/LauncherFactory.java        |  7 ++--
 .../discovery/LauncherDiscoveryListeners.java |  4 +--
 .../suite/api/ConfigurationParameter.java     |  5 +--
 .../suite/api/ConfigurationParameters.java    |  5 +--
 .../DisableParentConfigurationParameters.java |  5 +--
 .../suite/api/SelectClasspathResource.java    |  5 +--
 .../suite/api/SelectClasspathResources.java   |  5 +--
 .../platform/suite/api/SelectDirectories.java |  5 +--
 .../junit/platform/suite/api/SelectFile.java  |  5 +--
 .../junit/platform/suite/api/SelectFiles.java |  5 +--
 .../platform/suite/api/SelectModules.java     |  5 +--
 .../junit/platform/suite/api/SelectUris.java  |  5 +--
 .../org/junit/platform/suite/api/Suite.java   |  4 ++-
 .../testkit/engine/EngineTestKit.java         |  6 ++--
 .../testkit/engine/EventConditions.java       |  4 +--
 75 files changed, 209 insertions(+), 207 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index 1240caa55aa2..fbde194825dc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
@@ -3023,7 +3022,7 @@ public static void assertAll(String heading, Stream<Executable> executables) thr
 	 *
 	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	public static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable) {
 		return AssertThrowsExactly.assertThrowsExactly(expectedType, executable);
 	}
@@ -3042,7 +3041,7 @@ public static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType,
 	 *
 	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	public static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable,
 			String message) {
 		return AssertThrowsExactly.assertThrowsExactly(expectedType, executable, message);
@@ -3063,7 +3062,7 @@ public static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType,
 	 *
 	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	public static <T extends Throwable> T assertThrowsExactly(Class<T> expectedType, Executable executable,
 			Supplier<String> messageSupplier) {
 		return AssertThrowsExactly.assertThrowsExactly(expectedType, executable, messageSupplier);
@@ -3567,7 +3566,7 @@ public static <T, E extends Throwable> T assertTimeoutPreemptively(Duration time
 	 *
 	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue) {
 		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue);
 	}
@@ -3583,7 +3582,7 @@ public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue)
 	 *
 	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, String message) {
 		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue, message);
 	}
@@ -3600,7 +3599,7 @@ public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue,
 	 *
 	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	public static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Supplier<String> messageSupplier) {
 		return AssertInstanceOf.assertInstanceOf(expectedType, actualValue, messageSupplier);
 	}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
index 5ad667d13c5c..5773e0b007c5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassDescriptor.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
@@ -24,7 +24,7 @@
  * @since 5.8
  * @see ClassOrdererContext
  */
-@API(status = EXPERIMENTAL, since = "5.8")
+@API(status = STABLE, since = "5.10")
 public interface ClassDescriptor {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
index 04017c02d9a5..2bc852b412a5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrderer.java
@@ -11,7 +11,6 @@
 package org.junit.jupiter.api;
 
 import static java.util.Comparator.comparingInt;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Collections;
@@ -59,7 +58,7 @@
  * @see #orderClasses(ClassOrdererContext)
  * @see MethodOrderer
  */
-@API(status = EXPERIMENTAL, since = "5.8")
+@API(status = STABLE, since = "5.10")
 public interface ClassOrderer {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
index 1ec2e9b899c1..45f60c12679c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/ClassOrdererContext.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.List;
 import java.util.Optional;
@@ -25,7 +25,7 @@
  * @see ClassOrderer
  * @see ClassDescriptor
  */
-@API(status = EXPERIMENTAL, since = "5.8")
+@API(status = STABLE, since = "5.10")
 public interface ClassOrdererContext {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
index 6586a84aff51..22c6ec62551d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.commons.support.ModifierSupport.isStatic;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
@@ -229,7 +228,7 @@ private static String replaceUnderscores(String name) {
 	 *
 	 * @since 5.7
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7")
+	@API(status = STABLE, since = "5.10")
 	class IndicativeSentences implements DisplayNameGenerator {
 
 		static final DisplayNameGenerator INSTANCE = new IndicativeSentences();
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
index 6925a2b69809..97ab817eb4b3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/IndicativeSentencesGeneration.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -47,7 +47,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-@API(status = EXPERIMENTAL, since = "5.7")
+@API(status = STABLE, since = "5.10")
 public @interface IndicativeSentencesGeneration {
 
 	String DEFAULT_SEPARATOR = ", ";
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
index 20550832e137..49f62ab2760b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodDescriptor.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Annotation;
@@ -43,7 +42,7 @@ public interface MethodDescriptor {
 	 * or blank
 	 * @since 5.7
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7")
+	@API(status = STABLE, since = "5.10")
 	String getDisplayName();
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
index 7818020d4b6e..c8269f4a705f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/MethodOrderer.java
@@ -12,7 +12,6 @@
 
 import static java.util.Comparator.comparingInt;
 import static org.apiguardian.api.API.Status.DEPRECATED;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.reflect.Method;
@@ -158,7 +157,7 @@ public Alphanumeric() {
 	 *
 	 * @since 5.7
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7")
+	@API(status = STABLE, since = "5.10")
 	class MethodName implements MethodOrderer {
 
 		public MethodName() {
@@ -189,7 +188,7 @@ private static String parameterList(Method method) {
 	 *
 	 * @since 5.7
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7")
+	@API(status = STABLE, since = "5.10")
 	class DisplayName implements MethodOrderer {
 
 		public DisplayName() {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
index 15eedf5659ae..7658214e7559 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestClassOrder.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -68,7 +68,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-@API(status = EXPERIMENTAL, since = "5.8")
+@API(status = STABLE, since = "5.10")
 public @interface TestClassOrder {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
index 5acb383e3137..adedf30de2a5 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api.condition;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Locale;
@@ -102,7 +101,7 @@ public enum OS {
 	 *
 	 * @since 5.9
 	 */
-	@API(status = EXPERIMENTAL, since = "5.9")
+	@API(status = STABLE, since = "5.10")
 	public static OS current() {
 		return CURRENT_OS;
 	}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index e58f585fdf59..faee7c4f4f35 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -313,7 +313,7 @@ default Method getRequiredTestMethod() {
 	 * @see System#getProperty(String)
 	 * @see org.junit.platform.engine.ConfigurationParameters
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7")
+	@API(status = STABLE, since = "5.10")
 	<T> Optional<T> getConfigurationParameter(String key, Function<String, T> transformer);
 
 	/**
@@ -699,7 +699,7 @@ public int hashCode() {
 		 * @return new namespace; never {@code null}
 		 * @since 5.8
 		 */
-		@API(status = EXPERIMENTAL, since = "5.8")
+		@API(status = STABLE, since = "5.10")
 		public Namespace append(Object... parts) {
 			Preconditions.notEmpty(parts, "parts array must not be null or empty");
 			Preconditions.containsNoNullElements(parts, "individual parts must not be null");
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
index 5d4bbdb2935b..91cf7e35c136 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java
@@ -12,6 +12,7 @@
 
 import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -49,7 +50,7 @@
  * @see ReflectiveInvocationContext
  * @see ExtensionContext
  */
-@API(status = EXPERIMENTAL, since = "5.5")
+@API(status = STABLE, since = "5.10")
 public interface InvocationInterceptor extends Extension {
 
 	/**
@@ -222,7 +223,7 @@ default void interceptAfterAllMethod(Invocation<Void> invocation,
 	 * @param <T> the result type
 	 * @since 5.5
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	interface Invocation<T> {
 
 		/**
@@ -239,7 +240,7 @@ interface Invocation<T> {
 		 * <p>This allows to bypass the check that {@link #proceed()} must be
 		 * called at least once. The default implementation does nothing.
 		 */
-		@API(status = EXPERIMENTAL, since = "5.6")
+		@API(status = STABLE, since = "5.10")
 		default void skip() {
 			// do nothing
 		}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
index 7b7eb21084ab..1852e1b9e8ec 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/LifecycleMethodExecutionExceptionHandler.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.extension;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 
@@ -53,7 +53,7 @@
  * @since 5.5
  * @see TestExecutionExceptionHandler
  */
-@API(status = EXPERIMENTAL, since = "5.5")
+@API(status = STABLE, since = "5.10")
 public interface LifecycleMethodExecutionExceptionHandler extends Extension {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
index 90666658ad6f..1108fce671ea 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ReflectiveInvocationContext.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.extension;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.reflect.Executable;
 import java.util.List;
@@ -26,7 +26,7 @@
  *
  * @since 5.5
  */
-@API(status = EXPERIMENTAL, since = "5.5")
+@API(status = STABLE, since = "5.10")
 public interface ReflectiveInvocationContext<T extends Executable> {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
index 1feab18515e8..dbc9cb547b30 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstancePreDestroyCallback.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api.extension;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.ArrayList;
@@ -108,7 +107,7 @@ public interface TestInstancePreDestroyCallback extends Extension {
 	 * {@code null}
 	 * @since 5.7.1
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7.1")
+	@API(status = STABLE, since = "5.10")
 	static void preDestroyTestInstances(ExtensionContext context, Consumer<Object> callback) {
 		List<Object> destroyedInstances = new ArrayList<>(context.getRequiredTestInstances().getAllInstances());
 		for (Optional<ExtensionContext> current = context.getParent(); current.isPresent(); current = current.get().getParent()) {
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
index e8c5920bf3aa..46ae5de4dba3 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationException.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.extension;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
@@ -21,7 +21,7 @@
  *
  * @since 5.3
  */
-@API(status = EXPERIMENTAL, since = "5.3")
+@API(status = STABLE, since = "5.10")
 public class TestInstantiationException extends JUnitException {
 
 	private static final long serialVersionUID = 1L;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
index 0346fc0bb3ba..2df41aed6a76 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.extension.support;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -28,7 +28,7 @@
  * @param <T> the type of the parameter supported by this {@code ParameterResolver}
  * @since 5.6
  */
-@API(status = EXPERIMENTAL, since = "5.6")
+@API(status = STABLE, since = "5.10")
 public abstract class TypeBasedParameterResolver<T> implements ParameterResolver {
 
 	private final Type supportedParameterType;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 8d0e6dad480a..2352f6286cd2 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -12,6 +12,7 @@
 
 import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.io.File;
 import java.io.IOException;
@@ -92,7 +93,7 @@
 @Target({ ElementType.FIELD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@API(status = EXPERIMENTAL, since = "5.4")
+@API(status = STABLE, since = "5.10")
 public @interface TempDir {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index 86d051c6b5bc..822d1a768ec1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.api.parallel;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -48,7 +49,7 @@
  * @see ResourceLock
  * @since 5.3
  */
-@API(status = EXPERIMENTAL, since = "5.3")
+@API(status = STABLE, since = "5.10")
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Inherited
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
index b0b7752a6c4b..b27ade10cec1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ExecutionMode.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.parallel;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 
@@ -21,7 +21,7 @@
  * @see #SAME_THREAD
  * @see #CONCURRENT
  */
-@API(status = EXPERIMENTAL, since = "5.3")
+@API(status = STABLE, since = "5.10")
 public enum ExecutionMode {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
index 5dc97602e4ff..874fd984f844 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Isolated.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.parallel;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -33,7 +33,7 @@
  * @see ExecutionMode
  * @see ResourceLock
  */
-@API(status = EXPERIMENTAL, since = "5.7")
+@API(status = STABLE, since = "5.10")
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Inherited
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
index 30378f53d160..9ada99fc741c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceAccessMode.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.parallel;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 
@@ -20,7 +20,7 @@
  * @since 5.3
  * @see ResourceLock
  */
-@API(status = EXPERIMENTAL, since = "5.3")
+@API(status = STABLE, since = "5.10")
 public enum ResourceAccessMode {
 
 	/**
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
index 4f7f97d403fb..73064926404a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLock.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.parallel;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -46,7 +46,7 @@
  * @see ResourceLocks
  * @since 5.3
  */
-@API(status = EXPERIMENTAL, since = "5.3")
+@API(status = STABLE, since = "5.10")
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Inherited
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
index f15bfbc38797..1e2c2548a729 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/ResourceLocks.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.parallel;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -34,7 +34,7 @@
  * @see ResourceLock
  * @since 5.3
  */
-@API(status = EXPERIMENTAL, since = "5.3")
+@API(status = STABLE, since = "5.10")
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Inherited
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
index ccdbaefe1627..df5fcd7eb98a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Resources.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.api.parallel;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 
@@ -20,7 +20,7 @@
  * @since 5.3
  * @see ResourceLock
  */
-@API(status = EXPERIMENTAL, since = "5.3")
+@API(status = STABLE, since = "5.10")
 public class Resources {
 
 	/**
@@ -54,7 +54,7 @@ public class Resources {
 	 * @since 5.4
 	 * @see java.util.Locale#setDefault(java.util.Locale)
 	 */
-	@API(status = EXPERIMENTAL, since = "5.4")
+	@API(status = STABLE, since = "5.10")
 	public static final String LOCALE = "java.util.Locale.default";
 
 	/**
@@ -64,7 +64,7 @@ public class Resources {
 	 * @since 5.4
 	 * @see java.util.TimeZone#setDefault(java.util.TimeZone)
 	 */
-	@API(status = EXPERIMENTAL, since = "5.4")
+	@API(status = STABLE, since = "5.10")
 	public static final String TIME_ZONE = "java.util.TimeZone.default";
 
 	/**
@@ -74,7 +74,7 @@ public class Resources {
 	 * @see Isolated
 	 * @see org.junit.platform.engine.support.hierarchical.ExclusiveResource
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	public static final String GLOBAL = "org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_KEY";
 
 	private Resources() {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index f99d61d82947..fbde0fc1184c 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -121,7 +121,7 @@ public final class Constants {
 	 *
 	 * @since 5.3
 	 */
-	@API(status = EXPERIMENTAL, since = "5.3")
+	@API(status = STABLE, since = "5.10")
 	public static final String PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME = JupiterConfiguration.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME;
 
 	/**
@@ -129,7 +129,7 @@ public final class Constants {
 	 *
 	 * @see Execution#DEFAULT_EXECUTION_MODE_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.4")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_PARALLEL_EXECUTION_MODE = Execution.DEFAULT_EXECUTION_MODE_PROPERTY_NAME;
 
 	/**
@@ -138,7 +138,7 @@ public final class Constants {
 	 *
 	 * @see Execution#DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME = Execution.DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME;
 
 	static final String PARALLEL_CONFIG_PREFIX = "junit.jupiter.execution.parallel.config.";
@@ -152,7 +152,7 @@ public final class Constants {
 	 *
 	 * @since 5.3
 	 */
-	@API(status = EXPERIMENTAL, since = "5.3")
+	@API(status = STABLE, since = "5.10")
 	public static final String PARALLEL_CONFIG_STRATEGY_PROPERTY_NAME = PARALLEL_CONFIG_PREFIX
 			+ CONFIG_STRATEGY_PROPERTY_NAME;
 
@@ -164,7 +164,7 @@ public final class Constants {
 	 *
 	 * @since 5.3
 	 */
-	@API(status = EXPERIMENTAL, since = "5.3")
+	@API(status = STABLE, since = "5.10")
 	public static final String PARALLEL_CONFIG_FIXED_PARALLELISM_PROPERTY_NAME = PARALLEL_CONFIG_PREFIX
 			+ CONFIG_FIXED_PARALLELISM_PROPERTY_NAME;
 
@@ -211,7 +211,7 @@ public final class Constants {
 	 *
 	 * @since 5.3
 	 */
-	@API(status = EXPERIMENTAL, since = "5.3")
+	@API(status = STABLE, since = "5.10")
 	public static final String PARALLEL_CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME = PARALLEL_CONFIG_PREFIX
 			+ CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME;
 
@@ -222,7 +222,7 @@ public final class Constants {
 	 *
 	 * @since 5.3
 	 */
-	@API(status = EXPERIMENTAL, since = "5.3")
+	@API(status = STABLE, since = "5.10")
 	public static final String PARALLEL_CONFIG_CUSTOM_CLASS_PROPERTY_NAME = PARALLEL_CONFIG_PREFIX
 			+ CONFIG_CUSTOM_CLASS_PROPERTY_NAME;
 
@@ -232,7 +232,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -240,7 +240,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TESTABLE_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -249,7 +249,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TEST_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -258,7 +258,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TEST_TEMPLATE_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -267,7 +267,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_TEST_FACTORY_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -275,7 +275,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_LIFECYCLE_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -284,7 +284,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_BEFORE_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -293,7 +293,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_BEFORE_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -302,7 +302,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_AFTER_EACH_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -311,7 +311,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.5")
+	@API(status = STABLE, since = "5.10")
 	public static final String DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
@@ -319,7 +319,7 @@ public final class Constants {
 	 *
 	 * @see Timeout#TIMEOUT_MODE_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "5.6")
+	@API(status = STABLE, since = "5.10")
 	public static final String TIMEOUT_MODE_PROPERTY_NAME = Timeout.TIMEOUT_MODE_PROPERTY_NAME;
 
 	/**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
index 61fd036c0d9a..4464c67c3363 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.params;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
@@ -241,7 +240,7 @@
 	 * @since 5.8
 	 * @see java.lang.AutoCloseable
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	boolean autoCloseArguments() default true;
 
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
index 505ba540c33a..ba194e446de7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java
@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.params.converter;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ParameterContext;
@@ -28,7 +28,7 @@
  * @see ArgumentConverter
  * @see SimpleArgumentConverter
  */
-@API(status = EXPERIMENTAL, since = "5.7")
+@API(status = STABLE, since = "5.10")
 public abstract class TypedArgumentConverter<S, T> implements ArgumentConverter {
 
 	private final Class<S> sourceType;
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
index 177790713575..4638ea1281e2 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileSource.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.params.provider;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
@@ -123,7 +122,7 @@
 	 *
 	 * @since 5.8.2
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8.2")
+	@API(status = STABLE, since = "5.10")
 	boolean useHeadersInDisplayName() default false;
 
 	/**
@@ -136,7 +135,7 @@
 	 *
 	 * @since 5.8.2
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8.2")
+	@API(status = STABLE, since = "5.10")
 	char quoteCharacter() default '"';
 
 	/**
@@ -211,7 +210,7 @@
 	 *
 	 * @since 5.7
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7")
+	@API(status = STABLE, since = "5.10")
 	int maxCharsPerColumn() default 4096;
 
 	/**
@@ -222,7 +221,7 @@
 	 *
 	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	boolean ignoreLeadingAndTrailingWhitespace() default true;
 
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
index f5985b458cfe..8b3a0bb81fdf 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvSource.java
@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.params.provider;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Documented;
@@ -153,7 +152,7 @@
 	 * @see #value
 	 * @see #quoteCharacter
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8.1")
+	@API(status = STABLE, since = "5.10")
 	String textBlock() default "";
 
 	/**
@@ -186,7 +185,7 @@
 	 *
 	 * @since 5.8.2
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8.2")
+	@API(status = STABLE, since = "5.10")
 	boolean useHeadersInDisplayName() default false;
 
 	/**
@@ -201,7 +200,7 @@
 	 * @since 5.8.2
 	 * @see #textBlock
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8.2")
+	@API(status = STABLE, since = "5.10")
 	char quoteCharacter() default '\'';
 
 	/**
@@ -265,7 +264,7 @@
 	 *
 	 * @since 5.7
 	 */
-	@API(status = EXPERIMENTAL, since = "5.7")
+	@API(status = STABLE, since = "5.10")
 	int maxCharsPerColumn() default 4096;
 
 	/**
@@ -276,7 +275,7 @@
 	 *
 	 * @since 5.8
 	 */
-	@API(status = EXPERIMENTAL, since = "5.8")
+	@API(status = STABLE, since = "5.10")
 	boolean ignoreLeadingAndTrailingWhitespace() default true;
 
 }
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
index 037c9ee509aa..f32dc57a2965 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.commons.support;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -154,7 +154,7 @@ public static <A extends Annotation> Optional<A> findAnnotation(AnnotatedElement
 	 * @see SearchOption
 	 * @see #findAnnotation(AnnotatedElement, Class)
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	public static <A extends Annotation> Optional<A> findAnnotation(Class<?> clazz, Class<A> annotationType,
 			SearchOption searchOption) {
 
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
index 005167ccfa55..55b5ea5e2df9 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/SearchOption.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.commons.support;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 
@@ -21,7 +21,7 @@
  * @see #DEFAULT
  * @see #INCLUDE_ENCLOSING_CLASSES
  */
-@API(status = EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public enum SearchOption {
 
 	/**
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index e80eed132b19..18f6d69936a6 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -112,7 +112,7 @@ static class SelectorOptions {
 				"-scan-classpath" }, converter = ClasspathEntriesConverter.class, arity = "0..1", hidden = true)
 		private List<Path> selectedClasspathEntries2 = new ArrayList<>();
 
-		@Option(names = "--scan-modules", description = "EXPERIMENTAL: Scan all resolved modules for test discovery.")
+		@Option(names = "--scan-modules", description = "Scan all resolved modules for test discovery.")
 		private boolean scanModulepath;
 
 		@Option(names = "-scan-modules", hidden = true)
@@ -141,7 +141,7 @@ static class SelectorOptions {
 		private List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
 
 		@Option(names = { "-o",
-				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "EXPERIMENTAL: Select single module for test discovery. This option can be repeated.")
+				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "Select single module for test discovery. This option can be repeated.")
 		private List<ModuleSelector> selectedModules = new ArrayList<>();
 
 		@Option(names = { "--o",
diff --git a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
index d0a830a4f939..67f152d6af7c 100644
--- a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
+++ b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.console;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.io.PrintWriter;
 import java.util.spi.ToolProvider;
@@ -22,7 +22,7 @@
  *
  * @since 1.6
  */
-@API(status = EXPERIMENTAL, since = "1.6")
+@API(status = STABLE, since = "1.10")
 public class ConsoleLauncherToolProvider implements ToolProvider {
 
 	@Override
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
index 615ce857d5d6..4152ce8f52fa 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryListener.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.engine;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 
@@ -29,7 +29,7 @@
  * @since 1.6
  * @see EngineDiscoveryRequest#getDiscoveryListener()
  */
-@API(status = EXPERIMENTAL, since = "1.6")
+@API(status = STABLE, since = "1.10")
 public interface EngineDiscoveryListener {
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
index e5062594c29c..0ea3b70ce8d7 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/EngineDiscoveryRequest.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.engine;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.List;
@@ -80,7 +79,7 @@ public interface EngineDiscoveryRequest {
 	 * @return the discovery listener; never {@code null}
 	 * @since 1.6
 	 */
-	@API(status = EXPERIMENTAL, since = "1.6")
+	@API(status = STABLE, since = "1.10")
 	default EngineDiscoveryListener getDiscoveryListener() {
 		return EngineDiscoveryListener.NOOP;
 	}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
index 2229101742aa..56ac8d0bce7c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/SelectorResolutionResult.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.engine;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Optional;
 
@@ -26,7 +26,7 @@
  *
  * @since 1.6
  */
-@API(status = EXPERIMENTAL, since = "1.6")
+@API(status = STABLE, since = "1.10")
 public class SelectorResolutionResult {
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
index 1e9b2e0379eb..5e4f13b99661 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/UniqueId.java
@@ -12,7 +12,6 @@
 
 import static java.util.Collections.singletonList;
 import static java.util.Collections.unmodifiableList;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.io.Serializable;
@@ -180,7 +179,7 @@ public final UniqueId append(Segment segment) {
 	 *
 	 * @since 1.8
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	public UniqueId appendEngine(String engineId) {
 		return append(new Segment(ENGINE_SEGMENT_TYPE, engineId));
 	}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 77336370a366..98a72275614c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -325,7 +325,7 @@ public static ClasspathResourceSelector selectClasspathResource(String classpath
 	 * @since 1.1
 	 * @see ModuleSelector
 	 */
-	@API(status = EXPERIMENTAL, since = "1.1")
+	@API(status = STABLE, since = "1.10")
 	public static ModuleSelector selectModule(String moduleName) {
 		Preconditions.notBlank(moduleName, "Module name must not be null or blank");
 		return new ModuleSelector(moduleName.trim());
@@ -341,7 +341,7 @@ public static ModuleSelector selectModule(String moduleName) {
 	 * @since 1.1
 	 * @see ModuleSelector
 	 */
-	@API(status = EXPERIMENTAL, since = "1.1")
+	@API(status = STABLE, since = "1.10")
 	public static List<ModuleSelector> selectModules(Set<String> moduleNames) {
 		Preconditions.notNull(moduleNames, "Module names must not be null");
 		Preconditions.containsNoNullElements(moduleNames, "Individual module name must not be null");
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
index f50e9a32a48f..f0c8789aace3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/config/PrefixedConfigurationParameters.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.engine.support.config;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Optional;
 import java.util.Set;
@@ -26,7 +26,7 @@
  *
  * @since 1.3
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public class PrefixedConfigurationParameters implements ConfigurationParameters {
 
 	private final ConfigurationParameters delegate;
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
index 344f917ca9e6..99314c76259d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/EngineDiscoveryRequestResolver.java
@@ -11,7 +11,7 @@
 package org.junit.platform.engine.support.discovery;
 
 import static java.util.stream.Collectors.toCollection;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +48,7 @@
  * @see #builder()
  * @see #resolve(EngineDiscoveryRequest, TestDescriptor)
  */
-@API(status = EXPERIMENTAL, since = "1.5")
+@API(status = STABLE, since = "1.10")
 public class EngineDiscoveryRequestResolver<T extends TestDescriptor> {
 
 	private final List<Function<InitializationContext<T>, SelectorResolver>> resolverCreators;
@@ -134,7 +134,7 @@ public static <T extends TestDescriptor> Builder<T> builder() {
 	 * @param <T> the type of the engine's descriptor
 	 * @since 1.5
 	 */
-	@API(status = EXPERIMENTAL, since = "1.5")
+	@API(status = STABLE, since = "1.10")
 	public static class Builder<T extends TestDescriptor> {
 
 		private final List<Function<InitializationContext<T>, SelectorResolver>> resolverCreators = new ArrayList<>();
@@ -219,7 +219,7 @@ public EngineDiscoveryRequestResolver<T> build() {
 	 * @see Builder#addSelectorResolver(Function)
 	 * @see Builder#addTestDescriptorVisitor(Function)
 	 */
-	@API(status = EXPERIMENTAL, since = "1.5")
+	@API(status = STABLE, since = "1.10")
 	public interface InitializationContext<T extends TestDescriptor> {
 
 		/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
index 93bc2b1d647f..3864db3cfe40 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/SelectorResolver.java
@@ -13,6 +13,7 @@
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singleton;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -68,7 +69,7 @@
  *
  * @since 1.5
  */
-@API(status = EXPERIMENTAL, since = "1.5")
+@API(status = STABLE, since = "1.10")
 public interface SelectorResolver {
 
 	/**
@@ -355,7 +356,7 @@ default Resolution resolve(DiscoverySelector selector, Context context) {
 	 * @since 1.5
 	 * @see SelectorResolver
 	 */
-	@API(status = EXPERIMENTAL, since = "1.5")
+	@API(status = STABLE, since = "1.10")
 	interface Context {
 
 		/**
@@ -446,7 +447,7 @@ <T extends TestDescriptor> Optional<T> addToParent(Supplier<DiscoverySelector> p
 	 * @since 1.5
 	 * @see SelectorResolver
 	 */
-	@API(status = EXPERIMENTAL, since = "1.5")
+	@API(status = STABLE, since = "1.10")
 	class Resolution {
 
 		private static final Resolution UNRESOLVED = new Resolution(emptySet(), emptySet());
@@ -566,7 +567,7 @@ public Set<? extends DiscoverySelector> getSelectors() {
 	 * @see Resolution#match(Match)
 	 * @see Resolution#matches(Set)
 	 */
-	@API(status = EXPERIMENTAL, since = "1.5")
+	@API(status = STABLE, since = "1.10")
 	class Match {
 
 		private final TestDescriptor testDescriptor;
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
index ffbbe310fd03..4d6af87031df 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
@@ -11,6 +11,7 @@
 package org.junit.platform.engine.support.hierarchical;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.math.BigDecimal;
 import java.util.Locale;
@@ -27,7 +28,7 @@
  *
  * @since 1.3
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public enum DefaultParallelExecutionConfigurationStrategy implements ParallelExecutionConfigurationStrategy {
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
index 1674101c4c4c..500d69ffb7fb 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ExclusiveResource.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Objects;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -27,7 +27,7 @@
  * @since 1.3
  * @see Node#getExecutionMode()
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public class ExclusiveResource {
 
 	/**
@@ -44,7 +44,7 @@ public class ExclusiveResource {
 	 *
 	 * @since 1.7
 	 */
-	@API(status = EXPERIMENTAL, since = "1.7")
+	@API(status = STABLE, since = "1.10")
 	public static final String GLOBAL_KEY = "org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_KEY";
 
 	static final ExclusiveResource GLOBAL_READ = new ExclusiveResource(GLOBAL_KEY, LockMode.READ);
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
index 84ef2561ea27..7f3fc2214c08 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java
@@ -11,7 +11,7 @@
 package org.junit.platform.engine.support.hierarchical;
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.engine.support.hierarchical.Node.ExecutionMode.CONCURRENT;
 
 import java.lang.Thread.UncaughtExceptionHandler;
@@ -47,7 +47,7 @@
  * @see ForkJoinPool
  * @see DefaultParallelExecutionConfigurationStrategy
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public class ForkJoinPoolHierarchicalTestExecutorService implements HierarchicalTestExecutorService {
 
 	private final ForkJoinPool forkJoinPool;
@@ -69,7 +69,7 @@ public ForkJoinPoolHierarchicalTestExecutorService(ConfigurationParameters confi
 	 *
 	 * @since 1.7
 	 */
-	@API(status = EXPERIMENTAL, since = "1.7")
+	@API(status = STABLE, since = "1.10")
 	public ForkJoinPoolHierarchicalTestExecutorService(ParallelExecutionConfiguration configuration) {
 		forkJoinPool = createForkJoinPool(configuration);
 		parallelism = forkJoinPool.getParallelism();
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
index 44ff65f3a581..2bb665a6983a 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestEngine.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
@@ -75,7 +75,7 @@ public final void execute(ExecutionRequest request) {
 	 * @see ForkJoinPoolHierarchicalTestExecutorService
 	 * @see SameThreadHierarchicalTestExecutorService
 	 */
-	@API(status = EXPERIMENTAL, since = "1.3")
+	@API(status = STABLE, since = "1.10")
 	protected HierarchicalTestExecutorService createExecutorService(ExecutionRequest request) {
 		return new SameThreadHierarchicalTestExecutorService();
 	}
@@ -98,7 +98,7 @@ protected HierarchicalTestExecutorService createExecutorService(ExecutionRequest
 	 * @see OpenTest4JAwareThrowableCollector
 	 * @see ThrowableCollector
 	 */
-	@API(status = EXPERIMENTAL, since = "1.3")
+	@API(status = STABLE, since = "1.10")
 	protected ThrowableCollector.Factory createThrowableCollectorFactory(ExecutionRequest request) {
 		return OpenTest4JAwareThrowableCollector::new;
 	}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
index b4290a77d0e3..59fa82d2a21b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.List;
 import java.util.concurrent.Future;
@@ -27,7 +27,7 @@
  * @see SameThreadHierarchicalTestExecutorService
  * @see ForkJoinPoolHierarchicalTestExecutorService
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public interface HierarchicalTestExecutorService extends AutoCloseable {
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
index 691d5140a68e..d826340a582f 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/Node.java
@@ -11,8 +11,8 @@
 package org.junit.platform.engine.support.hierarchical;
 
 import static java.util.Collections.emptySet;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Optional;
 import java.util.Set;
@@ -132,7 +132,7 @@ default void after(C context) throws Exception {
 	 * @param invocation the wrapped invocation (must be invoked exactly once)
 	 * @since 1.4
 	 */
-	@API(status = EXPERIMENTAL, since = "1.4")
+	@API(status = STABLE, since = "1.10")
 	default void around(C context, Invocation<C> invocation) throws Exception {
 		invocation.invoke(context);
 	}
@@ -147,7 +147,7 @@ default void around(C context, Invocation<C> invocation) throws Exception {
 	 * @param result the result of skipped execution
 	 * @since 1.4
 	 */
-	@API(status = EXPERIMENTAL, since = "1.4", consumers = "org.junit.platform.engine.support.hierarchical")
+	@API(status = STABLE, since = "1.10", consumers = "org.junit.platform.engine.support.hierarchical")
 	default void nodeSkipped(C context, TestDescriptor testDescriptor, SkipResult result) {
 	}
 
@@ -161,7 +161,7 @@ default void nodeSkipped(C context, TestDescriptor testDescriptor, SkipResult re
 	 * @param result the result of the execution
 	 * @since 1.4
 	 */
-	@API(status = EXPERIMENTAL, since = "1.4", consumers = "org.junit.platform.engine.support.hierarchical")
+	@API(status = STABLE, since = "1.10", consumers = "org.junit.platform.engine.support.hierarchical")
 	default void nodeFinished(C context, TestDescriptor testDescriptor, TestExecutionResult result) {
 	}
 
@@ -176,7 +176,7 @@ default void nodeFinished(C context, TestDescriptor testDescriptor, TestExecutio
 	 * @since 1.3
 	 * @see ExclusiveResource
 	 */
-	@API(status = EXPERIMENTAL, since = "1.3", consumers = "org.junit.platform.engine.support.hierarchical")
+	@API(status = STABLE, since = "1.10", consumers = "org.junit.platform.engine.support.hierarchical")
 	default Set<ExclusiveResource> getExclusiveResources() {
 		return emptySet();
 	}
@@ -191,7 +191,7 @@ default Set<ExclusiveResource> getExclusiveResources() {
 	 * @since 1.3
 	 * @see ExecutionMode
 	 */
-	@API(status = EXPERIMENTAL, since = "1.3", consumers = "org.junit.platform.engine.support.hierarchical")
+	@API(status = STABLE, since = "1.10", consumers = "org.junit.platform.engine.support.hierarchical")
 	default ExecutionMode getExecutionMode() {
 		return ExecutionMode.CONCURRENT;
 	}
@@ -298,10 +298,10 @@ interface DynamicTestExecutor {
 		 * @param executionListener the executionListener to be notified; never
 		 * {@code null}
 		 * @return a future to cancel or wait for the execution
-		 * @since 5.7
+		 * @since 1.7
 		 * @see EngineExecutionListener#NOOP
 		 */
-		@API(status = EXPERIMENTAL, since = "5.7")
+		@API(status = STABLE, since = "1.10")
 		Future<?> execute(TestDescriptor testDescriptor, EngineExecutionListener executionListener);
 
 		/**
@@ -325,7 +325,7 @@ interface DynamicTestExecutor {
 	 * @see #CONCURRENT
 	 * @see Node#getExecutionMode()
 	 */
-	@API(status = EXPERIMENTAL, since = "1.3", consumers = "org.junit.platform.engine.support.hierarchical")
+	@API(status = STABLE, since = "1.10", consumers = "org.junit.platform.engine.support.hierarchical")
 	enum ExecutionMode {
 
 		/**
@@ -349,7 +349,7 @@ enum ExecutionMode {
 	 * @param <C> the type of {@code EngineExecutionContext} used by the {@code HierarchicalTestEngine}
 	 * @since 1.4
 	 */
-	@API(status = EXPERIMENTAL, since = "1.4")
+	@API(status = STABLE, since = "1.10")
 	interface Invocation<C extends EngineExecutionContext> {
 
 		/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
index 4707889644ec..444d544014d8 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfiguration.java
@@ -11,6 +11,7 @@
 package org.junit.platform.engine.support.hierarchical;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.concurrent.ForkJoinPool;
 import java.util.function.Predicate;
@@ -30,7 +31,7 @@
  * @see ParallelExecutionConfigurationStrategy
  * @see DefaultParallelExecutionConfigurationStrategy
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public interface ParallelExecutionConfiguration {
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
index 181ae46332a6..dd2b9be17ccd 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionConfigurationStrategy.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 import org.junit.platform.engine.ConfigurationParameters;
@@ -21,7 +21,7 @@
  * @since 1.3
  * @see DefaultParallelExecutionConfigurationStrategy
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public interface ParallelExecutionConfigurationStrategy {
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
index 9ec55b8f7fca..0024478e6afa 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.engine.support.hierarchical;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 
@@ -20,7 +20,7 @@
  * @since 1.3
  * @see HierarchicalTestExecutorService.TestTask#getResourceLock()
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public interface ResourceLock extends AutoCloseable {
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
index c1844da90ace..bb2d4280ce3b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/SameThreadHierarchicalTestExecutorService.java
@@ -11,7 +11,7 @@
 package org.junit.platform.engine.support.hierarchical;
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.List;
 import java.util.concurrent.Future;
@@ -24,7 +24,7 @@
  *
  * @since 1.3
  */
-@API(status = EXPERIMENTAL, since = "1.3")
+@API(status = STABLE, since = "1.10")
 public class SameThreadHierarchicalTestExecutorService implements HierarchicalTestExecutorService {
 
 	public SameThreadHierarchicalTestExecutorService() {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
index 39c703720dad..5dad3bc37982 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/EngineDiscoveryResult.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.launcher;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Optional;
 
@@ -26,7 +26,7 @@
  *
  * @since 1.6
  */
-@API(status = EXPERIMENTAL, since = "1.6")
+@API(status = STABLE, since = "1.10")
 public class EngineDiscoveryResult {
 
 	/**
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
index 2c3a96df09fd..1abb128b32dc 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.launcher;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
@@ -58,7 +57,7 @@ public interface Launcher {
 	 * @param listeners the listeners to be notified of test discovery events;
 	 * never {@code null} or empty
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	void registerLauncherDiscoveryListeners(LauncherDiscoveryListener... listeners);
 
 	/**
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
index 90062041a169..9b97f4b1ce3a 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryListener.java
@@ -11,6 +11,7 @@
 package org.junit.platform.launcher;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 import org.junit.platform.engine.EngineDiscoveryListener;
@@ -53,7 +54,7 @@ public interface LauncherDiscoveryListener extends EngineDiscoveryListener {
 	 * @param request the request for which discovery is being started
 	 * @since 1.8
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	default void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
 	}
 
@@ -63,7 +64,7 @@ default void launcherDiscoveryStarted(LauncherDiscoveryRequest request) {
 	 * @param request the request for which discovery has finished
 	 * @since 1.8
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	default void launcherDiscoveryFinished(LauncherDiscoveryRequest request) {
 	}
 
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
index 1a91c9cc4a9e..0eadbbfe6a9f 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherDiscoveryRequest.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.launcher;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.List;
@@ -91,7 +90,7 @@ public interface LauncherDiscoveryRequest extends EngineDiscoveryRequest {
 	 * @return the discovery listener; never {@code null}
 	 * @since 1.6
 	 */
-	@API(status = EXPERIMENTAL, since = "1.6")
+	@API(status = STABLE, since = "1.10")
 	@Override
 	default LauncherDiscoveryListener getDiscoveryListener() {
 		return LauncherDiscoveryListener.NOOP;
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
index b8e71c8d0426..0d93fb15d116 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSession.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.launcher;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 import org.junit.platform.launcher.core.LauncherFactory;
@@ -25,7 +25,7 @@
  * @see LauncherSessionListener
  * @see LauncherFactory
  */
-@API(status = EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public interface LauncherSession extends AutoCloseable {
 
 	/**
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
index 96af16434669..9a89def0f531 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherSessionListener.java
@@ -10,7 +10,7 @@
 
 package org.junit.platform.launcher;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
 import org.junit.platform.launcher.core.LauncherConfig;
@@ -39,7 +39,7 @@
  * @see LauncherConfig.Builder#addLauncherSessionListeners
  * @see LauncherFactory
  */
-@API(status = EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public interface LauncherSessionListener {
 
 	/**
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
index 0a622b168f6b..b9dcd3775a7c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherConfig.java
@@ -10,7 +10,6 @@
 
 package org.junit.platform.launcher.core;
 
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Collection;
@@ -77,7 +76,7 @@ public interface LauncherConfig {
 	 * automatically registered
 	 * @since 1.8
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	boolean isLauncherSessionListenerAutoRegistrationEnabled();
 
 	/**
@@ -89,7 +88,7 @@ public interface LauncherConfig {
 	 * automatically registered
 	 * @since 1.8
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	boolean isLauncherDiscoveryListenerAutoRegistrationEnabled();
 
 	/**
@@ -111,7 +110,7 @@ public interface LauncherConfig {
 	 * registered
 	 * @since 1.7
 	 */
-	@API(status = EXPERIMENTAL, since = "1.7")
+	@API(status = STABLE, since = "1.10")
 	boolean isPostDiscoveryFilterAutoRegistrationEnabled();
 
 	/**
@@ -131,7 +130,7 @@ public interface LauncherConfig {
 	 * {@code null} but potentially empty
 	 * @since 1.8
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	Collection<LauncherSessionListener> getAdditionalLauncherSessionListeners();
 
 	/**
@@ -142,7 +141,7 @@ public interface LauncherConfig {
 	 * {@code null} but potentially empty
 	 * @since 1.8
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	Collection<LauncherDiscoveryListener> getAdditionalLauncherDiscoveryListeners();
 
 	/**
@@ -162,7 +161,7 @@ public interface LauncherConfig {
 	 * {@code null} but potentially empty
 	 * @since 1.7
 	 */
-	@API(status = EXPERIMENTAL, since = "1.7")
+	@API(status = STABLE, since = "1.10")
 	Collection<PostDiscoveryFilter> getAdditionalPostDiscoveryFilters();
 
 	/**
@@ -205,7 +204,7 @@ private Builder() {
 		 * @return this builder for method chaining
 		 * @since 1.8
 		 */
-		@API(status = EXPERIMENTAL, since = "1.8")
+		@API(status = STABLE, since = "1.10")
 		public Builder enableLauncherSessionListenerAutoRegistration(boolean enabled) {
 			this.launcherSessionListenerAutoRegistrationEnabled = enabled;
 			return this;
@@ -222,7 +221,7 @@ public Builder enableLauncherSessionListenerAutoRegistration(boolean enabled) {
 		 * @return this builder for method chaining
 		 * @since 1.8
 		 */
-		@API(status = EXPERIMENTAL, since = "1.8")
+		@API(status = STABLE, since = "1.10")
 		public Builder enableLauncherDiscoveryListenerAutoRegistration(boolean enabled) {
 			this.launcherDiscoveryListenerAutoRegistrationEnabled = enabled;
 			return this;
@@ -266,7 +265,7 @@ public Builder enableTestEngineAutoRegistration(boolean enabled) {
 		 * @return this builder for method chaining
 		 * @since 1.7
 		 */
-		@API(status = EXPERIMENTAL, since = "1.7")
+		@API(status = STABLE, since = "1.10")
 		public Builder enablePostDiscoveryFilterAutoRegistration(boolean enabled) {
 			this.postDiscoveryFilterAutoRegistrationEnabled = enabled;
 			return this;
@@ -339,7 +338,7 @@ public Builder addTestExecutionListeners(TestExecutionListener... listeners) {
 		 * @return this builder for method chaining
 		 * @since 1.7
 		 */
-		@API(status = EXPERIMENTAL, since = "1.7")
+		@API(status = STABLE, since = "1.10")
 		public Builder addPostDiscoveryFilters(PostDiscoveryFilter... filters) {
 			Preconditions.notNull(filters, "PostDiscoveryFilter array must not be null");
 			Preconditions.containsNoNullElements(filters, "PostDiscoveryFilter array must not contain null elements");
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
index 09b690a1d670..1d2f22d7a559 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -11,7 +11,6 @@
 package org.junit.platform.launcher.core;
 
 import static org.apiguardian.api.API.Status.DEPRECATED;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.ArrayList;
@@ -214,7 +213,7 @@ public LauncherDiscoveryRequestBuilder configurationParameters(Map<String, Strin
 	 * @see #configurationParameter(String, String)
 	 * @see #configurationParameters(Map)
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	public LauncherDiscoveryRequestBuilder parentConfigurationParameters(
 			ConfigurationParameters configurationParameters) {
 		Preconditions.notNull(configurationParameters, "parent configuration parameters must not be null");
@@ -239,7 +238,7 @@ public LauncherDiscoveryRequestBuilder parentConfigurationParameters(
 	 * @see LauncherDiscoveryListeners
 	 * @see LauncherDiscoveryRequestBuilder#DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME
 	 */
-	@API(status = EXPERIMENTAL, since = "1.6")
+	@API(status = STABLE, since = "1.10")
 	public LauncherDiscoveryRequestBuilder listeners(LauncherDiscoveryListener... listeners) {
 		Preconditions.notNull(listeners, "discovery listener array must not be null");
 		Preconditions.containsNoNullElements(listeners, "individual discovery listeners must not be null");
@@ -260,7 +259,7 @@ public LauncherDiscoveryRequestBuilder listeners(LauncherDiscoveryListener... li
 	 * @see #configurationParameter(String, String)
 	 * @see #configurationParameters(Map)
 	 */
-	@API(status = EXPERIMENTAL, since = "1.7")
+	@API(status = STABLE, since = "1.10")
 	public LauncherDiscoveryRequestBuilder enableImplicitConfigurationParameters(boolean enabled) {
 		this.implicitConfigurationParametersEnabled = enabled;
 		return this;
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
index 172db2b89a34..8a214a546946 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherFactory.java
@@ -11,7 +11,6 @@
 package org.junit.platform.launcher.core;
 
 import static java.util.Collections.emptyList;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.launcher.LauncherConstants.DEACTIVATE_LISTENERS_PATTERN_PROPERTY_NAME;
 import static org.junit.platform.launcher.LauncherConstants.ENABLE_LAUNCHER_INTERCEPTORS;
@@ -78,7 +77,7 @@ private LauncherFactory() {
 	 * @since 1.8
 	 * @see #openSession(LauncherConfig)
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	public static LauncherSession openSession() throws PreconditionViolationException {
 		return openSession(LauncherConfig.DEFAULT);
 	}
@@ -94,7 +93,7 @@ public static LauncherSession openSession() throws PreconditionViolationExceptio
 	 * @since 1.8
 	 * @see #openSession()
 	 */
-	@API(status = EXPERIMENTAL, since = "1.8")
+	@API(status = STABLE, since = "1.10")
 	public static LauncherSession openSession(LauncherConfig config) throws PreconditionViolationException {
 		Preconditions.notNull(config, "LauncherConfig must not be null");
 		LauncherConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
@@ -124,7 +123,7 @@ public static Launcher create() throws PreconditionViolationException {
 	 * @since 1.3
 	 * @see #create()
 	 */
-	@API(status = EXPERIMENTAL, since = "1.3")
+	@API(status = STABLE, since = "1.10")
 	public static Launcher create(LauncherConfig config) throws PreconditionViolationException {
 		Preconditions.notNull(config, "LauncherConfig must not be null");
 		LauncherConfigurationParameters configurationParameters = LauncherConfigurationParameters.builder().build();
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
index c64f28fc20a2..c8efa369abee 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/discovery/LauncherDiscoveryListeners.java
@@ -11,8 +11,8 @@
 package org.junit.platform.launcher.listeners.discovery;
 
 import static java.util.stream.Collectors.joining;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Arrays;
 import java.util.List;
@@ -32,7 +32,7 @@
  *
  * @since 1.6
  */
-@API(status = EXPERIMENTAL, since = "1.6")
+@API(status = STABLE, since = "1.10")
 public class LauncherDiscoveryListeners {
 
 	private LauncherDiscoveryListeners() {
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
index 0ab3693bbd80..3b844b3ad340 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameter.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -19,7 +21,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @ConfigurationParameter} is a {@linkplain Repeatable repeatable}
@@ -37,7 +38,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 @Repeatable(ConfigurationParameters.class)
 public @interface ConfigurationParameter {
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
index 0f12270a0eb9..ecad947396cb 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/ConfigurationParameters.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -18,7 +20,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @ConfigurationParameters} is a container for one or more
@@ -35,7 +36,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public @interface ConfigurationParameters {
 
 	/**
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
index d1eed0eebe7c..088fc037a9df 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/DisableParentConfigurationParameters.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -18,7 +20,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * Disable parent configuration parameters.
@@ -39,6 +40,6 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public @interface DisableParentConfigurationParameters {
 }
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
index 64d6cc3d4e18..a6fda29df8ba 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResource.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -19,7 +21,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @SelectClasspathResource} is a {@linkplain Repeatable repeatable}
@@ -35,7 +36,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 @Repeatable(SelectClasspathResources.class)
 public @interface SelectClasspathResource {
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
index a8860b9c0a4e..c1be1af94e45 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasspathResources.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -18,7 +20,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @SelectClasspathResources} is a container for one or more
@@ -35,7 +36,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public @interface SelectClasspathResources {
 
 	/**
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
index 30d32a533d61..43bcf16ccec6 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectDirectories.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -18,7 +20,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @SelectDirectories} specifies the directories to <em>select</em> when
@@ -33,7 +34,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public @interface SelectDirectories {
 
 	/**
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
index 88be94546bc1..bddf3cfc3d03 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFile.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -19,7 +21,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @SelectFile} is a {@linkplain Repeatable repeatable} annotation that
@@ -35,7 +36,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 @Repeatable(SelectFiles.class)
 public @interface SelectFile {
 
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
index 4f4c8fd44ff7..e5a989e87ff9 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectFiles.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -18,7 +20,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @SelectFiles} is a container for one or more
@@ -35,7 +36,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public @interface SelectFiles {
 
 	/**
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
index 12f90de77417..a4cbe0111391 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectModules.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -19,7 +21,6 @@
 import java.util.Set;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @SelectModules} specifies the modules to <em>select</em> when running
@@ -34,7 +35,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public @interface SelectModules {
 
 	/**
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
index 82512f2faea5..5783114bdacd 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectUris.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -18,7 +20,6 @@
 import java.lang.annotation.Target;
 
 import org.apiguardian.api.API;
-import org.apiguardian.api.API.Status;
 
 /**
  * {@code @SelectUris} specifies the URIs to <em>select</em> when running a test
@@ -33,7 +34,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 public @interface SelectUris {
 
 	/**
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
index 739d65826de4..d1d3f85fd64e 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/Suite.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.STABLE;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -70,7 +72,7 @@
 @Target(ElementType.TYPE)
 @Inherited
 @Documented
-@API(status = Status.EXPERIMENTAL, since = "1.8")
+@API(status = STABLE, since = "1.10")
 @Testable
 public @interface Suite {
 
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
index 195c223ffcb1..ee4ab403e27f 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EngineTestKit.java
@@ -13,8 +13,8 @@
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singleton;
 import static org.apiguardian.api.API.Status.DEPRECATED;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
+import static org.apiguardian.api.API.Status.STABLE;
 import static org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.Phase.EXECUTION;
 
 import java.util.Map;
@@ -361,7 +361,7 @@ public Builder filters(DiscoveryFilter<?>... filters) {
 		 * @see #configurationParameters(Map)
 		 * @see #execute()
 		 */
-		@API(status = EXPERIMENTAL, since = "1.7")
+		@API(status = STABLE, since = "1.10")
 		public Builder filters(Filter<?>... filters) {
 			this.requestBuilder.filters(filters);
 			return this;
@@ -416,7 +416,7 @@ public Builder configurationParameters(Map<String, String> configurationParamete
 		 * @see #configurationParameter(String, String)
 		 * @see #configurationParameters(Map)
 		 */
-		@API(status = EXPERIMENTAL, since = "1.7")
+		@API(status = STABLE, since = "1.10")
 		public Builder enableImplicitConfigurationParameters(boolean enabled) {
 			this.requestBuilder.enableImplicitConfigurationParameters(enabled);
 			return this;
diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
index f1aa473435c0..7f354b75b7f7 100644
--- a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
+++ b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
@@ -12,8 +12,8 @@
 
 import static java.util.function.Predicate.isEqual;
 import static java.util.stream.Collectors.toList;
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
+import static org.apiguardian.api.API.Status.STABLE;
 import static org.assertj.core.api.Assertions.allOf;
 import static org.junit.platform.commons.util.FunctionUtils.where;
 import static org.junit.platform.engine.TestExecutionResult.Status.ABORTED;
@@ -464,7 +464,7 @@ public static Condition<Event> reason(Predicate<String> predicate) {
 	 * {@link Event}'s {@linkplain Event#getPayload() payload} is an instance of
 	 * {@link ReportEntry} that contains the supplied key-value pairs.
 	 */
-	@API(status = EXPERIMENTAL, since = "1.7")
+	@API(status = STABLE, since = "1.10")
 	public static Condition<Event> reportEntry(Map<String, String> keyValuePairs) {
 		return new Condition<>(byPayload(ReportEntry.class, it -> it.getKeyValuePairs().equals(keyValuePairs)),
 			"event for report entry with key-value pairs %s", keyValuePairs);

From 82a12325df8a040f7d44fe8d56dae05c22baeb7a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 22 Apr 2023 11:49:10 +0200
Subject: [PATCH 1178/1433] Document promotion of experimental APIs and mention
 highlights

Resolves #3248.
---
 .../asciidoc/release-notes/release-notes-5.10.0-M1.adoc  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 9e4437d1dd94..01e4e56a6a1f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -24,6 +24,10 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
+* Promote various "experimental" APIs that have matured to "stable" including
+  `ModuleSelector`, `EngineDiscoveryListener`, `EngineDiscoveryRequestResolver`,
+  `LauncherSession`, `LauncherSessionListener`, parallel execution support classes,
+  `@Suite` and related annotations, and others.
 * All utility methods in `ReflectionSupport` that return a `List` now have counterparts
   which return a `Stream`.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
@@ -65,7 +69,10 @@ repository on GitHub.
 
 ==== New Features and Improvements
 
-
+* Promote various "experimental" APIs that have matured to "stable" including
+  `MethodOrderer`, `ClassOrderer`, `InvocationInterceptor`,
+  `LifecycleMethodExecutionExceptionHandler`, `@TempDir`, parallel execution annotations,
+  and others.
 * `@RepeatedTest` can now be configured with a failure threshold which signifies the
   number of failures after which remaining repetitions will be automatically skipped. See
   the <<../user-guide/index.adoc#writing-tests-repeated-tests, User Guide>> for details.

From a7a016f9d834c0c539bfaa58de019898f8b9cb4e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 22 Apr 2023 14:32:55 +0200
Subject: [PATCH 1179/1433] Upgradle to 8.1.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8196ca1994f9..2c3425d49ec4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From db2e7fa67712a2e903532f689e0c2feef2085364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kraso=C5=84?= <Krzysztof.Krason@gmail.com>
Date: Sat, 22 Apr 2023 14:37:29 +0200
Subject: [PATCH 1180/1433] Use proper AssertJ assertions (#3196)

Slight refactoring of AssertJ assertions into shorter, more descriptive
and generating better error messages.
---
 .../junit/jupiter/api/DynamicTestTests.java   |  4 +--
 .../DiscoverySelectorResolverTests.java       |  8 +++---
 .../TempDirectoryPerDeclarationTests.java     | 26 +++++++++----------
 .../extension/TimeoutConfigurationTests.java  |  4 +--
 .../AbstractEqualsAndHashCodeTests.java       |  2 +-
 .../commons/util/ClasspathScannerTests.java   |  8 +++---
 .../tasks/DiscoveryRequestCreatorTests.java   |  2 +-
 .../platform/console/tasks/TreeNodeTests.java |  4 +--
 .../descriptor/CompositeTestSourceTests.java  |  4 +--
 .../platform/launcher/TagFilterTests.java     |  4 +--
 .../launcher/core/DefaultLauncherTests.java   |  6 ++---
 11 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
index 91a49501f0e1..9036f8c006ce 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/DynamicTestTests.java
@@ -179,9 +179,9 @@ void sourceUriIsReturnedWhenSupplied() {
 		URI containerSourceUri = URI.create("other://container");
 		DynamicContainer container = dynamicContainer("bar", containerSourceUri, Stream.of(test));
 
-		assertThat(test.getTestSourceUri().get()).isSameAs(testSourceUri);
+		assertThat(test.getTestSourceUri()).containsSame(testSourceUri);
 		assertThat(test.toString()).isEqualTo("DynamicTest [displayName = 'foo', testSourceUri = any://test]");
-		assertThat(container.getTestSourceUri().get()).isSameAs(containerSourceUri);
+		assertThat(container.getTestSourceUri()).containsSame(containerSourceUri);
 		assertThat(container.toString()).isEqualTo(
 			"DynamicContainer [displayName = 'bar', testSourceUri = other://container]");
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
index a71d0665e14b..c51a116f8399 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java
@@ -450,9 +450,9 @@ void packageResolutionUsingDefaultPackage() throws Exception {
 		resolve(request().selectors(selectPackage("")));
 
 		// 150 is completely arbitrary. The actual number is likely much higher.
-		assertThat(engineDescriptor.getDescendants().size())//
+		assertThat(engineDescriptor.getDescendants())//
 				.describedAs("Too few test descriptors in classpath")//
-				.isGreaterThan(150);
+				.hasSizeGreaterThan(150);
 
 		List<UniqueId> uniqueIds = uniqueIds();
 		assertThat(uniqueIds)//
@@ -474,9 +474,9 @@ void classpathResolution() throws Exception {
 		resolve(request().selectors(selectors));
 
 		// 150 is completely arbitrary. The actual number is likely much higher.
-		assertThat(engineDescriptor.getDescendants().size())//
+		assertThat(engineDescriptor.getDescendants())//
 				.describedAs("Too few test descriptors in classpath")//
-				.isGreaterThan(150);
+				.hasSizeGreaterThan(150);
 
 		List<UniqueId> uniqueIds = uniqueIds();
 		assertThat(uniqueIds)//
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index c98e99e0514d..8f2308e63c91 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -113,19 +113,19 @@ Stream<DynamicTest> resolvesSeparateTempDirsForEachAnnotationDeclaration() {
 					"instanceField2", "beforeEach1", "beforeEach2", "test1", "test2", "afterEach1", "afterEach2");
 				assertThat(testBTempDirs.values()).hasSize(10).doesNotHaveDuplicates();
 
-				assertThat(testATempDirs.get("staticField1")).isEqualTo(classTempDirs.get("staticField1"));
-				assertThat(testBTempDirs.get("staticField1")).isEqualTo(classTempDirs.get("staticField1"));
-				assertThat(testATempDirs.get("staticField2")).isEqualTo(classTempDirs.get("staticField2"));
-				assertThat(testBTempDirs.get("staticField2")).isEqualTo(classTempDirs.get("staticField2"));
-
-				assertThat(testATempDirs.get("instanceField1")).isNotEqualTo(testBTempDirs.get("instanceField1"));
-				assertThat(testATempDirs.get("instanceField2")).isNotEqualTo(testBTempDirs.get("instanceField2"));
-				assertThat(testATempDirs.get("beforeEach1")).isNotEqualTo(testBTempDirs.get("beforeEach1"));
-				assertThat(testATempDirs.get("beforeEach2")).isNotEqualTo(testBTempDirs.get("beforeEach2"));
-				assertThat(testATempDirs.get("test1")).isNotEqualTo(testBTempDirs.get("test1"));
-				assertThat(testATempDirs.get("test2")).isNotEqualTo(testBTempDirs.get("test2"));
-				assertThat(testATempDirs.get("afterEach1")).isNotEqualTo(testBTempDirs.get("afterEach1"));
-				assertThat(testATempDirs.get("afterEach2")).isNotEqualTo(testBTempDirs.get("afterEach2"));
+				assertThat(testATempDirs).containsEntry("staticField1", classTempDirs.get("staticField1"));
+				assertThat(testBTempDirs).containsEntry("staticField1", classTempDirs.get("staticField1"));
+				assertThat(testATempDirs).containsEntry("staticField2", classTempDirs.get("staticField2"));
+				assertThat(testBTempDirs).containsEntry("staticField2", classTempDirs.get("staticField2"));
+
+				assertThat(testATempDirs).doesNotContainEntry("instanceField1", testBTempDirs.get("instanceField1"));
+				assertThat(testATempDirs).doesNotContainEntry("instanceField2", testBTempDirs.get("instanceField2"));
+				assertThat(testATempDirs).doesNotContainEntry("beforeEach1", testBTempDirs.get("beforeEach1"));
+				assertThat(testATempDirs).doesNotContainEntry("beforeEach2", testBTempDirs.get("beforeEach2"));
+				assertThat(testATempDirs).doesNotContainEntry("test1", testBTempDirs.get("test1"));
+				assertThat(testATempDirs).doesNotContainEntry("test2", testBTempDirs.get("test2"));
+				assertThat(testATempDirs).doesNotContainEntry("afterEach1", testBTempDirs.get("afterEach1"));
+				assertThat(testATempDirs).doesNotContainEntry("afterEach2", testBTempDirs.get("afterEach2"));
 			}));
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
index d37d922fb9ad..4886f2718607 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java
@@ -139,7 +139,7 @@ void logsInvalidValues(LogRecordListener logRecordListener) {
 	void specificThreadModeIsUsed() {
 		when(extensionContext.getConfigurationParameter(DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME)).thenReturn(
 			Optional.of("SEPARATE_THREAD"));
-		assertThat(config.getDefaultTimeoutThreadMode()).isEqualTo(Optional.of(SEPARATE_THREAD));
+		assertThat(config.getDefaultTimeoutThreadMode()).contains(SEPARATE_THREAD);
 	}
 
 	@Test
@@ -148,7 +148,7 @@ void logsInvalidThreadModeValueAndReturnEmpty(LogRecordListener logRecordListene
 		when(extensionContext.getConfigurationParameter(DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME)).thenReturn(
 			Optional.of("invalid"));
 
-		assertThat(config.getDefaultTimeoutThreadMode()).isEqualTo(Optional.empty());
+		assertThat(config.getDefaultTimeoutThreadMode()).isNotPresent();
 		assertThat(logRecordListener.stream(Level.WARNING).map(LogRecord::getMessage)) //
 				.containsExactly(
 					"Invalid timeout thread mode 'invalid' set via the 'junit.jupiter.execution.timeout.thread.mode.default' configuration parameter.");
diff --git a/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java b/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
index 8fdd06ae2021..688bb079e780 100644
--- a/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java
@@ -26,7 +26,7 @@ protected final <T> void assertEqualsAndHashCode(T equal1, T equal2, T different
 		assertThat(different).isNotNull();
 
 		assertThat(equal1).isNotSameAs(equal2);
-		assertThat(equal1).isNotEqualTo(null);
+		assertThat(equal1).isNotNull();
 		assertThat(equal1).isNotEqualTo(new Object());
 		assertThat(equal1).isNotEqualTo(different);
 		assertThat(different).isNotEqualTo(equal1);
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
index 69c2a8f778fe..f68256284906 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java
@@ -123,7 +123,7 @@ void scanForClassesInClasspathRootWhenGenericRuntimeExceptionOccurs(LogRecordLis
 	private void assertClassesScannedWhenExceptionIsThrown(Predicate<Class<?>> filter) throws Exception {
 		var classFilter = ClassFilter.of(filter);
 		var classes = this.classpathScanner.scanForClassesInClasspathRoot(getTestClasspathRoot(), classFilter);
-		assertThat(classes.size()).isGreaterThanOrEqualTo(150);
+		assertThat(classes).hasSizeGreaterThanOrEqualTo(150);
 	}
 
 	private void assertDebugMessageLogged(LogRecordListener listener, String regex) {
@@ -177,7 +177,7 @@ private void scanForClassesInClasspathRootWithinJarFile(String resourceName) thr
 	@Test
 	void scanForClassesInPackage() {
 		var classes = classpathScanner.scanForClassesInPackage("org.junit.platform.commons", allClasses);
-		assertThat(classes.size()).isGreaterThanOrEqualTo(20);
+		assertThat(classes).hasSizeGreaterThanOrEqualTo(20);
 		assertTrue(classes.contains(NestedClassToBeFound.class));
 		assertTrue(classes.contains(MemberClassToBeFound.class));
 	}
@@ -253,7 +253,7 @@ void scanForClassesInDefaultPackage() {
 		var classFilter = ClassFilter.of(this::inDefaultPackage);
 		var classes = classpathScanner.scanForClassesInPackage("", classFilter);
 
-		assertThat(classes.size()).as("number of classes found in default package").isGreaterThanOrEqualTo(1);
+		assertThat(classes).as("number of classes found in default package").isNotEmpty();
 		assertTrue(classes.stream().allMatch(this::inDefaultPackage));
 		assertTrue(classes.stream().anyMatch(clazz -> "DefaultPackageTestCase".equals(clazz.getName())));
 	}
@@ -345,7 +345,7 @@ void findAllClassesInClasspathRootWithFilter() throws Exception {
 		var root = getTestClasspathRoot();
 		var classes = classpathScanner.scanForClassesInClasspathRoot(root, allClasses);
 
-		assertThat(classes.size()).isGreaterThanOrEqualTo(20);
+		assertThat(classes).hasSizeGreaterThanOrEqualTo(20);
 		assertTrue(classes.contains(ClasspathScannerTests.class));
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index 3456eb8f2068..59e4d929f06f 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -269,7 +269,7 @@ void propagatesMethodSelectors() {
 		assertThat(methodSelectors).hasSize(2);
 		assertThat(methodSelectors.get(0).getClassName()).isEqualTo("com.acme.Foo");
 		assertThat(methodSelectors.get(0).getMethodName()).isEqualTo("m");
-		assertThat(methodSelectors.get(0).getMethodParameterTypes()).isEqualTo("");
+		assertThat(methodSelectors.get(0).getMethodParameterTypes()).isEmpty();
 		assertThat(methodSelectors.get(1).getClassName()).isEqualTo("com.example.Bar");
 		assertThat(methodSelectors.get(1).getMethodName()).isEqualTo("method");
 		assertThat(methodSelectors.get(1).getMethodParameterTypes()).isEqualTo("java.lang.Object");
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
index a1256833c2d4..d17f340c481e 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java
@@ -51,7 +51,7 @@ void childrenCanBeAddedConcurrently() throws Exception {
 			}
 		});
 
-		assertThat(treeNode.children.size()).isEqualTo(NUM_THREADS * ITEMS_PER_THREAD);
+		assertThat(treeNode.children).hasSize(NUM_THREADS * ITEMS_PER_THREAD);
 	}
 
 	@Test
@@ -64,7 +64,7 @@ void reportEntriesCanBeAddedConcurrently() throws Exception {
 			}
 		});
 
-		assertThat(treeNode.reports.size()).isEqualTo(NUM_THREADS * ITEMS_PER_THREAD);
+		assertThat(treeNode.reports).hasSize(NUM_THREADS * ITEMS_PER_THREAD);
 	}
 
 	private void runConcurrently(Runnable action) throws InterruptedException {
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
index 6984fa14718d..25d49a0aa191 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java
@@ -53,12 +53,12 @@ void createCompositeTestSourceFromClassAndFileSources() {
 		var sources = new ArrayList<>(List.of(fileSource, classSource));
 		var compositeTestSource = CompositeTestSource.from(sources);
 
-		assertThat(compositeTestSource.getSources().size()).isEqualTo(2);
+		assertThat(compositeTestSource.getSources()).hasSize(2);
 		assertThat(compositeTestSource.getSources()).contains(fileSource, classSource);
 
 		// Ensure the supplied sources list was defensively copied.
 		sources.remove(1);
-		assertThat(compositeTestSource.getSources().size()).isEqualTo(2);
+		assertThat(compositeTestSource.getSources()).hasSize(2);
 
 		// Ensure the returned sources list is immutable.
 		assertThrows(UnsupportedOperationException.class, () -> compositeTestSource.getSources().add(fileSource));
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
index 14d966ee9b93..2ac0fab7c2df 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java
@@ -172,12 +172,12 @@ private void excludeSingleTag(PostDiscoveryFilter filter) {
 
 	private void assertIncluded(FilterResult filterResult, String expectedReason) {
 		assertTrue(filterResult.included());
-		assertThat(filterResult.getReason()).isPresent().contains(expectedReason);
+		assertThat(filterResult.getReason()).contains(expectedReason);
 	}
 
 	private void assertExcluded(FilterResult filterResult, String expectedReason) {
 		assertTrue(filterResult.excluded());
-		assertThat(filterResult.getReason()).isPresent().contains(expectedReason);
+		assertThat(filterResult.getReason()).contains(expectedReason);
 	}
 
 	// -------------------------------------------------------------------------
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index e0e7a3c4bf57..228f73d8620c 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -403,7 +403,7 @@ void withoutConfigurationParameters_LauncherPassesEmptyConfigurationParametersIn
 		launcher.execute(request().build());
 
 		var configurationParameters = engine.requestForExecution.getConfigurationParameters();
-		assertThat(configurationParameters.get("key").isPresent()).isFalse();
+		assertThat(configurationParameters.get("key")).isNotPresent();
 		assertThat(configurationParameters.size()).isEqualTo(0);
 	}
 
@@ -417,8 +417,8 @@ void withConfigurationParameters_LauncherPassesPopulatedConfigurationParametersI
 
 		var configurationParameters = engine.requestForExecution.getConfigurationParameters();
 		assertThat(configurationParameters.size()).isEqualTo(1);
-		assertThat(configurationParameters.get("key").isPresent()).isTrue();
-		assertThat(configurationParameters.get("key").get()).isEqualTo("value");
+		assertThat(configurationParameters.get("key")).isPresent();
+		assertThat(configurationParameters.get("key")).contains("value");
 	}
 
 	@Test

From a5854c2445d9e3e3f048ddc2ff8eee8ab474dffd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 22 Apr 2023 14:52:08 +0200
Subject: [PATCH 1181/1433] Add 5.9.3 release notes

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes/release-notes-5.9.3.adoc    | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 8f5734c9dba8..25763d56a817 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -18,6 +18,8 @@ include::{includedir}/link-attributes.adoc[]
 
 include::{basedir}/release-notes-5.10.0-M1.adoc[]
 
+include::{basedir}/release-notes-5.9.3.adoc[]
+
 include::{basedir}/release-notes-5.9.2.adoc[]
 
 include::{basedir}/release-notes-5.9.1.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
new file mode 100644
index 000000000000..bc912326c369
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.9.3]]
+== 5.9.3
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/67?closed=1+[5.9.3] milestone page in the
+JUnit repository on GitHub.
+
+
+[[release-notes-5.9.3-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.9.3-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+= [[release-notes-5.9.3-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From a3ed03dae55ad01f458f74d8eb24bb34bcc3fa34 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 22 Apr 2023 14:53:29 +0200
Subject: [PATCH 1182/1433] Move release notes entry for #3236 to 5.9.3

---
 .../docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc   | 2 --
 .../src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc   | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 01e4e56a6a1f..9912b813930b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -60,8 +60,6 @@ repository on GitHub.
   `@MethodSource("myFactory([I)"` (which was already supported) and
   `@MethodSource("myFactory(java.lang.String[])` instead of
   `@MethodSource("myFactory([Ljava.lang.String;)`.
-* Exceptions thrown for undeletable files when cleaning up a temporary directory created
-  via `@TempDir` now include the root cause.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index bc912326c369..de65c7777c0a 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -31,7 +31,8 @@ JUnit repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Exceptions thrown for undeletable files when cleaning up a temporary directory created
+  via `@TempDir` now include the root cause.
 
 ==== Deprecations and Breaking Changes
 

From 594f7e403ccf6bd758ca91008328272bf996f250 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 22 Apr 2023 15:01:21 +0200
Subject: [PATCH 1183/1433] Revert disallowing private lifecycle methods

Document using private as being strongly discouraged.

Resolves #3242.
---
 .../release-notes/release-notes-5.9.3.adoc    |  2 +
 .../java/org/junit/jupiter/api/AfterAll.java  | 13 ++--
 .../java/org/junit/jupiter/api/AfterEach.java |  5 +-
 .../java/org/junit/jupiter/api/BeforeAll.java | 13 ++--
 .../org/junit/jupiter/api/BeforeEach.java     |  5 +-
 .../descriptor/LifecycleMethodUtils.java      | 13 +---
 ...alidLifecycleMethodConfigurationTests.java | 78 ++-----------------
 7 files changed, 30 insertions(+), 99 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index de65c7777c0a..4e0da156e26f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -33,6 +33,8 @@ JUnit repository on GitHub.
 
 * Exceptions thrown for undeletable files when cleaning up a temporary directory created
   via `@TempDir` now include the root cause.
+* Allow lifecycle methods to be declared as `private` again for backwards compatibility
+  but document it as a discouraged practice.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
index 061ee118c4c5..52743ebef416 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java
@@ -29,17 +29,20 @@
  *
  * <h2>Method Signatures</h2>
  *
- * <p>{@code @AfterAll} methods must have a {@code void} return type, must not
- * be {@code private}, and must be {@code static} by default. Consequently,
- * {@code @AfterAll} methods are not supported in {@link Nested @Nested} test
- * classes or as <em>interface default methods</em> unless the test class is
- * annotated with {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}.
+ * <p>{@code @AfterAll} methods must have a {@code void} return type and must be
+ * {@code static} by default. Consequently, {@code @AfterAll} methods are not
+ * supported in {@link Nested @Nested} test classes or as <em>interface default
+ * methods</em> unless the test class is annotated with
+ * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}.
  * However, beginning with Java 16 {@code @AfterAll} methods may be declared as
  * {@code static} in {@link Nested @Nested} test classes, and the
  * {@code Lifecycle.PER_CLASS} restriction no longer applies. {@code @AfterAll}
  * methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
+ * <p>Using {@code private} visibility for {@code @BeforeAll} methods is
+ * strongly discouraged and will be disallowed in a future release.
+ *
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @AfterAll} methods are inherited from superclasses as long as
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
index df5a522e114f..8dfd018fa4f9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java
@@ -28,8 +28,9 @@
  *
  * <h2>Method Signatures</h2>
  *
- * <p>{@code @AfterEach} methods must have a {@code void} return type,
- * must not be {@code private}, and must not be {@code static}.
+ * <p>{@code @AfterEach} methods must have a {@code void} return type and must
+ * not be {@code static}. Using {@code private} visibility is strongly
+ * discouraged and will be disallowed in a future release.
  * They may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
index 01b56d393c1a..30eba9b73746 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java
@@ -29,17 +29,20 @@
  *
  * <h2>Method Signatures</h2>
  *
- * <p>{@code @BeforeAll} methods must have a {@code void} return type, must not
- * be {@code private}, and must be {@code static} by default. Consequently,
- * {@code @BeforeAll} methods are not supported in {@link Nested @Nested} test
- * classes or as <em>interface default methods</em> unless the test class is
- * annotated with {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}.
+ * <p>{@code @BeforeAll} methods must have a {@code void} return type and must
+ * be {@code static} by default. Consequently, {@code @BeforeAll} methods are
+ * not supported in {@link Nested @Nested} test classes or as <em>interface
+ * default methods</em> unless the test class is annotated with
+ * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}.
  * However, beginning with Java 16 {@code @BeforeAll} methods may be declared as
  * {@code static} in {@link Nested @Nested} test classes, and the
  * {@code Lifecycle.PER_CLASS} restriction no longer applies. {@code @BeforeAll}
  * methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
+ * <p>Using {@code private} visibility for {@code @BeforeAll} methods is
+ * strongly discouraged and will be disallowed in a future release.
+ *
  * <h2>Inheritance and Execution Order</h2>
  *
  * <p>{@code @BeforeAll} methods are inherited from superclasses as long as
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
index 79d0f73f0b4d..37ca2498c889 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java
@@ -28,8 +28,9 @@
  *
  * <h2>Method Signatures</h2>
  *
- * <p>{@code @BeforeEach} methods must have a {@code void} return type,
- * must not be {@code private}, and must not be {@code static}.
+ * <p>{@code @BeforeEach} methods must have a {@code void} return type and must
+ * not be {@code static}. Using {@code private} visibility is strongly
+ * discouraged and will be disallowed in a future release.
  * They may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
index 27c90790b140..9adb38ff3945 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LifecycleMethodUtils.java
@@ -61,7 +61,6 @@ private static List<Method> findMethodsAndAssertStaticAndNonPrivate(Class<?> tes
 		if (requireStatic) {
 			methods.forEach(method -> assertStatic(annotationType, method));
 		}
-		methods.forEach(method -> assertNonPrivate(annotationType, method));
 		return methods;
 	}
 
@@ -69,10 +68,7 @@ private static List<Method> findMethodsAndAssertNonStaticAndNonPrivate(Class<?>
 			Class<? extends Annotation> annotationType, HierarchyTraversalMode traversalMode) {
 
 		List<Method> methods = findMethodsAndCheckVoidReturnType(testClass, annotationType, traversalMode);
-		methods.forEach(method -> {
-			assertNonStatic(annotationType, method);
-			assertNonPrivate(annotationType, method);
-		});
+		methods.forEach(method -> assertNonStatic(annotationType, method));
 		return methods;
 	}
 
@@ -99,13 +95,6 @@ private static void assertNonStatic(Class<? extends Annotation> annotationType,
 		}
 	}
 
-	private static void assertNonPrivate(Class<? extends Annotation> annotationType, Method method) {
-		if (ReflectionUtils.isPrivate(method)) {
-			throw new JUnitException(String.format("@%s method '%s' must not be private.",
-				annotationType.getSimpleName(), method.toGenericString()));
-		}
-	}
-
 	private static void assertVoid(Class<? extends Annotation> annotationType, Method method) {
 		if (!returnsVoid(method)) {
 			throw new JUnitException(String.format("@%s method '%s' must not return a value.",
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
index 87cffb5af787..37dc164993ab 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/InvalidLifecycleMethodConfigurationTests.java
@@ -35,45 +35,25 @@ class InvalidLifecycleMethodConfigurationTests extends AbstractJupiterTestEngine
 
 	@Test
 	void executeValidTestCaseAlongsideTestCaseWithInvalidNonStaticBeforeAllDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidNonStaticBeforeAllMethod.class);
-	}
-
-	@Test
-	void executeValidTestCaseAlongsideTestCaseWithInvalidPrivateBeforeAllDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidPrivateBeforeAllMethod.class);
+		assertContainerFailed(TestCaseWithInvalidNonStaticBeforeAllMethod.class);
 	}
 
 	@Test
 	void executeValidTestCaseAlongsideTestCaseWithInvalidNonStaticAfterAllDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidNonStaticAfterAllMethod.class);
-	}
-
-	@Test
-	void executeValidTestCaseAlongsideTestCaseWithInvalidPrivateAfterAllDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidPrivateAfterAllMethod.class);
+		assertContainerFailed(TestCaseWithInvalidNonStaticAfterAllMethod.class);
 	}
 
 	@Test
 	void executeValidTestCaseAlongsideTestCaseWithInvalidStaticBeforeEachDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidStaticBeforeEachMethod.class);
-	}
-
-	@Test
-	void executeValidTestCaseAlongsideTestCaseWithInvalidPrivateBeforeEachDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidPrivateBeforeEachMethod.class);
+		assertContainerFailed(TestCaseWithInvalidStaticBeforeEachMethod.class);
 	}
 
 	@Test
 	void executeValidTestCaseAlongsideTestCaseWithInvalidStaticAfterEachDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidStaticAfterEachMethod.class);
-	}
-
-	@Test
-	void executeValidTestCaseAlongsideTestCaseWithInvalidPrivateAfterEachDeclaration() {
-		assertExecutionResults(TestCaseWithInvalidPrivateAfterEachMethod.class);
+		assertContainerFailed(TestCaseWithInvalidStaticAfterEachMethod.class);
 	}
 
-	private void assertExecutionResults(Class<?> invalidTestClass) {
+	private void assertContainerFailed(Class<?> invalidTestClass) {
 		EngineExecutionResults executionResults = executeTests(selectClass(TestCase.class),
 			selectClass(invalidTestClass));
 		Events containers = executionResults.containerEvents();
@@ -112,18 +92,6 @@ void test() {
 		}
 	}
 
-	static class TestCaseWithInvalidPrivateBeforeAllMethod {
-
-		// must not be private
-		@BeforeAll
-		private static void beforeAll() {
-		}
-
-		@Test
-		void test() {
-		}
-	}
-
 	static class TestCaseWithInvalidNonStaticAfterAllMethod {
 
 		// must be static
@@ -136,18 +104,6 @@ void test() {
 		}
 	}
 
-	static class TestCaseWithInvalidPrivateAfterAllMethod {
-
-		// must not be private
-		@AfterAll
-		private static void afterAll() {
-		}
-
-		@Test
-		void test() {
-		}
-	}
-
 	static class TestCaseWithInvalidStaticBeforeEachMethod {
 
 		// must NOT be static
@@ -160,18 +116,6 @@ void test() {
 		}
 	}
 
-	static class TestCaseWithInvalidPrivateBeforeEachMethod {
-
-		// must NOT be private
-		@BeforeEach
-		private void beforeEach() {
-		}
-
-		@Test
-		void test() {
-		}
-	}
-
 	static class TestCaseWithInvalidStaticAfterEachMethod {
 
 		// must NOT be static
@@ -184,16 +128,4 @@ void test() {
 		}
 	}
 
-	static class TestCaseWithInvalidPrivateAfterEachMethod {
-
-		// must NOT be private
-		@AfterEach
-		private void afterEach() {
-		}
-
-		@Test
-		void test() {
-		}
-	}
-
 }

From 6b12a22dd30bfcb9012be456895cad8df1ea9366 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 22 Apr 2023 21:58:04 +0200
Subject: [PATCH 1184/1433] Move release notes entry for #3130 to 5.9.3

---
 .../release-notes/release-notes-5.10.0-M1.adoc         | 10 +---------
 .../asciidoc/release-notes/release-notes-5.9.3.adoc    |  9 +++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 9912b813930b..0fa133676232 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -51,15 +51,7 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* Parameter types for _local_ `@MethodSource` factory method names are now validated. For
-  example, `@MethodSource("myFactory(example.NonexistentType)")` will now result in an
-  exception stating that `example.NonexistentType` cannot be resolved to a valid type.
-* The syntax for parameter types in _local_ `@MethodSource` factory method names now
-  supports canonical array names -- for example, you may now specify `int[]` as in
-  `@MethodSource("myFactory(int[])"` instead of the _binary_ name `[I` as in
-  `@MethodSource("myFactory([I)"` (which was already supported) and
-  `@MethodSource("myFactory(java.lang.String[])` instead of
-  `@MethodSource("myFactory([Ljava.lang.String;)`.
+* ❓
 
 ==== Deprecations and Breaking Changes
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index 4e0da156e26f..0ec90b9e25e0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -31,6 +31,15 @@ JUnit repository on GitHub.
 
 ==== Bug Fixes
 
+* Parameter types for _local_ `@MethodSource` factory method names are now validated. For
+  example, `@MethodSource("myFactory(example.NonexistentType)")` will now result in an
+  exception stating that `example.NonexistentType` cannot be resolved to a valid type.
+* The syntax for parameter types in _local_ `@MethodSource` factory method names now
+  supports canonical array names -- for example, you may now specify `int[]` as in
+  `@MethodSource("myFactory(int[])"` instead of the _binary_ name `[I` as in
+  `@MethodSource("myFactory([I)"` (which was already supported) and
+  `@MethodSource("myFactory(java.lang.String[])` instead of
+  `@MethodSource("myFactory([Ljava.lang.String;)`.
 * Exceptions thrown for undeletable files when cleaning up a temporary directory created
   via `@TempDir` now include the root cause.
 * Allow lifecycle methods to be declared as `private` again for backwards compatibility

From a6b95dbd6305e4edf261eca04b10067e8d685740 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 23 Apr 2023 13:34:14 +0200
Subject: [PATCH 1185/1433] Polish 5.9.3 Release Notes

---
 .../asciidoc/release-notes/release-notes-5.9.3.adoc   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index 0ec90b9e25e0..8e4f71799f9b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -40,10 +40,11 @@ JUnit repository on GitHub.
   `@MethodSource("myFactory([I)"` (which was already supported) and
   `@MethodSource("myFactory(java.lang.String[])` instead of
   `@MethodSource("myFactory([Ljava.lang.String;)`.
-* Exceptions thrown for undeletable files when cleaning up a temporary directory created
-  via `@TempDir` now include the root cause.
-* Allow lifecycle methods to be declared as `private` again for backwards compatibility
-  but document it as a discouraged practice.
+* Exceptions thrown for files that cannot be deleted when cleaning up a temporary
+  directory created via `@TempDir` now include the root cause.
+* Lifecycle methods are allowed to be declared as `private` again for backwards
+  compatibility; however, using `private` visibility for lifecycle methods is strongly
+  discouraged and will be disallowed in a future release.
 
 ==== Deprecations and Breaking Changes
 
@@ -54,7 +55,7 @@ JUnit repository on GitHub.
 * ❓
 
 
-= [[release-notes-5.9.3-junit-vintage]]
+[[release-notes-5.9.3-junit-vintage]]
 === JUnit Vintage
 
 ==== Bug Fixes

From 07f2bf349e45f5a63228cb6002ae7bdbd3445ce1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 22 Apr 2023 12:20:31 +0200
Subject: [PATCH 1186/1433] Treat overloaded local & external @MethodSource
 factory methods equally

Prior to this commit, given overloaded @MethodSource factory methods, a
local qualified method name (LQMN) was not treated the same as a
fully-qualified method name (FQMN).

Specifically, if the user provided a FQMN without specifying the
parameter list, JUnit Jupiter would find the factory method that
accepts zero arguments. Whereas, if the user provided an LQMN without
specifying the parameter list, JUnit Jupiter would fail to find the
factory method.

This commit fixes that bug by reworking the internals of
MethodArgumentsProvider so that overloaded local and external factory
methods are looked up with the same semantics.

The commit also improves diagnostics for failure to find a factory
method specified via LQMN by falling back to the same lenient search
semantics that are used to locate a "default" local factory method.

Furthermore, this commit modifies the internals of
MethodArgumentsProvider so that it consistently throws
PreconditionViolationExceptions for user configuration errors.

This commit also introduces additional tests for error use cases.

See: #3130, #3131
Closes: #3266
---
 .../release-notes/release-notes-5.9.3.adoc    |   8 +-
 .../provider/MethodArgumentsProvider.java     | 113 ++++---
 .../jupiter/params/provider/MethodSource.java |  16 +-
 .../MethodArgumentsProviderTests.java         | 288 +++++++++++++-----
 4 files changed, 300 insertions(+), 125 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index 8e4f71799f9b..cb4b0f1ec7a2 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -40,6 +40,9 @@ JUnit repository on GitHub.
   `@MethodSource("myFactory([I)"` (which was already supported) and
   `@MethodSource("myFactory(java.lang.String[])` instead of
   `@MethodSource("myFactory([Ljava.lang.String;)`.
+* The search algorithm used to find `@MethodSource` factory methods now applies consistent
+  semantics for _local_ qualified method names and fully-qualified method names for
+  overloaded factory methods.
 * Exceptions thrown for files that cannot be deleted when cleaning up a temporary
   directory created via `@TempDir` now include the root cause.
 * Lifecycle methods are allowed to be declared as `private` again for backwards
@@ -52,7 +55,10 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* The search algorithm used to find `@MethodSource` factory methods now falls back to
+  lenient search semantics when a factory method cannot be found by qualified name
+  (without a parameter list) and also provides better diagnostics when a unique factory
+  method cannot be found.
 
 
 [[release-notes-5.9.3-junit-vintage]]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index b92e19d46b6d..5b277369d326 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -37,6 +38,9 @@
  */
 class MethodArgumentsProvider extends AnnotationBasedArgumentsProvider<MethodSource> {
 
+	private static final Predicate<Method> isFactoryMethod = //
+		method -> isConvertibleToStream(method.getReturnType()) && !isTestMethod(method);
+
 	@Override
 	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, MethodSource annotation) {
 		Class<?> testClass = context.getRequiredTestClass();
@@ -45,28 +49,37 @@ protected Stream<? extends Arguments> provideArguments(ExtensionContext context,
 		String[] methodNames = annotation.value();
 		// @formatter:off
 		return stream(methodNames)
-				.map(factoryMethodName -> getFactoryMethod(testClass, testMethod, factoryMethodName))
+				.map(factoryMethodName -> findFactoryMethod(testClass, testMethod, factoryMethodName))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
 				.map(MethodArgumentsProvider::toArguments);
 		// @formatter:on
 	}
 
-	private Method getFactoryMethod(Class<?> testClass, Method testMethod, String factoryMethodName) {
-		if (!StringUtils.isBlank(factoryMethodName)) {
-			if (looksLikeAFullyQualifiedMethodName(factoryMethodName)) {
-				return getFactoryMethodByFullyQualifiedName(factoryMethodName);
-			}
-			else if (looksLikeALocalQualifiedMethodName(factoryMethodName)) {
-				return getFactoryMethodByFullyQualifiedName(testClass.getName() + "#" + factoryMethodName);
-			}
-		}
-		else {
-			// User did not provide a factory method name, so we search for a
-			// factory method with the same name as the parameterized test method.
+	private static Method findFactoryMethod(Class<?> testClass, Method testMethod, String factoryMethodName) {
+		String originalFactoryMethodName = factoryMethodName;
+
+		// If the user did not provide a factory method name, find a "default" local
+		// factory method with the same name as the parameterized test method.
+		if (StringUtils.isBlank(factoryMethodName)) {
 			factoryMethodName = testMethod.getName();
+			return findFactoryMethodBySimpleName(testClass, testMethod, factoryMethodName);
 		}
-		return findFactoryMethodBySimpleName(testClass, testMethod, factoryMethodName);
+
+		// Convert local factory method name to fully-qualified method name.
+		if (!looksLikeAFullyQualifiedMethodName(factoryMethodName)) {
+			factoryMethodName = testClass.getName() + "#" + factoryMethodName;
+		}
+
+		// Find factory method using fully-qualified name.
+		Method factoryMethod = findFactoryMethodByFullyQualifiedName(testMethod, factoryMethodName);
+
+		// Ensure factory method has a valid return type and is not a test method.
+		Preconditions.condition(isFactoryMethod.test(factoryMethod), () -> format(
+			"Could not find valid factory method [%s] for test class [%s] but found the following invalid candidate: %s",
+			originalFactoryMethodName, testClass.getName(), factoryMethod));
+
+		return factoryMethod;
 	}
 
 	private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodName) {
@@ -83,52 +96,54 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa
 			return indexOfFirstDot < indexOfLastOpeningParenthesis;
 		}
 		// If we get this far, we conclude the supplied factory method name "looks"
-		// like it was intended to be a fully qualified method name, even if the
+		// like it was intended to be a fully-qualified method name, even if the
 		// syntax is invalid. We do this in order to provide better diagnostics for
-		// the user when a fully qualified method name is in fact invalid.
+		// the user when a fully-qualified method name is in fact invalid.
 		return true;
 	}
 
-	private static boolean looksLikeALocalQualifiedMethodName(String factoryMethodName) {
-		// This method is intended to be called after looksLikeAFullyQualifiedMethodName()
-		// and therefore does not check for the absence of '#' and does not reason about
-		// the presence or absence of a fully qualified class name.
-		if (factoryMethodName.endsWith("()")) {
-			return true;
-		}
-		int indexOfLastOpeningParenthesis = factoryMethodName.lastIndexOf('(');
-		return (indexOfLastOpeningParenthesis > 0)
-				&& (indexOfLastOpeningParenthesis < factoryMethodName.lastIndexOf(')'));
-	}
-
-	private Method getFactoryMethodByFullyQualifiedName(String fullyQualifiedMethodName) {
+	private static Method findFactoryMethodByFullyQualifiedName(Method testMethod, String fullyQualifiedMethodName) {
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
 		String methodName = methodParts[1];
 		String methodParameters = methodParts[2];
+		Class<?> clazz = loadRequiredClass(className);
+
+		// Attempt to find an exact match first.
+		Method factoryMethod = ReflectionUtils.findMethod(clazz, methodName, methodParameters).orElse(null);
+		if (factoryMethod != null) {
+			return factoryMethod;
+		}
+
+		boolean explicitParameterListSpecified = //
+			StringUtils.isNotBlank(methodParameters) || fullyQualifiedMethodName.endsWith("()");
+
+		// If we didn't find an exact match but an explicit parameter list was specified,
+		// that's a user configuration error.
+		Preconditions.condition(!explicitParameterListSpecified,
+			() -> format("Could not find factory method [%s(%s)] in class [%s]", methodName, methodParameters,
+				className));
 
-		return ReflectionUtils.findMethod(loadRequiredClass(className), methodName, methodParameters).orElseThrow(
-			() -> new JUnitException(format("Could not find factory method [%s(%s)] in class [%s]", methodName,
-				methodParameters, className)));
+		// Otherwise, fall back to the same lenient search semantics that are used
+		// to locate a "default" local factory method.
+		return findFactoryMethodBySimpleName(clazz, testMethod, methodName);
 	}
 
 	/**
-	 * Find all methods in the given {@code testClass} with the desired {@code factoryMethodName}
-	 * which have return types that can be converted to a {@link Stream}, ignoring the
-	 * {@code testMethod} itself as well as any {@code @Test}, {@code @TestTemplate},
-	 * or {@code @TestFactory} methods with the same name.
-	 * @return the factory method, if found
-	 * @throws org.junit.platform.commons.PreconditionViolationException if the
-	 * factory method was not found or if multiple competing factory methods with
-	 * the same name were found
+	 * Find the factory method by searching for all methods in the given {@code clazz}
+	 * with the desired {@code factoryMethodName} which have return types that can be
+	 * converted to a {@link Stream}, ignoring the {@code testMethod} itself as well
+	 * as any {@code @Test}, {@code @TestTemplate}, or {@code @TestFactory} methods
+	 * with the same name.
+	 * @return the single factory method matching the search criteria
+	 * @throws PreconditionViolationException if the factory method was not found or
+	 * multiple competing factory methods with the same name were found
 	 */
-	private Method findFactoryMethodBySimpleName(Class<?> testClass, Method testMethod, String factoryMethodName) {
+	private static Method findFactoryMethodBySimpleName(Class<?> clazz, Method testMethod, String factoryMethodName) {
 		Predicate<Method> isCandidate = candidate -> factoryMethodName.equals(candidate.getName())
 				&& !testMethod.equals(candidate);
-		List<Method> candidates = ReflectionUtils.findMethods(testClass, isCandidate);
+		List<Method> candidates = ReflectionUtils.findMethods(clazz, isCandidate);
 
-		Predicate<Method> isFactoryMethod = method -> isConvertibleToStream(method.getReturnType())
-				&& !isTestMethod(method);
 		List<Method> factoryMethods = candidates.stream().filter(isFactoryMethod).collect(toList());
 
 		Preconditions.condition(factoryMethods.size() > 0, () -> {
@@ -138,23 +153,23 @@ private Method findFactoryMethodBySimpleName(Class<?> testClass, Method testMeth
 			if (candidates.size() > 0) {
 				return format(
 					"Could not find valid factory method [%s] in class [%s] but found the following invalid candidates: %s",
-					factoryMethodName, testClass.getName(), candidates);
+					factoryMethodName, clazz.getName(), candidates);
 			}
 			// Otherwise, report that we didn't find anything.
-			return format("Could not find factory method [%s] in class [%s]", factoryMethodName, testClass.getName());
+			return format("Could not find factory method [%s] in class [%s]", factoryMethodName, clazz.getName());
 		});
 		Preconditions.condition(factoryMethods.size() == 1,
 			() -> format("%d factory methods named [%s] were found in class [%s]: %s", factoryMethods.size(),
-				factoryMethodName, testClass.getName(), factoryMethods));
+				factoryMethodName, clazz.getName(), factoryMethods));
 		return factoryMethods.get(0);
 	}
 
-	private boolean isTestMethod(Method candidate) {
+	private static boolean isTestMethod(Method candidate) {
 		return isAnnotated(candidate, Test.class) || isAnnotated(candidate, TestTemplate.class)
 				|| isAnnotated(candidate, TestFactory.class);
 	}
 
-	private Class<?> loadRequiredClass(String className) {
+	private static Class<?> loadRequiredClass(String className) {
 		return ReflectionUtils.tryToLoadClass(className).getOrThrow(
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 	}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
index dbd41bd66b7a..3c8a39a0898e 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodSource.java
@@ -111,12 +111,20 @@
 	 * The names of factory methods within the test class or in external classes
 	 * to use as sources for arguments.
 	 *
-	 * <p>Factory methods in external classes must be referenced by <em>fully
-	 * qualified method name</em> &mdash; for example,
-	 * {@code com.example.StringsProviders#blankStrings} or
-	 * {@code com.example.TopLevelClass$NestedClass#classMethod} for a factory
+	 * <p>Factory methods in external classes must be referenced by
+	 * <em>fully-qualified method name</em> &mdash; for example,
+	 * {@code "com.example.StringsProviders#blankStrings"} or
+	 * {@code "com.example.TopLevelClass$NestedClass#classMethod"} for a factory
 	 * method in a static nested class.
 	 *
+	 * <p>If a factory method accepts arguments that are provided by a
+	 * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolver},
+	 * you can supply the formal parameter list in the qualified method name to
+	 * disambiguate between overloaded variants of the factory method. For example,
+	 * {@code "blankStrings(int)"} for a local qualified method name or
+	 * {@code "com.example.StringsProviders#blankStrings(int)"} for a fully-qualified
+	 * method name.
+	 *
 	 * <p>If no factory method names are declared, a method within the test class
 	 * that has the same name as the test method will be used as the factory
 	 * method by default.
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 281670a4435f..1bd49479bb06 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -13,7 +13,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.engine.extension.MutableExtensionRegistry.createRegistryWithDefaultExtensions;
-import static org.junit.jupiter.params.provider.MethodArgumentsProviderTests.DefaultFactoryMethodNameTestCase.TEST_METHOD;
 import static org.junit.platform.commons.util.ReflectionUtils.findMethod;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
@@ -50,26 +49,6 @@ class MethodArgumentsProviderTests {
 
 	private MutableExtensionRegistry extensionRegistry;
 
-	@Test
-	void throwsExceptionWhenFactoryMethodDoesNotExist() {
-		var exception = assertThrows(JUnitException.class, () -> provideArguments("unknownMethod").toArray());
-
-		assertThat(exception.getMessage()).isEqualTo(
-			"Could not find factory method [unknownMethod] in class [" + TestCase.class.getName() + "]");
-	}
-
-	@Test
-	void throwsExceptionForIllegalReturnType() {
-		var exception = assertThrows(PreconditionViolationException.class,
-			() -> provideArguments("providerWithIllegalReturnType").toArray());
-
-		assertThat(exception.getMessage())//
-				.containsSubsequence("Could not find valid factory method [providerWithIllegalReturnType] in class [",
-					TestCase.class.getName() + "]", //
-					"but found the following invalid candidates: ", //
-					"[static java.lang.Object org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase.providerWithIllegalReturnType()]");
-	}
-
 	@Test
 	void providesArgumentsUsingStream() {
 		var arguments = provideArguments("stringStreamProvider");
@@ -195,7 +174,7 @@ void providesArgumentsUsingListOfObjectArrays() {
 
 	@Test
 	void throwsExceptionWhenNonStaticFactoryMethodIsReferencedAndStaticIsRequired() {
-		var exception = assertThrows(JUnitException.class,
+		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(NonStaticTestCase.class, null, false, "nonStaticStringStreamProvider").toArray());
 
 		assertThat(exception).hasMessageContaining("Cannot invoke non-static method");
@@ -210,8 +189,10 @@ void providesArgumentsFromNonStaticFactoryMethodWhenStaticIsNotRequired() {
 
 	@Test
 	void providesArgumentsUsingDefaultFactoryMethodName() {
-		Class<?> testClass = DefaultFactoryMethodNameTestCase.class;
-		var testMethod = findMethod(testClass, TEST_METHOD, String.class).get();
+		var testClass = DefaultFactoryMethodNameTestCase.class;
+		var methodName = "testDefaultFactoryMethodName";
+		var testMethod = findMethod(testClass, methodName, String.class).get();
+
 		var arguments = provideArguments(testClass, testMethod, false, "");
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"));
@@ -246,35 +227,6 @@ void providesArgumentsUsingExternalAndInternalFactoryMethodsCombined() {
 		assertThat(arguments).containsExactly(array("foo"), array("bar"), array("string1"), array("string2"));
 	}
 
-	@Test
-	void throwsExceptionWhenClassForExternalFactoryMethodCannotBeLoaded() {
-		var exception = assertThrows(JUnitException.class,
-			() -> provideArguments("com.example.NonExistentExternalFactoryMethods#stringsProvider").toArray());
-
-		assertThat(exception.getMessage()).isEqualTo(
-			"Could not load class [com.example.NonExistentExternalFactoryMethods]");
-	}
-
-	@Test
-	void throwsExceptionWhenExternalFactoryMethodCannotBeFound() {
-		var exception = assertThrows(JUnitException.class,
-			() -> provideArguments(ExternalFactoryMethods.class.getName() + "#nonExistentMethod").toArray());
-
-		assertThat(exception.getMessage()).isEqualTo("Could not find factory method [nonExistentMethod()] in class ["
-				+ ExternalFactoryMethods.class.getName() + "]");
-	}
-
-	@Test
-	void throwsExceptionWhenFullyQualifiedMethodNameIsInvalid() {
-		var exception = assertThrows(JUnitException.class,
-			() -> provideArguments(ExternalFactoryMethods.class.getName() + ".wrongSyntax").toArray());
-
-		assertThat(exception.getMessage()).isEqualTo(
-			"[" + ExternalFactoryMethods.class.getName() + ".wrongSyntax] is not a valid fully qualified method name: "
-					+ "it must start with a fully qualified class name followed by a '#' and then the method name, "
-					+ "optionally followed by a parameter list enclosed in parentheses.");
-	}
-
 	@Nested
 	class PrimitiveArrays {
 
@@ -391,6 +343,13 @@ void providesArgumentsUsingSimpleNameForFactoryMethodThatAcceptsArgumentWithoutS
 			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
 		}
 
+		@Test
+		void providesArgumentsUsingFullyQualifiedNameForFactoryMethodThatAcceptsArgumentWithoutSpecifyingParameterList() {
+			var arguments = provideArguments(TestCase.class.getName() + "#stringStreamProviderWithParameter");
+
+			assertThat(arguments).containsExactly(array("foo!"), array("bar!"));
+		}
+
 		@Test
 		void providesArgumentsUsingFullyQualifiedNameSpecifyingParameter() {
 			var arguments = provideArguments(
@@ -461,7 +420,8 @@ in class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCas
 		@Test
 		void failsToProvideArgumentsUsingFullyQualifiedNameSpecifyingIncorrectParameterType() {
 			String method = TestCase.class.getName() + "#stringStreamProviderWithParameter(java.lang.Integer)";
-			var exception = assertThrows(JUnitException.class, () -> provideArguments(method).toArray());
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments(method).toArray());
 
 			assertThat(exception).hasMessage("""
 					Could not find factory method [stringStreamProviderWithParameter(java.lang.Integer)] in \
@@ -471,7 +431,7 @@ class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]"
 		@Test
 		void failsToProvideArgumentsUsingLocalQualifiedNameSpecifyingIncorrectParameterType() {
 			var method = "stringStreamProviderWithParameter(java.lang.Integer)";
-			var exception = assertThrows(JUnitException.class,
+			var exception = assertThrows(PreconditionViolationException.class,
 				() -> provideArguments(this.testMethod, method).toArray());
 
 			assertThat(exception).hasMessage("""
@@ -539,11 +499,6 @@ void providesArgumentsUsingLocalQualifiedNameSpecifyingMultipleParameters(String
 			assertThat(arguments).containsExactly(array("foo!!"), array("bar!!"));
 		}
 
-		/**
-		 * In contrast to {@link #failsToProvideArgumentsUsingLocalQualifiedNameForOverloadedFactoryMethodWhenParameterListIsNotSpecified()},
-		 * using the fully qualified method name without specifying the parameter list "selects"
-		 * the overloaded method that accepts zero arguments.
-		 */
 		@Test
 		void providesArgumentsUsingFullyQualifiedNameForOverloadedFactoryMethodWhenParameterListIsNotSpecified() {
 			var arguments = provideArguments(TestCase.class.getName() + "#stringStreamProviderWithOrWithoutParameter");
@@ -552,16 +507,160 @@ void providesArgumentsUsingFullyQualifiedNameForOverloadedFactoryMethodWhenParam
 		}
 
 		@Test
-		void failsToProvideArgumentsUsingLocalQualifiedNameForOverloadedFactoryMethodWhenParameterListIsNotSpecified() {
+		void providesArgumentsUsingLocalQualifiedNameForOverloadedFactoryMethodWhenParameterListIsNotSpecified() {
+			var arguments = provideArguments("stringStreamProviderWithOrWithoutParameter").toArray();
+
+			assertThat(arguments).containsExactly(array("foo"), array("bar"));
+		}
+
+	}
+
+	@Nested
+	class ErrorCases {
+
+		@Test
+		void throwsExceptionWhenFullyQualifiedMethodNameSyntaxIsInvalid() {
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments("org.example.wrongSyntax").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo(
+				"[org.example.wrongSyntax] is not a valid fully qualified method name: "
+						+ "it must start with a fully qualified class name followed by a '#' and then the method name, "
+						+ "optionally followed by a parameter list enclosed in parentheses.");
+		}
+
+		@Test
+		void throwsExceptionWhenClassForExternalFactoryMethodCannotBeLoaded() {
+			var exception = assertThrows(JUnitException.class,
+				() -> provideArguments("com.example.NonExistentClass#stringsProvider").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo("Could not load class [com.example.NonExistentClass]");
+		}
+
+		@Test
+		void throwsExceptionWhenExternalFactoryMethodDoesNotExist() {
+			String factoryClass = ExternalFactoryMethods.class.getName();
+
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments(factoryClass + "#nonExistentMethod").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo(
+				"Could not find factory method [nonExistentMethod] in class [%s]", factoryClass);
+		}
+
+		@Test
+		void throwsExceptionWhenLocalFactoryMethodDoesNotExist() {
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments("nonExistentMethod").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo(
+				"Could not find factory method [nonExistentMethod] in class [%s]", TestCase.class.getName());
+		}
+
+		@Test
+		void throwsExceptionWhenExternalFactoryMethodAcceptingSingleArgumentDoesNotExist() {
+			String factoryClass = ExternalFactoryMethods.class.getName();
+
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments(factoryClass + "#nonExistentMethod(int)").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo(
+				"Could not find factory method [nonExistentMethod(int)] in class [%s]", factoryClass);
+		}
+
+		@Test
+		void throwsExceptionWhenLocalFactoryMethodAcceptingSingleArgumentDoesNotExist() {
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments("nonExistentMethod(int)").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo(
+				"Could not find factory method [nonExistentMethod(int)] in class [%s]", TestCase.class.getName());
+		}
+
+		@Test
+		void throwsExceptionWhenExternalFactoryMethodAcceptingMultipleArgumentsDoesNotExist() {
+			String factoryClass = ExternalFactoryMethods.class.getName();
+
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments(factoryClass + "#nonExistentMethod(int, java.lang.String)").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo(
+				"Could not find factory method [nonExistentMethod(int, java.lang.String)] in class [%s]", factoryClass);
+		}
+
+		@Test
+		void throwsExceptionWhenLocalFactoryMethodAcceptingMultipleArgumentsDoesNotExist() {
 			var exception = assertThrows(PreconditionViolationException.class,
-				() -> provideArguments("stringStreamProviderWithOrWithoutParameter").toArray());
+				() -> provideArguments("nonExistentMethod(java.lang.String,int)").toArray());
+
+			assertThat(exception.getMessage()).isEqualTo(
+				"Could not find factory method [nonExistentMethod(java.lang.String,int)] in class [%s]",
+				TestCase.class.getName());
+		}
+
+		@Test
+		void throwsExceptionWhenExternalFactoryMethodHasInvalidReturnType() {
+			String testClass = TestCase.class.getName();
+			String factoryClass = ExternalFactoryMethods.class.getName();
+			String factoryMethod = factoryClass + "#factoryWithInvalidReturnType";
+
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments(TestCase.class, null, false, factoryMethod).toArray());
+
+			assertThat(exception.getMessage())//
+					.containsSubsequence("Could not find valid factory method [" + factoryMethod + "] for test class [",
+						testClass + "]", //
+						"but found the following invalid candidate: ",
+						"static java.lang.Object " + factoryClass + ".factoryWithInvalidReturnType()");
+		}
+
+		@Test
+		void throwsExceptionWhenLocalFactoryMethodHasInvalidReturnType() {
+			String testClass = TestCase.class.getName();
+			String factoryClass = testClass;
+			String factoryMethod = "factoryWithInvalidReturnType";
+
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments(factoryMethod).toArray());
 
 			assertThat(exception.getMessage())//
-					.startsWith("3 factory methods named [stringStreamProviderWithOrWithoutParameter] were found in "
-							+ "class [org.junit.jupiter.params.provider.MethodArgumentsProviderTests$TestCase]: ")//
-					.contains("stringStreamProviderWithOrWithoutParameter()",
-						"stringStreamProviderWithOrWithoutParameter(java.lang.String)",
-						"stringStreamProviderWithOrWithoutParameter(java.lang.String,java.lang.String)");
+					.containsSubsequence("Could not find valid factory method [" + factoryMethod + "] for test class [",
+						factoryClass + "]", //
+						"but found the following invalid candidate: ", //
+						"static java.lang.Object " + factoryClass + ".factoryWithInvalidReturnType()");
+		}
+
+		@Test
+		void throwsExceptionWhenMultipleDefaultFactoryMethodCandidatesExist() {
+			var testClass = MultipleDefaultFactoriesTestCase.class;
+			var methodName = "test";
+			var testMethod = findMethod(testClass, methodName, String.class).get();
+
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments(testClass, testMethod, false, "").toArray());
+
+			assertThat(exception.getMessage()).contains(//
+				"2 factory methods named [test] were found in class [", testClass.getName() + "]: ", //
+				"$MultipleDefaultFactoriesTestCase.test()", //
+				"$MultipleDefaultFactoriesTestCase.test(int)"//
+			);
+		}
+
+		@Test
+		void throwsExceptionWhenMultipleInvalidDefaultFactoryMethodCandidatesExist() {
+			var testClass = MultipleInvalidDefaultFactoriesTestCase.class;
+			var methodName = "test";
+			var testMethod = findMethod(testClass, methodName, String.class).get();
+
+			var exception = assertThrows(PreconditionViolationException.class,
+				() -> provideArguments(testClass, testMethod, false, "").toArray());
+
+			assertThat(exception.getMessage()).contains(//
+				"Could not find valid factory method [test] in class [", testClass.getName() + "]", //
+				"but found the following invalid candidates: ", //
+				"$MultipleInvalidDefaultFactoriesTestCase.test()", //
+				"$MultipleInvalidDefaultFactoriesTestCase.test(int)"//
+			);
 		}
 
 	}
@@ -585,8 +684,13 @@ private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod,
 
 		if (testMethod == null) {
 			try {
+				class DummyClass {
+					@SuppressWarnings("unused")
+					public void dummyMethod() {
+					};
+				}
 				// ensure we have a non-null method, even if it's not a real test method.
-				testMethod = getClass().getMethod("toString");
+				testMethod = DummyClass.class.getMethod("dummyMethod");
 			}
 			catch (Exception ex) {
 				throw new RuntimeException(ex);
@@ -618,13 +722,47 @@ private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod,
 
 	static class DefaultFactoryMethodNameTestCase {
 
-		static final String TEST_METHOD = "testDefaultFactoryMethodName";
+		// Test
+		void testDefaultFactoryMethodName(String param) {
+		}
 
+		// Factory
 		static Stream<String> testDefaultFactoryMethodName() {
 			return Stream.of("foo", "bar");
 		}
+	}
+
+	static class MultipleDefaultFactoriesTestCase {
+
+		// Test
+		void test(String param) {
+		}
 
-		void testDefaultFactoryMethodName(String param) {
+		// Factory
+		static Stream<String> test() {
+			return Stream.of();
+		}
+
+		// Another Factory
+		static Stream<Integer> test(int num) {
+			return Stream.of();
+		}
+	}
+
+	static class MultipleInvalidDefaultFactoriesTestCase {
+
+		// Test
+		void test(String param) {
+		}
+
+		// NOT a Factory
+		static String test() {
+			return null;
+		}
+
+		// Also NOT a Factory
+		static Object test(int num) {
+			return null;
 		}
 	}
 
@@ -635,7 +773,7 @@ void test() {
 
 		// --- Invalid ---------------------------------------------------------
 
-		static Object providerWithIllegalReturnType() {
+		static Object factoryWithInvalidReturnType() {
 			return -1;
 		}
 
@@ -671,6 +809,10 @@ static Stream<String> stringStreamProviderWithOrWithoutParameter(String paramete
 			return stringStreamProviderWithParameter(parameter1 + parameter2);
 		}
 
+		// Overloaded method, but not a valid return type for a factory method
+		static void stringStreamProviderWithOrWithoutParameter(String parameter1, int parameter2) {
+		}
+
 		// @ParameterizedTest
 		// @MethodSource // use default, inferred factory method
 		void overloadedStringStreamProvider(Object parameter) {
@@ -798,6 +940,10 @@ Stream<String> nonStaticStringStreamProvider() {
 
 	static class ExternalFactoryMethods {
 
+		static Object factoryWithInvalidReturnType() {
+			return -1;
+		}
+
 		static Stream<String> stringsProvider() {
 			return Stream.of("string1", "string2");
 		}

From 918f0970bce9e010b8b085dd25471984854f1665 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 23 Apr 2023 15:14:27 +0200
Subject: [PATCH 1187/1433] Ignore obsolete buildSrc directory

The buildSrc directory was deleted as part of #3149 but when using an
existing working copy or switching between `main` and existing release
branches its `build` folder will reappear and cause the
`checkstyleNoHttp` task to fail. Therefore, we'll keep ignoring it for
the time being to make local development simpler.
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f1cf305950ea..aa5dea89658d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,5 +61,5 @@ nexusPublishing {
 }
 
 nohttp {
-	source.exclude("**/.gradle/**", "gradle/plugins/**/build/**")
+	source.exclude("**/.gradle/**", "gradle/plugins/**/build/**", "buildSrc/build/**")
 }

From e48bd292000e9af30a0d4ad5e9cfb7d81d14db7c Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <mpkorstanje@users.noreply.github.com>
Date: Sun, 23 Apr 2023 15:22:25 +0200
Subject: [PATCH 1188/1433] Limit max pool size for dynamic parallel execution
 (#3206)

This is a followup of #3044 for the `dynamic` strategy.

Fixes #3205.
---
 .../release-notes-5.10.0-M1.adoc              |  8 ++-
 .../asciidoc/user-guide/writing-tests.adoc    | 24 +++++++--
 ...arallelExecutionConfigurationStrategy.java | 52 +++++++++++++++++--
 ...elExecutionConfigurationStrategyTests.java | 22 +++++++-
 4 files changed, 97 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 0fa133676232..56c41b3286f7 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -42,6 +42,7 @@ repository on GitHub.
   methods of the former. Please refer to the
   <<../user-guide/index.adoc#launcher-api-launcher-interceptors-custom, User Guide>> for
   details.
+* Support for limiting the `max-pool-size-factor` for parallel execution via a configuration parameter.
 * The new `testfeed` details mode for `ConsoleLauncher` prints test execution events as
   they occur in a concise format.
 
@@ -55,7 +56,8 @@ repository on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* The `dynamic` parallel execution strategy now allows the thread pool to be saturated by
+default.
 
 ==== New Features and Improvements
 
@@ -76,6 +78,10 @@ repository on GitHub.
   `ArgumentsProvider` and `AnnotationConsumer`.
 * New `AnnotationBasedArgumentConverter` convenience base class which implements both
   `ArgumentConverter` and `AnnotationConsumer`.
+* New `junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor` configuration
+  parameter to set the maximum pool size factor.
+* New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
+  parameter to disable pool saturation.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 9f26004ec5dd..e0806ef9bbed 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2395,6 +2395,8 @@ configuration parameter to one of the following options.
   Computes the desired parallelism based on the number of available processors/cores
   multiplied by the `junit.jupiter.execution.parallel.config.dynamic.factor`
   configuration parameter (defaults to `1`).
+  The optional `junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor`
+  configuration parameter can be used to limit the maximum number of threads.
 
 `fixed`::
   Uses the mandatory `junit.jupiter.execution.parallel.config.fixed.parallelism`
@@ -2418,8 +2420,8 @@ of the synchronization mechanisms described in the next section, the `ForkJoinPo
 is used behind the scenes may spawn additional threads to ensure execution continues with
 sufficient parallelism.
 If you require such guarantees, with Java 9+, it is possible to limit the maximum number
-of concurrent threads by controlling the maximum pool size of the `fixed` and `custom`
-strategies.
+of concurrent threads by controlling the maximum pool size of the `dynamic`, `fixed` and
+`custom` strategies.
 
 [[writing-tests-parallel-execution-config-properties]]
 ===== Relevant properties
@@ -2466,6 +2468,22 @@ The following table lists relevant properties for configuring parallel execution
 | a positive decimal number
 | ```1.0```
 
+| ```junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor```
+| Factor to be multiplied by the number of available processors/cores and the value of
+  `junit.jupiter.execution.parallel.config.dynamic.factor` to determine the desired
+  parallelism for the ```dynamic``` configuration strategy
+| a positive decimal number, must be greater than or equal to `1.0`
+| 256 + the value of `junit.jupiter.execution.parallel.config.dynamic.factor` multiplied
+  by the number of available processors/cores
+
+| ```junit.jupiter.execution.parallel.config.dynamic.saturate```
+| Disable saturation of the underlying fork-join pool for the ```dynamic``` configuration
+strategy
+|
+* `true`
+* `false`
+| ```true```
+
 | ```junit.jupiter.execution.parallel.config.fixed.parallelism```
 | Desired parallelism for the ```fixed``` configuration strategy
 | a positive integer
@@ -2474,7 +2492,7 @@ The following table lists relevant properties for configuring parallel execution
 | ```junit.jupiter.execution.parallel.config.fixed.max-pool-size```
 | Desired maximum pool size of the underlying fork-join pool for the ```fixed```
   configuration strategy
-| a positive integer, must greater than or equal to `junit.jupiter.execution.parallel.config.fixed.parallelism`
+| a positive integer, must be greater than or equal to `junit.jupiter.execution.parallel.config.fixed.parallelism`
 | 256 + the value of `junit.jupiter.execution.parallel.config.fixed.parallelism`
 
 | ```junit.jupiter.execution.parallel.config.fixed.saturate```
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
index 4d6af87031df..a37d9ea35c1c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategy.java
@@ -72,8 +72,20 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter
 			int parallelism = Math.max(1,
 				factor.multiply(BigDecimal.valueOf(Runtime.getRuntime().availableProcessors())).intValue());
 
-			return new DefaultParallelExecutionConfiguration(parallelism, parallelism, 256 + parallelism, parallelism,
-				KEEP_ALIVE_SECONDS, null);
+			int maxPoolSize = configurationParameters.get(CONFIG_DYNAMIC_MAX_POOL_SIZE_FACTOR_PROPERTY_NAME,
+				BigDecimal::new).map(maxPoolSizeFactor -> {
+					Preconditions.condition(maxPoolSizeFactor.compareTo(BigDecimal.ONE) >= 0,
+						() -> String.format(
+							"Factor '%s' specified via configuration parameter '%s' must be greater than or equal to 1",
+							factor, CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME));
+					return maxPoolSizeFactor.multiply(BigDecimal.valueOf(parallelism)).intValue();
+				}).orElseGet(() -> 256 + parallelism);
+
+			boolean saturate = configurationParameters.get(CONFIG_DYNAMIC_SATURATE_PROPERTY_NAME,
+				Boolean::valueOf).orElse(true);
+
+			return new DefaultParallelExecutionConfiguration(parallelism, parallelism, maxPoolSize, parallelism,
+				KEEP_ALIVE_SECONDS, __ -> saturate);
 		}
 	},
 
@@ -155,12 +167,46 @@ public ParallelExecutionConfiguration createConfiguration(ConfigurationParameter
 	 * Property name of the factor used to determine the desired parallelism for the
 	 * {@link #DYNAMIC} configuration strategy.
 	 *
-	 * <p>Value must be a decimal number; defaults to {@code 1}.
+	 * <p>Value must be a non-negative decimal number; defaults to {@code 1}.
 	 *
 	 * @see #DYNAMIC
 	 */
 	public static final String CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME = "dynamic.factor";
 
+	/**
+	 * Property name of the factor used to determine the maximum pool size of
+	 * the underlying fork-join pool for the {@link #DYNAMIC} configuration
+	 * strategy.
+	 *
+	 * <p>Value must be a decimal number equal and greater than or equal to
+	 * {@code 1}. When set the maximum pool size is calculated as
+	 * {@code dynamic.max-pool-size-factor * dynamic.factor * Runtime.getRuntime().availableProcessors()}
+	 * When not set the maximum pool size is calculated as
+	 * {@code 256 + dynamic.factor * Runtime.getRuntime().availableProcessors()}
+	 * instead.
+	 *
+	 * @since 1.10
+	 * @see #DYNAMIC
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static final String CONFIG_DYNAMIC_MAX_POOL_SIZE_FACTOR_PROPERTY_NAME = "dynamic.max-pool-size-factor";
+
+	/**
+	 * Property name used to disable saturation of the underlying fork-join pool
+	 * for the {@link #DYNAMIC} configuration strategy.
+	 *
+	 * <p>When set to {@code false} the underlying fork-join pool will reject
+	 * additional tasks if all available workers are busy and the maximum
+	 * pool-size would be exceeded.
+	 * <p>Value must either {@code true} or {@code false}; defaults to {@code true}.
+	 *
+	 * @since 1.10
+	 * @see #DYNAMIC
+	 * @see #CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static final String CONFIG_DYNAMIC_SATURATE_PROPERTY_NAME = "dynamic.saturate";
+
 	/**
 	 * Property name used to specify the fully qualified class name of the
 	 * {@link ParallelExecutionConfigurationStrategy} to be used by the
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
index b6cb64223aa9..b7ac504017e8 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/DefaultParallelExecutionConfigurationStrategyTests.java
@@ -30,7 +30,7 @@
  */
 class DefaultParallelExecutionConfigurationStrategyTests {
 
-	private ConfigurationParameters configParams = mock();
+	final ConfigurationParameters configParams = mock();
 
 	@BeforeEach
 	void setUp() {
@@ -78,7 +78,25 @@ void dynamicStrategyCreatesValidConfiguration() {
 		assertThat(configuration.getMinimumRunnable()).isEqualTo(availableProcessors * 2);
 		assertThat(configuration.getMaxPoolSize()).isEqualTo(256 + (availableProcessors * 2));
 		assertThat(configuration.getKeepAliveSeconds()).isEqualTo(30);
-		assertThat(configuration.getSaturatePredicate()).isNull();
+		assertThat(configuration.getSaturatePredicate().test(null)).isTrue();
+	}
+
+	@Test
+	void dynamicSaturateStrategyCreatesValidConfiguration() {
+		when(configParams.get("dynamic.factor")).thenReturn(Optional.of("2.0"));
+		when(configParams.get("dynamic.max-pool-size-factor")).thenReturn(Optional.of("3.0"));
+		when(configParams.get("dynamic.saturate")).thenReturn(Optional.of("false"));
+
+		ParallelExecutionConfigurationStrategy strategy = DefaultParallelExecutionConfigurationStrategy.DYNAMIC;
+		var configuration = strategy.createConfiguration(configParams);
+
+		var availableProcessors = Runtime.getRuntime().availableProcessors();
+		assertThat(configuration.getParallelism()).isEqualTo(availableProcessors * 2);
+		assertThat(configuration.getCorePoolSize()).isEqualTo(availableProcessors * 2);
+		assertThat(configuration.getMinimumRunnable()).isEqualTo(availableProcessors * 2);
+		assertThat(configuration.getMaxPoolSize()).isEqualTo(availableProcessors * 6);
+		assertThat(configuration.getKeepAliveSeconds()).isEqualTo(30);
+		assertThat(configuration.getSaturatePredicate().test(null)).isFalse();
 	}
 
 	@Test

From de5f417647d01543604993bde4e98aa3be82ca8a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 23 Apr 2023 15:45:30 +0200
Subject: [PATCH 1189/1433] Polishing

---
 .../params/provider/CsvArgumentsProvider.java | 28 ++++++------
 .../provider/CsvFileArgumentsProvider.java    | 44 +++++++++----------
 .../provider/MethodArgumentsProvider.java     |  4 +-
 .../provider/ValueArgumentsProvider.java      | 27 ++++++------
 4 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
index 4d715c96c240..2a93e39849c7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java
@@ -41,19 +41,19 @@ class CsvArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvSource> {
 	private CsvParser csvParser;
 
 	@Override
-	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource annotation) {
-		this.nullValues = toSet(annotation.nullValues());
-		this.csvParser = createParserFor(annotation);
-		final boolean textBlockDeclared = !annotation.textBlock().isEmpty();
-		Preconditions.condition(annotation.value().length > 0 ^ textBlockDeclared,
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource csvSource) {
+		this.nullValues = toSet(csvSource.nullValues());
+		this.csvParser = createParserFor(csvSource);
+		final boolean textBlockDeclared = !csvSource.textBlock().isEmpty();
+		Preconditions.condition(csvSource.value().length > 0 ^ textBlockDeclared,
 			() -> "@CsvSource must be declared with either `value` or `textBlock` but not both");
 
-		return textBlockDeclared ? parseTextBlock(annotation) : parseValueArray(annotation);
+		return textBlockDeclared ? parseTextBlock(csvSource) : parseValueArray(csvSource);
 	}
 
-	private Stream<Arguments> parseTextBlock(CsvSource annotation) {
-		String textBlock = annotation.textBlock();
-		boolean useHeadersInDisplayName = annotation.useHeadersInDisplayName();
+	private Stream<Arguments> parseTextBlock(CsvSource csvSource) {
+		String textBlock = csvSource.textBlock();
+		boolean useHeadersInDisplayName = csvSource.useHeadersInDisplayName();
 		List<Arguments> argumentsList = new ArrayList<>();
 
 		try {
@@ -69,20 +69,20 @@ private Stream<Arguments> parseTextBlock(CsvSource annotation) {
 			}
 		}
 		catch (Throwable throwable) {
-			throw handleCsvException(throwable, annotation);
+			throw handleCsvException(throwable, csvSource);
 		}
 
 		return argumentsList.stream();
 	}
 
-	private Stream<Arguments> parseValueArray(CsvSource annotation) {
-		boolean useHeadersInDisplayName = annotation.useHeadersInDisplayName();
+	private Stream<Arguments> parseValueArray(CsvSource csvSource) {
+		boolean useHeadersInDisplayName = csvSource.useHeadersInDisplayName();
 		List<Arguments> argumentsList = new ArrayList<>();
 
 		try {
 			String[] headers = null;
 			AtomicInteger index = new AtomicInteger(0);
-			for (String input : annotation.value()) {
+			for (String input : csvSource.value()) {
 				index.incrementAndGet();
 				String[] csvRecord = this.csvParser.parseLine(input + LINE_SEPARATOR);
 				// Lazily retrieve headers if necessary.
@@ -96,7 +96,7 @@ private Stream<Arguments> parseValueArray(CsvSource annotation) {
 			}
 		}
 		catch (Throwable throwable) {
-			throw handleCsvException(throwable, annotation);
+			throw handleCsvException(throwable, csvSource);
 		}
 
 		return argumentsList.stream();
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
index 30e389b39a0a..104ec7eed6d4 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java
@@ -58,45 +58,45 @@ class CsvFileArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvFileS
 	}
 
 	@Override
-	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvFileSource annotation) {
-		this.charset = getCharsetFrom(annotation);
-		this.numLinesToSkip = annotation.numLinesToSkip();
-		this.csvParser = createParserFor(annotation);
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvFileSource csvFileSource) {
+		this.charset = getCharsetFrom(csvFileSource);
+		this.numLinesToSkip = csvFileSource.numLinesToSkip();
+		this.csvParser = createParserFor(csvFileSource);
 
-		Stream<Source> resources = Arrays.stream(annotation.resources()).map(inputStreamProvider::classpathResource);
-		Stream<Source> files = Arrays.stream(annotation.files()).map(inputStreamProvider::file);
+		Stream<Source> resources = Arrays.stream(csvFileSource.resources()).map(inputStreamProvider::classpathResource);
+		Stream<Source> files = Arrays.stream(csvFileSource.files()).map(inputStreamProvider::file);
 		List<Source> sources = Stream.concat(resources, files).collect(toList());
 
 		// @formatter:off
 		return Preconditions.notEmpty(sources, "Resources or files must not be empty")
 				.stream()
 				.map(source -> source.open(context))
-				.map(inputStream -> beginParsing(inputStream, annotation))
-				.flatMap(parser -> toStream(parser, annotation));
+				.map(inputStream -> beginParsing(inputStream, csvFileSource))
+				.flatMap(parser -> toStream(parser, csvFileSource));
 		// @formatter:on
 	}
 
-	private Charset getCharsetFrom(CsvFileSource annotation) {
+	private Charset getCharsetFrom(CsvFileSource csvFileSource) {
 		try {
-			return Charset.forName(annotation.encoding());
+			return Charset.forName(csvFileSource.encoding());
 		}
 		catch (Exception ex) {
-			throw new PreconditionViolationException("The charset supplied in " + annotation + " is invalid", ex);
+			throw new PreconditionViolationException("The charset supplied in " + csvFileSource + " is invalid", ex);
 		}
 	}
 
-	private CsvParser beginParsing(InputStream inputStream, CsvFileSource annotation) {
+	private CsvParser beginParsing(InputStream inputStream, CsvFileSource csvFileSource) {
 		try {
 			this.csvParser.beginParsing(inputStream, this.charset);
 		}
 		catch (Throwable throwable) {
-			handleCsvException(throwable, annotation);
+			handleCsvException(throwable, csvFileSource);
 		}
 		return this.csvParser;
 	}
 
-	private Stream<Arguments> toStream(CsvParser csvParser, CsvFileSource annotation) {
-		CsvParserIterator iterator = new CsvParserIterator(csvParser, annotation);
+	private Stream<Arguments> toStream(CsvParser csvParser, CsvFileSource csvFileSource) {
+		CsvParserIterator iterator = new CsvParserIterator(csvParser, csvFileSource);
 		return stream(spliteratorUnknownSize(iterator, Spliterator.ORDERED), false) //
 				.skip(this.numLinesToSkip) //
 				.onClose(() -> {
@@ -104,7 +104,7 @@ private Stream<Arguments> toStream(CsvParser csvParser, CsvFileSource annotation
 						csvParser.stopParsing();
 					}
 					catch (Throwable throwable) {
-						handleCsvException(throwable, annotation);
+						handleCsvException(throwable, csvFileSource);
 					}
 				});
 	}
@@ -112,17 +112,17 @@ private Stream<Arguments> toStream(CsvParser csvParser, CsvFileSource annotation
 	private static class CsvParserIterator implements Iterator<Arguments> {
 
 		private final CsvParser csvParser;
-		private final CsvFileSource annotation;
+		private final CsvFileSource csvFileSource;
 		private final boolean useHeadersInDisplayName;
 		private final Set<String> nullValues;
 		private Arguments nextArguments;
 		private String[] headers;
 
-		CsvParserIterator(CsvParser csvParser, CsvFileSource annotation) {
+		CsvParserIterator(CsvParser csvParser, CsvFileSource csvFileSource) {
 			this.csvParser = csvParser;
-			this.annotation = annotation;
-			this.useHeadersInDisplayName = annotation.useHeadersInDisplayName();
-			this.nullValues = toSet(annotation.nullValues());
+			this.csvFileSource = csvFileSource;
+			this.useHeadersInDisplayName = csvFileSource.useHeadersInDisplayName();
+			this.nullValues = toSet(csvFileSource.nullValues());
 			advance();
 		}
 
@@ -154,7 +154,7 @@ private void advance() {
 				}
 			}
 			catch (Throwable throwable) {
-				handleCsvException(throwable, this.annotation);
+				handleCsvException(throwable, this.csvFileSource);
 			}
 		}
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 5b277369d326..0336401b3886 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -42,11 +42,11 @@ class MethodArgumentsProvider extends AnnotationBasedArgumentsProvider<MethodSou
 		method -> isConvertibleToStream(method.getReturnType()) && !isTestMethod(method);
 
 	@Override
-	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, MethodSource annotation) {
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, MethodSource methodSource) {
 		Class<?> testClass = context.getRequiredTestClass();
 		Method testMethod = context.getRequiredTestMethod();
 		Object testInstance = context.getTestInstance().orElse(null);
-		String[] methodNames = annotation.value();
+		String[] methodNames = methodSource.value();
 		// @formatter:off
 		return stream(methodNames)
 				.map(factoryMethodName -> findFactoryMethod(testClass, testMethod, factoryMethodName))
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
index 1fe665290ec2..21ef1f176cba 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/ValueArgumentsProvider.java
@@ -27,25 +27,25 @@
 class ValueArgumentsProvider extends AnnotationBasedArgumentsProvider<ValueSource> {
 
 	@Override
-	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, ValueSource source) {
-		Object[] arguments = getArgumentsFromSource(source);
+	protected Stream<? extends Arguments> provideArguments(ExtensionContext context, ValueSource valueSource) {
+		Object[] arguments = getArgumentsFromSource(valueSource);
 		return Arrays.stream(arguments).map(Arguments::of);
 	}
 
-	private Object[] getArgumentsFromSource(ValueSource source) {
+	private Object[] getArgumentsFromSource(ValueSource valueSource) {
 		// @formatter:off
 		List<Object> arrays =
 			Stream.of(
-				source.shorts(),
-				source.bytes(),
-				source.ints(),
-				source.longs(),
-				source.floats(),
-				source.doubles(),
-				source.chars(),
-				source.booleans(),
-				source.strings(),
-				source.classes()
+				valueSource.shorts(),
+				valueSource.bytes(),
+				valueSource.ints(),
+				valueSource.longs(),
+				valueSource.floats(),
+				valueSource.doubles(),
+				valueSource.chars(),
+				valueSource.booleans(),
+				valueSource.strings(),
+				valueSource.classes()
 			)
 			.filter(array -> Array.getLength(array) > 0)
 			.collect(toList());
@@ -59,4 +59,5 @@ private Object[] getArgumentsFromSource(ValueSource source) {
 				.mapToObj(index -> Array.get(originalArray, index)) //
 				.toArray();
 	}
+
 }

From 38c215845403670cc9a76b8925e96c479597038c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 23 Apr 2023 16:55:28 +0200
Subject: [PATCH 1190/1433] Fix running tests via IntelliJ

---
 documentation/documentation.gradle.kts                         | 3 ---
 .../src/main/kotlin/junitbuild.testing-conventions.gradle.kts  | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 1088e55c40a7..2b5530d2dc0c 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -49,9 +49,6 @@ dependencies {
 	testRuntimeOnly(libs.apiguardian) {
 		because("it's required to generate API tables")
 	}
-	testRuntimeOnly(libs.openTestReporting.events) {
-		because("it's required to run tests via IntelliJ which does not consumed the shadowed jar of junit-platform-reporting")
-	}
 
 	testImplementation(libs.classgraph) {
 		because("ApiReportGenerator needs it")
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
index 032661be08d0..a69f7d89c58b 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
@@ -82,4 +82,7 @@ dependencies {
 	testRuntimeOnly(project(":junit-platform-reporting"))
 
 	testRuntimeOnly(bundleFromLibs("log4j"))
+	testRuntimeOnly(dependencyFromLibs("openTestReporting-events")) {
+		because("it's required to run tests via IntelliJ which does not consumed the shadowed jar of junit-platform-reporting")
+	}
 }

From 7b2688c8cbe6349656ef94492dceff6537d6a87c Mon Sep 17 00:00:00 2001
From: Ale Mendoza <aletinmendoza@hotmail.com>
Date: Fri, 21 Apr 2023 13:16:27 -0600
Subject: [PATCH 1191/1433] Do not parse {displayName} for @ParameterizedTest
 using MessageFormat

Prior to this commit, if a @ParameterizedTest used the {displayName}
placeholder to generate a display name and the value of the displayName
contained an apostrophe (') or something resembling a MessageFormat
element (such as {data}), JUnit threw an exception due to failure to
parse the display name.

This is applicable to method names in Kotlin-based tests or custom
display names in general.

To fix this bug, instead of replacing the DISPLAY_NAME_PLACEHOLDER
before the MessageFormat is evaluated, the DISPLAY_NAME_PLACEHOLDER is
now replaced with another temporary placeholder, which is then replaced
after the MessageFormat has been evaluated.

Closes #3235
Closes #3264
---
 .../release-notes-5.10.0-M1.adoc              |  4 +-
 .../ParameterizedTestNameFormatter.java       |  6 +-
 .../ParameterizedTestNameFormatterTests.java  | 18 ++++++
 ...erizedTestNameFormatterIntegrationTests.kt | 62 +++++++++++++++++++
 4 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 56c41b3286f7..1308b0e792a0 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -52,7 +52,9 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* The `{displayName}` placeholder of `@ParameterizedTest` is no longer parsed during the
+  evaluation of the `MessageFormat`, now `@DisplayName` and Kotlin method names can contain
+  single apostrophes and `MessageFormat` elements, such as `{data}`.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
index 4d8899d89639..800f146b70b0 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
@@ -31,6 +31,7 @@
 class ParameterizedTestNameFormatter {
 
 	private static final char ELLIPSIS = '\u2026';
+	private static final String DISPLAY_NAME_TEMPORARY_PLACEHOLDER = "__DISPLAY_NAME__";
 
 	private final String pattern;
 	private final String displayName;
@@ -61,7 +62,8 @@ private String formatSafely(int invocationIndex, Object[] arguments) {
 		String pattern = prepareMessageFormatPattern(invocationIndex, namedArguments);
 		MessageFormat format = new MessageFormat(pattern);
 		Object[] humanReadableArguments = makeReadable(format, namedArguments);
-		return format.format(humanReadableArguments);
+		String formatted = format.format(humanReadableArguments);
+		return formatted.replace(DISPLAY_NAME_TEMPORARY_PLACEHOLDER, this.displayName);
 	}
 
 	private Object[] extractNamedArguments(Object[] arguments) {
@@ -72,7 +74,7 @@ private Object[] extractNamedArguments(Object[] arguments) {
 
 	private String prepareMessageFormatPattern(int invocationIndex, Object[] arguments) {
 		String result = pattern//
-				.replace(DISPLAY_NAME_PLACEHOLDER, this.displayName)//
+				.replace(DISPLAY_NAME_PLACEHOLDER, DISPLAY_NAME_TEMPORARY_PLACEHOLDER)//
 				.replace(INDEX_PLACEHOLDER, String.valueOf(invocationIndex));
 
 		if (result.contains(ARGUMENTS_WITH_NAMES_PLACEHOLDER)) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
index e83f88fc0f62..ad63dbdede43 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
@@ -60,6 +60,24 @@ void formatsDisplayName() {
 		assertEquals("enigma", formatter.format(2));
 	}
 
+	@Test
+	void formatsDisplayNameWithApostrophe() {
+		String displayName = "display'Zero";
+		var formatter = formatter(DISPLAY_NAME_PLACEHOLDER, "display'Zero");
+
+		assertEquals(displayName, formatter.format(1));
+		assertEquals(displayName, formatter.format(2));
+	}
+
+	@Test
+	void formatsDisplayNameContainingFormatElements() {
+		String displayName = "{enigma} {0} '{1}'";
+		var formatter = formatter(DISPLAY_NAME_PLACEHOLDER, displayName);
+
+		assertEquals(displayName, formatter.format(1));
+		assertEquals(displayName, formatter.format(2));
+	}
+
 	@Test
 	void formatsInvocationIndex() {
 		var formatter = formatter(INDEX_PLACEHOLDER, "enigma");
diff --git a/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt b/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt
new file mode 100644
index 000000000000..afcfb4bde7a2
--- /dev/null
+++ b/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.TestInfo
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
+
+class ParameterizedTestNameFormatterIntegrationTests {
+
+    @ValueSource(strings = ["foo", "bar"])
+    @ParameterizedTest
+    fun `implicit'Name`(param: String, info: TestInfo) {
+        if (param.equals("foo")) {
+            assertEquals("[1] foo", info.displayName)
+        } else {
+            assertEquals("[2] bar", info.displayName)
+        }
+    }
+
+    @ValueSource(strings = ["foo", "bar"])
+    @ParameterizedTest(name = "{0}")
+    fun `zero'Only`(param: String, info: TestInfo) {
+        if (param.equals("foo")) {
+            assertEquals("foo", info.displayName)
+        } else {
+            assertEquals("bar", info.displayName)
+        }
+    }
+
+    @ValueSource(strings = ["foo", "bar"])
+    @ParameterizedTest(name = "{displayName}")
+    fun `displayName'Only`(param: String, info: TestInfo) {
+        assertEquals("displayName'Only(String, TestInfo)", info.displayName)
+    }
+
+    @ValueSource(strings = ["foo", "bar"])
+    @ParameterizedTest(name = "{displayName} - {0}")
+    fun `displayName'Zero`(param: String, info: TestInfo) {
+        if (param.equals("foo")) {
+            assertEquals("displayName'Zero(String, TestInfo) - foo", info.displayName)
+        } else {
+            assertEquals("displayName'Zero(String, TestInfo) - bar", info.displayName)
+        }
+    }
+
+    @ValueSource(strings = ["foo", "bar"])
+    @ParameterizedTest(name = "{0} - {displayName}")
+    fun `zero'DisplayName`(param: String, info: TestInfo) {
+        if (param.equals("foo")) {
+            assertEquals("foo - zero'DisplayName(String, TestInfo)", info.displayName)
+        } else {
+            assertEquals("bar - zero'DisplayName(String, TestInfo)", info.displayName)
+        }
+    }
+}

From 745714463175df7198b018c446ea7a31fb19cd65 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 24 Apr 2023 13:56:33 +0200
Subject: [PATCH 1192/1433] Polish contribution

See #3264
---
 .../release-notes-5.10.0-M1.adoc              |  9 ++++++---
 .../ParameterizedTestNameFormatter.java       |  6 +++---
 .../ParameterizedTestNameFormatterTests.java  |  2 +-
 ...erizedTestNameFormatterIntegrationTests.kt | 20 +++++++++----------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 1308b0e792a0..809bdfc65fa5 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -52,9 +52,12 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* The `{displayName}` placeholder of `@ParameterizedTest` is no longer parsed during the
-  evaluation of the `MessageFormat`, now `@DisplayName` and Kotlin method names can contain
-  single apostrophes and `MessageFormat` elements, such as `{data}`.
+* The `{displayName}` placeholder for `@ParameterizedTest` invocation names is no longer
+  parsed using `java.text.MessageFormat`. Consequently, any text in the display name of
+  the `@ParameterizedTest` method will be included unmodified in the invocation display
+  name. For example, Kotlin method names and custom display names configured via
+  `@DisplayName` can now contain apostrophes (`'`) as well as text resembling
+  `MessageFormat` elements such as `{0}` or `{data}`.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
index 800f146b70b0..a505bd81f91e 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestNameFormatter.java
@@ -31,7 +31,7 @@
 class ParameterizedTestNameFormatter {
 
 	private static final char ELLIPSIS = '\u2026';
-	private static final String DISPLAY_NAME_TEMPORARY_PLACEHOLDER = "__DISPLAY_NAME__";
+	private static final String TEMPORARY_DISPLAY_NAME_PLACEHOLDER = "~~~JUNIT_DISPLAY_NAME~~~";
 
 	private final String pattern;
 	private final String displayName;
@@ -63,7 +63,7 @@ private String formatSafely(int invocationIndex, Object[] arguments) {
 		MessageFormat format = new MessageFormat(pattern);
 		Object[] humanReadableArguments = makeReadable(format, namedArguments);
 		String formatted = format.format(humanReadableArguments);
-		return formatted.replace(DISPLAY_NAME_TEMPORARY_PLACEHOLDER, this.displayName);
+		return formatted.replace(TEMPORARY_DISPLAY_NAME_PLACEHOLDER, this.displayName);
 	}
 
 	private Object[] extractNamedArguments(Object[] arguments) {
@@ -74,7 +74,7 @@ private Object[] extractNamedArguments(Object[] arguments) {
 
 	private String prepareMessageFormatPattern(int invocationIndex, Object[] arguments) {
 		String result = pattern//
-				.replace(DISPLAY_NAME_PLACEHOLDER, DISPLAY_NAME_TEMPORARY_PLACEHOLDER)//
+				.replace(DISPLAY_NAME_PLACEHOLDER, TEMPORARY_DISPLAY_NAME_PLACEHOLDER)//
 				.replace(INDEX_PLACEHOLDER, String.valueOf(invocationIndex));
 
 		if (result.contains(ARGUMENTS_WITH_NAMES_PLACEHOLDER)) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
index ad63dbdede43..1cbabc827991 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestNameFormatterTests.java
@@ -61,7 +61,7 @@ void formatsDisplayName() {
 	}
 
 	@Test
-	void formatsDisplayNameWithApostrophe() {
+	void formatsDisplayNameContainingApostrophe() {
 		String displayName = "display'Zero";
 		var formatter = formatter(DISPLAY_NAME_PLACEHOLDER, "display'Zero");
 
diff --git a/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt b/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt
index afcfb4bde7a2..1e02be19ace3 100644
--- a/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt
@@ -16,7 +16,7 @@ class ParameterizedTestNameFormatterIntegrationTests {
 
     @ValueSource(strings = ["foo", "bar"])
     @ParameterizedTest
-    fun `implicit'Name`(param: String, info: TestInfo) {
+    fun `defaultDisplayName`(param: String, info: TestInfo) {
         if (param.equals("foo")) {
             assertEquals("[1] foo", info.displayName)
         } else {
@@ -26,7 +26,7 @@ class ParameterizedTestNameFormatterIntegrationTests {
 
     @ValueSource(strings = ["foo", "bar"])
     @ParameterizedTest(name = "{0}")
-    fun `zero'Only`(param: String, info: TestInfo) {
+    fun `1st argument`(param: String, info: TestInfo) {
         if (param.equals("foo")) {
             assertEquals("foo", info.displayName)
         } else {
@@ -36,27 +36,27 @@ class ParameterizedTestNameFormatterIntegrationTests {
 
     @ValueSource(strings = ["foo", "bar"])
     @ParameterizedTest(name = "{displayName}")
-    fun `displayName'Only`(param: String, info: TestInfo) {
-        assertEquals("displayName'Only(String, TestInfo)", info.displayName)
+    fun `displayNamePlaceholder - it's an {enigma} '{0}'`(@Suppress("UNUSED_PARAMETER") param: String, info: TestInfo) {
+        assertEquals("displayNamePlaceholder - it's an {enigma} '{0}'(String, TestInfo)", info.displayName)
     }
 
     @ValueSource(strings = ["foo", "bar"])
     @ParameterizedTest(name = "{displayName} - {0}")
-    fun `displayName'Zero`(param: String, info: TestInfo) {
+    fun `displayName and 1st 'argument'`(param: String, info: TestInfo) {
         if (param.equals("foo")) {
-            assertEquals("displayName'Zero(String, TestInfo) - foo", info.displayName)
+            assertEquals("displayName and 1st 'argument'(String, TestInfo) - foo", info.displayName)
         } else {
-            assertEquals("displayName'Zero(String, TestInfo) - bar", info.displayName)
+            assertEquals("displayName and 1st 'argument'(String, TestInfo) - bar", info.displayName)
         }
     }
 
     @ValueSource(strings = ["foo", "bar"])
     @ParameterizedTest(name = "{0} - {displayName}")
-    fun `zero'DisplayName`(param: String, info: TestInfo) {
+    fun `1st 'argument' and displayName`(param: String, info: TestInfo) {
         if (param.equals("foo")) {
-            assertEquals("foo - zero'DisplayName(String, TestInfo)", info.displayName)
+            assertEquals("foo - 1st 'argument' and displayName(String, TestInfo)", info.displayName)
         } else {
-            assertEquals("bar - zero'DisplayName(String, TestInfo)", info.displayName)
+            assertEquals("bar - 1st 'argument' and displayName(String, TestInfo)", info.displayName)
         }
     }
 }

From 0a7c051d06fd0c3df4fb31f67bc34b38dba733d2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 24 Apr 2023 14:13:30 +0200
Subject: [PATCH 1193/1433] Move release note for #3235/#3264 to 5.9.3

---
 .../asciidoc/release-notes/release-notes-5.10.0-M1.adoc    | 7 +------
 .../docs/asciidoc/release-notes/release-notes-5.9.3.adoc   | 6 ++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 809bdfc65fa5..56c41b3286f7 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -52,12 +52,7 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* The `{displayName}` placeholder for `@ParameterizedTest` invocation names is no longer
-  parsed using `java.text.MessageFormat`. Consequently, any text in the display name of
-  the `@ParameterizedTest` method will be included unmodified in the invocation display
-  name. For example, Kotlin method names and custom display names configured via
-  `@DisplayName` can now contain apostrophes (`'`) as well as text resembling
-  `MessageFormat` elements such as `{0}` or `{data}`.
+* ❓
 
 ==== Deprecations and Breaking Changes
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index cb4b0f1ec7a2..a084dceab9d3 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -43,6 +43,12 @@ JUnit repository on GitHub.
 * The search algorithm used to find `@MethodSource` factory methods now applies consistent
   semantics for _local_ qualified method names and fully-qualified method names for
   overloaded factory methods.
+* The `{displayName}` placeholder for `@ParameterizedTest` invocation names is no longer
+  parsed using `java.text.MessageFormat`. Consequently, any text in the display name of
+  the `@ParameterizedTest` method will be included unmodified in the invocation display
+  name. For example, Kotlin method names and custom display names configured via
+  `@DisplayName` can now contain apostrophes (`'`) as well as text resembling
+  `MessageFormat` elements such as `{0}` or `{data}`.
 * Exceptions thrown for files that cannot be deleted when cleaning up a temporary
   directory created via `@TempDir` now include the root cause.
 * Lifecycle methods are allowed to be declared as `private` again for backwards

From ad6e81ab9e7159e9ad92bbd0a7ab1ec88eef4642 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 24 Apr 2023 14:16:09 +0200
Subject: [PATCH 1194/1433] test

---
 .../ParameterizedTestNameFormatterIntegrationTests.kt       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt b/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt
index 1e02be19ace3..829f98aefabc 100644
--- a/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/ParameterizedTestNameFormatterIntegrationTests.kt
@@ -16,7 +16,7 @@ class ParameterizedTestNameFormatterIntegrationTests {
 
     @ValueSource(strings = ["foo", "bar"])
     @ParameterizedTest
-    fun `defaultDisplayName`(param: String, info: TestInfo) {
+    fun defaultDisplayName(param: String, info: TestInfo) {
         if (param.equals("foo")) {
             assertEquals("[1] foo", info.displayName)
         } else {
@@ -36,8 +36,8 @@ class ParameterizedTestNameFormatterIntegrationTests {
 
     @ValueSource(strings = ["foo", "bar"])
     @ParameterizedTest(name = "{displayName}")
-    fun `displayNamePlaceholder - it's an {enigma} '{0}'`(@Suppress("UNUSED_PARAMETER") param: String, info: TestInfo) {
-        assertEquals("displayNamePlaceholder - it's an {enigma} '{0}'(String, TestInfo)", info.displayName)
+    fun `it's an {enigma} '{0}'`(@Suppress("UNUSED_PARAMETER") param: String, info: TestInfo) {
+        assertEquals("it's an {enigma} '{0}'(String, TestInfo)", info.displayName)
     }
 
     @ValueSource(strings = ["foo", "bar"])

From 34c8bad5a7d7c80319c66cf76272830fa73c6875 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 24 Apr 2023 14:25:14 +0200
Subject: [PATCH 1195/1433] Prepare release notes for 5.9.3

---
 .../release-notes/release-notes-5.9.3.adoc    | 32 +++----------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index a084dceab9d3..0f0ecd97d930 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -1,9 +1,9 @@
 [[release-notes-5.9.3]]
 == 5.9.3
 
-*Date of Release:* ❓
+*Date of Release:* April ❓, 2023
 
-*Scope:* ❓
+*Scope:* Bug fixes and enhancements since 5.9.2
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/67?closed=1+[5.9.3] milestone page in the
@@ -13,17 +13,7 @@ JUnit repository on GitHub.
 [[release-notes-5.9.3-junit-platform]]
 === JUnit Platform
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes.
 
 
 [[release-notes-5.9.3-junit-jupiter]]
@@ -55,10 +45,6 @@ JUnit repository on GitHub.
   compatibility; however, using `private` visibility for lifecycle methods is strongly
   discouraged and will be disallowed in a future release.
 
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * The search algorithm used to find `@MethodSource` factory methods now falls back to
@@ -70,14 +56,4 @@ JUnit repository on GitHub.
 [[release-notes-5.9.3-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes.

From 7f96fa110dfd5e5e02184bc464bbc0d0ae50eb83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 06:00:11 +0000
Subject: [PATCH 1196/1433] Bump info.picocli:picocli from 4.7.2 to 4.7.3

Bumps [info.picocli:picocli](https://github.com/remkop/picocli) from 4.7.2 to 4.7.3.
- [Release notes](https://github.com/remkop/picocli/releases)
- [Changelog](https://github.com/remkop/picocli/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/remkop/picocli/compare/v4.7.2...v4.7.3)

---
updated-dependencies:
- dependency-name: info.picocli:picocli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 16a05f9e4423..71e1471fabd4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.2.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }
-picocli = { module = "info.picocli:picocli", version = "4.7.2" }
+picocli = { module = "info.picocli:picocli", version = "4.7.3" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.7" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }

From da3a252dc9e22e33548baa92b7c5879185d73e7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 06:00:26 +0000
Subject: [PATCH 1197/1433] Bump org.mockito:mockito-junit-jupiter from 5.2.0
 to 5.3.1

Bumps [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) from 5.2.0 to 5.3.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.2.0...v5.3.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 71e1471fabd4..51f09b24c087 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.1" }
-mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.2.0" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.3.1" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }

From f1c0fe89959cc503a7af98c682c1dcc47468282d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 06:00:35 +0000
Subject: [PATCH 1198/1433] Bump org.ajoberstar.git-publish from 4.1.1 to 4.2.0

Bumps [org.ajoberstar.git-publish](https://github.com/ajoberstar/gradle-git-publish) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/ajoberstar/gradle-git-publish/releases)
- [Commits](https://github.com/ajoberstar/gradle-git-publish/compare/4.1.1...4.2.0)

---
updated-dependencies:
- dependency-name: org.ajoberstar.git-publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index d25799ec35ce..b2ec56051470 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,7 +10,7 @@ pluginManagement {
 		id("com.gradle.enterprise") version "3.13" // keep in sync with gradle/plugins/build.gradle.kts
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
-		id("org.ajoberstar.git-publish") version "4.1.1"
+		id("org.ajoberstar.git-publish") version "4.2.0"
 		kotlin("jvm") version "1.8.20"
 		// Check if workaround in documentation.gradle.kts can be removed when upgrading
 		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"

From 4e659da3bf6ee5b0aca147a0341d1c1c78ec9a41 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Tue, 25 Apr 2023 07:44:24 +0200
Subject: [PATCH 1199/1433] Update AssertJ URL (#3274)

---
 documentation/src/docs/asciidoc/link-attributes.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index d7d259e8f04c..a3e7638b65f6 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -178,7 +178,7 @@ endif::[]
 // Third-party Links
 :API:                                        https://apiguardian-team.github.io/apiguardian/docs/current/api/[@API]
 :API_Guardian:                               https://github.com/apiguardian-team/apiguardian[@API Guardian]
-:AssertJ:                                    https://joel-costigliola.github.io/assertj/[AssertJ]
+:AssertJ:                                    https://assertj.github.io/doc/[AssertJ]
 :Gitter:                                     https://gitter.im/junit-team/junit5[Gitter]
 :Hamcrest:                                   https://hamcrest.org/JavaHamcrest/[Hamcrest]
 :Log4j:                                      https://logging.apache.org/log4j/2.x/[Log4j]

From 05ba5e65d4bdbaa543dff1f8584f67c690a32957 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 25 Apr 2023 07:46:34 +0200
Subject: [PATCH 1200/1433] Remove experimental warning blocks from promoted
 features

---
 .../src/docs/asciidoc/user-guide/writing-tests.adoc       | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index e0806ef9bbed..cf5068052f34 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2262,10 +2262,6 @@ This heuristic is queried by the `disabled_on_debug` mode.
 [[writing-tests-parallel-execution]]
 === Parallel Execution
 
-.Parallel test execution is an experimental feature
-WARNING: You're invited to give it a try and provide feedback to the JUnit team so they
-can improve and eventually <<api-evolution, promote>> this feature.
-
 By default, JUnit Jupiter tests are run sequentially in a single thread. Running tests in
 parallel -- for example, to speed up execution -- is available as an opt-in feature since
 version 5.3. To enable parallel execution, set the
@@ -2561,10 +2557,6 @@ another dependency.
 [[writing-tests-built-in-extensions-TempDirectory]]
 ==== The TempDirectory Extension
 
-.`@TempDir` is an experimental feature
-WARNING: You're invited to give it a try and provide feedback to the JUnit team so they
-can improve and eventually <<api-evolution, promote>> this feature.
-
 The built-in `{TempDirectory}` extension is used to create and clean up a temporary
 directory for an individual test or all tests in a test class. It is registered by
 default. To use it, annotate a non-final, unassigned field of type `java.nio.file.Path` or

From 13f86a09647842a0a98576cd40e47486d4a92bf8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 26 Apr 2023 08:23:40 +0200
Subject: [PATCH 1201/1433] Finalize 5.9.3 release notes

---
 .../asciidoc/release-notes/release-notes-5.9.3.adoc    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index 0f0ecd97d930..09dc2a8e9f45 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.9.3]]
 == 5.9.3
 
-*Date of Release:* April ❓, 2023
+*Date of Release:* April 26, 2023
 
 *Scope:* Bug fixes and enhancements since 5.9.2
 
@@ -33,12 +33,12 @@ No changes.
 * The search algorithm used to find `@MethodSource` factory methods now applies consistent
   semantics for _local_ qualified method names and fully-qualified method names for
   overloaded factory methods.
-* The `{displayName}` placeholder for `@ParameterizedTest` invocation names is no longer
-  parsed using `java.text.MessageFormat`. Consequently, any text in the display name of
+* The `+{displayName}+` placeholder for `@ParameterizedTest` invocation names is no longer
+  parsed using `java.text.MessageFormat`.Consequently, any text in the display name of
   the `@ParameterizedTest` method will be included unmodified in the invocation display
-  name. For example, Kotlin method names and custom display names configured via
+  name.For example, Kotlin method names and custom display names configured via
   `@DisplayName` can now contain apostrophes (`'`) as well as text resembling
-  `MessageFormat` elements such as `{0}` or `{data}`.
+  `MessageFormat` elements such as `+{0}+` or `+{data}+`.
 * Exceptions thrown for files that cannot be deleted when cleaning up a temporary
   directory created via `@TempDir` now include the root cause.
 * Lifecycle methods are allowed to be declared as `private` again for backwards

From 1a8cdda80887ff024fbe60de157a410e33ee1a15 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 26 Apr 2023 08:53:54 +0200
Subject: [PATCH 1202/1433] Fix whitespace

---
 .../src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index 09dc2a8e9f45..b2476afdfac5 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -34,9 +34,9 @@ No changes.
   semantics for _local_ qualified method names and fully-qualified method names for
   overloaded factory methods.
 * The `+{displayName}+` placeholder for `@ParameterizedTest` invocation names is no longer
-  parsed using `java.text.MessageFormat`.Consequently, any text in the display name of
+  parsed using `java.text.MessageFormat`. Consequently, any text in the display name of
   the `@ParameterizedTest` method will be included unmodified in the invocation display
-  name.For example, Kotlin method names and custom display names configured via
+  name. For example, Kotlin method names and custom display names configured via
   `@DisplayName` can now contain apostrophes (`'`) as well as text resembling
   `MessageFormat` elements such as `+{0}+` or `+{data}+`.
 * Exceptions thrown for files that cannot be deleted when cleaning up a temporary

From 5cac4a3117c284e4334f58a54732c8a7e08e8f1a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 26 Apr 2023 08:27:05 +0200
Subject: [PATCH 1203/1433] Release 5.9.3

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aa095c5e67be..21d803d3ae4e 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository is the home of the next generation of JUnit, _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.9.2](https://github.com/junit-team/junit5/releases/tag/r5.9.2) (January 10, 2023)
+- General Availability (GA): [JUnit 5.9.3](https://github.com/junit-team/junit5/releases/tag/r5.9.3) (April 26, 2023)
 - Preview (Milestone/Release Candidate): n/a
 
 ## Documentation

From 3781a673f94479fff8ccacece3892ce0778614dd Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Wed, 26 Apr 2023 09:39:11 +0200
Subject: [PATCH 1204/1433] Add factory SPI for `@TempDir` (#2958)

This adds a factory SPI to `@TempDir`, allowing to define how the
temporary directory is created.

This can be used for custom file systems, but it may also used for
customizing how and where the directory is created for the default file
system.

The intended usage is to extend `TempDirFactory` and provide the class
to the new `factory` attribute of `@TempDir`.

Resolves #2088.
Resolves #2400.
---
 documentation/documentation.gradle.kts        |   4 +
 .../src/docs/asciidoc/link-attributes.adoc    |   1 +
 .../release-notes-5.10.0-M1.adoc              |   4 +
 .../asciidoc/user-guide/writing-tests.adoc    |  30 +++-
 .../java/example/TempDirCleanupModeDemo.java  |  28 ----
 .../test/java/example/TempDirectoryDemo.java  |  69 +++++++++
 gradle/libs.versions.toml                     |   2 +
 .../org/junit/jupiter/api/io/TempDir.java     |  16 +-
 .../junit/jupiter/api/io/TempDirFactory.java  |  85 +++++++++++
 .../junit-jupiter-engine.gradle.kts           |   2 +
 .../engine/extension/TempDirectory.java       |  76 ++++++++--
 .../extension/CloseablePathCleanupTests.java  |  34 +++--
 .../TempDirectoryPerContextTests.java         |  35 +++++
 .../TempDirectoryPerDeclarationTests.java     | 137 ++++++++++++++++++
 14 files changed, 461 insertions(+), 62 deletions(-)
 delete mode 100644 documentation/src/test/java/example/TempDirCleanupModeDemo.java
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 2b5530d2dc0c..4c6d673c01f6 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -54,6 +54,10 @@ dependencies {
 		because("ApiReportGenerator needs it")
 	}
 
+	testImplementation(libs.jimfs) {
+		because("Jimfs is used in src/test/java")
+	}
+
 	standaloneConsoleLauncher(projects.junitPlatformConsoleStandalone)
 }
 
diff --git a/documentation/src/docs/asciidoc/link-attributes.adoc b/documentation/src/docs/asciidoc/link-attributes.adoc
index a3e7638b65f6..6aa27c3d46b8 100644
--- a/documentation/src/docs/asciidoc/link-attributes.adoc
+++ b/documentation/src/docs/asciidoc/link-attributes.adoc
@@ -181,6 +181,7 @@ endif::[]
 :AssertJ:                                    https://assertj.github.io/doc/[AssertJ]
 :Gitter:                                     https://gitter.im/junit-team/junit5[Gitter]
 :Hamcrest:                                   https://hamcrest.org/JavaHamcrest/[Hamcrest]
+:Jimfs:                                      https://google.github.io/jimfs/[Jimfs]
 :Log4j:                                      https://logging.apache.org/log4j/2.x/[Log4j]
 :Log4j_JDK_Logging_Adapter:                  https://logging.apache.org/log4j/2.x/log4j-jul/index.html[Log4j JDK Logging Adapter]
 :Logback:                                    https://logback.qos.ch/[Logback]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 56c41b3286f7..a20ddfe9b82b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -82,6 +82,10 @@ default.
   parameter to set the maximum pool size factor.
 * New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
   parameter to disable pool saturation.
+* New `TempDirFactory` SPI for customizing how the `TempDirectory` extension creates
+  temporary directories. See the
+  <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
+  for details.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index cf5068052f34..9da5858b63f1 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2613,5 +2613,33 @@ The default cleanup mode is `ALWAYS`. You can use the
 [source,java,indent=0]
 .A test class with a temporary directory that doesn't get cleaned up
 ----
-include::{testDir}/example/TempDirCleanupModeDemo.java[tags=user_guide]
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_cleanup_mode]
+----
+
+`@TempDir` supports custom creation of temporary directories via the optional
+`factory` attribute. This allows to define how the temporary directory is created,
+giving control over characteristics such as the directory name, root folder,
+and underlying file system.
+
+Factories can be created by implementing `TempDirFactory`. The default implementation
+available in Jupiter delegates the directory creation to
+`java.nio.file.Files::createTempDirectory`, passing `junit` as the prefix string
+to be used in generating the directory's name.
+
+The following example defines a factory that uses the test name as the directory name
+prefix instead of the `junit` constant value.
+
+[source,java,indent=0]
+.A test class with a temporary directory having the test name as the directory name prefix
+----
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_factory_name_prefix]
+----
+
+It's also possible to use an in-memory file system like `{Jimfs}` for the creation of the
+temporary directory. The following example shows how to do it.
+
+[source,java,indent=0]
+.A test class with a temporary directory created with the Jimfs in-memory file system
+----
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_factory_jimfs]
 ----
diff --git a/documentation/src/test/java/example/TempDirCleanupModeDemo.java b/documentation/src/test/java/example/TempDirCleanupModeDemo.java
deleted file mode 100644
index 84c05b4b7999..000000000000
--- a/documentation/src/test/java/example/TempDirCleanupModeDemo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package example;
-
-import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
-
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-// tag::user_guide[]
-class TempDirCleanupModeDemo {
-
-	@Test
-	void fileTest(@TempDir(cleanup = ON_SUCCESS) Path tempDir) {
-		// perform test
-	}
-}
-// end::user_guide[]
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index 70ce582217c3..417c70731924 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -13,15 +13,23 @@
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
 
 import java.io.IOException;
+import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
+
 import example.util.ListWriter;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.io.TempDirFactory;
 
 class TempDirectoryDemo {
 
@@ -73,4 +81,65 @@ void anotherTestThatUsesTheSameTempDir() {
 	}
 	// end::user_guide_field_injection[]
 
+	static
+	// tag::user_guide_cleanup_mode[]
+	class CleanupModeDemo {
+
+		@Test
+		void fileTest(@TempDir(cleanup = ON_SUCCESS) Path tempDir) {
+			// perform test
+		}
+
+	}
+	// end::user_guide_cleanup_mode[]
+
+	static
+	// tag::user_guide_factory_name_prefix[]
+	class TempDirFactoryDemo {
+
+		@Test
+		void factoryTest(@TempDir(factory = Factory.class) Path tempDir) {
+			assertTrue(tempDir.getFileName().toString().startsWith("factoryTest"));
+		}
+
+		static class Factory implements TempDirFactory {
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws IOException {
+				return Files.createTempDirectory(context.getRequiredTestMethod().getName());
+			}
+
+		}
+
+	}
+	// end::user_guide_factory_name_prefix[]
+
+	static
+	// tag::user_guide_factory_jimfs[]
+	class InMemoryTempDirDemo {
+
+		@Test
+		void test(@TempDir(factory = JimfsTempDirFactory.class) Path tempDir) {
+			// perform test
+		}
+
+		static class JimfsTempDirFactory implements TempDirFactory {
+
+			private final FileSystem fileSystem = Jimfs.newFileSystem(Configuration.unix());
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws IOException {
+				return Files.createTempDirectory(fileSystem.getPath("/"), "junit");
+			}
+
+			@Override
+			public void close() throws IOException {
+				fileSystem.close();
+			}
+
+		}
+
+	}
+	// end::user_guide_factory_jimfs[]
+
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 51f09b24c087..ccab4e47bb04 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -31,6 +31,7 @@ groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.11" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
+jimfs = { module = "com.google.jimfs:jimfs", version = "1.2" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "2.0.0" }
@@ -39,6 +40,7 @@ kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.1" }
+memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.5.1" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.3.1" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 2352f6286cd2..01a7be31dc51 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -26,6 +26,7 @@
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.io.TempDirFactory.Standard;
 
 /**
  * {@code @TempDir} can be used to annotate a field in a test class or a
@@ -96,9 +97,22 @@
 @API(status = STABLE, since = "5.10")
 public @interface TempDir {
 
+	/**
+	 * Factory for the temporary directory.
+	 *
+	 * <p>If {@value #SCOPE_PROPERTY_NAME} is set to {@code per_context}, no
+	 * custom factory is allowed.
+	 *
+	 * @return the class instance of the factory
+	 *
+	 * @since 5.10
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
+	Class<? extends TempDirFactory> factory() default Standard.class;
+
 	/**
 	 * Property name used to set the scope of temporary directories created via
-	 * {@link org.junit.jupiter.api.io.TempDir @TempDir} annotation: {@value}
+	 * {@link TempDir @TempDir} annotation: {@value}
 	 *
 	 * <h4>Supported Values</h4>
 	 * <ul>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
new file mode 100644
index 000000000000..1f6958257a20
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.io;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
+
+import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * {@code TempDirFactory} defines the SPI for creating temporary directories
+ * programmatically.
+ *
+ * <p>A temporary directory factory is typically used to gain more control on
+ * the temporary directory creation, like defining the parent directory or even
+ * the file system that should be used.
+ *
+ * <p>Concrete implementations must have a <em>default constructor</em>.
+ *
+ * <p>A {@link TempDirFactory} can be configured <em>locally</em>
+ * for a test class field or method parameter via the {@link TempDir @TempDir}
+ * annotation.
+ *
+ * @since 5.10
+ * @see TempDir @TempDir
+ */
+@FunctionalInterface
+@API(status = EXPERIMENTAL, since = "5.10")
+public interface TempDirFactory extends Closeable {
+
+	/**
+	 * Create a new temporary directory, using the given prefix to generate its name.
+	 * Depending on the implementation, the resulting {@code Path} may or may not be
+	 * associated with the default {@code FileSystem}.
+	 *
+	 * @param context the current extension context; never {@code null}
+	 * @return the path to the newly created directory that did not exist before this method was invoked; never {@code null}
+	 * @throws Exception in case of failures
+	 */
+	Path createTempDirectory(ExtensionContext context) throws Exception;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	default void close() throws IOException {
+	}
+
+	/**
+	 * Standard temporary directory factory that delegates to
+	 * {@link Files#createTempDirectory}.
+	 *
+	 * @see Files#createTempDirectory(String, FileAttribute[])
+	 */
+	class Standard implements TempDirFactory {
+
+		public static final TempDirFactory INSTANCE = new Standard();
+
+		private static final String TEMP_DIR_PREFIX = "junit";
+
+		public Standard() {
+		}
+
+		@Override
+		public Path createTempDirectory(ExtensionContext context) throws IOException {
+			return Files.createTempDirectory(TEMP_DIR_PREFIX);
+		}
+
+	}
+
+}
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index daa45cd35487..63d45183f2be 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -21,9 +21,11 @@ dependencies {
 	testImplementation(projects.junitPlatformTestkit)
 	testImplementation(testFixtures(projects.junitPlatformCommons))
 	testImplementation(kotlin("stdlib"))
+	testImplementation(libs.jimfs)
 	testImplementation(libs.junit4)
 	testImplementation(libs.kotlinx.coroutines)
 	testImplementation(libs.groovy4)
+	testImplementation(libs.memoryfilesystem)
 	testImplementation(testFixtures(projects.junitJupiterApi))
 
 	osgiVerification(projects.junitPlatformLauncher)
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 624c9adbce80..3cd8a47fc4a2 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -51,6 +51,7 @@
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.engine.config.EnumConfigurationParameterConverter;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.commons.JUnitException;
@@ -74,7 +75,6 @@ class TempDirectory implements BeforeAllCallback, BeforeEachCallback, ParameterR
 
 	static final Namespace NAMESPACE = Namespace.create(TempDirectory.class);
 	private static final String KEY = "temp.dir";
-	private static final String TEMP_DIR_PREFIX = "junit";
 
 	// for testing purposes
 	static final String FILE_OPERATIONS_KEY = "file.operations";
@@ -123,7 +123,9 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 
 			try {
 				CleanupMode cleanupMode = determineCleanupModeForField(field);
-				makeAccessible(field).set(testInstance, getPathOrFile(field, field.getType(), cleanupMode, context));
+				TempDirFactory factory = getTempDirFactoryForField(field);
+				makeAccessible(field).set(testInstance,
+					getPathOrFile(field, field.getType(), factory, cleanupMode, context));
 			}
 			catch (Throwable t) {
 				ExceptionUtils.throwAsUncheckedException(t);
@@ -154,7 +156,8 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 		Class<?> parameterType = parameterContext.getParameter().getType();
 		assertSupportedType("parameter", parameterType);
 		CleanupMode cleanupMode = determineCleanupModeForParameter(parameterContext);
-		return getPathOrFile(parameterContext.getParameter(), parameterType, cleanupMode, extensionContext);
+		TempDirFactory factory = getTempDirFactoryForParameter(parameterContext);
+		return getPathOrFile(parameterContext.getParameter(), parameterType, factory, cleanupMode, extensionContext);
 	}
 
 	private CleanupMode determineCleanupModeForField(Field field) {
@@ -174,6 +177,25 @@ private CleanupMode determineCleanupMode(TempDir tempDir) {
 		return cleanupMode == DEFAULT ? this.configuration.getDefaultTempDirCleanupMode() : cleanupMode;
 	}
 
+	private TempDirFactory getTempDirFactoryForField(Field field) {
+		TempDir tempDir = findAnnotation(field, TempDir.class).orElseThrow(
+			() -> new JUnitException("Field " + field + " must be annotated with @TempDir"));
+		return getTempDirFactory(tempDir);
+	}
+
+	private TempDirFactory getTempDirFactoryForParameter(ParameterContext parameterContext) {
+		TempDir tempDir = parameterContext.findAnnotation(TempDir.class).orElseThrow(() -> new JUnitException(
+			"Parameter " + parameterContext.getParameter() + " must be annotated with @TempDir"));
+		return getTempDirFactory(tempDir);
+	}
+
+	private static TempDirFactory getTempDirFactory(TempDir tempDir) {
+		Class<? extends TempDirFactory> factory = tempDir.factory();
+		return factory == TempDirFactory.Standard.class //
+				? TempDirFactory.Standard.INSTANCE
+				: ReflectionUtils.newInstance(factory);
+	}
+
 	private void assertNonFinalField(Field field) {
 		if (ReflectionUtils.isFinal(field)) {
 			throw new ExtensionConfigurationException("@TempDir field [" + field + "] must not be declared as final.");
@@ -187,13 +209,22 @@ private void assertSupportedType(String target, Class<?> type) {
 		}
 	}
 
-	private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, CleanupMode cleanupMode,
-			ExtensionContext extensionContext) {
-		Namespace namespace = getScope(extensionContext) == Scope.PER_DECLARATION //
+	@SuppressWarnings("deprecation")
+	private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, TempDirFactory factory,
+			CleanupMode cleanupMode, ExtensionContext extensionContext) {
+		Scope scope = getScope(extensionContext);
+
+		if (scope == Scope.PER_CONTEXT && factory != TempDirFactory.Standard.INSTANCE) {
+			throw new ExtensionConfigurationException("Custom @TempDir factory is not supported with "
+					+ TempDir.SCOPE_PROPERTY_NAME + "=" + Scope.PER_CONTEXT.toString().toLowerCase());
+		}
+
+		Namespace namespace = scope == Scope.PER_DECLARATION //
 				? NAMESPACE.append(sourceElement) //
 				: NAMESPACE;
 		Path path = extensionContext.getStore(namespace) //
-				.getOrComputeIfAbsent(KEY, __ -> createTempDir(cleanupMode, extensionContext), CloseablePath.class) //
+				.getOrComputeIfAbsent(KEY, __ -> createTempDir(factory, cleanupMode, extensionContext),
+					CloseablePath.class) //
 				.get();
 
 		return (type == Path.class) ? path : path.toFile();
@@ -209,9 +240,10 @@ private Scope getScope(ExtensionContext context) {
 		);
 	}
 
-	static CloseablePath createTempDir(CleanupMode cleanupMode, ExtensionContext executionContext) {
+	static CloseablePath createTempDir(TempDirFactory factory, CleanupMode cleanupMode,
+			ExtensionContext executionContext) {
 		try {
-			return new CloseablePath(Files.createTempDirectory(TEMP_DIR_PREFIX), cleanupMode, executionContext);
+			return new CloseablePath(factory, cleanupMode, executionContext);
 		}
 		catch (Exception ex) {
 			throw new ExtensionConfigurationException("Failed to create default temp directory", ex);
@@ -223,11 +255,14 @@ static class CloseablePath implements CloseableResource {
 		private static final Logger logger = LoggerFactory.getLogger(CloseablePath.class);
 
 		private final Path dir;
+		private final TempDirFactory factory;
 		private final CleanupMode cleanupMode;
 		private final ExtensionContext executionContext;
 
-		CloseablePath(Path dir, CleanupMode cleanupMode, ExtensionContext executionContext) {
-			this.dir = dir;
+		CloseablePath(TempDirFactory factory, CleanupMode cleanupMode, ExtensionContext executionContext)
+				throws Exception {
+			this.dir = factory.createTempDirectory(executionContext);
+			this.factory = factory;
 			this.cleanupMode = cleanupMode;
 			this.executionContext = executionContext;
 		}
@@ -251,6 +286,8 @@ public void close() throws IOException {
 			if (!failures.isEmpty()) {
 				throw createIOExceptionWithAttachedFailures(failures);
 			}
+
+			factory.close();
 		}
 
 		private SortedMap<Path, IOException> deleteAllFilesAndDirectories(FileOperations fileOperations)
@@ -261,13 +298,13 @@ private SortedMap<Path, IOException> deleteAllFilesAndDirectories(FileOperations
 
 			SortedMap<Path, IOException> failures = new TreeMap<>();
 			Set<Path> retriedPaths = new HashSet<>();
-			resetPermissions(dir);
+			tryToResetPermissions(dir);
 			Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
 
 				@Override
 				public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
 					if (!dir.equals(CloseablePath.this.dir)) {
-						resetPermissions(dir);
+						tryToResetPermissions(dir);
 					}
 					return CONTINUE;
 				}
@@ -310,7 +347,7 @@ private void resetPermissionsAndTryToDeleteAgain(Path path, IOException exceptio
 					boolean notYetRetried = retriedPaths.add(path);
 					if (notYetRetried) {
 						try {
-							resetPermissions(path);
+							tryToResetPermissions(path);
 							if (Files.isDirectory(path)) {
 								Files.walkFileTree(path, this);
 							}
@@ -332,8 +369,15 @@ private void resetPermissionsAndTryToDeleteAgain(Path path, IOException exceptio
 		}
 
 		@SuppressWarnings("ResultOfMethodCallIgnored")
-		private static void resetPermissions(Path path) {
-			File file = path.toFile();
+		private static void tryToResetPermissions(Path path) {
+			File file;
+			try {
+				file = path.toFile();
+			}
+			catch (UnsupportedOperationException ignore) {
+				// Might happen when the `TempDirFactory` uses a custom `FileSystem`
+				return;
+			}
 			file.setReadable(true);
 			file.setWritable(true);
 			if (Files.isDirectory(path)) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index 7d9557609345..d708f21041ae 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -17,6 +17,8 @@
 import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -24,14 +26,17 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
+import org.mockito.Mockito;
 
 /**
  * Integration tests for cleanup of the {@link TempDirectory} when the {@link CleanupMode} is
@@ -45,6 +50,7 @@
 class CloseablePathCleanupTests extends AbstractJupiterTestEngineTests {
 
 	private final ExtensionContext extensionContext = mock();
+	private final TempDirFactory factory = spy(TempDirFactory.Standard.INSTANCE);
 
 	private TempDirectory.CloseablePath closeablePath;
 
@@ -59,56 +65,52 @@ void cleanupTempDirectory() throws IOException {
 		deleteIfExists(closeablePath.get());
 	}
 
-	/**
-	 * Ensure a closeable path is cleaned up for a cleanup mode of ALWAYS.
-	 */
 	@Test
+	@DisplayName("is cleaned up for a cleanup mode of ALWAYS")
 	void always() throws IOException {
-		closeablePath = TempDirectory.createTempDir(ALWAYS, extensionContext);
+		closeablePath = TempDirectory.createTempDir(factory, ALWAYS, extensionContext);
 		assertThat(closeablePath.get()).exists();
 
 		closeablePath.close();
 		assertThat(closeablePath.get()).doesNotExist();
+		verify(factory).close();
 	}
 
-	/**
-	 * Ensure a closeable path is not cleaned up for a cleanup mode of NEVER.
-	 */
 	@Test
+	@DisplayName("is not cleaned up for a cleanup mode of NEVER")
 	void never() throws IOException {
-		closeablePath = TempDirectory.createTempDir(NEVER, extensionContext);
+		closeablePath = TempDirectory.createTempDir(factory, NEVER, extensionContext);
 		assertThat(closeablePath.get()).exists();
 
 		closeablePath.close();
 		assertThat(closeablePath.get()).exists();
+		verify(factory, Mockito.never()).close();
 	}
 
-	/**
-	 * Ensure a closeable path is not cleaned up for a cleanup mode of ON_SUCCESS, if there is a TestAbortedException.
-	 */
 	@Test
+	@DisplayName("is not cleaned up for a cleanup mode of ON_SUCCESS, if there is an exception")
 	void onSuccessWithException() throws IOException {
 		when(extensionContext.getExecutionException()).thenReturn(Optional.of(new Exception()));
 
-		closeablePath = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
+		closeablePath = TempDirectory.createTempDir(factory, ON_SUCCESS, extensionContext);
 		assertThat(closeablePath.get()).exists();
 
 		closeablePath.close();
 		assertThat(closeablePath.get()).exists();
+		verify(factory, Mockito.never()).close();
 	}
 
-	/**
-	 * Ensure a closeable path is cleaned up for a cleanup mode of ON_SUCCESS, if there is no exception.
-	 */
 	@Test
+	@DisplayName("is cleaned up for a cleanup mode of ON_SUCCESS, if there is no exception")
 	void onSuccessWithNoException() throws IOException {
 		when(extensionContext.getExecutionException()).thenReturn(Optional.empty());
 
-		closeablePath = TempDirectory.createTempDir(ON_SUCCESS, extensionContext);
+		closeablePath = TempDirectory.createTempDir(factory, ON_SUCCESS, extensionContext);
 		assertThat(closeablePath.get()).exists();
 
 		closeablePath.close();
 		assertThat(closeablePath.get()).doesNotExist();
+		verify(factory).close();
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index 60c9f383bda9..9179d7c1a91f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -50,8 +50,10 @@
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
@@ -346,6 +348,22 @@ void doesNotSupportTempDirAnnotationOnConstructorParameterWithTestInstancePerCla
 				"@TempDir is not supported on constructor parameters. Please use field injection instead.");
 		}
 
+		@Test
+		@DisplayName("when @TempDir factory is not Standard")
+		@Order(32)
+		void onlySupportsStandardTempDirFactory() {
+			var results = executeTestsForClass(NonStandardFactoryTestCase.class);
+
+			// @formatter:off
+			TempDirectoryPerContextTests.assertSingleFailedTest(results,
+					instanceOf(ParameterResolutionException.class),
+					message(m -> m.matches("Failed to resolve parameter \\[.+] in method \\[.+]: .+")),
+					cause(
+							instanceOf(ExtensionConfigurationException.class),
+							message("Custom @TempDir factory is not supported with junit.jupiter.tempdir.scope=per_context")));
+			// @formatter:on
+		}
+
 	}
 
 	@Nested
@@ -626,6 +644,23 @@ static class AnnotationOnConstructorParameterWithTestInstancePerClassTestCase
 		}
 	}
 
+	static class NonStandardFactoryTestCase {
+
+		@Test
+		void test(@SuppressWarnings("unused") @TempDir(factory = Factory.class) Path tempDir) {
+			// never called
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws Exception {
+				return Files.createTempDirectory("junit");
+			}
+		}
+
+	}
+
 	static class AnnotationOnBeforeAllMethodParameterTestCase extends BaseSharedTempDirParameterInjectionTestCase {
 
 		@BeforeAll
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 8f2308e63c91..fe4a9a90a5f3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -30,6 +30,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -38,6 +39,10 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
+import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder;
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
+
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
@@ -58,9 +63,11 @@
 import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.Constants;
 import org.junit.jupiter.engine.extension.TempDirectory.FileOperations;
@@ -304,6 +311,40 @@ void supportsPrivateStaticFields() {
 
 	}
 
+	@Nested
+	@DisplayName("supports custom factory")
+	class Factory {
+
+		@Test
+		@DisplayName("that uses test method name as temp dir name prefix")
+		void supportsFactoryWithTestMethodNameAsPrefix() {
+			executeTestsForClass(FactoryWithTestMethodNameAsPrefixTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("that uses custom temp dir parent directory")
+		void supportsFactoryWithCustomParentDirectory() {
+			executeTestsForClass(FactoryWithCustomParentDirectoryTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("that uses com.github.marschall:memoryfilesystem")
+		void supportsFactoryWithMemoryFileSystem() {
+			executeTestsForClass(FactoryWithMemoryFileSystemTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("that uses com.google.jimfs:jimfs")
+		void supportsFactoryWithJimfs() {
+			executeTestsForClass(FactoryWithJimfsTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+	}
+
 	private static void assertSingleFailedContainer(EngineExecutionResults results, Class<? extends Throwable> clazz,
 			String message) {
 
@@ -1065,4 +1106,100 @@ void test() throws Exception {
 			Files.createFile(tempDir.resolve(UNDELETABLE_PATH));
 		}
 	}
+
+	static class FactoryWithTestMethodNameAsPrefixTestCase {
+
+		@Test
+		void test(@TempDir(factory = Factory.class) Path tempDir) {
+			assertTrue(Files.exists(tempDir));
+			assertThat(tempDir.getFileName().toString()).startsWith("test");
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws Exception {
+				return Files.createTempDirectory(context.getRequiredTestMethod().getName());
+			}
+		}
+
+	}
+
+	// https://github.com/junit-team/junit5/issues/2088
+	static class FactoryWithCustomParentDirectoryTestCase {
+
+		@Test
+		void test(@TempDir(factory = Factory.class) Path tempDir) {
+			assertThat(tempDir).exists().hasParent(Factory.parent);
+			assertThat(tempDir.getFileName().toString()).startsWith("prefix");
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			private static Path parent;
+
+			private Factory() throws IOException {
+				parent = Files.createTempDirectory("parent");
+			}
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws Exception {
+				return Files.createTempDirectory(parent, "prefix");
+			}
+		}
+
+	}
+
+	static class FactoryWithMemoryFileSystemTestCase {
+
+		@Test
+		void test(@TempDir(factory = Factory.class) Path tempDir) {
+			assertThat(tempDir).exists().hasFileSystem(Factory.fileSystem);
+			assertThat(tempDir.getFileName().toString()).startsWith("prefix");
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			private static FileSystem fileSystem;
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws Exception {
+				fileSystem = MemoryFileSystemBuilder.newEmpty().build();
+				return Files.createTempDirectory(fileSystem.getPath("/"), "prefix");
+			}
+
+			@Override
+			public void close() throws IOException {
+				fileSystem.close();
+			}
+		}
+
+	}
+
+	static class FactoryWithJimfsTestCase {
+
+		@Test
+		void test(@TempDir(factory = Factory.class) Path tempDir) {
+			assertThat(tempDir).exists().hasFileSystem(Factory.fileSystem);
+			assertThat(tempDir.getFileName().toString()).startsWith("prefix");
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			private static FileSystem fileSystem;
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws Exception {
+				fileSystem = Jimfs.newFileSystem(Configuration.unix());
+				return Files.createTempDirectory(fileSystem.getPath("/"), "prefix");
+			}
+
+			@Override
+			public void close() throws IOException {
+				fileSystem.close();
+			}
+		}
+
+	}
+
 }

From 3dbba00cde03a122769dbcae6da60a65bf20915b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 26 Apr 2023 10:05:08 +0200
Subject: [PATCH 1205/1433] Fix ModularUserGuideTests

---
 .../platform-tooling-support-tests.gradle.kts                 | 1 +
 .../platform/tooling/support/tests/ModularUserGuideTests.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 7190c13879ef..c79bd0195f48 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -63,6 +63,7 @@ dependencies {
 	thirdPartyJars(libs.apiguardian)
 	thirdPartyJars(libs.hamcrest)
 	thirdPartyJars(libs.opentest4j)
+	thirdPartyJars(libs.jimfs)
 
 	antJars(platform(projects.junitBom))
 	antJars(libs.bundles.ant)
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
index 3c2fc9fe17ad..1369eb94366d 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java
@@ -84,6 +84,8 @@ private static List<String> compile(Path temp, Writer out, Writer err) throws Ex
 		ThirdPartyJars.copy(lib, "org.apiguardian", "apiguardian-api");
 		ThirdPartyJars.copy(lib, "org.hamcrest", "hamcrest");
 		ThirdPartyJars.copy(lib, "org.opentest4j", "opentest4j");
+		ThirdPartyJars.copy(lib, "com.google.jimfs", "jimfs");
+		ThirdPartyJars.copy(lib, "com.google.guava", "guava");
 		Helper.loadAllJUnitModules(lib);
 		args.add("--module-path");
 		args.add(lib.toString());
@@ -186,7 +188,9 @@ void runTestsFromUserGuideWithinModularBoundaries(@TempDir Path temp) throws Exc
 			"lib/apiguardian-api-.+\\.jar", //
 			"lib/assertj-core-.+\\.jar", //
 			"lib/byte-buddy-.+", //
+			"lib/guava-.+\\.jar", //
 			"lib/hamcrest-.+\\.jar", //
+			"lib/jimfs-.+\\.jar", //
 			"lib/junit-.+\\.jar", //
 			">> ALL JUNIT 5 JARS >>", //
 			"lib/opentest4j-.+\\.jar", //

From 4d69f8c3916cf1db0a1e0a775b1cefd66151ec03 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 26 Apr 2023 11:37:46 +0200
Subject: [PATCH 1206/1433] Fix syntax in examples in release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.9.3.adoc  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
index b2476afdfac5..6d1020227e39 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.3.adoc
@@ -26,10 +26,10 @@ No changes.
   exception stating that `example.NonexistentType` cannot be resolved to a valid type.
 * The syntax for parameter types in _local_ `@MethodSource` factory method names now
   supports canonical array names -- for example, you may now specify `int[]` as in
-  `@MethodSource("myFactory(int[])"` instead of the _binary_ name `[I` as in
-  `@MethodSource("myFactory([I)"` (which was already supported) and
-  `@MethodSource("myFactory(java.lang.String[])` instead of
-  `@MethodSource("myFactory([Ljava.lang.String;)`.
+  `@MethodSource("myFactory(int[])")` instead of the _binary_ name `[I` as in
+  `@MethodSource("myFactory([I)")` (which was already supported) and
+  `@MethodSource("myFactory(java.lang.String[])")` instead of
+  `@MethodSource("myFactory([Ljava.lang.String;)")`.
 * The search algorithm used to find `@MethodSource` factory methods now applies consistent
   semantics for _local_ qualified method names and fully-qualified method names for
   overloaded factory methods.

From 0aae9a9574bb2b2994035e0f7beb199ef03b02cf Mon Sep 17 00:00:00 2001
From: Bassem ElMasry <75857183+BassemElMasry@users.noreply.github.com>
Date: Wed, 26 Apr 2023 16:06:51 +0200
Subject: [PATCH 1207/1433] Improve error message for non-static
 `@MethodSource` factory methods

Resolves #3215.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes/release-notes-5.10.0-M1.adoc   |  1 +
 .../params/provider/MethodArgumentsProvider.java | 16 ++++++++++++++++
 .../provider/MethodArgumentsProviderTests.java   |  7 ++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index a20ddfe9b82b..8529843fe89d 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -86,6 +86,7 @@ default.
   temporary directories. See the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
+* Improve error message for non-static `@MethodSource` factory methods
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 0336401b3886..6815c9cf1b71 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -24,6 +24,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
@@ -50,12 +51,27 @@ protected Stream<? extends Arguments> provideArguments(ExtensionContext context,
 		// @formatter:off
 		return stream(methodNames)
 				.map(factoryMethodName -> findFactoryMethod(testClass, testMethod, factoryMethodName))
+				.map(factoryMethod -> validateStaticFactoryMethod(context, factoryMethod))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
 				.map(MethodArgumentsProvider::toArguments);
 		// @formatter:on
 	}
 
+	private Method validateStaticFactoryMethod(ExtensionContext context, Method factoryMethod) {
+		if (isPerMethodLifecycle(context)) {
+			Preconditions.condition(ReflectionUtils.isStatic(factoryMethod), () -> String.format(
+				"method '%s' must be static unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS).",
+				factoryMethod.toGenericString()));
+		}
+		return factoryMethod;
+	}
+
+	private boolean isPerMethodLifecycle(ExtensionContext context) {
+		return context.getTestInstanceLifecycle().orElse(
+			TestInstance.Lifecycle.PER_CLASS) == TestInstance.Lifecycle.PER_METHOD;
+	}
+
 	private static Method findFactoryMethod(Class<?> testClass, Method testMethod, String factoryMethodName) {
 		String originalFactoryMethodName = factoryMethodName;
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 1bd49479bb06..24c144f21c0f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -32,6 +32,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
@@ -177,7 +178,8 @@ void throwsExceptionWhenNonStaticFactoryMethodIsReferencedAndStaticIsRequired()
 		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(NonStaticTestCase.class, null, false, "nonStaticStringStreamProvider").toArray());
 
-		assertThat(exception).hasMessageContaining("Cannot invoke non-static method");
+		assertThat(exception).hasMessageContaining(
+			"must be static unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS)");
 	}
 
 	@Test
@@ -713,6 +715,9 @@ public void dummyMethod() {
 		var testInstance = allowNonStaticMethod ? ReflectionUtils.newInstance(testClass) : null;
 		when(extensionContext.getTestInstance()).thenReturn(Optional.ofNullable(testInstance));
 
+		var lifeCycle = allowNonStaticMethod ? TestInstance.Lifecycle.PER_CLASS : TestInstance.Lifecycle.PER_METHOD;
+		when(extensionContext.getTestInstanceLifecycle()).thenReturn(Optional.of(lifeCycle));
+
 		var provider = new MethodArgumentsProvider();
 		provider.accept(methodSource);
 		return provider.provideArguments(extensionContext).map(Arguments::get);

From 35d99d4038e31649a68f9d53e56538c0d890a345 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 24 Feb 2023 11:19:56 +0100
Subject: [PATCH 1208/1433] Generalize ConsoleLauncherExecutionResult to
 CommandResult

---
 .../junit/platform/console/CommandResult.java | 62 ++++++++++++++
 .../platform/console/ConsoleLauncher.java     | 31 ++++---
 .../ConsoleLauncherExecutionResult.java       | 83 -------------------
 .../ExecutionCommandResultFactory.java        | 47 +++++++++++
 .../console/ConsoleLauncherToolProvider.java  |  2 +-
 .../console/ConsoleLauncherTests.java         | 10 +--
 .../console/ConsoleLauncherWrapper.java       |  2 +-
 .../console/ConsoleLauncherWrapperResult.java |  6 +-
 ...> ExecutionCommandResultFactoryTests.java} | 14 ++--
 .../tasks/ConsoleTestExecutorTests.java       | 12 +--
 10 files changed, 148 insertions(+), 121 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/CommandResult.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/ExecutionCommandResultFactory.java
 rename platform-tests/src/test/java/org/junit/platform/console/{ConsoleLauncherExecutionResultTests.java => ExecutionCommandResultFactoryTests.java} (79%)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/CommandResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/CommandResult.java
new file mode 100644
index 000000000000..69472426fe2f
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/CommandResult.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.util.Optional;
+
+import org.apiguardian.api.API;
+
+/**
+ * @since 1.10
+ */
+@API(status = INTERNAL, since = "1.10")
+public class CommandResult<T> {
+
+	/**
+	 * Exit code indicating successful execution
+	 */
+	protected static final int SUCCESS = 0;
+
+	/**
+	 * Exit code indicating any failure(s)
+	 */
+	protected static final int FAILURE = -1;
+
+	public static <T> CommandResult<T> success() {
+		return create(SUCCESS, null);
+	}
+
+	public static <T> CommandResult<T> failure() {
+		return create(FAILURE, null);
+	}
+
+	public static <T> CommandResult<T> create(int exitCode, T value) {
+		return new CommandResult<>(exitCode, value);
+	}
+
+	private final int exitCode;
+	private final T value;
+
+	private CommandResult(int exitCode, T value) {
+		this.exitCode = exitCode;
+		this.value = value;
+	}
+
+	public int getExitCode() {
+		return exitCode;
+	}
+
+	public Optional<T> getValue() {
+		return Optional.ofNullable(value);
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index a78633b656d1..942ab3252450 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -39,20 +39,20 @@
 public class ConsoleLauncher {
 
 	public static void main(String... args) {
-		int exitCode = execute(System.out, System.err, args).getExitCode();
+		int exitCode = run(System.out, System.err, args).getExitCode();
 		System.exit(exitCode);
 	}
 
 	@API(status = INTERNAL, since = "1.0")
-	public static ConsoleLauncherExecutionResult execute(PrintStream out, PrintStream err, String... args) {
-		return execute(new PrintWriter(out), new PrintWriter(err), args);
+	public static CommandResult<?> run(PrintStream out, PrintStream err, String... args) {
+		return run(new PrintWriter(out), new PrintWriter(err), args);
 	}
 
 	@API(status = INTERNAL, since = "1.0")
-	public static ConsoleLauncherExecutionResult execute(PrintWriter out, PrintWriter err, String... args) {
+	public static CommandResult<?> run(PrintWriter out, PrintWriter err, String... args) {
 		CommandLineOptionsParser parser = new PicocliCommandLineOptionsParser();
 		ConsoleLauncher consoleLauncher = new ConsoleLauncher(parser, out, err);
-		return consoleLauncher.execute(args);
+		return consoleLauncher.run(args);
 	}
 
 	private final CommandLineOptionsParser commandLineOptionsParser;
@@ -65,12 +65,12 @@ public static ConsoleLauncherExecutionResult execute(PrintWriter out, PrintWrite
 		this.err = err;
 	}
 
-	ConsoleLauncherExecutionResult execute(String... args) {
+	CommandResult<?> run(String... args) {
 		try {
 			CommandLineOptions options = commandLineOptionsParser.parse(args);
 			if (options.isListEngines()) {
 				displayEngines(out);
-				return ConsoleLauncherExecutionResult.success();
+				return CommandResult.success();
 			}
 			if (!options.isBannerDisabled()) {
 				displayBanner(out);
@@ -80,7 +80,7 @@ ConsoleLauncherExecutionResult execute(String... args) {
 			}
 			if (options.isDisplayHelp()) {
 				commandLineOptionsParser.printHelp(out, options.isAnsiColorOutputDisabled());
-				return ConsoleLauncherExecutionResult.success();
+				return CommandResult.success();
 			}
 			return executeTests(options, out);
 		}
@@ -88,7 +88,7 @@ ConsoleLauncherExecutionResult execute(String... args) {
 			err.println(ex.getMessage());
 			err.println();
 			commandLineOptionsParser.printHelp(err, false);
-			return ConsoleLauncherExecutionResult.failed();
+			return CommandResult.failure();
 		}
 		finally {
 			out.flush();
@@ -118,32 +118,31 @@ private void displayEngine(PrintWriter out, TestEngine engine) {
 		out.println(engine.getId() + details);
 	}
 
-	private ConsoleLauncherExecutionResult listTests(CommandLineOptions options, PrintWriter out) {
+	private CommandResult<Void> listTests(CommandLineOptions options, PrintWriter out) {
 		try {
 			new ConsoleTestExecutor(options).discover(out);
-			return ConsoleLauncherExecutionResult.success();
+			return CommandResult.success();
 		}
 		catch (Exception exception) {
 			return handleTestExecutorException(exception, options);
 		}
 	}
 
-	private ConsoleLauncherExecutionResult executeTests(CommandLineOptions options, PrintWriter out) {
+	private CommandResult<TestExecutionSummary> executeTests(CommandLineOptions options, PrintWriter out) {
 		try {
 			TestExecutionSummary testExecutionSummary = new ConsoleTestExecutor(options).execute(out);
-			return ConsoleLauncherExecutionResult.forSummary(testExecutionSummary, options);
+			return ExecutionCommandResultFactory.forSummary(testExecutionSummary, options);
 		}
 		catch (Exception exception) {
 			return handleTestExecutorException(exception, options);
 		}
 	}
 
-	private ConsoleLauncherExecutionResult handleTestExecutorException(Exception exception,
-			CommandLineOptions options) {
+	private <T> CommandResult<T> handleTestExecutorException(Exception exception, CommandLineOptions options) {
 		exception.printStackTrace(err);
 		err.println();
 		commandLineOptionsParser.printHelp(out, options.isAnsiColorOutputDisabled());
-		return ConsoleLauncherExecutionResult.failed();
+		return CommandResult.failure();
 	}
 
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
deleted file mode 100644
index 23dd8225471f..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncherExecutionResult.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console;
-
-import static org.apiguardian.api.API.Status.INTERNAL;
-
-import java.util.Optional;
-
-import org.apiguardian.api.API;
-import org.junit.platform.console.options.CommandLineOptions;
-import org.junit.platform.launcher.listeners.TestExecutionSummary;
-
-/**
- * @since 1.0
- */
-@API(status = INTERNAL, since = "1.0")
-public class ConsoleLauncherExecutionResult {
-
-	/**
-	 * Exit code indicating successful execution
-	 */
-	private static final int SUCCESS = 0;
-
-	/**
-	 * Exit code indicating test failure(s)
-	 */
-	private static final int TEST_FAILED = 1;
-
-	/**
-	 * Exit code indicating no tests found
-	 */
-	private static final int NO_TESTS_FOUND = 2;
-
-	/**
-	 * Exit code indicating any failure(s)
-	 */
-	private static final int FAILED = -1;
-
-	public static int computeExitCode(TestExecutionSummary summary, CommandLineOptions options) {
-		if (options.isFailIfNoTests() && summary.getTestsFoundCount() == 0) {
-			return NO_TESTS_FOUND;
-		}
-		return summary.getTotalFailureCount() == 0 ? SUCCESS : TEST_FAILED;
-	}
-
-	static ConsoleLauncherExecutionResult success() {
-		return new ConsoleLauncherExecutionResult(SUCCESS, null);
-	}
-
-	static ConsoleLauncherExecutionResult failed() {
-		return new ConsoleLauncherExecutionResult(FAILED, null);
-	}
-
-	static ConsoleLauncherExecutionResult forSummary(TestExecutionSummary summary, CommandLineOptions options) {
-		int exitCode = computeExitCode(summary, options);
-		return new ConsoleLauncherExecutionResult(exitCode, summary);
-	}
-
-	private final int exitCode;
-	private final TestExecutionSummary testExecutionSummary;
-
-	private ConsoleLauncherExecutionResult(int exitCode, TestExecutionSummary testExecutionSummary) {
-		this.testExecutionSummary = testExecutionSummary;
-		this.exitCode = exitCode;
-	}
-
-	public int getExitCode() {
-		return exitCode;
-	}
-
-	public Optional<TestExecutionSummary> getTestExecutionSummary() {
-		return Optional.ofNullable(testExecutionSummary);
-	}
-
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ExecutionCommandResultFactory.java b/junit-platform-console/src/main/java/org/junit/platform/console/ExecutionCommandResultFactory.java
new file mode 100644
index 000000000000..f1cf7434f025
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ExecutionCommandResultFactory.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.junit.platform.console.CommandResult.SUCCESS;
+
+import org.apiguardian.api.API;
+import org.junit.platform.console.options.CommandLineOptions;
+import org.junit.platform.launcher.listeners.TestExecutionSummary;
+
+/**
+ * @since 1.10
+ */
+@API(status = INTERNAL, since = "1.10")
+public class ExecutionCommandResultFactory {
+
+	/**
+	 * Exit code indicating test failure(s)
+	 */
+	private static final int TEST_FAILED = 1;
+
+	/**
+	 * Exit code indicating no tests found
+	 */
+	private static final int NO_TESTS_FOUND = 2;
+
+	public static int computeExitCode(TestExecutionSummary summary, CommandLineOptions options) {
+		if (options.isFailIfNoTests() && summary.getTestsFoundCount() == 0) {
+			return NO_TESTS_FOUND;
+		}
+		return summary.getTotalFailureCount() == 0 ? SUCCESS : TEST_FAILED;
+	}
+
+	static CommandResult<TestExecutionSummary> forSummary(TestExecutionSummary summary, CommandLineOptions options) {
+		int exitCode = computeExitCode(summary, options);
+		return CommandResult.create(exitCode, summary);
+	}
+}
diff --git a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
index 67f152d6af7c..37dfb476105f 100644
--- a/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
+++ b/junit-platform-console/src/main/java9/org/junit/platform/console/ConsoleLauncherToolProvider.java
@@ -32,6 +32,6 @@ public String name() {
 
 	@Override
 	public int run(PrintWriter out, PrintWriter err, String... args) {
-		return ConsoleLauncher.execute(out, err, args).getExitCode();
+		return ConsoleLauncher.run(out, err, args).getExitCode();
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index b7f70803c15d..9d7a78afa6b6 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -43,7 +43,7 @@ void displayHelp() {
 		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.execute("--help").getExitCode();
+		var exitCode = consoleLauncher.run("--help").getExitCode();
 
 		assertEquals(0, exitCode);
 		verify(commandLineOptionsParser).parse("--help");
@@ -59,7 +59,7 @@ void displayBanner() {
 		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.execute("--help").getExitCode();
+		var exitCode = consoleLauncher.run("--help").getExitCode();
 
 		assertEquals(0, exitCode);
 		assertLinesMatch(
@@ -77,7 +77,7 @@ void disableBanner() {
 		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.execute("--help", "--disable-banner").getExitCode();
+		var exitCode = consoleLauncher.run("--help", "--disable-banner").getExitCode();
 
 		assertEquals(0, exitCode);
 		assertLinesMatch(List.of(), stringWriter.toString().lines().collect(Collectors.toList()));
@@ -89,7 +89,7 @@ void executeWithUnknownCommandLineOption() {
 		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(new CommandLineOptions());
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.execute("--all").getExitCode();
+		var exitCode = consoleLauncher.run("--all").getExitCode();
 
 		assertEquals(-1, exitCode);
 		verify(commandLineOptionsParser).parse("--all");
@@ -101,7 +101,7 @@ void executeWithSupportedCommandLineOption() {
 		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(new CommandLineOptions());
 
 		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.execute("--scan-classpath").getExitCode();
+		var exitCode = consoleLauncher.run("--scan-classpath").getExitCode();
 
 		assertEquals(-1, exitCode);
 		verify(commandLineOptionsParser).parse("--scan-classpath");
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
index 1740d07912f3..e84c07364327 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
@@ -52,7 +52,7 @@ public ConsoleLauncherWrapperResult execute(int expectedExitCode, String... args
 	}
 
 	public ConsoleLauncherWrapperResult execute(Optional<Integer> expectedCode, String... args) {
-		var result = consoleLauncher.execute(args);
+		var result = consoleLauncher.run(args);
 		var code = result.getExitCode();
 		var outText = out.toString();
 		var errText = err.toString();
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
index bad59d3f0037..152a1337d80f 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
@@ -26,12 +26,14 @@ class ConsoleLauncherWrapperResult implements TestExecutionSummary {
 	final int code;
 	private final TestExecutionSummary summary;
 
-	ConsoleLauncherWrapperResult(String[] args, String out, String err, ConsoleLauncherExecutionResult result) {
+	ConsoleLauncherWrapperResult(String[] args, String out, String err, CommandResult<?> result) {
 		this.args = args;
 		this.out = out;
 		this.err = err;
 		this.code = result.getExitCode();
-		this.summary = result.getTestExecutionSummary().orElse(null);
+		this.summary = (TestExecutionSummary) result.getValue() //
+				.filter(it -> it instanceof TestExecutionSummary) //
+				.orElse(null);
 	}
 
 	private void checkTestExecutionSummaryState() {
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java b/platform-tests/src/test/java/org/junit/platform/console/ExecutionCommandResultFactoryTests.java
similarity index 79%
rename from platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
rename to platform-tests/src/test/java/org/junit/platform/console/ExecutionCommandResultFactoryTests.java
index 1d37cfc93e5b..810d03fbd77e 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherExecutionResultTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ExecutionCommandResultFactoryTests.java
@@ -19,9 +19,9 @@
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 /**
- * @since 1.3
+ * @since 1.10
  */
-class ConsoleLauncherExecutionResultTests {
+class ExecutionCommandResultFactoryTests {
 
 	private final CommandLineOptions options = new CommandLineOptions();
 	private final TestExecutionSummary summary = mock();
@@ -30,7 +30,7 @@ class ConsoleLauncherExecutionResultTests {
 	void hasStatusCode0ForNoTotalFailures() {
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -39,7 +39,7 @@ void hasStatusCode0ForNoTotalFailures() {
 	void hasStatusCode1ForForAnyFailure() {
 		when(summary.getTotalFailureCount()).thenReturn(1L);
 
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -52,7 +52,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() {
 		options.setFailIfNoTests(true);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(2);
 	}
@@ -66,7 +66,7 @@ void hasStatusCode0ForTestsAndHasOptionFailIfNoTestsFound() {
 		when(summary.getTestsFoundCount()).thenReturn(1L);
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -79,7 +79,7 @@ void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() {
 		options.setFailIfNoTests(false);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(summary, options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index 02c270af9d9c..e8e8973d1f0f 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -23,7 +23,7 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.console.ConsoleLauncherExecutionResult;
+import org.junit.platform.console.ExecutionCommandResultFactory;
 import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.Details;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
@@ -99,7 +99,7 @@ void hasStatusCode0ForSucceedingTest() throws Exception {
 		dummyTestEngine.addTest("succeedingTest", SUCCEEDING_TEST);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -109,7 +109,7 @@ void hasStatusCode1ForFailingTest() throws Exception {
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -119,7 +119,7 @@ void hasStatusCode1ForFailingContainer() throws Exception {
 		dummyTestEngine.addContainer("failingContainer", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -132,7 +132,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
 		options.setFailIfNoTests(true);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(2);
 	}
@@ -143,7 +143,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
 	@Test
 	void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() throws Exception {
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ConsoleLauncherExecutionResult.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}

From 99d2b55c152eca28f5e621fd19321c922c34a07b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 24 Feb 2023 15:28:36 +0100
Subject: [PATCH 1209/1433] Introduce commands

---
 .../junit/platform/commons/function/Try.java  | 23 +++++
 .../platform/console/ConsoleLauncher.java     | 89 ++-----------------
 .../options/BannerPrintingCommand.java        | 34 +++++++
 .../platform/console/options/Command.java     | 19 ++++
 .../console/options/CommandLineParser.java    | 69 ++++++++++++++
 .../console/{ => options}/CommandResult.java  |  4 +-
 .../console/options/DiscoverTestsCommand.java | 29 ++++++
 .../console/options/ErrorHandlingCommand.java | 40 +++++++++
 .../ExecuteTestsCommand.java}                 | 30 ++++---
 .../platform/console/options/HelpCommand.java | 33 +++++++
 .../options/ListTestEnginesCommand.java       | 46 ++++++++++
 .../options/OptionParsingErrorCommand.java    | 30 +++++++
 .../platform/console/options/SafeCommand.java | 18 ++++
 .../platform/commons/function/TryTests.java   |  1 +
 .../console/ConsoleLauncherWrapperResult.java |  1 +
 .../ExecuteTestsCommandTests.java}            | 15 ++--
 .../tasks/ConsoleTestExecutorTests.java       | 12 +--
 .../support/tests/StandaloneTests.java        |  2 +-
 18 files changed, 383 insertions(+), 112 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/BannerPrintingCommand.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/Command.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineParser.java
 rename junit-platform-console/src/main/java/org/junit/platform/console/{ => options}/CommandResult.java (93%)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/ErrorHandlingCommand.java
 rename junit-platform-console/src/main/java/org/junit/platform/console/{ExecutionCommandResultFactory.java => options/ExecuteTestsCommand.java} (53%)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/HelpCommand.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/OptionParsingErrorCommand.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/SafeCommand.java
 rename platform-tests/src/test/java/org/junit/platform/console/{ExecutionCommandResultFactoryTests.java => options/ExecuteTestsCommandTests.java} (75%)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
index 9d7c5997b532..14427701999f 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
@@ -161,6 +161,17 @@ private Try() {
 	 */
 	public abstract <E extends Exception> V getOrThrow(Function<? super Exception, E> exceptionTransformer) throws E;
 
+	/**
+	 * If this {@code Try} is a success, get the contained value; if this
+	 * {@code Try} is a failure, call the supplied {@link Function} with the
+	 * contained exception and return its result.
+	 *
+	 * @param action the action to try; must not be {@code null}
+	 * @return the contained value, if available; otherwise, the result of the
+	 * supplied action
+	 */
+	public abstract V getOrElse(Function<Exception, V> action);
+
 	/**
 	 * If this {@code Try} is a success, call the supplied {@link Consumer} with
 	 * the contained value; otherwise, do nothing.
@@ -252,6 +263,12 @@ public <E extends Exception> V getOrThrow(Function<? super Exception, E> excepti
 			return this.value;
 		}
 
+		@Override
+		public V getOrElse(Function<Exception, V> action) {
+			// don't call action because this Try is a success
+			return this.value;
+		}
+
 		@Override
 		public Try<V> ifSuccess(Consumer<V> valueConsumer) {
 			checkNotNull(valueConsumer, "valueConsumer");
@@ -335,6 +352,12 @@ public <E extends Exception> V getOrThrow(Function<? super Exception, E> excepti
 			throw exceptionTransformer.apply(this.cause);
 		}
 
+		@Override
+		public V getOrElse(Function<Exception, V> action) {
+			checkNotNull(action, "action");
+			return action.apply(this.cause);
+		}
+
 		@Override
 		public Try<V> ifSuccess(Consumer<V> valueConsumer) {
 			// don't call valueConsumer because this Try is a failure
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index 942ab3252450..31963eb10cc7 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -15,19 +15,13 @@
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
-import java.util.Comparator;
-import java.util.StringJoiner;
-import java.util.stream.StreamSupport;
 
 import org.apiguardian.api.API;
-import org.junit.platform.commons.JUnitException;
-import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.CommandLineOptionsParser;
+import org.junit.platform.console.options.CommandLineParser;
+import org.junit.platform.console.options.CommandResult;
 import org.junit.platform.console.options.PicocliCommandLineOptionsParser;
-import org.junit.platform.console.tasks.ConsoleTestExecutor;
-import org.junit.platform.engine.TestEngine;
-import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
-import org.junit.platform.launcher.listeners.TestExecutionSummary;
+import org.junit.platform.console.options.SafeCommand;
 
 /**
  * The {@code ConsoleLauncher} is a stand-alone application for launching the
@@ -55,40 +49,20 @@ public static CommandResult<?> run(PrintWriter out, PrintWriter err, String... a
 		return consoleLauncher.run(args);
 	}
 
-	private final CommandLineOptionsParser commandLineOptionsParser;
+	private final CommandLineParser commandLineParser;
 	private final PrintWriter out;
 	private final PrintWriter err;
 
 	ConsoleLauncher(CommandLineOptionsParser commandLineOptionsParser, PrintWriter out, PrintWriter err) {
-		this.commandLineOptionsParser = commandLineOptionsParser;
+		this.commandLineParser = new CommandLineParser(commandLineOptionsParser);
 		this.out = out;
 		this.err = err;
 	}
 
 	CommandResult<?> run(String... args) {
 		try {
-			CommandLineOptions options = commandLineOptionsParser.parse(args);
-			if (options.isListEngines()) {
-				displayEngines(out);
-				return CommandResult.success();
-			}
-			if (!options.isBannerDisabled()) {
-				displayBanner(out);
-			}
-			if (options.isListTests()) {
-				return listTests(options, out);
-			}
-			if (options.isDisplayHelp()) {
-				commandLineOptionsParser.printHelp(out, options.isAnsiColorOutputDisabled());
-				return CommandResult.success();
-			}
-			return executeTests(options, out);
-		}
-		catch (JUnitException ex) {
-			err.println(ex.getMessage());
-			err.println();
-			commandLineOptionsParser.printHelp(err, false);
-			return CommandResult.failure();
+			SafeCommand<?> command = commandLineParser.parse(args);
+			return command.run(out, err);
 		}
 		finally {
 			out.flush();
@@ -96,53 +70,4 @@ CommandResult<?> run(String... args) {
 		}
 	}
 
-	void displayBanner(PrintWriter out) {
-		out.println();
-		out.println("Thanks for using JUnit! Support its development at https://junit.org/sponsoring");
-		out.println();
-	}
-
-	void displayEngines(PrintWriter out) {
-		ServiceLoaderTestEngineRegistry registry = new ServiceLoaderTestEngineRegistry();
-		Iterable<TestEngine> engines = registry.loadTestEngines();
-		StreamSupport.stream(engines.spliterator(), false) //
-				.sorted(Comparator.comparing(TestEngine::getId)) //
-				.forEach(engine -> displayEngine(out, engine));
-	}
-
-	private void displayEngine(PrintWriter out, TestEngine engine) {
-		StringJoiner details = new StringJoiner(":", " (", ")");
-		engine.getGroupId().ifPresent(details::add);
-		engine.getArtifactId().ifPresent(details::add);
-		engine.getVersion().ifPresent(details::add);
-		out.println(engine.getId() + details);
-	}
-
-	private CommandResult<Void> listTests(CommandLineOptions options, PrintWriter out) {
-		try {
-			new ConsoleTestExecutor(options).discover(out);
-			return CommandResult.success();
-		}
-		catch (Exception exception) {
-			return handleTestExecutorException(exception, options);
-		}
-	}
-
-	private CommandResult<TestExecutionSummary> executeTests(CommandLineOptions options, PrintWriter out) {
-		try {
-			TestExecutionSummary testExecutionSummary = new ConsoleTestExecutor(options).execute(out);
-			return ExecutionCommandResultFactory.forSummary(testExecutionSummary, options);
-		}
-		catch (Exception exception) {
-			return handleTestExecutorException(exception, options);
-		}
-	}
-
-	private <T> CommandResult<T> handleTestExecutorException(Exception exception, CommandLineOptions options) {
-		exception.printStackTrace(err);
-		err.println();
-		commandLineOptionsParser.printHelp(out, options.isAnsiColorOutputDisabled());
-		return CommandResult.failure();
-	}
-
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/BannerPrintingCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/BannerPrintingCommand.java
new file mode 100644
index 000000000000..fb98db2f7ecd
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/BannerPrintingCommand.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+
+public class BannerPrintingCommand<T> implements Command<T> {
+
+	private final Command<T> delegate;
+
+	public BannerPrintingCommand(Command<T> delegate) {
+		this.delegate = delegate;
+	}
+
+	@Override
+	public CommandResult<T> run(PrintWriter out, PrintWriter err) throws Exception {
+		displayBanner(out);
+		return delegate.run(out, err);
+	}
+
+	void displayBanner(PrintWriter out) {
+		out.println();
+		out.println("Thanks for using JUnit! Support its development at https://junit.org/sponsoring");
+		out.println();
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Command.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Command.java
new file mode 100644
index 000000000000..c91199348b92
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/Command.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+
+public interface Command<T> {
+
+	CommandResult<T> run(PrintWriter out, PrintWriter err) throws Exception;
+
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineParser.java
new file mode 100644
index 000000000000..ee89531b0e28
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineParser.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.junit.platform.console.options.CommandResult.failure;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.function.Try;
+
+/**
+ * @since 1.10
+ */
+@API(status = INTERNAL, since = "1.10")
+public class CommandLineParser {
+
+	private final CommandLineOptionsParser optionsParser;
+
+	public CommandLineParser(CommandLineOptionsParser optionsParser) {
+		this.optionsParser = optionsParser;
+	}
+
+	public SafeCommand<?> parse(String... arguments) {
+		return Try.call(() -> parseOptions(arguments)) //
+				.andThenTry(this::createDecoratedCommand) //
+				.getOrElse(this::optionParsingErrorCommand);
+	}
+
+	private SafeCommand<?> createDecoratedCommand(CommandLineOptions options) {
+		Command<?> command = createCommand(options);
+		command = options.isBannerDisabled() ? command : new BannerPrintingCommand<>(command);
+		return new ErrorHandlingCommand<>(options, command,
+			helpCommand(options.isAnsiColorOutputDisabled(), failure()));
+	}
+
+	private Command<?> createCommand(CommandLineOptions options) {
+		if (options.isDisplayHelp()) {
+			return helpCommand(options.isAnsiColorOutputDisabled(), CommandResult.success());
+		}
+		if (options.isListEngines()) {
+			return new ListTestEnginesCommand();
+		}
+		if (options.isListTests()) {
+			return new DiscoverTestsCommand(options);
+		}
+		return new ExecuteTestsCommand(options);
+	}
+
+	private <T> OptionParsingErrorCommand<T> optionParsingErrorCommand(Exception failure) {
+		return new OptionParsingErrorCommand<>(failure, helpCommand(false, failure()));
+	}
+
+	private <T> HelpCommand<T> helpCommand(boolean ansiColorOutputDisabled, CommandResult<T> result) {
+		return new HelpCommand<>(optionsParser, ansiColorOutputDisabled, result);
+	}
+
+	private CommandLineOptions parseOptions(String[] arguments) {
+		return optionsParser.parse(arguments);
+	}
+
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/CommandResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
similarity index 93%
rename from junit-platform-console/src/main/java/org/junit/platform/console/CommandResult.java
rename to junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
index 69472426fe2f..ea6a361fbba7 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/CommandResult.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console;
+package org.junit.platform.console.options;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 
@@ -25,7 +25,7 @@ public class CommandResult<T> {
 	/**
 	 * Exit code indicating successful execution
 	 */
-	protected static final int SUCCESS = 0;
+	public static final int SUCCESS = 0;
 
 	/**
 	 * Exit code indicating any failure(s)
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
new file mode 100644
index 000000000000..f7eed5bc1580
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
+
+public class DiscoverTestsCommand implements Command<Void> {
+	private final CommandLineOptions options;
+
+	public DiscoverTestsCommand(CommandLineOptions options) {
+		this.options = options;
+	}
+
+	@Override
+	public CommandResult<Void> run(PrintWriter out, PrintWriter err) throws Exception {
+		new ConsoleTestExecutor(options).discover(out);
+		return CommandResult.success();
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ErrorHandlingCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ErrorHandlingCommand.java
new file mode 100644
index 000000000000..5eb232085c21
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ErrorHandlingCommand.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+
+public class ErrorHandlingCommand<T> implements SafeCommand<T> {
+
+	private final CommandLineOptions options;
+	private final Command<T> delegate;
+	private final HelpCommand<T> helpCommand;
+
+	public ErrorHandlingCommand(CommandLineOptions options, Command<T> delegate, HelpCommand<T> helpCommandSupplier) {
+		this.options = options;
+		this.delegate = delegate;
+		this.helpCommand = helpCommandSupplier;
+	}
+
+	@Override
+	public CommandResult<T> run(PrintWriter out, PrintWriter err) {
+		try {
+			return delegate.run(out, err);
+		}
+		catch (Exception exception) {
+			exception.printStackTrace(err);
+			err.println();
+			helpCommand.run(out, err);
+			return CommandResult.failure();
+		}
+	}
+
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ExecutionCommandResultFactory.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
similarity index 53%
rename from junit-platform-console/src/main/java/org/junit/platform/console/ExecutionCommandResultFactory.java
rename to junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
index f1cf7434f025..103fdd1302e1 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ExecutionCommandResultFactory.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
@@ -8,20 +8,16 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console;
+package org.junit.platform.console.options;
 
-import static org.apiguardian.api.API.Status.INTERNAL;
-import static org.junit.platform.console.CommandResult.SUCCESS;
+import static org.junit.platform.console.options.CommandResult.SUCCESS;
 
-import org.apiguardian.api.API;
-import org.junit.platform.console.options.CommandLineOptions;
+import java.io.PrintWriter;
+
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
-/**
- * @since 1.10
- */
-@API(status = INTERNAL, since = "1.10")
-public class ExecutionCommandResultFactory {
+public class ExecuteTestsCommand implements Command<TestExecutionSummary> {
 
 	/**
 	 * Exit code indicating test failure(s)
@@ -40,8 +36,16 @@ public static int computeExitCode(TestExecutionSummary summary, CommandLineOptio
 		return summary.getTotalFailureCount() == 0 ? SUCCESS : TEST_FAILED;
 	}
 
-	static CommandResult<TestExecutionSummary> forSummary(TestExecutionSummary summary, CommandLineOptions options) {
-		int exitCode = computeExitCode(summary, options);
-		return CommandResult.create(exitCode, summary);
+	private final CommandLineOptions options;
+
+	public ExecuteTestsCommand(CommandLineOptions options) {
+		this.options = options;
+	}
+
+	@Override
+	public CommandResult<TestExecutionSummary> run(PrintWriter out, PrintWriter err) throws Exception {
+		TestExecutionSummary testExecutionSummary = new ConsoleTestExecutor(options).execute(out);
+		int exitCode = computeExitCode(testExecutionSummary, options);
+		return CommandResult.create(exitCode, testExecutionSummary);
 	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/HelpCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/HelpCommand.java
new file mode 100644
index 000000000000..137260fce861
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/HelpCommand.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+
+public class HelpCommand<T> implements SafeCommand<T> {
+
+	private final boolean ansiColorOutputDisabled;
+	private final CommandLineOptionsParser optionsParser;
+	private final CommandResult<T> result;
+
+	public HelpCommand(CommandLineOptionsParser optionsParser, boolean ansiColorOutputDisabled,
+			CommandResult<T> result) {
+		this.ansiColorOutputDisabled = ansiColorOutputDisabled;
+		this.optionsParser = optionsParser;
+		this.result = result;
+	}
+
+	@Override
+	public CommandResult<T> run(PrintWriter out, PrintWriter err) {
+		optionsParser.printHelp(out, ansiColorOutputDisabled);
+		return result;
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
new file mode 100644
index 000000000000..fdef012defa6
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.junit.platform.console.options.CommandResult.success;
+
+import java.io.PrintWriter;
+import java.util.Comparator;
+import java.util.StringJoiner;
+import java.util.stream.StreamSupport;
+
+import org.junit.platform.engine.TestEngine;
+import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
+
+public class ListTestEnginesCommand implements Command<Void> {
+
+	@Override
+	public CommandResult<Void> run(PrintWriter out, PrintWriter err) throws Exception {
+		displayEngines(out);
+		return success();
+	}
+
+	void displayEngines(PrintWriter out) {
+		ServiceLoaderTestEngineRegistry registry = new ServiceLoaderTestEngineRegistry();
+		Iterable<TestEngine> engines = registry.loadTestEngines();
+		StreamSupport.stream(engines.spliterator(), false) //
+				.sorted(Comparator.comparing(TestEngine::getId)) //
+				.forEach(engine -> displayEngine(out, engine));
+	}
+
+	private void displayEngine(PrintWriter out, TestEngine engine) {
+		StringJoiner details = new StringJoiner(":", " (", ")");
+		engine.getGroupId().ifPresent(details::add);
+		engine.getArtifactId().ifPresent(details::add);
+		engine.getVersion().ifPresent(details::add);
+		out.println(engine.getId() + details);
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/OptionParsingErrorCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/OptionParsingErrorCommand.java
new file mode 100644
index 000000000000..d8941a524aca
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/OptionParsingErrorCommand.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+
+class OptionParsingErrorCommand<T> implements SafeCommand<T> {
+
+	private final Exception failure;
+	private final HelpCommand<T> helpCommand;
+
+	public OptionParsingErrorCommand(Exception failure, HelpCommand<T> helpCommand) {
+		this.failure = failure;
+		this.helpCommand = helpCommand;
+	}
+
+	@Override
+	public CommandResult<T> run(PrintWriter out, PrintWriter err) {
+		out.println("Error parsing command-line arguments: " + failure.getMessage());
+		return helpCommand.run(out, err);
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/SafeCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/SafeCommand.java
new file mode 100644
index 000000000000..e5c8a92be875
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/SafeCommand.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+
+public interface SafeCommand<T> extends Command<T> {
+	@Override
+	CommandResult<T> run(PrintWriter out, PrintWriter err);
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
index 52d466ffe15a..03f2cdffa46d 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
@@ -108,6 +108,7 @@ void methodPreconditionsAreChecked() {
 		var failure = Try.failure(new Exception());
 		assertThrows(JUnitException.class, () -> failure.orElse(null));
 		assertThrows(JUnitException.class, () -> failure.orElseTry(null));
+		assertThrows(JUnitException.class, () -> failure.getOrElse(null));
 		assertThrows(JUnitException.class, () -> failure.ifFailure(null));
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
index 152a1337d80f..9cf164a31b65 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapperResult.java
@@ -13,6 +13,7 @@
 import java.io.PrintWriter;
 import java.util.List;
 
+import org.junit.platform.console.options.CommandResult;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 /**
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ExecutionCommandResultFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
similarity index 75%
rename from platform-tests/src/test/java/org/junit/platform/console/ExecutionCommandResultFactoryTests.java
rename to platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
index 810d03fbd77e..a45a69631452 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ExecutionCommandResultFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
@@ -8,20 +8,19 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.console;
+package org.junit.platform.console.options;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 /**
  * @since 1.10
  */
-class ExecutionCommandResultFactoryTests {
+class ExecuteTestsCommandTests {
 
 	private final CommandLineOptions options = new CommandLineOptions();
 	private final TestExecutionSummary summary = mock();
@@ -30,7 +29,7 @@ class ExecutionCommandResultFactoryTests {
 	void hasStatusCode0ForNoTotalFailures() {
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -39,7 +38,7 @@ void hasStatusCode0ForNoTotalFailures() {
 	void hasStatusCode1ForForAnyFailure() {
 		when(summary.getTotalFailureCount()).thenReturn(1L);
 
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -52,7 +51,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() {
 		options.setFailIfNoTests(true);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(2);
 	}
@@ -66,7 +65,7 @@ void hasStatusCode0ForTestsAndHasOptionFailIfNoTestsFound() {
 		when(summary.getTestsFoundCount()).thenReturn(1L);
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -79,7 +78,7 @@ void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() {
 		options.setFailIfNoTests(false);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(summary, options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index e8e8973d1f0f..67d83f7dc798 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -23,9 +23,9 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.console.ExecutionCommandResultFactory;
 import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.Details;
+import org.junit.platform.console.options.ExecuteTestsCommand;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 
 /**
@@ -99,7 +99,7 @@ void hasStatusCode0ForSucceedingTest() throws Exception {
 		dummyTestEngine.addTest("succeedingTest", SUCCEEDING_TEST);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -109,7 +109,7 @@ void hasStatusCode1ForFailingTest() throws Exception {
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -119,7 +119,7 @@ void hasStatusCode1ForFailingContainer() throws Exception {
 		dummyTestEngine.addContainer("failingContainer", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -132,7 +132,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
 		options.setFailIfNoTests(true);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(2);
 	}
@@ -143,7 +143,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
 	@Test
 	void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() throws Exception {
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecutionCommandResultFactory.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index e193618d5ef8..5d931a41c6c1 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -66,7 +66,7 @@ void listAllObservableEngines() {
 				.setTool(new Java()) //
 				.setProject("standalone") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
-				.addArguments("--list-engines").build() //
+				.addArguments("--list-engines", "--disable-banner").build() //
 				.run(false);
 
 		assertEquals(0, result.getExitCode(), String.join("\n", result.getOutputLines("out")));

From cd62eec548e23d5cd260d47201136ff60f2eeaed Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 25 Feb 2023 21:35:12 +0100
Subject: [PATCH 1210/1433] Introduce Picocli subcommands

---
 documentation/documentation.gradle.kts        |  18 +-
 .../junitbuild/exec/RunConsoleLauncher.kt     |  19 +-
 .../platform/console/ConsoleLauncher.java     |  24 +-
 .../console/options/AvailableOptions.java     |   8 -
 .../options/BannerPrintingCommand.java        |  34 --
 .../platform/console/options/BaseCommand.java |  52 +++
 .../platform/console/options/Command.java     |  19 -
 .../console/options/CommandLineOptions.java   |  18 -
 .../options/CommandLineOptionsMixin.java      | 379 ++++++++++++++++++
 .../console/options/CommandLineParser.java    |  69 ----
 .../console/options/DiscoverTestsCommand.java |  18 +-
 .../console/options/ErrorHandlingCommand.java |  40 --
 .../console/options/ExecuteTestsCommand.java  |  33 +-
 .../platform/console/options/HelpCommand.java |  33 --
 .../options/ListTestEnginesCommand.java       |  11 +-
 .../platform/console/options/MainCommand.java | 121 ++++++
 .../options/OptionParsingErrorCommand.java    |  30 --
 .../console/options/OutputOptionsMixin.java   |  36 ++
 .../platform/console/options/SafeCommand.java |  18 -
 .../console/tasks/ConsoleTestExecutor.java    |   4 +-
 .../CustomContextClassLoaderExecutor.java     |  26 +-
 21 files changed, 668 insertions(+), 342 deletions(-)
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/BannerPrintingCommand.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/Command.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineParser.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/ErrorHandlingCommand.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/HelpCommand.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/OptionParsingErrorCommand.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/SafeCommand.java

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 4c6d673c01f6..b697801d8f37 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -117,6 +117,18 @@ require(externalModulesWithoutModularJavadoc.values.all { it.endsWith("/") }) {
 tasks {
 
 	val consoleLauncherTest by registering(RunConsoleLauncher::class) {
+		args.addAll("execute")
+		args.addAll("--scan-classpath")
+		args.addAll("--config=junit.platform.reporting.open.xml.enabled=true")
+		val reportsDir = project.layout.buildDirectory.dir("console-launcher-test-results")
+		outputs.dir(reportsDir)
+		argumentProviders.add(CommandLineArgumentProvider {
+			listOf(
+				"--reports-dir=${reportsDir.get()}",
+				"--config=junit.platform.reporting.output.dir=${reportsDir.get()}"
+
+			)
+		})
 		args.addAll("--config", "enableHttpServer=true")
 		args.addAll("--include-classname", ".*Tests")
 		args.addAll("--include-classname", ".*Demo")
@@ -126,13 +138,7 @@ tasks {
 
 	register<RunConsoleLauncher>("consoleLauncher") {
 		hideOutput.set(false)
-		reportsDir.set(layout.buildDirectory.dir("console-launcher"))
 		outputs.upToDateWhen { false }
-		args.addAll("--config", "enableHttpServer=true")
-		args.addAll("--include-classname", ".*Tests")
-		args.addAll("--include-classname", ".*Demo")
-		args.addAll("--exclude-tag", "exclude")
-		args.addAll("--exclude-tag", "timeout")
 	}
 
 	test {
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
index 2dc13d501b75..a92f31195ad2 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild/exec/RunConsoleLauncher.kt
@@ -3,7 +3,6 @@ package junitbuild.exec
 import org.apache.tools.ant.types.Commandline
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
@@ -20,6 +19,7 @@ import java.io.ByteArrayOutputStream
 import java.util.*
 import javax.inject.Inject
 
+@CacheableTask
 abstract class RunConsoleLauncher @Inject constructor(private val execOperations: ExecOperations) : DefaultTask() {
 
     @get:Classpath
@@ -28,15 +28,15 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
     @get:Input
     abstract val args: ListProperty<String>
 
+    @get:Nested
+    abstract val argumentProviders: ListProperty<CommandLineArgumentProvider>
+
     @get:Input
     abstract val commandLineArgs: ListProperty<String>
 
     @get:Nested
     abstract val javaLauncher: Property<JavaLauncher>
 
-    @get:OutputDirectory
-    abstract val reportsDir: DirectoryProperty
-
     @get:Internal
     abstract val debugging: Property<Boolean>
 
@@ -45,7 +45,6 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
 
     init {
         runtimeClasspath.from(project.the<SourceSetContainer>()["test"].runtimeClasspath)
-        reportsDir.convention(project.layout.buildDirectory.dir("test-results"))
         javaLauncher.set(project.the<JavaToolchainService>().launcherFor(project.the<JavaPluginExtension>().toolchain))
 
         debugging.convention(false)
@@ -65,17 +64,9 @@ abstract class RunConsoleLauncher @Inject constructor(private val execOperations
             executable = javaLauncher.get().executablePath.asFile.absolutePath
             classpath = runtimeClasspath
             mainClass.set("org.junit.platform.console.ConsoleLauncher")
-            args("--scan-classpath")
-            args("--config=junit.platform.reporting.open.xml.enabled=true")
             args(this@RunConsoleLauncher.args.get())
             args(this@RunConsoleLauncher.commandLineArgs.get())
-            argumentProviders += CommandLineArgumentProvider {
-                listOf(
-                    "--reports-dir=${reportsDir.get()}",
-                    "--config=junit.platform.reporting.output.dir=${reportsDir.get()}"
-
-                )
-            }
+            argumentProviders.addAll(this@RunConsoleLauncher.argumentProviders.get())
             systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
             debug = debugging.get()
             if (hideOutput.get()) {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index 31963eb10cc7..9d785fe58657 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -13,15 +13,12 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
 
-import java.io.PrintStream;
 import java.io.PrintWriter;
 
 import org.apiguardian.api.API;
 import org.junit.platform.console.options.CommandLineOptionsParser;
-import org.junit.platform.console.options.CommandLineParser;
 import org.junit.platform.console.options.CommandResult;
-import org.junit.platform.console.options.PicocliCommandLineOptionsParser;
-import org.junit.platform.console.options.SafeCommand;
+import org.junit.platform.console.options.MainCommand;
 
 /**
  * The {@code ConsoleLauncher} is a stand-alone application for launching the
@@ -33,36 +30,29 @@
 public class ConsoleLauncher {
 
 	public static void main(String... args) {
-		int exitCode = run(System.out, System.err, args).getExitCode();
-		System.exit(exitCode);
-	}
-
-	@API(status = INTERNAL, since = "1.0")
-	public static CommandResult<?> run(PrintStream out, PrintStream err, String... args) {
-		return run(new PrintWriter(out), new PrintWriter(err), args);
+		PrintWriter out = new PrintWriter(System.out);
+		PrintWriter err = new PrintWriter(System.err);
+		CommandResult<?> result = run(out, err, args);
+		System.exit(result.getExitCode());
 	}
 
 	@API(status = INTERNAL, since = "1.0")
 	public static CommandResult<?> run(PrintWriter out, PrintWriter err, String... args) {
-		CommandLineOptionsParser parser = new PicocliCommandLineOptionsParser();
-		ConsoleLauncher consoleLauncher = new ConsoleLauncher(parser, out, err);
+		ConsoleLauncher consoleLauncher = new ConsoleLauncher(null, out, err);
 		return consoleLauncher.run(args);
 	}
 
-	private final CommandLineParser commandLineParser;
 	private final PrintWriter out;
 	private final PrintWriter err;
 
 	ConsoleLauncher(CommandLineOptionsParser commandLineOptionsParser, PrintWriter out, PrintWriter err) {
-		this.commandLineParser = new CommandLineParser(commandLineOptionsParser);
 		this.out = out;
 		this.err = err;
 	}
 
 	CommandResult<?> run(String... args) {
 		try {
-			SafeCommand<?> command = commandLineParser.parse(args);
-			return command.run(out, err);
+			return MainCommand.run(out, err, args);
 		}
 		finally {
 			out.flush();
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index 18f6d69936a6..ec0733426923 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -85,16 +85,8 @@ static class CommandOptions {
 		@Option(names = { "--h", "-help" }, help = true, hidden = true)
 		private boolean helpRequested2;
 
-		@Option(names = { "--list-tests" }, description = "List all observable tests.")
-		private boolean listTestsRequested;
-
-		@Option(names = { "--list-engines" }, description = "List all observable test engines.")
-		private boolean listEnginesRequested;
-
 		private void applyTo(CommandLineOptions result) {
 			result.setDisplayHelp(this.helpRequested || this.helpRequested2);
-			result.setListTests(this.listTestsRequested);
-			result.setListEngines(this.listEnginesRequested);
 		}
 	}
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/BannerPrintingCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/BannerPrintingCommand.java
deleted file mode 100644
index fb98db2f7ecd..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/BannerPrintingCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import java.io.PrintWriter;
-
-public class BannerPrintingCommand<T> implements Command<T> {
-
-	private final Command<T> delegate;
-
-	public BannerPrintingCommand(Command<T> delegate) {
-		this.delegate = delegate;
-	}
-
-	@Override
-	public CommandResult<T> run(PrintWriter out, PrintWriter err) throws Exception {
-		displayBanner(out);
-		return delegate.run(out, err);
-	}
-
-	void displayBanner(PrintWriter out) {
-		out.println();
-		out.println("Thanks for using JUnit! Support its development at https://junit.org/sponsoring");
-		out.println();
-	}
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
new file mode 100644
index 000000000000..fe3e1b3a47aa
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+import java.util.concurrent.Callable;
+
+import picocli.CommandLine.Mixin;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Spec;
+
+abstract class BaseCommand<T> implements Callable<T> {
+
+	@Spec
+	CommandSpec commandSpec;
+
+	@Mixin
+	OutputOptionsMixin banner;
+
+	@Option(names = { "-h", "--help" }, usageHelp = true)
+	private boolean helpRequested;
+
+	@Override
+	public final T call() {
+		PrintWriter out = getOut();
+		if (!banner.isDisableBanner()) {
+			displayBanner(out);
+		}
+		return execute(out);
+	}
+
+	private PrintWriter getOut() {
+		return commandSpec.commandLine().getOut();
+	}
+
+	private void displayBanner(PrintWriter out) {
+		out.println();
+		out.println("Thanks for using JUnit! Support its development at https://junit.org/sponsoring");
+		out.println();
+	}
+
+	protected abstract T execute(PrintWriter out);
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/Command.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/Command.java
deleted file mode 100644
index c91199348b92..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/Command.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import java.io.PrintWriter;
-
-public interface Command<T> {
-
-	CommandResult<T> run(PrintWriter out, PrintWriter err) throws Exception;
-
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index f7d50c9bb9d0..7fa385dda2d3 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -48,8 +48,6 @@ public class CommandLineOptions {
 	static final Theme DEFAULT_THEME = Theme.valueOf(ConsoleUtils.charset());
 
 	private boolean displayHelp;
-	private boolean listEngines;
-	private boolean listTests;
 	private boolean ansiColorOutputDisabled;
 	private Path colorPalettePath;
 	private boolean isSingleColorPalette;
@@ -95,22 +93,6 @@ public void setDisplayHelp(boolean displayHelp) {
 		this.displayHelp = displayHelp;
 	}
 
-	public boolean isListEngines() {
-		return this.listEngines;
-	}
-
-	public void setListEngines(boolean listEngines) {
-		this.listEngines = listEngines;
-	}
-
-	public boolean isListTests() {
-		return listTests;
-	}
-
-	public void setListTests(boolean listTests) {
-		this.listTests = listTests;
-	}
-
 	public boolean isAnsiColorOutputDisabled() {
 		return this.ansiColorOutputDisabled;
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
new file mode 100644
index 000000000000..a92c6b1337ce
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
@@ -0,0 +1,379 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_DETAILS;
+import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_DETAILS_NAME;
+import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_THEME;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.platform.engine.discovery.ClassNameFilter;
+import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.ClasspathResourceSelector;
+import org.junit.platform.engine.discovery.DirectorySelector;
+import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.IterationSelector;
+import org.junit.platform.engine.discovery.MethodSelector;
+import org.junit.platform.engine.discovery.ModuleSelector;
+import org.junit.platform.engine.discovery.PackageSelector;
+import org.junit.platform.engine.discovery.UriSelector;
+
+import picocli.CommandLine;
+
+public class CommandLineOptionsMixin {
+
+	private static final String CP_OPTION = "cp";
+
+	@CommandLine.ArgGroup(validate = false, order = 2, heading = "%n@|bold SELECTORS|@%n%n")
+	SelectorOptions selectorOptions;
+
+	@CommandLine.ArgGroup(validate = false, order = 3, heading = "%n@|bold FILTERS|@%n%n")
+	FilterOptions filterOptions;
+
+	@CommandLine.ArgGroup(validate = false, order = 4, heading = "%n@|bold RUNTIME CONFIGURATION|@%n%n")
+	RuntimeConfigurationOptions runtimeConfigurationOptions;
+
+	@CommandLine.ArgGroup(validate = false, order = 5, heading = "%n@|bold REPORTING|@%n%n")
+	ReportingOptions reportingOptions;
+
+	@CommandLine.ArgGroup(validate = false, order = 6, heading = "%n@|bold CONSOLE OUTPUT|@%n%n")
+	ConsoleOutputOptions consoleOutputOptions = new ConsoleOutputOptions();
+
+	static class SelectorOptions {
+
+		@CommandLine.Option(names = { "--scan-classpath",
+				"--scan-class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "0..1", description = "Scan all directories on the classpath or explicit classpath roots. " //
+						+ "Without arguments, only directories on the system classpath as well as additional classpath " //
+						+ "entries supplied via -" + CP_OPTION + " (directories and JAR files) are scanned. " //
+						+ "Explicit classpath roots that are not on the classpath will be silently ignored. " //
+						+ "This option can be repeated.")
+		private List<Path> selectedClasspathEntries;
+
+		@CommandLine.Option(names = { "-scan-class-path",
+				"-scan-classpath" }, converter = ClasspathEntriesConverter.class, arity = "0..1", hidden = true)
+		private List<Path> selectedClasspathEntries2;
+
+		@CommandLine.Option(names = "--scan-modules", description = "EXPERIMENTAL: Scan all resolved modules for test discovery.")
+		private boolean scanModulepath;
+
+		@CommandLine.Option(names = "-scan-modules", hidden = true)
+		private boolean scanModulepath2;
+
+		@CommandLine.Option(names = { "-u",
+				"--select-uri" }, paramLabel = "URI", arity = "1", converter = SelectorConverter.Uri.class, description = "Select a URI for test discovery. This option can be repeated.")
+		private List<UriSelector> selectedUris = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--u",
+				"-select-uri" }, arity = "1", hidden = true, converter = SelectorConverter.Uri.class)
+		private List<UriSelector> selectedUris2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-f",
+				"--select-file" }, paramLabel = "FILE", arity = "1", converter = SelectorConverter.File.class, description = "Select a file for test discovery. This option can be repeated.")
+		private List<FileSelector> selectedFiles = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--f",
+				"-select-file" }, arity = "1", hidden = true, converter = SelectorConverter.File.class)
+		private List<FileSelector> selectedFiles2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-d",
+				"--select-directory" }, paramLabel = "DIR", arity = "1", converter = SelectorConverter.Directory.class, description = "Select a directory for test discovery. This option can be repeated.")
+		private List<DirectorySelector> selectedDirectories = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--d",
+				"-select-directory" }, arity = "1", hidden = true, converter = SelectorConverter.Directory.class)
+		private List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-o",
+				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "EXPERIMENTAL: Select single module for test discovery. This option can be repeated.")
+		private List<ModuleSelector> selectedModules = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--o",
+				"-select-module" }, arity = "1", converter = SelectorConverter.Module.class, hidden = true)
+		private List<ModuleSelector> selectedModules2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-p",
+				"--select-package" }, paramLabel = "PKG", arity = "1", converter = SelectorConverter.Package.class, description = "Select a package for test discovery. This option can be repeated.")
+		private List<PackageSelector> selectedPackages = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--p",
+				"-select-package" }, arity = "1", hidden = true, converter = SelectorConverter.Package.class)
+		private List<PackageSelector> selectedPackages2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-c",
+				"--select-class" }, paramLabel = "CLASS", arity = "1", converter = SelectorConverter.Class.class, description = "Select a class for test discovery. This option can be repeated.")
+		private List<ClassSelector> selectedClasses = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--c",
+				"-select-class" }, arity = "1", hidden = true, converter = SelectorConverter.Class.class)
+		private List<ClassSelector> selectedClasses2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-m",
+				"--select-method" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Method.class, description = "Select a method for test discovery. This option can be repeated.")
+		private List<MethodSelector> selectedMethods = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--m",
+				"-select-method" }, arity = "1", hidden = true, converter = SelectorConverter.Method.class)
+		private List<MethodSelector> selectedMethods2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-r",
+				"--select-resource" }, paramLabel = "RESOURCE", arity = "1", converter = SelectorConverter.ClasspathResource.class, description = "Select a classpath resource for test discovery. This option can be repeated.")
+		private List<ClasspathResourceSelector> selectedClasspathResources = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--r",
+				"-select-resource" }, arity = "1", hidden = true, converter = SelectorConverter.ClasspathResource.class)
+		private List<ClasspathResourceSelector> selectedClasspathResources2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-i",
+				"--select-iteration" }, paramLabel = "TYPE:VALUE[INDEX(..INDEX)?(,INDEX(..INDEX)?)*]", arity = "1", converter = SelectorConverter.Iteration.class, description = "Select iterations for test discovery (e.g. method:com.acme.Foo#m()[1..2]). This option can be repeated.")
+		private List<IterationSelector> selectedIterations = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--i",
+				"-select-iteration" }, arity = "1", hidden = true, converter = SelectorConverter.Iteration.class)
+		private List<IterationSelector> selectedIterations2 = new ArrayList<>();
+
+		private void applyTo(CommandLineOptions result) {
+			result.setScanClasspath(this.selectedClasspathEntries != null || this.selectedClasspathEntries2 != null); // flag was specified
+			result.setScanModulepath(this.scanModulepath || this.scanModulepath2);
+			result.setSelectedModules(merge(this.selectedModules, this.selectedModules2));
+			result.setSelectedClasspathEntries(merge(this.selectedClasspathEntries, this.selectedClasspathEntries2));
+			result.setSelectedUris(merge(this.selectedUris, this.selectedUris2));
+			result.setSelectedFiles(merge(this.selectedFiles, this.selectedFiles2));
+			result.setSelectedDirectories(merge(this.selectedDirectories, this.selectedDirectories2));
+			result.setSelectedPackages(merge(this.selectedPackages, this.selectedPackages2));
+			result.setSelectedClasses(merge(this.selectedClasses, this.selectedClasses2));
+			result.setSelectedMethods(merge(this.selectedMethods, this.selectedMethods2));
+			result.setSelectedClasspathResources(
+				merge(this.selectedClasspathResources, this.selectedClasspathResources2));
+			result.setSelectedIterations(merge(this.selectedIterations, this.selectedIterations2));
+		}
+	}
+
+	static class FilterOptions {
+
+		@CommandLine.Option(names = { "-n",
+				"--include-classname" }, paramLabel = "PATTERN", defaultValue = ClassNameFilter.STANDARD_INCLUDE_PATTERN, arity = "1", description = "Provide a regular expression to include only classes whose fully qualified names match. " //
+						+ "To avoid loading classes unnecessarily, the default pattern only includes class " //
+						+ "names that begin with \"Test\" or end with \"Test\" or \"Tests\". " //
+						+ "When this option is repeated, all patterns will be combined using OR semantics. " //
+						+ "Default: ${DEFAULT-VALUE}")
+		private List<String> includeClassNamePatterns = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--n", "-include-classname" }, arity = "1", hidden = true)
+		private List<String> includeClassNamePatterns2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-N",
+				"--exclude-classname" }, paramLabel = "PATTERN", arity = "1", description = "Provide a regular expression to exclude those classes whose fully qualified names match. " //
+						+ "When this option is repeated, all patterns will be combined using OR semantics.")
+		private List<String> excludeClassNamePatterns = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--N", "-exclude-classname" }, arity = "1", hidden = true)
+		private List<String> excludeClassNamePatterns2 = new ArrayList<>();
+
+		@CommandLine.Option(names = {
+				"--include-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be included in the test run. This option can be repeated.")
+		private List<String> includePackages = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-include-package" }, arity = "1", hidden = true)
+		private List<String> includePackages2 = new ArrayList<>();
+
+		@CommandLine.Option(names = {
+				"--exclude-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be excluded from the test run. This option can be repeated.")
+		private List<String> excludePackages = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-exclude-package" }, arity = "1", hidden = true)
+		private List<String> excludePackages2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-t",
+				"--include-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to include only tests whose tags match. "
+						+ //
+						"When this option is repeated, all patterns will be combined using OR semantics.")
+		private List<String> includedTags = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--t", "-include-tag" }, arity = "1", hidden = true)
+		private List<String> includedTags2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-T",
+				"--exclude-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to exclude those tests whose tags match. "
+						+ //
+						"When this option is repeated, all patterns will be combined using OR semantics.")
+		private List<String> excludedTags = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--T", "-exclude-tag" }, arity = "1", hidden = true)
+		private List<String> excludedTags2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-e",
+				"--include-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be included in the test run. This option can be repeated.")
+		private List<String> includedEngines = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--e", "-include-engine" }, arity = "1", hidden = true)
+		private List<String> includedEngines2 = new ArrayList<>();
+
+		@CommandLine.Option(names = { "-E",
+				"--exclude-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be excluded from the test run. This option can be repeated.")
+		private List<String> excludedEngines = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--E", "-exclude-engine" }, arity = "1", hidden = true)
+		private List<String> excludedEngines2 = new ArrayList<>();
+
+		private void applyTo(CommandLineOptions result) {
+			result.setIncludedClassNamePatterns(merge(this.includeClassNamePatterns, this.includeClassNamePatterns2));
+			result.setExcludedClassNamePatterns(merge(this.excludeClassNamePatterns, this.excludeClassNamePatterns2));
+			result.setIncludedPackages(merge(this.includePackages, this.includePackages2));
+			result.setExcludedPackages(merge(this.excludePackages, this.excludePackages2));
+			result.setIncludedTagExpressions(merge(this.includedTags, this.includedTags2));
+			result.setExcludedTagExpressions(merge(this.excludedTags, this.excludedTags2));
+			result.setIncludedEngines(merge(this.includedEngines, this.includedEngines2));
+			result.setExcludedEngines(merge(this.excludedEngines, this.excludedEngines2));
+		}
+	}
+
+	static class RuntimeConfigurationOptions {
+
+		@CommandLine.Option(names = { "-" + CP_OPTION, "--classpath",
+				"--class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "1", description = "Provide additional classpath entries "
+						+ "-- for example, for adding engines and their dependencies. This option can be repeated.")
+		private List<Path> additionalClasspathEntries = new ArrayList<>();
+
+		@CommandLine.Option(names = { "--cp", "-classpath",
+				"-class-path" }, converter = ClasspathEntriesConverter.class, hidden = true)
+		private List<Path> additionalClasspathEntries2 = new ArrayList<>();
+
+		// Implementation note: the @Option annotation is on a setter method to allow validation.
+		private Map<String, String> configurationParameters = new LinkedHashMap<>();
+
+		@CommandLine.Spec
+		private CommandLine.Model.CommandSpec spec;
+
+		@CommandLine.Option(names = { "-config" }, arity = "1", hidden = true)
+		public void setConfigurationParameters2(Map<String, String> keyValuePairs) {
+			setConfigurationParameters(keyValuePairs);
+		}
+
+		/**
+		 * Adds the specified key-value pair (or pairs) to the configuration parameters.
+		 * A {@code ParameterException} is thrown if the same key is specified multiple times
+		 * on the command line.
+		 *
+		 * @param map the key-value pairs to add
+		 * @throws CommandLine.ParameterException if the map already contains this key
+		 * @see <a href="https://github.com/junit-team/junit5/issues/1308">#1308</a>
+		 */
+		@CommandLine.Option(names = "--config", paramLabel = "KEY=VALUE", arity = "1", description = "Set a configuration parameter for test discovery and execution. This option can be repeated.")
+		public void setConfigurationParameters(Map<String, String> map) {
+			for (String key : map.keySet()) {
+				String newValue = map.get(key);
+				validateUnique(key, newValue);
+				configurationParameters.put(key, newValue);
+			}
+		}
+
+		private void validateUnique(String key, String newValue) {
+			String existing = configurationParameters.get(key);
+			if (existing != null && !existing.equals(newValue)) {
+				throw new CommandLine.ParameterException(spec.commandLine(),
+					String.format("Duplicate key '%s' for values '%s' and '%s'.", key, existing, newValue));
+			}
+		}
+
+		private void applyTo(CommandLineOptions result) {
+			result.setAdditionalClasspathEntries(merge(additionalClasspathEntries, additionalClasspathEntries2));
+			result.setConfigurationParameters(configurationParameters);
+		}
+	}
+
+	static class ReportingOptions {
+
+		@CommandLine.Option(names = "--fail-if-no-tests", description = "Fail and return exit status code 2 if no tests are found.")
+		private boolean failIfNoTests; // no single-dash equivalent: was introduced in 5.3-M1
+
+		@CommandLine.Option(names = "--reports-dir", paramLabel = "DIR", description = "Enable report output into a specified local directory (will be created if it does not exist).")
+		private Path reportsDir;
+
+		@CommandLine.Option(names = "-reports-dir", hidden = true)
+		private Path reportsDir2;
+
+		private void applyTo(CommandLineOptions result) {
+			result.setFailIfNoTests(this.failIfNoTests);
+			result.setReportsDir(choose(this.reportsDir, this.reportsDir2, null));
+		}
+	}
+
+	static class ConsoleOutputOptions {
+
+		@CommandLine.Option(names = "--color-palette", paramLabel = "FILE", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
+		private Path colorPalette;
+		@CommandLine.Option(names = "-color-palette", hidden = true)
+		private Path colorPalette2;
+
+		@CommandLine.Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
+		private boolean singleColorPalette;
+		@CommandLine.Option(names = "-single-color", hidden = true)
+		private boolean singleColorPalette2;
+
+		@CommandLine.Option(names = "--details", paramLabel = "MODE", defaultValue = DEFAULT_DETAILS_NAME, description = "Select an output details mode for when tests are executed. " //
+				+ "Use one of: ${COMPLETION-CANDIDATES}. If 'none' is selected, " //
+				+ "then only the summary and test failures are shown. Default: ${DEFAULT-VALUE}.")
+		private Details details = DEFAULT_DETAILS;
+
+		@CommandLine.Option(names = "-details", hidden = true, defaultValue = DEFAULT_DETAILS_NAME)
+		private Details details2 = DEFAULT_DETAILS;
+
+		@CommandLine.Option(names = "--details-theme", paramLabel = "THEME", description = "Select an output details tree theme for when tests are executed. "
+				+ "Use one of: ${COMPLETION-CANDIDATES}. Default is detected based on default character encoding.")
+		private Theme theme = DEFAULT_THEME;
+
+		@CommandLine.Option(names = "-details-theme", hidden = true)
+		private Theme theme2 = DEFAULT_THEME;
+
+		private void applyTo(CommandLineOptions result) {
+			result.setColorPalettePath(choose(colorPalette, colorPalette2, null));
+			result.setSingleColorPalette(singleColorPalette || singleColorPalette2);
+			result.setDetails(choose(details, details2, DEFAULT_DETAILS));
+			result.setTheme(choose(theme, theme2, DEFAULT_THEME));
+		}
+	}
+
+	CommandLineOptions toCommandLineOptions() {
+		CommandLineOptions result = new CommandLineOptions();
+		if (this.selectorOptions != null) {
+			this.selectorOptions.applyTo(result);
+		}
+		if (this.filterOptions != null) {
+			this.filterOptions.applyTo(result);
+		}
+		if (this.runtimeConfigurationOptions != null) {
+			this.runtimeConfigurationOptions.applyTo(result);
+		}
+		if (this.reportingOptions != null) {
+			this.reportingOptions.applyTo(result);
+		}
+		if (this.consoleOutputOptions != null) {
+			this.consoleOutputOptions.applyTo(result);
+		}
+		return result;
+	}
+
+	private static <T> List<T> merge(List<T> list1, List<T> list2) {
+		List<T> result = new ArrayList<>(list1 == null ? Collections.emptyList() : list1);
+		result.addAll(list2 == null ? Collections.emptyList() : list2);
+		return result;
+	}
+
+	private static <T> T choose(T left, T right, T defaultValue) {
+		return left == right ? left : (left == defaultValue ? right : left);
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineParser.java
deleted file mode 100644
index ee89531b0e28..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineParser.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import static org.apiguardian.api.API.Status.INTERNAL;
-import static org.junit.platform.console.options.CommandResult.failure;
-
-import org.apiguardian.api.API;
-import org.junit.platform.commons.function.Try;
-
-/**
- * @since 1.10
- */
-@API(status = INTERNAL, since = "1.10")
-public class CommandLineParser {
-
-	private final CommandLineOptionsParser optionsParser;
-
-	public CommandLineParser(CommandLineOptionsParser optionsParser) {
-		this.optionsParser = optionsParser;
-	}
-
-	public SafeCommand<?> parse(String... arguments) {
-		return Try.call(() -> parseOptions(arguments)) //
-				.andThenTry(this::createDecoratedCommand) //
-				.getOrElse(this::optionParsingErrorCommand);
-	}
-
-	private SafeCommand<?> createDecoratedCommand(CommandLineOptions options) {
-		Command<?> command = createCommand(options);
-		command = options.isBannerDisabled() ? command : new BannerPrintingCommand<>(command);
-		return new ErrorHandlingCommand<>(options, command,
-			helpCommand(options.isAnsiColorOutputDisabled(), failure()));
-	}
-
-	private Command<?> createCommand(CommandLineOptions options) {
-		if (options.isDisplayHelp()) {
-			return helpCommand(options.isAnsiColorOutputDisabled(), CommandResult.success());
-		}
-		if (options.isListEngines()) {
-			return new ListTestEnginesCommand();
-		}
-		if (options.isListTests()) {
-			return new DiscoverTestsCommand(options);
-		}
-		return new ExecuteTestsCommand(options);
-	}
-
-	private <T> OptionParsingErrorCommand<T> optionParsingErrorCommand(Exception failure) {
-		return new OptionParsingErrorCommand<>(failure, helpCommand(false, failure()));
-	}
-
-	private <T> HelpCommand<T> helpCommand(boolean ansiColorOutputDisabled, CommandResult<T> result) {
-		return new HelpCommand<>(optionsParser, ansiColorOutputDisabled, result);
-	}
-
-	private CommandLineOptions parseOptions(String[] arguments) {
-		return optionsParser.parse(arguments);
-	}
-
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
index f7eed5bc1580..0c9c93ae76c1 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
@@ -14,16 +14,18 @@
 
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
-public class DiscoverTestsCommand implements Command<Void> {
-	private final CommandLineOptions options;
+import picocli.CommandLine;
+import picocli.CommandLine.Mixin;
 
-	public DiscoverTestsCommand(CommandLineOptions options) {
-		this.options = options;
-	}
+@CommandLine.Command(name = "discover", description = "Discover tests")
+public class DiscoverTestsCommand extends BaseCommand<Void> {
+
+	@Mixin
+	CommandLineOptionsMixin options;
 
 	@Override
-	public CommandResult<Void> run(PrintWriter out, PrintWriter err) throws Exception {
-		new ConsoleTestExecutor(options).discover(out);
-		return CommandResult.success();
+	protected Void execute(PrintWriter out) {
+		new ConsoleTestExecutor(options.toCommandLineOptions()).discover(out);
+		return null;
 	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ErrorHandlingCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ErrorHandlingCommand.java
deleted file mode 100644
index 5eb232085c21..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ErrorHandlingCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import java.io.PrintWriter;
-
-public class ErrorHandlingCommand<T> implements SafeCommand<T> {
-
-	private final CommandLineOptions options;
-	private final Command<T> delegate;
-	private final HelpCommand<T> helpCommand;
-
-	public ErrorHandlingCommand(CommandLineOptions options, Command<T> delegate, HelpCommand<T> helpCommandSupplier) {
-		this.options = options;
-		this.delegate = delegate;
-		this.helpCommand = helpCommandSupplier;
-	}
-
-	@Override
-	public CommandResult<T> run(PrintWriter out, PrintWriter err) {
-		try {
-			return delegate.run(out, err);
-		}
-		catch (Exception exception) {
-			exception.printStackTrace(err);
-			err.println();
-			helpCommand.run(out, err);
-			return CommandResult.failure();
-		}
-	}
-
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
index 103fdd1302e1..719b2578f476 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
@@ -17,7 +17,12 @@
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
-public class ExecuteTestsCommand implements Command<TestExecutionSummary> {
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
+
+@Command(name = "execute", description = "Execute tests")
+public class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements CommandLine.IExitCodeGenerator {
 
 	/**
 	 * Exit code indicating test failure(s)
@@ -29,6 +34,20 @@ public class ExecuteTestsCommand implements Command<TestExecutionSummary> {
 	 */
 	private static final int NO_TESTS_FOUND = 2;
 
+	@Mixin
+	CommandLineOptionsMixin options;
+
+	@Override
+	protected TestExecutionSummary execute(PrintWriter out) {
+		CommandLineOptions options = this.options.toCommandLineOptions();
+		return new ConsoleTestExecutor(options).execute(out);
+	}
+
+	@Override
+	public int getExitCode() {
+		return computeExitCode(commandSpec.commandLine().getExecutionResult(), options.toCommandLineOptions());
+	}
+
 	public static int computeExitCode(TestExecutionSummary summary, CommandLineOptions options) {
 		if (options.isFailIfNoTests() && summary.getTestsFoundCount() == 0) {
 			return NO_TESTS_FOUND;
@@ -36,16 +55,4 @@ public static int computeExitCode(TestExecutionSummary summary, CommandLineOptio
 		return summary.getTotalFailureCount() == 0 ? SUCCESS : TEST_FAILED;
 	}
 
-	private final CommandLineOptions options;
-
-	public ExecuteTestsCommand(CommandLineOptions options) {
-		this.options = options;
-	}
-
-	@Override
-	public CommandResult<TestExecutionSummary> run(PrintWriter out, PrintWriter err) throws Exception {
-		TestExecutionSummary testExecutionSummary = new ConsoleTestExecutor(options).execute(out);
-		int exitCode = computeExitCode(testExecutionSummary, options);
-		return CommandResult.create(exitCode, testExecutionSummary);
-	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/HelpCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/HelpCommand.java
deleted file mode 100644
index 137260fce861..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/HelpCommand.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import java.io.PrintWriter;
-
-public class HelpCommand<T> implements SafeCommand<T> {
-
-	private final boolean ansiColorOutputDisabled;
-	private final CommandLineOptionsParser optionsParser;
-	private final CommandResult<T> result;
-
-	public HelpCommand(CommandLineOptionsParser optionsParser, boolean ansiColorOutputDisabled,
-			CommandResult<T> result) {
-		this.ansiColorOutputDisabled = ansiColorOutputDisabled;
-		this.optionsParser = optionsParser;
-		this.result = result;
-	}
-
-	@Override
-	public CommandResult<T> run(PrintWriter out, PrintWriter err) {
-		optionsParser.printHelp(out, ansiColorOutputDisabled);
-		return result;
-	}
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
index fdef012defa6..2d99b14db1a5 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
@@ -10,8 +10,6 @@
 
 package org.junit.platform.console.options;
 
-import static org.junit.platform.console.options.CommandResult.success;
-
 import java.io.PrintWriter;
 import java.util.Comparator;
 import java.util.StringJoiner;
@@ -20,12 +18,15 @@
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
 
-public class ListTestEnginesCommand implements Command<Void> {
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "engines", description = "List available test engines")
+public class ListTestEnginesCommand extends BaseCommand<Void> {
 
 	@Override
-	public CommandResult<Void> run(PrintWriter out, PrintWriter err) throws Exception {
+	protected Void execute(PrintWriter out) {
 		displayEngines(out);
-		return success();
+		return null;
 	}
 
 	void displayEngines(PrintWriter out) {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
new file mode 100644
index 000000000000..b50638471bf1
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.IExitCodeGenerator;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Spec;
+import picocli.CommandLine.Unmatched;
+
+/**
+ * @since 1.0
+ */
+@Command(//
+		name = "junit", //
+		abbreviateSynopsis = true, //
+		sortOptions = false, //
+		usageHelpWidth = 95, //
+		showAtFileInUsageHelp = true, //
+		usageHelpAutoWidth = true, //
+		description = "Launches the JUnit Platform for test discovery and execution.", //
+		footerHeading = "%n", //
+		footer = "For more information, please refer to the JUnit User Guide at%n" //
+				+ "@|underline https://junit.org/junit5/docs/current/user-guide/|@", //
+		subcommands = { DiscoverTestsCommand.class, ExecuteTestsCommand.class, ListTestEnginesCommand.class,
+				CommandLine.HelpCommand.class }, //
+		scope = CommandLine.ScopeType.INHERIT)
+public class MainCommand implements Callable<Object>, IExitCodeGenerator {
+
+	@Option(names = { "-h", "--help" }, help = true, hidden = true)
+	private boolean helpRequested;
+
+	@Option(names = { "--h", "-help" }, help = true, hidden = true)
+	private boolean helpRequested2;
+
+	@Unmatched
+	private List<String> allParameters = new ArrayList<>();
+
+	@Spec
+	CommandSpec commandSpec;
+
+	CommandResult<?> commandResult;
+
+	@Override
+	public Object call() {
+		if (helpRequested || helpRequested2) {
+			commandSpec.commandLine().usage(commandSpec.commandLine().getOut());
+			commandResult = CommandResult.success();
+			return null;
+		}
+		if (allParameters.contains("--list-engines")) {
+			return runCommand("engines", Optional.of("--list-engines"));
+		}
+		return runCommand("execute", Optional.empty());
+	}
+
+	@Override
+	public int getExitCode() {
+		return commandResult.getExitCode();
+	}
+
+	@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+	private Object runCommand(String subcommand, Optional<String> triggeringOption) {
+		CommandLine commandLine = commandSpec.commandLine();
+		Object command = commandLine.getSubcommands().get(subcommand).getCommandSpec().userObject();
+
+		printDeprecationWarning(subcommand, triggeringOption, commandLine);
+
+		List<String> args = new ArrayList<>(commandLine.getParseResult().expandedArgs());
+		triggeringOption.ifPresent(args::remove);
+		CommandResult<?> result = runCommand(commandLine.getOut(), //
+			commandLine.getErr(), //
+			args.toArray(new String[0]), //
+			command);
+		this.commandResult = result;
+		return result.getValue().orElse(null);
+	}
+
+	private static void printDeprecationWarning(String subcommand, Optional<String> triggeringOption,
+			CommandLine commandLine) {
+		PrintWriter err = commandLine.getErr();
+		String reason = triggeringOption.map(it -> " due to use of '" + it + "'").orElse("");
+		err.printf("WARNING: Delegating to the '%s' command%s.%n", subcommand, reason);
+		err.println("WARNING: This behaviour has been deprecated and will be removed in a future release.");
+		err.println("WARNING: Please use the '" + subcommand + "' command directly.");
+		err.flush();
+	}
+
+	public static CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
+		Object command = new MainCommand();
+		return runCommand(out, err, args, command);
+	}
+
+	private static CommandResult<?> runCommand(PrintWriter out, PrintWriter err, String[] args, Object command) {
+		CommandLine commandLine = new CommandLine(command);
+		int exitCode = commandLine //
+				.setOut(out) //
+				.setErr(err) //
+				.setUnmatchedArgumentsAllowed(false) //
+				.setCaseInsensitiveEnumValuesAllowed(true) //
+				.setAtFileCommentChar(null) // for --select-method com.acme.Foo#m()
+				.execute(args);
+		return CommandResult.create(exitCode, commandLine.getExecutionResult());
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/OptionParsingErrorCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/OptionParsingErrorCommand.java
deleted file mode 100644
index d8941a524aca..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/OptionParsingErrorCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import java.io.PrintWriter;
-
-class OptionParsingErrorCommand<T> implements SafeCommand<T> {
-
-	private final Exception failure;
-	private final HelpCommand<T> helpCommand;
-
-	public OptionParsingErrorCommand(Exception failure, HelpCommand<T> helpCommand) {
-		this.failure = failure;
-		this.helpCommand = helpCommand;
-	}
-
-	@Override
-	public CommandResult<T> run(PrintWriter out, PrintWriter err) {
-		out.println("Error parsing command-line arguments: " + failure.getMessage());
-		return helpCommand.run(out, err);
-	}
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
new file mode 100644
index 000000000000..9b0a71c589dc
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import picocli.CommandLine;
+
+public class OutputOptionsMixin {
+
+	@CommandLine.Option(names = "--disable-banner", description = "Disable print out of the welcome message.")
+	private boolean disableBanner;
+
+	@CommandLine.Option(names = "-disable-banner", hidden = true)
+	private boolean disableBanner2;
+
+	@CommandLine.Option(names = "--disable-ansi-colors", description = "Disable ANSI colors in output (not supported by all terminals).")
+	private boolean disableAnsiColors;
+
+	@CommandLine.Option(names = "-disable-ansi-colors", hidden = true)
+	private boolean disableAnsiColors2;
+
+	public boolean isDisableBanner() {
+		return disableBanner || disableBanner2;
+	}
+
+	public boolean isDisableAnsiColors() {
+		return disableAnsiColors || disableAnsiColors2;
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/SafeCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/SafeCommand.java
deleted file mode 100644
index e5c8a92be875..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/SafeCommand.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import java.io.PrintWriter;
-
-public interface SafeCommand<T> extends Command<T> {
-	@Override
-	CommandResult<T> run(PrintWriter out, PrintWriter err);
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index 1c5c6c18cac3..edd49ac88b5e 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -55,14 +55,14 @@ public ConsoleTestExecutor(CommandLineOptions options) {
 		this.launcherSupplier = launcherSupplier;
 	}
 
-	public void discover(PrintWriter out) throws Exception {
+	public void discover(PrintWriter out) {
 		new CustomContextClassLoaderExecutor(createCustomClassLoader()).invoke(() -> {
 			discoverTests(out);
 			return null;
 		});
 	}
 
-	public TestExecutionSummary execute(PrintWriter out) throws Exception {
+	public TestExecutionSummary execute(PrintWriter out) {
 		return new CustomContextClassLoaderExecutor(createCustomClassLoader()).invoke(() -> executeTests(out));
 	}
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
index 19794e9bece7..2bd075b15f27 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/CustomContextClassLoaderExecutor.java
@@ -11,7 +11,9 @@
 package org.junit.platform.console.tasks;
 
 import java.util.Optional;
-import java.util.concurrent.Callable;
+import java.util.function.Supplier;
+
+import org.junit.platform.commons.JUnitException;
 
 /**
  * @since 1.0
@@ -24,28 +26,36 @@ class CustomContextClassLoaderExecutor {
 		this.customClassLoader = customClassLoader;
 	}
 
-	<T> T invoke(Callable<T> callable) throws Exception {
+	<T> T invoke(Supplier<T> supplier) {
 		if (customClassLoader.isPresent()) {
 			// Only get/set context class loader when necessary to prevent problems with
 			// security managers
-			return replaceThreadContextClassLoaderAndInvoke(customClassLoader.get(), callable);
+			return replaceThreadContextClassLoaderAndInvoke(customClassLoader.get(), supplier);
 		}
-		return callable.call();
+		return supplier.get();
 	}
 
-	private <T> T replaceThreadContextClassLoaderAndInvoke(ClassLoader customClassLoader, Callable<T> callable)
-			throws Exception {
+	private <T> T replaceThreadContextClassLoaderAndInvoke(ClassLoader customClassLoader, Supplier<T> supplier) {
 		ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
 		try {
 			Thread.currentThread().setContextClassLoader(customClassLoader);
-			return callable.call();
+			return supplier.get();
 		}
 		finally {
 			Thread.currentThread().setContextClassLoader(originalClassLoader);
 			if (customClassLoader instanceof AutoCloseable) {
-				((AutoCloseable) customClassLoader).close();
+				close((AutoCloseable) customClassLoader);
 			}
 		}
 	}
 
+	private static void close(AutoCloseable customClassLoader) {
+		try {
+			customClassLoader.close();
+		}
+		catch (Exception e) {
+			throw new JUnitException("Failed to close custom class loader", e);
+		}
+	}
+
 }

From f91651232df650c8c05929a8e6b44754a9f7f57b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 26 Feb 2023 18:44:54 +0100
Subject: [PATCH 1211/1433] Fix some tests

---
 .../platform/console/options/BaseCommand.java | 16 ++++++---
 .../console/options/CommandResult.java        | 18 ++++++++++
 .../console/options/DiscoverTestsCommand.java |  4 ++-
 .../console/options/ExecuteTestsCommand.java  | 23 ++-----------
 .../options/ListTestEnginesCommand.java       |  4 ++-
 .../platform/console/options/MainCommand.java | 26 ++++++++++----
 .../console/options/OutputOptionsMixin.java   | 34 ++++++++++++++-----
 .../ConsoleLauncherIntegrationTests.java      | 10 +++---
 .../console/ConsoleLauncherWrapper.java       | 13 +++----
 .../options/ExecuteTestsCommandTests.java     | 10 +++---
 .../tasks/ConsoleTestExecutorTests.java       | 12 +++----
 .../support/tests/StandaloneTests.java        | 22 +++++++-----
 12 files changed, 118 insertions(+), 74 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
index fe3e1b3a47aa..0232a14e25f2 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
@@ -13,6 +13,7 @@
 import java.io.PrintWriter;
 import java.util.concurrent.Callable;
 
+import picocli.CommandLine;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
@@ -24,15 +25,16 @@ abstract class BaseCommand<T> implements Callable<T> {
 	CommandSpec commandSpec;
 
 	@Mixin
-	OutputOptionsMixin banner;
+	OutputOptionsMixin outputOptions;
 
-	@Option(names = { "-h", "--help" }, usageHelp = true)
+	@SuppressWarnings("unused")
+	@Option(names = { "-h", "--help" }, usageHelp = true, description = "Display help information.")
 	private boolean helpRequested;
 
 	@Override
 	public final T call() {
 		PrintWriter out = getOut();
-		if (!banner.isDisableBanner()) {
+		if (!outputOptions.isDisableBanner()) {
 			displayBanner(out);
 		}
 		return execute(out);
@@ -44,8 +46,14 @@ private PrintWriter getOut() {
 
 	private void displayBanner(PrintWriter out) {
 		out.println();
-		out.println("Thanks for using JUnit! Support its development at https://junit.org/sponsoring");
+		CommandLine.Help.ColorScheme colorScheme = commandSpec.commandLine().getColorScheme();
+		if (colorScheme.ansi().enabled()) {
+			out.print("💚 ");
+		}
+		out.println(colorScheme.text(
+			"@|italic Thanks for using JUnit!|@ Support its development at @|underline https://junit.org/sponsoring|@"));
 		out.println();
+		out.flush();
 	}
 
 	protected abstract T execute(PrintWriter out);
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
index ea6a361fbba7..4295b484b0c3 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 
 import org.apiguardian.api.API;
+import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 /**
  * @since 1.10
@@ -32,6 +33,16 @@ public class CommandResult<T> {
 	 */
 	protected static final int FAILURE = -1;
 
+	/**
+	 * Exit code indicating test failure(s)
+	 */
+	private static final int TEST_FAILED = 1;
+
+	/**
+	 * Exit code indicating no tests found
+	 */
+	private static final int NO_TESTS_FOUND = 2;
+
 	public static <T> CommandResult<T> success() {
 		return create(SUCCESS, null);
 	}
@@ -52,6 +63,13 @@ private CommandResult(int exitCode, T value) {
 		this.value = value;
 	}
 
+	public static int computeExitCode(TestExecutionSummary summary, CommandLineOptions options) {
+		if (options.isFailIfNoTests() && summary.getTestsFoundCount() == 0) {
+			return NO_TESTS_FOUND;
+		}
+		return summary.getTotalFailureCount() == 0 ? SUCCESS : TEST_FAILED;
+	}
+
 	public int getExitCode() {
 		return exitCode;
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
index 0c9c93ae76c1..a8cfbb2b9a68 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
@@ -25,7 +25,9 @@ public class DiscoverTestsCommand extends BaseCommand<Void> {
 
 	@Override
 	protected Void execute(PrintWriter out) {
-		new ConsoleTestExecutor(options.toCommandLineOptions()).discover(out);
+		CommandLineOptions options = this.options.toCommandLineOptions();
+		options.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
+		new ConsoleTestExecutor(options).discover(out);
 		return null;
 	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
index 719b2578f476..2e0eef266b2f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
@@ -10,8 +10,6 @@
 
 package org.junit.platform.console.options;
 
-import static org.junit.platform.console.options.CommandResult.SUCCESS;
-
 import java.io.PrintWriter;
 
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
@@ -24,35 +22,20 @@
 @Command(name = "execute", description = "Execute tests")
 public class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements CommandLine.IExitCodeGenerator {
 
-	/**
-	 * Exit code indicating test failure(s)
-	 */
-	private static final int TEST_FAILED = 1;
-
-	/**
-	 * Exit code indicating no tests found
-	 */
-	private static final int NO_TESTS_FOUND = 2;
-
 	@Mixin
 	CommandLineOptionsMixin options;
 
 	@Override
 	protected TestExecutionSummary execute(PrintWriter out) {
 		CommandLineOptions options = this.options.toCommandLineOptions();
+		options.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
 		return new ConsoleTestExecutor(options).execute(out);
 	}
 
 	@Override
 	public int getExitCode() {
-		return computeExitCode(commandSpec.commandLine().getExecutionResult(), options.toCommandLineOptions());
-	}
-
-	public static int computeExitCode(TestExecutionSummary summary, CommandLineOptions options) {
-		if (options.isFailIfNoTests() && summary.getTestsFoundCount() == 0) {
-			return NO_TESTS_FOUND;
-		}
-		return summary.getTotalFailureCount() == 0 ? SUCCESS : TEST_FAILED;
+		return CommandResult.computeExitCode(commandSpec.commandLine().getExecutionResult(),
+			options.toCommandLineOptions());
 	}
 
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
index 2d99b14db1a5..1af1680917e1 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
@@ -35,6 +35,7 @@ void displayEngines(PrintWriter out) {
 		StreamSupport.stream(engines.spliterator(), false) //
 				.sorted(Comparator.comparing(TestEngine::getId)) //
 				.forEach(engine -> displayEngine(out, engine));
+		out.flush();
 	}
 
 	private void displayEngine(PrintWriter out, TestEngine engine) {
@@ -42,6 +43,7 @@ private void displayEngine(PrintWriter out, TestEngine engine) {
 		engine.getGroupId().ifPresent(details::add);
 		engine.getArtifactId().ifPresent(details::add);
 		engine.getVersion().ifPresent(details::add);
-		out.println(engine.getId() + details);
+		out.println(
+			commandSpec.commandLine().getColorScheme().text(String.format("@|bold %s|@%s", engine.getId(), details)));
 	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
index b50638471bf1..b96f8f1f18ff 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -78,10 +78,9 @@ public int getExitCode() {
 	@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 	private Object runCommand(String subcommand, Optional<String> triggeringOption) {
 		CommandLine commandLine = commandSpec.commandLine();
+		commandLine.setUnmatchedArgumentsAllowed(false);
 		Object command = commandLine.getSubcommands().get(subcommand).getCommandSpec().userObject();
 
-		printDeprecationWarning(subcommand, triggeringOption, commandLine);
-
 		List<String> args = new ArrayList<>(commandLine.getParseResult().expandedArgs());
 		triggeringOption.ifPresent(args::remove);
 		CommandResult<?> result = runCommand(commandLine.getOut(), //
@@ -89,6 +88,9 @@ private Object runCommand(String subcommand, Optional<String> triggeringOption)
 			args.toArray(new String[0]), //
 			command);
 		this.commandResult = result;
+
+		printDeprecationWarning(subcommand, triggeringOption, commandLine);
+
 		return result.getValue().orElse(null);
 	}
 
@@ -96,9 +98,15 @@ private static void printDeprecationWarning(String subcommand, Optional<String>
 			CommandLine commandLine) {
 		PrintWriter err = commandLine.getErr();
 		String reason = triggeringOption.map(it -> " due to use of '" + it + "'").orElse("");
-		err.printf("WARNING: Delegating to the '%s' command%s.%n", subcommand, reason);
-		err.println("WARNING: This behaviour has been deprecated and will be removed in a future release.");
-		err.println("WARNING: Please use the '" + subcommand + "' command directly.");
+
+		commandLine.getOut().flush();
+		err.println();
+		err.println(commandLine.getColorScheme().text(
+			String.format("@|yellow,bold WARNING:|@ Delegated to the '%s' command%s.", subcommand, reason)));
+		err.println(commandLine.getColorScheme().text(
+			"         This behaviour has been deprecated and will be removed in a future release."));
+		err.println(
+			commandLine.getColorScheme().text("         Please use the '" + subcommand + "' command directly."));
 		err.flush();
 	}
 
@@ -112,7 +120,13 @@ private static CommandResult<?> runCommand(PrintWriter out, PrintWriter err, Str
 		int exitCode = commandLine //
 				.setOut(out) //
 				.setErr(err) //
-				.setUnmatchedArgumentsAllowed(false) //
+				.setExecutionExceptionHandler((ex, cmd, parseResult) -> {
+					err.println(cmd.getColorScheme().richStackTraceString(ex));
+					err.println();
+					err.flush();
+					cmd.usage(out);
+					return CommandResult.FAILURE;
+				}) //
 				.setCaseInsensitiveEnumValuesAllowed(true) //
 				.setAtFileCommentChar(null) // for --select-method com.acme.Foo#m()
 				.execute(args);
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
index 9b0a71c589dc..7051281dc284 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
@@ -10,27 +10,45 @@
 
 package org.junit.platform.console.options;
 
-import picocli.CommandLine;
+import static picocli.CommandLine.Help.defaultColorScheme;
+import static picocli.CommandLine.Spec.Target.MIXEE;
+
+import picocli.CommandLine.Help.Ansi;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Spec;
 
 public class OutputOptionsMixin {
 
-	@CommandLine.Option(names = "--disable-banner", description = "Disable print out of the welcome message.")
+	@Spec(MIXEE)
+	CommandSpec commandSpec;
+
+	@Option(names = "--disable-banner", description = "Disable print out of the welcome message.")
 	private boolean disableBanner;
 
-	@CommandLine.Option(names = "-disable-banner", hidden = true)
+	@Option(names = "-disable-banner", hidden = true)
 	private boolean disableBanner2;
 
-	@CommandLine.Option(names = "--disable-ansi-colors", description = "Disable ANSI colors in output (not supported by all terminals).")
 	private boolean disableAnsiColors;
 
-	@CommandLine.Option(names = "-disable-ansi-colors", hidden = true)
-	private boolean disableAnsiColors2;
-
 	public boolean isDisableBanner() {
 		return disableBanner || disableBanner2;
 	}
 
 	public boolean isDisableAnsiColors() {
-		return disableAnsiColors || disableAnsiColors2;
+		return disableAnsiColors;
+	}
+
+	@Option(names = "--disable-ansi-colors", description = "Disable ANSI colors in output (not supported by all terminals).")
+	public void setDisableAnsiColors(boolean disableAnsiColors) {
+		if (disableAnsiColors) {
+			commandSpec.commandLine().setColorScheme(defaultColorScheme(Ansi.OFF));
+		}
+		this.disableAnsiColors = disableAnsiColors;
+	}
+
+	@Option(names = "-disable-ansi-colors", hidden = true)
+	public void setDisableAnsiColors2(boolean disableAnsiColors) {
+		setDisableAnsiColors(disableAnsiColors);
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
index b8ccb37f3582..96121c573333 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
@@ -10,11 +10,10 @@
 
 package org.junit.platform.console;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.platform.commons.util.StringUtils.isBlank;
 
 import org.junit.jupiter.api.Test;
 
@@ -27,8 +26,8 @@ class ConsoleLauncherIntegrationTests {
 	void executeWithoutArgumentsFailsAndPrintsHelpInformation() {
 		var result = new ConsoleLauncherWrapper().execute(-1);
 		assertAll("empty args array results in display of help information and an exception stacktrace", //
-			() -> assertTrue(result.out.contains("help information")), //
-			() -> assertTrue(result.err.contains("No arguments were supplied to the ConsoleLauncher")) //
+			() -> assertThat(result.out).contains("help information"), //
+			() -> assertThat(result.err).contains("No arguments were supplied to the ConsoleLauncher") //
 		);
 	}
 
@@ -46,8 +45,7 @@ void executeWithExcludeClassnameOptionExcludesClasses() {
 		assertAll("all subpackage test classes are excluded by the class name filter", //
 			() -> assertArrayEquals(args, result.args), //
 			() -> assertEquals(0, result.code), //
-			() -> assertEquals(0, result.getTestsFoundCount()), //
-			() -> assertTrue(isBlank(result.err)) //
+			() -> assertEquals(0, result.getTestsFoundCount()) //
 		);
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
index e84c07364327..60ab9bf35086 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
@@ -10,11 +10,8 @@
 
 package org.junit.platform.console;
 
-import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.platform.commons.util.StringUtils.isBlank;
-import static org.junit.platform.commons.util.StringUtils.isNotBlank;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -58,10 +55,10 @@ public ConsoleLauncherWrapperResult execute(Optional<Integer> expectedCode, Stri
 		var errText = err.toString();
 		if (expectedCode.isPresent()) {
 			int expectedValue = expectedCode.get();
-			assertAll("wrapped execution failed:\n" + outText + "\n", //
-				() -> assertEquals(expectedValue, code, "ConsoleLauncher execute code mismatch!"), //
-				() -> assertTrue(expectedValue == 0 ? isBlank(errText) : isNotBlank(errText)) //
-			);
+			assertEquals(expectedValue, code, "ConsoleLauncher execute code mismatch!");
+			if (expectedValue != 0) {
+				assertThat(errText).isNotBlank();
+			}
 		}
 		return new ConsoleLauncherWrapperResult(args, outText, errText, result);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
index a45a69631452..0547744ae146 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
@@ -29,7 +29,7 @@ class ExecuteTestsCommandTests {
 	void hasStatusCode0ForNoTotalFailures() {
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
+		var exitCode = CommandResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -38,7 +38,7 @@ void hasStatusCode0ForNoTotalFailures() {
 	void hasStatusCode1ForForAnyFailure() {
 		when(summary.getTotalFailureCount()).thenReturn(1L);
 
-		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
+		var exitCode = CommandResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -51,7 +51,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() {
 		options.setFailIfNoTests(true);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
+		var exitCode = CommandResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(2);
 	}
@@ -65,7 +65,7 @@ void hasStatusCode0ForTestsAndHasOptionFailIfNoTestsFound() {
 		when(summary.getTestsFoundCount()).thenReturn(1L);
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
+		var exitCode = CommandResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -78,7 +78,7 @@ void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() {
 		options.setFailIfNoTests(false);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		var exitCode = ExecuteTestsCommand.computeExitCode(summary, options);
+		var exitCode = CommandResult.computeExitCode(summary, options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index 67d83f7dc798..bd925432117f 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -24,8 +24,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.console.options.CommandLineOptions;
+import org.junit.platform.console.options.CommandResult;
 import org.junit.platform.console.options.Details;
-import org.junit.platform.console.options.ExecuteTestsCommand;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 
 /**
@@ -99,7 +99,7 @@ void hasStatusCode0ForSucceedingTest() throws Exception {
 		dummyTestEngine.addTest("succeedingTest", SUCCEEDING_TEST);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
@@ -109,7 +109,7 @@ void hasStatusCode1ForFailingTest() throws Exception {
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -119,7 +119,7 @@ void hasStatusCode1ForFailingContainer() throws Exception {
 		dummyTestEngine.addContainer("failingContainer", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(1);
 	}
@@ -132,7 +132,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
 		options.setFailIfNoTests(true);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(2);
 	}
@@ -143,7 +143,7 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
 	@Test
 	void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() throws Exception {
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = ExecuteTestsCommand.computeExitCode(task.execute(dummyWriter()), options);
+		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
 
 		assertThat(exitCode).isEqualTo(0);
 	}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 5d931a41c6c1..813ce07c1844 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -66,7 +66,7 @@ void listAllObservableEngines() {
 				.setTool(new Java()) //
 				.setProject("standalone") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
-				.addArguments("--list-engines", "--disable-banner").build() //
+				.addArguments("engines", "--disable-banner").build() //
 				.run(false);
 
 		assertEquals(0, result.getExitCode(), String.join("\n", result.getOutputLines("out")));
@@ -116,7 +116,7 @@ void compile() throws Exception {
 	@Test
 	@Order(2)
 	void discoverTree() {
-		Result result = listTests("--details-theme=ascii");
+		Result result = discover("--details-theme=ascii");
 
 		var expected = """
 				.
@@ -151,7 +151,7 @@ void discoverTree() {
 	@Test
 	@Order(2)
 	void discoverFlat() {
-		Result result = listTests("--details=flat");
+		Result result = discover("--details=flat");
 
 		var expected = """
 				JUnit Jupiter ([engine:junit-jupiter])
@@ -185,7 +185,7 @@ JUnit Jupiter ([engine:junit-platform-suite]/[suite:standalone.SuiteIntegration]
 	@Test
 	@Order(2)
 	void discoverVerbose() {
-		Result result = listTests("--details=verbose", "--details-theme=ascii");
+		Result result = discover("--details=verbose", "--details-theme=ascii");
 
 		var expected = """
 				+-- JUnit Jupiter
@@ -269,7 +269,7 @@ void discoverVerbose() {
 	@Test
 	@Order(2)
 	void discoverNone() {
-		Result result = listTests("--details=none");
+		Result result = discover("--details=none");
 
 		assertThat(result.getOutputLines("out")).isEmpty();
 	}
@@ -277,7 +277,7 @@ void discoverNone() {
 	@Test
 	@Order(2)
 	void discoverSummary() {
-		Result result = listTests("--details=summary");
+		Result result = discover("--details=summary");
 
 		var expected = """
 
@@ -291,7 +291,7 @@ void discoverSummary() {
 	@Test
 	@Order(2)
 	void discoverTestFeed() {
-		Result result = listTests("--details=testfeed");
+		Result result = discover("--details=testfeed");
 
 		var expected = """
 				JUnit Jupiter > JupiterIntegration > successful()
@@ -311,12 +311,12 @@ JUnit Jupiter > JupiterIntegration > disabled()
 		assertLinesMatch(expected.lines(), result.getOutputLines("out").stream());
 	}
 
-	private static Result listTests(String... args) {
+	private static Result discover(String... args) {
 		var result = Request.builder() //
 				.setTool(new Java()) //
 				.setProject("standalone") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
-				.addArguments("--list-tests") //
+				.addArguments("discover") //
 				.addArguments("--scan-class-path") //
 				.addArguments("--disable-banner") //
 				.addArguments("--disable-ansi-colors") //
@@ -341,6 +341,7 @@ void execute() throws IOException {
 				.addArguments("-Djava.util.logging.config.file=logging.properties") //
 				.addArguments("-Djunit.platform.launcher.interceptors.enabled=true") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
+				.addArguments("execute") //
 				.addArguments("--scan-class-path") //
 				.addArguments("--disable-banner") //
 				.addArguments("--include-classname", "standalone.*") //
@@ -375,6 +376,7 @@ void executeOnJava8() throws IOException {
 				.addArguments("-Djava.util.logging.config.file=logging.properties") //
 				.addArguments("-Djunit.platform.launcher.interceptors.enabled=true") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
+				.addArguments("execute") //
 				.addArguments("--scan-class-path") //
 				.addArguments("--disable-banner") //
 				.addArguments("--include-classname", "standalone.*") //
@@ -410,6 +412,7 @@ void executeOnJava8SelectPackage() throws IOException {
 				.addArguments("-Djava.util.logging.config.file=logging.properties") //
 				.addArguments("-Djunit.platform.launcher.interceptors.enabled=true") //
 				.addArguments("-jar", MavenRepo.jar("junit-platform-console-standalone")) //
+				.addArguments("execute") //
 				.addArguments("--select-package", "standalone") //
 				.addArguments("--disable-banner") //
 				.addArguments("--include-classname", "standalone.*") //
@@ -449,6 +452,7 @@ void executeWithJarredTestClasses() {
 				.addArguments("-Djava.util.logging.config.file=logging.properties") //
 				.addArguments("--class-path", String.join(File.pathSeparator, path)) //
 				.addArguments("org.junit.platform.console.ConsoleLauncher") //
+				.addArguments("execute") //
 				.addArguments("--scan-class-path") //
 				.addArguments("--disable-banner") //
 				.addArguments("--include-classname", "standalone.*") //

From feb691eed7f46c3e7f5be09932abf09299763aad Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 1 Mar 2023 21:09:35 +0100
Subject: [PATCH 1212/1433] Fix tests

---
 .../platform/console/ConsoleLauncher.java     | 13 ++-
 .../console/options/DiscoverTestsCommand.java | 17 +++-
 .../console/options/ExecuteTestsCommand.java  | 15 +++-
 .../options/ListTestEnginesCommand.java       | 11 ++-
 .../platform/console/options/MainCommand.java | 35 ++++++--
 .../console/ConsoleLauncherTests.java         | 89 +++++++++----------
 .../console/ConsoleLauncherWrapper.java       | 11 +--
 7 files changed, 120 insertions(+), 71 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index 9d785fe58657..fda92040f17f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -14,11 +14,13 @@
 import static org.apiguardian.api.API.Status.MAINTAINED;
 
 import java.io.PrintWriter;
+import java.util.function.Function;
 
 import org.apiguardian.api.API;
-import org.junit.platform.console.options.CommandLineOptionsParser;
+import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.CommandResult;
 import org.junit.platform.console.options.MainCommand;
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 /**
  * The {@code ConsoleLauncher} is a stand-alone application for launching the
@@ -38,21 +40,24 @@ public static void main(String... args) {
 
 	@API(status = INTERNAL, since = "1.0")
 	public static CommandResult<?> run(PrintWriter out, PrintWriter err, String... args) {
-		ConsoleLauncher consoleLauncher = new ConsoleLauncher(null, out, err);
+		ConsoleLauncher consoleLauncher = new ConsoleLauncher(ConsoleTestExecutor::new, out, err);
 		return consoleLauncher.run(args);
 	}
 
+	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
 	private final PrintWriter out;
 	private final PrintWriter err;
 
-	ConsoleLauncher(CommandLineOptionsParser commandLineOptionsParser, PrintWriter out, PrintWriter err) {
+	ConsoleLauncher(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory, PrintWriter out,
+			PrintWriter err) {
+		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 		this.out = out;
 		this.err = err;
 	}
 
 	CommandResult<?> run(String... args) {
 		try {
-			return MainCommand.run(out, err, args);
+			return new MainCommand(consoleTestExecutorFactory).run(out, err, args);
 		}
 		finally {
 			out.flush();
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
index a8cfbb2b9a68..af658d13f854 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
@@ -11,23 +11,34 @@
 package org.junit.platform.console.options;
 
 import java.io.PrintWriter;
+import java.util.function.Function;
 
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
-import picocli.CommandLine;
+import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 
-@CommandLine.Command(name = "discover", description = "Discover tests")
+@Command(//
+		name = "discover", //
+		description = "Discover tests", //
+		exitCodeOnInvalidInput = CommandResult.FAILURE, //
+		exitCodeOnExecutionException = CommandResult.FAILURE //
+)
 public class DiscoverTestsCommand extends BaseCommand<Void> {
 
+	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
 	@Mixin
 	CommandLineOptionsMixin options;
 
+	public DiscoverTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
+	}
+
 	@Override
 	protected Void execute(PrintWriter out) {
 		CommandLineOptions options = this.options.toCommandLineOptions();
 		options.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
-		new ConsoleTestExecutor(options).discover(out);
+		consoleTestExecutorFactory.apply(options).discover(out);
 		return null;
 	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
index 2e0eef266b2f..c6e81dbc6158 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
@@ -11,6 +11,7 @@
 package org.junit.platform.console.options;
 
 import java.io.PrintWriter;
+import java.util.function.Function;
 
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
@@ -19,17 +20,27 @@
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 
-@Command(name = "execute", description = "Execute tests")
+@Command(//
+		name = "execute", //
+		description = "Execute tests", //
+		exitCodeOnInvalidInput = CommandResult.FAILURE, //
+		exitCodeOnExecutionException = CommandResult.FAILURE //
+)
 public class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements CommandLine.IExitCodeGenerator {
 
+	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
 	@Mixin
 	CommandLineOptionsMixin options;
 
+	public ExecuteTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
+	}
+
 	@Override
 	protected TestExecutionSummary execute(PrintWriter out) {
 		CommandLineOptions options = this.options.toCommandLineOptions();
 		options.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
-		return new ConsoleTestExecutor(options).execute(out);
+		return consoleTestExecutorFactory.apply(options).execute(out);
 	}
 
 	@Override
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
index 1af1680917e1..a37baffef949 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
@@ -18,9 +18,14 @@
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry;
 
-import picocli.CommandLine;
-
-@CommandLine.Command(name = "engines", description = "List available test engines")
+import picocli.CommandLine.Command;
+
+@Command(//
+		name = "engines", //
+		description = "List available test engines", //
+		exitCodeOnInvalidInput = CommandResult.FAILURE, //
+		exitCodeOnExecutionException = CommandResult.FAILURE //
+)
 public class ListTestEnginesCommand extends BaseCommand<Void> {
 
 	@Override
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
index b96f8f1f18ff..cac99a0a535f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -10,11 +10,17 @@
 
 package org.junit.platform.console.options;
 
+import static org.apiguardian.api.API.Status.INTERNAL;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Callable;
+import java.util.function.Function;
+
+import org.apiguardian.api.API;
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
@@ -25,7 +31,7 @@
 import picocli.CommandLine.Unmatched;
 
 /**
- * @since 1.0
+ * @since 1.10
  */
 @Command(//
 		name = "junit", //
@@ -38,11 +44,14 @@
 		footerHeading = "%n", //
 		footer = "For more information, please refer to the JUnit User Guide at%n" //
 				+ "@|underline https://junit.org/junit5/docs/current/user-guide/|@", //
-		subcommands = { DiscoverTestsCommand.class, ExecuteTestsCommand.class, ListTestEnginesCommand.class,
-				CommandLine.HelpCommand.class }, //
-		scope = CommandLine.ScopeType.INHERIT)
+		scope = CommandLine.ScopeType.INHERIT, //
+		exitCodeOnInvalidInput = CommandResult.FAILURE, //
+		exitCodeOnExecutionException = CommandResult.FAILURE //
+)
+@API(status = INTERNAL, since = "1.10")
 public class MainCommand implements Callable<Object>, IExitCodeGenerator {
 
+	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
 	@Option(names = { "-h", "--help" }, help = true, hidden = true)
 	private boolean helpRequested;
 
@@ -57,6 +66,10 @@ public class MainCommand implements Callable<Object>, IExitCodeGenerator {
 
 	CommandResult<?> commandResult;
 
+	public MainCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
+	}
+
 	@Override
 	public Object call() {
 		if (helpRequested || helpRequested2) {
@@ -110,13 +123,19 @@ private static void printDeprecationWarning(String subcommand, Optional<String>
 		err.flush();
 	}
 
-	public static CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
-		Object command = new MainCommand();
-		return runCommand(out, err, args, command);
+	public CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
+		CommandLine commandLine = new CommandLine(this).addSubcommand(
+			new DiscoverTestsCommand(consoleTestExecutorFactory)).addSubcommand(
+				new ExecuteTestsCommand(consoleTestExecutorFactory)).addSubcommand(new ListTestEnginesCommand());
+		return runCommand(out, err, args, commandLine);
 	}
 
 	private static CommandResult<?> runCommand(PrintWriter out, PrintWriter err, String[] args, Object command) {
-		CommandLine commandLine = new CommandLine(command);
+		return runCommand(out, err, args, new CommandLine(command));
+	}
+
+	private static CommandResult<Object> runCommand(PrintWriter out, PrintWriter err, String[] args,
+			CommandLine commandLine) {
 		int exitCode = commandLine //
 				.setOut(out) //
 				.setErr(err) //
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index 9d7a78afa6b6..8b0f9f68aa3e 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -10,21 +10,22 @@
 
 package org.junit.platform.console;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.CommandLineOptionsParser;
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 /**
  * @since 1.0
@@ -34,41 +35,35 @@ class ConsoleLauncherTests {
 	private final StringWriter stringWriter = new StringWriter();
 	private final PrintWriter printSink = new PrintWriter(stringWriter);
 
-	@Test
-	void displayHelp() {
+	@ParameterizedTest(name = "{0}")
+	@MethodSource("commandsWithEmptyOptionExitCodes")
+	void displayHelp(String command) {
 		var options = new CommandLineOptions();
 		options.setDisplayHelp(true);
 
-		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
-
-		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.run("--help").getExitCode();
+		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
+		var exitCode = consoleLauncher.run(command, "--help").getExitCode();
 
 		assertEquals(0, exitCode);
-		verify(commandLineOptionsParser).parse("--help");
 	}
 
-	@Test
-	void displayBanner() {
+	@ParameterizedTest(name = "{0}")
+	@MethodSource("commandsWithEmptyOptionExitCodes")
+	void displayBanner(String command) {
 		var options = new CommandLineOptions();
 		options.setBannerDisabled(false);
 		options.setDisplayHelp(true);
 
-		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
-
-		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.run("--help").getExitCode();
+		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
+		consoleLauncher.run(command);
 
-		assertEquals(0, exitCode);
-		assertLinesMatch(
-			List.of("", "Thanks for using JUnit! Support its development at https://junit.org/sponsoring", ""),
-			stringWriter.toString().lines().collect(Collectors.toList()));
+		assertThat(stringWriter.toString()).contains(
+			"Thanks for using JUnit! Support its development at https://junit.org/sponsoring");
 	}
 
-	@Test
-	void disableBanner() {
+	@ParameterizedTest(name = "{0}")
+	@MethodSource("commandsWithEmptyOptionExitCodes")
+	void disableBanner(String command, int expectedExitCode) {
 		var options = new CommandLineOptions();
 		options.setBannerDisabled(true);
 		options.setDisplayHelp(true);
@@ -76,35 +71,37 @@ void disableBanner() {
 		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
 		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
 
-		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.run("--help", "--disable-banner").getExitCode();
+		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
+		var exitCode = consoleLauncher.run(command, "--disable-banner").getExitCode();
 
-		assertEquals(0, exitCode);
-		assertLinesMatch(List.of(), stringWriter.toString().lines().collect(Collectors.toList()));
+		assertEquals(expectedExitCode, exitCode);
+		assertThat(stringWriter.toString()).doesNotContain("Thanks for using JUnit!");
 	}
 
-	@Test
-	void executeWithUnknownCommandLineOption() {
-		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(new CommandLineOptions());
-
-		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.run("--all").getExitCode();
+	@ParameterizedTest(name = "{0}")
+	@MethodSource("commandsWithEmptyOptionExitCodes")
+	void executeWithUnknownCommandLineOption(String command) {
+		var consoleLauncher = new ConsoleLauncher(ConsoleTestExecutor::new, printSink, printSink);
+		var exitCode = consoleLauncher.run(command, "--all").getExitCode();
 
 		assertEquals(-1, exitCode);
-		verify(commandLineOptionsParser).parse("--all");
 	}
 
-	@Test
-	void executeWithSupportedCommandLineOption() {
-		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(new CommandLineOptions());
+	@ParameterizedTest(name = "{0}")
+	@MethodSource("commandsWithEmptyOptionExitCodes")
+	void executeWithoutCommandLineOptions(String command, int expectedExitCode) {
+		var consoleLauncher = new ConsoleLauncher(ConsoleTestExecutor::new, printSink, printSink);
+		var actualExitCode = consoleLauncher.run(command).getExitCode();
 
-		var consoleLauncher = new ConsoleLauncher(commandLineOptionsParser, printSink, printSink);
-		var exitCode = consoleLauncher.run("--scan-classpath").getExitCode();
+		assertEquals(expectedExitCode, actualExitCode);
+	}
 
-		assertEquals(-1, exitCode);
-		verify(commandLineOptionsParser).parse("--scan-classpath");
+	static Stream<Arguments> commandsWithEmptyOptionExitCodes() {
+		return Stream.of( //
+			Arguments.of("execute", -1), //
+			Arguments.of("discover", -1), //
+			Arguments.of("engines", 0) //
+		);
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
index 60ab9bf35086..68b09cbaa890 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
@@ -16,9 +16,10 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Optional;
+import java.util.function.Function;
 
-import org.junit.platform.console.options.CommandLineOptionsParser;
-import org.junit.platform.console.options.PicocliCommandLineOptionsParser;
+import org.junit.platform.console.options.CommandLineOptions;
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 /**
  * @since 1.0
@@ -30,13 +31,13 @@ class ConsoleLauncherWrapper {
 	private final ConsoleLauncher consoleLauncher;
 
 	ConsoleLauncherWrapper() {
-		this(new PicocliCommandLineOptionsParser());
+		this(ConsoleTestExecutor::new);
 	}
 
-	private ConsoleLauncherWrapper(CommandLineOptionsParser parser) {
+	private ConsoleLauncherWrapper(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
 		var outWriter = new PrintWriter(out, false);
 		var errWriter = new PrintWriter(err, false);
-		this.consoleLauncher = new ConsoleLauncher(parser, outWriter, errWriter);
+		this.consoleLauncher = new ConsoleLauncher(consoleTestExecutorFactory, outWriter, errWriter);
 
 	}
 

From ce58e767153a66da72a1df8c79569f988423dc52 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 1 Mar 2023 22:04:30 +0100
Subject: [PATCH 1213/1433] Test new CLI parsing logic

---
 .../console/options/AvailableOptions.java     |  1 -
 .../platform/console/options/BaseCommand.java | 18 ++++++
 .../console/options/CommandLineOptions.java   |  9 ---
 .../console/options/DiscoverTestsCommand.java |  9 +--
 .../console/options/ExecuteTestsCommand.java  | 22 +++++--
 .../options/ListTestEnginesCommand.java       |  7 +-
 .../platform/console/options/MainCommand.java | 19 ++----
 platform-tests/platform-tests.gradle.kts      |  1 +
 .../console/ConsoleLauncherTests.java         | 21 +-----
 ...va => CommandLineOptionsParsingTests.java} | 64 ++++---------------
 10 files changed, 57 insertions(+), 114 deletions(-)
 rename platform-tests/src/test/java/org/junit/platform/console/options/{PicocliCommandLineOptionsParserTests.java => CommandLineOptionsParsingTests.java} (93%)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
index ec0733426923..c556c24eb2e2 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
@@ -86,7 +86,6 @@ static class CommandOptions {
 		private boolean helpRequested2;
 
 		private void applyTo(CommandLineOptions result) {
-			result.setDisplayHelp(this.helpRequested || this.helpRequested2);
 		}
 	}
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
index 0232a14e25f2..6fa50e1e500c 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
@@ -31,6 +31,24 @@ abstract class BaseCommand<T> implements Callable<T> {
 	@Option(names = { "-h", "--help" }, usageHelp = true, description = "Display help information.")
 	private boolean helpRequested;
 
+	static CommandLine initialize(CommandLine commandLine) {
+		CommandLine.IParameterExceptionHandler defaultParameterExceptionHandler = commandLine.getParameterExceptionHandler();
+		return commandLine //
+				.setParameterExceptionHandler((ex, args) -> {
+					defaultParameterExceptionHandler.handleParseException(ex, args);
+					return CommandResult.FAILURE;
+				}) //
+				.setExecutionExceptionHandler((ex, cmd, __) -> {
+					commandLine.getErr().println(cmd.getColorScheme().richStackTraceString(ex));
+					commandLine.getErr().println();
+					commandLine.getErr().flush();
+					cmd.usage(commandLine.getOut());
+					return CommandResult.FAILURE;
+				}) //
+				.setCaseInsensitiveEnumValuesAllowed(true) //
+				.setAtFileCommentChar(null);
+	}
+
 	@Override
 	public final T call() {
 		PrintWriter out = getOut();
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index 7fa385dda2d3..6e97889027b4 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -47,7 +47,6 @@ public class CommandLineOptions {
 	static final Details DEFAULT_DETAILS = Details.valueOf(DEFAULT_DETAILS_NAME.toUpperCase(Locale.ROOT));
 	static final Theme DEFAULT_THEME = Theme.valueOf(ConsoleUtils.charset());
 
-	private boolean displayHelp;
 	private boolean ansiColorOutputDisabled;
 	private Path colorPalettePath;
 	private boolean isSingleColorPalette;
@@ -85,14 +84,6 @@ public class CommandLineOptions {
 
 	private Map<String, String> configurationParameters = emptyMap();
 
-	public boolean isDisplayHelp() {
-		return this.displayHelp;
-	}
-
-	public void setDisplayHelp(boolean displayHelp) {
-		this.displayHelp = displayHelp;
-	}
-
 	public boolean isAnsiColorOutputDisabled() {
 		return this.ansiColorOutputDisabled;
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
index af658d13f854..d8b94cbb6fc6 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
@@ -20,17 +20,14 @@
 
 @Command(//
 		name = "discover", //
-		description = "Discover tests", //
-		exitCodeOnInvalidInput = CommandResult.FAILURE, //
-		exitCodeOnExecutionException = CommandResult.FAILURE //
-)
-public class DiscoverTestsCommand extends BaseCommand<Void> {
+		description = "Discover tests")
+class DiscoverTestsCommand extends BaseCommand<Void> {
 
 	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
 	@Mixin
 	CommandLineOptionsMixin options;
 
-	public DiscoverTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+	DiscoverTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
index c6e81dbc6158..2cbb48d20812 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
@@ -22,25 +22,33 @@
 
 @Command(//
 		name = "execute", //
-		description = "Execute tests", //
-		exitCodeOnInvalidInput = CommandResult.FAILURE, //
-		exitCodeOnExecutionException = CommandResult.FAILURE //
-)
-public class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements CommandLine.IExitCodeGenerator {
+		description = "Execute tests")
+class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements CommandLine.IExitCodeGenerator {
 
 	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
 	@Mixin
 	CommandLineOptionsMixin options;
 
-	public ExecuteTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+	ExecuteTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
+	static CommandLineOptions parseCommandLineOptions(String[] args) {
+		ExecuteTestsCommand command = new ExecuteTestsCommand(__ -> null);
+		BaseCommand.initialize(new CommandLine(command)).parseArgs(args);
+		return command.toCommandLineOptions();
+	}
+
 	@Override
 	protected TestExecutionSummary execute(PrintWriter out) {
+		CommandLineOptions options = toCommandLineOptions();
+		return consoleTestExecutorFactory.apply(options).execute(out);
+	}
+
+	private CommandLineOptions toCommandLineOptions() {
 		CommandLineOptions options = this.options.toCommandLineOptions();
 		options.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
-		return consoleTestExecutorFactory.apply(options).execute(out);
+		return options;
 	}
 
 	@Override
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
index a37baffef949..fd18d739a99e 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
@@ -22,11 +22,8 @@
 
 @Command(//
 		name = "engines", //
-		description = "List available test engines", //
-		exitCodeOnInvalidInput = CommandResult.FAILURE, //
-		exitCodeOnExecutionException = CommandResult.FAILURE //
-)
-public class ListTestEnginesCommand extends BaseCommand<Void> {
+		description = "List available test engines")
+class ListTestEnginesCommand extends BaseCommand<Void> {
 
 	@Override
 	protected Void execute(PrintWriter out) {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
index cac99a0a535f..5ad88f3d2869 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -125,8 +125,9 @@ private static void printDeprecationWarning(String subcommand, Optional<String>
 
 	public CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
 		CommandLine commandLine = new CommandLine(this).addSubcommand(
-			new DiscoverTestsCommand(consoleTestExecutorFactory)).addSubcommand(
-				new ExecuteTestsCommand(consoleTestExecutorFactory)).addSubcommand(new ListTestEnginesCommand());
+			new DiscoverTestsCommand(consoleTestExecutorFactory)) //
+				.addSubcommand(new ExecuteTestsCommand(consoleTestExecutorFactory)) //
+				.addSubcommand(new ListTestEnginesCommand());
 		return runCommand(out, err, args, commandLine);
 	}
 
@@ -136,19 +137,9 @@ private static CommandResult<?> runCommand(PrintWriter out, PrintWriter err, Str
 
 	private static CommandResult<Object> runCommand(PrintWriter out, PrintWriter err, String[] args,
 			CommandLine commandLine) {
-		int exitCode = commandLine //
+		int exitCode = BaseCommand.initialize(commandLine) //
 				.setOut(out) //
-				.setErr(err) //
-				.setExecutionExceptionHandler((ex, cmd, parseResult) -> {
-					err.println(cmd.getColorScheme().richStackTraceString(ex));
-					err.println();
-					err.flush();
-					cmd.usage(out);
-					return CommandResult.FAILURE;
-				}) //
-				.setCaseInsensitiveEnumValuesAllowed(true) //
-				.setAtFileCommentChar(null) // for --select-method com.acme.Foo#m()
-				.execute(args);
+				.setErr(err).execute(args);
 		return CommandResult.create(exitCode, commandLine.getExecutionResult());
 	}
 }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index ebdd20a6788a..fa0c4ff30fa7 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
 	}
 	testImplementation(libs.joox)
 	testImplementation(libs.openTestReporting.tooling)
+	testImplementation(libs.picocli)
 	testImplementation(libs.bundles.xmlunit)
 	testImplementation(testFixtures(projects.junitJupiterApi))
 
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index 8b0f9f68aa3e..87c61425e454 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -12,9 +12,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -23,8 +20,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.platform.console.options.CommandLineOptions;
-import org.junit.platform.console.options.CommandLineOptionsParser;
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 /**
@@ -38,22 +33,16 @@ class ConsoleLauncherTests {
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("commandsWithEmptyOptionExitCodes")
 	void displayHelp(String command) {
-		var options = new CommandLineOptions();
-		options.setDisplayHelp(true);
-
 		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
 		var exitCode = consoleLauncher.run(command, "--help").getExitCode();
 
 		assertEquals(0, exitCode);
+		assertThat(stringWriter.toString()).contains("--help");
 	}
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("commandsWithEmptyOptionExitCodes")
 	void displayBanner(String command) {
-		var options = new CommandLineOptions();
-		options.setBannerDisabled(false);
-		options.setDisplayHelp(true);
-
 		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
 		consoleLauncher.run(command);
 
@@ -64,13 +53,6 @@ void displayBanner(String command) {
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("commandsWithEmptyOptionExitCodes")
 	void disableBanner(String command, int expectedExitCode) {
-		var options = new CommandLineOptions();
-		options.setBannerDisabled(true);
-		options.setDisplayHelp(true);
-
-		var commandLineOptionsParser = mock(CommandLineOptionsParser.class);
-		when(commandLineOptionsParser.parse(any(String[].class))).thenReturn(options);
-
 		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
 		var exitCode = consoleLauncher.run(command, "--disable-banner").getExitCode();
 
@@ -85,6 +67,7 @@ void executeWithUnknownCommandLineOption(String command) {
 		var exitCode = consoleLauncher.run(command, "--all").getExitCode();
 
 		assertEquals(-1, exitCode);
+		assertThat(stringWriter.toString()).contains("Unknown option: '--all'").contains("Usage:");
 	}
 
 	@ParameterizedTest(name = "{0}")
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
similarity index 93%
rename from platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
rename to platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
index ed793dcf6159..1000e25e8106 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/PicocliCommandLineOptionsParserTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
@@ -31,8 +31,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -47,22 +45,20 @@
 import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.platform.commons.JUnitException;
 
 /**
- * @since 1.0
+ * @since 1.10
  */
-class PicocliCommandLineOptionsParserTests {
+class CommandLineOptionsParsingTests {
 
 	@Test
 	void parseNoArguments() {
 		String[] noArguments = {};
-		var options = createParser().parse(noArguments);
+		var options = parse(noArguments);
 
 		// @formatter:off
 		assertAll(
 			() -> assertFalse(options.isAnsiColorOutputDisabled()),
-			() -> assertFalse(options.isDisplayHelp()),
 			() -> assertEquals(CommandLineOptions.DEFAULT_DETAILS, options.getDetails()),
 			() -> assertFalse(options.isScanClasspath()),
 			() -> assertEquals(List.of(STANDARD_INCLUDE_PATTERN), options.getIncludedClassNamePatterns()),
@@ -90,7 +86,6 @@ void parseSwitches() {
 		// @formatter:off
 		assertAll(
 			() -> assertParses("disable ansi", CommandLineOptions::isAnsiColorOutputDisabled, "--disable-ansi-colors"),
-			() -> assertParses("help", CommandLineOptions::isDisplayHelp, "-h", "--help"),
 			() -> assertParses("scan class path", CommandLineOptions::isScanClasspath, "--scan-class-path")
 		);
 		// @formatter:on
@@ -563,51 +558,14 @@ void parseInvalidConfigurationParameters() {
 	@ParameterizedTest
 	@EnumSource
 	void parseInvalidConfigurationParametersWithDuplicateKey(ArgsType type) {
-		Exception e = assertThrows(JUnitException.class, () -> type.parseArgLine("--config foo=bar --config foo=baz"));
+		Exception e = assertThrows(Exception.class, () -> type.parseArgLine("--config foo=bar --config foo=baz"));
 
-		assertThat(e.getMessage()).isEqualTo(
-			"Error parsing command-line arguments: Duplicate key 'foo' for values 'bar' and 'baz'.");
-		assertThat(e.getCause().getMessage()).isEqualTo("Duplicate key 'foo' for values 'bar' and 'baz'.");
-	}
-
-	@Test
-	void printHelpOutputsHelpOption() {
-		var writer = new StringWriter();
-
-		createParser().printHelp(writer, true);
-
-		assertThat(writer.toString()).contains("--help");
-	}
-
-	@Test
-	void printHelpPreservesOriginalIOException() {
-		var writer = new Writer() {
-
-			@SuppressWarnings("NullableProblems")
-			@Override
-			public void write(char[] buffer, int off, int len) throws IOException {
-				throw new IOException("Something went wrong");
-			}
-
-			@Override
-			public void flush() {
-			}
-
-			@Override
-			public void close() {
-			}
-		};
-
-		var parser = createParser();
-		var exception = assertThrows(RuntimeException.class, () -> parser.printHelp(writer, true));
-
-		assertThat(exception).hasCauseInstanceOf(IOException.class);
-		assertThat(exception.getCause()).hasMessage("Something went wrong");
+		assertThat(e.getMessage()).isEqualTo("Duplicate key 'foo' for values 'bar' and 'baz'.");
 	}
 
 	private void assertOptionWithMissingRequiredArgumentThrowsException(String... options) {
-		assertAll(Stream.of(options).map(
-			opt -> () -> assertThrows(JUnitException.class, () -> ArgsType.args.parseArgLine(opt))));
+		assertAll(
+			Stream.of(options).map(opt -> () -> assertThrows(Exception.class, () -> ArgsType.args.parseArgLine(opt))));
 	}
 
 	private void assertParses(String name, Predicate<CommandLineOptions> property, String... argLines) {
@@ -626,7 +584,7 @@ private void assertParses(String name, Predicate<CommandLineOptions> property, S
 	enum ArgsType {
 		args {
 			CommandLineOptions parseArgLine(String argLine) {
-				return createParser().parse(split(argLine));
+				return parse(split(argLine));
 			}
 		},
 		atFile {
@@ -634,7 +592,7 @@ CommandLineOptions parseArgLine(String argLine) throws IOException {
 				var atFile = Files.createTempFile("junit-launcher-args", ".txt");
 				try {
 					Files.write(atFile, List.of(split(argLine)));
-					return createParser().parse("@" + atFile);
+					return parse("@" + atFile);
 				}
 				finally {
 					Files.deleteIfExists(atFile);
@@ -648,8 +606,8 @@ private static String[] split(String argLine) {
 		}
 	}
 
-	private static CommandLineOptionsParser createParser() {
-		return new PicocliCommandLineOptionsParser();
+	private static CommandLineOptions parse(String... args) {
+		return ExecuteTestsCommand.parseCommandLineOptions(args);
 	}
 
 }

From d451f7242e79a78a956d23c21f4f6fd1c89ff852 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 1 Mar 2023 22:05:33 +0100
Subject: [PATCH 1214/1433] Delete obsolete code

---
 .../console/options/AvailableOptions.java     | 439 ------------------
 .../options/CommandLineOptionsMixin.java      |   4 +-
 .../options/CommandLineOptionsParser.java     |  29 --
 .../PicocliCommandLineOptionsParser.java      |  61 ---
 4 files changed, 2 insertions(+), 531 deletions(-)
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
 delete mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
deleted file mode 100644
index c556c24eb2e2..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/AvailableOptions.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_DETAILS;
-import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_DETAILS_NAME;
-import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_THEME;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.platform.engine.discovery.ClassNameFilter;
-import org.junit.platform.engine.discovery.ClassSelector;
-import org.junit.platform.engine.discovery.ClasspathResourceSelector;
-import org.junit.platform.engine.discovery.DirectorySelector;
-import org.junit.platform.engine.discovery.FileSelector;
-import org.junit.platform.engine.discovery.IterationSelector;
-import org.junit.platform.engine.discovery.MethodSelector;
-import org.junit.platform.engine.discovery.ModuleSelector;
-import org.junit.platform.engine.discovery.PackageSelector;
-import org.junit.platform.engine.discovery.UriSelector;
-
-import picocli.CommandLine;
-import picocli.CommandLine.ArgGroup;
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Model.CommandSpec;
-import picocli.CommandLine.Option;
-import picocli.CommandLine.ParameterException;
-import picocli.CommandLine.ParseResult;
-import picocli.CommandLine.Spec;
-
-/**
- * @since 1.0
- */
-@Command(//
-		name = "ConsoleLauncher", //
-		abbreviateSynopsis = true, //
-		sortOptions = false, //
-		usageHelpWidth = 95, //
-		showAtFileInUsageHelp = true, //
-		usageHelpAutoWidth = true, //
-		description = "Launches the JUnit Platform for test discovery and execution.", //
-		footerHeading = "%n", //
-		footer = "For more information, please refer to the JUnit User Guide at%n" //
-				+ "@|underline https://junit.org/junit5/docs/current/user-guide/|@"//
-)
-class AvailableOptions {
-
-	private static final String CP_OPTION = "cp";
-
-	@ArgGroup(validate = false, order = 1, heading = "%n@|bold COMMANDS|@%n%n")
-	CommandOptions commandOptions;
-
-	@ArgGroup(validate = false, order = 2, heading = "%n@|bold SELECTORS|@%n%n")
-	SelectorOptions selectorOptions;
-
-	@ArgGroup(validate = false, order = 3, heading = "%n@|bold FILTERS|@%n%n")
-	FilterOptions filterOptions;
-
-	@ArgGroup(validate = false, order = 4, heading = "%n@|bold RUNTIME CONFIGURATION|@%n%n")
-	RuntimeConfigurationOptions runtimeConfigurationOptions;
-
-	@ArgGroup(validate = false, order = 5, heading = "%n@|bold REPORTING|@%n%n")
-	ReportingOptions reportingOptions;
-
-	@ArgGroup(validate = false, order = 6, heading = "%n@|bold CONSOLE OUTPUT|@%n%n")
-	ConsoleOutputOptions consoleOutputOptions;
-
-	static class CommandOptions {
-
-		@Option(names = { "-h", "--help" }, usageHelp = true, description = "Display help information.")
-		private boolean helpRequested;
-
-		@Option(names = { "--h", "-help" }, help = true, hidden = true)
-		private boolean helpRequested2;
-
-		private void applyTo(CommandLineOptions result) {
-		}
-	}
-
-	static class SelectorOptions {
-
-		@Option(names = { "--scan-classpath",
-				"--scan-class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "0..1", description = "Scan all directories on the classpath or explicit classpath roots. " //
-						+ "Without arguments, only directories on the system classpath as well as additional classpath " //
-						+ "entries supplied via -" + CP_OPTION + " (directories and JAR files) are scanned. " //
-						+ "Explicit classpath roots that are not on the classpath will be silently ignored. " //
-						+ "This option can be repeated.")
-		private List<Path> selectedClasspathEntries = new ArrayList<>();
-
-		@Option(names = { "-scan-class-path",
-				"-scan-classpath" }, converter = ClasspathEntriesConverter.class, arity = "0..1", hidden = true)
-		private List<Path> selectedClasspathEntries2 = new ArrayList<>();
-
-		@Option(names = "--scan-modules", description = "Scan all resolved modules for test discovery.")
-		private boolean scanModulepath;
-
-		@Option(names = "-scan-modules", hidden = true)
-		private boolean scanModulepath2;
-
-		@Option(names = { "-u",
-				"--select-uri" }, paramLabel = "URI", arity = "1", converter = SelectorConverter.Uri.class, description = "Select a URI for test discovery. This option can be repeated.")
-		private List<UriSelector> selectedUris = new ArrayList<>();
-
-		@Option(names = { "--u", "-select-uri" }, arity = "1", hidden = true, converter = SelectorConverter.Uri.class)
-		private List<UriSelector> selectedUris2 = new ArrayList<>();
-
-		@Option(names = { "-f",
-				"--select-file" }, paramLabel = "FILE", arity = "1", converter = SelectorConverter.File.class, description = "Select a file for test discovery. This option can be repeated.")
-		private List<FileSelector> selectedFiles = new ArrayList<>();
-
-		@Option(names = { "--f", "-select-file" }, arity = "1", hidden = true, converter = SelectorConverter.File.class)
-		private List<FileSelector> selectedFiles2 = new ArrayList<>();
-
-		@Option(names = { "-d",
-				"--select-directory" }, paramLabel = "DIR", arity = "1", converter = SelectorConverter.Directory.class, description = "Select a directory for test discovery. This option can be repeated.")
-		private List<DirectorySelector> selectedDirectories = new ArrayList<>();
-
-		@Option(names = { "--d",
-				"-select-directory" }, arity = "1", hidden = true, converter = SelectorConverter.Directory.class)
-		private List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
-
-		@Option(names = { "-o",
-				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "Select single module for test discovery. This option can be repeated.")
-		private List<ModuleSelector> selectedModules = new ArrayList<>();
-
-		@Option(names = { "--o",
-				"-select-module" }, arity = "1", converter = SelectorConverter.Module.class, hidden = true)
-		private List<ModuleSelector> selectedModules2 = new ArrayList<>();
-
-		@Option(names = { "-p",
-				"--select-package" }, paramLabel = "PKG", arity = "1", converter = SelectorConverter.Package.class, description = "Select a package for test discovery. This option can be repeated.")
-		private List<PackageSelector> selectedPackages = new ArrayList<>();
-
-		@Option(names = { "--p",
-				"-select-package" }, arity = "1", hidden = true, converter = SelectorConverter.Package.class)
-		private List<PackageSelector> selectedPackages2 = new ArrayList<>();
-
-		@Option(names = { "-c",
-				"--select-class" }, paramLabel = "CLASS", arity = "1", converter = SelectorConverter.Class.class, description = "Select a class for test discovery. This option can be repeated.")
-		private List<ClassSelector> selectedClasses = new ArrayList<>();
-
-		@Option(names = { "--c",
-				"-select-class" }, arity = "1", hidden = true, converter = SelectorConverter.Class.class)
-		private List<ClassSelector> selectedClasses2 = new ArrayList<>();
-
-		@Option(names = { "-m",
-				"--select-method" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Method.class, description = "Select a method for test discovery. This option can be repeated.")
-		private List<MethodSelector> selectedMethods = new ArrayList<>();
-
-		@Option(names = { "--m",
-				"-select-method" }, arity = "1", hidden = true, converter = SelectorConverter.Method.class)
-		private List<MethodSelector> selectedMethods2 = new ArrayList<>();
-
-		@Option(names = { "-r",
-				"--select-resource" }, paramLabel = "RESOURCE", arity = "1", converter = SelectorConverter.ClasspathResource.class, description = "Select a classpath resource for test discovery. This option can be repeated.")
-		private List<ClasspathResourceSelector> selectedClasspathResources = new ArrayList<>();
-
-		@Option(names = { "--r",
-				"-select-resource" }, arity = "1", hidden = true, converter = SelectorConverter.ClasspathResource.class)
-		private List<ClasspathResourceSelector> selectedClasspathResources2 = new ArrayList<>();
-
-		@Option(names = { "-i",
-				"--select-iteration" }, paramLabel = "TYPE:VALUE[INDEX(..INDEX)?(,INDEX(..INDEX)?)*]", arity = "1", converter = SelectorConverter.Iteration.class, description = "Select iterations for test discovery (e.g. method:com.acme.Foo#m()[1..2]). This option can be repeated.")
-		private List<IterationSelector> selectedIterations = new ArrayList<>();
-
-		@Option(names = { "--i",
-				"-select-iteration" }, arity = "1", hidden = true, converter = SelectorConverter.Iteration.class)
-		private List<IterationSelector> selectedIterations2 = new ArrayList<>();
-
-		private void applyTo(ParseResult parseResult, CommandLineOptions result) {
-			result.setScanClasspath(parseResult.hasMatchedOption("scan-class-path")); // flag was specified
-			result.setScanModulepath(this.scanModulepath || this.scanModulepath2);
-			result.setSelectedModules(merge(this.selectedModules, this.selectedModules2));
-			result.setSelectedClasspathEntries(merge(this.selectedClasspathEntries, this.selectedClasspathEntries2));
-			result.setSelectedUris(merge(this.selectedUris, this.selectedUris2));
-			result.setSelectedFiles(merge(this.selectedFiles, this.selectedFiles2));
-			result.setSelectedDirectories(merge(this.selectedDirectories, this.selectedDirectories2));
-			result.setSelectedPackages(merge(this.selectedPackages, this.selectedPackages2));
-			result.setSelectedClasses(merge(this.selectedClasses, this.selectedClasses2));
-			result.setSelectedMethods(merge(this.selectedMethods, this.selectedMethods2));
-			result.setSelectedClasspathResources(
-				merge(this.selectedClasspathResources, this.selectedClasspathResources2));
-			result.setSelectedIterations(merge(this.selectedIterations, this.selectedIterations2));
-		}
-	}
-
-	static class FilterOptions {
-
-		@Option(names = { "-n",
-				"--include-classname" }, paramLabel = "PATTERN", defaultValue = ClassNameFilter.STANDARD_INCLUDE_PATTERN, arity = "1", description = "Provide a regular expression to include only classes whose fully qualified names match. " //
-						+ "To avoid loading classes unnecessarily, the default pattern only includes class " //
-						+ "names that begin with \"Test\" or end with \"Test\" or \"Tests\". " //
-						+ "When this option is repeated, all patterns will be combined using OR semantics. " //
-						+ "Default: ${DEFAULT-VALUE}")
-		private List<String> includeClassNamePatterns = new ArrayList<>();
-
-		@Option(names = { "--n", "-include-classname" }, arity = "1", hidden = true)
-		private List<String> includeClassNamePatterns2 = new ArrayList<>();
-
-		@Option(names = { "-N",
-				"--exclude-classname" }, paramLabel = "PATTERN", arity = "1", description = "Provide a regular expression to exclude those classes whose fully qualified names match. " //
-						+ "When this option is repeated, all patterns will be combined using OR semantics.")
-		private List<String> excludeClassNamePatterns = new ArrayList<>();
-
-		@Option(names = { "--N", "-exclude-classname" }, arity = "1", hidden = true)
-		private List<String> excludeClassNamePatterns2 = new ArrayList<>();
-
-		@Option(names = {
-				"--include-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be included in the test run. This option can be repeated.")
-		private List<String> includePackages = new ArrayList<>();
-
-		@Option(names = { "-include-package" }, arity = "1", hidden = true)
-		private List<String> includePackages2 = new ArrayList<>();
-
-		@Option(names = {
-				"--exclude-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be excluded from the test run. This option can be repeated.")
-		private List<String> excludePackages = new ArrayList<>();
-
-		@Option(names = { "-exclude-package" }, arity = "1", hidden = true)
-		private List<String> excludePackages2 = new ArrayList<>();
-
-		@Option(names = { "-t",
-				"--include-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to include only tests whose tags match. "
-						+ //
-						"When this option is repeated, all patterns will be combined using OR semantics.")
-		private List<String> includedTags = new ArrayList<>();
-
-		@Option(names = { "--t", "-include-tag" }, arity = "1", hidden = true)
-		private List<String> includedTags2 = new ArrayList<>();
-
-		@Option(names = { "-T",
-				"--exclude-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to exclude those tests whose tags match. "
-						+ //
-						"When this option is repeated, all patterns will be combined using OR semantics.")
-		private List<String> excludedTags = new ArrayList<>();
-
-		@Option(names = { "--T", "-exclude-tag" }, arity = "1", hidden = true)
-		private List<String> excludedTags2 = new ArrayList<>();
-
-		@Option(names = { "-e",
-				"--include-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be included in the test run. This option can be repeated.")
-		private List<String> includedEngines = new ArrayList<>();
-
-		@Option(names = { "--e", "-include-engine" }, arity = "1", hidden = true)
-		private List<String> includedEngines2 = new ArrayList<>();
-
-		@Option(names = { "-E",
-				"--exclude-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be excluded from the test run. This option can be repeated.")
-		private List<String> excludedEngines = new ArrayList<>();
-
-		@Option(names = { "--E", "-exclude-engine" }, arity = "1", hidden = true)
-		private List<String> excludedEngines2 = new ArrayList<>();
-
-		private void applyTo(CommandLineOptions result) {
-			result.setIncludedClassNamePatterns(merge(this.includeClassNamePatterns, this.includeClassNamePatterns2));
-			result.setExcludedClassNamePatterns(merge(this.excludeClassNamePatterns, this.excludeClassNamePatterns2));
-			result.setIncludedPackages(merge(this.includePackages, this.includePackages2));
-			result.setExcludedPackages(merge(this.excludePackages, this.excludePackages2));
-			result.setIncludedTagExpressions(merge(this.includedTags, this.includedTags2));
-			result.setExcludedTagExpressions(merge(this.excludedTags, this.excludedTags2));
-			result.setIncludedEngines(merge(this.includedEngines, this.includedEngines2));
-			result.setExcludedEngines(merge(this.excludedEngines, this.excludedEngines2));
-		}
-	}
-
-	static class RuntimeConfigurationOptions {
-
-		@Option(names = { "-" + CP_OPTION, "--classpath",
-				"--class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "1", description = "Provide additional classpath entries "
-						+ "-- for example, for adding engines and their dependencies. This option can be repeated.")
-		private List<Path> additionalClasspathEntries = new ArrayList<>();
-
-		@Option(names = { "--cp", "-classpath",
-				"-class-path" }, converter = ClasspathEntriesConverter.class, hidden = true)
-		private List<Path> additionalClasspathEntries2 = new ArrayList<>();
-
-		// Implementation note: the @Option annotation is on a setter method to allow validation.
-		private Map<String, String> configurationParameters = new LinkedHashMap<>();
-
-		@Spec
-		private CommandSpec spec;
-
-		@Option(names = { "-config" }, arity = "1", hidden = true)
-		public void setConfigurationParameters2(Map<String, String> keyValuePairs) {
-			setConfigurationParameters(keyValuePairs);
-		}
-
-		/**
-		 * Adds the specified key-value pair (or pairs) to the configuration parameters.
-		 * A {@code ParameterException} is thrown if the same key is specified multiple times
-		 * on the command line.
-		 *
-		 * @param map the key-value pairs to add
-		 * @throws picocli.CommandLine.ParameterException if the map already contains this key
-		 * @see <a href="https://github.com/junit-team/junit5/issues/1308">#1308</a>
-		 */
-		@Option(names = "--config", paramLabel = "KEY=VALUE", arity = "1", description = "Set a configuration parameter for test discovery and execution. This option can be repeated.")
-		public void setConfigurationParameters(Map<String, String> map) {
-			for (String key : map.keySet()) {
-				String newValue = map.get(key);
-				validateUnique(key, newValue);
-				configurationParameters.put(key, newValue);
-			}
-		}
-
-		private void validateUnique(String key, String newValue) {
-			String existing = configurationParameters.get(key);
-			if (existing != null && !existing.equals(newValue)) {
-				throw new ParameterException(spec.commandLine(),
-					String.format("Duplicate key '%s' for values '%s' and '%s'.", key, existing, newValue));
-			}
-		}
-
-		private void applyTo(CommandLineOptions result) {
-			result.setAdditionalClasspathEntries(merge(additionalClasspathEntries, additionalClasspathEntries2));
-			result.setConfigurationParameters(configurationParameters);
-		}
-	}
-
-	static class ReportingOptions {
-
-		@Option(names = "--fail-if-no-tests", description = "Fail and return exit status code 2 if no tests are found.")
-		private boolean failIfNoTests; // no single-dash equivalent: was introduced in 5.3-M1
-
-		@Option(names = "--reports-dir", paramLabel = "DIR", description = "Enable report output into a specified local directory (will be created if it does not exist).")
-		private Path reportsDir;
-
-		@Option(names = "-reports-dir", hidden = true)
-		private Path reportsDir2;
-
-		private void applyTo(CommandLineOptions result) {
-			result.setFailIfNoTests(this.failIfNoTests);
-			result.setReportsDir(choose(this.reportsDir, this.reportsDir2, null));
-		}
-	}
-
-	static class ConsoleOutputOptions {
-		@Option(names = "--disable-ansi-colors", description = "Disable ANSI colors in output (not supported by all terminals).")
-		private boolean disableAnsiColors;
-
-		@Option(names = "-disable-ansi-colors", hidden = true)
-		private boolean disableAnsiColors2;
-
-		@Option(names = "--color-palette", paramLabel = "FILE", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
-		private Path colorPalette;
-		@Option(names = "-color-palette", hidden = true)
-		private Path colorPalette2;
-
-		@Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
-		private boolean singleColorPalette;
-		@Option(names = "-single-color", hidden = true)
-		private boolean singleColorPalette2;
-
-		@Option(names = "--disable-banner", description = "Disable print out of the welcome message.")
-		private boolean disableBanner;
-
-		@Option(names = "-disable-banner", hidden = true)
-		private boolean disableBanner2;
-
-		@Option(names = "--details", paramLabel = "MODE", defaultValue = DEFAULT_DETAILS_NAME, description = "Select an output details mode for when tests are executed. " //
-				+ "Use one of: ${COMPLETION-CANDIDATES}. If 'none' is selected, " //
-				+ "then only the summary and test failures are shown. Default: ${DEFAULT-VALUE}.")
-		private Details details = DEFAULT_DETAILS;
-
-		@Option(names = "-details", hidden = true, defaultValue = DEFAULT_DETAILS_NAME)
-		private Details details2 = DEFAULT_DETAILS;
-
-		@Option(names = "--details-theme", paramLabel = "THEME", description = "Select an output details tree theme for when tests are executed. "
-				+ "Use one of: ${COMPLETION-CANDIDATES}. Default is detected based on default character encoding.")
-		private Theme theme = DEFAULT_THEME;
-
-		@Option(names = "-details-theme", hidden = true)
-		private Theme theme2 = DEFAULT_THEME;
-
-		private void applyTo(CommandLineOptions result) {
-			result.setAnsiColorOutputDisabled(disableAnsiColors || disableAnsiColors2);
-			result.setColorPalettePath(choose(colorPalette, colorPalette2, null));
-			result.setSingleColorPalette(singleColorPalette || singleColorPalette2);
-			result.setBannerDisabled(disableBanner || disableBanner2);
-			result.setDetails(choose(details, details2, DEFAULT_DETAILS));
-			result.setTheme(choose(theme, theme2, DEFAULT_THEME));
-		}
-	}
-
-	AvailableOptions() {
-	}
-
-	CommandLine getParser() {
-		CommandLine result = new CommandLine(this);
-		result.setCaseInsensitiveEnumValuesAllowed(true);
-		result.setAtFileCommentChar(null); // for --select-method com.acme.Foo#m()
-		return result;
-	}
-
-	CommandLineOptions toCommandLineOptions(ParseResult parseResult) {
-		CommandLineOptions result = new CommandLineOptions();
-		if (commandOptions != null) {
-			this.commandOptions.applyTo(result);
-		}
-		if (this.selectorOptions != null) {
-			this.selectorOptions.applyTo(parseResult, result);
-		}
-		if (this.filterOptions != null) {
-			this.filterOptions.applyTo(result);
-		}
-		if (this.runtimeConfigurationOptions != null) {
-			this.runtimeConfigurationOptions.applyTo(result);
-		}
-		if (this.reportingOptions != null) {
-			this.reportingOptions.applyTo(result);
-		}
-		if (this.consoleOutputOptions != null) {
-			this.consoleOutputOptions.applyTo(result);
-		}
-		return result;
-	}
-
-	private static <T> List<T> merge(List<T> list1, List<T> list2) {
-		List<T> result = new ArrayList<>(list1);
-		result.addAll(list2);
-		return result;
-	}
-
-	private static <T> T choose(T left, T right, T defaultValue) {
-		return left == right ? left : (left == defaultValue ? right : left);
-	}
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
index a92c6b1337ce..5396f5f1c11a 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
@@ -67,7 +67,7 @@ static class SelectorOptions {
 				"-scan-classpath" }, converter = ClasspathEntriesConverter.class, arity = "0..1", hidden = true)
 		private List<Path> selectedClasspathEntries2;
 
-		@CommandLine.Option(names = "--scan-modules", description = "EXPERIMENTAL: Scan all resolved modules for test discovery.")
+		@CommandLine.Option(names = "--scan-modules", description = "Scan all resolved modules for test discovery.")
 		private boolean scanModulepath;
 
 		@CommandLine.Option(names = "-scan-modules", hidden = true)
@@ -98,7 +98,7 @@ static class SelectorOptions {
 		private List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
 
 		@CommandLine.Option(names = { "-o",
-				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "EXPERIMENTAL: Select single module for test discovery. This option can be repeated.")
+				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "Select single module for test discovery. This option can be repeated.")
 		private List<ModuleSelector> selectedModules = new ArrayList<>();
 
 		@CommandLine.Option(names = { "--o",
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
deleted file mode 100644
index b460540e4add..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsParser.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import static org.apiguardian.api.API.Status.INTERNAL;
-
-import java.io.Writer;
-
-import org.apiguardian.api.API;
-
-/**
- * @since 1.0
- */
-@API(status = INTERNAL, since = "1.0")
-public interface CommandLineOptionsParser {
-
-	CommandLineOptions parse(String... arguments);
-
-	void printHelp(Writer writer, boolean ansiColorOutputDisabled);
-
-}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
deleted file mode 100644
index a064c1285fdf..000000000000
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/PicocliCommandLineOptionsParser.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.platform.console.options;
-
-import static org.apiguardian.api.API.Status.INTERNAL;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.apiguardian.api.API;
-import org.junit.platform.commons.JUnitException;
-
-import picocli.CommandLine;
-import picocli.CommandLine.ParseResult;
-
-/**
- * @since 1.0
- */
-@API(status = INTERNAL, since = "1.0")
-public class PicocliCommandLineOptionsParser implements CommandLineOptionsParser {
-
-	@Override
-	public CommandLineOptions parse(String... arguments) {
-		AvailableOptions availableOptions = getAvailableOptions();
-		CommandLine parser = availableOptions.getParser();
-		try {
-			ParseResult detectedOptions = parser.parseArgs(arguments);
-			return availableOptions.toCommandLineOptions(detectedOptions);
-		}
-		catch (Exception ex) {
-			throw new JUnitException("Error parsing command-line arguments: " + ex.getMessage(), ex);
-		}
-	}
-
-	@Override
-	public void printHelp(Writer writer, boolean ansiColorOutputDisabled) {
-		try {
-			CommandLine parser = getAvailableOptions().getParser();
-			if (ansiColorOutputDisabled) {
-				parser.setColorScheme(CommandLine.Help.defaultColorScheme(CommandLine.Help.Ansi.OFF));
-			}
-			writer.append(parser.getUsageMessage());
-		}
-		catch (IOException ex) {
-			throw new JUnitException("Error printing help", ex);
-		}
-	}
-
-	private AvailableOptions getAvailableOptions() {
-		return new AvailableOptions();
-	}
-
-}

From 1a31235c15699b8805629e12d5a27e831a2d3a99 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 1 Mar 2023 22:13:58 +0100
Subject: [PATCH 1215/1433] Hide implementation details

---
 .../platform/console/ConsoleLauncher.java     |  4 +-
 .../console/options/CommandFacade.java        | 39 +++++++++++++++++++
 .../options/CommandLineOptionsMixin.java      |  2 +-
 .../console/options/DiscoverTestsCommand.java |  3 +-
 .../console/options/ExecuteTestsCommand.java  |  3 +-
 .../options/ListTestEnginesCommand.java       |  3 +-
 .../platform/console/options/MainCommand.java | 17 +++-----
 .../console/options/OutputOptionsMixin.java   |  2 +-
 8 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index fda92040f17f..59e71a22bf13 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -17,9 +17,9 @@
 import java.util.function.Function;
 
 import org.apiguardian.api.API;
+import org.junit.platform.console.options.CommandFacade;
 import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.CommandResult;
-import org.junit.platform.console.options.MainCommand;
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 /**
@@ -57,7 +57,7 @@ public static CommandResult<?> run(PrintWriter out, PrintWriter err, String... a
 
 	CommandResult<?> run(String... args) {
 		try {
-			return new MainCommand(consoleTestExecutorFactory).run(out, err, args);
+			return new CommandFacade(consoleTestExecutorFactory).run(out, err, args);
 		}
 		finally {
 			out.flush();
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java
new file mode 100644
index 000000000000..30bd7d6eb3e7
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.io.PrintWriter;
+import java.util.function.Function;
+
+import org.apiguardian.api.API;
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
+
+/**
+ * Internal facade to run a CLI command that exists to hide implementation
+ * details such as the used library.
+ *
+ * @since 1.10
+ */
+@API(status = INTERNAL, since = "1.10")
+public class CommandFacade {
+
+	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
+
+	public CommandFacade(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
+	}
+
+	public CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
+		return new MainCommand(consoleTestExecutorFactory).run(out, err, args);
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
index 5396f5f1c11a..179ac65e9814 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
@@ -34,7 +34,7 @@
 
 import picocli.CommandLine;
 
-public class CommandLineOptionsMixin {
+class CommandLineOptionsMixin {
 
 	private static final String CP_OPTION = "cp";
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
index d8b94cbb6fc6..94596d8fce6e 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
@@ -20,7 +20,8 @@
 
 @Command(//
 		name = "discover", //
-		description = "Discover tests")
+		description = "Discover tests" //
+)
 class DiscoverTestsCommand extends BaseCommand<Void> {
 
 	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
index 2cbb48d20812..7791cc24ff76 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
@@ -22,7 +22,8 @@
 
 @Command(//
 		name = "execute", //
-		description = "Execute tests")
+		description = "Execute tests" //
+)
 class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements CommandLine.IExitCodeGenerator {
 
 	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
index fd18d739a99e..15879ac37e1e 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
@@ -22,7 +22,8 @@
 
 @Command(//
 		name = "engines", //
-		description = "List available test engines")
+		description = "List available test engines" //
+)
 class ListTestEnginesCommand extends BaseCommand<Void> {
 
 	@Override
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
index 5ad88f3d2869..13668618222f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -10,8 +10,6 @@
 
 package org.junit.platform.console.options;
 
-import static org.apiguardian.api.API.Status.INTERNAL;
-
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,7 +17,6 @@
 import java.util.concurrent.Callable;
 import java.util.function.Function;
 
-import org.apiguardian.api.API;
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 import picocli.CommandLine;
@@ -30,9 +27,6 @@
 import picocli.CommandLine.Spec;
 import picocli.CommandLine.Unmatched;
 
-/**
- * @since 1.10
- */
 @Command(//
 		name = "junit", //
 		abbreviateSynopsis = true, //
@@ -48,8 +42,7 @@
 		exitCodeOnInvalidInput = CommandResult.FAILURE, //
 		exitCodeOnExecutionException = CommandResult.FAILURE //
 )
-@API(status = INTERNAL, since = "1.10")
-public class MainCommand implements Callable<Object>, IExitCodeGenerator {
+class MainCommand implements Callable<Object>, IExitCodeGenerator {
 
 	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
 	@Option(names = { "-h", "--help" }, help = true, hidden = true)
@@ -66,7 +59,7 @@ public class MainCommand implements Callable<Object>, IExitCodeGenerator {
 
 	CommandResult<?> commandResult;
 
-	public MainCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+	MainCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
@@ -123,9 +116,9 @@ private static void printDeprecationWarning(String subcommand, Optional<String>
 		err.flush();
 	}
 
-	public CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
-		CommandLine commandLine = new CommandLine(this).addSubcommand(
-			new DiscoverTestsCommand(consoleTestExecutorFactory)) //
+	CommandResult<?> run(PrintWriter out, PrintWriter err, String[] args) {
+		CommandLine commandLine = new CommandLine(this) //
+				.addSubcommand(new DiscoverTestsCommand(consoleTestExecutorFactory)) //
 				.addSubcommand(new ExecuteTestsCommand(consoleTestExecutorFactory)) //
 				.addSubcommand(new ListTestEnginesCommand());
 		return runCommand(out, err, args, commandLine);
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
index 7051281dc284..6f18f7e06fae 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/OutputOptionsMixin.java
@@ -18,7 +18,7 @@
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Spec;
 
-public class OutputOptionsMixin {
+class OutputOptionsMixin {
 
 	@Spec(MIXEE)
 	CommandSpec commandSpec;

From 6443b656d9ab9de81e5fe864c1c2412f457dc2ce Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 3 Mar 2023 15:42:11 +0100
Subject: [PATCH 1216/1433] Make error message actionable

---
 .../junit/platform/console/options/BaseCommand.java    | 10 +++++++++-
 .../console/tasks/DiscoveryRequestCreator.java         |  3 ++-
 .../console/ConsoleLauncherIntegrationTests.java       |  5 +++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
index 6fa50e1e500c..720770975604 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
@@ -13,10 +13,13 @@
 import java.io.PrintWriter;
 import java.util.concurrent.Callable;
 
+import org.junit.platform.commons.PreconditionViolationException;
+
 import picocli.CommandLine;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
+import picocli.CommandLine.ParameterException;
 import picocli.CommandLine.Spec;
 
 abstract class BaseCommand<T> implements Callable<T> {
@@ -55,7 +58,12 @@ public final T call() {
 		if (!outputOptions.isDisableBanner()) {
 			displayBanner(out);
 		}
-		return execute(out);
+		try {
+			return execute(out);
+		}
+		catch (PreconditionViolationException e) {
+			throw new ParameterException(commandSpec.commandLine(), e.getMessage(), e.getCause());
+		}
 	}
 
 	private PrintWriter getOut() {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
index 2fb1ea03a74b..c6e0dfa06004 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
@@ -69,7 +69,8 @@ private List<? extends DiscoverySelector> createDiscoverySelectors(CommandLineOp
 				"Scanning the module-path and using explicit selectors at the same time is not supported");
 			return selectModules(ModuleUtils.findAllNonSystemBootModuleNames());
 		}
-		return Preconditions.notEmpty(explicitSelectors, "No arguments were supplied to the ConsoleLauncher");
+		return Preconditions.notEmpty(explicitSelectors,
+			"Please specify an explicit selector option or use --scan-class-path or --scan-modules");
 	}
 
 	private List<ClasspathRootSelector> createClasspathRootSelectors(CommandLineOptions options) {
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
index 96121c573333..c325729acf3e 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
@@ -26,8 +26,9 @@ class ConsoleLauncherIntegrationTests {
 	void executeWithoutArgumentsFailsAndPrintsHelpInformation() {
 		var result = new ConsoleLauncherWrapper().execute(-1);
 		assertAll("empty args array results in display of help information and an exception stacktrace", //
-			() -> assertThat(result.out).contains("help information"), //
-			() -> assertThat(result.err).contains("No arguments were supplied to the ConsoleLauncher") //
+			() -> assertThat(result.err).contains("help information"), //
+			() -> assertThat(result.err).contains(
+				"Please specify an explicit selector option or use --scan-class-path or --scan-modules") //
 		);
 	}
 

From 19f44a63fbff3ff7bebbab021e7b70ade9b7f183 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Mar 2023 11:59:50 +0100
Subject: [PATCH 1217/1433] Remove unused option

---
 .../platform/console/options/CommandLineOptions.java     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index 6e97889027b4..d7fd31903941 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -50,7 +50,6 @@ public class CommandLineOptions {
 	private boolean ansiColorOutputDisabled;
 	private Path colorPalettePath;
 	private boolean isSingleColorPalette;
-	private boolean bannerDisabled;
 	private Details details = DEFAULT_DETAILS;
 	private Theme theme = DEFAULT_THEME;
 	private List<Path> additionalClasspathEntries = emptyList();
@@ -108,14 +107,6 @@ public void setSingleColorPalette(boolean singleColorPalette) {
 		this.isSingleColorPalette = singleColorPalette;
 	}
 
-	public boolean isBannerDisabled() {
-		return this.bannerDisabled;
-	}
-
-	public void setBannerDisabled(boolean bannerDisabled) {
-		this.bannerDisabled = bannerDisabled;
-	}
-
 	public boolean isScanModulepath() {
 		return this.scanModulepath;
 	}

From c437f7631f7ea9fb7b9b4f2c940f05dfe3ace639 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Mar 2023 13:02:20 +0100
Subject: [PATCH 1218/1433] Move execution-specific options to corresponding
 command

---
 .../platform/console/options/BaseCommand.java |  12 ++
 .../console/options/CommandLineOptions.java   |  20 ---
 .../options/CommandLineOptionsMixin.java      | 138 ++++++++----------
 .../console/options/CommandResult.java        |  18 ---
 .../console/options/ExecuteTestsCommand.java  |  64 ++++++--
 .../platform/console/options/MainCommand.java |   3 +-
 .../console/tasks/ConsoleTestExecutor.java    |  17 ++-
 .../CommandLineOptionsParsingTests.java       |  18 +--
 .../options/ExecuteTestsCommandTests.java     |  56 +++++--
 .../tasks/ConsoleTestExecutorTests.java       |  82 ++---------
 10 files changed, 193 insertions(+), 235 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
index 720770975604..189bfafc8863 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
@@ -34,6 +34,18 @@ abstract class BaseCommand<T> implements Callable<T> {
 	@Option(names = { "-h", "--help" }, usageHelp = true, description = "Display help information.")
 	private boolean helpRequested;
 
+	void execute(String... args) {
+		toCommandLine().execute(args);
+	}
+
+	void parseArgs(String... args) {
+		toCommandLine().parseArgs(args);
+	}
+
+	private CommandLine toCommandLine() {
+		return BaseCommand.initialize(new CommandLine(this));
+	}
+
 	static CommandLine initialize(CommandLine commandLine) {
 		CommandLine.IParameterExceptionHandler defaultParameterExceptionHandler = commandLine.getParameterExceptionHandler();
 		return commandLine //
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
index d7fd31903941..4b1f0610698d 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 
 import org.apiguardian.api.API;
 import org.junit.platform.engine.DiscoverySelector;
@@ -53,7 +52,6 @@ public class CommandLineOptions {
 	private Details details = DEFAULT_DETAILS;
 	private Theme theme = DEFAULT_THEME;
 	private List<Path> additionalClasspathEntries = emptyList();
-	private boolean failIfNoTests;
 
 	private boolean scanClasspath;
 	private List<Path> selectedClasspathEntries = emptyList();
@@ -79,8 +77,6 @@ public class CommandLineOptions {
 	private List<String> includedTagExpressions = emptyList();
 	private List<String> excludedTagExpressions = emptyList();
 
-	private Path reportsDir;
-
 	private Map<String, String> configurationParameters = emptyMap();
 
 	public boolean isAnsiColorOutputDisabled() {
@@ -151,14 +147,6 @@ public void setAdditionalClasspathEntries(List<Path> additionalClasspathEntries)
 		this.additionalClasspathEntries = additionalClasspathEntries;
 	}
 
-	public boolean isFailIfNoTests() {
-		return this.failIfNoTests;
-	}
-
-	public void setFailIfNoTests(boolean failIfNoTests) {
-		this.failIfNoTests = failIfNoTests;
-	}
-
 	public List<Path> getSelectedClasspathEntries() {
 		return this.selectedClasspathEntries;
 	}
@@ -317,14 +305,6 @@ public void setExcludedTagExpressions(List<String> excludedTags) {
 		this.excludedTagExpressions = excludedTags;
 	}
 
-	public Optional<Path> getReportsDir() {
-		return Optional.ofNullable(this.reportsDir);
-	}
-
-	public void setReportsDir(Path reportsDir) {
-		this.reportsDir = reportsDir;
-	}
-
 	public Map<String, String> getConfigurationParameters() {
 		return this.configurationParameters;
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
index 179ac65e9814..71a51b42383d 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
@@ -33,29 +33,28 @@
 import org.junit.platform.engine.discovery.UriSelector;
 
 import picocli.CommandLine;
+import picocli.CommandLine.ArgGroup;
+import picocli.CommandLine.Option;
 
 class CommandLineOptionsMixin {
 
 	private static final String CP_OPTION = "cp";
 
-	@CommandLine.ArgGroup(validate = false, order = 2, heading = "%n@|bold SELECTORS|@%n%n")
+	@ArgGroup(validate = false, order = 2, heading = "%n@|bold SELECTORS|@%n%n")
 	SelectorOptions selectorOptions;
 
-	@CommandLine.ArgGroup(validate = false, order = 3, heading = "%n@|bold FILTERS|@%n%n")
+	@ArgGroup(validate = false, order = 3, heading = "%n@|bold FILTERS|@%n%n")
 	FilterOptions filterOptions;
 
-	@CommandLine.ArgGroup(validate = false, order = 4, heading = "%n@|bold RUNTIME CONFIGURATION|@%n%n")
+	@ArgGroup(validate = false, order = 4, heading = "%n@|bold RUNTIME CONFIGURATION|@%n%n")
 	RuntimeConfigurationOptions runtimeConfigurationOptions;
 
-	@CommandLine.ArgGroup(validate = false, order = 5, heading = "%n@|bold REPORTING|@%n%n")
-	ReportingOptions reportingOptions;
-
-	@CommandLine.ArgGroup(validate = false, order = 6, heading = "%n@|bold CONSOLE OUTPUT|@%n%n")
+	@ArgGroup(validate = false, order = 5, heading = "%n@|bold CONSOLE OUTPUT|@%n%n")
 	ConsoleOutputOptions consoleOutputOptions = new ConsoleOutputOptions();
 
 	static class SelectorOptions {
 
-		@CommandLine.Option(names = { "--scan-classpath",
+		@Option(names = { "--scan-classpath",
 				"--scan-class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "0..1", description = "Scan all directories on the classpath or explicit classpath roots. " //
 						+ "Without arguments, only directories on the system classpath as well as additional classpath " //
 						+ "entries supplied via -" + CP_OPTION + " (directories and JAR files) are scanned. " //
@@ -63,88 +62,89 @@ static class SelectorOptions {
 						+ "This option can be repeated.")
 		private List<Path> selectedClasspathEntries;
 
-		@CommandLine.Option(names = { "-scan-class-path",
+		@Option(names = { "-scan-class-path",
 				"-scan-classpath" }, converter = ClasspathEntriesConverter.class, arity = "0..1", hidden = true)
 		private List<Path> selectedClasspathEntries2;
 
-		@CommandLine.Option(names = "--scan-modules", description = "Scan all resolved modules for test discovery.")
+		@Option(names = "--scan-modules", description = "Scan all resolved modules for test discovery.")
 		private boolean scanModulepath;
 
-		@CommandLine.Option(names = "-scan-modules", hidden = true)
+		@Option(names = "-scan-modules", hidden = true)
 		private boolean scanModulepath2;
 
-		@CommandLine.Option(names = { "-u",
+		@Option(names = { "-u",
 				"--select-uri" }, paramLabel = "URI", arity = "1", converter = SelectorConverter.Uri.class, description = "Select a URI for test discovery. This option can be repeated.")
 		private List<UriSelector> selectedUris = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--u",
-				"-select-uri" }, arity = "1", hidden = true, converter = SelectorConverter.Uri.class)
+		@Option(names = { "--u", "-select-uri" }, arity = "1", hidden = true, converter = SelectorConverter.Uri.class)
 		private List<UriSelector> selectedUris2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-f",
+		@Option(names = { "-f",
 				"--select-file" }, paramLabel = "FILE", arity = "1", converter = SelectorConverter.File.class, description = "Select a file for test discovery. This option can be repeated.")
 		private List<FileSelector> selectedFiles = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--f",
-				"-select-file" }, arity = "1", hidden = true, converter = SelectorConverter.File.class)
+		@Option(names = { "--f", "-select-file" }, arity = "1", hidden = true, converter = SelectorConverter.File.class)
 		private List<FileSelector> selectedFiles2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-d",
+		@Option(names = { "-d",
 				"--select-directory" }, paramLabel = "DIR", arity = "1", converter = SelectorConverter.Directory.class, description = "Select a directory for test discovery. This option can be repeated.")
 		private List<DirectorySelector> selectedDirectories = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--d",
+		@Option(names = { "--d",
 				"-select-directory" }, arity = "1", hidden = true, converter = SelectorConverter.Directory.class)
 		private List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-o",
+		@Option(names = { "-o",
 				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "Select single module for test discovery. This option can be repeated.")
 		private List<ModuleSelector> selectedModules = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--o",
+		@Option(names = { "--o",
 				"-select-module" }, arity = "1", converter = SelectorConverter.Module.class, hidden = true)
 		private List<ModuleSelector> selectedModules2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-p",
+		@Option(names = { "-p",
 				"--select-package" }, paramLabel = "PKG", arity = "1", converter = SelectorConverter.Package.class, description = "Select a package for test discovery. This option can be repeated.")
 		private List<PackageSelector> selectedPackages = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--p",
+		@Option(names = { "--p",
 				"-select-package" }, arity = "1", hidden = true, converter = SelectorConverter.Package.class)
 		private List<PackageSelector> selectedPackages2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-c",
+		@Option(names = { "-c",
 				"--select-class" }, paramLabel = "CLASS", arity = "1", converter = SelectorConverter.Class.class, description = "Select a class for test discovery. This option can be repeated.")
 		private List<ClassSelector> selectedClasses = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--c",
+		@Option(names = { "--c",
 				"-select-class" }, arity = "1", hidden = true, converter = SelectorConverter.Class.class)
 		private List<ClassSelector> selectedClasses2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-m",
+		@Option(names = { "-m",
 				"--select-method" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Method.class, description = "Select a method for test discovery. This option can be repeated.")
 		private List<MethodSelector> selectedMethods = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--m",
+		@Option(names = { "--m",
 				"-select-method" }, arity = "1", hidden = true, converter = SelectorConverter.Method.class)
 		private List<MethodSelector> selectedMethods2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-r",
+		@Option(names = { "-r",
 				"--select-resource" }, paramLabel = "RESOURCE", arity = "1", converter = SelectorConverter.ClasspathResource.class, description = "Select a classpath resource for test discovery. This option can be repeated.")
 		private List<ClasspathResourceSelector> selectedClasspathResources = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--r",
+		@Option(names = { "--r",
 				"-select-resource" }, arity = "1", hidden = true, converter = SelectorConverter.ClasspathResource.class)
 		private List<ClasspathResourceSelector> selectedClasspathResources2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-i",
+		@Option(names = { "-i",
 				"--select-iteration" }, paramLabel = "TYPE:VALUE[INDEX(..INDEX)?(,INDEX(..INDEX)?)*]", arity = "1", converter = SelectorConverter.Iteration.class, description = "Select iterations for test discovery (e.g. method:com.acme.Foo#m()[1..2]). This option can be repeated.")
 		private List<IterationSelector> selectedIterations = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--i",
+		@Option(names = { "--i",
 				"-select-iteration" }, arity = "1", hidden = true, converter = SelectorConverter.Iteration.class)
 		private List<IterationSelector> selectedIterations2 = new ArrayList<>();
 
+		SelectorOptions() {
+		}
+
 		private void applyTo(CommandLineOptions result) {
 			result.setScanClasspath(this.selectedClasspathEntries != null || this.selectedClasspathEntries2 != null); // flag was specified
 			result.setScanModulepath(this.scanModulepath || this.scanModulepath2);
@@ -164,7 +164,7 @@ private void applyTo(CommandLineOptions result) {
 
 	static class FilterOptions {
 
-		@CommandLine.Option(names = { "-n",
+		@Option(names = { "-n",
 				"--include-classname" }, paramLabel = "PATTERN", defaultValue = ClassNameFilter.STANDARD_INCLUDE_PATTERN, arity = "1", description = "Provide a regular expression to include only classes whose fully qualified names match. " //
 						+ "To avoid loading classes unnecessarily, the default pattern only includes class " //
 						+ "names that begin with \"Test\" or end with \"Test\" or \"Tests\". " //
@@ -172,61 +172,61 @@ static class FilterOptions {
 						+ "Default: ${DEFAULT-VALUE}")
 		private List<String> includeClassNamePatterns = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--n", "-include-classname" }, arity = "1", hidden = true)
+		@Option(names = { "--n", "-include-classname" }, arity = "1", hidden = true)
 		private List<String> includeClassNamePatterns2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-N",
+		@Option(names = { "-N",
 				"--exclude-classname" }, paramLabel = "PATTERN", arity = "1", description = "Provide a regular expression to exclude those classes whose fully qualified names match. " //
 						+ "When this option is repeated, all patterns will be combined using OR semantics.")
 		private List<String> excludeClassNamePatterns = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--N", "-exclude-classname" }, arity = "1", hidden = true)
+		@Option(names = { "--N", "-exclude-classname" }, arity = "1", hidden = true)
 		private List<String> excludeClassNamePatterns2 = new ArrayList<>();
 
-		@CommandLine.Option(names = {
+		@Option(names = {
 				"--include-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be included in the test run. This option can be repeated.")
 		private List<String> includePackages = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-include-package" }, arity = "1", hidden = true)
+		@Option(names = { "-include-package" }, arity = "1", hidden = true)
 		private List<String> includePackages2 = new ArrayList<>();
 
-		@CommandLine.Option(names = {
+		@Option(names = {
 				"--exclude-package" }, paramLabel = "PKG", arity = "1", description = "Provide a package to be excluded from the test run. This option can be repeated.")
 		private List<String> excludePackages = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-exclude-package" }, arity = "1", hidden = true)
+		@Option(names = { "-exclude-package" }, arity = "1", hidden = true)
 		private List<String> excludePackages2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-t",
+		@Option(names = { "-t",
 				"--include-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to include only tests whose tags match. "
 						+ //
 						"When this option is repeated, all patterns will be combined using OR semantics.")
 		private List<String> includedTags = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--t", "-include-tag" }, arity = "1", hidden = true)
+		@Option(names = { "--t", "-include-tag" }, arity = "1", hidden = true)
 		private List<String> includedTags2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-T",
+		@Option(names = { "-T",
 				"--exclude-tag" }, paramLabel = "TAG", arity = "1", description = "Provide a tag or tag expression to exclude those tests whose tags match. "
 						+ //
 						"When this option is repeated, all patterns will be combined using OR semantics.")
 		private List<String> excludedTags = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--T", "-exclude-tag" }, arity = "1", hidden = true)
+		@Option(names = { "--T", "-exclude-tag" }, arity = "1", hidden = true)
 		private List<String> excludedTags2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-e",
+		@Option(names = { "-e",
 				"--include-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be included in the test run. This option can be repeated.")
 		private List<String> includedEngines = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--e", "-include-engine" }, arity = "1", hidden = true)
+		@Option(names = { "--e", "-include-engine" }, arity = "1", hidden = true)
 		private List<String> includedEngines2 = new ArrayList<>();
 
-		@CommandLine.Option(names = { "-E",
+		@Option(names = { "-E",
 				"--exclude-engine" }, paramLabel = "ID", arity = "1", description = "Provide the ID of an engine to be excluded from the test run. This option can be repeated.")
 		private List<String> excludedEngines = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--E", "-exclude-engine" }, arity = "1", hidden = true)
+		@Option(names = { "--E", "-exclude-engine" }, arity = "1", hidden = true)
 		private List<String> excludedEngines2 = new ArrayList<>();
 
 		private void applyTo(CommandLineOptions result) {
@@ -243,12 +243,12 @@ private void applyTo(CommandLineOptions result) {
 
 	static class RuntimeConfigurationOptions {
 
-		@CommandLine.Option(names = { "-" + CP_OPTION, "--classpath",
+		@Option(names = { "-" + CP_OPTION, "--classpath",
 				"--class-path" }, converter = ClasspathEntriesConverter.class, paramLabel = "PATH", arity = "1", description = "Provide additional classpath entries "
 						+ "-- for example, for adding engines and their dependencies. This option can be repeated.")
 		private List<Path> additionalClasspathEntries = new ArrayList<>();
 
-		@CommandLine.Option(names = { "--cp", "-classpath",
+		@Option(names = { "--cp", "-classpath",
 				"-class-path" }, converter = ClasspathEntriesConverter.class, hidden = true)
 		private List<Path> additionalClasspathEntries2 = new ArrayList<>();
 
@@ -258,7 +258,7 @@ static class RuntimeConfigurationOptions {
 		@CommandLine.Spec
 		private CommandLine.Model.CommandSpec spec;
 
-		@CommandLine.Option(names = { "-config" }, arity = "1", hidden = true)
+		@Option(names = { "-config" }, arity = "1", hidden = true)
 		public void setConfigurationParameters2(Map<String, String> keyValuePairs) {
 			setConfigurationParameters(keyValuePairs);
 		}
@@ -272,7 +272,7 @@ public void setConfigurationParameters2(Map<String, String> keyValuePairs) {
 		 * @throws CommandLine.ParameterException if the map already contains this key
 		 * @see <a href="https://github.com/junit-team/junit5/issues/1308">#1308</a>
 		 */
-		@CommandLine.Option(names = "--config", paramLabel = "KEY=VALUE", arity = "1", description = "Set a configuration parameter for test discovery and execution. This option can be repeated.")
+		@Option(names = "--config", paramLabel = "KEY=VALUE", arity = "1", description = "Set a configuration parameter for test discovery and execution. This option can be repeated.")
 		public void setConfigurationParameters(Map<String, String> map) {
 			for (String key : map.keySet()) {
 				String newValue = map.get(key);
@@ -295,48 +295,31 @@ private void applyTo(CommandLineOptions result) {
 		}
 	}
 
-	static class ReportingOptions {
-
-		@CommandLine.Option(names = "--fail-if-no-tests", description = "Fail and return exit status code 2 if no tests are found.")
-		private boolean failIfNoTests; // no single-dash equivalent: was introduced in 5.3-M1
-
-		@CommandLine.Option(names = "--reports-dir", paramLabel = "DIR", description = "Enable report output into a specified local directory (will be created if it does not exist).")
-		private Path reportsDir;
-
-		@CommandLine.Option(names = "-reports-dir", hidden = true)
-		private Path reportsDir2;
-
-		private void applyTo(CommandLineOptions result) {
-			result.setFailIfNoTests(this.failIfNoTests);
-			result.setReportsDir(choose(this.reportsDir, this.reportsDir2, null));
-		}
-	}
-
 	static class ConsoleOutputOptions {
 
-		@CommandLine.Option(names = "--color-palette", paramLabel = "FILE", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
+		@Option(names = "--color-palette", paramLabel = "FILE", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
 		private Path colorPalette;
-		@CommandLine.Option(names = "-color-palette", hidden = true)
+		@Option(names = "-color-palette", hidden = true)
 		private Path colorPalette2;
 
-		@CommandLine.Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
+		@Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
 		private boolean singleColorPalette;
-		@CommandLine.Option(names = "-single-color", hidden = true)
+		@Option(names = "-single-color", hidden = true)
 		private boolean singleColorPalette2;
 
-		@CommandLine.Option(names = "--details", paramLabel = "MODE", defaultValue = DEFAULT_DETAILS_NAME, description = "Select an output details mode for when tests are executed. " //
+		@Option(names = "--details", paramLabel = "MODE", defaultValue = DEFAULT_DETAILS_NAME, description = "Select an output details mode for when tests are executed. " //
 				+ "Use one of: ${COMPLETION-CANDIDATES}. If 'none' is selected, " //
 				+ "then only the summary and test failures are shown. Default: ${DEFAULT-VALUE}.")
 		private Details details = DEFAULT_DETAILS;
 
-		@CommandLine.Option(names = "-details", hidden = true, defaultValue = DEFAULT_DETAILS_NAME)
+		@Option(names = "-details", hidden = true, defaultValue = DEFAULT_DETAILS_NAME)
 		private Details details2 = DEFAULT_DETAILS;
 
-		@CommandLine.Option(names = "--details-theme", paramLabel = "THEME", description = "Select an output details tree theme for when tests are executed. "
+		@Option(names = "--details-theme", paramLabel = "THEME", description = "Select an output details tree theme for when tests are executed. "
 				+ "Use one of: ${COMPLETION-CANDIDATES}. Default is detected based on default character encoding.")
 		private Theme theme = DEFAULT_THEME;
 
-		@CommandLine.Option(names = "-details-theme", hidden = true)
+		@Option(names = "-details-theme", hidden = true)
 		private Theme theme2 = DEFAULT_THEME;
 
 		private void applyTo(CommandLineOptions result) {
@@ -358,9 +341,6 @@ CommandLineOptions toCommandLineOptions() {
 		if (this.runtimeConfigurationOptions != null) {
 			this.runtimeConfigurationOptions.applyTo(result);
 		}
-		if (this.reportingOptions != null) {
-			this.reportingOptions.applyTo(result);
-		}
 		if (this.consoleOutputOptions != null) {
 			this.consoleOutputOptions.applyTo(result);
 		}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
index 4295b484b0c3..ea6a361fbba7 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandResult.java
@@ -15,7 +15,6 @@
 import java.util.Optional;
 
 import org.apiguardian.api.API;
-import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 /**
  * @since 1.10
@@ -33,16 +32,6 @@ public class CommandResult<T> {
 	 */
 	protected static final int FAILURE = -1;
 
-	/**
-	 * Exit code indicating test failure(s)
-	 */
-	private static final int TEST_FAILED = 1;
-
-	/**
-	 * Exit code indicating no tests found
-	 */
-	private static final int NO_TESTS_FOUND = 2;
-
 	public static <T> CommandResult<T> success() {
 		return create(SUCCESS, null);
 	}
@@ -63,13 +52,6 @@ private CommandResult(int exitCode, T value) {
 		this.value = value;
 	}
 
-	public static int computeExitCode(TestExecutionSummary summary, CommandLineOptions options) {
-		if (options.isFailIfNoTests() && summary.getTestsFoundCount() == 0) {
-			return NO_TESTS_FOUND;
-		}
-		return summary.getTotalFailureCount() == 0 ? SUCCESS : TEST_FAILED;
-	}
-
 	public int getExitCode() {
 		return exitCode;
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
index 7791cc24ff76..65bb7f166ff1 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
@@ -10,13 +10,18 @@
 
 package org.junit.platform.console.options;
 
+import static org.junit.platform.console.options.CommandResult.SUCCESS;
+
 import java.io.PrintWriter;
+import java.nio.file.Path;
+import java.util.Optional;
 import java.util.function.Function;
 
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 import picocli.CommandLine;
+import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 
@@ -26,36 +31,71 @@
 )
 class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements CommandLine.IExitCodeGenerator {
 
+	/**
+	 * Exit code indicating test failure(s)
+	 */
+	private static final int TEST_FAILED = 1;
+
+	/**
+	 * Exit code indicating no tests found
+	 */
+	private static final int NO_TESTS_FOUND = 2;
+
 	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
+
 	@Mixin
 	CommandLineOptionsMixin options;
 
+	@ArgGroup(validate = false, order = 6, heading = "%n@|bold REPORTING|@%n%n")
+	ReportingOptions reportingOptions;
+
 	ExecuteTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
-	static CommandLineOptions parseCommandLineOptions(String[] args) {
-		ExecuteTestsCommand command = new ExecuteTestsCommand(__ -> null);
-		BaseCommand.initialize(new CommandLine(command)).parseArgs(args);
-		return command.toCommandLineOptions();
-	}
-
 	@Override
 	protected TestExecutionSummary execute(PrintWriter out) {
-		CommandLineOptions options = toCommandLineOptions();
-		return consoleTestExecutorFactory.apply(options).execute(out);
+		return consoleTestExecutorFactory.apply(toCommandLineOptions()).execute(out, getReportsDir());
+	}
+
+	Optional<Path> getReportsDir() {
+		return getReportingOptions().flatMap(ReportingOptions::getReportsDir);
+	}
+
+	private Optional<ReportingOptions> getReportingOptions() {
+		return Optional.ofNullable(reportingOptions);
 	}
 
-	private CommandLineOptions toCommandLineOptions() {
-		CommandLineOptions options = this.options.toCommandLineOptions();
+	CommandLineOptions toCommandLineOptions() {
+		CommandLineOptions options = this.options == null ? new CommandLineOptions()
+				: this.options.toCommandLineOptions();
 		options.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
 		return options;
 	}
 
 	@Override
 	public int getExitCode() {
-		return CommandResult.computeExitCode(commandSpec.commandLine().getExecutionResult(),
-			options.toCommandLineOptions());
+		TestExecutionSummary executionResult = commandSpec.commandLine().getExecutionResult();
+		boolean failIfNoTests = getReportingOptions().map(it -> it.failIfNoTests).orElse(false);
+		if (failIfNoTests && executionResult.getTestsFoundCount() == 0) {
+			return NO_TESTS_FOUND;
+		}
+		return executionResult.getTotalFailureCount() == 0 ? SUCCESS : TEST_FAILED;
 	}
 
+	static class ReportingOptions {
+
+		@CommandLine.Option(names = "--fail-if-no-tests", description = "Fail and return exit status code 2 if no tests are found.")
+		private boolean failIfNoTests; // no single-dash equivalent: was introduced in 5.3-M1
+
+		@CommandLine.Option(names = "--reports-dir", paramLabel = "DIR", description = "Enable report output into a specified local directory (will be created if it does not exist).")
+		private Path reportsDir;
+
+		@CommandLine.Option(names = "-reports-dir", hidden = true)
+		private Path reportsDir2;
+
+		Optional<Path> getReportsDir() {
+			return reportsDir == null ? Optional.ofNullable(reportsDir2) : Optional.of(reportsDir);
+		}
+	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
index 13668618222f..742fd450d671 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -132,7 +132,8 @@ private static CommandResult<Object> runCommand(PrintWriter out, PrintWriter err
 			CommandLine commandLine) {
 		int exitCode = BaseCommand.initialize(commandLine) //
 				.setOut(out) //
-				.setErr(err).execute(args);
+				.setErr(err) //
+				.execute(args);
 		return CommandResult.create(exitCode, commandLine.getExecutionResult());
 	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index edd49ac88b5e..0a470a3387d1 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -62,8 +62,9 @@ public void discover(PrintWriter out) {
 		});
 	}
 
-	public TestExecutionSummary execute(PrintWriter out) {
-		return new CustomContextClassLoaderExecutor(createCustomClassLoader()).invoke(() -> executeTests(out));
+	public TestExecutionSummary execute(PrintWriter out, Optional<Path> reportsDir) {
+		return new CustomContextClassLoaderExecutor(createCustomClassLoader()) //
+				.invoke(() -> executeTests(out, reportsDir));
 	}
 
 	private void discoverTests(PrintWriter out) {
@@ -89,9 +90,9 @@ private static void printFoundTestsSummary(PrintWriter out, TestPlan testPlan) {
 		out.flush();
 	}
 
-	private TestExecutionSummary executeTests(PrintWriter out) {
+	private TestExecutionSummary executeTests(PrintWriter out, Optional<Path> reportsDir) {
 		Launcher launcher = launcherSupplier.get();
-		SummaryGeneratingListener summaryListener = registerListeners(out, launcher);
+		SummaryGeneratingListener summaryListener = registerListeners(out, reportsDir, launcher);
 
 		LauncherDiscoveryRequest discoveryRequest = new DiscoveryRequestCreator().toDiscoveryRequest(options);
 		launcher.execute(discoveryRequest);
@@ -124,14 +125,14 @@ private URL toURL(Path path) {
 		}
 	}
 
-	private SummaryGeneratingListener registerListeners(PrintWriter out, Launcher launcher) {
+	private SummaryGeneratingListener registerListeners(PrintWriter out, Optional<Path> reportsDir, Launcher launcher) {
 		// always register summary generating listener
 		SummaryGeneratingListener summaryListener = new SummaryGeneratingListener();
 		launcher.registerTestExecutionListeners(summaryListener);
 		// optionally, register test plan execution details printing listener
 		createDetailsPrintingListener(out).ifPresent(launcher::registerTestExecutionListeners);
 		// optionally, register XML reports writing listener
-		createXmlWritingListener(out).ifPresent(launcher::registerTestExecutionListeners);
+		createXmlWritingListener(out, reportsDir).ifPresent(launcher::registerTestExecutionListeners);
 		return summaryListener;
 	}
 
@@ -168,8 +169,8 @@ private ColorPalette getColorPalette() {
 		return ColorPalette.DEFAULT;
 	}
 
-	private Optional<TestExecutionListener> createXmlWritingListener(PrintWriter out) {
-		return options.getReportsDir().map(reportsDir -> new LegacyXmlReportGeneratingListener(reportsDir, out));
+	private Optional<TestExecutionListener> createXmlWritingListener(PrintWriter out, Optional<Path> reportsDir) {
+		return reportsDir.map(it -> new LegacyXmlReportGeneratingListener(it, out));
 	}
 
 	private void printSummary(TestExecutionSummary summary, PrintWriter out) {
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
index 1000e25e8106..504ab485511f 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
@@ -36,7 +36,6 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
@@ -68,7 +67,6 @@ void parseNoArguments() {
 			() -> assertEquals(List.of(), options.getIncludedTagExpressions()),
 			() -> assertEquals(List.of(), options.getExcludedTagExpressions()),
 			() -> assertEquals(List.of(), options.getAdditionalClasspathEntries()),
-			() -> assertEquals(Optional.empty(), options.getReportsDir()),
 			() -> assertEquals(List.of(), options.getSelectedUris()),
 			() -> assertEquals(List.of(), options.getSelectedFiles()),
 			() -> assertEquals(List.of(), options.getSelectedDirectories()),
@@ -303,18 +301,6 @@ void parseInvalidAdditionalClasspathEntries() {
 		assertOptionWithMissingRequiredArgumentThrowsException("-cp", "--classpath", "--class-path");
 	}
 
-	@ParameterizedTest
-	@EnumSource
-	void parseValidXmlReportsDirs(ArgsType type) {
-		var dir = Paths.get("build", "test-results");
-		// @formatter:off
-		assertAll(
-			() -> assertEquals(Optional.of(dir), type.parseArgLine("--reports-dir build/test-results").getReportsDir()),
-			() -> assertEquals(Optional.of(dir), type.parseArgLine("--reports-dir=build/test-results").getReportsDir())
-		);
-		// @formatter:on
-	}
-
 	@Test
 	void parseInvalidXmlReportsDirs() {
 		assertOptionWithMissingRequiredArgumentThrowsException("--reports-dir");
@@ -607,7 +593,9 @@ private static String[] split(String argLine) {
 	}
 
 	private static CommandLineOptions parse(String... args) {
-		return ExecuteTestsCommand.parseCommandLineOptions(args);
+		ExecuteTestsCommand command = new ExecuteTestsCommand(__ -> null);
+		command.parseArgs(args);
+		return command.toCommandLineOptions();
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
index 0547744ae146..86d0a641fe0b 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
@@ -11,10 +11,18 @@
 package org.junit.platform.console.options;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.nio.file.Paths;
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 /**
@@ -22,25 +30,31 @@
  */
 class ExecuteTestsCommandTests {
 
-	private final CommandLineOptions options = new CommandLineOptions();
 	private final TestExecutionSummary summary = mock();
+	private final ConsoleTestExecutor consoleTestExecutor = mock();
+	private final ExecuteTestsCommand command = new ExecuteTestsCommand(__ -> consoleTestExecutor);
+
+	@BeforeEach
+	void setUp() {
+		when(consoleTestExecutor.execute(any(), any())).thenReturn(summary);
+	}
 
 	@Test
 	void hasStatusCode0ForNoTotalFailures() {
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		var exitCode = CommandResult.computeExitCode(summary, options);
+		command.execute();
 
-		assertThat(exitCode).isEqualTo(0);
+		assertThat(command.getExitCode()).isEqualTo(0);
 	}
 
 	@Test
 	void hasStatusCode1ForForAnyFailure() {
 		when(summary.getTotalFailureCount()).thenReturn(1L);
 
-		var exitCode = CommandResult.computeExitCode(summary, options);
+		command.execute();
 
-		assertThat(exitCode).isEqualTo(1);
+		assertThat(command.getExitCode()).isEqualTo(1);
 	}
 
 	/**
@@ -48,12 +62,11 @@ void hasStatusCode1ForForAnyFailure() {
 	 */
 	@Test
 	void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() {
-		options.setFailIfNoTests(true);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		var exitCode = CommandResult.computeExitCode(summary, options);
+		command.execute("--fail-if-no-tests");
 
-		assertThat(exitCode).isEqualTo(2);
+		assertThat(command.getExitCode()).isEqualTo(2);
 	}
 
 	/**
@@ -61,13 +74,12 @@ void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() {
 	 */
 	@Test
 	void hasStatusCode0ForTestsAndHasOptionFailIfNoTestsFound() {
-		options.setFailIfNoTests(true);
 		when(summary.getTestsFoundCount()).thenReturn(1L);
 		when(summary.getTotalFailureCount()).thenReturn(0L);
 
-		var exitCode = CommandResult.computeExitCode(summary, options);
+		command.execute("--fail-if-no-tests");
 
-		assertThat(exitCode).isEqualTo(0);
+		assertThat(command.getExitCode()).isEqualTo(0);
 	}
 
 	/**
@@ -75,12 +87,28 @@ void hasStatusCode0ForTestsAndHasOptionFailIfNoTestsFound() {
 	 */
 	@Test
 	void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() {
-		options.setFailIfNoTests(false);
 		when(summary.getTestsFoundCount()).thenReturn(0L);
 
-		var exitCode = CommandResult.computeExitCode(summary, options);
+		command.execute();
+
+		assertThat(command.getExitCode()).isEqualTo(0);
+	}
+
+	@Test
+	void parseValidXmlReportsDirs() {
+		var dir = Paths.get("build", "test-results");
+		// @formatter:off
+		assertAll(
+				() -> assertEquals(Optional.empty(), parseArgs().getReportsDir()),
+				() -> assertEquals(Optional.of(dir), parseArgs("--reports-dir", "build/test-results").getReportsDir()),
+				() -> assertEquals(Optional.of(dir), parseArgs("--reports-dir=build/test-results").getReportsDir())
+		);
+		// @formatter:on
+	}
 
-		assertThat(exitCode).isEqualTo(0);
+	private ExecuteTestsCommand parseArgs(String... args) {
+		command.parseArgs(args);
+		return command;
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index bd925432117f..353bb1a48591 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -21,10 +21,10 @@
 import java.io.StringWriter;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.console.options.CommandLineOptions;
-import org.junit.platform.console.options.CommandResult;
 import org.junit.platform.console.options.Details;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 
@@ -39,117 +39,63 @@ class ConsoleTestExecutorTests {
 
 	private final StringWriter stringWriter = new StringWriter();
 	private final CommandLineOptions options = new CommandLineOptions();
-	private DemoHierarchicalTestEngine dummyTestEngine = new DemoHierarchicalTestEngine();
+	private final DemoHierarchicalTestEngine dummyTestEngine = new DemoHierarchicalTestEngine();
 
 	{
 		options.setScanClasspath(true);
 	}
 
 	@Test
-	void printsSummary() throws Exception {
+	void printsSummary() {
 		dummyTestEngine.addTest("succeedingTest", SUCCEEDING_TEST);
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		task.execute(new PrintWriter(stringWriter));
+		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("Test run finished after", "2 tests found", "0 tests skipped",
 			"2 tests started", "0 tests aborted", "1 tests successful", "1 tests failed");
 	}
 
 	@Test
-	void printsDetailsIfTheyAreNotHidden() throws Exception {
+	void printsDetailsIfTheyAreNotHidden() {
 		options.setDetails(Details.FLAT);
 
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		task.execute(new PrintWriter(stringWriter));
+		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("Test execution started.");
 	}
 
 	@Test
-	void printsNoDetailsIfTheyAreHidden() throws Exception {
+	void printsNoDetailsIfTheyAreHidden() {
 		options.setDetails(Details.NONE);
 
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		task.execute(new PrintWriter(stringWriter));
+		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).doesNotContain("Test execution started.");
 	}
 
 	@Test
-	void printsFailuresEvenIfDetailsAreHidden() throws Exception {
+	void printsFailuresEvenIfDetailsAreHidden() {
 		options.setDetails(Details.NONE);
 
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 		dummyTestEngine.addContainer("failingContainer", FAILING_BLOCK);
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		task.execute(new PrintWriter(stringWriter));
+		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("Failures (2)", "failingTest", "failingContainer");
 	}
 
 	@Test
-	void hasStatusCode0ForSucceedingTest() throws Exception {
-		dummyTestEngine.addTest("succeedingTest", SUCCEEDING_TEST);
-
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
-
-		assertThat(exitCode).isEqualTo(0);
-	}
-
-	@Test
-	void hasStatusCode1ForFailingTest() throws Exception {
-		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
-
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
-
-		assertThat(exitCode).isEqualTo(1);
-	}
-
-	@Test
-	void hasStatusCode1ForFailingContainer() throws Exception {
-		dummyTestEngine.addContainer("failingContainer", FAILING_BLOCK);
-
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
-
-		assertThat(exitCode).isEqualTo(1);
-	}
-
-	/**
-	 * @since 1.3
-	 */
-	@Test
-	void hasStatusCode2ForNoTestsAndHasOptionFailIfNoTestsFound() throws Exception {
-		options.setFailIfNoTests(true);
-
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
-
-		assertThat(exitCode).isEqualTo(2);
-	}
-
-	/**
-	 * @since 1.3
-	 */
-	@Test
-	void hasStatusCode0ForNoTestsAndNotFailIfNoTestsFound() throws Exception {
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		var exitCode = CommandResult.computeExitCode(task.execute(dummyWriter()), options);
-
-		assertThat(exitCode).isEqualTo(0);
-	}
-
-	@Test
-	void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() throws Exception {
+	void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() {
 		options.setAdditionalClasspathEntries(List.of(Paths.get(".")));
 
 		var oldClassLoader = getDefaultClassLoader();
@@ -157,13 +103,13 @@ void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() throws Except
 			() -> assertSame(oldClassLoader, getDefaultClassLoader(), "should fail"));
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		task.execute(new PrintWriter(stringWriter));
+		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("failingTest", "should fail", "1 tests failed");
 	}
 
 	@Test
-	void usesSameClassLoaderIfNoAdditionalClassPathEntriesArePresent() throws Exception {
+	void usesSameClassLoaderIfNoAdditionalClassPathEntriesArePresent() {
 		options.setAdditionalClasspathEntries(List.of());
 
 		var oldClassLoader = getDefaultClassLoader();
@@ -171,7 +117,7 @@ void usesSameClassLoaderIfNoAdditionalClassPathEntriesArePresent() throws Except
 			() -> assertNotSame(oldClassLoader, getDefaultClassLoader(), "should fail"));
 
 		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
-		task.execute(new PrintWriter(stringWriter));
+		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("failingTest", "should fail", "1 tests failed");
 	}

From 0173a37a48807d9c031271cef8b183e84891a100 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 13 Mar 2023 14:58:39 +0100
Subject: [PATCH 1219/1433] Separate discovery from output options

---
 .../platform/console/ConsoleLauncher.java     |   7 +-
 .../console/options/CommandFacade.java        |   5 +-
 .../console/options/DiscoverTestsCommand.java |  18 +-
 .../console/options/ExecuteTestsCommand.java  |  28 +-
 .../platform/console/options/MainCommand.java |   6 +-
 .../options/TestConsoleOutputOptions.java     |  76 +++++
 .../TestConsoleOutputOptionsMixin.java        |  73 ++++
 ...Options.java => TestDiscoveryOptions.java} |  59 +---
 ...in.java => TestDiscoveryOptionsMixin.java} |  61 +---
 .../console/tasks/ConsoleTestExecutor.java    |  44 ++-
 .../tasks/DiscoveryRequestCreator.java        |  14 +-
 .../console/ConsoleLauncherTests.java         |   6 +-
 .../console/ConsoleLauncherWrapper.java       |   5 +-
 .../CommandLineOptionsParsingTests.java       | 323 +++++++++---------
 .../options/ExecuteTestsCommandTests.java     |   2 +-
 .../tasks/ConsoleTestExecutorTests.java       |  34 +-
 .../tasks/DiscoveryRequestCreatorTests.java   |   4 +-
 17 files changed, 415 insertions(+), 350 deletions(-)
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptions.java
 create mode 100644 junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptionsMixin.java
 rename junit-platform-console/src/main/java/org/junit/platform/console/options/{CommandLineOptions.java => TestDiscoveryOptions.java} (85%)
 rename junit-platform-console/src/main/java/org/junit/platform/console/options/{CommandLineOptionsMixin.java => TestDiscoveryOptionsMixin.java} (85%)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
index 59e71a22bf13..5127c2187d2f 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/ConsoleLauncher.java
@@ -14,11 +14,9 @@
 import static org.apiguardian.api.API.Status.MAINTAINED;
 
 import java.io.PrintWriter;
-import java.util.function.Function;
 
 import org.apiguardian.api.API;
 import org.junit.platform.console.options.CommandFacade;
-import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.CommandResult;
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
@@ -44,12 +42,11 @@ public static CommandResult<?> run(PrintWriter out, PrintWriter err, String... a
 		return consoleLauncher.run(args);
 	}
 
-	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
+	private final ConsoleTestExecutor.Factory consoleTestExecutorFactory;
 	private final PrintWriter out;
 	private final PrintWriter err;
 
-	ConsoleLauncher(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory, PrintWriter out,
-			PrintWriter err) {
+	ConsoleLauncher(ConsoleTestExecutor.Factory consoleTestExecutorFactory, PrintWriter out, PrintWriter err) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 		this.out = out;
 		this.err = err;
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java
index 30bd7d6eb3e7..352e1b265e18 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandFacade.java
@@ -13,7 +13,6 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.io.PrintWriter;
-import java.util.function.Function;
 
 import org.apiguardian.api.API;
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
@@ -27,9 +26,9 @@
 @API(status = INTERNAL, since = "1.10")
 public class CommandFacade {
 
-	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
+	private final ConsoleTestExecutor.Factory consoleTestExecutorFactory;
 
-	public CommandFacade(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+	public CommandFacade(ConsoleTestExecutor.Factory consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
index 94596d8fce6e..c47d116f9e2c 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/DiscoverTestsCommand.java
@@ -11,7 +11,6 @@
 package org.junit.platform.console.options;
 
 import java.io.PrintWriter;
-import java.util.function.Function;
 
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
@@ -24,19 +23,24 @@
 )
 class DiscoverTestsCommand extends BaseCommand<Void> {
 
-	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
+	private final ConsoleTestExecutor.Factory consoleTestExecutorFactory;
+
+	@Mixin
+	TestDiscoveryOptionsMixin discoveryOptions;
+
 	@Mixin
-	CommandLineOptionsMixin options;
+	TestConsoleOutputOptionsMixin testOutputOptions;
 
-	DiscoverTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+	DiscoverTestsCommand(ConsoleTestExecutor.Factory consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
 	@Override
 	protected Void execute(PrintWriter out) {
-		CommandLineOptions options = this.options.toCommandLineOptions();
-		options.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
-		consoleTestExecutorFactory.apply(options).discover(out);
+		TestDiscoveryOptions discoveryOptions = this.discoveryOptions.toTestDiscoveryOptions();
+		TestConsoleOutputOptions testOutputOptions = this.testOutputOptions.toTestConsoleOutputOptions();
+		testOutputOptions.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
+		consoleTestExecutorFactory.create(discoveryOptions, testOutputOptions).discover(out);
 		return null;
 	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
index 65bb7f166ff1..82c37dc2297c 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ExecuteTestsCommand.java
@@ -15,7 +15,6 @@
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.Optional;
-import java.util.function.Function;
 
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
@@ -41,21 +40,25 @@ class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements C
 	 */
 	private static final int NO_TESTS_FOUND = 2;
 
-	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
+	private final ConsoleTestExecutor.Factory consoleTestExecutorFactory;
 
 	@Mixin
-	CommandLineOptionsMixin options;
+	TestDiscoveryOptionsMixin discoveryOptions;
+
+	@Mixin
+	TestConsoleOutputOptionsMixin testOutputOptions;
 
 	@ArgGroup(validate = false, order = 6, heading = "%n@|bold REPORTING|@%n%n")
 	ReportingOptions reportingOptions;
 
-	ExecuteTestsCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+	ExecuteTestsCommand(ConsoleTestExecutor.Factory consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
 	@Override
 	protected TestExecutionSummary execute(PrintWriter out) {
-		return consoleTestExecutorFactory.apply(toCommandLineOptions()).execute(out, getReportsDir());
+		return consoleTestExecutorFactory.create(toTestDiscoveryOptions(), toTestConsoleOutputOptions()) //
+				.execute(out, getReportsDir());
 	}
 
 	Optional<Path> getReportsDir() {
@@ -66,11 +69,16 @@ private Optional<ReportingOptions> getReportingOptions() {
 		return Optional.ofNullable(reportingOptions);
 	}
 
-	CommandLineOptions toCommandLineOptions() {
-		CommandLineOptions options = this.options == null ? new CommandLineOptions()
-				: this.options.toCommandLineOptions();
-		options.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
-		return options;
+	TestDiscoveryOptions toTestDiscoveryOptions() {
+		return this.discoveryOptions == null //
+				? new TestDiscoveryOptions() //
+				: this.discoveryOptions.toTestDiscoveryOptions();
+	}
+
+	TestConsoleOutputOptions toTestConsoleOutputOptions() {
+		TestConsoleOutputOptions testOutputOptions = this.testOutputOptions.toTestConsoleOutputOptions();
+		testOutputOptions.setAnsiColorOutputDisabled(outputOptions.isDisableAnsiColors());
+		return testOutputOptions;
 	}
 
 	@Override
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
index 742fd450d671..2a2930d285ef 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -15,7 +15,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Callable;
-import java.util.function.Function;
 
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
@@ -44,7 +43,8 @@
 )
 class MainCommand implements Callable<Object>, IExitCodeGenerator {
 
-	private final Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory;
+	private final ConsoleTestExecutor.Factory consoleTestExecutorFactory;
+
 	@Option(names = { "-h", "--help" }, help = true, hidden = true)
 	private boolean helpRequested;
 
@@ -59,7 +59,7 @@ class MainCommand implements Callable<Object>, IExitCodeGenerator {
 
 	CommandResult<?> commandResult;
 
-	MainCommand(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+	MainCommand(ConsoleTestExecutor.Factory consoleTestExecutorFactory) {
 		this.consoleTestExecutorFactory = consoleTestExecutorFactory;
 	}
 
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptions.java
new file mode 100644
index 000000000000..680c2d826bad
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptions.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import java.nio.file.Path;
+import java.util.Locale;
+
+import org.apiguardian.api.API;
+
+/**
+ * @since 1.10
+ */
+@API(status = INTERNAL, since = "1.10")
+public class TestConsoleOutputOptions {
+
+	static final String DEFAULT_DETAILS_NAME = "tree";
+	static final Details DEFAULT_DETAILS = Details.valueOf(DEFAULT_DETAILS_NAME.toUpperCase(Locale.ROOT));
+	static final Theme DEFAULT_THEME = Theme.valueOf(ConsoleUtils.charset());
+
+	private boolean ansiColorOutputDisabled;
+	private Path colorPalettePath;
+	private boolean isSingleColorPalette;
+	private Details details = DEFAULT_DETAILS;
+	private Theme theme = DEFAULT_THEME;
+
+	public boolean isAnsiColorOutputDisabled() {
+		return this.ansiColorOutputDisabled;
+	}
+
+	public void setAnsiColorOutputDisabled(boolean ansiColorOutputDisabled) {
+		this.ansiColorOutputDisabled = ansiColorOutputDisabled;
+	}
+
+	public Path getColorPalettePath() {
+		return colorPalettePath;
+	}
+
+	public void setColorPalettePath(Path colorPalettePath) {
+		this.colorPalettePath = colorPalettePath;
+	}
+
+	public boolean isSingleColorPalette() {
+		return isSingleColorPalette;
+	}
+
+	public void setSingleColorPalette(boolean singleColorPalette) {
+		this.isSingleColorPalette = singleColorPalette;
+	}
+
+	public Details getDetails() {
+		return this.details;
+	}
+
+	public void setDetails(Details details) {
+		this.details = details;
+	}
+
+	public Theme getTheme() {
+		return this.theme;
+	}
+
+	public void setTheme(Theme theme) {
+		this.theme = theme;
+	}
+
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptionsMixin.java
new file mode 100644
index 000000000000..dd24838e3f55
--- /dev/null
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestConsoleOutputOptionsMixin.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.options;
+
+import static org.junit.platform.console.options.TestConsoleOutputOptions.DEFAULT_DETAILS;
+import static org.junit.platform.console.options.TestConsoleOutputOptions.DEFAULT_DETAILS_NAME;
+import static org.junit.platform.console.options.TestConsoleOutputOptions.DEFAULT_THEME;
+
+import java.nio.file.Path;
+
+import picocli.CommandLine.ArgGroup;
+import picocli.CommandLine.Option;
+
+class TestConsoleOutputOptionsMixin {
+
+	@ArgGroup(validate = false, order = 5, heading = "%n@|bold CONSOLE OUTPUT|@%n%n")
+	ConsoleOutputOptions consoleOutputOptions = new ConsoleOutputOptions();
+
+	static class ConsoleOutputOptions {
+
+		@Option(names = "--color-palette", paramLabel = "FILE", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
+		private Path colorPalette;
+		@Option(names = "-color-palette", hidden = true)
+		private Path colorPalette2;
+
+		@Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
+		private boolean singleColorPalette;
+		@Option(names = "-single-color", hidden = true)
+		private boolean singleColorPalette2;
+
+		@Option(names = "--details", paramLabel = "MODE", defaultValue = DEFAULT_DETAILS_NAME, description = "Select an output details mode for when tests are executed. " //
+				+ "Use one of: ${COMPLETION-CANDIDATES}. If 'none' is selected, " //
+				+ "then only the summary and test failures are shown. Default: ${DEFAULT-VALUE}.")
+		private Details details = DEFAULT_DETAILS;
+
+		@Option(names = "-details", hidden = true, defaultValue = DEFAULT_DETAILS_NAME)
+		private Details details2 = DEFAULT_DETAILS;
+
+		@Option(names = "--details-theme", paramLabel = "THEME", description = "Select an output details tree theme for when tests are executed. "
+				+ "Use one of: ${COMPLETION-CANDIDATES}. Default is detected based on default character encoding.")
+		private Theme theme = DEFAULT_THEME;
+
+		@Option(names = "-details-theme", hidden = true)
+		private Theme theme2 = DEFAULT_THEME;
+
+		private void applyTo(TestConsoleOutputOptions result) {
+			result.setColorPalettePath(choose(colorPalette, colorPalette2, null));
+			result.setSingleColorPalette(singleColorPalette || singleColorPalette2);
+			result.setDetails(choose(details, details2, DEFAULT_DETAILS));
+			result.setTheme(choose(theme, theme2, DEFAULT_THEME));
+		}
+	}
+
+	TestConsoleOutputOptions toTestConsoleOutputOptions() {
+		TestConsoleOutputOptions result = new TestConsoleOutputOptions();
+		if (this.consoleOutputOptions != null) {
+			this.consoleOutputOptions.applyTo(result);
+		}
+		return result;
+	}
+
+	private static <T> T choose(T left, T right, T defaultValue) {
+		return left == right ? left : (left == defaultValue ? right : left);
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptions.java
similarity index 85%
rename from junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
rename to junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptions.java
index 4b1f0610698d..b7949de159f6 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptions.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptions.java
@@ -21,7 +21,6 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import org.apiguardian.api.API;
@@ -37,23 +36,13 @@
 import org.junit.platform.engine.discovery.UriSelector;
 
 /**
- * @since 1.0
+ * @since 1.10
  */
-@API(status = INTERNAL, since = "1.0")
-public class CommandLineOptions {
-
-	static final String DEFAULT_DETAILS_NAME = "tree";
-	static final Details DEFAULT_DETAILS = Details.valueOf(DEFAULT_DETAILS_NAME.toUpperCase(Locale.ROOT));
-	static final Theme DEFAULT_THEME = Theme.valueOf(ConsoleUtils.charset());
-
-	private boolean ansiColorOutputDisabled;
-	private Path colorPalettePath;
-	private boolean isSingleColorPalette;
-	private Details details = DEFAULT_DETAILS;
-	private Theme theme = DEFAULT_THEME;
-	private List<Path> additionalClasspathEntries = emptyList();
+@API(status = INTERNAL, since = "1.10")
+public class TestDiscoveryOptions {
 
 	private boolean scanClasspath;
+	private List<Path> additionalClasspathEntries = emptyList();
 	private List<Path> selectedClasspathEntries = emptyList();
 
 	private boolean scanModulepath;
@@ -79,30 +68,6 @@ public class CommandLineOptions {
 
 	private Map<String, String> configurationParameters = emptyMap();
 
-	public boolean isAnsiColorOutputDisabled() {
-		return this.ansiColorOutputDisabled;
-	}
-
-	public void setAnsiColorOutputDisabled(boolean ansiColorOutputDisabled) {
-		this.ansiColorOutputDisabled = ansiColorOutputDisabled;
-	}
-
-	public Path getColorPalettePath() {
-		return colorPalettePath;
-	}
-
-	public void setColorPalettePath(Path colorPalettePath) {
-		this.colorPalettePath = colorPalettePath;
-	}
-
-	public boolean isSingleColorPalette() {
-		return isSingleColorPalette;
-	}
-
-	public void setSingleColorPalette(boolean singleColorPalette) {
-		this.isSingleColorPalette = singleColorPalette;
-	}
-
 	public boolean isScanModulepath() {
 		return this.scanModulepath;
 	}
@@ -119,22 +84,6 @@ public void setScanClasspath(boolean scanClasspath) {
 		this.scanClasspath = scanClasspath;
 	}
 
-	public Details getDetails() {
-		return this.details;
-	}
-
-	public void setDetails(Details details) {
-		this.details = details;
-	}
-
-	public Theme getTheme() {
-		return this.theme;
-	}
-
-	public void setTheme(Theme theme) {
-		this.theme = theme;
-	}
-
 	public List<Path> getExistingAdditionalClasspathEntries() {
 		return this.additionalClasspathEntries.stream().filter(Files::exists).collect(toList());
 	}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java
similarity index 85%
rename from junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
rename to junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java
index 71a51b42383d..2a8e7751e3a1 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/CommandLineOptionsMixin.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java
@@ -10,10 +10,6 @@
 
 package org.junit.platform.console.options;
 
-import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_DETAILS;
-import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_DETAILS_NAME;
-import static org.junit.platform.console.options.CommandLineOptions.DEFAULT_THEME;
-
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,7 +32,7 @@
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Option;
 
-class CommandLineOptionsMixin {
+class TestDiscoveryOptionsMixin {
 
 	private static final String CP_OPTION = "cp";
 
@@ -49,9 +45,6 @@ class CommandLineOptionsMixin {
 	@ArgGroup(validate = false, order = 4, heading = "%n@|bold RUNTIME CONFIGURATION|@%n%n")
 	RuntimeConfigurationOptions runtimeConfigurationOptions;
 
-	@ArgGroup(validate = false, order = 5, heading = "%n@|bold CONSOLE OUTPUT|@%n%n")
-	ConsoleOutputOptions consoleOutputOptions = new ConsoleOutputOptions();
-
 	static class SelectorOptions {
 
 		@Option(names = { "--scan-classpath",
@@ -145,7 +138,7 @@ static class SelectorOptions {
 		SelectorOptions() {
 		}
 
-		private void applyTo(CommandLineOptions result) {
+		private void applyTo(TestDiscoveryOptions result) {
 			result.setScanClasspath(this.selectedClasspathEntries != null || this.selectedClasspathEntries2 != null); // flag was specified
 			result.setScanModulepath(this.scanModulepath || this.scanModulepath2);
 			result.setSelectedModules(merge(this.selectedModules, this.selectedModules2));
@@ -229,7 +222,7 @@ static class FilterOptions {
 		@Option(names = { "--E", "-exclude-engine" }, arity = "1", hidden = true)
 		private List<String> excludedEngines2 = new ArrayList<>();
 
-		private void applyTo(CommandLineOptions result) {
+		private void applyTo(TestDiscoveryOptions result) {
 			result.setIncludedClassNamePatterns(merge(this.includeClassNamePatterns, this.includeClassNamePatterns2));
 			result.setExcludedClassNamePatterns(merge(this.excludeClassNamePatterns, this.excludeClassNamePatterns2));
 			result.setIncludedPackages(merge(this.includePackages, this.includePackages2));
@@ -289,49 +282,14 @@ private void validateUnique(String key, String newValue) {
 			}
 		}
 
-		private void applyTo(CommandLineOptions result) {
+		private void applyTo(TestDiscoveryOptions result) {
 			result.setAdditionalClasspathEntries(merge(additionalClasspathEntries, additionalClasspathEntries2));
 			result.setConfigurationParameters(configurationParameters);
 		}
 	}
 
-	static class ConsoleOutputOptions {
-
-		@Option(names = "--color-palette", paramLabel = "FILE", description = "Specify a path to a properties file to customize ANSI style of output (not supported by all terminals).")
-		private Path colorPalette;
-		@Option(names = "-color-palette", hidden = true)
-		private Path colorPalette2;
-
-		@Option(names = "--single-color", description = "Style test output using only text attributes, no color (not supported by all terminals).")
-		private boolean singleColorPalette;
-		@Option(names = "-single-color", hidden = true)
-		private boolean singleColorPalette2;
-
-		@Option(names = "--details", paramLabel = "MODE", defaultValue = DEFAULT_DETAILS_NAME, description = "Select an output details mode for when tests are executed. " //
-				+ "Use one of: ${COMPLETION-CANDIDATES}. If 'none' is selected, " //
-				+ "then only the summary and test failures are shown. Default: ${DEFAULT-VALUE}.")
-		private Details details = DEFAULT_DETAILS;
-
-		@Option(names = "-details", hidden = true, defaultValue = DEFAULT_DETAILS_NAME)
-		private Details details2 = DEFAULT_DETAILS;
-
-		@Option(names = "--details-theme", paramLabel = "THEME", description = "Select an output details tree theme for when tests are executed. "
-				+ "Use one of: ${COMPLETION-CANDIDATES}. Default is detected based on default character encoding.")
-		private Theme theme = DEFAULT_THEME;
-
-		@Option(names = "-details-theme", hidden = true)
-		private Theme theme2 = DEFAULT_THEME;
-
-		private void applyTo(CommandLineOptions result) {
-			result.setColorPalettePath(choose(colorPalette, colorPalette2, null));
-			result.setSingleColorPalette(singleColorPalette || singleColorPalette2);
-			result.setDetails(choose(details, details2, DEFAULT_DETAILS));
-			result.setTheme(choose(theme, theme2, DEFAULT_THEME));
-		}
-	}
-
-	CommandLineOptions toCommandLineOptions() {
-		CommandLineOptions result = new CommandLineOptions();
+	TestDiscoveryOptions toTestDiscoveryOptions() {
+		TestDiscoveryOptions result = new TestDiscoveryOptions();
 		if (this.selectorOptions != null) {
 			this.selectorOptions.applyTo(result);
 		}
@@ -341,9 +299,6 @@ CommandLineOptions toCommandLineOptions() {
 		if (this.runtimeConfigurationOptions != null) {
 			this.runtimeConfigurationOptions.applyTo(result);
 		}
-		if (this.consoleOutputOptions != null) {
-			this.consoleOutputOptions.applyTo(result);
-		}
 		return result;
 	}
 
@@ -352,8 +307,4 @@ private static <T> List<T> merge(List<T> list1, List<T> list2) {
 		result.addAll(list2 == null ? Collections.emptyList() : list2);
 		return result;
 	}
-
-	private static <T> T choose(T left, T right, T defaultValue) {
-		return left == right ? left : (left == defaultValue ? right : left);
-	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
index 0a470a3387d1..694005933cdf 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java
@@ -24,8 +24,9 @@
 import org.apiguardian.api.API;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.ClassLoaderUtils;
-import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.Details;
+import org.junit.platform.console.options.TestConsoleOutputOptions;
+import org.junit.platform.console.options.TestDiscoveryOptions;
 import org.junit.platform.console.options.Theme;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
@@ -42,16 +43,19 @@
 @API(status = INTERNAL, since = "1.0")
 public class ConsoleTestExecutor {
 
-	private final CommandLineOptions options;
+	private final TestDiscoveryOptions discoveryOptions;
+	private final TestConsoleOutputOptions outputOptions;
 	private final Supplier<Launcher> launcherSupplier;
 
-	public ConsoleTestExecutor(CommandLineOptions options) {
-		this(options, LauncherFactory::create);
+	public ConsoleTestExecutor(TestDiscoveryOptions discoveryOptions, TestConsoleOutputOptions outputOptions) {
+		this(discoveryOptions, outputOptions, LauncherFactory::create);
 	}
 
 	// for tests only
-	ConsoleTestExecutor(CommandLineOptions options, Supplier<Launcher> launcherSupplier) {
-		this.options = options;
+	ConsoleTestExecutor(TestDiscoveryOptions discoveryOptions, TestConsoleOutputOptions outputOptions,
+			Supplier<Launcher> launcherSupplier) {
+		this.discoveryOptions = discoveryOptions;
+		this.outputOptions = outputOptions;
 		this.launcherSupplier = launcherSupplier;
 	}
 
@@ -71,11 +75,11 @@ private void discoverTests(PrintWriter out) {
 		Launcher launcher = launcherSupplier.get();
 		Optional<DetailsPrintingListener> commandLineTestPrinter = createDetailsPrintingListener(out);
 
-		LauncherDiscoveryRequest discoveryRequest = new DiscoveryRequestCreator().toDiscoveryRequest(options);
+		LauncherDiscoveryRequest discoveryRequest = new DiscoveryRequestCreator().toDiscoveryRequest(discoveryOptions);
 		TestPlan testPlan = launcher.discover(discoveryRequest);
 
 		commandLineTestPrinter.ifPresent(printer -> printer.listTests(testPlan));
-		if (options.getDetails() != Details.NONE) {
+		if (outputOptions.getDetails() != Details.NONE) {
 			printFoundTestsSummary(out, testPlan);
 		}
 	}
@@ -94,11 +98,11 @@ private TestExecutionSummary executeTests(PrintWriter out, Optional<Path> report
 		Launcher launcher = launcherSupplier.get();
 		SummaryGeneratingListener summaryListener = registerListeners(out, reportsDir, launcher);
 
-		LauncherDiscoveryRequest discoveryRequest = new DiscoveryRequestCreator().toDiscoveryRequest(options);
+		LauncherDiscoveryRequest discoveryRequest = new DiscoveryRequestCreator().toDiscoveryRequest(discoveryOptions);
 		launcher.execute(discoveryRequest);
 
 		TestExecutionSummary summary = summaryListener.getSummary();
-		if (summary.getTotalFailureCount() > 0 || options.getDetails() != Details.NONE) {
+		if (summary.getTotalFailureCount() > 0 || outputOptions.getDetails() != Details.NONE) {
 			printSummary(summary, out);
 		}
 
@@ -106,7 +110,7 @@ private TestExecutionSummary executeTests(PrintWriter out, Optional<Path> report
 	}
 
 	private Optional<ClassLoader> createCustomClassLoader() {
-		List<Path> additionalClasspathEntries = options.getExistingAdditionalClasspathEntries();
+		List<Path> additionalClasspathEntries = discoveryOptions.getExistingAdditionalClasspathEntries();
 		if (!additionalClasspathEntries.isEmpty()) {
 			URL[] urls = additionalClasspathEntries.stream().map(this::toURL).toArray(URL[]::new);
 			ClassLoader parentClassLoader = ClassLoaderUtils.getDefaultClassLoader();
@@ -138,8 +142,8 @@ private SummaryGeneratingListener registerListeners(PrintWriter out, Optional<Pa
 
 	private Optional<DetailsPrintingListener> createDetailsPrintingListener(PrintWriter out) {
 		ColorPalette colorPalette = getColorPalette();
-		Theme theme = options.getTheme();
-		switch (options.getDetails()) {
+		Theme theme = outputOptions.getTheme();
+		switch (outputOptions.getDetails()) {
 			case SUMMARY:
 				// summary listener is always created and registered
 				return Optional.empty();
@@ -157,13 +161,13 @@ private Optional<DetailsPrintingListener> createDetailsPrintingListener(PrintWri
 	}
 
 	private ColorPalette getColorPalette() {
-		if (options.isAnsiColorOutputDisabled()) {
+		if (outputOptions.isAnsiColorOutputDisabled()) {
 			return ColorPalette.NONE;
 		}
-		if (options.getColorPalettePath() != null) {
-			return new ColorPalette(options.getColorPalettePath());
+		if (outputOptions.getColorPalettePath() != null) {
+			return new ColorPalette(outputOptions.getColorPalettePath());
 		}
-		if (options.isSingleColorPalette()) {
+		if (outputOptions.isSingleColorPalette()) {
 			return ColorPalette.SINGLE_COLOR;
 		}
 		return ColorPalette.DEFAULT;
@@ -175,10 +179,14 @@ private Optional<TestExecutionListener> createXmlWritingListener(PrintWriter out
 
 	private void printSummary(TestExecutionSummary summary, PrintWriter out) {
 		// Otherwise the failures have already been printed in detail
-		if (EnumSet.of(Details.NONE, Details.SUMMARY, Details.TREE).contains(options.getDetails())) {
+		if (EnumSet.of(Details.NONE, Details.SUMMARY, Details.TREE).contains(outputOptions.getDetails())) {
 			summary.printFailuresTo(out);
 		}
 		summary.printTo(out);
 	}
 
+	@FunctionalInterface
+	public interface Factory {
+		ConsoleTestExecutor create(TestDiscoveryOptions discoveryOptions, TestConsoleOutputOptions outputOptions);
+	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
index c6e0dfa06004..89aeec8c3817 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/tasks/DiscoveryRequestCreator.java
@@ -33,7 +33,7 @@
 import org.junit.platform.commons.util.ModuleUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
-import org.junit.platform.console.options.CommandLineOptions;
+import org.junit.platform.console.options.TestDiscoveryOptions;
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.engine.discovery.ClassNameFilter;
 import org.junit.platform.engine.discovery.ClassSelector;
@@ -48,7 +48,7 @@
  */
 class DiscoveryRequestCreator {
 
-	LauncherDiscoveryRequest toDiscoveryRequest(CommandLineOptions options) {
+	LauncherDiscoveryRequest toDiscoveryRequest(TestDiscoveryOptions options) {
 		LauncherDiscoveryRequestBuilder requestBuilder = request();
 		List<? extends DiscoverySelector> selectors = createDiscoverySelectors(options);
 		requestBuilder.selectors(selectors);
@@ -57,7 +57,7 @@ LauncherDiscoveryRequest toDiscoveryRequest(CommandLineOptions options) {
 		return requestBuilder.build();
 	}
 
-	private List<? extends DiscoverySelector> createDiscoverySelectors(CommandLineOptions options) {
+	private List<? extends DiscoverySelector> createDiscoverySelectors(TestDiscoveryOptions options) {
 		List<DiscoverySelector> explicitSelectors = options.getExplicitSelectors();
 		if (options.isScanClasspath()) {
 			Preconditions.condition(explicitSelectors.isEmpty(),
@@ -73,12 +73,12 @@ private List<? extends DiscoverySelector> createDiscoverySelectors(CommandLineOp
 			"Please specify an explicit selector option or use --scan-class-path or --scan-modules");
 	}
 
-	private List<ClasspathRootSelector> createClasspathRootSelectors(CommandLineOptions options) {
+	private List<ClasspathRootSelector> createClasspathRootSelectors(TestDiscoveryOptions options) {
 		Set<Path> classpathRoots = determineClasspathRoots(options);
 		return selectClasspathRoots(classpathRoots);
 	}
 
-	private Set<Path> determineClasspathRoots(CommandLineOptions options) {
+	private Set<Path> determineClasspathRoots(TestDiscoveryOptions options) {
 		if (options.getSelectedClasspathEntries().isEmpty()) {
 			Set<Path> rootDirs = new LinkedHashSet<>(ReflectionUtils.getAllClasspathRootDirectories());
 			rootDirs.addAll(options.getExistingAdditionalClasspathEntries());
@@ -87,7 +87,7 @@ private Set<Path> determineClasspathRoots(CommandLineOptions options) {
 		return new LinkedHashSet<>(options.getSelectedClasspathEntries());
 	}
 
-	private void addFilters(LauncherDiscoveryRequestBuilder requestBuilder, CommandLineOptions options,
+	private void addFilters(LauncherDiscoveryRequestBuilder requestBuilder, TestDiscoveryOptions options,
 			List<? extends DiscoverySelector> selectors) {
 		requestBuilder.filters(includedClassNamePatterns(options, selectors));
 
@@ -121,7 +121,7 @@ private void addFilters(LauncherDiscoveryRequestBuilder requestBuilder, CommandL
 		}
 	}
 
-	private ClassNameFilter includedClassNamePatterns(CommandLineOptions options,
+	private ClassNameFilter includedClassNamePatterns(TestDiscoveryOptions options,
 			List<? extends DiscoverySelector> selectors) {
 		Stream<String> patternStreams = Stream.concat( //
 			options.getIncludedClassNamePatterns().stream(), //
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
index 87c61425e454..b56c5dd1be42 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherTests.java
@@ -33,7 +33,7 @@ class ConsoleLauncherTests {
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("commandsWithEmptyOptionExitCodes")
 	void displayHelp(String command) {
-		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
+		var consoleLauncher = new ConsoleLauncher((__, ___) -> null, printSink, printSink);
 		var exitCode = consoleLauncher.run(command, "--help").getExitCode();
 
 		assertEquals(0, exitCode);
@@ -43,7 +43,7 @@ void displayHelp(String command) {
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("commandsWithEmptyOptionExitCodes")
 	void displayBanner(String command) {
-		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
+		var consoleLauncher = new ConsoleLauncher((__, ___) -> null, printSink, printSink);
 		consoleLauncher.run(command);
 
 		assertThat(stringWriter.toString()).contains(
@@ -53,7 +53,7 @@ void displayBanner(String command) {
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("commandsWithEmptyOptionExitCodes")
 	void disableBanner(String command, int expectedExitCode) {
-		var consoleLauncher = new ConsoleLauncher(__ -> null, printSink, printSink);
+		var consoleLauncher = new ConsoleLauncher((__, ___) -> null, printSink, printSink);
 		var exitCode = consoleLauncher.run(command, "--disable-banner").getExitCode();
 
 		assertEquals(expectedExitCode, exitCode);
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
index 68b09cbaa890..f2349908aeed 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherWrapper.java
@@ -16,9 +16,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Optional;
-import java.util.function.Function;
 
-import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.tasks.ConsoleTestExecutor;
 
 /**
@@ -34,11 +32,10 @@ class ConsoleLauncherWrapper {
 		this(ConsoleTestExecutor::new);
 	}
 
-	private ConsoleLauncherWrapper(Function<CommandLineOptions, ConsoleTestExecutor> consoleTestExecutorFactory) {
+	private ConsoleLauncherWrapper(ConsoleTestExecutor.Factory consoleTestExecutorFactory) {
 		var outWriter = new PrintWriter(out, false);
 		var errWriter = new PrintWriter(err, false);
 		this.consoleLauncher = new ConsoleLauncher(consoleTestExecutorFactory, outWriter, errWriter);
-
 	}
 
 	public ConsoleLauncherWrapperResult execute(String... args) {
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
index 504ab485511f..c995a642d2df 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
@@ -57,24 +57,24 @@ void parseNoArguments() {
 
 		// @formatter:off
 		assertAll(
-			() -> assertFalse(options.isAnsiColorOutputDisabled()),
-			() -> assertEquals(CommandLineOptions.DEFAULT_DETAILS, options.getDetails()),
-			() -> assertFalse(options.isScanClasspath()),
-			() -> assertEquals(List.of(STANDARD_INCLUDE_PATTERN), options.getIncludedClassNamePatterns()),
-			() -> assertEquals(List.of(), options.getExcludedClassNamePatterns()),
-			() -> assertEquals(List.of(), options.getIncludedPackages()),
-			() -> assertEquals(List.of(), options.getExcludedPackages()),
-			() -> assertEquals(List.of(), options.getIncludedTagExpressions()),
-			() -> assertEquals(List.of(), options.getExcludedTagExpressions()),
-			() -> assertEquals(List.of(), options.getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(), options.getSelectedUris()),
-			() -> assertEquals(List.of(), options.getSelectedFiles()),
-			() -> assertEquals(List.of(), options.getSelectedDirectories()),
-			() -> assertEquals(List.of(), options.getSelectedModules()),
-			() -> assertEquals(List.of(), options.getSelectedPackages()),
-			() -> assertEquals(List.of(), options.getSelectedMethods()),
-			() -> assertEquals(List.of(), options.getSelectedClasspathEntries()),
-			() -> assertEquals(Map.of(), options.getConfigurationParameters())
+			() -> assertFalse(options.output.isAnsiColorOutputDisabled()),
+			() -> assertEquals(TestConsoleOutputOptions.DEFAULT_DETAILS, options.output.getDetails()),
+			() -> assertFalse(options.discovery.isScanClasspath()),
+			() -> assertEquals(List.of(STANDARD_INCLUDE_PATTERN), options.discovery.getIncludedClassNamePatterns()),
+			() -> assertEquals(List.of(), options.discovery.getExcludedClassNamePatterns()),
+			() -> assertEquals(List.of(), options.discovery.getIncludedPackages()),
+			() -> assertEquals(List.of(), options.discovery.getExcludedPackages()),
+			() -> assertEquals(List.of(), options.discovery.getIncludedTagExpressions()),
+			() -> assertEquals(List.of(), options.discovery.getExcludedTagExpressions()),
+			() -> assertEquals(List.of(), options.discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(), options.discovery.getSelectedUris()),
+			() -> assertEquals(List.of(), options.discovery.getSelectedFiles()),
+			() -> assertEquals(List.of(), options.discovery.getSelectedDirectories()),
+			() -> assertEquals(List.of(), options.discovery.getSelectedModules()),
+			() -> assertEquals(List.of(), options.discovery.getSelectedPackages()),
+			() -> assertEquals(List.of(), options.discovery.getSelectedMethods()),
+			() -> assertEquals(List.of(), options.discovery.getSelectedClasspathEntries()),
+			() -> assertEquals(Map.of(), options.discovery.getConfigurationParameters())
 		);
 		// @formatter:on
 	}
@@ -83,8 +83,8 @@ void parseNoArguments() {
 	void parseSwitches() {
 		// @formatter:off
 		assertAll(
-			() -> assertParses("disable ansi", CommandLineOptions::isAnsiColorOutputDisabled, "--disable-ansi-colors"),
-			() -> assertParses("scan class path", CommandLineOptions::isScanClasspath, "--scan-class-path")
+			() -> assertTrue(parse("--disable-ansi-colors").output.isAnsiColorOutputDisabled(), "disable ansi"),
+			() -> assertTrue(parse("--scan-class-path").discovery.isScanClasspath(), "scan class path")
 		);
 		// @formatter:on
 	}
@@ -94,12 +94,12 @@ void parseSwitches() {
 	void parseValidDetails(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(Details.VERBOSE, type.parseArgLine("--details verbose").getDetails()),
-			() -> assertEquals(Details.TREE, type.parseArgLine("--details tree").getDetails()),
-			() -> assertEquals(Details.FLAT, type.parseArgLine("--details flat").getDetails()),
-			() -> assertEquals(Details.NONE, type.parseArgLine("--details NONE").getDetails()),
-			() -> assertEquals(Details.NONE, type.parseArgLine("--details none").getDetails()),
-			() -> assertEquals(Details.NONE, type.parseArgLine("--details None").getDetails())
+			() -> assertEquals(Details.VERBOSE, type.parseArgLine("--details verbose").output.getDetails()),
+			() -> assertEquals(Details.TREE, type.parseArgLine("--details tree").output.getDetails()),
+			() -> assertEquals(Details.FLAT, type.parseArgLine("--details flat").output.getDetails()),
+			() -> assertEquals(Details.NONE, type.parseArgLine("--details NONE").output.getDetails()),
+			() -> assertEquals(Details.NONE, type.parseArgLine("--details none").output.getDetails()),
+			() -> assertEquals(Details.NONE, type.parseArgLine("--details None").output.getDetails())
 		);
 		// @formatter:on
 	}
@@ -114,11 +114,11 @@ void parseInvalidDetails() {
 	void parseValidDetailsTheme(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(Theme.ASCII, type.parseArgLine("--details-theme ascii").getTheme()),
-			() -> assertEquals(Theme.ASCII, type.parseArgLine("--details-theme ASCII").getTheme()),
-			() -> assertEquals(Theme.UNICODE, type.parseArgLine("--details-theme unicode").getTheme()),
-			() -> assertEquals(Theme.UNICODE, type.parseArgLine("--details-theme UNICODE").getTheme()),
-			() -> assertEquals(Theme.UNICODE, type.parseArgLine("--details-theme uniCode").getTheme())
+			() -> assertEquals(Theme.ASCII, type.parseArgLine("--details-theme ascii").output.getTheme()),
+			() -> assertEquals(Theme.ASCII, type.parseArgLine("--details-theme ASCII").output.getTheme()),
+			() -> assertEquals(Theme.UNICODE, type.parseArgLine("--details-theme unicode").output.getTheme()),
+			() -> assertEquals(Theme.UNICODE, type.parseArgLine("--details-theme UNICODE").output.getTheme()),
+			() -> assertEquals(Theme.UNICODE, type.parseArgLine("--details-theme uniCode").output.getTheme())
 		);
 		// @formatter:on
 	}
@@ -133,9 +133,9 @@ void parseInvalidDetailsTheme() {
 	void parseValidIncludeClassNamePatterns(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(List.of(".*Test"), type.parseArgLine("-n .*Test").getIncludedClassNamePatterns()),
-			() -> assertEquals(List.of(".*Test", ".*Tests"), type.parseArgLine("--include-classname .*Test --include-classname .*Tests").getIncludedClassNamePatterns()),
-			() -> assertEquals(List.of(".*Test"), type.parseArgLine("--include-classname=.*Test").getIncludedClassNamePatterns())
+			() -> assertEquals(List.of(".*Test"), type.parseArgLine("-n .*Test").discovery.getIncludedClassNamePatterns()),
+			() -> assertEquals(List.of(".*Test", ".*Tests"), type.parseArgLine("--include-classname .*Test --include-classname .*Tests").discovery.getIncludedClassNamePatterns()),
+			() -> assertEquals(List.of(".*Test"), type.parseArgLine("--include-classname=.*Test").discovery.getIncludedClassNamePatterns())
 		);
 		// @formatter:on
 	}
@@ -145,16 +145,17 @@ void parseValidIncludeClassNamePatterns(ArgsType type) {
 	void parseValidExcludeClassNamePatterns(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(List.of(".*Test"), type.parseArgLine("-N .*Test").getExcludedClassNamePatterns()),
-			() -> assertEquals(List.of(".*Test", ".*Tests"), type.parseArgLine("--exclude-classname .*Test --exclude-classname .*Tests").getExcludedClassNamePatterns()),
-			() -> assertEquals(List.of(".*Test"), type.parseArgLine("--exclude-classname=.*Test").getExcludedClassNamePatterns())
+			() -> assertEquals(List.of(".*Test"), type.parseArgLine("-N .*Test").discovery.getExcludedClassNamePatterns()),
+			() -> assertEquals(List.of(".*Test", ".*Tests"), type.parseArgLine("--exclude-classname .*Test --exclude-classname .*Tests").discovery.getExcludedClassNamePatterns()),
+			() -> assertEquals(List.of(".*Test"), type.parseArgLine("--exclude-classname=.*Test").discovery.getExcludedClassNamePatterns())
 		);
 		// @formatter:on
 	}
 
 	@Test
 	void usesDefaultClassNamePatternWithoutExplicitArgument() throws Exception {
-		assertEquals(List.of(STANDARD_INCLUDE_PATTERN), ArgsType.args.parseArgLine("").getIncludedClassNamePatterns());
+		assertEquals(List.of(STANDARD_INCLUDE_PATTERN),
+			ArgsType.args.parseArgLine("").discovery.getIncludedClassNamePatterns());
 	}
 
 	@Test
@@ -173,11 +174,11 @@ void parseValidIncludedPackages(ArgsType type) {
 		// @formatter:off
 		assertAll(
 				() -> assertEquals(List.of("org.junit.included"),
-						type.parseArgLine("--include-package org.junit.included").getIncludedPackages()),
+						type.parseArgLine("--include-package org.junit.included").discovery.getIncludedPackages()),
 				() -> assertEquals(List.of("org.junit.included"),
-						type.parseArgLine("--include-package=org.junit.included").getIncludedPackages()),
+						type.parseArgLine("--include-package=org.junit.included").discovery.getIncludedPackages()),
 				() -> assertEquals(List.of("org.junit.included1", "org.junit.included2"),
-						type.parseArgLine("--include-package org.junit.included1 --include-package org.junit.included2").getIncludedPackages())
+						type.parseArgLine("--include-package org.junit.included1 --include-package org.junit.included2").discovery.getIncludedPackages())
 		);
 		// @formatter:on
 	}
@@ -188,11 +189,11 @@ void parseValidExcludedPackages(ArgsType type) {
 		// @formatter:off
 		assertAll(
 				() -> assertEquals(List.of("org.junit.excluded"),
-						type.parseArgLine("--exclude-package org.junit.excluded").getExcludedPackages()),
+						type.parseArgLine("--exclude-package org.junit.excluded").discovery.getExcludedPackages()),
 				() -> assertEquals(List.of("org.junit.excluded"),
-						type.parseArgLine("--exclude-package=org.junit.excluded").getExcludedPackages()),
+						type.parseArgLine("--exclude-package=org.junit.excluded").discovery.getExcludedPackages()),
 				() -> assertEquals(List.of("org.junit.excluded1", "org.junit.excluded2"),
-						type.parseArgLine("--exclude-package org.junit.excluded1 --exclude-package org.junit.excluded2").getExcludedPackages())
+						type.parseArgLine("--exclude-package org.junit.excluded1 --exclude-package org.junit.excluded2").discovery.getExcludedPackages())
 		);
 		// @formatter:on
 	}
@@ -202,10 +203,10 @@ void parseValidExcludedPackages(ArgsType type) {
 	void parseValidIncludedTags(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(List.of("fast"), type.parseArgLine("-t fast").getIncludedTagExpressions()),
-			() -> assertEquals(List.of("fast"), type.parseArgLine("--include-tag fast").getIncludedTagExpressions()),
-			() -> assertEquals(List.of("fast"), type.parseArgLine("--include-tag=fast").getIncludedTagExpressions()),
-			() -> assertEquals(List.of("fast", "slow"), type.parseArgLine("-t fast -t slow").getIncludedTagExpressions())
+			() -> assertEquals(List.of("fast"), type.parseArgLine("-t fast").discovery.getIncludedTagExpressions()),
+			() -> assertEquals(List.of("fast"), type.parseArgLine("--include-tag fast").discovery.getIncludedTagExpressions()),
+			() -> assertEquals(List.of("fast"), type.parseArgLine("--include-tag=fast").discovery.getIncludedTagExpressions()),
+			() -> assertEquals(List.of("fast", "slow"), type.parseArgLine("-t fast -t slow").discovery.getIncludedTagExpressions())
 		);
 		// @formatter:on
 	}
@@ -220,10 +221,10 @@ void parseInvalidIncludedTags() {
 	void parseValidExcludedTags(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(List.of("fast"), type.parseArgLine("-T fast").getExcludedTagExpressions()),
-			() -> assertEquals(List.of("fast"), type.parseArgLine("--exclude-tag fast").getExcludedTagExpressions()),
-			() -> assertEquals(List.of("fast"), type.parseArgLine("--exclude-tag=fast").getExcludedTagExpressions()),
-			() -> assertEquals(List.of("fast", "slow"), type.parseArgLine("-T fast -T slow").getExcludedTagExpressions())
+			() -> assertEquals(List.of("fast"), type.parseArgLine("-T fast").discovery.getExcludedTagExpressions()),
+			() -> assertEquals(List.of("fast"), type.parseArgLine("--exclude-tag fast").discovery.getExcludedTagExpressions()),
+			() -> assertEquals(List.of("fast"), type.parseArgLine("--exclude-tag=fast").discovery.getExcludedTagExpressions()),
+			() -> assertEquals(List.of("fast", "slow"), type.parseArgLine("-T fast -T slow").discovery.getExcludedTagExpressions())
 		);
 		// @formatter:on
 	}
@@ -238,9 +239,9 @@ void parseInvalidExcludedTags() {
 	void parseValidIncludedEngines(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(List.of("junit-jupiter"), type.parseArgLine("-e junit-jupiter").getIncludedEngines()),
-			() -> assertEquals(List.of("junit-vintage"), type.parseArgLine("--include-engine junit-vintage").getIncludedEngines()),
-			() -> assertEquals(List.of(), type.parseArgLine("").getIncludedEngines())
+			() -> assertEquals(List.of("junit-jupiter"), type.parseArgLine("-e junit-jupiter").discovery.getIncludedEngines()),
+			() -> assertEquals(List.of("junit-vintage"), type.parseArgLine("--include-engine junit-vintage").discovery.getIncludedEngines()),
+			() -> assertEquals(List.of(), type.parseArgLine("").discovery.getIncludedEngines())
 		);
 		// @formatter:on
 	}
@@ -255,9 +256,9 @@ void parseInvalidIncludedEngines() {
 	void parseValidExcludedEngines(ArgsType type) {
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(List.of("junit-jupiter"), type.parseArgLine("-E junit-jupiter").getExcludedEngines()),
-			() -> assertEquals(List.of("junit-vintage"), type.parseArgLine("--exclude-engine junit-vintage").getExcludedEngines()),
-			() -> assertEquals(List.of(), type.parseArgLine("").getExcludedEngines())
+			() -> assertEquals(List.of("junit-jupiter"), type.parseArgLine("-E junit-jupiter").discovery.getExcludedEngines()),
+			() -> assertEquals(List.of("junit-vintage"), type.parseArgLine("--exclude-engine junit-vintage").discovery.getExcludedEngines()),
+			() -> assertEquals(List.of(), type.parseArgLine("").discovery.getExcludedEngines())
 		);
 		// @formatter:on
 	}
@@ -273,16 +274,16 @@ void parseValidAdditionalClasspathEntries(ArgsType type) {
 		var dir = Paths.get(".");
 		// @formatter:off
 		assertAll(
-			() -> assertEquals(List.of(dir), type.parseArgLine("-cp .").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("--cp .").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("-classpath .").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("-classpath=.").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("--classpath .").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("--classpath=.").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path .").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path=.").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir, Path.of("lib/some.jar")), type.parseArgLine("-cp . -cp lib/some.jar").getAdditionalClasspathEntries()),
-			() -> assertEquals(List.of(dir, Path.of("lib/some.jar")), type.parseArgLine("-cp ." + File.pathSeparator + "lib/some.jar").getAdditionalClasspathEntries())
+			() -> assertEquals(List.of(dir), type.parseArgLine("-cp .").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--cp .").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("-classpath .").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("-classpath=.").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--classpath .").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--classpath=.").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path .").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--class-path=.").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir, Path.of("lib/some.jar")), type.parseArgLine("-cp . -cp lib/some.jar").discovery.getAdditionalClasspathEntries()),
+			() -> assertEquals(List.of(dir, Path.of("lib/some.jar")), type.parseArgLine("-cp ." + File.pathSeparator + "lib/some.jar").discovery.getAdditionalClasspathEntries())
 		);
 		// @formatter:on
 	}
@@ -291,9 +292,10 @@ void parseValidAdditionalClasspathEntries(ArgsType type) {
 	@EnabledOnOs(OS.WINDOWS)
 	void parseValidAndAbsoluteAdditionalClasspathEntries() throws Exception {
 		ArgsType type = ArgsType.args;
-		assertEquals(List.of(Path.of("C:\\a.jar")), type.parseArgLine("-cp C:\\a.jar").getAdditionalClasspathEntries());
+		assertEquals(List.of(Path.of("C:\\a.jar")),
+			type.parseArgLine("-cp C:\\a.jar").discovery.getAdditionalClasspathEntries());
 		assertEquals(List.of(Path.of("C:\\foo.jar"), Path.of("D:\\bar.jar")),
-			type.parseArgLine("-cp C:\\foo.jar;D:\\bar.jar").getAdditionalClasspathEntries());
+			type.parseArgLine("-cp C:\\foo.jar;D:\\bar.jar").discovery.getAdditionalClasspathEntries());
 	}
 
 	@Test
@@ -311,13 +313,13 @@ void parseInvalidXmlReportsDirs() {
 	void parseValidUriSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-u file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--u file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-select-uri file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-select-uri=file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--select-uri file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--select-uri=file:///foo.txt").getSelectedUris()),
-				() -> assertEquals(List.of(selectUri("file:///foo.txt"), selectUri("https://example")), type.parseArgLine("-u file:///foo.txt -u https://example").getSelectedUris())
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-u file:///foo.txt").discovery.getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--u file:///foo.txt").discovery.getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-select-uri file:///foo.txt").discovery.getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("-select-uri=file:///foo.txt").discovery.getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--select-uri file:///foo.txt").discovery.getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt")), type.parseArgLine("--select-uri=file:///foo.txt").discovery.getSelectedUris()),
+				() -> assertEquals(List.of(selectUri("file:///foo.txt"), selectUri("https://example")), type.parseArgLine("-u file:///foo.txt -u https://example").discovery.getSelectedUris())
 		);
 		// @formatter:on
 	}
@@ -332,13 +334,13 @@ void parseInvalidUriSelectors() {
 	void parseValidFileSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-f foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--f foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-select-file foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-select-file=foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--select-file foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--select-file=foo.txt").getSelectedFiles()),
-				() -> assertEquals(List.of(selectFile("foo.txt"), selectFile("bar.csv")), type.parseArgLine("-f foo.txt -f bar.csv").getSelectedFiles())
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-f foo.txt").discovery.getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--f foo.txt").discovery.getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-select-file foo.txt").discovery.getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("-select-file=foo.txt").discovery.getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--select-file foo.txt").discovery.getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt")), type.parseArgLine("--select-file=foo.txt").discovery.getSelectedFiles()),
+				() -> assertEquals(List.of(selectFile("foo.txt"), selectFile("bar.csv")), type.parseArgLine("-f foo.txt -f bar.csv").discovery.getSelectedFiles())
 		);
 		// @formatter:on
 	}
@@ -353,13 +355,13 @@ void parseInvalidFileSelectors() {
 	void parseValidDirectorySelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-d foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--d foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-select-directory foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-select-directory=foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--select-directory foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--select-directory=foo/bar").getSelectedDirectories()),
-				() -> assertEquals(List.of(selectDirectory("foo/bar"), selectDirectory("bar/qux")), type.parseArgLine("-d foo/bar -d bar/qux").getSelectedDirectories())
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-d foo/bar").discovery.getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--d foo/bar").discovery.getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-select-directory foo/bar").discovery.getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("-select-directory=foo/bar").discovery.getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--select-directory foo/bar").discovery.getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar")), type.parseArgLine("--select-directory=foo/bar").discovery.getSelectedDirectories()),
+				() -> assertEquals(List.of(selectDirectory("foo/bar"), selectDirectory("bar/qux")), type.parseArgLine("-d foo/bar -d bar/qux").discovery.getSelectedDirectories())
 		);
 		// @formatter:on
 	}
@@ -374,13 +376,13 @@ void parseInvalidDirectorySelectors() {
 	void parseValidModuleSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-o com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--o com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-select-module com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-select-module=com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--select-module com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--select-module=com.acme.foo").getSelectedModules()),
-				() -> assertEquals(List.of(selectModule("com.acme.foo"), selectModule("com.example.bar")), type.parseArgLine("-o com.acme.foo -o com.example.bar").getSelectedModules())
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-o com.acme.foo").discovery.getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--o com.acme.foo").discovery.getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-select-module com.acme.foo").discovery.getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("-select-module=com.acme.foo").discovery.getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--select-module com.acme.foo").discovery.getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo")), type.parseArgLine("--select-module=com.acme.foo").discovery.getSelectedModules()),
+				() -> assertEquals(List.of(selectModule("com.acme.foo"), selectModule("com.example.bar")), type.parseArgLine("-o com.acme.foo -o com.example.bar").discovery.getSelectedModules())
 		);
 		// @formatter:on
 	}
@@ -395,13 +397,13 @@ void parseInvalidModuleSelectors() {
 	void parseValidPackageSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-p com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--p com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-select-package com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-select-package=com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--select-package com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--select-package=com.acme.foo").getSelectedPackages()),
-				() -> assertEquals(List.of(selectPackage("com.acme.foo"), selectPackage("com.example.bar")), type.parseArgLine("-p com.acme.foo -p com.example.bar").getSelectedPackages())
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-p com.acme.foo").discovery.getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--p com.acme.foo").discovery.getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-select-package com.acme.foo").discovery.getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("-select-package=com.acme.foo").discovery.getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--select-package com.acme.foo").discovery.getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo")), type.parseArgLine("--select-package=com.acme.foo").discovery.getSelectedPackages()),
+				() -> assertEquals(List.of(selectPackage("com.acme.foo"), selectPackage("com.example.bar")), type.parseArgLine("-p com.acme.foo -p com.example.bar").discovery.getSelectedPackages())
 		);
 		// @formatter:on
 	}
@@ -416,13 +418,13 @@ void parseInvalidPackageSelectors() {
 	void parseValidClassSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-c com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--c com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-select-class com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-select-class=com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--select-class com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--select-class=com.acme.Foo").getSelectedClasses()),
-				() -> assertEquals(List.of(selectClass("com.acme.Foo"), selectClass("com.example.Bar")), type.parseArgLine("-c com.acme.Foo -c com.example.Bar").getSelectedClasses())
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-c com.acme.Foo").discovery.getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--c com.acme.Foo").discovery.getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-select-class com.acme.Foo").discovery.getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("-select-class=com.acme.Foo").discovery.getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--select-class com.acme.Foo").discovery.getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo")), type.parseArgLine("--select-class=com.acme.Foo").discovery.getSelectedClasses()),
+				() -> assertEquals(List.of(selectClass("com.acme.Foo"), selectClass("com.example.Bar")), type.parseArgLine("-c com.acme.Foo -c com.example.Bar").discovery.getSelectedClasses())
 		);
 		// @formatter:on
 	}
@@ -437,14 +439,14 @@ void parseInvalidClassSelectors() {
 	void parseValidMethodSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-m com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--m com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-select-method com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-select-method=com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--select-method com.acme.Foo#m()").getSelectedMethods()),
-				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--select-method=com.acme.Foo#m()").getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-m com.acme.Foo#m()").discovery.getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--m com.acme.Foo#m()").discovery.getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-select-method com.acme.Foo#m()").discovery.getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("-select-method=com.acme.Foo#m()").discovery.getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--select-method com.acme.Foo#m()").discovery.getSelectedMethods()),
+				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()")), type.parseArgLine("--select-method=com.acme.Foo#m()").discovery.getSelectedMethods()),
 				() -> assertEquals(List.of(selectMethod("com.acme.Foo#m()"), selectMethod("com.example.Bar#method(java.lang.Object)")),
-						type.parseArgLine("-m com.acme.Foo#m() -m com.example.Bar#method(java.lang.Object)").getSelectedMethods())
+						type.parseArgLine("-m com.acme.Foo#m() -m com.example.Bar#method(java.lang.Object)").discovery.getSelectedMethods())
 		);
 		// @formatter:on
 	}
@@ -459,13 +461,13 @@ void parseInvalidMethodSelectors() {
 	void parseValidClasspathResourceSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-r /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--r /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-select-resource /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-select-resource=/foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--select-resource /foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--select-resource=/foo.csv").getSelectedClasspathResources()),
-				() -> assertEquals(List.of(selectClasspathResource("/foo.csv"), selectClasspathResource("bar.json")), type.parseArgLine("-r /foo.csv -r bar.json").getSelectedClasspathResources())
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-r /foo.csv").discovery.getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--r /foo.csv").discovery.getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-select-resource /foo.csv").discovery.getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("-select-resource=/foo.csv").discovery.getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--select-resource /foo.csv").discovery.getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv")), type.parseArgLine("--select-resource=/foo.csv").discovery.getSelectedClasspathResources()),
+				() -> assertEquals(List.of(selectClasspathResource("/foo.csv"), selectClasspathResource("bar.json")), type.parseArgLine("-r /foo.csv -r bar.json").discovery.getSelectedClasspathResources())
 		);
 		// @formatter:on
 	}
@@ -480,13 +482,13 @@ void parseInvalidClasspathResourceSelectors() {
 	void parseValidIterationSelectors(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertEquals(List.of(selectIteration(selectClasspathResource("/foo.csv"), 0)), type.parseArgLine("-i resource:/foo.csv[0]").getSelectedIterations()),
-				() -> assertEquals(List.of(selectIteration(selectMethod("com.acme.Foo#m()"), 1, 2)), type.parseArgLine("--i method:com.acme.Foo#m()[1..2]").getSelectedIterations()),
-				() -> assertEquals(List.of(selectIteration(selectClass("com.acme.Foo"), 0, 2)), type.parseArgLine("-select-iteration class:com.acme.Foo[0,2]").getSelectedIterations()),
-				() -> assertEquals(List.of(selectIteration(selectPackage("com.acme.foo"), 3)), type.parseArgLine("-select-iteration=package:com.acme.foo[3]").getSelectedIterations()),
-				() -> assertEquals(List.of(selectIteration(selectModule("com.acme.foo"), 0, 1, 2, 4, 5, 6)), type.parseArgLine("--select-iteration module:com.acme.foo[0..2,4..6]").getSelectedIterations()),
-				() -> assertEquals(List.of(selectIteration(selectDirectory("foo/bar"), 1, 5)), type.parseArgLine("--select-iteration=directory:foo/bar[1,5]").getSelectedIterations()),
-				() -> assertEquals(List.of(selectIteration(selectFile("foo.txt"), 6), selectIteration(selectUri("file:///foo.txt"), 7)), type.parseArgLine("-i file:foo.txt[6] -i uri:file:///foo.txt[7]").getSelectedIterations())
+				() -> assertEquals(List.of(selectIteration(selectClasspathResource("/foo.csv"), 0)), type.parseArgLine("-i resource:/foo.csv[0]").discovery.getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectMethod("com.acme.Foo#m()"), 1, 2)), type.parseArgLine("--i method:com.acme.Foo#m()[1..2]").discovery.getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectClass("com.acme.Foo"), 0, 2)), type.parseArgLine("-select-iteration class:com.acme.Foo[0,2]").discovery.getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectPackage("com.acme.foo"), 3)), type.parseArgLine("-select-iteration=package:com.acme.foo[3]").discovery.getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectModule("com.acme.foo"), 0, 1, 2, 4, 5, 6)), type.parseArgLine("--select-iteration module:com.acme.foo[0..2,4..6]").discovery.getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectDirectory("foo/bar"), 1, 5)), type.parseArgLine("--select-iteration=directory:foo/bar[1,5]").discovery.getSelectedIterations()),
+				() -> assertEquals(List.of(selectIteration(selectFile("foo.txt"), 6), selectIteration(selectUri("file:///foo.txt"), 7)), type.parseArgLine("-i file:foo.txt[6] -i uri:file:///foo.txt[7]").discovery.getSelectedIterations())
 		);
 		// @formatter:on
 	}
@@ -502,17 +504,17 @@ void parseClasspathScanningEntries(ArgsType type) {
 		var dir = Paths.get(".");
 		// @formatter:off
 		assertAll(
-			() -> assertTrue(type.parseArgLine("--scan-class-path").isScanClasspath()),
-			() -> assertEquals(List.of(), type.parseArgLine("--scan-class-path").getSelectedClasspathEntries()),
-			() -> assertTrue(type.parseArgLine("--scan-classpath").isScanClasspath()),
-			() -> assertEquals(List.of(), type.parseArgLine("--scan-classpath").getSelectedClasspathEntries()),
-			() -> assertTrue(type.parseArgLine("--scan-class-path .").isScanClasspath()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("--scan-class-path .").getSelectedClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("--scan-class-path=.").getSelectedClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("-scan-class-path .").getSelectedClasspathEntries()),
-			() -> assertEquals(List.of(dir), type.parseArgLine("-scan-class-path=.").getSelectedClasspathEntries()),
-			() -> assertEquals(List.of(dir, Paths.get("src/test/java")), type.parseArgLine("--scan-class-path . --scan-class-path src/test/java").getSelectedClasspathEntries()),
-			() -> assertEquals(List.of(dir, Paths.get("src/test/java")), type.parseArgLine("--scan-class-path ." + File.pathSeparator + "src/test/java").getSelectedClasspathEntries())
+			() -> assertTrue(type.parseArgLine("--scan-class-path").discovery.isScanClasspath()),
+			() -> assertEquals(List.of(), type.parseArgLine("--scan-class-path").discovery.getSelectedClasspathEntries()),
+			() -> assertTrue(type.parseArgLine("--scan-classpath").discovery.isScanClasspath()),
+			() -> assertEquals(List.of(), type.parseArgLine("--scan-classpath").discovery.getSelectedClasspathEntries()),
+			() -> assertTrue(type.parseArgLine("--scan-class-path .").discovery.isScanClasspath()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--scan-class-path .").discovery.getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("--scan-class-path=.").discovery.getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("-scan-class-path .").discovery.getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir), type.parseArgLine("-scan-class-path=.").discovery.getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir, Paths.get("src/test/java")), type.parseArgLine("--scan-class-path . --scan-class-path src/test/java").discovery.getSelectedClasspathEntries()),
+			() -> assertEquals(List.of(dir, Paths.get("src/test/java")), type.parseArgLine("--scan-class-path ." + File.pathSeparator + "src/test/java").discovery.getSelectedClasspathEntries())
 		);
 		// @formatter:on
 	}
@@ -522,15 +524,15 @@ void parseClasspathScanningEntries(ArgsType type) {
 	void parseValidConfigurationParameters(ArgsType type) {
 		// @formatter:off
 		assertAll(
-				() -> assertThat(type.parseArgLine("-config foo=bar").getConfigurationParameters())
+				() -> assertThat(type.parseArgLine("-config foo=bar").discovery.getConfigurationParameters())
 						.containsOnly(entry("foo", "bar")),
-				() -> assertThat(type.parseArgLine("-config=foo=bar").getConfigurationParameters())
+				() -> assertThat(type.parseArgLine("-config=foo=bar").discovery.getConfigurationParameters())
 						.containsOnly(entry("foo", "bar")),
-				() -> assertThat(type.parseArgLine("--config foo=bar").getConfigurationParameters())
+				() -> assertThat(type.parseArgLine("--config foo=bar").discovery.getConfigurationParameters())
 						.containsOnly(entry("foo", "bar")),
-				() -> assertThat(type.parseArgLine("--config=foo=bar").getConfigurationParameters())
+				() -> assertThat(type.parseArgLine("--config=foo=bar").discovery.getConfigurationParameters())
 						.containsOnly(entry("foo", "bar")),
-				() -> assertThat(type.parseArgLine("--config foo=bar --config baz=qux").getConfigurationParameters())
+				() -> assertThat(type.parseArgLine("--config foo=bar --config baz=qux").discovery.getConfigurationParameters())
 						.containsExactly(entry("foo", "bar"), entry("baz", "qux"))
 		);
 		// @formatter:on
@@ -554,27 +556,27 @@ private void assertOptionWithMissingRequiredArgumentThrowsException(String... op
 			Stream.of(options).map(opt -> () -> assertThrows(Exception.class, () -> ArgsType.args.parseArgLine(opt))));
 	}
 
-	private void assertParses(String name, Predicate<CommandLineOptions> property, String... argLines) {
+	private void assertParses(String name, Predicate<Result> property, String... argLines) {
 		Stream.of(argLines).forEach(argLine -> {
-			CommandLineOptions options = null;
+			Result result = null;
 			try {
-				options = ArgsType.args.parseArgLine(argLine);
+				result = ArgsType.args.parseArgLine(argLine);
 			}
 			catch (IOException e) {
 				fail(e);
 			}
-			assertTrue(property.test(options), () -> name + " should be enabled by: " + argLine);
+			assertTrue(property.test(result), () -> name + " should be enabled by: " + argLine);
 		});
 	}
 
 	enum ArgsType {
 		args {
-			CommandLineOptions parseArgLine(String argLine) {
+			Result parseArgLine(String argLine) {
 				return parse(split(argLine));
 			}
 		},
 		atFile {
-			CommandLineOptions parseArgLine(String argLine) throws IOException {
+			Result parseArgLine(String argLine) throws IOException {
 				var atFile = Files.createTempFile("junit-launcher-args", ".txt");
 				try {
 					Files.write(atFile, List.of(split(argLine)));
@@ -585,17 +587,20 @@ CommandLineOptions parseArgLine(String argLine) throws IOException {
 				}
 			}
 		};
-		abstract CommandLineOptions parseArgLine(String argLine) throws IOException;
+		abstract Result parseArgLine(String argLine) throws IOException;
 
 		private static String[] split(String argLine) {
 			return "".equals(argLine) ? new String[0] : argLine.split("\\s+");
 		}
 	}
 
-	private static CommandLineOptions parse(String... args) {
-		ExecuteTestsCommand command = new ExecuteTestsCommand(__ -> null);
+	private static Result parse(String... args) {
+		ExecuteTestsCommand command = new ExecuteTestsCommand((__, ___) -> null);
 		command.parseArgs(args);
-		return command.toCommandLineOptions();
+		return new Result(command.toTestDiscoveryOptions(), command.toTestConsoleOutputOptions());
+	}
+
+	record Result(TestDiscoveryOptions discovery, TestConsoleOutputOptions output) {
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
index 86d0a641fe0b..ef867d0fe4ee 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/ExecuteTestsCommandTests.java
@@ -32,7 +32,7 @@ class ExecuteTestsCommandTests {
 
 	private final TestExecutionSummary summary = mock();
 	private final ConsoleTestExecutor consoleTestExecutor = mock();
-	private final ExecuteTestsCommand command = new ExecuteTestsCommand(__ -> consoleTestExecutor);
+	private final ExecuteTestsCommand command = new ExecuteTestsCommand((__, ___) -> consoleTestExecutor);
 
 	@BeforeEach
 	void setUp() {
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
index 353bb1a48591..7c51142118d8 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/ConsoleTestExecutorTests.java
@@ -24,8 +24,9 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.console.options.CommandLineOptions;
 import org.junit.platform.console.options.Details;
+import org.junit.platform.console.options.TestConsoleOutputOptions;
+import org.junit.platform.console.options.TestDiscoveryOptions;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 
 /**
@@ -38,11 +39,12 @@ class ConsoleTestExecutorTests {
 	};
 
 	private final StringWriter stringWriter = new StringWriter();
-	private final CommandLineOptions options = new CommandLineOptions();
+	private final TestDiscoveryOptions discoveryOptions = new TestDiscoveryOptions();
+	private final TestConsoleOutputOptions outputOptions = new TestConsoleOutputOptions();
 	private final DemoHierarchicalTestEngine dummyTestEngine = new DemoHierarchicalTestEngine();
 
 	{
-		options.setScanClasspath(true);
+		discoveryOptions.setScanClasspath(true);
 	}
 
 	@Test
@@ -50,7 +52,7 @@ void printsSummary() {
 		dummyTestEngine.addTest("succeedingTest", SUCCEEDING_TEST);
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(discoveryOptions, outputOptions, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("Test run finished after", "2 tests found", "0 tests skipped",
@@ -59,11 +61,11 @@ void printsSummary() {
 
 	@Test
 	void printsDetailsIfTheyAreNotHidden() {
-		options.setDetails(Details.FLAT);
+		outputOptions.setDetails(Details.FLAT);
 
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(discoveryOptions, outputOptions, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("Test execution started.");
@@ -71,11 +73,11 @@ void printsDetailsIfTheyAreNotHidden() {
 
 	@Test
 	void printsNoDetailsIfTheyAreHidden() {
-		options.setDetails(Details.NONE);
+		outputOptions.setDetails(Details.NONE);
 
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(discoveryOptions, outputOptions, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).doesNotContain("Test execution started.");
@@ -83,12 +85,12 @@ void printsNoDetailsIfTheyAreHidden() {
 
 	@Test
 	void printsFailuresEvenIfDetailsAreHidden() {
-		options.setDetails(Details.NONE);
+		outputOptions.setDetails(Details.NONE);
 
 		dummyTestEngine.addTest("failingTest", FAILING_BLOCK);
 		dummyTestEngine.addContainer("failingContainer", FAILING_BLOCK);
 
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(discoveryOptions, outputOptions, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("Failures (2)", "failingTest", "failingContainer");
@@ -96,13 +98,13 @@ void printsFailuresEvenIfDetailsAreHidden() {
 
 	@Test
 	void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() {
-		options.setAdditionalClasspathEntries(List.of(Paths.get(".")));
+		discoveryOptions.setAdditionalClasspathEntries(List.of(Paths.get(".")));
 
 		var oldClassLoader = getDefaultClassLoader();
 		dummyTestEngine.addTest("failingTest",
 			() -> assertSame(oldClassLoader, getDefaultClassLoader(), "should fail"));
 
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(discoveryOptions, outputOptions, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("failingTest", "should fail", "1 tests failed");
@@ -110,20 +112,16 @@ void usesCustomClassLoaderIfAdditionalClassPathEntriesArePresent() {
 
 	@Test
 	void usesSameClassLoaderIfNoAdditionalClassPathEntriesArePresent() {
-		options.setAdditionalClasspathEntries(List.of());
+		discoveryOptions.setAdditionalClasspathEntries(List.of());
 
 		var oldClassLoader = getDefaultClassLoader();
 		dummyTestEngine.addTest("failingTest",
 			() -> assertNotSame(oldClassLoader, getDefaultClassLoader(), "should fail"));
 
-		var task = new ConsoleTestExecutor(options, () -> createLauncher(dummyTestEngine));
+		var task = new ConsoleTestExecutor(discoveryOptions, outputOptions, () -> createLauncher(dummyTestEngine));
 		task.execute(new PrintWriter(stringWriter), Optional.empty());
 
 		assertThat(stringWriter.toString()).contains("failingTest", "should fail", "1 tests failed");
 	}
 
-	private PrintWriter dummyWriter() {
-		return new PrintWriter(new StringWriter());
-	}
-
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index 59e4d929f06f..733d35f7f466 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -34,7 +34,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
-import org.junit.platform.console.options.CommandLineOptions;
+import org.junit.platform.console.options.TestDiscoveryOptions;
 import org.junit.platform.engine.Filter;
 import org.junit.platform.engine.discovery.ClassNameFilter;
 import org.junit.platform.engine.discovery.ClassSelector;
@@ -54,7 +54,7 @@
  */
 class DiscoveryRequestCreatorTests {
 
-	private final CommandLineOptions options = new CommandLineOptions();
+	private final TestDiscoveryOptions options = new TestDiscoveryOptions();
 
 	@Test
 	void convertsScanClasspathOptionWithoutExplicitRootDirectories() {

From c37b8d5a1fe4f4cfcdb2c75801b095dfad47f290 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 14 Apr 2023 19:36:46 +0200
Subject: [PATCH 1220/1433] Document options of all subcommands in User Guide

---
 documentation/documentation.gradle.kts        | 30 +++++++++++++++++++
 .../asciidoc/user-guide/running-tests.adoc    | 26 ++++++++++++++--
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index b697801d8f37..0cfe24f66c60 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -99,6 +99,9 @@ gitPublish {
 
 val generatedAsciiDocPath = layout.buildDirectory.dir("generated/asciidoc")
 val consoleLauncherOptionsFile = generatedAsciiDocPath.map { it.file("console-launcher-options.txt") }
+val consoleLauncherDiscoverOptionsFile = generatedAsciiDocPath.map { it.file("console-launcher-discover-options.txt") }
+val consoleLauncherExecuteOptionsFile = generatedAsciiDocPath.map { it.file("console-launcher-execute-options.txt") }
+val consoleLauncherEnginesOptionsFile = generatedAsciiDocPath.map { it.file("console-launcher-engines-options.txt") }
 val experimentalApisTableFile = generatedAsciiDocPath.map { it.file("experimental-apis-table.adoc") }
 val deprecatedApisTableFile = generatedAsciiDocPath.map { it.file("deprecated-apis-table.adoc") }
 val standaloneConsoleLauncherShadowedArtifactsFile = generatedAsciiDocPath.map { it.file("console-launcher-standalone-shadowed-artifacts.adoc") }
@@ -160,6 +163,27 @@ tasks {
 		redirectOutput(consoleLauncherOptionsFile)
 	}
 
+	val generateConsoleLauncherDiscoverOptions by registering(JavaExec::class) {
+		classpath = sourceSets["test"].runtimeClasspath
+		mainClass.set("org.junit.platform.console.ConsoleLauncher")
+		args("discover", "--help", "--disable-banner")
+		redirectOutput(consoleLauncherDiscoverOptionsFile)
+	}
+
+	val generateConsoleLauncherExecuteOptions by registering(JavaExec::class) {
+		classpath = sourceSets["test"].runtimeClasspath
+		mainClass.set("org.junit.platform.console.ConsoleLauncher")
+		args("execute", "--help", "--disable-banner")
+		redirectOutput(consoleLauncherExecuteOptionsFile)
+	}
+
+	val generateConsoleLauncherEnginesOptions by registering(JavaExec::class) {
+		classpath = sourceSets["test"].runtimeClasspath
+		mainClass.set("org.junit.platform.console.ConsoleLauncher")
+		args("engines", "--help", "--disable-banner")
+		redirectOutput(consoleLauncherEnginesOptionsFile)
+	}
+
 	val generateExperimentalApisTable by registering(JavaExec::class) {
 		classpath = sourceSets["test"].runtimeClasspath
 		mainClass.set("org.junit.api.tools.ApiReportGenerator")
@@ -191,6 +215,9 @@ tasks {
 	withType<AbstractAsciidoctorTask>().configureEach {
 		inputs.files(
 			generateConsoleLauncherOptions,
+			generateConsoleLauncherDiscoverOptions,
+			generateConsoleLauncherExecuteOptions,
+			generateConsoleLauncherEnginesOptions,
 			generateExperimentalApisTable,
 			generateDeprecatedApisTable,
 			generateStandaloneConsoleLauncherShadowedArtifactsFile
@@ -220,6 +247,9 @@ tasks {
 				"docs-version" to docsVersion,
 				"revnumber" to version,
 				"consoleLauncherOptionsFile" to consoleLauncherOptionsFile.get(),
+				"consoleLauncherDiscoverOptionsFile" to consoleLauncherDiscoverOptionsFile.get(),
+				"consoleLauncherExecuteOptionsFile" to consoleLauncherExecuteOptionsFile.get(),
+				"consoleLauncherEnginesOptionsFile" to consoleLauncherEnginesOptionsFile.get(),
 				"experimentalApisTableFile" to experimentalApisTableFile.get(),
 				"deprecatedApisTableFile" to deprecatedApisTableFile.get(),
 				"standaloneConsoleLauncherShadowedArtifactsFile" to standaloneConsoleLauncherShadowedArtifactsFile.get(),
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index cdff368b4f3a..e454b70c4ad7 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -598,7 +598,7 @@ standalone `ConsoleLauncher` as shown below.
 
 [source,console,subs=attributes+]
 ----
-$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS>
+$ java -jar junit-platform-console-standalone-{platform-version}.jar execute <OPTIONS>
 
 ├─ JUnit Vintage
 │  └─ example.JUnit4Tests
@@ -638,16 +638,36 @@ $ java -cp classes:testlib/* org.junit.platform.console.ConsoleLauncher <OPTIONS
 .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
+supplied, the `ConsoleLauncher` exits with a status code of `2`. Otherwise, the exit code
 is `0`.
 
 [[running-tests-console-launcher-options]]
-==== Options
+==== Subcommands and Options
+
+The `{ConsoleLauncher}` provides the following subcommands:
 
 ----
 include::{consoleLauncherOptionsFile}[]
 ----
 
+===== Discovering tests
+
+----
+include::{consoleLauncherDiscoverOptionsFile}[]
+----
+
+===== Executing tests
+
+----
+include::{consoleLauncherExecuteOptionsFile}[]
+----
+
+===== Listing test engines
+
+----
+include::{consoleLauncherEnginesOptionsFile}[]
+----
+
 [[running-tests-console-launcher-argument-files]]
 ==== Argument Files (@-files)
 

From 29b4500b2113bcbe65f9eebc9d87c8dc827e5985 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 14 Apr 2023 19:40:21 +0200
Subject: [PATCH 1221/1433] Add to release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 8529843fe89d..3baf70021a62 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -45,6 +45,10 @@ repository on GitHub.
 * Support for limiting the `max-pool-size-factor` for parallel execution via a configuration parameter.
 * The new `testfeed` details mode for `ConsoleLauncher` prints test execution events as
   they occur in a concise format.
+* The existing functionality of the Console Launcher has been split into two subcommands:
+  `execute` for executing tests and `engines` for listing registered test engines.
+* A new `discover` subcommand has been added to the Console Launcher to print the
+  discovered tests for the specified details mode without executing them.
 
 
 [[release-notes-5.10.0-M1-junit-jupiter]]

From ebd139b0e8ff0814f57b6822a2eeca6f0d30cf78 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 26 Apr 2023 16:15:05 +0200
Subject: [PATCH 1222/1433] Remove unused method

---
 .../junit/platform/commons/function/Try.java  | 23 -------------------
 .../platform/commons/function/TryTests.java   |  1 -
 2 files changed, 24 deletions(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
index 14427701999f..9d7c5997b532 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/function/Try.java
@@ -161,17 +161,6 @@ private Try() {
 	 */
 	public abstract <E extends Exception> V getOrThrow(Function<? super Exception, E> exceptionTransformer) throws E;
 
-	/**
-	 * If this {@code Try} is a success, get the contained value; if this
-	 * {@code Try} is a failure, call the supplied {@link Function} with the
-	 * contained exception and return its result.
-	 *
-	 * @param action the action to try; must not be {@code null}
-	 * @return the contained value, if available; otherwise, the result of the
-	 * supplied action
-	 */
-	public abstract V getOrElse(Function<Exception, V> action);
-
 	/**
 	 * If this {@code Try} is a success, call the supplied {@link Consumer} with
 	 * the contained value; otherwise, do nothing.
@@ -263,12 +252,6 @@ public <E extends Exception> V getOrThrow(Function<? super Exception, E> excepti
 			return this.value;
 		}
 
-		@Override
-		public V getOrElse(Function<Exception, V> action) {
-			// don't call action because this Try is a success
-			return this.value;
-		}
-
 		@Override
 		public Try<V> ifSuccess(Consumer<V> valueConsumer) {
 			checkNotNull(valueConsumer, "valueConsumer");
@@ -352,12 +335,6 @@ public <E extends Exception> V getOrThrow(Function<? super Exception, E> excepti
 			throw exceptionTransformer.apply(this.cause);
 		}
 
-		@Override
-		public V getOrElse(Function<Exception, V> action) {
-			checkNotNull(action, "action");
-			return action.apply(this.cause);
-		}
-
 		@Override
 		public Try<V> ifSuccess(Consumer<V> valueConsumer) {
 			// don't call valueConsumer because this Try is a failure
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
index 03f2cdffa46d..52d466ffe15a 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/function/TryTests.java
@@ -108,7 +108,6 @@ void methodPreconditionsAreChecked() {
 		var failure = Try.failure(new Exception());
 		assertThrows(JUnitException.class, () -> failure.orElse(null));
 		assertThrows(JUnitException.class, () -> failure.orElseTry(null));
-		assertThrows(JUnitException.class, () -> failure.getOrElse(null));
 		assertThrows(JUnitException.class, () -> failure.ifFailure(null));
 	}
 

From b2ab677b6dc69b83432c7df29d19955613e20bf5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 26 Apr 2023 16:24:39 +0200
Subject: [PATCH 1223/1433] Polishing

---
 .../org/junit/platform/console/options/BaseCommand.java  | 8 ++++++--
 .../platform/console/options/ListTestEnginesCommand.java | 3 +--
 .../org/junit/platform/console/options/MainCommand.java  | 9 +++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
index 189bfafc8863..70805ebce2db 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/BaseCommand.java
@@ -84,15 +84,19 @@ private PrintWriter getOut() {
 
 	private void displayBanner(PrintWriter out) {
 		out.println();
-		CommandLine.Help.ColorScheme colorScheme = commandSpec.commandLine().getColorScheme();
+		CommandLine.Help.ColorScheme colorScheme = getColorScheme();
 		if (colorScheme.ansi().enabled()) {
 			out.print("💚 ");
 		}
-		out.println(colorScheme.text(
+		out.println(colorScheme.string(
 			"@|italic Thanks for using JUnit!|@ Support its development at @|underline https://junit.org/sponsoring|@"));
 		out.println();
 		out.flush();
 	}
 
+	protected final CommandLine.Help.ColorScheme getColorScheme() {
+		return commandSpec.commandLine().getColorScheme();
+	}
+
 	protected abstract T execute(PrintWriter out);
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
index 15879ac37e1e..029e76856f19 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/ListTestEnginesCommand.java
@@ -46,7 +46,6 @@ private void displayEngine(PrintWriter out, TestEngine engine) {
 		engine.getGroupId().ifPresent(details::add);
 		engine.getArtifactId().ifPresent(details::add);
 		engine.getVersion().ifPresent(details::add);
-		out.println(
-			commandSpec.commandLine().getColorScheme().text(String.format("@|bold %s|@%s", engine.getId(), details)));
+		out.println(getColorScheme().string(String.format("@|bold %s|@%s", engine.getId(), details)));
 	}
 }
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
index 2a2930d285ef..62eaaf7e7ed8 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -20,6 +20,7 @@
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Help.ColorScheme;
 import picocli.CommandLine.IExitCodeGenerator;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
@@ -107,12 +108,12 @@ private static void printDeprecationWarning(String subcommand, Optional<String>
 
 		commandLine.getOut().flush();
 		err.println();
-		err.println(commandLine.getColorScheme().text(
+		ColorScheme colorScheme = commandLine.getColorScheme();
+		err.println(colorScheme.string(
 			String.format("@|yellow,bold WARNING:|@ Delegated to the '%s' command%s.", subcommand, reason)));
-		err.println(commandLine.getColorScheme().text(
-			"         This behaviour has been deprecated and will be removed in a future release."));
 		err.println(
-			commandLine.getColorScheme().text("         Please use the '" + subcommand + "' command directly."));
+			colorScheme.string("         This behaviour has been deprecated and will be removed in a future release."));
+		err.println(colorScheme.string("         Please use the '" + subcommand + "' command directly."));
 		err.flush();
 	}
 

From ccd8f9c81ffdf23816b0e793ac92838c88ac2853 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 26 Apr 2023 18:43:07 +0200
Subject: [PATCH 1224/1433] Polishing

---
 .../release-notes-5.10.0-M1.adoc              | 16 ++++++----
 .../provider/MethodArgumentsProvider.java     | 31 +++++++++----------
 .../MethodArgumentsProviderTests.java         |  8 ++---
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 3baf70021a62..7a086de6d38f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -42,12 +42,13 @@ repository on GitHub.
   methods of the former. Please refer to the
   <<../user-guide/index.adoc#launcher-api-launcher-interceptors-custom, User Guide>> for
   details.
-* Support for limiting the `max-pool-size-factor` for parallel execution via a configuration parameter.
-* The new `testfeed` details mode for `ConsoleLauncher` prints test execution events as
+* Support for limiting the `max-pool-size-factor` for parallel execution via a
+  configuration parameter.
+* New `testfeed` details mode for `ConsoleLauncher` that prints test execution events as
   they occur in a concise format.
-* The existing functionality of the Console Launcher has been split into two subcommands:
+* The existing functionality of the `ConsoleLauncher` has been split into two subcommands:
   `execute` for executing tests and `engines` for listing registered test engines.
-* A new `discover` subcommand has been added to the Console Launcher to print the
+* A new `discover` subcommand has been added to the `ConsoleLauncher` to print the
   discovered tests for the specified details mode without executing them.
 
 
@@ -61,7 +62,7 @@ repository on GitHub.
 ==== Deprecations and Breaking Changes
 
 * The `dynamic` parallel execution strategy now allows the thread pool to be saturated by
-default.
+  default.
 
 ==== New Features and Improvements
 
@@ -90,7 +91,10 @@ default.
   temporary directories. See the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
-* Improve error message for non-static `@MethodSource` factory methods
+* If a non-static `@MethodSource` factory method is used with test instance per-method
+  lifecycle semantics, the exception thrown now informs the user that the factory method
+  must be `static` unless the test class is annotated with
+  `@TestInstance(Lifecycle.PER_CLASS)`.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 6815c9cf1b71..9ff585afd66e 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -24,7 +24,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
-import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
@@ -51,27 +51,13 @@ protected Stream<? extends Arguments> provideArguments(ExtensionContext context,
 		// @formatter:off
 		return stream(methodNames)
 				.map(factoryMethodName -> findFactoryMethod(testClass, testMethod, factoryMethodName))
-				.map(factoryMethod -> validateStaticFactoryMethod(context, factoryMethod))
+				.map(factoryMethod -> validateFactoryMethod(context, factoryMethod))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
 				.map(MethodArgumentsProvider::toArguments);
 		// @formatter:on
 	}
 
-	private Method validateStaticFactoryMethod(ExtensionContext context, Method factoryMethod) {
-		if (isPerMethodLifecycle(context)) {
-			Preconditions.condition(ReflectionUtils.isStatic(factoryMethod), () -> String.format(
-				"method '%s' must be static unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS).",
-				factoryMethod.toGenericString()));
-		}
-		return factoryMethod;
-	}
-
-	private boolean isPerMethodLifecycle(ExtensionContext context) {
-		return context.getTestInstanceLifecycle().orElse(
-			TestInstance.Lifecycle.PER_CLASS) == TestInstance.Lifecycle.PER_METHOD;
-	}
-
 	private static Method findFactoryMethod(Class<?> testClass, Method testMethod, String factoryMethodName) {
 		String originalFactoryMethodName = factoryMethodName;
 
@@ -190,6 +176,19 @@ private static Class<?> loadRequiredClass(String className) {
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 	}
 
+	private static Method validateFactoryMethod(ExtensionContext context, Method factoryMethod) {
+		if (isPerMethodLifecycle(context)) {
+			Preconditions.condition(ReflectionUtils.isStatic(factoryMethod), () -> format(
+				"Method '%s' must be static unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS).",
+				factoryMethod.toGenericString()));
+		}
+		return factoryMethod;
+	}
+
+	private static boolean isPerMethodLifecycle(ExtensionContext context) {
+		return context.getTestInstanceLifecycle().orElse(Lifecycle.PER_CLASS) == Lifecycle.PER_METHOD;
+	}
+
 	private static Arguments toArguments(Object item) {
 
 		// Nothing to do except cast.
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 24c144f21c0f..fcd2d5110293 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
@@ -178,8 +178,8 @@ void throwsExceptionWhenNonStaticFactoryMethodIsReferencedAndStaticIsRequired()
 		var exception = assertThrows(PreconditionViolationException.class,
 			() -> provideArguments(NonStaticTestCase.class, null, false, "nonStaticStringStreamProvider").toArray());
 
-		assertThat(exception).hasMessageContaining(
-			"must be static unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS)");
+		assertThat(exception).hasMessageContainingAll("Method '",
+			"' must be static unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS)");
 	}
 
 	@Test
@@ -715,7 +715,7 @@ public void dummyMethod() {
 		var testInstance = allowNonStaticMethod ? ReflectionUtils.newInstance(testClass) : null;
 		when(extensionContext.getTestInstance()).thenReturn(Optional.ofNullable(testInstance));
 
-		var lifeCycle = allowNonStaticMethod ? TestInstance.Lifecycle.PER_CLASS : TestInstance.Lifecycle.PER_METHOD;
+		var lifeCycle = allowNonStaticMethod ? Lifecycle.PER_CLASS : Lifecycle.PER_METHOD;
 		when(extensionContext.getTestInstanceLifecycle()).thenReturn(Optional.of(lifeCycle));
 
 		var provider = new MethodArgumentsProvider();

From 55e30d2c9be033af761080bf74975f9539a76822 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 26 Apr 2023 19:16:17 +0200
Subject: [PATCH 1225/1433] Correct error message for non-static @MethodSource
 factory methods

See #3215
---
 .../jupiter/params/provider/MethodArgumentsProvider.java  | 8 +++++---
 .../params/provider/MethodArgumentsProviderTests.java     | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 9ff585afd66e..b30cba7055d2 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -178,9 +178,11 @@ private static Class<?> loadRequiredClass(String className) {
 
 	private static Method validateFactoryMethod(ExtensionContext context, Method factoryMethod) {
 		if (isPerMethodLifecycle(context)) {
-			Preconditions.condition(ReflectionUtils.isStatic(factoryMethod), () -> format(
-				"Method '%s' must be static unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS).",
-				factoryMethod.toGenericString()));
+			Preconditions.condition(ReflectionUtils.isStatic(factoryMethod),
+				() -> format("Method '%s' must be static: local factory methods must be static unless "
+						+ "the test class is annotated with @TestInstance(Lifecycle.PER_CLASS); external "
+						+ "factory methods must always be static.",
+					factoryMethod.toGenericString()));
 		}
 		return factoryMethod;
 	}
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index fcd2d5110293..f3e91a6c72a7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -179,7 +179,9 @@ void throwsExceptionWhenNonStaticFactoryMethodIsReferencedAndStaticIsRequired()
 			() -> provideArguments(NonStaticTestCase.class, null, false, "nonStaticStringStreamProvider").toArray());
 
 		assertThat(exception).hasMessageContainingAll("Method '",
-			"' must be static unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS)");
+			"' must be static: local factory methods must be static ",
+			"unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS); ",
+			"external factory methods must always be static.");
 	}
 
 	@Test

From bc85460fdbcaad5c75ed41f0737967747567eaa4 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 10:26:54 +0200
Subject: [PATCH 1226/1433] Speed up gitPublishReset task by doing a shallow
 clone

Thanks to ajoberstar/gradle-git-publish#57
---
 documentation/documentation.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 0cfe24f66c60..22d26f83df20 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -82,6 +82,7 @@ gitPublish {
 	repoUri.set("https://github.com/junit-team/junit5.git")
 	branch.set("gh-pages")
 	sign.set(false)
+	fetchDepth.set(1)
 
 	contents {
 		from(docsDir)

From 6d4593d2871398899ef59c55ee061304e84211e6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 11:19:28 +0200
Subject: [PATCH 1227/1433] Use version catalog for Gradle plugins

---
 build.gradle.kts                         |  4 ++--
 documentation/documentation.gradle.kts   |  6 +++---
 gradle/libs.versions.toml                | 12 ++++++++++++
 platform-tests/platform-tests.gradle.kts |  2 +-
 settings.gradle.kts                      |  9 +--------
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index aa5dea89658d..292568069bec 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-	id("io.spring.nohttp")
-	id("io.github.gradle-nexus.publish-plugin")
+	alias(libs.plugins.nohttp)
+	alias(libs.plugins.nexusPublish)
 	id("junitbuild.base-conventions")
 	id("junitbuild.build-metadata")
 	id("junitbuild.dependency-update-check")
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 22d26f83df20..1596024abaac 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -8,9 +8,9 @@ import java.io.ByteArrayOutputStream
 import java.nio.file.Files
 
 plugins {
-	id("org.asciidoctor.jvm.convert")
-	id("org.asciidoctor.jvm.pdf")
-	id("org.ajoberstar.git-publish")
+	alias(libs.plugins.asciidoctorConvert)
+	alias(libs.plugins.asciidoctorPdf)
+	alias(libs.plugins.gitPublish)
 	id("junitbuild.build-parameters")
 	id("junitbuild.kotlin-library-conventions")
 	id("junitbuild.testing-conventions")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ccab4e47bb04..b271620e92c7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,6 +2,7 @@
 ant = "1.10.13"
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
+asciidoctor-plugins = "4.0.0-alpha.1"
 assertj = "3.24.2"
 checkstyle = "9.0"
 jacoco = "0.8.7"
@@ -56,3 +57,14 @@ xmlunit-placeholders = { module = "org.xmlunit:xmlunit-placeholders", version.re
 ant = ["ant", "ant-junit", "ant-junitlauncher"]
 log4j = ["log4j-core", "log4j-jul"]
 xmlunit = ["xmlunit-assertj", "xmlunit-placeholders"]
+
+[plugins]
+
+# Check if workaround in documentation.gradle.kts can be removed when upgrading
+asciidoctorConvert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor-plugins" }
+asciidoctorPdf = { id = "org.asciidoctor.jvm.pdf", version.ref = "asciidoctor-plugins" }
+
+gitPublish = { id = "org.ajoberstar.git-publish", version = "4.2.0" }
+jmh = { id = "me.champeau.jmh", version = "0.7.1" }
+nohttp = { id = "io.spring.nohttp", version = "0.0.11" }
+nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index fa0c4ff30fa7..ef730d24a79f 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 	id("junitbuild.java-library-conventions")
 	id("junitbuild.junit4-compatibility")
 	id("junitbuild.testing-conventions")
-	id("me.champeau.jmh")
+	alias(libs.plugins.jmh)
 }
 
 dependencies {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b2ec56051470..c9ef2eeb2a2b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,17 +7,10 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.13" // keep in sync with gradle/plugins/build.gradle.kts
+		id("com.gradle.enterprise") version "3.13" // keep in sync with gradle/libs.versions.toml
 		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
 		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
-		id("org.ajoberstar.git-publish") version "4.2.0"
 		kotlin("jvm") version "1.8.20"
-		// Check if workaround in documentation.gradle.kts can be removed when upgrading
-		id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
-		id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"
-		id("me.champeau.jmh") version "0.7.1"
-		id("io.spring.nohttp") version "0.0.11"
-		id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 	}
 }
 

From 2eaf5b9db09fabfa29af74898d51c29d1f072bbb Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 11:24:14 +0200
Subject: [PATCH 1228/1433] Share version catalog with included build

---
 gradle/plugins/settings.gradle.kts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
index ac0f7bb49c42..5e3aa2b886e9 100644
--- a/gradle/plugins/settings.gradle.kts
+++ b/gradle/plugins/settings.gradle.kts
@@ -1,2 +1,10 @@
+dependencyResolutionManagement {
+	versionCatalogs {
+		create("libs") {
+			from(files("../libs.versions.toml"))
+		}
+	}
+}
+
 include("build-parameters")
 include("common")

From 4cb77c2283bc81d3366a2c3fb6c4a295ea97d62d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 11:24:28 +0200
Subject: [PATCH 1229/1433] Move plugin versions to catalog

---
 gradle/libs.versions.toml                        | 2 ++
 gradle/plugins/build-parameters/build.gradle.kts | 2 +-
 gradle/plugins/common/build.gradle.kts           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b271620e92c7..e87b330f9d3a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -64,7 +64,9 @@ xmlunit = ["xmlunit-assertj", "xmlunit-placeholders"]
 asciidoctorConvert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor-plugins" }
 asciidoctorPdf = { id = "org.asciidoctor.jvm.pdf", version.ref = "asciidoctor-plugins" }
 
+buildParameters = { id = "org.gradlex.build-parameters", version = "1.4.3" }
 gitPublish = { id = "org.ajoberstar.git-publish", version = "4.2.0" }
 jmh = { id = "me.champeau.jmh", version = "0.7.1" }
 nohttp = { id = "io.spring.nohttp", version = "0.0.11" }
 nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
+versions = { id = "com.github.ben-manes.versions", version = "0.46.0" }
diff --git a/gradle/plugins/build-parameters/build.gradle.kts b/gradle/plugins/build-parameters/build.gradle.kts
index d246161af8fa..1e8e585eacc5 100644
--- a/gradle/plugins/build-parameters/build.gradle.kts
+++ b/gradle/plugins/build-parameters/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	id("org.gradlex.build-parameters") version "1.4.3"
+	alias(libs.plugins.buildParameters)
 }
 
 group = "junitbuild"
diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index ad26d3bb9b5a..968635d6e444 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	`kotlin-dsl`
-	id("com.github.ben-manes.versions") version "0.46.0"
+	alias(libs.plugins.versions)
 }
 
 repositories {

From 8d8cd55dd8f23a3fca27354b835699c07a49706f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 11:40:07 +0200
Subject: [PATCH 1230/1433] Move dependency versions to catalog

---
 gradle/libs.versions.toml                            | 12 ++++++++++--
 gradle/plugins/common/build.gradle.kts               | 10 +++++-----
 .../platform-tooling-support-tests.gradle.kts        |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e87b330f9d3a..ac905046315c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@ apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
 asciidoctor-plugins = "4.0.0-alpha.1"
 assertj = "3.24.2"
+bnd = "6.4.0"
 checkstyle = "9.0"
 jacoco = "0.8.7"
 jmh = "1.36"
@@ -16,6 +17,8 @@ opentest4j = "1.2.0"
 openTestReporting = "0.1.0-M1"
 surefire = "3.0.0-M7"
 xmlunit = "2.9.1"
+gradleEnterprisePlugin = "3.13" # keep in sync with root settings.gradle.kts
+gradleVersionsPlugin = "0.46.0"
 
 [libraries]
 ant = { module = "org.apache.ant:ant", version.ref = "ant" }
@@ -25,9 +28,14 @@ apiguardian = { module = "org.apiguardian:apiguardian-api", version.ref = "apigu
 archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.0.1" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
-bnd = { module = "biz.aQute.bnd:biz.aQute.bndlib", version = "6.4.0" }
+bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.157" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
+gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version.ref = "gradleEnterprisePlugin" }
+gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
+gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
+gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.18.0" }
+gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionsPlugin" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.11" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
@@ -69,4 +77,4 @@ gitPublish = { id = "org.ajoberstar.git-publish", version = "4.2.0" }
 jmh = { id = "me.champeau.jmh", version = "0.7.1" }
 nohttp = { id = "io.spring.nohttp", version = "0.0.11" }
 nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
-versions = { id = "com.github.ben-manes.versions", version = "0.46.0" }
+versions = { id = "com.github.ben-manes.versions", version.ref = "gradleVersionsPlugin" }
diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index 968635d6e444..15553512490b 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -12,11 +12,11 @@ repositories {
 dependencies {
 	implementation(project(":build-parameters"))
 	implementation(kotlin("gradle-plugin"))
-	implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0")
-	implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")
-	implementation("com.github.ben-manes:gradle-versions-plugin:0.46.0")
-	implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
-	compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.13") // keep in sync with root settings.gradle.kts
+	implementation(libs.gradle.bnd)
+	implementation(libs.gradle.spotless)
+	implementation(libs.gradle.versions)
+	implementation(libs.gradle.shadow)
+	compileOnly(libs.gradle.enterprise)
 }
 
 tasks {
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index c79bd0195f48..63570bc6ae4e 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -47,7 +47,7 @@ dependencies {
 	testImplementation(libs.groovy4) {
 		because("it provides convenience methods to handle process output")
 	}
-	testImplementation(libs.bnd) {
+	testImplementation(libs.bndlib) {
 		because("parsing OSGi metadata")
 	}
 	testRuntimeOnly(libs.slf4j.julBinding) {

From 6ce3610f41586d74d69484641815727560069f52 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 11:53:20 +0200
Subject: [PATCH 1231/1433] Use same JDK target for shared plugins as used by
 Gradle JVM

---
 gradle/plugins/common/build.gradle.kts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index 15553512490b..37a2c1b3301c 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
 	`kotlin-dsl`
 	alias(libs.plugins.versions)
@@ -18,15 +16,3 @@ dependencies {
 	implementation(libs.gradle.shadow)
 	compileOnly(libs.gradle.enterprise)
 }
-
-tasks {
-	withType<JavaCompile>().configureEach {
-		options.release.set(11)
-	}
-	withType<KotlinCompile>().configureEach {
-		kotlinOptions {
-			jvmTarget = "11"
-			allWarningsAsErrors = true
-		}
-	}
-}

From 98bf8e0bddc1f46ea717b7ea25d1759b171ad590 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 11:55:18 +0200
Subject: [PATCH 1232/1433] Remove unnecessary config from build-parameters
 plugin as well

---
 gradle/plugins/build-parameters/build.gradle.kts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gradle/plugins/build-parameters/build.gradle.kts b/gradle/plugins/build-parameters/build.gradle.kts
index 1e8e585eacc5..909f736269e1 100644
--- a/gradle/plugins/build-parameters/build.gradle.kts
+++ b/gradle/plugins/build-parameters/build.gradle.kts
@@ -73,9 +73,3 @@ buildParameters {
 		}
 	}
 }
-
-tasks {
-	withType<JavaCompile>().configureEach {
-		options.release.set(11)
-	}
-}

From d5c5c2042655f3024d51c2866da4d8b941078ca7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 11:55:37 +0200
Subject: [PATCH 1233/1433] Use type-safe project accessors for consistency
 with main build

---
 gradle/plugins/common/build.gradle.kts | 2 +-
 gradle/plugins/settings.gradle.kts     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index 37a2c1b3301c..97ffa0b8df1a 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-	implementation(project(":build-parameters"))
+	implementation(projects.buildParameters)
 	implementation(kotlin("gradle-plugin"))
 	implementation(libs.gradle.bnd)
 	implementation(libs.gradle.spotless)
diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
index 5e3aa2b886e9..584d528c72e2 100644
--- a/gradle/plugins/settings.gradle.kts
+++ b/gradle/plugins/settings.gradle.kts
@@ -8,3 +8,5 @@ dependencyResolutionManagement {
 
 include("build-parameters")
 include("common")
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

From f199207ec0cd63f820e418fbe2f4254705b803f0 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 12:00:47 +0200
Subject: [PATCH 1234/1433] Remove duplication

---
 settings.gradle.kts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c9ef2eeb2a2b..10b6bf933001 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,17 +7,14 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 	plugins {
-		id("com.gradle.enterprise") version "3.13" // keep in sync with gradle/libs.versions.toml
-		id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
-		id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 		kotlin("jvm") version "1.8.20"
 	}
 }
 
 plugins {
-	id("com.gradle.enterprise")
-	id("com.gradle.common-custom-user-data-gradle-plugin")
-	id("org.gradle.toolchains.foojay-resolver-convention")
+	id("com.gradle.enterprise") version "3.13" // keep in sync with gradle/libs.versions.toml
+	id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
+	id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 	id("junitbuild.build-parameters")
 }
 

From b43fe9f9fda08db06ec2e7ff705b1a3a0a6fe87b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 12:21:18 +0200
Subject: [PATCH 1235/1433] Introduce settings-conventions plugin

This gets rid of having to keep versions in sync
---
 gradle/libs.versions.toml                                | 5 +++--
 gradle/plugins/build.gradle.kts                          | 3 +++
 gradle/plugins/common/build.gradle.kts                   | 7 ++++---
 .../junitbuild.settings-conventions.settings.gradle.kts  | 5 +++++
 settings.gradle.kts                                      | 9 ++-------
 5 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 gradle/plugins/build.gradle.kts
 create mode 100644 gradle/plugins/common/src/main/kotlin/junitbuild.settings-conventions.settings.gradle.kts

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ac905046315c..cfc4cb787472 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,6 @@ opentest4j = "1.2.0"
 openTestReporting = "0.1.0-M1"
 surefire = "3.0.0-M7"
 xmlunit = "2.9.1"
-gradleEnterprisePlugin = "3.13" # keep in sync with root settings.gradle.kts
 gradleVersionsPlugin = "0.46.0"
 
 [libraries]
@@ -31,7 +30,9 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.157" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
-gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version.ref = "gradleEnterprisePlugin" }
+gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.10" }
+gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
+gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.18.0" }
diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
new file mode 100644
index 000000000000..f64d71d4260c
--- /dev/null
+++ b/gradle/plugins/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+	alias(libs.plugins.versions)
+}
diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
index 97ffa0b8df1a..0753c6a3099e 100644
--- a/gradle/plugins/common/build.gradle.kts
+++ b/gradle/plugins/common/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
 	`kotlin-dsl`
-	alias(libs.plugins.versions)
 }
 
 repositories {
@@ -11,8 +10,10 @@ dependencies {
 	implementation(projects.buildParameters)
 	implementation(kotlin("gradle-plugin"))
 	implementation(libs.gradle.bnd)
+	implementation(libs.gradle.commonCustomUserData)
+	implementation(libs.gradle.enterprise)
+	implementation(libs.gradle.foojayResolver)
+	implementation(libs.gradle.shadow)
 	implementation(libs.gradle.spotless)
 	implementation(libs.gradle.versions)
-	implementation(libs.gradle.shadow)
-	compileOnly(libs.gradle.enterprise)
 }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.settings-conventions.settings.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.settings-conventions.settings.gradle.kts
new file mode 100644
index 000000000000..654e5b73502a
--- /dev/null
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.settings-conventions.settings.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+	id("com.gradle.enterprise")
+	id("com.gradle.common-custom-user-data-gradle-plugin")
+	id("org.gradle.toolchains.foojay-resolver-convention")
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 10b6bf933001..2f339b3e129e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,20 +2,15 @@ import buildparameters.BuildParametersExtension
 import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
 
 pluginManagement {
+	includeBuild("gradle/plugins")
 	repositories {
-		includeBuild("gradle/plugins")
 		gradlePluginPortal()
 	}
-	plugins {
-		kotlin("jvm") version "1.8.20"
-	}
 }
 
 plugins {
-	id("com.gradle.enterprise") version "3.13" // keep in sync with gradle/libs.versions.toml
-	id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
-	id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 	id("junitbuild.build-parameters")
+	id("junitbuild.settings-conventions")
 }
 
 dependencyResolutionManagement {

From 558e3b3c2f5f2d92e960f5ae4d29a8bf39fb9de2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 12:21:25 +0200
Subject: [PATCH 1236/1433] Avoid Gradle warning due to
 TYPESAFE_PROJECT_ACCESSORS

---
 gradle/plugins/settings.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
index 584d528c72e2..411d60f787dc 100644
--- a/gradle/plugins/settings.gradle.kts
+++ b/gradle/plugins/settings.gradle.kts
@@ -6,6 +6,8 @@ dependencyResolutionManagement {
 	}
 }
 
+rootProject.name = "plugins"
+
 include("build-parameters")
 include("common")
 

From 5e87e82315650f9849ef688a4eadbfdb622aa95a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 12:26:03 +0200
Subject: [PATCH 1237/1433] Reorder versions alphabetically

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cfc4cb787472..49d5e62c949a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,6 +6,7 @@ asciidoctor-plugins = "4.0.0-alpha.1"
 assertj = "3.24.2"
 bnd = "6.4.0"
 checkstyle = "9.0"
+gradleVersionsPlugin = "0.46.0"
 jacoco = "0.8.7"
 jmh = "1.36"
 junit4 = "4.13.2"
@@ -17,7 +18,6 @@ opentest4j = "1.2.0"
 openTestReporting = "0.1.0-M1"
 surefire = "3.0.0-M7"
 xmlunit = "2.9.1"
-gradleVersionsPlugin = "0.46.0"
 
 [libraries]
 ant = { module = "org.apache.ant:ant", version.ref = "ant" }

From ab75fbdd3f6097caa3ce252933f8733c87b96f41 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 12:34:47 +0200
Subject: [PATCH 1238/1433] Remove no longer necessary import

---
 .../main/kotlin/junitbuild.dependency-update-check.gradle.kts   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
index a62a03a12169..f7bac1fb8efc 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.dependency-update-check.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.resolutionStrategy
-
 plugins {
 	id("com.github.ben-manes.versions")
 }

From c945ba65e9cea4e835eb5616b74bd8b7595e8c69 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 12:34:56 +0200
Subject: [PATCH 1239/1433] Update Checkstyle to 9.3

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 49d5e62c949a..c1ecb500a857 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ asciidoctor-pdf = "1.5.3"
 asciidoctor-plugins = "4.0.0-alpha.1"
 assertj = "3.24.2"
 bnd = "6.4.0"
-checkstyle = "9.0"
+checkstyle = "9.3"
 gradleVersionsPlugin = "0.46.0"
 jacoco = "0.8.7"
 jmh = "1.36"

From 75fbe27de67148d454b6bab1c4ddc04f02762a4b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 28 Apr 2023 12:37:52 +0200
Subject: [PATCH 1240/1433] Move comment about version to its declaration

---
 gradle/libs.versions.toml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c1ecb500a857..b1e243beb944 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 ant = "1.10.13"
 apiguardian = "1.1.2"
 asciidoctor-pdf = "1.5.3"
-asciidoctor-plugins = "4.0.0-alpha.1"
+asciidoctor-plugins = "4.0.0-alpha.1" # Check if workaround in documentation.gradle.kts can be removed when upgrading
 assertj = "3.24.2"
 bnd = "6.4.0"
 checkstyle = "9.3"
@@ -68,11 +68,8 @@ log4j = ["log4j-core", "log4j-jul"]
 xmlunit = ["xmlunit-assertj", "xmlunit-placeholders"]
 
 [plugins]
-
-# Check if workaround in documentation.gradle.kts can be removed when upgrading
 asciidoctorConvert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor-plugins" }
 asciidoctorPdf = { id = "org.asciidoctor.jvm.pdf", version.ref = "asciidoctor-plugins" }
-
 buildParameters = { id = "org.gradlex.build-parameters", version = "1.4.3" }
 gitPublish = { id = "org.ajoberstar.git-publish", version = "4.2.0" }
 jmh = { id = "me.champeau.jmh", version = "0.7.1" }

From f79e38bb77f9bd1c5330577613359d619fff95ae Mon Sep 17 00:00:00 2001
From: Ralph Weires <123059570+s-rwe@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:39:26 +0200
Subject: [PATCH 1241/1433] Make String to Boolean parameter conversion more
 strict (#3178)

Cause use of anything other than `true` or `false` (case-insensitive)
fail in conversion, to make potential typos explicitly visible (instead
of implicitly just treating all else as `false`).

Includes a few tests for failures on invalid values, for conversions
handled by `StringToBooleanAndCharPrimitiveConverter`.

Resolves #3177.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes-5.10.0-M1.adoc              |  3 +++
 .../asciidoc/user-guide/writing-tests.adoc    |  2 +-
 .../converter/DefaultArgumentConverter.java   |  7 ++++++-
 .../DefaultArgumentConverterTests.java        | 21 ++++++++++++++++++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 7a086de6d38f..debf40a3499e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -63,6 +63,9 @@ repository on GitHub.
 
 * The `dynamic` parallel execution strategy now allows the thread pool to be saturated by
   default.
+* Implicit type conversion of boolean values like in `@CsvSource` is now stricter, only
+  allowing values `"true"` or `"false"` (case-insensitive), in order to make accidental
+  mistakes apparent, avoiding potential confusion.
 
 ==== New Features and Improvements
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 9da5858b63f1..9b355fce57cc 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1706,7 +1706,7 @@ integral types: `byte`, `short`, `int`, `long`, and their boxed counterparts.
 |===
 | Target Type | Example
 
-| `boolean`/`Boolean`        | `"true"`                                 -> `true`
+| `boolean`/`Boolean`        | `"true"`                                 -> `true` _(only accepts values 'true' or 'false', case-insensitive)_
 | `byte`/`Byte`              | `"15"`, `"0xF"`, or `"017"`              -> `(byte) 15`
 | `char`/`Character`         | `"o"`                                    -> `'o'`
 | `short`/`Short`            | `"15"`, `"0xF"`, or `"017"`              -> `(short) 15`
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index 0db0027c89dc..adc8a5486088 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -146,7 +146,12 @@ private static class StringToBooleanAndCharPrimitiveConverter implements StringT
 		private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
 		static {
 			Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
-			converters.put(Boolean.class, Boolean::valueOf);
+			converters.put(Boolean.class, source -> {
+				boolean isTrue = "true".equalsIgnoreCase(source);
+				Preconditions.condition(isTrue || "false".equalsIgnoreCase(source),
+					() -> "String must be (ignoring case) 'true' or 'false': " + source);
+				return isTrue;
+			});
 			converters.put(Character.class, source -> {
 				Preconditions.condition(source.length() == 1, () -> "String must have length of 1: " + source);
 				return source.charAt(0);
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 12ad9cca0703..9dbff3ae7c96 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -11,6 +11,7 @@
 package org.junit.jupiter.params.converter;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.io.File;
 import java.lang.Thread.State;
@@ -99,6 +100,21 @@ void convertsStringsToPrimitiveTypes() {
 		assertConverts("42.2_3", double.class, 42.23);
 	}
 
+	@Test
+	void throwsExceptionOnInvalidStringForPrimitiveTypes() {
+		assertThatExceptionOfType(ArgumentConversionException.class) //
+				.isThrownBy(() -> convert("ab", char.class)) //
+				.withMessage("Failed to convert String \"ab\" to type java.lang.Character") //
+				.havingCause() //
+				.withMessage("String must have length of 1: ab");
+
+		assertThatExceptionOfType(ArgumentConversionException.class) //
+				.isThrownBy(() -> convert("tru", boolean.class)) //
+				.withMessage("Failed to convert String \"tru\" to type java.lang.Boolean") //
+				.havingCause() //
+				.withMessage("String must be (ignoring case) 'true' or 'false': tru");
+	}
+
 	/**
 	 * @since 5.4
 	 */
@@ -232,11 +248,14 @@ void convertsStringToUUID() {
 	// -------------------------------------------------------------------------
 
 	private void assertConverts(Object input, Class<?> targetClass, Object expectedOutput) {
-		var result = DefaultArgumentConverter.INSTANCE.convert(input, targetClass);
+		var result = convert(input, targetClass);
 
 		assertThat(result) //
 				.describedAs(input + " --(" + targetClass.getName() + ")--> " + expectedOutput) //
 				.isEqualTo(expectedOutput);
 	}
 
+	private Object convert(Object input, Class<?> targetClass) {
+		return DefaultArgumentConverter.INSTANCE.convert(input, targetClass);
+	}
 }

From d62feaa61e91034b3923a8f4112c8c839dc68b55 Mon Sep 17 00:00:00 2001
From: Peng Cheng <peng.cheng@acyclic.ai>
Date: Fri, 28 Apr 2023 09:27:09 -0400
Subject: [PATCH 1242/1433] Make error message for cyclic graphs in test
 discovery more actionable

The error message now includes two paths from the engine root to the
found `TestDescriptor` in question.

Resolves #3051.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../core/EngineDiscoveryResultValidator.java  | 68 +++++++++++++++----
 .../EngineDiscoveryResultValidatorTests.java  | 42 +++++++++---
 2 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
index a5441ae65462..797656f719af 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidator.java
@@ -10,10 +10,15 @@
 
 package org.junit.platform.launcher.core;
 
+import static java.util.stream.Collectors.joining;
+
 import java.util.ArrayDeque;
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.Queue;
-import java.util.Set;
 
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.engine.TestDescriptor;
@@ -37,30 +42,67 @@ void validate(TestEngine testEngine, TestDescriptor root) {
 			() -> String.format(
 				"The discover() method for TestEngine with ID '%s' must return a non-null root TestDescriptor.",
 				testEngine.getId()));
-		Preconditions.condition(isAcyclic(root),
-			() -> String.format("The discover() method for TestEngine with ID '%s' returned a cyclic graph.",
-				testEngine.getId()));
+		Optional<String> cyclicGraphInfo = getCyclicGraphInfo(root);
+		Preconditions.condition(!cyclicGraphInfo.isPresent(),
+			() -> String.format("The discover() method for TestEngine with ID '%s' returned a cyclic graph; %s",
+				testEngine.getId(), cyclicGraphInfo.get()));
 	}
 
 	/**
-	 * @return {@code true} if the tree does <em>not</em> contain a cycle; else {@code false}.
+	 * @return non-empty {@link Optional} if the tree contains a cycle
 	 */
-	boolean isAcyclic(TestDescriptor root) {
-		Set<UniqueId> visited = new HashSet<>();
-		visited.add(root.getUniqueId());
+	private Optional<String> getCyclicGraphInfo(TestDescriptor root) {
+
+		Map<UniqueId, Optional<UniqueId>> visited = new HashMap<>();
+		visited.put(root.getUniqueId(), Optional.empty());
+
 		Queue<TestDescriptor> queue = new ArrayDeque<>();
 		queue.add(root);
+
 		while (!queue.isEmpty()) {
-			for (TestDescriptor child : queue.remove().getChildren()) {
-				if (!visited.add(child.getUniqueId())) {
-					return false; // id already known: cycle detected!
+			TestDescriptor parent = queue.remove();
+			for (TestDescriptor child : parent.getChildren()) {
+				UniqueId uid = child.getUniqueId();
+				if (visited.containsKey(uid)) { // id already known: cycle detected!
+
+					List<UniqueId> path1 = findPath(visited, uid);
+					List<UniqueId> path2 = findPath(visited, parent.getUniqueId());
+					path2.add(uid);
+
+					return Optional.of(String.format("%s exists in at least two paths:\n(1) %s\n(2) %s", uid,
+						formatted(path1), formatted(path2)));
+				}
+				else {
+					visited.put(uid, Optional.of(parent.getUniqueId()));
 				}
 				if (child.isContainer()) {
 					queue.add(child);
 				}
 			}
 		}
-		return true;
+		return Optional.empty();
+	}
+
+	private String formatted(List<UniqueId> path) {
+		return path.stream().map(UniqueId::toString).collect(joining(" -> "));
+	}
+
+	private static List<UniqueId> findPath(Map<UniqueId, Optional<UniqueId>> visited, UniqueId target) {
+		List<UniqueId> path = new ArrayList<>();
+		path.add(target);
+		UniqueId current = target;
+
+		while (visited.containsKey(current)) {
+			Optional<UniqueId> backTraced = visited.get(current);
+			if (backTraced.isPresent()) {
+				path.add(0, backTraced.get());
+				current = backTraced.get();
+			}
+			else {
+				break;
+			}
+		}
+		return path;
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
index e9421a24871e..0a5463534af8 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
@@ -10,28 +10,38 @@
 
 package org.junit.platform.launcher.core;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.junit.jupiter.api.Test;
+import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.fakes.TestDescriptorStub;
+import org.junit.platform.fakes.TestEngineStub;
 
 /**
  * @since 1.3
  */
 class EngineDiscoveryResultValidatorTests {
 
+	private final TestEngine testEngine = new TestEngineStub("my-engine");
 	private final EngineDiscoveryResultValidator validator = new EngineDiscoveryResultValidator();
 
 	@Test
 	void detectCycleWithDoubleRoot() {
+
 		var root = new TestDescriptorStub(UniqueId.forEngine("root"), "root");
-		assertTrue(validator.isAcyclic(root));
+		validator.validate(testEngine, root);
 
 		root.addChild(root);
-		assertFalse(validator.isAcyclic(root));
+		assertThatThrownBy(() -> validator.validate(testEngine, root)) //
+				.isInstanceOf(PreconditionViolationException.class) //
+				.hasMessage(
+					"""
+							The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; [engine:root] exists in at least two paths:
+							(1) [engine:root]
+							(2) [engine:root] -> [engine:root]""");
 	}
 
 	@Test
@@ -42,10 +52,16 @@ void detectCycleWithDoubleGroup() {
 		TestDescriptor group2 = new TestDescriptorStub(rootId.append("group", "2"), "2");
 		root.addChild(group1);
 		root.addChild(group2);
-		assertTrue(validator.isAcyclic(root));
+		validator.validate(testEngine, root);
 
 		group2.addChild(group1);
-		assertFalse(validator.isAcyclic(root));
+		assertThatThrownBy(() -> validator.validate(testEngine, root)) //
+				.isInstanceOf(PreconditionViolationException.class) //
+				.hasMessage(
+					"""
+							The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; [engine:root]/[group:1] exists in at least two paths:
+							(1) [engine:root] -> [engine:root]/[group:1]
+							(2) [engine:root] -> [engine:root]/[group:2] -> [engine:root]/[group:1]""");
 	}
 
 	@Test
@@ -56,14 +72,20 @@ void detectCycleWithDoubleTest() {
 		TestDescriptor group2 = new TestDescriptorStub(rootId.append("group", "2"), "2");
 		root.addChild(group1);
 		root.addChild(group2);
-		TestDescriptor test1 = new TestDescriptorStub(rootId.append("test", "1"), "1-1");
-		TestDescriptor test2 = new TestDescriptorStub(rootId.append("test", "2"), "2-2");
+		TestDescriptor test1 = new TestDescriptorStub(group1.getUniqueId().append("test", "1"), "1-1");
+		TestDescriptor test2 = new TestDescriptorStub(group2.getUniqueId().append("test", "2"), "2-2");
 		group1.addChild(test1);
 		group2.addChild(test2);
-		assertTrue(validator.isAcyclic(root));
+		validator.validate(testEngine, root);
 
 		group2.addChild(test1);
-		assertFalse(validator.isAcyclic(root));
+		assertThatThrownBy(() -> validator.validate(testEngine, root)) //
+				.isInstanceOf(PreconditionViolationException.class) //
+				.hasMessage(
+					"""
+							The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; [engine:root]/[group:1]/[test:1] exists in at least two paths:
+							(1) [engine:root] -> [engine:root]/[group:1] -> [engine:root]/[group:1]/[test:1]
+							(2) [engine:root] -> [engine:root]/[group:2] -> [engine:root]/[group:1]/[test:1]""");
 	}
 
 }

From 23941351588882a3167d5fe1529acabb8be30595 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 28 Apr 2023 17:19:06 +0200
Subject: [PATCH 1243/1433] Improve error msg for non-static external
 @MethodSource factory methods

Prior to this commit, the error message was cryptic if an external
factory method was non-static and the test class was configured to run
with test instance per-class lifecycle semantics.

Specifically, the error was the following from the native implementation
of Method#invoke in the JDK.

java.lang.IllegalArgumentException: object is not an instance of declaring class

This commit builds on the work done in PR #3263 by expanding the "static
is required" check to any resolved factory method that cannot be invoked
on the current test instance (which may be null).

Consequently, the isPerMethodLifecycle() check is no longer necessary.

Closes #3276
---
 .../provider/MethodArgumentsProvider.java     | 11 +---
 .../MethodArgumentsProviderTests.java         | 65 +++++++++++++------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index b30cba7055d2..b018ff1668c8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -24,7 +24,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
-import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
@@ -51,7 +50,7 @@ protected Stream<? extends Arguments> provideArguments(ExtensionContext context,
 		// @formatter:off
 		return stream(methodNames)
 				.map(factoryMethodName -> findFactoryMethod(testClass, testMethod, factoryMethodName))
-				.map(factoryMethod -> validateFactoryMethod(context, factoryMethod))
+				.map(factoryMethod -> validateFactoryMethod(context, factoryMethod, testInstance))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
 				.map(MethodArgumentsProvider::toArguments);
@@ -176,8 +175,8 @@ private static Class<?> loadRequiredClass(String className) {
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 	}
 
-	private static Method validateFactoryMethod(ExtensionContext context, Method factoryMethod) {
-		if (isPerMethodLifecycle(context)) {
+	private static Method validateFactoryMethod(ExtensionContext context, Method factoryMethod, Object testInstance) {
+		if (!factoryMethod.getDeclaringClass().isInstance(testInstance)) {
 			Preconditions.condition(ReflectionUtils.isStatic(factoryMethod),
 				() -> format("Method '%s' must be static: local factory methods must be static unless "
 						+ "the test class is annotated with @TestInstance(Lifecycle.PER_CLASS); external "
@@ -187,10 +186,6 @@ private static Method validateFactoryMethod(ExtensionContext context, Method fac
 		return factoryMethod;
 	}
 
-	private static boolean isPerMethodLifecycle(ExtensionContext context) {
-		return context.getTestInstanceLifecycle().orElse(Lifecycle.PER_CLASS) == Lifecycle.PER_METHOD;
-	}
-
 	private static Arguments toArguments(Object item) {
 
 		// Nothing to do except cast.
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index f3e91a6c72a7..0df033899039 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -174,10 +174,38 @@ void providesArgumentsUsingListOfObjectArrays() {
 	}
 
 	@Test
-	void throwsExceptionWhenNonStaticFactoryMethodIsReferencedAndStaticIsRequired() {
+	void throwsExceptionWhenNonStaticLocalFactoryMethodIsReferencedWithLifecyclePerMethodSemantics() {
+		var lifecyclePerClass = false;
 		var exception = assertThrows(PreconditionViolationException.class,
-			() -> provideArguments(NonStaticTestCase.class, null, false, "nonStaticStringStreamProvider").toArray());
+			() -> provideArguments(NonStaticTestCase.class, lifecyclePerClass,
+				"nonStaticStringStreamProvider").toArray());
 
+		assertStaticIsRequired(exception);
+	}
+
+	@Test
+	void throwsExceptionWhenNonStaticExternalFactoryMethodIsReferencedWithLifecyclePerMethodSemantics() {
+		var factoryClass = NonStaticTestCase.class.getName();
+		var factoryMethod = factoryClass + "#nonStaticStringStreamProvider";
+		var lifecyclePerClass = false;
+		var exception = assertThrows(PreconditionViolationException.class,
+			() -> provideArguments(TestCase.class, lifecyclePerClass, factoryMethod).toArray());
+
+		assertStaticIsRequired(exception);
+	}
+
+	@Test
+	void throwsExceptionWhenNonStaticExternalFactoryMethodIsReferencedWithLifecyclePerClassSemantics() {
+		var factoryClass = NonStaticTestCase.class.getName();
+		var factoryMethod = factoryClass + "#nonStaticStringStreamProvider";
+		boolean lifecyclePerClass = true;
+		var exception = assertThrows(PreconditionViolationException.class,
+			() -> provideArguments(TestCase.class, lifecyclePerClass, factoryMethod).toArray());
+
+		assertStaticIsRequired(exception);
+	}
+
+	private static void assertStaticIsRequired(PreconditionViolationException exception) {
 		assertThat(exception).hasMessageContainingAll("Method '",
 			"' must be static: local factory methods must be static ",
 			"unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS); ",
@@ -186,7 +214,7 @@ void throwsExceptionWhenNonStaticFactoryMethodIsReferencedAndStaticIsRequired()
 
 	@Test
 	void providesArgumentsFromNonStaticFactoryMethodWhenStaticIsNotRequired() {
-		var arguments = provideArguments(NonStaticTestCase.class, null, true, "nonStaticStringStreamProvider");
+		var arguments = provideArguments(NonStaticTestCase.class, true, "nonStaticStringStreamProvider");
 
 		assertThat(arguments).containsExactly(array("foo"), array("bar"));
 	}
@@ -609,7 +637,7 @@ void throwsExceptionWhenExternalFactoryMethodHasInvalidReturnType() {
 			String factoryMethod = factoryClass + "#factoryWithInvalidReturnType";
 
 			var exception = assertThrows(PreconditionViolationException.class,
-				() -> provideArguments(TestCase.class, null, false, factoryMethod).toArray());
+				() -> provideArguments(TestCase.class, false, factoryMethod).toArray());
 
 			assertThat(exception.getMessage())//
 					.containsSubsequence("Could not find valid factory method [" + factoryMethod + "] for test class [",
@@ -676,30 +704,24 @@ private static Object[] array(Object... objects) {
 	}
 
 	private Stream<Object[]> provideArguments(String... factoryMethodNames) {
-		return provideArguments(TestCase.class, null, false, factoryMethodNames);
+		return provideArguments(TestCase.class, false, factoryMethodNames);
 	}
 
 	private Stream<Object[]> provideArguments(Method testMethod, String factoryMethodName) {
 		return provideArguments(TestCase.class, testMethod, false, factoryMethodName);
 	}
 
-	private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod, boolean allowNonStaticMethod,
+	private Stream<Object[]> provideArguments(Class<?> testClass, boolean allowNonStaticMethod,
 			String... factoryMethodNames) {
 
-		if (testMethod == null) {
-			try {
-				class DummyClass {
-					@SuppressWarnings("unused")
-					public void dummyMethod() {
-					};
-				}
-				// ensure we have a non-null method, even if it's not a real test method.
-				testMethod = DummyClass.class.getMethod("dummyMethod");
-			}
-			catch (Exception ex) {
-				throw new RuntimeException(ex);
-			}
-		}
+		// Ensure we have a non-null test method, even if it's not a real test method.
+		// If this throws an exception, make sure that the supplied test class defines a "void test()" method.
+		Method testMethod = ReflectionUtils.findMethod(testClass, "test").get();
+		return provideArguments(testClass, testMethod, allowNonStaticMethod, factoryMethodNames);
+	}
+
+	private Stream<Object[]> provideArguments(Class<?> testClass, Method testMethod, boolean allowNonStaticMethod,
+			String... factoryMethodNames) {
 
 		var methodSource = mock(MethodSource.class);
 
@@ -940,6 +962,9 @@ static Object[][] twoDimensionalObjectArrayProvider() {
 	// This test case mimics @TestInstance(Lifecycle.PER_CLASS)
 	static class NonStaticTestCase {
 
+		void test() {
+		}
+
 		Stream<String> nonStaticStringStreamProvider() {
 			return Stream.of("foo", "bar");
 		}

From 4ab790d1df55328cd9fa33d5499e2b1ed9c076ef Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 28 Apr 2023 17:33:38 +0200
Subject: [PATCH 1244/1433] Polish formatting in tests

---
 .../EngineDiscoveryResultValidatorTests.java  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
index 0a5463534af8..93f4d0b03e84 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/EngineDiscoveryResultValidatorTests.java
@@ -30,18 +30,17 @@ class EngineDiscoveryResultValidatorTests {
 
 	@Test
 	void detectCycleWithDoubleRoot() {
-
 		var root = new TestDescriptorStub(UniqueId.forEngine("root"), "root");
 		validator.validate(testEngine, root);
 
 		root.addChild(root);
 		assertThatThrownBy(() -> validator.validate(testEngine, root)) //
 				.isInstanceOf(PreconditionViolationException.class) //
-				.hasMessage(
-					"""
-							The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; [engine:root] exists in at least two paths:
-							(1) [engine:root]
-							(2) [engine:root] -> [engine:root]""");
+				.hasMessage("""
+						The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; \
+						[engine:root] exists in at least two paths:
+						(1) [engine:root]
+						(2) [engine:root] -> [engine:root]""");
 	}
 
 	@Test
@@ -57,11 +56,11 @@ void detectCycleWithDoubleGroup() {
 		group2.addChild(group1);
 		assertThatThrownBy(() -> validator.validate(testEngine, root)) //
 				.isInstanceOf(PreconditionViolationException.class) //
-				.hasMessage(
-					"""
-							The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; [engine:root]/[group:1] exists in at least two paths:
-							(1) [engine:root] -> [engine:root]/[group:1]
-							(2) [engine:root] -> [engine:root]/[group:2] -> [engine:root]/[group:1]""");
+				.hasMessage("""
+						The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; \
+						[engine:root]/[group:1] exists in at least two paths:
+						(1) [engine:root] -> [engine:root]/[group:1]
+						(2) [engine:root] -> [engine:root]/[group:2] -> [engine:root]/[group:1]""");
 	}
 
 	@Test
@@ -81,11 +80,11 @@ void detectCycleWithDoubleTest() {
 		group2.addChild(test1);
 		assertThatThrownBy(() -> validator.validate(testEngine, root)) //
 				.isInstanceOf(PreconditionViolationException.class) //
-				.hasMessage(
-					"""
-							The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; [engine:root]/[group:1]/[test:1] exists in at least two paths:
-							(1) [engine:root] -> [engine:root]/[group:1] -> [engine:root]/[group:1]/[test:1]
-							(2) [engine:root] -> [engine:root]/[group:2] -> [engine:root]/[group:1]/[test:1]""");
+				.hasMessage("""
+						The discover() method for TestEngine with ID 'my-engine' returned a cyclic graph; \
+						[engine:root]/[group:1]/[test:1] exists in at least two paths:
+						(1) [engine:root] -> [engine:root]/[group:1] -> [engine:root]/[group:1]/[test:1]
+						(2) [engine:root] -> [engine:root]/[group:2] -> [engine:root]/[group:1]/[test:1]""");
 	}
 
 }

From e33897530085e91a6d4a04113533f44b0d90a120 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 11:54:59 +0200
Subject: [PATCH 1245/1433] Document #3051 in release notes

---
 .../docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index debf40a3499e..ada634f0a944 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -50,6 +50,8 @@ repository on GitHub.
   `execute` for executing tests and `engines` for listing registered test engines.
 * A new `discover` subcommand has been added to the `ConsoleLauncher` to print the
   discovered tests for the specified details mode without executing them.
+* Improved error message for cyclic graphs detected during test discovery to be more
+  actionable.
 
 
 [[release-notes-5.10.0-M1-junit-jupiter]]

From 141f508a59a469d6c2afba6027b41ed2f0aad1bd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 12:39:12 +0200
Subject: [PATCH 1246/1433] Generalize and move store implementation to
 junit-platform-engine

JUnit Platform engine now provides `NamespacedHierarchicalStore` which
is used in the JUnit Jupiter engine to implement
`ExtensionContext.Store`.

Resolves #3047.
---
 .../release-notes-5.10.0-M1.adoc              |   2 +
 .../api/extension/ExtensionContext.java       |   4 +-
 .../extension/ExtensionContextException.java  |   7 +
 .../descriptor/AbstractExtensionContext.java  |  19 +-
 .../execution/ExtensionValuesStore.java       | 245 -----------
 .../engine/execution/NamespaceAwareStore.java |  32 +-
 .../engine/descriptor/NamespaceTests.java     |  36 ++
 ...ExtensionContextStoreConcurrencyTests.java |   5 +-
 .../execution/ExtensionContextStoreTests.java |  15 +-
 .../extension/CloseablePathCleanupTests.java  |   4 +-
 .../SeparateThreadTimeoutInvocationTests.java |   4 +-
 .../TimeoutInvocationFactoryTests.java        |   4 +-
 .../ParameterizedTestExtensionTests.java      |   4 +-
 .../store/NamespacedHierarchicalStore.java    | 403 ++++++++++++++++++
 .../NamespacedHierarchicalStoreException.java |  32 ++
 .../engine/support/store/package-info.java    |   5 +
 .../module-info.java                          |   1 +
 .../NamespacedHierarchicalStoreTests.java     | 152 +++++--
 .../junit-platform-engine.expected.txt        |   1 +
 19 files changed, 656 insertions(+), 319 deletions(-)
 delete mode 100644 junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/NamespaceTests.java
 create mode 100644 junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
 create mode 100644 junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreException.java
 create mode 100644 junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/package-info.java
 rename junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java => platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java (70%)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index ada634f0a944..d73c14f7a78b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -52,6 +52,8 @@ repository on GitHub.
   discovered tests for the specified details mode without executing them.
 * Improved error message for cyclic graphs detected during test discovery to be more
   actionable.
+* Extracted `NamespacedHierarchicalStore` from JUnit Jupiter engine for reuse by other
+  test engines and their extensions.
 
 
 [[release-notes-5.10.0-M1-junit-jupiter]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
index faee7c4f4f35..3182b91035db 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java
@@ -547,7 +547,7 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 *
 		 * @param key the key; never {@code null}
 		 * @param defaultCreator the function called with the supplied {@code key}
-		 * to create a new value; never {@code null}
+		 * to create a new value; never {@code null} but may return {@code null}
 		 * @param <K> the key type
 		 * @param <V> the value type
 		 * @return the value; potentially {@code null}
@@ -574,7 +574,7 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 *
 		 * @param key the key; never {@code null}
 		 * @param defaultCreator the function called with the supplied {@code key}
-		 * to create a new value; never {@code null}
+		 * to create a new value; never {@code null} but may return {@code null}
 		 * @param requiredType the required type of the value; never {@code null}
 		 * @param <K> the key type
 		 * @param <V> the value type
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
index 957c0ed6910f..c47bfc48e6fa 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContextException.java
@@ -10,6 +10,7 @@
 
 package org.junit.jupiter.api.extension;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import org.apiguardian.api.API;
@@ -27,8 +28,14 @@ public class ExtensionContextException extends JUnitException {
 
 	private static final long serialVersionUID = 1L;
 
+	@SuppressWarnings("unused")
 	public ExtensionContextException(String message) {
 		super(message);
 	}
 
+	@API(status = EXPERIMENTAL, since = "5.10")
+	public ExtensionContextException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
index 90b6a9326797..58ff7c73936b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java
@@ -22,9 +22,9 @@
 
 import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
-import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.Preconditions;
@@ -33,18 +33,25 @@
 import org.junit.platform.engine.TestTag;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.hierarchical.Node;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
 
 /**
  * @since 5.0
  */
 abstract class AbstractExtensionContext<T extends TestDescriptor> implements ExtensionContext, AutoCloseable {
 
+	private static final NamespacedHierarchicalStore.CloseAction<Namespace> CLOSE_RESOURCES = (__, ___, value) -> {
+		if (value instanceof CloseableResource) {
+			((CloseableResource) value).close();
+		}
+	};
+
 	private final ExtensionContext parent;
 	private final EngineExecutionListener engineExecutionListener;
 	private final T testDescriptor;
 	private final Set<String> tags;
 	private final JupiterConfiguration configuration;
-	private final ExtensionValuesStore valuesStore;
+	private final NamespacedHierarchicalStore<Namespace> valuesStore;
 	private final ExecutableInvoker executableInvoker;
 
 	AbstractExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener, T testDescriptor,
@@ -67,17 +74,17 @@ abstract class AbstractExtensionContext<T extends TestDescriptor> implements Ext
 		// @formatter:on
 	}
 
-	private ExtensionValuesStore createStore(ExtensionContext parent) {
-		ExtensionValuesStore parentStore = null;
+	private NamespacedHierarchicalStore<Namespace> createStore(ExtensionContext parent) {
+		NamespacedHierarchicalStore<Namespace> parentStore = null;
 		if (parent != null) {
 			parentStore = ((AbstractExtensionContext<?>) parent).valuesStore;
 		}
-		return new ExtensionValuesStore(parentStore);
+		return new NamespacedHierarchicalStore<>(parentStore, CLOSE_RESOURCES);
 	}
 
 	@Override
 	public void close() {
-		this.valuesStore.closeAllStoredCloseableValues();
+		this.valuesStore.close();
 	}
 
 	@Override
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
deleted file mode 100644
index 133e3d6b0156..000000000000
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ExtensionValuesStore.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright 2015-2023 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.engine.execution;
-
-import static org.apiguardian.api.API.Status.INTERNAL;
-import static org.junit.jupiter.engine.support.JupiterThrowableCollectorFactory.createThrowableCollector;
-import static org.junit.platform.commons.util.ReflectionUtils.getWrapperType;
-import static org.junit.platform.commons.util.ReflectionUtils.isAssignableTo;
-
-import java.util.Comparator;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import org.apiguardian.api.API;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
-import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
-import org.junit.jupiter.api.extension.ExtensionContextException;
-import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
-
-/**
- * {@code ExtensionValuesStore} is used inside implementations of
- * {@link ExtensionContext} to store and retrieve values.
- *
- * @since 5.0
- */
-@API(status = INTERNAL, since = "5.0")
-public class ExtensionValuesStore {
-
-	private static final Comparator<StoredValue> REVERSE_INSERT_ORDER = Comparator.<StoredValue, Integer> comparing(
-		it -> it.order).reversed();
-
-	private final AtomicInteger insertOrderSequence = new AtomicInteger();
-	private final ConcurrentMap<CompositeKey, StoredValue> storedValues = new ConcurrentHashMap<>(4);
-	private final ExtensionValuesStore parentStore;
-
-	public ExtensionValuesStore(ExtensionValuesStore parentStore) {
-		this.parentStore = parentStore;
-	}
-
-	/**
-	 * Close all values that implement {@link CloseableResource}.
-	 *
-	 * @implNote Only close values stored in this instance. This implementation
-	 * does not close values in parent stores.
-	 */
-	public void closeAllStoredCloseableValues() {
-		ThrowableCollector throwableCollector = createThrowableCollector();
-		storedValues.values().stream() //
-				.filter(storedValue -> storedValue.evaluateSafely() instanceof CloseableResource) //
-				.sorted(REVERSE_INSERT_ORDER) //
-				.map(storedValue -> (CloseableResource) storedValue.evaluate()) //
-				.forEach(resource -> throwableCollector.execute(resource::close));
-		throwableCollector.assertEmpty();
-	}
-
-	Object get(Namespace namespace, Object key) {
-		StoredValue storedValue = getStoredValue(new CompositeKey(namespace, key));
-		return (storedValue != null ? storedValue.evaluate() : null);
-	}
-
-	<T> T get(Namespace namespace, Object key, Class<T> requiredType) {
-		Object value = get(namespace, key);
-		return castToRequiredType(key, value, requiredType);
-	}
-
-	<K, V> Object getOrComputeIfAbsent(Namespace namespace, K key, Function<K, V> defaultCreator) {
-		CompositeKey compositeKey = new CompositeKey(namespace, key);
-		StoredValue storedValue = getStoredValue(compositeKey);
-		if (storedValue == null) {
-			StoredValue newValue = storedValue(new MemoizingSupplier(() -> defaultCreator.apply(key)));
-			storedValue = Optional.ofNullable(storedValues.putIfAbsent(compositeKey, newValue)).orElse(newValue);
-		}
-		return storedValue.evaluate();
-	}
-
-	<K, V> V getOrComputeIfAbsent(Namespace namespace, K key, Function<K, V> defaultCreator, Class<V> requiredType) {
-		Object value = getOrComputeIfAbsent(namespace, key, defaultCreator);
-		return castToRequiredType(key, value, requiredType);
-	}
-
-	void put(Namespace namespace, Object key, Object value) {
-		storedValues.put(new CompositeKey(namespace, key), storedValue(() -> value));
-	}
-
-	private StoredValue storedValue(Supplier<Object> value) {
-		return new StoredValue(insertOrderSequence.getAndIncrement(), value);
-	}
-
-	Object remove(Namespace namespace, Object key) {
-		StoredValue previous = storedValues.remove(new CompositeKey(namespace, key));
-		return (previous != null ? previous.evaluate() : null);
-	}
-
-	<T> T remove(Namespace namespace, Object key, Class<T> requiredType) {
-		Object value = remove(namespace, key);
-		return castToRequiredType(key, value, requiredType);
-	}
-
-	private StoredValue getStoredValue(CompositeKey compositeKey) {
-		StoredValue storedValue = storedValues.get(compositeKey);
-		if (storedValue != null) {
-			return storedValue;
-		}
-		if (parentStore != null) {
-			return parentStore.getStoredValue(compositeKey);
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> T castToRequiredType(Object key, Object value, Class<T> requiredType) {
-		if (value == null) {
-			return null;
-		}
-		if (isAssignableTo(value, requiredType)) {
-			if (requiredType.isPrimitive()) {
-				return (T) getWrapperType(requiredType).cast(value);
-			}
-			return requiredType.cast(value);
-		}
-		// else
-		throw new ExtensionContextException(
-			String.format("Object stored under key [%s] is not of required type [%s]", key, requiredType.getName()));
-	}
-
-	private static class CompositeKey {
-
-		private final Namespace namespace;
-		private final Object key;
-
-		private CompositeKey(Namespace namespace, Object key) {
-			this.namespace = namespace;
-			this.key = key;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if (this == o) {
-				return true;
-			}
-			if (o == null || getClass() != o.getClass()) {
-				return false;
-			}
-			CompositeKey that = (CompositeKey) o;
-			return this.namespace.equals(that.namespace) && this.key.equals(that.key);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(namespace, key);
-		}
-
-	}
-
-	private static class StoredValue {
-
-		private final int order;
-		private final Supplier<Object> supplier;
-
-		public StoredValue(int order, Supplier<Object> supplier) {
-			this.order = order;
-			this.supplier = supplier;
-		}
-
-		private Object evaluateSafely() {
-			try {
-				return evaluate();
-			}
-			catch (RuntimeException e) {
-				return null;
-			}
-		}
-
-		private Object evaluate() {
-			return supplier.get();
-		}
-
-	}
-
-	private static class MemoizingSupplier implements Supplier<Object> {
-
-		private static final Object NO_VALUE_SET = new Object();
-
-		private final Lock lock = new ReentrantLock();
-		private final Supplier<Object> delegate;
-		private volatile Object value = NO_VALUE_SET;
-
-		private MemoizingSupplier(Supplier<Object> delegate) {
-			this.delegate = delegate;
-		}
-
-		@Override
-		public Object get() {
-			if (value == NO_VALUE_SET) {
-				computeValue();
-			}
-			if (value instanceof Failure) {
-				throw ((Failure) value).exception;
-			}
-			return value;
-		}
-
-		private void computeValue() {
-			lock.lock();
-			try {
-				if (value == NO_VALUE_SET) {
-					value = delegate.get();
-				}
-			}
-			catch (RuntimeException e) {
-				value = new Failure(e);
-			}
-			finally {
-				lock.unlock();
-			}
-		}
-
-		private static class Failure {
-
-			private final RuntimeException exception;
-
-			public Failure(RuntimeException exception) {
-				this.exception = exception;
-			}
-		}
-
-	}
-
-}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
index 1b56304505f1..7d30d496a708 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/NamespaceAwareStore.java
@@ -13,11 +13,15 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.ExtensionContextException;
 import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStoreException;
 
 /**
  * @since 5.0
@@ -25,10 +29,10 @@
 @API(status = INTERNAL, since = "5.0")
 public class NamespaceAwareStore implements Store {
 
-	private final ExtensionValuesStore valuesStore;
+	private final NamespacedHierarchicalStore<Namespace> valuesStore;
 	private final Namespace namespace;
 
-	public NamespaceAwareStore(ExtensionValuesStore valuesStore, Namespace namespace) {
+	public NamespaceAwareStore(NamespacedHierarchicalStore<Namespace> valuesStore, Namespace namespace) {
 		this.valuesStore = valuesStore;
 		this.namespace = namespace;
 	}
@@ -36,21 +40,21 @@ public NamespaceAwareStore(ExtensionValuesStore valuesStore, Namespace namespace
 	@Override
 	public Object get(Object key) {
 		Preconditions.notNull(key, "key must not be null");
-		return this.valuesStore.get(this.namespace, key);
+		return accessStore(() -> this.valuesStore.get(this.namespace, key));
 	}
 
 	@Override
 	public <T> T get(Object key, Class<T> requiredType) {
 		Preconditions.notNull(key, "key must not be null");
 		Preconditions.notNull(requiredType, "requiredType must not be null");
-		return this.valuesStore.get(this.namespace, key, requiredType);
+		return accessStore(() -> this.valuesStore.get(this.namespace, key, requiredType));
 	}
 
 	@Override
 	public <K, V> Object getOrComputeIfAbsent(K key, Function<K, V> defaultCreator) {
 		Preconditions.notNull(key, "key must not be null");
 		Preconditions.notNull(defaultCreator, "defaultCreator function must not be null");
-		return this.valuesStore.getOrComputeIfAbsent(this.namespace, key, defaultCreator);
+		return accessStore(() -> this.valuesStore.getOrComputeIfAbsent(this.namespace, key, defaultCreator));
 	}
 
 	@Override
@@ -58,26 +62,36 @@ public <K, V> V getOrComputeIfAbsent(K key, Function<K, V> defaultCreator, Class
 		Preconditions.notNull(key, "key must not be null");
 		Preconditions.notNull(defaultCreator, "defaultCreator function must not be null");
 		Preconditions.notNull(requiredType, "requiredType must not be null");
-		return this.valuesStore.getOrComputeIfAbsent(this.namespace, key, defaultCreator, requiredType);
+		return accessStore(
+			() -> this.valuesStore.getOrComputeIfAbsent(this.namespace, key, defaultCreator, requiredType));
 	}
 
 	@Override
 	public void put(Object key, Object value) {
 		Preconditions.notNull(key, "key must not be null");
-		this.valuesStore.put(this.namespace, key, value);
+		accessStore(() -> this.valuesStore.put(this.namespace, key, value));
 	}
 
 	@Override
 	public Object remove(Object key) {
 		Preconditions.notNull(key, "key must not be null");
-		return this.valuesStore.remove(this.namespace, key);
+		return accessStore(() -> this.valuesStore.remove(this.namespace, key));
 	}
 
 	@Override
 	public <T> T remove(Object key, Class<T> requiredType) {
 		Preconditions.notNull(key, "key must not be null");
 		Preconditions.notNull(requiredType, "requiredType must not be null");
-		return this.valuesStore.remove(this.namespace, key, requiredType);
+		return accessStore(() -> this.valuesStore.remove(this.namespace, key, requiredType));
+	}
+
+	private <T> T accessStore(Supplier<T> action) {
+		try {
+			return action.get();
+		}
+		catch (NamespacedHierarchicalStoreException e) {
+			throw new ExtensionContextException(e.getMessage(), e);
+		}
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/NamespaceTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/NamespaceTests.java
new file mode 100644
index 000000000000..67ed44ed28fd
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/NamespaceTests.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.descriptor;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+
+public class NamespaceTests {
+
+	@Test
+	void namespacesEqualForSamePartsSequence() {
+		Namespace ns1 = Namespace.create("part1", "part2");
+		Namespace ns2 = Namespace.create("part1", "part2");
+
+		assertEquals(ns1, ns2);
+	}
+
+	@Test
+	void orderOfNamespacePartsDoesMatter() {
+		Namespace ns1 = Namespace.create("part1", "part2");
+		Namespace ns2 = Namespace.create("part2", "part1");
+
+		assertNotEquals(ns1, ns2);
+	}
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
index f09fb6990655..dd270822b176 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreConcurrencyTests.java
@@ -18,9 +18,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
 
 /**
- * Concurrency tests for {@link NamespaceAwareStore} and {@link ExtensionValuesStore}.
+ * Concurrency tests for {@link NamespaceAwareStore} and {@link NamespacedHierarchicalStore}.
  *
  * @since 5.0
  */
@@ -46,7 +47,7 @@ private String newValue(String key) {
 
 	private Store reset() {
 		count.set(0);
-		return new NamespaceAwareStore(new ExtensionValuesStore(null), Namespace.GLOBAL);
+		return new NamespaceAwareStore(new NamespacedHierarchicalStore<>(null), Namespace.GLOBAL);
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
index 16f40334473d..d19f97f2a31a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionContextStoreTests.java
@@ -21,9 +21,11 @@
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.ExtensionContextException;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStoreException;
 
 /**
- * Unit tests for {@link NamespaceAwareStore} and {@link ExtensionValuesStore}.
+ * Unit tests for {@link NamespaceAwareStore} and {@link NamespacedHierarchicalStore}.
  *
  * @since 5.5
  * @see ExtensionContextStoreConcurrencyTests
@@ -34,8 +36,8 @@ class ExtensionContextStoreTests {
 	private static final String KEY = "key";
 	private static final String VALUE = "value";
 
-	private final ExtensionValuesStore parentStore = new ExtensionValuesStore(null);
-	private final ExtensionValuesStore localStore = new ExtensionValuesStore(parentStore);
+	private final NamespacedHierarchicalStore<Namespace> parentStore = new NamespacedHierarchicalStore<>(null);
+	private final NamespacedHierarchicalStore<Namespace> localStore = new NamespacedHierarchicalStore<>(parentStore);
 	private final Store store = new NamespaceAwareStore(localStore, Namespace.GLOBAL);
 
 	@Test
@@ -53,7 +55,10 @@ void getOrDefaultRequestingIncompatibleType() {
 
 		Exception exception = assertThrows(ExtensionContextException.class,
 			() -> store.getOrDefault(KEY, boolean.class, true));
-		assertThat(exception).hasMessageContaining("is not of required type");
+		assertThat(exception) //
+				.hasMessageContaining("is not of required type") //
+				.hasCauseInstanceOf(NamespacedHierarchicalStoreException.class) //
+				.hasStackTraceContaining(NamespacedHierarchicalStore.class.getName());
 	}
 
 	@Test
@@ -83,7 +88,7 @@ void getOrComputeIfAbsentWithFailingCreator() {
 		var e2 = assertThrows(RuntimeException.class, () -> store.get(KEY));
 		assertSame(e1, e2);
 
-		assertDoesNotThrow(localStore::closeAllStoredCloseableValues);
+		assertDoesNotThrow(localStore::close);
 		assertThat(invocations).hasValue(1);
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index d708f21041ae..da549d491c99 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -34,8 +34,8 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
-import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
 import org.mockito.Mockito;
 
 /**
@@ -56,7 +56,7 @@ class CloseablePathCleanupTests extends AbstractJupiterTestEngineTests {
 
 	@BeforeEach
 	void setUpExtensionContext() {
-		var store = new NamespaceAwareStore(new ExtensionValuesStore(null), Namespace.GLOBAL);
+		var store = new NamespaceAwareStore(new NamespacedHierarchicalStore<>(null), Namespace.GLOBAL);
 		when(extensionContext.getStore(any())).thenReturn(store);
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java
index 7ec645925f5f..c8d51e7987a8 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTests.java
@@ -23,9 +23,9 @@
 import org.junit.jupiter.api.Timeout.ThreadMode;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
-import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 import org.junit.jupiter.engine.extension.TimeoutInvocationFactory.TimeoutInvocationParameters;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
 
 /**
  * @since 5.9
@@ -71,7 +71,7 @@ void shouldThrowInvocationException() {
 
 	private static <T> SeparateThreadTimeoutInvocation<T> aSeparateThreadInvocation(Invocation<T> invocation) {
 		var namespace = ExtensionContext.Namespace.create(SeparateThreadTimeoutInvocationTests.class);
-		var store = new NamespaceAwareStore(new ExtensionValuesStore(null), namespace);
+		var store = new NamespaceAwareStore(new NamespacedHierarchicalStore<>(null), namespace);
 		var parameters = new TimeoutInvocationParameters<>(invocation,
 			new TimeoutDuration(PREEMPTIVE_TIMEOUT_MILLIS, MILLISECONDS), () -> "method()");
 		return (SeparateThreadTimeoutInvocation<T>) new TimeoutInvocationFactory(store) //
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTests.java
index a6b2b650afbd..9d3c46487dab 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactoryTests.java
@@ -22,10 +22,10 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
-import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 import org.junit.jupiter.engine.extension.TimeoutInvocationFactory.SingleThreadExecutorResource;
 import org.junit.jupiter.engine.extension.TimeoutInvocationFactory.TimeoutInvocationParameters;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -35,7 +35,7 @@
 class TimeoutInvocationFactoryTests {
 
 	@Spy
-	private final Store store = new NamespaceAwareStore(new ExtensionValuesStore(null),
+	private final Store store = new NamespaceAwareStore(new NamespacedHierarchicalStore<>(null),
 		ExtensionContext.Namespace.create(TimeoutInvocationFactoryTests.class));
 	@Mock
 	private Invocation<String> invocation;
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
index 12f044db13e0..40c1eeeec28a 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -34,13 +34,13 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstances;
 import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.junit.jupiter.engine.execution.ExtensionValuesStore;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
 
 /**
  * Unit tests for {@link ParameterizedTestExtension}.
@@ -189,7 +189,7 @@ private ExtensionContext getExtensionContextReturningSingleMethod(Object testCas
 
 		return new ExtensionContext() {
 
-			private final ExtensionValuesStore store = new ExtensionValuesStore(null);
+			private final NamespacedHierarchicalStore<Namespace> store = new NamespacedHierarchicalStore<>(null);
 
 			@Override
 			public Optional<Method> getTestMethod() {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
new file mode 100644
index 000000000000..79f69ce5e5bc
--- /dev/null
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
@@ -0,0 +1,403 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.engine.support.store;
+
+import static java.util.Comparator.comparing;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.junit.platform.commons.util.ReflectionUtils.getWrapperType;
+import static org.junit.platform.commons.util.ReflectionUtils.isAssignableTo;
+
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.util.ExceptionUtils;
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.commons.util.UnrecoverableExceptions;
+import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
+
+/**
+ * {@code ExtensionValuesStore} is a hierarchical namespaced key-value store.
+ * <p>
+ * Its behavior when closed can be customized by passing a {@link CloseAction}
+ * to {@link #NamespacedHierarchicalStore(NamespacedHierarchicalStore, CloseAction)}.
+ * <p>
+ * This class is thread-safe.
+ *
+ * @param <N> Namespace type
+ * @since 5.10
+ */
+@API(status = EXPERIMENTAL, since = "5.10")
+public class NamespacedHierarchicalStore<N> implements AutoCloseable {
+
+	private final AtomicInteger insertOrderSequence = new AtomicInteger();
+	private final ConcurrentMap<CompositeKey<N>, StoredValue> storedValues = new ConcurrentHashMap<>(4);
+	private final NamespacedHierarchicalStore<N> parentStore;
+	private final CloseAction<N> closeAction;
+
+	/**
+	 * Create a new store with the supplied parent.
+	 *
+	 * @param parentStore The parent store to use for lookups; may be
+	 *                    {@code null}.
+	 */
+	public NamespacedHierarchicalStore(NamespacedHierarchicalStore<N> parentStore) {
+		this(parentStore, null);
+	}
+
+	/**
+	 * Create a new store with the supplied parent and close action.
+	 *
+	 * @param parentStore The parent store to use for lookups; may be
+	 *                    {@code null}.
+	 * @param closeAction The action to be called for each stored value when
+	 *                    this store is closed; may be {@code null}.
+	 */
+	public NamespacedHierarchicalStore(NamespacedHierarchicalStore<N> parentStore, CloseAction<N> closeAction) {
+		this.parentStore = parentStore;
+		this.closeAction = closeAction;
+	}
+
+	public NamespacedHierarchicalStore<N> newChild() {
+		return new NamespacedHierarchicalStore<>(this, closeAction);
+	}
+
+	/**
+	 * If a close action is configured, it will be called with all successfully
+	 * stored values in reverse insertion order.
+	 *
+	 * <p>Closing a store does not close its parent or any of its children.
+	 */
+	@Override
+	public void close() {
+		if (closeAction == null) {
+			return;
+		}
+		ThrowableCollector throwableCollector = new ThrowableCollector(__ -> false);
+		storedValues.entrySet().stream() //
+				.map(e -> e.getValue().evaluateSafely(e.getKey())) //
+				.filter(it -> it != null && it.value != null) //
+				.sorted(EvaluatedValue.REVERSE_INSERT_ORDER) //
+				.forEach(it -> throwableCollector.execute(() -> it.close(closeAction)));
+		throwableCollector.assertEmpty();
+	}
+
+	/**
+	 * Get the value stored for the supplied namespace and key in this or the
+	 * parent store, if present.
+	 *
+	 * @param namespace the namespace; never {@code null}
+	 * @param key the key; never {@code null}
+	 * @return stored value; may be {@code null}
+	 */
+	public Object get(N namespace, Object key) {
+		StoredValue storedValue = getStoredValue(new CompositeKey<>(namespace, key));
+		return StoredValue.evaluateIfNotNull(storedValue);
+	}
+
+	/**
+	 * Get the value stored for the supplied namespace and key in this or the
+	 * parent store, if present, and cast it to the supplied required type.
+	 *
+	 * @param namespace the namespace; never {@code null}
+	 * @param key the key; never {@code null}
+	 * @param requiredType the required type of the value; never {@code null}
+	 * @return stored value; may be {@code null}
+	 * @throws NamespacedHierarchicalStoreException if the stored value cannot
+	 *                                              be cast to the required type
+	 */
+	public <T> T get(N namespace, Object key, Class<T> requiredType) {
+		Object value = get(namespace, key);
+		return castToRequiredType(key, value, requiredType);
+	}
+
+	/**
+	 * Get the value stored for the supplied namespace and key in this or the
+	 * parent store, if present, or call the supplied function to compute it.
+	 *
+	 * @param namespace the namespace; never {@code null}
+	 * @param key the key; never {@code null}
+	 * @param defaultCreator the function called with the supplied {@code key}
+	 * to create a new value; never {@code null} but may return {@code null}
+	 * @return stored value; may be {@code null}
+	 */
+	public <K, V> Object getOrComputeIfAbsent(N namespace, K key, Function<K, V> defaultCreator) {
+		CompositeKey<N> compositeKey = new CompositeKey<>(namespace, key);
+		Preconditions.notNull(defaultCreator, "defaultCreator must not be null");
+		StoredValue storedValue = getStoredValue(compositeKey);
+		if (storedValue == null) {
+			storedValue = storedValues.computeIfAbsent(compositeKey,
+				__ -> storedValue(new MemoizingSupplier(() -> defaultCreator.apply(key))));
+		}
+		return storedValue.evaluate();
+	}
+
+	/**
+	 * Get the value stored for the supplied namespace and key in this or the
+	 * parent store, if present, or call the supplied function to compute it
+	 * and, finally, cast it to the supplied required type.
+	 *
+	 * @param namespace the namespace; never {@code null}
+	 * @param key the key; never {@code null}
+	 * @param defaultCreator the function called with the supplied {@code key}
+	 * to create a new value; never {@code null} but may return {@code null}
+	 * @param requiredType the required type of the value; never {@code null}
+	 * @return stored value; may be {@code null}
+	 * @throws NamespacedHierarchicalStoreException if the stored value cannot
+	 *                                              be cast to the required type
+	 */
+	public <K, V> V getOrComputeIfAbsent(N namespace, K key, Function<K, V> defaultCreator, Class<V> requiredType) {
+		Object value = getOrComputeIfAbsent(namespace, key, defaultCreator);
+		return castToRequiredType(key, value, requiredType);
+	}
+
+	/**
+	 * Put the supplied value for the supplied namespace and key into this
+	 * store and return the previously associated value in this store.
+	 *
+	 * <p>The {@link CloseAction} will <em>not</em> be called for the previously
+	 * stored value, if any.
+	 *
+	 * @param namespace the namespace; never {@code null}
+	 * @param key the key; never {@code null}
+	 * @param value the value to store; may be {@code null}
+	 * @return previously stored value; may be {@code null}
+	 * @throws NamespacedHierarchicalStoreException if the stored value cannot
+	 *                                              be cast to the required type
+	 */
+	public Object put(N namespace, Object key, Object value) {
+		StoredValue oldValue = storedValues.put(new CompositeKey<>(namespace, key), storedValue(() -> value));
+		return StoredValue.evaluateIfNotNull(oldValue);
+	}
+
+	/**
+	 * Remove the value stored for the supplied namespace and key from this
+	 * store.
+	 *
+	 * <p>The {@link CloseAction} will <em>not</em> be called for the removed
+	 * value.
+	 *
+	 * @param namespace the namespace; never {@code null}
+	 * @param key the key; never {@code null}
+	 * @return previously stored value; may be {@code null}
+	 */
+	public Object remove(N namespace, Object key) {
+		StoredValue previous = storedValues.remove(new CompositeKey<>(namespace, key));
+		return StoredValue.evaluateIfNotNull(previous);
+	}
+
+	/**
+	 * Remove the value stored for the supplied namespace and key from this
+	 * store and cast it to the supplied required type.
+	 *
+	 * <p>The {@link CloseAction} will <em>not</em> be called for the removed
+	 * value.
+	 *
+	 * @param namespace the namespace; never {@code null}
+	 * @param key the key; never {@code null}
+	 * @param requiredType the required type of the value; never {@code null}
+	 * @return previously stored value; may be {@code null}
+	 * @throws NamespacedHierarchicalStoreException if the stored value cannot
+	 *                                              be cast to the required type
+	 */
+	public <T> T remove(N namespace, Object key, Class<T> requiredType) {
+		Object value = remove(namespace, key);
+		return castToRequiredType(key, value, requiredType);
+	}
+
+	private StoredValue storedValue(Supplier<Object> value) {
+		return new StoredValue(insertOrderSequence.getAndIncrement(), value);
+	}
+
+	private StoredValue getStoredValue(CompositeKey<N> compositeKey) {
+		StoredValue storedValue = storedValues.get(compositeKey);
+		if (storedValue != null) {
+			return storedValue;
+		}
+		if (parentStore != null) {
+			return parentStore.getStoredValue(compositeKey);
+		}
+		return null;
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T> T castToRequiredType(Object key, Object value, Class<T> requiredType) {
+		Preconditions.notNull(requiredType, "requiredType must not be null");
+		if (value == null) {
+			return null;
+		}
+		if (isAssignableTo(value, requiredType)) {
+			if (requiredType.isPrimitive()) {
+				return (T) getWrapperType(requiredType).cast(value);
+			}
+			return requiredType.cast(value);
+		}
+		// else
+		throw new NamespacedHierarchicalStoreException(
+			String.format("Object stored under key [%s] is not of required type [%s]", key, requiredType.getName()));
+	}
+
+	private static class CompositeKey<N> {
+
+		private final N namespace;
+		private final Object key;
+
+		private CompositeKey(N namespace, Object key) {
+			this.namespace = Preconditions.notNull(namespace, "namespace must not be null");
+			this.key = Preconditions.notNull(key, "key must not be null");
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			CompositeKey<?> that = (CompositeKey<?>) o;
+			return this.namespace.equals(that.namespace) && this.key.equals(that.key);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(namespace, key);
+		}
+
+	}
+
+	private static class StoredValue {
+
+		private final int order;
+		private final Supplier<Object> supplier;
+
+		StoredValue(int order, Supplier<Object> supplier) {
+			this.order = order;
+			this.supplier = supplier;
+		}
+
+		private <N> EvaluatedValue<N> evaluateSafely(CompositeKey<N> compositeKey) {
+			try {
+				return new EvaluatedValue<>(compositeKey, order, evaluate());
+			}
+			catch (Throwable t) {
+				UnrecoverableExceptions.rethrowIfUnrecoverable(t);
+				return null;
+			}
+		}
+
+		private Object evaluate() {
+			return supplier.get();
+		}
+
+		static Object evaluateIfNotNull(StoredValue value) {
+			return value != null ? value.evaluate() : null;
+		}
+
+	}
+
+	private static class EvaluatedValue<N> {
+
+		private static final Comparator<EvaluatedValue<?>> REVERSE_INSERT_ORDER = comparing(
+			(EvaluatedValue<?> it) -> it.order).reversed();
+
+		private final CompositeKey<N> compositeKey;
+		private final int order;
+		private final Object value;
+
+		EvaluatedValue(CompositeKey<N> key, int order, Object value) {
+			this.compositeKey = key;
+			this.order = order;
+			this.value = value;
+		}
+
+		void close(CloseAction<N> closeAction) throws Throwable {
+			closeAction.close(compositeKey.namespace, compositeKey.key, value);
+		}
+	}
+
+	/**
+	 * Thread-safe {@link Supplier} that memoizes the result of calling its
+	 * delegate and ensures it is called at most once.
+	 *
+	 * <p>If the delegate throws an exception, it is stored and rethrown every
+	 * time {@link #get()} is called.
+	 *
+	 * @see StoredValue
+	 */
+	private static class MemoizingSupplier implements Supplier<Object> {
+
+		private static final Object NO_VALUE_SET = new Object();
+
+		private final Supplier<Object> delegate;
+		private volatile Object value = NO_VALUE_SET;
+
+		private MemoizingSupplier(Supplier<Object> delegate) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public Object get() {
+			if (value == NO_VALUE_SET) {
+				computeValue();
+			}
+			if (value instanceof Failure) {
+				ExceptionUtils.throwAsUncheckedException(((Failure) value).throwable);
+			}
+			return value;
+		}
+
+		private synchronized void computeValue() {
+			try {
+				if (value == NO_VALUE_SET) {
+					value = delegate.get();
+				}
+			}
+			catch (Throwable t) {
+				value = new Failure(t);
+				UnrecoverableExceptions.rethrowIfUnrecoverable(t);
+			}
+		}
+
+		private static class Failure {
+
+			private final Throwable throwable;
+
+			public Failure(Throwable throwable) {
+				this.throwable = throwable;
+			}
+		}
+
+	}
+
+	/**
+	 * Called for each successfully stored non-null value in when closing a
+	 * {@link NamespacedHierarchicalStore}.
+	 */
+	@FunctionalInterface
+	public interface CloseAction<N> {
+
+		/**
+		 * Close the supplied {@code value}.
+		 *
+		 * @param namespace the namespace; never {@code null}
+		 * @param key the key; never {@code null}
+		 * @param value the value; never {@code null}
+		 */
+		void close(N namespace, Object key, Object value) throws Throwable;
+	}
+
+}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreException.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreException.java
new file mode 100644
index 000000000000..93be77040166
--- /dev/null
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.engine.support.store;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.JUnitException;
+
+/**
+ * Exception thrown by failed {@link NamespacedHierarchicalStore} operations.
+ *
+ * @since 5.10
+ */
+@API(status = EXPERIMENTAL, since = "5.10")
+public class NamespacedHierarchicalStoreException extends JUnitException {
+
+	private static final long serialVersionUID = 1L;
+
+	public NamespacedHierarchicalStoreException(String message) {
+		super(message);
+	}
+
+}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/package-info.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/package-info.java
new file mode 100644
index 000000000000..d40e1e88e974
--- /dev/null
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Reusable data structures for test engines and their extensions.
+ */
+
+package org.junit.platform.engine.support.store;
diff --git a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
index 0b6336c6becf..46c2069448c2 100644
--- a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
+++ b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
@@ -30,4 +30,5 @@
 	exports org.junit.platform.engine.support.discovery;
 	exports org.junit.platform.engine.support.filter;
 	exports org.junit.platform.engine.support.hierarchical;
+	exports org.junit.platform.engine.support.store;
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java
similarity index 70%
rename from junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
rename to platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java
index 04d6fc009ece..966c8a9f4e65 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/execution/ExtensionValuesStoreTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java
@@ -8,14 +8,20 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.engine.execution;
+package org.junit.platform.engine.support.store;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.platform.commons.test.ConcurrencyTestingUtils.executeConcurrently;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -23,25 +29,24 @@
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
-import org.junit.jupiter.api.extension.ExtensionContextException;
 
 /**
- * Unit tests for {@link ExtensionValuesStore}.
+ * Unit tests for {@link NamespacedHierarchicalStore}.
  *
  * @since 5.0
- * @see org.junit.jupiter.engine.descriptor.ExtensionContextTests
  */
-public class ExtensionValuesStoreTests {
+public class NamespacedHierarchicalStoreTests {
 
 	private final Object key = "key";
 	private final Object value = "value";
 
-	private final Namespace namespace = Namespace.create("ns");
+	private final String namespace = "ns";
 
-	private final ExtensionValuesStore grandParentStore = new ExtensionValuesStore(null);
-	private final ExtensionValuesStore parentStore = new ExtensionValuesStore(grandParentStore);
-	private final ExtensionValuesStore store = new ExtensionValuesStore(parentStore);
+	private final NamespacedHierarchicalStore.CloseAction<String> closeAction = mock();
+	private final NamespacedHierarchicalStore<String> grandParentStore = new NamespacedHierarchicalStore<>(null,
+		closeAction);
+	private final NamespacedHierarchicalStore<String> parentStore = grandParentStore.newChild();
+	private final NamespacedHierarchicalStore<String> store = parentStore.newChild();
 
 	@Nested
 	class StoringValuesTests {
@@ -62,7 +67,7 @@ void valueCanBeReplaced() {
 			store.put(namespace, key, value);
 
 			Object newValue = new Object();
-			store.put(namespace, key, newValue);
+			assertEquals(value, store.put(namespace, key, newValue));
 
 			assertEquals(newValue, store.get(namespace, key));
 		}
@@ -119,10 +124,10 @@ void keysCanBeRemoved() {
 		@Test
 		void sameKeyWithDifferentNamespaces() {
 			Object value1 = createObject("value1");
-			Namespace namespace1 = Namespace.create("ns1");
+			String namespace1 = "ns1";
 
 			Object value2 = createObject("value2");
-			Namespace namespace2 = Namespace.create("ns2");
+			String namespace2 = "ns2";
 
 			store.put(namespace1, key, value1);
 			store.put(namespace2, key, value2);
@@ -133,8 +138,8 @@ void sameKeyWithDifferentNamespaces() {
 
 		@Test
 		void valueIsComputedIfAbsentInDifferentNamespace() {
-			Namespace namespace1 = Namespace.create("ns1");
-			Namespace namespace2 = Namespace.create("ns2");
+			String namespace1 = "ns1";
+			String namespace2 = "ns2";
 
 			assertEquals(value, store.getOrComputeIfAbsent(namespace1, key, innerKey -> value));
 			assertEquals(value, store.get(namespace1, key));
@@ -144,8 +149,8 @@ void valueIsComputedIfAbsentInDifferentNamespace() {
 
 		@Test
 		void keyIsOnlyRemovedInGivenNamespace() {
-			Namespace namespace1 = Namespace.create("ns1");
-			Namespace namespace2 = Namespace.create("ns2");
+			String namespace1 = "ns1";
+			String namespace2 = "ns2";
 
 			Object value1 = createObject("value1");
 			Object value2 = createObject("value2");
@@ -164,7 +169,7 @@ void getWithTypeSafetyAndInvalidRequiredTypeThrowsException() {
 			String value = "enigma";
 			store.put(namespace, key, value);
 
-			Exception exception = assertThrows(ExtensionContextException.class,
+			Exception exception = assertThrows(NamespacedHierarchicalStoreException.class,
 				() -> store.get(namespace, key, Number.class));
 			assertEquals("Object stored under key [42] is not of required type [java.lang.Number]",
 				exception.getMessage());
@@ -214,7 +219,7 @@ void getOrComputeIfAbsentWithTypeSafetyAndInvalidRequiredTypeThrowsException() {
 			// But declare that our function creates a String...
 			Function<String, String> defaultCreator = k -> "enigma";
 
-			Exception exception = assertThrows(ExtensionContextException.class,
+			Exception exception = assertThrows(NamespacedHierarchicalStoreException.class,
 				() -> store.getOrComputeIfAbsent(namespace, key, defaultCreator, String.class));
 			assertEquals("Object stored under key [pi] is not of required type [java.lang.String]",
 				exception.getMessage());
@@ -242,13 +247,22 @@ void getOrComputeIfAbsentWithTypeSafetyAndPrimitiveValueType() {
 			assertEquals(value, computedInteger.intValue());
 		}
 
+		@Test
+		void getOrComputeIfAbsentWithExceptionThrowingCreatorFunction() {
+			var e = assertThrows(RuntimeException.class, () -> store.getOrComputeIfAbsent(namespace, key, __ -> {
+				throw new RuntimeException("boom");
+			}));
+			assertSame(e, assertThrows(RuntimeException.class, () -> store.get(namespace, key)));
+			assertSame(e, assertThrows(RuntimeException.class, () -> store.remove(namespace, key)));
+		}
+
 		@Test
 		void removeWithTypeSafetyAndInvalidRequiredTypeThrowsException() {
 			Integer key = 42;
 			String value = "enigma";
 			store.put(namespace, key, value);
 
-			Exception exception = assertThrows(ExtensionContextException.class,
+			Exception exception = assertThrows(NamespacedHierarchicalStoreException.class,
 				() -> store.remove(namespace, key, Number.class));
 			assertEquals("Object stored under key [42] is not of required type [java.lang.Number]",
 				exception.getMessage());
@@ -297,10 +311,12 @@ void removeNullValueWithTypeSafety() {
 		void simulateRaceConditionInGetOrComputeIfAbsent() throws Exception {
 			int threads = 10;
 			AtomicInteger counter = new AtomicInteger();
-			ExtensionValuesStore localStore = new ExtensionValuesStore(null);
+			List<Object> values;
 
-			List<Object> values = executeConcurrently(threads, //
-				() -> localStore.getOrComputeIfAbsent(namespace, key, it -> counter.incrementAndGet()));
+			try (var localStore = new NamespacedHierarchicalStore<>(null)) {
+				values = executeConcurrently(threads, //
+					() -> localStore.getOrComputeIfAbsent(namespace, key, it -> counter.incrementAndGet()));
+			}
 
 			assertEquals(1, counter.get());
 			assertThat(values).hasSize(threads).containsOnly(1);
@@ -332,38 +348,90 @@ void valueFromParentCanBeOverriddenInChild() {
 	class CompositeNamespaceTests {
 
 		@Test
-		void namespacesEqualForSamePartsSequence() {
-			Namespace ns1 = Namespace.create("part1", "part2");
-			Namespace ns2 = Namespace.create("part1", "part2");
+		void additionNamespacePartMakesADifference() {
+
+			String ns1 = "part1/part2";
+			String ns2 = "part1";
+
+			Object value2 = createObject("value2");
+
+			parentStore.put(ns1, key, value);
+			parentStore.put(ns2, key, value2);
 
-			assertEquals(ns1, ns2);
+			assertEquals(value, store.get(ns1, key));
+			assertEquals(value2, store.get(ns2, key));
+		}
+
+	}
+
+	@Nested
+	class CloseActionTests {
+
+		@Test
+		void callsCloseActionInReverseInsertionOrderWhenClosingStore() throws Throwable {
+			store.put(namespace, "key1", "value1");
+			store.put(namespace, "key2", "value2");
+			store.put(namespace, "key3", "value3");
+			verifyNoInteractions(closeAction);
+
+			store.close();
+			var inOrder = inOrder(closeAction);
+			inOrder.verify(closeAction).close(namespace, "key3", "value3");
+			inOrder.verify(closeAction).close(namespace, "key2", "value2");
+			inOrder.verify(closeAction).close(namespace, "key1", "value1");
 		}
 
 		@Test
-		void orderOfNamespacePartsDoesMatter() {
-			Namespace ns1 = Namespace.create("part1", "part2");
-			Namespace ns2 = Namespace.create("part2", "part1");
+		void doesNotCallCloseActionForRemovedValues() {
+			store.put(namespace, key, value);
+			store.remove(namespace, key);
 
-			assertNotEquals(ns1, ns2);
+			store.close();
+
+			verifyNoInteractions(closeAction);
 		}
 
 		@Test
-		void additionNamespacePartMakesADifference() {
+		void doesNotCallCloseActionForReplacedValues() throws Throwable {
+			store.put(namespace, key, "value1");
+			store.put(namespace, key, "value2");
 
-			Namespace ns1 = Namespace.create("part1", "part2");
-			Namespace ns2 = Namespace.create("part1");
-			Namespace ns3 = Namespace.create("part1", "part2");
+			store.close();
 
-			Object value2 = createObject("value2");
+			verify(closeAction).close(namespace, key, "value2");
+			verifyNoMoreInteractions(closeAction);
+		}
 
-			parentStore.put(ns1, key, value);
-			parentStore.put(ns2, key, value2);
+		@Test
+		void doesNotCallCloseActionForNullValues() {
+			store.put(namespace, key, null);
 
-			assertEquals(value, store.get(ns1, key));
-			assertEquals(value, store.get(ns3, key));
-			assertEquals(value2, store.get(ns2, key));
+			store.close();
+
+			verifyNoInteractions(closeAction);
+		}
+
+		@Test
+		void ignoresStoredValuesThatThrewExceptionsDuringCleanup() {
+			assertThrows(RuntimeException.class, () -> store.getOrComputeIfAbsent(namespace, key, __ -> {
+				throw new RuntimeException("boom");
+			}));
+
+			assertDoesNotThrow(store::close);
+
+			verifyNoInteractions(closeAction);
 		}
 
+		@Test
+		void doesNotIgnoreStoredValuesThatThrewUnrecoverableFailuresDuringCleanup() {
+			assertThrows(OutOfMemoryError.class, () -> store.getOrComputeIfAbsent(namespace, key, __ -> {
+				throw new OutOfMemoryError();
+			}));
+
+			assertThrows(OutOfMemoryError.class, store::close);
+
+			verifyNoInteractions(closeAction);
+		}
 	}
 
 	private Object createObject(final String display) {
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
index d6f69626900a..956d780949b2 100644
--- a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
+++ b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
@@ -7,6 +7,7 @@ exports org.junit.platform.engine.support.descriptor
 exports org.junit.platform.engine.support.discovery
 exports org.junit.platform.engine.support.filter
 exports org.junit.platform.engine.support.hierarchical
+exports org.junit.platform.engine.support.store
 requires java.base mandated
 requires org.apiguardian.api static transitive
 requires org.junit.platform.commons transitive

From da9f4d796a084f97d8c62b61f812f28acb76d28c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 12:47:08 +0200
Subject: [PATCH 1247/1433] Make NamespacedHierarchicalStore final

Since it's not designed to be subclassed.
---
 .../engine/support/store/NamespacedHierarchicalStore.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
index 79f69ce5e5bc..9e7643923440 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
@@ -41,7 +41,7 @@
  * @since 5.10
  */
 @API(status = EXPERIMENTAL, since = "5.10")
-public class NamespacedHierarchicalStore<N> implements AutoCloseable {
+public final class NamespacedHierarchicalStore<N> implements AutoCloseable {
 
 	private final AtomicInteger insertOrderSequence = new AtomicInteger();
 	private final ConcurrentMap<CompositeKey<N>, StoredValue> storedValues = new ConcurrentHashMap<>(4);

From da7f21199a503a1ac088363fdcfb473bb6411769 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 12:56:13 +0200
Subject: [PATCH 1248/1433] Use Gradle Enterprise testing annotations

To avoid referencing test class names as strings in the build script
---
 gradle/libs.versions.toml                                      | 1 +
 .../src/main/kotlin/junitbuild.testing-conventions.gradle.kts  | 1 +
 .../platform-tooling-support-tests.gradle.kts                  | 3 ---
 .../platform/tooling/support/tests/GraalVmStarterTests.java    | 3 +++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b1e243beb944..4292406a8c2d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -61,6 +61,7 @@ spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5"
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }
 xmlunit-placeholders = { module = "org.xmlunit:xmlunit-placeholders", version.ref = "xmlunit" }
+testingAnnotations = { module = "com.gradle:gradle-enterprise-testing-annotations", version = "1.1" }
 
 [bundles]
 ant = ["ant", "ant-junit", "ant-junitlauncher"]
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
index a69f7d89c58b..8a1cdd89955f 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
@@ -72,6 +72,7 @@ tasks.withType<Test>().configureEach {
 dependencies {
 	testImplementation(dependencyFromLibs("assertj"))
 	testImplementation(dependencyFromLibs("mockito"))
+	testImplementation(dependencyFromLibs("testingAnnotations"))
 
 	if (!project.name.startsWith("junit-jupiter")) {
 		testImplementation(project(":junit-jupiter"))
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 63570bc6ae4e..e56ad9e5b707 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -126,9 +126,6 @@ tasks.test {
 
 	distribution {
 		requirements.add("jdk=8")
-		localOnly {
-			includeClasses.add("platform.tooling.support.tests.GraalVmStarterTests") // GraalVM is not installed on Test Distribution agents
-		}
 	}
 	jvmArgumentProviders += JavaHomeDir(project, 8)
 }
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
index 9ea078c54ea9..53b5742aa4ee 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
@@ -21,6 +21,8 @@
 
 import de.sormuras.bartholdy.tool.GradleWrapper;
 
+import com.gradle.enterprise.testing.annotations.LocalOnly;
+
 import org.junit.jupiter.api.Test;
 
 import platform.tooling.support.MavenRepo;
@@ -29,6 +31,7 @@
 /**
  * @since 1.9.1
  */
+@LocalOnly(because = "GraalVM is not installed on Test Distribution agents")
 class GraalVmStarterTests {
 
 	@Test

From a1ef339a13c7cc7249f8c91e1a2f3e3052ba8705 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 13:01:17 +0200
Subject: [PATCH 1249/1433] Polish Gradle settings script

---
 settings.gradle.kts | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2f339b3e129e..8a3d71e47b04 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -24,6 +24,7 @@ dependencyResolutionManagement {
 	}
 }
 
+val buildParameters = the<BuildParametersExtension>()
 val gradleEnterpriseServer = "https://ge.junit.org"
 
 gradleEnterprise {
@@ -71,9 +72,10 @@ buildCache {
 	}
 }
 
-val javaVersion = JavaVersion.current()
-require(javaVersion == JavaVersion.VERSION_17) {
-	"The JUnit 5 build must be executed with Java 17. Currently executing with Java ${javaVersion.majorVersion}."
+val expectedJavaVersion = JavaVersion.VERSION_17
+val actualJavaVersion = JavaVersion.current()
+require(actualJavaVersion == expectedJavaVersion) {
+	"The JUnit 5 build must be executed with Java ${expectedJavaVersion.majorVersion}. Currently executing with Java ${actualJavaVersion.majorVersion}."
 }
 
 rootProject.name = "junit5"
@@ -105,16 +107,10 @@ include("junit-bom")
 // check that every subproject has a custom build file
 // based on the project name
 rootProject.children.forEach { project ->
-	project.buildFileName = "${project.name}.gradle"
-	if (!project.buildFile.isFile) {
-		project.buildFileName = "${project.name}.gradle.kts"
-	}
+	project.buildFileName = "${project.name}.gradle.kts"
 	require(project.buildFile.isFile) {
 		"${project.buildFile} must exist"
 	}
 }
 
-val buildParameters: BuildParametersExtension
-	get() = the()
-
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

From 4c8c547d0593d76bc675ebca095f02214c12d939 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 29 Apr 2023 13:37:25 +0200
Subject: [PATCH 1250/1433] Remove unused code

---
 .../options/CommandLineOptionsParsingTests.java | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
index c995a642d2df..03d2d92e77ee 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java
@@ -17,7 +17,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathResource;
@@ -36,7 +35,6 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
@@ -556,26 +554,15 @@ private void assertOptionWithMissingRequiredArgumentThrowsException(String... op
 			Stream.of(options).map(opt -> () -> assertThrows(Exception.class, () -> ArgsType.args.parseArgLine(opt))));
 	}
 
-	private void assertParses(String name, Predicate<Result> property, String... argLines) {
-		Stream.of(argLines).forEach(argLine -> {
-			Result result = null;
-			try {
-				result = ArgsType.args.parseArgLine(argLine);
-			}
-			catch (IOException e) {
-				fail(e);
-			}
-			assertTrue(property.test(result), () -> name + " should be enabled by: " + argLine);
-		});
-	}
-
 	enum ArgsType {
 		args {
+			@Override
 			Result parseArgLine(String argLine) {
 				return parse(split(argLine));
 			}
 		},
 		atFile {
+			@Override
 			Result parseArgLine(String argLine) throws IOException {
 				var atFile = Files.createTempFile("junit-launcher-args", ".txt");
 				try {

From 3179d699d468dacdae037478d4d947a11e66092a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 29 Apr 2023 13:47:45 +0200
Subject: [PATCH 1251/1433] Polish NamespacedHierarchicalStore

---
 .../store/NamespacedHierarchicalStore.java    | 126 +++++++++---------
 1 file changed, 65 insertions(+), 61 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
index 9e7643923440..e931016ae941 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
@@ -30,12 +30,14 @@
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
 
 /**
- * {@code ExtensionValuesStore} is a hierarchical namespaced key-value store.
- * <p>
- * Its behavior when closed can be customized by passing a {@link CloseAction}
- * to {@link #NamespacedHierarchicalStore(NamespacedHierarchicalStore, CloseAction)}.
- * <p>
- * This class is thread-safe.
+ * {@code NamespacedHierarchicalStore} is a hierarchical, namespaced key-value store.
+ *
+ * <p>Its {@linkplain #close() closing} behavior can be customized by passing a
+ * {@link CloseAction} to the
+ * {@link #NamespacedHierarchicalStore(NamespacedHierarchicalStore, CloseAction)}
+ * constructor.
+ *
+ * <p>This class is thread-safe.
  *
  * @param <N> Namespace type
  * @since 5.10
@@ -51,8 +53,7 @@ public final class NamespacedHierarchicalStore<N> implements AutoCloseable {
 	/**
 	 * Create a new store with the supplied parent.
 	 *
-	 * @param parentStore The parent store to use for lookups; may be
-	 *                    {@code null}.
+	 * @param parentStore the parent store to use for lookups; may be {@code null}
 	 */
 	public NamespacedHierarchicalStore(NamespacedHierarchicalStore<N> parentStore) {
 		this(parentStore, null);
@@ -61,10 +62,9 @@ public NamespacedHierarchicalStore(NamespacedHierarchicalStore<N> parentStore) {
 	/**
 	 * Create a new store with the supplied parent and close action.
 	 *
-	 * @param parentStore The parent store to use for lookups; may be
-	 *                    {@code null}.
-	 * @param closeAction The action to be called for each stored value when
-	 *                    this store is closed; may be {@code null}.
+	 * @param parentStore the parent store to use for lookups; may be {@code null}
+	 * @param closeAction the action to be called for each stored value when this
+	 * store is closed; may be {@code null}
 	 */
 	public NamespacedHierarchicalStore(NamespacedHierarchicalStore<N> parentStore, CloseAction<N> closeAction) {
 		this.parentStore = parentStore;
@@ -72,7 +72,7 @@ public NamespacedHierarchicalStore(NamespacedHierarchicalStore<N> parentStore, C
 	}
 
 	public NamespacedHierarchicalStore<N> newChild() {
-		return new NamespacedHierarchicalStore<>(this, closeAction);
+		return new NamespacedHierarchicalStore<>(this, this.closeAction);
 	}
 
 	/**
@@ -83,25 +83,25 @@ public NamespacedHierarchicalStore<N> newChild() {
 	 */
 	@Override
 	public void close() {
-		if (closeAction == null) {
+		if (this.closeAction == null) {
 			return;
 		}
 		ThrowableCollector throwableCollector = new ThrowableCollector(__ -> false);
-		storedValues.entrySet().stream() //
+		this.storedValues.entrySet().stream() //
 				.map(e -> e.getValue().evaluateSafely(e.getKey())) //
 				.filter(it -> it != null && it.value != null) //
 				.sorted(EvaluatedValue.REVERSE_INSERT_ORDER) //
-				.forEach(it -> throwableCollector.execute(() -> it.close(closeAction)));
+				.forEach(it -> throwableCollector.execute(() -> it.close(this.closeAction)));
 		throwableCollector.assertEmpty();
 	}
 
 	/**
-	 * Get the value stored for the supplied namespace and key in this or the
-	 * parent store, if present.
+	 * Get the value stored for the supplied namespace and key in this store or
+	 * the parent store, if present.
 	 *
 	 * @param namespace the namespace; never {@code null}
 	 * @param key the key; never {@code null}
-	 * @return stored value; may be {@code null}
+	 * @return the stored value; may be {@code null}
 	 */
 	public Object get(N namespace, Object key) {
 		StoredValue storedValue = getStoredValue(new CompositeKey<>(namespace, key));
@@ -109,45 +109,45 @@ public Object get(N namespace, Object key) {
 	}
 
 	/**
-	 * Get the value stored for the supplied namespace and key in this or the
-	 * parent store, if present, and cast it to the supplied required type.
+	 * Get the value stored for the supplied namespace and key in this store or
+	 * the parent store, if present, and cast it to the supplied required type.
 	 *
 	 * @param namespace the namespace; never {@code null}
 	 * @param key the key; never {@code null}
 	 * @param requiredType the required type of the value; never {@code null}
-	 * @return stored value; may be {@code null}
+	 * @return the stored value; may be {@code null}
 	 * @throws NamespacedHierarchicalStoreException if the stored value cannot
-	 *                                              be cast to the required type
+	 * be cast to the required type
 	 */
-	public <T> T get(N namespace, Object key, Class<T> requiredType) {
+	public <T> T get(N namespace, Object key, Class<T> requiredType) throws NamespacedHierarchicalStoreException {
 		Object value = get(namespace, key);
 		return castToRequiredType(key, value, requiredType);
 	}
 
 	/**
-	 * Get the value stored for the supplied namespace and key in this or the
-	 * parent store, if present, or call the supplied function to compute it.
+	 * Get the value stored for the supplied namespace and key in this store or
+	 * the parent store, if present, or call the supplied function to compute it.
 	 *
 	 * @param namespace the namespace; never {@code null}
 	 * @param key the key; never {@code null}
 	 * @param defaultCreator the function called with the supplied {@code key}
 	 * to create a new value; never {@code null} but may return {@code null}
-	 * @return stored value; may be {@code null}
+	 * @return the stored value; may be {@code null}
 	 */
 	public <K, V> Object getOrComputeIfAbsent(N namespace, K key, Function<K, V> defaultCreator) {
-		CompositeKey<N> compositeKey = new CompositeKey<>(namespace, key);
 		Preconditions.notNull(defaultCreator, "defaultCreator must not be null");
+		CompositeKey<N> compositeKey = new CompositeKey<>(namespace, key);
 		StoredValue storedValue = getStoredValue(compositeKey);
 		if (storedValue == null) {
-			storedValue = storedValues.computeIfAbsent(compositeKey,
+			storedValue = this.storedValues.computeIfAbsent(compositeKey,
 				__ -> storedValue(new MemoizingSupplier(() -> defaultCreator.apply(key))));
 		}
 		return storedValue.evaluate();
 	}
 
 	/**
-	 * Get the value stored for the supplied namespace and key in this or the
-	 * parent store, if present, or call the supplied function to compute it
+	 * Get the value stored for the supplied namespace and key in this store or
+	 * the parent store, if present, or call the supplied function to compute it
 	 * and, finally, cast it to the supplied required type.
 	 *
 	 * @param namespace the namespace; never {@code null}
@@ -155,11 +155,12 @@ public <K, V> Object getOrComputeIfAbsent(N namespace, K key, Function<K, V> def
 	 * @param defaultCreator the function called with the supplied {@code key}
 	 * to create a new value; never {@code null} but may return {@code null}
 	 * @param requiredType the required type of the value; never {@code null}
-	 * @return stored value; may be {@code null}
+	 * @return the stored value; may be {@code null}
 	 * @throws NamespacedHierarchicalStoreException if the stored value cannot
-	 *                                              be cast to the required type
+	 * be cast to the required type
 	 */
-	public <K, V> V getOrComputeIfAbsent(N namespace, K key, Function<K, V> defaultCreator, Class<V> requiredType) {
+	public <K, V> V getOrComputeIfAbsent(N namespace, K key, Function<K, V> defaultCreator, Class<V> requiredType)
+			throws NamespacedHierarchicalStoreException {
 		Object value = getOrComputeIfAbsent(namespace, key, defaultCreator);
 		return castToRequiredType(key, value, requiredType);
 	}
@@ -174,12 +175,12 @@ public <K, V> V getOrComputeIfAbsent(N namespace, K key, Function<K, V> defaultC
 	 * @param namespace the namespace; never {@code null}
 	 * @param key the key; never {@code null}
 	 * @param value the value to store; may be {@code null}
-	 * @return previously stored value; may be {@code null}
+	 * @return the previously stored value; may be {@code null}
 	 * @throws NamespacedHierarchicalStoreException if the stored value cannot
-	 *                                              be cast to the required type
+	 * be cast to the required type
 	 */
-	public Object put(N namespace, Object key, Object value) {
-		StoredValue oldValue = storedValues.put(new CompositeKey<>(namespace, key), storedValue(() -> value));
+	public Object put(N namespace, Object key, Object value) throws NamespacedHierarchicalStoreException {
+		StoredValue oldValue = this.storedValues.put(new CompositeKey<>(namespace, key), storedValue(() -> value));
 		return StoredValue.evaluateIfNotNull(oldValue);
 	}
 
@@ -192,10 +193,10 @@ public Object put(N namespace, Object key, Object value) {
 	 *
 	 * @param namespace the namespace; never {@code null}
 	 * @param key the key; never {@code null}
-	 * @return previously stored value; may be {@code null}
+	 * @return the previously stored value; may be {@code null}
 	 */
 	public Object remove(N namespace, Object key) {
-		StoredValue previous = storedValues.remove(new CompositeKey<>(namespace, key));
+		StoredValue previous = this.storedValues.remove(new CompositeKey<>(namespace, key));
 		return StoredValue.evaluateIfNotNull(previous);
 	}
 
@@ -209,26 +210,26 @@ public Object remove(N namespace, Object key) {
 	 * @param namespace the namespace; never {@code null}
 	 * @param key the key; never {@code null}
 	 * @param requiredType the required type of the value; never {@code null}
-	 * @return previously stored value; may be {@code null}
+	 * @return the previously stored value; may be {@code null}
 	 * @throws NamespacedHierarchicalStoreException if the stored value cannot
-	 *                                              be cast to the required type
+	 * be cast to the required type
 	 */
-	public <T> T remove(N namespace, Object key, Class<T> requiredType) {
+	public <T> T remove(N namespace, Object key, Class<T> requiredType) throws NamespacedHierarchicalStoreException {
 		Object value = remove(namespace, key);
 		return castToRequiredType(key, value, requiredType);
 	}
 
 	private StoredValue storedValue(Supplier<Object> value) {
-		return new StoredValue(insertOrderSequence.getAndIncrement(), value);
+		return new StoredValue(this.insertOrderSequence.getAndIncrement(), value);
 	}
 
 	private StoredValue getStoredValue(CompositeKey<N> compositeKey) {
-		StoredValue storedValue = storedValues.get(compositeKey);
+		StoredValue storedValue = this.storedValues.get(compositeKey);
 		if (storedValue != null) {
 			return storedValue;
 		}
-		if (parentStore != null) {
-			return parentStore.getStoredValue(compositeKey);
+		if (this.parentStore != null) {
+			return this.parentStore.getStoredValue(compositeKey);
 		}
 		return null;
 	}
@@ -274,7 +275,7 @@ public boolean equals(Object o) {
 
 		@Override
 		public int hashCode() {
-			return Objects.hash(namespace, key);
+			return Objects.hash(this.namespace, this.key);
 		}
 
 	}
@@ -318,15 +319,16 @@ private static class EvaluatedValue<N> {
 		private final int order;
 		private final Object value;
 
-		EvaluatedValue(CompositeKey<N> key, int order, Object value) {
-			this.compositeKey = key;
+		private EvaluatedValue(CompositeKey<N> compositeKey, int order, Object value) {
+			this.compositeKey = compositeKey;
 			this.order = order;
 			this.value = value;
 		}
 
-		void close(CloseAction<N> closeAction) throws Throwable {
-			closeAction.close(compositeKey.namespace, compositeKey.key, value);
+		private void close(CloseAction<N> closeAction) throws Throwable {
+			closeAction.close(this.compositeKey.namespace, this.compositeKey.key, this.value);
 		}
+
 	}
 
 	/**
@@ -351,23 +353,23 @@ private MemoizingSupplier(Supplier<Object> delegate) {
 
 		@Override
 		public Object get() {
-			if (value == NO_VALUE_SET) {
+			if (this.value == NO_VALUE_SET) {
 				computeValue();
 			}
-			if (value instanceof Failure) {
-				ExceptionUtils.throwAsUncheckedException(((Failure) value).throwable);
+			if (this.value instanceof Failure) {
+				ExceptionUtils.throwAsUncheckedException(((Failure) this.value).throwable);
 			}
-			return value;
+			return this.value;
 		}
 
 		private synchronized void computeValue() {
 			try {
-				if (value == NO_VALUE_SET) {
-					value = delegate.get();
+				if (this.value == NO_VALUE_SET) {
+					this.value = this.delegate.get();
 				}
 			}
 			catch (Throwable t) {
-				value = new Failure(t);
+				this.value = new Failure(t);
 				UnrecoverableExceptions.rethrowIfUnrecoverable(t);
 			}
 		}
@@ -384,8 +386,9 @@ public Failure(Throwable throwable) {
 	}
 
 	/**
-	 * Called for each successfully stored non-null value in when closing a
-	 * {@link NamespacedHierarchicalStore}.
+	 * Called for each successfully stored non-null value in the store when a
+	 * {@link NamespacedHierarchicalStore} is
+	 * {@link NamespacedHierarchicalStore#close() closed}.
 	 */
 	@FunctionalInterface
 	public interface CloseAction<N> {
@@ -398,6 +401,7 @@ public interface CloseAction<N> {
 		 * @param value the value; never {@code null}
 		 */
 		void close(N namespace, Object key, Object value) throws Throwable;
+
 	}
 
 }

From 6cb0858895305d3f7480889a5cb49c610f4beb07 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 29 Apr 2023 14:00:00 +0200
Subject: [PATCH 1252/1433] Polish
 MethodArgumentsProvider.validateFactoryMethod()

See #3276
---
 .../params/provider/MethodArgumentsProvider.java    | 13 ++++++-------
 .../provider/MethodArgumentsProviderTests.java      |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index b018ff1668c8..07415218a00b 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -176,13 +176,12 @@ private static Class<?> loadRequiredClass(String className) {
 	}
 
 	private static Method validateFactoryMethod(ExtensionContext context, Method factoryMethod, Object testInstance) {
-		if (!factoryMethod.getDeclaringClass().isInstance(testInstance)) {
-			Preconditions.condition(ReflectionUtils.isStatic(factoryMethod),
-				() -> format("Method '%s' must be static: local factory methods must be static unless "
-						+ "the test class is annotated with @TestInstance(Lifecycle.PER_CLASS); external "
-						+ "factory methods must always be static.",
-					factoryMethod.toGenericString()));
-		}
+		Preconditions.condition(
+			factoryMethod.getDeclaringClass().isInstance(testInstance) || ReflectionUtils.isStatic(factoryMethod),
+			() -> format("Method '%s' must be static: local factory methods must be static "
+					+ "unless the PER_CLASS @TestInstance lifecycle mode is used; "
+					+ "external factory methods must always be static.",
+				factoryMethod.toGenericString()));
 		return factoryMethod;
 	}
 
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 0df033899039..0188bb90a80f 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -208,7 +208,7 @@ void throwsExceptionWhenNonStaticExternalFactoryMethodIsReferencedWithLifecycleP
 	private static void assertStaticIsRequired(PreconditionViolationException exception) {
 		assertThat(exception).hasMessageContainingAll("Method '",
 			"' must be static: local factory methods must be static ",
-			"unless the test class is annotated with @TestInstance(Lifecycle.PER_CLASS); ",
+			"unless the PER_CLASS @TestInstance lifecycle mode is used; ",
 			"external factory methods must always be static.");
 	}
 

From ddaaf6f77a83d4c5382e7e12d96cfb415cecd121 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 29 Apr 2023 14:07:05 +0200
Subject: [PATCH 1253/1433] Update release notes entry

See #3215, #3263
Closes #3276
---
 .../asciidoc/release-notes/release-notes-5.10.0-M1.adoc    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index d73c14f7a78b..534522496fc8 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -98,10 +98,9 @@ repository on GitHub.
   temporary directories. See the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
-* If a non-static `@MethodSource` factory method is used with test instance per-method
-  lifecycle semantics, the exception thrown now informs the user that the factory method
-  must be `static` unless the test class is annotated with
-  `@TestInstance(Lifecycle.PER_CLASS)`.
+* If `@MethodSource` is used with a non-static factory method that should be `static`, the
+  exception thrown now provides the user a meaningful explanation of how to address the
+  problem.
 
 
 [[release-notes-5.10.0-M1-junit-vintage]]

From 9856de10e89a8722187691ce799dff9ad7522224 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 29 Apr 2023 14:20:04 +0200
Subject: [PATCH 1254/1433] Remove obsolete method parameter

See #3276
---
 .../jupiter/params/provider/MethodArgumentsProvider.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 07415218a00b..ddcb16b5c488 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -50,7 +50,7 @@ protected Stream<? extends Arguments> provideArguments(ExtensionContext context,
 		// @formatter:off
 		return stream(methodNames)
 				.map(factoryMethodName -> findFactoryMethod(testClass, testMethod, factoryMethodName))
-				.map(factoryMethod -> validateFactoryMethod(context, factoryMethod, testInstance))
+				.map(factoryMethod -> validateFactoryMethod(factoryMethod, testInstance))
 				.map(factoryMethod -> context.getExecutableInvoker().invoke(factoryMethod, testInstance))
 				.flatMap(CollectionUtils::toStream)
 				.map(MethodArgumentsProvider::toArguments);
@@ -175,7 +175,7 @@ private static Class<?> loadRequiredClass(String className) {
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 	}
 
-	private static Method validateFactoryMethod(ExtensionContext context, Method factoryMethod, Object testInstance) {
+	private static Method validateFactoryMethod(Method factoryMethod, Object testInstance) {
 		Preconditions.condition(
 			factoryMethod.getDeclaringClass().isInstance(testInstance) || ReflectionUtils.isStatic(factoryMethod),
 			() -> format("Method '%s' must be static: local factory methods must be static "

From 7644bbd3a8e58717c9493732aa88862c5188c42b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 13:37:52 +0200
Subject: [PATCH 1255/1433] Mark known third-party tasks as not compatible with
 config cache

---
 build.gradle.kts                                 |  4 ++++
 documentation/documentation.gradle.kts           |  2 ++
 .../junitbuild.spotless-conventions.gradle.kts   | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 292568069bec..e45ad17ddf6e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -63,3 +63,7 @@ nexusPublishing {
 nohttp {
 	source.exclude("**/.gradle/**", "gradle/plugins/**/build/**", "buildSrc/build/**")
 }
+
+tasks.checkstyleNohttp {
+	notCompatibleWithConfigurationCache("https://github.com/spring-io/nohttp/issues/61")
+}
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 1596024abaac..e9a9de2fcd5b 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -284,6 +284,8 @@ tasks {
 				"--add-opens", "java.base/java.io=ALL-UNNAMED"
 			)
 		}
+
+		notCompatibleWithConfigurationCache("https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/564")
 	}
 
 	asciidoctor {
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
index 026eebbf40a5..53383e81a845 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
@@ -1,3 +1,7 @@
+import com.diffplug.gradle.spotless.SpotlessApply
+import com.diffplug.gradle.spotless.SpotlessCheck
+import com.diffplug.spotless.LineEnding
+
 plugins {
 	id("com.diffplug.spotless")
 }
@@ -44,4 +48,16 @@ spotless {
 			endWithNewline()
 		}
 	}
+
+	// https://github.com/diffplug/spotless/issues/1644
+	lineEndings = LineEnding.PLATFORM_NATIVE // or any other except GIT_ATTRIBUTES
+}
+
+tasks {
+	withType<SpotlessApply>().configureEach {
+		notCompatibleWithConfigurationCache("https://github.com/diffplug/spotless/issues/644")
+	}
+	withType<SpotlessCheck>().configureEach {
+		notCompatibleWithConfigurationCache("https://github.com/diffplug/spotless/issues/644")
+	}
 }

From 9c287897a89bb43ca8966d4db700e94649dd0f6a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 13:38:32 +0200
Subject: [PATCH 1256/1433] Make tasks compatible with configuration cache

---
 .../src/main/kotlin/junitbuild.osgi-conventions.gradle.kts  | 6 ++++--
 .../kotlin/junitbuild.publishing-conventions.gradle.kts     | 1 +
 .../src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts   | 3 ++-
 junit-jupiter-api/junit-jupiter-api.gradle.kts              | 3 ++-
 junit-jupiter-engine/junit-jupiter-engine.gradle.kts        | 3 ++-
 .../junit-jupiter-migrationsupport.gradle.kts               | 3 ++-
 junit-jupiter-params/junit-jupiter-params.gradle.kts        | 3 ++-
 .../junit-platform-console-standalone.gradle.kts            | 3 ++-
 junit-platform-launcher/junit-platform-launcher.gradle.kts  | 3 ++-
 junit-platform-runner/junit-platform-runner.gradle.kts      | 3 ++-
 junit-vintage-engine/junit-vintage-engine.gradle.kts        | 6 ++++--
 11 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
index ea432398c77b..6b19ce2c8c9c 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
@@ -7,6 +7,8 @@ plugins {
 
 val importAPIGuardian = "org.apiguardian.*;resolution:=\"optional\""
 
+val projectDescription = objects.property<String>().convention(provider { project.description })
+
 // This task enhances `jar` and `shadowJar` tasks with the bnd
 // `BundleTaskExtension` extension which allows for generating OSGi
 // metadata into the jar
@@ -16,8 +18,8 @@ tasks.withType<Jar>().matching { task: Jar ->
 	extra["importAPIGuardian"] = importAPIGuardian
 
 	extensions.create<BundleTaskExtension>(BundleTaskExtension.NAME, this).apply {
-		properties.set(provider {
-			mapOf("project.description" to project.description)
+		properties.set(projectDescription.map {
+			mapOf("project.description" to it)
 		})
 		// These are bnd instructions necessary for generating OSGi metadata.
 		// We've generalized these so that they are widely applicable limiting
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
index 876612f0609c..dae789b6351c 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
@@ -47,6 +47,7 @@ signing {
 }
 
 tasks.withType<Sign>().configureEach {
+	val isSnapshot = project.version.toString().contains("SNAPSHOT")
 	onlyIf {
 		!isSnapshot // Gradle Module Metadata currently does not support signing snapshots
 	}
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
index 509b58f2c8c0..15bb10473e1a 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
@@ -4,8 +4,9 @@ val tempRepoName by extra("temp")
 val tempRepoDir by extra(file("$buildDir/repo"))
 
 val clearTempRepoDir by tasks.registering {
+	val dir = tempRepoDir
 	doFirst {
-		tempRepoDir.deleteRecursively()
+		dir.deleteRecursively()
 	}
 }
 
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index e4f2869ae39f..7dd03a78f4e9 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -21,10 +21,11 @@ dependencies {
 tasks {
 	jar {
 		bundle {
+			val version = project.version
 			bnd("""
 				Require-Capability:\
 					org.junit.platform.engine;\
-						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${rootProject.property("version")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("version")!!}}})))';\
+						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${version}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${version}}})))';\
 						effective:=active
 			""")
 		}
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 63d45183f2be..26b4b2664e20 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -38,6 +38,7 @@ tasks {
 	}
 	jar {
 		bundle {
+			val platformVersion: String by rootProject.extra
 			bnd("""
 				Provide-Capability:\
 					org.junit.platform.engine;\
@@ -45,7 +46,7 @@ tasks {
 						version:Version="${'$'}{version_cleanup;${project.version}}"
 				Require-Capability:\
 					org.junit.platform.launcher;\
-						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}}})))';\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${platformVersion}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${platformVersion}}})))';\
 						effective:=active
 			""")
 		}
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
index e9b8e0c049fd..d3779d057e4f 100644
--- a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
+++ b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -24,10 +24,11 @@ dependencies {
 
 tasks.jar {
 	bundle {
+		val importAPIGuardian: String by extra
 		bnd("""
 			# Import JUnit4 packages with a version
 			Import-Package: \
-				${extra["importAPIGuardian"]},\
+				$importAPIGuardian,\
 				org.junit;version="[${libs.versions.junit4Min.get()},5)",\
 				org.junit.platform.commons.logging;status=INTERNAL,\
 				org.junit.rules;version="[${libs.versions.junit4Min.get()},5)",\
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index 6d98446d921d..f023f4c3ea83 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -30,10 +30,11 @@ dependencies {
 tasks {
 	jar {
 		bundle {
+			val version = project.version
 			bnd("""
 				Require-Capability:\
 					org.junit.platform.engine;\
-						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${rootProject.property("version")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("version")!!}}})))';\
+						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;$version})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;$version}})))';\
 						effective:=active
 			""")
 		}
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index 61d35dedab17..da249709a95f 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -52,10 +52,11 @@ tasks {
 		}
 
 		bundle {
+			val importAPIGuardian: String by extra
 			bnd("""
 				# Customize the imports because this is an aggregate jar
 				Import-Package: \
-					${extra["importAPIGuardian"]},\
+					$importAPIGuardian,\
 					kotlin.*;resolution:="optional",\
 					*
 				# Disable the APIGuardian plugin since everything was already
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
index 228ecb35b734..a9b3630762c8 100644
--- a/junit-platform-launcher/junit-platform-launcher.gradle.kts
+++ b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -17,11 +17,12 @@ dependencies {
 tasks {
 	jar {
 		bundle {
+			val version = project.version
 			bnd("""
 				Provide-Capability:\
 					org.junit.platform.launcher;\
 						org.junit.platform.launcher='junit-platform-launcher';\
-						version:Version="${'$'}{version_cleanup;${project.version}}"
+						version:Version="${'$'}{version_cleanup;${version}}"
 			""")
 		}
 	}
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
index c62d027f6c67..bbc2ae9d95be 100644
--- a/junit-platform-runner/junit-platform-runner.gradle.kts
+++ b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -24,10 +24,11 @@ dependencies {
 
 tasks.jar {
 	bundle {
+		val importAPIGuardian: String by extra
 		bnd("""
 			# Import JUnit4 packages with a version
 			Import-Package: \
-				${extra["importAPIGuardian"]},\
+				$importAPIGuardian,\
 				org.junit.platform.commons.logging;status=INTERNAL,\
 				org.junit.runner.*;version="[${libs.versions.junit4Min.get()},5)",\
 				*
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 90648ed0b888..8dea84a41458 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -37,6 +37,8 @@ tasks {
 	jar {
 		bundle {
 			val junit4Min = libs.versions.junit4Min.get()
+			val platformVersion: String by rootProject.extra
+			val version = project.version
 			bnd("""
 				# Import JUnit4 packages with a version
 				Import-Package: \
@@ -53,10 +55,10 @@ tasks {
 				Provide-Capability:\
 					org.junit.platform.engine;\
 						org.junit.platform.engine='junit-vintage';\
-						version:Version="${'$'}{version_cleanup;${project.version}}"
+						version:Version="${'$'}{version_cleanup;$version}"
 				Require-Capability:\
 					org.junit.platform.launcher;\
-						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}}})))';\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;$platformVersion})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;$platformVersion}})))';\
 						effective:=active
 			""")
 		}

From 45d40bd92297b6c026c224af71e319f80fcd030a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 14:05:40 +0200
Subject: [PATCH 1257/1433] Make :platform-tooling-support-tests:test config
 cache compatible

---
 .../platform-tooling-support-tests.gradle.kts | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index e56ad9e5b707..a4c3e5a09906 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -105,8 +105,8 @@ tasks.test {
 
 	val tempRepoDir: File by rootProject
 	jvmArgumentProviders += MavenRepo(tempRepoDir)
-	jvmArgumentProviders += JarPath(thirdPartyJars)
-	jvmArgumentProviders += JarPath(antJars)
+	jvmArgumentProviders += JarPath(project, thirdPartyJars)
+	jvmArgumentProviders += JarPath(project, antJars)
 	jvmArgumentProviders += MavenDistribution(project, unzipMavenDistribution)
 
 	(options as JUnitPlatformOptions).apply {
@@ -127,14 +127,14 @@ tasks.test {
 	distribution {
 		requirements.add("jdk=8")
 	}
-	jvmArgumentProviders += JavaHomeDir(project, 8)
+	jvmArgumentProviders += JavaHomeDir(project, 8, distribution.enabled)
 }
 
 class MavenRepo(@get:InputDirectory @get:PathSensitive(RELATIVE) val repoDir: File) : CommandLineArgumentProvider {
 	override fun asArguments() = listOf("-Dmaven.repo=$repoDir")
 }
 
-class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgumentProvider {
+class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEnabled: Provider<Boolean>) : CommandLineArgumentProvider {
 
 	@Internal
 	val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
@@ -148,8 +148,11 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 				}
 			})
 
+	@Internal
+	val enabled: Property<Boolean> = project.objects.property<Boolean>().convention(testDistributionEnabled.map { !it })
+
 	override fun asArguments(): List<String> {
-		if (buildParameters.enterprise.testDistribution.enabled) {
+		if (!enabled.get()) {
 			return emptyList()
 		}
 		val metadata = javaLauncher.map { it.metadata }
@@ -158,8 +161,11 @@ class JavaHomeDir(project: Project, @Input val version: Int) : CommandLineArgume
 	}
 }
 
-class JarPath(@Classpath val configuration: Configuration, @Input val key: String = configuration.name) : CommandLineArgumentProvider {
-	override fun asArguments() = listOf("-D${key}=${configuration.asPath}")
+class JarPath(project: Project, configuration: Configuration, @Input val key: String = configuration.name) : CommandLineArgumentProvider {
+	@get:Classpath
+	val files: ConfigurableFileCollection = project.objects.fileCollection().from(configuration)
+
+	override fun asArguments() = listOf("-D${key}=${files.asPath}")
 }
 
 class MavenDistribution(project: Project, sourceTask: TaskProvider<*>) : CommandLineArgumentProvider {

From c3de451159a363f0222cb6488803e2ff0ba47d07 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 14:07:03 +0200
Subject: [PATCH 1258/1433] Enable stricter configuration cache checks

---
 settings.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8a3d71e47b04..6b20013500bb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -113,4 +113,5 @@ rootProject.children.forEach { project ->
 	}
 }
 
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

From 4f96843ef273b19b65374b8ffc451e0248832dfc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 14:26:49 +0200
Subject: [PATCH 1259/1433] Extract config cache compatible
 CaptureJavaExecOutput task

---
 documentation/documentation.gradle.kts        | 63 ++++++++-----------
 .../junitbuild/exec/CaptureJavaExecOutput.kt  | 50 +++++++++++++++
 2 files changed, 75 insertions(+), 38 deletions(-)
 create mode 100644 gradle/plugins/common/src/main/kotlin/junitbuild/exec/CaptureJavaExecOutput.kt

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index e9a9de2fcd5b..0d603b81dd06 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -1,11 +1,10 @@
+import junitbuild.exec.CaptureJavaExecOutput
 import junitbuild.exec.ClasspathSystemPropertyProvider
 import junitbuild.exec.RunConsoleLauncher
 import junitbuild.javadoc.ModuleSpecificJavadocFileOption
 import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
 import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
-import java.io.ByteArrayOutputStream
-import java.nio.file.Files
 
 plugins {
 	alias(libs.plugins.asciidoctorConvert)
@@ -157,48 +156,48 @@ tasks {
 		dependsOn(consoleLauncherTest)
 	}
 
-	val generateConsoleLauncherOptions by registering(JavaExec::class) {
-		classpath = sourceSets["test"].runtimeClasspath
+	val generateConsoleLauncherOptions by registering(CaptureJavaExecOutput::class) {
+		classpath.from(sourceSets["test"].runtimeClasspath)
 		mainClass.set("org.junit.platform.console.ConsoleLauncher")
-		args("--help", "--disable-banner")
-		redirectOutput(consoleLauncherOptionsFile)
+		args.addAll("--help", "--disable-banner")
+		outputFile.set(consoleLauncherOptionsFile)
 	}
 
-	val generateConsoleLauncherDiscoverOptions by registering(JavaExec::class) {
-		classpath = sourceSets["test"].runtimeClasspath
+	val generateConsoleLauncherDiscoverOptions by registering(CaptureJavaExecOutput::class) {
+		classpath.from(sourceSets["test"].runtimeClasspath)
 		mainClass.set("org.junit.platform.console.ConsoleLauncher")
-		args("discover", "--help", "--disable-banner")
-		redirectOutput(consoleLauncherDiscoverOptionsFile)
+		args.addAll("discover", "--help", "--disable-banner")
+		outputFile.set(consoleLauncherDiscoverOptionsFile)
 	}
 
-	val generateConsoleLauncherExecuteOptions by registering(JavaExec::class) {
-		classpath = sourceSets["test"].runtimeClasspath
+	val generateConsoleLauncherExecuteOptions by registering(CaptureJavaExecOutput::class) {
+		classpath.from(sourceSets["test"].runtimeClasspath)
 		mainClass.set("org.junit.platform.console.ConsoleLauncher")
-		args("execute", "--help", "--disable-banner")
-		redirectOutput(consoleLauncherExecuteOptionsFile)
+		args.addAll("execute", "--help", "--disable-banner")
+		outputFile.set(consoleLauncherExecuteOptionsFile)
 	}
 
-	val generateConsoleLauncherEnginesOptions by registering(JavaExec::class) {
-		classpath = sourceSets["test"].runtimeClasspath
+	val generateConsoleLauncherEnginesOptions by registering(CaptureJavaExecOutput::class) {
+		classpath.from(sourceSets["test"].runtimeClasspath)
 		mainClass.set("org.junit.platform.console.ConsoleLauncher")
-		args("engines", "--help", "--disable-banner")
-		redirectOutput(consoleLauncherEnginesOptionsFile)
+		args.addAll("engines", "--help", "--disable-banner")
+		outputFile.set(consoleLauncherEnginesOptionsFile)
 	}
 
-	val generateExperimentalApisTable by registering(JavaExec::class) {
-		classpath = sourceSets["test"].runtimeClasspath
+	val generateExperimentalApisTable by registering(CaptureJavaExecOutput::class) {
+		classpath.from(sourceSets["test"].runtimeClasspath)
 		mainClass.set("org.junit.api.tools.ApiReportGenerator")
 		jvmArgumentProviders += ClasspathSystemPropertyProvider("api.classpath", apiReport)
-		args("EXPERIMENTAL")
-		redirectOutput(experimentalApisTableFile)
+		args.add("EXPERIMENTAL")
+		outputFile.set(experimentalApisTableFile)
 	}
 
-	val generateDeprecatedApisTable by registering(JavaExec::class) {
-		classpath = sourceSets["test"].runtimeClasspath
+	val generateDeprecatedApisTable by registering(CaptureJavaExecOutput::class) {
+		classpath.from(sourceSets["test"].runtimeClasspath)
 		mainClass.set("org.junit.api.tools.ApiReportGenerator")
 		jvmArgumentProviders += ClasspathSystemPropertyProvider("api.classpath", apiReport)
-		args("DEPRECATED")
-		redirectOutput(deprecatedApisTableFile)
+		args.add("DEPRECATED")
+		outputFile.set(deprecatedApisTableFile)
 	}
 
 	val generateStandaloneConsoleLauncherShadowedArtifactsFile by registering(Copy::class) {
@@ -479,18 +478,6 @@ tasks {
 	}
 }
 
-fun JavaExec.redirectOutput(outputFile: Provider<RegularFile>) {
-	outputs.file(outputFile)
-	val byteStream = ByteArrayOutputStream()
-	standardOutput = byteStream
-	doLast {
-		outputFile.get().asFile.apply {
-			Files.createDirectories(parentFile.toPath())
-			Files.write(toPath(), byteStream.toByteArray())
-		}
-	}
-}
-
 eclipse {
 	classpath {
 		plusConfigurations.add(projects.junitPlatformConsole.dependencyProject.configurations["shadowed"])
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild/exec/CaptureJavaExecOutput.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/exec/CaptureJavaExecOutput.kt
new file mode 100644
index 000000000000..aa1f4c391168
--- /dev/null
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild/exec/CaptureJavaExecOutput.kt
@@ -0,0 +1,50 @@
+package junitbuild.exec
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Classpath
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Nested
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import org.gradle.process.CommandLineArgumentProvider
+import org.gradle.process.ExecOperations
+import java.nio.file.Files
+import javax.inject.Inject
+
+@CacheableTask
+abstract class CaptureJavaExecOutput @Inject constructor(private val execOperations: ExecOperations) : DefaultTask() {
+
+    @get:Classpath
+    abstract val classpath: ConfigurableFileCollection
+
+    @get:Input
+    abstract val mainClass: Property<String>
+
+    @get:Input
+    abstract val args: ListProperty<String>
+
+    @get:Nested
+    val jvmArgumentProviders = mutableListOf<CommandLineArgumentProvider>()
+
+    @get:OutputFile
+    abstract val outputFile: RegularFileProperty
+
+    @TaskAction
+    fun execute() {
+        val outputFile = outputFile.get().asFile.toPath()
+        Files.newOutputStream(outputFile).use { out ->
+            execOperations.javaexec {
+                classpath = this@CaptureJavaExecOutput.classpath
+                mainClass.set(this@CaptureJavaExecOutput.mainClass)
+                args = this@CaptureJavaExecOutput.args.get()
+                jvmArgumentProviders.addAll(this@CaptureJavaExecOutput.jvmArgumentProviders)
+                standardOutput = out
+            }
+        }
+    }
+}

From cb84b1c86d33d9a5888c3f6dfca8616222cf2938 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 14:46:34 +0200
Subject: [PATCH 1260/1433] Extract
 GenerateStandaloneConsoleLauncherShadowedArtifactsFile task

---
 documentation/documentation.gradle.kts        | 14 ++-----
 ...oneConsoleLauncherShadowedArtifactsFile.kt | 40 +++++++++++++++++++
 2 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 gradle/plugins/common/src/main/kotlin/junitbuild/exec/GenerateStandaloneConsoleLauncherShadowedArtifactsFile.kt

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 0d603b81dd06..947d80f8c99d 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -1,5 +1,6 @@
 import junitbuild.exec.CaptureJavaExecOutput
 import junitbuild.exec.ClasspathSystemPropertyProvider
+import junitbuild.exec.GenerateStandaloneConsoleLauncherShadowedArtifactsFile
 import junitbuild.exec.RunConsoleLauncher
 import junitbuild.javadoc.ModuleSpecificJavadocFileOption
 import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
@@ -200,16 +201,9 @@ tasks {
 		outputFile.set(deprecatedApisTableFile)
 	}
 
-	val generateStandaloneConsoleLauncherShadowedArtifactsFile by registering(Copy::class) {
-		from(zipTree(standaloneConsoleLauncher.elements.map { it.single().asFile })) {
-			include("META-INF/shadowed-artifacts")
-			includeEmptyDirs = false
-			eachFile {
-				relativePath = RelativePath(true, standaloneConsoleLauncherShadowedArtifactsFile.get().asFile.name)
-			}
-			filter { line -> "- `${line}`" }
-		}
-		into(standaloneConsoleLauncherShadowedArtifactsFile.map { it.asFile.parentFile })
+	val generateStandaloneConsoleLauncherShadowedArtifactsFile by registering(GenerateStandaloneConsoleLauncherShadowedArtifactsFile::class) {
+		inputJar.fileProvider(standaloneConsoleLauncher.elements.map { it.single().asFile })
+		outputFile.set(standaloneConsoleLauncherShadowedArtifactsFile)
 	}
 
 	withType<AbstractAsciidoctorTask>().configureEach {
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild/exec/GenerateStandaloneConsoleLauncherShadowedArtifactsFile.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/exec/GenerateStandaloneConsoleLauncherShadowedArtifactsFile.kt
new file mode 100644
index 000000000000..042a55e8517c
--- /dev/null
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild/exec/GenerateStandaloneConsoleLauncherShadowedArtifactsFile.kt
@@ -0,0 +1,40 @@
+package junitbuild.exec
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ArchiveOperations
+import org.gradle.api.file.FileSystemOperations
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.file.RelativePath
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Classpath
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import javax.inject.Inject
+
+@CacheableTask
+abstract class GenerateStandaloneConsoleLauncherShadowedArtifactsFile @Inject constructor(
+    private val fileSystem: FileSystemOperations,
+    private val archives: ArchiveOperations
+) : DefaultTask() {
+
+    @get:Classpath
+    abstract val inputJar: RegularFileProperty
+
+    @get:OutputFile
+    abstract val outputFile: RegularFileProperty
+
+    @TaskAction
+    fun execute() {
+        fileSystem.copy {
+            from(archives.zipTree(inputJar)) {
+                include("META-INF/shadowed-artifacts")
+                includeEmptyDirs = false
+                eachFile {
+                    relativePath = RelativePath(true, outputFile.get().asFile.name)
+                }
+                filter { line -> "- `${line}`" }
+            }
+            into(outputFile.get().asFile.parentFile)
+        }
+    }
+}

From bcf523437949cea6691f4b5ad9697546de25ea2d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 15:03:18 +0200
Subject: [PATCH 1261/1433] Document NamespacedHierarchicalStore.newChild()
 method

---
 .../engine/support/store/NamespacedHierarchicalStore.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
index e931016ae941..536c029b10a0 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java
@@ -71,6 +71,10 @@ public NamespacedHierarchicalStore(NamespacedHierarchicalStore<N> parentStore, C
 		this.closeAction = closeAction;
 	}
 
+	/**
+	 * Create a child store with this store as its parent using the same close
+	 * action.
+	 */
 	public NamespacedHierarchicalStore<N> newChild() {
 		return new NamespacedHierarchicalStore<>(this, this.closeAction);
 	}

From 694a5b4a8309a57778c6bdf9880ce7dc7ec2a03c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 15:04:17 +0200
Subject: [PATCH 1262/1433] Add conventional exception constructor

---
 .../support/store/NamespacedHierarchicalStoreException.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreException.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreException.java
index 93be77040166..276c890e7c9b 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreException.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreException.java
@@ -29,4 +29,8 @@ public NamespacedHierarchicalStoreException(String message) {
 		super(message);
 	}
 
+	@SuppressWarnings("unused")
+	public NamespacedHierarchicalStoreException(String message, Throwable cause) {
+		super(message, cause);
+	}
 }

From ba428edfd3b7cb9376924fb9eca75f25cd017a2b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 15:58:28 +0200
Subject: [PATCH 1263/1433] Fix Spotless on Windows

---
 .../src/main/kotlin/junitbuild.spotless-conventions.gradle.kts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
index 53383e81a845..d390fb2b2e1c 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
@@ -50,7 +50,7 @@ spotless {
 	}
 
 	// https://github.com/diffplug/spotless/issues/1644
-	lineEndings = LineEnding.PLATFORM_NATIVE // or any other except GIT_ATTRIBUTES
+	lineEndings = LineEnding.UNIX // or any other except GIT_ATTRIBUTES
 }
 
 tasks {

From 3b7766b2d61b9ae8227254ae984937f714238d57 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 29 Apr 2023 16:41:48 +0200
Subject: [PATCH 1264/1433] Introduce dry-run execution mode (#3165)

The new `junit.platform.execution.dryRun.enabled` configuration
parameter can be used to enable dry-run mode in which tests returned
from test discovery are pretended to be executed and test
started/finished events are reported to registered
`TestExecutionListeners`. This can be useful to test changes in the
configuration of a build or to verify a listener is called as expected
without having to wait for all tests to be executed.
---
 .../release-notes-5.10.0-M1.adoc              |  2 +
 .../advanced-topics/launcher-api.adoc         | 11 +++++
 .../platform/launcher/LauncherConstants.java  | 16 +++++++
 .../core/EngineExecutionOrchestrator.java     | 47 +++++++++++++++++--
 .../launcher/core/DefaultLauncherTests.java   | 28 +++++++++++
 5 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 534522496fc8..859021071a76 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -54,6 +54,8 @@ repository on GitHub.
   actionable.
 * Extracted `NamespacedHierarchicalStore` from JUnit Jupiter engine for reuse by other
   test engines and their extensions.
+* New dry-run mode to simulate test execution without actually running tests. Please refer
+  to the <<../user-guide/index.adoc#launcher-api-dry-run-mode, User Guide>> for details.
 
 
 [[release-notes-5.10.0-M1-junit-jupiter]]
diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
index 8f98a7e825b1..6257d266c293 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
@@ -264,3 +264,14 @@ built-in fluent _builder_ API, as demonstrated in the following example.
 ----
 include::{testDir}/example/UsingTheLauncherDemo.java[tags=launcherConfig]
 ----
+
+[[launcher-api-dry-run-mode]]
+==== Dry-Run Mode
+
+When running tests via the `{Launcher}` API, you can enable _dry-run mode_ by setting the
+`junit.platform.execution.dryRun.enabled` <<running-tests-config-params,
+configuration parameter>> to `true`. In this mode, the `{Launcher}` will not actually
+execute any tests but will notify registered `{TestExecutionListener}` instances as if all
+tests had been executed successfully. This can be useful to test changes in the
+configuration of a build or to verify a listener is called as expected without having to
+wait for all tests to be executed.
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index 8862cb28ea7e..595c7698ed14 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -148,6 +148,22 @@ public class LauncherConstants {
 	@API(status = EXPERIMENTAL, since = "1.10")
 	public static final String ENABLE_LAUNCHER_INTERCEPTORS = "junit.platform.launcher.interceptors.enabled";
 
+	/**
+	 * Property name used to enable dry-run mode for test execution.
+	 *
+	 * <p>When dry-run mode is enabled, no tests will be executed. Instead, all
+	 * registered {@link TestExecutionListener TestExecutionListeners} will
+	 * receive started/finished events for all test descriptors that are part
+	 * of the discovered {@link TestPlan}. All tests will be reported as
+	 * successful. This can be useful to test changes in the configuration of a
+	 * build or to verify a listener is called as expected without having to
+	 * wait for all tests to be executed.
+	 *
+	 * <p>Value must either {@code true} or {@code false}; defaults to {@code false}.
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static final String DRY_RUN_PROPERTY_NAME = "junit.platform.execution.dryRun.enabled";
+
 	private LauncherConstants() {
 		/* no-op */
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index 35e174e46ecd..8ec4a133c2a7 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -11,6 +11,7 @@
 package org.junit.platform.launcher.core;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
+import static org.junit.platform.launcher.LauncherConstants.DRY_RUN_PROPERTY_NAME;
 import static org.junit.platform.launcher.core.ListenerRegistry.forEngineExecutionListeners;
 
 import java.util.Optional;
@@ -27,6 +28,7 @@
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 
 /**
@@ -82,13 +84,50 @@ private void execute(InternalTestPlan internalTestPlan, EngineExecutionListener
 		TestPlan testPlan = internalTestPlan.getDelegate();
 		LauncherDiscoveryResult discoveryResult = internalTestPlan.getDiscoveryResult();
 
+		testExecutionListener.testPlanExecutionStarted(testPlan);
+		if (isDryRun(internalTestPlan)) {
+			dryRun(testPlan, testExecutionListener);
+		}
+		else {
+			execute(discoveryResult,
+				buildEngineExecutionListener(parentEngineExecutionListener, testExecutionListener, testPlan));
+		}
+		testExecutionListener.testPlanExecutionFinished(testPlan);
+	}
+
+	private Boolean isDryRun(InternalTestPlan internalTestPlan) {
+		return internalTestPlan.getConfigurationParameters().getBoolean(DRY_RUN_PROPERTY_NAME).orElse(false);
+	}
+
+	private void dryRun(TestPlan testPlan, TestExecutionListener listener) {
+		testPlan.accept(new TestPlan.Visitor() {
+			@Override
+			public void preVisitContainer(TestIdentifier testIdentifier) {
+				listener.executionStarted(testIdentifier);
+			}
+
+			@Override
+			public void visit(TestIdentifier testIdentifier) {
+				if (!testIdentifier.isContainer()) {
+					listener.executionStarted(testIdentifier);
+					listener.executionFinished(testIdentifier, TestExecutionResult.successful());
+				}
+			}
+
+			@Override
+			public void postVisitContainer(TestIdentifier testIdentifier) {
+				listener.executionFinished(testIdentifier, TestExecutionResult.successful());
+			}
+		});
+	}
+
+	private static EngineExecutionListener buildEngineExecutionListener(
+			EngineExecutionListener parentEngineExecutionListener, TestExecutionListener testExecutionListener,
+			TestPlan testPlan) {
 		ListenerRegistry<EngineExecutionListener> engineExecutionListenerRegistry = forEngineExecutionListeners();
 		engineExecutionListenerRegistry.add(new ExecutionListenerAdapter(testPlan, testExecutionListener));
 		engineExecutionListenerRegistry.add(parentEngineExecutionListener);
-
-		testExecutionListener.testPlanExecutionStarted(testPlan);
-		execute(discoveryResult, engineExecutionListenerRegistry.getCompositeListener());
-		testExecutionListener.testPlanExecutionFinished(testPlan);
+		return engineExecutionListenerRegistry.getCompositeListener();
 	}
 
 	private void withInterceptedStreams(ConfigurationParameters configurationParameters,
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 228f73d8620c..0e39ae5e2d23 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -18,6 +18,7 @@
 import static org.junit.platform.engine.TestExecutionResult.successful;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId;
+import static org.junit.platform.launcher.LauncherConstants.DRY_RUN_PROPERTY_NAME;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME;
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 import static org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly.createLauncher;
@@ -49,6 +50,7 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
+import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestDescriptor;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 import org.junit.platform.fakes.TestDescriptorStub;
 import org.junit.platform.fakes.TestEngineSpy;
@@ -625,4 +627,30 @@ private void assertImposter(String id) {
 			impostor.getClass().getName(), id);
 	}
 
+	@Test
+	void dryRunModeReportsEventsForAllTestsButDoesNotExecuteThem() {
+		var engine = new DemoHierarchicalTestEngine("engine");
+		var container = engine.addContainer("container", "Container", null);
+		var test = new DemoHierarchicalTestDescriptor(container.getUniqueId().append("test", "test"), "Test",
+			(__, ___) -> {
+				throw new RuntimeException("boom");
+			});
+		container.addChild(test);
+
+		var launcher = createLauncher(engine);
+		TestExecutionListener listener = mock();
+
+		launcher.execute(request().configurationParameter(DRY_RUN_PROPERTY_NAME, "true").build(), listener);
+
+		var inOrder = inOrder(listener);
+		inOrder.verify(listener).testPlanExecutionStarted(any());
+		inOrder.verify(listener).executionStarted(TestIdentifier.from(engine.getEngineDescriptor()));
+		inOrder.verify(listener).executionStarted(TestIdentifier.from(container));
+		inOrder.verify(listener).executionStarted(TestIdentifier.from(test));
+		inOrder.verify(listener).executionFinished(TestIdentifier.from(test), successful());
+		inOrder.verify(listener).executionFinished(TestIdentifier.from(container), successful());
+		inOrder.verify(listener).executionFinished(TestIdentifier.from(engine.getEngineDescriptor()), successful());
+		inOrder.verify(listener).testPlanExecutionFinished(any());
+		inOrder.verifyNoMoreInteractions();
+	}
 }

From 784bcc63307aebb76dc07d4f65acd27a360fec4a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 4 May 2023 18:11:45 +0200
Subject: [PATCH 1265/1433] Polishing

---
 .../java/org/junit/platform/launcher/LauncherConstants.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index 595c7698ed14..806478728f93 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -159,7 +159,7 @@ public class LauncherConstants {
 	 * build or to verify a listener is called as expected without having to
 	 * wait for all tests to be executed.
 	 *
-	 * <p>Value must either {@code true} or {@code false}; defaults to {@code false}.
+	 * <p>Value must be either {@code true} or {@code false}; defaults to {@code false}.
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
 	public static final String DRY_RUN_PROPERTY_NAME = "junit.platform.execution.dryRun.enabled";

From 4bee6def900bab698240d5642477ef9fcca8cb7a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 4 May 2023 18:21:17 +0200
Subject: [PATCH 1266/1433] Update list of supported extension APIs in JUnit
 Jupiter

---
 .../main/java/org/junit/jupiter/api/extension/ExtendWith.java  | 3 +++
 .../org/junit/jupiter/api/extension/RegisterExtension.java     | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
index dbee47c2c483..1030887ac384 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtendWith.java
@@ -76,10 +76,13 @@
  * <li>{@link AfterTestExecutionCallback}</li>
  * <li>{@link TestInstanceFactory}</li>
  * <li>{@link TestInstancePostProcessor}</li>
+ * <li>{@link TestInstancePreConstructCallback}</li>
  * <li>{@link TestInstancePreDestroyCallback}</li>
  * <li>{@link ParameterResolver}</li>
+ * <li>{@link LifecycleMethodExecutionExceptionHandler}</li>
  * <li>{@link TestExecutionExceptionHandler}</li>
  * <li>{@link TestTemplateInvocationContextProvider}</li>
+ * <li>{@link TestWatcher}</li>
  * </ul>
  *
  * @since 5.0
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
index c3f89728f385..16c51bfd397d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/RegisterExtension.java
@@ -124,8 +124,10 @@
  * <li>{@link AfterTestExecutionCallback}</li>
  * <li>{@link TestInstanceFactory}</li>
  * <li>{@link TestInstancePostProcessor}</li>
+ * <li>{@link TestInstancePreConstructCallback}</li>
  * <li>{@link TestInstancePreDestroyCallback}</li>
  * <li>{@link ParameterResolver}</li>
+ * <li>{@link LifecycleMethodExecutionExceptionHandler}</li>
  * <li>{@link TestExecutionExceptionHandler}</li>
  * <li>{@link TestTemplateInvocationContextProvider}</li>
  * <li>{@link TestWatcher}</li>

From 57d63ad0e47c13f79cf8f7eff49e6ef646649319 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 5 May 2023 14:26:56 +0200
Subject: [PATCH 1267/1433] Polishing

---
 .../OpenTest4JAndJUnit4AwareThrowableCollectorTests.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
index a3b492b8e254..a22b9f33683d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/support/OpenTest4JAndJUnit4AwareThrowableCollectorTests.java
@@ -95,7 +95,7 @@ private void doWithCustomClassLoader(ClassLoader classLoader, Executable executa
 
 	private static class TestClassLoader extends URLClassLoader {
 
-		private static URL[] CLASSPATH_URLS = new URL[] {
+		private static final URL[] CLASSPATH_URLS = new URL[] {
 				OpenTest4JAndJUnit4AwareThrowableCollector.class.getProtectionDomain().getCodeSource().getLocation() };
 
 		private final boolean simulateJUnit4Missing;

From 401c81a38cf12328a0d32c3213d41ec45c14ce1f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 5 May 2023 15:33:09 +0200
Subject: [PATCH 1268/1433] Polish TempDirFactory support

---
 .../org/junit/jupiter/api/io/TempDir.java     | 10 ++++---
 .../junit/jupiter/api/io/TempDirFactory.java  | 28 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 01a7be31dc51..13a94f78c0bb 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -100,19 +100,21 @@
 	/**
 	 * Factory for the temporary directory.
 	 *
-	 * <p>If {@value #SCOPE_PROPERTY_NAME} is set to {@code per_context}, no
-	 * custom factory is allowed.
+	 * <p>If the {@value #SCOPE_PROPERTY_NAME} configuration parameter is set to
+	 * {@code per_context}, no custom factory is allowed.
 	 *
-	 * @return the class instance of the factory
+	 * <p>Defaults to {@link TempDirFactory.Standard}.
 	 *
+	 * @return the type of {@code TempDirFactory} to use
 	 * @since 5.10
+	 * @see TempDirFactory
 	 */
 	@API(status = EXPERIMENTAL, since = "5.10")
 	Class<? extends TempDirFactory> factory() default Standard.class;
 
 	/**
 	 * Property name used to set the scope of temporary directories created via
-	 * {@link TempDir @TempDir} annotation: {@value}
+	 * the {@link TempDir @TempDir} annotation: {@value}
 	 *
 	 * <h4>Supported Values</h4>
 	 * <ul>
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
index 1f6958257a20..3ee97de2e251 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.FileAttribute;
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -25,15 +24,14 @@
  * {@code TempDirFactory} defines the SPI for creating temporary directories
  * programmatically.
  *
- * <p>A temporary directory factory is typically used to gain more control on
- * the temporary directory creation, like defining the parent directory or even
- * the file system that should be used.
+ * <p>A temporary directory factory is typically used to gain control over the
+ * temporary directory creation, like defining the parent directory or the file
+ * system that should be used.
  *
  * <p>Concrete implementations must have a <em>default constructor</em>.
  *
- * <p>A {@link TempDirFactory} can be configured <em>locally</em>
- * for a test class field or method parameter via the {@link TempDir @TempDir}
- * annotation.
+ * <p>A {@link TempDirFactory} can be configured <em>locally</em> for a test class
+ * field or method parameter via the {@link TempDir @TempDir} annotation.
  *
  * @since 5.10
  * @see TempDir @TempDir
@@ -43,12 +41,14 @@
 public interface TempDirFactory extends Closeable {
 
 	/**
-	 * Create a new temporary directory, using the given prefix to generate its name.
-	 * Depending on the implementation, the resulting {@code Path} may or may not be
-	 * associated with the default {@code FileSystem}.
+	 * Create a new temporary directory.
+	 *
+	 * <p>Depending on the implementation, the resulting {@link Path} may or may
+	 * not be associated with the {@link java.nio.file.FileSystems#getDefault()
+	 * default FileSystem}.
 	 *
 	 * @param context the current extension context; never {@code null}
-	 * @return the path to the newly created directory that did not exist before this method was invoked; never {@code null}
+	 * @return the path to the newly created temporary directory; never {@code null}
 	 * @throws Exception in case of failures
 	 */
 	Path createTempDirectory(ExtensionContext context) throws Exception;
@@ -61,10 +61,10 @@ default void close() throws IOException {
 	}
 
 	/**
-	 * Standard temporary directory factory that delegates to
-	 * {@link Files#createTempDirectory}.
+	 * Standard {@link TempDirFactory} implementation which delegates to
+	 * {@link Files#createTempDirectory} using {@code "junit"} as the prefix.
 	 *
-	 * @see Files#createTempDirectory(String, FileAttribute[])
+	 * @see Files#createTempDirectory(java.lang.String, java.nio.file.attribute.FileAttribute[])
 	 */
 	class Standard implements TempDirFactory {
 

From 903c2a5bf1626e2a9bd806b8b1a10e78a904963e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 5 May 2023 15:43:09 +0200
Subject: [PATCH 1269/1433] Polishing

---
 .../engine/extension/TempDirectoryPerDeclarationTests.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index fe4a9a90a5f3..0662cc2e4827 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -1171,6 +1171,7 @@ public Path createTempDirectory(ExtensionContext context) throws Exception {
 			@Override
 			public void close() throws IOException {
 				fileSystem.close();
+				fileSystem = null;
 			}
 		}
 
@@ -1197,6 +1198,7 @@ public Path createTempDirectory(ExtensionContext context) throws Exception {
 			@Override
 			public void close() throws IOException {
 				fileSystem.close();
+				fileSystem = null;
 			}
 		}
 

From da6a0cae9beff18227c2dd21a12cd490c7bcfd92 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 5 May 2023 16:13:13 +0200
Subject: [PATCH 1270/1433] Use ClassLoader from Class in
 ReflectionUtils.loadRequiredParameterType()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, the loadRequiredParameterType() method in
ReflectionUtils used tryToLoad(String) to load the class for the
specified parameter type name via the "default" ClassLoader. For
standard ClassLoader arrangements this works fine; however, for more
complex ClassLoader arrangements – such as those used in OSGi – loading
the parameter type via the default ClassLoader may fail.

For example, DiscoverySelectors.selectMethod(Class<?>, String, String)
would previously fail to select the specified method if the parameter
types could not be loaded using the default ClassLoader.

To address that issue, this commit modifies loadRequiredParameterType()
so that it uses the tryToLoad(String, ClassLoader) variant, specifying
a ClassLoader that is more likely to be able to load the parameter type.

Specifically, the ClassLoader for the supplied Class is used.
Alternatively, if that ClassLoader is null (for example, because the
Class represents a primitive type or void), then
ClassLoaderUtils.getDefaultClassLoader() is used to obtain the
"default" ClassLoader (which is effectively a fallback to the original
behavior).

Co-authored-by: kriegfrj <fr.jkrieg@greekwelfaresa.org.au>
Closes #2104
---
 .../release-notes-5.10.0-M1.adoc              |  6 +++
 .../commons/support/ReflectionSupport.java    |  5 +++
 .../commons/util/ReflectionUtils.java         |  7 +++-
 .../commons/util/ReflectionUtilsTests.java    | 42 +++++++++++++++++++
 .../commons/util/classes/CustomType.java      | 21 ++++++++++
 5 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 platform-tests/src/test/java/org/junit/platform/commons/util/classes/CustomType.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 859021071a76..14d07a5f068c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -30,6 +30,12 @@ repository on GitHub.
   `@Suite` and related annotations, and others.
 * All utility methods in `ReflectionSupport` that return a `List` now have counterparts
   which return a `Stream`.
+* `ReflectionSupport.findMethod(Class<?>, String, String)` now uses the `ClassLoader` of
+  the supplied `Class` to load parameter types instead of using the _default_
+  `ClassLoader`. This allows parameter types to be resolved in non-standard `ClassLoader`
+  arrangements (such as OSGi). Consequently,
+  `DiscoverySelectors.selectMethod(Class<?>, String, String)` also now works properly in
+  non-standard `ClassLoader` arrangements.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
   started/finished and opened/closed events are now invoked using "wrapping" semantics.
   This means that finished/closed event methods are invoked in reverse order compared to
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
index dffe8ea5033b..6b6c98d3d055 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
@@ -351,6 +351,11 @@ public static Try<Object> tryToReadFieldValue(Field field, Object instance) {
 	 * interface and traversing up the type hierarchy until such a method is
 	 * found or the type hierarchy is exhausted.
 	 *
+	 * <p>As of JUnit Platform 1.10, this method uses the {@link ClassLoader} of
+	 * the supplied {@code clazz} to load parameter types instead of using the
+	 * <em>default</em> {@code ClassLoader}, which allows parameter types to be
+	 * resolved in different {@code ClassLoader} arrangements.
+	 *
 	 * <p>The algorithm does not search for methods in {@link java.lang.Object}.
 	 *
 	 * @param clazz the class or interface in which to find the method; never {@code null}
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 71d51d53463f..c33f514f35a9 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -1375,8 +1375,13 @@ private static Class<?>[] resolveParameterTypes(Class<?> clazz, String methodNam
 	}
 
 	private static Class<?> loadRequiredParameterType(Class<?> clazz, String methodName, String typeName) {
+		ClassLoader classLoader = clazz.getClassLoader();
+		if (classLoader == null) {
+			classLoader = ClassLoaderUtils.getDefaultClassLoader();
+		}
+
 		// @formatter:off
-		return tryToLoadClass(typeName)
+		return tryToLoadClass(typeName, classLoader)
 				.getOrThrow(cause -> new JUnitException(
 						String.format("Failed to load parameter type [%s] for method [%s] in class [%s].",
 								typeName, methodName, clazz.getName()), cause));
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index d667bce7767b..eac7ddf60780 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -70,6 +70,7 @@
 import org.junit.platform.commons.util.ReflectionUtilsTests.OuterClass.StaticNestedClass;
 import org.junit.platform.commons.util.ReflectionUtilsTests.OuterClass.StaticNestedSiblingClass;
 import org.junit.platform.commons.util.ReflectionUtilsTests.OuterClassImplementingInterface.InnerClassImplementingInterface;
+import org.junit.platform.commons.util.classes.CustomType;
 
 /**
  * Unit tests for {@link ReflectionUtils}.
@@ -1023,6 +1024,33 @@ void findMethodByParameterNamesWithMultidimensionalObjectArrayParameter() throws
 		assertFindMethodByParameterNames("methodWithMultidimensionalObjectArray", Double[][][][][].class);
 	}
 
+	/**
+	 * @since 5.10
+	 */
+	@Test
+	void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() throws Exception {
+		var methodName = "customMethod";
+		var customTypeName = CustomType.class.getName();
+		var nestedTypeName = CustomType.NestedType.class.getName();
+
+		try (CustomTypeClassLoader customTypeClassLoader = new CustomTypeClassLoader()) {
+			var customType = customTypeClassLoader.loadClass(customTypeName);
+
+			var optional = findMethod(customType, methodName, nestedTypeName);
+			assertThat(optional).get().satisfies(method -> {
+				assertThat(method.getName()).isEqualTo(methodName);
+
+				var declaringClass = method.getDeclaringClass();
+				assertThat(declaringClass.getName()).isEqualTo(customTypeName);
+				assertThat(declaringClass).isNotEqualTo(CustomType.class);
+
+				var parameterTypes = method.getParameterTypes();
+				assertThat(parameterTypes).extracting(Class::getName).containsExactly(nestedTypeName);
+				assertThat(parameterTypes[0].getClass()).isNotEqualTo(CustomType.NestedType.class);
+			});
+		}
+	}
+
 	@Test
 	void findMethodByParameterNamesWithParameterizedMapParameter() throws Exception {
 		var methodName = "methodWithParameterizedMap";
@@ -1903,4 +1931,18 @@ private static class ClassWithTwoConstructors {
 		}
 	}
 
+	private static class CustomTypeClassLoader extends URLClassLoader {
+
+		CustomTypeClassLoader() {
+			super(new URL[] { CustomTypeClassLoader.class.getProtectionDomain().getCodeSource().getLocation() },
+				getSystemClassLoader());
+		}
+
+		@Override
+		public Class<?> loadClass(String name) throws ClassNotFoundException {
+			return (name.startsWith(CustomType.class.getName()) ? findClass(name) : super.loadClass(name));
+		}
+
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/classes/CustomType.java b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/CustomType.java
new file mode 100644
index 000000000000..8a56cae42072
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/classes/CustomType.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.commons.util.classes;
+
+public class CustomType {
+
+	void customMethod(NestedType arg) {
+	}
+
+	public static class NestedType {
+	}
+
+}

From 6ca0cc6b2ca528a583fd450f0cf4da32076cebf5 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Sat, 6 May 2023 07:33:44 +0200
Subject: [PATCH 1271/1433] Fix typo in AnnotationBasedArgumentConverter
 Javadoc (#3283)

---
 .../params/converter/AnnotationBasedArgumentConverter.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
index fa67ae7c8d74..e86a1558d128 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
@@ -20,7 +20,7 @@
 import org.junit.platform.commons.util.Preconditions;
 
 /**
- * {@code SimpleArgumentConverter} is an abstract base class for
+ * {@code AnnotationBasedArgumentConverter} is an abstract base class for
  * {@link ArgumentConverter} implementations that also need to consume an
  * annotation in order to perform the conversion.
  *

From 75c0bd07fd8b7b6bab658c403cbad655e9764a08 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 6 May 2023 15:25:56 +0200
Subject: [PATCH 1272/1433] Introduce FilteringClassLoader as a reusable test
 fixture

---
 .../api/AssertThrowsAssertionsTests.java      | 21 ++----
 .../AssertThrowsExactlyAssertionsTests.java   | 21 ++----
 .../extension/TestInstanceFactoryTests.java   | 22 ++----
 .../commons/test/FilteringClassLoader.java    | 69 +++++++++++++++++++
 .../commons/util/ReflectionUtilsTests.java    | 18 +----
 5 files changed, 85 insertions(+), 66 deletions(-)
 create mode 100644 junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/FilteringClassLoader.java

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
index 7a807db61d55..a48dde45bd72 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
@@ -21,12 +21,12 @@
 
 import java.io.IOException;
 import java.io.Serial;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
+import java.util.function.Predicate;
 
 import org.junit.jupiter.api.function.Executable;
+import org.junit.platform.commons.test.FilteringClassLoader;
 import org.opentest4j.AssertionFailedError;
 
 /**
@@ -242,8 +242,9 @@ void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpected
 	@Test
 	@SuppressWarnings("unchecked")
 	void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoader() throws Exception {
-		try (EnigmaClassLoader enigmaClassLoader = new EnigmaClassLoader()) {
+		Predicate<String> classNameFilter = name -> EnigmaThrowable.class.getName().equals(name);
 
+		try (FilteringClassLoader enigmaClassLoader = new FilteringClassLoader(classNameFilter)) {
 			// Load expected exception type from different class loader
 			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) enigmaClassLoader.loadClass(
 				EnigmaThrowable.class.getName());
@@ -278,18 +279,4 @@ private static class LocalException extends RuntimeException {
 		private static final long serialVersionUID = 1L;
 	}
 
-	private static class EnigmaClassLoader extends URLClassLoader {
-
-		EnigmaClassLoader() {
-			super(new URL[] { EnigmaClassLoader.class.getProtectionDomain().getCodeSource().getLocation() },
-				getSystemClassLoader());
-		}
-
-		@Override
-		public Class<?> loadClass(String name) throws ClassNotFoundException {
-			return (EnigmaThrowable.class.getName().equals(name) ? findClass(name) : super.loadClass(name));
-		}
-
-	}
-
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
index 79c1f32876d8..d1ae89147b49 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
@@ -21,12 +21,12 @@
 
 import java.io.IOException;
 import java.io.Serial;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
+import java.util.function.Predicate;
 
 import org.junit.jupiter.api.function.Executable;
+import org.junit.platform.commons.test.FilteringClassLoader;
 import org.opentest4j.AssertionFailedError;
 
 /**
@@ -282,8 +282,9 @@ void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpected
 	@Test
 	@SuppressWarnings("unchecked")
 	void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoader() throws Exception {
-		try (EnigmaClassLoader enigmaClassLoader = new EnigmaClassLoader()) {
+		Predicate<String> classNameFilter = name -> EnigmaThrowable.class.getName().equals(name);
 
+		try (FilteringClassLoader enigmaClassLoader = new FilteringClassLoader(classNameFilter)) {
 			// Load expected exception type from different class loader
 			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) enigmaClassLoader.loadClass(
 				EnigmaThrowable.class.getName());
@@ -318,18 +319,4 @@ private static class LocalException extends RuntimeException {
 		private static final long serialVersionUID = 1L;
 	}
 
-	private static class EnigmaClassLoader extends URLClassLoader {
-
-		EnigmaClassLoader() {
-			super(new URL[] { EnigmaClassLoader.class.getProtectionDomain().getCodeSource().getLocation() },
-				getSystemClassLoader());
-		}
-
-		@Override
-		public Class<?> loadClass(String name) throws ClassNotFoundException {
-			return (EnigmaThrowable.class.getName().equals(name) ? findClass(name) : super.loadClass(name));
-		}
-
-	}
-
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
index b773e9eefbf6..171be279b380 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
@@ -25,11 +25,10 @@
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
 
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Predicate;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -45,6 +44,7 @@
 import org.junit.jupiter.api.extension.TestInstanceFactoryContext;
 import org.junit.jupiter.api.extension.TestInstantiationException;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.platform.commons.test.FilteringClassLoader;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
@@ -695,7 +695,9 @@ public Object createTestInstance(TestInstanceFactoryContext factoryContext, Exte
 			String className = testClass.getName();
 			instantiated(getClass(), testClass);
 
-			try (ProxyClassLoader proxyClassLoader = new ProxyClassLoader()) {
+			Predicate<String> classNameFilter = name -> name.startsWith(TestInstanceFactoryTests.class.getName());
+
+			try (FilteringClassLoader proxyClassLoader = new FilteringClassLoader(classNameFilter)) {
 				// Load test class from different class loader
 				Class<?> clazz = proxyClassLoader.loadClass(className);
 				return ReflectionUtils.newInstance(clazz);
@@ -706,20 +708,6 @@ public Object createTestInstance(TestInstanceFactoryContext factoryContext, Exte
 		}
 	}
 
-	private static class ProxyClassLoader extends URLClassLoader {
-
-		ProxyClassLoader() {
-			super(new URL[] { ProxyClassLoader.class.getProtectionDomain().getCodeSource().getLocation() },
-				getSystemClassLoader());
-		}
-
-		@Override
-		public Class<?> loadClass(String name) throws ClassNotFoundException {
-			return (name.startsWith(TestInstanceFactoryTests.class.getName()) ? findClass(name)
-					: super.loadClass(name));
-		}
-	}
-
 	private static boolean instantiated(Class<? extends TestInstanceFactory> factoryClass, Class<?> testClass) {
 		return callSequence.add(factoryClass.getSimpleName() + " instantiated: " + testClass.getSimpleName());
 	}
diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/FilteringClassLoader.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/FilteringClassLoader.java
new file mode 100644
index 000000000000..7422b74f0b0b
--- /dev/null
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/FilteringClassLoader.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.commons.test;
+
+import java.lang.StackWalker.Option;
+import java.lang.StackWalker.StackFrame;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.CodeSource;
+import java.util.function.Predicate;
+
+import org.junit.platform.commons.util.ClassLoaderUtils;
+
+/**
+ * Custom {@link ClassLoader} which accepts a class name {@link Predicate} to
+ * filter classes that should be loaded by this {@code ClassLoader} instead of
+ * the {@linkplain ClassLoaderUtils#getDefaultClassLoader() default ClassLoader}.
+ *
+ * <p>This class loader is only suitable for specific testing scenarios, where
+ * you need to load particular classes from a different class loader.
+ *
+ * @since 5.10
+ */
+public class FilteringClassLoader extends URLClassLoader {
+
+	private static final Predicate<Class<?>> notFilteringClassLoader = //
+		clazz -> !clazz.equals(FilteringClassLoader.class);
+
+	private final Predicate<String> classNameFilter;
+
+	public FilteringClassLoader(Predicate<String> classNameFilter) {
+		super(new URL[] { getCodeSourceUrl() }, ClassLoaderUtils.getDefaultClassLoader());
+
+		this.classNameFilter = classNameFilter;
+	}
+
+	@Override
+	public Class<?> loadClass(String name) throws ClassNotFoundException {
+		return (this.classNameFilter.test(name) ? findClass(name) : super.loadClass(name));
+	}
+
+	/**
+	 * Get the {@link CodeSource} {@link URL} of the class that instantiated the
+	 * {@code FilteringClassLoader}.
+	 */
+	private static URL getCodeSourceUrl() {
+		StackWalker walker = StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE);
+
+		// @formatter:off
+		Class<?> callerClass = walker.walk(stream -> stream
+				.map(StackFrame::getDeclaringClass)
+				.filter(notFilteringClassLoader)
+				.findFirst()
+				.get()
+			);
+		// @formatter:on
+
+		return callerClass.getProtectionDomain().getCodeSource().getLocation();
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index eac7ddf60780..94a0de91e35f 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -58,6 +58,7 @@
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.logging.LogRecordListener;
+import org.junit.platform.commons.test.FilteringClassLoader;
 import org.junit.platform.commons.util.ReflectionUtilsTests.ClassWithNestedClasses.Nested1;
 import org.junit.platform.commons.util.ReflectionUtilsTests.ClassWithNestedClasses.Nested2;
 import org.junit.platform.commons.util.ReflectionUtilsTests.ClassWithNestedClasses.Nested3;
@@ -1032,8 +1033,9 @@ void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() thro
 		var methodName = "customMethod";
 		var customTypeName = CustomType.class.getName();
 		var nestedTypeName = CustomType.NestedType.class.getName();
+		Predicate<String> classNameFilter = name -> name.startsWith(customTypeName);
 
-		try (CustomTypeClassLoader customTypeClassLoader = new CustomTypeClassLoader()) {
+		try (FilteringClassLoader customTypeClassLoader = new FilteringClassLoader(classNameFilter)) {
 			var customType = customTypeClassLoader.loadClass(customTypeName);
 
 			var optional = findMethod(customType, methodName, nestedTypeName);
@@ -1931,18 +1933,4 @@ private static class ClassWithTwoConstructors {
 		}
 	}
 
-	private static class CustomTypeClassLoader extends URLClassLoader {
-
-		CustomTypeClassLoader() {
-			super(new URL[] { CustomTypeClassLoader.class.getProtectionDomain().getCodeSource().getLocation() },
-				getSystemClassLoader());
-		}
-
-		@Override
-		public Class<?> loadClass(String name) throws ClassNotFoundException {
-			return (name.startsWith(CustomType.class.getName()) ? findClass(name) : super.loadClass(name));
-		}
-
-	}
-
 }

From 566a3ab7769515855b84bd425a36462b34d9b0ae Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 6 May 2023 15:44:06 +0200
Subject: [PATCH 1273/1433] Move version check to included build

Since it is evaluated first.

Resolves #3281.
---
 gradle/plugins/settings.gradle.kts | 6 ++++++
 settings.gradle.kts                | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
index 411d60f787dc..0b948c46d94f 100644
--- a/gradle/plugins/settings.gradle.kts
+++ b/gradle/plugins/settings.gradle.kts
@@ -1,3 +1,9 @@
+val expectedJavaVersion = JavaVersion.VERSION_17
+val actualJavaVersion = JavaVersion.current()
+require(actualJavaVersion == expectedJavaVersion) {
+	"The JUnit 5 build must be executed with Java ${expectedJavaVersion.majorVersion}. Currently executing with Java ${actualJavaVersion.majorVersion}."
+}
+
 dependencyResolutionManagement {
 	versionCatalogs {
 		create("libs") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6b20013500bb..8ae205fbcbeb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -72,12 +72,6 @@ buildCache {
 	}
 }
 
-val expectedJavaVersion = JavaVersion.VERSION_17
-val actualJavaVersion = JavaVersion.current()
-require(actualJavaVersion == expectedJavaVersion) {
-	"The JUnit 5 build must be executed with Java ${expectedJavaVersion.majorVersion}. Currently executing with Java ${actualJavaVersion.majorVersion}."
-}
-
 rootProject.name = "junit5"
 
 include("documentation")

From 2c1c1fac33b9f512388520feced9441e59831ffc Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Sat, 6 May 2023 15:55:35 +0200
Subject: [PATCH 1274/1433] Add `junit.jupiter.tempdir.factory.default`
 configuration property

You can use the `junit.jupiter.tempdir.factory.default` configuration
parameter to specify the fully qualified class name of the
`TempDirFactory` you would like to use by default. Just like for
factories configured via the `factory` attribute of the `@TempDir`
annotation, the supplied class has to implement the `TempDirFactory`
interface. The default factory will be used for all `@TempDir`
annotations unless the `factory` attribute of the annotation specifies
a different factory.

In summary, the factory for a temporary directory is determined
according to the following precedence rules:

1. The `factory` attribute of the `@TempDir` annotation, if present
2. The default `TempDirFactory` configured via the configuration
   parameter, if present
3. Otherwise, `org.junit.jupiter.api.io.TempDirFactory$Standard` will be
   used.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
Co-authored-by: Sam Brannen <sam@sambrannen.com>
---
 .../release-notes-5.10.0-M1.adoc              |  2 +
 .../asciidoc/user-guide/writing-tests.adoc    | 16 ++++
 .../org/junit/jupiter/api/io/TempDir.java     | 26 +++++-
 .../junit/jupiter/api/io/TempDirFactory.java  |  7 +-
 .../org/junit/jupiter/engine/Constants.java   | 10 ++
 .../config/CachingJupiterConfiguration.java   | 10 ++
 .../config/DefaultJupiterConfiguration.java   | 13 +++
 ...iatingConfigurationParameterConverter.java | 15 ++-
 .../engine/config/JupiterConfiguration.java   |  4 +
 .../engine/extension/TempDirectory.java       | 91 +++++++++---------
 .../CachingJupiterConfigurationTests.java     | 14 +++
 .../DefaultJupiterConfigurationTests.java     | 36 +++++++
 .../extension/CloseablePathCleanupTests.java  |  5 +-
 .../TempDirectoryPerContextTests.java         | 71 +++++++++++++-
 .../TempDirectoryPerDeclarationTests.java     | 93 +++++++++++++++++++
 15 files changed, 355 insertions(+), 58 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 14d07a5f068c..9a11fb59b7fa 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -106,6 +106,8 @@ repository on GitHub.
   temporary directories. See the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
+* New `junit.jupiter.tempdir.factory.default` configuration parameter to set the default
+  `TempDirFactory` for temporary directories.
 * If `@MethodSource` is used with a non-static factory method that should be `static`, the
   exception thrown now provides the user a meaningful explanation of how to address the
   problem.
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 9b355fce57cc..cdbba94357ca 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2643,3 +2643,19 @@ temporary directory. The following example shows how to do it.
 ----
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_factory_jimfs]
 ----
+
+You can use the `junit.jupiter.tempdir.factory.default`
+<<running-tests-config-params, configuration parameter>> to specify the fully qualified
+class name of the `TempDirFactory` you would like to use by default. Just like for
+factories configured via the `factory` attribute of the `@TempDir` annotation,
+the supplied class has to implement the `TempDirFactory` interface. The default factory
+will be used for all `@TempDir` annotations unless the `factory` attribute of the
+annotation specifies a different factory.
+
+In summary, the factory for a temporary directory is determined according to the
+following precedence rules:
+
+1. The `factory` attribute of the `@TempDir` annotation, if present
+2. The default `TempDirFactory` configured via the configuration
+parameter, if present
+3. Otherwise, `org.junit.jupiter.api.io.TempDirFactory$Standard` will be used.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 13a94f78c0bb..2a39549fd82d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -26,7 +26,6 @@
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
-import org.junit.jupiter.api.io.TempDirFactory.Standard;
 
 /**
  * {@code @TempDir} can be used to annotate a field in a test class or a
@@ -97,6 +96,22 @@
 @API(status = STABLE, since = "5.10")
 public @interface TempDir {
 
+	/**
+	 * Property name used to set the default temporary directory factory class name:
+	 * {@value}
+	 *
+	 * <h4>Supported Values</h4>
+	 *
+	 * <p>Supported values include fully qualified class names for types that
+	 * implement {@link TempDirFactory}.
+	 *
+	 * <p>If not specified, the default is {@link TempDirFactory.Standard}.
+	 *
+	 * @since 5.10
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
+	String DEFAULT_FACTORY_PROPERTY_NAME = "junit.jupiter.tempdir.factory.default";
+
 	/**
 	 * Factory for the temporary directory.
 	 *
@@ -105,12 +120,19 @@
 	 *
 	 * <p>Defaults to {@link TempDirFactory.Standard}.
 	 *
+	 * <p>As an alternative to setting this attribute, a global
+	 * {@link TempDirFactory} can be configured for the entire test suite via
+	 * the {@value #DEFAULT_FACTORY_PROPERTY_NAME} configuration parameter.
+	 * See the User Guide for details. Note, however, that a {@code @TempDir}
+	 * declaration with a custom {@code factory} always overrides a global
+	 * {@code TempDirFactory}.
+	 *
 	 * @return the type of {@code TempDirFactory} to use
 	 * @since 5.10
 	 * @see TempDirFactory
 	 */
 	@API(status = EXPERIMENTAL, since = "5.10")
-	Class<? extends TempDirFactory> factory() default Standard.class;
+	Class<? extends TempDirFactory> factory() default TempDirFactory.class;
 
 	/**
 	 * Property name used to set the scope of temporary directories created via
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
index 3ee97de2e251..910daec3e44a 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
@@ -30,8 +30,11 @@
  *
  * <p>Concrete implementations must have a <em>default constructor</em>.
  *
- * <p>A {@link TempDirFactory} can be configured <em>locally</em> for a test class
- * field or method parameter via the {@link TempDir @TempDir} annotation.
+ * <p>A {@link TempDirFactory} can be configured <em>globally</em> for the
+ * entire test suite via the {@value TempDir#DEFAULT_FACTORY_PROPERTY_NAME}
+ * configuration parameter (see the User Guide for details) or <em>locally</em>
+ * for a test class field or method parameter via the {@link TempDir @TempDir}
+ * annotation.
  *
  * @since 5.10
  * @see TempDir @TempDir
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index fbde0fc1184c..f4e4dc9ca631 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -359,6 +359,16 @@ public final class Constants {
 	@API(status = EXPERIMENTAL, since = "5.9")
 	public static final String DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME = Timeout.DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME;
 
+	/**
+	 * Property name used to set the default factory for temporary directories created via
+	 * {@link TempDir @TempDir} annotation: {@value}
+	 *
+	 * @since 5.10
+	 * @see TempDir#DEFAULT_FACTORY_PROPERTY_NAME
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
+	public static final String DEFAULT_TEMP_DIR_FACTORY_PROPERTY_NAME = TempDir.DEFAULT_FACTORY_PROPERTY_NAME;
+
 	private Constants() {
 		/* no-op */
 	}
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
index ebf547344bdc..2d61b58c1c32 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java
@@ -12,11 +12,13 @@
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.jupiter.api.io.TempDir.DEFAULT_CLEANUP_MODE_PROPERTY_NAME;
+import static org.junit.jupiter.api.io.TempDir.DEFAULT_FACTORY_PROPERTY_NAME;
 
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.ClassOrderer;
@@ -25,6 +27,7 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.io.CleanupMode;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
 /**
@@ -115,4 +118,11 @@ public CleanupMode getDefaultTempDirCleanupMode() {
 			key -> delegate.getDefaultTempDirCleanupMode());
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Supplier<TempDirFactory> getDefaultTempDirFactorySupplier() {
+		return (Supplier<TempDirFactory>) cache.computeIfAbsent(DEFAULT_FACTORY_PROPERTY_NAME,
+			key -> delegate.getDefaultTempDirFactorySupplier());
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
index ae8a4944904f..d64c4ceee318 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java
@@ -13,10 +13,12 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.jupiter.api.io.CleanupMode.ALWAYS;
 import static org.junit.jupiter.api.io.TempDir.DEFAULT_CLEANUP_MODE_PROPERTY_NAME;
+import static org.junit.jupiter.api.io.TempDir.DEFAULT_FACTORY_PROPERTY_NAME;
 
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.ClassOrderer;
@@ -25,6 +27,7 @@
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.io.CleanupMode;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.platform.commons.util.ClassNamePatternFilterUtils;
 import org.junit.platform.commons.util.Preconditions;
@@ -56,6 +59,9 @@ public class DefaultJupiterConfiguration implements JupiterConfiguration {
 	private static final EnumConfigurationParameterConverter<CleanupMode> cleanupModeConverter = //
 		new EnumConfigurationParameterConverter<>(CleanupMode.class, "cleanup mode");
 
+	private static final InstantiatingConfigurationParameterConverter<TempDirFactory> tempDirFactoryConverter = //
+		new InstantiatingConfigurationParameterConverter<>(TempDirFactory.class, "temp dir factory");
+
 	private final ConfigurationParameters configurationParameters;
 
 	public DefaultJupiterConfiguration(ConfigurationParameters configurationParameters) {
@@ -128,4 +134,11 @@ public CleanupMode getDefaultTempDirCleanupMode() {
 		return cleanupModeConverter.get(configurationParameters, DEFAULT_CLEANUP_MODE_PROPERTY_NAME, ALWAYS);
 	}
 
+	@Override
+	public Supplier<TempDirFactory> getDefaultTempDirFactorySupplier() {
+		Supplier<Optional<TempDirFactory>> supplier = tempDirFactoryConverter.supply(configurationParameters,
+			DEFAULT_FACTORY_PROPERTY_NAME);
+		return () -> supplier.get().orElse(TempDirFactory.Standard.INSTANCE);
+	}
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
index 7f77d47122ce..ddc5acd121f7 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverter.java
@@ -11,7 +11,9 @@
 package org.junit.jupiter.engine.config;
 
 import java.util.Optional;
+import java.util.function.Supplier;
 
+import org.junit.platform.commons.function.Try;
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -33,18 +35,23 @@ public InstantiatingConfigurationParameterConverter(Class<T> clazz, String name)
 	}
 
 	Optional<T> get(ConfigurationParameters configurationParameters, String key) {
+		return supply(configurationParameters, key).get();
+	}
+
+	Supplier<Optional<T>> supply(ConfigurationParameters configurationParameters, String key) {
 		// @formatter:off
 		return configurationParameters.get(key)
 				.map(String::trim)
 				.filter(className -> !className.isEmpty())
-				.flatMap(className -> newInstance(className, key));
+				.map(className -> newInstanceSupplier(className, key))
+				.orElse(Optional::empty);
 		// @formatter:on
 	}
 
-	private Optional<T> newInstance(String className, String key) {
+	private Supplier<Optional<T>> newInstanceSupplier(String className, String key) {
+		Try<Class<?>> clazz = ReflectionUtils.tryToLoadClass(className);
 		// @formatter:off
-		return ReflectionUtils.tryToLoadClass(className)
-				.andThenTry(ReflectionUtils::newInstance)
+		return () -> clazz.andThenTry(ReflectionUtils::newInstance)
 				.andThenTry(this.clazz::cast)
 				.ifSuccess(generator -> logSuccessMessage(className, key))
 				.ifFailure(cause -> logFailureMessage(className, key, cause))
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
index d0027c15e70b..559b4d7d5715 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.ClassOrderer;
@@ -23,6 +24,7 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.io.CleanupMode;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
@@ -66,4 +68,6 @@ public interface JupiterConfiguration {
 
 	CleanupMode getDefaultTempDirCleanupMode();
 
+	Supplier<TempDirFactory> getDefaultTempDirFactorySupplier();
+
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 3cd8a47fc4a2..d8dbdd3776a3 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -117,15 +117,17 @@ private void injectInstanceFields(ExtensionContext context, Object instance) {
 	private void injectFields(ExtensionContext context, Object testInstance, Class<?> testClass,
 			Predicate<Field> predicate) {
 
+		Scope scope = getScope(context);
+
 		findAnnotatedFields(testClass, TempDir.class, predicate).forEach(field -> {
 			assertNonFinalField(field);
 			assertSupportedType("field", field.getType());
 
 			try {
 				CleanupMode cleanupMode = determineCleanupModeForField(field);
-				TempDirFactory factory = getTempDirFactoryForField(field);
+				TempDirFactory factory = determineTempDirFactoryForField(field, scope);
 				makeAccessible(field).set(testInstance,
-					getPathOrFile(field, field.getType(), factory, cleanupMode, context));
+					getPathOrFile(field, field.getType(), factory, cleanupMode, scope, context));
 			}
 			catch (Throwable t) {
 				ExceptionUtils.throwAsUncheckedException(t);
@@ -156,8 +158,10 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 		Class<?> parameterType = parameterContext.getParameter().getType();
 		assertSupportedType("parameter", parameterType);
 		CleanupMode cleanupMode = determineCleanupModeForParameter(parameterContext);
-		TempDirFactory factory = getTempDirFactoryForParameter(parameterContext);
-		return getPathOrFile(parameterContext.getParameter(), parameterType, factory, cleanupMode, extensionContext);
+		Scope scope = getScope(extensionContext);
+		TempDirFactory factory = determineTempDirFactoryForParameter(parameterContext, scope);
+		return getPathOrFile(parameterContext.getParameter(), parameterType, factory, cleanupMode, scope,
+			extensionContext);
 	}
 
 	private CleanupMode determineCleanupModeForField(Field field) {
@@ -177,22 +181,40 @@ private CleanupMode determineCleanupMode(TempDir tempDir) {
 		return cleanupMode == DEFAULT ? this.configuration.getDefaultTempDirCleanupMode() : cleanupMode;
 	}
 
-	private TempDirFactory getTempDirFactoryForField(Field field) {
+	@SuppressWarnings("deprecation")
+	private Scope getScope(ExtensionContext context) {
+		return context.getRoot().getStore(NAMESPACE).getOrComputeIfAbsent( //
+			Scope.class, //
+			__ -> new EnumConfigurationParameterConverter<>(Scope.class, "@TempDir scope") //
+					.get(TempDir.SCOPE_PROPERTY_NAME, context::getConfigurationParameter, Scope.PER_DECLARATION), //
+			Scope.class //
+		);
+	}
+
+	private TempDirFactory determineTempDirFactoryForField(Field field, Scope scope) {
 		TempDir tempDir = findAnnotation(field, TempDir.class).orElseThrow(
 			() -> new JUnitException("Field " + field + " must be annotated with @TempDir"));
-		return getTempDirFactory(tempDir);
+		return determineTempDirFactory(tempDir, scope);
 	}
 
-	private TempDirFactory getTempDirFactoryForParameter(ParameterContext parameterContext) {
+	private TempDirFactory determineTempDirFactoryForParameter(ParameterContext parameterContext, Scope scope) {
 		TempDir tempDir = parameterContext.findAnnotation(TempDir.class).orElseThrow(() -> new JUnitException(
 			"Parameter " + parameterContext.getParameter() + " must be annotated with @TempDir"));
-		return getTempDirFactory(tempDir);
+		return determineTempDirFactory(tempDir, scope);
 	}
 
-	private static TempDirFactory getTempDirFactory(TempDir tempDir) {
+	@SuppressWarnings("deprecation")
+	private TempDirFactory determineTempDirFactory(TempDir tempDir, Scope scope) {
 		Class<? extends TempDirFactory> factory = tempDir.factory();
-		return factory == TempDirFactory.Standard.class //
-				? TempDirFactory.Standard.INSTANCE
+
+		if (factory != TempDirFactory.class && scope == Scope.PER_CONTEXT) {
+			throw new ExtensionConfigurationException("Custom @TempDir factory is not supported with "
+					+ TempDir.SCOPE_PROPERTY_NAME + "=" + Scope.PER_CONTEXT.name().toLowerCase() + ". Use "
+					+ TempDir.DEFAULT_FACTORY_PROPERTY_NAME + " instead.");
+		}
+
+		return factory == TempDirFactory.class //
+				? this.configuration.getDefaultTempDirFactorySupplier().get()
 				: ReflectionUtils.newInstance(factory);
 	}
 
@@ -209,16 +231,8 @@ private void assertSupportedType(String target, Class<?> type) {
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, TempDirFactory factory,
-			CleanupMode cleanupMode, ExtensionContext extensionContext) {
-		Scope scope = getScope(extensionContext);
-
-		if (scope == Scope.PER_CONTEXT && factory != TempDirFactory.Standard.INSTANCE) {
-			throw new ExtensionConfigurationException("Custom @TempDir factory is not supported with "
-					+ TempDir.SCOPE_PROPERTY_NAME + "=" + Scope.PER_CONTEXT.toString().toLowerCase());
-		}
-
+			CleanupMode cleanupMode, Scope scope, ExtensionContext extensionContext) {
 		Namespace namespace = scope == Scope.PER_DECLARATION //
 				? NAMESPACE.append(sourceElement) //
 				: NAMESPACE;
@@ -230,16 +244,6 @@ private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, Temp
 		return (type == Path.class) ? path : path.toFile();
 	}
 
-	@SuppressWarnings("deprecation")
-	private Scope getScope(ExtensionContext context) {
-		return context.getRoot().getStore(NAMESPACE).getOrComputeIfAbsent( //
-			Scope.class, //
-			__ -> new EnumConfigurationParameterConverter<>(Scope.class, "@TempDir scope") //
-					.get(TempDir.SCOPE_PROPERTY_NAME, context::getConfigurationParameter, Scope.PER_DECLARATION), //
-			Scope.class //
-		);
-	}
-
 	static CloseablePath createTempDir(TempDirFactory factory, CleanupMode cleanupMode,
 			ExtensionContext executionContext) {
 		try {
@@ -273,21 +277,24 @@ Path get() {
 
 		@Override
 		public void close() throws IOException {
-			if (cleanupMode == NEVER
-					|| (cleanupMode == ON_SUCCESS && executionContext.getExecutionException().isPresent())) {
-				logger.info(() -> "Skipping cleanup of temp dir " + dir + " due to cleanup mode configuration.");
-				return;
-			}
+			try {
+				if (cleanupMode == NEVER
+						|| (cleanupMode == ON_SUCCESS && executionContext.getExecutionException().isPresent())) {
+					logger.info(() -> "Skipping cleanup of temp dir " + dir + " due to cleanup mode configuration.");
+					return;
+				}
 
-			FileOperations fileOperations = executionContext.getStore(NAMESPACE) //
-					.getOrDefault(FILE_OPERATIONS_KEY, FileOperations.class, FileOperations.DEFAULT);
+				FileOperations fileOperations = executionContext.getStore(NAMESPACE) //
+						.getOrDefault(FILE_OPERATIONS_KEY, FileOperations.class, FileOperations.DEFAULT);
 
-			SortedMap<Path, IOException> failures = deleteAllFilesAndDirectories(fileOperations);
-			if (!failures.isEmpty()) {
-				throw createIOExceptionWithAttachedFailures(failures);
+				SortedMap<Path, IOException> failures = deleteAllFilesAndDirectories(fileOperations);
+				if (!failures.isEmpty()) {
+					throw createIOExceptionWithAttachedFailures(failures);
+				}
+			}
+			finally {
+				factory.close();
 			}
-
-			factory.close();
 		}
 
 		private SortedMap<Path, IOException> deleteAllFilesAndDirectories(FileOperations fileOperations)
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
index cb4f88f73b47..a978c1883900 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java
@@ -21,11 +21,13 @@
 
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.engine.descriptor.CustomDisplayNameGenerator;
 
@@ -123,6 +125,18 @@ void cachesDefaultTempDirCleanupMode() {
 		verify(delegate, only()).getDefaultTempDirCleanupMode();
 	}
 
+	@Test
+	void cachesDefaultTempDirFactorySupplier() {
+		Supplier<TempDirFactory> supplier = mock();
+		when(delegate.getDefaultTempDirFactorySupplier()).thenReturn(supplier);
+
+		// call `cache.getDefaultTempDirFactorySupplier()` twice to verify the delegate method is called only once.
+		assertThat(cache.getDefaultTempDirFactorySupplier()).isSameAs(supplier);
+		assertThat(cache.getDefaultTempDirFactorySupplier()).isSameAs(supplier);
+
+		verify(delegate, only()).getDefaultTempDirFactorySupplier();
+	}
+
 	@Test
 	void doesNotCacheRawParameters() {
 		when(delegate.getRawConfigurationParameter("foo")).thenReturn(Optional.of("bar")).thenReturn(
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
index 2592fe256b35..d6cfc1d41713 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
@@ -20,13 +20,17 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.nio.file.Path;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.io.CleanupMode;
+import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.engine.Constants;
 import org.junit.jupiter.engine.descriptor.CustomDisplayNameGenerator;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -108,6 +112,38 @@ void shouldGetNothingAsDefaultTestMethodOrderWithoutConfigParamSet() {
 		assertThat(defaultTestMethodOrder).isEmpty();
 	}
 
+	@Test
+	void shouldGetDefaultTempDirFactorySupplierWithConfigParamSet() {
+		ConfigurationParameters parameters = mock();
+		String key = Constants.DEFAULT_TEMP_DIR_FACTORY_PROPERTY_NAME;
+		when(parameters.get(key)).thenReturn(Optional.of(CustomFactory.class.getName()));
+		JupiterConfiguration configuration = new DefaultJupiterConfiguration(parameters);
+
+		Supplier<TempDirFactory> supplier = configuration.getDefaultTempDirFactorySupplier();
+
+		assertThat(supplier.get()).isInstanceOf(TempDirFactory.class);
+	}
+
+	private static class CustomFactory implements TempDirFactory {
+
+		@Override
+		public Path createTempDirectory(ExtensionContext context) {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	@Test
+	void shouldGetStandardAsDefaultTempDirFactorySupplierWithoutConfigParamSet() {
+		ConfigurationParameters parameters = mock();
+		String key = Constants.DEFAULT_TEMP_DIR_FACTORY_PROPERTY_NAME;
+		when(parameters.get(key)).thenReturn(Optional.empty());
+		JupiterConfiguration configuration = new DefaultJupiterConfiguration(parameters);
+
+		Supplier<TempDirFactory> supplier = configuration.getDefaultTempDirFactorySupplier();
+
+		assertThat(supplier.get()).isSameAs(TempDirFactory.Standard.INSTANCE);
+	}
+
 	private void assertDefaultConfigParam(String configValue, Lifecycle expected) {
 		ConfigurationParameters configParams = mock();
 		when(configParams.get(KEY)).thenReturn(Optional.ofNullable(configValue));
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index da549d491c99..43c5105047a2 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -36,7 +36,6 @@
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
-import org.mockito.Mockito;
 
 /**
  * Integration tests for cleanup of the {@link TempDirectory} when the {@link CleanupMode} is
@@ -84,7 +83,7 @@ void never() throws IOException {
 
 		closeablePath.close();
 		assertThat(closeablePath.get()).exists();
-		verify(factory, Mockito.never()).close();
+		verify(factory).close();
 	}
 
 	@Test
@@ -97,7 +96,7 @@ void onSuccessWithException() throws IOException {
 
 		closeablePath.close();
 		assertThat(closeablePath.get()).exists();
-		verify(factory, Mockito.never()).close();
+		verify(factory).close();
 	}
 
 	@Test
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index 9179d7c1a91f..baf537d9fd88 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -55,6 +55,7 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
@@ -67,13 +68,16 @@
 @DisplayName("TempDirectory extension (per context)")
 class TempDirectoryPerContextTests extends AbstractJupiterTestEngineTests {
 
-	@SuppressWarnings("deprecation")
 	@Override
 	protected EngineExecutionResults executeTestsForClass(Class<?> testClass) {
-		return executeTests(request() //
+		return executeTests(requestBuilder(testClass).build());
+	}
+
+	@SuppressWarnings("deprecation")
+	private static LauncherDiscoveryRequestBuilder requestBuilder(Class<?> testClass) {
+		return request() //
 				.selectors(selectClass(testClass)) //
-				.configurationParameter(TempDir.SCOPE_PROPERTY_NAME, TempDirectory.Scope.PER_CONTEXT.toString()) //
-				.build());
+				.configurationParameter(TempDir.SCOPE_PROPERTY_NAME, TempDirectory.Scope.PER_CONTEXT.toString());
 	}
 
 	@BeforeEach
@@ -287,6 +291,44 @@ void resolvesSeparateTempDirWhenAnnotationIsUsedOnAfterAllMethodParameterOnly()
 
 	}
 
+	@Nested
+	@DisplayName("supports default factory")
+	@TestMethodOrder(OrderAnnotation.class)
+	class DefaultFactory {
+
+		private EngineExecutionResults executeTestsForClassWithDefaultFactory(Class<?> testClass,
+				Class<? extends TempDirFactory> factoryClass) {
+			return TempDirectoryPerContextTests.super.executeTests(requestBuilder(testClass) //
+					.configurationParameter(TempDir.DEFAULT_FACTORY_PROPERTY_NAME, factoryClass.getName()) //
+					.build());
+		}
+
+		@Test
+		@DisplayName("set to Jupiter's default")
+		void supportsStandardDefaultFactory() {
+			executeTestsForClassWithDefaultFactory(StandardDefaultFactoryTestCase.class, TempDirFactory.Standard.class) //
+					.testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("set to custom factory")
+		void supportsCustomDefaultFactory() {
+			executeTestsForClassWithDefaultFactory(NonStandardDefaultFactoryTestCase.class, Factory.class) //
+					.testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws Exception {
+				return Files.createTempDirectory("junit");
+			}
+		}
+
+	}
+
 	@Nested
 	@DisplayName("reports failure")
 	@TestMethodOrder(OrderAnnotation.class)
@@ -360,7 +402,8 @@ void onlySupportsStandardTempDirFactory() {
 					message(m -> m.matches("Failed to resolve parameter \\[.+] in method \\[.+]: .+")),
 					cause(
 							instanceOf(ExtensionConfigurationException.class),
-							message("Custom @TempDir factory is not supported with junit.jupiter.tempdir.scope=per_context")));
+							message("Custom @TempDir factory is not supported with junit.jupiter.tempdir.scope=per_context. "
+									+ "Use junit.jupiter.tempdir.factory.default instead.")));
 			// @formatter:on
 		}
 
@@ -661,6 +704,24 @@ public Path createTempDirectory(ExtensionContext context) throws Exception {
 
 	}
 
+	static class StandardDefaultFactoryTestCase {
+
+		@Test
+		void test(@TempDir Path tempDir1, @TempDir Path tempDir2) {
+			assertSame(tempDir1, tempDir2);
+		}
+
+	}
+
+	static class NonStandardDefaultFactoryTestCase {
+
+		@Test
+		void test(@TempDir Path tempDir1, @TempDir Path tempDir2) {
+			assertSame(tempDir1, tempDir2);
+		}
+
+	}
+
 	static class AnnotationOnBeforeAllMethodParameterTestCase extends BaseSharedTempDirParameterInjectionTestCase {
 
 		@BeforeAll
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 0662cc2e4827..68253d8fef24 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -68,6 +69,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.api.io.TempDirFactory;
+import org.junit.jupiter.api.io.TempDirFactory.Standard;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.Constants;
 import org.junit.jupiter.engine.extension.TempDirectory.FileOperations;
@@ -345,6 +347,64 @@ void supportsFactoryWithJimfs() {
 
 	}
 
+	@Nested
+	@DisplayName("supports default factory")
+	@TestMethodOrder(OrderAnnotation.class)
+	class DefaultFactory {
+
+		private EngineExecutionResults executeTestsForClassWithDefaultFactory(Class<?> testClass,
+				Class<? extends TempDirFactory> factoryClass) {
+			return TempDirectoryPerDeclarationTests.super.executeTests(request() //
+					.selectors(selectClass(testClass)) //
+					.configurationParameter(TempDir.DEFAULT_FACTORY_PROPERTY_NAME, factoryClass.getName()) //
+					.build());
+		}
+
+		@Test
+		@DisplayName("set to Jupiter's default")
+		void supportsStandardDefaultFactory() {
+			executeTestsForClassWithDefaultFactory(StandardDefaultFactoryTestCase.class, Standard.class) //
+					.testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("set to custom factory")
+		void supportsCustomDefaultFactory() {
+			executeTestsForClassWithDefaultFactory(CustomDefaultFactoryTestCase.class, Factory.class) //
+					.testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("set to custom factory together with declaration of Jupiter's default")
+		void supportsCustomDefaultFactoryWithStandardFactoryOnDeclaration() {
+			executeTestsForClassWithDefaultFactory( //
+				CustomDefaultFactoryWithStandardDeclarationTestCase.class, Factory.class) //
+					.testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			private boolean closed;
+
+			@Override
+			public Path createTempDirectory(ExtensionContext context) throws Exception {
+				return Files.createTempDirectory("custom");
+			}
+
+			@Override
+			public void close() {
+				if (closed) {
+					throw new IllegalStateException("already closed");
+				}
+				closed = true;
+			}
+		}
+
+	}
+
 	private static void assertSingleFailedContainer(EngineExecutionResults results, Class<? extends Throwable> clazz,
 			String message) {
 
@@ -1204,4 +1264,37 @@ public void close() throws IOException {
 
 	}
 
+	static class StandardDefaultFactoryTestCase {
+
+		@Test
+		void test(@TempDir Path tempDir1, @TempDir Path tempDir2) {
+			assertNotSame(tempDir1, tempDir2);
+			assertThat(tempDir1.getFileName().toString()).startsWith("junit");
+			assertThat(tempDir2.getFileName().toString()).startsWith("junit");
+		}
+
+	}
+
+	static class CustomDefaultFactoryTestCase {
+
+		@Test
+		void test(@TempDir Path tempDir1, @TempDir Path tempDir2) {
+			assertNotSame(tempDir1, tempDir2);
+			assertThat(tempDir1.getFileName().toString()).startsWith("custom");
+			assertThat(tempDir2.getFileName().toString()).startsWith("custom");
+		}
+
+	}
+
+	static class CustomDefaultFactoryWithStandardDeclarationTestCase {
+
+		@Test
+		void test(@TempDir Path tempDir1, @TempDir(factory = Standard.class) Path tempDir2) {
+			assertNotSame(tempDir1, tempDir2);
+			assertThat(tempDir1.getFileName().toString()).startsWith("custom");
+			assertThat(tempDir2.getFileName().toString()).startsWith("junit");
+		}
+
+	}
+
 }

From 98612d2143e6048f2827be090a808a6d02e1781e Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 6 May 2023 22:01:37 +0800
Subject: [PATCH 1275/1433] Add Maven Central badges (#3217)

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 21d803d3ae4e..61f0b3fe31df 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,10 @@ consumption in other projects via the following command.
 
 ## Dependency Metadata
 
+[![JUnit Jupiter version](https://img.shields.io/maven-central/v/org.junit.jupiter/junit-jupiter/5..svg?color=25a162&label=Jupiter)](https://central.sonatype.com/search?namespace=org.junit.jupiter)
+[![JUnit Vintage version](https://img.shields.io/maven-central/v/org.junit.vintage/junit-vintage-engine/5..svg?color=25a162&label=Vintage)](https://central.sonatype.com/search?namespace=org.junit.vintage)
+[![JUnit Platform version](https://img.shields.io/maven-central/v/org.junit.platform/junit-platform-commons/1..svg?color=25a162&label=Platform)](https://central.sonatype.com/search?namespace=org.junit.platform)
+
 Consult the [Dependency Metadata] section of the [User Guide] for a list of all artifacts
 of the JUnit Platform, JUnit Jupiter, and JUnit Vintage.
 

From f3dd6bca8f2d786db4c77e15529d7c0159f77261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20B=C3=BCnger?= <Bukama@users.noreply.github.com>
Date: Sat, 6 May 2023 16:08:59 +0200
Subject: [PATCH 1276/1433] Create custom rouge theme (#3267)

The rouge code formatting themes are used by asciidoc, which is used to
create the user guide. But the default theme and all overs, except the
"bw" theme, will create low color contrast, which can be problematic
for people with visual restrictions.

Instead of using rouge's "bw" theme a custom theme was created to tackle
these issue, because using the "bw" theme there was no visual switch
between regular text and code examples.

The created theme is a light themes that solves all contrast errors in
the user guide. However it can't fix other accessibility problems of
the user guide, like missing link textes. Those other problems have to
be fixed seperately.

Resolves #3071.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 documentation/documentation.gradle.kts        |   2 +
 .../asciidoc/resources/themes/rouge_junit.rb  | 147 ++++++++++++++++++
 2 files changed, 149 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/resources/themes/rouge_junit.rb

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 947d80f8c99d..5167b3caf35e 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -66,6 +66,7 @@ asciidoctorj {
 		diagram.use()
 		pdf.version(libs.versions.asciidoctor.pdf)
 	}
+	requires(file("src/docs/asciidoc/resources/themes/rouge_junit.rb"))
 }
 
 val snapshot = rootProject.version.toString().contains("SNAPSHOT")
@@ -249,6 +250,7 @@ tasks {
 				"standaloneConsoleLauncherShadowedArtifactsFile" to standaloneConsoleLauncherShadowedArtifactsFile.get(),
 				"outdir" to outputDir.absolutePath,
 				"source-highlighter" to "rouge",
+				"rouge-style" to "junit",
 				"tabsize" to "4",
 				"toc" to "left",
 				"icons" to "font",
diff --git a/documentation/src/docs/asciidoc/resources/themes/rouge_junit.rb b/documentation/src/docs/asciidoc/resources/themes/rouge_junit.rb
new file mode 100644
index 000000000000..ec6a46109788
--- /dev/null
+++ b/documentation/src/docs/asciidoc/resources/themes/rouge_junit.rb
@@ -0,0 +1,147 @@
+require 'rouge' unless defined? ::Rouge.version
+
+module Rouge; module Themes
+
+  class JUnit < CSSTheme
+    name 'junit'
+
+     # This is an extension of the official "github" theme to remove accessibility issues in code blocks
+     # Primer primitives (https://github.com/primer/primitives/tree/main/src/tokens)
+    P_RED_0        = {:light => '#ffebe9', :dark => '#ffdcd7'}
+    P_RED_3        = {:dark => '#ff7b72'}
+    P_RED_5        = {:light => '#cf222e'}
+    P_RED_7        = {:light => '#82071e', :dark => '#8e1519'}
+    P_RED_8        = {:dark => '#67060c'}
+    P_ORANGE_2     = {:dark => '#ffa657'}
+    P_ORANGE_6     = {:light => '#953800'}
+    P_GREEN_0      = {:light => '#dafbe1', :dark => '#aff5b4'}
+    P_GREEN_1      = {:dark => '#7ee787'}
+    P_GREEN_6      = {:light => '#116329'}
+    P_GREEN_8      = {:dark => '#033a16'}
+    P_BLUE_1       = {:dark => '#a5d6ff'}
+    P_BLUE_2       = {:dark => '#79c0ff'}
+    P_BLUE_5       = {:dark => '#1f6feb'}
+    P_BLUE_6       = {:light => '#0550ae'}
+    P_BLUE_8       = {:light => '#0a3069'}
+    P_PURPLE_2     = {:dark => '#d2a8ff'}
+    P_PURPLE_5     = {:light => '#8250df'}
+    P_GRAY_0       = {:light => '#f6f8fa', :dark => '#f0f6fc'}
+    P_GRAY_1       = {:dark => '#c9d1d9'}
+    P_GRAY_3       = {:dark => '#8b949e'}
+    P_GRAY_5       = {:light => '#34383d'} # '#6e7781'
+    P_GRAY_8       = {:dark => '#161b22'}
+    P_GRAY_9       = {:light => '#24292f'}
+
+    extend HasModes
+
+    def self.light!
+     mode :dark # indicate that there is a dark variant
+     mode! :light
+    end
+
+    def self.dark!
+     mode :light # indicate that there is a light variant
+     mode! :dark
+    end
+
+    def self.make_dark!
+     palette :comment     => P_GRAY_3[@mode]
+     palette :constant    => P_BLUE_2[@mode]
+     palette :entity      => P_PURPLE_2[@mode]
+     palette :heading     => P_BLUE_5[@mode]
+     palette :keyword     => P_RED_3[@mode]
+     palette :string      => P_BLUE_1[@mode]
+     palette :tag         => P_GREEN_1[@mode]
+     palette :variable    => P_ORANGE_2[@mode]
+
+     palette :fgDefault   => P_GRAY_1[@mode]
+     palette :bgDefault   => P_GRAY_8[@mode]
+
+     palette :fgInserted  => P_GREEN_0[@mode]
+     palette :bgInserted  => P_GREEN_8[@mode]
+
+     palette :fgDeleted   => P_RED_0[@mode]
+     palette :bgDeleted   => P_RED_8[@mode]
+
+     palette :fgError     => P_GRAY_0[@mode]
+     palette :bgError     => P_RED_7[@mode]
+    end
+
+    def self.make_light!
+     palette :comment     => P_GRAY_5[@mode]
+     palette :constant    => P_BLUE_6[@mode]
+     palette :entity      => P_PURPLE_5[@mode]
+     palette :heading     => P_BLUE_6[@mode]
+     palette :keyword     => P_RED_5[@mode]
+     palette :string      => P_BLUE_8[@mode]
+     palette :tag         => P_GREEN_6[@mode]
+     palette :variable    => P_ORANGE_6[@mode]
+
+     palette :fgDefault   => P_GRAY_9[@mode]
+     palette :bgDefault   => P_GRAY_0[@mode]
+
+     palette :fgInserted  => P_GREEN_6[@mode]
+     palette :bgInserted  => P_GREEN_0[@mode]
+
+     palette :fgDeleted   => P_RED_7[@mode]
+     palette :bgDeleted   => P_RED_0[@mode]
+
+     palette :fgError     => P_GRAY_0[@mode]
+     palette :bgError     => P_RED_7[@mode]
+    end
+
+    light!
+
+    style Text,                       :fg => :fgDefault, :bg => :bgDefault
+
+    style Keyword,                    :fg => :keyword
+
+    style Generic::Error,             :fg => :fgError
+
+    style Generic::Deleted,           :fg => :fgDeleted, :bg => :bgDeleted
+
+    style Name::Builtin,
+         Name::Class,
+         Name::Constant,
+         Name::Namespace,            :fg => :variable
+
+    style Literal::String::Regex,
+         Name::Attribute,
+         Name::Tag,                  :fg => :tag
+
+    style Generic::Inserted,          :fg => :fgInserted, :bg => :bgInserted
+
+    style Keyword::Constant,
+         Literal,
+         Literal::String::Backtick,
+         Name::Builtin::Pseudo,
+         Name::Exception,
+         Name::Label,
+         Name::Property,
+         Name::Variable,
+         Operator,                   :fg => :constant
+
+    style Generic::Heading,
+         Generic::Subheading,        :fg => :heading, :bold => true
+
+    style Literal::String,            :fg => :string
+
+    style Name::Decorator,
+         Name::Function,             :fg => :entity
+
+    style Error,                      :fg => :fgError, :bg => :bgError
+
+    style Comment,
+         Generic::Lineno,
+         Generic::Traceback,         :fg => :comment
+
+    style Name::Entity,
+         Literal::String::Interpol,  :fg => :fgDefault
+
+    style Generic::Emph,              :fg => :fgDefault, :italic => true
+
+    style Generic::Strong,            :fg => :fgDefault, :bold => true
+
+  end
+end; end
+

From 552ce897849f53b36fcc8382624505a36dddcd0c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 6 May 2023 16:22:43 +0200
Subject: [PATCH 1277/1433] Fix GraalVmStarterTests

---
 .../projects/graalvm-starter/build.gradle.kts                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts b/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
index cd346c7f1ac5..26f76f8b874a 100644
--- a/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/graalvm-starter/build.gradle.kts
@@ -32,6 +32,7 @@ graalvmNative {
 	binaries {
 		named("test") {
 			buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig")
+			buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter")
 			buildArgs.add("-H:+ReportExceptionStackTraces")
 		}
 	}

From d66dcf60bc39cebc6d8fa85025581bd1fcceaec7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 6 May 2023 16:22:31 +0200
Subject: [PATCH 1278/1433] Rename FilteringClassLoader to TestClassLoader and
 improve API

---
 .../api/AssertThrowsAssertionsTests.java      |  7 ++--
 .../AssertThrowsExactlyAssertionsTests.java   |  7 ++--
 .../extension/TestInstanceFactoryTests.java   |  9 +++--
 ...gClassLoader.java => TestClassLoader.java} | 34 +++++++++++++++----
 .../commons/util/ReflectionUtilsTests.java    |  5 ++-
 5 files changed, 37 insertions(+), 25 deletions(-)
 rename junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/{FilteringClassLoader.java => TestClassLoader.java} (63%)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
index a48dde45bd72..73de6acbcefb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
@@ -23,10 +23,9 @@
 import java.io.Serial;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
-import java.util.function.Predicate;
 
 import org.junit.jupiter.api.function.Executable;
-import org.junit.platform.commons.test.FilteringClassLoader;
+import org.junit.platform.commons.test.TestClassLoader;
 import org.opentest4j.AssertionFailedError;
 
 /**
@@ -242,9 +241,7 @@ void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpected
 	@Test
 	@SuppressWarnings("unchecked")
 	void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoader() throws Exception {
-		Predicate<String> classNameFilter = name -> EnigmaThrowable.class.getName().equals(name);
-
-		try (FilteringClassLoader enigmaClassLoader = new FilteringClassLoader(classNameFilter)) {
+		try (TestClassLoader enigmaClassLoader = TestClassLoader.forClasses(EnigmaThrowable.class)) {
 			// Load expected exception type from different class loader
 			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) enigmaClassLoader.loadClass(
 				EnigmaThrowable.class.getName());
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
index d1ae89147b49..c8edc464a874 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
@@ -23,10 +23,9 @@
 import java.io.Serial;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
-import java.util.function.Predicate;
 
 import org.junit.jupiter.api.function.Executable;
-import org.junit.platform.commons.test.FilteringClassLoader;
+import org.junit.platform.commons.test.TestClassLoader;
 import org.opentest4j.AssertionFailedError;
 
 /**
@@ -282,9 +281,7 @@ void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpected
 	@Test
 	@SuppressWarnings("unchecked")
 	void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoader() throws Exception {
-		Predicate<String> classNameFilter = name -> EnigmaThrowable.class.getName().equals(name);
-
-		try (FilteringClassLoader enigmaClassLoader = new FilteringClassLoader(classNameFilter)) {
+		try (TestClassLoader enigmaClassLoader = TestClassLoader.forClasses(EnigmaThrowable.class)) {
 			// Load expected exception type from different class loader
 			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) enigmaClassLoader.loadClass(
 				EnigmaThrowable.class.getName());
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
index 171be279b380..9a89a1653032 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Predicate;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -44,7 +43,7 @@
 import org.junit.jupiter.api.extension.TestInstanceFactoryContext;
 import org.junit.jupiter.api.extension.TestInstantiationException;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
-import org.junit.platform.commons.test.FilteringClassLoader;
+import org.junit.platform.commons.test.TestClassLoader;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
@@ -693,11 +692,11 @@ private static class ProxyTestInstanceFactory implements TestInstanceFactory {
 		public Object createTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext extensionContext) {
 			Class<?> testClass = factoryContext.getTestClass();
 			String className = testClass.getName();
-			instantiated(getClass(), testClass);
+			String prefix = TestInstanceFactoryTests.class.getName();
 
-			Predicate<String> classNameFilter = name -> name.startsWith(TestInstanceFactoryTests.class.getName());
+			instantiated(getClass(), testClass);
 
-			try (FilteringClassLoader proxyClassLoader = new FilteringClassLoader(classNameFilter)) {
+			try (TestClassLoader proxyClassLoader = TestClassLoader.forClassNamePrefix(prefix)) {
 				// Load test class from different class loader
 				Class<?> clazz = proxyClassLoader.loadClass(className);
 				return ReflectionUtils.newInstance(clazz);
diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/FilteringClassLoader.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
similarity index 63%
rename from junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/FilteringClassLoader.java
rename to junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
index 7422b74f0b0b..239885fdeb7e 100644
--- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/FilteringClassLoader.java
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
@@ -15,12 +15,13 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.security.CodeSource;
+import java.util.Arrays;
 import java.util.function.Predicate;
 
 import org.junit.platform.commons.util.ClassLoaderUtils;
 
 /**
- * Custom {@link ClassLoader} which accepts a class name {@link Predicate} to
+ * Test {@link ClassLoader} which accepts a class name {@link Predicate} to
  * filter classes that should be loaded by this {@code ClassLoader} instead of
  * the {@linkplain ClassLoaderUtils#getDefaultClassLoader() default ClassLoader}.
  *
@@ -29,14 +30,33 @@
  *
  * @since 5.10
  */
-public class FilteringClassLoader extends URLClassLoader {
+public class TestClassLoader extends URLClassLoader {
 
-	private static final Predicate<Class<?>> notFilteringClassLoader = //
-		clazz -> !clazz.equals(FilteringClassLoader.class);
+	private static final Predicate<Class<?>> notTestClassLoader = clazz -> !clazz.equals(TestClassLoader.class);
 
 	private final Predicate<String> classNameFilter;
 
-	public FilteringClassLoader(Predicate<String> classNameFilter) {
+	/**
+	 * Create a {@link TestClassLoader} that filters the provided classes.
+	 *
+	 * @see #forClassNamePrefix(String)
+	 */
+	public static TestClassLoader forClasses(Class<?>... classes) {
+		Predicate<String> classNameFilter = name -> Arrays.stream(classes).map(Class::getName).anyMatch(name::equals);
+		return new TestClassLoader(classNameFilter);
+	}
+
+	/**
+	 * Create a {@link TestClassLoader} that filters classes whose fully
+	 * qualified names start with the provided prefix.
+	 *
+	 * @see #forClasses(Class...)
+	 */
+	public static TestClassLoader forClassNamePrefix(String prefix) {
+		return new TestClassLoader(name -> name.startsWith(prefix));
+	}
+
+	public TestClassLoader(Predicate<String> classNameFilter) {
 		super(new URL[] { getCodeSourceUrl() }, ClassLoaderUtils.getDefaultClassLoader());
 
 		this.classNameFilter = classNameFilter;
@@ -49,7 +69,7 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
 
 	/**
 	 * Get the {@link CodeSource} {@link URL} of the class that instantiated the
-	 * {@code FilteringClassLoader}.
+	 * {@code TestClassLoader}.
 	 */
 	private static URL getCodeSourceUrl() {
 		StackWalker walker = StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE);
@@ -57,7 +77,7 @@ private static URL getCodeSourceUrl() {
 		// @formatter:off
 		Class<?> callerClass = walker.walk(stream -> stream
 				.map(StackFrame::getDeclaringClass)
-				.filter(notFilteringClassLoader)
+				.filter(notTestClassLoader)
 				.findFirst()
 				.get()
 			);
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 94a0de91e35f..52bf8b442ba8 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -58,7 +58,7 @@
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.logging.LogRecordListener;
-import org.junit.platform.commons.test.FilteringClassLoader;
+import org.junit.platform.commons.test.TestClassLoader;
 import org.junit.platform.commons.util.ReflectionUtilsTests.ClassWithNestedClasses.Nested1;
 import org.junit.platform.commons.util.ReflectionUtilsTests.ClassWithNestedClasses.Nested2;
 import org.junit.platform.commons.util.ReflectionUtilsTests.ClassWithNestedClasses.Nested3;
@@ -1033,9 +1033,8 @@ void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() thro
 		var methodName = "customMethod";
 		var customTypeName = CustomType.class.getName();
 		var nestedTypeName = CustomType.NestedType.class.getName();
-		Predicate<String> classNameFilter = name -> name.startsWith(customTypeName);
 
-		try (FilteringClassLoader customTypeClassLoader = new FilteringClassLoader(classNameFilter)) {
+		try (TestClassLoader customTypeClassLoader = TestClassLoader.forClassNamePrefix(customTypeName)) {
 			var customType = customTypeClassLoader.loadClass(customTypeName);
 
 			var optional = findMethod(customType, methodName, nestedTypeName);

From 9ea22079959d1c122daa2b5fca459d39d6e2af07 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 6 May 2023 16:35:53 +0200
Subject: [PATCH 1279/1433] Enable Dependabot for composite actions

---
 .github/dependabot.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 96ab685e82d0..5c19f255d870 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,3 +18,18 @@ updates:
     schedule:
       interval: "weekly"
     labels: [ ]
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/main-build"
+    schedule:
+      interval: "weekly"
+    labels: [ ]
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/run-gradle"
+    schedule:
+      interval: "weekly"
+    labels: [ ]
+  - package-ecosystem: "github-actions"
+    directory: "/.github/actions/setup-test-jdk"
+    schedule:
+      interval: "weekly"
+    labels: [ ]

From 81a60428b591306e35228deba7c51bf514849609 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 May 2023 16:49:41 +0200
Subject: [PATCH 1280/1433] Bump com.gradle:gradle-enterprise-gradle-plugin to
 3.13.1 (#3284)

Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.13 to 3.13.1.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4292406a8c2d..4fb3e554ed83 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.157" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.10" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
-gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13" }
+gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.1" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.18.0" }

From ba87b530baad24b0d56554794d326517dd8aa8de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 May 2023 16:50:45 +0200
Subject: [PATCH 1281/1433] Bump org.jetbrains.kotlinx:kotlinx-coroutines-core
 to 1.7.0 (#3285)

Bumps [org.jetbrains.kotlinx:kotlinx-coroutines-core](https://github.com/Kotlin/kotlinx.coroutines) from 1.6.4 to 1.7.0.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.4...1.7.0)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4fb3e554ed83..eef6fddd7e51 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -46,7 +46,7 @@ jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "2.0.0" }
 junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.13.2" } }
-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.0" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.1" }

From a9605824bdc1f1eb9070f6bbb0aa1388308a7e1c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 6 May 2023 17:02:50 +0200
Subject: [PATCH 1282/1433] Polishing

---
 .../java/org/junit/jupiter/api/Timeout.java   |  2 +-
 .../org/junit/jupiter/engine/Constants.java   |  6 ++---
 .../TempDirectoryPerContextTests.java         | 10 ++++-----
 .../TempDirectoryPerDeclarationTests.java     | 22 +++++++++----------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
index db9cc94cb5ae..f80d8bf6f2ee 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Timeout.java
@@ -298,7 +298,7 @@
 	String DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME = "junit.jupiter.execution.timeout.afterall.method.default";
 
 	/**
-	 * Property used to determine if timeouts are applied to tests: {@value}.
+	 * Property name used to configure whether timeouts are applied to tests: {@value}.
 	 *
 	 * <p>The value of this property will be used to toggle whether
 	 * {@link Timeout @Timeout} is applied to tests.</p>
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
index f4e4dc9ca631..2c7b509c9964 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java
@@ -315,7 +315,7 @@ public final class Constants {
 	public static final String DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME = Timeout.DEFAULT_AFTER_ALL_METHOD_TIMEOUT_PROPERTY_NAME;
 
 	/**
-	 * Property used to determine if timeouts are applied to tests: {@value}.
+	 * Property name used to configure whether timeouts are applied to tests: {@value}.
 	 *
 	 * @see Timeout#TIMEOUT_MODE_PROPERTY_NAME
 	 */
@@ -340,7 +340,7 @@ public final class Constants {
 
 	/**
 	 * Property name used to set the scope of temporary directories created via
-	 * {@link TempDir @TempDir} annotation: {@value}
+	 * the {@link TempDir @TempDir} annotation: {@value}
 	 *
 	 * @see TempDir#SCOPE_PROPERTY_NAME
 	 */
@@ -361,7 +361,7 @@ public final class Constants {
 
 	/**
 	 * Property name used to set the default factory for temporary directories created via
-	 * {@link TempDir @TempDir} annotation: {@value}
+	 * the {@link TempDir @TempDir} annotation: {@value}
 	 *
 	 * @since 5.10
 	 * @see TempDir#DEFAULT_FACTORY_PROPERTY_NAME
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index baf537d9fd88..84addd7dd905 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -57,6 +57,7 @@
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
+import org.junit.platform.testkit.engine.Events;
 
 /**
  * Integration tests for the legacy behavior of the {@link TempDirectory}
@@ -77,7 +78,7 @@ protected EngineExecutionResults executeTestsForClass(Class<?> testClass) {
 	private static LauncherDiscoveryRequestBuilder requestBuilder(Class<?> testClass) {
 		return request() //
 				.selectors(selectClass(testClass)) //
-				.configurationParameter(TempDir.SCOPE_PROPERTY_NAME, TempDirectory.Scope.PER_CONTEXT.toString());
+				.configurationParameter(TempDir.SCOPE_PROPERTY_NAME, TempDirectory.Scope.PER_CONTEXT.name());
 	}
 
 	@BeforeEach
@@ -296,18 +297,17 @@ void resolvesSeparateTempDirWhenAnnotationIsUsedOnAfterAllMethodParameterOnly()
 	@TestMethodOrder(OrderAnnotation.class)
 	class DefaultFactory {
 
-		private EngineExecutionResults executeTestsForClassWithDefaultFactory(Class<?> testClass,
+		private Events executeTestsForClassWithDefaultFactory(Class<?> testClass,
 				Class<? extends TempDirFactory> factoryClass) {
 			return TempDirectoryPerContextTests.super.executeTests(requestBuilder(testClass) //
 					.configurationParameter(TempDir.DEFAULT_FACTORY_PROPERTY_NAME, factoryClass.getName()) //
-					.build());
+					.build()).testEvents();
 		}
 
 		@Test
 		@DisplayName("set to Jupiter's default")
 		void supportsStandardDefaultFactory() {
 			executeTestsForClassWithDefaultFactory(StandardDefaultFactoryTestCase.class, TempDirFactory.Standard.class) //
-					.testEvents()//
 					.assertStatistics(stats -> stats.started(1).succeeded(1));
 		}
 
@@ -315,7 +315,6 @@ void supportsStandardDefaultFactory() {
 		@DisplayName("set to custom factory")
 		void supportsCustomDefaultFactory() {
 			executeTestsForClassWithDefaultFactory(NonStandardDefaultFactoryTestCase.class, Factory.class) //
-					.testEvents()//
 					.assertStatistics(stats -> stats.started(1).succeeded(1));
 		}
 
@@ -1401,4 +1400,5 @@ void nested() {
 			}
 		}
 	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 68253d8fef24..33a5297e21ae 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -100,7 +100,7 @@ Stream<DynamicTest> resolvesSeparateTempDirsForEachAnnotationDeclaration() {
 				var results = executeTests(request() //
 						.selectors(selectClass(AllPossibleDeclarationLocationsTestCase.class)) //
 						.configurationParameter(Constants.DEFAULT_TEST_INSTANCE_LIFECYCLE_PROPERTY_NAME,
-							lifecycle.toString()).build());
+							lifecycle.name()).build());
 
 				results.containerEvents().assertStatistics(stats -> stats.started(2).succeeded(2));
 				results.testEvents().assertStatistics(stats -> stats.started(2).succeeded(2));
@@ -1172,7 +1172,7 @@ static class FactoryWithTestMethodNameAsPrefixTestCase {
 		@Test
 		void test(@TempDir(factory = Factory.class) Path tempDir) {
 			assertTrue(Files.exists(tempDir));
-			assertThat(tempDir.getFileName().toString()).startsWith("test");
+			assertThat(tempDir.getFileName()).asString().startsWith("test");
 		}
 
 		private static class Factory implements TempDirFactory {
@@ -1191,7 +1191,7 @@ static class FactoryWithCustomParentDirectoryTestCase {
 		@Test
 		void test(@TempDir(factory = Factory.class) Path tempDir) {
 			assertThat(tempDir).exists().hasParent(Factory.parent);
-			assertThat(tempDir.getFileName().toString()).startsWith("prefix");
+			assertThat(tempDir.getFileName()).asString().startsWith("prefix");
 		}
 
 		private static class Factory implements TempDirFactory {
@@ -1215,7 +1215,7 @@ static class FactoryWithMemoryFileSystemTestCase {
 		@Test
 		void test(@TempDir(factory = Factory.class) Path tempDir) {
 			assertThat(tempDir).exists().hasFileSystem(Factory.fileSystem);
-			assertThat(tempDir.getFileName().toString()).startsWith("prefix");
+			assertThat(tempDir.getFileName()).asString().startsWith("prefix");
 		}
 
 		private static class Factory implements TempDirFactory {
@@ -1242,7 +1242,7 @@ static class FactoryWithJimfsTestCase {
 		@Test
 		void test(@TempDir(factory = Factory.class) Path tempDir) {
 			assertThat(tempDir).exists().hasFileSystem(Factory.fileSystem);
-			assertThat(tempDir.getFileName().toString()).startsWith("prefix");
+			assertThat(tempDir.getFileName()).asString().startsWith("prefix");
 		}
 
 		private static class Factory implements TempDirFactory {
@@ -1269,8 +1269,8 @@ static class StandardDefaultFactoryTestCase {
 		@Test
 		void test(@TempDir Path tempDir1, @TempDir Path tempDir2) {
 			assertNotSame(tempDir1, tempDir2);
-			assertThat(tempDir1.getFileName().toString()).startsWith("junit");
-			assertThat(tempDir2.getFileName().toString()).startsWith("junit");
+			assertThat(tempDir1.getFileName()).asString().startsWith("junit");
+			assertThat(tempDir2.getFileName()).asString().startsWith("junit");
 		}
 
 	}
@@ -1280,8 +1280,8 @@ static class CustomDefaultFactoryTestCase {
 		@Test
 		void test(@TempDir Path tempDir1, @TempDir Path tempDir2) {
 			assertNotSame(tempDir1, tempDir2);
-			assertThat(tempDir1.getFileName().toString()).startsWith("custom");
-			assertThat(tempDir2.getFileName().toString()).startsWith("custom");
+			assertThat(tempDir1.getFileName()).asString().startsWith("custom");
+			assertThat(tempDir2.getFileName()).asString().startsWith("custom");
 		}
 
 	}
@@ -1291,8 +1291,8 @@ static class CustomDefaultFactoryWithStandardDeclarationTestCase {
 		@Test
 		void test(@TempDir Path tempDir1, @TempDir(factory = Standard.class) Path tempDir2) {
 			assertNotSame(tempDir1, tempDir2);
-			assertThat(tempDir1.getFileName().toString()).startsWith("custom");
-			assertThat(tempDir2.getFileName().toString()).startsWith("junit");
+			assertThat(tempDir1.getFileName()).asString().startsWith("custom");
+			assertThat(tempDir2.getFileName()).asString().startsWith("junit");
 		}
 
 	}

From 8c74a224933b13f61d343949d89686166fb4a4d0 Mon Sep 17 00:00:00 2001
From: Roland Illig <roland.illig@gmx.de>
Date: Sat, 6 May 2023 17:11:04 +0200
Subject: [PATCH 1283/1433] Add missing space in user guide

Closes #3286
---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index cdbba94357ca..757a72a2990b 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1303,7 +1303,7 @@ for parameterized tests that accept a single argument.
   `java.util.List`, `java.util.Set`, `java.util.SortedSet`, `java.util.NavigableSet`,
   `java.util.Map` (and concrete subtypes with a `public` no-arg constructor,
   `java.util.SortedMap`, `java.util.NavigableMap`, primitive arrays (e.g., `int[]`,
-  `char[][]`, etc.), object arrays (e.g.,`String[]`, `Integer[][]`, etc.).
+  `char[][]`, etc.), object arrays (e.g., `String[]`, `Integer[][]`, etc.).
 * `{NullAndEmptySource}`: a _composed annotation_ that combines the functionality of
   `@NullSource` and `@EmptySource`.
 

From 174128d05c2f78a5553747f39cc0f55f1fe042be Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 7 May 2023 14:14:02 +0200
Subject: [PATCH 1284/1433] Polish code formatting in User Guide

---
 .../src/test/java/example/DisplayNameGeneratorDemo.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/documentation/src/test/java/example/DisplayNameGeneratorDemo.java b/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
index f1483d15c67e..0ccfb762e24b 100644
--- a/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
+++ b/documentation/src/test/java/example/DisplayNameGeneratorDemo.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
 import org.junit.jupiter.api.IndicativeSentencesGeneration;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -40,7 +41,7 @@ void if_it_is_negative(int year) {
 	}
 
 	@Nested
-	@IndicativeSentencesGeneration(separator = " -> ", generator = DisplayNameGenerator.ReplaceUnderscores.class)
+	@IndicativeSentencesGeneration(separator = " -> ", generator = ReplaceUnderscores.class)
 	class A_year_is_a_leap_year {
 
 		@Test

From 3ab4d510266bec0962a88a876760b6ba2001597c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 7 May 2023 14:32:08 +0200
Subject: [PATCH 1285/1433] Improve color palette for code examples

- comments are now dark green instead of gray

- method invocations are now dark blue instead of dark green

These changes have been checked with the WAVE Evaluation Tool extension
in Google Chrome.

See ##3071
---
 .../src/docs/asciidoc/resources/themes/rouge_junit.rb        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/resources/themes/rouge_junit.rb b/documentation/src/docs/asciidoc/resources/themes/rouge_junit.rb
index ec6a46109788..003a88b51955 100644
--- a/documentation/src/docs/asciidoc/resources/themes/rouge_junit.rb
+++ b/documentation/src/docs/asciidoc/resources/themes/rouge_junit.rb
@@ -22,6 +22,7 @@ class JUnit < CSSTheme
     P_BLUE_2       = {:dark => '#79c0ff'}
     P_BLUE_5       = {:dark => '#1f6feb'}
     P_BLUE_6       = {:light => '#0550ae'}
+    P_BLUE_7       = {:light => '#055099'}
     P_BLUE_8       = {:light => '#0a3069'}
     P_PURPLE_2     = {:dark => '#d2a8ff'}
     P_PURPLE_5     = {:light => '#8250df'}
@@ -68,13 +69,13 @@ def self.make_dark!
     end
 
     def self.make_light!
-     palette :comment     => P_GRAY_5[@mode]
+     palette :comment     => P_GREEN_6[@mode]
      palette :constant    => P_BLUE_6[@mode]
      palette :entity      => P_PURPLE_5[@mode]
      palette :heading     => P_BLUE_6[@mode]
      palette :keyword     => P_RED_5[@mode]
      palette :string      => P_BLUE_8[@mode]
-     palette :tag         => P_GREEN_6[@mode]
+     palette :tag         => P_BLUE_7[@mode]
      palette :variable    => P_ORANGE_6[@mode]
 
      palette :fgDefault   => P_GRAY_9[@mode]

From 3fd5c804ded43dadbc5022bf6cb05ecae695089e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 7 May 2023 17:03:06 +0200
Subject: [PATCH 1286/1433] Polish wording in release notes

---
 .../asciidoc/release-notes/release-notes-5.10.0-M1.adoc    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 9a11fb59b7fa..0dd4ff940f59 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -32,10 +32,9 @@ repository on GitHub.
   which return a `Stream`.
 * `ReflectionSupport.findMethod(Class<?>, String, String)` now uses the `ClassLoader` of
   the supplied `Class` to load parameter types instead of using the _default_
-  `ClassLoader`. This allows parameter types to be resolved in non-standard `ClassLoader`
-  arrangements (such as OSGi). Consequently,
-  `DiscoverySelectors.selectMethod(Class<?>, String, String)` also now works properly in
-  non-standard `ClassLoader` arrangements.
+  `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
+  arrangements (such as OSGi). Consequently, `DiscoverySelectors.selectMethod(Class<?>,
+  String, String)` also now works properly with custom `ClassLoader` arrangements.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
   started/finished and opened/closed events are now invoked using "wrapping" semantics.
   This means that finished/closed event methods are invoked in reverse order compared to

From 1c9c018007fa25824e43979f0f2a57061fcabbfe Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 7 May 2023 18:00:33 +0200
Subject: [PATCH 1287/1433] Update test to check ClassLoader in conjunction
 with TestClassLoader

---
 .../junit/platform/commons/util/ReflectionUtilsTests.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 52bf8b442ba8..e8bc60ff012b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -1036,18 +1036,23 @@ void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() thro
 
 		try (TestClassLoader customTypeClassLoader = TestClassLoader.forClassNamePrefix(customTypeName)) {
 			var customType = customTypeClassLoader.loadClass(customTypeName);
+			assertThat(customType.getClassLoader()).isInstanceOf(TestClassLoader.class);
 
 			var optional = findMethod(customType, methodName, nestedTypeName);
 			assertThat(optional).get().satisfies(method -> {
 				assertThat(method.getName()).isEqualTo(methodName);
 
 				var declaringClass = method.getDeclaringClass();
+				assertThat(declaringClass.getClassLoader()).isInstanceOf(TestClassLoader.class);
 				assertThat(declaringClass.getName()).isEqualTo(customTypeName);
 				assertThat(declaringClass).isNotEqualTo(CustomType.class);
 
 				var parameterTypes = method.getParameterTypes();
 				assertThat(parameterTypes).extracting(Class::getName).containsExactly(nestedTypeName);
-				assertThat(parameterTypes[0].getClass()).isNotEqualTo(CustomType.NestedType.class);
+				Class<?> parameterType = parameterTypes[0].getClass();
+				assertThat(parameterType).isNotEqualTo(CustomType.NestedType.class);
+				// The ClassLoader is null because of the behavior of our TestClassLoader.
+				assertThat(parameterType.getClassLoader()).isNull();
 			});
 		}
 	}

From 4b45db09a1c048837fac17026fa14deb7e61e341 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 7 May 2023 18:30:20 +0200
Subject: [PATCH 1288/1433] Avoid attempted duplicate class definition in
 TestClassLoader

---
 .../platform/commons/test/TestClassLoader.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
index 239885fdeb7e..c0f43ebb11af 100644
--- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
@@ -16,6 +16,8 @@
 import java.net.URLClassLoader;
 import java.security.CodeSource;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 
 import org.junit.platform.commons.util.ClassLoaderUtils;
@@ -34,6 +36,8 @@ public class TestClassLoader extends URLClassLoader {
 
 	private static final Predicate<Class<?>> notTestClassLoader = clazz -> !clazz.equals(TestClassLoader.class);
 
+	private final Map<String, Class<?>> cachedClasses = new ConcurrentHashMap<>();
+
 	private final Predicate<String> classNameFilter;
 
 	/**
@@ -64,7 +68,19 @@ public TestClassLoader(Predicate<String> classNameFilter) {
 
 	@Override
 	public Class<?> loadClass(String name) throws ClassNotFoundException {
-		return (this.classNameFilter.test(name) ? findClass(name) : super.loadClass(name));
+		Class<?> clazz = this.cachedClasses.get(name);
+		if (clazz != null) {
+			return clazz;
+		}
+		synchronized (this.cachedClasses) {
+			clazz = this.cachedClasses.get(name);
+			if (clazz != null) {
+				return clazz;
+			}
+			clazz = this.classNameFilter.test(name) ? findClass(name) : super.loadClass(name);
+			this.cachedClasses.put(name, clazz);
+			return clazz;
+		}
 	}
 
 	/**

From f16982e56172a51cda838157df412724f53b6196 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 8 May 2023 13:13:15 +0200
Subject: [PATCH 1289/1433] Refactor TestClassLoader to use
 getClassLoadingLock() and findLoadedClass()

---
 .../commons/test/TestClassLoader.java         | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
index c0f43ebb11af..04c354260770 100644
--- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
@@ -16,8 +16,6 @@
 import java.net.URLClassLoader;
 import java.security.CodeSource;
 import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 
 import org.junit.platform.commons.util.ClassLoaderUtils;
@@ -34,9 +32,11 @@
  */
 public class TestClassLoader extends URLClassLoader {
 
-	private static final Predicate<Class<?>> notTestClassLoader = clazz -> !clazz.equals(TestClassLoader.class);
+	static {
+		ClassLoader.registerAsParallelCapable();
+	}
 
-	private final Map<String, Class<?>> cachedClasses = new ConcurrentHashMap<>();
+	private static final Predicate<Class<?>> notTestClassLoader = clazz -> !clazz.equals(TestClassLoader.class);
 
 	private final Predicate<String> classNameFilter;
 
@@ -68,18 +68,12 @@ public TestClassLoader(Predicate<String> classNameFilter) {
 
 	@Override
 	public Class<?> loadClass(String name) throws ClassNotFoundException {
-		Class<?> clazz = this.cachedClasses.get(name);
-		if (clazz != null) {
-			return clazz;
-		}
-		synchronized (this.cachedClasses) {
-			clazz = this.cachedClasses.get(name);
+		synchronized (getClassLoadingLock(name)) {
+			Class<?> clazz = findLoadedClass(name);
 			if (clazz != null) {
 				return clazz;
 			}
-			clazz = this.classNameFilter.test(name) ? findClass(name) : super.loadClass(name);
-			this.cachedClasses.put(name, clazz);
-			return clazz;
+			return this.classNameFilter.test(name) ? findClass(name) : super.loadClass(name);
 		}
 	}
 

From ce8dcbb1943cff028b2462bcaf952104cb054ca1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 8 May 2023 13:24:16 +0200
Subject: [PATCH 1290/1433] Simplify TestClassLoader

---
 .../commons/test/TestClassLoader.java         | 35 ++++++-------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
index 04c354260770..33319209cefd 100644
--- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
@@ -11,7 +11,6 @@
 package org.junit.platform.commons.test;
 
 import java.lang.StackWalker.Option;
-import java.lang.StackWalker.StackFrame;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.security.CodeSource;
@@ -32,14 +31,12 @@
  */
 public class TestClassLoader extends URLClassLoader {
 
+	private static final StackWalker stackWalker = StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE);
+
 	static {
 		ClassLoader.registerAsParallelCapable();
 	}
 
-	private static final Predicate<Class<?>> notTestClassLoader = clazz -> !clazz.equals(TestClassLoader.class);
-
-	private final Predicate<String> classNameFilter;
-
 	/**
 	 * Create a {@link TestClassLoader} that filters the provided classes.
 	 *
@@ -47,7 +44,7 @@ public class TestClassLoader extends URLClassLoader {
 	 */
 	public static TestClassLoader forClasses(Class<?>... classes) {
 		Predicate<String> classNameFilter = name -> Arrays.stream(classes).map(Class::getName).anyMatch(name::equals);
-		return new TestClassLoader(classNameFilter);
+		return new TestClassLoader(getCodeSourceUrl(stackWalker.getCallerClass()), classNameFilter);
 	}
 
 	/**
@@ -57,11 +54,13 @@ public static TestClassLoader forClasses(Class<?>... classes) {
 	 * @see #forClasses(Class...)
 	 */
 	public static TestClassLoader forClassNamePrefix(String prefix) {
-		return new TestClassLoader(name -> name.startsWith(prefix));
+		return new TestClassLoader(getCodeSourceUrl(stackWalker.getCallerClass()), name -> name.startsWith(prefix));
 	}
 
-	public TestClassLoader(Predicate<String> classNameFilter) {
-		super(new URL[] { getCodeSourceUrl() }, ClassLoaderUtils.getDefaultClassLoader());
+	private final Predicate<String> classNameFilter;
+
+	private TestClassLoader(URL codeSourceUrl, Predicate<String> classNameFilter) {
+		super(new URL[] { codeSourceUrl }, ClassLoaderUtils.getDefaultClassLoader());
 
 		this.classNameFilter = classNameFilter;
 	}
@@ -78,22 +77,10 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
 	}
 
 	/**
-	 * Get the {@link CodeSource} {@link URL} of the class that instantiated the
-	 * {@code TestClassLoader}.
+	 * Get the {@link CodeSource} {@link URL} of the supplied class.
 	 */
-	private static URL getCodeSourceUrl() {
-		StackWalker walker = StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE);
-
-		// @formatter:off
-		Class<?> callerClass = walker.walk(stream -> stream
-				.map(StackFrame::getDeclaringClass)
-				.filter(notTestClassLoader)
-				.findFirst()
-				.get()
-			);
-		// @formatter:on
-
-		return callerClass.getProtectionDomain().getCodeSource().getLocation();
+	private static URL getCodeSourceUrl(Class<?> clazz) {
+		return clazz.getProtectionDomain().getCodeSource().getLocation();
 	}
 
 }

From fc3f23047043908d31cc8bd3b2ea246d3a5fe2be Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 8 May 2023 17:53:18 +0200
Subject: [PATCH 1291/1433] Introduce tryToLoadClass(String, ClassLoader) in
 ReflectionSupport

This commit introduces a new `tryToLoadClass(...)` variant in
`ReflectionSupport` that accepts an explicit `ClassLoader`, allowing
classes to be resolved with custom `ClassLoader` arrangements.

Closes #3289
---
 .../release-notes-5.10.0-M1.adoc              |  2 ++
 .../commons/support/ReflectionSupport.java    | 26 +++++++++++++++--
 .../support/ReflectionSupportTests.java       | 28 +++++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 0dd4ff940f59..3554ade17a93 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -30,6 +30,8 @@ repository on GitHub.
   `@Suite` and related annotations, and others.
 * All utility methods in `ReflectionSupport` that return a `List` now have counterparts
   which return a `Stream`.
+* New `tryToLoadClass(...)` variant in `ReflectionSupport` that accepts an explicit
+  `ClassLoader`, allowing classes to be resolved with custom `ClassLoader` arrangements.
 * `ReflectionSupport.findMethod(Class<?>, String, String)` now uses the `ClassLoader` of
   the supplied `Class` to load parameter types instead of using the _default_
   `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
index 6b6c98d3d055..21259a93a58a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java
@@ -11,6 +11,7 @@
 package org.junit.platform.commons.support;
 
 import static org.apiguardian.api.API.Status.DEPRECATED;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
 
 import java.lang.reflect.Field;
@@ -72,8 +73,8 @@ public static Optional<Class<?>> loadClass(String name) {
 	}
 
 	/**
-	 * Try to load a class by its <em>primitive name</em> or <em>fully qualified name</em>,
-	 * using the default {@link ClassLoader}.
+	 * Try to load a class by its <em>primitive name</em> or <em>fully qualified
+	 * name</em>, using the default {@link ClassLoader}.
 	 *
 	 * <p>Class names for arrays may be specified using either the JVM's internal
 	 * String representation (e.g., {@code [[I} for {@code int[][]},
@@ -86,12 +87,33 @@ public static Optional<Class<?>> loadClass(String name) {
 	 * {@code Try} containing the exception if no such class could be loaded;
 	 * never {@code null}
 	 * @since 1.4
+	 * @see #tryToLoadClass(String, ClassLoader)
 	 */
 	@API(status = MAINTAINED, since = "1.4")
 	public static Try<Class<?>> tryToLoadClass(String name) {
 		return ReflectionUtils.tryToLoadClass(name);
 	}
 
+	/**
+	 * Try to load a class by its <em>primitive name</em> or <em>fully qualified
+	 * name</em>, using the supplied {@link ClassLoader}.
+	 *
+	 * <p>See {@link ReflectionSupport#tryToLoadClass(String) tryToLoadClass(String)}
+	 * for details on support for class names for arrays.
+	 *
+	 * @param name the name of the class to load; never {@code null} or blank
+	 * @param classLoader the {@code ClassLoader} to use; never {@code null}
+	 * @return a successful {@code Try} containing the loaded class or a failed
+	 * {@code Try} containing the exception if no such class could be loaded;
+	 * never {@code null}
+	 * @since 1.10
+	 * @see #tryToLoadClass(String)
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static Try<Class<?>> tryToLoadClass(String name, ClassLoader classLoader) {
+		return ReflectionUtils.tryToLoadClass(name, classLoader);
+	}
+
 	/**
 	 * Find all {@linkplain Class classes} in the supplied classpath {@code root}
 	 * that match the specified {@code classFilter} and {@code classNameFilter}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
index f14ff26e1fc4..0006a795fa07 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java
@@ -74,6 +74,34 @@ void tryToLoadClassPreconditions() {
 		assertPreconditionViolationExceptionForString("Class name", () -> ReflectionSupport.tryToLoadClass(""));
 	}
 
+	/**
+	 * @since 1.10
+	 */
+	@Test
+	void tryToLoadClassWithExplicitClassLoaderDelegates() {
+		ClassLoader classLoader = getClass().getClassLoader();
+
+		assertEquals(ReflectionUtils.tryToLoadClass("-", classLoader).toOptional(),
+			ReflectionSupport.tryToLoadClass("-", classLoader).toOptional());
+		assertEquals(ReflectionUtils.tryToLoadClass("A", classLoader).toOptional(),
+			ReflectionSupport.tryToLoadClass("A", classLoader).toOptional());
+		assertEquals(ReflectionUtils.tryToLoadClass("java.nio.Bits", classLoader),
+			ReflectionSupport.tryToLoadClass("java.nio.Bits", classLoader));
+	}
+
+	/**
+	 * @since 1.10
+	 */
+	@Test
+	void tryToLoadClassWithExplicitClassLoaderPreconditions() {
+		ClassLoader cl = getClass().getClassLoader();
+
+		assertPreconditionViolationExceptionForString("Class name", () -> ReflectionSupport.tryToLoadClass(null, cl));
+		assertPreconditionViolationExceptionForString("Class name", () -> ReflectionSupport.tryToLoadClass("", cl));
+
+		assertPreconditionViolationException("ClassLoader", () -> ReflectionSupport.tryToLoadClass("int", null));
+	}
+
 	@TestFactory
 	List<DynamicTest> findAllClassesInClasspathRootDelegates() throws Throwable {
 		List<DynamicTest> tests = new ArrayList<>();

From 93231adfb4b203b7cd47ec05d2a5af42f7a2930a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 8 May 2023 18:00:49 +0200
Subject: [PATCH 1292/1433] Stop referring to JUnit 5 as the "next generation"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's the "current generation". 😀
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 61f0b3fe31df..c6af2f63b219 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # <img src="https://junit.org/junit5/assets/img/junit5-logo.png" align="right" width="100">JUnit 5
 
-This repository is the home of the next generation of JUnit, _JUnit 5_.
+This repository is the home of _JUnit 5_.
 
 [![Support JUnit](https://img.shields.io/badge/%F0%9F%92%9A-Support%20JUnit-brightgreen.svg)](https://junit.org/sponsoring)
 

From b41ae69659e8dc3fa230f97d8a751d81e69d06d7 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Mon, 8 May 2023 22:33:16 +0200
Subject: [PATCH 1293/1433] Prune stack traces produced by failing tests
 (#3277)

This commit introduces stack trace pruning, in order to make the stack traces produced by failing tests more concise and readable.
This is an opt-out feature that can be enabled or disabled with the `junit.platform.stacktrace.pruning.enabled` configuration property, and configured by providing a pattern to `junit.platform.stacktrace.pruning.pattern`.

Resolves #3247

Co-authored-by: Christian Stein <sormuras@gmail.com>
---
 .../release-notes-5.10.0-M1.adoc              |   4 +
 .../asciidoc/user-guide/running-tests.adoc    |  26 +++
 .../junitbuild.testing-conventions.gradle.kts |   1 +
 .../util/ClassNamePatternFilterUtils.java     |  22 +-
 .../platform/commons/util/ExceptionUtils.java |  85 ++++++++
 .../platform/launcher/LauncherConstants.java  |  54 +++++
 .../core/EngineExecutionOrchestrator.java     |  25 ++-
 ...ckTracePruningEngineExecutionListener.java |  58 +++++
 .../platform/StackTracePruningTests.java      | 205 ++++++++++++++++++
 .../ClassNamePatternFilterUtilsTests.java     |  71 ++++--
 .../commons/util/ExceptionUtilsTests.java     |  82 +++++++
 11 files changed, 608 insertions(+), 25 deletions(-)
 create mode 100644 junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StackTracePruningEngineExecutionListener.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/StackTracePruningTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 3554ade17a93..be76fc61d78c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -63,6 +63,10 @@ repository on GitHub.
   test engines and their extensions.
 * New dry-run mode to simulate test execution without actually running tests. Please refer
   to the <<../user-guide/index.adoc#launcher-api-dry-run-mode, User Guide>> for details.
+* Stack traces produced by failing tests are now pruned of calls from the `org.junit`,
+  `java`, and `jdk` packages by default. This feature can be disabled or configured to
+  prune other calls via configurations parameters. Please refer to the
+  <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
 
 
 [[release-notes-5.10.0-M1-junit-jupiter]]
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index e454b70c4ad7..507a60f908d1 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -878,6 +878,7 @@ parameters_ used for the following features.
 
 - <<extensions-conditions-deactivation>>
 - <<launcher-api-listeners-custom-deactivation>>
+- <<stacktrace-pruning>>
 
 If the value for the given _configuration parameter_ consists solely of an asterisk
 (`+++*+++`), the pattern will match against all candidate classes. Otherwise, the value
@@ -1094,3 +1095,28 @@ https://jdk.java.net/jmc/[JDK Mission Control].
 WARNING: Flight Recorder support is currently an _experimental_ feature. You're invited to
 give it a try and provide feedback to the JUnit team so they can improve and eventually
 <<api-evolution, promote>> this feature.
+
+[[stacktrace-pruning]]
+=== Stack trace pruning
+
+Since version 1.10, the JUnit Platform provides built-in support for pruning stack traces
+produced by failing tests. This feature can be enabled or disabled via the
+`junit.platform.stacktrace.pruning.enabled` _configuration parameter_.
+
+By default, all calls from the `org.junit`, `java`, and `jdk` packages are removed from the
+stack trace. You can also configure the JUnit Platform to exclude different or additional
+calls. To do this, provide a pattern for the `junit.platform.stacktrace.pruning.pattern`
+_configuration parameter_ to specify which fully qualified class names should be excluded
+from the stack traces.
+
+In addition, and independently of the provided pattern, all elements prior to and
+including the first call from the JUnit Platform Launcher will be removed.
+
+NOTE: Since they provide necessary insights to understand a test failure, calls to
+`{Assertions}` or `{Assumptions}` will never be excluded from stack traces even though
+they are part of the `org.junit` package.
+
+[[stacktrace-pruning-pattern]]
+==== Pattern Matching Syntax
+
+Refer to <<running-tests-config-params-deactivation-pattern>> for details.
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
index 8a1cdd89955f..122db6b5b5af 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
@@ -41,6 +41,7 @@ tasks.withType<Test>().configureEach {
 		server.set(uri("https://ge.junit.org"))
 	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
+	systemProperty("junit.platform.stacktrace.pruning.enabled", false)
 	// Required until ASM officially supports the JDK 14
 	systemProperty("net.bytebuddy.experimental", true)
 	if (buildParameters.testing.enableJFR) {
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
index cea745d1568f..020376d34545 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassNamePatternFilterUtils.java
@@ -16,6 +16,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -50,21 +51,36 @@ private ClassNamePatternFilterUtils() {
 	 * @param patterns a comma-separated list of patterns
 	 */
 	public static <T> Predicate<T> excludeMatchingClasses(String patterns) {
+		return excludeMatchingClasses(patterns, object -> object.getClass().getName());
+	}
+
+	/**
+	 * Create a {@link Predicate} that can be used to exclude (i.e., filter out)
+	 * fully qualified class names matching any of the supplied patterns.
+	 *
+	 * @param patterns a comma-separated list of patterns
+	 */
+	public static Predicate<String> excludeMatchingClassNames(String patterns) {
+		return excludeMatchingClasses(patterns, Function.identity());
+	}
+
+	private static <T> Predicate<T> excludeMatchingClasses(String patterns, Function<T, String> classNameGetter) {
 		// @formatter:off
 		return Optional.ofNullable(patterns)
 				.filter(StringUtils::isNotBlank)
 				.map(String::trim)
-				.map(ClassNamePatternFilterUtils::<T>createPredicateFromPatterns)
+				.map(trimmedPatterns -> createPredicateFromPatterns(trimmedPatterns, classNameGetter))
 				.orElse(object -> true);
 		// @formatter:on
 	}
 
-	private static <T> Predicate<T> createPredicateFromPatterns(String patterns) {
+	private static <T> Predicate<T> createPredicateFromPatterns(String patterns,
+			Function<T, String> classNameProvider) {
 		if (DEACTIVATE_ALL_PATTERN.equals(patterns)) {
 			return object -> false;
 		}
 		List<Pattern> patternList = convertToRegularExpressions(patterns);
-		return object -> patternList.stream().noneMatch(it -> it.matcher(object.getClass().getName()).matches());
+		return object -> patternList.stream().noneMatch(it -> it.matcher(classNameProvider.apply(object)).matches());
 	}
 
 	private static List<Pattern> convertToRegularExpressions(String patterns) {
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
index d8177037278b..64f59d12d5fb 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -14,6 +14,15 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
 
@@ -31,6 +40,8 @@
 @API(status = INTERNAL, since = "1.0")
 public final class ExceptionUtils {
 
+	private static final String JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX = "org.junit.platform.launcher.";
+
 	private ExceptionUtils() {
 		/* no-op */
 	}
@@ -80,4 +91,78 @@ public static String readStackTrace(Throwable throwable) {
 		return stringWriter.toString();
 	}
 
+	/**
+	 * Prune the stack trace of the supplied {@link Throwable} by filtering its
+	 * elements using the supplied {@link Predicate}, except for
+	 * {@code org.junit.jupiter.api.Assertions} and
+	 * {@code org.junit.jupiter.api.Assumptions} that will always remain
+	 * present.
+	 *
+	 * <p>Additionally, all elements prior to and including the first
+	 * JUnit Launcher call will be removed.
+	 *
+	 * @param throwable the {@code Throwable} whose stack trace should be
+	 * pruned; never {@code null}
+	 * @param stackTraceElementFilter the {@code Predicate} used to filter
+	 * elements of the stack trace; never {@code null}
+	 *
+	 * @since 5.10
+	 */
+	@API(status = INTERNAL, since = "5.10")
+	public static void pruneStackTrace(Throwable throwable, Predicate<String> stackTraceElementFilter) {
+		Preconditions.notNull(throwable, "Throwable must not be null");
+		Preconditions.notNull(stackTraceElementFilter, "Predicate must not be null");
+
+		List<StackTraceElement> stackTrace = Arrays.asList(throwable.getStackTrace());
+		List<StackTraceElement> prunedStackTrace = new ArrayList<>();
+
+		Collections.reverse(stackTrace);
+
+		for (StackTraceElement element : stackTrace) {
+			String className = element.getClassName();
+			if (className.startsWith(JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX)) {
+				prunedStackTrace.clear();
+			}
+			else if (stackTraceElementFilter.test(className)) {
+				prunedStackTrace.add(element);
+			}
+		}
+
+		Collections.reverse(prunedStackTrace);
+		throwable.setStackTrace(prunedStackTrace.toArray(new StackTraceElement[0]));
+	}
+
+	/**
+	 * Find all causes and suppressed exceptions in the backtrace of the
+	 * supplied {@link Throwable}.
+	 *
+	 * @param rootThrowable the {@code Throwable} to explore; never {@code null}
+	 * @return an immutable list of all throwables found, including the supplied
+	 * one; never {@code null}
+	 *
+	 * @since 5.10
+	 */
+	@API(status = INTERNAL, since = "5.10")
+	public static List<Throwable> findNestedThrowables(Throwable rootThrowable) {
+		Preconditions.notNull(rootThrowable, "Throwable must not be null");
+
+		Set<Throwable> visited = new LinkedHashSet<>();
+		Deque<Throwable> toVisit = new ArrayDeque<>();
+		toVisit.add(rootThrowable);
+
+		while (!toVisit.isEmpty()) {
+			Throwable current = toVisit.remove();
+			boolean isFirstVisit = visited.add(current);
+			if (isFirstVisit) {
+				Throwable cause = current.getCause();
+				if (cause != null) {
+					toVisit.add(cause);
+				}
+				toVisit.addAll(Arrays.asList(current.getSuppressed()));
+			}
+		}
+
+		return Collections.unmodifiableList(new ArrayList<>(visited));
+	}
+
 }
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index 806478728f93..bf16677f933c 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -164,6 +164,60 @@ public class LauncherConstants {
 	@API(status = EXPERIMENTAL, since = "1.10")
 	public static final String DRY_RUN_PROPERTY_NAME = "junit.platform.execution.dryRun.enabled";
 
+	/**
+	 * Property name used to enable or disable stack trace pruning.
+	 *
+	 * <p>By default, stack trace pruning is enabled.
+	 *
+	 * @see org.junit.platform.launcher.core.EngineExecutionOrchestrator
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static final String STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME = "junit.platform.stacktrace.pruning.enabled";
+
+	/**
+	 * Property name used to provide patterns to remove elements from stack traces.
+	 *
+	 * <h4>Pattern Matching Syntax</h4>
+	 *
+	 * <p>If the property value consists solely of an asterisk ({@code *}), all
+	 * elements will be removed. Otherwise, the property value will be treated
+	 * as a comma-separated list of patterns where each individual pattern will
+	 * be matched against the fully qualified class name (<em>FQCN</em>) of the
+	 * stack trace element. Any dot ({@code .}) in a pattern will match against
+	 * a dot ({@code .}) or a dollar sign ({@code $}) in a FQCN. Any asterisk
+	 * ({@code *}) will match against one or more characters in a FQCN. All
+	 * other characters in a pattern will be matched one-to-one against a FQCN.
+	 *
+	 * <h4>Examples</h4>
+	 *
+	 * <ul>
+	 * <li>{@code *}: remove all elements.
+	 * <li>{@code org.junit.*}: remove every element with the {@code org.junit}
+	 * base package and any of its subpackages.
+	 * <li>{@code *.MyClass}: remove every element whose simple class name is
+	 * exactly {@code MyClass}.
+	 * <li>{@code *System*, *Dev*}: exclude every element whose FQCN contains
+	 * {@code System} or {@code Dev}.
+	 * <li>{@code org.example.MyClass, org.example.TheirClass}: remove
+	 * elements whose FQCN is exactly {@code org.example.MyClass} or
+	 * {@code org.example.TheirClass}.
+	 * </ul>
+	 *
+	 * @see #STACKTRACE_PRUNING_DEFAULT_PATTERN
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static final String STACKTRACE_PRUNING_PATTERN_PROPERTY_NAME = "junit.platform.stacktrace.pruning.pattern";
+
+	/**
+	 * Default pattern for stack trace pruning which matches the
+	 * {@code org.junit}, {@code java}, and {@code jdk} base packages as well
+	 * as any of their subpackages.
+	 *
+	 * @see #STACKTRACE_PRUNING_PATTERN_PROPERTY_NAME
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static final String STACKTRACE_PRUNING_DEFAULT_PATTERN = "org.junit.*,java.*,jdk.*";
+
 	private LauncherConstants() {
 		/* no-op */
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index 8ec4a133c2a7..ab1a8e94b503 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -12,6 +12,9 @@
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.launcher.LauncherConstants.DRY_RUN_PROPERTY_NAME;
+import static org.junit.platform.launcher.LauncherConstants.STACKTRACE_PRUNING_DEFAULT_PATTERN;
+import static org.junit.platform.launcher.LauncherConstants.STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME;
+import static org.junit.platform.launcher.LauncherConstants.STACKTRACE_PRUNING_PATTERN_PROPERTY_NAME;
 import static org.junit.platform.launcher.core.ListenerRegistry.forEngineExecutionListeners;
 
 import java.util.Optional;
@@ -155,20 +158,34 @@ public void execute(LauncherDiscoveryResult discoveryResult, EngineExecutionList
 		Preconditions.notNull(discoveryResult, "discoveryResult must not be null");
 		Preconditions.notNull(engineExecutionListener, "engineExecutionListener must not be null");
 
+		ConfigurationParameters configurationParameters = discoveryResult.getConfigurationParameters();
+		EngineExecutionListener listener = selectExecutionListener(engineExecutionListener, configurationParameters);
+
 		for (TestEngine testEngine : discoveryResult.getTestEngines()) {
 			TestDescriptor engineDescriptor = discoveryResult.getEngineTestDescriptor(testEngine);
 			if (engineDescriptor instanceof EngineDiscoveryErrorDescriptor) {
-				engineExecutionListener.executionStarted(engineDescriptor);
-				engineExecutionListener.executionFinished(engineDescriptor,
+				listener.executionStarted(engineDescriptor);
+				listener.executionFinished(engineDescriptor,
 					TestExecutionResult.failed(((EngineDiscoveryErrorDescriptor) engineDescriptor).getCause()));
 			}
 			else {
-				execute(engineDescriptor, engineExecutionListener, discoveryResult.getConfigurationParameters(),
-					testEngine);
+				execute(engineDescriptor, listener, configurationParameters, testEngine);
 			}
 		}
 	}
 
+	private static EngineExecutionListener selectExecutionListener(EngineExecutionListener engineExecutionListener,
+			ConfigurationParameters configurationParameters) {
+		boolean stackTracePruningEnabled = configurationParameters.getBoolean(STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME) //
+				.orElse(true);
+		if (stackTracePruningEnabled) {
+			String pruningPattern = configurationParameters.get(STACKTRACE_PRUNING_PATTERN_PROPERTY_NAME) //
+					.orElse(STACKTRACE_PRUNING_DEFAULT_PATTERN);
+			return new StackTracePruningEngineExecutionListener(engineExecutionListener, pruningPattern);
+		}
+		return engineExecutionListener;
+	}
+
 	private ListenerRegistry<TestExecutionListener> buildListenerRegistryForExecution(
 			TestExecutionListener... listeners) {
 		if (listeners.length == 0) {
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StackTracePruningEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StackTracePruningEngineExecutionListener.java
new file mode 100644
index 000000000000..574ce4827d47
--- /dev/null
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StackTracePruningEngineExecutionListener.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.launcher.core;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.junit.platform.commons.util.ClassNamePatternFilterUtils;
+import org.junit.platform.commons.util.ExceptionUtils;
+import org.junit.platform.engine.EngineExecutionListener;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestExecutionResult;
+
+/**
+ * Prunes the stack trace in case of a failed event.
+ *
+ * @since 1.10
+ * @see org.junit.platform.commons.util.ExceptionUtils#pruneStackTrace(Throwable, Predicate)
+ */
+class StackTracePruningEngineExecutionListener extends DelegatingEngineExecutionListener {
+
+	private static final List<String> ALWAYS_INCLUDED_STACK_TRACE_ELEMENTS = Arrays.asList( //
+		"org.junit.jupiter.api.Assertions", //
+		"org.junit.jupiter.api.Assumptions" //
+	);
+
+	private final Predicate<String> stackTraceElementFilter;
+
+	StackTracePruningEngineExecutionListener(EngineExecutionListener delegate, String pruningPattern) {
+		super(delegate);
+		this.stackTraceElementFilter = ClassNamePatternFilterUtils.excludeMatchingClassNames(pruningPattern) //
+				.or(ALWAYS_INCLUDED_STACK_TRACE_ELEMENTS::contains);
+	}
+
+	@Override
+	public void executionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+		if (testExecutionResult.getThrowable().isPresent()) {
+			Throwable throwable = testExecutionResult.getThrowable().get();
+
+			ExceptionUtils.findNestedThrowables(throwable).forEach(this::pruneStackTrace);
+		}
+		super.executionFinished(testDescriptor, testExecutionResult);
+	}
+
+	private void pruneStackTrace(Throwable throwable) {
+		ExceptionUtils.pruneStackTrace(throwable, stackTraceElementFilter);
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/StackTracePruningTests.java b/platform-tests/src/test/java/org/junit/platform/StackTracePruningTests.java
new file mode 100644
index 000000000000..397dacc3172d
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/StackTracePruningTests.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertLinesMatch;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.testkit.engine.EngineExecutionResults;
+import org.junit.platform.testkit.engine.EngineTestKit;
+
+/**
+ * Test cases for stacktrace pruning.
+ *
+ * <p>Note: the package {@code org.junit.platform} this class resides in is
+ * chosen on purpose. If it was in {@code org.junit.platform.launcher}
+ * stack traces would be fully pruned.
+ *
+ * @since 5.10
+ */
+class StackTracePruningTests {
+
+	@Test
+	void shouldPruneStackTraceByDefault() {
+		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
+				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.execute();
+
+		List<StackTraceElement> stackTrace = extractStackTrace(results);
+
+		assertStackTraceMatch(stackTrace, """
+				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
+				""");
+
+		assertStackTraceDoesNotContain(stackTrace, "java.util.ArrayList.forEach(ArrayList.java:");
+		assertStackTraceDoesNotContain(stackTrace,
+			"jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:");
+	}
+
+	@Test
+	void shouldPruneStackTraceWhenEnabled() {
+		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
+				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
+				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.execute();
+
+		List<StackTraceElement> stackTrace = extractStackTrace(results);
+
+		assertStackTraceMatch(stackTrace, """
+				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
+				""");
+
+		assertStackTraceDoesNotContain(stackTrace, "java.util.ArrayList.forEach(ArrayList.java:");
+		assertStackTraceDoesNotContain(stackTrace,
+			"jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:");
+	}
+
+	@Test
+	void shouldNotPruneStackTraceWhenDisabled() {
+		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
+				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "false") //
+				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.execute();
+
+		List<StackTraceElement> stackTrace = extractStackTrace(results);
+
+		assertStackTraceMatch(stackTrace, """
+				\\Qorg.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:\\E.+
+				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
+				>>>>
+				\\Qjava.base/java.util.ArrayList.forEach(ArrayList.java:\\E.+
+				>>>>
+				""");
+	}
+
+	@Test
+	void shouldPruneStackTraceAccordingToPattern() {
+		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
+				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
+				.configurationParameter("junit.platform.stacktrace.pruning.pattern", "jdk.*") //
+				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.execute();
+
+		List<StackTraceElement> stackTrace = extractStackTrace(results);
+
+		assertStackTraceMatch(stackTrace, """
+				\\Qorg.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:\\E.+
+				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
+				>>>>
+				\\Qjava.base/java.util.ArrayList.forEach(ArrayList.java:\\E.+
+				>>>>
+				""");
+
+		assertStackTraceDoesNotContain(stackTrace, "jdk.");
+	}
+
+	@Test
+	void shouldAlwaysKeepJupiterAssertionStackTraceElement() {
+		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
+				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
+				.configurationParameter("junit.platform.stacktrace.pruning.pattern", "*") //
+				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.execute();
+
+		List<StackTraceElement> stackTrace = extractStackTrace(results);
+
+		assertStackTraceMatch(stackTrace, """
+				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
+				""");
+	}
+
+	@Test
+	void shouldAlwaysKeepJupiterAssumptionStackTraceElement() {
+		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
+				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
+				.configurationParameter("junit.platform.stacktrace.pruning.pattern", "*") //
+				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssumption")) //
+				.execute();
+
+		List<StackTraceElement> stackTrace = extractStackTrace(results);
+
+		assertStackTraceMatch(stackTrace, """
+				\\Qorg.junit.jupiter.api.Assumptions.assumeTrue(Assumptions.java:\\E.+
+				""");
+	}
+
+	@Test
+	void shouldPruneStackTracesOfSuppressedExceptions() {
+		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
+				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
+				.selectors(selectMethod(StackTracePruningTestCase.class, "multipleFailingAssertions")) //
+				.execute();
+
+		Throwable throwable = getThrowable(results);
+
+		for (Throwable suppressed : throwable.getSuppressed()) {
+			List<StackTraceElement> stackTrace = Arrays.asList(suppressed.getStackTrace());
+			assertStackTraceDoesNotContain(stackTrace, "java.util.ArrayList.forEach(ArrayList.java:");
+		}
+	}
+
+	private static List<StackTraceElement> extractStackTrace(EngineExecutionResults results) {
+		return Arrays.asList(getThrowable(results).getStackTrace());
+	}
+
+	private static Throwable getThrowable(EngineExecutionResults results) {
+		var failedTestEvent = results.testEvents().failed().list().get(0);
+		var testResult = failedTestEvent.getRequiredPayload(TestExecutionResult.class);
+		return testResult.getThrowable().orElseThrow();
+	}
+
+	private static void assertStackTraceMatch(List<StackTraceElement> stackTrace, String expectedLines) {
+		List<String> stackStraceAsLines = stackTrace.stream() //
+				.map(StackTraceElement::toString) //
+				.collect(Collectors.toList());
+		assertLinesMatch(expectedLines.lines().toList(), stackStraceAsLines);
+	}
+
+	private static void assertStackTraceDoesNotContain(List<StackTraceElement> stackTrace, String element) {
+		String stackStraceAsString = stackTrace.stream() //
+				.map(StackTraceElement::toString) //
+				.collect(Collectors.joining());
+		assertThat(stackStraceAsString).doesNotContain(element);
+	}
+
+	// -------------------------------------------------------------------
+
+	static class StackTracePruningTestCase {
+
+		@Test
+		void failingAssertion() {
+			Assertions.fail();
+		}
+
+		@Test
+		void multipleFailingAssertions() {
+			Assertions.assertAll(Assertions::fail, Assertions::fail);
+		}
+
+		@Test
+		void failingAssumption() {
+			Assumptions.assumeTrue(() -> {
+				throw new RuntimeException();
+			});
+		}
+
+	}
+
+}
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
index 7f0d6a7f34ff..214daefbba6b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassNamePatternFilterUtilsTests.java
@@ -45,11 +45,11 @@ class ClassNamePatternFilterUtilsTests {
 	})
 	//@formatter:on
 	@ParameterizedTest
-	void alwaysEnabledConditions(String pattern) {
+	void neverExcludedConditions(String pattern) {
 		List<? extends ExecutionCondition> executionConditions = List.of(new AExecutionConditionClass(),
 			new BExecutionConditionClass());
-		assertThat(executionConditions).filteredOn(
-			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isNotEmpty();
+		assertThat(executionConditions).filteredOn(ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)) //
+				.hasSize(2);
 	}
 
 	//@formatter:off
@@ -62,11 +62,11 @@ void alwaysEnabledConditions(String pattern) {
 	})
 	//@formatter:on
 	@ParameterizedTest
-	void alwaysDisabledConditions(String pattern) {
+	void alwaysExcludedConditions(String pattern) {
 		List<? extends ExecutionCondition> executionConditions = List.of(new AExecutionConditionClass(),
 			new BExecutionConditionClass());
-		assertThat(executionConditions).filteredOn(
-			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isEmpty();
+		assertThat(executionConditions).filteredOn(ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)) //
+				.isEmpty();
 	}
 
 	//@formatter:off
@@ -79,11 +79,11 @@ void alwaysDisabledConditions(String pattern) {
 	})
 	//@formatter:on
 	@ParameterizedTest
-	void alwaysEnabledListeners(String pattern) {
+	void neverExcludedListeners(String pattern) {
 		List<? extends TestExecutionListener> executionConditions = List.of(new ATestExecutionListenerClass(),
 			new BTestExecutionListenerClass());
-		assertThat(executionConditions).filteredOn(
-			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isNotEmpty();
+		assertThat(executionConditions).filteredOn(ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)) //
+				.hasSize(2);
 	}
 
 	//@formatter:off
@@ -96,11 +96,11 @@ void alwaysEnabledListeners(String pattern) {
 	})
 	//@formatter:on
 	@ParameterizedTest
-	void alwaysDisabledListeners(String pattern) {
+	void alwaysExcludedListeners(String pattern) {
 		List<? extends TestExecutionListener> executionConditions = List.of(new ATestExecutionListenerClass(),
 			new BTestExecutionListenerClass());
-		assertThat(executionConditions).filteredOn(
-			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isEmpty();
+		assertThat(executionConditions).filteredOn(ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)) //
+				.isEmpty();
 	}
 
 	//@formatter:off
@@ -113,10 +113,10 @@ void alwaysDisabledListeners(String pattern) {
 	})
 	//@formatter:on
 	@ParameterizedTest
-	void alwaysEnabledClass(String pattern) {
+	void neverExcludedClass(String pattern) {
 		var executionConditions = List.of(new AVanillaEmpty(), new BVanillaEmpty());
-		assertThat(executionConditions).filteredOn(
-			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isNotEmpty();
+		assertThat(executionConditions).filteredOn(ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)) //
+				.hasSize(2);
 	}
 
 	//@formatter:off
@@ -129,9 +129,44 @@ void alwaysEnabledClass(String pattern) {
 	})
 	//@formatter:on
 	@ParameterizedTest
-	void alwaysDisabledClass(String pattern) {
+	void alwaysExcludedClass(String pattern) {
 		var executionConditions = List.of(new AVanillaEmpty(), new BVanillaEmpty());
-		assertThat(executionConditions).filteredOn(
-			ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)).isEmpty();
+		assertThat(executionConditions).filteredOn(ClassNamePatternFilterUtils.excludeMatchingClasses(pattern)) //
+				.isEmpty();
 	}
+
+	//@formatter:off
+	@ValueSource(strings = {
+			"org.junit.jupiter.*",
+			"org.junit.platform.*.NonExistentClass",
+			"*.NonExistentClass*",
+			"*NonExistentClass*",
+			"AVanillaEmpty, BVanillaEmpty"
+	})
+	//@formatter:on
+	@ParameterizedTest
+	void neverExcludedClassName(String pattern) {
+		var executionConditions = List.of("org.junit.platform.commons.util.classes.AVanillaEmpty",
+			"org.junit.platform.commons.util.classes.BVanillaEmpty");
+		assertThat(executionConditions).filteredOn(ClassNamePatternFilterUtils.excludeMatchingClassNames(pattern)) //
+				.hasSize(2);
+	}
+
+	//@formatter:off
+	@ValueSource(strings = {
+			"org.junit.platform.*",
+			"*.platform.*",
+			"*",
+			"*AVanillaEmpty, *BVanillaEmpty",
+			"*VanillaEmpty"
+	})
+	//@formatter:on
+	@ParameterizedTest
+	void alwaysExcludedClassName(String pattern) {
+		var executionConditions = List.of("org.junit.platform.commons.util.classes.AVanillaEmpty",
+			"org.junit.platform.commons.util.classes.BVanillaEmpty");
+		assertThat(executionConditions).filteredOn(ClassNamePatternFilterUtils.excludeMatchingClassNames(pattern)) //
+				.isEmpty();
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
index b3750f5290c8..4d04fa970301 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
@@ -11,11 +11,17 @@
 package org.junit.platform.commons.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.platform.commons.util.ExceptionUtils.findNestedThrowables;
+import static org.junit.platform.commons.util.ExceptionUtils.pruneStackTrace;
 import static org.junit.platform.commons.util.ExceptionUtils.readStackTrace;
 import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.JUnitException;
@@ -62,4 +68,80 @@ void readStackTraceForLocalJUnitException() {
 		}
 	}
 
+	@Test
+	void pruneStackTraceOfCallsFromSpecificPackage() {
+		try {
+			throw new JUnitException("expected");
+		}
+		catch (JUnitException e) {
+			pruneStackTrace(e, element -> !element.startsWith("org.junit."));
+			assertThat(e.getStackTrace()) //
+					.noneMatch(element -> element.toString().contains("org.junit."));
+		}
+	}
+
+	@Test
+	void pruneStackTraceOfAllLauncherCalls() {
+		try {
+			throw new JUnitException("expected");
+		}
+		catch (JUnitException e) {
+			pruneStackTrace(e, element -> true);
+			assertThat(e.getStackTrace()) //
+					.noneMatch(element -> element.toString().contains("org.junit.platform.launcher."));
+		}
+	}
+
+	@Test
+	void pruneStackTraceOfEverythingPriorToFirstLauncherCall() {
+		try {
+			throw new JUnitException("expected");
+		}
+		catch (JUnitException e) {
+			StackTraceElement[] stackTrace = e.getStackTrace();
+			stackTrace[stackTrace.length - 1] = new StackTraceElement("org.example.Class", "method", "file", 123);
+			e.setStackTrace(stackTrace);
+
+			pruneStackTrace(e, element -> true);
+			assertThat(e.getStackTrace()) //
+					.noneMatch(element -> element.toString().contains("org.example.Class.method(file:123)"));
+		}
+	}
+
+	@Test
+	void findSuppressedExceptionsAndCausesOfThrowable() {
+		Throwable t1 = new Throwable("#1");
+		Throwable t2 = new Throwable("#2");
+		Throwable t3 = new Throwable("#3");
+		Throwable t4 = new Throwable("#4");
+		Throwable t5 = new Throwable("#5");
+		t1.initCause(t2);
+		t2.initCause(t3);
+		t1.addSuppressed(t4);
+		t2.addSuppressed(t5);
+
+		assertThat(findNestedThrowables(t1)) //
+				.extracting(Throwable::getMessage) //
+				.containsExactlyInAnyOrder("#1", "#2", "#3", "#4", "#5");
+	}
+
+	@Test
+	void avoidCyclesWhileSearchingForNestedThrowables() {
+		Throwable t1 = new Throwable();
+		Throwable t2 = new Throwable(t1);
+		Throwable t3 = new Throwable(t1);
+		t1.initCause(t2);
+		t1.addSuppressed(t3);
+		t2.addSuppressed(t3);
+
+		assertThat(findNestedThrowables(t1)).hasSize(3);
+	}
+
+	private static void assertStackTraceMatch(StackTraceElement[] stackTrace, String expectedLines) {
+		List<String> stackStraceAsLines = Arrays.stream(stackTrace) //
+				.map(StackTraceElement::toString) //
+				.collect(Collectors.toList());
+		assertLinesMatch(expectedLines.lines().toList(), stackStraceAsLines);
+	}
+
 }

From a77b77814cae4c674fcd03f8bac83dbc0b04f154 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 May 2023 05:59:36 +0000
Subject: [PATCH 1294/1433] Bump com.github.marschall:memoryfilesystem from
 2.5.1 to 2.6.0

Bumps [com.github.marschall:memoryfilesystem](https://github.com/marschall/memoryfilesystem) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/marschall/memoryfilesystem/releases)
- [Commits](https://github.com/marschall/memoryfilesystem/compare/2.5.1...2.6.0)

---
updated-dependencies:
- dependency-name: com.github.marschall:memoryfilesystem
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index eef6fddd7e51..3e6b28566abc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.1" }
-memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.5.1" }
+memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.6.0" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.3.1" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }

From 212f165cbbad83a034f7c1d9df0f8581176a0bc1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 9 May 2023 15:33:27 +0200
Subject: [PATCH 1295/1433] Polish built-in @ParameterizedTest argument
 converters

---
 .../converter/DefaultArgumentConverter.java   | 63 ++++++++++---------
 .../DefaultArgumentConverterTests.java        |  6 +-
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index adc8a5486088..04ea897f792d 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -39,7 +39,6 @@
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.util.Collections;
 import java.util.Currency;
 import java.util.HashMap;
 import java.util.List;
@@ -76,8 +75,9 @@ public class DefaultArgumentConverter extends SimpleArgumentConverter {
 	public static final DefaultArgumentConverter INSTANCE = new DefaultArgumentConverter();
 
 	private static final List<StringToObjectConverter> stringToObjectConverters = unmodifiableList(asList( //
-		new StringToBooleanAndCharPrimitiveConverter(), //
-		new StringToNumericPrimitiveConverter(), //
+		new StringToBooleanConverter(), //
+		new StringToCharacterConverter(), //
+		new StringToNumberConverter(), //
 		new StringToEnumConverter(), //
 		new StringToJavaTimeConverter(), //
 		new StringToCommonJavaTypesConverter(), //
@@ -93,7 +93,7 @@ public Object convert(Object source, Class<?> targetType) {
 		if (source == null) {
 			if (targetType.isPrimitive()) {
 				throw new ArgumentConversionException(
-					"Cannot convert null to primitive value of type " + targetType.getName());
+					"Cannot convert null to primitive value of type " + targetType.getTypeName());
 			}
 			return null;
 		}
@@ -102,16 +102,17 @@ public Object convert(Object source, Class<?> targetType) {
 			return source;
 		}
 
-		return convertToTargetType(source, toWrapperType(targetType));
+		return convertToTargetType(source, targetType);
 	}
 
 	private Object convertToTargetType(Object source, Class<?> targetType) {
 		if (source instanceof String) {
+			Class<?> targetTypeToUse = toWrapperType(targetType);
 			Optional<StringToObjectConverter> converter = stringToObjectConverters.stream().filter(
-				candidate -> candidate.canConvert(targetType)).findFirst();
+				candidate -> candidate.canConvert(targetTypeToUse)).findFirst();
 			if (converter.isPresent()) {
 				try {
-					return converter.get().convert((String) source, targetType);
+					return converter.get().convert((String) source, targetTypeToUse);
 				}
 				catch (Exception ex) {
 					if (ex instanceof ArgumentConversionException) {
@@ -120,7 +121,7 @@ private Object convertToTargetType(Object source, Class<?> targetType) {
 					}
 					// else
 					throw new ArgumentConversionException(
-						"Failed to convert String \"" + source + "\" to type " + targetType.getName(), ex);
+						"Failed to convert String \"" + source + "\" to type " + targetType.getTypeName(), ex);
 				}
 			}
 		}
@@ -135,42 +136,48 @@ private static Class<?> toWrapperType(Class<?> targetType) {
 
 	interface StringToObjectConverter {
 
+		/**
+		 * Determine if this converter can convert from a {@link String} to the
+		 * supplied target type (which is guaranteed to be a wrapper type for
+		 * primitives &mdash; for example, {@link Integer} instead of {@code int}).
+		 */
 		boolean canConvert(Class<?> targetType);
 
 		Object convert(String source, Class<?> targetType) throws Exception;
 
 	}
 
-	private static class StringToBooleanAndCharPrimitiveConverter implements StringToObjectConverter {
+	private static class StringToBooleanConverter implements StringToObjectConverter {
 
-		private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
-		static {
-			Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
-			converters.put(Boolean.class, source -> {
-				boolean isTrue = "true".equalsIgnoreCase(source);
-				Preconditions.condition(isTrue || "false".equalsIgnoreCase(source),
-					() -> "String must be (ignoring case) 'true' or 'false': " + source);
-				return isTrue;
-			});
-			converters.put(Character.class, source -> {
-				Preconditions.condition(source.length() == 1, () -> "String must have length of 1: " + source);
-				return source.charAt(0);
-			});
-			CONVERTERS = unmodifiableMap(converters);
+		@Override
+		public boolean canConvert(Class<?> targetType) {
+			return targetType == Boolean.class;
+		}
+
+		@Override
+		public Object convert(String source, Class<?> targetType) {
+			boolean isTrue = "true".equalsIgnoreCase(source);
+			Preconditions.condition(isTrue || "false".equalsIgnoreCase(source),
+				() -> "String must be 'true' or 'false' (ignoring case): " + source);
+			return isTrue;
 		}
+	}
+
+	private static class StringToCharacterConverter implements StringToObjectConverter {
 
 		@Override
 		public boolean canConvert(Class<?> targetType) {
-			return CONVERTERS.containsKey(targetType);
+			return targetType == Character.class;
 		}
 
 		@Override
 		public Object convert(String source, Class<?> targetType) {
-			return CONVERTERS.get(targetType).apply(source);
+			Preconditions.condition(source.length() == 1, () -> "String must have length of 1: " + source);
+			return source.charAt(0);
 		}
 	}
 
-	private static class StringToNumericPrimitiveConverter implements StringToObjectConverter {
+	private static class StringToNumberConverter implements StringToObjectConverter {
 
 		private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
 		static {
@@ -232,7 +239,7 @@ private static class StringToJavaTimeConverter implements StringToObjectConverte
 			converters.put(ZonedDateTime.class, ZonedDateTime::parse);
 			converters.put(ZoneId.class, ZoneId::of);
 			converters.put(ZoneOffset.class, ZoneOffset::of);
-			CONVERTERS = Collections.unmodifiableMap(converters);
+			CONVERTERS = unmodifiableMap(converters);
 		}
 
 		@Override
@@ -270,7 +277,7 @@ private static class StringToCommonJavaTypesConverter implements StringToObjectC
 			converters.put(Locale.class, Locale::new);
 			converters.put(UUID.class, UUID::fromString);
 
-			CONVERTERS = Collections.unmodifiableMap(converters);
+			CONVERTERS = unmodifiableMap(converters);
 		}
 
 		@Override
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 9dbff3ae7c96..5f7e022c15b7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -104,15 +104,15 @@ void convertsStringsToPrimitiveTypes() {
 	void throwsExceptionOnInvalidStringForPrimitiveTypes() {
 		assertThatExceptionOfType(ArgumentConversionException.class) //
 				.isThrownBy(() -> convert("ab", char.class)) //
-				.withMessage("Failed to convert String \"ab\" to type java.lang.Character") //
+				.withMessage("Failed to convert String \"ab\" to type char") //
 				.havingCause() //
 				.withMessage("String must have length of 1: ab");
 
 		assertThatExceptionOfType(ArgumentConversionException.class) //
 				.isThrownBy(() -> convert("tru", boolean.class)) //
-				.withMessage("Failed to convert String \"tru\" to type java.lang.Boolean") //
+				.withMessage("Failed to convert String \"tru\" to type boolean") //
 				.havingCause() //
-				.withMessage("String must be (ignoring case) 'true' or 'false': tru");
+				.withMessage("String must be 'true' or 'false' (ignoring case): tru");
 	}
 
 	/**

From 950f7b7d148aea2e099da3d424bd2d06756496b9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 9 May 2023 15:58:27 +0200
Subject: [PATCH 1296/1433] Improve error messages for @ParameterizedTest
 argument conversion

This commit also adds tests for missing built-in conversion support.
---
 .../converter/DefaultArgumentConverter.java   | 12 ++++----
 .../DefaultArgumentConverterTests.java        | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index 04ea897f792d..ef61c8d80c63 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -125,8 +125,9 @@ private Object convertToTargetType(Object source, Class<?> targetType) {
 				}
 			}
 		}
-		throw new ArgumentConversionException("No implicit conversion to convert object of type "
-				+ source.getClass().getName() + " to type " + targetType.getName());
+		throw new ArgumentConversionException(
+			String.format("No built-in converter for source type %s and target type %s",
+				source.getClass().getTypeName(), targetType.getTypeName()));
 	}
 
 	private static Class<?> toWrapperType(Class<?> targetType) {
@@ -291,12 +292,11 @@ public Object convert(String source, Class<?> targetType) throws Exception {
 		}
 
 		private static Class<?> toClass(String type) {
-			//@formatter:off
-			return ReflectionUtils
-					.tryToLoadClass(type)
+			// @formatter:off
+			return ReflectionUtils.tryToLoadClass(type)
 					.getOrThrow(cause -> new ArgumentConversionException(
 							"Failed to convert String \"" + type + "\" to type " + Class.class.getName(), cause));
-			//@formatter:on
+			// @formatter:on
 		}
 
 		private static URL toURL(String url) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 5f7e022c15b7..8548cb3caed9 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -115,6 +115,30 @@ void throwsExceptionOnInvalidStringForPrimitiveTypes() {
 				.withMessage("String must be 'true' or 'false' (ignoring case): tru");
 	}
 
+	@Test
+	void throwsExceptionWhenImplicitConverstionIsUnsupported() {
+		assertThatExceptionOfType(ArgumentConversionException.class) //
+				.isThrownBy(() -> convert("foo", Enigma.class)) //
+				.withMessage("No built-in converter for source type java.lang.String and target type %s",
+					Enigma.class.getName());
+
+		assertThatExceptionOfType(ArgumentConversionException.class) //
+				.isThrownBy(() -> convert(new Enigma(), int[].class)) //
+				.withMessage("No built-in converter for source type %s and target type int[]", Enigma.class.getName());
+
+		assertThatExceptionOfType(ArgumentConversionException.class) //
+				.isThrownBy(() -> convert(new long[] {}, int[].class)) //
+				.withMessage("No built-in converter for source type long[] and target type int[]");
+
+		assertThatExceptionOfType(ArgumentConversionException.class) //
+				.isThrownBy(() -> convert(new String[] {}, boolean.class)) //
+				.withMessage("No built-in converter for source type java.lang.String[] and target type boolean");
+
+		assertThatExceptionOfType(ArgumentConversionException.class) //
+				.isThrownBy(() -> convert(Class.class, int[].class)) //
+				.withMessage("No built-in converter for source type java.lang.Class and target type int[]");
+	}
+
 	/**
 	 * @since 5.4
 	 */
@@ -258,4 +282,8 @@ private void assertConverts(Object input, Class<?> targetClass, Object expectedO
 	private Object convert(Object input, Class<?> targetClass) {
 		return DefaultArgumentConverter.INSTANCE.convert(input, targetClass);
 	}
+
+	private static class Enigma {
+	}
+
 }

From 357186978015c1875f17e2dad7446cf394f506bb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 9 May 2023 16:12:25 +0200
Subject: [PATCH 1297/1433] Polishing

---
 .../jupiter/params/converter/DefaultArgumentConverter.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index ef61c8d80c63..6f85dd6cfd8a 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -295,7 +295,7 @@ private static Class<?> toClass(String type) {
 			// @formatter:off
 			return ReflectionUtils.tryToLoadClass(type)
 					.getOrThrow(cause -> new ArgumentConversionException(
-							"Failed to convert String \"" + type + "\" to type " + Class.class.getName(), cause));
+							"Failed to convert String \"" + type + "\" to type java.lang.Class", cause));
 			// @formatter:on
 		}
 
@@ -304,8 +304,8 @@ private static URL toURL(String url) {
 				return URI.create(url).toURL();
 			}
 			catch (MalformedURLException ex) {
-				throw new ArgumentConversionException(
-					"Failed to convert String \"" + url + "\" to type " + URL.class.getName(), ex);
+				throw new ArgumentConversionException("Failed to convert String \"" + url + "\" to type java.net.URL",
+					ex);
 			}
 		}
 

From f6e73acdbe9133bdd4286241c88f707a3a3228cc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 9 May 2023 15:18:43 +0200
Subject: [PATCH 1298/1433] Convert String to Class using custom ClassLoader
 for @ParameterizedTest

The @ParameterizedTest infrastructure has built-in support for
converting from a fully-qualified class name (String) to a Class;
however, if the named class is not visible in JUnit's default
ClassLoader, the conversion will fail.

This commit addresses this issue by refactoring the internals of the
@ParameterizedTest infrastructure so that the ClassLoader of the class
in which the @ParameterizedTest method is declared is used to resolve
classes instead of the default ClassLoader

Closes #3291
---
 .../release-notes-5.10.0-M1.adoc              |  5 +-
 .../junit-jupiter-params.gradle.kts           |  1 +
 .../ParameterizedTestMethodContext.java       |  2 +-
 .../aggregator/DefaultArgumentsAccessor.java  |  9 ++-
 .../converter/DefaultArgumentConverter.java   | 59 +++++++++++-----
 .../DefaultArgumentsAccessorTests.java        | 70 ++++++++++++-------
 .../DefaultArgumentConverterTests.java        | 48 ++++++++++++-
 .../ArgumentsAccessorKotlinTests.kt           | 33 +++++++--
 8 files changed, 173 insertions(+), 54 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index be76fc61d78c..8c73d6d54a75 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -74,7 +74,10 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* When converting an argument for a `@ParameterizedTest` method from a fully-qualified
+  class name (`String`) to a `Class`, the `ClassLoader` of the class in which the
+  `@ParameterizedTest` method is declared is now used to resolve the `Class` instead of
+  the _default_ `ClassLoader`.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
index f023f4c3ea83..ac430302010c 100644
--- a/junit-jupiter-params/junit-jupiter-params.gradle.kts
+++ b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
 	testImplementation(projects.junitJupiterEngine)
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformSuiteEngine)
+	testImplementation(testFixtures(projects.junitPlatformCommons))
 	testImplementation(testFixtures(projects.junitJupiterEngine))
 
 	compileOnly(kotlin("stdlib"))
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
index 5f3b159af785..43223b0d3da7 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
@@ -253,7 +253,7 @@ static class Aggregator implements Resolver {
 
 		@Override
 		public Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex) {
-			ArgumentsAccessor accessor = new DefaultArgumentsAccessor(invocationIndex, arguments);
+			ArgumentsAccessor accessor = new DefaultArgumentsAccessor(parameterContext, invocationIndex, arguments);
 			try {
 				return this.argumentsAggregator.aggregateArguments(accessor, parameterContext);
 			}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
index d5990c4716e3..33064919c351 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java
@@ -18,6 +18,7 @@
 import java.util.List;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.params.converter.DefaultArgumentConverter;
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.Preconditions;
@@ -35,12 +36,15 @@
 @API(status = INTERNAL, since = "5.2")
 public class DefaultArgumentsAccessor implements ArgumentsAccessor {
 
+	private final ParameterContext parameterContext;
 	private final int invocationIndex;
 	private final Object[] arguments;
 
-	public DefaultArgumentsAccessor(int invocationIndex, Object... arguments) {
+	public DefaultArgumentsAccessor(ParameterContext parameterContext, int invocationIndex, Object... arguments) {
+		Preconditions.notNull(parameterContext, "ParameterContext must not be null");
 		Preconditions.condition(invocationIndex >= 1, () -> "invocation index must be >= 1");
 		Preconditions.notNull(arguments, "Arguments array must not be null");
+		this.parameterContext = parameterContext;
 		this.invocationIndex = invocationIndex;
 		this.arguments = arguments;
 	}
@@ -57,7 +61,8 @@ public <T> T get(int index, Class<T> requiredType) {
 		Preconditions.notNull(requiredType, "requiredType must not be null");
 		Object value = get(index);
 		try {
-			Object convertedValue = DefaultArgumentConverter.INSTANCE.convert(value, requiredType);
+			Object convertedValue = DefaultArgumentConverter.INSTANCE.convert(value, requiredType,
+				this.parameterContext);
 			return requiredType.cast(convertedValue);
 		}
 		catch (Exception ex) {
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index 6f85dd6cfd8a..83ff6fa24477 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -49,6 +49,8 @@
 import java.util.function.Function;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.platform.commons.util.ClassLoaderUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
 
@@ -70,7 +72,7 @@
  * @see org.junit.jupiter.params.converter.ArgumentConverter
  */
 @API(status = INTERNAL, since = "5.0")
-public class DefaultArgumentConverter extends SimpleArgumentConverter {
+public class DefaultArgumentConverter implements ArgumentConverter {
 
 	public static final DefaultArgumentConverter INSTANCE = new DefaultArgumentConverter();
 
@@ -78,6 +80,7 @@ public class DefaultArgumentConverter extends SimpleArgumentConverter {
 		new StringToBooleanConverter(), //
 		new StringToCharacterConverter(), //
 		new StringToNumberConverter(), //
+		new StringToClassConverter(), //
 		new StringToEnumConverter(), //
 		new StringToJavaTimeConverter(), //
 		new StringToCommonJavaTypesConverter(), //
@@ -89,7 +92,12 @@ private DefaultArgumentConverter() {
 	}
 
 	@Override
-	public Object convert(Object source, Class<?> targetType) {
+	public final Object convert(Object source, ParameterContext context) {
+		Class<?> targetType = context.getParameter().getType();
+		return convert(source, targetType, context);
+	}
+
+	public final Object convert(Object source, Class<?> targetType, ParameterContext context) {
 		if (source == null) {
 			if (targetType.isPrimitive()) {
 				throw new ArgumentConversionException(
@@ -102,17 +110,17 @@ public Object convert(Object source, Class<?> targetType) {
 			return source;
 		}
 
-		return convertToTargetType(source, targetType);
-	}
-
-	private Object convertToTargetType(Object source, Class<?> targetType) {
 		if (source instanceof String) {
 			Class<?> targetTypeToUse = toWrapperType(targetType);
 			Optional<StringToObjectConverter> converter = stringToObjectConverters.stream().filter(
 				candidate -> candidate.canConvert(targetTypeToUse)).findFirst();
 			if (converter.isPresent()) {
+				ClassLoader classLoader = context.getDeclaringExecutable().getDeclaringClass().getClassLoader();
+				if (classLoader == null) {
+					classLoader = ClassLoaderUtils.getDefaultClassLoader();
+				}
 				try {
-					return converter.get().convert((String) source, targetTypeToUse);
+					return converter.get().convert((String) source, targetTypeToUse, classLoader);
 				}
 				catch (Exception ex) {
 					if (ex instanceof ArgumentConversionException) {
@@ -146,6 +154,10 @@ interface StringToObjectConverter {
 
 		Object convert(String source, Class<?> targetType) throws Exception;
 
+		default Object convert(String source, Class<?> targetType, ClassLoader classLoader) throws Exception {
+			return convert(source, targetType);
+		}
+
 	}
 
 	private static class StringToBooleanConverter implements StringToObjectConverter {
@@ -203,6 +215,29 @@ public Object convert(String source, Class<?> targetType) {
 		}
 	}
 
+	private static class StringToClassConverter implements StringToObjectConverter {
+
+		@Override
+		public boolean canConvert(Class<?> targetType) {
+			return targetType == Class.class;
+		}
+
+		@Override
+		public Object convert(String source, Class<?> targetType) throws Exception {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public Object convert(String className, Class<?> targetType, ClassLoader classLoader) throws Exception {
+			// @formatter:off
+			return ReflectionUtils.tryToLoadClass(className, classLoader)
+					.getOrThrow(cause -> new ArgumentConversionException(
+							"Failed to convert String \"" + className + "\" to type java.lang.Class", cause));
+			// @formatter:on
+		}
+
+	}
+
 	private static class StringToEnumConverter implements StringToObjectConverter {
 
 		@Override
@@ -261,8 +296,6 @@ private static class StringToCommonJavaTypesConverter implements StringToObjectC
 		static {
 			Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
 
-			// java.lang
-			converters.put(Class.class, StringToCommonJavaTypesConverter::toClass);
 			// java.io and java.nio
 			converters.put(File.class, File::new);
 			converters.put(Charset.class, Charset::forName);
@@ -291,14 +324,6 @@ public Object convert(String source, Class<?> targetType) throws Exception {
 			return CONVERTERS.get(targetType).apply(source);
 		}
 
-		private static Class<?> toClass(String type) {
-			// @formatter:off
-			return ReflectionUtils.tryToLoadClass(type)
-					.getOrThrow(cause -> new ArgumentConversionException(
-							"Failed to convert String \"" + type + "\" to type java.lang.Class", cause));
-			// @formatter:on
-		}
-
 		private static URL toURL(String url) {
 			try {
 				return URI.create(url).toURL();
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
index f56beb375dc5..10abef0847d7 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessorTests.java
@@ -16,11 +16,16 @@
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.lang.reflect.Method;
 import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
  * Unit tests for {@link DefaultArgumentsAccessor}.
@@ -31,53 +36,53 @@ class DefaultArgumentsAccessorTests {
 
 	@Test
 	void argumentsMustNotBeNull() {
-		assertThrows(PreconditionViolationException.class, () -> new DefaultArgumentsAccessor(1, (Object[]) null));
+		assertThrows(PreconditionViolationException.class, () -> defaultArgumentsAccessor(1, (Object[]) null));
 	}
 
 	@Test
 	void indexMustNotBeNegative() {
-		ArgumentsAccessor arguments = new DefaultArgumentsAccessor(1, 1, 2);
+		ArgumentsAccessor arguments = defaultArgumentsAccessor(1, 1, 2);
 		Exception exception = assertThrows(PreconditionViolationException.class, () -> arguments.get(-1));
 		assertThat(exception.getMessage()).containsSubsequence("index must be", ">= 0");
 	}
 
 	@Test
 	void indexMustBeSmallerThanLength() {
-		ArgumentsAccessor arguments = new DefaultArgumentsAccessor(1, 1, 2);
+		ArgumentsAccessor arguments = defaultArgumentsAccessor(1, 1, 2);
 		Exception exception = assertThrows(PreconditionViolationException.class, () -> arguments.get(2));
 		assertThat(exception.getMessage()).containsSubsequence("index must be", "< 2");
 	}
 
 	@Test
 	void getNull() {
-		assertNull(new DefaultArgumentsAccessor(1, new Object[] { null }).get(0));
+		assertNull(defaultArgumentsAccessor(1, new Object[] { null }).get(0));
 	}
 
 	@Test
 	void getWithNullCastToWrapperType() {
-		assertNull(new DefaultArgumentsAccessor(1, (Object[]) new Integer[] { null }).get(0, Integer.class));
+		assertNull(defaultArgumentsAccessor(1, (Object[]) new Integer[] { null }).get(0, Integer.class));
 	}
 
 	@Test
 	void get() {
-		assertEquals(1, new DefaultArgumentsAccessor(1, 1).get(0));
+		assertEquals(1, defaultArgumentsAccessor(1, 1).get(0));
 	}
 
 	@Test
 	void getWithCast() {
-		assertEquals(Integer.valueOf(1), new DefaultArgumentsAccessor(1, 1).get(0, Integer.class));
-		assertEquals(Character.valueOf('A'), new DefaultArgumentsAccessor(1, 'A').get(0, Character.class));
+		assertEquals(Integer.valueOf(1), defaultArgumentsAccessor(1, 1).get(0, Integer.class));
+		assertEquals(Character.valueOf('A'), defaultArgumentsAccessor(1, 'A').get(0, Character.class));
 	}
 
 	@Test
 	void getWithCastToPrimitiveType() {
 		Exception exception = assertThrows(ArgumentAccessException.class,
-			() -> new DefaultArgumentsAccessor(1, 1).get(0, int.class));
+			() -> defaultArgumentsAccessor(1, 1).get(0, int.class));
 		assertThat(exception.getMessage()).isEqualTo(
 			"Argument at index [0] with value [1] and type [java.lang.Integer] could not be converted or cast to type [int].");
 
 		exception = assertThrows(ArgumentAccessException.class,
-			() -> new DefaultArgumentsAccessor(1, new Object[] { null }).get(0, int.class));
+			() -> defaultArgumentsAccessor(1, new Object[] { null }).get(0, int.class));
 		assertThat(exception.getMessage()).isEqualTo(
 			"Argument at index [0] with value [null] and type [null] could not be converted or cast to type [int].");
 	}
@@ -85,59 +90,59 @@ void getWithCastToPrimitiveType() {
 	@Test
 	void getWithCastToIncompatibleType() {
 		Exception exception = assertThrows(ArgumentAccessException.class,
-			() -> new DefaultArgumentsAccessor(1, 1).get(0, Character.class));
+			() -> defaultArgumentsAccessor(1, 1).get(0, Character.class));
 		assertThat(exception.getMessage()).isEqualTo(
 			"Argument at index [0] with value [1] and type [java.lang.Integer] could not be converted or cast to type [java.lang.Character].");
 	}
 
 	@Test
 	void getCharacter() {
-		assertEquals(Character.valueOf('A'), new DefaultArgumentsAccessor(1, 'A', 'B').getCharacter(0));
+		assertEquals(Character.valueOf('A'), defaultArgumentsAccessor(1, 'A', 'B').getCharacter(0));
 	}
 
 	@Test
 	void getBoolean() {
-		assertEquals(Boolean.TRUE, new DefaultArgumentsAccessor(1, true, false).getBoolean(0));
+		assertEquals(Boolean.TRUE, defaultArgumentsAccessor(1, true, false).getBoolean(0));
 	}
 
 	@Test
 	void getByte() {
-		assertEquals(Byte.valueOf((byte) 42), new DefaultArgumentsAccessor(1, (byte) 42).getByte(0));
+		assertEquals(Byte.valueOf((byte) 42), defaultArgumentsAccessor(1, (byte) 42).getByte(0));
 	}
 
 	@Test
 	void getShort() {
-		assertEquals(Short.valueOf((short) 42), new DefaultArgumentsAccessor(1, (short) 42).getShort(0));
+		assertEquals(Short.valueOf((short) 42), defaultArgumentsAccessor(1, (short) 42).getShort(0));
 	}
 
 	@Test
 	void getInteger() {
-		assertEquals(Integer.valueOf(42), new DefaultArgumentsAccessor(1, 42).getInteger(0));
+		assertEquals(Integer.valueOf(42), defaultArgumentsAccessor(1, 42).getInteger(0));
 	}
 
 	@Test
 	void getLong() {
-		assertEquals(Long.valueOf(42L), new DefaultArgumentsAccessor(1, 42L).getLong(0));
+		assertEquals(Long.valueOf(42L), defaultArgumentsAccessor(1, 42L).getLong(0));
 	}
 
 	@Test
 	void getFloat() {
-		assertEquals(Float.valueOf(42.0f), new DefaultArgumentsAccessor(1, 42.0f).getFloat(0));
+		assertEquals(Float.valueOf(42.0f), defaultArgumentsAccessor(1, 42.0f).getFloat(0));
 	}
 
 	@Test
 	void getDouble() {
-		assertEquals(Double.valueOf(42.0), new DefaultArgumentsAccessor(1, 42.0).getDouble(0));
+		assertEquals(Double.valueOf(42.0), defaultArgumentsAccessor(1, 42.0).getDouble(0));
 	}
 
 	@Test
 	void getString() {
-		assertEquals("foo", new DefaultArgumentsAccessor(1, "foo", "bar").getString(0));
+		assertEquals("foo", defaultArgumentsAccessor(1, "foo", "bar").getString(0));
 	}
 
 	@Test
 	void toArray() {
-		var arguments = new DefaultArgumentsAccessor(1, "foo", "bar");
+		var arguments = defaultArgumentsAccessor(1, "foo", "bar");
 		var copy = arguments.toArray();
 		assertArrayEquals(new String[] { "foo", "bar" }, copy);
 
@@ -148,7 +153,7 @@ void toArray() {
 
 	@Test
 	void toList() {
-		var arguments = new DefaultArgumentsAccessor(1, "foo", "bar");
+		var arguments = defaultArgumentsAccessor(1, "foo", "bar");
 		var copy = arguments.toList();
 		assertIterableEquals(Arrays.asList("foo", "bar"), copy);
 
@@ -158,9 +163,24 @@ void toList() {
 
 	@Test
 	void size() {
-		assertEquals(0, new DefaultArgumentsAccessor(1).size());
-		assertEquals(1, new DefaultArgumentsAccessor(1, 42).size());
-		assertEquals(5, new DefaultArgumentsAccessor(1, 'a', 'b', 'c', 'd', 'e').size());
+		assertEquals(0, defaultArgumentsAccessor(1).size());
+		assertEquals(1, defaultArgumentsAccessor(1, 42).size());
+		assertEquals(5, defaultArgumentsAccessor(1, 'a', 'b', 'c', 'd', 'e').size());
+	}
+
+	private static DefaultArgumentsAccessor defaultArgumentsAccessor(int invocationIndex, Object... arguments) {
+		return new DefaultArgumentsAccessor(parameterContext(), invocationIndex, arguments);
+	}
+
+	private static ParameterContext parameterContext() {
+		Method declaringExecutable = ReflectionUtils.findMethod(DefaultArgumentsAccessorTests.class, "foo").get();
+		ParameterContext parameterContext = mock();
+		when(parameterContext.getDeclaringExecutable()).thenReturn(declaringExecutable);
+		return parameterContext;
+	}
+
+	@SuppressWarnings("unused")
+	private static void foo() {
 	}
 
 }
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 8548cb3caed9..07b49f494f27 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -12,9 +12,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.lang.Thread.State;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
@@ -43,6 +46,9 @@
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.platform.commons.test.TestClassLoader;
+import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
  * Unit tests for {@link DefaultArgumentConverter}.
@@ -202,6 +208,23 @@ void convertsStringToClass() {
 		assertConverts("[[Ljava.lang.String;", Class.class, String[][].class);
 	}
 
+	@Test
+	void convertsStringToClassWithCustomTypeFromDifferentClassLoader() throws Exception {
+		String customTypeName = Enigma.class.getName();
+		try (TestClassLoader customTypeClassLoader = TestClassLoader.forClasses(Enigma.class)) {
+			var customType = customTypeClassLoader.loadClass(customTypeName);
+			assertThat(customType.getClassLoader()).isInstanceOf(TestClassLoader.class);
+
+			var declaringExecutable = ReflectionUtils.findMethod(customType, "foo").get();
+			assertThat(declaringExecutable.getDeclaringClass().getClassLoader()).isInstanceOf(TestClassLoader.class);
+
+			var clazz = (Class<?>) convert(customTypeName, Class.class, parameterContext(declaringExecutable));
+			assertThat(clazz).isNotEqualTo(Enigma.class);
+			assertThat(clazz).isEqualTo(customType);
+			assertThat(clazz.getClassLoader()).isInstanceOf(TestClassLoader.class);
+		}
+	}
+
 	// --- java.math -----------------------------------------------------------
 
 	@Test
@@ -280,10 +303,33 @@ private void assertConverts(Object input, Class<?> targetClass, Object expectedO
 	}
 
 	private Object convert(Object input, Class<?> targetClass) {
-		return DefaultArgumentConverter.INSTANCE.convert(input, targetClass);
+		return convert(input, targetClass, parameterContext());
+	}
+
+	private Object convert(Object input, Class<?> targetClass, ParameterContext parameterContext) {
+		return DefaultArgumentConverter.INSTANCE.convert(input, targetClass, parameterContext);
+	}
+
+	private static ParameterContext parameterContext() {
+		Method declaringExecutable = ReflectionUtils.findMethod(DefaultArgumentConverterTests.class, "foo").get();
+		return parameterContext(declaringExecutable);
+	}
+
+	private static ParameterContext parameterContext(Method declaringExecutable) {
+		ParameterContext parameterContext = mock();
+		when(parameterContext.getDeclaringExecutable()).thenReturn(declaringExecutable);
+		return parameterContext;
+	}
+
+	@SuppressWarnings("unused")
+	private static void foo() {
 	}
 
 	private static class Enigma {
+
+		@SuppressWarnings("unused")
+		void foo() {
+		}
 	}
 
 }
diff --git a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
index d30f8f8e2cbd..3c50a0d173fd 100644
--- a/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
+++ b/junit-jupiter-params/src/test/kotlin/org/junit/jupiter/params/aggregator/ArgumentsAccessorKotlinTests.kt
@@ -13,6 +13,11 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.api.extension.ParameterContext
+import org.junit.platform.commons.util.ReflectionUtils
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.`when`
+import java.lang.reflect.Method
 
 /**
  * Unit tests for using [ArgumentsAccessor] from Kotlin.
@@ -21,14 +26,14 @@ class ArgumentsAccessorKotlinTests {
 
     @Test
     fun `get() with reified type and index`() {
-        assertEquals(1, DefaultArgumentsAccessor(1, 1).get<Int>(0))
-        assertEquals('A', DefaultArgumentsAccessor(1, 'A').get<Char>(0))
+        assertEquals(1, defaultArgumentsAccessor(1, 1).get<Int>(0))
+        assertEquals('A', defaultArgumentsAccessor(1, 'A').get<Char>(0))
     }
 
     @Test
     fun `get() with reified type and index for incompatible type`() {
         val exception = assertThrows<ArgumentAccessException> {
-            DefaultArgumentsAccessor(1, Integer.valueOf(1)).get<Char>(0)
+            defaultArgumentsAccessor(1, Integer.valueOf(1)).get<Char>(0)
         }
 
         assertThat(exception).hasMessage(
@@ -38,13 +43,27 @@ class ArgumentsAccessorKotlinTests {
 
     @Test
     fun `get() with index`() {
-        assertEquals(1, DefaultArgumentsAccessor(1, 1).get(0))
-        assertEquals('A', DefaultArgumentsAccessor(1, 'A').get(0))
+        assertEquals(1, defaultArgumentsAccessor(1, 1).get(0))
+        assertEquals('A', defaultArgumentsAccessor(1, 'A').get(0))
     }
 
     @Test
     fun `get() with index and class reference`() {
-        assertEquals(1, DefaultArgumentsAccessor(1, 1).get(0, Integer::class.java))
-        assertEquals('A', DefaultArgumentsAccessor(1, 'A').get(0, Character::class.java))
+        assertEquals(1, defaultArgumentsAccessor(1, 1).get(0, Integer::class.java))
+        assertEquals('A', defaultArgumentsAccessor(1, 'A').get(0, Character::class.java))
+    }
+
+    fun defaultArgumentsAccessor(invocationIndex: Int, vararg arguments: Any): DefaultArgumentsAccessor {
+        return DefaultArgumentsAccessor(parameterContext(), invocationIndex, *arguments)
+    }
+
+    fun parameterContext(): ParameterContext {
+        val declaringExecutable: Method = ReflectionUtils.findMethod(DefaultArgumentsAccessorTests::class.java, "foo").get()
+        val parameterContext: ParameterContext = mock()
+        `when`(parameterContext.getDeclaringExecutable()).thenReturn(declaringExecutable)
+        return parameterContext
+    }
+
+    fun foo() {
     }
 }

From bc36f2697833b0e821f3051b5710b431e5de8690 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 9 May 2023 18:06:19 +0200
Subject: [PATCH 1299/1433] Convert StringToObjectConverter and implementations
 to top-level types

---
 .../converter/DefaultArgumentConverter.java   | 216 ------------------
 .../FallbackStringToObjectConverter.java      |   1 -
 .../converter/StringToBooleanConverter.java   |  30 +++
 .../converter/StringToCharacterConverter.java |  28 +++
 .../converter/StringToClassConverter.java     |  36 +++
 .../StringToCommonJavaTypesConverter.java     |  75 ++++++
 .../converter/StringToEnumConverter.java      |  30 +++
 .../converter/StringToJavaTimeConverter.java  |  65 ++++++
 .../converter/StringToNumberConverter.java    |  43 ++++
 .../converter/StringToObjectConverter.java    |  46 ++++
 10 files changed, 353 insertions(+), 217 deletions(-)
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToBooleanConverter.java
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCharacterConverter.java
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToClassConverter.java
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCommonJavaTypesConverter.java
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToEnumConverter.java
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToJavaTimeConverter.java
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToNumberConverter.java
 create mode 100644 junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToObjectConverter.java

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index 83ff6fa24477..d542b3929e5e 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -12,46 +12,23 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
-import static java.util.Collections.unmodifiableMap;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.commons.util.ReflectionUtils.getWrapperType;
 
 import java.io.File;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.Currency;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.function.Function;
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.platform.commons.util.ClassLoaderUtils;
-import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
@@ -143,197 +120,4 @@ private static Class<?> toWrapperType(Class<?> targetType) {
 		return wrapperType != null ? wrapperType : targetType;
 	}
 
-	interface StringToObjectConverter {
-
-		/**
-		 * Determine if this converter can convert from a {@link String} to the
-		 * supplied target type (which is guaranteed to be a wrapper type for
-		 * primitives &mdash; for example, {@link Integer} instead of {@code int}).
-		 */
-		boolean canConvert(Class<?> targetType);
-
-		Object convert(String source, Class<?> targetType) throws Exception;
-
-		default Object convert(String source, Class<?> targetType, ClassLoader classLoader) throws Exception {
-			return convert(source, targetType);
-		}
-
-	}
-
-	private static class StringToBooleanConverter implements StringToObjectConverter {
-
-		@Override
-		public boolean canConvert(Class<?> targetType) {
-			return targetType == Boolean.class;
-		}
-
-		@Override
-		public Object convert(String source, Class<?> targetType) {
-			boolean isTrue = "true".equalsIgnoreCase(source);
-			Preconditions.condition(isTrue || "false".equalsIgnoreCase(source),
-				() -> "String must be 'true' or 'false' (ignoring case): " + source);
-			return isTrue;
-		}
-	}
-
-	private static class StringToCharacterConverter implements StringToObjectConverter {
-
-		@Override
-		public boolean canConvert(Class<?> targetType) {
-			return targetType == Character.class;
-		}
-
-		@Override
-		public Object convert(String source, Class<?> targetType) {
-			Preconditions.condition(source.length() == 1, () -> "String must have length of 1: " + source);
-			return source.charAt(0);
-		}
-	}
-
-	private static class StringToNumberConverter implements StringToObjectConverter {
-
-		private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
-		static {
-			Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
-			converters.put(Byte.class, Byte::decode);
-			converters.put(Short.class, Short::decode);
-			converters.put(Integer.class, Integer::decode);
-			converters.put(Long.class, Long::decode);
-			converters.put(Float.class, Float::valueOf);
-			converters.put(Double.class, Double::valueOf);
-			CONVERTERS = unmodifiableMap(converters);
-		}
-
-		@Override
-		public boolean canConvert(Class<?> targetType) {
-			return CONVERTERS.containsKey(targetType);
-		}
-
-		@Override
-		public Object convert(String source, Class<?> targetType) {
-			return CONVERTERS.get(targetType).apply(source.replace("_", ""));
-		}
-	}
-
-	private static class StringToClassConverter implements StringToObjectConverter {
-
-		@Override
-		public boolean canConvert(Class<?> targetType) {
-			return targetType == Class.class;
-		}
-
-		@Override
-		public Object convert(String source, Class<?> targetType) throws Exception {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public Object convert(String className, Class<?> targetType, ClassLoader classLoader) throws Exception {
-			// @formatter:off
-			return ReflectionUtils.tryToLoadClass(className, classLoader)
-					.getOrThrow(cause -> new ArgumentConversionException(
-							"Failed to convert String \"" + className + "\" to type java.lang.Class", cause));
-			// @formatter:on
-		}
-
-	}
-
-	private static class StringToEnumConverter implements StringToObjectConverter {
-
-		@Override
-		public boolean canConvert(Class<?> targetType) {
-			return targetType.isEnum();
-		}
-
-		@Override
-		public Object convert(String source, Class<?> targetType) throws Exception {
-			return valueOf(targetType, source);
-		}
-
-		@SuppressWarnings({ "unchecked", "rawtypes" })
-		private Object valueOf(Class targetType, String source) {
-			return Enum.valueOf(targetType, source);
-		}
-	}
-
-	private static class StringToJavaTimeConverter implements StringToObjectConverter {
-
-		private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
-		static {
-			Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
-			converters.put(Duration.class, Duration::parse);
-			converters.put(Instant.class, Instant::parse);
-			converters.put(LocalDate.class, LocalDate::parse);
-			converters.put(LocalDateTime.class, LocalDateTime::parse);
-			converters.put(LocalTime.class, LocalTime::parse);
-			converters.put(MonthDay.class, MonthDay::parse);
-			converters.put(OffsetDateTime.class, OffsetDateTime::parse);
-			converters.put(OffsetTime.class, OffsetTime::parse);
-			converters.put(Period.class, Period::parse);
-			converters.put(Year.class, Year::parse);
-			converters.put(YearMonth.class, YearMonth::parse);
-			converters.put(ZonedDateTime.class, ZonedDateTime::parse);
-			converters.put(ZoneId.class, ZoneId::of);
-			converters.put(ZoneOffset.class, ZoneOffset::of);
-			CONVERTERS = unmodifiableMap(converters);
-		}
-
-		@Override
-		public boolean canConvert(Class<?> targetType) {
-			return CONVERTERS.containsKey(targetType);
-		}
-
-		@Override
-		public Object convert(String source, Class<?> targetType) throws Exception {
-			return CONVERTERS.get(targetType).apply(source);
-		}
-	}
-
-	private static class StringToCommonJavaTypesConverter implements StringToObjectConverter {
-
-		private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
-
-		static {
-			Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
-
-			// java.io and java.nio
-			converters.put(File.class, File::new);
-			converters.put(Charset.class, Charset::forName);
-			converters.put(Path.class, Paths::get);
-			// java.net
-			converters.put(URI.class, URI::create);
-			converters.put(URL.class, StringToCommonJavaTypesConverter::toURL);
-			// java.math
-			converters.put(BigDecimal.class, BigDecimal::new);
-			converters.put(BigInteger.class, BigInteger::new);
-			// java.util
-			converters.put(Currency.class, Currency::getInstance);
-			converters.put(Locale.class, Locale::new);
-			converters.put(UUID.class, UUID::fromString);
-
-			CONVERTERS = unmodifiableMap(converters);
-		}
-
-		@Override
-		public boolean canConvert(Class<?> targetType) {
-			return CONVERTERS.containsKey(targetType);
-		}
-
-		@Override
-		public Object convert(String source, Class<?> targetType) throws Exception {
-			return CONVERTERS.get(targetType).apply(source);
-		}
-
-		private static URL toURL(String url) {
-			try {
-				return URI.create(url).toURL();
-			}
-			catch (MalformedURLException ex) {
-				throw new ArgumentConversionException("Failed to convert String \"" + url + "\" to type java.net.URL",
-					ex);
-			}
-		}
-
-	}
-
 }
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
index be2ea7d1370b..79f0028e58a6 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/FallbackStringToObjectConverter.java
@@ -26,7 +26,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import org.junit.jupiter.params.converter.DefaultArgumentConverter.StringToObjectConverter;
 import org.junit.platform.commons.util.Preconditions;
 
 /**
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToBooleanConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToBooleanConverter.java
new file mode 100644
index 000000000000..9d911825809b
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToBooleanConverter.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+import org.junit.platform.commons.util.Preconditions;
+
+class StringToBooleanConverter implements StringToObjectConverter {
+
+	@Override
+	public boolean canConvert(Class<?> targetType) {
+		return targetType == Boolean.class;
+	}
+
+	@Override
+	public Object convert(String source, Class<?> targetType) {
+		boolean isTrue = "true".equalsIgnoreCase(source);
+		Preconditions.condition(isTrue || "false".equalsIgnoreCase(source),
+			() -> "String must be 'true' or 'false' (ignoring case): " + source);
+		return isTrue;
+	}
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCharacterConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCharacterConverter.java
new file mode 100644
index 000000000000..b3849051e45d
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCharacterConverter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+import org.junit.platform.commons.util.Preconditions;
+
+class StringToCharacterConverter implements StringToObjectConverter {
+
+	@Override
+	public boolean canConvert(Class<?> targetType) {
+		return targetType == Character.class;
+	}
+
+	@Override
+	public Object convert(String source, Class<?> targetType) {
+		Preconditions.condition(source.length() == 1, () -> "String must have length of 1: " + source);
+		return source.charAt(0);
+	}
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToClassConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToClassConverter.java
new file mode 100644
index 000000000000..debefc342ed0
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToClassConverter.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+import org.junit.platform.commons.util.ReflectionUtils;
+
+class StringToClassConverter implements StringToObjectConverter {
+
+	@Override
+	public boolean canConvert(Class<?> targetType) {
+		return targetType == Class.class;
+	}
+
+	@Override
+	public Object convert(String source, Class<?> targetType) throws Exception {
+		throw new UnsupportedOperationException("Invoke convert(String, Class<?>, ClassLoader) instead");
+	}
+
+	@Override
+	public Object convert(String className, Class<?> targetType, ClassLoader classLoader) throws Exception {
+		// @formatter:off
+		return ReflectionUtils.tryToLoadClass(className, classLoader)
+				.getOrThrow(cause -> new ArgumentConversionException(
+						"Failed to convert String \"" + className + "\" to type java.lang.Class", cause));
+		// @formatter:on
+	}
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCommonJavaTypesConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCommonJavaTypesConverter.java
new file mode 100644
index 000000000000..7237433ac82b
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCommonJavaTypesConverter.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+import static java.util.Collections.unmodifiableMap;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Currency;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
+
+class StringToCommonJavaTypesConverter implements StringToObjectConverter {
+
+	private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
+
+	static {
+		Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
+
+		// java.io and java.nio
+		converters.put(File.class, File::new);
+		converters.put(Charset.class, Charset::forName);
+		converters.put(Path.class, Paths::get);
+		// java.net
+		converters.put(URI.class, URI::create);
+		converters.put(URL.class, StringToCommonJavaTypesConverter::toURL);
+		// java.math
+		converters.put(BigDecimal.class, BigDecimal::new);
+		converters.put(BigInteger.class, BigInteger::new);
+		// java.util
+		converters.put(Currency.class, Currency::getInstance);
+		converters.put(Locale.class, Locale::new);
+		converters.put(UUID.class, UUID::fromString);
+
+		CONVERTERS = unmodifiableMap(converters);
+	}
+
+	@Override
+	public boolean canConvert(Class<?> targetType) {
+		return CONVERTERS.containsKey(targetType);
+	}
+
+	@Override
+	public Object convert(String source, Class<?> targetType) throws Exception {
+		return CONVERTERS.get(targetType).apply(source);
+	}
+
+	private static URL toURL(String url) {
+		try {
+			return URI.create(url).toURL();
+		}
+		catch (MalformedURLException ex) {
+			throw new ArgumentConversionException("Failed to convert String \"" + url + "\" to type java.net.URL", ex);
+		}
+	}
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToEnumConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToEnumConverter.java
new file mode 100644
index 000000000000..f33fe6bf9f72
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToEnumConverter.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+class StringToEnumConverter implements StringToObjectConverter {
+
+	@Override
+	public boolean canConvert(Class<?> targetType) {
+		return targetType.isEnum();
+	}
+
+	@Override
+	public Object convert(String source, Class<?> targetType) throws Exception {
+		return valueOf(targetType, source);
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	private static Object valueOf(Class targetType, String source) {
+		return Enum.valueOf(targetType, source);
+	}
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToJavaTimeConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToJavaTimeConverter.java
new file mode 100644
index 000000000000..b1851ecc323d
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToJavaTimeConverter.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+import static java.util.Collections.unmodifiableMap;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+class StringToJavaTimeConverter implements StringToObjectConverter {
+
+	private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
+	static {
+		Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
+		converters.put(Duration.class, Duration::parse);
+		converters.put(Instant.class, Instant::parse);
+		converters.put(LocalDate.class, LocalDate::parse);
+		converters.put(LocalDateTime.class, LocalDateTime::parse);
+		converters.put(LocalTime.class, LocalTime::parse);
+		converters.put(MonthDay.class, MonthDay::parse);
+		converters.put(OffsetDateTime.class, OffsetDateTime::parse);
+		converters.put(OffsetTime.class, OffsetTime::parse);
+		converters.put(Period.class, Period::parse);
+		converters.put(Year.class, Year::parse);
+		converters.put(YearMonth.class, YearMonth::parse);
+		converters.put(ZonedDateTime.class, ZonedDateTime::parse);
+		converters.put(ZoneId.class, ZoneId::of);
+		converters.put(ZoneOffset.class, ZoneOffset::of);
+		CONVERTERS = unmodifiableMap(converters);
+	}
+
+	@Override
+	public boolean canConvert(Class<?> targetType) {
+		return CONVERTERS.containsKey(targetType);
+	}
+
+	@Override
+	public Object convert(String source, Class<?> targetType) throws Exception {
+		return CONVERTERS.get(targetType).apply(source);
+	}
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToNumberConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToNumberConverter.java
new file mode 100644
index 000000000000..3cfda8670818
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToNumberConverter.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+import static java.util.Collections.unmodifiableMap;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+class StringToNumberConverter implements StringToObjectConverter {
+
+	private static final Map<Class<?>, Function<String, ?>> CONVERTERS;
+	static {
+		Map<Class<?>, Function<String, ?>> converters = new HashMap<>();
+		converters.put(Byte.class, Byte::decode);
+		converters.put(Short.class, Short::decode);
+		converters.put(Integer.class, Integer::decode);
+		converters.put(Long.class, Long::decode);
+		converters.put(Float.class, Float::valueOf);
+		converters.put(Double.class, Double::valueOf);
+		CONVERTERS = unmodifiableMap(converters);
+	}
+
+	@Override
+	public boolean canConvert(Class<?> targetType) {
+		return CONVERTERS.containsKey(targetType);
+	}
+
+	@Override
+	public Object convert(String source, Class<?> targetType) {
+		return CONVERTERS.get(targetType).apply(source.replace("_", ""));
+	}
+
+}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToObjectConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToObjectConverter.java
new file mode 100644
index 000000000000..2a60202dba81
--- /dev/null
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToObjectConverter.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.params.converter;
+
+/**
+ * Internal API for converting arguments of type {@link String} to a specified
+ * target type.
+ */
+interface StringToObjectConverter {
+
+	/**
+	 * Determine if this converter can convert from a {@link String} to the
+	 * supplied target type (which is guaranteed to be a wrapper type for
+	 * primitives &mdash; for example, {@link Integer} instead of {@code int}).
+	 */
+	boolean canConvert(Class<?> targetType);
+
+	/**
+	 * Convert the supplied {@link String} to the supplied target type (which is
+	 * guaranteed to be a wrapper type for primitives &mdash; for example,
+	 * {@link Integer} instead of {@code int}).
+	 */
+	Object convert(String source, Class<?> targetType) throws Exception;
+
+	/**
+	 * Convert the supplied {@link String} to the supplied target type (which is
+	 * guaranteed to be a wrapper type for primitives &mdash; for example,
+	 * {@link Integer} instead of {@code int}).
+	 *
+	 * <p>The default implementation simply delegates to {@link #convert(String, Class)}.
+	 * Can be overridden by concrete implementations of this interface that need
+	 * access to the supplied {@link ClassLoader}.
+	 */
+	default Object convert(String source, Class<?> targetType, ClassLoader classLoader) throws Exception {
+		return convert(source, targetType);
+	}
+
+}

From 7538811db2038e8b034eb8a6fcddda54496a7994 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 9 May 2023 18:11:35 +0200
Subject: [PATCH 1300/1433] Load classes using Class.forName() instead of
 ClassLoader.loadClass()

Closes #3290
---
 .../java/org/junit/platform/commons/util/ReflectionUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index c33f514f35a9..263aa36c05ec 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -829,7 +829,7 @@ public static Try<Class<?>> tryToLoadClass(String name, ClassLoader classLoader)
 			}
 
 			// Fallback to standard VM class loading
-			return classLoader.loadClass(trimmedName);
+			return Class.forName(trimmedName, false, classLoader);
 		});
 	}
 
@@ -838,7 +838,7 @@ private static Class<?> loadArrayType(ClassLoader classLoader, String componentT
 
 		Class<?> componentType = classNameToTypeMap.containsKey(componentTypeName)
 				? classNameToTypeMap.get(componentTypeName)
-				: classLoader.loadClass(componentTypeName);
+				: Class.forName(componentTypeName, false, classLoader);
 
 		return Array.newInstance(componentType, new int[dimensions]).getClass();
 	}

From c4ee492c27e97c96174e1cc2e0130cb7b8a5c808 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 9 May 2023 18:26:17 +0200
Subject: [PATCH 1301/1433] Simplify StringToEnumConverter

---
 .../jupiter/params/converter/StringToEnumConverter.java     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToEnumConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToEnumConverter.java
index f33fe6bf9f72..f20d1487d5ee 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToEnumConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToEnumConverter.java
@@ -18,12 +18,8 @@ public boolean canConvert(Class<?> targetType) {
 	}
 
 	@Override
-	public Object convert(String source, Class<?> targetType) throws Exception {
-		return valueOf(targetType, source);
-	}
-
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private static Object valueOf(Class targetType, String source) {
+	public Object convert(String source, Class targetType) throws Exception {
 		return Enum.valueOf(targetType, source);
 	}
 

From 5fa0963b2ff37f5da7dc9fc147228aa099ebbefa Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 10 May 2023 17:47:59 +0200
Subject: [PATCH 1302/1433] Fix test

Thanks to @chrisr3 for pointing out the bug in the test.
---
 .../junit/platform/commons/util/ReflectionUtilsTests.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index e8bc60ff012b..89b309aecf88 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -1049,10 +1049,9 @@ void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() thro
 
 				var parameterTypes = method.getParameterTypes();
 				assertThat(parameterTypes).extracting(Class::getName).containsExactly(nestedTypeName);
-				Class<?> parameterType = parameterTypes[0].getClass();
+				Class<?> parameterType = parameterTypes[0];
 				assertThat(parameterType).isNotEqualTo(CustomType.NestedType.class);
-				// The ClassLoader is null because of the behavior of our TestClassLoader.
-				assertThat(parameterType.getClassLoader()).isNull();
+				assertThat(parameterType.getClassLoader()).isInstanceOf(TestClassLoader.class);
 			});
 		}
 	}

From c184dbc0551a2d2a2e24241c60c86612afcbc254 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 10 May 2023 17:52:25 +0200
Subject: [PATCH 1303/1433] Polish test

---
 .../junit/platform/commons/util/ReflectionUtilsTests.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 89b309aecf88..2c7a03dc3257 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -1036,14 +1036,14 @@ void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() thro
 
 		try (TestClassLoader customTypeClassLoader = TestClassLoader.forClassNamePrefix(customTypeName)) {
 			var customType = customTypeClassLoader.loadClass(customTypeName);
-			assertThat(customType.getClassLoader()).isInstanceOf(TestClassLoader.class);
+			assertThat(customType.getClassLoader()).isEqualTo(customTypeClassLoader);
 
 			var optional = findMethod(customType, methodName, nestedTypeName);
 			assertThat(optional).get().satisfies(method -> {
 				assertThat(method.getName()).isEqualTo(methodName);
 
 				var declaringClass = method.getDeclaringClass();
-				assertThat(declaringClass.getClassLoader()).isInstanceOf(TestClassLoader.class);
+				assertThat(declaringClass.getClassLoader()).isEqualTo(customTypeClassLoader);
 				assertThat(declaringClass.getName()).isEqualTo(customTypeName);
 				assertThat(declaringClass).isNotEqualTo(CustomType.class);
 
@@ -1051,7 +1051,7 @@ void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() thro
 				assertThat(parameterTypes).extracting(Class::getName).containsExactly(nestedTypeName);
 				Class<?> parameterType = parameterTypes[0];
 				assertThat(parameterType).isNotEqualTo(CustomType.NestedType.class);
-				assertThat(parameterType.getClassLoader()).isInstanceOf(TestClassLoader.class);
+				assertThat(parameterType.getClassLoader()).isEqualTo(customTypeClassLoader);
 			});
 		}
 	}

From 882e33bbaab7a443ce1433459dc53cedc1267268 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 11 May 2023 16:06:28 +0200
Subject: [PATCH 1304/1433] Polish TestClassLoader usage

---
 .../junit/jupiter/api/AssertThrowsAssertionsTests.java |  4 ++--
 .../api/AssertThrowsExactlyAssertionsTests.java        |  4 ++--
 .../engine/extension/TestInstanceFactoryTests.java     |  5 ++---
 .../converter/DefaultArgumentConverterTests.java       | 10 +++++-----
 .../platform/commons/util/ReflectionUtilsTests.java    | 10 +++++-----
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
index 73de6acbcefb..a1fa8197e90d 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsAssertionsTests.java
@@ -241,9 +241,9 @@ void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpected
 	@Test
 	@SuppressWarnings("unchecked")
 	void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoader() throws Exception {
-		try (TestClassLoader enigmaClassLoader = TestClassLoader.forClasses(EnigmaThrowable.class)) {
+		try (var testClassLoader = TestClassLoader.forClasses(EnigmaThrowable.class)) {
 			// Load expected exception type from different class loader
-			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) enigmaClassLoader.loadClass(
+			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) testClassLoader.loadClass(
 				EnigmaThrowable.class.getName());
 
 			try {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
index c8edc464a874..ec0c20e47bd1 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertThrowsExactlyAssertionsTests.java
@@ -281,9 +281,9 @@ void assertThrowsWithExecutableThatThrowsInstanceOfStaticNestedClassAsUnexpected
 	@Test
 	@SuppressWarnings("unchecked")
 	void assertThrowsWithExecutableThatThrowsSameExceptionTypeFromDifferentClassLoader() throws Exception {
-		try (TestClassLoader enigmaClassLoader = TestClassLoader.forClasses(EnigmaThrowable.class)) {
+		try (var testClassLoader = TestClassLoader.forClasses(EnigmaThrowable.class)) {
 			// Load expected exception type from different class loader
-			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) enigmaClassLoader.loadClass(
+			Class<? extends Throwable> enigmaThrowableClass = (Class<? extends Throwable>) testClassLoader.loadClass(
 				EnigmaThrowable.class.getName());
 
 			try {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
index 9a89a1653032..fa729e13b79b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java
@@ -692,13 +692,12 @@ private static class ProxyTestInstanceFactory implements TestInstanceFactory {
 		public Object createTestInstance(TestInstanceFactoryContext factoryContext, ExtensionContext extensionContext) {
 			Class<?> testClass = factoryContext.getTestClass();
 			String className = testClass.getName();
-			String prefix = TestInstanceFactoryTests.class.getName();
 
 			instantiated(getClass(), testClass);
 
-			try (TestClassLoader proxyClassLoader = TestClassLoader.forClassNamePrefix(prefix)) {
+			try (var testClassLoader = TestClassLoader.forClasses(testClass)) {
 				// Load test class from different class loader
-				Class<?> clazz = proxyClassLoader.loadClass(className);
+				Class<?> clazz = testClassLoader.loadClass(className);
 				return ReflectionUtils.newInstance(clazz);
 			}
 			catch (Exception ex) {
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
index 07b49f494f27..90d8fb062792 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/DefaultArgumentConverterTests.java
@@ -211,17 +211,17 @@ void convertsStringToClass() {
 	@Test
 	void convertsStringToClassWithCustomTypeFromDifferentClassLoader() throws Exception {
 		String customTypeName = Enigma.class.getName();
-		try (TestClassLoader customTypeClassLoader = TestClassLoader.forClasses(Enigma.class)) {
-			var customType = customTypeClassLoader.loadClass(customTypeName);
-			assertThat(customType.getClassLoader()).isInstanceOf(TestClassLoader.class);
+		try (var testClassLoader = TestClassLoader.forClasses(Enigma.class)) {
+			var customType = testClassLoader.loadClass(customTypeName);
+			assertThat(customType.getClassLoader()).isSameAs(testClassLoader);
 
 			var declaringExecutable = ReflectionUtils.findMethod(customType, "foo").get();
-			assertThat(declaringExecutable.getDeclaringClass().getClassLoader()).isInstanceOf(TestClassLoader.class);
+			assertThat(declaringExecutable.getDeclaringClass().getClassLoader()).isSameAs(testClassLoader);
 
 			var clazz = (Class<?>) convert(customTypeName, Class.class, parameterContext(declaringExecutable));
 			assertThat(clazz).isNotEqualTo(Enigma.class);
 			assertThat(clazz).isEqualTo(customType);
-			assertThat(clazz.getClassLoader()).isInstanceOf(TestClassLoader.class);
+			assertThat(clazz.getClassLoader()).isSameAs(testClassLoader);
 		}
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
index 2c7a03dc3257..d74b74ce7592 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java
@@ -1034,16 +1034,16 @@ void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() thro
 		var customTypeName = CustomType.class.getName();
 		var nestedTypeName = CustomType.NestedType.class.getName();
 
-		try (TestClassLoader customTypeClassLoader = TestClassLoader.forClassNamePrefix(customTypeName)) {
-			var customType = customTypeClassLoader.loadClass(customTypeName);
-			assertThat(customType.getClassLoader()).isEqualTo(customTypeClassLoader);
+		try (var testClassLoader = TestClassLoader.forClassNamePrefix(customTypeName)) {
+			var customType = testClassLoader.loadClass(customTypeName);
+			assertThat(customType.getClassLoader()).isSameAs(testClassLoader);
 
 			var optional = findMethod(customType, methodName, nestedTypeName);
 			assertThat(optional).get().satisfies(method -> {
 				assertThat(method.getName()).isEqualTo(methodName);
 
 				var declaringClass = method.getDeclaringClass();
-				assertThat(declaringClass.getClassLoader()).isEqualTo(customTypeClassLoader);
+				assertThat(declaringClass.getClassLoader()).isSameAs(testClassLoader);
 				assertThat(declaringClass.getName()).isEqualTo(customTypeName);
 				assertThat(declaringClass).isNotEqualTo(CustomType.class);
 
@@ -1051,7 +1051,7 @@ void findMethodByParameterNamesWithWithCustomTypeFromDifferentClassLoader() thro
 				assertThat(parameterTypes).extracting(Class::getName).containsExactly(nestedTypeName);
 				Class<?> parameterType = parameterTypes[0];
 				assertThat(parameterType).isNotEqualTo(CustomType.NestedType.class);
-				assertThat(parameterType.getClassLoader()).isEqualTo(customTypeClassLoader);
+				assertThat(parameterType.getClassLoader()).isSameAs(testClassLoader);
 			});
 		}
 	}

From 334860a2a3e295758ab041547c9533d216afec59 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 11 May 2023 16:18:18 +0200
Subject: [PATCH 1305/1433] Move conversion for BigInteger & BigDecimal to
 StringToNumberConverter

---
 .../params/converter/StringToCommonJavaTypesConverter.java | 5 -----
 .../jupiter/params/converter/StringToNumberConverter.java  | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCommonJavaTypesConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCommonJavaTypesConverter.java
index 7237433ac82b..b9ac124aded8 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCommonJavaTypesConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToCommonJavaTypesConverter.java
@@ -13,8 +13,6 @@
 import static java.util.Collections.unmodifiableMap;
 
 import java.io.File;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -42,9 +40,6 @@ class StringToCommonJavaTypesConverter implements StringToObjectConverter {
 		// java.net
 		converters.put(URI.class, URI::create);
 		converters.put(URL.class, StringToCommonJavaTypesConverter::toURL);
-		// java.math
-		converters.put(BigDecimal.class, BigDecimal::new);
-		converters.put(BigInteger.class, BigInteger::new);
 		// java.util
 		converters.put(Currency.class, Currency::getInstance);
 		converters.put(Locale.class, Locale::new);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToNumberConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToNumberConverter.java
index 3cfda8670818..ca278019a488 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToNumberConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/StringToNumberConverter.java
@@ -12,6 +12,8 @@
 
 import static java.util.Collections.unmodifiableMap;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -27,6 +29,11 @@ class StringToNumberConverter implements StringToObjectConverter {
 		converters.put(Long.class, Long::decode);
 		converters.put(Float.class, Float::valueOf);
 		converters.put(Double.class, Double::valueOf);
+		// Technically, BigInteger and BigDecimal constructors are covered by
+		// FallbackStringToObjectConverter, but we have explicit conversion
+		// configured for them anyway.
+		converters.put(BigInteger.class, BigInteger::new);
+		converters.put(BigDecimal.class, BigDecimal::new);
 		CONVERTERS = unmodifiableMap(converters);
 	}
 

From ebe7a02075e88c0d53e8ab7cc439e45c05a5d461 Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Wed, 3 May 2023 11:42:10 +0100
Subject: [PATCH 1306/1433] Load classes using the test's own ClassLoader

Prior to this commit, the extensions supporting @MethodSource,
@EnabledIf, and @DisabledIf failed to load an external class if the
external class was not visible to JUnit's default ClassLoader.

This commit addresses those issues by loading external classes using
the ClassLoader obtained from the test class or falling back to JUnit's
default ClassLoader if the test's ClassLoader cannot be obtained.

This allows JUnit to find the classes while running in a custom
ClassLoader arrangement -- for example, inside an OSGi framework.

Closes #3292
Closes #3279
Closes #3280
---
 .../release-notes/release-notes-5.10.0-M1.adoc        |  3 ++-
 .../jupiter/api/condition/MethodBasedCondition.java   |  5 +++--
 .../params/provider/MethodArgumentsProvider.java      | 11 ++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 8c73d6d54a75..66444a23c945 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -15,7 +15,8 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* ❓
+* Use a test class's own classloader to search for `@MethodSource` and `MethodBasedCondition` methods.
+  This allows these features to work correctly inside an OSGi framework.
 
 ==== Deprecations and Breaking Changes
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index 403304792e75..0459fab50c96 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -57,13 +57,14 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 	}
 
 	private Method getConditionMethod(String fullyQualifiedMethodName, ExtensionContext context) {
+		final Class<?> testClass = context.getRequiredTestClass();
 		if (!fullyQualifiedMethodName.contains("#")) {
-			return findMethod(context.getRequiredTestClass(), fullyQualifiedMethodName);
+			return findMethod(testClass, fullyQualifiedMethodName);
 		}
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
 		String methodName = methodParts[1];
-		Class<?> clazz = ReflectionUtils.tryToLoadClass(className).getOrThrow(
+		Class<?> clazz = ReflectionUtils.tryToLoadClass(className, testClass.getClassLoader()).getOrThrow(
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 		return findMethod(clazz, methodName);
 	}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index ddcb16b5c488..0c094c7442cc 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -73,7 +73,7 @@ private static Method findFactoryMethod(Class<?> testClass, Method testMethod, S
 		}
 
 		// Find factory method using fully-qualified name.
-		Method factoryMethod = findFactoryMethodByFullyQualifiedName(testMethod, factoryMethodName);
+		Method factoryMethod = findFactoryMethodByFullyQualifiedName(testClass, testMethod, factoryMethodName);
 
 		// Ensure factory method has a valid return type and is not a test method.
 		Preconditions.condition(isFactoryMethod.test(factoryMethod), () -> format(
@@ -103,12 +103,13 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa
 		return true;
 	}
 
-	private static Method findFactoryMethodByFullyQualifiedName(Method testMethod, String fullyQualifiedMethodName) {
+	private static Method findFactoryMethodByFullyQualifiedName(Class<?> testClass, Method testMethod,
+			String fullyQualifiedMethodName) {
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
 		String methodName = methodParts[1];
 		String methodParameters = methodParts[2];
-		Class<?> clazz = loadRequiredClass(className);
+		Class<?> clazz = loadRequiredClass(className, testClass.getClassLoader());
 
 		// Attempt to find an exact match first.
 		Method factoryMethod = ReflectionUtils.findMethod(clazz, methodName, methodParameters).orElse(null);
@@ -170,8 +171,8 @@ private static boolean isTestMethod(Method candidate) {
 				|| isAnnotated(candidate, TestFactory.class);
 	}
 
-	private static Class<?> loadRequiredClass(String className) {
-		return ReflectionUtils.tryToLoadClass(className).getOrThrow(
+	private static Class<?> loadRequiredClass(String className, ClassLoader classLoader) {
+		return ReflectionUtils.tryToLoadClass(className, classLoader).getOrThrow(
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 	}
 

From cd1b3b05a63457e3ffefb8994f2e72025363152a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 12 May 2023 14:06:40 +0200
Subject: [PATCH 1307/1433] Polish contribution

See #3292
See #3279
See #3280
---
 .../asciidoc/release-notes/release-notes-5.10.0-M1.adoc  | 7 +++++--
 .../jupiter/api/condition/MethodBasedCondition.java      | 9 +++++++--
 .../jupiter/params/provider/MethodArgumentsProvider.java | 7 ++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 66444a23c945..b5160bd252fa 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -15,8 +15,7 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* Use a test class's own classloader to search for `@MethodSource` and `MethodBasedCondition` methods.
-  This allows these features to work correctly inside an OSGi framework.
+* ❓
 
 ==== Deprecations and Breaking Changes
 
@@ -75,6 +74,10 @@ repository on GitHub.
 
 ==== Bug Fixes
 
+* The extensions supporting `@MethodSource`, `@EnabledIf`, and `@DisabledIf` now load
+  classes by fully-qualified class name using the `ClassLoader` obtained from the test
+  class when possible. This allows classes to be resolved with custom `ClassLoader`
+  arrangements (such as OSGi).
 * When converting an argument for a `@ParameterizedTest` method from a fully-qualified
   class name (`String`) to a `Class`, the `ClassLoader` of the class in which the
   `@ParameterizedTest` method is declared is now used to resolve the `Class` instead of
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index 0459fab50c96..afad20d8fb36 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.util.ClassLoaderUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.commons.util.StringUtils;
@@ -57,14 +58,18 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 	}
 
 	private Method getConditionMethod(String fullyQualifiedMethodName, ExtensionContext context) {
-		final Class<?> testClass = context.getRequiredTestClass();
+		Class<?> testClass = context.getRequiredTestClass();
 		if (!fullyQualifiedMethodName.contains("#")) {
 			return findMethod(testClass, fullyQualifiedMethodName);
 		}
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
 		String methodName = methodParts[1];
-		Class<?> clazz = ReflectionUtils.tryToLoadClass(className, testClass.getClassLoader()).getOrThrow(
+		ClassLoader classLoader = testClass.getClassLoader();
+		if (classLoader == null) {
+			classLoader = ClassLoaderUtils.getDefaultClassLoader();
+		}
+		Class<?> clazz = ReflectionUtils.tryToLoadClass(className, classLoader).getOrThrow(
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 		return findMethod(clazz, methodName);
 	}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 0c094c7442cc..73f7074e613f 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.util.ClassLoaderUtils;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -109,7 +110,11 @@ private static Method findFactoryMethodByFullyQualifiedName(Class<?> testClass,
 		String className = methodParts[0];
 		String methodName = methodParts[1];
 		String methodParameters = methodParts[2];
-		Class<?> clazz = loadRequiredClass(className, testClass.getClassLoader());
+		ClassLoader classLoader = testClass.getClassLoader();
+		if (classLoader == null) {
+			classLoader = ClassLoaderUtils.getDefaultClassLoader();
+		}
+		Class<?> clazz = loadRequiredClass(className, classLoader);
 
 		// Attempt to find an exact match first.
 		Method factoryMethod = ReflectionUtils.findMethod(clazz, methodName, methodParameters).orElse(null);

From 8bfe25a7f6dd89626739a442468fa208ab0e0bde Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 12 May 2023 14:20:04 +0200
Subject: [PATCH 1308/1433] Test @EnabledIf and @DisabledIf with custom
 ClassLoader arrangement

See #3292
See #3280
---
 .../api/condition/MethodBasedCondition.java   |  3 +-
 .../DisabledIfConditionClassLoaderTests.java  | 66 +++++++++++++++++++
 .../EnabledIfConditionClassLoaderTests.java   | 66 +++++++++++++++++++
 3 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionClassLoaderTests.java
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionClassLoaderTests.java

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index afad20d8fb36..cbe7e4b0ef7c 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -57,7 +57,8 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 				.orElseGet(this::enabledByDefault);
 	}
 
-	private Method getConditionMethod(String fullyQualifiedMethodName, ExtensionContext context) {
+	// package-private for testing
+	Method getConditionMethod(String fullyQualifiedMethodName, ExtensionContext context) {
 		Class<?> testClass = context.getRequiredTestClass();
 		if (!fullyQualifiedMethodName.contains("#")) {
 			return findMethod(testClass, fullyQualifiedMethodName);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionClassLoaderTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionClassLoaderTests.java
new file mode 100644
index 000000000000..0e2ebac8a435
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionClassLoaderTests.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.condition;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.test.TestClassLoader;
+import org.junit.platform.commons.util.ReflectionUtils;
+
+/**
+ * Tests for {@link DisabledIfCondition} using custom {@link ClassLoader} arrangements.
+ *
+ * @since 5.10
+ */
+public class DisabledIfConditionClassLoaderTests {
+
+	@Test
+	// No need to introduce a "disabled" version of this test, since it would simply be the
+	// logical inverse of this method and would therefore not provide any further benefit.
+	void enabledWithStaticMethodInTypeFromDifferentClassLoader() throws Exception {
+		try (var testClassLoader = TestClassLoader.forClasses(getClass(), StaticConditionMethods.class)) {
+			var testClass = testClassLoader.loadClass(getClass().getName());
+			assertThat(testClass.getClassLoader()).isSameAs(testClassLoader);
+
+			ExtensionContext context = mock();
+			Method annotatedMethod = ReflectionUtils.findMethod(getClass(), "enabledMethod").get();
+			when(context.getElement()).thenReturn(Optional.of(annotatedMethod));
+			doReturn(testClass).when(context).getRequiredTestClass();
+
+			DisabledIfCondition condition = new DisabledIfCondition();
+			ConditionEvaluationResult result = condition.evaluateExecutionCondition(context);
+			assertThat(result).isNotNull();
+			assertThat(result.isDisabled()).isFalse();
+
+			Method conditionMethod = condition.getConditionMethod(
+				"org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse", context);
+			assertThat(conditionMethod).isNotNull();
+			Class<?> declaringClass = conditionMethod.getDeclaringClass();
+			assertThat(declaringClass.getClassLoader()).isSameAs(testClassLoader);
+			assertThat(declaringClass.getName()).isEqualTo(StaticConditionMethods.class.getName());
+			assertThat(declaringClass).isNotEqualTo(StaticConditionMethods.class);
+		}
+	}
+
+	@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
+	private void enabledMethod() {
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionClassLoaderTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionClassLoaderTests.java
new file mode 100644
index 000000000000..3c07ce9bc065
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionClassLoaderTests.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.condition;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.test.TestClassLoader;
+import org.junit.platform.commons.util.ReflectionUtils;
+
+/**
+ * Tests for {@link EnabledIfCondition} using custom {@link ClassLoader} arrangements.
+ *
+ * @since 5.10
+ */
+public class EnabledIfConditionClassLoaderTests {
+
+	@Test
+	// No need to introduce a "disabled" version of this test, since it would simply be the
+	// logical inverse of this method and would therefore not provide any further benefit.
+	void enabledWithStaticMethodInTypeFromDifferentClassLoader() throws Exception {
+		try (var testClassLoader = TestClassLoader.forClasses(getClass(), StaticConditionMethods.class)) {
+			var testClass = testClassLoader.loadClass(getClass().getName());
+			assertThat(testClass.getClassLoader()).isSameAs(testClassLoader);
+
+			ExtensionContext context = mock();
+			Method annotatedMethod = ReflectionUtils.findMethod(getClass(), "enabledMethod").get();
+			when(context.getElement()).thenReturn(Optional.of(annotatedMethod));
+			doReturn(testClass).when(context).getRequiredTestClass();
+
+			EnabledIfCondition condition = new EnabledIfCondition();
+			ConditionEvaluationResult result = condition.evaluateExecutionCondition(context);
+			assertThat(result).isNotNull();
+			assertThat(result.isDisabled()).isFalse();
+
+			Method conditionMethod = condition.getConditionMethod(
+				"org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue", context);
+			assertThat(conditionMethod).isNotNull();
+			Class<?> declaringClass = conditionMethod.getDeclaringClass();
+			assertThat(declaringClass.getClassLoader()).isSameAs(testClassLoader);
+			assertThat(declaringClass.getName()).isEqualTo(StaticConditionMethods.class.getName());
+			assertThat(declaringClass).isNotEqualTo(StaticConditionMethods.class);
+		}
+	}
+
+	@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
+	private void enabledMethod() {
+	}
+
+}

From b3f6c99e9568816268ec21917c5f5064325c013a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 12 May 2023 14:51:10 +0200
Subject: [PATCH 1309/1433] Test @MethodSource with custom ClassLoader
 arrangement

See #3279
See #3280
---
 .../provider/MethodArgumentsProvider.java     |  3 ++-
 .../MethodArgumentsProviderTests.java         | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index 73f7074e613f..ec0e5a3b455c 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -104,7 +104,8 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa
 		return true;
 	}
 
-	private static Method findFactoryMethodByFullyQualifiedName(Class<?> testClass, Method testMethod,
+	// package-private for testing
+	static Method findFactoryMethodByFullyQualifiedName(Class<?> testClass, Method testMethod,
 			String fullyQualifiedMethodName) {
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
diff --git a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
index 0188bb90a80f..08959e1a8824 100644
--- a/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
+++ b/junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java
@@ -41,6 +41,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.test.TestClassLoader;
 import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
@@ -237,6 +238,31 @@ void providesArgumentsUsingExternalFactoryMethod() {
 		assertThat(arguments).containsExactly(array("string1"), array("string2"));
 	}
 
+	@Test
+	void providesArgumentsUsingExternalFactoryMethodInTypeFromDifferentClassLoader() throws Exception {
+		try (var testClassLoader = TestClassLoader.forClasses(TestCase.class, ExternalFactoryMethods.class)) {
+			var testClass = testClassLoader.loadClass(TestCase.class.getName());
+			var testMethod = ReflectionUtils.findMethod(testClass, "test").get();
+			var fullyQualifiedMethodName = ExternalFactoryMethods.class.getName() + "#stringsProvider";
+
+			assertThat(testClass.getClassLoader()).isSameAs(testClassLoader);
+
+			var arguments = provideArguments(testClass, false, fullyQualifiedMethodName);
+			assertThat(arguments).containsExactly(array("string1"), array("string2"));
+
+			var factoryMethod = MethodArgumentsProvider.findFactoryMethodByFullyQualifiedName(testClass, testMethod,
+				fullyQualifiedMethodName);
+			assertThat(factoryMethod).isNotNull();
+			assertThat(factoryMethod.getName()).isEqualTo("stringsProvider");
+			assertThat(factoryMethod.getParameterTypes()).isEmpty();
+
+			var declaringClass = factoryMethod.getDeclaringClass();
+			assertThat(declaringClass.getName()).isEqualTo(ExternalFactoryMethods.class.getName());
+			assertThat(declaringClass).isNotEqualTo(ExternalFactoryMethods.class);
+			assertThat(declaringClass.getClassLoader()).isSameAs(testClassLoader);
+		}
+	}
+
 	@Test
 	void providesArgumentsUsingExternalFactoryMethodWithParentheses() {
 		var arguments = provideArguments(ExternalFactoryMethods.class.getName() + "#stringsProvider()");

From c12634cbc65b9da528681cf3abc4b79814a3656e Mon Sep 17 00:00:00 2001
From: Fr Jeremy Krieg <kriegfrj@users.noreply.github.com>
Date: Sat, 13 May 2023 00:39:24 +0930
Subject: [PATCH 1310/1433] Support explicit ClassLoader in ClassSelector and
 MethodSelector

This commit introduces overloaded selectClass() and selectMethod() variants
in DiscoverySelectors that accept an explicit ClassLoader and also modifies
ClassSelector and MethodSelector accordingly.


Closes #1987
Closes #2107
---
 .../release-notes-5.10.0-M1.adoc              |  3 +
 .../engine/discovery/ClassSelector.java       | 22 +++++-
 .../engine/discovery/DiscoverySelectors.java  | 75 ++++++++++++++++++-
 .../engine/discovery/MethodSelector.java      | 26 ++++++-
 .../engine/discovery/ClassSelectorTests.java  |  7 ++
 .../discovery/DiscoverySelectorsTests.java    | 35 ++++++++-
 .../engine/discovery/MethodSelectorTests.java | 23 ++++--
 7 files changed, 172 insertions(+), 19 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index b5160bd252fa..0df9b8c80f95 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -32,6 +32,9 @@ repository on GitHub.
   which return a `Stream`.
 * New `tryToLoadClass(...)` variant in `ReflectionSupport` that accepts an explicit
   `ClassLoader`, allowing classes to be resolved with custom `ClassLoader` arrangements.
+* New overloaded constructors for `ClassSelector` and `MethodSelector` that take an
+  explicit `ClassLoader` as a parameter, allowing selectors to select classes in custom
+  `ClassLoader` arrangements like in OSGi.
 * `ReflectionSupport.findMethod(Class<?>, String, String)` now uses the `ClassLoader` of
   the supplied `Class` to load parameter types instead of using the _default_
   `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
index 30f6906994d7..d9e77967b924 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
@@ -16,6 +16,7 @@
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.function.Try;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.commons.util.ToStringBuilder;
 import org.junit.platform.engine.DiscoverySelector;
@@ -43,15 +44,22 @@
 public class ClassSelector implements DiscoverySelector {
 
 	private final String className;
+	private final ClassLoader classLoader;
 
 	private Class<?> javaClass;
 
 	ClassSelector(String className) {
+		this(className, null);
+	}
+
+	ClassSelector(String className, ClassLoader classLoader) {
 		this.className = className;
+		this.classLoader = classLoader;
 	}
 
 	ClassSelector(Class<?> javaClass) {
 		this.className = javaClass.getName();
+		this.classLoader = javaClass.getClassLoader();
 		this.javaClass = javaClass;
 	}
 
@@ -62,6 +70,13 @@ public String getClassName() {
 		return this.className;
 	}
 
+	/**
+	 * Get the class loader used to load the selected class.
+	 */
+	public ClassLoader getClassLoader() {
+		return this.classLoader;
+	}
+
 	/**
 	 * Get the selected {@link Class}.
 	 *
@@ -71,9 +86,10 @@ public String getClassName() {
 	 */
 	public Class<?> getJavaClass() {
 		if (this.javaClass == null) {
-			this.javaClass = ReflectionUtils.tryToLoadClass(this.className).getOrThrow(
-				cause -> new PreconditionViolationException("Could not load class with name: " + this.className,
-					cause));
+			final Try<Class<?>> clazz = this.classLoader == null ? ReflectionUtils.tryToLoadClass(this.className)
+					: ReflectionUtils.tryToLoadClass(className, this.classLoader);
+			this.javaClass = clazz.getOrThrow(cause -> new PreconditionViolationException(
+				"Could not load class with name: " + this.className, cause));
 		}
 		return this.javaClass;
 	}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 98a72275614c..6951cdc5b9be 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -393,6 +393,21 @@ public static ClassSelector selectClass(String className) {
 		return new ClassSelector(className);
 	}
 
+	/**
+	 * Create a {@code ClassSelector} for the supplied class name using the
+	 * supplied class loader.
+	 *
+	 * @param className the fully qualified name of the class to select;
+	 * never {@code null} or blank
+	 * @param classLoader the class loader to use to try and load the
+	 * supplied class. If {@code null}, the default class loader will be used.
+	 * @see ClassSelector
+	 */
+	public static ClassSelector selectClass(String className, ClassLoader classLoader) {
+		Preconditions.notBlank(className, "Class name must not be null or blank");
+		return new ClassSelector(className, classLoader);
+	}
+
 	/**
 	 * Create a {@code MethodSelector} for the supplied <em>fully qualified
 	 * method name</em>.
@@ -436,12 +451,28 @@ public static ClassSelector selectClass(String className) {
 	 * @see MethodSelector
 	 */
 	public static MethodSelector selectMethod(String fullyQualifiedMethodName) throws PreconditionViolationException {
+		return selectMethod(fullyQualifiedMethodName, (ClassLoader) null);
+	}
+
+	/**
+	 * Create a {@code MethodSelector} for the supplied <em>fully qualified
+	 * method name</em> using the given classloader.
+	 *
+	 * @param fullyQualifiedMethodName the fully qualified name of the method to select; never
+	 * {@code null} or blank (see {@link #selectMethod(String)} for the format of this string).
+	 * @param classLoader the class loader to use to try and load the
+	 * supplied class. If {@code null}, the default class loader will be used.
+	 * @see #selectMethod(String)
+	 */
+	public static MethodSelector selectMethod(String fullyQualifiedMethodName, ClassLoader classLoader)
+			throws PreconditionViolationException {
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
-		return selectMethod(methodParts[0], methodParts[1], methodParts[2]);
+		return selectMethod(methodParts[0], methodParts[1], methodParts[2], classLoader);
 	}
 
 	/**
-	 * Create a {@code MethodSelector} for the supplied class name and method name.
+	 * Create a {@code MethodSelector} for the supplied class name and method name
+	 * using the default class loader.
 	 *
 	 * @param className the fully qualified name of the class in which the method
 	 * is declared, or a subclass thereof; never {@code null} or blank
@@ -449,9 +480,24 @@ public static MethodSelector selectMethod(String fullyQualifiedMethodName) throw
 	 * @see MethodSelector
 	 */
 	public static MethodSelector selectMethod(String className, String methodName) {
+		return selectMethod(className, methodName, (ClassLoader) null);
+	}
+
+	/**
+	 * Create a {@code MethodSelector} for the supplied class name and method name, using
+	 * the given class loader to find the class.
+	 *
+	 * @param className the fully qualified name of the class in which the method
+	 * is declared, or a subclass thereof; never {@code null} or blank
+	 * @param methodName the name of the method to select; never {@code null} or blank
+	 * @param classLoader the class loader to use to try and load the
+	 * supplied class. If {@code null}, the default class loader will be used.
+	 * @see MethodSelector
+	 */
+	public static MethodSelector selectMethod(String className, String methodName, ClassLoader classLoader) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new MethodSelector(className, methodName);
+		return new MethodSelector(className, methodName, classLoader);
 	}
 
 	/**
@@ -471,10 +517,31 @@ public static MethodSelector selectMethod(String className, String methodName) {
 	 * @see MethodSelector
 	 */
 	public static MethodSelector selectMethod(String className, String methodName, String methodParameterTypes) {
+		return selectMethod(className, methodName, methodParameterTypes, null);
+	}
+
+	/**
+	 * Create a {@code MethodSelector} for the supplied class name, method name,
+	 * and method parameter types, using the specified class loader.
+	 *
+	 * <p>The parameter types {@code String} is typically a comma-separated list
+	 * of atomic types, fully qualified class names, or array types; however,
+	 * the exact syntax depends on the underlying test engine.
+	 *
+	 * @param className the fully qualified name of the class in which the method
+	 * is declared, or a subclass thereof; never {@code null} or blank
+	 * @param methodName the name of the method to select; never {@code null} or blank
+	 * @param methodParameterTypes the method parameter types as a single string; never
+	 * {@code null} though potentially an empty string if the method does not accept
+	 * arguments
+	 * @see MethodSelector
+	 */
+	public static MethodSelector selectMethod(String className, String methodName, String methodParameterTypes,
+			ClassLoader classLoader) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
 		Preconditions.notNull(methodParameterTypes, "Parameter types must not be null");
-		return new MethodSelector(className, methodName, methodParameterTypes.trim());
+		return new MethodSelector(className, methodName, methodParameterTypes.trim(), classLoader);
 	}
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index ff7e627ac4d7..460f9b552c2c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -17,6 +17,7 @@
 
 import org.apiguardian.api.API;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.function.Try;
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.commons.util.StringUtils;
@@ -53,6 +54,7 @@
 @API(status = STABLE, since = "1.0")
 public class MethodSelector implements DiscoverySelector {
 
+	private final ClassLoader classLoader;
 	private final String className;
 	private final String methodName;
 	private final String methodParameterTypes;
@@ -61,10 +63,19 @@ public class MethodSelector implements DiscoverySelector {
 	private Method javaMethod;
 
 	MethodSelector(String className, String methodName) {
-		this(className, methodName, "");
+		this(className, methodName, "", (ClassLoader) null);
+	}
+
+	MethodSelector(String className, String methodName, ClassLoader classLoader) {
+		this(className, methodName, "", classLoader);
 	}
 
 	MethodSelector(String className, String methodName, String methodParameterTypes) {
+		this(className, methodName, methodParameterTypes, (ClassLoader) null);
+	}
+
+	MethodSelector(String className, String methodName, String methodParameterTypes, ClassLoader classLoader) {
+		this.classLoader = classLoader;
 		this.className = className;
 		this.methodName = methodName;
 		this.methodParameterTypes = methodParameterTypes;
@@ -75,6 +86,7 @@ public class MethodSelector implements DiscoverySelector {
 	}
 
 	MethodSelector(Class<?> javaClass, String methodName, String methodParameterTypes) {
+		this.classLoader = javaClass.getClassLoader();
 		this.javaClass = javaClass;
 		this.className = javaClass.getName();
 		this.methodName = methodName;
@@ -82,6 +94,7 @@ public class MethodSelector implements DiscoverySelector {
 	}
 
 	MethodSelector(Class<?> javaClass, Method method) {
+		this.classLoader = javaClass.getClassLoader();
 		this.javaClass = javaClass;
 		this.className = javaClass.getName();
 		this.javaMethod = method;
@@ -96,6 +109,13 @@ public String getClassName() {
 		return this.className;
 	}
 
+	/**
+	 * Get the class loader used to load the specified class.
+	 */
+	public ClassLoader getClassLoader() {
+		return this.classLoader;
+	}
+
 	/**
 	 * Get the selected method name.
 	 */
@@ -153,7 +173,9 @@ public Method getJavaMethod() {
 	private void lazyLoadJavaClass() {
 		if (this.javaClass == null) {
 			// @formatter:off
-			this.javaClass = ReflectionUtils.tryToLoadClass(this.className).getOrThrow(
+			final Try<Class<?>> clazz = this.classLoader == null ? ReflectionUtils.tryToLoadClass(this.className)
+					: ReflectionUtils.tryToLoadClass(className, this.classLoader);
+			this.javaClass = clazz.getOrThrow(
 				cause -> new PreconditionViolationException("Could not load class with name: " + this.className, cause));
 			// @formatter:on
 		}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
index 6da64efdb35b..f3206537209f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -43,4 +43,11 @@ void preservesOriginalExceptionWhenTryingToLoadClass() {
 		assertThat(e).hasMessage("Could not load class with name: org.example.TestClass").hasCauseInstanceOf(
 			ClassNotFoundException.class);
 	}
+
+	@Test
+	void useClassClassLoader() {
+		var selector = new ClassSelector(getClass());
+
+		assertThat(selector.getClassLoader()).isNotNull().isSameAs(getClass().getClassLoader());
+	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index db65c530b831..0c71c74c3c02 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -13,6 +13,8 @@
 import static java.lang.String.join;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
@@ -31,6 +33,7 @@
 import java.io.File;
 import java.lang.reflect.Method;
 import java.net.URI;
+import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -46,6 +49,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.test.TestClassLoader;
 import org.junit.platform.commons.util.ReflectionUtils;
 
 /**
@@ -242,9 +246,20 @@ void selectClassByName() {
 		assertEquals(getClass(), selector.getJavaClass());
 	}
 
+	@Test
+	void selectClassByNameAndClassLoader() throws Exception {
+		try (TestClassLoader l = TestClassLoader.forClasses(getClass())) {
+			ClassSelector selector = selectClass(getClass().getName(), l);
+			assertEquals(getClass().getTypeName(), selector.getJavaClass().getTypeName());
+			assertNotEquals(getClass(), selector.getJavaClass());
+			assertSame(l, selector.getClassLoader());
+			assertSame(l, selector.getJavaClass().getClassLoader());
+		}
+	}
+
 	@Test
 	void selectMethodByClassNameAndMethodNamePreconditions() {
-		assertViolatesPrecondition(() -> selectMethod("TestClass", null));
+		assertViolatesPrecondition(() -> selectMethod("TestClass", (String) null));
 		assertViolatesPrecondition(() -> selectMethod("TestClass", ""));
 		assertViolatesPrecondition(() -> selectMethod("TestClass", "  "));
 		assertViolatesPrecondition(() -> selectMethod((String) null, "method"));
@@ -260,7 +275,7 @@ void selectMethodByClassNameMethodNameAndMethodParameterTypesPreconditions() {
 		assertViolatesPrecondition(() -> selectMethod((String) null, "method", "int"));
 		assertViolatesPrecondition(() -> selectMethod("", "method", "int"));
 		assertViolatesPrecondition(() -> selectMethod("   ", "method", "int"));
-		assertViolatesPrecondition(() -> selectMethod("TestClass", "method", null));
+		assertViolatesPrecondition(() -> selectMethod("TestClass", "method", (String) null));
 	}
 
 	@Test
@@ -320,6 +335,22 @@ void selectMethodByFullyQualifiedName() throws Exception {
 		assertSelectMethodByFullyQualifiedName(clazz, method);
 	}
 
+	@Test
+	void selectMethodByFullyQualifiedNameAndClassLoader() throws Exception {
+		try (URLClassLoader l = TestClassLoader.forClasses(getClass())) {
+			Class<?> clazz = l.loadClass(getClass().getTypeName());
+			assertNotEquals(getClass(), clazz);
+
+			Method method = clazz.getDeclaredMethod("myTest");
+			MethodSelector selector = selectMethod(getClass().getName(), "myTest", l);
+			assertEquals(method, selector.getJavaMethod());
+			assertEquals(clazz, selector.getJavaClass());
+			assertEquals(clazz.getName(), selector.getClassName());
+			assertEquals(method.getName(), selector.getMethodName());
+			assertEquals("", selector.getMethodParameterTypes());
+		}
+	}
+
 	@Test
 	void selectMethodByFullyQualifiedNameForDefaultMethodInInterface() throws Exception {
 		Class<?> clazz = TestCaseWithDefaultMethod.class;
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 4f6b54125ccf..4368f97e0222 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -27,20 +27,20 @@ class MethodSelectorTests extends AbstractEqualsAndHashCodeTests {
 
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new MethodSelector("TestClass", "method", "int, boolean");
-		var selector2 = new MethodSelector("TestClass", "method", "int, boolean");
+		var selector1 = new MethodSelector("TestClass", "method", "int, boolean", null);
+		var selector2 = new MethodSelector("TestClass", "method", "int, boolean", null);
 
 		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", "int"));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method"));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", "int, boolean"));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X"));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("X", "method", "int, boolean"));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("X", "method"));
+		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", (ClassLoader) null));
+		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", "int, boolean", null));
+		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", (ClassLoader) null));
+		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("X", "method", "int, boolean", null));
+		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("X", "method", (ClassLoader) null));
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadClass() {
-		var selector = new MethodSelector("TestClass", "method", "int, boolean");
+		var selector = new MethodSelector("TestClass", "method", "int, boolean", (ClassLoader) null);
 
 		var e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
 
@@ -48,4 +48,11 @@ void preservesOriginalExceptionWhenTryingToLoadClass() {
 			ClassNotFoundException.class);
 	}
 
+	@Test
+	void usesClassClassLoader() {
+		var selector = new MethodSelector(getClass(), "usesClassClassLoader");
+
+		assertThat(selector.getClassLoader()).isNotNull().isEqualTo(getClass().getClassLoader());
+	}
+
 }

From 142476c62c7c0e00e8b84a890a5a1319826b7cdf Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 12 May 2023 18:06:01 +0200
Subject: [PATCH 1311/1433] Polish contribution

See #1987, #2107
---
 .../release-notes-5.10.0-M1.adoc              |  6 +-
 .../engine/discovery/ClassSelector.java       | 23 ++++++--
 .../engine/discovery/DiscoverySelectors.java  | 57 ++++++++++++-------
 .../engine/discovery/MethodSelector.java      | 19 ++++---
 .../engine/discovery/ClassSelectorTests.java  |  3 +-
 .../discovery/DiscoverySelectorsTests.java    | 17 +++---
 .../engine/discovery/MethodSelectorTests.java |  2 +-
 ...LoggingLauncherDiscoveryListenerTests.java |  2 +-
 8 files changed, 79 insertions(+), 50 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 0df9b8c80f95..05f4bcacba16 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -32,14 +32,14 @@ repository on GitHub.
   which return a `Stream`.
 * New `tryToLoadClass(...)` variant in `ReflectionSupport` that accepts an explicit
   `ClassLoader`, allowing classes to be resolved with custom `ClassLoader` arrangements.
-* New overloaded constructors for `ClassSelector` and `MethodSelector` that take an
-  explicit `ClassLoader` as a parameter, allowing selectors to select classes in custom
-  `ClassLoader` arrangements like in OSGi.
 * `ReflectionSupport.findMethod(Class<?>, String, String)` now uses the `ClassLoader` of
   the supplied `Class` to load parameter types instead of using the _default_
   `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
   arrangements (such as OSGi). Consequently, `DiscoverySelectors.selectMethod(Class<?>,
   String, String)` also now works properly with custom `ClassLoader` arrangements.
+* New overloaded constructors for `ClassSelector` and `MethodSelector` that take an
+  explicit `ClassLoader` as a parameter, allowing selectors to select classes in custom
+  `ClassLoader` arrangements like in OSGi.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
   started/finished and opened/closed events are now invoked using "wrapping" semantics.
   This means that finished/closed event methods are invoked in reverse order compared to
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
index d9e77967b924..8eab972fdde9 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.discovery;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.util.Objects;
@@ -71,8 +72,10 @@ public String getClassName() {
 	}
 
 	/**
-	 * Get the class loader used to load the selected class.
+	 * Get the {@link ClassLoader} used to load the selected class.
+	 * @since 1.10
 	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
 	public ClassLoader getClassLoader() {
 		return this.classLoader;
 	}
@@ -86,10 +89,13 @@ public ClassLoader getClassLoader() {
 	 */
 	public Class<?> getJavaClass() {
 		if (this.javaClass == null) {
-			final Try<Class<?>> clazz = this.classLoader == null ? ReflectionUtils.tryToLoadClass(this.className)
-					: ReflectionUtils.tryToLoadClass(className, this.classLoader);
-			this.javaClass = clazz.getOrThrow(cause -> new PreconditionViolationException(
-				"Could not load class with name: " + this.className, cause));
+			// @formatter:off
+			Try<Class<?>> tryToLoadClass = this.classLoader == null
+				? ReflectionUtils.tryToLoadClass(this.className)
+				: ReflectionUtils.tryToLoadClass(this.className, this.classLoader);
+			this.javaClass = tryToLoadClass.getOrThrow(cause ->
+				new PreconditionViolationException("Could not load class with name: " + this.className, cause));
+			// @formatter:on
 		}
 		return this.javaClass;
 	}
@@ -121,7 +127,12 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return new ToStringBuilder(this).append("className", this.className).toString();
+		// @formatter:off
+		return new ToStringBuilder(this)
+				.append("className", this.className)
+				.append("classLoader", this.classLoader)
+				.toString();
+		// @formatter:on
 	}
 
 }
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 6951cdc5b9be..721e5230ba0c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -384,25 +384,25 @@ public static ClassSelector selectClass(Class<?> clazz) {
 	/**
 	 * Create a {@code ClassSelector} for the supplied class name.
 	 *
-	 * @param className the fully qualified name of the class to select;
-	 * never {@code null} or blank
+	 * @param className the fully qualified name of the class to select; never
+	 * {@code null} or blank
 	 * @see ClassSelector
 	 */
 	public static ClassSelector selectClass(String className) {
-		Preconditions.notBlank(className, "Class name must not be null or blank");
-		return new ClassSelector(className);
+		return selectClass(className, null);
 	}
 
 	/**
-	 * Create a {@code ClassSelector} for the supplied class name using the
-	 * supplied class loader.
+	 * Create a {@code ClassSelector} for the supplied class name and class loader.
 	 *
-	 * @param className the fully qualified name of the class to select;
-	 * never {@code null} or blank
-	 * @param classLoader the class loader to use to try and load the
-	 * supplied class. If {@code null}, the default class loader will be used.
+	 * @param className the fully qualified name of the class to select; never
+	 * {@code null} or blank
+	 * @param classLoader the class loader to use to load the class, or {@code null}
+	 * to signal that the default {@code ClassLoader} should be used
+	 * @since 1.10
 	 * @see ClassSelector
 	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
 	public static ClassSelector selectClass(String className, ClassLoader classLoader) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
 		return new ClassSelector(className, classLoader);
@@ -446,8 +446,8 @@ public static ClassSelector selectClass(String className, ClassLoader classLoade
 	 * <tr><td>{@code example.Service.process(String[][])}</td><td>{@code example.Service#process(java.lang.String[][])}</td></tr>
 	 * </table>
 	 *
-	 * @param fullyQualifiedMethodName the fully qualified name of the method to select; never
-	 * {@code null} or blank
+	 * @param fullyQualifiedMethodName the fully qualified name of the method to
+	 * select; never {@code null} or blank
 	 * @see MethodSelector
 	 */
 	public static MethodSelector selectMethod(String fullyQualifiedMethodName) throws PreconditionViolationException {
@@ -456,14 +456,21 @@ public static MethodSelector selectMethod(String fullyQualifiedMethodName) throw
 
 	/**
 	 * Create a {@code MethodSelector} for the supplied <em>fully qualified
-	 * method name</em> using the given classloader.
+	 * method name</em> and class loader.
 	 *
-	 * @param fullyQualifiedMethodName the fully qualified name of the method to select; never
-	 * {@code null} or blank (see {@link #selectMethod(String)} for the format of this string).
-	 * @param classLoader the class loader to use to try and load the
-	 * supplied class. If {@code null}, the default class loader will be used.
+	 * <p>See {@link #selectMethod(String)} for the supported formats for a
+	 * fully qualified method name.
+	 *
+	 * @param fullyQualifiedMethodName the fully qualified name of the method to
+	 * select; never {@code null} or blank
+	 * @param classLoader the class loader to use to load the method's declaring
+	 * class, or {@code null} to signal that the default {@code ClassLoader}
+	 * should be used
+	 * @since 1.10
 	 * @see #selectMethod(String)
+	 * @see MethodSelector
 	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
 	public static MethodSelector selectMethod(String fullyQualifiedMethodName, ClassLoader classLoader)
 			throws PreconditionViolationException {
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
@@ -484,16 +491,18 @@ public static MethodSelector selectMethod(String className, String methodName) {
 	}
 
 	/**
-	 * Create a {@code MethodSelector} for the supplied class name and method name, using
-	 * the given class loader to find the class.
+	 * Create a {@code MethodSelector} for the supplied class name, method name,
+	 * and class loader.
 	 *
 	 * @param className the fully qualified name of the class in which the method
 	 * is declared, or a subclass thereof; never {@code null} or blank
 	 * @param methodName the name of the method to select; never {@code null} or blank
-	 * @param classLoader the class loader to use to try and load the
-	 * supplied class. If {@code null}, the default class loader will be used.
+	 * @param classLoader the class loader to use to load the class, or {@code null}
+	 * to signal that the default {@code ClassLoader} should be used
+	 * @since 1.10
 	 * @see MethodSelector
 	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
 	public static MethodSelector selectMethod(String className, String methodName, ClassLoader classLoader) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
@@ -522,7 +531,7 @@ public static MethodSelector selectMethod(String className, String methodName, S
 
 	/**
 	 * Create a {@code MethodSelector} for the supplied class name, method name,
-	 * and method parameter types, using the specified class loader.
+	 * method parameter types, and class loader.
 	 *
 	 * <p>The parameter types {@code String} is typically a comma-separated list
 	 * of atomic types, fully qualified class names, or array types; however,
@@ -534,8 +543,12 @@ public static MethodSelector selectMethod(String className, String methodName, S
 	 * @param methodParameterTypes the method parameter types as a single string; never
 	 * {@code null} though potentially an empty string if the method does not accept
 	 * arguments
+	 * @param classLoader the class loader to use to load the class, or {@code null}
+	 * to signal that the default {@code ClassLoader} should be used
+	 * @since 1.10
 	 * @see MethodSelector
 	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
 	public static MethodSelector selectMethod(String className, String methodName, String methodParameterTypes,
 			ClassLoader classLoader) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 460f9b552c2c..9bd898ff0a04 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.discovery;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.reflect.Method;
@@ -63,7 +64,7 @@ public class MethodSelector implements DiscoverySelector {
 	private Method javaMethod;
 
 	MethodSelector(String className, String methodName) {
-		this(className, methodName, "", (ClassLoader) null);
+		this(className, methodName, (ClassLoader) null);
 	}
 
 	MethodSelector(String className, String methodName, ClassLoader classLoader) {
@@ -71,7 +72,7 @@ public class MethodSelector implements DiscoverySelector {
 	}
 
 	MethodSelector(String className, String methodName, String methodParameterTypes) {
-		this(className, methodName, methodParameterTypes, (ClassLoader) null);
+		this(className, methodName, methodParameterTypes, null);
 	}
 
 	MethodSelector(String className, String methodName, String methodParameterTypes, ClassLoader classLoader) {
@@ -110,8 +111,10 @@ public String getClassName() {
 	}
 
 	/**
-	 * Get the class loader used to load the specified class.
+	 * Get the {@link ClassLoader} used to load the specified class.
+	 * @since 1.10
 	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
 	public ClassLoader getClassLoader() {
 		return this.classLoader;
 	}
@@ -173,10 +176,11 @@ public Method getJavaMethod() {
 	private void lazyLoadJavaClass() {
 		if (this.javaClass == null) {
 			// @formatter:off
-			final Try<Class<?>> clazz = this.classLoader == null ? ReflectionUtils.tryToLoadClass(this.className)
-					: ReflectionUtils.tryToLoadClass(className, this.classLoader);
-			this.javaClass = clazz.getOrThrow(
-				cause -> new PreconditionViolationException("Could not load class with name: " + this.className, cause));
+			Try<Class<?>> tryToLoadClass = this.classLoader == null
+				? ReflectionUtils.tryToLoadClass(this.className)
+				: ReflectionUtils.tryToLoadClass(this.className, this.classLoader);
+			this.javaClass = tryToLoadClass.getOrThrow(cause ->
+				new PreconditionViolationException("Could not load class with name: " + this.className, cause));
 			// @formatter:on
 		}
 	}
@@ -235,6 +239,7 @@ public String toString() {
 				.append("className", this.className)
 				.append("methodName", this.methodName)
 				.append("methodParameterTypes", this.methodParameterTypes)
+				.append("classLoader", this.classLoader)
 				.toString();
 		// @formatter:on
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
index f3206537209f..507fecca2d5c 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -45,9 +45,10 @@ void preservesOriginalExceptionWhenTryingToLoadClass() {
 	}
 
 	@Test
-	void useClassClassLoader() {
+	void usesClassClassLoader() {
 		var selector = new ClassSelector(getClass());
 
 		assertThat(selector.getClassLoader()).isNotNull().isSameAs(getClass().getClassLoader());
 	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index 0c71c74c3c02..6565b88b968e 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -33,7 +33,6 @@
 import java.io.File;
 import java.lang.reflect.Method;
 import java.net.URI;
-import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -248,12 +247,12 @@ void selectClassByName() {
 
 	@Test
 	void selectClassByNameAndClassLoader() throws Exception {
-		try (TestClassLoader l = TestClassLoader.forClasses(getClass())) {
-			ClassSelector selector = selectClass(getClass().getName(), l);
-			assertEquals(getClass().getTypeName(), selector.getJavaClass().getTypeName());
+		try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
+			ClassSelector selector = selectClass(getClass().getName(), testClassLoader);
+			assertEquals(getClass().getName(), selector.getJavaClass().getName());
 			assertNotEquals(getClass(), selector.getJavaClass());
-			assertSame(l, selector.getClassLoader());
-			assertSame(l, selector.getJavaClass().getClassLoader());
+			assertSame(testClassLoader, selector.getClassLoader());
+			assertSame(testClassLoader, selector.getJavaClass().getClassLoader());
 		}
 	}
 
@@ -337,12 +336,12 @@ void selectMethodByFullyQualifiedName() throws Exception {
 
 	@Test
 	void selectMethodByFullyQualifiedNameAndClassLoader() throws Exception {
-		try (URLClassLoader l = TestClassLoader.forClasses(getClass())) {
-			Class<?> clazz = l.loadClass(getClass().getTypeName());
+		try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
+			Class<?> clazz = testClassLoader.loadClass(getClass().getName());
 			assertNotEquals(getClass(), clazz);
 
 			Method method = clazz.getDeclaredMethod("myTest");
-			MethodSelector selector = selectMethod(getClass().getName(), "myTest", l);
+			MethodSelector selector = selectMethod(getClass().getName(), "myTest", testClassLoader);
 			assertEquals(method, selector.getJavaMethod());
 			assertEquals(clazz, selector.getJavaClass());
 			assertEquals(clazz.getName(), selector.getClassName());
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 4368f97e0222..526a1ad15fa1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -52,7 +52,7 @@ void preservesOriginalExceptionWhenTryingToLoadClass() {
 	void usesClassClassLoader() {
 		var selector = new MethodSelector(getClass(), "usesClassClassLoader");
 
-		assertThat(selector.getClassLoader()).isNotNull().isEqualTo(getClass().getClassLoader());
+		assertThat(selector.getClassLoader()).isNotNull().isSameAs(getClass().getClassLoader());
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
index 4cdecfa28760..dc25e14a76ed 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/LoggingLauncherDiscoveryListenerTests.java
@@ -80,7 +80,7 @@ void logsErrorOnSelectorResolutionFailure(LogRecordListener log) {
 		assertThat(log.stream(LoggingLauncherDiscoveryListener.class, Level.SEVERE)) //
 				.extracting(LogRecord::getMessage) //
 				.containsExactly(
-					"Resolution of ClassSelector [className = 'java.lang.Object'] by [engine:some-engine] failed");
+					"Resolution of ClassSelector [className = 'java.lang.Object', classLoader = null] by [engine:some-engine] failed");
 	}
 
 	@Test

From cd4d060aea9b828a1a3fd7ca3b54fbb6fe8b3b27 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 12 May 2023 18:35:06 +0200
Subject: [PATCH 1312/1433] Introduce ClassLoaderUtils.getClassLoader(Class)

---
 .../api/condition/MethodBasedCondition.java   |  5 +-
 .../converter/DefaultArgumentConverter.java   |  6 +--
 .../provider/MethodArgumentsProvider.java     |  5 +-
 .../commons/util/ClassLoaderUtils.java        | 13 +++++
 .../commons/util/ReflectionUtils.java         |  5 +-
 .../commons/util/ClassLoaderUtilsTests.java   | 49 +++++++++++++++++++
 6 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
index cbe7e4b0ef7c..64fc1008ba2b 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java
@@ -66,10 +66,7 @@ Method getConditionMethod(String fullyQualifiedMethodName, ExtensionContext cont
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
 		String methodName = methodParts[1];
-		ClassLoader classLoader = testClass.getClassLoader();
-		if (classLoader == null) {
-			classLoader = ClassLoaderUtils.getDefaultClassLoader();
-		}
+		ClassLoader classLoader = ClassLoaderUtils.getClassLoader(testClass);
 		Class<?> clazz = ReflectionUtils.tryToLoadClass(className, classLoader).getOrThrow(
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 		return findMethod(clazz, methodName);
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
index d542b3929e5e..fe697c5696e3 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/DefaultArgumentConverter.java
@@ -92,10 +92,8 @@ public final Object convert(Object source, Class<?> targetType, ParameterContext
 			Optional<StringToObjectConverter> converter = stringToObjectConverters.stream().filter(
 				candidate -> candidate.canConvert(targetTypeToUse)).findFirst();
 			if (converter.isPresent()) {
-				ClassLoader classLoader = context.getDeclaringExecutable().getDeclaringClass().getClassLoader();
-				if (classLoader == null) {
-					classLoader = ClassLoaderUtils.getDefaultClassLoader();
-				}
+				Class<?> declaringClass = context.getDeclaringExecutable().getDeclaringClass();
+				ClassLoader classLoader = ClassLoaderUtils.getClassLoader(declaringClass);
 				try {
 					return converter.get().convert((String) source, targetTypeToUse, classLoader);
 				}
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
index ec0e5a3b455c..ed5ba8db51ca 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -111,10 +111,7 @@ static Method findFactoryMethodByFullyQualifiedName(Class<?> testClass, Method t
 		String className = methodParts[0];
 		String methodName = methodParts[1];
 		String methodParameters = methodParts[2];
-		ClassLoader classLoader = testClass.getClassLoader();
-		if (classLoader == null) {
-			classLoader = ClassLoaderUtils.getDefaultClassLoader();
-		}
+		ClassLoader classLoader = ClassLoaderUtils.getClassLoader(testClass);
 		Class<?> clazz = loadRequiredClass(className, classLoader);
 
 		// Attempt to find an exact match first.
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
index 0bd035b9ecd5..58c18302e41a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ClassLoaderUtils.java
@@ -36,6 +36,19 @@ private ClassLoaderUtils() {
 		/* no-op */
 	}
 
+	/**
+	 * Get the {@link ClassLoader} for the supplied {@link Class}, falling back
+	 * to the {@link #getDefaultClassLoader() default class loader} if the class
+	 * loader for the supplied class is {@code null}.
+	 * @param clazz the class for which to retrieve the class loader; never {@code null}
+	 * @since 1.10
+	 */
+	public static ClassLoader getClassLoader(Class<?> clazz) {
+		Preconditions.notNull(clazz, "Class must not be null");
+		ClassLoader classLoader = clazz.getClassLoader();
+		return (classLoader != null) ? classLoader : getDefaultClassLoader();
+	}
+
 	public static ClassLoader getDefaultClassLoader() {
 		try {
 			ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 263aa36c05ec..74be92f77a3a 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -1375,10 +1375,7 @@ private static Class<?>[] resolveParameterTypes(Class<?> clazz, String methodNam
 	}
 
 	private static Class<?> loadRequiredParameterType(Class<?> clazz, String methodName, String typeName) {
-		ClassLoader classLoader = clazz.getClassLoader();
-		if (classLoader == null) {
-			classLoader = ClassLoaderUtils.getDefaultClassLoader();
-		}
+		ClassLoader classLoader = ClassLoaderUtils.getClassLoader(clazz);
 
 		// @formatter:off
 		return tryToLoadClass(typeName, classLoader)
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
index 87d793a051cc..b3a01d5314ce 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ClassLoaderUtilsTests.java
@@ -10,6 +10,8 @@
 
 package org.junit.platform.commons.util;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -18,6 +20,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.test.TestClassLoader;
 
 /**
  * Unit tests for {@link ClassLoaderUtils}.
@@ -26,6 +29,52 @@
  */
 class ClassLoaderUtilsTests {
 
+	@Test
+	void getClassLoaderPreconditions() {
+		assertThatExceptionOfType(PreconditionViolationException.class)//
+				.isThrownBy(() -> ClassLoaderUtils.getClassLoader(null))//
+				.withMessage("Class must not be null");
+	}
+
+	@Test
+	void getClassLoaderForPrimitive() {
+		assertThat(int.class.getClassLoader()).isNull();
+		ClassLoader classLoader = ClassLoaderUtils.getClassLoader(int.class);
+		assertThat(classLoader).isSameAs(getClass().getClassLoader());
+	}
+
+	@Test
+	void getClassLoaderForWrapperType() {
+		assertThat(Byte.class.getClassLoader()).isNull();
+		ClassLoader classLoader = ClassLoaderUtils.getClassLoader(Byte.class);
+		assertThat(classLoader).isSameAs(getClass().getClassLoader());
+	}
+
+	@Test
+	void getClassLoaderForVoidType() {
+		assertThat(void.class.getClassLoader()).isNull();
+		ClassLoader classLoader = ClassLoaderUtils.getClassLoader(void.class);
+		assertThat(classLoader).isSameAs(getClass().getClassLoader());
+	}
+
+	@Test
+	void getClassLoaderForTestClass() {
+		assertThat(getClass().getClassLoader()).isNotNull();
+		ClassLoader classLoader = ClassLoaderUtils.getClassLoader(getClass());
+		assertThat(classLoader).isSameAs(getClass().getClassLoader());
+	}
+
+	@Test
+	void getClassLoaderForClassInDifferentClassLoader() throws Exception {
+		try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
+			var testClass = testClassLoader.loadClass(getClass().getName());
+			assertThat(testClass.getClassLoader()).isSameAs(testClassLoader);
+
+			var classLoader = ClassLoaderUtils.getClassLoader(testClass);
+			assertThat(classLoader).isSameAs(testClassLoader);
+		}
+	}
+
 	@Test
 	void getDefaultClassLoaderWithExplicitContextClassLoader() {
 		var original = Thread.currentThread().getContextClassLoader();

From e576cff4d10eba142790007f7a6a0ca57041100a Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 May 2023 13:22:41 +0200
Subject: [PATCH 1313/1433] Reduce number of internal constructors

---
 .../platform/engine/discovery/ClassSelector.java |  4 ----
 .../engine/discovery/MethodSelector.java         | 16 ++++------------
 .../engine/discovery/ClassSelectorTests.java     |  8 ++++----
 .../engine/discovery/MethodSelectorTests.java    |  2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
index 8eab972fdde9..70937471e622 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
@@ -49,10 +49,6 @@ public class ClassSelector implements DiscoverySelector {
 
 	private Class<?> javaClass;
 
-	ClassSelector(String className) {
-		this(className, null);
-	}
-
 	ClassSelector(String className, ClassLoader classLoader) {
 		this.className = className;
 		this.classLoader = classLoader;
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 9bd898ff0a04..85251b2bfc47 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -63,18 +63,10 @@ public class MethodSelector implements DiscoverySelector {
 	private Class<?> javaClass;
 	private Method javaMethod;
 
-	MethodSelector(String className, String methodName) {
-		this(className, methodName, (ClassLoader) null);
-	}
-
 	MethodSelector(String className, String methodName, ClassLoader classLoader) {
 		this(className, methodName, "", classLoader);
 	}
 
-	MethodSelector(String className, String methodName, String methodParameterTypes) {
-		this(className, methodName, methodParameterTypes, null);
-	}
-
 	MethodSelector(String className, String methodName, String methodParameterTypes, ClassLoader classLoader) {
 		this.classLoader = classLoader;
 		this.className = className;
@@ -236,10 +228,10 @@ public int hashCode() {
 	public String toString() {
 		// @formatter:off
 		return new ToStringBuilder(this)
-				.append("className", this.className)
-				.append("methodName", this.methodName)
-				.append("methodParameterTypes", this.methodParameterTypes)
-				.append("classLoader", this.classLoader)
+				.append("className", getClassName())
+				.append("methodName", getMethodName())
+				.append("methodParameterTypes", getMethodParameterTypes())
+				.append("classLoader", getClassLoader())
 				.toString();
 		// @formatter:on
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
index 507fecca2d5c..16a0215f25e6 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -27,16 +27,16 @@ class ClassSelectorTests extends AbstractEqualsAndHashCodeTests {
 
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new ClassSelector("org.example.TestClass");
-		var selector2 = new ClassSelector("org.example.TestClass");
-		var selector3 = new ClassSelector("org.example.X");
+		var selector1 = new ClassSelector("org.example.TestClass", null);
+		var selector2 = new ClassSelector("org.example.TestClass", null);
+		var selector3 = new ClassSelector("org.example.X", null);
 
 		assertEqualsAndHashCode(selector1, selector2, selector3);
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadClass() {
-		var selector = new ClassSelector("org.example.TestClass");
+		var selector = new ClassSelector("org.example.TestClass", null);
 
 		var e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 526a1ad15fa1..1a128b23f3a9 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -30,7 +30,7 @@ void equalsAndHashCode() {
 		var selector1 = new MethodSelector("TestClass", "method", "int, boolean", null);
 		var selector2 = new MethodSelector("TestClass", "method", "int, boolean", null);
 
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", "int"));
+		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", "int", null));
 		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", (ClassLoader) null));
 		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", "int, boolean", null));
 		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", (ClassLoader) null));

From a30437b289aa1e071894a914ac05e152eee65d41 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 May 2023 12:36:41 +0200
Subject: [PATCH 1314/1433] Support explicit ClassLoader in NestedClassSelector

Issue: #3298
---
 .../release-notes-5.10.0-M1.adoc              |  6 ++---
 .../engine/discovery/DiscoverySelectors.java  | 19 ++++++++++++-
 .../engine/discovery/NestedClassSelector.java | 27 +++++++++++++++----
 .../discovery/DiscoverySelectorsTests.java    | 21 +++++++++++++++
 .../discovery/NestedClassSelectorTests.java   | 25 ++++++++++++-----
 5 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 05f4bcacba16..c837866c0409 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -37,9 +37,9 @@ repository on GitHub.
   `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
   arrangements (such as OSGi). Consequently, `DiscoverySelectors.selectMethod(Class<?>,
   String, String)` also now works properly with custom `ClassLoader` arrangements.
-* New overloaded constructors for `ClassSelector` and `MethodSelector` that take an
-  explicit `ClassLoader` as a parameter, allowing selectors to select classes in custom
-  `ClassLoader` arrangements like in OSGi.
+* New overloaded constructors for `ClassSelector`, `NestedClassSelector`, and
+  `MethodSelector` that take an explicit `ClassLoader` as a parameter, allowing selectors
+  to select classes in custom `ClassLoader` arrangements like in OSGi.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
   started/finished and opened/closed events are now invoked using "wrapping" semantics.
   This means that finished/closed event methods are invoked in reverse order compared to
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 721e5230ba0c..edc38f56eb14 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -635,9 +635,26 @@ public static NestedClassSelector selectNestedClass(List<Class<?>> enclosingClas
 	 */
 	@API(status = STABLE, since = "1.6")
 	public static NestedClassSelector selectNestedClass(List<String> enclosingClassNames, String nestedClassName) {
+		return selectNestedClass(enclosingClassNames, nestedClassName, null);
+	}
+
+	/**
+	 * Create a {@code NestedClassSelector} for the supplied class name, its enclosing
+	 * classes' names, and class loader.
+	 *
+	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
+	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
+	 * @param classLoader the class loader to use to load the enclosing and nested classes, or
+	 * {@code null} to signal that the default {@code ClassLoader} should be used
+	 * @since 1.10
+	 * @see NestedClassSelector
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static NestedClassSelector selectNestedClass(List<String> enclosingClassNames, String nestedClassName,
+			ClassLoader classLoader) {
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
-		return new NestedClassSelector(enclosingClassNames, nestedClassName);
+		return new NestedClassSelector(enclosingClassNames, nestedClassName, classLoader);
 	}
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
index 5d463eabe438..dbfc4f6871e1 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
@@ -11,7 +11,9 @@
 package org.junit.platform.engine.discovery;
 
 import static java.util.stream.Collectors.toList;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
+import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList;
 
 import java.util.List;
 import java.util.Objects;
@@ -46,17 +48,31 @@
 @API(status = STABLE, since = "1.6")
 public class NestedClassSelector implements DiscoverySelector {
 
-	private List<ClassSelector> enclosingClassSelectors;
-	private ClassSelector nestedClassSelector;
+	private final List<ClassSelector> enclosingClassSelectors;
+	private final ClassSelector nestedClassSelector;
+	private final ClassLoader classLoader;
 
-	NestedClassSelector(List<String> enclosingClassNames, String nestedClassName) {
-		this.enclosingClassSelectors = enclosingClassNames.stream().map(ClassSelector::new).collect(toList());
-		this.nestedClassSelector = new ClassSelector(nestedClassName);
+	NestedClassSelector(List<String> enclosingClassNames, String nestedClassName, ClassLoader classLoader) {
+		this.enclosingClassSelectors = enclosingClassNames.stream() //
+				.map(className -> new ClassSelector(className, classLoader)) //
+				.collect(toUnmodifiableList());
+		this.nestedClassSelector = new ClassSelector(nestedClassName, classLoader);
+		this.classLoader = classLoader;
 	}
 
 	NestedClassSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass) {
 		this.enclosingClassSelectors = enclosingClasses.stream().map(ClassSelector::new).collect(toList());
 		this.nestedClassSelector = new ClassSelector(nestedClass);
+		this.classLoader = nestedClass.getClassLoader();
+	}
+
+	/**
+	 * Get the {@link ClassLoader} used to load the selected nested class.
+	 * @since 1.10
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public ClassLoader getClassLoader() {
+		return this.classLoader;
 	}
 
 	/**
@@ -121,6 +137,7 @@ public String toString() {
 		return new ToStringBuilder(this) //
 				.append("enclosingClassNames", getEnclosingClassNames()) //
 				.append("nestedClassName", getNestedClassName()) //
+				.append("classLoader", getClassLoader()) //
 				.toString();
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index 6565b88b968e..a6c96f751d91 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -691,6 +691,27 @@ void selectNestedClassByClassNames() {
 			assertThat(selector.getNestedClassName()).isEqualTo(nestedClassName);
 		}
 
+		@Test
+		void selectNestedClassByClassNamesAndClassLoader() throws Exception {
+			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
+				AbstractClassWithNestedInnerClass.NestedClass.class);
+			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
+
+				var selector = selectNestedClass(List.of(enclosingClassName), nestedClassName, testClassLoader);
+
+				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
+				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
+				assertThat(selector.getNestedClass()).isNotEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+				assertThat(selector.getNestedClass().getName()).isEqualTo(nestedClassName);
+
+				assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
+				assertThat(selector.getEnclosingClasses()).extracting(Class::getClassLoader).containsOnly(
+					testClassLoader);
+				assertThat(selector.getNestedClass().getClassLoader()).isSameAs(testClassLoader);
+				assertSame(testClassLoader, selector.getNestedClass().getClassLoader());
+			}
+		}
+
 		@Test
 		void selectDoubleNestedClassByClassNames() {
 			var selector = selectNestedClass(List.of(enclosingClassName, nestedClassName), doubleNestedClassName);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
index c58b24b52a30..7d80b25e5437 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
@@ -30,18 +30,18 @@ class NestedClassSelectorTests extends AbstractEqualsAndHashCodeTests {
 	@Test
 	void equalsAndHashCode() {
 		var selector1 = new NestedClassSelector(List.of("org.example.EnclosingTestClass"),
-			"org.example.NestedTestClass");
+			"org.example.NestedTestClass", null);
 		var selector2 = new NestedClassSelector(List.of("org.example.EnclosingTestClass"),
-			"org.example.NestedTestClass");
-		var selector3 = new NestedClassSelector(List.of("org.example.X"), "org.example.Y");
+			"org.example.NestedTestClass", null);
+		var selector3 = new NestedClassSelector(List.of("org.example.X"), "org.example.Y", null);
 
 		assertEqualsAndHashCode(selector1, selector2, selector3);
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadEnclosingClasses() {
-		var selector = new NestedClassSelector(List.of("org.example.EnclosingTestClass"),
-			"org.example.NestedTestClass");
+		var selector = new NestedClassSelector(List.of("org.example.EnclosingTestClass"), "org.example.NestedTestClass",
+			null);
 
 		var exception = assertThrows(PreconditionViolationException.class, selector::getEnclosingClasses);
 
@@ -51,12 +51,23 @@ void preservesOriginalExceptionWhenTryingToLoadEnclosingClasses() {
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadNestedClass() {
-		var selector = new NestedClassSelector(List.of("org.example.EnclosingTestClass"),
-			"org.example.NestedTestClass");
+		var selector = new NestedClassSelector(List.of("org.example.EnclosingTestClass"), "org.example.NestedTestClass",
+			null);
 
 		var exception = assertThrows(PreconditionViolationException.class, selector::getNestedClass);
 
 		assertThat(exception).hasMessage("Could not load class with name: org.example.NestedTestClass") //
 				.hasCauseInstanceOf(ClassNotFoundException.class);
 	}
+
+	@Test
+	void usesClassClassLoader() {
+		var selector = new NestedClassSelector(List.of(getClass()), NestedTestCase.class);
+
+		assertThat(selector.getClassLoader()).isNotNull().isSameAs(getClass().getClassLoader());
+	}
+
+	@SuppressWarnings("InnerClassMayBeStatic")
+	class NestedTestCase {
+	}
 }

From 8bc798f00b0bbf9f58a96789bc7bc2cd80404e94 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 May 2023 13:22:26 +0200
Subject: [PATCH 1315/1433] Support explicit ClassLoader in
 NestedMethodSelector

Resolves #3298.
---
 .../release-notes-5.10.0-M1.adoc              |  7 +--
 .../engine/discovery/DiscoverySelectors.java  | 45 +++++++++++++++-
 .../discovery/NestedMethodSelector.java       | 24 ++++++---
 .../discovery/DiscoverySelectorsTests.java    | 52 ++++++++++++++++++-
 .../discovery/NestedMethodSelectorTests.java  | 43 ++++++++++-----
 5 files changed, 145 insertions(+), 26 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index c837866c0409..fe346720e342 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -37,9 +37,10 @@ repository on GitHub.
   `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
   arrangements (such as OSGi). Consequently, `DiscoverySelectors.selectMethod(Class<?>,
   String, String)` also now works properly with custom `ClassLoader` arrangements.
-* New overloaded constructors for `ClassSelector`, `NestedClassSelector`, and
-  `MethodSelector` that take an explicit `ClassLoader` as a parameter, allowing selectors
-  to select classes in custom `ClassLoader` arrangements like in OSGi.
+* New overloaded constructors for `ClassSelector`, `NestedClassSelector`,
+  `MethodSelector`, and `NestedMethodSelector` that take an explicit `ClassLoader` as a
+  parameter, allowing selectors to select classes in custom `ClassLoader` arrangements
+  like in OSGi.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
   started/finished and opened/closed events are now invoked using "wrapping" semantics.
   This means that finished/closed event methods are invoked in reverse order compared to
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index edc38f56eb14..6ada10fb641c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -669,11 +669,29 @@ public static NestedClassSelector selectNestedClass(List<String> enclosingClassN
 	@API(status = STABLE, since = "1.6")
 	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
 			String methodName) {
+		return selectNestedMethod(enclosingClassNames, nestedClassName, methodName, (ClassLoader) null);
+	}
 
+	/**
+	 * Create a {@code NestedMethodSelector} for the supplied nested class name, method name,
+	 * and class loader.
+	 *
+	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
+	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
+	 * @param methodName the name of the method to select; never {@code null} or blank
+	 * @param classLoader the class loader to use to load the method's declaring
+	 * class, or {@code null} to signal that the default {@code ClassLoader}
+	 * should be used
+	 * @since 1.10
+	 * @see NestedMethodSelector
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
+			String methodName, ClassLoader classLoader) throws PreconditionViolationException {
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName);
+		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, classLoader);
 	}
 
 	/**
@@ -696,12 +714,35 @@ public static NestedMethodSelector selectNestedMethod(List<String> enclosingClas
 	@API(status = STABLE, since = "1.6")
 	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
 			String methodName, String methodParameterTypes) {
+		return selectNestedMethod(enclosingClassNames, nestedClassName, methodName, methodParameterTypes, null);
+	}
+
+	/**
+	 * Create a {@code NestedMethodSelector} for the supplied nested class name, method name,
+	 * method parameter types, and class loader.
+	 *
+	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
+	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
+	 * @param methodName the name of the method to select; never {@code null} or blank
+	 * @param methodParameterTypes the method parameter types as a single string; never
+	 * {@code null} though potentially an empty string if the method does not accept
+	 * arguments
+	 * @param classLoader the class loader to use to load the method's declaring
+	 * class, or {@code null} to signal that the default {@code ClassLoader}
+	 * should be used
+	 * @since 1.10
+	 * @see #selectNestedMethod(List, String, String, String)
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
+			String methodName, String methodParameterTypes, ClassLoader classLoader) {
 
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
 		Preconditions.notNull(methodParameterTypes, "Parameter types must not be null");
-		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, methodParameterTypes);
+		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, methodParameterTypes,
+			classLoader);
 	}
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index 28f00afa88c1..3e3e97371c41 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.discovery;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.reflect.Method;
@@ -55,15 +56,15 @@ public class NestedMethodSelector implements DiscoverySelector {
 	private final NestedClassSelector nestedClassSelector;
 	private final MethodSelector methodSelector;
 
-	NestedMethodSelector(List<String> enclosingClassNames, String nestedClassName, String methodName) {
-		this.nestedClassSelector = new NestedClassSelector(enclosingClassNames, nestedClassName);
-		this.methodSelector = new MethodSelector(nestedClassName, methodName);
+	NestedMethodSelector(List<String> enclosingClassNames, String nestedClassName, String methodName,
+			ClassLoader classLoader) {
+		this(enclosingClassNames, nestedClassName, methodName, "", classLoader);
 	}
 
 	NestedMethodSelector(List<String> enclosingClassNames, String nestedClassName, String methodName,
-			String methodParameterTypes) {
-		this.nestedClassSelector = new NestedClassSelector(enclosingClassNames, nestedClassName);
-		this.methodSelector = new MethodSelector(nestedClassName, methodName, methodParameterTypes);
+			String methodParameterTypes, ClassLoader classLoader) {
+		this.nestedClassSelector = new NestedClassSelector(enclosingClassNames, nestedClassName, classLoader);
+		this.methodSelector = new MethodSelector(nestedClassName, methodName, methodParameterTypes, classLoader);
 	}
 
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName) {
@@ -82,6 +83,16 @@ public class NestedMethodSelector implements DiscoverySelector {
 		this.methodSelector = new MethodSelector(nestedClass, method);
 	}
 
+	/**
+	 * Get the {@link ClassLoader} used to load the nested class.
+	 *
+	 * @since 1.10
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public ClassLoader getClassLoader() {
+		return this.nestedClassSelector.getClassLoader();
+	}
+
 	/**
 	 * Get the names of the classes enclosing the nested class
 	 * containing the selected method.
@@ -182,6 +193,7 @@ public String toString() {
 				.append("nestedClassName", getNestedClassName()) //
 				.append("methodName", getMethodName()) //
 				.append("methodParameterTypes", getMethodParameterTypes()) //
+				.append("classLoader", getClassLoader()) //
 				.toString();
 	}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index a6c96f751d91..bf2cd601b4bb 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -747,6 +747,30 @@ void selectNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
 			assertThat(selector.getMethodName()).isEqualTo(methodName);
 		}
 
+		@Test
+		void selectNestedMethodByEnclosingClassNamesAndMethodNameAndClassLoader() throws Exception {
+			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
+				AbstractClassWithNestedInnerClass.NestedClass.class);
+			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
+
+				var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
+					testClassLoader);
+
+				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
+				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
+				assertThat(selector.getNestedClass()).isNotEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+				assertThat(selector.getNestedClass().getName()).isEqualTo(nestedClassName);
+
+				assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
+				assertThat(selector.getEnclosingClasses()).extracting(Class::getClassLoader).containsOnly(
+					testClassLoader);
+				assertThat(selector.getNestedClass().getClassLoader()).isSameAs(testClassLoader);
+				assertSame(testClassLoader, selector.getNestedClass().getClassLoader());
+
+				assertThat(selector.getMethodName()).isEqualTo(methodName);
+			}
+		}
+
 		@Test
 		void selectNestedMethodByEnclosingClassesAndMethodName() throws Exception {
 			var selector = selectNestedMethod(List.of(ClassWithNestedInnerClass.class),
@@ -776,6 +800,31 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypes() th
 			assertThat(selector.getMethodName()).isEqualTo(methodName);
 		}
 
+		@Test
+		void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypesAndClassLoader() throws Exception {
+			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
+				AbstractClassWithNestedInnerClass.NestedClass.class);
+			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
+
+				var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
+					String.class.getName(), testClassLoader);
+
+				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
+				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
+				assertThat(selector.getNestedClass()).isNotEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+				assertThat(selector.getNestedClass().getName()).isEqualTo(nestedClassName);
+
+				assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
+				assertThat(selector.getEnclosingClasses()).extracting(Class::getClassLoader).containsOnly(
+					testClassLoader);
+				assertThat(selector.getNestedClass().getClassLoader()).isSameAs(testClassLoader);
+				assertSame(testClassLoader, selector.getNestedClass().getClassLoader());
+
+				assertThat(selector.getMethodName()).isEqualTo(methodName);
+				assertThat(selector.getMethodParameterTypes()).isEqualTo(String.class.getName());
+			}
+		}
+
 		@Test
 		void selectDoubleNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
 			var doubleNestedMethodName = "doubleNestedTest";
@@ -808,7 +857,8 @@ void selectNestedMethodPreconditions() {
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", null, "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", " "));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", " ", "int"));
-			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", "methodName", null));
+			assertViolatesPrecondition(
+				() -> selectNestedMethod(List.of("ClassName"), "ClassName", "methodName", (String) null));
 		}
 
 		abstract class AbstractClassWithNestedInnerClass {
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
index 2c547172a95f..13a6bf5bab4a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
@@ -29,32 +29,33 @@ class NestedMethodSelectorTests extends AbstractEqualsAndHashCodeTests {
 
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method",
-			"int, boolean");
-		var selector2 = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method",
-			"int, boolean");
+		var selector1 = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean",
+			null);
+		var selector2 = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean",
+			null);
 
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("X"), "NestedTestClass", "method", "int, boolean"));
+			new NestedMethodSelector(List.of("X"), "NestedTestClass", "method", "int, boolean", null));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("X"), "NestedTestClass", "method"));
+			new NestedMethodSelector(List.of("X"), "NestedTestClass", "method", "", null));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int"));
+			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int", null));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method"));
+			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "", null));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "X", "int, boolean"));
+			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "X", "int, boolean", null));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "X"));
+			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "X", "", null));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "X", "method", "int, boolean"));
+			new NestedMethodSelector(List.of("EnclosingClass"), "X", "method", "int, boolean", null));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "X", "method"));
+			new NestedMethodSelector(List.of("EnclosingClass"), "X", "method", "", null));
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadEnclosingClass() {
-		var selector = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean");
+		var selector = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean",
+			null);
 
 		var exception = assertThrows(PreconditionViolationException.class, selector::getEnclosingClasses);
 
@@ -64,7 +65,8 @@ void preservesOriginalExceptionWhenTryingToLoadEnclosingClass() {
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadNestedClass() {
-		var selector = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean");
+		var selector = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean",
+			null);
 
 		var exception = assertThrows(PreconditionViolationException.class, selector::getNestedClass);
 
@@ -72,4 +74,17 @@ void preservesOriginalExceptionWhenTryingToLoadNestedClass() {
 				.hasCauseInstanceOf(ClassNotFoundException.class);
 	}
 
+	@Test
+	void usesClassClassLoader() {
+		var selector = new NestedMethodSelector(List.of(getClass()), NestedTestCase.class, "method", "");
+
+		assertThat(selector.getClassLoader()).isNotNull().isSameAs(getClass().getClassLoader());
+	}
+
+	@SuppressWarnings("InnerClassMayBeStatic")
+	class NestedTestCase {
+		void method() {
+		}
+	}
+
 }

From 15abc968a9cb66250675514751a445a0f951bb69 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 May 2023 14:34:46 +0200
Subject: [PATCH 1316/1433] Prepare release notes for 5.10 M1

---
 .../release-notes-5.10.0-M1.adoc              | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index fe346720e342..b76262cbb9cf 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -1,9 +1,23 @@
 [[release-notes-5.10.0-M1]]
 == 5.10.0-M1
 
-*Date of Release:* ❓
-
-*Scope:* ❓
+*Date of Release:* May 13, 2023
+
+*Scope:*
+
+* Promotion of various experimental APIs to stable
+* New `LauncherInterceptor` SPI
+* New `testfeed` details mode for `ConsoleLauncher`
+* New `ConsoleLauncher` subcommand for test discovery without execution
+* Dry-run mode for test execution
+* Provide `NamespacedHierarchicalStore` for third-party test engine reuse
+* Stacktrace pruning to hide internal JUnit calls
+* New `TempDirFactory` SPI for customizing how temporary directories are created
+* Failure threshold for `@RepeatedTest`
+* New convenience base classes for implementing `ArgumentsProvider` and `ArgumentConverter`
+* Custom class loader support for class/method selectors, `@MethodSource`, `@EnabledIf`, and `@DisabledIf`
+* Improved configurability of parallel execution
+* Numerous bug fixes and minor improvements
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1] milestone page in the JUnit
@@ -13,14 +27,11 @@ repository on GitHub.
 [[release-notes-5.10.0-M1-junit-platform]]
 === JUnit Platform
 
-==== Bug Fixes
-
-* ❓
-
 ==== Deprecations and Breaking Changes
 
 * Building native images with GraalVM now requires configuring the build arg
-  `--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig`.
+  `--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig` and
+  `--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter`.
 
 ==== New Features and Improvements
 
@@ -118,8 +129,8 @@ repository on GitHub.
   parameter to set the maximum pool size factor.
 * New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
   parameter to disable pool saturation.
-* New `TempDirFactory` SPI for customizing how the `TempDirectory` extension creates
-  temporary directories. See the
+* New `TempDirFactory` SPI for customizing how the `@TempDir` extension creates temporary
+  directories. See the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
 * New `junit.jupiter.tempdir.factory.default` configuration parameter to set the default
@@ -127,19 +138,3 @@ repository on GitHub.
 * If `@MethodSource` is used with a non-static factory method that should be `static`, the
   exception thrown now provides the user a meaningful explanation of how to address the
   problem.
-
-
-[[release-notes-5.10.0-M1-junit-vintage]]
-=== JUnit Vintage
-
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓

From 8b7b6ef904b22095e1369b528b1d690905d26972 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 13 May 2023 14:37:15 +0200
Subject: [PATCH 1317/1433] Polishing

---
 .../commons/test/TestClassLoader.java         | 14 +++++++
 .../engine/discovery/NestedClassSelector.java | 14 +++----
 .../discovery/NestedMethodSelector.java       | 19 +++++----
 .../discovery/DiscoverySelectorsTests.java    | 42 +++++++++----------
 4 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
index 33319209cefd..5ec1970b4dc8 100644
--- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
@@ -15,6 +15,7 @@
 import java.net.URLClassLoader;
 import java.security.CodeSource;
 import java.util.Arrays;
+import java.util.List;
 import java.util.function.Predicate;
 
 import org.junit.platform.commons.util.ClassLoaderUtils;
@@ -40,6 +41,7 @@ public class TestClassLoader extends URLClassLoader {
 	/**
 	 * Create a {@link TestClassLoader} that filters the provided classes.
 	 *
+	 * @see #forClasses(List)
 	 * @see #forClassNamePrefix(String)
 	 */
 	public static TestClassLoader forClasses(Class<?>... classes) {
@@ -47,11 +49,23 @@ public static TestClassLoader forClasses(Class<?>... classes) {
 		return new TestClassLoader(getCodeSourceUrl(stackWalker.getCallerClass()), classNameFilter);
 	}
 
+	/**
+	 * Create a {@link TestClassLoader} that filters the provided classes.
+	 *
+	 * @see #forClasses(Class...)
+	 * @see #forClassNamePrefix(String)
+	 */
+	public static TestClassLoader forClasses(List<Class<?>> classes) {
+		Predicate<String> classNameFilter = name -> classes.stream().map(Class::getName).anyMatch(name::equals);
+		return new TestClassLoader(getCodeSourceUrl(stackWalker.getCallerClass()), classNameFilter);
+	}
+
 	/**
 	 * Create a {@link TestClassLoader} that filters classes whose fully
 	 * qualified names start with the provided prefix.
 	 *
 	 * @see #forClasses(Class...)
+	 * @see #forClasses(List)
 	 */
 	public static TestClassLoader forClassNamePrefix(String prefix) {
 		return new TestClassLoader(getCodeSourceUrl(stackWalker.getCallerClass()), name -> name.startsWith(prefix));
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
index dbfc4f6871e1..036f50affa3e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
@@ -79,7 +79,7 @@ public ClassLoader getClassLoader() {
 	 * Get the names of the classes enclosing the selected nested class.
 	 */
 	public List<String> getEnclosingClassNames() {
-		return enclosingClassSelectors.stream().map(ClassSelector::getClassName).collect(toList());
+		return this.enclosingClassSelectors.stream().map(ClassSelector::getClassName).collect(toList());
 	}
 
 	/**
@@ -92,14 +92,14 @@ public List<String> getEnclosingClassNames() {
 	 * {@link PreconditionViolationException} if the classes cannot be loaded.
 	 */
 	public List<Class<?>> getEnclosingClasses() {
-		return enclosingClassSelectors.stream().map(ClassSelector::getJavaClass).collect(toList());
+		return this.enclosingClassSelectors.stream().map(ClassSelector::getJavaClass).collect(toList());
 	}
 
 	/**
 	 * Get the name of the selected nested class.
 	 */
 	public String getNestedClassName() {
-		return nestedClassSelector.getClassName();
+		return this.nestedClassSelector.getClassName();
 	}
 
 	/**
@@ -111,7 +111,7 @@ public String getNestedClassName() {
 	 * {@link PreconditionViolationException} if the class cannot be loaded.
 	 */
 	public Class<?> getNestedClass() {
-		return nestedClassSelector.getJavaClass();
+		return this.nestedClassSelector.getJavaClass();
 	}
 
 	@Override
@@ -123,13 +123,13 @@ public boolean equals(Object o) {
 			return false;
 		}
 		NestedClassSelector that = (NestedClassSelector) o;
-		return enclosingClassSelectors.equals(that.enclosingClassSelectors)
-				&& nestedClassSelector.equals(that.nestedClassSelector);
+		return this.enclosingClassSelectors.equals(that.enclosingClassSelectors)
+				&& this.nestedClassSelector.equals(that.nestedClassSelector);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(enclosingClassSelectors, nestedClassSelector);
+		return Objects.hash(this.enclosingClassSelectors, this.nestedClassSelector);
 	}
 
 	@Override
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index 3e3e97371c41..154e0a554e7e 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -98,7 +98,7 @@ public ClassLoader getClassLoader() {
 	 * containing the selected method.
 	 */
 	public List<String> getEnclosingClassNames() {
-		return nestedClassSelector.getEnclosingClassNames();
+		return this.nestedClassSelector.getEnclosingClassNames();
 	}
 
 	/**
@@ -111,14 +111,14 @@ public List<String> getEnclosingClassNames() {
 	 * {@link PreconditionViolationException} if the classes cannot be loaded.
 	 */
 	public List<Class<?>> getEnclosingClasses() {
-		return nestedClassSelector.getEnclosingClasses();
+		return this.nestedClassSelector.getEnclosingClasses();
 	}
 
 	/**
 	 * Get the name of the nested class containing the selected method.
 	 */
 	public String getNestedClassName() {
-		return nestedClassSelector.getNestedClassName();
+		return this.nestedClassSelector.getNestedClassName();
 	}
 
 	/**
@@ -130,14 +130,14 @@ public String getNestedClassName() {
 	 * {@link PreconditionViolationException} if the class cannot be loaded.
 	 */
 	public Class<?> getNestedClass() {
-		return nestedClassSelector.getNestedClass();
+		return this.nestedClassSelector.getNestedClass();
 	}
 
 	/**
 	 * Get the name of the selected method.
 	 */
 	public String getMethodName() {
-		return methodSelector.getMethodName();
+		return this.methodSelector.getMethodName();
 	}
 
 	/**
@@ -148,7 +148,7 @@ public String getMethodName() {
 	 * {@link PreconditionViolationException} if the method cannot be loaded.
 	 */
 	public Method getMethod() {
-		return methodSelector.getJavaMethod();
+		return this.methodSelector.getJavaMethod();
 	}
 
 	/**
@@ -166,7 +166,7 @@ public Method getMethod() {
 	 * constructor; never {@code null}
 	 */
 	public String getMethodParameterTypes() {
-		return methodSelector.getMethodParameterTypes();
+		return this.methodSelector.getMethodParameterTypes();
 	}
 
 	@Override
@@ -178,12 +178,13 @@ public boolean equals(Object o) {
 			return false;
 		}
 		NestedMethodSelector that = (NestedMethodSelector) o;
-		return nestedClassSelector.equals(that.nestedClassSelector) && methodSelector.equals(that.methodSelector);
+		return this.nestedClassSelector.equals(that.nestedClassSelector)
+				&& this.methodSelector.equals(that.methodSelector);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(nestedClassSelector, methodSelector);
+		return Objects.hash(this.nestedClassSelector, this.methodSelector);
 	}
 
 	@Override
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index bf2cd601b4bb..b49186a535b7 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -13,8 +13,6 @@
 import static java.lang.String.join;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
@@ -248,11 +246,12 @@ void selectClassByName() {
 	@Test
 	void selectClassByNameAndClassLoader() throws Exception {
 		try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
-			ClassSelector selector = selectClass(getClass().getName(), testClassLoader);
-			assertEquals(getClass().getName(), selector.getJavaClass().getName());
-			assertNotEquals(getClass(), selector.getJavaClass());
-			assertSame(testClassLoader, selector.getClassLoader());
-			assertSame(testClassLoader, selector.getJavaClass().getClassLoader());
+			var selector = selectClass(getClass().getName(), testClassLoader);
+
+			assertThat(selector.getJavaClass().getName()).isEqualTo(getClass().getName());
+			assertThat(selector.getJavaClass()).isNotEqualTo(getClass());
+			assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
+			assertThat(selector.getJavaClass().getClassLoader()).isSameAs(testClassLoader);
 		}
 	}
 
@@ -337,16 +336,16 @@ void selectMethodByFullyQualifiedName() throws Exception {
 	@Test
 	void selectMethodByFullyQualifiedNameAndClassLoader() throws Exception {
 		try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
-			Class<?> clazz = testClassLoader.loadClass(getClass().getName());
-			assertNotEquals(getClass(), clazz);
-
-			Method method = clazz.getDeclaredMethod("myTest");
-			MethodSelector selector = selectMethod(getClass().getName(), "myTest", testClassLoader);
-			assertEquals(method, selector.getJavaMethod());
-			assertEquals(clazz, selector.getJavaClass());
-			assertEquals(clazz.getName(), selector.getClassName());
-			assertEquals(method.getName(), selector.getMethodName());
-			assertEquals("", selector.getMethodParameterTypes());
+			var clazz = testClassLoader.loadClass(getClass().getName());
+			assertThat(clazz).isNotEqualTo(getClass());
+
+			var method = clazz.getDeclaredMethod("myTest");
+			var selector = selectMethod(getClass().getName(), "myTest", testClassLoader);
+			assertThat(selector.getJavaMethod()).isEqualTo(method);
+			assertThat(selector.getJavaClass()).isEqualTo(clazz);
+			assertThat(selector.getClassName()).isEqualTo(clazz.getName());
+			assertThat(selector.getMethodName()).isEqualTo(method.getName());
+			assertThat(selector.getMethodParameterTypes()).isEmpty();
 		}
 	}
 
@@ -695,8 +694,8 @@ void selectNestedClassByClassNames() {
 		void selectNestedClassByClassNamesAndClassLoader() throws Exception {
 			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
 				AbstractClassWithNestedInnerClass.NestedClass.class);
-			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
 
+			try (var testClassLoader = TestClassLoader.forClasses(testClasses)) {
 				var selector = selectNestedClass(List.of(enclosingClassName), nestedClassName, testClassLoader);
 
 				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
@@ -708,7 +707,6 @@ void selectNestedClassByClassNamesAndClassLoader() throws Exception {
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getClassLoader).containsOnly(
 					testClassLoader);
 				assertThat(selector.getNestedClass().getClassLoader()).isSameAs(testClassLoader);
-				assertSame(testClassLoader, selector.getNestedClass().getClassLoader());
 			}
 		}
 
@@ -751,8 +749,8 @@ void selectNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
 		void selectNestedMethodByEnclosingClassNamesAndMethodNameAndClassLoader() throws Exception {
 			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
 				AbstractClassWithNestedInnerClass.NestedClass.class);
-			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
 
+			try (var testClassLoader = TestClassLoader.forClasses(testClasses)) {
 				var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
 					testClassLoader);
 
@@ -765,7 +763,6 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameAndClassLoader() throws
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getClassLoader).containsOnly(
 					testClassLoader);
 				assertThat(selector.getNestedClass().getClassLoader()).isSameAs(testClassLoader);
-				assertSame(testClassLoader, selector.getNestedClass().getClassLoader());
 
 				assertThat(selector.getMethodName()).isEqualTo(methodName);
 			}
@@ -804,8 +801,8 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypes() th
 		void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypesAndClassLoader() throws Exception {
 			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
 				AbstractClassWithNestedInnerClass.NestedClass.class);
-			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
 
+			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
 				var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
 					String.class.getName(), testClassLoader);
 
@@ -818,7 +815,6 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypesAndCl
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getClassLoader).containsOnly(
 					testClassLoader);
 				assertThat(selector.getNestedClass().getClassLoader()).isSameAs(testClassLoader);
-				assertSame(testClassLoader, selector.getNestedClass().getClassLoader());
 
 				assertThat(selector.getMethodName()).isEqualTo(methodName);
 				assertThat(selector.getMethodParameterTypes()).isEqualTo(String.class.getName());

From d26453d0ad2aff038fa5d8d137e56df4cb1a4886 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 13 May 2023 14:51:25 +0200
Subject: [PATCH 1318/1433] Polish release notes

---
 .../release-notes/release-notes-5.10.0-M1.adoc        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index b76262cbb9cf..cb26ac56a9dc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -10,12 +10,13 @@
 * New `testfeed` details mode for `ConsoleLauncher`
 * New `ConsoleLauncher` subcommand for test discovery without execution
 * Dry-run mode for test execution
-* Provide `NamespacedHierarchicalStore` for third-party test engine reuse
+* New `NamespacedHierarchicalStore` for use in third-party test engines
 * Stacktrace pruning to hide internal JUnit calls
 * New `TempDirFactory` SPI for customizing how temporary directories are created
 * Failure threshold for `@RepeatedTest`
 * New convenience base classes for implementing `ArgumentsProvider` and `ArgumentConverter`
-* Custom class loader support for class/method selectors, `@MethodSource`, `@EnabledIf`, and `@DisabledIf`
+* Custom class loader support for class/method selectors, `@MethodSource`, `@EnabledIf`,
+  and `@DisabledIf`
 * Improved configurability of parallel execution
 * Numerous bug fixes and minor improvements
 
@@ -138,3 +139,9 @@ repository on GitHub.
 * If `@MethodSource` is used with a non-static factory method that should be `static`, the
   exception thrown now provides the user a meaningful explanation of how to address the
   problem.
+
+
+[[release-notes-5.10.0-M1-junit-vintage]]
+=== JUnit Vintage
+
+No changes.

From e8f5c06270e3691109a4d8559c7e68b0b59436a2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 13 May 2023 15:04:50 +0200
Subject: [PATCH 1319/1433] Polish Javadoc for discovery selectors

---
 .../junit/platform/engine/discovery/MethodSelector.java   | 2 +-
 .../platform/engine/discovery/NestedClassSelector.java    | 8 ++++----
 .../platform/engine/discovery/NestedMethodSelector.java   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 85251b2bfc47..32a4b2a11410 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -35,7 +35,7 @@
  * {@linkplain #getJavaMethod() method} and its method name, class name, and
  * parameter types accordingly. If a {@link Class} and method name, a class name
  * and method name, or a <em>fully qualified method name</em> is provided,
- * this selector will only attempt to lazily load the {@link Class} and
+ * this selector will only attempt to lazily load the {@link Class} or
  * {@link Method} if {@link #getJavaClass()} or {@link #getJavaMethod()} is
  * invoked.
  *
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
index 036f50affa3e..877ed2820b26 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
@@ -30,10 +30,10 @@
  * tests or containers based on classes.
  *
  * <p>If Java {@link Class} references are provided for the nested class or
- * the enclosing classes, the selector will return these {@code Class} and
- * their class names accordingly. If class names are provided, the selector
- * will only attempt to lazily load the {@link Class} if
- * {@link #getEnclosingClasses()} or {@link #getNestedClass()} are invoked.
+ * the enclosing classes, the selector will return those classes and their class
+ * names accordingly. If class names are provided, the selector will only attempt
+ * to lazily load classes if {@link #getEnclosingClasses()} or
+ * {@link #getNestedClass()} is invoked.
  *
  * <p>In this context, Java {@link Class} means anything that can be referenced
  * as a {@link Class} on the JVM &mdash; for example, classes from other JVM
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index 154e0a554e7e..76d46b8bbcaf 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -31,10 +31,10 @@
  *
  * <p>If a Java {@link Method} is provided, the selector will return that
  * {@linkplain #getMethod() method} and its method name, class name, enclosing
- * classes names and parameter types accordingly. If class or methods names are
- * provided, this selector will only attempt to lazily load the {@link Class}
- * and {@link Method} if {@link #getEnclosingClasses()},
- * {@link #getNestedClass()} or {@link #getMethod()} is invoked.
+ * classes names, and parameter types accordingly. If class names or method names
+ * are provided, this selector will only attempt to lazily load the {@link Class}
+ * or {@link Method} if {@link #getEnclosingClasses()},
+ * {@link #getNestedClass()}, or {@link #getMethod()} is invoked.
  *
  * <p>In this context, a Java {@code Method} means anything that can be referenced
  * as a {@link Method} on the JVM &mdash; for example, methods from Java classes

From 6b98fe2dbeee4f62ea3dd14ba8d855560076d73f Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 May 2023 14:44:28 +0200
Subject: [PATCH 1320/1433] Release 5.10.0-M1

---
 README.md         | 2 +-
 gradle.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c6af2f63b219..5bc2cae11046 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository is the home of _JUnit 5_.
 ## Latest Releases
 
 - General Availability (GA): [JUnit 5.9.3](https://github.com/junit-team/junit5/releases/tag/r5.9.3) (April 26, 2023)
-- Preview (Milestone/Release Candidate): n/a
+- Preview (Milestone/Release Candidate): [JUnit 5.10.0-M1](https://github.com/junit-team/junit5/releases/tag/r5.10.0-M1) (May 13, 2023)
 
 ## Documentation
 
diff --git a/gradle.properties b/gradle.properties
index 1a6d11cf2f54..341c0acfa0eb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.10.0-SNAPSHOT
+version         = 5.10.0-M1
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.10.0-SNAPSHOT
+platformVersion = 1.10.0-M1
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.10.0-SNAPSHOT
+vintageVersion  = 5.10.0-M1
 
 defaultBuiltBy  = JUnit Team
 

From 0ee6e09a41e944feecb2df2f4845c86f4aea1baa Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 13 May 2023 15:19:29 +0200
Subject: [PATCH 1321/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 341c0acfa0eb..1a6d11cf2f54 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.10.0-M1
+version         = 5.10.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.10.0-M1
+platformVersion = 1.10.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.10.0-M1
+vintageVersion  = 5.10.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From ebb31e169077edde00bdd04493aaa56fb02e066d Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Sat, 13 May 2023 18:18:35 +0200
Subject: [PATCH 1322/1433] Add missing parenthesis

---
 documentation/src/docs/asciidoc/user-guide/writing-tests.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 757a72a2990b..a05eb8b70dec 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -1301,7 +1301,7 @@ for parameterized tests that accept a single argument.
   `@ParameterizedTest` method for parameters of the following types: `java.lang.String`,
   `java.util.Collection` (and concrete subtypes with a `public` no-arg constructor),
   `java.util.List`, `java.util.Set`, `java.util.SortedSet`, `java.util.NavigableSet`,
-  `java.util.Map` (and concrete subtypes with a `public` no-arg constructor,
+  `java.util.Map` (and concrete subtypes with a `public` no-arg constructor),
   `java.util.SortedMap`, `java.util.NavigableMap`, primitive arrays (e.g., `int[]`,
   `char[][]`, etc.), object arrays (e.g., `String[]`, `Integer[][]`, etc.).
 * `{NullAndEmptySource}`: a _composed annotation_ that combines the functionality of

From 85c3c91371848be9e9410301a1dc3dbac25d01c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 05:58:13 +0000
Subject: [PATCH 1323/1433] Bump org.apache.groovy:groovy from 4.0.11 to 4.0.12

Bumps [org.apache.groovy:groovy](https://github.com/apache/groovy) from 4.0.11 to 4.0.12.
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3e6b28566abc..72a63bcdcf34 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd
 gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.18.0" }
 gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionsPlugin" }
-groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.11" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.12" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }

From 94e8ded5a7d334c43828d00700a73703f4d7ca8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 05:58:15 +0000
Subject: [PATCH 1324/1433] Bump com.gradle:gradle-enterprise-gradle-plugin
 from 3.13.1 to 3.13.2

Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.13.1 to 3.13.2.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 72a63bcdcf34..04664d9d79f5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.157" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.10" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
-gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.1" }
+gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.2" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.18.0" }

From 00266f465ff02bc172580c0d655204dbc6d349d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 05:58:27 +0000
Subject: [PATCH 1325/1433] Bump org.jetbrains.kotlinx:kotlinx-coroutines-core
 from 1.7.0 to 1.7.1

Bumps [org.jetbrains.kotlinx:kotlinx-coroutines-core](https://github.com/Kotlin/kotlinx.coroutines) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.0...1.7.1)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 04664d9d79f5..a4597b08b5bd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -46,7 +46,7 @@ jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "2.0.0" }
 junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.13.2" } }
-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.0" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.1" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.1" }

From 576901a2314d4d190f1823874a702d44a0b57350 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 05:58:32 +0000
Subject: [PATCH 1326/1433] Bump com.github.marschall:memoryfilesystem from
 2.6.0 to 2.6.1

Bumps [com.github.marschall:memoryfilesystem](https://github.com/marschall/memoryfilesystem) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/marschall/memoryfilesystem/releases)
- [Commits](https://github.com/marschall/memoryfilesystem/compare/2.6.0...2.6.1)

---
updated-dependencies:
- dependency-name: com.github.marschall:memoryfilesystem
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a4597b08b5bd..35727bff1cc6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.1" }
-memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.6.0" }
+memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.6.1" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.3.1" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }

From 704e383ddc43fb1adb3277ef9e3f18a049c036f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 05:58:40 +0000
Subject: [PATCH 1327/1433] Bump io.github.classgraph:classgraph from 4.8.157
 to 4.8.158

Bumps [io.github.classgraph:classgraph](https://github.com/classgraph/classgraph) from 4.8.157 to 4.8.158.
- [Release notes](https://github.com/classgraph/classgraph/releases)
- [Commits](https://github.com/classgraph/classgraph/compare/classgraph-4.8.157...classgraph-4.8.158)

---
updated-dependencies:
- dependency-name: io.github.classgraph:classgraph
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 35727bff1cc6..1f1c3f1595dc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.0.1"
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
-classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.157" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.158" }
 commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.10" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }

From 8263ce2c34285e715c0a7e2db420dff41bd50309 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 15 May 2023 21:04:16 +0200
Subject: [PATCH 1328/1433] Use official action to label new issues

---
 .github/workflows/issue-labels.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/issue-labels.yml b/.github/workflows/issue-labels.yml
index 3dadaf6b4ad6..763dfe889565 100644
--- a/.github/workflows/issue-labels.yml
+++ b/.github/workflows/issue-labels.yml
@@ -1,14 +1,20 @@
 name: Label new issues
 on:
   issues:
-      types: ['opened']
+    types:
+      - opened
 jobs:
-  build:
+  label_issues:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
     steps:
-      - uses: Renato66/auto-label@69b3cbe79438b2079aed0a49474275d3e572cae5 # or v2
+      - uses: actions/github-script@v6
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          labels-synonyms: '{"3rd-party: Eclipse":["Eclipse"],"3rd-party: Gradle":["Gradle"],"3rd-party: IntelliJ IDEA":["IDEA","IntelliJ"],"3rd-party: Maven Surefire":["Failsafe","Maven","Surefire"],"3rd-party: Pioneer":["pioneer"],"component: Groovy":["Groovy"],"component: Test Kit":["Test Kit","TestKit"]}'
-          labels-not-allowed: '["dependencies","status: blocked","status: declined","status: duplicate","status: in progress","status: invalid","status: stale","status: superseded","status: team discussion","status: waiting-for-feedback","status: waiting-for-interest","status: works-as-designed","up-for-grabs"]'
-          default-labels: '["status: new"]'
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["status: new"]
+            })

From 5014959edb1be0a2faa94c560149ec508f508059 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 15 May 2023 21:19:12 +0200
Subject: [PATCH 1329/1433] Use GitHub Action instead of Stalebot to close
 inactive issues and PRs

---
 .github/stale.yml                           | 63 ---------------------
 .github/workflows/close-inactive-issues.yml | 31 ++++++++++
 2 files changed, 31 insertions(+), 63 deletions(-)
 delete mode 100644 .github/stale.yml
 create mode 100644 .github/workflows/close-inactive-issues.yml

diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index e99f9d303c4d..000000000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-# Configuration options apply to both Issues and Pull Requests.
-# We configure those individually to match our workflow (see `pulls:` and `issues:`)
-
-pulls:
-  # Number of days of inactivity before a Pull Request becomes stale
-  daysUntilStale: 14
-
-  # Number of days of inactivity before a Pull Request with the stale label is closed.
-  # Set to false to disable. If disabled, Pull Request still need to be closed manually, but will remain marked as stale.
-  daysUntilClose: 21
-
-  # Comment to post when marking as stale. Set to `false` to disable
-  markComment: >
-    If you would like us to be able to process this pull request, please provide the requested information or make the requested changes.
-    If the information is not provided or the requested changes are not made within the next 3 weeks, we will be unable to proceed and this pull request will be closed.
-  # Comment to post when closing a stale Pull Request.
-  closeComment: >
-    Closing due to lack of requested feedback.
-    If you would like to proceed with your contribution, please provide the requested information or make the requested changes, and we will re-open this pull request.
-issues:
-  daysUntilStale: 14
-
-  # Number of days of inactivity before an Issue with the stale label is closed.
-  # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-  daysUntilClose: 21
-
-  # Comment to post when marking as stale. Set to `false` to disable
-  markComment: >
-    If you would like us to be able to process this issue, please provide the requested information.
-    If the information is not provided within the next 3 weeks, we will be unable to proceed and this issue will be closed.
-  # Comment to post when closing a stale Issue.
-  closeComment: >
-    Closing due to lack of requested feedback.
-    If you would like to proceed with your contribution, please provide the requested information and we will re-open this issue.
-
-# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
-onlyLabels: ["status: waiting-for-feedback"]
-
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels: []
-
-# Set to true to ignore issues in a project (defaults to false)
-exemptProjects: false
-
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: false
-
-# Set to true to ignore issues with an assignee (defaults to false)
-exemptAssignees: false
-
-# Label to use when marking as stale
-staleLabel: "status: stale"
-
-# Comment to post when removing the stale label.
-# unmarkComment: >
-#   Your comment here.
-
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 30
-
-# Limit to only `issues` or `pulls`
-# only: issues
diff --git a/.github/workflows/close-inactive-issues.yml b/.github/workflows/close-inactive-issues.yml
new file mode 100644
index 000000000000..ab8bb97a6f28
--- /dev/null
+++ b/.github/workflows/close-inactive-issues.yml
@@ -0,0 +1,31 @@
+name: Close inactive issues and PRs
+on:
+  schedule:
+    - cron: "30 1 * * *"
+  workflow_dispatch:
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v8
+        with:
+          only-labels: "status: waiting-for-feedback"
+          days-before-stale: 14
+          days-before-close: 21
+          stale-issue-label: "status: stale"
+          stale-pr-label: "status: stale"
+          stale-issue-message: >
+            If you would like us to be able to process this issue, please provide the requested information.
+            If the information is not provided within the next 3 weeks, we will be unable to proceed and this issue will be closed.
+          close-issue-message: >
+            Closing due to lack of requested feedback.
+            If you would like to proceed with your contribution, please provide the requested information and we will re-open this issue.
+          stale-pr-message: >
+            If you would like us to be able to process this pull request, please provide the requested information or make the requested changes.
+            If the information is not provided or the requested changes are not made within the next 3 weeks, we will be unable to proceed and this pull request will be closed.
+          close-pr-message: >
+            Closing due to lack of requested feedback.
+            If you would like to proceed with your contribution, please provide the requested information or make the requested changes, and we will re-open this pull request.

From b93b10c9e8ed64bc2c2e85ea9cfdffaa2db7b27d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 15 May 2023 21:39:36 +0200
Subject: [PATCH 1330/1433] Use ephemeral GitHub token

---
 .github/workflows/main.yml             | 4 +++-
 documentation/documentation.gradle.kts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 676ec1a2f87a..45cd562be1ea 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -90,6 +90,8 @@ jobs:
       cancel-in-progress: true
     needs: Linux
     runs-on: ubuntu-latest
+    permissions:
+      contents: write # in order to push to gh-pages branch
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - name: Check out repository
@@ -106,5 +108,5 @@ jobs:
         arguments: --quiet
     - name: Upload Documentation
       env:
-        GRGIT_USER: ${{ secrets.GH_TOKEN }}
+        GRGIT_USER: ${{ github.token }}
       run: ./gradle/scripts/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 5167b3caf35e..843950c45568 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -225,7 +225,7 @@ tasks {
 			}
 		}
 
-		// Temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
+		// temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
 		inputs.dir(sourceDir).withPropertyName("sourceDir").withPathSensitivity(RELATIVE)
 
 		attributeProviders += AsciidoctorAttributeProvider {

From be5d512f19c7b312bc23971a557e54f9a8dc1613 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Tue, 16 May 2023 07:21:55 +0200
Subject: [PATCH 1331/1433] Revert "Use ephemeral GitHub token"

This reverts commit b93b10c9e8ed64bc2c2e85ea9cfdffaa2db7b27d.
---
 .github/workflows/main.yml             | 4 +---
 documentation/documentation.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 45cd562be1ea..676ec1a2f87a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -90,8 +90,6 @@ jobs:
       cancel-in-progress: true
     needs: Linux
     runs-on: ubuntu-latest
-    permissions:
-      contents: write # in order to push to gh-pages branch
     if: github.event_name == 'push' && github.repository == 'junit-team/junit5' && github.ref == 'refs/heads/main'
     steps:
     - name: Check out repository
@@ -108,5 +106,5 @@ jobs:
         arguments: --quiet
     - name: Upload Documentation
       env:
-        GRGIT_USER: ${{ github.token }}
+        GRGIT_USER: ${{ secrets.GH_TOKEN }}
       run: ./gradle/scripts/publishDocumentationSnapshotOnlyIfNecessary.sh
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 843950c45568..5167b3caf35e 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -225,7 +225,7 @@ tasks {
 			}
 		}
 
-		// temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
+		// Temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
 		inputs.dir(sourceDir).withPropertyName("sourceDir").withPathSensitivity(RELATIVE)
 
 		attributeProviders += AsciidoctorAttributeProvider {

From 82d5fc18bd0f01045ed2db0bada18fbfe2e733fe Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 17 May 2023 18:03:07 +0200
Subject: [PATCH 1332/1433] Allow CodeQL actions to post code scanning results

---
 .github/workflows/codeql-analysis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 82ee018479e3..63b648c7b424 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -20,6 +20,8 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    permissions:
+      security-events: write
     strategy:
       fail-fast: false
       matrix:

From d5f17c329d209894d2f93434357c4244d389ce95 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 18 May 2023 13:53:08 +0200
Subject: [PATCH 1333/1433] Remove unnecessary parentheses

---
 .../src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
index 15bb10473e1a..bced3b66b4ab 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
@@ -12,7 +12,7 @@ val clearTempRepoDir by tasks.registering {
 
 subprojects {
 	pluginManager.withPlugin("maven-publish") {
-		configure<PublishingExtension>() {
+		configure<PublishingExtension> {
 			repositories {
 				maven {
 					name = tempRepoName

From 5ce0bdf5f682edafe39b454c54e5761877fbc3cf Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 18 May 2023 13:53:44 +0200
Subject: [PATCH 1334/1433] Reduce partition size

To address fluctuating execution times
---
 .../platform-tooling-support-tests.gradle.kts                 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index a4c3e5a09906..6d38ccfcefc0 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -1,6 +1,8 @@
+import com.gradle.enterprise.gradleplugin.testdistribution.internal.TestDistributionExtensionInternal
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.jvm.toolchain.internal.NoToolchainAvailableException
+import java.time.Duration
 
 plugins {
 	id("junitbuild.build-parameters")
@@ -126,6 +128,8 @@ tasks.test {
 
 	distribution {
 		requirements.add("jdk=8")
+		this as TestDistributionExtensionInternal
+		preferredMaxDuration.set(Duration.ofMillis(500))
 	}
 	jvmArgumentProviders += JavaHomeDir(project, 8, distribution.enabled)
 }

From 8f137f3fbe713a92348b55f4ca9f32f45ac111a1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 18 May 2023 13:57:04 +0200
Subject: [PATCH 1335/1433] Normalize Maven repo to make integration test task
 cacheable

---
 .../platform-tooling-support-tests.gradle.kts | 58 +++++++++++++++----
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index 6d38ccfcefc0..bf05bb93b4ef 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -87,6 +87,32 @@ val unzipMavenDistribution by tasks.registering(Sync::class) {
 	into(layout.buildDirectory.dir("maven-distribution"))
 }
 
+val normalizeMavenRepo by tasks.registering(Sync::class) {
+
+	val mavenizedProjects: List<Project> by rootProject
+	val tempRepoDir: File by rootProject
+	val tempRepoName: String by rootProject
+
+	// All maven-aware projects must be published to the local temp repository
+	(mavenizedProjects + projects.junitBom.dependencyProject)
+		.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalized()}Repository") }
+		.forEach { dependsOn(it) }
+
+	from(tempRepoDir) {
+		exclude("**/maven-metadata.xml*")
+		exclude("**/*.md5")
+		exclude("**/*.sha*")
+		exclude("**/*.module")
+	}
+	from(tempRepoDir) {
+		include("**/*.module")
+		val regex = "\"(sha\\d+|md5|size)\": (?:\".+\"|\\d+)(,)?".toRegex()
+		filter { line -> regex.replace(line, "\"normalized-$1\": \"normalized-value\"$2") }
+	}
+	rename("(.*\\W)\\d{8}\\.\\d{6}-\\d+(\\W.*)", "$1SNAPSHOT$2")
+	into(layout.buildDirectory.dir("normalized-repo"))
+}
+
 tasks.test {
 	// Opt-out via system property: '-Dplatform.tooling.support.tests.enabled=false'
 	enabled = System.getProperty("platform.tooling.support.tests.enabled")?.toBoolean() ?: true
@@ -95,18 +121,10 @@ tasks.test {
 	// always publish all mavenizedProjects even if this "test" task
 	// is not executed.
 	if (enabled) {
-
-		// All maven-aware projects must be installed, i.e. published to the local repository
-		val mavenizedProjects: List<Project> by rootProject
-		val tempRepoName: String by rootProject
-
-		(mavenizedProjects + projects.junitBom.dependencyProject)
-			.map { project -> project.tasks.named("publishAllPublicationsTo${tempRepoName.capitalized()}Repository") }
-			.forEach { dependsOn(it) }
+		dependsOn(normalizeMavenRepo)
+		jvmArgumentProviders += MavenRepo(project, normalizeMavenRepo.map { it.destinationDir })
 	}
 
-	val tempRepoDir: File by rootProject
-	jvmArgumentProviders += MavenRepo(tempRepoDir)
 	jvmArgumentProviders += JarPath(project, thirdPartyJars)
 	jvmArgumentProviders += JarPath(project, antJars)
 	jvmArgumentProviders += MavenDistribution(project, unzipMavenDistribution)
@@ -134,8 +152,24 @@ tasks.test {
 	jvmArgumentProviders += JavaHomeDir(project, 8, distribution.enabled)
 }
 
-class MavenRepo(@get:InputDirectory @get:PathSensitive(RELATIVE) val repoDir: File) : CommandLineArgumentProvider {
-	override fun asArguments() = listOf("-Dmaven.repo=$repoDir")
+class MavenRepo(project: Project, @get:Internal val repoDir: Provider<File>) : CommandLineArgumentProvider {
+
+	// Track jars and non-jars separately to benefit from runtime classpath normalization
+	// which ignores timestamp manifest attributes.
+
+	@InputFiles
+	@Classpath
+	val jarFiles: ConfigurableFileTree = project.fileTree(repoDir) {
+		include("**/*.jar")
+	}
+
+	@InputFiles
+	@PathSensitive(RELATIVE)
+	val nonJarFiles: ConfigurableFileTree = project.fileTree(repoDir) {
+		exclude("**/*.jar")
+	}
+
+	override fun asArguments() = listOf("-Dmaven.repo=${repoDir.get().absolutePath}")
 }
 
 class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEnabled: Provider<Boolean>) : CommandLineArgumentProvider {

From 71c238132a130d29bbb3ab7693ff7f67d5c6bed5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 19 May 2023 17:12:04 +0200
Subject: [PATCH 1336/1433] Add initial 5.10.0-RC1 release notes

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 +
 .../release-notes-5.10.0-RC1.adoc             | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index 25763d56a817..faebab1dc3b6 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.10.0-RC1.adoc[]
+
 include::{basedir}/release-notes-5.10.0-M1.adoc[]
 
 include::{basedir}/release-notes-5.9.3.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
new file mode 100644
index 000000000000..b4d059c7c3d4
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -0,0 +1,58 @@
+[[release-notes-5.10.0-RC1]]
+== 5.10.0-RC1
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1] milestone page in the
+JUnit repository on GitHub.
+
+
+[[release-notes-5.10.0-RC1-junit-platform]]
+=== JUnit Platform
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-5.10.0-RC1-junit-jupiter]]
+=== JUnit Jupiter
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓
+
+
+= [[release-notes-5.10.0-RC1-junit-vintage]]
+=== JUnit Vintage
+
+==== Bug Fixes
+
+* ❓
+
+==== Deprecations and Breaking Changes
+
+* ❓
+
+==== New Features and Improvements
+
+* ❓

From 39cf2d5928f4a23f5f627229ac9496e526e5693e Mon Sep 17 00:00:00 2001
From: Mohammed Albayyouk <mohammedmk.albayyouk@student.uhasselt.be>
Date: Sat, 13 May 2023 23:27:56 +0200
Subject: [PATCH 1337/1433] Allowing selecting methods by name in test suites

This commit adds a new `@SelectMethod` annotation and a corresponding
`@SelectMethods` container annotation. The annotation can be used to
specify a method to select when running a test suite on the JUnit
Platform. These annotations allow users to selectively run certain test
methods within a test class, which can be useful for large test suites
with many methods.

The `@SelectMethod annotation` specifies the class and name of the
method to select, as well as the parameter types of the method if
applicable.

In addition to adding these new classes, three test cases have been
added to demonstrate their usage. These test cases cover scenarios such
as selecting a test method with no parameters, selecting a test method
with parameters, and using the @SelectMethods container to specify
multiple test methods to run.

Closes #3303.
Resolves #3012.

Co-authored-by: Marc Philipp <mail@marcphilipp.de>
---
 .../release-notes-5.10.0-RC1.adoc             |  2 +-
 .../platform/suite/api/SelectMethod.java      | 87 +++++++++++++++++++
 .../platform/suite/api/SelectMethods.java     | 47 ++++++++++
 .../commons/AdditionalDiscoverySelectors.java |  7 ++
 .../SuiteLauncherDiscoveryRequestBuilder.java | 11 +++
 ...eLauncherDiscoveryRequestBuilderTests.java | 56 ++++++++++++
 .../suite/engine/SuiteEngineTests.java        | 14 +++
 .../engine/testsuites/SelectMethodsSuite.java | 23 +++++
 8 files changed, 246 insertions(+), 1 deletion(-)
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
 create mode 100644 junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethods.java
 create mode 100644 platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectMethodsSuite.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index b4d059c7c3d4..9a785aed42dc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -23,7 +23,7 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* Add `@SelectMethod` selector support to `@Suite` test engine
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
new file mode 100644
index 000000000000..652280ce45b3
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code @SelectMethod} is a {@linkplain Repeatable repeatable} annotation that
+ * specifies a method to <em>select</em> when running a test suite on the JUnit
+ * Platform.
+ *
+ * @since 1.10
+ * @see Suite
+ * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectMethod(Class, String, String)
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = EXPERIMENTAL, since = "1.10")
+@Repeatable(SelectMethods.class)
+public @interface SelectMethod {
+
+	/**
+	 * The class in which the method is declared, or a subclass thereof.
+	 */
+	Class<?> clazz();
+
+	/**
+	 * The name of the method to select; never blank.
+	 */
+	String name();
+
+	/**
+	 * The parameter types of the method to select.
+	 *
+	 * <p>This is typically a comma-separated list of atomic types, fully
+	 * qualified class names, or array types; however, the exact syntax
+	 * depends on the underlying test engine.
+	 *
+	 * <p>If the method takes no parameters, this attribute must be an
+	 * empty string.
+	 *
+	 * <p>Array parameter types may be specified using either the JVM's internal
+	 * String representation (e.g., {@code [[I} for {@code int[][]},
+	 * {@code [Ljava.lang.String;} for {@code java.lang.String[]}, etc.) or
+	 * <em>source code syntax</em> (e.g., {@code int[][]}, {@code java.lang.String[]},
+	 * etc.).
+	 * <p>
+	 * <table class="plain">
+	 * <caption>Examples</caption>
+	 * <tr><th>Method</th><th>Parameter types list</th></tr>
+	 * <tr><td>{@code java.lang.String.chars()}</td><td>The empty string</td></tr>
+	 * <tr><td>{@code java.lang.String.equalsIgnoreCase(String)}</td><td>{@code java.lang.String}</td></tr>
+	 * <tr><td>{@code java.lang.String.substring(int, int)}</td><td>{@code int, int}</td></tr>
+	 * <tr><td>{@code example.Calc.avg(int[])}</td><td>{@code [I}</td></tr>
+	 * <tr><td>{@code example.Calc.avg(int[])}</td><td>{@code int[]}</td></tr>
+	 * <tr><td>{@code example.Matrix.multiply(double[][])}</td><td>{@code [[D}</td></tr>
+	 * <tr><td>{@code example.Matrix.multiply(double[][])}</td><td>{@code double[][]}</td></tr>
+	 * <tr><td>{@code example.Service.process(String[])}</td><td>{@code [Ljava.lang.String;}</td></tr>
+	 * <tr><td>{@code example.Service.process(String[])}</td><td>{@code java.lang.String[]}</td></tr>
+	 * <tr><td>{@code example.Service.process(String[][])}</td><td>{@code [[Ljava.lang.String;}</td></tr>
+	 * <tr><td>{@code example.Service.process(String[][])}</td><td>{@code java.lang.String[][]}</td></tr>
+	 * </table>
+	 */
+	String parameters() default "";
+
+}
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethods.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethods.java
new file mode 100644
index 000000000000..542c647aa108
--- /dev/null
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethods.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.api;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apiguardian.api.API;
+
+/**
+ * {@code @SelectMethods} is a container for one or more
+ * {@link SelectMethod @SelectMethod} declarations.
+ *
+ * <p>Note, however, that use of the {@code @SelectMethods} container is
+ * completely optional since {@code @SelectMethod} is a
+ * {@linkplain java.lang.annotation.Repeatable repeatable} annotation.
+ *
+ * @since 1.10
+ * @see SelectMethod
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+@API(status = EXPERIMENTAL, since = "1.10")
+public @interface SelectMethods {
+
+	/**
+	 * An array of one or more {@link SelectMethod @SelectMethod} declarations.
+	 */
+	SelectMethod[] value();
+
+}
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
index 99dffdaf15f8..cfcf1f6a2d31 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -23,6 +23,7 @@
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.engine.discovery.FilePosition;
 import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.ModuleSelector;
 import org.junit.platform.engine.discovery.PackageSelector;
 import org.junit.platform.engine.discovery.UriSelector;
@@ -78,6 +79,12 @@ static List<ClassSelector> selectClasses(Class<?>... classes) {
 		// @formatter:on
 	}
 
+	static MethodSelector selectMethod(Class<?> clazz, String name, String parameters) {
+		Preconditions.notBlank(name, "Method name must not be null or blank");
+		Preconditions.notNull(parameters, "Method parameter types must not be null");
+		return DiscoverySelectors.selectMethod(clazz, name, parameters);
+	}
+
 	static List<ModuleSelector> selectModules(String... moduleNames) {
 		Preconditions.notNull(moduleNames, "Module names must not be null");
 		Preconditions.containsNoNullElements(moduleNames, "Individual module names must not be null");
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index fabe88911782..d61ddbef151f 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -36,6 +36,7 @@
 import org.junit.platform.engine.Filter;
 import org.junit.platform.engine.discovery.ClassNameFilter;
 import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.PackageNameFilter;
 import org.junit.platform.launcher.EngineFilter;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
@@ -55,6 +56,7 @@
 import org.junit.platform.suite.api.SelectClasspathResource;
 import org.junit.platform.suite.api.SelectDirectories;
 import org.junit.platform.suite.api.SelectFile;
+import org.junit.platform.suite.api.SelectMethod;
 import org.junit.platform.suite.api.SelectModules;
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.SelectUris;
@@ -149,6 +151,10 @@ public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
 		findAnnotationValues(suiteClass, SelectClasses.class, SelectClasses::value)
 				.map(this::selectClasses)
 				.ifPresent(this::selectors);
+		findRepeatableAnnotations(suiteClass, SelectMethod.class)
+				.stream()
+				.map(annotation -> selectMethod(annotation.clazz(), annotation.name(), annotation.parameters()))
+				.forEach(this::selectors);
 		findAnnotationValues(suiteClass, IncludeClassNamePatterns.class, IncludeClassNamePatterns::value)
 				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
 				.map(this::createIncludeClassNameFilter)
@@ -206,6 +212,11 @@ private List<ClassSelector> selectClasses(Class<?>... classes) {
 		return AdditionalDiscoverySelectors.selectClasses(classes);
 	}
 
+	private MethodSelector selectMethod(Class<?> clazz, String name, String parameters) {
+		selectedClassNames.add(clazz.getName());
+		return AdditionalDiscoverySelectors.selectMethod(clazz, name, parameters);
+	}
+
 	private ClassNameFilter createIncludeClassNameFilter(String... patterns) {
 		String[] combinedPatterns = Stream.concat(//
 			this.selectedClassNames.stream().map(Pattern::quote), //
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index 7a985b601ee1..a0951cf7fc46 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -34,8 +34,10 @@
 import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.ClasspathResourceSelector;
 import org.junit.platform.engine.discovery.DirectorySelector;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.engine.discovery.FilePosition;
 import org.junit.platform.engine.discovery.FileSelector;
+import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.ModuleSelector;
 import org.junit.platform.engine.discovery.PackageNameFilter;
 import org.junit.platform.engine.discovery.PackageSelector;
@@ -58,6 +60,7 @@
 import org.junit.platform.suite.api.SelectClasspathResource;
 import org.junit.platform.suite.api.SelectDirectories;
 import org.junit.platform.suite.api.SelectFile;
+import org.junit.platform.suite.api.SelectMethod;
 import org.junit.platform.suite.api.SelectModules;
 import org.junit.platform.suite.api.SelectPackages;
 import org.junit.platform.suite.api.SelectUris;
@@ -214,6 +217,59 @@ class Suite {
 		assertEquals(TestCase.class, exactlyOne(selectors).getJavaClass());
 	}
 
+	@Test
+	void selectOneMethodWithNoParameters() {
+		class TestClass {
+			void testMethod() {
+			}
+		}
+		@SelectMethod(clazz = TestClass.class, name = "testMethod")
+		class Suite {
+		}
+
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<MethodSelector> selectors = request.getSelectorsByType(MethodSelector.class);
+		assertEquals(DiscoverySelectors.selectMethod(TestClass.class, "testMethod"), exactlyOne(selectors));
+	}
+
+	@Test
+	void selectOneMethodWithOneParameters() {
+		class TestClass {
+			void testMethod(int i) {
+			}
+		}
+		@SelectMethod(clazz = TestClass.class, name = "testMethod", parameters = "int")
+		class Suite {
+		}
+
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<MethodSelector> selectors = request.getSelectorsByType(MethodSelector.class);
+		assertEquals(DiscoverySelectors.selectMethod(TestClass.class, "testMethod", "int"), exactlyOne(selectors));
+	}
+
+	@Test
+	void selectTwoMethodWithTwoParameters() {
+		class TestClass {
+			void firstTestMethod(int i, String j) {
+			}
+
+			void secondTestMethod(boolean i, float j) {
+			}
+		}
+		@SelectMethod(clazz = TestClass.class, name = "firstTestMethod", parameters = "int, java.lang.String")
+		@SelectMethod(clazz = TestClass.class, name = "secondTestMethod", parameters = "boolean, float")
+		class Suite {
+		}
+
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<MethodSelector> selectors = request.getSelectorsByType(MethodSelector.class);
+		assertEquals(2, selectors.size());
+		assertEquals(DiscoverySelectors.selectMethod(TestClass.class, "firstTestMethod", "int, java.lang.String"),
+			selectors.get(0));
+		assertEquals(DiscoverySelectors.selectMethod(TestClass.class, "secondTestMethod", "boolean, float"),
+			selectors.get(1));
+	}
+
 	@Test
 	void selectClasspathResource() {
 		@SelectClasspathResource("com.example.testcases")
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index 4c44d1c04e3f..759cd6e2768c 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -51,6 +51,7 @@
 import org.junit.platform.suite.engine.testsuites.MultipleSuite;
 import org.junit.platform.suite.engine.testsuites.NestedSuite;
 import org.junit.platform.suite.engine.testsuites.SelectClassesSuite;
+import org.junit.platform.suite.engine.testsuites.SelectMethodsSuite;
 import org.junit.platform.suite.engine.testsuites.SuiteDisplayNameSuite;
 import org.junit.platform.suite.engine.testsuites.SuiteSuite;
 import org.junit.platform.suite.engine.testsuites.ThreePartCyclicSuite;
@@ -74,6 +75,19 @@ void selectClasses() {
 		// @formatter:on
 	}
 
+	@Test
+	void selectMethods() {
+		// @formatter:off
+		EngineTestKit.engine(ENGINE_ID)
+				.selectors(selectClass(SelectMethodsSuite.class))
+				.execute()
+				.testEvents()
+				.assertThatEvents()
+				.haveExactly(1, event(test(MultipleTestsTestCase.class.getName(), "test()"), finishedSuccessfully()))
+				.doNotHave(event(test(MultipleTestsTestCase.class.getName(), "test2()")));
+		// @formatter:on
+	}
+
 	@Test
 	void suiteDisplayName() {
 		// @formatter:off
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectMethodsSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectMethodsSuite.java
new file mode 100644
index 000000000000..1e9712e5e156
--- /dev/null
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectMethodsSuite.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.suite.engine.testsuites;
+
+import org.junit.platform.suite.api.SelectMethod;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.engine.testcases.MultipleTestsTestCase;
+
+/**
+ * @since 1.10
+ */
+@Suite
+@SelectMethod(clazz = MultipleTestsTestCase.class, name = "test")
+public class SelectMethodsSuite {
+}

From 33a32068d4421fdcbe5e71220eeff024b02d0ebc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Mon, 22 May 2023 08:02:19 +0200
Subject: [PATCH 1338/1433] Mark verifyOSGi tasks not cacheable

Due to bndtools/bnd#5666
---
 .../src/main/kotlin/junitbuild.osgi-conventions.gradle.kts       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
index 6b19ce2c8c9c..ce36b6127823 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
@@ -109,6 +109,7 @@ val verifyOSGi by tasks.registering(Resolve::class) {
 	// end up in the dependencies of those projects.
 	bundles(osgiVerification)
 	properties.empty()
+	outputs.doNotCacheIf("https://github.com/bndtools/bnd/issues/5666") { true }
 }
 
 tasks.check {

From 78062ec3dc22994338c7ea49a3219ee909237a8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 05:58:51 +0000
Subject: [PATCH 1339/1433] Bump commons-io:commons-io from 2.11.0 to 2.12.0

Bumps commons-io:commons-io from 2.11.0 to 2.12.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1f1c3f1595dc..1d5ca89491b8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@ assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.158" }
-commons-io = { module = "commons-io:commons-io", version = "2.11.0" }
+commons-io = { module = "commons-io:commons-io", version = "2.12.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.10" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
 gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.2" }

From 1e1e23da560b29445349a4ccae4439a7307137bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 05:59:07 +0000
Subject: [PATCH 1340/1433] Bump org.apache.maven:apache-maven from 3.9.1 to
 3.9.2

Bumps [org.apache.maven:apache-maven](https://github.com/apache/maven) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.9.1...maven-3.9.2)

---
updated-dependencies:
- dependency-name: org.apache.maven:apache-maven
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d5ca89491b8..bf556db5994e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,7 @@ junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.1" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
-maven = { module = "org.apache.maven:apache-maven", version = "3.9.1" }
+maven = { module = "org.apache.maven:apache-maven", version = "3.9.2" }
 memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.6.1" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.3.1" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }

From e3abf427eafe6e3a5d6df41d09664de5cb87629d Mon Sep 17 00:00:00 2001
From: Jerome Prinet <jprinet@gradle.com>
Date: Mon, 22 May 2023 13:02:15 +0200
Subject: [PATCH 1341/1433] Fix cache relocatability of
 :platform-tooling-support-tests:test

---
 .../platform-tooling-support-tests.gradle.kts             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index bf05bb93b4ef..dd2b86a7d362 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -135,10 +135,10 @@ tasks.test {
 
 	inputs.apply {
 		dir("projects").withPathSensitivity(RELATIVE)
-		file("${rootDir}/gradle.properties")
-		file("${rootDir}/settings.gradle.kts")
-		file("${rootDir}/gradlew")
-		file("${rootDir}/gradlew.bat")
+		file("${rootDir}/gradle.properties").withPathSensitivity(RELATIVE)
+		file("${rootDir}/settings.gradle.kts").withPathSensitivity(RELATIVE)
+		file("${rootDir}/gradlew").withPathSensitivity(RELATIVE)
+		file("${rootDir}/gradlew.bat").withPathSensitivity(RELATIVE)
 		dir("${rootDir}/gradle/wrapper").withPathSensitivity(RELATIVE)
 		dir("${rootDir}/documentation/src/main").withPathSensitivity(RELATIVE)
 		dir("${rootDir}/documentation/src/test").withPathSensitivity(RELATIVE)

From ffab3a37f4a4e33529cca4ef9a464c244756c6fc Mon Sep 17 00:00:00 2001
From: Jerome Prinet <jprinet@gradle.com>
Date: Mon, 22 May 2023 14:37:26 +0200
Subject: [PATCH 1342/1433] Fix spotless configuration

---
 .../src/main/kotlin/junitbuild.spotless-conventions.gradle.kts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
index d390fb2b2e1c..e078a3a50d1c 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
@@ -20,6 +20,7 @@ spotless {
 
 	format("documentation") {
 		target("*.adoc", "*.md", "src/**/*.adoc", "src/**/*.md")
+		targetExclude("**/build", "**/target")
 		trimTrailingWhitespace()
 		endWithNewline()
 	}

From 668698385ccc832e59b69c6c19ab64b0a43b46ef Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Tue, 23 May 2023 13:47:30 +0200
Subject: [PATCH 1343/1433] Add thread-safety details to TempDirFactory
 documentation

---
 .../release-notes/release-notes-5.10.0-RC1.adoc  |  4 ++--
 .../docs/asciidoc/user-guide/writing-tests.adoc  | 16 ++++++++++------
 .../org/junit/jupiter/api/io/TempDirFactory.java |  5 ++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 9a785aed42dc..0e9176601ab5 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -39,10 +39,10 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* Add thread-safety details to `TempDirFactory` documentation
 
 
-= [[release-notes-5.10.0-RC1-junit-vintage]]
+[[release-notes-5.10.0-RC1-junit-vintage]]
 === JUnit Vintage
 
 ==== Bug Fixes
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index a05eb8b70dec..63dac9f2f726 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2616,13 +2616,17 @@ The default cleanup mode is `ALWAYS`. You can use the
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_cleanup_mode]
 ----
 
-`@TempDir` supports custom creation of temporary directories via the optional
-`factory` attribute. This allows to define how the temporary directory is created,
-giving control over characteristics such as the directory name, root folder,
-and underlying file system.
+`@TempDir` supports the programmatic creation of temporary directories via the optional
+`factory` attribute. This is typically used to gain control over the temporary directory
+creation, like defining the parent directory or the file system that should be used.
 
-Factories can be created by implementing `TempDirFactory`. The default implementation
-available in Jupiter delegates the directory creation to
+Factories can be created by implementing `TempDirFactory`.
+Implementations must provide a no-args constructor and should not make any assumptions
+regarding when and how many times they are instantiated, but can assume that
+`TempDirFactory::createTempDirectory` and `TempDirFactory::close` are both called
+once per instance, in this order, and from the same thread.
+
+The default implementation available in Jupiter delegates the directory creation to
 `java.nio.file.Files::createTempDirectory`, passing `junit` as the prefix string
 to be used in generating the directory's name.
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
index 910daec3e44a..c5d273df2613 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
@@ -28,7 +28,10 @@
  * temporary directory creation, like defining the parent directory or the file
  * system that should be used.
  *
- * <p>Concrete implementations must have a <em>default constructor</em>.
+ * <p>Implementations must provide a no-args constructor and should not make any
+ * assumptions regarding when and how many times they are instantiated, but can
+ * assume that {@link #createTempDirectory(ExtensionContext)} and {@link #close()}
+ * are both called once per instance, in this order, and from the same thread.
  *
  * <p>A {@link TempDirFactory} can be configured <em>globally</em> for the
  * entire test suite via the {@value TempDir#DEFAULT_FACTORY_PROPERTY_NAME}

From e0970b64e2adf8cbfbf17102f3ab58b9b68201d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Desgroppes?=
 <rdesgroppes@users.noreply.github.com>
Date: Sat, 27 May 2023 14:48:55 +0200
Subject: [PATCH 1344/1433] Return subcommand execution result (#3322)

When explicitly specifying the `execute` subcommand as advised by:
> WARNING: Delegated to the 'execute' command.
>          This behaviour has been deprecated and will be removed in a future release.
>          Please use the 'execute' command directly.

... it happens that `ConsoleLauncher.run` returns a `CommandResult`
whose `getValue` method always returns `Optional.empty()` instead of the
expected (non-empty) `Optional<TestExecutionSummary>`.

It turns out that, when `picocli` executes a _subcommand_, it doesn't
propagate the return value to the parent `CommandLine`, whose
`getExecutionResult` method then returns `null`.

There was a question about it last year
(https://github.com/remkop/picocli/issues/1656) answered by the [user
manual](https://picocli.info/#_executing_commands_with_subcommands):
> The `ParseResult` can be used to get the return value from a Callable
> or Method subcommand:
> ```java
> // getting return value from Callable or Method command
> Object topResult = cmd.getExecutionResult();
>
> // getting return value from Callable or Method subcommand
> ParseResult parseResult = cmd.getParseResult();
> if (parseResult.subcommand() != null) {
>    CommandLine sub = parseResult.subcommand().commandSpec().commandLine();
>    Object subResult = sub.getExecutionResult();
> }
> ```

The present change therefore consists in implementing it.

Note: prior to the change, presently adapted tests (now parameterized so
as to cover both forms) were all failing on:
```java
java.lang.IllegalStateException: TestExecutionSummary not assigned. Exit code is: 0
	at app//org.junit.platform.console.ConsoleLauncherWrapperResult.checkTestExecutionSummaryState(ConsoleLauncherWrapperResult.java:42)
	at app//org.junit.platform.console.ConsoleLauncherWrapperResult.getTestsFoundCount(ConsoleLauncherWrapperResult.java:102)
```
---
 .../platform/console/options/MainCommand.java | 12 ++++-
 .../ConsoleLauncherIntegrationTests.java      | 45 ++++++++++++-------
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
index 62eaaf7e7ed8..610094564b9e 100644
--- a/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
+++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/MainCommand.java
@@ -135,6 +135,16 @@ private static CommandResult<Object> runCommand(PrintWriter out, PrintWriter err
 				.setOut(out) //
 				.setErr(err) //
 				.execute(args);
-		return CommandResult.create(exitCode, commandLine.getExecutionResult());
+		return CommandResult.create(exitCode, getLikelyExecutedCommand(commandLine).getExecutionResult());
+	}
+
+	/**
+	 * Get the most likely executed subcommand, if any, or the main command otherwise.
+	 * @see <a href="https://picocli.info/#_executing_commands_with_subcommands">Executing Commands with Subcommands</a>
+	 */
+	private static CommandLine getLikelyExecutedCommand(final CommandLine commandLine) {
+		return Optional.ofNullable(commandLine.getParseResult().subcommand()) //
+				.map(parseResult -> parseResult.commandSpec().commandLine()) //
+				.orElse(commandLine);
 	}
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
index c325729acf3e..768ae68c13ec 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/ConsoleLauncherIntegrationTests.java
@@ -16,6 +16,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 /**
  * @since 1.0
@@ -32,16 +34,26 @@ void executeWithoutArgumentsFailsAndPrintsHelpInformation() {
 		);
 	}
 
-	@Test
-	void executeWithoutExcludeClassnameOptionDoesNotExcludeClassesAndMustIncludeAllClassesMatchingTheStandardClassnamePattern() {
-		String[] args = { "-e", "junit-jupiter", "-p", "org.junit.platform.console.subpackage" };
+	@ParameterizedTest
+	@ValueSource(strings = { //
+			"-e junit-jupiter -p org.junit.platform.console.subpackage", //
+			"execute -e junit-jupiter -p org.junit.platform.console.subpackage" //
+	})
+	void executeWithoutExcludeClassnameOptionDoesNotExcludeClassesAndMustIncludeAllClassesMatchingTheStandardClassnamePattern(
+			final String line) {
+		String[] args = line.split(" ");
 		assertEquals(9, new ConsoleLauncherWrapper().execute(args).getTestsFoundCount());
 	}
 
-	@Test
-	void executeWithExcludeClassnameOptionExcludesClasses() {
-		String[] args = { "-e", "junit-jupiter", "-p", "org.junit.platform.console.subpackage", "--exclude-classname",
-				"^org\\.junit\\.platform\\.console\\.subpackage\\..*" };
+	@ParameterizedTest
+	@ValueSource(strings = {
+			"-e junit-jupiter -p org.junit.platform.console.subpackage --exclude-classname"
+					+ " ^org\\.junit\\.platform\\.console\\.subpackage\\..*",
+			"execute -e junit-jupiter -p org.junit.platform.console.subpackage --exclude-classname"
+					+ " ^org\\.junit\\.platform\\.console\\.subpackage\\..*" //
+	})
+	void executeWithExcludeClassnameOptionExcludesClasses(final String line) {
+		String[] args = line.split(" ");
 		var result = new ConsoleLauncherWrapper().execute(args);
 		assertAll("all subpackage test classes are excluded by the class name filter", //
 			() -> assertArrayEquals(args, result.args), //
@@ -50,17 +62,20 @@ void executeWithExcludeClassnameOptionExcludesClasses() {
 		);
 	}
 
-	@Test
-	void executeSelectingModuleNames() {
-		String[] args1 = { "-e", "junit-jupiter", "-o", "java.base" };
+	@ParameterizedTest
+	@ValueSource(strings = { //
+			"-e junit-jupiter -o java.base", "-e junit-jupiter --select-module java.base", //
+			"execute -e junit-jupiter -o java.base", "execute -e junit-jupiter --select-module java.base" //
+	})
+	void executeSelectingModuleNames(final String line) {
+		String[] args1 = line.split(" ");
 		assertEquals(0, new ConsoleLauncherWrapper().execute(args1).getTestsFoundCount());
-		String[] args2 = { "-e", "junit-jupiter", "--select-module", "java.base" };
-		assertEquals(0, new ConsoleLauncherWrapper().execute(args2).getTestsFoundCount());
 	}
 
-	@Test
-	void executeScanModules() {
-		String[] args1 = { "-e", "junit-jupiter", "--scan-modules" };
+	@ParameterizedTest
+	@ValueSource(strings = { "-e junit-jupiter --scan-modules", "execute -e junit-jupiter --scan-modules" })
+	void executeScanModules(final String line) {
+		String[] args1 = line.split(" ");
 		assertEquals(0, new ConsoleLauncherWrapper().execute(args1).getTestsFoundCount());
 	}
 

From 8e10aaa596a0cd8034c1b074b353496527bc5768 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 27 May 2023 18:02:13 +0200
Subject: [PATCH 1345/1433] Polish TempDirFactory documentation

---
 .../release-notes/release-notes-5.10.0-RC1.adoc        |  4 ++--
 .../src/docs/asciidoc/user-guide/writing-tests.adoc    | 10 +++++-----
 .../java/org/junit/jupiter/api/io/TempDirFactory.java  |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 0e9176601ab5..ec2f6756a773 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -23,7 +23,7 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
-* Add `@SelectMethod` selector support to `@Suite` test engine
+* New `@SelectMethod` selector support in the `@Suite` test engine.
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
@@ -39,7 +39,7 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
-* Add thread-safety details to `TempDirFactory` documentation
+* Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
 
 
 [[release-notes-5.10.0-RC1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 63dac9f2f726..477c84b5b1ae 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2620,11 +2620,11 @@ include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_cleanup_mode]
 `factory` attribute. This is typically used to gain control over the temporary directory
 creation, like defining the parent directory or the file system that should be used.
 
-Factories can be created by implementing `TempDirFactory`.
-Implementations must provide a no-args constructor and should not make any assumptions
-regarding when and how many times they are instantiated, but can assume that
-`TempDirFactory::createTempDirectory` and `TempDirFactory::close` are both called
-once per instance, in this order, and from the same thread.
+Factories can be created by implementing `TempDirFactory`. Implementations must provide a
+no-args constructor and should not make any assumptions regarding when and how many times
+they are instantiated, but they can assume that their `createTempDirectory(...)` and
+`close()` methods will both be called once per instance, in this order, and from the same
+thread.
 
 The default implementation available in Jupiter delegates the directory creation to
 `java.nio.file.Files::createTempDirectory`, passing `junit` as the prefix string
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
index c5d273df2613..97dfe075a7c8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
@@ -29,9 +29,9 @@
  * system that should be used.
  *
  * <p>Implementations must provide a no-args constructor and should not make any
- * assumptions regarding when and how many times they are instantiated, but can
- * assume that {@link #createTempDirectory(ExtensionContext)} and {@link #close()}
- * are both called once per instance, in this order, and from the same thread.
+ * assumptions regarding when and how many times they are instantiated, but they
+ * can assume that {@link #createTempDirectory(ExtensionContext)} and {@link #close()}
+ * will both be called once per instance, in this order, and from the same thread.
  *
  * <p>A {@link TempDirFactory} can be configured <em>globally</em> for the
  * entire test suite via the {@value TempDir#DEFAULT_FACTORY_PROPERTY_NAME}

From 6ae599b8865dbd16cd2ecd9e8ebb52937bea3733 Mon Sep 17 00:00:00 2001
From: Philippe Marschall <philippe.marschall@gmail.com>
Date: Mon, 15 May 2023 20:55:15 +0200
Subject: [PATCH 1346/1433] Support @TempDir as a meta-annotation

Prior to this commit, @TempDir could not be used as a meta-annotation.

This commit adds ANNOTATION_TYPE as a target for the @TempDir annotation
to allow it to be used as a meta-annotation so that users can create
custom composed annotations based on @TempDir.

Closes #3313
Closes #3311
---
 .../release-notes-5.10.0-RC1.adoc             |  2 +
 .../asciidoc/user-guide/writing-tests.adoc    | 13 ++++
 .../test/java/example/TempDirectoryDemo.java  | 26 +++++++
 .../org/junit/jupiter/api/io/TempDir.java     |  2 +-
 .../TempDirectoryMetaAnnotationTests.java     | 75 +++++++++++++++++++
 5 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryMetaAnnotationTests.java

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index ec2f6756a773..0aba01a6d220 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -24,6 +24,8 @@ JUnit repository on GitHub.
 ==== New Features and Improvements
 
 * New `@SelectMethod` selector support in the `@Suite` test engine.
+* Add `@SelectMethod` selector support to `@Suite` test engine
+* `@TempDir` can now be used in meta-annotations
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 477c84b5b1ae..9c09c61efadf 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2648,6 +2648,19 @@ temporary directory. The following example shows how to do it.
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_factory_jimfs]
 ----
 
+`@TempDir` can also be used in meta-annotations to reduce repetition.
+
+[source,java,indent=0]
+.A definition of a meta-annotation using `@TempDir`
+----
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_meta_annotation]
+----
+[source,java,indent=0]
+.A test class using a meta-annotation
+----
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_meta_annotation_usage]
+----
+
 You can use the `junit.jupiter.tempdir.factory.default`
 <<running-tests-config-params, configuration parameter>> to specify the fully qualified
 class name of the `TempDirFactory` you would like to use by default. Just like for
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index 417c70731924..d75dccc1cfcc 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -17,6 +17,10 @@
 import static org.junit.jupiter.api.io.CleanupMode.ON_SUCCESS;
 
 import java.io.IOException;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -24,6 +28,7 @@
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
 
+import example.TempDirectoryDemo.InMemoryTempDirDemo.JimfsTempDirFactory;
 import example.util.ListWriter;
 
 import org.junit.jupiter.api.Test;
@@ -142,4 +147,25 @@ public void close() throws IOException {
 	}
 	// end::user_guide_factory_jimfs[]
 
+	// tag::user_guide_meta_annotation[]
+	@Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.PARAMETER })
+	@Retention(RetentionPolicy.RUNTIME)
+	@TempDir(factory = JimfsTempDirFactory.class)
+	@interface JimfsTempDir {
+
+	}
+	// end::user_guide_meta_annotation[]
+
+	static
+	// tag::user_guide_meta_annotation_usage[]
+	class JimfsTempDirAnnotationDemo {
+
+		@Test
+		void test(@JimfsTempDir Path tempDir) {
+			// perform test
+		}
+
+	}
+	// end::user_guide_meta_annotation_usage[]
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index 2a39549fd82d..d80c882bbcbe 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -90,7 +90,7 @@
  *
  * @since 5.4
  */
-@Target({ ElementType.FIELD, ElementType.PARAMETER })
+@Target({ ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @API(status = STABLE, since = "5.10")
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryMetaAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryMetaAnnotationTests.java
new file mode 100644
index 000000000000..c657cec02258
--- /dev/null
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryMetaAnnotationTests.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.extension;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+
+/**
+ * Integration tests for the use of {@link TempDir} as a meta-annotation.
+ *
+ * @since 5.10
+ */
+@DisplayName("@TempDir as a meta-annotation")
+class TempDirectoryMetaAnnotationTests extends AbstractJupiterTestEngineTests {
+
+	@Test
+	void annotationOnField() {
+		executeTestsForClass(AnnotationOnFieldTestCase.class).testEvents().assertStatistics(
+			stats -> stats.started(1).succeeded(1));
+	}
+
+	@Test
+	void annotationOnParameter() {
+		executeTestsForClass(AnnotationOnParameterTestCase.class).testEvents().assertStatistics(
+			stats -> stats.started(1).succeeded(1));
+	}
+
+	static class AnnotationOnFieldTestCase {
+
+		@MetaTempDir
+		private Path tempDir;
+
+		@Test
+		void test() {
+			assertTrue(Files.exists(tempDir));
+		}
+
+	}
+
+	static class AnnotationOnParameterTestCase {
+
+		@Test
+		void test(@MetaTempDir Path tempDir) {
+			assertTrue(Files.exists(tempDir));
+		}
+
+	}
+
+	@TempDir
+	@Target({ ElementType.FIELD, ElementType.PARAMETER })
+	@Retention(RetentionPolicy.RUNTIME)
+	@interface MetaTempDir {
+
+	}
+
+}

From e205ccd802038c24a50a1453765ba8c4c31c41c7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 27 May 2023 18:29:10 +0200
Subject: [PATCH 1347/1433] Polish contribution

See #3311, #3313
---
 .../release-notes-5.10.0-RC1.adoc             |  6 +++--
 .../asciidoc/user-guide/writing-tests.adoc    | 22 ++++++++++++-------
 .../test/java/example/TempDirectoryDemo.java  |  9 ++++----
 .../org/junit/jupiter/api/io/TempDir.java     |  2 +-
 .../TempDirectoryMetaAnnotationTests.java     | 15 ++++++-------
 5 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 0aba01a6d220..22c369a4de96 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -24,8 +24,6 @@ JUnit repository on GitHub.
 ==== New Features and Improvements
 
 * New `@SelectMethod` selector support in the `@Suite` test engine.
-* Add `@SelectMethod` selector support to `@Suite` test engine
-* `@TempDir` can now be used in meta-annotations
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
@@ -41,6 +39,10 @@ JUnit repository on GitHub.
 
 ==== New Features and Improvements
 
+* `@TempDir` can now be used as a meta-annotation in order to create custom _composed
+  annotations_. See the `@JimfsTempDir` example in the
+  <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
+  for details.
 * Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
 
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 9c09c61efadf..142f752e47c3 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2627,8 +2627,8 @@ they are instantiated, but they can assume that their `createTempDirectory(...)`
 thread.
 
 The default implementation available in Jupiter delegates the directory creation to
-`java.nio.file.Files::createTempDirectory`, passing `junit` as the prefix string
-to be used in generating the directory's name.
+`java.nio.file.Files::createTempDirectory`, passing `junit` as the prefix string to be
+used in generating the directory's name.
 
 The following example defines a factory that uses the test name as the directory name
 prefix instead of the `junit` constant value.
@@ -2640,7 +2640,7 @@ include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_factory_name_p
 ----
 
 It's also possible to use an in-memory file system like `{Jimfs}` for the creation of the
-temporary directory. The following example shows how to do it.
+temporary directory. The following example demonstrates how to achieve that.
 
 [source,java,indent=0]
 .A test class with a temporary directory created with the Jimfs in-memory file system
@@ -2648,17 +2648,23 @@ temporary directory. The following example shows how to do it.
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_factory_jimfs]
 ----
 
-`@TempDir` can also be used in meta-annotations to reduce repetition.
+`@TempDir` can also be used as a <<writing-tests-meta-annotations, meta-annotation>> to
+reduce repetition. The following code listing shows how to create a custom `@JimfsTempDir`
+annotation that can be used as a drop-in replacement for
+`@TempDir(factory = JimfsTempDirFactory.class)`.
 
 [source,java,indent=0]
-.A definition of a meta-annotation using `@TempDir`
+.A custom annotation meta-annotated with `@TempDir`
 ----
-include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_meta_annotation]
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_composed_annotation]
 ----
+
+The following example demonstrates how to use the custom `@JimfsTempDir` annotation.
+
 [source,java,indent=0]
-.A test class using a meta-annotation
+.A test class using the custom annotation
 ----
-include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_meta_annotation_usage]
+include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_composed_annotation_usage]
 ----
 
 You can use the `junit.jupiter.tempdir.factory.default`
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index d75dccc1cfcc..d45961698997 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -147,17 +147,16 @@ public void close() throws IOException {
 	}
 	// end::user_guide_factory_jimfs[]
 
-	// tag::user_guide_meta_annotation[]
+	// tag::user_guide_composed_annotation[]
 	@Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.PARAMETER })
 	@Retention(RetentionPolicy.RUNTIME)
 	@TempDir(factory = JimfsTempDirFactory.class)
 	@interface JimfsTempDir {
-
 	}
-	// end::user_guide_meta_annotation[]
+	// end::user_guide_composed_annotation[]
 
 	static
-	// tag::user_guide_meta_annotation_usage[]
+	// tag::user_guide_composed_annotation_usage[]
 	class JimfsTempDirAnnotationDemo {
 
 		@Test
@@ -166,6 +165,6 @@ void test(@JimfsTempDir Path tempDir) {
 		}
 
 	}
-	// end::user_guide_meta_annotation_usage[]
+	// end::user_guide_composed_annotation_usage[]
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
index d80c882bbcbe..519b14f1e2c8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDir.java
@@ -90,7 +90,7 @@
  *
  * @since 5.4
  */
-@Target({ ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @API(status = STABLE, since = "5.10")
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryMetaAnnotationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryMetaAnnotationTests.java
index c657cec02258..2dad2e09fe55 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryMetaAnnotationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryMetaAnnotationTests.java
@@ -34,19 +34,19 @@ class TempDirectoryMetaAnnotationTests extends AbstractJupiterTestEngineTests {
 
 	@Test
 	void annotationOnField() {
-		executeTestsForClass(AnnotationOnFieldTestCase.class).testEvents().assertStatistics(
-			stats -> stats.started(1).succeeded(1));
+		executeTestsForClass(AnnotationOnFieldTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
 	}
 
 	@Test
 	void annotationOnParameter() {
-		executeTestsForClass(AnnotationOnParameterTestCase.class).testEvents().assertStatistics(
-			stats -> stats.started(1).succeeded(1));
+		executeTestsForClass(AnnotationOnParameterTestCase.class).testEvents()//
+				.assertStatistics(stats -> stats.started(1).succeeded(1));
 	}
 
 	static class AnnotationOnFieldTestCase {
 
-		@MetaTempDir
+		@CustomTempDir
 		private Path tempDir;
 
 		@Test
@@ -59,7 +59,7 @@ void test() {
 	static class AnnotationOnParameterTestCase {
 
 		@Test
-		void test(@MetaTempDir Path tempDir) {
+		void test(@CustomTempDir Path tempDir) {
 			assertTrue(Files.exists(tempDir));
 		}
 
@@ -68,8 +68,7 @@ void test(@MetaTempDir Path tempDir) {
 	@TempDir
 	@Target({ ElementType.FIELD, ElementType.PARAMETER })
 	@Retention(RetentionPolicy.RUNTIME)
-	@interface MetaTempDir {
-
+	@interface CustomTempDir {
 	}
 
 }

From bd733b57007a4330393ea1de5236f50aca76ca2f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 28 May 2023 16:54:42 +0200
Subject: [PATCH 1348/1433] Overhaul structure of DiscoverySelectorsTests

Plus polishing and additional tests/assertions for the status quo.
---
 .../discovery/DiscoverySelectorsTests.java    | 1081 +++++++++--------
 1 file changed, 572 insertions(+), 509 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index b49186a535b7..a4b1f0f3c8a0 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -38,6 +38,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
@@ -56,623 +57,681 @@
  */
 class DiscoverySelectorsTests {
 
-	@Test
-	void selectUriByName() {
-		assertViolatesPrecondition(() -> selectUri((String) null));
-		assertViolatesPrecondition(() -> selectUri("   "));
-		assertViolatesPrecondition(() -> selectUri("foo:"));
+	@Nested
+	class SelectUriTests {
 
-		var uri = "https://junit.org";
+		@Test
+		void selectUriByName() {
+			assertViolatesPrecondition(() -> selectUri((String) null));
+			assertViolatesPrecondition(() -> selectUri("   "));
+			assertViolatesPrecondition(() -> selectUri("foo:"));
 
-		var selector = selectUri(uri);
-		assertEquals(uri, selector.getUri().toString());
-	}
+			var uri = "https://junit.org";
 
-	@Test
-	void selectUriByURI() throws Exception {
-		assertViolatesPrecondition(() -> selectUri((URI) null));
-		assertViolatesPrecondition(() -> selectUri("   "));
+			var selector = selectUri(uri);
+			assertEquals(uri, selector.getUri().toString());
+		}
 
-		var uri = new URI("https://junit.org");
+		@Test
+		void selectUriByURI() throws Exception {
+			assertViolatesPrecondition(() -> selectUri((URI) null));
+			assertViolatesPrecondition(() -> selectUri("   "));
+
+			var uri = new URI("https://junit.org");
+
+			var selector = selectUri(uri);
+			assertEquals(uri, selector.getUri());
+		}
 
-		var selector = selectUri(uri);
-		assertEquals(uri, selector.getUri());
 	}
 
-	@Test
-	void selectFileByName() {
-		assertViolatesPrecondition(() -> selectFile((String) null));
-		assertViolatesPrecondition(() -> selectFile("   "));
+	@Nested
+	class SelectFileTests {
 
-		var path = "src/test/resources/do_not_delete_me.txt";
+		@Test
+		void selectFileByName() {
+			assertViolatesPrecondition(() -> selectFile((String) null));
+			assertViolatesPrecondition(() -> selectFile("   "));
 
-		var selector = selectFile(path);
-		assertEquals(path, selector.getRawPath());
-		assertEquals(new File(path), selector.getFile());
-		assertEquals(Paths.get(path), selector.getPath());
-	}
+			var path = "src/test/resources/do_not_delete_me.txt";
 
-	@Test
-	void selectFileByNameAndPosition() {
-		var filePosition = FilePosition.from(12, 34);
-		assertViolatesPrecondition(() -> selectFile((String) null, filePosition));
-		assertViolatesPrecondition(() -> selectFile("   ", filePosition));
+			var selector = selectFile(path);
+			assertEquals(path, selector.getRawPath());
+			assertEquals(new File(path), selector.getFile());
+			assertEquals(Paths.get(path), selector.getPath());
+		}
 
-		var path = "src/test/resources/do_not_delete_me.txt";
+		@Test
+		void selectFileByNameAndPosition() {
+			var filePosition = FilePosition.from(12, 34);
+			assertViolatesPrecondition(() -> selectFile((String) null, filePosition));
+			assertViolatesPrecondition(() -> selectFile("   ", filePosition));
+
+			var path = "src/test/resources/do_not_delete_me.txt";
+
+			var selector = selectFile(path, filePosition);
+			assertEquals(path, selector.getRawPath());
+			assertEquals(new File(path), selector.getFile());
+			assertEquals(Paths.get(path), selector.getPath());
+			assertEquals(filePosition, selector.getPosition().get());
+		}
+
+		@Test
+		void selectFileByFileReference() throws Exception {
+			assertViolatesPrecondition(() -> selectFile((File) null));
+			assertViolatesPrecondition(() -> selectFile(new File("bogus/nonexistent.txt")));
+
+			var currentDir = new File(".").getCanonicalFile();
+			var relativeDir = new File("..", currentDir.getName());
+			var file = new File(relativeDir, "src/test/resources/do_not_delete_me.txt");
+			var path = file.getCanonicalFile().getPath();
+
+			var selector = selectFile(file);
+			assertEquals(path, selector.getRawPath());
+			assertEquals(file.getCanonicalFile(), selector.getFile());
+			assertEquals(Paths.get(path), selector.getPath());
+		}
+
+		@Test
+		void selectFileByFileReferenceAndPosition() throws Exception {
+			var filePosition = FilePosition.from(12, 34);
+			assertViolatesPrecondition(() -> selectFile((File) null, filePosition));
+			assertViolatesPrecondition(() -> selectFile(new File("bogus/nonexistent.txt"), filePosition));
+
+			var currentDir = new File(".").getCanonicalFile();
+			var relativeDir = new File("..", currentDir.getName());
+			var file = new File(relativeDir, "src/test/resources/do_not_delete_me.txt");
+			var path = file.getCanonicalFile().getPath();
+
+			var selector = selectFile(file, filePosition);
+			assertEquals(path, selector.getRawPath());
+			assertEquals(file.getCanonicalFile(), selector.getFile());
+			assertEquals(Paths.get(path), selector.getPath());
+			assertEquals(FilePosition.from(12, 34), selector.getPosition().get());
+		}
 
-		var selector = selectFile(path, filePosition);
-		assertEquals(path, selector.getRawPath());
-		assertEquals(new File(path), selector.getFile());
-		assertEquals(Paths.get(path), selector.getPath());
-		assertEquals(filePosition, selector.getPosition().get());
 	}
 
-	@Test
-	void selectFileByFileReference() throws Exception {
-		assertViolatesPrecondition(() -> selectFile((File) null));
-		assertViolatesPrecondition(() -> selectFile(new File("bogus/nonexistent.txt")));
+	@Nested
+	class SelectDirectoryTests {
+
+		@Test
+		void selectDirectoryByName() {
+			assertViolatesPrecondition(() -> selectDirectory((String) null));
+			assertViolatesPrecondition(() -> selectDirectory("   "));
 
-		var currentDir = new File(".").getCanonicalFile();
-		var relativeDir = new File("..", currentDir.getName());
-		var file = new File(relativeDir, "src/test/resources/do_not_delete_me.txt");
-		var path = file.getCanonicalFile().getPath();
+			var path = "src/test/resources";
 
-		var selector = selectFile(file);
-		assertEquals(path, selector.getRawPath());
-		assertEquals(file.getCanonicalFile(), selector.getFile());
-		assertEquals(Paths.get(path), selector.getPath());
-	}
+			var selector = selectDirectory(path);
+			assertEquals(path, selector.getRawPath());
+			assertEquals(new File(path), selector.getDirectory());
+			assertEquals(Paths.get(path), selector.getPath());
+		}
+
+		@Test
+		void selectDirectoryByFileReference() throws Exception {
+			assertViolatesPrecondition(() -> selectDirectory((File) null));
+			assertViolatesPrecondition(() -> selectDirectory(new File("bogus/nonexistent")));
+
+			var currentDir = new File(".").getCanonicalFile();
+			var relativeDir = new File("..", currentDir.getName());
+			var directory = new File(relativeDir, "src/test/resources");
+			var path = directory.getCanonicalFile().getPath();
+
+			var selector = selectDirectory(directory);
+			assertEquals(path, selector.getRawPath());
+			assertEquals(directory.getCanonicalFile(), selector.getDirectory());
+			assertEquals(Paths.get(path), selector.getPath());
+		}
 
-	@Test
-	void selectFileByFileReferenceAndPosition() throws Exception {
-		var filePosition = FilePosition.from(12, 34);
-		assertViolatesPrecondition(() -> selectFile((File) null, filePosition));
-		assertViolatesPrecondition(() -> selectFile(new File("bogus/nonexistent.txt"), filePosition));
-
-		var currentDir = new File(".").getCanonicalFile();
-		var relativeDir = new File("..", currentDir.getName());
-		var file = new File(relativeDir, "src/test/resources/do_not_delete_me.txt");
-		var path = file.getCanonicalFile().getPath();
-
-		var selector = selectFile(file, filePosition);
-		assertEquals(path, selector.getRawPath());
-		assertEquals(file.getCanonicalFile(), selector.getFile());
-		assertEquals(Paths.get(path), selector.getPath());
-		assertEquals(FilePosition.from(12, 34), selector.getPosition().get());
 	}
 
-	@Test
-	void selectDirectoryByName() {
-		assertViolatesPrecondition(() -> selectDirectory((String) null));
-		assertViolatesPrecondition(() -> selectDirectory("   "));
+	@Nested
+	class SelectClasspathResourceTests {
 
-		var path = "src/test/resources";
+		@Test
+		void selectClasspathResources() {
+			assertViolatesPrecondition(() -> selectClasspathResource(null));
+			assertViolatesPrecondition(() -> selectClasspathResource(""));
+			assertViolatesPrecondition(() -> selectClasspathResource("    "));
+			assertViolatesPrecondition(() -> selectClasspathResource("\t"));
+
+			// with unnecessary "/" prefix
+			var selector = selectClasspathResource("/foo/bar/spec.xml");
+			assertEquals("foo/bar/spec.xml", selector.getClasspathResourceName());
+
+			// standard use case
+			selector = selectClasspathResource("A/B/C/spec.json");
+			assertEquals("A/B/C/spec.json", selector.getClasspathResourceName());
+		}
+
+		@Test
+		void selectClasspathResourcesWithFilePosition() {
+			var filePosition = FilePosition.from(12, 34);
+			assertViolatesPrecondition(() -> selectClasspathResource(null, filePosition));
+			assertViolatesPrecondition(() -> selectClasspathResource("", filePosition));
+			assertViolatesPrecondition(() -> selectClasspathResource("    ", filePosition));
+			assertViolatesPrecondition(() -> selectClasspathResource("\t", filePosition));
+
+			// with unnecessary "/" prefix
+			var selector = selectClasspathResource("/foo/bar/spec.xml", filePosition);
+			assertEquals("foo/bar/spec.xml", selector.getClasspathResourceName());
+			assertEquals(FilePosition.from(12, 34), selector.getPosition().get());
+
+			// standard use case
+			selector = selectClasspathResource("A/B/C/spec.json", filePosition);
+			assertEquals("A/B/C/spec.json", selector.getClasspathResourceName());
+			assertEquals(filePosition, selector.getPosition().get());
+		}
 
-		var selector = selectDirectory(path);
-		assertEquals(path, selector.getRawPath());
-		assertEquals(new File(path), selector.getDirectory());
-		assertEquals(Paths.get(path), selector.getPath());
 	}
 
-	@Test
-	void selectDirectoryByFileReference() throws Exception {
-		assertViolatesPrecondition(() -> selectDirectory((File) null));
-		assertViolatesPrecondition(() -> selectDirectory(new File("bogus/nonexistent")));
+	@Nested
+	class SelectModuleTests {
 
-		var currentDir = new File(".").getCanonicalFile();
-		var relativeDir = new File("..", currentDir.getName());
-		var directory = new File(relativeDir, "src/test/resources");
-		var path = directory.getCanonicalFile().getPath();
+		@Test
+		void selectModuleByName() {
+			var selector = selectModule("java.base");
+			assertEquals("java.base", selector.getModuleName());
+		}
 
-		var selector = selectDirectory(directory);
-		assertEquals(path, selector.getRawPath());
-		assertEquals(directory.getCanonicalFile(), selector.getDirectory());
-		assertEquals(Paths.get(path), selector.getPath());
-	}
+		@Test
+		void selectModuleByNamePreconditions() {
+			assertViolatesPrecondition(() -> selectModule(null));
+			assertViolatesPrecondition(() -> selectModule(""));
+			assertViolatesPrecondition(() -> selectModule("   "));
+		}
 
-	@Test
-	void selectClasspathResources() {
-		assertViolatesPrecondition(() -> selectClasspathResource(null));
-		assertViolatesPrecondition(() -> selectClasspathResource(""));
-		assertViolatesPrecondition(() -> selectClasspathResource("    "));
-		assertViolatesPrecondition(() -> selectClasspathResource("\t"));
+		@Test
+		void selectModulesByNames() {
+			var selectors = selectModules(Set.of("a", "b"));
+			var names = selectors.stream().map(ModuleSelector::getModuleName).collect(Collectors.toList());
+			assertThat(names).containsExactlyInAnyOrder("b", "a");
+		}
 
-		// with unnecessary "/" prefix
-		var selector = selectClasspathResource("/foo/bar/spec.xml");
-		assertEquals("foo/bar/spec.xml", selector.getClasspathResourceName());
+		@Test
+		void selectModulesByNamesPreconditions() {
+			assertViolatesPrecondition(() -> selectModules(null));
+			assertViolatesPrecondition(() -> selectModules(Set.of("a", " ")));
+		}
 
-		// standard use case
-		selector = selectClasspathResource("A/B/C/spec.json");
-		assertEquals("A/B/C/spec.json", selector.getClasspathResourceName());
 	}
 
-	@Test
-	void selectClasspathResourcesWithFilePosition() {
-		var filePosition = FilePosition.from(12, 34);
-		assertViolatesPrecondition(() -> selectClasspathResource(null, filePosition));
-		assertViolatesPrecondition(() -> selectClasspathResource("", filePosition));
-		assertViolatesPrecondition(() -> selectClasspathResource("    ", filePosition));
-		assertViolatesPrecondition(() -> selectClasspathResource("\t", filePosition));
-
-		// with unnecessary "/" prefix
-		var selector = selectClasspathResource("/foo/bar/spec.xml", filePosition);
-		assertEquals("foo/bar/spec.xml", selector.getClasspathResourceName());
-		assertEquals(FilePosition.from(12, 34), selector.getPosition().get());
-
-		// standard use case
-		selector = selectClasspathResource("A/B/C/spec.json", filePosition);
-		assertEquals("A/B/C/spec.json", selector.getClasspathResourceName());
-		assertEquals(filePosition, selector.getPosition().get());
-	}
+	@Nested
+	class SelectPackageTests {
 
-	@Test
-	void selectModuleByName() {
-		var selector = selectModule("java.base");
-		assertEquals("java.base", selector.getModuleName());
-	}
+		@Test
+		void selectPackageByName() {
+			var selector = selectPackage(getClass().getPackage().getName());
+			assertEquals(getClass().getPackage().getName(), selector.getPackageName());
+		}
 
-	@Test
-	void selectModuleByNamePreconditions() {
-		assertViolatesPrecondition(() -> selectModule(null));
-		assertViolatesPrecondition(() -> selectModule(""));
-		assertViolatesPrecondition(() -> selectModule("   "));
 	}
 
-	@Test
-	void selectModulesByNames() {
-		var selectors = selectModules(Set.of("a", "b"));
-		var names = selectors.stream().map(ModuleSelector::getModuleName).collect(Collectors.toList());
-		assertThat(names).containsExactlyInAnyOrder("b", "a");
-	}
+	@Nested
+	class SelectClasspathRootsTests {
 
-	@Test
-	void selectModulesByNamesPreconditions() {
-		assertViolatesPrecondition(() -> selectModules(null));
-		assertViolatesPrecondition(() -> selectModules(Set.of("a", " ")));
-	}
+		@Test
+		void selectClasspathRootsWithNonExistingDirectory() {
+			var selectors = selectClasspathRoots(Set.of(Paths.get("some", "local", "path")));
 
-	@Test
-	void selectPackageByName() {
-		var selector = selectPackage(getClass().getPackage().getName());
-		assertEquals(getClass().getPackage().getName(), selector.getPackageName());
-	}
+			assertThat(selectors).isEmpty();
+		}
 
-	@Test
-	void selectClassByName() {
-		var selector = selectClass(getClass().getName());
-		assertEquals(getClass(), selector.getJavaClass());
-	}
+		@Test
+		void selectClasspathRootsWithNonExistingJarFile() {
+			var selectors = selectClasspathRoots(Set.of(Paths.get("some.jar")));
 
-	@Test
-	void selectClassByNameAndClassLoader() throws Exception {
-		try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
-			var selector = selectClass(getClass().getName(), testClassLoader);
+			assertThat(selectors).isEmpty();
+		}
+
+		@Test
+		void selectClasspathRootsWithExistingDirectory(@TempDir Path tempDir) {
+			var selectors = selectClasspathRoots(Set.of(tempDir));
 
-			assertThat(selector.getJavaClass().getName()).isEqualTo(getClass().getName());
-			assertThat(selector.getJavaClass()).isNotEqualTo(getClass());
-			assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
-			assertThat(selector.getJavaClass().getClassLoader()).isSameAs(testClassLoader);
+			assertThat(selectors).extracting(ClasspathRootSelector::getClasspathRoot).containsExactly(tempDir.toUri());
 		}
-	}
 
-	@Test
-	void selectMethodByClassNameAndMethodNamePreconditions() {
-		assertViolatesPrecondition(() -> selectMethod("TestClass", (String) null));
-		assertViolatesPrecondition(() -> selectMethod("TestClass", ""));
-		assertViolatesPrecondition(() -> selectMethod("TestClass", "  "));
-		assertViolatesPrecondition(() -> selectMethod((String) null, "method"));
-		assertViolatesPrecondition(() -> selectMethod("", "method"));
-		assertViolatesPrecondition(() -> selectMethod("   ", "method"));
-	}
+		@Test
+		void selectClasspathRootsWithExistingJarFile() throws Exception {
+			var jarUri = getClass().getResource("/jartest.jar").toURI();
+			var jarFile = Paths.get(jarUri);
 
-	@Test
-	void selectMethodByClassNameMethodNameAndMethodParameterTypesPreconditions() {
-		assertViolatesPrecondition(() -> selectMethod("TestClass", null, "int"));
-		assertViolatesPrecondition(() -> selectMethod("TestClass", "", "int"));
-		assertViolatesPrecondition(() -> selectMethod("TestClass", "  ", "int"));
-		assertViolatesPrecondition(() -> selectMethod((String) null, "method", "int"));
-		assertViolatesPrecondition(() -> selectMethod("", "method", "int"));
-		assertViolatesPrecondition(() -> selectMethod("   ", "method", "int"));
-		assertViolatesPrecondition(() -> selectMethod("TestClass", "method", (String) null));
-	}
+			var selectors = selectClasspathRoots(Set.of(jarFile));
 
-	@Test
-	void selectMethodByClassAndMethodNamePreconditions() {
-		assertViolatesPrecondition(() -> selectMethod(getClass(), (String) null));
-		assertViolatesPrecondition(() -> selectMethod(getClass(), ""));
-		assertViolatesPrecondition(() -> selectMethod(getClass(), "  "));
-		assertViolatesPrecondition(() -> selectMethod((Class<?>) null, "method"));
-		assertViolatesPrecondition(() -> selectMethod("", "method"));
-		assertViolatesPrecondition(() -> selectMethod("   ", "method"));
-	}
+			assertThat(selectors).extracting(ClasspathRootSelector::getClasspathRoot).containsExactly(jarUri);
+		}
 
-	@Test
-	void selectMethodByClassMethodNameAndMethodParameterTypesPreconditions() {
-		assertViolatesPrecondition(() -> selectMethod((Class<?>) null, "method", "int"));
-		assertViolatesPrecondition(() -> selectMethod(getClass(), null, "int"));
-		assertViolatesPrecondition(() -> selectMethod(getClass(), "", "int"));
-		assertViolatesPrecondition(() -> selectMethod(getClass(), "  ", "int"));
-		assertViolatesPrecondition(() -> selectMethod(getClass(), "method", null));
 	}
 
-	@Test
-	void selectMethodByClassAndMethodPreconditions() {
-		var method = getClass().getDeclaredMethods()[0];
-		assertViolatesPrecondition(() -> selectMethod(null, method));
-		assertViolatesPrecondition(() -> selectMethod(getClass(), (Method) null));
-	}
+	@Nested
+	class SelectClassTests {
 
-	@ParameterizedTest(name = "FQMN: ''{0}''")
-	@MethodSource("invalidFullyQualifiedMethodNames")
-	void selectMethodByFullyQualifiedNamePreconditions(String fqmn, String message) {
-		Exception exception = assertThrows(PreconditionViolationException.class, () -> selectMethod(fqmn));
-		assertThat(exception).hasMessageContaining(message);
-	}
+		@Test
+		void selectClassByName() {
+			var selector = selectClass(getClass().getName());
+			assertEquals(getClass(), selector.getJavaClass());
+		}
 
-	static Stream<Arguments> invalidFullyQualifiedMethodNames() {
-		// @formatter:off
-		return Stream.of(
-			arguments(null, "must not be null or blank"),
-			arguments("", "must not be null or blank"),
-			arguments("   ", "must not be null or blank"),
-			arguments("com.example", "not a valid fully qualified method name"),
-			arguments("com.example.Foo", "not a valid fully qualified method name"),
-			arguments("method", "not a valid fully qualified method name"),
-			arguments("#method", "not a valid fully qualified method name"),
-			arguments("#method()", "not a valid fully qualified method name"),
-			arguments("#method(int)", "not a valid fully qualified method name"),
-			arguments("java.lang.String#", "not a valid fully qualified method name")
-		);
-		// @formatter:on
-	}
+		@Test
+		void selectClassByNameAndClassLoader() throws Exception {
+			try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
+				var selector = selectClass(getClass().getName(), testClassLoader);
+
+				assertThat(selector.getJavaClass().getName()).isEqualTo(getClass().getName());
+				assertThat(selector.getJavaClass()).isNotEqualTo(getClass());
+				assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
+				assertThat(selector.getJavaClass().getClassLoader()).isSameAs(testClassLoader);
+			}
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedName() throws Exception {
-		Class<?> clazz = getClass();
-		var method = clazz.getDeclaredMethod("myTest");
-		assertSelectMethodByFullyQualifiedName(clazz, method);
 	}
 
-	@Test
-	void selectMethodByFullyQualifiedNameAndClassLoader() throws Exception {
-		try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
-			var clazz = testClassLoader.loadClass(getClass().getName());
-			assertThat(clazz).isNotEqualTo(getClass());
+	@Nested
+	class SelectMethodTests {
 
-			var method = clazz.getDeclaredMethod("myTest");
-			var selector = selectMethod(getClass().getName(), "myTest", testClassLoader);
-			assertThat(selector.getJavaMethod()).isEqualTo(method);
-			assertThat(selector.getJavaClass()).isEqualTo(clazz);
-			assertThat(selector.getClassName()).isEqualTo(clazz.getName());
-			assertThat(selector.getMethodName()).isEqualTo(method.getName());
-			assertThat(selector.getMethodParameterTypes()).isEmpty();
+		@Test
+		@DisplayName("Preconditions: selectMethod(className, methodName)")
+		void selectMethodByClassNameAndMethodNamePreconditions() {
+			assertViolatesPrecondition(() -> selectMethod("TestClass", (String) null));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", ""));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", "  "));
+			assertViolatesPrecondition(() -> selectMethod((String) null, "method"));
+			assertViolatesPrecondition(() -> selectMethod("", "method"));
+			assertViolatesPrecondition(() -> selectMethod("   ", "method"));
 		}
-	}
 
-	@Test
-	void selectMethodByFullyQualifiedNameForDefaultMethodInInterface() throws Exception {
-		Class<?> clazz = TestCaseWithDefaultMethod.class;
-		var method = clazz.getMethod("myTest");
-		assertSelectMethodByFullyQualifiedName(clazz, method);
-	}
+		@Test
+		@DisplayName("Preconditions: selectMethod(className, methodName, parameterTypeNames)")
+		void selectMethodByClassNameMethodNameAndParameterTypeNamesPreconditions() {
+			assertViolatesPrecondition(() -> selectMethod("TestClass", null, "int"));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", "", "int"));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", "  ", "int"));
+			assertViolatesPrecondition(() -> selectMethod((String) null, "method", "int"));
+			assertViolatesPrecondition(() -> selectMethod("", "method", "int"));
+			assertViolatesPrecondition(() -> selectMethod("   ", "method", "int"));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", "method", (String) null));
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithPrimitiveParameter() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", int.class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, int.class, "int");
-	}
+		@Test
+		@DisplayName("Preconditions: selectMethod(class, methodName)")
+		void selectMethodByClassAndMethodNamePreconditions() {
+			assertViolatesPrecondition(() -> selectMethod(testClass(), (String) null));
+			assertViolatesPrecondition(() -> selectMethod(testClass(), ""));
+			assertViolatesPrecondition(() -> selectMethod(testClass(), "  "));
+			assertViolatesPrecondition(() -> selectMethod((Class<?>) null, "method"));
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithPrimitiveParameterUsingSourceCodeSyntax() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", int.class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, "int", "int");
-	}
+		@Test
+		@DisplayName("Preconditions: selectMethod(class, methodName, parameterTypeNames)")
+		void selectMethodByClassMethodNameAndParameterTypeNamesPreconditions() {
+			assertViolatesPrecondition(() -> selectMethod((Class<?>) null, "method", "int"));
+			assertViolatesPrecondition(() -> selectMethod(testClass(), null, "int"));
+			assertViolatesPrecondition(() -> selectMethod(testClass(), "", "int"));
+			assertViolatesPrecondition(() -> selectMethod(testClass(), "  ", "int"));
+			assertViolatesPrecondition(() -> selectMethod(testClass(), "method", (String) null));
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithObjectParameter() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", String.class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, String.class, String.class.getName());
-	}
+		@Test
+		@DisplayName("Preconditions: selectMethod(class, method)")
+		void selectMethodByClassAndMethodPreconditions() {
+			var method = getClass().getDeclaredMethods()[0];
+			assertViolatesPrecondition(() -> selectMethod(null, method));
+			assertViolatesPrecondition(() -> selectMethod(testClass(), (Method) null));
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithObjectParameterUsingSourceCodeSyntax() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", String.class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, "java.lang.String", String.class.getName());
-	}
+		@ParameterizedTest(name = "FQMN: ''{0}''")
+		@MethodSource("invalidFullyQualifiedMethodNames")
+		@DisplayName("Preconditions: selectMethod(FQMN)")
+		void selectMethodByFullyQualifiedNamePreconditions(String fqmn, String message) {
+			Exception exception = assertThrows(PreconditionViolationException.class, () -> selectMethod(fqmn));
+			assertThat(exception).hasMessageContaining(message);
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithPrimitiveArrayParameter() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", int[].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, int[].class, int[].class.getName());
-	}
+		static Stream<Arguments> invalidFullyQualifiedMethodNames() {
+			// @formatter:off
+			return Stream.of(
+				arguments(null, "must not be null or blank"),
+				arguments("", "must not be null or blank"),
+				arguments("   ", "must not be null or blank"),
+				arguments("com.example", "not a valid fully qualified method name"),
+				arguments("com.example.Foo", "not a valid fully qualified method name"),
+				arguments("method", "not a valid fully qualified method name"),
+				arguments("#method", "not a valid fully qualified method name"),
+				arguments("#method()", "not a valid fully qualified method name"),
+				arguments("#method(int)", "not a valid fully qualified method name"),
+				arguments("java.lang.String#", "not a valid fully qualified method name")
+			);
+			// @formatter:on
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithPrimitiveArrayParameterUsingSourceCodeSyntax() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", int[].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, "int[]", "int[]");
-	}
+		@Test
+		void selectMethodByFullyQualifiedName() throws Exception {
+			Class<?> clazz = testClass();
+			var method = clazz.getDeclaredMethod("myTest");
+			assertSelectMethodByFullyQualifiedName(clazz, method);
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithObjectArrayParameter() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", String[].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, String[].class, String[].class.getName());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameAndClassLoader() throws Exception {
+			try (var testClassLoader = TestClassLoader.forClasses(testClass())) {
+				var clazz = testClassLoader.loadClass(testClass().getName());
+				assertThat(clazz).isNotEqualTo(testClass());
+
+				var method = clazz.getDeclaredMethod("myTest");
+				var selector = selectMethod(testClass().getName(), "myTest", testClassLoader);
+				assertThat(selector.getJavaMethod()).isEqualTo(method);
+				assertThat(selector.getJavaClass()).isEqualTo(clazz);
+				assertThat(selector.getClassName()).isEqualTo(clazz.getName());
+				assertThat(selector.getMethodName()).isEqualTo(method.getName());
+				assertThat(selector.getMethodParameterTypes()).isEmpty();
+			}
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithObjectArrayParameterUsingSourceCodeSyntax() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", String[].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, "java.lang.String[]", "java.lang.String[]");
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameForDefaultMethodInInterface() throws Exception {
+			Class<?> clazz = TestCaseWithDefaultMethod.class;
+			var method = clazz.getMethod("myTest");
+			assertSelectMethodByFullyQualifiedName(clazz, method);
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithTwoDimensionalPrimitiveArrayParameter() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", int[][].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, int[][].class, int[][].class.getName());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithPrimitiveParameter() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", int.class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, int.class, "int");
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithTwoDimensionalPrimitiveArrayParameterUsingSourceCodeSyntax()
-			throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", int[][].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, "int[][]", "int[][]");
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithPrimitiveParameterUsingSourceCodeSyntax() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", int.class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, "int", "int");
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithTwoDimensionalObjectArrayParameter() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", String[][].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, String[][].class, String[][].class.getName());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithObjectParameter() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", String.class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, String.class, String.class.getName());
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithTwoDimensionalObjectArrayParameterUsingSourceCodeSyntax()
-			throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", String[][].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, "java.lang.String[][]", "java.lang.String[][]");
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithObjectParameterUsingSourceCodeSyntax() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", String.class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, "java.lang.String", String.class.getName());
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithMultidimensionalPrimitiveArrayParameter() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", int[][][][][].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, int[][][][][].class, int[][][][][].class.getName());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithPrimitiveArrayParameter() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", int[].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, int[].class, int[].class.getName());
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithMultidimensionalPrimitiveArrayParameterUsingSourceCodeSyntax()
-			throws Exception {
+		@Test
+		void selectMethodByFullyQualifiedNameWithPrimitiveArrayParameterUsingSourceCodeSyntax() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", int[].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, "int[]", "int[]");
+		}
 
-		var method = getClass().getDeclaredMethod("myTest", int[][][][][].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, "int[][][][][]", "int[][][][][]");
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithObjectArrayParameter() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", String[].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, String[].class, String[].class.getName());
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithMultidimensionalObjectArrayParameter() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", Double[][][][][].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, Double[][][][][].class,
-			Double[][][][][].class.getName());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithObjectArrayParameterUsingSourceCodeSyntax() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", String[].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, "java.lang.String[]", "java.lang.String[]");
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameWithMultidimensionalObjectArrayParameterUsingSourceCodeSyntax()
-			throws Exception {
+		@Test
+		void selectMethodByFullyQualifiedNameWithTwoDimensionalPrimitiveArrayParameter() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", int[][].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, int[][].class, int[][].class.getName());
+		}
 
-		var method = getClass().getDeclaredMethod("myTest", Double[][][][][].class);
-		assertSelectMethodByFullyQualifiedName(getClass(), method, "java.lang.Double[][][][][]",
-			"java.lang.Double[][][][][]");
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithTwoDimensionalPrimitiveArrayParameterUsingSourceCodeSyntax()
+				throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", int[][].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, "int[][]", "int[][]");
+		}
 
-	@Test
-	void selectMethodByFullyQualifiedNameEndingInOpeningParenthesis() {
-		var className = "org.example.MyClass";
-		// The following bizarre method name is not permissible in Java source
-		// code; however, it's permitted by the JVM -- for example, in Groovy
-		// or Kotlin source code using back ticks.
-		var methodName = ")--(";
-		var fqmn = className + "#" + methodName;
-
-		var selector = selectMethod(fqmn);
-		assertEquals(className, selector.getClassName());
-		assertEquals(methodName, selector.getMethodName());
-		assertEquals("", selector.getMethodParameterTypes());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithTwoDimensionalObjectArrayParameter() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", String[][].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, String[][].class, String[][].class.getName());
+		}
 
-	/**
-	 * Inspired by Spock specifications.
-	 */
-	@Test
-	void selectMethodByFullyQualifiedNameContainingHashtags() {
-		var className = "org.example.CalculatorSpec";
-		var methodName = "#a plus #b equals #c";
-		var fqmn = className + "#" + methodName;
-
-		var selector = selectMethod(fqmn);
-		assertEquals(className, selector.getClassName());
-		assertEquals(methodName, selector.getMethodName());
-		assertEquals("", selector.getMethodParameterTypes());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithTwoDimensionalObjectArrayParameterUsingSourceCodeSyntax()
+				throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", String[][].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, "java.lang.String[][]", "java.lang.String[][]");
+		}
 
-	/**
-	 * Inspired by Spock specifications.
-	 */
-	@Test
-	void selectMethodByFullyQualifiedNameContainingHashtagsAndWithParameterList() {
-		var className = "org.example.CalculatorSpec";
-		var methodName = "#a plus #b equals #c";
-		var methodParameters = "int, int, int";
-		var fqmn = String.format("%s#%s(%s)", className, methodName, methodParameters);
-
-		var selector = selectMethod(fqmn);
-		assertEquals(className, selector.getClassName());
-		assertEquals(methodName, selector.getMethodName());
-		assertEquals(methodParameters, selector.getMethodParameterTypes());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithMultidimensionalPrimitiveArrayParameter() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", int[][][][][].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, int[][][][][].class,
+				int[][][][][].class.getName());
+		}
 
-	/**
-	 * Inspired by Kotlin tests.
-	 */
-	@Test
-	void selectMethodByFullyQualifiedNameContainingParentheses() {
-		var className = "org.example.KotlinTestCase";
-		var methodName = "🦆 ~|~test with a really, (really) terrible name & that needs to be changed!~|~";
-		var fqmn = className + "#" + methodName;
+		@Test
+		void selectMethodByFullyQualifiedNameWithMultidimensionalPrimitiveArrayParameterUsingSourceCodeSyntax()
+				throws Exception {
 
-		var selector = selectMethod(fqmn);
+			var method = testClass().getDeclaredMethod("myTest", int[][][][][].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, "int[][][][][]", "int[][][][][]");
+		}
 
-		assertEquals(className, selector.getClassName());
-		assertEquals(methodName, selector.getMethodName());
-		assertEquals("", selector.getMethodParameterTypes());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameWithMultidimensionalObjectArrayParameter() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest", Double[][][][][].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, Double[][][][][].class,
+				Double[][][][][].class.getName());
+		}
 
-	/**
-	 * Inspired by Kotlin tests.
-	 */
-	@Test
-	void selectMethodByFullyQualifiedNameEndingWithParentheses() {
-		var className = "org.example.KotlinTestCase";
-		var methodName = "test name ends with parentheses()";
-		var fqmn = className + "#" + methodName + "()";
+		@Test
+		void selectMethodByFullyQualifiedNameWithMultidimensionalObjectArrayParameterUsingSourceCodeSyntax()
+				throws Exception {
 
-		var selector = selectMethod(fqmn);
+			var method = testClass().getDeclaredMethod("myTest", Double[][][][][].class);
+			assertSelectMethodByFullyQualifiedName(testClass(), method, "java.lang.Double[][][][][]",
+				"java.lang.Double[][][][][]");
+		}
 
-		assertEquals(className, selector.getClassName());
-		assertEquals(methodName, selector.getMethodName());
-		assertEquals("", selector.getMethodParameterTypes());
-	}
+		@Test
+		void selectMethodByFullyQualifiedNameEndingInOpeningParenthesis() {
+			var className = "org.example.MyClass";
+			// The following bizarre method name is not permissible in Java source
+			// code; however, it's permitted by the JVM -- for example, in Groovy
+			// or Kotlin source code using back ticks.
+			var methodName = ")--(";
+			var fqmn = className + "#" + methodName;
+
+			var selector = selectMethod(fqmn);
+			assertEquals(className, selector.getClassName());
+			assertEquals(methodName, selector.getMethodName());
+			assertEquals("", selector.getMethodParameterTypes());
+		}
 
-	/**
-	 * Inspired by Kotlin tests.
-	 */
-	@Test
-	void selectMethodByFullyQualifiedNameEndingWithParenthesesAndWithParameterList() {
-		var className = "org.example.KotlinTestCase";
-		var methodName = "test name ends with parentheses()";
-		var methodParameters = "int, int, int";
-		var fqmn = String.format("%s#%s(%s)", className, methodName, methodParameters);
-
-		var selector = selectMethod(fqmn);
-
-		assertEquals(className, selector.getClassName());
-		assertEquals(methodName, selector.getMethodName());
-		assertEquals(methodParameters, selector.getMethodParameterTypes());
-	}
+		/**
+		 * Inspired by Spock specifications.
+		 */
+		@Test
+		void selectMethodByFullyQualifiedNameContainingHashtags() {
+			var className = "org.example.CalculatorSpec";
+			var methodName = "#a plus #b equals #c";
+			var fqmn = className + "#" + methodName;
+
+			var selector = selectMethod(fqmn);
+			assertEquals(className, selector.getClassName());
+			assertEquals(methodName, selector.getMethodName());
+			assertEquals("", selector.getMethodParameterTypes());
+		}
 
-	private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method) {
-		var selector = selectMethod(fqmn(clazz, method.getName()));
-		assertEquals(method, selector.getJavaMethod());
-		assertEquals(clazz, selector.getJavaClass());
-		assertEquals(clazz.getName(), selector.getClassName());
-		assertEquals(method.getName(), selector.getMethodName());
-		assertEquals("", selector.getMethodParameterTypes());
-	}
+		/**
+		 * Inspired by Spock specifications.
+		 */
+		@Test
+		void selectMethodByFullyQualifiedNameContainingHashtagsAndWithParameterList() {
+			var className = "org.example.CalculatorSpec";
+			var methodName = "#a plus #b equals #c";
+			var methodParameters = "int, int, int";
+			var fqmn = String.format("%s#%s(%s)", className, methodName, methodParameters);
+
+			var selector = selectMethod(fqmn);
+			assertEquals(className, selector.getClassName());
+			assertEquals(methodName, selector.getMethodName());
+			assertEquals(methodParameters, selector.getMethodParameterTypes());
+		}
 
-	private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method, Class<?> parameterType,
-			String expectedParameterTypes) {
+		/**
+		 * Inspired by Kotlin tests.
+		 */
+		@Test
+		void selectMethodByFullyQualifiedNameContainingParentheses() {
+			var className = "org.example.KotlinTestCase";
+			var methodName = "🦆 ~|~test with a really, (really) terrible name & that needs to be changed!~|~";
+			var fqmn = className + "#" + methodName;
 
-		var selector = selectMethod(fqmn(parameterType));
-		assertEquals(method, selector.getJavaMethod());
-		assertEquals(clazz, selector.getJavaClass());
-		assertEquals(clazz.getName(), selector.getClassName());
-		assertEquals(method.getName(), selector.getMethodName());
-		assertEquals(expectedParameterTypes, selector.getMethodParameterTypes());
-	}
+			var selector = selectMethod(fqmn);
 
-	private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method, String parameterName,
-			String expectedParameterTypes) {
+			assertEquals(className, selector.getClassName());
+			assertEquals(methodName, selector.getMethodName());
+			assertEquals("", selector.getMethodParameterTypes());
+		}
 
-		var selector = selectMethod(fqmnWithParamNames(parameterName));
-		assertEquals(method, selector.getJavaMethod());
-		assertEquals(clazz, selector.getJavaClass());
-		assertEquals(clazz.getName(), selector.getClassName());
-		assertEquals(method.getName(), selector.getMethodName());
-		assertEquals(expectedParameterTypes, selector.getMethodParameterTypes());
-	}
+		/**
+		 * Inspired by Kotlin tests.
+		 */
+		@Test
+		void selectMethodByFullyQualifiedNameEndingWithParentheses() {
+			var className = "org.example.KotlinTestCase";
+			var methodName = "test name ends with parentheses()";
+			var fqmn = className + "#" + methodName + "()";
 
-	@Test
-	void selectMethodByClassAndMethodName() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest");
+			var selector = selectMethod(fqmn);
 
-		var selector = selectMethod(getClass(), "myTest");
-		assertEquals(getClass(), selector.getJavaClass());
-		assertEquals(getClass().getName(), selector.getClassName());
-		assertEquals(method, selector.getJavaMethod());
-		assertEquals("myTest", selector.getMethodName());
-		assertEquals("", selector.getMethodParameterTypes());
-	}
+			assertEquals(className, selector.getClassName());
+			assertEquals(methodName, selector.getMethodName());
+			assertEquals("", selector.getMethodParameterTypes());
+		}
 
-	@Test
-	void selectMethodByClassAndMethodNameWithParameterTypes() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", String.class);
+		/**
+		 * Inspired by Kotlin tests.
+		 */
+		@Test
+		void selectMethodByFullyQualifiedNameEndingWithParenthesesAndWithParameterList() {
+			var className = "org.example.KotlinTestCase";
+			var methodName = "test name ends with parentheses()";
+			var methodParameters = "int, int, int";
+			var fqmn = String.format("%s#%s(%s)", className, methodName, methodParameters);
 
-		var selector = selectMethod(getClass(), "myTest", String.class.getName());
-		assertEquals(getClass(), selector.getJavaClass());
-		assertEquals(getClass().getName(), selector.getClassName());
-		assertEquals(method, selector.getJavaMethod());
-		assertEquals("myTest", selector.getMethodName());
-		assertEquals(String.class.getName(), selector.getMethodParameterTypes());
-	}
+			var selector = selectMethod(fqmn);
 
-	@Test
-	void selectMethodWithParametersByMethodReference() throws Exception {
-		var method = getClass().getDeclaredMethod("myTest", String.class);
+			assertEquals(className, selector.getClassName());
+			assertEquals(methodName, selector.getMethodName());
+			assertEquals(methodParameters, selector.getMethodParameterTypes());
+		}
 
-		var selector = selectMethod(getClass(), method);
-		assertEquals(method, selector.getJavaMethod());
-		assertEquals(getClass(), selector.getJavaClass());
-		assertEquals(getClass().getName(), selector.getClassName());
-		assertEquals("myTest", selector.getMethodName());
-		assertEquals(String.class.getName(), selector.getMethodParameterTypes());
-	}
+		private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method) {
+			var selector = selectMethod(fqmn(clazz, method.getName()));
+			assertEquals(method, selector.getJavaMethod());
+			assertEquals(clazz, selector.getJavaClass());
+			assertEquals(clazz.getName(), selector.getClassName());
+			assertEquals(method.getName(), selector.getMethodName());
+			assertEquals("", selector.getMethodParameterTypes());
+		}
 
-	@Test
-	void selectClassByNameForSpockSpec() {
-		var className = "org.example.CalculatorSpec";
-		var selector = selectClass(className);
-		assertEquals(className, selector.getClassName());
-	}
+		private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method, Class<?> parameterType,
+				String expectedParameterTypes) {
 
-	@Test
-	void selectMethodByClassAndNameForSpockSpec() {
-		var className = "org.example.CalculatorSpec";
-		var methodName = "#a plus #b equals #c";
+			var selector = selectMethod(fqmn(parameterType));
+			assertEquals(method, selector.getJavaMethod());
+			assertEquals(clazz, selector.getJavaClass());
+			assertEquals(clazz.getName(), selector.getClassName());
+			assertEquals(method.getName(), selector.getMethodName());
+			assertEquals(expectedParameterTypes, selector.getMethodParameterTypes());
+		}
 
-		var selector = selectMethod(className, methodName);
-		assertEquals(className, selector.getClassName());
-		assertEquals(methodName, selector.getMethodName());
-		assertEquals("", selector.getMethodParameterTypes());
-	}
+		private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method, String parameterName,
+				String expectedParameterTypes) {
 
-	@Test
-	void selectClasspathRootsWithNonExistingDirectory() {
-		var selectors = selectClasspathRoots(Set.of(Paths.get("some", "local", "path")));
+			var selector = selectMethod(fqmnWithParamNames(parameterName));
+			assertEquals(method, selector.getJavaMethod());
+			assertEquals(clazz, selector.getJavaClass());
+			assertEquals(clazz.getName(), selector.getClassName());
+			assertEquals(method.getName(), selector.getMethodName());
+			assertEquals(expectedParameterTypes, selector.getMethodParameterTypes());
+		}
 
-		assertThat(selectors).isEmpty();
-	}
+		@Test
+		void selectMethodByClassAndMethodName() throws Exception {
+			var method = testClass().getDeclaredMethod("myTest");
+
+			var selector = selectMethod(testClass(), "myTest");
+			assertEquals(testClass(), selector.getJavaClass());
+			assertEquals(testClass().getName(), selector.getClassName());
+			assertEquals(method, selector.getJavaMethod());
+			assertEquals("myTest", selector.getMethodName());
+			assertEquals("", selector.getMethodParameterTypes());
+		}
 
-	@Test
-	void selectClasspathRootsWithNonExistingJarFile() {
-		var selectors = selectClasspathRoots(Set.of(Paths.get("some.jar")));
+		@Test
+		void selectMethodByClassMethodNameAndParameterTypeNames() throws Exception {
+			var testClass = testClass();
+			var method = testClass.getDeclaredMethod("myTest", String.class, boolean[].class);
 
-		assertThat(selectors).isEmpty();
-	}
+			var selector = selectMethod(testClass, "myTest", "java.lang.String, boolean[]");
 
-	@Test
-	void selectClasspathRootsWithExistingDirectory(@TempDir Path tempDir) {
-		var selectors = selectClasspathRoots(Set.of(tempDir));
+			assertThat(selector.getClassName()).isEqualTo(testClass.getName());
+			assertThat(selector.getJavaClass()).isEqualTo(testClass);
+			assertThat(selector.getMethodName()).isEqualTo("myTest");
+			assertThat(selector.getJavaMethod()).isEqualTo(method);
+			assertThat(selector.getMethodParameterTypes()).isEqualTo("java.lang.String, boolean[]");
+		}
 
-		assertThat(selectors).extracting(ClasspathRootSelector::getClasspathRoot).containsExactly(tempDir.toUri());
-	}
+		@Test
+		void selectMethodWithParametersByMethodReference() throws Exception {
+			var testClass = testClass();
+			var method = testClass.getDeclaredMethod("myTest", String.class, boolean[].class);
 
-	@Test
-	void selectClasspathRootsWithExistingJarFile() throws Exception {
-		var jarUri = getClass().getResource("/jartest.jar").toURI();
-		var jarFile = Paths.get(jarUri);
+			var selector = selectMethod(testClass, method);
 
-		var selectors = selectClasspathRoots(Set.of(jarFile));
+			assertThat(selector.getClassName()).isEqualTo(testClass.getName());
+			assertThat(selector.getJavaClass()).isEqualTo(testClass);
+			assertThat(selector.getMethodName()).isEqualTo("myTest");
+			assertThat(selector.getJavaMethod()).isEqualTo(method);
+			assertThat(selector.getMethodParameterTypes()).isEqualTo("java.lang.String, [Z");
+		}
+
+		@Test
+		void selectClassByNameForSpockSpec() {
+			var className = "org.example.CalculatorSpec";
+			var selector = selectClass(className);
+			assertEquals(className, selector.getClassName());
+		}
+
+		@Test
+		void selectMethodByClassAndNameForSpockSpec() {
+			var className = "org.example.CalculatorSpec";
+			var methodName = "#a plus #b equals #c";
+
+			var selector = selectMethod(className, methodName);
+			assertEquals(className, selector.getClassName());
+			assertEquals(methodName, selector.getMethodName());
+			assertEquals("", selector.getMethodParameterTypes());
+		}
+
+		private static Class<?> testClass() {
+			return DiscoverySelectorsTests.class;
+		}
 
-		assertThat(selectors).extracting(ClasspathRootSelector::getClasspathRoot).containsExactly(jarUri);
 	}
 
 	@Nested
-	class NestedClassAndMethodSelectors {
+	class SelectNestedClassAndSelectNestedMethodTests {
 
 		private final String enclosingClassName = getClass().getName() + "$ClassWithNestedInnerClass";
 		private final String nestedClassName = getClass().getName() + "$AbstractClassWithNestedInnerClass$NestedClass";
@@ -908,6 +967,7 @@ private static String fqmn(Class<?> clazz, String methodName, Class<?>... params
 	private static String fqmnWithParamNames(String... params) {
 		return String.format("%s#%s(%s)", DiscoverySelectorsTests.class.getName(), "myTest", join(", ", params));
 	}
+
 	interface TestInterface {
 
 		@Test
@@ -937,6 +997,9 @@ void myTest(int[][][][][] grid) {
 	void myTest(String info) {
 	}
 
+	void myTest(String info, boolean[] flags) {
+	}
+
 	void myTest(String[] info) {
 	}
 

From 7cfdfeb6db4f08cc72597b4d11720d10ba5830dd Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 28 May 2023 17:34:03 +0200
Subject: [PATCH 1349/1433] Allow selecting classes by name via
 `@SelectClasses`

This commit introduces a `String[] names` attribute in `@SelectClasses`
to select classes by fully-qualified class name.

This new attribute can be used in conjunction with or instead of
`value`.

The intent is to support selecting classes that are not visible to the
class in which `@SelectClasses` is declared -- for example a `@Suite`
class.

Resolves #3325.
---
 .../release-notes-5.10.0-RC1.adoc             |  1 +
 .../platform/suite/api/SelectClasses.java     | 21 ++++++++++-
 .../commons/AdditionalDiscoverySelectors.java | 15 ++++++--
 .../SuiteLauncherDiscoveryRequestBuilder.java | 28 ++++++++++----
 ...eLauncherDiscoveryRequestBuilderTests.java | 37 +++++++++++++++++--
 .../suite/engine/SuiteEngineTests.java        |  2 +-
 6 files changed, 89 insertions(+), 15 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 22c369a4de96..da807f8aed72 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -24,6 +24,7 @@ JUnit repository on GitHub.
 ==== New Features and Improvements
 
 * New `@SelectMethod` selector support in the `@Suite` test engine.
+* Allow selecting classes by name via new `names` attribute of `@SelectClasses`
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
index 9d0a8d3c661a..452cce3895c1 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.suite.api;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
 
 import java.lang.annotation.Documented;
@@ -26,8 +27,10 @@
  * a test suite on the JUnit Platform.
  *
  * @since 1.0
+ * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
  * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectClass(Class)
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectClass(String)
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
@@ -38,7 +41,23 @@
 
 	/**
 	 * One or more classes to select.
+	 * <p>
+	 * May be use in conjunction with or instead of {@link #names()}.
 	 */
-	Class<?>[] value();
+	Class<?>[] value() default {};
+
+	/**
+	 * One or more classes to select by their fully qualified names.
+	 * <p>
+	 * May be use in conjunction with or instead of {@link #value()}.
+	 * <p>
+	 * This attribute is intended to be used when the class cannot be referenced
+	 * directly from where this annotation is used, for example, when it's not
+	 * visible due to being package-private.
+	 *
+	 * @since 1.10
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	String[] names() default {};
 
 }
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
index cfcf1f6a2d31..2bce97c1f43a 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -68,14 +68,23 @@ static List<PackageSelector> selectPackages(String... packageNames) {
 		// @formatter:on
 	}
 
-	static List<ClassSelector> selectClasses(Class<?>... classes) {
+	static Stream<ClassSelector> selectClasses(Class<?>... classes) {
 		Preconditions.notNull(classes, "classes must not be null");
 		Preconditions.containsNoNullElements(classes, "Individual classes must not be null");
 
 		// @formatter:off
 		return uniqueStreamOf(classes)
-				.map(DiscoverySelectors::selectClass)
-				.collect(Collectors.toList());
+				.map(DiscoverySelectors::selectClass);
+		// @formatter:on
+	}
+
+	static Stream<ClassSelector> selectClasses(String... classNames) {
+		Preconditions.notNull(classNames, "classNames must not be null");
+		Preconditions.containsNoNullElements(classNames, "Individual class names must not be null");
+
+		// @formatter:off
+		return uniqueStreamOf(classNames)
+				.map(DiscoverySelectors::selectClass);
 		// @formatter:on
 	}
 
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index d61ddbef151f..08cb4aea20fa 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.suite.commons;
 
+import static java.util.stream.Collectors.toList;
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
 import static org.junit.platform.commons.util.AnnotationUtils.findRepeatableAnnotations;
 import static org.junit.platform.engine.discovery.ClassNameFilter.STANDARD_INCLUDE_PATTERN;
@@ -18,11 +19,12 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -69,7 +71,7 @@
 public final class SuiteLauncherDiscoveryRequestBuilder {
 
 	private final LauncherDiscoveryRequestBuilder delegate = LauncherDiscoveryRequestBuilder.request();
-	private final List<String> selectedClassNames = new ArrayList<>();
+	private final Set<String> selectedClassNames = new LinkedHashSet<>();
 	private boolean includeClassNamePatternsUsed;
 	private boolean filterStandardClassNamePatterns = false;
 	private ConfigurationParameters parentConfigurationParameters;
@@ -148,8 +150,8 @@ public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
 				.ifPresent(this::filters);
 		// Process @SelectClasses before @IncludeClassNamePatterns, since the names
 		// of selected classes get automatically added to the include filter.
-		findAnnotationValues(suiteClass, SelectClasses.class, SelectClasses::value)
-				.map(this::selectClasses)
+		findAnnotation(suiteClass, SelectClasses.class)
+				.map(annotation -> selectClasses(suiteClass, annotation))
 				.ifPresent(this::selectors);
 		findRepeatableAnnotations(suiteClass, SelectMethod.class)
 				.stream()
@@ -207,9 +209,21 @@ public LauncherDiscoveryRequest build() {
 		return delegate.build();
 	}
 
-	private List<ClassSelector> selectClasses(Class<?>... classes) {
-		Arrays.stream(classes).map(Class::getName).distinct().forEach(this.selectedClassNames::add);
-		return AdditionalDiscoverySelectors.selectClasses(classes);
+	private List<ClassSelector> selectClasses(Class<?> suiteClass, SelectClasses annotation) {
+		return toClassSelectors(suiteClass, annotation) //
+				.distinct() //
+				.peek(selector -> this.selectedClassNames.add(selector.getClassName())) //
+				.collect(toList());
+	}
+
+	private static Stream<ClassSelector> toClassSelectors(Class<?> suiteClass, SelectClasses annotation) {
+		Preconditions.condition(annotation.value().length > 0 || annotation.names().length > 0,
+			() -> String.format("@SelectClasses on class [%s] must declare at least one class reference or name",
+				suiteClass.getName()));
+		return Stream.concat(//
+			AdditionalDiscoverySelectors.selectClasses(annotation.value()), //
+			AdditionalDiscoverySelectors.selectClasses(annotation.names()) //
+		);
 	}
 
 	private MethodSelector selectMethod(Class<?> clazz, String name, String parameters) {
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index a0951cf7fc46..1848163bc6ce 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -10,8 +10,10 @@
 
 package org.junit.platform.suite.commons;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.annotation.Retention;
@@ -23,9 +25,12 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.engine.JupiterTestEngine;
+import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.engine.ConfigurationParameters;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestTag;
@@ -204,7 +209,7 @@ class Suite {
 	}
 
 	@Test
-	void selectClasses() {
+	void selectClassesByReference() {
 		class TestCase {
 		}
 		@SelectClasses(TestCase.class)
@@ -217,6 +222,33 @@ class Suite {
 		assertEquals(TestCase.class, exactlyOne(selectors).getJavaClass());
 	}
 
+	@Test
+	void selectClassesByName() {
+		@SelectClasses(names = "org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilderTests$NonLocalTestCase")
+		class Suite {
+		}
+
+		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
+		List<ClassSelector> selectors = request.getSelectorsByType(ClassSelector.class);
+		assertEquals(NonLocalTestCase.class, exactlyOne(selectors).getJavaClass());
+	}
+
+	@Test
+	void selectClassesWithoutReferencesOrNames() {
+		@SelectClasses
+		class Suite {
+		}
+
+		var e = assertThrows(PreconditionViolationException.class, () -> builder.suite(Suite.class));
+
+		assertThat(e).hasMessageMatching(
+			"@SelectClasses on class \\[" + Pattern.quote(SuiteLauncherDiscoveryRequestBuilderTests.class.getName())
+					+ "\\$\\d+Suite] must declare at least one class reference or name");
+	}
+
+	static class NonLocalTestCase {
+	}
+
 	@Test
 	void selectOneMethodWithNoParameters() {
 		class TestClass {
@@ -460,8 +492,7 @@ class Suite {
 	}
 
 	private static <T> T exactlyOne(List<T> list) {
-		assertEquals(1, list.size());
-		return list.get(0);
+		return CollectionUtils.getOnlyElement(list);
 	}
 
 	private static class StubAbstractTestDescriptor extends AbstractTestDescriptor {
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
index 759cd6e2768c..040a71ef28a9 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java
@@ -144,7 +144,7 @@ void innerSuiteIsNotExecuted() {
 
 	@SuppressWarnings("InnerClassMayBeStatic")
 	@Suite
-	@SelectClasses(SingleTestTestCase.class)
+	@SelectClasses(names = "org.junit.platform.suite.engine.testcases.SingleTestTestCase")
 	private class InnerSuite {
 
 	}

From b618b82691bc1f02ae1513c38493c743958fb025 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 30 May 2023 10:44:34 +0200
Subject: [PATCH 1350/1433] Polishing

---
 .../release-notes-5.10.0-RC1.adoc             |  2 +-
 .../engine/discovery/DiscoverySelectors.java  | 12 +++++------
 .../engine/discovery/MethodSelector.java      |  4 ++--
 .../discovery/NestedMethodSelector.java       |  3 +--
 .../platform/suite/api/SelectClasses.java     | 16 +++++++--------
 .../commons/AdditionalDiscoverySelectors.java | 20 +++++++------------
 6 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index da807f8aed72..73c6cf3edffa 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -24,7 +24,7 @@ JUnit repository on GitHub.
 ==== New Features and Improvements
 
 * New `@SelectMethod` selector support in the `@Suite` test engine.
-* Allow selecting classes by name via new `names` attribute of `@SelectClasses`
+* Allow selecting classes by name via new the `names` attribute in `@SelectClasses`.
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 6ada10fb641c..f020620827cb 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -389,7 +389,7 @@ public static ClassSelector selectClass(Class<?> clazz) {
 	 * @see ClassSelector
 	 */
 	public static ClassSelector selectClass(String className) {
-		return selectClass(className, null);
+		return selectClass(className, (ClassLoader) null);
 	}
 
 	/**
@@ -506,7 +506,7 @@ public static MethodSelector selectMethod(String className, String methodName) {
 	public static MethodSelector selectMethod(String className, String methodName, ClassLoader classLoader) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new MethodSelector(className, methodName, classLoader);
+		return new MethodSelector(className, methodName, "", classLoader);
 	}
 
 	/**
@@ -566,9 +566,7 @@ public static MethodSelector selectMethod(String className, String methodName, S
 	 * @see MethodSelector
 	 */
 	public static MethodSelector selectMethod(Class<?> javaClass, String methodName) {
-		Preconditions.notNull(javaClass, "Class must not be null");
-		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new MethodSelector(javaClass, methodName);
+		return selectMethod(javaClass, methodName, "");
 	}
 
 	/**
@@ -635,7 +633,7 @@ public static NestedClassSelector selectNestedClass(List<Class<?>> enclosingClas
 	 */
 	@API(status = STABLE, since = "1.6")
 	public static NestedClassSelector selectNestedClass(List<String> enclosingClassNames, String nestedClassName) {
-		return selectNestedClass(enclosingClassNames, nestedClassName, null);
+		return selectNestedClass(enclosingClassNames, nestedClassName, (ClassLoader) null);
 	}
 
 	/**
@@ -691,7 +689,7 @@ public static NestedMethodSelector selectNestedMethod(List<String> enclosingClas
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, classLoader);
+		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, "", classLoader);
 	}
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 32a4b2a11410..43b6716c6359 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -166,15 +166,15 @@ public Method getJavaMethod() {
 	}
 
 	private void lazyLoadJavaClass() {
+		// @formatter:off
 		if (this.javaClass == null) {
-			// @formatter:off
 			Try<Class<?>> tryToLoadClass = this.classLoader == null
 				? ReflectionUtils.tryToLoadClass(this.className)
 				: ReflectionUtils.tryToLoadClass(this.className, this.classLoader);
 			this.javaClass = tryToLoadClass.getOrThrow(cause ->
 				new PreconditionViolationException("Could not load class with name: " + this.className, cause));
-			// @formatter:on
 		}
+		// @formatter:on
 	}
 
 	private void lazyLoadJavaMethod() {
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index 76d46b8bbcaf..bb2ca9dc2bdd 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -68,8 +68,7 @@ public class NestedMethodSelector implements DiscoverySelector {
 	}
 
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName) {
-		this.nestedClassSelector = new NestedClassSelector(enclosingClasses, nestedClass);
-		this.methodSelector = new MethodSelector(nestedClass, methodName);
+		this(enclosingClasses, nestedClass, methodName, "");
 	}
 
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName,
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
index 452cce3895c1..024772788141 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectClasses.java
@@ -41,19 +41,19 @@
 
 	/**
 	 * One or more classes to select.
-	 * <p>
-	 * May be use in conjunction with or instead of {@link #names()}.
+	 *
+	 * <p>May be use in conjunction with or instead of {@link #names() names}.
 	 */
 	Class<?>[] value() default {};
 
 	/**
 	 * One or more classes to select by their fully qualified names.
-	 * <p>
-	 * May be use in conjunction with or instead of {@link #value()}.
-	 * <p>
-	 * This attribute is intended to be used when the class cannot be referenced
-	 * directly from where this annotation is used, for example, when it's not
-	 * visible due to being package-private.
+	 *
+	 * <p>May be use in conjunction with or instead of {@link #value() value}.
+	 *
+	 * <p>This attribute is intended to be used when a class cannot be referenced
+	 * directly from where this annotation is used &mdash; for example, when a
+	 * class is not visible due to being private or package-private.
 	 *
 	 * @since 1.10
 	 */
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
index 2bce97c1f43a..188385080855 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -72,26 +72,20 @@ static Stream<ClassSelector> selectClasses(Class<?>... classes) {
 		Preconditions.notNull(classes, "classes must not be null");
 		Preconditions.containsNoNullElements(classes, "Individual classes must not be null");
 
-		// @formatter:off
-		return uniqueStreamOf(classes)
-				.map(DiscoverySelectors::selectClass);
-		// @formatter:on
+		return uniqueStreamOf(classes).map(DiscoverySelectors::selectClass);
 	}
 
 	static Stream<ClassSelector> selectClasses(String... classNames) {
 		Preconditions.notNull(classNames, "classNames must not be null");
 		Preconditions.containsNoNullElements(classNames, "Individual class names must not be null");
 
-		// @formatter:off
-		return uniqueStreamOf(classNames)
-				.map(DiscoverySelectors::selectClass);
-		// @formatter:on
+		return uniqueStreamOf(classNames).map(DiscoverySelectors::selectClass);
 	}
 
-	static MethodSelector selectMethod(Class<?> clazz, String name, String parameters) {
+	static MethodSelector selectMethod(Class<?> clazz, String name, String parameterTypeNames) {
 		Preconditions.notBlank(name, "Method name must not be null or blank");
-		Preconditions.notNull(parameters, "Method parameter types must not be null");
-		return DiscoverySelectors.selectMethod(clazz, name, parameters);
+		Preconditions.notNull(parameterTypeNames, "parameter type names must not be null");
+		return DiscoverySelectors.selectMethod(clazz, name, parameterTypeNames);
 	}
 
 	static List<ModuleSelector> selectModules(String... moduleNames) {
@@ -125,8 +119,8 @@ static ClasspathResourceSelector selectClasspathResource(String classpathResourc
 		return DiscoverySelectors.selectClasspathResource(classpathResourceName, FilePosition.from(line, column));
 	}
 
-	private static <T> Stream<T> uniqueStreamOf(T[] packageNames) {
-		return Arrays.stream(packageNames).distinct();
+	private static <T> Stream<T> uniqueStreamOf(T[] elements) {
+		return Arrays.stream(elements).distinct();
 	}
 
 }

From 8eaf84e9604a0147e21e376c0ed64e168a375cd8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 30 May 2023 10:46:08 +0200
Subject: [PATCH 1351/1433] Rename getMethodParameterTypes() to
 getParameterTypeNames() in method selectors

This commit renames getMethodParameterTypes() to getParameterTypeNames()
in MethodSelector and NestedMethodSelector and deprecates the existing
getMethodParameterTypes() methods.

This is a prerequisite for #3326.

Closes #3334
---
 .../release-notes-5.10.0-RC1.adoc             |   3 +-
 .../engine/discovery/DiscoverySelectors.java  | 100 +++++++++---------
 .../engine/discovery/MethodSelector.java      |  98 ++++++++++-------
 .../discovery/NestedMethodSelector.java       |  51 +++++----
 .../tasks/DiscoveryRequestCreatorTests.java   |   4 +-
 .../discovery/DiscoverySelectorsTests.java    |  30 +++---
 .../engine/discovery/MethodSelectorTests.java |  68 +++++++++---
 7 files changed, 211 insertions(+), 143 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 73c6cf3edffa..39b36c84307a 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -19,7 +19,8 @@ JUnit repository on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
+  have been deprecated and replaced by `getParameterTypeNames()` for greater clarity.
 
 ==== New Features and Improvements
 
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index f020620827cb..2774eb424397 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -511,50 +511,50 @@ public static MethodSelector selectMethod(String className, String methodName, C
 
 	/**
 	 * Create a {@code MethodSelector} for the supplied class name, method name,
-	 * and method parameter types.
+	 * and parameter type names.
 	 *
-	 * <p>The parameter types {@code String} is typically a comma-separated list
-	 * of atomic types, fully qualified class names, or array types; however,
+	 * <p>The parameter type names {@code String} is typically a comma-separated
+	 * list of atomic types, fully qualified class names, or array types; however,
 	 * the exact syntax depends on the underlying test engine.
 	 *
 	 * @param className the fully qualified name of the class in which the method
 	 * is declared, or a subclass thereof; never {@code null} or blank
 	 * @param methodName the name of the method to select; never {@code null} or blank
-	 * @param methodParameterTypes the method parameter types as a single string; never
-	 * {@code null} though potentially an empty string if the method does not accept
-	 * arguments
+	 * @param parameterTypeNames the parameter type names as a single string; never
+	 * {@code null} though potentially an empty string if the method does not declare
+	 * parameters
 	 * @see MethodSelector
 	 */
-	public static MethodSelector selectMethod(String className, String methodName, String methodParameterTypes) {
-		return selectMethod(className, methodName, methodParameterTypes, null);
+	public static MethodSelector selectMethod(String className, String methodName, String parameterTypeNames) {
+		return selectMethod(className, methodName, parameterTypeNames, (ClassLoader) null);
 	}
 
 	/**
 	 * Create a {@code MethodSelector} for the supplied class name, method name,
-	 * method parameter types, and class loader.
+	 * parameter type names, and class loader.
 	 *
-	 * <p>The parameter types {@code String} is typically a comma-separated list
-	 * of atomic types, fully qualified class names, or array types; however,
+	 * <p>The parameter type names {@code String} is typically a comma-separated
+	 * list of atomic types, fully qualified class names, or array types; however,
 	 * the exact syntax depends on the underlying test engine.
 	 *
 	 * @param className the fully qualified name of the class in which the method
 	 * is declared, or a subclass thereof; never {@code null} or blank
 	 * @param methodName the name of the method to select; never {@code null} or blank
-	 * @param methodParameterTypes the method parameter types as a single string; never
-	 * {@code null} though potentially an empty string if the method does not accept
-	 * arguments
+	 * @param parameterTypeNames the parameter type names as a single string; never
+	 * {@code null} though potentially an empty string if the method does not declare
+	 * any parameters
 	 * @param classLoader the class loader to use to load the class, or {@code null}
 	 * to signal that the default {@code ClassLoader} should be used
 	 * @since 1.10
 	 * @see MethodSelector
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
-	public static MethodSelector selectMethod(String className, String methodName, String methodParameterTypes,
+	public static MethodSelector selectMethod(String className, String methodName, String parameterTypeNames,
 			ClassLoader classLoader) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		Preconditions.notNull(methodParameterTypes, "Parameter types must not be null");
-		return new MethodSelector(className, methodName, methodParameterTypes.trim(), classLoader);
+		Preconditions.notNull(parameterTypeNames, "Parameter type names must not be null");
+		return new MethodSelector(className, methodName, parameterTypeNames.trim(), classLoader);
 	}
 
 	/**
@@ -571,25 +571,25 @@ public static MethodSelector selectMethod(Class<?> javaClass, String methodName)
 
 	/**
 	 * Create a {@code MethodSelector} for the supplied {@link Class}, method name,
-	 * and method parameter types.
+	 * and parameter type names.
 	 *
-	 * <p>The parameter types {@code String} is typically a comma-separated list
-	 * of atomic types, fully qualified class names, or array types; however,
+	 * <p>The parameter type names {@code String} is typically a comma-separated
+	 * list of atomic types, fully qualified class names, or array types; however,
 	 * the exact syntax depends on the underlying test engine.
 	 *
 	 * @param javaClass the class in which the method is declared, or a subclass thereof;
 	 * never {@code null}
 	 * @param methodName the name of the method to select; never {@code null} or blank
-	 * @param methodParameterTypes the method parameter types as a single string; never
-	 * {@code null} though potentially an empty string if the method does not accept
-	 * arguments
+	 * @param parameterTypeNames the parameter type names as a single string; never
+	 * {@code null} though potentially an empty string if the method does not declare
+	 * any parameters
 	 * @see MethodSelector
 	 */
-	public static MethodSelector selectMethod(Class<?> javaClass, String methodName, String methodParameterTypes) {
+	public static MethodSelector selectMethod(Class<?> javaClass, String methodName, String parameterTypeNames) {
 		Preconditions.notNull(javaClass, "Class must not be null");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		Preconditions.notNull(methodParameterTypes, "Parameter types must not be null");
-		return new MethodSelector(javaClass, methodName, methodParameterTypes.trim());
+		Preconditions.notNull(parameterTypeNames, "Parameter type names must not be null");
+		return new MethodSelector(javaClass, methodName, parameterTypeNames.trim());
 	}
 
 	/**
@@ -694,37 +694,37 @@ public static NestedMethodSelector selectNestedMethod(List<String> enclosingClas
 
 	/**
 	 * Create a {@code NestedMethodSelector} for the supplied nested class name, method name,
-	 * and method parameter types.
+	 * and parameter type names.
 	 *
-	 * <p>The parameter types {@code String} is typically a comma-separated list
-	 * of atomic types, fully qualified class names, or array types; however,
+	 * <p>The parameter type names {@code String} is typically a comma-separated
+	 * list of atomic types, fully qualified class names, or array types; however,
 	 * the exact syntax depends on the underlying test engine.
 	 *
 	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
 	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
 	 * @param methodName the name of the method to select; never {@code null} or blank
-	 * @param methodParameterTypes the method parameter types as a single string; never
-	 * {@code null} though potentially an empty string if the method does not accept
-	 * arguments
+	 * @param parameterTypeNames the parameter type names as a single string; never
+	 * {@code null} though potentially an empty string if the method does not declare
+	 * parameters
 	 * @since 1.6
 	 * @see NestedMethodSelector
 	 */
 	@API(status = STABLE, since = "1.6")
 	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
-			String methodName, String methodParameterTypes) {
-		return selectNestedMethod(enclosingClassNames, nestedClassName, methodName, methodParameterTypes, null);
+			String methodName, String parameterTypeNames) {
+		return selectNestedMethod(enclosingClassNames, nestedClassName, methodName, parameterTypeNames, null);
 	}
 
 	/**
 	 * Create a {@code NestedMethodSelector} for the supplied nested class name, method name,
-	 * method parameter types, and class loader.
+	 * parameter type names, and class loader.
 	 *
 	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
 	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
 	 * @param methodName the name of the method to select; never {@code null} or blank
-	 * @param methodParameterTypes the method parameter types as a single string; never
-	 * {@code null} though potentially an empty string if the method does not accept
-	 * arguments
+	 * @param parameterTypeNames the parameter type names as a single string; never
+	 * {@code null} though potentially an empty string if the method does not declare
+	 * parameters
 	 * @param classLoader the class loader to use to load the method's declaring
 	 * class, or {@code null} to signal that the default {@code ClassLoader}
 	 * should be used
@@ -733,13 +733,13 @@ public static NestedMethodSelector selectNestedMethod(List<String> enclosingClas
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
 	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
-			String methodName, String methodParameterTypes, ClassLoader classLoader) {
+			String methodName, String parameterTypeNames, ClassLoader classLoader) {
 
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		Preconditions.notNull(methodParameterTypes, "Parameter types must not be null");
-		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, methodParameterTypes,
+		Preconditions.notNull(parameterTypeNames, "Parameter types must not be null");
+		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, parameterTypeNames,
 			classLoader);
 	}
 
@@ -764,30 +764,30 @@ public static NestedMethodSelector selectNestedMethod(List<Class<?>> enclosingCl
 
 	/**
 	 * Create a {@code NestedMethodSelector} for the supplied {@link Class}, method name,
-	 * and method parameter types.
+	 * and parameter type names.
 	 *
-	 * <p>The parameter types {@code String} is typically a comma-separated list
-	 * of atomic types, fully qualified class names, or array types; however,
+	 * <p>The parameter type names {@code String} is typically a comma-separated
+	 * list of atomic types, fully qualified class names, or array types; however,
 	 * the exact syntax depends on the underlying test engine.
 	 *
 	 * @param enclosingClasses the path to the nested class to select; never {@code null} or empty
 	 * @param nestedClass the nested class to select; never {@code null}
 	 * @param methodName the name of the method to select; never {@code null} or blank
-	 * @param methodParameterTypes the method parameter types as a single string; never
-	 * {@code null} though potentially an empty string if the method does not accept
-	 * arguments
+	 * @param parameterTypeNames the parameter type names as a single string; never
+	 * {@code null} though potentially an empty string if the method does not declare
+	 * parameters
 	 * @since 1.6
 	 * @see NestedMethodSelector
 	 */
 	@API(status = STABLE, since = "1.6")
 	public static NestedMethodSelector selectNestedMethod(List<Class<?>> enclosingClasses, Class<?> nestedClass,
-			String methodName, String methodParameterTypes) {
+			String methodName, String parameterTypeNames) {
 
 		Preconditions.notEmpty(enclosingClasses, "Enclosing classes must not be null or empty");
 		Preconditions.notNull(nestedClass, "Nested class must not be null");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		Preconditions.notNull(methodParameterTypes, "Parameter types must not be null");
-		return new NestedMethodSelector(enclosingClasses, nestedClass, methodName, methodParameterTypes);
+		Preconditions.notNull(parameterTypeNames, "Parameter types must not be null");
+		return new NestedMethodSelector(enclosingClasses, nestedClass, methodName, parameterTypeNames);
 	}
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 43b6716c6359..58bd420bf5fa 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.discovery;
 
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
@@ -58,32 +59,27 @@ public class MethodSelector implements DiscoverySelector {
 	private final ClassLoader classLoader;
 	private final String className;
 	private final String methodName;
-	private final String methodParameterTypes;
+	private final String parameterTypeNames;
 
-	private Class<?> javaClass;
-	private Method javaMethod;
+	private volatile Class<?> javaClass;
+	private volatile Method javaMethod;
 
-	MethodSelector(String className, String methodName, ClassLoader classLoader) {
-		this(className, methodName, "", classLoader);
-	}
-
-	MethodSelector(String className, String methodName, String methodParameterTypes, ClassLoader classLoader) {
+	/**
+	 * @since 1.10
+	 */
+	MethodSelector(String className, String methodName, String parameterTypeNames, ClassLoader classLoader) {
 		this.classLoader = classLoader;
 		this.className = className;
 		this.methodName = methodName;
-		this.methodParameterTypes = methodParameterTypes;
-	}
-
-	MethodSelector(Class<?> javaClass, String methodName) {
-		this(javaClass, methodName, "");
+		this.parameterTypeNames = parameterTypeNames;
 	}
 
-	MethodSelector(Class<?> javaClass, String methodName, String methodParameterTypes) {
+	MethodSelector(Class<?> javaClass, String methodName, String parameterTypeNames) {
 		this.classLoader = javaClass.getClassLoader();
 		this.javaClass = javaClass;
 		this.className = javaClass.getName();
 		this.methodName = methodName;
-		this.methodParameterTypes = methodParameterTypes;
+		this.parameterTypeNames = parameterTypeNames;
 	}
 
 	MethodSelector(Class<?> javaClass, Method method) {
@@ -92,18 +88,12 @@ public class MethodSelector implements DiscoverySelector {
 		this.className = javaClass.getName();
 		this.javaMethod = method;
 		this.methodName = method.getName();
-		this.methodParameterTypes = ClassUtils.nullSafeToString(method.getParameterTypes());
-	}
-
-	/**
-	 * Get the selected class name.
-	 */
-	public String getClassName() {
-		return this.className;
+		this.parameterTypeNames = ClassUtils.nullSafeToString(method.getParameterTypes());
 	}
 
 	/**
 	 * Get the {@link ClassLoader} used to load the specified class.
+	 * @return the {@code ClassLoader}; potentially {@code null}
 	 * @since 1.10
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
@@ -111,6 +101,13 @@ public ClassLoader getClassLoader() {
 		return this.classLoader;
 	}
 
+	/**
+	 * Get the selected class name.
+	 */
+	public String getClassName() {
+		return this.className;
+	}
+
 	/**
 	 * Get the selected method name.
 	 */
@@ -119,21 +116,41 @@ public String getMethodName() {
 	}
 
 	/**
-	 * Get the parameter types for the selected method as a {@link String},
-	 * typically a comma-separated list of primitive types, fully qualified
-	 * class names, or array types.
+	 * Get the names of parameter types for the selected method.
+	 *
+	 * <p>See {@link #getParameterTypeNames()} for details.
+	 *
+	 * @return the names of parameter types supplied to this {@code MethodSelector}
+	 * via a constructor or deduced from a {@code Method} or parameter types supplied
+	 * via a constructor; never {@code null} but potentially an empty string
+	 * @since 1.0
+	 * @see #getParameterTypes()
+	 * @deprecated since 1.10 in favor of {@link #getParameterTypeNames()}
+	 */
+	@Deprecated
+	@API(status = DEPRECATED, since = "1.10")
+	public String getMethodParameterTypes() {
+		return getParameterTypeNames();
+	}
+
+	/**
+	 * Get the names of parameter types for the selected method as a {@link String},
+	 * typically a comma-separated list of primitive types, fully qualified class
+	 * names, or array types.
 	 *
-	 * <p>Note: the parameter types are provided as a single string instead of
-	 * a collection in order to allow this selector to be used in a generic
+	 * <p>Note: the names of parameter types are provided as a single string instead
+	 * of a collection in order to allow this selector to be used in a generic
 	 * fashion by various test engines. It is therefore the responsibility of
 	 * the caller of this method to determine how to parse the returned string.
 	 *
-	 * @return the parameter types supplied to this {@code MethodSelector} via
-	 * a constructor or deduced from a {@code Method} supplied via a constructor;
-	 * never {@code null}
+	 * @return the names of parameter types supplied to this {@code MethodSelector}
+	 * via a constructor or deduced from a {@code Method} supplied via a constructor;
+	 * never {@code null} but potentially an empty string
+	 * @since 1.10
 	 */
-	public String getMethodParameterTypes() {
-		return this.methodParameterTypes;
+	@API(status = STABLE, since = "1.10")
+	public String getParameterTypeNames() {
+		return this.parameterTypeNames;
 	}
 
 	/**
@@ -178,15 +195,14 @@ private void lazyLoadJavaClass() {
 	}
 
 	private void lazyLoadJavaMethod() {
-		lazyLoadJavaClass();
-
 		if (this.javaMethod == null) {
-			if (StringUtils.isNotBlank(this.methodParameterTypes)) {
+			lazyLoadJavaClass();
+			if (StringUtils.isNotBlank(this.parameterTypeNames)) {
 				this.javaMethod = ReflectionUtils.findMethod(this.javaClass, this.methodName,
-					this.methodParameterTypes).orElseThrow(
+					this.parameterTypeNames).orElseThrow(
 						() -> new PreconditionViolationException(String.format(
 							"Could not find method with name [%s] and parameter types [%s] in class [%s].",
-							this.methodName, this.methodParameterTypes, this.javaClass.getName())));
+							this.methodName, this.parameterTypeNames, this.javaClass.getName())));
 			}
 			else {
 				this.javaMethod = ReflectionUtils.findMethod(this.javaClass, this.methodName).orElseThrow(
@@ -212,7 +228,7 @@ public boolean equals(Object o) {
 		MethodSelector that = (MethodSelector) o;
 		return Objects.equals(this.className, that.className)//
 				&& Objects.equals(this.methodName, that.methodName)//
-				&& Objects.equals(this.methodParameterTypes, that.methodParameterTypes);
+				&& Objects.equals(this.parameterTypeNames, that.parameterTypeNames);
 	}
 
 	/**
@@ -221,7 +237,7 @@ public boolean equals(Object o) {
 	@API(status = STABLE, since = "1.3")
 	@Override
 	public int hashCode() {
-		return Objects.hash(this.className, this.methodName, this.methodParameterTypes);
+		return Objects.hash(this.className, this.methodName, this.parameterTypeNames);
 	}
 
 	@Override
@@ -230,7 +246,7 @@ public String toString() {
 		return new ToStringBuilder(this)
 				.append("className", getClassName())
 				.append("methodName", getMethodName())
-				.append("methodParameterTypes", getMethodParameterTypes())
+				.append("parameterTypes", getParameterTypeNames())
 				.append("classLoader", getClassLoader())
 				.toString();
 		// @formatter:on
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index bb2ca9dc2bdd..aeb6f28fac4d 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.discovery;
 
+import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
@@ -57,14 +58,9 @@ public class NestedMethodSelector implements DiscoverySelector {
 	private final MethodSelector methodSelector;
 
 	NestedMethodSelector(List<String> enclosingClassNames, String nestedClassName, String methodName,
-			ClassLoader classLoader) {
-		this(enclosingClassNames, nestedClassName, methodName, "", classLoader);
-	}
-
-	NestedMethodSelector(List<String> enclosingClassNames, String nestedClassName, String methodName,
-			String methodParameterTypes, ClassLoader classLoader) {
+			String parameterTypeNames, ClassLoader classLoader) {
 		this.nestedClassSelector = new NestedClassSelector(enclosingClassNames, nestedClassName, classLoader);
-		this.methodSelector = new MethodSelector(nestedClassName, methodName, methodParameterTypes, classLoader);
+		this.methodSelector = new MethodSelector(nestedClassName, methodName, parameterTypeNames, classLoader);
 	}
 
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName) {
@@ -72,9 +68,9 @@ public class NestedMethodSelector implements DiscoverySelector {
 	}
 
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName,
-			String methodParameterTypes) {
+			String parameterTypeNames) {
 		this.nestedClassSelector = new NestedClassSelector(enclosingClasses, nestedClass);
-		this.methodSelector = new MethodSelector(nestedClass, methodName, methodParameterTypes);
+		this.methodSelector = new MethodSelector(nestedClass, methodName, parameterTypeNames);
 	}
 
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, Method method) {
@@ -151,21 +147,40 @@ public Method getMethod() {
 	}
 
 	/**
-	 * Get the parameter types for the selected method as a {@link String},
+	 * Get the names of parameter types for the selected method.
+	 *
+	 * <p>See {@link #getParameterTypeNames()} for details.
+	 *
+	 * @return the names of parameter types supplied to this {@code NestedMethodSelector}
+	 * via a constructor or deduced from a {@code Method} supplied via a constructor;
+	 * never {@code null} but potentially an empty string
+	 * @since 1.6
+	 * @deprecated since 1.10 in favor or {@link #getParameterTypeNames()}
+	 */
+	@Deprecated
+	@API(status = DEPRECATED, since = "1.10")
+	public String getMethodParameterTypes() {
+		return getParameterTypeNames();
+	}
+
+	/**
+	 * Get the names of parameter types for the selected method as a {@link String},
 	 * typically a comma-separated list of primitive types, fully qualified
 	 * class names, or array types.
 	 *
-	 * <p>Note: the parameter types are provided as a single string instead of
-	 * a collection in order to allow this selector to be used in a generic
+	 * <p>Note: the names of parameter types are provided as a single string instead
+	 * of a collection in order to allow this selector to be used in a generic
 	 * fashion by various test engines. It is therefore the responsibility of
 	 * the caller of this method to determine how to parse the returned string.
 	 *
-	 * @return the parameter types supplied to this {@code NestedMethodSelector}
-	 * via a constructor or deduced from a {@code Method} supplied via a
-	 * constructor; never {@code null}
+	 * @return the names of parameter types supplied to this {@code NestedMethodSelector}
+	 * via a constructor or deduced from a {@code Method} supplied via a constructor;
+	 * never {@code null} but potentially an empty string
+	 * @since 1.10
 	 */
-	public String getMethodParameterTypes() {
-		return this.methodSelector.getMethodParameterTypes();
+	@API(status = STABLE, since = "1.10")
+	public String getParameterTypeNames() {
+		return this.methodSelector.getParameterTypeNames();
 	}
 
 	@Override
@@ -192,7 +207,7 @@ public String toString() {
 				.append("enclosingClassNames", getEnclosingClassNames()) //
 				.append("nestedClassName", getNestedClassName()) //
 				.append("methodName", getMethodName()) //
-				.append("methodParameterTypes", getMethodParameterTypes()) //
+				.append("parameterTypes", getParameterTypeNames()) //
 				.append("classLoader", getClassLoader()) //
 				.toString();
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
index 733d35f7f466..87b35ef20360 100644
--- a/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java
@@ -269,10 +269,10 @@ void propagatesMethodSelectors() {
 		assertThat(methodSelectors).hasSize(2);
 		assertThat(methodSelectors.get(0).getClassName()).isEqualTo("com.acme.Foo");
 		assertThat(methodSelectors.get(0).getMethodName()).isEqualTo("m");
-		assertThat(methodSelectors.get(0).getMethodParameterTypes()).isEmpty();
+		assertThat(methodSelectors.get(0).getParameterTypeNames()).isEmpty();
 		assertThat(methodSelectors.get(1).getClassName()).isEqualTo("com.example.Bar");
 		assertThat(methodSelectors.get(1).getMethodName()).isEqualTo("method");
-		assertThat(methodSelectors.get(1).getMethodParameterTypes()).isEqualTo("java.lang.Object");
+		assertThat(methodSelectors.get(1).getParameterTypeNames()).isEqualTo("java.lang.Object");
 	}
 
 	@Test
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index a4b1f0f3c8a0..205e16d7cd5a 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -424,7 +424,7 @@ void selectMethodByFullyQualifiedNameAndClassLoader() throws Exception {
 				assertThat(selector.getJavaClass()).isEqualTo(clazz);
 				assertThat(selector.getClassName()).isEqualTo(clazz.getName());
 				assertThat(selector.getMethodName()).isEqualTo(method.getName());
-				assertThat(selector.getMethodParameterTypes()).isEmpty();
+				assertThat(selector.getParameterTypeNames()).isEmpty();
 			}
 		}
 
@@ -552,7 +552,7 @@ void selectMethodByFullyQualifiedNameEndingInOpeningParenthesis() {
 			var selector = selectMethod(fqmn);
 			assertEquals(className, selector.getClassName());
 			assertEquals(methodName, selector.getMethodName());
-			assertEquals("", selector.getMethodParameterTypes());
+			assertEquals("", selector.getParameterTypeNames());
 		}
 
 		/**
@@ -567,7 +567,7 @@ void selectMethodByFullyQualifiedNameContainingHashtags() {
 			var selector = selectMethod(fqmn);
 			assertEquals(className, selector.getClassName());
 			assertEquals(methodName, selector.getMethodName());
-			assertEquals("", selector.getMethodParameterTypes());
+			assertEquals("", selector.getParameterTypeNames());
 		}
 
 		/**
@@ -583,7 +583,7 @@ void selectMethodByFullyQualifiedNameContainingHashtagsAndWithParameterList() {
 			var selector = selectMethod(fqmn);
 			assertEquals(className, selector.getClassName());
 			assertEquals(methodName, selector.getMethodName());
-			assertEquals(methodParameters, selector.getMethodParameterTypes());
+			assertEquals(methodParameters, selector.getParameterTypeNames());
 		}
 
 		/**
@@ -599,7 +599,7 @@ void selectMethodByFullyQualifiedNameContainingParentheses() {
 
 			assertEquals(className, selector.getClassName());
 			assertEquals(methodName, selector.getMethodName());
-			assertEquals("", selector.getMethodParameterTypes());
+			assertEquals("", selector.getParameterTypeNames());
 		}
 
 		/**
@@ -615,7 +615,7 @@ void selectMethodByFullyQualifiedNameEndingWithParentheses() {
 
 			assertEquals(className, selector.getClassName());
 			assertEquals(methodName, selector.getMethodName());
-			assertEquals("", selector.getMethodParameterTypes());
+			assertEquals("", selector.getParameterTypeNames());
 		}
 
 		/**
@@ -632,7 +632,7 @@ void selectMethodByFullyQualifiedNameEndingWithParenthesesAndWithParameterList()
 
 			assertEquals(className, selector.getClassName());
 			assertEquals(methodName, selector.getMethodName());
-			assertEquals(methodParameters, selector.getMethodParameterTypes());
+			assertEquals(methodParameters, selector.getParameterTypeNames());
 		}
 
 		private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method) {
@@ -641,7 +641,7 @@ private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method metho
 			assertEquals(clazz, selector.getJavaClass());
 			assertEquals(clazz.getName(), selector.getClassName());
 			assertEquals(method.getName(), selector.getMethodName());
-			assertEquals("", selector.getMethodParameterTypes());
+			assertEquals("", selector.getParameterTypeNames());
 		}
 
 		private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method, Class<?> parameterType,
@@ -652,7 +652,7 @@ private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method metho
 			assertEquals(clazz, selector.getJavaClass());
 			assertEquals(clazz.getName(), selector.getClassName());
 			assertEquals(method.getName(), selector.getMethodName());
-			assertEquals(expectedParameterTypes, selector.getMethodParameterTypes());
+			assertEquals(expectedParameterTypes, selector.getParameterTypeNames());
 		}
 
 		private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method method, String parameterName,
@@ -663,7 +663,7 @@ private void assertSelectMethodByFullyQualifiedName(Class<?> clazz, Method metho
 			assertEquals(clazz, selector.getJavaClass());
 			assertEquals(clazz.getName(), selector.getClassName());
 			assertEquals(method.getName(), selector.getMethodName());
-			assertEquals(expectedParameterTypes, selector.getMethodParameterTypes());
+			assertEquals(expectedParameterTypes, selector.getParameterTypeNames());
 		}
 
 		@Test
@@ -675,7 +675,7 @@ void selectMethodByClassAndMethodName() throws Exception {
 			assertEquals(testClass().getName(), selector.getClassName());
 			assertEquals(method, selector.getJavaMethod());
 			assertEquals("myTest", selector.getMethodName());
-			assertEquals("", selector.getMethodParameterTypes());
+			assertEquals("", selector.getParameterTypeNames());
 		}
 
 		@Test
@@ -689,7 +689,7 @@ void selectMethodByClassMethodNameAndParameterTypeNames() throws Exception {
 			assertThat(selector.getJavaClass()).isEqualTo(testClass);
 			assertThat(selector.getMethodName()).isEqualTo("myTest");
 			assertThat(selector.getJavaMethod()).isEqualTo(method);
-			assertThat(selector.getMethodParameterTypes()).isEqualTo("java.lang.String, boolean[]");
+			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String, boolean[]");
 		}
 
 		@Test
@@ -703,7 +703,7 @@ void selectMethodWithParametersByMethodReference() throws Exception {
 			assertThat(selector.getJavaClass()).isEqualTo(testClass);
 			assertThat(selector.getMethodName()).isEqualTo("myTest");
 			assertThat(selector.getJavaMethod()).isEqualTo(method);
-			assertThat(selector.getMethodParameterTypes()).isEqualTo("java.lang.String, [Z");
+			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String, [Z");
 		}
 
 		@Test
@@ -721,7 +721,7 @@ void selectMethodByClassAndNameForSpockSpec() {
 			var selector = selectMethod(className, methodName);
 			assertEquals(className, selector.getClassName());
 			assertEquals(methodName, selector.getMethodName());
-			assertEquals("", selector.getMethodParameterTypes());
+			assertEquals("", selector.getParameterTypeNames());
 		}
 
 		private static Class<?> testClass() {
@@ -876,7 +876,7 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypesAndCl
 				assertThat(selector.getNestedClass().getClassLoader()).isSameAs(testClassLoader);
 
 				assertThat(selector.getMethodName()).isEqualTo(methodName);
-				assertThat(selector.getMethodParameterTypes()).isEqualTo(String.class.getName());
+				assertThat(selector.getParameterTypeNames()).isEqualTo(String.class.getName());
 			}
 		}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 1a128b23f3a9..6d67ecf1c960 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -11,10 +11,13 @@
 package org.junit.platform.engine.discovery;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.AbstractEqualsAndHashCodeTests;
+import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**
@@ -25,34 +28,67 @@
  */
 class MethodSelectorTests extends AbstractEqualsAndHashCodeTests {
 
+	private static final String TEST_CASE_NAME = TestCase.class.getName();
+
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new MethodSelector("TestClass", "method", "int, boolean", null);
-		var selector2 = new MethodSelector("TestClass", "method", "int, boolean", null);
-
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", "int", null));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", (ClassLoader) null));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", "int, boolean", null));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", (ClassLoader) null));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("X", "method", "int, boolean", null));
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("X", "method", (ClassLoader) null));
+		var selector1 = new MethodSelector(TEST_CASE_NAME, "method", "int, boolean", null);
+		var selector2 = new MethodSelector(TEST_CASE_NAME, "method", "int, boolean", null);
+		var selector3 = new MethodSelector(TestCase.class, "method", "int, boolean");
+
+		Stream.of(selector2, selector3).forEach(selector -> {
+			assertEqualsAndHashCode(selector1, selector, new MethodSelector(TEST_CASE_NAME, "method", "int", null));
+			assertEqualsAndHashCode(selector1, selector,
+				new MethodSelector(TEST_CASE_NAME, "method", "", (ClassLoader) null));
+			assertEqualsAndHashCode(selector1, selector, new MethodSelector(TEST_CASE_NAME, "X", "int, boolean", null));
+			assertEqualsAndHashCode(selector1, selector,
+				new MethodSelector(TEST_CASE_NAME, "X", "", (ClassLoader) null));
+			assertEqualsAndHashCode(selector1, selector, new MethodSelector("X", "method", "int, boolean", null));
+			assertEqualsAndHashCode(selector1, selector, new MethodSelector("X", "method", "", (ClassLoader) null));
+		});
 	}
 
 	@Test
-	void preservesOriginalExceptionWhenTryingToLoadClass() {
-		var selector = new MethodSelector("TestClass", "method", "int, boolean", (ClassLoader) null);
+	void preservesOriginalExceptionWhenTryingToLoadJavaClass() {
+		var selector = new MethodSelector("org.example.BogusClass", "method", "int, boolean", (ClassLoader) null);
 
-		var e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
+		assertThat(selector.getClassName()).isEqualTo("org.example.BogusClass");
+		assertThat(selector.getMethodName()).isEqualTo("method");
+		assertThat(selector.getParameterTypeNames()).isEqualTo("int, boolean");
 
-		assertThat(e).hasMessage("Could not load class with name: TestClass").hasCauseInstanceOf(
-			ClassNotFoundException.class);
+		assertThatExceptionOfType(PreconditionViolationException.class)//
+				.isThrownBy(selector::getJavaClass)//
+				.withMessage("Could not load class with name: org.example.BogusClass")//
+				.withCauseInstanceOf(ClassNotFoundException.class);
+	}
+
+	@Test
+	void preservesOriginalExceptionWhenTryingToLoadClassForParameterType() {
+		var selector = new MethodSelector(TEST_CASE_NAME, "method", "int[], org.example.Bogus", (ClassLoader) null);
+
+		assertThat(selector.getClassName()).isEqualTo(TEST_CASE_NAME);
+		assertThat(selector.getMethodName()).isEqualTo("method");
+		assertThat(selector.getParameterTypeNames()).isEqualTo("int[], org.example.Bogus");
+
+		assertThatExceptionOfType(JUnitException.class)//
+				.isThrownBy(selector::getJavaMethod)//
+				.withMessage("Failed to load parameter type [org.example.Bogus] for method [method] in class [%s].",
+					TEST_CASE_NAME)//
+				.withCauseInstanceOf(ClassNotFoundException.class);
 	}
 
 	@Test
 	void usesClassClassLoader() {
-		var selector = new MethodSelector(getClass(), "usesClassClassLoader");
+		var selector = new MethodSelector(getClass(), "usesClassClassLoader", "");
 
 		assertThat(selector.getClassLoader()).isNotNull().isSameAs(getClass().getClassLoader());
 	}
 
+	private static class TestCase {
+
+		@SuppressWarnings("unused")
+		void method(int num, boolean flag) {
+		}
+	}
+
 }

From b34cc87b7bbaab1a5dd7614953dd72c8fda43742 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 05:58:55 +0000
Subject: [PATCH 1352/1433] Bump com.gradle:gradle-enterprise-gradle-plugin
 from 3.13.2 to 3.13.3

Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.13.2 to 3.13.3.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bf556db5994e..854aa67f2bc0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.158" }
 commons-io = { module = "commons-io:commons-io", version = "2.12.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.10" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
-gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.2" }
+gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.3" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.18.0" }

From 2ca71a5fc6dfb548593840afa2c9cbb389725e64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 05:59:05 +0000
Subject: [PATCH 1353/1433] Bump io.github.classgraph:classgraph from 4.8.158
 to 4.8.160

Bumps [io.github.classgraph:classgraph](https://github.com/classgraph/classgraph) from 4.8.158 to 4.8.160.
- [Release notes](https://github.com/classgraph/classgraph/releases)
- [Commits](https://github.com/classgraph/classgraph/compare/classgraph-4.8.158...classgraph-4.8.160)

---
updated-dependencies:
- dependency-name: io.github.classgraph:classgraph
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 854aa67f2bc0..8d0942d85822 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.0.1"
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
-classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.158" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.160" }
 commons-io = { module = "commons-io:commons-io", version = "2.12.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.10" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }

From 895d17c1c9074f582a1da238f3b57a39b520b4f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 May 2023 05:59:22 +0000
Subject: [PATCH 1354/1433] Bump com.diffplug.spotless:spotless-plugin-gradle
 from 6.18.0 to 6.19.0

Bumps [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.18.0 to 6.19.0.
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/gradle/6.18.0...gradle/6.19.0)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-plugin-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8d0942d85822..7f2087e4a621 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", vers
 gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.3" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
-gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.18.0" }
+gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.19.0" }
 gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionsPlugin" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.12" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }

From 300c6b65e25729e111b0ea468fcbfc751adb98ea Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 30 May 2023 11:54:17 +0200
Subject: [PATCH 1355/1433] Declare ClassLoader param 1st in DiscoverySelector
 methods & constructors

This commit declares ClassLoader parameters first in DiscoverySelector
methods and constructors.

This is technically a breaking change for JUnit Platform 1.10 M1 but
not for 1.9.x or previous versions, since the ClassLoader parameters
were first introduced in 1.10 M1.

Closes #3335
---
 .../release-notes-5.10.0-RC1.adoc             |  3 +
 .../engine/discovery/ClassSelector.java       | 20 ++---
 .../engine/discovery/DiscoverySelectors.java  | 79 ++++++++++---------
 .../engine/discovery/MethodSelector.java      |  3 +-
 .../engine/discovery/NestedClassSelector.java | 14 ++--
 .../discovery/NestedMethodSelector.java       |  4 +-
 .../engine/discovery/ClassSelectorTests.java  |  8 +-
 .../discovery/DiscoverySelectorsTests.java    | 14 ++--
 .../engine/discovery/MethodSelectorTests.java | 20 ++---
 .../discovery/NestedClassSelectorTests.java   | 18 ++---
 10 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 39b36c84307a..42f1352f5234 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -21,6 +21,9 @@ JUnit repository on GitHub.
 
 * The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
   have been deprecated and replaced by `getParameterTypeNames()` for greater clarity.
+* Methods in `DiscoverySelectors` that accept a `ClassLoader` now declare the
+  `ClassLoader` as the first parameter. This is only a breaking change for code that
+  relies on the new methods introduced in JUnit Platform 1.10 M1.
 
 ==== New Features and Improvements
 
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
index 70937471e622..284c1ed4ff81 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java
@@ -44,12 +44,12 @@
 @API(status = STABLE, since = "1.0")
 public class ClassSelector implements DiscoverySelector {
 
-	private final String className;
 	private final ClassLoader classLoader;
+	private final String className;
 
 	private Class<?> javaClass;
 
-	ClassSelector(String className, ClassLoader classLoader) {
+	ClassSelector(ClassLoader classLoader, String className) {
 		this.className = className;
 		this.classLoader = classLoader;
 	}
@@ -60,15 +60,10 @@ public class ClassSelector implements DiscoverySelector {
 		this.javaClass = javaClass;
 	}
 
-	/**
-	 * Get the selected class name.
-	 */
-	public String getClassName() {
-		return this.className;
-	}
-
 	/**
 	 * Get the {@link ClassLoader} used to load the selected class.
+	 *
+	 * @return the {@code ClassLoader}; potentially {@code null}
 	 * @since 1.10
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
@@ -76,6 +71,13 @@ public ClassLoader getClassLoader() {
 		return this.classLoader;
 	}
 
+	/**
+	 * Get the selected class name.
+	 */
+	public String getClassName() {
+		return this.className;
+	}
+
 	/**
 	 * Get the selected {@link Class}.
 	 *
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 2774eb424397..322c8c0cc1f5 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -389,23 +389,23 @@ public static ClassSelector selectClass(Class<?> clazz) {
 	 * @see ClassSelector
 	 */
 	public static ClassSelector selectClass(String className) {
-		return selectClass(className, (ClassLoader) null);
+		return selectClass((ClassLoader) null, className);
 	}
 
 	/**
 	 * Create a {@code ClassSelector} for the supplied class name and class loader.
 	 *
-	 * @param className the fully qualified name of the class to select; never
-	 * {@code null} or blank
 	 * @param classLoader the class loader to use to load the class, or {@code null}
 	 * to signal that the default {@code ClassLoader} should be used
+	 * @param className the fully qualified name of the class to select; never
+	 * {@code null} or blank
 	 * @since 1.10
 	 * @see ClassSelector
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
-	public static ClassSelector selectClass(String className, ClassLoader classLoader) {
+	public static ClassSelector selectClass(ClassLoader classLoader, String className) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
-		return new ClassSelector(className, classLoader);
+		return new ClassSelector(classLoader, className);
 	}
 
 	/**
@@ -451,7 +451,7 @@ public static ClassSelector selectClass(String className, ClassLoader classLoade
 	 * @see MethodSelector
 	 */
 	public static MethodSelector selectMethod(String fullyQualifiedMethodName) throws PreconditionViolationException {
-		return selectMethod(fullyQualifiedMethodName, (ClassLoader) null);
+		return selectMethod((ClassLoader) null, fullyQualifiedMethodName);
 	}
 
 	/**
@@ -461,20 +461,20 @@ public static MethodSelector selectMethod(String fullyQualifiedMethodName) throw
 	 * <p>See {@link #selectMethod(String)} for the supported formats for a
 	 * fully qualified method name.
 	 *
-	 * @param fullyQualifiedMethodName the fully qualified name of the method to
-	 * select; never {@code null} or blank
 	 * @param classLoader the class loader to use to load the method's declaring
 	 * class, or {@code null} to signal that the default {@code ClassLoader}
 	 * should be used
+	 * @param fullyQualifiedMethodName the fully qualified name of the method to
+	 * select; never {@code null} or blank
 	 * @since 1.10
 	 * @see #selectMethod(String)
 	 * @see MethodSelector
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
-	public static MethodSelector selectMethod(String fullyQualifiedMethodName, ClassLoader classLoader)
+	public static MethodSelector selectMethod(ClassLoader classLoader, String fullyQualifiedMethodName)
 			throws PreconditionViolationException {
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
-		return selectMethod(methodParts[0], methodParts[1], methodParts[2], classLoader);
+		return selectMethod(classLoader, methodParts[0], methodParts[1], methodParts[2]);
 	}
 
 	/**
@@ -487,26 +487,26 @@ public static MethodSelector selectMethod(String fullyQualifiedMethodName, Class
 	 * @see MethodSelector
 	 */
 	public static MethodSelector selectMethod(String className, String methodName) {
-		return selectMethod(className, methodName, (ClassLoader) null);
+		return selectMethod((ClassLoader) null, className, methodName);
 	}
 
 	/**
 	 * Create a {@code MethodSelector} for the supplied class name, method name,
 	 * and class loader.
 	 *
+	 * @param classLoader the class loader to use to load the class, or {@code null}
+	 * to signal that the default {@code ClassLoader} should be used
 	 * @param className the fully qualified name of the class in which the method
 	 * is declared, or a subclass thereof; never {@code null} or blank
 	 * @param methodName the name of the method to select; never {@code null} or blank
-	 * @param classLoader the class loader to use to load the class, or {@code null}
-	 * to signal that the default {@code ClassLoader} should be used
 	 * @since 1.10
 	 * @see MethodSelector
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
-	public static MethodSelector selectMethod(String className, String methodName, ClassLoader classLoader) {
+	public static MethodSelector selectMethod(ClassLoader classLoader, String className, String methodName) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new MethodSelector(className, methodName, "", classLoader);
+		return new MethodSelector(classLoader, className, methodName, "");
 	}
 
 	/**
@@ -526,7 +526,7 @@ public static MethodSelector selectMethod(String className, String methodName, C
 	 * @see MethodSelector
 	 */
 	public static MethodSelector selectMethod(String className, String methodName, String parameterTypeNames) {
-		return selectMethod(className, methodName, parameterTypeNames, (ClassLoader) null);
+		return selectMethod((ClassLoader) null, className, methodName, parameterTypeNames);
 	}
 
 	/**
@@ -537,24 +537,24 @@ public static MethodSelector selectMethod(String className, String methodName, S
 	 * list of atomic types, fully qualified class names, or array types; however,
 	 * the exact syntax depends on the underlying test engine.
 	 *
+	 * @param classLoader the class loader to use to load the class, or {@code null}
+	 * to signal that the default {@code ClassLoader} should be used
 	 * @param className the fully qualified name of the class in which the method
 	 * is declared, or a subclass thereof; never {@code null} or blank
 	 * @param methodName the name of the method to select; never {@code null} or blank
 	 * @param parameterTypeNames the parameter type names as a single string; never
 	 * {@code null} though potentially an empty string if the method does not declare
 	 * any parameters
-	 * @param classLoader the class loader to use to load the class, or {@code null}
-	 * to signal that the default {@code ClassLoader} should be used
 	 * @since 1.10
 	 * @see MethodSelector
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
-	public static MethodSelector selectMethod(String className, String methodName, String parameterTypeNames,
-			ClassLoader classLoader) {
+	public static MethodSelector selectMethod(ClassLoader classLoader, String className, String methodName,
+			String parameterTypeNames) {
 		Preconditions.notBlank(className, "Class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
 		Preconditions.notNull(parameterTypeNames, "Parameter type names must not be null");
-		return new MethodSelector(className, methodName, parameterTypeNames.trim(), classLoader);
+		return new MethodSelector(classLoader, className, methodName, parameterTypeNames.trim());
 	}
 
 	/**
@@ -633,26 +633,26 @@ public static NestedClassSelector selectNestedClass(List<Class<?>> enclosingClas
 	 */
 	@API(status = STABLE, since = "1.6")
 	public static NestedClassSelector selectNestedClass(List<String> enclosingClassNames, String nestedClassName) {
-		return selectNestedClass(enclosingClassNames, nestedClassName, (ClassLoader) null);
+		return selectNestedClass((ClassLoader) null, enclosingClassNames, nestedClassName);
 	}
 
 	/**
 	 * Create a {@code NestedClassSelector} for the supplied class name, its enclosing
 	 * classes' names, and class loader.
 	 *
-	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
-	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
 	 * @param classLoader the class loader to use to load the enclosing and nested classes, or
 	 * {@code null} to signal that the default {@code ClassLoader} should be used
+	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
+	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
 	 * @since 1.10
 	 * @see NestedClassSelector
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
-	public static NestedClassSelector selectNestedClass(List<String> enclosingClassNames, String nestedClassName,
-			ClassLoader classLoader) {
+	public static NestedClassSelector selectNestedClass(ClassLoader classLoader, List<String> enclosingClassNames,
+			String nestedClassName) {
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
-		return new NestedClassSelector(enclosingClassNames, nestedClassName, classLoader);
+		return new NestedClassSelector(classLoader, enclosingClassNames, nestedClassName);
 	}
 
 	/**
@@ -667,25 +667,25 @@ public static NestedClassSelector selectNestedClass(List<String> enclosingClassN
 	@API(status = STABLE, since = "1.6")
 	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
 			String methodName) {
-		return selectNestedMethod(enclosingClassNames, nestedClassName, methodName, (ClassLoader) null);
+		return selectNestedMethod((ClassLoader) null, enclosingClassNames, nestedClassName, methodName);
 	}
 
 	/**
 	 * Create a {@code NestedMethodSelector} for the supplied nested class name, method name,
 	 * and class loader.
 	 *
-	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
-	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
-	 * @param methodName the name of the method to select; never {@code null} or blank
 	 * @param classLoader the class loader to use to load the method's declaring
 	 * class, or {@code null} to signal that the default {@code ClassLoader}
 	 * should be used
+	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
+	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
+	 * @param methodName the name of the method to select; never {@code null} or blank
 	 * @since 1.10
 	 * @see NestedMethodSelector
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
-	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
-			String methodName, ClassLoader classLoader) throws PreconditionViolationException {
+	public static NestedMethodSelector selectNestedMethod(ClassLoader classLoader, List<String> enclosingClassNames,
+			String nestedClassName, String methodName) throws PreconditionViolationException {
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
@@ -712,28 +712,29 @@ public static NestedMethodSelector selectNestedMethod(List<String> enclosingClas
 	@API(status = STABLE, since = "1.6")
 	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
 			String methodName, String parameterTypeNames) {
-		return selectNestedMethod(enclosingClassNames, nestedClassName, methodName, parameterTypeNames, null);
+		return selectNestedMethod((ClassLoader) null, enclosingClassNames, nestedClassName, methodName,
+			parameterTypeNames);
 	}
 
 	/**
 	 * Create a {@code NestedMethodSelector} for the supplied nested class name, method name,
 	 * parameter type names, and class loader.
 	 *
+	 * @param classLoader the class loader to use to load the method's declaring
+	 * class, or {@code null} to signal that the default {@code ClassLoader}
+	 * should be used
 	 * @param enclosingClassNames the names of the enclosing classes; never {@code null} or empty
 	 * @param nestedClassName the name of the nested class to select; never {@code null} or blank
 	 * @param methodName the name of the method to select; never {@code null} or blank
 	 * @param parameterTypeNames the parameter type names as a single string; never
 	 * {@code null} though potentially an empty string if the method does not declare
 	 * parameters
-	 * @param classLoader the class loader to use to load the method's declaring
-	 * class, or {@code null} to signal that the default {@code ClassLoader}
-	 * should be used
 	 * @since 1.10
 	 * @see #selectNestedMethod(List, String, String, String)
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
-	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
-			String methodName, String parameterTypeNames, ClassLoader classLoader) {
+	public static NestedMethodSelector selectNestedMethod(ClassLoader classLoader, List<String> enclosingClassNames,
+			String nestedClassName, String methodName, String parameterTypeNames) {
 
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 58bd420bf5fa..293b65eee5a3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -67,7 +67,7 @@ public class MethodSelector implements DiscoverySelector {
 	/**
 	 * @since 1.10
 	 */
-	MethodSelector(String className, String methodName, String parameterTypeNames, ClassLoader classLoader) {
+	MethodSelector(ClassLoader classLoader, String className, String methodName, String parameterTypeNames) {
 		this.classLoader = classLoader;
 		this.className = className;
 		this.methodName = methodName;
@@ -93,6 +93,7 @@ public class MethodSelector implements DiscoverySelector {
 
 	/**
 	 * Get the {@link ClassLoader} used to load the specified class.
+	 *
 	 * @return the {@code ClassLoader}; potentially {@code null}
 	 * @since 1.10
 	 */
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
index 877ed2820b26..154f74179d1c 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java
@@ -48,26 +48,28 @@
 @API(status = STABLE, since = "1.6")
 public class NestedClassSelector implements DiscoverySelector {
 
+	private final ClassLoader classLoader;
 	private final List<ClassSelector> enclosingClassSelectors;
 	private final ClassSelector nestedClassSelector;
-	private final ClassLoader classLoader;
 
-	NestedClassSelector(List<String> enclosingClassNames, String nestedClassName, ClassLoader classLoader) {
+	NestedClassSelector(ClassLoader classLoader, List<String> enclosingClassNames, String nestedClassName) {
+		this.classLoader = classLoader;
 		this.enclosingClassSelectors = enclosingClassNames.stream() //
-				.map(className -> new ClassSelector(className, classLoader)) //
+				.map(className -> new ClassSelector(classLoader, className)) //
 				.collect(toUnmodifiableList());
-		this.nestedClassSelector = new ClassSelector(nestedClassName, classLoader);
-		this.classLoader = classLoader;
+		this.nestedClassSelector = new ClassSelector(classLoader, nestedClassName);
 	}
 
 	NestedClassSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass) {
+		this.classLoader = nestedClass.getClassLoader();
 		this.enclosingClassSelectors = enclosingClasses.stream().map(ClassSelector::new).collect(toList());
 		this.nestedClassSelector = new ClassSelector(nestedClass);
-		this.classLoader = nestedClass.getClassLoader();
 	}
 
 	/**
 	 * Get the {@link ClassLoader} used to load the selected nested class.
+	 *
+	 * @return the {@code ClassLoader}; potentially {@code null}
 	 * @since 1.10
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index aeb6f28fac4d..215b44792b59 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -59,8 +59,8 @@ public class NestedMethodSelector implements DiscoverySelector {
 
 	NestedMethodSelector(List<String> enclosingClassNames, String nestedClassName, String methodName,
 			String parameterTypeNames, ClassLoader classLoader) {
-		this.nestedClassSelector = new NestedClassSelector(enclosingClassNames, nestedClassName, classLoader);
-		this.methodSelector = new MethodSelector(nestedClassName, methodName, parameterTypeNames, classLoader);
+		this.nestedClassSelector = new NestedClassSelector(classLoader, enclosingClassNames, nestedClassName);
+		this.methodSelector = new MethodSelector(classLoader, nestedClassName, methodName, parameterTypeNames);
 	}
 
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName) {
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
index 16a0215f25e6..2280fa8173b9 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -27,16 +27,16 @@ class ClassSelectorTests extends AbstractEqualsAndHashCodeTests {
 
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new ClassSelector("org.example.TestClass", null);
-		var selector2 = new ClassSelector("org.example.TestClass", null);
-		var selector3 = new ClassSelector("org.example.X", null);
+		var selector1 = new ClassSelector(null, "org.example.TestClass");
+		var selector2 = new ClassSelector(null, "org.example.TestClass");
+		var selector3 = new ClassSelector(null, "org.example.X");
 
 		assertEqualsAndHashCode(selector1, selector2, selector3);
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadClass() {
-		var selector = new ClassSelector("org.example.TestClass", null);
+		var selector = new ClassSelector(null, "org.example.TestClass");
 
 		var e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index 205e16d7cd5a..a2e4af2113f2 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -316,7 +316,7 @@ void selectClassByName() {
 		@Test
 		void selectClassByNameAndClassLoader() throws Exception {
 			try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
-				var selector = selectClass(getClass().getName(), testClassLoader);
+				var selector = selectClass(testClassLoader, getClass().getName());
 
 				assertThat(selector.getJavaClass().getName()).isEqualTo(getClass().getName());
 				assertThat(selector.getJavaClass()).isNotEqualTo(getClass());
@@ -419,7 +419,7 @@ void selectMethodByFullyQualifiedNameAndClassLoader() throws Exception {
 				assertThat(clazz).isNotEqualTo(testClass());
 
 				var method = clazz.getDeclaredMethod("myTest");
-				var selector = selectMethod(testClass().getName(), "myTest", testClassLoader);
+				var selector = selectMethod(testClassLoader, testClass().getName(), "myTest");
 				assertThat(selector.getJavaMethod()).isEqualTo(method);
 				assertThat(selector.getJavaClass()).isEqualTo(clazz);
 				assertThat(selector.getClassName()).isEqualTo(clazz.getName());
@@ -755,7 +755,7 @@ void selectNestedClassByClassNamesAndClassLoader() throws Exception {
 				AbstractClassWithNestedInnerClass.NestedClass.class);
 
 			try (var testClassLoader = TestClassLoader.forClasses(testClasses)) {
-				var selector = selectNestedClass(List.of(enclosingClassName), nestedClassName, testClassLoader);
+				var selector = selectNestedClass(testClassLoader, List.of(enclosingClassName), nestedClassName);
 
 				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
@@ -810,8 +810,8 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameAndClassLoader() throws
 				AbstractClassWithNestedInnerClass.NestedClass.class);
 
 			try (var testClassLoader = TestClassLoader.forClasses(testClasses)) {
-				var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
-					testClassLoader);
+				var selector = selectNestedMethod(testClassLoader, List.of(enclosingClassName), nestedClassName,
+					methodName);
 
 				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
@@ -862,8 +862,8 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypesAndCl
 				AbstractClassWithNestedInnerClass.NestedClass.class);
 
 			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
-				var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
-					String.class.getName(), testClassLoader);
+				var selector = selectNestedMethod(testClassLoader, List.of(enclosingClassName), nestedClassName,
+					methodName, String.class.getName());
 
 				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 6d67ecf1c960..9f314ef7d8ed 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -32,25 +32,25 @@ class MethodSelectorTests extends AbstractEqualsAndHashCodeTests {
 
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new MethodSelector(TEST_CASE_NAME, "method", "int, boolean", null);
-		var selector2 = new MethodSelector(TEST_CASE_NAME, "method", "int, boolean", null);
+		var selector1 = new MethodSelector(null, TEST_CASE_NAME, "method", "int, boolean");
+		var selector2 = new MethodSelector(null, TEST_CASE_NAME, "method", "int, boolean");
 		var selector3 = new MethodSelector(TestCase.class, "method", "int, boolean");
 
 		Stream.of(selector2, selector3).forEach(selector -> {
-			assertEqualsAndHashCode(selector1, selector, new MethodSelector(TEST_CASE_NAME, "method", "int", null));
+			assertEqualsAndHashCode(selector1, selector, new MethodSelector(null, TEST_CASE_NAME, "method", "int"));
 			assertEqualsAndHashCode(selector1, selector,
-				new MethodSelector(TEST_CASE_NAME, "method", "", (ClassLoader) null));
-			assertEqualsAndHashCode(selector1, selector, new MethodSelector(TEST_CASE_NAME, "X", "int, boolean", null));
+				new MethodSelector((ClassLoader) null, TEST_CASE_NAME, "method", ""));
+			assertEqualsAndHashCode(selector1, selector, new MethodSelector(null, TEST_CASE_NAME, "X", "int, boolean"));
 			assertEqualsAndHashCode(selector1, selector,
-				new MethodSelector(TEST_CASE_NAME, "X", "", (ClassLoader) null));
-			assertEqualsAndHashCode(selector1, selector, new MethodSelector("X", "method", "int, boolean", null));
-			assertEqualsAndHashCode(selector1, selector, new MethodSelector("X", "method", "", (ClassLoader) null));
+				new MethodSelector((ClassLoader) null, TEST_CASE_NAME, "X", ""));
+			assertEqualsAndHashCode(selector1, selector, new MethodSelector(null, "X", "method", "int, boolean"));
+			assertEqualsAndHashCode(selector1, selector, new MethodSelector((ClassLoader) null, "X", "method", ""));
 		});
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadJavaClass() {
-		var selector = new MethodSelector("org.example.BogusClass", "method", "int, boolean", (ClassLoader) null);
+		var selector = new MethodSelector((ClassLoader) null, "org.example.BogusClass", "method", "int, boolean");
 
 		assertThat(selector.getClassName()).isEqualTo("org.example.BogusClass");
 		assertThat(selector.getMethodName()).isEqualTo("method");
@@ -64,7 +64,7 @@ void preservesOriginalExceptionWhenTryingToLoadJavaClass() {
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadClassForParameterType() {
-		var selector = new MethodSelector(TEST_CASE_NAME, "method", "int[], org.example.Bogus", (ClassLoader) null);
+		var selector = new MethodSelector((ClassLoader) null, TEST_CASE_NAME, "method", "int[], org.example.Bogus");
 
 		assertThat(selector.getClassName()).isEqualTo(TEST_CASE_NAME);
 		assertThat(selector.getMethodName()).isEqualTo("method");
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
index 7d80b25e5437..93fe50b6fc4f 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
@@ -29,19 +29,19 @@ class NestedClassSelectorTests extends AbstractEqualsAndHashCodeTests {
 
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new NestedClassSelector(List.of("org.example.EnclosingTestClass"),
-			"org.example.NestedTestClass", null);
-		var selector2 = new NestedClassSelector(List.of("org.example.EnclosingTestClass"),
-			"org.example.NestedTestClass", null);
-		var selector3 = new NestedClassSelector(List.of("org.example.X"), "org.example.Y", null);
+		var selector1 = new NestedClassSelector(null, List.of("org.example.EnclosingTestClass"),
+			"org.example.NestedTestClass");
+		var selector2 = new NestedClassSelector(null, List.of("org.example.EnclosingTestClass"),
+			"org.example.NestedTestClass");
+		var selector3 = new NestedClassSelector(null, List.of("org.example.X"), "org.example.Y");
 
 		assertEqualsAndHashCode(selector1, selector2, selector3);
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadEnclosingClasses() {
-		var selector = new NestedClassSelector(List.of("org.example.EnclosingTestClass"), "org.example.NestedTestClass",
-			null);
+		var selector = new NestedClassSelector(null, List.of("org.example.EnclosingTestClass"),
+			"org.example.NestedTestClass");
 
 		var exception = assertThrows(PreconditionViolationException.class, selector::getEnclosingClasses);
 
@@ -51,8 +51,8 @@ void preservesOriginalExceptionWhenTryingToLoadEnclosingClasses() {
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadNestedClass() {
-		var selector = new NestedClassSelector(List.of("org.example.EnclosingTestClass"), "org.example.NestedTestClass",
-			null);
+		var selector = new NestedClassSelector(null, List.of("org.example.EnclosingTestClass"),
+			"org.example.NestedTestClass");
 
 		var exception = assertThrows(PreconditionViolationException.class, selector::getNestedClass);
 

From f77f4b6e2215cb32a468782a55137aaafae2b08b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 30 May 2023 12:57:07 +0200
Subject: [PATCH 1356/1433] Remove broken Javadoc link

---
 .../org/junit/platform/engine/discovery/MethodSelector.java     | 1 -
 .../main/java/org/junit/platform/suite/api/SelectMethod.java    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index 293b65eee5a3..c1d9ad28deb8 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -125,7 +125,6 @@ public String getMethodName() {
 	 * via a constructor or deduced from a {@code Method} or parameter types supplied
 	 * via a constructor; never {@code null} but potentially an empty string
 	 * @since 1.0
-	 * @see #getParameterTypes()
 	 * @deprecated since 1.10 in favor of {@link #getParameterTypeNames()}
 	 */
 	@Deprecated
diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
index 652280ce45b3..b83fd420405a 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
@@ -65,7 +65,7 @@
 	 * {@code [Ljava.lang.String;} for {@code java.lang.String[]}, etc.) or
 	 * <em>source code syntax</em> (e.g., {@code int[][]}, {@code java.lang.String[]},
 	 * etc.).
-	 * <p>
+	 *
 	 * <table class="plain">
 	 * <caption>Examples</caption>
 	 * <tr><th>Method</th><th>Parameter types list</th></tr>

From 3aee65946a732ba37dad446e025b6d81a266c459 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 30 May 2023 15:22:13 +0200
Subject: [PATCH 1357/1433] Polishing

---
 .../engine/discovery/DiscoverySelectors.java  | 13 +++-----
 .../discovery/NestedMethodSelector.java       |  8 ++---
 .../discovery/NestedMethodSelectorTests.java  | 32 +++++++++----------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 322c8c0cc1f5..42553214d695 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -689,7 +689,7 @@ public static NestedMethodSelector selectNestedMethod(ClassLoader classLoader, L
 		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, "", classLoader);
+		return new NestedMethodSelector(classLoader, enclosingClassNames, nestedClassName, methodName, "");
 	}
 
 	/**
@@ -740,8 +740,8 @@ public static NestedMethodSelector selectNestedMethod(ClassLoader classLoader, L
 		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
 		Preconditions.notNull(parameterTypeNames, "Parameter types must not be null");
-		return new NestedMethodSelector(enclosingClassNames, nestedClassName, methodName, parameterTypeNames,
-			classLoader);
+		return new NestedMethodSelector(classLoader, enclosingClassNames, nestedClassName, methodName,
+			parameterTypeNames.trim());
 	}
 
 	/**
@@ -757,10 +757,7 @@ public static NestedMethodSelector selectNestedMethod(ClassLoader classLoader, L
 	public static NestedMethodSelector selectNestedMethod(List<Class<?>> enclosingClasses, Class<?> nestedClass,
 			String methodName) {
 
-		Preconditions.notEmpty(enclosingClasses, "Enclosing classes must not be null or empty");
-		Preconditions.notNull(nestedClass, "Nested class must not be null");
-		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new NestedMethodSelector(enclosingClasses, nestedClass, methodName);
+		return selectNestedMethod(enclosingClasses, nestedClass, methodName, "");
 	}
 
 	/**
@@ -788,7 +785,7 @@ public static NestedMethodSelector selectNestedMethod(List<Class<?>> enclosingCl
 		Preconditions.notNull(nestedClass, "Nested class must not be null");
 		Preconditions.notBlank(methodName, "Method name must not be null or blank");
 		Preconditions.notNull(parameterTypeNames, "Parameter types must not be null");
-		return new NestedMethodSelector(enclosingClasses, nestedClass, methodName, parameterTypeNames);
+		return new NestedMethodSelector(enclosingClasses, nestedClass, methodName, parameterTypeNames.trim());
 	}
 
 	/**
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index 215b44792b59..0d4ebb51a6c4 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -57,16 +57,12 @@ public class NestedMethodSelector implements DiscoverySelector {
 	private final NestedClassSelector nestedClassSelector;
 	private final MethodSelector methodSelector;
 
-	NestedMethodSelector(List<String> enclosingClassNames, String nestedClassName, String methodName,
-			String parameterTypeNames, ClassLoader classLoader) {
+	NestedMethodSelector(ClassLoader classLoader, List<String> enclosingClassNames, String nestedClassName,
+			String methodName, String parameterTypeNames) {
 		this.nestedClassSelector = new NestedClassSelector(classLoader, enclosingClassNames, nestedClassName);
 		this.methodSelector = new MethodSelector(classLoader, nestedClassName, methodName, parameterTypeNames);
 	}
 
-	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName) {
-		this(enclosingClasses, nestedClass, methodName, "");
-	}
-
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName,
 			String parameterTypeNames) {
 		this.nestedClassSelector = new NestedClassSelector(enclosingClasses, nestedClass);
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
index 13a6bf5bab4a..f696cc47f3e1 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
@@ -29,33 +29,33 @@ class NestedMethodSelectorTests extends AbstractEqualsAndHashCodeTests {
 
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean",
-			null);
-		var selector2 = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean",
-			null);
+		var selector1 = new NestedMethodSelector(null, List.of("EnclosingClass"), "NestedTestClass", "method",
+			"int, boolean");
+		var selector2 = new NestedMethodSelector(null, List.of("EnclosingClass"), "NestedTestClass", "method",
+			"int, boolean");
 
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("X"), "NestedTestClass", "method", "int, boolean", null));
+			new NestedMethodSelector(null, List.of("X"), "NestedTestClass", "method", "int, boolean"));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("X"), "NestedTestClass", "method", "", null));
+			new NestedMethodSelector(null, List.of("X"), "NestedTestClass", "method", ""));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int", null));
+			new NestedMethodSelector(null, List.of("EnclosingClass"), "NestedTestClass", "method", "int"));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "", null));
+			new NestedMethodSelector(null, List.of("EnclosingClass"), "NestedTestClass", "method", ""));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "X", "int, boolean", null));
+			new NestedMethodSelector(null, List.of("EnclosingClass"), "NestedTestClass", "X", "int, boolean"));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "X", "", null));
+			new NestedMethodSelector(null, List.of("EnclosingClass"), "NestedTestClass", "X", ""));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "X", "method", "int, boolean", null));
+			new NestedMethodSelector(null, List.of("EnclosingClass"), "X", "method", "int, boolean"));
 		assertEqualsAndHashCode(selector1, selector2,
-			new NestedMethodSelector(List.of("EnclosingClass"), "X", "method", "", null));
+			new NestedMethodSelector(null, List.of("EnclosingClass"), "X", "method", ""));
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadEnclosingClass() {
-		var selector = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean",
-			null);
+		var selector = new NestedMethodSelector(null, List.of("EnclosingClass"), "NestedTestClass", "method",
+			"int, boolean");
 
 		var exception = assertThrows(PreconditionViolationException.class, selector::getEnclosingClasses);
 
@@ -65,8 +65,8 @@ void preservesOriginalExceptionWhenTryingToLoadEnclosingClass() {
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadNestedClass() {
-		var selector = new NestedMethodSelector(List.of("EnclosingClass"), "NestedTestClass", "method", "int, boolean",
-			null);
+		var selector = new NestedMethodSelector(null, List.of("EnclosingClass"), "NestedTestClass", "method",
+			"int, boolean");
 
 		var exception = assertThrows(PreconditionViolationException.class, selector::getNestedClass);
 

From bb962513ef1a921f48d83379ef9715f4e3d7d2e0 Mon Sep 17 00:00:00 2001
From: BassemElMasry <baelmasry@gmail.com>
Date: Mon, 29 May 2023 19:51:20 +0200
Subject: [PATCH 1358/1433] Add optional `reason` attribute in @Execution

Closes #3187
Closes #3332
---
 .../asciidoc/release-notes/release-notes-5.10.0-RC1.adoc   | 1 +
 .../java/org/junit/jupiter/api/parallel/Execution.java     | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 42f1352f5234..f95f00c9c58c 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -29,6 +29,7 @@ JUnit repository on GitHub.
 
 * New `@SelectMethod` selector support in the `@Suite` test engine.
 * Allow selecting classes by name via new the `names` attribute in `@SelectClasses`.
+*Adding a reason for using the selected execution mode.
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index 822d1a768ec1..9a3e14d7b60d 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -99,4 +99,11 @@
 	 */
 	ExecutionMode value();
 
+	/**
+	 * The reason for using the selected execution mode.
+	 * @since 5.10
+	 */
+	@API(status = STABLE, since = "5.10")
+	String reason() default "";
+
 }

From 185ca9b88d15cc5e0ae29e74d87b786afef819f3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 30 May 2023 16:42:54 +0200
Subject: [PATCH 1359/1433] Polish contribution

See #3332
---
 .../docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc  | 3 ++-
 .../main/java/org/junit/jupiter/api/parallel/Execution.java    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index f95f00c9c58c..f83cdda24c5a 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -29,7 +29,6 @@ JUnit repository on GitHub.
 
 * New `@SelectMethod` selector support in the `@Suite` test engine.
 * Allow selecting classes by name via new the `names` attribute in `@SelectClasses`.
-*Adding a reason for using the selected execution mode.
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
@@ -50,6 +49,8 @@ JUnit repository on GitHub.
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
 * Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
+* New `reason` attribute in `@Execution` which can be used to document the reason for
+  using the selected execution mode.
 
 
 [[release-notes-5.10.0-RC1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index 9a3e14d7b60d..fdab343fbebf 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -101,6 +101,9 @@
 
 	/**
 	 * The reason for using the selected execution mode.
+	 *
+	 * <p>This is for informational purposes only.
+	 *
 	 * @since 5.10
 	 */
 	@API(status = STABLE, since = "5.10")

From 9b9d5deec57d4817a83455ba9fba23d8551a111b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 30 May 2023 16:44:49 +0200
Subject: [PATCH 1360/1433] Polishing

---
 .../asciidoc/release-notes/release-notes-5.10.0-RC1.adoc     | 3 ++-
 .../main/java/org/junit/jupiter/api/parallel/Execution.java  | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index f83cdda24c5a..53db2d882329 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -28,7 +28,8 @@ JUnit repository on GitHub.
 ==== New Features and Improvements
 
 * New `@SelectMethod` selector support in the `@Suite` test engine.
-* Allow selecting classes by name via new the `names` attribute in `@SelectClasses`.
+* Classes may now be selected by fully-qualified name via new the `names` attribute in
+  `@SelectClasses`.
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
index fdab343fbebf..cb1c8c01ffee 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/parallel/Execution.java
@@ -41,9 +41,8 @@
  *     <dd>Default execution mode for top-level classes</dd>
  * </dl>
  *
- * <p>{@value #DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME}
- * overrides {@value #DEFAULT_EXECUTION_MODE_PROPERTY_NAME} for top-level
- * classes
+ * <p>{@value #DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME} overrides
+ * {@value #DEFAULT_EXECUTION_MODE_PROPERTY_NAME} for top-level classes.
  *
  * @see Isolated
  * @see ResourceLock

From b7249fc1217ea5b862f1818874f41cad1d62446e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 2 Jun 2023 12:04:02 +0200
Subject: [PATCH 1361/1433] Update OpenTest4J to 1.3.0-RC2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7f2087e4a621..97985b8e4ab8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 ktlint = "0.48.2"
 log4j = "2.20.0"
-opentest4j = "1.2.0"
+opentest4j = "1.3.0-RC2"
 openTestReporting = "0.1.0-M1"
 surefire = "3.0.0-M7"
 xmlunit = "2.9.1"

From c842e99f6220e243249fc89bd54c6e22ad7ca88e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 05:59:23 +0000
Subject: [PATCH 1362/1433] Bump info.picocli:picocli from 4.7.3 to 4.7.4

Bumps [info.picocli:picocli](https://github.com/remkop/picocli) from 4.7.3 to 4.7.4.
- [Release notes](https://github.com/remkop/picocli/releases)
- [Changelog](https://github.com/remkop/picocli/blob/main/RELEASE-NOTES.md)
- [Commits](https://github.com/remkop/picocli/compare/v4.7.3...v4.7.4)

---
updated-dependencies:
- dependency-name: info.picocli:picocli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 97985b8e4ab8..c1e75ff9410b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,7 +55,7 @@ mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.3.1" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }
-picocli = { module = "info.picocli:picocli", version = "4.7.3" }
+picocli = { module = "info.picocli:picocli", version = "4.7.4" }
 slf4j-julBinding = { module = "org.slf4j:slf4j-jdk14", version = "2.0.7" }
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }

From abf89c0f0ea14d734bfda870aa965502be16014f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 05:59:37 +0000
Subject: [PATCH 1363/1433] Bump
 com.gradle:common-custom-user-data-gradle-plugin from 1.10 to 1.11

Bumps com.gradle:common-custom-user-data-gradle-plugin from 1.10 to 1.11.

---
updated-dependencies:
- dependency-name: com.gradle:common-custom-user-data-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c1e75ff9410b..4c79dd2beafe 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.160" }
 commons-io = { module = "commons-io:commons-io", version = "2.12.0" }
-gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.10" }
+gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.11" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
 gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.3" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }

From 1cd8766a3a1c0a692554a774a676d65d9f622cba Mon Sep 17 00:00:00 2001
From: Ellen Spertus <espertus@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:07:51 -0700
Subject: [PATCH 1364/1433] Fix typo

---
 .../docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
index 6257d266c293..9b4722dcd6b3 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
@@ -168,7 +168,7 @@ include::{testDir}/example/session/HttpTests.java[tags=user_guide]
 
 In order to intercept the creation of instances of `{Launcher}` and
 `{LauncherSessionListener}` and calls to the `discover` and `execute` methods of the
-former, clients can registercustom implementations of `{LauncherInterceptor}` via Java's
+former, clients can register custom implementations of `{LauncherInterceptor}` via Java's
 `{ServiceLoader}` mechanism by additionally setting the
 `junit.platform.launcher.interceptors.enabled` <<running-tests-config-params,
 configuration parameter>> to `true`.

From 6d1fe61f37bdcd762324c86ba14a98e970f20462 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Jun 2023 11:01:51 +0200
Subject: [PATCH 1365/1433] Remove pointers to outdated JUnit Platform Gradle
 plugin

---
 .../src/docs/asciidoc/user-guide/running-tests.adoc        | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 507a60f908d1..6476d57022ec 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -122,13 +122,6 @@ your IDE has built-in support for JUnit 4.
 [[running-tests-build-gradle]]
 ==== Gradle
 
-[WARNING]
-.The JUnit Platform Gradle Plugin has been discontinued
-====
-The `junit-platform-gradle-plugin` developed by the JUnit team was deprecated in JUnit
-Platform 1.2 and discontinued in 1.3. Please switch to Gradle's standard `test` task.
-====
-
 Starting with https://docs.gradle.org/4.6/release-notes.html[version 4.6], Gradle provides
 https://docs.gradle.org/current/userguide/java_testing.html#using_junit5[native support]
 for executing tests on the JUnit Platform. To enable it, you need to specify

From 7ba55150060beec798ffb0e982e2ea69055b7a69 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Jun 2023 11:02:19 +0200
Subject: [PATCH 1366/1433] Document how to use BOM to align dependency
 versions

---
 .../asciidoc/user-guide/running-tests.adoc    | 52 +++++++++++++++++--
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 6476d57022ec..8461b9bc7c1f 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -155,7 +155,24 @@ Please refer to the
 https://docs.gradle.org/current/userguide/java_plugin.html#sec:java_test[official Gradle documentation]
 for a comprehensive list of options.
 
-NOTE: See <<running-tests-build-spring-boot>> for details on how to override the version
+[[running-tests-build-gradle-bom]]
+===== Aligning dependency versions
+
+Unless you're using Spring Boot which defines its own way of managing dependencies, it is
+recommended to use the JUnit Platform BOM to align the versions of all JUnit 5 artifacts.
+
+[source,groovy,indent=0]
+[subs=attributes+]
+----
+dependencies {
+	testImplementation(platform("org.junit:junit-bom:{bom-version}"))
+}
+----
+
+Using the BOM allows you to omit the version when declaring dependencies on all artifacts
+with the `org.junit.platform`, `org.junit.jupiter`, and `org.junit.vintage` group IDs.
+
+TIP: See <<running-tests-build-spring-boot>> for details on how to override the version
 of JUnit used in your Spring Boot application.
 
 [[running-tests-build-gradle-config-params]]
@@ -190,7 +207,7 @@ on the dependency-aggregating JUnit Jupiter artifact similar to the following.
 [subs=attributes+]
 ----
 dependencies {
-	testImplementation("org.junit.jupiter:junit-jupiter:{jupiter-version}")
+	testImplementation("org.junit.jupiter:junit-jupiter:{jupiter-version}") // version can be omitted when using the BOM
 }
 ----
 
@@ -203,7 +220,7 @@ implementation similar to the following.
 ----
 dependencies {
 	testImplementation("junit:junit:{junit4-version}")
-	testRuntimeOnly("org.junit.vintage:junit-vintage-engine:{vintage-version}")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine:{vintage-version}") // version can be omitted when using the BOM
 }
 ----
 
@@ -268,6 +285,31 @@ Launcher to your Maven build as follows.
 ----
 ====
 
+[[running-tests-build-maven-bom]]
+===== Aligning dependency versions
+
+Unless you're using Spring Boot which defines its own way of managing dependencies, it is
+recommended to use the JUnit Platform BOM to align the versions of all JUnit 5 artifacts.
+
+[source,xml,indent=0]
+[subs=attributes+]
+----
+<dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit-bom</artifactId>
+			<version>{bom-version}</version>
+			<type>pom</type>
+			<scope>import</scope>
+		</dependency>
+	</dependencies>
+</dependencyManagement>
+----
+
+Using the BOM allows you to omit the version when declaring dependencies on all artifacts
+with the `org.junit.platform`, `org.junit.jupiter`, and `org.junit.vintage` group IDs.
+
 TIP: See <<running-tests-build-spring-boot>> for details on how to override the version
 of JUnit used in your Spring Boot application.
 
@@ -290,7 +332,7 @@ following.
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>{jupiter-version}</version>
+			<version>{jupiter-version}</version> <!-- can be omitted when using the BOM -->
 			<scope>test</scope>
 		</dependency>
 		<!-- ... -->
@@ -329,7 +371,7 @@ long as you configure `test` scoped dependencies on JUnit 4 and the JUnit Vintag
 		<dependency>
 			<groupId>org.junit.vintage</groupId>
 			<artifactId>junit-vintage-engine</artifactId>
-			<version>{vintage-version}</version>
+			<version>{vintage-version}</version> <!-- can be omitted when using the BOM -->
 			<scope>test</scope>
 		</dependency>
 		<!-- ... -->

From 207f8ec0ac23059563835719a984a13080f553ae Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Jun 2023 11:02:45 +0200
Subject: [PATCH 1367/1433] Declare Surefire version in a way Dependabot can
 update it

---
 gradle/libs.versions.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4c79dd2beafe..7db60ecff765 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -61,6 +61,7 @@ spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5"
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }
 xmlunit-placeholders = { module = "org.xmlunit:xmlunit-placeholders", version.ref = "xmlunit" }
+mavenSurefirePlugin = { module = "org.apache.maven.plugins:maven-surefire-plugin", version.ref = "surefire" }
 testingAnnotations = { module = "com.gradle:gradle-enterprise-testing-annotations", version = "1.1" }
 
 [bundles]

From f240ce7332e2c90d82396c88f3078c2a883be61c Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Jun 2023 11:02:58 +0200
Subject: [PATCH 1368/1433] Use BOM in Maven integration tests

---
 .../projects/maven-starter/pom.xml              | 17 +++++++++++++----
 .../maven-surefire-compatibility/pom.xml        | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/platform-tooling-support-tests/projects/maven-starter/pom.xml b/platform-tooling-support-tests/projects/maven-starter/pom.xml
index 9ec72ae39829..18b577f81a4e 100644
--- a/platform-tooling-support-tests/projects/maven-starter/pom.xml
+++ b/platform-tooling-support-tests/projects/maven-starter/pom.xml
@@ -11,25 +11,34 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
-        <junit.jupiter.version>${env.JUNIT_JUPITER_VERSION}</junit.jupiter.version>
-        <junit.platform.version>${env.JUNIT_PLATFORM_VERSION}</junit.platform.version>
+        <junit.bom.version>${env.JUNIT_JUPITER_VERSION}</junit.bom.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-reporting</artifactId>
-            <version>${junit.platform.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
diff --git a/platform-tooling-support-tests/projects/maven-surefire-compatibility/pom.xml b/platform-tooling-support-tests/projects/maven-surefire-compatibility/pom.xml
index 2eda3ba4d826..58f907ab1e05 100644
--- a/platform-tooling-support-tests/projects/maven-surefire-compatibility/pom.xml
+++ b/platform-tooling-support-tests/projects/maven-surefire-compatibility/pom.xml
@@ -11,19 +11,29 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
-        <junit.jupiter.version>${env.JUNIT_JUPITER_VERSION}</junit.jupiter.version>
-        <junit.platform.version>${env.JUNIT_PLATFORM_VERSION}</junit.platform.version>
+        <junit.bom.version>${env.JUNIT_JUPITER_VERSION}</junit.bom.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -64,7 +74,6 @@
                 <dependency>
                     <groupId>org.junit.platform</groupId>
                     <artifactId>junit-platform-launcher</artifactId>
-                    <version>${junit.platform.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>

From 78afdc4612f4df6d5bc7d1d9c06402dec66dd6c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jun 2023 09:15:10 +0000
Subject: [PATCH 1369/1433] Bump org.apache.maven.plugins:maven-surefire-plugin

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M7 to 3.1.2.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M7...surefire-3.1.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7db60ecff765..277f585469cf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ ktlint = "0.48.2"
 log4j = "2.20.0"
 opentest4j = "1.3.0-RC2"
 openTestReporting = "0.1.0-M1"
-surefire = "3.0.0-M7"
+surefire = "3.1.2"
 xmlunit = "2.9.1"
 
 [libraries]

From d660d94d5ec42ba45fd5114c14d080694c966b3b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Jun 2023 11:32:18 +0200
Subject: [PATCH 1370/1433] Reorder alphabetically

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 277f585469cf..726d9ea0dff1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -50,6 +50,7 @@ kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.2" }
+mavenSurefirePlugin = { module = "org.apache.maven.plugins:maven-surefire-plugin", version.ref = "surefire" }
 memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.6.1" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.3.1" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
@@ -61,7 +62,6 @@ spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5"
 univocity-parsers = { module = "com.univocity:univocity-parsers", version = "2.9.1" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }
 xmlunit-placeholders = { module = "org.xmlunit:xmlunit-placeholders", version.ref = "xmlunit" }
-mavenSurefirePlugin = { module = "org.apache.maven.plugins:maven-surefire-plugin", version.ref = "surefire" }
 testingAnnotations = { module = "com.gradle:gradle-enterprise-testing-annotations", version = "1.1" }
 
 [bundles]

From 468c7781adf691b6d35779f9d78e661383879064 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 7 Jun 2023 11:32:35 +0200
Subject: [PATCH 1371/1433] Declare Checkstyle version in a way Dependabot can
 update

---
 gradle/libs.versions.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 726d9ea0dff1..7e4f5a1e05b0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,6 +28,7 @@ archunit = { module = "com.tngtech.archunit:archunit-junit5", version = "1.0.1"
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 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.160" }
 commons-io = { module = "commons-io:commons-io", version = "2.12.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.11" }

From 49e74f755d8a1c9c6a341b7220ab6f72a5c4cfa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jun 2023 09:35:05 +0000
Subject: [PATCH 1372/1433] Bump com.puppycrawl.tools:checkstyle from 9.3 to
 10.12.0

Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 9.3 to 10.12.0.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-9.3...checkstyle-10.12.0)

---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7e4f5a1e05b0..c4e291f9fca5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ asciidoctor-pdf = "1.5.3"
 asciidoctor-plugins = "4.0.0-alpha.1" # Check if workaround in documentation.gradle.kts can be removed when upgrading
 assertj = "3.24.2"
 bnd = "6.4.0"
-checkstyle = "9.3"
+checkstyle = "10.12.0"
 gradleVersionsPlugin = "0.46.0"
 jacoco = "0.8.7"
 jmh = "1.36"

From 44e1a8d5878a46ca81125b907c11970673c41ddb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 9 Jun 2023 13:48:10 +0200
Subject: [PATCH 1373/1433] Delete unused code

---
 .../platform/commons/util/ExceptionUtilsTests.java    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
index 4d04fa970301..1c96ca1b7e9b 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
@@ -11,7 +11,6 @@
 package org.junit.platform.commons.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.platform.commons.util.ExceptionUtils.findNestedThrowables;
 import static org.junit.platform.commons.util.ExceptionUtils.pruneStackTrace;
@@ -19,9 +18,6 @@
 import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.JUnitException;
@@ -137,11 +133,4 @@ void avoidCyclesWhileSearchingForNestedThrowables() {
 		assertThat(findNestedThrowables(t1)).hasSize(3);
 	}
 
-	private static void assertStackTraceMatch(StackTraceElement[] stackTrace, String expectedLines) {
-		List<String> stackStraceAsLines = Arrays.stream(stackTrace) //
-				.map(StackTraceElement::toString) //
-				.collect(Collectors.toList());
-		assertLinesMatch(expectedLines.lines().toList(), stackStraceAsLines);
-	}
-
 }

From 4d00a8674aa3ad308b917779ea36492e55f3bfdd Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 9 Jun 2023 13:48:35 +0200
Subject: [PATCH 1374/1433] Suppress "unused" warnings in tests

---
 .../commons/SuiteLauncherDiscoveryRequestBuilderTests.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index 1848163bc6ce..bafc67b02370 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -251,6 +251,7 @@ static class NonLocalTestCase {
 
 	@Test
 	void selectOneMethodWithNoParameters() {
+		@SuppressWarnings("unused")
 		class TestClass {
 			void testMethod() {
 			}
@@ -266,6 +267,7 @@ class Suite {
 
 	@Test
 	void selectOneMethodWithOneParameters() {
+		@SuppressWarnings("unused")
 		class TestClass {
 			void testMethod(int i) {
 			}
@@ -281,6 +283,7 @@ class Suite {
 
 	@Test
 	void selectTwoMethodWithTwoParameters() {
+		@SuppressWarnings("unused")
 		class TestClass {
 			void firstTestMethod(int i, String j) {
 			}

From 34d235eadd8ab0f318541bce13b6b2ab71d40a28 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 9 Jun 2023 14:08:02 +0200
Subject: [PATCH 1375/1433] Fix @since tag

---
 .../java/org/junit/platform/commons/test/TestClassLoader.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
index 5ec1970b4dc8..e408068352b1 100644
--- a/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
+++ b/junit-platform-commons/src/testFixtures/java/org/junit/platform/commons/test/TestClassLoader.java
@@ -28,7 +28,7 @@
  * <p>This class loader is only suitable for specific testing scenarios, where
  * you need to load particular classes from a different class loader.
  *
- * @since 5.10
+ * @since 1.10
  */
 public class TestClassLoader extends URLClassLoader {
 

From 90a55e27ec4955e87e81037a24cb59d4c19e66ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 05:58:38 +0000
Subject: [PATCH 1376/1433] Bump gradleVersionsPlugin from 0.46.0 to 0.47.0

Bumps `gradleVersionsPlugin` from 0.46.0 to 0.47.0.

Updates `com.github.ben-manes:gradle-versions-plugin` from 0.46.0 to 0.47.0
- [Release notes](https://github.com/ben-manes/gradle-versions-plugin/releases)
- [Commits](https://github.com/ben-manes/gradle-versions-plugin/compare/v0.46.0...v0.47.0)

Updates `com.github.ben-manes.versions` from 0.46.0 to 0.47.0

---
updated-dependencies:
- dependency-name: com.github.ben-manes:gradle-versions-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.github.ben-manes.versions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c4e291f9fca5..9650e67c06da 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ asciidoctor-plugins = "4.0.0-alpha.1" # Check if workaround in documentation.gra
 assertj = "3.24.2"
 bnd = "6.4.0"
 checkstyle = "10.12.0"
-gradleVersionsPlugin = "0.46.0"
+gradleVersionsPlugin = "0.47.0"
 jacoco = "0.8.7"
 jmh = "1.36"
 junit4 = "4.13.2"

From e41a174f53d543ecfee683cf854e61067d7bf900 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 05:58:58 +0000
Subject: [PATCH 1377/1433] Bump commons-io:commons-io from 2.12.0 to 2.13.0

Bumps commons-io:commons-io from 2.12.0 to 2.13.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9650e67c06da..241b6fc2e5f7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 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.160" }
-commons-io = { module = "commons-io:commons-io", version = "2.12.0" }
+commons-io = { module = "commons-io:commons-io", version = "2.13.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.11" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
 gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.3" }

From c71d6715e01e2bd65fcce9675955a851da24d384 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 26 May 2023 17:58:41 +0200
Subject: [PATCH 1378/1433] Support method selection with var-args parameter
 types in DiscoverySelectors

Prior to this commit, when selecting a method or nested method in
DiscoverySelectors, the parameter list could only be supplied as a
comma-delimited string -- for example, "int,java.lang.String,boolean[]".

This commit introduces selectMethod() and selectNestedMethod() variants
in DiscoverySelectors that accept a `Class<?>...` (var-args) argument
of parameter types as a type-safe alternative to providing the
names of parameter types as a comma-delimited string.

Closes #3326
Closes #3327
---
 .../release-notes-5.10.0-RC1.adoc             |   5 +-
 .../commons/util/ReflectionUtils.java         |   3 +-
 .../engine/discovery/DiscoverySelectors.java  |  98 ++++++-
 .../engine/discovery/MethodSelector.java      |  80 +++++-
 .../discovery/NestedMethodSelector.java       |  61 +++--
 .../discovery/DiscoverySelectorsTests.java    | 241 ++++++++++++++----
 .../engine/discovery/MethodSelectorTests.java |   3 +-
 7 files changed, 409 insertions(+), 82 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 53db2d882329..0fc96c603b6b 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -28,8 +28,11 @@ JUnit repository on GitHub.
 ==== New Features and Improvements
 
 * New `@SelectMethod` selector support in the `@Suite` test engine.
-* Classes may now be selected by fully-qualified name via new the `names` attribute in
+* Classes may now be selected by fully-qualified name via the `names` attribute in
   `@SelectClasses`.
+* New `selectMethod()` and `selectNestedMethod()` variants in `DiscoverySelectors` that
+  accept a `Class<?>...` argument of parameter types as a type-safe alternative to
+  providing the names of parameter types as a comma-delimited string.
 
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
index 74be92f77a3a..816b7fadd104 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java
@@ -1361,7 +1361,8 @@ public static Optional<Method> findMethod(Class<?> clazz, String methodName, Str
 		return findMethod(clazz, methodName, resolveParameterTypes(clazz, methodName, parameterTypeNames));
 	}
 
-	private static Class<?>[] resolveParameterTypes(Class<?> clazz, String methodName, String parameterTypeNames) {
+	@API(status = INTERNAL, since = "1.10")
+	public static Class<?>[] resolveParameterTypes(Class<?> clazz, String methodName, String parameterTypeNames) {
 		if (StringUtils.isBlank(parameterTypeNames)) {
 			return EMPTY_CLASS_ARRAY;
 		}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
index 42553214d695..3439d20d45e3 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java
@@ -504,9 +504,7 @@ public static MethodSelector selectMethod(String className, String methodName) {
 	 */
 	@API(status = EXPERIMENTAL, since = "1.10")
 	public static MethodSelector selectMethod(ClassLoader classLoader, String className, String methodName) {
-		Preconditions.notBlank(className, "Class name must not be null or blank");
-		Preconditions.notBlank(methodName, "Method name must not be null or blank");
-		return new MethodSelector(classLoader, className, methodName, "");
+		return selectMethod(classLoader, className, methodName, "");
 	}
 
 	/**
@@ -592,6 +590,48 @@ public static MethodSelector selectMethod(Class<?> javaClass, String methodName,
 		return new MethodSelector(javaClass, methodName, parameterTypeNames.trim());
 	}
 
+	/**
+	 * Create a {@code MethodSelector} for the supplied class name, method name,
+	 * and parameter types.
+	 *
+	 * @param className the fully qualified name of the class in which the method
+	 * is declared, or a subclass thereof; never {@code null} or blank
+	 * @param methodName the name of the method to select; never {@code null} or blank
+	 * @param parameterTypes the formal parameter types of the method; never
+	 * {@code null} though potentially empty if the method does not declare parameters
+	 * @since 1.10
+	 * @see MethodSelector
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static MethodSelector selectMethod(String className, String methodName, Class<?>... parameterTypes) {
+		Preconditions.notBlank(className, "Class name must not be null or blank");
+		Preconditions.notBlank(methodName, "Method name must not be null or blank");
+		Preconditions.notNull(parameterTypes, "Parameter types array must not be null");
+		Preconditions.containsNoNullElements(parameterTypes, "Parameter types array must not contain null elements");
+		return new MethodSelector((ClassLoader) null, className, methodName, parameterTypes);
+	}
+
+	/**
+	 * Create a {@code MethodSelector} for the supplied {@link Class}, method name,
+	 * and parameter types.
+	 *
+	 * @param javaClass the class in which the method is declared, or a subclass thereof;
+	 * never {@code null}
+	 * @param methodName the name of the method to select; never {@code null} or blank
+	 * @param parameterTypes the formal parameter types of the method; never
+	 * {@code null} though potentially empty if the method does not declare parameters
+	 * @since 1.10
+	 * @see MethodSelector
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static MethodSelector selectMethod(Class<?> javaClass, String methodName, Class<?>... parameterTypes) {
+		Preconditions.notNull(javaClass, "Class must not be null");
+		Preconditions.notBlank(methodName, "Method name must not be null or blank");
+		Preconditions.notNull(parameterTypes, "Parameter types array must not be null");
+		Preconditions.containsNoNullElements(parameterTypes, "Parameter types array must not contain null elements");
+		return new MethodSelector(javaClass, methodName, parameterTypes);
+	}
+
 	/**
 	 * Create a {@code MethodSelector} for the supplied {@link Class} and {@link Method}.
 	 *
@@ -744,6 +784,33 @@ public static NestedMethodSelector selectNestedMethod(ClassLoader classLoader, L
 			parameterTypeNames.trim());
 	}
 
+	/**
+	 * Create a {@code NestedMethodSelector} for the supplied enclosing class names,
+	 * nested class name, method name, and parameter types.
+	 *
+	 * @param enclosingClassNames the names of the enclosing classes; never {@code null}
+	 * or empty
+	 * @param nestedClassName the name of the nested class to select; never {@code null}
+	 * or blank
+	 * @param methodName the name of the method to select; never {@code null} or blank
+	 * @param parameterTypes the formal parameter types of the method; never {@code null}
+	 * though potentially empty if the method does not declare parameters
+	 * @since 1.10
+	 * @see NestedMethodSelector
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static NestedMethodSelector selectNestedMethod(List<String> enclosingClassNames, String nestedClassName,
+			String methodName, Class<?>... parameterTypes) {
+
+		Preconditions.notEmpty(enclosingClassNames, "Enclosing class names must not be null or empty");
+		Preconditions.notBlank(nestedClassName, "Nested class name must not be null or blank");
+		Preconditions.notBlank(methodName, "Method name must not be null or blank");
+		Preconditions.notNull(parameterTypes, "Parameter types array must not be null");
+		Preconditions.containsNoNullElements(parameterTypes, "Parameter types array must not contain null elements");
+		return new NestedMethodSelector((ClassLoader) null, enclosingClassNames, nestedClassName, methodName,
+			parameterTypes);
+	}
+
 	/**
 	 * Create a {@code NestedMethodSelector} for the supplied nested {@link Class} and method name.
 	 *
@@ -788,6 +855,31 @@ public static NestedMethodSelector selectNestedMethod(List<Class<?>> enclosingCl
 		return new NestedMethodSelector(enclosingClasses, nestedClass, methodName, parameterTypeNames.trim());
 	}
 
+	/**
+	 * Create a {@code NestedMethodSelector} for the supplied enclosing classes,
+	 * nested class, method name, and parameter types.
+	 *
+	 * @param enclosingClasses the path to the nested class to select; never {@code null}
+	 * or empty
+	 * @param nestedClass the nested class to select; never {@code null}
+	 * @param methodName the name of the method to select; never {@code null} or blank
+	 * @param parameterTypes the formal parameter types of the method; never {@code null}
+	 * though potentially empty if the method does not declare parameters
+	 * @since 1.10
+	 * @see NestedMethodSelector
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public static NestedMethodSelector selectNestedMethod(List<Class<?>> enclosingClasses, Class<?> nestedClass,
+			String methodName, Class<?>... parameterTypes) {
+
+		Preconditions.notEmpty(enclosingClasses, "Enclosing classes must not be null or empty");
+		Preconditions.notNull(nestedClass, "Nested class must not be null");
+		Preconditions.notBlank(methodName, "Method name must not be null or blank");
+		Preconditions.notNull(parameterTypes, "Parameter types array must not be null");
+		Preconditions.containsNoNullElements(parameterTypes, "Parameter types array must not contain null elements");
+		return new NestedMethodSelector(enclosingClasses, nestedClass, methodName, parameterTypes);
+	}
+
 	/**
 	 * Create a {@code NestedMethodSelector} for the supplied nested {@link Class} and {@link Method}.
 	 *
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
index c1d9ad28deb8..c1055f68b743 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java
@@ -18,11 +18,11 @@
 import java.util.Objects;
 
 import org.apiguardian.api.API;
+import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.function.Try;
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
-import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.commons.util.ToStringBuilder;
 import org.junit.platform.engine.DiscoverySelector;
 
@@ -36,9 +36,9 @@
  * {@linkplain #getJavaMethod() method} and its method name, class name, and
  * parameter types accordingly. If a {@link Class} and method name, a class name
  * and method name, or a <em>fully qualified method name</em> is provided,
- * this selector will only attempt to lazily load the {@link Class} or
- * {@link Method} if {@link #getJavaClass()} or {@link #getJavaMethod()} is
- * invoked.
+ * this selector will only attempt to lazily load the class, method, or parameter
+ * types if {@link #getJavaClass()}, {@link #getJavaMethod()}, or
+ * {@link #getParameterTypes()} is invoked.
  *
  * <p>In this context, a Java {@code Method} means anything that can be referenced
  * as a {@link Method} on the JVM &mdash; for example, methods from Java classes
@@ -63,6 +63,7 @@ public class MethodSelector implements DiscoverySelector {
 
 	private volatile Class<?> javaClass;
 	private volatile Method javaMethod;
+	private volatile Class<?>[] parameterTypes;
 
 	/**
 	 * @since 1.10
@@ -82,13 +83,37 @@ public class MethodSelector implements DiscoverySelector {
 		this.parameterTypeNames = parameterTypeNames;
 	}
 
+	/**
+	 * @since 1.10
+	 */
+	MethodSelector(ClassLoader classLoader, String className, String methodName, Class<?>... parameterTypes) {
+		this.classLoader = classLoader;
+		this.className = className;
+		this.methodName = methodName;
+		this.parameterTypes = parameterTypes.clone();
+		this.parameterTypeNames = ClassUtils.nullSafeToString(Class::getTypeName, this.parameterTypes);
+	}
+
+	/**
+	 * @since 1.10
+	 */
+	MethodSelector(Class<?> javaClass, String methodName, Class<?>... parameterTypes) {
+		this.classLoader = javaClass.getClassLoader();
+		this.javaClass = javaClass;
+		this.className = javaClass.getName();
+		this.methodName = methodName;
+		this.parameterTypes = parameterTypes.clone();
+		this.parameterTypeNames = ClassUtils.nullSafeToString(Class::getTypeName, this.parameterTypes);
+	}
+
 	MethodSelector(Class<?> javaClass, Method method) {
 		this.classLoader = javaClass.getClassLoader();
 		this.javaClass = javaClass;
 		this.className = javaClass.getName();
 		this.javaMethod = method;
 		this.methodName = method.getName();
-		this.parameterTypeNames = ClassUtils.nullSafeToString(method.getParameterTypes());
+		this.parameterTypes = method.getParameterTypes();
+		this.parameterTypeNames = ClassUtils.nullSafeToString(Class::getTypeName, this.parameterTypes);
 	}
 
 	/**
@@ -121,10 +146,10 @@ public String getMethodName() {
 	 *
 	 * <p>See {@link #getParameterTypeNames()} for details.
 	 *
-	 * @return the names of parameter types supplied to this {@code MethodSelector}
-	 * via a constructor or deduced from a {@code Method} or parameter types supplied
-	 * via a constructor; never {@code null} but potentially an empty string
+	 * @return the names of parameter types
 	 * @since 1.0
+	 * @see #getParameterTypeNames()
+	 * @see #getParameterTypes()
 	 * @deprecated since 1.10 in favor of {@link #getParameterTypeNames()}
 	 */
 	@Deprecated
@@ -144,9 +169,10 @@ public String getMethodParameterTypes() {
 	 * the caller of this method to determine how to parse the returned string.
 	 *
 	 * @return the names of parameter types supplied to this {@code MethodSelector}
-	 * via a constructor or deduced from a {@code Method} supplied via a constructor;
-	 * never {@code null} but potentially an empty string
+	 * via a constructor or deduced from a {@code Method} or parameter types supplied
+	 * via a constructor; never {@code null} but potentially an empty string
 	 * @since 1.10
+	 * @see #getParameterTypes()
 	 */
 	@API(status = STABLE, since = "1.10")
 	public String getParameterTypeNames() {
@@ -182,6 +208,27 @@ public Method getJavaMethod() {
 		return this.javaMethod;
 	}
 
+	/**
+	 * Get the parameter types for the selected method.
+	 *
+	 * <p>If the parameter types were not provided as {@link Class} references
+	 * (or could not be deduced as {@code Class} references in the constructor),
+	 * this method attempts to lazily load the class reference for each parameter
+	 * type based on its name and throws a {@link JUnitException} if the class
+	 * cannot be loaded.
+	 *
+	 * @return the method's parameter types; never {@code null} but potentially
+	 * an empty array if the selected method does not declare parameters
+	 * @since 1.10
+	 * @see #getParameterTypeNames()
+	 * @see Method#getParameterTypes()
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public Class<?>[] getParameterTypes() {
+		lazyLoadParameterTypes();
+		return this.parameterTypes.clone();
+	}
+
 	private void lazyLoadJavaClass() {
 		// @formatter:off
 		if (this.javaClass == null) {
@@ -197,9 +244,10 @@ private void lazyLoadJavaClass() {
 	private void lazyLoadJavaMethod() {
 		if (this.javaMethod == null) {
 			lazyLoadJavaClass();
-			if (StringUtils.isNotBlank(this.parameterTypeNames)) {
+			lazyLoadParameterTypes();
+			if (this.parameterTypes.length > 0) {
 				this.javaMethod = ReflectionUtils.findMethod(this.javaClass, this.methodName,
-					this.parameterTypeNames).orElseThrow(
+					this.parameterTypes).orElseThrow(
 						() -> new PreconditionViolationException(String.format(
 							"Could not find method with name [%s] and parameter types [%s] in class [%s].",
 							this.methodName, this.parameterTypeNames, this.javaClass.getName())));
@@ -213,6 +261,14 @@ private void lazyLoadJavaMethod() {
 		}
 	}
 
+	private void lazyLoadParameterTypes() {
+		if (this.parameterTypes == null) {
+			lazyLoadJavaClass();
+			this.parameterTypes = ReflectionUtils.resolveParameterTypes(this.javaClass, this.methodName,
+				this.parameterTypeNames);
+		}
+	}
+
 	/**
 	 * @since 1.3
 	 */
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
index 0d4ebb51a6c4..22e1ffdef440 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java
@@ -33,9 +33,9 @@
  * <p>If a Java {@link Method} is provided, the selector will return that
  * {@linkplain #getMethod() method} and its method name, class name, enclosing
  * classes names, and parameter types accordingly. If class names or method names
- * are provided, this selector will only attempt to lazily load the {@link Class}
- * or {@link Method} if {@link #getEnclosingClasses()},
- * {@link #getNestedClass()}, or {@link #getMethod()} is invoked.
+ * are provided, this selector will only attempt to lazily load a class or method
+ * if {@link #getEnclosingClasses()}, {@link #getNestedClass()},
+ * {@link #getMethod()}, or {@link #getParameterTypes()} is invoked.
  *
  * <p>In this context, a Java {@code Method} means anything that can be referenced
  * as a {@link Method} on the JVM &mdash; for example, methods from Java classes
@@ -63,12 +63,30 @@ public class NestedMethodSelector implements DiscoverySelector {
 		this.methodSelector = new MethodSelector(classLoader, nestedClassName, methodName, parameterTypeNames);
 	}
 
+	/**
+	 * @since 1.10
+	 */
+	NestedMethodSelector(ClassLoader classLoader, List<String> enclosingClassNames, String nestedClassName,
+			String methodName, Class<?>... parameterTypes) {
+		this.nestedClassSelector = new NestedClassSelector(classLoader, enclosingClassNames, nestedClassName);
+		this.methodSelector = new MethodSelector(classLoader, nestedClassName, methodName, parameterTypes);
+	}
+
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName,
 			String parameterTypeNames) {
 		this.nestedClassSelector = new NestedClassSelector(enclosingClasses, nestedClass);
 		this.methodSelector = new MethodSelector(nestedClass, methodName, parameterTypeNames);
 	}
 
+	/**
+	 * @since 1.10
+	 */
+	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, String methodName,
+			Class<?>... parameterTypes) {
+		this.nestedClassSelector = new NestedClassSelector(enclosingClasses, nestedClass);
+		this.methodSelector = new MethodSelector(nestedClass, methodName, parameterTypes);
+	}
+
 	NestedMethodSelector(List<Class<?>> enclosingClasses, Class<?> nestedClass, Method method) {
 		this.nestedClassSelector = new NestedClassSelector(enclosingClasses, nestedClass);
 		this.methodSelector = new MethodSelector(nestedClass, method);
@@ -147,10 +165,10 @@ public Method getMethod() {
 	 *
 	 * <p>See {@link #getParameterTypeNames()} for details.
 	 *
-	 * @return the names of parameter types supplied to this {@code NestedMethodSelector}
-	 * via a constructor or deduced from a {@code Method} supplied via a constructor;
-	 * never {@code null} but potentially an empty string
+	 * @return the names of parameter types
 	 * @since 1.6
+	 * @see #getParameterTypeNames()
+	 * @see #getParameterTypes()
 	 * @deprecated since 1.10 in favor or {@link #getParameterTypeNames()}
 	 */
 	@Deprecated
@@ -160,25 +178,38 @@ public String getMethodParameterTypes() {
 	}
 
 	/**
-	 * Get the names of parameter types for the selected method as a {@link String},
-	 * typically a comma-separated list of primitive types, fully qualified
-	 * class names, or array types.
+	 * Get the names of parameter types for the selected method as a {@link String}.
 	 *
-	 * <p>Note: the names of parameter types are provided as a single string instead
-	 * of a collection in order to allow this selector to be used in a generic
-	 * fashion by various test engines. It is therefore the responsibility of
-	 * the caller of this method to determine how to parse the returned string.
+	 * <p>See {@link MethodSelector#getParameterTypeNames()} for details.
 	 *
 	 * @return the names of parameter types supplied to this {@code NestedMethodSelector}
-	 * via a constructor or deduced from a {@code Method} supplied via a constructor;
-	 * never {@code null} but potentially an empty string
+	 * via a constructor or deduced from a {@code Method} or parameter types supplied
+	 * via a constructor; never {@code null} but potentially an empty string
 	 * @since 1.10
+	 * @see MethodSelector#getParameterTypeNames()
+	 *
 	 */
 	@API(status = STABLE, since = "1.10")
 	public String getParameterTypeNames() {
 		return this.methodSelector.getParameterTypeNames();
 	}
 
+	/**
+	 * Get the parameter types for the selected method.
+	 *
+	 * <p>See {@link MethodSelector#getParameterTypes()} for details.
+	 *
+	 * @return the method's parameter types; never {@code null} but potentially
+	 * an empty array if the selected method does not declare parameters
+	 * @since 1.10
+	 * @see #getParameterTypeNames()
+	 * @see MethodSelector#getParameterTypes()
+	 */
+	@API(status = EXPERIMENTAL, since = "1.10")
+	public Class<?>[] getParameterTypes() {
+		return this.methodSelector.getParameterTypes();
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
index a2e4af2113f2..dfb967afd9fd 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java
@@ -314,7 +314,7 @@ void selectClassByName() {
 		}
 
 		@Test
-		void selectClassByNameAndClassLoader() throws Exception {
+		void selectClassByNameWithExplicitClassLoader() throws Exception {
 			try (var testClassLoader = TestClassLoader.forClasses(getClass())) {
 				var selector = selectClass(testClassLoader, getClass().getName());
 
@@ -353,6 +353,19 @@ void selectMethodByClassNameMethodNameAndParameterTypeNamesPreconditions() {
 			assertViolatesPrecondition(() -> selectMethod("TestClass", "method", (String) null));
 		}
 
+		@Test
+		@DisplayName("Preconditions: selectMethod(className, methodName, parameterTypes)")
+		void selectMethodByClassNameMethodNameAndParameterTypesPreconditions() {
+			assertViolatesPrecondition(() -> selectMethod("TestClass", null, int.class));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", "", int.class));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", "  ", int.class));
+			assertViolatesPrecondition(() -> selectMethod((String) null, "method", int.class));
+			assertViolatesPrecondition(() -> selectMethod("", "method", int.class));
+			assertViolatesPrecondition(() -> selectMethod("   ", "method", int.class));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", "method", (Class<?>) null));
+			assertViolatesPrecondition(() -> selectMethod("TestClass", "method", new Class<?>[] { int.class, null }));
+		}
+
 		@Test
 		@DisplayName("Preconditions: selectMethod(class, methodName)")
 		void selectMethodByClassAndMethodNamePreconditions() {
@@ -413,7 +426,7 @@ void selectMethodByFullyQualifiedName() throws Exception {
 		}
 
 		@Test
-		void selectMethodByFullyQualifiedNameAndClassLoader() throws Exception {
+		void selectMethodByFullyQualifiedNameWithExplicitClassLoader() throws Exception {
 			try (var testClassLoader = TestClassLoader.forClasses(testClass())) {
 				var clazz = testClassLoader.loadClass(testClass().getName());
 				assertThat(clazz).isNotEqualTo(testClass());
@@ -690,6 +703,58 @@ void selectMethodByClassMethodNameAndParameterTypeNames() throws Exception {
 			assertThat(selector.getMethodName()).isEqualTo("myTest");
 			assertThat(selector.getJavaMethod()).isEqualTo(method);
 			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String, boolean[]");
+			assertThat(selector.getParameterTypes()).containsExactly(String.class, boolean[].class);
+		}
+
+		@Test
+		void selectMethodByClassNameMethodNameAndParameterTypes() throws Exception {
+			var testClass = testClass();
+			var method = testClass.getDeclaredMethod("myTest", String.class, boolean[].class);
+
+			var selector = selectMethod(testClass.getName(), "myTest", String.class, boolean[].class);
+
+			assertThat(selector.getClassName()).isEqualTo(testClass.getName());
+			assertThat(selector.getJavaClass()).isEqualTo(testClass);
+			assertThat(selector.getMethodName()).isEqualTo("myTest");
+			assertThat(selector.getJavaMethod()).isEqualTo(method);
+			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String, boolean[]");
+			assertThat(selector.getParameterTypes()).containsExactly(String.class, boolean[].class);
+		}
+
+		@Test
+		void selectMethodByClassNameMethodNameAndParameterTypeNamesWithExplicitClassLoader() throws Exception {
+			var testClass = testClass();
+
+			try (var testClassLoader = TestClassLoader.forClasses(testClass)) {
+				var clazz = testClassLoader.loadClass(testClass.getName());
+				assertThat(clazz).isNotEqualTo(testClass);
+
+				var method = clazz.getDeclaredMethod("myTest", String.class, boolean[].class);
+				var selector = selectMethod(testClassLoader, testClass.getName(), "myTest",
+					"java.lang.String, boolean[]");
+
+				assertThat(selector.getClassName()).isEqualTo(clazz.getName());
+				assertThat(selector.getJavaClass()).isEqualTo(clazz);
+				assertThat(selector.getMethodName()).isEqualTo(method.getName());
+				assertThat(selector.getJavaMethod()).isEqualTo(method);
+				assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String, boolean[]");
+				assertThat(selector.getParameterTypes()).containsExactly(String.class, boolean[].class);
+			}
+		}
+
+		@Test
+		void selectMethodByClassMethodNameAndParameterTypes() throws Exception {
+			var testClass = testClass();
+			var method = testClass.getDeclaredMethod("myTest", String.class, boolean[].class);
+
+			var selector = selectMethod(testClass, "myTest", String.class, boolean[].class);
+
+			assertThat(selector.getClassName()).isEqualTo(testClass.getName());
+			assertThat(selector.getJavaClass()).isEqualTo(testClass);
+			assertThat(selector.getMethodName()).isEqualTo("myTest");
+			assertThat(selector.getJavaMethod()).isEqualTo(method);
+			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String, boolean[]");
+			assertThat(selector.getParameterTypes()).containsExactly(String.class, boolean[].class);
 		}
 
 		@Test
@@ -703,7 +768,8 @@ void selectMethodWithParametersByMethodReference() throws Exception {
 			assertThat(selector.getJavaClass()).isEqualTo(testClass);
 			assertThat(selector.getMethodName()).isEqualTo("myTest");
 			assertThat(selector.getJavaMethod()).isEqualTo(method);
-			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String, [Z");
+			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String, boolean[]");
+			assertThat(selector.getParameterTypes()).containsExactly(String.class, boolean[].class);
 		}
 
 		@Test
@@ -734,7 +800,7 @@ private static Class<?> testClass() {
 	class SelectNestedClassAndSelectNestedMethodTests {
 
 		private final String enclosingClassName = getClass().getName() + "$ClassWithNestedInnerClass";
-		private final String nestedClassName = getClass().getName() + "$AbstractClassWithNestedInnerClass$NestedClass";
+		private final String nestedClassName = getClass().getName() + "$ClassWithNestedInnerClass$NestedClass";
 		private final String doubleNestedClassName = nestedClassName + "$DoubleNestedClass";
 		private final String methodName = "nestedTest";
 
@@ -743,23 +809,22 @@ void selectNestedClassByClassNames() {
 			var selector = selectNestedClass(List.of(enclosingClassName), nestedClassName);
 
 			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
-			assertThat(selector.getNestedClass()).isEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+			assertThat(selector.getNestedClass()).isEqualTo(ClassWithNestedInnerClass.NestedClass.class);
 
 			assertThat(selector.getEnclosingClassNames()).containsOnly(enclosingClassName);
 			assertThat(selector.getNestedClassName()).isEqualTo(nestedClassName);
 		}
 
 		@Test
-		void selectNestedClassByClassNamesAndClassLoader() throws Exception {
-			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
-				AbstractClassWithNestedInnerClass.NestedClass.class);
+		void selectNestedClassByClassNamesWithExplicitClassLoader() throws Exception {
+			var testClasses = List.of(ClassWithNestedInnerClass.class, ClassWithNestedInnerClass.NestedClass.class);
 
 			try (var testClassLoader = TestClassLoader.forClasses(testClasses)) {
 				var selector = selectNestedClass(testClassLoader, List.of(enclosingClassName), nestedClassName);
 
 				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
-				assertThat(selector.getNestedClass()).isNotEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+				assertThat(selector.getNestedClass()).isNotEqualTo(ClassWithNestedInnerClass.NestedClass.class);
 				assertThat(selector.getNestedClass().getName()).isEqualTo(nestedClassName);
 
 				assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
@@ -774,9 +839,9 @@ void selectDoubleNestedClassByClassNames() {
 			var selector = selectNestedClass(List.of(enclosingClassName, nestedClassName), doubleNestedClassName);
 
 			assertThat(selector.getEnclosingClasses()).containsExactly(ClassWithNestedInnerClass.class,
-				AbstractClassWithNestedInnerClass.NestedClass.class);
+				ClassWithNestedInnerClass.NestedClass.class);
 			assertThat(selector.getNestedClass()).isEqualTo(
-				AbstractClassWithNestedInnerClass.NestedClass.DoubleNestedClass.class);
+				ClassWithNestedInnerClass.NestedClass.DoubleNestedClass.class);
 
 			assertThat(selector.getEnclosingClassNames()).containsExactly(enclosingClassName, nestedClassName);
 			assertThat(selector.getNestedClassName()).isEqualTo(doubleNestedClassName);
@@ -796,7 +861,7 @@ void selectNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
 			var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName);
 
 			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
-			assertThat(selector.getNestedClass()).isEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+			assertThat(selector.getNestedClass()).isEqualTo(ClassWithNestedInnerClass.NestedClass.class);
 			assertThat(selector.getMethod()).isEqualTo(selector.getNestedClass().getDeclaredMethod(methodName));
 
 			assertThat(selector.getEnclosingClassNames()).containsOnly(enclosingClassName);
@@ -805,9 +870,8 @@ void selectNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
 		}
 
 		@Test
-		void selectNestedMethodByEnclosingClassNamesAndMethodNameAndClassLoader() throws Exception {
-			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
-				AbstractClassWithNestedInnerClass.NestedClass.class);
+		void selectNestedMethodByEnclosingClassNamesAndMethodNameWithExplicitClassLoader() throws Exception {
+			var testClasses = List.of(ClassWithNestedInnerClass.class, ClassWithNestedInnerClass.NestedClass.class);
 
 			try (var testClassLoader = TestClassLoader.forClasses(testClasses)) {
 				var selector = selectNestedMethod(testClassLoader, List.of(enclosingClassName), nestedClassName,
@@ -815,7 +879,7 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameAndClassLoader() throws
 
 				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
-				assertThat(selector.getNestedClass()).isNotEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+				assertThat(selector.getNestedClass()).isNotEqualTo(ClassWithNestedInnerClass.NestedClass.class);
 				assertThat(selector.getNestedClass().getName()).isEqualTo(nestedClassName);
 
 				assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
@@ -830,10 +894,10 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameAndClassLoader() throws
 		@Test
 		void selectNestedMethodByEnclosingClassesAndMethodName() throws Exception {
 			var selector = selectNestedMethod(List.of(ClassWithNestedInnerClass.class),
-				AbstractClassWithNestedInnerClass.NestedClass.class, methodName);
+				ClassWithNestedInnerClass.NestedClass.class, methodName);
 
 			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
-			assertThat(selector.getNestedClass()).isEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+			assertThat(selector.getNestedClass()).isEqualTo(ClassWithNestedInnerClass.NestedClass.class);
 			assertThat(selector.getMethod()).isEqualTo(selector.getNestedClass().getDeclaredMethod(methodName));
 
 			assertThat(selector.getEnclosingClassNames()).containsOnly(enclosingClassName);
@@ -842,12 +906,12 @@ void selectNestedMethodByEnclosingClassesAndMethodName() throws Exception {
 		}
 
 		@Test
-		void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypes() throws Exception {
+		void selectNestedMethodByEnclosingClassNamesMethodNameAndParameterTypeNames() throws Exception {
 			var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName,
 				String.class.getName());
 
 			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
-			assertThat(selector.getNestedClass()).isEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+			assertThat(selector.getNestedClass()).isEqualTo(ClassWithNestedInnerClass.NestedClass.class);
 			assertThat(selector.getMethod()).isEqualTo(
 				selector.getNestedClass().getDeclaredMethod(methodName, String.class));
 
@@ -856,18 +920,42 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypes() th
 			assertThat(selector.getMethodName()).isEqualTo(methodName);
 		}
 
+		/**
+		 * @since 1.0
+		 */
 		@Test
-		void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypesAndClassLoader() throws Exception {
-			var testClasses = List.of(AbstractClassWithNestedInnerClass.class, ClassWithNestedInnerClass.class,
-				AbstractClassWithNestedInnerClass.NestedClass.class);
+		void selectNestedMethodByEnclosingClassNamesMethodNameAndParameterTypes() throws Exception {
+			var selector = selectNestedMethod(List.of(enclosingClassName), nestedClassName, methodName, String.class);
 
-			try (var testClassLoader = TestClassLoader.forClasses(testClasses.toArray(Class[]::new))) {
+			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
+			assertThat(selector.getNestedClass()).isEqualTo(ClassWithNestedInnerClass.NestedClass.class);
+			assertThat(selector.getMethod()).isEqualTo(
+				selector.getNestedClass().getDeclaredMethod(methodName, String.class));
+			assertThat(selector.getParameterTypes()).containsExactly(String.class);
+
+			assertThat(selector.getEnclosingClassNames()).containsOnly(enclosingClassName);
+			assertThat(selector.getNestedClassName()).isEqualTo(nestedClassName);
+			assertThat(selector.getMethodName()).isEqualTo(methodName);
+			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String");
+		}
+
+		/**
+		 * @since 1.10
+		 */
+		@Test
+		void selectNestedMethodByEnclosingClassNamesMethodNameAndParameterTypeNamesWithExplicitClassLoader()
+				throws Exception {
+
+			var enclosingClass = ClassWithNestedInnerClass.class;
+			var nestedClass = ClassWithNestedInnerClass.NestedClass.class;
+
+			try (var testClassLoader = TestClassLoader.forClasses(enclosingClass, nestedClass)) {
 				var selector = selectNestedMethod(testClassLoader, List.of(enclosingClassName), nestedClassName,
 					methodName, String.class.getName());
 
-				assertThat(selector.getEnclosingClasses()).doesNotContain(ClassWithNestedInnerClass.class);
+				assertThat(selector.getEnclosingClasses()).doesNotContain(enclosingClass);
 				assertThat(selector.getEnclosingClasses()).extracting(Class::getName).containsOnly(enclosingClassName);
-				assertThat(selector.getNestedClass()).isNotEqualTo(AbstractClassWithNestedInnerClass.NestedClass.class);
+				assertThat(selector.getNestedClass()).isNotEqualTo(nestedClass);
 				assertThat(selector.getNestedClass().getName()).isEqualTo(nestedClassName);
 
 				assertThat(selector.getClassLoader()).isSameAs(testClassLoader);
@@ -880,6 +968,26 @@ void selectNestedMethodByEnclosingClassNamesAndMethodNameWithParameterTypesAndCl
 			}
 		}
 
+		/**
+		 * @since 1.10
+		 */
+		@Test
+		void selectNestedMethodByEnclosingClassesMethodNameAndParameterTypes() throws Exception {
+			var selector = selectNestedMethod(List.of(ClassWithNestedInnerClass.class),
+				ClassWithNestedInnerClass.NestedClass.class, methodName, String.class);
+
+			assertThat(selector.getEnclosingClasses()).containsOnly(ClassWithNestedInnerClass.class);
+			assertThat(selector.getNestedClass()).isEqualTo(ClassWithNestedInnerClass.NestedClass.class);
+			assertThat(selector.getMethod()).isEqualTo(
+				selector.getNestedClass().getDeclaredMethod(methodName, String.class));
+			assertThat(selector.getParameterTypes()).containsExactly(String.class);
+
+			assertThat(selector.getEnclosingClassNames()).containsOnly(enclosingClassName);
+			assertThat(selector.getNestedClassName()).isEqualTo(nestedClassName);
+			assertThat(selector.getMethodName()).isEqualTo(methodName);
+			assertThat(selector.getParameterTypeNames()).isEqualTo("java.lang.String");
+		}
+
 		@Test
 		void selectDoubleNestedMethodByEnclosingClassNamesAndMethodName() throws Exception {
 			var doubleNestedMethodName = "doubleNestedTest";
@@ -887,9 +995,9 @@ void selectDoubleNestedMethodByEnclosingClassNamesAndMethodName() throws Excepti
 				doubleNestedMethodName);
 
 			assertThat(selector.getEnclosingClasses()).containsExactly(ClassWithNestedInnerClass.class,
-				AbstractClassWithNestedInnerClass.NestedClass.class);
+				ClassWithNestedInnerClass.NestedClass.class);
 			assertThat(selector.getNestedClass()).isEqualTo(
-				AbstractClassWithNestedInnerClass.NestedClass.DoubleNestedClass.class);
+				ClassWithNestedInnerClass.NestedClass.DoubleNestedClass.class);
 			assertThat(selector.getMethod()).isEqualTo(
 				selector.getNestedClass().getDeclaredMethod(doubleNestedMethodName));
 
@@ -899,53 +1007,88 @@ void selectDoubleNestedMethodByEnclosingClassNamesAndMethodName() throws Excepti
 		}
 
 		@Test
-		void selectNestedMethodPreconditions() {
+		@DisplayName("Preconditions: selectNestedMethod(enclosingClassNames, nestedClassName, methodName)")
+		void selectNestedMethodByEnclosingClassNamesAndMethodNamePreconditions() {
 			assertViolatesPrecondition(() -> selectNestedMethod(null, "ClassName", "methodName"));
-			assertViolatesPrecondition(() -> selectNestedMethod(null, "ClassName", "methodName", "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of(), "ClassName", "methodName"));
-			assertViolatesPrecondition(() -> selectNestedMethod(List.of(), "ClassName", "methodName", "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), null, "methodName"));
-			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), null, "methodName", "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), " ", "methodName"));
-			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), " ", "methodName", "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", null));
-			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", null, "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", " "));
+		}
+
+		@Test
+		@DisplayName("Preconditions: selectNestedMethod(enclosingClassNames, nestedClassName, methodName, parameterTypeNames)")
+		void selectNestedMethodByEnclosingClassNamesMethodNameAndParameterTypeNamesPreconditions() {
+			assertViolatesPrecondition(() -> selectNestedMethod(null, "ClassName", "methodName", "int"));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of(), "ClassName", "methodName", "int"));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), null, "methodName", "int"));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), " ", "methodName", "int"));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", null, "int"));
 			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", " ", "int"));
 			assertViolatesPrecondition(
 				() -> selectNestedMethod(List.of("ClassName"), "ClassName", "methodName", (String) null));
 		}
 
-		abstract class AbstractClassWithNestedInnerClass {
+		/**
+		 * @since 1.10
+		 */
+		@Test
+		@DisplayName("Preconditions: selectNestedMethod(enclosingClassNames, nestedClassName, methodName, parameterTypes)")
+		void selectNestedMethodByEnclosingClassNamesMethodNameAndParameterTypesPreconditions() {
+			assertViolatesPrecondition(() -> selectNestedMethod(null, "ClassName", "methodName", int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of(), "ClassName", "methodName", int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), null, "methodName", int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), " ", "methodName", int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", null, int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", " ", int.class));
+			assertViolatesPrecondition(
+				() -> selectNestedMethod(List.of("ClassName"), "ClassName", "methodName", (Class<?>) null));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of("ClassName"), "ClassName", "methodName",
+				new Class<?>[] { int.class, null }));
+		}
+
+		/**
+		 * @since 1.10
+		 */
+		@Test
+		@DisplayName("Preconditions: selectNestedMethod(enclosingClasses, nestedClass, methodName, parameterTypes)")
+		void selectNestedMethodByEnclosingClassesClassMethodNameAndParameterTypesPreconditions() {
+			List<Class<?>> enclosingClassList = List.of(ClassWithNestedInnerClass.class);
+			Class<?> nestedClass = ClassWithNestedInnerClass.NestedClass.class;
+
+			assertViolatesPrecondition(() -> selectNestedMethod(null, nestedClass, "methodName", int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(List.of(), nestedClass, "methodName", int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(enclosingClassList, null, "methodName", int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(enclosingClassList, nestedClass, null, int.class));
+			assertViolatesPrecondition(() -> selectNestedMethod(enclosingClassList, nestedClass, " ", int.class));
+			assertViolatesPrecondition(
+				() -> selectNestedMethod(enclosingClassList, nestedClass, "methodName", (Class<?>) null));
+			assertViolatesPrecondition(() -> selectNestedMethod(enclosingClassList, nestedClass, "methodName",
+				new Class<?>[] { int.class, null }));
+		}
+
+		static class ClassWithNestedInnerClass {
 
-			@Nested
+			// @Nested
 			class NestedClass {
 
-				@Test
+				// @Test
 				void nestedTest() {
 				}
 
-				@Test
+				// @Test
 				void nestedTest(String parameter) {
 				}
 
-				@Nested
+				// @Nested
 				class DoubleNestedClass {
 
-					@Test
+					// @Test
 					void doubleNestedTest() {
 					}
-
 				}
-
 			}
-
-		}
-
-		class ClassWithNestedInnerClass extends AbstractClassWithNestedInnerClass {
-		}
-
-		class OtherClassWithNestedInnerClass extends AbstractClassWithNestedInnerClass {
 		}
 
 	}
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
index 9f314ef7d8ed..b6d890ba0861 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -35,8 +35,9 @@ void equalsAndHashCode() {
 		var selector1 = new MethodSelector(null, TEST_CASE_NAME, "method", "int, boolean");
 		var selector2 = new MethodSelector(null, TEST_CASE_NAME, "method", "int, boolean");
 		var selector3 = new MethodSelector(TestCase.class, "method", "int, boolean");
+		var selector4 = new MethodSelector(TestCase.class, "method", int.class, boolean.class);
 
-		Stream.of(selector2, selector3).forEach(selector -> {
+		Stream.of(selector2, selector3, selector4).forEach(selector -> {
 			assertEqualsAndHashCode(selector1, selector, new MethodSelector(null, TEST_CASE_NAME, "method", "int"));
 			assertEqualsAndHashCode(selector1, selector,
 				new MethodSelector((ClassLoader) null, TEST_CASE_NAME, "method", ""));

From 287607c784930e0baf2bc4bfc61deb6520167330 Mon Sep 17 00:00:00 2001
From: Tom Tresansky <tom.tresansky@gmail.com>
Date: Thu, 15 Jun 2023 02:00:20 -0400
Subject: [PATCH 1379/1433] Work around bndtools/bnd#5695 by configuring jar
 tasks eagerly (#3354)

Eagerly configure Jar tasks to create the BundleTaskExtension prior to
the Gradle compileClasspath configuration becoming locked and
triggering it's beforeLocking callback to run. This allows the BND
extension to modify the LibraryElements attribute on that configuration
and request a variant with the "jar" value prior to Gradle
automatically modifying the attribute to request the "classes" value.
This ensures jars are present on the classpath for BND to use when
checked for exported classes to use when building the manifest. If it
only uses the classes directory for this task, it will not have access
to version information and will not write version info to the manifest
it is assembling for the current project, causing the verifyOSGi task
to fail.

Addresses issue bndtools/bnd#5695 and allows merging of #3351.
---
 .../src/main/kotlin/junitbuild.osgi-conventions.gradle.kts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
index ce36b6127823..03de80c3edd8 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
@@ -14,7 +14,7 @@ val projectDescription = objects.property<String>().convention(provider { projec
 // metadata into the jar
 tasks.withType<Jar>().matching { task: Jar ->
 	task.name == "jar" || task.name == "shadowJar"
-}.configureEach {
+}.all { // configure tasks eagerly as workaround for https://github.com/bndtools/bnd/issues/5695
 	extra["importAPIGuardian"] = importAPIGuardian
 
 	extensions.create<BundleTaskExtension>(BundleTaskExtension.NAME, this).apply {

From c3e3c8b82cefea0ccedc47aa1098498ea9a911b8 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 15 Jun 2023 08:25:58 +0200
Subject: [PATCH 1380/1433] Upgradle to 8.2-rc-2 (#3351)

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 62076 -> 63282 bytes
 gradle/wrapper/gradle-wrapper.properties |   5 +++--
 gradlew                                  |   5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29d3e0ab67b14947c167a862655af9b..f03f475efe8cbb781d8a1f9dfcd7fbfc89bcef5a 100644
GIT binary patch
delta 11954
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%0A<WcpT@#Cp*QLV<VB2)0CbzqJMFKvUB+D6V*XP
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

delta 10805
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2c3425d49ec4..264e083fcdce 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=0906569bf96e8ebefbc1aa56318c74aeafd9710455b2817c70d709c5d77785c4
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-rc-2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb43e3..fcb6fca147c0 100755
--- a/gradlew
+++ b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

From ee3b1ef568cd5f3f027e2d26fb5a6ebf243fb16a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 16 Jun 2023 15:01:34 +0200
Subject: [PATCH 1381/1433] Document that assert[Not]Same should not be used
 with primitive types

Closes #3358
---
 .../org/junit/jupiter/api/Assertions.java     | 45 +++++++++++++++----
 .../api/AssertSameAssertionsTests.java        | 15 +++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
index fbde194825dc..4be1561689dc 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java
@@ -2845,14 +2845,24 @@ public static void assertNotEquals(Object unexpected, Object actual, Supplier<St
 	// --- assertSame ----------------------------------------------------------
 
 	/**
-	 * <em>Assert</em> that {@code expected} and {@code actual} refer to the same object.
+	 * <em>Assert</em> that the {@code expected} object and the {@code actual} object
+	 * are the same object.
+	 * <p>This method should only be used to assert <em>identity</em> between objects.
+	 * To assert <em>equality</em> between two objects or two primitive values,
+	 * use one of the {@code assertEquals(...)} methods instead &mdash; for example,
+	 * use {@code assertEquals(999, 999)} instead of {@code assertSame(999, 999)}.
 	 */
 	public static void assertSame(Object expected, Object actual) {
 		AssertSame.assertSame(expected, actual);
 	}
 
 	/**
-	 * <em>Assert</em> that {@code expected} and {@code actual} refer to the same object.
+	 * <em>Assert</em> that the {@code expected} object and the {@code actual} object
+	 * are the same object.
+	 * <p>This method should only be used to assert <em>identity</em> between objects.
+	 * To assert <em>equality</em> between two objects or two primitive values,
+	 * use one of the {@code assertEquals(...)} methods instead &mdash; for example,
+	 * use {@code assertEquals(999, 999)} instead of {@code assertSame(999, 999)}.
 	 * <p>Fails with the supplied failure {@code message}.
 	 */
 	public static void assertSame(Object expected, Object actual, String message) {
@@ -2860,8 +2870,14 @@ public static void assertSame(Object expected, Object actual, String message) {
 	}
 
 	/**
-	 * <em>Assert</em> that {@code expected} and {@code actual} refer to the same object.
-	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 * <em>Assert</em> that the {@code expected} object and the {@code actual} object
+	 * are the same object.
+	 * <p>This method should only be used to assert <em>identity</em> between objects.
+	 * To assert <em>equality</em> between two objects or two primitive values,
+	 * use one of the {@code assertEquals(...)} methods instead &mdash; for example,
+	 * use {@code assertEquals(999, 999)} instead of {@code assertSame(999, 999)}.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied
+	 * {@code messageSupplier}.
 	 */
 	public static void assertSame(Object expected, Object actual, Supplier<String> messageSupplier) {
 		AssertSame.assertSame(expected, actual, messageSupplier);
@@ -2870,14 +2886,22 @@ public static void assertSame(Object expected, Object actual, Supplier<String> m
 	// --- assertNotSame -------------------------------------------------------
 
 	/**
-	 * <em>Assert</em> that {@code expected} and {@code actual} do not refer to the same object.
+	 * <em>Assert</em> that the {@code unexpected} object and the {@code actual}
+	 * object are not the same object.
+	 * <p>This method should only be used to compare the <em>identity</em> of two
+	 * objects. To assert that two objects or two primitive values are not
+	 * <em>equal</em>, use one of the {@code assertNotEquals(...)} methods instead.
 	 */
 	public static void assertNotSame(Object unexpected, Object actual) {
 		AssertNotSame.assertNotSame(unexpected, actual);
 	}
 
 	/**
-	 * <em>Assert</em> that {@code expected} and {@code actual} do not refer to the same object.
+	 * <em>Assert</em> that the {@code unexpected} object and the {@code actual}
+	 * object are not the same object.
+	 * <p>This method should only be used to compare the <em>identity</em> of two
+	 * objects. To assert that two objects or two primitive values are not
+	 * <em>equal</em>, use one of the {@code assertNotEquals(...)} methods instead.
 	 * <p>Fails with the supplied failure {@code message}.
 	 */
 	public static void assertNotSame(Object unexpected, Object actual, String message) {
@@ -2885,8 +2909,13 @@ public static void assertNotSame(Object unexpected, Object actual, String messag
 	}
 
 	/**
-	 * <em>Assert</em> that {@code expected} and {@code actual} do not refer to the same object.
-	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 * <em>Assert</em> that the {@code unexpected} object and the {@code actual}
+	 * object are not the same object.
+	 * <p>This method should only be used to compare the <em>identity</em> of two
+	 * objects. To assert that two objects or two primitive values are not
+	 * <em>equal</em>, use one of the {@code assertNotEquals(...)} methods instead.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied
+	 * {@code messageSupplier}.
 	 */
 	public static void assertNotSame(Object unexpected, Object actual, Supplier<String> messageSupplier) {
 		AssertNotSame.assertNotSame(unexpected, actual, messageSupplier);
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
index e9ab08de1a49..c1299d8f5d04 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java
@@ -12,6 +12,7 @@
 
 import static org.junit.jupiter.api.AssertionTestUtils.assertExpectedAndActualValues;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageContains;
+import static org.junit.jupiter.api.AssertionTestUtils.assertMessageMatches;
 import static org.junit.jupiter.api.AssertionTestUtils.assertMessageStartsWith;
 import static org.junit.jupiter.api.AssertionTestUtils.expectAssertionFailedError;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -82,6 +83,20 @@ void assertSameWithDifferentObjects() {
 		}
 	}
 
+	@Test
+	void assertSameWithEqualPrimitivesAutoboxedToDifferentWrappers() {
+		try {
+			int i = 999;
+			assertSame(i, i);
+			expectAssertionFailedError();
+		}
+		catch (AssertionFailedError ex) {
+			assertMessageMatches(ex,
+				"expected: java\\.lang\\.Integer@.+?<999> but was: java\\.lang\\.Integer@.+?<999>");
+			assertExpectedAndActualValues(ex, 999, 999);
+		}
+	}
+
 	@Test
 	void assertSameWithEquivalentStringsAndMessageSupplier() {
 		String expected = new String("foo");

From c69398bc0b76d1a9726df015129fc206a7fa36dc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 16 Jun 2023 16:16:31 +0200
Subject: [PATCH 1382/1433] Introduce
 findAnnotatedFields(clazz,annoType,predicate) in AnnotationSupport

This is merely a convenience method which delegates to existing
internal functionality.

Closes #3360
---
 .../commons/support/AnnotationSupport.java    | 31 ++++++++++++++++++-
 .../commons/util/AnnotationUtils.java         |  6 +---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
index f32dc57a2965..8764d2d70670 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java
@@ -285,7 +285,36 @@ public static List<Field> findPublicAnnotatedFields(Class<?> clazz, Class<?> fie
 	 */
 	@API(status = MAINTAINED, since = "1.4")
 	public static List<Field> findAnnotatedFields(Class<?> clazz, Class<? extends Annotation> annotationType) {
-		return AnnotationUtils.findAnnotatedFields(clazz, annotationType, field -> true);
+		return findAnnotatedFields(clazz, annotationType, field -> true);
+	}
+
+	/**
+	 * Find all {@linkplain Field fields} of the supplied class or interface
+	 * that are annotated or <em>meta-annotated</em> with the specified
+	 * {@code annotationType} and match the specified {@code predicate}, using
+	 * top-down search semantics within the type hierarchy.
+	 *
+	 * <p>Fields declared in the same class or interface will be ordered using
+	 * an algorithm that is deterministic but intentionally nonobvious.
+	 *
+	 * <p>The results will not contain fields that are <em>hidden</em> or
+	 * {@linkplain Field#isSynthetic() synthetic}.
+	 *
+	 * @param clazz the class or interface in which to find the fields; never {@code null}
+	 * @param annotationType the annotation type to search for; never {@code null}
+	 * @param predicate the field filter; never {@code null}
+	 * @return the list of all such fields found; neither {@code null} nor mutable
+	 * @since 1.10
+	 * @see Class#getDeclaredFields()
+	 * @see #findPublicAnnotatedFields(Class, Class, Class)
+	 * @see #findAnnotatedFields(Class, Class, Predicate, HierarchyTraversalMode)
+	 * @see ReflectionSupport#findFields(Class, Predicate, HierarchyTraversalMode)
+	 * @see ReflectionSupport#tryToReadFieldValue(Field, Object)
+	 */
+	@API(status = MAINTAINED, since = "1.10")
+	public static List<Field> findAnnotatedFields(Class<?> clazz, Class<? extends Annotation> annotationType,
+			Predicate<Field> predicate) {
+		return AnnotationUtils.findAnnotatedFields(clazz, annotationType, predicate);
 	}
 
 	/**
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
index 9da0cb5650d6..2cd1bbcee225 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/AnnotationUtils.java
@@ -455,11 +455,7 @@ public static List<Field> findPublicAnnotatedFields(Class<?> clazz, Class<?> fie
 	}
 
 	/**
-	 * Find all {@linkplain Field fields} of the supplied class or interface
-	 * that are annotated or <em>meta-annotated</em> with the specified
-	 * {@code annotationType} and match the specified {@code predicate}, using
-	 * top-down search semantics within the type hierarchy.
-	 *
+	 * @see org.junit.platform.commons.support.AnnotationSupport#findAnnotatedFields(Class, Class, Predicate)
 	 * @see #findAnnotatedFields(Class, Class, Predicate, HierarchyTraversalMode)
 	 */
 	public static List<Field> findAnnotatedFields(Class<?> clazz, Class<? extends Annotation> annotationType,

From 3005bacd9ad6da8fc3ad1abb1b9687f88319581c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 16 Jun 2023 16:52:48 +0200
Subject: [PATCH 1383/1433] Improve documentation for extension registration
 via @ExtendWith on fields

The User Guide now includes an example implementation of the
RandomNumberExtension in order to improve the documentation for
extension registration via @ExtendWith on fields.

Closes #3004
---
 .../release-notes-5.10.0-RC1.adoc             |  3 +
 .../docs/asciidoc/user-guide/extensions.adoc  | 19 ++++++
 .../example/extensions/RandomNumberDemo.java  | 21 +++---
 .../extensions/RandomNumberExtension.java     | 68 +++++++++++++++++--
 4 files changed, 95 insertions(+), 16 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 0fc96c603b6b..1eeeaab8be51 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -55,6 +55,9 @@ JUnit repository on GitHub.
 * Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
 * New `reason` attribute in `@Execution` which can be used to document the reason for
   using the selected execution mode.
+* The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
+  includes an example implementation of the `RandomNumberExtension` in order to improve
+  the documentation for extension registration via `@ExtendWith` on fields.
 
 
 [[release-notes-5.10.0-RC1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index a1fee08b8303..b0bec55f8ab9 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -115,6 +115,25 @@ include::{testDir}/example/extensions/Random.java[tags=user_guide]
 include::{testDir}/example/extensions/RandomNumberDemo.java[tags=user_guide]
 ----
 
+[[extensions-RandomNumberExtension]]
+The following code listing provides an example of how one might choose to implement such a
+`RandomNumberExtension`. This implementation works for the use cases in
+`RandomNumberDemo`; however, it may not prove robust enough to cover all use cases – for
+example, the random number generation support is limited to integers, it uses
+`java.util.Random` instead of `java.security.SecureRandom`, etc. In any case, it is
+important to note which extension APIs are implemented and for what reasons.
+
+Specifically, `RandomNumberExtension` implements the following extension APIs:
+
+- `BeforeAllCallback`: to support static field injection
+- `BeforeEachCallback`: to support non-static field injection
+- `ParameterResolver`: to support constructor and method injection
+
+[source,java,indent=0]
+----
+include::{testDir}/example/extensions/RandomNumberExtension.java[tags=user_guide]
+----
+
 [TIP]
 .Extension Registration Order for `@ExtendWith` on Fields
 ====
diff --git a/documentation/src/test/java/example/extensions/RandomNumberDemo.java b/documentation/src/test/java/example/extensions/RandomNumberDemo.java
index d52af0a65ef8..8dd274bda73c 100644
--- a/documentation/src/test/java/example/extensions/RandomNumberDemo.java
+++ b/documentation/src/test/java/example/extensions/RandomNumberDemo.java
@@ -11,31 +11,34 @@
 package example.extensions;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@Disabled("RandomNumberExtension has not been implemented")
-//tag::user_guide[]
+// tag::user_guide[]
 class RandomNumberDemo {
 
-	// use random number field in test methods and @BeforeEach
-	// or @AfterEach lifecycle methods
+	// Use static randomNumber0 field anywhere in the test class,
+	// including @BeforeAll or @AfterEach lifecycle methods.
+	@Random
+	private static Integer randomNumber0;
+
+	// Use randomNumber1 field in test methods and @BeforeEach
+	// or @AfterEach lifecycle methods.
 	@Random
 	private int randomNumber1;
 
 	RandomNumberDemo(@Random int randomNumber2) {
-		// use random number in constructor
+		// Use randomNumber2 in constructor
 	}
 
 	@BeforeEach
 	void beforeEach(@Random int randomNumber3) {
-		// use random number in @BeforeEach method
+		// Use randomNumber3 in @BeforeEach method.
 	}
 
 	@Test
 	void test(@Random int randomNumber4) {
-		// use random number in test method
+		// Use randomNumber4 in test method.
 	}
 
 }
-//end::user_guide[]
+// end::user_guide[]
diff --git a/documentation/src/test/java/example/extensions/RandomNumberExtension.java b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
index 98f1d1ace3f8..7616427d78a5 100644
--- a/documentation/src/test/java/example/extensions/RandomNumberExtension.java
+++ b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
@@ -10,30 +10,84 @@
 
 package example.extensions;
 
+// tag::user_guide[]
+
+import static org.junit.platform.commons.support.AnnotationSupport.findAnnotatedFields;
+
+import java.lang.reflect.Field;
+import java.util.function.Predicate;
+
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.platform.commons.support.ModifierSupport;
+
+// end::user_guide[]
+// @formatter:off
+// tag::user_guide[]
+class RandomNumberExtension
+		implements BeforeAllCallback, BeforeEachCallback, ParameterResolver {
 
-class RandomNumberExtension implements BeforeAllCallback, BeforeEachCallback, ParameterResolver {
+	private final java.util.Random random = new java.util.Random(System.nanoTime());
 
+	/**
+	 * Injects a random integer into static fields that are annotated with
+	 * {@code @Random} and are of type {@code int} or {@link Integer}.
+	 */
 	@Override
-	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
-		return false;
+	public void beforeAll(ExtensionContext context) {
+		injectFields(context.getRequiredTestClass(), null, ModifierSupport::isStatic);
 	}
 
+	/**
+	 * Injects a random integer into non-static fields that are annotated with
+	 * {@code @Random} and are of type {@code int} or {@link Integer}.
+	 */
 	@Override
-	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
-		return null;
+	public void beforeEach(ExtensionContext context) {
+		injectFields(context.getRequiredTestClass(), context.getRequiredTestInstance(),
+			ModifierSupport::isNotStatic);
 	}
 
+	/**
+	 * Returns true if the parameter is annotated with {@code @Random} and is
+	 * of type {@code int} or {@link Integer}.
+	 */
 	@Override
-	public void beforeAll(ExtensionContext context) {
+	public boolean supportsParameter(ParameterContext pc, ExtensionContext ec) {
+		return pc.isAnnotated(Random.class) && isInteger(pc.getParameter().getType());
 	}
 
+	/**
+	 * Returns a random integer.
+	 */
 	@Override
-	public void beforeEach(ExtensionContext context) {
+	public Object resolveParameter(ParameterContext pc, ExtensionContext ec) {
+		return this.random.nextInt();
+	}
+
+	private void injectFields(Class<?> testClass, Object testInstance,
+			Predicate<Field> predicate) {
+
+		predicate = predicate.and(field -> isInteger(field.getType()));
+		findAnnotatedFields(testClass, Random.class, predicate)
+			.forEach(field -> {
+				try {
+					field.setAccessible(true);
+					field.set(testInstance, this.random.nextInt());
+				}
+				catch (Exception ex) {
+					throw new RuntimeException(ex);
+				}
+			});
+	}
+
+	private static boolean isInteger(Class<?> type) {
+		return type == Integer.class || type == int.class;
 	}
 
 }
+// end::user_guide[]
+// @formatter:on

From e77ed5ca1e7329f11cb3dfe40a4fc015662e5b48 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 17 Jun 2023 13:54:47 +0200
Subject: [PATCH 1384/1433] Polish CONTRIBUTING.md

---
 CONTRIBUTING.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2078c532b4c8..2313cecda3ff 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,10 +28,10 @@ Issue: #999
 ## Pull Requests
 
 Our [Definition of Done](https://github.com/junit-team/junit5/wiki/Definition-of-Done)
-offers some guidelines on what we expect from a pull request.
+(DoD) offers some guidelines on what we expect from a pull request.
 Feel free to open a pull request that does not fulfill all criteria, e.g. to discuss
 a certain change before polishing it, but please be aware that we will only merge it
-in case the DoD is met.
+once the DoD is met.
 
 Please add the following lines to your pull request description:
 
@@ -95,16 +95,15 @@ code -- class names, method names, variable names, etc.
 ### Javadoc
 
 - Javadoc comments should be wrapped after 80 characters whenever possible.
-- This first paragraph must be a single, concise sentence that ends with a period (".").
-- Place `<p>` on the same line as the first line in a new paragraph and precede `<p>` with a blank line.
+- This first paragraph must be a single, concise sentence that ends with a period (`.`).
+- Place `<p>` on the same line as the first line of a new paragraph and precede `<p>` with a blank line.
 - Insert a blank line before at-clauses/tags.
 - Favor `{@code foo}` over `<code>foo</code>`.
 - Favor literals (e.g., `{@literal @}`) over HTML entities.
-- New classes and methods should have `@since ...` annotation.
-- Use `@since 5.0` instead of `@since 5.0.0`.
-- Do not use `@author` tags. Instead, contributors are listed on [GitHub](https://github.com/junit-team/junit5/graphs/contributors).
-- Do not use verbs in third person form (e.g. use "Discover tests..." instead of "Discovers tests...")
-  in the first sentence describing a method.
+- New classes and methods should declare a `@since ...` tag.
+- Use `@since 5.10` instead of `@since 5.10.0`.
+- Do not use `@author` tags. Instead, contributors are listed on the [GitHub](https://github.com/junit-team/junit5/graphs/contributors) page.
+- Do not use verbs in third-person form in the first sentence of the Javadoc for a method -- for example, use "Discover tests..." instead of "Discovers tests...".
 
 #### Examples
 
@@ -121,11 +120,11 @@ See [`ExtensionContext`](junit-jupiter-api/src/main/java/org/junit/jupiter/api/e
 
 #### Assertions
 
-- Use `org.junit.jupiter.api.Assertions` wherever possible.
+- Use `org.junit.jupiter.api.Assertions` for simple assertions.
 - Use AssertJ when richer assertions are needed.
 - Do not use `org.junit.Assert` or `junit.framework.Assert`.
 
-#### Mocking
+#### Mocking and Stubbing
 
 - Use either [Mockito](https://github.com/mockito/mockito) or hand-written test doubles.
 
@@ -143,10 +142,11 @@ See [`ExtensionContext`](junit-jupiter-api/src/main/java/org/junit/jupiter/api/e
 
 ### Deprecation
 
-Publicly available interfaces, classes and methods have a defined lifecycle
+The JUnit 5 project uses the `@API` annotation from [API Guardian](https://github.com/apiguardian-team/apiguardian).
+Publicly available interfaces, classes, and methods have a defined lifecycle
 which is described in detail in the [User Guide](https://junit.org/junit5/docs/current/user-guide/#api-evolution).
-This process is using the `@API` annotation from [API Guardian](https://github.com/apiguardian-team/apiguardian).
-It also describes the deprecation process followed for API items.
+
+That following describes the deprecation process followed for API items.
 
 To deprecate an item:
 - Update the `@API.status` to `DEPRECATED`.

From 03f7fd887faf2f7dccc5fd13c8c74e3846fc835c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 17 Jun 2023 14:06:21 +0200
Subject: [PATCH 1385/1433] Polishing

See #3004
---
 .../docs/asciidoc/user-guide/extensions.adoc  |  2 +-
 .../extensions/RandomNumberExtension.java     | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index b0bec55f8ab9..9216679c907d 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -126,7 +126,7 @@ important to note which extension APIs are implemented and for what reasons.
 Specifically, `RandomNumberExtension` implements the following extension APIs:
 
 - `BeforeAllCallback`: to support static field injection
-- `BeforeEachCallback`: to support non-static field injection
+- `TestInstancePostProcessor`: to support non-static field injection
 - `ParameterResolver`: to support constructor and method injection
 
 [source,java,indent=0]
diff --git a/documentation/src/test/java/example/extensions/RandomNumberExtension.java b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
index 7616427d78a5..3bbece08e206 100644
--- a/documentation/src/test/java/example/extensions/RandomNumberExtension.java
+++ b/documentation/src/test/java/example/extensions/RandomNumberExtension.java
@@ -18,42 +18,43 @@
 import java.util.function.Predicate;
 
 import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 import org.junit.platform.commons.support.ModifierSupport;
 
 // end::user_guide[]
 // @formatter:off
 // tag::user_guide[]
 class RandomNumberExtension
-		implements BeforeAllCallback, BeforeEachCallback, ParameterResolver {
+		implements BeforeAllCallback, TestInstancePostProcessor, ParameterResolver {
 
 	private final java.util.Random random = new java.util.Random(System.nanoTime());
 
 	/**
-	 * Injects a random integer into static fields that are annotated with
-	 * {@code @Random} and are of type {@code int} or {@link Integer}.
+	 * Inject a random integer into static fields that are annotated with
+	 * {@code @Random} and can be assigned an integer value.
 	 */
 	@Override
 	public void beforeAll(ExtensionContext context) {
-		injectFields(context.getRequiredTestClass(), null, ModifierSupport::isStatic);
+		Class<?> testClass = context.getRequiredTestClass();
+		injectFields(testClass, null, ModifierSupport::isStatic);
 	}
 
 	/**
-	 * Injects a random integer into non-static fields that are annotated with
-	 * {@code @Random} and are of type {@code int} or {@link Integer}.
+	 * Inject a random integer into non-static fields that are annotated with
+	 * {@code @Random} and can be assigned an integer value.
 	 */
 	@Override
-	public void beforeEach(ExtensionContext context) {
-		injectFields(context.getRequiredTestClass(), context.getRequiredTestInstance(),
-			ModifierSupport::isNotStatic);
+	public void postProcessTestInstance(Object testInstance, ExtensionContext context) {
+		Class<?> testClass = context.getRequiredTestClass();
+		injectFields(testClass, testInstance, ModifierSupport::isNotStatic);
 	}
 
 	/**
-	 * Returns true if the parameter is annotated with {@code @Random} and is
-	 * of type {@code int} or {@link Integer}.
+	 * Determine if the parameter is annotated with {@code @Random} and can be
+	 * assigned an integer value.
 	 */
 	@Override
 	public boolean supportsParameter(ParameterContext pc, ExtensionContext ec) {
@@ -61,10 +62,10 @@ public boolean supportsParameter(ParameterContext pc, ExtensionContext ec) {
 	}
 
 	/**
-	 * Returns a random integer.
+	 * Resolve a random integer.
 	 */
 	@Override
-	public Object resolveParameter(ParameterContext pc, ExtensionContext ec) {
+	public Integer resolveParameter(ParameterContext pc, ExtensionContext ec) {
 		return this.random.nextInt();
 	}
 
@@ -85,7 +86,7 @@ private void injectFields(Class<?> testClass, Object testInstance,
 	}
 
 	private static boolean isInteger(Class<?> type) {
-		return type == Integer.class || type == int.class;
+		return int.class.isAssignableFrom(type);
 	}
 
 }

From 6fadfabadf449d9eb7956a3531a97cc2fa1a3882 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 17 Jun 2023 16:37:17 +0200
Subject: [PATCH 1386/1433] Polishing

---
 .../docs/asciidoc/user-guide/extensions.adoc  | 11 ++++---
 .../engine/extension/TestWatcherTests.java    | 29 ++++++++++---------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index 9216679c907d..3c1c53480ddd 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -455,9 +455,8 @@ information for the following events.
 * `testFailed`: invoked after a _test method_ has failed
 
 NOTE: In contrast to the definition of "test method" presented in
-<<writing-tests-classes-and-methods>>, in this context _test method_ refers to any
-`@Test` method or `@TestTemplate` method (for example, a `@RepeatedTest` or
-`@ParameterizedTest`).
+<<writing-tests-classes-and-methods>>, in this context _test method_ refers to any `@Test`
+method or `@TestTemplate` method (for example, a `@RepeatedTest` or `@ParameterizedTest`).
 
 Extensions implementing this interface can be registered at the method level or at the
 class level. In the latter case they will be invoked for any contained _test method_
@@ -466,9 +465,9 @@ including those in `@Nested` classes.
 [WARNING]
 ====
 Any instances of `ExtensionContext.Store.CloseableResource` stored in the `Store` of the
-provided `{ExtensionContext}` will be closed _before_ methods in this API are invoked (see
-<<extensions-keeping-state>>). You can use the parent context's `Store` to work with such
-resources.
+provided `{ExtensionContext}` will be closed _before_ methods in the `TestWatcher` API are
+invoked (see <<extensions-keeping-state>>). You can use the parent context's `Store` to
+work with such resources.
 ====
 
 [[extensions-lifecycle-callbacks]]
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
index 4c446f6fa094..cb6430a4f1ce 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
@@ -68,7 +68,7 @@ void clearResults() {
 	void testWatcherIsInvokedForTestMethodsInTopLevelAndNestedTestClasses() {
 		assertCommonStatistics(executeTestsForClass(TrackingTestWatcherTestMethodsTestCase.class));
 		assertThat(TrackingTestWatcher.results.keySet()).containsAll(testWatcherMethodNames);
-		TrackingTestWatcher.results.values().forEach(uidList -> assertEquals(2, uidList.size()));
+		TrackingTestWatcher.results.values().forEach(testMethodNames -> assertEquals(2, testMethodNames.size()));
 	}
 
 	@Test
@@ -80,12 +80,11 @@ void testWatcherIsInvokedForRepeatedTestMethods() {
 		results.testEvents().assertStatistics(
 			stats -> stats.dynamicallyRegistered(6).skipped(0).started(6).succeeded(2).aborted(2).failed(2));
 
-		ArrayList<String> expectedMethods = new ArrayList<>(testWatcherMethodNames);
 		// Since the @RepeatedTest container is disabled, the individual invocations never occur.
-		assertThat(TrackingTestWatcher.results.keySet()).containsAll(expectedMethods);
+		assertThat(TrackingTestWatcher.results.keySet()).containsAll(testWatcherMethodNames);
 		// 2 => number of iterations declared in @RepeatedTest(2).
-		TrackingTestWatcher.results.forEach(
-			(methodName, uidList) -> assertEquals("testDisabled".endsWith(methodName) ? 1 : 2, uidList.size()));
+		TrackingTestWatcher.results.forEach((testWatcherMethod, testMethodNames) -> assertEquals(
+			"testDisabled".equals(testWatcherMethod) ? 1 : 2, testMethodNames.size()));
 	}
 
 	@Test
@@ -109,8 +108,9 @@ void testWatcherExceptionsAreLoggedAndSwallowed(LogRecordListener logRecordListe
 		// @formatter:off
 		long exceptionCount = logRecordListener.stream(MethodBasedTestDescriptor.class, Level.WARNING)
 				.map(LogRecord::getThrown)
-				.filter(throwable -> throwable instanceof JUnitException)
-				.filter(throwable -> testWatcherMethodNames.contains(throwable.getStackTrace()[0].getMethodName()))
+				.filter(JUnitException.class::isInstance)
+				.map(throwable -> throwable.getStackTrace()[0].getMethodName())
+				.filter(testWatcherMethodNames::contains)
 				.count();
 		// @formatter:on
 
@@ -118,7 +118,7 @@ void testWatcherExceptionsAreLoggedAndSwallowed(LogRecordListener logRecordListe
 	}
 
 	@Test
-	void testWatcherInvokedForTestMethodsInTestCaseWithProblematicConstructor() {
+	void testWatcherIsInvokedForTestMethodsInTestCaseWithProblematicConstructor() {
 		EngineExecutionResults results = executeTestsForClass(ProblematicConstructorTestCase.class);
 		results.testEvents().assertStatistics(stats -> stats.skipped(0).started(8).succeeded(0).aborted(0).failed(8));
 		assertThat(TrackingTestWatcher.results.keySet()).containsExactly("testFailed");
@@ -257,26 +257,27 @@ private static class TrackingTestWatcher implements TestWatcher {
 
 		@Override
 		public void testSuccessful(ExtensionContext context) {
-			trackResult("testSuccessful", context.getUniqueId());
+			trackResult("testSuccessful", context);
 		}
 
 		@Override
 		public void testAborted(ExtensionContext context, Throwable cause) {
-			trackResult("testAborted", context.getUniqueId());
+			trackResult("testAborted", context);
 		}
 
 		@Override
 		public void testFailed(ExtensionContext context, Throwable cause) {
-			trackResult("testFailed", context.getUniqueId());
+			trackResult("testFailed", context);
 		}
 
 		@Override
 		public void testDisabled(ExtensionContext context, Optional<String> reason) {
-			trackResult("testDisabled", context.getUniqueId());
+			trackResult("testDisabled", context);
 		}
 
-		protected void trackResult(String status, String uid) {
-			results.computeIfAbsent(status, k -> new ArrayList<>()).add(uid);
+		protected void trackResult(String testWatcherMethod, ExtensionContext context) {
+			String testMethod = context.getRequiredTestMethod().getName();
+			results.computeIfAbsent(testWatcherMethod, k -> new ArrayList<>()).add(testMethod);
 		}
 
 	}

From 0864413d77837aeb40e03c7cc1c56ef567c202f8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 17 Jun 2023 18:01:56 +0200
Subject: [PATCH 1387/1433] Document scope of applicability for TestWatcher
 implementations

Closes #3234
---
 .../release-notes-5.10.0-RC1.adoc             |   2 +
 .../docs/asciidoc/user-guide/extensions.adoc  |  31 ++++-
 .../jupiter/api/extension/TestWatcher.java    |  24 +++-
 .../engine/extension/TestWatcherTests.java    | 110 ++++++++++++++++++
 4 files changed, 162 insertions(+), 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 1eeeaab8be51..c3a9bdaea88f 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -58,6 +58,8 @@ JUnit repository on GitHub.
 * The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
   includes an example implementation of the `RandomNumberExtension` in order to improve
   the documentation for extension registration via `@ExtendWith` on fields.
+* The scope of applicability for `TestWatcher` implementations is now more extensively
+  documented in the User Guide and Javadoc.
 
 
 [[release-notes-5.10.0-RC1-junit-vintage]]
diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index 3c1c53480ddd..3a40dad9bf7a 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -458,9 +458,34 @@ NOTE: In contrast to the definition of "test method" presented in
 <<writing-tests-classes-and-methods>>, in this context _test method_ refers to any `@Test`
 method or `@TestTemplate` method (for example, a `@RepeatedTest` or `@ParameterizedTest`).
 
-Extensions implementing this interface can be registered at the method level or at the
-class level. In the latter case they will be invoked for any contained _test method_
-including those in `@Nested` classes.
+Extensions implementing this interface can be registered at the class level, instance
+level, or method level. When registered at the class level, a `TestWatcher` will be
+invoked for any contained _test method_ including those in `@Nested` classes. When
+registered at the method level, a `TestWatcher` will only be invoked for the _test method_
+for which it was registered.
+
+[WARNING]
+====
+If a `TestWatcher` is registered via a non-static (instance) field – for example, using
+`@RegisterExtension` – and the test class is configured with
+`@TestInstance(Lifecycle.PER_METHOD)` semantics (which is the default lifecycle mode), the
+`TestWatcher` will **not** be invoked with events for `@TestTemplate` methods (for
+example, `@RepeatedTest` or `@ParameterizedTest`).
+
+To ensure that a `TestWatcher` is invoked for all _test methods_ in a given class, it is
+therefore recommended that the `TestWatcher` be registered at the class level with
+`@ExtendWith` or via a `static` field with `@RegisterExtension` or `@ExtendWith`.
+====
+
+If there is a failure at the class level — for example, an exception thrown by a
+`@BeforeAll` method — no test results will be reported. Similarly, if the test class is
+disabled via an `ExecutionCondition` — for example, `@Disabled` — no test results will be
+reported.
+
+In contrast to other Extension APIs, a `TestWatcher` is not permitted to adversely
+influence the execution of tests. Consequently, any exception thrown by a method in the
+`TestWatcher` API will be logged at `WARNING` level and will not be allowed to propagate
+or fail test execution.
 
 [WARNING]
 ====
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
index a720af0e061e..a38ff8d088a9 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestWatcher.java
@@ -31,9 +31,29 @@
  * {@link org.junit.jupiter.api.TestTemplate @TestTemplate} methods (e.g.,
  * {@code @RepeatedTest} and {@code @ParameterizedTest}). Moreover, if there is a
  * failure at the class level &mdash; for example, an exception thrown by a
- * {@code @BeforeAll} method &mdash; no test results will be reported.
+ * {@code @BeforeAll} method &mdash; no test results will be reported. Similarly,
+ * if the test class is disabled via an {@link ExecutionCondition} &mdash; for
+ * example, {@code @Disabled} &mdash; no test results will be reported.
  *
- * <p>Extensions implementing this API can be registered at any level.
+ * <p>Extensions implementing this interface can be registered at the class level,
+ * instance level, or method level. When registered at the class level, a
+ * {@code TestWatcher} will be invoked for any contained test method including
+ * those in {@link org.junit.jupiter.api.Nested @Nested} classes. When registered
+ * at the method level, a {@code TestWatcher} will only be invoked for the test
+ * method for which it was registered.
+ *
+ * <p><strong>WARNING</strong>: If a {@code TestWatcher} is registered via a
+ * non-static (instance) field &mdash; for example, using
+ * {@link RegisterExtension @RegisterExtension} &mdash; and the test class is
+ * configured with
+ * {@link org.junit.jupiter.api.TestInstance @TestInstance(Lifecycle.PER_METHOD)}
+ * semantics (which is the default lifecycle mode), the {@code TestWatcher} will
+ * <strong>not</strong> be invoked with events for {@code @TestTemplate} methods
+ * (such as {@code @RepeatedTest} and {@code @ParameterizedTest}). To ensure that
+ * a {@code TestWatcher} is invoked for all test methods in a given class, it is
+ * therefore recommended that the {@code TestWatcher} be registered at the class
+ * level with {@link ExtendWith @ExtendWith} or via a {@code static} field with
+ * {@code @RegisterExtension} or {@code @ExtendWith}.
  *
  * <h2>Exception Handling</h2>
  *
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
index cb6430a4f1ce..6ada22bf2527 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestWatcherTests.java
@@ -33,12 +33,18 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.extension.TestWatcher;
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
@@ -125,11 +131,60 @@ void testWatcherIsInvokedForTestMethodsInTestCaseWithProblematicConstructor() {
 		assertThat(TrackingTestWatcher.results.get("testFailed")).hasSize(8);
 	}
 
+	@Test
+	void testWatcherSemanticsWhenRegisteredAtClassLevel() {
+		Class<?> testClass = ClassLevelTestWatcherTestCase.class;
+		assertStatsForAbstractDisabledMethodsTestCase(testClass);
+
+		// We get "testDisabled" events for the @Test method and the @RepeatedTest container.
+		assertThat(TrackingTestWatcher.results.get("testDisabled")).containsExactly("test", "repeatedTest");
+	}
+
+	@Test
+	void testWatcherSemanticsWhenRegisteredAtInstanceLevelWithTestInstanceLifecyclePerClass() {
+		Class<?> testClass = TestInstancePerClassInstanceLevelTestWatcherTestCase.class;
+		assertStatsForAbstractDisabledMethodsTestCase(testClass);
+
+		// We get "testDisabled" events for the @Test method and the @RepeatedTest container.
+		assertThat(TrackingTestWatcher.results.get("testDisabled")).containsExactly("test", "repeatedTest");
+	}
+
+	@Test
+	void testWatcherSemanticsWhenRegisteredAtInstanceLevelWithTestInstanceLifecyclePerMethod() {
+		Class<?> testClass = TestInstancePerMethodInstanceLevelTestWatcherTestCase.class;
+		assertStatsForAbstractDisabledMethodsTestCase(testClass);
+
+		// Since the TestWatcher is registered at the instance level with test instance
+		// lifecycle per-method semantics, we get a "testDisabled" event only for the @Test
+		// method and NOT for the @RepeatedTest container.
+		assertThat(TrackingTestWatcher.results.get("testDisabled")).containsExactly("test");
+	}
+
+	@Test
+	void testWatcherSemanticsWhenRegisteredAtMethodLevel() {
+		Class<?> testClass = MethodLevelTestWatcherTestCase.class;
+		assertStatsForAbstractDisabledMethodsTestCase(testClass);
+
+		// We get "testDisabled" events for the @Test method and the @RepeatedTest container.
+		assertThat(TrackingTestWatcher.results.get("testDisabled")).containsExactly("test", "repeatedTest");
+	}
+
 	private void assertCommonStatistics(EngineExecutionResults results) {
 		results.containerEvents().assertStatistics(stats -> stats.started(3).succeeded(3).failed(0));
 		results.testEvents().assertStatistics(stats -> stats.skipped(2).started(6).succeeded(2).aborted(2).failed(2));
 	}
 
+	private void assertStatsForAbstractDisabledMethodsTestCase(Class<?> testClass) {
+		EngineExecutionResults results = executeTestsForClass(testClass);
+
+		results.containerEvents().assertStatistics(//
+			stats -> stats.skipped(1).started(2).succeeded(2).aborted(0).failed(0));
+		results.testEvents().assertStatistics(//
+			stats -> stats.skipped(1).started(0).succeeded(0).aborted(0).failed(0));
+
+		assertThat(TrackingTestWatcher.results.keySet()).containsExactly("testDisabled");
+	}
+
 	// -------------------------------------------------------------------------
 
 	private static abstract class AbstractTestCase {
@@ -251,6 +306,61 @@ static class ProblematicConstructorTestCase extends AbstractTestCase {
 		}
 	}
 
+	@TestMethodOrder(OrderAnnotation.class)
+	private static abstract class AbstractDisabledMethodsTestCase {
+
+		@Disabled
+		@Test
+		@Order(1)
+		void test() {
+		}
+
+		@Disabled
+		@RepeatedTest(2)
+		@Order(2)
+		void repeatedTest() {
+		}
+	}
+
+	static class ClassLevelTestWatcherTestCase extends AbstractDisabledMethodsTestCase {
+
+		@RegisterExtension
+		static TestWatcher watcher = new TrackingTestWatcher();
+	}
+
+	@TestInstance(Lifecycle.PER_CLASS)
+	static class TestInstancePerClassInstanceLevelTestWatcherTestCase extends AbstractDisabledMethodsTestCase {
+
+		@RegisterExtension
+		TestWatcher watcher = new TrackingTestWatcher();
+	}
+
+	@TestInstance(Lifecycle.PER_METHOD)
+	static class TestInstancePerMethodInstanceLevelTestWatcherTestCase extends AbstractDisabledMethodsTestCase {
+
+		@RegisterExtension
+		TestWatcher watcher = new TrackingTestWatcher();
+	}
+
+	static class MethodLevelTestWatcherTestCase extends AbstractDisabledMethodsTestCase {
+
+		@Override
+		@Disabled
+		@Test
+		@Order(1)
+		@ExtendWith(TrackingTestWatcher.class)
+		void test() {
+		}
+
+		@Override
+		@Disabled
+		@RepeatedTest(1)
+		@Order(2)
+		@ExtendWith(TrackingTestWatcher.class)
+		void repeatedTest() {
+		}
+	}
+
 	private static class TrackingTestWatcher implements TestWatcher {
 
 		private static final Map<String, List<String>> results = new HashMap<>();

From 437d43788a04c8a3fbbaf25f8d108b0684dcf274 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 17 Jun 2023 18:11:34 +0200
Subject: [PATCH 1388/1433] Fix cross reference links to definitions of test
 classes and methods

Closes #3362
---
 .../docs/asciidoc/user-guide/extensions.adoc  | 21 +++++++++----------
 .../asciidoc/user-guide/writing-tests.adoc    | 11 +++++-----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
index 3a40dad9bf7a..09ca2ec5e88b 100644
--- a/documentation/src/docs/asciidoc/user-guide/extensions.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -405,11 +405,11 @@ test instance, invoking custom de-initialization methods on the test instance, e
 runtime.
 
 If a _test class_ constructor, _test method_, or _lifecycle method_ (see
-<<writing-tests-classes-and-methods>>) declares a parameter, the parameter must be
-_resolved_ at runtime by a `ParameterResolver`. A `ParameterResolver` can either be
-built-in (see `{TestInfoParameterResolver}`) or <<extensions-registration,registered by
-the user>>. Generally speaking, parameters may be resolved by _name_, _type_,
-_annotation_, or any combination thereof.
+<<writing-tests-definitions>>) declares a parameter, the parameter must be _resolved_ at
+runtime by a `ParameterResolver`. A `ParameterResolver` can either be built-in (see
+`{TestInfoParameterResolver}`) or <<extensions-registration,registered by the user>>.
+Generally speaking, parameters may be resolved by _name_, _type_, _annotation_, or any
+combination thereof.
 
 If you wish to implement a custom `{ParameterResolver}` that resolves parameters based
 solely on the type of the parameter, you may find it convenient to extend the
@@ -455,8 +455,8 @@ information for the following events.
 * `testFailed`: invoked after a _test method_ has failed
 
 NOTE: In contrast to the definition of "test method" presented in
-<<writing-tests-classes-and-methods>>, in this context _test method_ refers to any `@Test`
-method or `@TestTemplate` method (for example, a `@RepeatedTest` or `@ParameterizedTest`).
+<<writing-tests-definitions>>, in this context _test method_ refers to any `@Test` method
+or `@TestTemplate` method (for example, a `@RepeatedTest` or `@ParameterizedTest`).
 
 Extensions implementing this interface can be registered at the class level, instance
 level, or method level. When registered at the class level, a `TestWatcher` will be
@@ -840,7 +840,7 @@ callbacks implemented by `Extension2`. `Extension1` is therefore said to _wrap_
 `Extension2`.
 
 JUnit Jupiter also guarantees _wrapping_ behavior within class and interface hierarchies
-for user-supplied _lifecycle methods_ (see <<writing-tests-classes-and-methods>>).
+for user-supplied _lifecycle methods_ (see <<writing-tests-definitions>>).
 
 * `@BeforeAll` methods are inherited from superclasses as long as they are not _hidden_,
   _overridden_, or _superseded_ (i.e., replaced based on signature only, irrespective of
@@ -988,7 +988,6 @@ image::extensions_BrokenLifecycleMethodConfigDemo.png[caption='',title='BrokenLi
 [TIP]
 ====
 Due to the aforementioned behavior, the JUnit Team recommends that developers declare at
-most one of each type of _lifecycle method_ (see <<writing-tests-classes-and-methods>>)
-per test class or test interface unless there are no dependencies between such lifecycle
-methods.
+most one of each type of _lifecycle method_ (see <<writing-tests-definitions>>) per test
+class or test interface unless there are no dependencies between such lifecycle methods.
 ====
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 142f752e47c3..b6cc23c33f9c 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -592,8 +592,7 @@ deterministic but intentionally nonobvious. This ensures that subsequent runs of
 suite execute test classes and test methods in the same order, thereby allowing for
 repeatable builds.
 
-NOTE: See <<writing-tests-classes-and-methods>> for a definition of _test method_ and
-_test class_.
+NOTE: See <<writing-tests-definitions>> for a definition of _test method_ and _test class_.
 
 [[writing-tests-test-execution-order-methods]]
 ==== Method Order
@@ -728,8 +727,8 @@ include::{testDir}/example/OrderedNestedTestClassesDemo.java[tags=user_guide]
 In order to allow individual test methods to be executed in isolation and to avoid
 unexpected side effects due to mutable test instance state, JUnit creates a new instance
 of each test class before executing each _test method_ (see
-<<writing-tests-classes-and-methods>>). This "per-method" test instance lifecycle is the
-default behavior in JUnit Jupiter and is analogous to all previous versions of JUnit.
+<<writing-tests-definitions>>). This "per-method" test instance lifecycle is the default
+behavior in JUnit Jupiter and is analogous to all previous versions of JUnit.
 
 NOTE: Please note that the test class will still be instantiated if a given _test method_
 is _disabled_ via a <<writing-tests-conditional-execution,condition>> (e.g., `@Disabled`,
@@ -840,8 +839,8 @@ constructors and methods.
 
 `{ParameterResolver}` defines the API for test extensions that wish to _dynamically_
 resolve parameters at runtime. If a _test class_ constructor, a _test method_, or a
-_lifecycle method_ (see <<writing-tests-classes-and-methods>>) accepts a parameter, the
-parameter must be resolved at runtime by a registered `ParameterResolver`.
+_lifecycle method_ (see <<writing-tests-definitions>>) accepts a parameter, the parameter
+must be resolved at runtime by a registered `ParameterResolver`.
 
 There are currently three built-in resolvers that are registered automatically.
 

From eb35aa9cdecd71f49af177f2cad32f5257311874 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 18 Jun 2023 17:32:08 +0200
Subject: [PATCH 1389/1433] Extend SelectMethod annotation attributes

The annotation now allows using fully qualified method names or,
alternatively, a simple method name along with either a type reference
or name, and either an array of parameter types references or a
comma-separated string of parameter type names.

Resolves #3324.
---
 .../platform/suite/api/SelectMethod.java      |  73 ++++++++-
 .../commons/AdditionalDiscoverySelectors.java |   7 -
 .../SuiteLauncherDiscoveryRequestBuilder.java |  68 ++++++++-
 ...eLauncherDiscoveryRequestBuilderTests.java | 140 ++++++++++++++----
 .../engine/testsuites/SelectMethodsSuite.java |   2 +-
 5 files changed, 249 insertions(+), 41 deletions(-)

diff --git a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
index b83fd420405a..a1313a343398 100644
--- a/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
+++ b/junit-platform-suite-api/src/main/java/org/junit/platform/suite/api/SelectMethod.java
@@ -30,7 +30,11 @@
  * @since 1.10
  * @see Suite
  * @see org.junit.platform.runner.JUnitPlatform
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectMethod(String)
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectMethod(String, String, String)
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectMethod(String, String, Class...)
  * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectMethod(Class, String, String)
+ * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectMethod(Class, String, Class...)
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
@@ -40,15 +44,74 @@
 @Repeatable(SelectMethods.class)
 public @interface SelectMethod {
 
+	/**
+	 * The <em>fully qualified method name</em> of the method to select.
+	 *
+	 * <p>The following formats are supported.
+	 *
+	 * <ul>
+	 * <li>{@code [fully qualified class name]#[methodName]}</li>
+	 * <li>{@code [fully qualified class name]#[methodName](parameter type list)}
+	 * </ul>
+	 *
+	 * <p>The <em>parameter type list</em> is a comma-separated list of primitive
+	 * names or fully qualified class names for the types of parameters accepted
+	 * by the method.
+	 *
+	 * <p>Array parameter types may be specified using either the JVM's internal
+	 * String representation (e.g., {@code [[I} for {@code int[][]},
+	 * {@code [Ljava.lang.String;} for {@code java.lang.String[]}, etc.) or
+	 * <em>source code syntax</em> (e.g., {@code int[][]}, {@code java.lang.String[]},
+	 * etc.).
+	 *
+	 * <table class="plain">
+	 * <caption>Examples</caption>
+	 * <tr><th>Method</th><th>Fully Qualified Method Name</th></tr>
+	 * <tr><td>{@code java.lang.String.chars()}</td><td>{@code java.lang.String#chars}</td></tr>
+	 * <tr><td>{@code java.lang.String.chars()}</td><td>{@code java.lang.String#chars()}</td></tr>
+	 * <tr><td>{@code java.lang.String.equalsIgnoreCase(String)}</td><td>{@code java.lang.String#equalsIgnoreCase(java.lang.String)}</td></tr>
+	 * <tr><td>{@code java.lang.String.substring(int, int)}</td><td>{@code java.lang.String#substring(int, int)}</td></tr>
+	 * <tr><td>{@code example.Calc.avg(int[])}</td><td>{@code example.Calc#avg([I)}</td></tr>
+	 * <tr><td>{@code example.Calc.avg(int[])}</td><td>{@code example.Calc#avg(int[])}</td></tr>
+	 * <tr><td>{@code example.Matrix.multiply(double[][])}</td><td>{@code example.Matrix#multiply([[D)}</td></tr>
+	 * <tr><td>{@code example.Matrix.multiply(double[][])}</td><td>{@code example.Matrix#multiply(double[][])}</td></tr>
+	 * <tr><td>{@code example.Service.process(String[])}</td><td>{@code example.Service#process([Ljava.lang.String;)}</td></tr>
+	 * <tr><td>{@code example.Service.process(String[])}</td><td>{@code example.Service#process(java.lang.String[])}</td></tr>
+	 * <tr><td>{@code example.Service.process(String[][])}</td><td>{@code example.Service#process([[Ljava.lang.String;)}</td></tr>
+	 * <tr><td>{@code example.Service.process(String[][])}</td><td>{@code example.Service#process(java.lang.String[][])}</td></tr>
+	 * </table>
+	 *
+	 * <p>Cannot be combined with any other attribute.
+	 *
+	 * @see org.junit.platform.engine.discovery.DiscoverySelectors#selectMethod(String)
+	 */
+	String value() default "";
+
 	/**
 	 * The class in which the method is declared, or a subclass thereof.
+	 *
+	 * <p>Cannot be used in conjunction with {@link #typeName()}.
+	 */
+	Class<?> type() default Class.class;
+
+	/**
+	 * The <em>fully qualified class name</em> in which the method is declared, or a subclass thereof.
+	 *
+	 * <p>Cannot be used in conjunction with {@link #type()}.
 	 */
-	Class<?> clazz();
+	String typeName() default "";
 
 	/**
-	 * The name of the method to select; never blank.
+	 * The name of the method to select; never blank unless {@link #value()} is used.
 	 */
-	String name();
+	String name() default "";
+
+	/**
+	 * The parameter types of the method to select.
+	 *
+	 * <p>Cannot be used in conjunction with {@link #parameterTypeNames()}.
+	 */
+	Class<?>[] parameterTypes() default {};
 
 	/**
 	 * The parameter types of the method to select.
@@ -81,7 +144,9 @@
 	 * <tr><td>{@code example.Service.process(String[][])}</td><td>{@code [[Ljava.lang.String;}</td></tr>
 	 * <tr><td>{@code example.Service.process(String[][])}</td><td>{@code java.lang.String[][]}</td></tr>
 	 * </table>
+	 *
+	 * <p>Cannot be used in conjunction with {@link #parameterTypes()}.
 	 */
-	String parameters() default "";
+	String parameterTypeNames() default "";
 
 }
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
index 188385080855..65e6c3504190 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/AdditionalDiscoverySelectors.java
@@ -23,7 +23,6 @@
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.engine.discovery.FilePosition;
 import org.junit.platform.engine.discovery.FileSelector;
-import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.ModuleSelector;
 import org.junit.platform.engine.discovery.PackageSelector;
 import org.junit.platform.engine.discovery.UriSelector;
@@ -82,12 +81,6 @@ static Stream<ClassSelector> selectClasses(String... classNames) {
 		return uniqueStreamOf(classNames).map(DiscoverySelectors::selectClass);
 	}
 
-	static MethodSelector selectMethod(Class<?> clazz, String name, String parameterTypeNames) {
-		Preconditions.notBlank(name, "Method name must not be null or blank");
-		Preconditions.notNull(parameterTypeNames, "parameter type names must not be null");
-		return DiscoverySelectors.selectMethod(clazz, name, parameterTypeNames);
-	}
-
 	static List<ModuleSelector> selectModules(String... moduleNames) {
 		Preconditions.notNull(moduleNames, "Module names must not be null");
 		Preconditions.containsNoNullElements(moduleNames, "Individual module names must not be null");
diff --git a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
index 08cb4aea20fa..c94b8009aaf8 100644
--- a/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
+++ b/junit-platform-suite-commons/src/main/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilder.java
@@ -38,6 +38,7 @@
 import org.junit.platform.engine.Filter;
 import org.junit.platform.engine.discovery.ClassNameFilter;
 import org.junit.platform.engine.discovery.ClassSelector;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.engine.discovery.MethodSelector;
 import org.junit.platform.engine.discovery.PackageNameFilter;
 import org.junit.platform.launcher.EngineFilter;
@@ -155,7 +156,7 @@ public SuiteLauncherDiscoveryRequestBuilder suite(Class<?> suiteClass) {
 				.ifPresent(this::selectors);
 		findRepeatableAnnotations(suiteClass, SelectMethod.class)
 				.stream()
-				.map(annotation -> selectMethod(annotation.clazz(), annotation.name(), annotation.parameters()))
+				.map(annotation -> selectMethod(suiteClass, annotation))
 				.forEach(this::selectors);
 		findAnnotationValues(suiteClass, IncludeClassNamePatterns.class, IncludeClassNamePatterns::value)
 				.flatMap(SuiteLauncherDiscoveryRequestBuilder::trimmed)
@@ -226,9 +227,68 @@ private static Stream<ClassSelector> toClassSelectors(Class<?> suiteClass, Selec
 		);
 	}
 
-	private MethodSelector selectMethod(Class<?> clazz, String name, String parameters) {
-		selectedClassNames.add(clazz.getName());
-		return AdditionalDiscoverySelectors.selectMethod(clazz, name, parameters);
+	private MethodSelector selectMethod(Class<?> suiteClass, SelectMethod annotation) {
+		MethodSelector methodSelector = toMethodSelector(suiteClass, annotation);
+		selectedClassNames.add(methodSelector.getClassName());
+		return methodSelector;
+	}
+
+	private MethodSelector toMethodSelector(Class<?> suiteClass, SelectMethod annotation) {
+		if (!annotation.value().isEmpty()) {
+			Preconditions.condition(annotation.type() == Class.class,
+				() -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+					"type must not be set in conjunction with fully qualified method name"));
+			Preconditions.condition(annotation.typeName().isEmpty(),
+				() -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+					"type name must not be set in conjunction with fully qualified method name"));
+			Preconditions.condition(annotation.name().isEmpty(),
+				() -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+					"method name must not be set in conjunction with fully qualified method name"));
+			Preconditions.condition(annotation.parameterTypes().length == 0,
+				() -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+					"parameter types must not be set in conjunction with fully qualified method name"));
+			Preconditions.condition(annotation.parameterTypeNames().isEmpty(),
+				() -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+					"parameter type names must not be set in conjunction with fully qualified method name"));
+
+			return DiscoverySelectors.selectMethod(annotation.value());
+		}
+
+		Class<?> type = annotation.type() == Class.class ? null : annotation.type();
+		String typeName = annotation.typeName().isEmpty() ? null : annotation.typeName().trim();
+		String methodName = Preconditions.notBlank(annotation.name(),
+			() -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass, "method name must not be blank"));
+		Class<?>[] parameterTypes = annotation.parameterTypes().length == 0 ? null : annotation.parameterTypes();
+		String parameterTypeNames = annotation.parameterTypeNames().trim();
+		if (parameterTypes != null) {
+			Preconditions.condition(parameterTypeNames.isEmpty(),
+				() -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+					"either parameter type names or parameter types must be set but not both"));
+		}
+		if (type == null) {
+			Preconditions.notBlank(typeName, () -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+				"type must be set or type name must not be blank"));
+			if (parameterTypes == null) {
+				return DiscoverySelectors.selectMethod(typeName, methodName, parameterTypeNames);
+			}
+			else {
+				return DiscoverySelectors.selectMethod(typeName, methodName, parameterTypes);
+			}
+		}
+		else {
+			Preconditions.condition(typeName == null, () -> prefixErrorMessageForInvalidSelectMethodUsage(suiteClass,
+				"either type name or type must be set but not both"));
+			if (parameterTypes == null) {
+				return DiscoverySelectors.selectMethod(type, methodName, parameterTypeNames);
+			}
+			else {
+				return DiscoverySelectors.selectMethod(type, methodName, parameterTypes);
+			}
+		}
+	}
+
+	private static String prefixErrorMessageForInvalidSelectMethodUsage(Class<?> suiteClass, String detailMessage) {
+		return String.format("@SelectMethod on class [%s]: %s", suiteClass.getName(), detailMessage);
 	}
 
 	private ClassNameFilter createIncludeClassNameFilter(String... patterns) {
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
index bafc67b02370..55aa8d6eaa04 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/commons/SuiteLauncherDiscoveryRequestBuilderTests.java
@@ -10,11 +10,14 @@
 
 package org.junit.platform.suite.commons;
 
+import static java.util.Map.entry;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilder.request;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -26,8 +29,11 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
+import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.CollectionUtils;
@@ -72,7 +78,7 @@
 
 class SuiteLauncherDiscoveryRequestBuilderTests {
 
-	SuiteLauncherDiscoveryRequestBuilder builder = SuiteLauncherDiscoveryRequestBuilder.request();
+	SuiteLauncherDiscoveryRequestBuilder builder = request();
 
 	@Test
 	void configurationParameter() {
@@ -249,40 +255,68 @@ class Suite {
 	static class NonLocalTestCase {
 	}
 
-	@Test
-	void selectOneMethodWithNoParameters() {
-		@SuppressWarnings("unused")
-		class TestClass {
-			void testMethod() {
-			}
+	@TestFactory
+	Stream<DynamicTest> selectOneMethodWithNoParameters() {
+		@SelectMethod("org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilderTests$NoParameterTestCase#testMethod")
+		class SuiteA {
 		}
-		@SelectMethod(clazz = TestClass.class, name = "testMethod")
-		class Suite {
+		@SelectMethod(type = NoParameterTestCase.class, name = "testMethod")
+		class SuiteB {
+		}
+		@SelectMethod(typeName = "org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilderTests$NoParameterTestCase", name = "testMethod")
+		class SuiteC {
 		}
 
-		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
-		List<MethodSelector> selectors = request.getSelectorsByType(MethodSelector.class);
-		assertEquals(DiscoverySelectors.selectMethod(TestClass.class, "testMethod"), exactlyOne(selectors));
+		return Stream.of(SuiteA.class, SuiteB.class, SuiteC.class) //
+				.map(suiteClass -> dynamicTest(suiteClass.getSimpleName(), () -> {
+					LauncherDiscoveryRequest request = request().suite(suiteClass).build();
+					List<MethodSelector> selectors = request.getSelectorsByType(MethodSelector.class);
+					assertEquals(DiscoverySelectors.selectMethod(NoParameterTestCase.class, "testMethod"),
+						exactlyOne(selectors));
+				}));
 	}
 
-	@Test
-	void selectOneMethodWithOneParameters() {
+	static class NoParameterTestCase {
 		@SuppressWarnings("unused")
-		class TestClass {
-			void testMethod(int i) {
-			}
+		void testMethod() {
 		}
-		@SelectMethod(clazz = TestClass.class, name = "testMethod", parameters = "int")
-		class Suite {
+	}
+
+	@TestFactory
+	Stream<DynamicTest> selectOneMethodWithOneParameter() {
+		@SelectMethod("org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilderTests$OneParameterTestCase#testMethod(int)")
+		class SuiteA {
+		}
+		@SelectMethod(type = OneParameterTestCase.class, name = "testMethod", parameterTypeNames = "int")
+		class SuiteB {
+		}
+		@SelectMethod(type = OneParameterTestCase.class, name = "testMethod", parameterTypes = int.class)
+		class SuiteC {
+		}
+		@SelectMethod(typeName = "org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilderTests$OneParameterTestCase", name = "testMethod", parameterTypeNames = "int")
+		class SuiteD {
+		}
+		@SelectMethod(typeName = "org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilderTests$OneParameterTestCase", name = "testMethod", parameterTypes = int.class)
+		class SuiteE {
 		}
 
-		LauncherDiscoveryRequest request = builder.suite(Suite.class).build();
-		List<MethodSelector> selectors = request.getSelectorsByType(MethodSelector.class);
-		assertEquals(DiscoverySelectors.selectMethod(TestClass.class, "testMethod", "int"), exactlyOne(selectors));
+		return Stream.of(SuiteA.class, SuiteB.class, SuiteC.class, SuiteD.class, SuiteE.class) //
+				.map(suiteClass -> dynamicTest(suiteClass.getSimpleName(), () -> {
+					LauncherDiscoveryRequest request = request().suite(suiteClass).build();
+					List<MethodSelector> selectors = request.getSelectorsByType(MethodSelector.class);
+					assertEquals(DiscoverySelectors.selectMethod(OneParameterTestCase.class, "testMethod", "int"),
+						exactlyOne(selectors));
+				}));
+	}
+
+	static class OneParameterTestCase {
+		@SuppressWarnings("unused")
+		void testMethod(int i) {
+		}
 	}
 
 	@Test
-	void selectTwoMethodWithTwoParameters() {
+	void selectTwoMethodsWithTwoParameters() {
 		@SuppressWarnings("unused")
 		class TestClass {
 			void firstTestMethod(int i, String j) {
@@ -291,8 +325,9 @@ void firstTestMethod(int i, String j) {
 			void secondTestMethod(boolean i, float j) {
 			}
 		}
-		@SelectMethod(clazz = TestClass.class, name = "firstTestMethod", parameters = "int, java.lang.String")
-		@SelectMethod(clazz = TestClass.class, name = "secondTestMethod", parameters = "boolean, float")
+		@SelectMethod(type = TestClass.class, name = "firstTestMethod", parameterTypeNames = "int, java.lang.String")
+		@SelectMethod(type = TestClass.class, name = "secondTestMethod", parameterTypes = { boolean.class,
+				float.class })
 		class Suite {
 		}
 
@@ -305,6 +340,61 @@ class Suite {
 			selectors.get(1));
 	}
 
+	@TestFactory
+	Stream<DynamicTest> selectMethodCausesExceptionOnInvalidUsage() {
+		@SelectMethod(value = "irrelevant", type = NoParameterTestCase.class)
+		class ValueAndType {
+		}
+		@SelectMethod(value = "SomeClass#someMethod", typeName = "org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilderTests$NoParameterTestCase")
+		class ValueAndTypeName {
+		}
+		@SelectMethod(value = "SomeClass#someMethod", name = "testMethod")
+		class ValueAndMethodName {
+		}
+		@SelectMethod(value = "SomeClass#someMethod", parameterTypes = int.class)
+		class ValueAndParameterTypes {
+		}
+		@SelectMethod(value = "SomeClass#someMethod", parameterTypeNames = "int")
+		class ValueAndParameterTypeNames {
+		}
+		@SelectMethod(type = NoParameterTestCase.class)
+		class MissingMethodName {
+		}
+		@SelectMethod(name = "testMethod", type = NoParameterTestCase.class, typeName = "org.junit.platform.suite.commons.SuiteLauncherDiscoveryRequestBuilderTests$NoParameterTestCase")
+		class TypeAndTypeName {
+		}
+		@SelectMethod(name = "testMethod", parameterTypes = int.class, parameterTypeNames = "int")
+		class ParameterTypesAndParameterTypeNames {
+		}
+
+		var expectedFailureMessages = Map.ofEntries( //
+			entry(ValueAndType.class, "type must not be set in conjunction with fully qualified method name"), //
+			entry(ValueAndTypeName.class, "type name must not be set in conjunction with fully qualified method name"), //
+			entry(ValueAndMethodName.class,
+				"method name must not be set in conjunction with fully qualified method name"), //
+			entry(ValueAndParameterTypes.class,
+				"parameter types must not be set in conjunction with fully qualified method name"), //
+			entry(ValueAndParameterTypeNames.class,
+				"parameter type names must not be set in conjunction with fully qualified method name"), //
+			entry(MissingMethodName.class, "method name must not be blank"), //
+			entry(TypeAndTypeName.class, "either type name or type must be set but not both"), //
+			entry(ParameterTypesAndParameterTypeNames.class,
+				"either parameter type names or parameter types must be set but not both") //
+		);
+		return expectedFailureMessages.entrySet().stream() //
+				.map(entry -> {
+					Class<?> suiteClassName = entry.getKey();
+					var expectedFailureMessage = entry.getValue();
+					return dynamicTest(suiteClassName.getSimpleName(), () -> {
+						var ex = assertThrows(PreconditionViolationException.class,
+							() -> request().suite(suiteClassName));
+						assertEquals(
+							"@SelectMethod on class [" + suiteClassName.getName() + "]: " + expectedFailureMessage,
+							ex.getMessage());
+					});
+				});
+	}
+
 	@Test
 	void selectClasspathResource() {
 		@SelectClasspathResource("com.example.testcases")
diff --git a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectMethodsSuite.java b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectMethodsSuite.java
index 1e9712e5e156..49184c267e23 100644
--- a/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectMethodsSuite.java
+++ b/platform-tests/src/test/java/org/junit/platform/suite/engine/testsuites/SelectMethodsSuite.java
@@ -18,6 +18,6 @@
  * @since 1.10
  */
 @Suite
-@SelectMethod(clazz = MultipleTestsTestCase.class, name = "test")
+@SelectMethod(type = MultipleTestsTestCase.class, name = "test")
 public class SelectMethodsSuite {
 }

From 4cadc8aa6c9560ac6a63c79f6866facb687b4c9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 05:59:19 +0000
Subject: [PATCH 1390/1433] Bump org.mockito:mockito-junit-jupiter from 5.3.1
 to 5.4.0

Bumps [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.3.1...v5.4.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 241b6fc2e5f7..60ab657af65c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.2" }
 mavenSurefirePlugin = { module = "org.apache.maven.plugins:maven-surefire-plugin", version.ref = "surefire" }
 memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.6.1" }
-mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.3.1" }
+mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.4.0" }
 opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
 openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
 openTestReporting-tooling = { module = "org.opentest4j.reporting:open-test-reporting-tooling", version.ref = "openTestReporting" }

From bc37aab6693b7f3839d42916c754f0b265009cf2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 25 Jun 2023 09:30:53 +0200
Subject: [PATCH 1391/1433] Document ClassOrderer wrt. parallel execution

Resolves #3007.
---
 .../src/docs/asciidoc/user-guide/writing-tests.adoc    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index b6cc23c33f9c..97991db4fb86 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -664,8 +664,8 @@ dependencies between test classes, or you may wish to order test classes to opti
 time as outlined in the following scenarios.
 
 * Run previously failing tests and faster tests first: "fail fast" mode
-* With parallel execution enabled, run longer tests first: "shortest test plan execution
-  duration" mode
+* With parallel execution enabled, schedule longer tests first: "shortest test plan
+  execution duration" mode
 * Various other use cases
 
 To configure test class execution order _globally_ for the entire test suite, use the
@@ -2302,6 +2302,12 @@ might conflict with the configured execution order. Thus, in both cases, test me
 such test classes are only executed concurrently if the `@Execution(CONCURRENT)`
 annotation is present on the test class or method.
 
+When parallel execution is enabled and a default `{ClassOrderer}` (see
+<<writing-tests-test-execution-order-classes>> for details) is registered, top-level test
+classes will initially be sorted accordingly and scheduled in that order. However, they
+are not guaranteed to be started in exactly that order since the threads they are executed
+on are not controlled directly by JUnit.
+
 All nodes of the test tree that are configured with the `CONCURRENT` execution mode will
 be executed fully in parallel according to the provided
 <<writing-tests-parallel-execution-config, configuration>> while observing the

From 1cc43af91de3984ed441283f2269502db9ffad93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 05:58:14 +0000
Subject: [PATCH 1392/1433] Bump com.gradle:gradle-enterprise-gradle-plugin
 from 3.13.3 to 3.13.4

Bumps com.gradle:gradle-enterprise-gradle-plugin from 3.13.3 to 3.13.4.

---
updated-dependencies:
- dependency-name: com.gradle:gradle-enterprise-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 60ab657af65c..cca8b8d605c0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -33,7 +33,7 @@ classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.160" }
 commons-io = { module = "commons-io:commons-io", version = "2.13.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.11" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
-gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.3" }
+gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.4" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.19.0" }

From 649c9a85fe99087cca9335f3b4cd8024750695c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 05:58:22 +0000
Subject: [PATCH 1393/1433] Bump com.puppycrawl.tools:checkstyle from 10.12.0
 to 10.12.1

Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.12.0 to 10.12.1.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.12.0...checkstyle-10.12.1)

---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cca8b8d605c0..6c9ad74561ca 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ asciidoctor-pdf = "1.5.3"
 asciidoctor-plugins = "4.0.0-alpha.1" # Check if workaround in documentation.gradle.kts can be removed when upgrading
 assertj = "3.24.2"
 bnd = "6.4.0"
-checkstyle = "10.12.0"
+checkstyle = "10.12.1"
 gradleVersionsPlugin = "0.47.0"
 jacoco = "0.8.7"
 jmh = "1.36"

From 309a696f4f7a2cda191521b43b0f2482832a6123 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Wed, 28 Jun 2023 20:41:23 +0200
Subject: [PATCH 1394/1433] Revise stacktrace pruning (#3364)

Resolves #3299.
---
 .../release-notes-5.10.0-RC1.adoc             |   5 +-
 .../asciidoc/user-guide/running-tests.adoc    |  19 ++-
 .../junitbuild.testing-conventions.gradle.kts |   1 -
 .../platform/commons/util/ExceptionUtils.java |  33 +++--
 .../junit/platform/engine/TestDescriptor.java |  20 +++
 .../platform/launcher/LauncherConstants.java  |  44 -------
 .../core/EngineExecutionOrchestrator.java     |   6 +-
 ...ckTracePruningEngineExecutionListener.java |  46 ++++---
 .../platform/StackTracePruningTests.java      | 117 ++++++++++++------
 .../commons/util/ExceptionUtilsTests.java     |  55 ++++----
 .../AbstractTestDescriptorTests.java          |  32 ++++-
 .../launcher/core/LauncherFactoryTests.java   |   4 +-
 ...egacyXmlReportGeneratingListenerTests.java |   4 +-
 13 files changed, 224 insertions(+), 162 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index c3a9bdaea88f..4524496a0b36 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -33,7 +33,10 @@ JUnit repository on GitHub.
 * New `selectMethod()` and `selectNestedMethod()` variants in `DiscoverySelectors` that
   accept a `Class<?>...` argument of parameter types as a type-safe alternative to
   providing the names of parameter types as a comma-delimited string.
-
+* Stack trace pruning has been revised and now only removes calls from the `org.junit`,
+  `jdk.internal.reflect`, and `sun.reflect` packages. Please refer to the
+  <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
+* New `getAncestors()` method in `TestDescriptor`.
 
 [[release-notes-5.10.0-RC1-junit-jupiter]]
 === JUnit Jupiter
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 8461b9bc7c1f..35915254fd95 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -1138,18 +1138,13 @@ Since version 1.10, the JUnit Platform provides built-in support for pruning sta
 produced by failing tests. This feature can be enabled or disabled via the
 `junit.platform.stacktrace.pruning.enabled` _configuration parameter_.
 
-By default, all calls from the `org.junit`, `java`, and `jdk` packages are removed from the
-stack trace. You can also configure the JUnit Platform to exclude different or additional
-calls. To do this, provide a pattern for the `junit.platform.stacktrace.pruning.pattern`
-_configuration parameter_ to specify which fully qualified class names should be excluded
-from the stack traces.
-
-In addition, and independently of the provided pattern, all elements prior to and
-including the first call from the JUnit Platform Launcher will be removed.
-
-NOTE: Since they provide necessary insights to understand a test failure, calls to
-`{Assertions}` or `{Assumptions}` will never be excluded from stack traces even though
-they are part of the `org.junit` package.
+If enabled, all calls from the `org.junit`, `jdk.internal.reflect`, and `sun.reflect`
+packages are removed from the stack trace, unless they are subsequent to the test itself
+or any of its ancestors. For that reason, calls to `{Assertions}` or `{Assumptions}` will
+never be excluded.
+
+In addition, all elements prior to and including the first call from the JUnit Platform
+Launcher will be removed.
 
 [[stacktrace-pruning-pattern]]
 ==== Pattern Matching Syntax
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
index 122db6b5b5af..8a1cdd89955f 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
@@ -41,7 +41,6 @@ tasks.withType<Test>().configureEach {
 		server.set(uri("https://ge.junit.org"))
 	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
-	systemProperty("junit.platform.stacktrace.pruning.enabled", false)
 	// Required until ASM officially supports the JDK 14
 	systemProperty("net.bytebuddy.experimental", true)
 	if (buildParameters.testing.enableJFR) {
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
index 64f59d12d5fb..7b108da8070f 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -42,6 +42,9 @@ public final class ExceptionUtils {
 
 	private static final String JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX = "org.junit.platform.launcher.";
 
+	private static final Predicate<String> STACK_TRACE_ELEMENT_FILTER = ClassNamePatternFilterUtils //
+			.excludeMatchingClassNames("org.junit.*,jdk.internal.reflect.*,sun.reflect.*");
+
 	private ExceptionUtils() {
 		/* no-op */
 	}
@@ -92,38 +95,44 @@ public static String readStackTrace(Throwable throwable) {
 	}
 
 	/**
-	 * Prune the stack trace of the supplied {@link Throwable} by filtering its
-	 * elements using the supplied {@link Predicate}, except for
-	 * {@code org.junit.jupiter.api.Assertions} and
-	 * {@code org.junit.jupiter.api.Assumptions} that will always remain
-	 * present.
+	 * Prune the stack trace of the supplied {@link Throwable} by removing
+	 * elements from the {@code org.junit}, {@code jdk.internal.reflect} and
+	 * {@code sun.reflect} packages. If an element matching one of the supplied
+	 * class names is encountered, all following elements will be kept regardless.
 	 *
 	 * <p>Additionally, all elements prior to and including the first
 	 * JUnit Launcher call will be removed.
 	 *
 	 * @param throwable the {@code Throwable} whose stack trace should be
 	 * pruned; never {@code null}
-	 * @param stackTraceElementFilter the {@code Predicate} used to filter
-	 * elements of the stack trace; never {@code null}
+	 * @param testClassNames the test class names that should stop the pruning
+	 * if encountered; never {@code null}
 	 *
 	 * @since 5.10
 	 */
 	@API(status = INTERNAL, since = "5.10")
-	public static void pruneStackTrace(Throwable throwable, Predicate<String> stackTraceElementFilter) {
+	public static void pruneStackTrace(Throwable throwable, List<String> testClassNames) {
 		Preconditions.notNull(throwable, "Throwable must not be null");
-		Preconditions.notNull(stackTraceElementFilter, "Predicate must not be null");
+		Preconditions.notNull(testClassNames, "List of test class names must not be null");
 
 		List<StackTraceElement> stackTrace = Arrays.asList(throwable.getStackTrace());
 		List<StackTraceElement> prunedStackTrace = new ArrayList<>();
 
 		Collections.reverse(stackTrace);
 
-		for (StackTraceElement element : stackTrace) {
+		for (int i = 0; i < stackTrace.size(); i++) {
+			StackTraceElement element = stackTrace.get(i);
 			String className = element.getClassName();
-			if (className.startsWith(JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX)) {
+
+			if (testClassNames.contains(className)) {
+				// Include all elements called by the test
+				prunedStackTrace.addAll(stackTrace.subList(i, stackTrace.size()));
+				break;
+			}
+			else if (className.startsWith(JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX)) {
 				prunedStackTrace.clear();
 			}
-			else if (stackTraceElementFilter.test(className)) {
+			else if (STACK_TRACE_ELEMENT_FILTER.test(className)) {
 				prunedStackTrace.add(element);
 			}
 		}
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
index b16a8d4319e2..7dfcecc644ca 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
@@ -106,6 +106,26 @@ default String getLegacyReportingName() {
 	 */
 	Set<? extends TestDescriptor> getChildren();
 
+	/**
+	 * Get the immutable set of all <em>ancestors</em> of this descriptor.
+	 *
+	 * <p>An <em>ancestors</em> is the parent of this descriptor or the parent
+	 * of one of its parents, recursively.
+	 *
+	 * @see #getParent()
+	 */
+	@API(status = STABLE, since = "5.10")
+	default Set<? extends TestDescriptor> getAncestors() {
+		if (!getParent().isPresent()) {
+			return Collections.emptySet();
+		}
+		TestDescriptor parent = getParent().get();
+		Set<TestDescriptor> ancestors = new LinkedHashSet<>();
+		ancestors.add(parent);
+		ancestors.addAll(parent.getAncestors());
+		return Collections.unmodifiableSet(ancestors);
+	}
+
 	/**
 	 * Get the immutable set of all <em>descendants</em> of this descriptor.
 	 *
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index bf16677f933c..af05c4ae86ee 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -174,50 +174,6 @@ public class LauncherConstants {
 	@API(status = EXPERIMENTAL, since = "1.10")
 	public static final String STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME = "junit.platform.stacktrace.pruning.enabled";
 
-	/**
-	 * Property name used to provide patterns to remove elements from stack traces.
-	 *
-	 * <h4>Pattern Matching Syntax</h4>
-	 *
-	 * <p>If the property value consists solely of an asterisk ({@code *}), all
-	 * elements will be removed. Otherwise, the property value will be treated
-	 * as a comma-separated list of patterns where each individual pattern will
-	 * be matched against the fully qualified class name (<em>FQCN</em>) of the
-	 * stack trace element. Any dot ({@code .}) in a pattern will match against
-	 * a dot ({@code .}) or a dollar sign ({@code $}) in a FQCN. Any asterisk
-	 * ({@code *}) will match against one or more characters in a FQCN. All
-	 * other characters in a pattern will be matched one-to-one against a FQCN.
-	 *
-	 * <h4>Examples</h4>
-	 *
-	 * <ul>
-	 * <li>{@code *}: remove all elements.
-	 * <li>{@code org.junit.*}: remove every element with the {@code org.junit}
-	 * base package and any of its subpackages.
-	 * <li>{@code *.MyClass}: remove every element whose simple class name is
-	 * exactly {@code MyClass}.
-	 * <li>{@code *System*, *Dev*}: exclude every element whose FQCN contains
-	 * {@code System} or {@code Dev}.
-	 * <li>{@code org.example.MyClass, org.example.TheirClass}: remove
-	 * elements whose FQCN is exactly {@code org.example.MyClass} or
-	 * {@code org.example.TheirClass}.
-	 * </ul>
-	 *
-	 * @see #STACKTRACE_PRUNING_DEFAULT_PATTERN
-	 */
-	@API(status = EXPERIMENTAL, since = "1.10")
-	public static final String STACKTRACE_PRUNING_PATTERN_PROPERTY_NAME = "junit.platform.stacktrace.pruning.pattern";
-
-	/**
-	 * Default pattern for stack trace pruning which matches the
-	 * {@code org.junit}, {@code java}, and {@code jdk} base packages as well
-	 * as any of their subpackages.
-	 *
-	 * @see #STACKTRACE_PRUNING_PATTERN_PROPERTY_NAME
-	 */
-	@API(status = EXPERIMENTAL, since = "1.10")
-	public static final String STACKTRACE_PRUNING_DEFAULT_PATTERN = "org.junit.*,java.*,jdk.*";
-
 	private LauncherConstants() {
 		/* no-op */
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index ab1a8e94b503..ed764199a3f6 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -12,9 +12,7 @@
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.junit.platform.launcher.LauncherConstants.DRY_RUN_PROPERTY_NAME;
-import static org.junit.platform.launcher.LauncherConstants.STACKTRACE_PRUNING_DEFAULT_PATTERN;
 import static org.junit.platform.launcher.LauncherConstants.STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME;
-import static org.junit.platform.launcher.LauncherConstants.STACKTRACE_PRUNING_PATTERN_PROPERTY_NAME;
 import static org.junit.platform.launcher.core.ListenerRegistry.forEngineExecutionListeners;
 
 import java.util.Optional;
@@ -179,9 +177,7 @@ private static EngineExecutionListener selectExecutionListener(EngineExecutionLi
 		boolean stackTracePruningEnabled = configurationParameters.getBoolean(STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME) //
 				.orElse(true);
 		if (stackTracePruningEnabled) {
-			String pruningPattern = configurationParameters.get(STACKTRACE_PRUNING_PATTERN_PROPERTY_NAME) //
-					.orElse(STACKTRACE_PRUNING_DEFAULT_PATTERN);
-			return new StackTracePruningEngineExecutionListener(engineExecutionListener, pruningPattern);
+			return new StackTracePruningEngineExecutionListener(engineExecutionListener);
 		}
 		return engineExecutionListener;
 	}
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StackTracePruningEngineExecutionListener.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StackTracePruningEngineExecutionListener.java
index 574ce4827d47..c183fdb683b8 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StackTracePruningEngineExecutionListener.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/StackTracePruningEngineExecutionListener.java
@@ -10,49 +10,61 @@
 
 package org.junit.platform.launcher.core;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.function.Predicate;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
-import org.junit.platform.commons.util.ClassNamePatternFilterUtils;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.engine.support.descriptor.MethodSource;
 
 /**
  * Prunes the stack trace in case of a failed event.
  *
  * @since 1.10
- * @see org.junit.platform.commons.util.ExceptionUtils#pruneStackTrace(Throwable, Predicate)
+ * @see org.junit.platform.commons.util.ExceptionUtils#pruneStackTrace(Throwable, List)
  */
 class StackTracePruningEngineExecutionListener extends DelegatingEngineExecutionListener {
 
-	private static final List<String> ALWAYS_INCLUDED_STACK_TRACE_ELEMENTS = Arrays.asList( //
-		"org.junit.jupiter.api.Assertions", //
-		"org.junit.jupiter.api.Assumptions" //
-	);
-
-	private final Predicate<String> stackTraceElementFilter;
-
-	StackTracePruningEngineExecutionListener(EngineExecutionListener delegate, String pruningPattern) {
+	StackTracePruningEngineExecutionListener(EngineExecutionListener delegate) {
 		super(delegate);
-		this.stackTraceElementFilter = ClassNamePatternFilterUtils.excludeMatchingClassNames(pruningPattern) //
-				.or(ALWAYS_INCLUDED_STACK_TRACE_ELEMENTS::contains);
 	}
 
 	@Override
 	public void executionFinished(TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) {
+		List<String> testClassNames = getTestClassNames(testDescriptor);
 		if (testExecutionResult.getThrowable().isPresent()) {
 			Throwable throwable = testExecutionResult.getThrowable().get();
 
-			ExceptionUtils.findNestedThrowables(throwable).forEach(this::pruneStackTrace);
+			ExceptionUtils.findNestedThrowables(throwable).forEach(
+				t -> ExceptionUtils.pruneStackTrace(t, testClassNames));
 		}
 		super.executionFinished(testDescriptor, testExecutionResult);
 	}
 
-	private void pruneStackTrace(Throwable throwable) {
-		ExceptionUtils.pruneStackTrace(throwable, stackTraceElementFilter);
+	private static List<String> getTestClassNames(TestDescriptor testDescriptor) {
+		return testDescriptor.getAncestors() //
+				.stream() //
+				.map(TestDescriptor::getSource) //
+				.filter(Optional::isPresent) //
+				.map(Optional::get) //
+				.map(source -> {
+					if (source instanceof ClassSource) {
+						return ((ClassSource) source).getClassName();
+					}
+					else if (source instanceof MethodSource) {
+						return ((MethodSource) source).getClassName();
+					}
+					else {
+						return null;
+					}
+				}) //
+				.filter(Objects::nonNull) //
+				.collect(Collectors.toList());
 	}
 
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/StackTracePruningTests.java b/platform-tests/src/test/java/org/junit/platform/StackTracePruningTests.java
index 397dacc3172d..d8a612bef2bc 100644
--- a/platform-tests/src/test/java/org/junit/platform/StackTracePruningTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/StackTracePruningTests.java
@@ -20,7 +20,11 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 import org.junit.platform.testkit.engine.EngineTestKit;
@@ -39,16 +43,11 @@ class StackTracePruningTests {
 	@Test
 	void shouldPruneStackTraceByDefault() {
 		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
-				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.selectors(selectMethod(FailingTestTestCase.class, "failingAssertion")) //
 				.execute();
 
 		List<StackTraceElement> stackTrace = extractStackTrace(results);
 
-		assertStackTraceMatch(stackTrace, """
-				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
-				""");
-
-		assertStackTraceDoesNotContain(stackTrace, "java.util.ArrayList.forEach(ArrayList.java:");
 		assertStackTraceDoesNotContain(stackTrace,
 			"jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:");
 	}
@@ -57,16 +56,11 @@ void shouldPruneStackTraceByDefault() {
 	void shouldPruneStackTraceWhenEnabled() {
 		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
 				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
-				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.selectors(selectMethod(FailingTestTestCase.class, "failingAssertion")) //
 				.execute();
 
 		List<StackTraceElement> stackTrace = extractStackTrace(results);
 
-		assertStackTraceMatch(stackTrace, """
-				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
-				""");
-
-		assertStackTraceDoesNotContain(stackTrace, "java.util.ArrayList.forEach(ArrayList.java:");
 		assertStackTraceDoesNotContain(stackTrace,
 			"jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:");
 	}
@@ -75,83 +69,103 @@ void shouldPruneStackTraceWhenEnabled() {
 	void shouldNotPruneStackTraceWhenDisabled() {
 		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
 				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "false") //
-				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.selectors(selectMethod(FailingTestTestCase.class, "failingAssertion")) //
 				.execute();
 
 		List<StackTraceElement> stackTrace = extractStackTrace(results);
 
 		assertStackTraceMatch(stackTrace, """
 				\\Qorg.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:\\E.+
-				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
 				>>>>
-				\\Qjava.base/java.util.ArrayList.forEach(ArrayList.java:\\E.+
+				\\Qorg.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:\\E.+
 				>>>>
 				""");
 	}
 
 	@Test
-	void shouldPruneStackTraceAccordingToPattern() {
+	void shouldAlwaysKeepJupiterAssertionStackTraceElement() {
 		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
 				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
-				.configurationParameter("junit.platform.stacktrace.pruning.pattern", "jdk.*") //
-				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.selectors(selectMethod(FailingTestTestCase.class, "failingAssertion")) //
 				.execute();
 
 		List<StackTraceElement> stackTrace = extractStackTrace(results);
 
 		assertStackTraceMatch(stackTrace, """
-				\\Qorg.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:\\E.+
-				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
 				>>>>
-				\\Qjava.base/java.util.ArrayList.forEach(ArrayList.java:\\E.+
+				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
 				>>>>
 				""");
-
-		assertStackTraceDoesNotContain(stackTrace, "jdk.");
 	}
 
 	@Test
-	void shouldAlwaysKeepJupiterAssertionStackTraceElement() {
+	void shouldAlwaysKeepJupiterAssumptionStackTraceElement() {
 		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
 				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
-				.configurationParameter("junit.platform.stacktrace.pruning.pattern", "*") //
-				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssertion")) //
+				.selectors(selectMethod(FailingTestTestCase.class, "failingAssumption")) //
 				.execute();
 
 		List<StackTraceElement> stackTrace = extractStackTrace(results);
 
 		assertStackTraceMatch(stackTrace, """
-				\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
+				>>>>
+				\\Qorg.junit.jupiter.api.Assumptions.assumeTrue(Assumptions.java:\\E.+
+				>>>>
 				""");
 	}
 
 	@Test
-	void shouldAlwaysKeepJupiterAssumptionStackTraceElement() {
+	void shouldKeepEverythingAfterTestCall() {
 		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
 				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
-				.configurationParameter("junit.platform.stacktrace.pruning.pattern", "*") //
-				.selectors(selectMethod(StackTracePruningTestCase.class, "failingAssumption")) //
+				.selectors(selectMethod(FailingTestTestCase.class, "failingAssertion")) //
 				.execute();
 
 		List<StackTraceElement> stackTrace = extractStackTrace(results);
 
-		assertStackTraceMatch(stackTrace, """
-				\\Qorg.junit.jupiter.api.Assumptions.assumeTrue(Assumptions.java:\\E.+
-				""");
+		assertStackTraceMatch(stackTrace,
+			"""
+					\\Qorg.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:\\E.+
+					\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
+					\\Qorg.junit.platform.StackTracePruningTests$FailingTestTestCase.failingAssertion(StackTracePruningTests.java:\\E.+
+					>>>>
+					""");
+	}
+
+	@ParameterizedTest
+	@ValueSource(strings = { "org.junit.platform.StackTracePruningTests$FailingBeforeEachTestCase",
+			"org.junit.platform.StackTracePruningTests$FailingBeforeEachTestCase$NestedTestCase",
+			"org.junit.platform.StackTracePruningTests$FailingBeforeEachTestCase$NestedTestCase$NestedNestedTestCase" })
+	void shouldKeepEverythingAfterLifecycleMethodCall(Class<?> methodClass) {
+		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
+				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
+				.selectors(selectMethod(methodClass, "test")) //
+				.execute();
+
+		List<StackTraceElement> stackTrace = extractStackTrace(results);
+
+		assertStackTraceMatch(stackTrace,
+			"""
+					\\Qorg.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:\\E.+
+					\\Qorg.junit.jupiter.api.Assertions.fail(Assertions.java:\\E.+
+					\\Qorg.junit.platform.StackTracePruningTests$FailingBeforeEachTestCase.setUp(StackTracePruningTests.java:\\E.+
+					>>>>
+					""");
 	}
 
 	@Test
 	void shouldPruneStackTracesOfSuppressedExceptions() {
 		EngineExecutionResults results = EngineTestKit.engine("junit-jupiter") //
 				.configurationParameter("junit.platform.stacktrace.pruning.enabled", "true") //
-				.selectors(selectMethod(StackTracePruningTestCase.class, "multipleFailingAssertions")) //
+				.selectors(selectMethod(FailingTestTestCase.class, "multipleFailingAssertions")) //
 				.execute();
 
 		Throwable throwable = getThrowable(results);
 
 		for (Throwable suppressed : throwable.getSuppressed()) {
 			List<StackTraceElement> stackTrace = Arrays.asList(suppressed.getStackTrace());
-			assertStackTraceDoesNotContain(stackTrace, "java.util.ArrayList.forEach(ArrayList.java:");
+			assertStackTraceDoesNotContain(stackTrace,
+				"jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:");
 		}
 	}
 
@@ -181,7 +195,7 @@ private static void assertStackTraceDoesNotContain(List<StackTraceElement> stack
 
 	// -------------------------------------------------------------------
 
-	static class StackTracePruningTestCase {
+	static class FailingTestTestCase {
 
 		@Test
 		void failingAssertion() {
@@ -202,4 +216,35 @@ void failingAssumption() {
 
 	}
 
+	static class FailingBeforeEachTestCase {
+
+		@BeforeEach
+		void setUp() {
+			Assertions.fail();
+		}
+
+		@Test
+		void test() {
+		}
+
+		@Nested
+		class NestedTestCase {
+
+			@Test
+			void test() {
+			}
+
+			@Nested
+			class NestedNestedTestCase {
+
+				@Test
+				void test() {
+				}
+
+			}
+
+		}
+
+	}
+
 }
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
index 1c96ca1b7e9b..edd11a17ded4 100644
--- a/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/commons/util/ExceptionUtilsTests.java
@@ -18,8 +18,11 @@
 import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
 
 import java.io.IOException;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 
@@ -64,44 +67,38 @@ void readStackTraceForLocalJUnitException() {
 		}
 	}
 
-	@Test
-	void pruneStackTraceOfCallsFromSpecificPackage() {
-		try {
-			throw new JUnitException("expected");
-		}
-		catch (JUnitException e) {
-			pruneStackTrace(e, element -> !element.startsWith("org.junit."));
-			assertThat(e.getStackTrace()) //
-					.noneMatch(element -> element.toString().contains("org.junit."));
-		}
+	@ParameterizedTest
+	@ValueSource(strings = { "org.junit.", "jdk.internal.reflect.", "sun.reflect." })
+	void pruneStackTraceOfCallsFromSpecificPackage(String shouldBePruned) {
+		JUnitException exception = new JUnitException("expected");
+
+		pruneStackTrace(exception, List.of());
+
+		assertThat(exception.getStackTrace()) //
+				.noneMatch(element -> element.toString().contains(shouldBePruned));
 	}
 
 	@Test
 	void pruneStackTraceOfAllLauncherCalls() {
-		try {
-			throw new JUnitException("expected");
-		}
-		catch (JUnitException e) {
-			pruneStackTrace(e, element -> true);
-			assertThat(e.getStackTrace()) //
-					.noneMatch(element -> element.toString().contains("org.junit.platform.launcher."));
-		}
+		JUnitException exception = new JUnitException("expected");
+
+		pruneStackTrace(exception, List.of());
+
+		assertThat(exception.getStackTrace()) //
+				.noneMatch(element -> element.toString().contains("org.junit.platform.launcher."));
 	}
 
 	@Test
 	void pruneStackTraceOfEverythingPriorToFirstLauncherCall() {
-		try {
-			throw new JUnitException("expected");
-		}
-		catch (JUnitException e) {
-			StackTraceElement[] stackTrace = e.getStackTrace();
-			stackTrace[stackTrace.length - 1] = new StackTraceElement("org.example.Class", "method", "file", 123);
-			e.setStackTrace(stackTrace);
+		JUnitException exception = new JUnitException("expected");
+		StackTraceElement[] stackTrace = exception.getStackTrace();
+		stackTrace[stackTrace.length - 1] = new StackTraceElement("org.example.Class", "method", "file", 123);
+		exception.setStackTrace(stackTrace);
 
-			pruneStackTrace(e, element -> true);
-			assertThat(e.getStackTrace()) //
-					.noneMatch(element -> element.toString().contains("org.example.Class.method(file:123)"));
-		}
+		pruneStackTrace(exception, List.of());
+
+		assertThat(exception.getStackTrace()) //
+				.noneMatch(element -> element.toString().contains("org.example.Class.method(file:123)"));
 	}
 
 	@Test
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
index abbc0f1e9f69..97d5614470d7 100644
--- a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.support.descriptor;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -34,15 +35,18 @@
 class AbstractTestDescriptorTests {
 
 	private EngineDescriptor engineDescriptor;
+	private GroupDescriptor group1;
+	private GroupDescriptor group11;
+	private LeafDescriptor leaf111;
 
 	@BeforeEach
 	void initTree() {
 		engineDescriptor = new EngineDescriptor(UniqueId.forEngine("testEngine"), "testEngine");
-		var group1 = new GroupDescriptor(UniqueId.root("group", "group1"));
+		group1 = new GroupDescriptor(UniqueId.root("group", "group1"));
 		engineDescriptor.addChild(group1);
 		var group2 = new GroupDescriptor(UniqueId.root("group", "group2"));
 		engineDescriptor.addChild(group2);
-		var group11 = new GroupDescriptor(UniqueId.root("group", "group1-1"));
+		group11 = new GroupDescriptor(UniqueId.root("group", "group1-1"));
 		group1.addChild(group11);
 
 		group1.addChild(new LeafDescriptor(UniqueId.root("leaf", "leaf1-1")));
@@ -50,7 +54,8 @@ void initTree() {
 
 		group2.addChild(new LeafDescriptor(UniqueId.root("leaf", "leaf2-1")));
 
-		group11.addChild(new LeafDescriptor(UniqueId.root("leaf", "leaf11-1")));
+		leaf111 = new LeafDescriptor(UniqueId.root("leaf", "leaf11-1"));
+		group11.addChild(leaf111);
 	}
 
 	@Test
@@ -133,6 +138,27 @@ void pruneGroup() {
 		assertFalse(visited.contains(UniqueId.root("group", "group1")));
 	}
 
+	@Test
+	void getAncestors() {
+		assertThat(getAncestorsUniqueIds(engineDescriptor)).isEmpty();
+
+		assertThat(getAncestorsUniqueIds(group1)).containsExactly( //
+			UniqueId.forEngine("testEngine"));
+
+		assertThat(getAncestorsUniqueIds(group11)).containsExactly( //
+			UniqueId.root("group", "group1"), //
+			UniqueId.forEngine("testEngine"));
+
+		assertThat(getAncestorsUniqueIds(leaf111)).containsExactly( //
+			UniqueId.root("group", "group1-1"), //
+			UniqueId.root("group", "group1"), //
+			UniqueId.forEngine("testEngine"));
+	}
+
+	private List<UniqueId> getAncestorsUniqueIds(TestDescriptor descriptor) {
+		return descriptor.getAncestors().stream().map(TestDescriptor::getUniqueId).toList();
+	}
+
 }
 
 class GroupDescriptor extends AbstractTestDescriptor {
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
index e769149edfff..d1432692d6d1 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherFactoryTests.java
@@ -38,6 +38,7 @@
 import org.junit.platform.fakes.TestEngineSpy;
 import org.junit.platform.launcher.InterceptedTestEngine;
 import org.junit.platform.launcher.InterceptorInjectedLauncherSessionListener;
+import org.junit.platform.launcher.LauncherConstants;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.LauncherSessionListener;
 import org.junit.platform.launcher.TagFilter;
@@ -298,7 +299,8 @@ public void execute(ExecutionRequest request) {
 					.addTestEngines(engine) //
 					.build();
 			var launcher = LauncherFactory.create(config);
-			var request = request().build();
+			var request = request().configurationParameter(LauncherConstants.STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME,
+				"false").build();
 
 			AtomicReference<TestExecutionResult> result = new AtomicReference<>();
 			launcher.execute(request, new TestExecutionListener() {
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
index 1ae505f8ba54..4e4c14cabece 100644
--- a/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/reporting/legacy/xml/LegacyXmlReportGeneratingListenerTests.java
@@ -51,6 +51,7 @@
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestDescriptor;
 import org.junit.platform.engine.support.hierarchical.DemoHierarchicalTestEngine;
 import org.junit.platform.fakes.TestDescriptorStub;
+import org.junit.platform.launcher.LauncherConstants;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 import org.opentest4j.AssertionFailedError;
@@ -429,7 +430,8 @@ private void executeTests(TestEngine engine, Clock clock) {
 		var reportListener = new LegacyXmlReportGeneratingListener(tempDirectory.toString(), out, clock);
 		var launcher = createLauncher(engine);
 		launcher.registerTestExecutionListeners(reportListener);
-		launcher.execute(request().selectors(selectUniqueId(UniqueId.forEngine(engine.getId()))).build());
+		launcher.execute(request().configurationParameter(LauncherConstants.STACKTRACE_PRUNING_ENABLED_PROPERTY_NAME,
+			"false").selectors(selectUniqueId(UniqueId.forEngine(engine.getId()))).build());
 	}
 
 	private Match readValidXmlFile(Path xmlFile) throws Exception {

From 607e028efca30fdca1e1cb0739c58857183a0165 Mon Sep 17 00:00:00 2001
From: Juliette de Rancourt <derancourt.juliette@gmail.com>
Date: Thu, 29 Jun 2023 20:07:40 +0200
Subject: [PATCH 1395/1433] Fix version in `@API` annotation for
 `TestDescriptor.getAncestors()`

---
 .../src/main/java/org/junit/platform/engine/TestDescriptor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
index 7dfcecc644ca..16fafe5fda30 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
@@ -114,7 +114,7 @@ default String getLegacyReportingName() {
 	 *
 	 * @see #getParent()
 	 */
-	@API(status = STABLE, since = "5.10")
+	@API(status = STABLE, since = "1.10")
 	default Set<? extends TestDescriptor> getAncestors() {
 		if (!getParent().isPresent()) {
 			return Collections.emptySet();

From 1f36bc8a4a4c14f7b69ef1eaa61cb534f48f55ae Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 30 Jun 2023 11:50:07 +0200
Subject: [PATCH 1396/1433] Polishing

---
 .../release-notes-5.10.0-RC1.adoc             |  1 +
 .../asciidoc/user-guide/running-tests.adoc    | 11 +++---
 .../asciidoc/user-guide/writing-tests.adoc    | 10 +++---
 .../platform/commons/util/ExceptionUtils.java | 35 ++++++++++---------
 .../junit/platform/engine/TestDescriptor.java |  9 +++--
 5 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 4524496a0b36..de5d8d10c2a7 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -38,6 +38,7 @@ JUnit repository on GitHub.
   <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
 * New `getAncestors()` method in `TestDescriptor`.
 
+
 [[release-notes-5.10.0-RC1-junit-jupiter]]
 === JUnit Jupiter
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 35915254fd95..3507f5892c6a 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -1132,14 +1132,15 @@ give it a try and provide feedback to the JUnit team so they can improve and eve
 <<api-evolution, promote>> this feature.
 
 [[stacktrace-pruning]]
-=== Stack trace pruning
+=== Stack Trace Pruning
 
 Since version 1.10, the JUnit Platform provides built-in support for pruning stack traces
-produced by failing tests. This feature can be enabled or disabled via the
-`junit.platform.stacktrace.pruning.enabled` _configuration parameter_.
+produced by failing tests. This feature is enabled by default but can be disabled by
+setting the `junit.platform.stacktrace.pruning.enabled` _configuration parameter_ to
+`false`.
 
-If enabled, all calls from the `org.junit`, `jdk.internal.reflect`, and `sun.reflect`
-packages are removed from the stack trace, unless they are subsequent to the test itself
+When enabled, all calls from the `org.junit`, `jdk.internal.reflect`, and `sun.reflect`
+packages are removed from the stack trace, unless the calls occur after the test itself
 or any of its ancestors. For that reason, calls to `{Assertions}` or `{Assumptions}` will
 never be excluded.
 
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index 97991db4fb86..e4dee9ca8339 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2302,11 +2302,11 @@ might conflict with the configured execution order. Thus, in both cases, test me
 such test classes are only executed concurrently if the `@Execution(CONCURRENT)`
 annotation is present on the test class or method.
 
-When parallel execution is enabled and a default `{ClassOrderer}` (see
-<<writing-tests-test-execution-order-classes>> for details) is registered, top-level test
-classes will initially be sorted accordingly and scheduled in that order. However, they
-are not guaranteed to be started in exactly that order since the threads they are executed
-on are not controlled directly by JUnit.
+When parallel execution is enabled and a default `{ClassOrderer}` is registered (see
+<<writing-tests-test-execution-order-classes>> for details), top-level test classes will
+initially be sorted accordingly and scheduled in that order. However, they are not
+guaranteed to be started in exactly that order since the threads they are executed on are
+not controlled directly by JUnit.
 
 All nodes of the test tree that are configured with the `CONCURRENT` execution mode will
 be executed fully in parallel according to the provided
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
index 7b108da8070f..ce698dbbdcd6 100644
--- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
+++ b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -96,24 +96,25 @@ public static String readStackTrace(Throwable throwable) {
 
 	/**
 	 * Prune the stack trace of the supplied {@link Throwable} by removing
-	 * elements from the {@code org.junit}, {@code jdk.internal.reflect} and
-	 * {@code sun.reflect} packages. If an element matching one of the supplied
-	 * class names is encountered, all following elements will be kept regardless.
+	 * {@linkplain StackTraceElement stack trace elements} from the {@code org.junit},
+	 * {@code jdk.internal.reflect}, and {@code sun.reflect} packages. If a
+	 * {@code StackTraceElement} matching one of the supplied {@code classNames}
+	 * is encountered, all subsequent elements in the stack trace will be retained.
 	 *
-	 * <p>Additionally, all elements prior to and including the first
-	 * JUnit Launcher call will be removed.
+	 * <p>Additionally, all elements prior to and including the first JUnit Platform
+	 * Launcher call will be removed.
 	 *
-	 * @param throwable the {@code Throwable} whose stack trace should be
-	 * pruned; never {@code null}
-	 * @param testClassNames the test class names that should stop the pruning
-	 * if encountered; never {@code null}
+	 * @param throwable the {@code Throwable} whose stack trace should be pruned;
+	 * never {@code null}
+	 * @param classNames the class names that should stop the pruning if encountered;
+	 * never {@code null}
 	 *
-	 * @since 5.10
+	 * @since 1.10
 	 */
-	@API(status = INTERNAL, since = "5.10")
-	public static void pruneStackTrace(Throwable throwable, List<String> testClassNames) {
+	@API(status = INTERNAL, since = "1.10")
+	public static void pruneStackTrace(Throwable throwable, List<String> classNames) {
 		Preconditions.notNull(throwable, "Throwable must not be null");
-		Preconditions.notNull(testClassNames, "List of test class names must not be null");
+		Preconditions.notNull(classNames, "List of class names must not be null");
 
 		List<StackTraceElement> stackTrace = Arrays.asList(throwable.getStackTrace());
 		List<StackTraceElement> prunedStackTrace = new ArrayList<>();
@@ -124,7 +125,7 @@ public static void pruneStackTrace(Throwable throwable, List<String> testClassNa
 			StackTraceElement element = stackTrace.get(i);
 			String className = element.getClassName();
 
-			if (testClassNames.contains(className)) {
+			if (classNames.contains(className)) {
 				// Include all elements called by the test
 				prunedStackTrace.addAll(stackTrace.subList(i, stackTrace.size()));
 				break;
@@ -142,16 +143,16 @@ else if (STACK_TRACE_ELEMENT_FILTER.test(className)) {
 	}
 
 	/**
-	 * Find all causes and suppressed exceptions in the backtrace of the
+	 * Find all causes and suppressed exceptions in the stack trace of the
 	 * supplied {@link Throwable}.
 	 *
 	 * @param rootThrowable the {@code Throwable} to explore; never {@code null}
 	 * @return an immutable list of all throwables found, including the supplied
 	 * one; never {@code null}
 	 *
-	 * @since 5.10
+	 * @since 1.10
 	 */
-	@API(status = INTERNAL, since = "5.10")
+	@API(status = INTERNAL, since = "1.10")
 	public static List<Throwable> findNestedThrowables(Throwable rootThrowable) {
 		Preconditions.notNull(rootThrowable, "Throwable must not be null");
 
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
index 16fafe5fda30..0f7f6f20ea49 100644
--- a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
+++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestDescriptor.java
@@ -109,8 +109,8 @@ default String getLegacyReportingName() {
 	/**
 	 * Get the immutable set of all <em>ancestors</em> of this descriptor.
 	 *
-	 * <p>An <em>ancestors</em> is the parent of this descriptor or the parent
-	 * of one of its parents, recursively.
+	 * <p>An <em>ancestor</em> is the parent of this descriptor or the parent of
+	 * one of its parents, recursively.
 	 *
 	 * @see #getParent()
 	 */
@@ -122,7 +122,10 @@ default Set<? extends TestDescriptor> getAncestors() {
 		TestDescriptor parent = getParent().get();
 		Set<TestDescriptor> ancestors = new LinkedHashSet<>();
 		ancestors.add(parent);
-		ancestors.addAll(parent.getAncestors());
+		// Need to recurse?
+		if (parent.getParent().isPresent()) {
+			ancestors.addAll(parent.getAncestors());
+		}
 		return Collections.unmodifiableSet(ancestors);
 	}
 

From 85141561529dd85ae245c088662c826152adcf45 Mon Sep 17 00:00:00 2001
From: JUnit Team <team@junit.org>
Date: Sun, 2 Jul 2023 15:18:29 +0000
Subject: [PATCH 1397/1433] Bump Gradle Wrapper from 8.2-rc-2 to 8.2

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 63282 -> 63375 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f03f475efe8cbb781d8a1f9dfcd7fbfc89bcef5a..033e24c4cdf41af1ab109bc7f253b2b887023340 100644
GIT binary patch
delta 4535
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
Xi8D5$8u-zfBqfRg0GR*r-#`8rZG^#i

delta 4433
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
BdaM8d

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 264e083fcdce..a7c2bd1bdc63 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=0906569bf96e8ebefbc1aa56318c74aeafd9710455b2817c70d709c5d77785c4
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-rc-2-bin.zip
+distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From eb34ed74d1f469091ece5686111b792781376708 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 2 Jul 2023 17:56:19 +0200
Subject: [PATCH 1398/1433] Set readonly attribute to false if
 `DosFileAttributeView` is supported

Fixes #3352.
---
 .../release-notes-5.10.0-RC1.adoc             |  2 ++
 .../engine/extension/TempDirectory.java       | 10 ++++++++
 .../TempDirectoryPerContextTests.java         | 24 ++++++++++++-------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index de5d8d10c2a7..41467f50ac58 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -64,6 +64,8 @@ JUnit repository on GitHub.
   the documentation for extension registration via `@ExtendWith` on fields.
 * The scope of applicability for `TestWatcher` implementations is now more extensively
   documented in the User Guide and Javadoc.
+* `@TempDir` now successfully cleans up files and directories on Windows that are set to
+  read-only.
 
 
 [[release-notes-5.10.0-RC1-junit-vintage]]
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index d8dbdd3776a3..0c41baa4724b 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -33,6 +33,7 @@
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.DosFileAttributeView;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -390,6 +391,15 @@ private static void tryToResetPermissions(Path path) {
 			if (Files.isDirectory(path)) {
 				file.setExecutable(true);
 			}
+			DosFileAttributeView dos = Files.getFileAttributeView(path, DosFileAttributeView.class);
+			if (dos != null) {
+				try {
+					dos.setReadOnly(false);
+				}
+				catch (IOException ignore) {
+					// nothing we can do
+				}
+			}
 		}
 
 		private IOException createIOExceptionWithAttachedFailures(SortedMap<Path, IOException> failures) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index 84addd7dd905..4515d33b27fb 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.DosFileAttributeView;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.function.Supplier;
@@ -47,8 +48,6 @@
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
@@ -126,7 +125,6 @@ void nonMintPermissionsDoNotCauseFailure() {
 	}
 
 	@Test
-	@DisabledOnOs(OS.WINDOWS)
 	@DisplayName("is capable of removing a read-only file in a read-only dir")
 	void readOnlyFileInReadOnlyDirDoesNotCauseFailure() {
 		executeTestsForClass(ReadOnlyFileInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
@@ -134,7 +132,6 @@ void readOnlyFileInReadOnlyDirDoesNotCauseFailure() {
 	}
 
 	@Test
-	@DisabledOnOs(OS.WINDOWS)
 	@DisplayName("is capable of removing a read-only file in a dir in a read-only dir")
 	void readOnlyFileInNestedReadOnlyDirDoesNotCauseFailure() {
 		executeTestsForClass(ReadOnlyFileInDirInReadOnlyDirDoesNotCauseFailureTestCase.class).testEvents()//
@@ -942,8 +939,8 @@ static class ReadOnlyFileInReadOnlyDirDoesNotCauseFailureTestCase {
 		void createReadOnlyFileInReadOnlyDir(@TempDir File tempDir) throws IOException {
 			File file = tempDir.toPath().resolve("file").toFile();
 			assumeTrue(file.createNewFile());
-			assumeTrue(tempDir.setReadOnly());
-			assumeTrue(file.setReadOnly());
+			assumeTrue(makeReadOnly(tempDir));
+			assumeTrue(makeReadOnly(file));
 		}
 
 	}
@@ -956,13 +953,22 @@ void createReadOnlyFileInReadOnlyDir(@TempDir File tempDir) throws IOException {
 			File file = tempDir.toPath().resolve("dir").resolve("file").toFile();
 			assumeTrue(file.getParentFile().mkdirs());
 			assumeTrue(file.createNewFile());
-			assumeTrue(tempDir.setReadOnly());
-			assumeTrue(file.getParentFile().setReadOnly());
-			assumeTrue(file.setReadOnly());
+			assumeTrue(makeReadOnly(tempDir));
+			assumeTrue(makeReadOnly(file.getParentFile()));
+			assumeTrue(makeReadOnly(file));
 		}
 
 	}
 
+	private static boolean makeReadOnly(File file) throws IOException {
+		var dos = Files.getFileAttributeView(file.toPath(), DosFileAttributeView.class);
+		if (dos != null) {
+			dos.setReadOnly(true);
+			return true;
+		}
+		return file.setReadOnly();
+	}
+
 	// https://github.com/junit-team/junit5/issues/2609
 	@SuppressWarnings("ResultOfMethodCallIgnored")
 	static class NonMintPermissionContentInTempDirectoryDoesNotCauseFailureTestCase {

From f82d93faea69ff1617399d1881cd90ee55403bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Bodn=C3=A1r?= <p.bodnar@centrum.cz>
Date: Sat, 10 Jun 2023 09:33:11 +0200
Subject: [PATCH 1399/1433] Document replacement for @Test(expected=...) in
 JUnit 4 migration tips

Closes #3348
---
 .../src/docs/asciidoc/user-guide/migration-from-junit4.adoc   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
index 09d351fbfec6..1bea652ce7b1 100644
--- a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
@@ -63,6 +63,10 @@ tests to JUnit Jupiter.
 * `@Rule` and `@ClassRule` no longer exist; superseded by `@ExtendWith` and
   `@RegisterExtension`.
   - See also <<migrating-from-junit4-rule-support>>.
+* `@Test(expected = ...)` and the `ExpectedException` rule no longer exist; use
+  `Assertions.assertThrows(...)` instead.
+  See <<migrating-from-junit4-rule-support>> if you still do need to use
+  `ExpectedException`.
 * Assertions and assumptions in JUnit Jupiter accept the failure message as their last
   argument instead of the first one.
   - See <<migrating-from-junit4-failure-message-arguments>> for details.

From 9d1f6e110d9dd94c8b63a33e06810a4bc13e92c1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 3 Jul 2023 16:04:26 +0200
Subject: [PATCH 1400/1433] Polish formatting

See #3348
---
 .../src/docs/asciidoc/user-guide/migration-from-junit4.adoc   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
index 1bea652ce7b1..98e0b056af93 100644
--- a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
@@ -65,8 +65,8 @@ tests to JUnit Jupiter.
   - See also <<migrating-from-junit4-rule-support>>.
 * `@Test(expected = ...)` and the `ExpectedException` rule no longer exist; use
   `Assertions.assertThrows(...)` instead.
-  See <<migrating-from-junit4-rule-support>> if you still do need to use
-  `ExpectedException`.
+  - See <<migrating-from-junit4-rule-support>> if you still need to use
+    `ExpectedException`.
 * Assertions and assumptions in JUnit Jupiter accept the failure message as their last
   argument instead of the first one.
   - See <<migrating-from-junit4-failure-message-arguments>> for details.

From 791446460919fb034c6d86d5004d87cd97a4afd0 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 3 Jul 2023 16:19:34 +0200
Subject: [PATCH 1401/1433] Prepare release notes for 5.10 RC1

---
 .../release-notes-5.10.0-RC1.adoc             | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index 41467f50ac58..a27df6037dd6 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -1,9 +1,17 @@
 [[release-notes-5.10.0-RC1]]
 == 5.10.0-RC1
 
-*Date of Release:* ❓
+*Date of Release:* July ❓, 2023
 
-*Scope:* ❓
+*Scope:*
+
+* New `@SelectMethod` support in test `@Suite` classes.
+* Various enhancements for discovery selectors for classes and methods, including
+  additional support for custom ClassLoader arrangements.
+* Improved `@TempDir` support for cleaning up files and directories on Windows.
+* Revised stack trace pruning support.
+* Various documentation improvements.
+* Minor changes and enhancements since 5.10 M1.
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1] milestone page in the
@@ -13,10 +21,6 @@ JUnit repository on GitHub.
 [[release-notes-5.10.0-RC1-junit-platform]]
 === JUnit Platform
 
-==== Bug Fixes
-
-* ❓
-
 ==== Deprecations and Breaking Changes
 
 * The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
@@ -42,43 +46,25 @@ JUnit repository on GitHub.
 [[release-notes-5.10.0-RC1-junit-jupiter]]
 === JUnit Jupiter
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
 ==== New Features and Improvements
 
 * `@TempDir` can now be used as a meta-annotation in order to create custom _composed
   annotations_. See the `@JimfsTempDir` example in the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
-* Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
+* `@TempDir` now successfully cleans up files and directories on Windows that are set to
+  read-only.
 * New `reason` attribute in `@Execution` which can be used to document the reason for
   using the selected execution mode.
 * The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
   includes an example implementation of the `RandomNumberExtension` in order to improve
   the documentation for extension registration via `@ExtendWith` on fields.
+* Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
 * The scope of applicability for `TestWatcher` implementations is now more extensively
   documented in the User Guide and Javadoc.
-* `@TempDir` now successfully cleans up files and directories on Windows that are set to
-  read-only.
 
 
 [[release-notes-5.10.0-RC1-junit-vintage]]
 === JUnit Vintage
 
-==== Bug Fixes
-
-* ❓
-
-==== Deprecations and Breaking Changes
-
-* ❓
-
-==== New Features and Improvements
-
-* ❓
+No changes.

From b72d1f64f37c5ed7fe0dc38785ab45bbad8cb747 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 3 Jul 2023 20:02:50 +0200
Subject: [PATCH 1402/1433] Fix copy-n-paste error in JRE enum Javadoc

---
 .../src/main/java/org/junit/jupiter/api/condition/JRE.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index b42bc90e90c3..50679310e9fa 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -139,7 +139,7 @@ public enum JRE {
 	JAVA_20,
 
 	/**
-	 * Java 20.
+	 * Java 21.
 	 *
 	 * @since 5.9.2
 	 */

From ed8038cfe9ebaad2002a4af8cf4c64de3d7c0dbb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 3 Jul 2023 20:03:24 +0200
Subject: [PATCH 1403/1433] Polish Javadoc for JRE enum

---
 .../java/org/junit/jupiter/api/condition/JRE.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index 50679310e9fa..fc6c980271b0 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -37,6 +37,13 @@
  * @see #JAVA_12
  * @see #JAVA_13
  * @see #JAVA_14
+ * @see #JAVA_15
+ * @see #JAVA_16
+ * @see #JAVA_17
+ * @see #JAVA_18
+ * @see #JAVA_19
+ * @see #JAVA_20
+ * @see #JAVA_21
  * @see #OTHER
  * @see EnabledOnJre
  * @see DisabledOnJre
@@ -221,14 +228,16 @@ private static JRE determineCurrentVersion() {
 
 	/**
 	 * @return {@code true} if <em>this</em> {@code JRE} is known to be the
-	 * Java Runtime Environment version for the currently executing JVM
+	 * Java Runtime Environment version for the currently executing JVM or if
+	 * the version is {@link #OTHER}
 	 */
 	public boolean isCurrentVersion() {
 		return this == CURRENT_VERSION;
 	}
 
 	/**
-	 * @return the {@link JRE} for the currently executing JVM
+	 * @return the {@link JRE} for the currently executing JVM, potentially
+	 * {@link #OTHER}
 	 *
 	 * @since 5.7
 	 */

From bf9e183540efc04d2a2c7f48cf4814ddfb5bff10 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jul 2023 12:57:35 +0200
Subject: [PATCH 1404/1433] Report tests as skipped in dry-run mode

Reporting them as successful seems misleading
---
 .../user-guide/advanced-topics/launcher-api.adoc       |  6 +++---
 .../org/junit/platform/launcher/LauncherConstants.java | 10 +++++-----
 .../launcher/core/EngineExecutionOrchestrator.java     |  3 +--
 .../platform/launcher/core/DefaultLauncherTests.java   |  3 +--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
index 9b4722dcd6b3..18c0b261e299 100644
--- a/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/advanced-topics/launcher-api.adoc
@@ -272,6 +272,6 @@ When running tests via the `{Launcher}` API, you can enable _dry-run mode_ by se
 `junit.platform.execution.dryRun.enabled` <<running-tests-config-params,
 configuration parameter>> to `true`. In this mode, the `{Launcher}` will not actually
 execute any tests but will notify registered `{TestExecutionListener}` instances as if all
-tests had been executed successfully. This can be useful to test changes in the
-configuration of a build or to verify a listener is called as expected without having to
-wait for all tests to be executed.
+tests had been skipped and their containers had been successful. This can be useful to
+test changes in the configuration of a build or to verify a listener is called as expected
+without having to wait for all tests to be executed.
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
index af05c4ae86ee..7e85b35d1c53 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/LauncherConstants.java
@@ -153,11 +153,11 @@ public class LauncherConstants {
 	 *
 	 * <p>When dry-run mode is enabled, no tests will be executed. Instead, all
 	 * registered {@link TestExecutionListener TestExecutionListeners} will
-	 * receive started/finished events for all test descriptors that are part
-	 * of the discovered {@link TestPlan}. All tests will be reported as
-	 * successful. This can be useful to test changes in the configuration of a
-	 * build or to verify a listener is called as expected without having to
-	 * wait for all tests to be executed.
+	 * receive events for all test descriptors that are part of the discovered
+	 * {@link TestPlan}. All containers will be reported as successful and all
+	 * tests as skipped. This can be useful to test changes in the configuration
+	 * of a build or to verify a listener is called as expected without having
+	 * to wait for all tests to be executed.
 	 *
 	 * <p>Value must be either {@code true} or {@code false}; defaults to {@code false}.
 	 */
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
index ed764199a3f6..bf0f78a7bde0 100644
--- a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
+++ b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineExecutionOrchestrator.java
@@ -110,8 +110,7 @@ public void preVisitContainer(TestIdentifier testIdentifier) {
 			@Override
 			public void visit(TestIdentifier testIdentifier) {
 				if (!testIdentifier.isContainer()) {
-					listener.executionStarted(testIdentifier);
-					listener.executionFinished(testIdentifier, TestExecutionResult.successful());
+					listener.executionSkipped(testIdentifier, "JUnit Platform dry-run mode is enabled");
 				}
 			}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
index 0e39ae5e2d23..f5b777b4b71d 100644
--- a/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
+++ b/platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java
@@ -646,8 +646,7 @@ void dryRunModeReportsEventsForAllTestsButDoesNotExecuteThem() {
 		inOrder.verify(listener).testPlanExecutionStarted(any());
 		inOrder.verify(listener).executionStarted(TestIdentifier.from(engine.getEngineDescriptor()));
 		inOrder.verify(listener).executionStarted(TestIdentifier.from(container));
-		inOrder.verify(listener).executionStarted(TestIdentifier.from(test));
-		inOrder.verify(listener).executionFinished(TestIdentifier.from(test), successful());
+		inOrder.verify(listener).executionSkipped(TestIdentifier.from(test), "JUnit Platform dry-run mode is enabled");
 		inOrder.verify(listener).executionFinished(TestIdentifier.from(container), successful());
 		inOrder.verify(listener).executionFinished(TestIdentifier.from(engine.getEngineDescriptor()), successful());
 		inOrder.verify(listener).testPlanExecutionFinished(any());

From 030cf9bd36332b3abb7f7d4b5510fed11f9c1dfc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jul 2023 13:19:48 +0200
Subject: [PATCH 1405/1433] Add JRE.JAVA_22

Resolves #3383.
---
 .github/workflows/cross-version.yml            |  2 +-
 .../release-notes-5.10.0-RC1.adoc              |  1 +
 .../org/junit/jupiter/api/condition/JRE.java   | 14 +++++++++++++-
 .../DisabledForJreRangeConditionTests.java     |  3 ++-
 .../DisabledForJreRangeIntegrationTests.java   |  6 ++++--
 .../condition/DisabledOnJreConditionTests.java | 12 +++++++++++-
 .../DisabledOnJreIntegrationTests.java         | 15 ++++++++++++---
 .../EnabledForJreRangeConditionTests.java      |  3 ++-
 .../EnabledForJreRangeIntegrationTests.java    |  8 +++++---
 .../condition/EnabledOnJreConditionTests.java  | 12 +++++++++++-
 .../EnabledOnJreIntegrationTests.java          | 18 +++++++++++++++---
 .../junit/jupiter/api/condition/JRETests.java  |  7 +++++++
 12 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 13c93692b87a..8480a68a49c7 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [19, 20, 21]
+        jdk: [20, 21, 22]
     name: "OpenJDK ${{ matrix.jdk }}"
     runs-on: ubuntu-latest
     steps:
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index a27df6037dd6..a9ab80ed4da8 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -62,6 +62,7 @@ JUnit repository on GitHub.
 * Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
 * The scope of applicability for `TestWatcher` implementations is now more extensively
   documented in the User Guide and Javadoc.
+* `JAVA_22` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-5.10.0-RC1-junit-vintage]]
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index fc6c980271b0..85e2b58ad888 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -44,6 +44,7 @@
  * @see #JAVA_19
  * @see #JAVA_20
  * @see #JAVA_21
+ * @see #JAVA_22
  * @see #OTHER
  * @see EnabledOnJre
  * @see DisabledOnJre
@@ -153,12 +154,21 @@ public enum JRE {
 	@API(status = STABLE, since = "5.9.2")
 	JAVA_21,
 
+	/**
+	 * Java 22.
+	 *
+	 * @since 5.10
+	 */
+	@API(status = STABLE, since = "5.9.2")
+	JAVA_22,
+
 	/**
 	 * A JRE version other than {@link #JAVA_8}, {@link #JAVA_9},
 	 * {@link #JAVA_10}, {@link #JAVA_11}, {@link #JAVA_12},
 	 * {@link #JAVA_13}, {@link #JAVA_14}, {@link #JAVA_15},
 	 * {@link #JAVA_16}, {@link #JAVA_17}, {@link #JAVA_18},
-	 * {@link #JAVA_19}, {@link #JAVA_20}, or {@link #JAVA_21}.
+	 * {@link #JAVA_19}, {@link #JAVA_20}, {@link #JAVA_21}, or
+	 * {@link #JAVA_22}.
 	 */
 	OTHER;
 
@@ -214,6 +224,8 @@ private static JRE determineCurrentVersion() {
 					return JAVA_20;
 				case 21:
 					return JAVA_21;
+				case 22:
+					return JAVA_22;
 				default:
 					return OTHER;
 			}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index 9ccce353304a..7c4cf44ede4c 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -116,7 +117,7 @@ void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(
 			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()));
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index bcca45f99859..c1c782def80e 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -25,6 +25,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
@@ -82,8 +83,9 @@ void javaMin18() {
 	@Test
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
-		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21());
+		assertTrue(
+			onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
index 35fa2e52bd85..acba9ef791c7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -206,6 +207,15 @@ void java21() {
 		assertDisabledOnCurrentJreIf(onJava21());
 	}
 
+	/**
+	 * @see DisabledOnJreIntegrationTests#java22()
+	 */
+	@Test
+	void java22() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(onJava22());
+	}
+
 	/**
 	 * @see DisabledOnJreIntegrationTests#other()
 	 */
@@ -214,7 +224,7 @@ void other() {
 		evaluateCondition();
 		assertDisabledOnCurrentJreIf(
 			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()));
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()));
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
index 12ece2e580a9..2c7f922cd6b7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
@@ -25,6 +25,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_10;
@@ -39,6 +40,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.JAVA_20;
 import static org.junit.jupiter.api.condition.JRE.JAVA_21;
+import static org.junit.jupiter.api.condition.JRE.JAVA_22;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -66,7 +68,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@DisabledOnJre(value = { JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17,
-			JAVA_18, JAVA_19, JAVA_20, JAVA_21, OTHER }, disabledReason = "Disabled on every JRE")
+			JAVA_18, JAVA_19, JAVA_20, JAVA_21, JAVA_22, OTHER }, disabledReason = "Disabled on every JRE")
 	void disabledOnAllJavaVersions() {
 		fail("should be disabled");
 	}
@@ -155,11 +157,18 @@ void java21() {
 		assertFalse(onJava21());
 	}
 
+	@Test
+	@DisabledOnJre(JAVA_22)
+	void java22() {
+		assertFalse(onJava22());
+	}
+
 	@Test
 	@DisabledOnJre(OTHER)
 	void other() {
-		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21());
+		assertTrue(
+			onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index f894695285d2..3e4cf7db4b15 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -115,7 +116,7 @@ void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(
 			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()));
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()));
 	}
 
 	private void assertEnabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index 5007240e7f2a..ccf86a08eb6a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -25,6 +25,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
@@ -78,15 +79,16 @@ void javaMax18() {
 	@Test
 	@EnabledForJreRange(min = JAVA_18)
 	void javaMin18() {
-		assertTrue(onJava18() || onJava19() || onJava20() || onJava21());
+		assertTrue(onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
 		assertFalse(onJava17());
 	}
 
 	@Test
 	@EnabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
-		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21());
+		assertFalse(
+			onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
index 9c4bb4c2a143..60f3cb70be1f 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
+import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
 import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 
@@ -205,6 +206,15 @@ void java21() {
 		assertEnabledOnCurrentJreIf(onJava21());
 	}
 
+	/**
+	 * @see EnabledOnJreIntegrationTests#java22()
+	 */
+	@Test
+	void java22() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(onJava22());
+	}
+
 	/**
 	 * @see EnabledOnJreIntegrationTests#other()
 	 */
@@ -213,7 +223,7 @@ void other() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(
 			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()));
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()));
 		assertCustomDisabledReasonIs("Disabled on almost every JRE");
 	}
 
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
index a7a414486727..3ad579262415 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.JAVA_20;
 import static org.junit.jupiter.api.condition.JRE.JAVA_21;
+import static org.junit.jupiter.api.condition.JRE.JAVA_22;
 import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 import static org.junit.jupiter.api.condition.JRE.JAVA_9;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
@@ -53,7 +54,7 @@ void missingJreDeclaration() {
 
 	@Test
 	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17, JAVA_18,
-			JAVA_19, JAVA_20, JAVA_21, OTHER })
+			JAVA_19, JAVA_20, JAVA_21, JAVA_22, OTHER })
 	void enabledOnAllJavaVersions() {
 	}
 
@@ -141,11 +142,18 @@ void java21() {
 		assertTrue(onJava21());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_22)
+	void java22() {
+		assertTrue(onJava22());
+	}
+
 	@Test
 	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
 	void other() {
-		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21());
+		assertFalse(
+			onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
+					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
 	}
 
 	static boolean onJava8() {
@@ -204,4 +212,8 @@ static boolean onJava21() {
 		return JAVA_VERSION.startsWith("21");
 	}
 
+	static boolean onJava22() {
+		return JAVA_VERSION.startsWith("22");
+	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
index f915146cfee4..7a2a2e6236ad 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/JRETests.java
@@ -16,6 +16,7 @@
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.JAVA_20;
 import static org.junit.jupiter.api.condition.JRE.JAVA_21;
+import static org.junit.jupiter.api.condition.JRE.JAVA_22;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
 
 import org.junit.jupiter.api.Test;
@@ -57,6 +58,12 @@ void java21() {
 		assertEquals(JAVA_21, JRE.currentVersion());
 	}
 
+	@Test
+	@EnabledOnJre(JAVA_22)
+	void java22() {
+		assertEquals(JAVA_22, JRE.currentVersion());
+	}
+
 	@Test
 	@EnabledOnJre(OTHER)
 	void other() {

From b059319ba641f875b04a9f4060fc593ff9c11c34 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jul 2023 13:59:26 +0200
Subject: [PATCH 1406/1433] Disable annotation processing to hide new
 deprecation warning

see https://ge.junit.org/s/lrxhuu5jfttsc/tests/task/:platform-tooling-support-tests:test/details/platform.tooling.support.tests.StandaloneTests/compile()?focused-execution=1&top-execution=2#L1
---
 .../java/platform/tooling/support/tests/StandaloneTests.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
index 813ce07c1844..eb8eb20254f2 100644
--- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
+++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -89,6 +89,7 @@ void compile() throws Exception {
 		var result = Request.builder() //
 				.setTool(new Javac()) //
 				.setProject("standalone") //
+				.addArguments("-proc:none") //
 				.addArguments("-d", workspace.resolve("bin")) //
 				.addArguments("--class-path", MavenRepo.jar("junit-platform-console-standalone")) //
 				.addArguments(workspace.resolve("src/standalone/JupiterIntegration.java")) //

From ff8ad47ec0643463945a4709fb5a52ae7e1e94c2 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jul 2023 14:18:31 +0200
Subject: [PATCH 1407/1433] Fix since version in API annotation

---
 .../src/main/java/org/junit/jupiter/api/condition/JRE.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
index 85e2b58ad888..ef868dfdc4b1 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
@@ -159,7 +159,7 @@ public enum JRE {
 	 *
 	 * @since 5.10
 	 */
-	@API(status = STABLE, since = "5.9.2")
+	@API(status = STABLE, since = "5.10")
 	JAVA_22,
 
 	/**

From 82978206492dbed6e1f2a92d0f192742d58fe8b5 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jul 2023 15:09:39 +0200
Subject: [PATCH 1408/1433] Update OpenTest4J to 1.3.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6c9ad74561ca..0474257c274f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ junit4Osgi = "4.13.2_1"
 junit4Min = "4.12"
 ktlint = "0.48.2"
 log4j = "2.20.0"
-opentest4j = "1.3.0-RC2"
+opentest4j = "1.3.0"
 openTestReporting = "0.1.0-M1"
 surefire = "3.1.2"
 xmlunit = "2.9.1"

From 6bf4da0ad65acfa5be146acc6b87439f6d38ef05 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jul 2023 15:11:24 +0200
Subject: [PATCH 1409/1433] Release 5.10.0-RC1

---
 README.md                                                   | 2 +-
 .../asciidoc/release-notes/release-notes-5.10.0-RC1.adoc    | 2 +-
 gradle.properties                                           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5bc2cae11046..60a57a4edf28 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository is the home of _JUnit 5_.
 ## Latest Releases
 
 - General Availability (GA): [JUnit 5.9.3](https://github.com/junit-team/junit5/releases/tag/r5.9.3) (April 26, 2023)
-- Preview (Milestone/Release Candidate): [JUnit 5.10.0-M1](https://github.com/junit-team/junit5/releases/tag/r5.10.0-M1) (May 13, 2023)
+- Preview (Milestone/Release Candidate): [JUnit 5.10.0-RC1](https://github.com/junit-team/junit5/releases/tag/r5.10.0-RC1) (July 6, 2023)
 
 ## Documentation
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
index a9ab80ed4da8..02ea691874ce 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.10.0-RC1]]
 == 5.10.0-RC1
 
-*Date of Release:* July ❓, 2023
+*Date of Release:* July 6, 2023
 
 *Scope:*
 
diff --git a/gradle.properties b/gradle.properties
index 1a6d11cf2f54..3974143077c9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.10.0-SNAPSHOT
+version         = 5.10.0-RC1
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.10.0-SNAPSHOT
+platformVersion = 1.10.0-RC1
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.10.0-SNAPSHOT
+vintageVersion  = 5.10.0-RC1
 
 defaultBuiltBy  = JUnit Team
 

From 3b7c5e8a867f409cebae0ed9095e065ec91dd41b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 6 Jul 2023 15:48:33 +0200
Subject: [PATCH 1410/1433] Remove obsolete section

The stack trace pruning feature no longer supports pattern matching.
---
 .../src/docs/asciidoc/user-guide/running-tests.adoc          | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
index 3507f5892c6a..1900545858fc 100644
--- a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -1146,8 +1146,3 @@ never be excluded.
 
 In addition, all elements prior to and including the first call from the JUnit Platform
 Launcher will be removed.
-
-[[stacktrace-pruning-pattern]]
-==== Pattern Matching Syntax
-
-Refer to <<running-tests-config-params-deactivation-pattern>> for details.

From a3b5491e5a1c1c63d948ee5715a4c24313caca39 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 6 Jul 2023 15:56:14 +0200
Subject: [PATCH 1411/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3974143077c9..1a6d11cf2f54 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.10.0-RC1
+version         = 5.10.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.10.0-RC1
+platformVersion = 1.10.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.10.0-RC1
+vintageVersion  = 5.10.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From 82a2ad70522fb81e51c0391272a7e1d0407c6bf8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 6 Jul 2023 16:53:04 +0200
Subject: [PATCH 1412/1433] Prune Release Notes for 5.10 GA

Closes #3384
---
 .../docs/asciidoc/release-notes/index.adoc    |  4 +-
 .../release-notes-5.10.0-RC1.adoc             | 71 ------------------
 ...10.0-M1.adoc => release-notes-5.10.0.adoc} | 75 ++++++++++++-------
 3 files changed, 51 insertions(+), 99 deletions(-)
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
 rename documentation/src/docs/asciidoc/release-notes/{release-notes-5.10.0-M1.adoc => release-notes-5.10.0.adoc} (75%)

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index faebab1dc3b6..ec787091b41e 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,9 +16,7 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
-include::{basedir}/release-notes-5.10.0-RC1.adoc[]
-
-include::{basedir}/release-notes-5.10.0-M1.adoc[]
+include::{basedir}/release-notes-5.10.0.adoc[]
 
 include::{basedir}/release-notes-5.9.3.adoc[]
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
deleted file mode 100644
index 02ea691874ce..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ /dev/null
@@ -1,71 +0,0 @@
-[[release-notes-5.10.0-RC1]]
-== 5.10.0-RC1
-
-*Date of Release:* July 6, 2023
-
-*Scope:*
-
-* New `@SelectMethod` support in test `@Suite` classes.
-* Various enhancements for discovery selectors for classes and methods, including
-  additional support for custom ClassLoader arrangements.
-* Improved `@TempDir` support for cleaning up files and directories on Windows.
-* Revised stack trace pruning support.
-* Various documentation improvements.
-* Minor changes and enhancements since 5.10 M1.
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1] milestone page in the
-JUnit repository on GitHub.
-
-
-[[release-notes-5.10.0-RC1-junit-platform]]
-=== JUnit Platform
-
-==== Deprecations and Breaking Changes
-
-* The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
-  have been deprecated and replaced by `getParameterTypeNames()` for greater clarity.
-* Methods in `DiscoverySelectors` that accept a `ClassLoader` now declare the
-  `ClassLoader` as the first parameter. This is only a breaking change for code that
-  relies on the new methods introduced in JUnit Platform 1.10 M1.
-
-==== New Features and Improvements
-
-* New `@SelectMethod` selector support in the `@Suite` test engine.
-* Classes may now be selected by fully-qualified name via the `names` attribute in
-  `@SelectClasses`.
-* New `selectMethod()` and `selectNestedMethod()` variants in `DiscoverySelectors` that
-  accept a `Class<?>...` argument of parameter types as a type-safe alternative to
-  providing the names of parameter types as a comma-delimited string.
-* Stack trace pruning has been revised and now only removes calls from the `org.junit`,
-  `jdk.internal.reflect`, and `sun.reflect` packages. Please refer to the
-  <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
-* New `getAncestors()` method in `TestDescriptor`.
-
-
-[[release-notes-5.10.0-RC1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== New Features and Improvements
-
-* `@TempDir` can now be used as a meta-annotation in order to create custom _composed
-  annotations_. See the `@JimfsTempDir` example in the
-  <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
-  for details.
-* `@TempDir` now successfully cleans up files and directories on Windows that are set to
-  read-only.
-* New `reason` attribute in `@Execution` which can be used to document the reason for
-  using the selected execution mode.
-* The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
-  includes an example implementation of the `RandomNumberExtension` in order to improve
-  the documentation for extension registration via `@ExtendWith` on fields.
-* Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
-* The scope of applicability for `TestWatcher` implementations is now more extensively
-  documented in the User Guide and Javadoc.
-* `JAVA_22` has been added to the `JRE` enum for use with JRE-based execution conditions.
-
-
-[[release-notes-5.10.0-RC1-junit-vintage]]
-=== JUnit Vintage
-
-No changes.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
similarity index 75%
rename from documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
rename to documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
index cb26ac56a9dc..513732acd741 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
@@ -1,7 +1,7 @@
-[[release-notes-5.10.0-M1]]
-== 5.10.0-M1
+[[release-notes-5.10.0]]
+== 5.10.0
 
-*Date of Release:* May 13, 2023
+*Date of Release:* ❓
 
 *Scope:*
 
@@ -12,6 +12,7 @@
 * Dry-run mode for test execution
 * New `NamespacedHierarchicalStore` for use in third-party test engines
 * Stacktrace pruning to hide internal JUnit calls
+* New `@SelectMethod` support in test `@Suite` classes.
 * New `TempDirFactory` SPI for customizing how temporary directories are created
 * Failure threshold for `@RepeatedTest`
 * New convenience base classes for implementing `ArgumentsProvider` and `ArgumentConverter`
@@ -21,11 +22,13 @@
 * Numerous bug fixes and minor improvements
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1] milestone page in the JUnit
+link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1],
+link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1], and
+link:{junit5-repo}+/milestone/70?closed=1+[5.10.0 GA] milestone pages in the JUnit
 repository on GitHub.
 
 
-[[release-notes-5.10.0-M1-junit-platform]]
+[[release-notes-5.10.0-junit-platform]]
 === JUnit Platform
 
 ==== Deprecations and Breaking Changes
@@ -33,10 +36,12 @@ repository on GitHub.
 * Building native images with GraalVM now requires configuring the build arg
   `--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig` and
   `--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter`.
+* The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
+  have been deprecated and replaced by `getParameterTypeNames()` for greater clarity.
 
 ==== New Features and Improvements
 
-* Promote various "experimental" APIs that have matured to "stable" including
+* Various "experimental" APIs have been promoted to "stable", including
   `ModuleSelector`, `EngineDiscoveryListener`, `EngineDiscoveryRequestResolver`,
   `LauncherSession`, `LauncherSessionListener`, parallel execution support classes,
   `@Suite` and related annotations, and others.
@@ -49,10 +54,17 @@ repository on GitHub.
   `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
   arrangements (such as OSGi). Consequently, `DiscoverySelectors.selectMethod(Class<?>,
   String, String)` also now works properly with custom `ClassLoader` arrangements.
+
+* New `@SelectMethod` selector support in the `@Suite` test engine.
+* Classes may now be selected by fully-qualified name via the `names` attribute in
+  `@SelectClasses`.
 * New overloaded constructors for `ClassSelector`, `NestedClassSelector`,
   `MethodSelector`, and `NestedMethodSelector` that take an explicit `ClassLoader` as a
   parameter, allowing selectors to select classes in custom `ClassLoader` arrangements
   like in OSGi.
+* New `selectMethod()` and `selectNestedMethod()` variants in `DiscoverySelectors` that
+  accept a `Class<?>...` argument of parameter types as a type-safe alternative to
+  providing the names of parameter types as a comma-delimited string.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
   started/finished and opened/closed events are now invoked using "wrapping" semantics.
   This means that finished/closed event methods are invoked in reverse order compared to
@@ -80,12 +92,13 @@ repository on GitHub.
 * New dry-run mode to simulate test execution without actually running tests. Please refer
   to the <<../user-guide/index.adoc#launcher-api-dry-run-mode, User Guide>> for details.
 * Stack traces produced by failing tests are now pruned of calls from the `org.junit`,
-  `java`, and `jdk` packages by default. This feature can be disabled or configured to
-  prune other calls via configurations parameters. Please refer to the
+  `jdk.internal.reflect`, and `sun.reflect` packages. This feature can be disabled via a
+  configuration parameter. Please refer to the
   <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
+* New `getAncestors()` method in `TestDescriptor`.
 
 
-[[release-notes-5.10.0-M1-junit-jupiter]]
+[[release-notes-5.10.0-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -105,43 +118,55 @@ repository on GitHub.
   default.
 * Implicit type conversion of boolean values like in `@CsvSource` is now stricter, only
   allowing values `"true"` or `"false"` (case-insensitive), in order to make accidental
-  mistakes apparent, avoiding potential confusion.
+  mistakes apparent and to avoid potential confusion.
 
 ==== New Features and Improvements
 
-* Promote various "experimental" APIs that have matured to "stable" including
+* Various "experimental" APIs have been promoted to "stable", including
   `MethodOrderer`, `ClassOrderer`, `InvocationInterceptor`,
   `LifecycleMethodExecutionExceptionHandler`, `@TempDir`, parallel execution annotations,
   and others.
+* `JAVA_22` has been added to the `JRE` enum for use with JRE-based execution conditions.
+* New `reason` attribute in `@Execution` which can be used to document the reason for
+  using the selected execution mode.
+* New `junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor` configuration
+  parameter to set the maximum pool size factor.
+* New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
+  parameter to disable pool saturation.
 * `@RepeatedTest` can now be configured with a failure threshold which signifies the
   number of failures after which remaining repetitions will be automatically skipped. See
   the <<../user-guide/index.adoc#writing-tests-repeated-tests, User Guide>> for details.
-* New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
-  `@ParameterizedTest` invocation.
+* If `@MethodSource` is used with a non-static factory method that should be `static`, the
+  exception thrown now provides the user a meaningful explanation of how to address the
+  problem.
 * `@EmptySource` now supports additional types, including `Collection` and `Map` subtypes
   with a public no-arg constructor.
-* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
-  fall back to the default display name generator.
+* New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
+  `@ParameterizedTest` invocation.
 * New `AnnotationBasedArgumentsProvider` convenience base class which implements both
   `ArgumentsProvider` and `AnnotationConsumer`.
 * New `AnnotationBasedArgumentConverter` convenience base class which implements both
   `ArgumentConverter` and `AnnotationConsumer`.
-* New `junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor` configuration
-  parameter to set the maximum pool size factor.
-* New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
-  parameter to disable pool saturation.
+* `@TempDir` can now be used as a meta-annotation in order to create custom _composed
+  annotations_. See the `@JimfsTempDir` example in the
+  <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
+  for details.
+* `@TempDir` now successfully cleans up files and directories on Windows that are set to
+  read-only.
 * New `TempDirFactory` SPI for customizing how the `@TempDir` extension creates temporary
   directories. See the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
-* New `junit.jupiter.tempdir.factory.default` configuration parameter to set the default
-  `TempDirFactory` for temporary directories.
-* If `@MethodSource` is used with a non-static factory method that should be `static`, the
-  exception thrown now provides the user a meaningful explanation of how to address the
-  problem.
+* The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
+  includes an example implementation of the `RandomNumberExtension` in order to improve
+  the documentation for extension registration via `@ExtendWith` on fields.
+* The scope of applicability for `TestWatcher` implementations is now more extensively
+  documented in the User Guide and Javadoc.
+* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
+  fall back to the default display name generator.
 
 
-[[release-notes-5.10.0-M1-junit-vintage]]
+[[release-notes-5.10.0-junit-vintage]]
 === JUnit Vintage
 
 No changes.

From e6cb83158646894aba775da603ce80166c29308b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 05:51:44 +0000
Subject: [PATCH 1413/1433] Bump org.jetbrains.kotlinx:kotlinx-coroutines-core
 from 1.7.1 to 1.7.2

Bumps [org.jetbrains.kotlinx:kotlinx-coroutines-core](https://github.com/Kotlin/kotlinx.coroutines) from 1.7.1 to 1.7.2.
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.1...1.7.2)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0474257c274f..fa654149929d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -47,7 +47,7 @@ jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "2.0.0" }
 junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.13.2" } }
-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.1" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.2" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
 maven = { module = "org.apache.maven:apache-maven", version = "3.9.2" }

From f8b29cafb5871436ebf999564c0546899277f412 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 13:03:34 +0000
Subject: [PATCH 1414/1433] Bump com.google.jimfs:jimfs from 1.2 to 1.3.0

Bumps [com.google.jimfs:jimfs](https://github.com/google/jimfs) from 1.2 to 1.3.0.
- [Release notes](https://github.com/google/jimfs/releases)
- [Commits](https://github.com/google/jimfs/compare/v1.2...v1.3.0)

---
updated-dependencies:
- dependency-name: com.google.jimfs:jimfs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fa654149929d..a8ba1cfb7f85 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -42,7 +42,7 @@ groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.12" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
-jimfs = { module = "com.google.jimfs:jimfs", version = "1.2" }
+jimfs = { module = "com.google.jimfs:jimfs", version = "1.3.0" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "2.0.0" }

From 2373ec32be1f2ab536d0e97a3be05ed1472f63b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 13:03:45 +0000
Subject: [PATCH 1415/1433] Bump io.github.classgraph:classgraph from 4.8.160
 to 4.8.161

Bumps [io.github.classgraph:classgraph](https://github.com/classgraph/classgraph) from 4.8.160 to 4.8.161.
- [Release notes](https://github.com/classgraph/classgraph/releases)
- [Commits](https://github.com/classgraph/classgraph/commits/classgraph-4.8.161)

---
updated-dependencies:
- dependency-name: io.github.classgraph:classgraph
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a8ba1cfb7f85..d1759a848449 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@ assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 bartholdy = { module = "de.sormuras:bartholdy", version = "0.2.3" }
 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.160" }
+classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.161" }
 commons-io = { module = "commons-io:commons-io", version = "2.13.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.11" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }

From 151b01d8cd2d77af9992550715a833141695a55b Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 7 Jul 2023 09:53:59 +0200
Subject: [PATCH 1416/1433] Use Kotlin DSL property assignment

---
 build.gradle.kts                              |  2 +-
 documentation/documentation.gradle.kts        | 36 ++++++-------
 .../plugins/build-parameters/build.gradle.kts | 46 ++++++++--------
 ....jacoco-aggregation-conventions.gradle.kts |  7 +--
 ...itbuild.jacoco-java-conventions.gradle.kts |  2 +-
 ...tbuild.java-library-conventions.gradle.kts | 18 +++----
 ...uild.java-multi-release-sources.gradle.kts |  2 +-
 ...uild.java-toolchain-conventions.gradle.kts |  8 +--
 .../junitbuild.osgi-conventions.gradle.kts    |  6 +--
 ...nitbuild.publishing-conventions.gradle.kts | 54 +++++++++----------
 .../junitbuild.shadow-conventions.gradle.kts  |  2 +-
 .../junitbuild.testing-conventions.gradle.kts | 10 ++--
 junit-bom/junit-bom.gradle.kts                |  4 +-
 .../junit-platform-commons.gradle.kts         |  2 +-
 ...nit-platform-console-standalone.gradle.kts |  2 +-
 .../junit-platform-console.gradle.kts         |  2 +-
 .../junit-platform-jfr.gradle.kts             |  8 +--
 .../junit-vintage-engine.gradle.kts           |  6 +--
 platform-tests/platform-tests.gradle.kts      | 12 ++---
 .../platform-tooling-support-tests.gradle.kts |  4 +-
 .../projects/gradle-starter/build.gradle.kts  |  2 +-
 21 files changed, 115 insertions(+), 120 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e45ad17ddf6e..048d466a4546 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
 }
 
 nexusPublishing {
-	packageGroup.set("org.junit")
+	packageGroup = "org.junit"
 	repositories {
 		sonatype()
 	}
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 5167b3caf35e..5a8de73e5cea 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -80,10 +80,10 @@ val ota4jDocVersion = if (libs.versions.opentest4j.get().contains("SNAPSHOT")) "
 val apiGuardianDocVersion = if (libs.versions.apiguardian.get().contains("SNAPSHOT")) "snapshot" else libs.versions.apiguardian.get()
 
 gitPublish {
-	repoUri.set("https://github.com/junit-team/junit5.git")
-	branch.set("gh-pages")
-	sign.set(false)
-	fetchDepth.set(1)
+	repoUri = "https://github.com/junit-team/junit5.git"
+	branch = "gh-pages"
+	sign = false
+	fetchDepth = 1
 
 	contents {
 		from(docsDir)
@@ -142,7 +142,7 @@ tasks {
 	}
 
 	register<RunConsoleLauncher>("consoleLauncher") {
-		hideOutput.set(false)
+		hideOutput = false
 		outputs.upToDateWhen { false }
 	}
 
@@ -160,51 +160,51 @@ tasks {
 
 	val generateConsoleLauncherOptions by registering(CaptureJavaExecOutput::class) {
 		classpath.from(sourceSets["test"].runtimeClasspath)
-		mainClass.set("org.junit.platform.console.ConsoleLauncher")
+		mainClass = "org.junit.platform.console.ConsoleLauncher"
 		args.addAll("--help", "--disable-banner")
-		outputFile.set(consoleLauncherOptionsFile)
+		outputFile = consoleLauncherOptionsFile
 	}
 
 	val generateConsoleLauncherDiscoverOptions by registering(CaptureJavaExecOutput::class) {
 		classpath.from(sourceSets["test"].runtimeClasspath)
-		mainClass.set("org.junit.platform.console.ConsoleLauncher")
+		mainClass = "org.junit.platform.console.ConsoleLauncher"
 		args.addAll("discover", "--help", "--disable-banner")
-		outputFile.set(consoleLauncherDiscoverOptionsFile)
+		outputFile = consoleLauncherDiscoverOptionsFile
 	}
 
 	val generateConsoleLauncherExecuteOptions by registering(CaptureJavaExecOutput::class) {
 		classpath.from(sourceSets["test"].runtimeClasspath)
-		mainClass.set("org.junit.platform.console.ConsoleLauncher")
+		mainClass = "org.junit.platform.console.ConsoleLauncher"
 		args.addAll("execute", "--help", "--disable-banner")
-		outputFile.set(consoleLauncherExecuteOptionsFile)
+		outputFile = consoleLauncherExecuteOptionsFile
 	}
 
 	val generateConsoleLauncherEnginesOptions by registering(CaptureJavaExecOutput::class) {
 		classpath.from(sourceSets["test"].runtimeClasspath)
-		mainClass.set("org.junit.platform.console.ConsoleLauncher")
+		mainClass = "org.junit.platform.console.ConsoleLauncher"
 		args.addAll("engines", "--help", "--disable-banner")
-		outputFile.set(consoleLauncherEnginesOptionsFile)
+		outputFile = consoleLauncherEnginesOptionsFile
 	}
 
 	val generateExperimentalApisTable by registering(CaptureJavaExecOutput::class) {
 		classpath.from(sourceSets["test"].runtimeClasspath)
-		mainClass.set("org.junit.api.tools.ApiReportGenerator")
+		mainClass = "org.junit.api.tools.ApiReportGenerator"
 		jvmArgumentProviders += ClasspathSystemPropertyProvider("api.classpath", apiReport)
 		args.add("EXPERIMENTAL")
-		outputFile.set(experimentalApisTableFile)
+		outputFile = experimentalApisTableFile
 	}
 
 	val generateDeprecatedApisTable by registering(CaptureJavaExecOutput::class) {
 		classpath.from(sourceSets["test"].runtimeClasspath)
-		mainClass.set("org.junit.api.tools.ApiReportGenerator")
+		mainClass = "org.junit.api.tools.ApiReportGenerator"
 		jvmArgumentProviders += ClasspathSystemPropertyProvider("api.classpath", apiReport)
 		args.add("DEPRECATED")
-		outputFile.set(deprecatedApisTableFile)
+		outputFile = deprecatedApisTableFile
 	}
 
 	val generateStandaloneConsoleLauncherShadowedArtifactsFile by registering(GenerateStandaloneConsoleLauncherShadowedArtifactsFile::class) {
 		inputJar.fileProvider(standaloneConsoleLauncher.elements.map { it.single().asFile })
-		outputFile.set(standaloneConsoleLauncherShadowedArtifactsFile)
+		outputFile = standaloneConsoleLauncherShadowedArtifactsFile
 	}
 
 	withType<AbstractAsciidoctorTask>().configureEach {
diff --git a/gradle/plugins/build-parameters/build.gradle.kts b/gradle/plugins/build-parameters/build.gradle.kts
index 909f736269e1..f70f2d8bc062 100644
--- a/gradle/plugins/build-parameters/build.gradle.kts
+++ b/gradle/plugins/build-parameters/build.gradle.kts
@@ -7,69 +7,69 @@ group = "junitbuild"
 buildParameters {
 	pluginId("junitbuild.build-parameters")
 	bool("ci") {
-		description.set("Whether or not this build is running in a CI environment")
-		defaultValue.set(false)
+		description = "Whether or not this build is running in a CI environment"
+		defaultValue = false
 		fromEnvironment()
 	}
 	integer("javaToolchainVersion") {
-		description.set("Defines the Java toolchain version to use for compiling code")
+		description = "Defines the Java toolchain version to use for compiling code"
 	}
 	group("buildCache") {
 		string("username") {
-			description.set("Username to authenticate with the remote build cache")
+			description = "Username to authenticate with the remote build cache"
 			fromEnvironment()
 		}
 		string("password") {
-			description.set("Password to authenticate with the remote build cache")
+			description = "Password to authenticate with the remote build cache"
 			fromEnvironment()
 		}
 		string("url") {
-			description.set("URL to the remote build cache")
+			description = "URL to the remote build cache"
 			fromEnvironment()
 		}
 	}
 	group("documentation") {
-		description.set("Parameters controlling how the documentation is built")
+		description = "Parameters controlling how the documentation is built"
 		bool("replaceCurrentDocs") {
-			description.set("The documentation that is being deployed will replace what's currently deployed as 'current'")
-			defaultValue.set(false)
+			description = "The documentation that is being deployed will replace what's currently deployed as 'current'"
+			defaultValue = false
 		}
 	}
 	group("enterprise") {
-		description.set("Parameters controlling Gradle Enterprise features")
+		description = "Parameters controlling Gradle Enterprise features"
 		group("predictiveTestSelection") {
 			bool("enabled") {
-				description.set("Whether or not to use Predictive Test Selection for selecting tests to execute")
-				defaultValue.set(true)
+				description = "Whether or not to use Predictive Test Selection for selecting tests to execute"
+				defaultValue = true
 			}
 		}
 		group("testDistribution") {
 			bool("enabled") {
-				description.set("Whether or not to use Test Distribution for executing tests")
-				defaultValue.set(false)
+				description = "Whether or not to use Test Distribution for executing tests"
+				defaultValue = false
 				fromEnvironment()
 			}
 			integer("maxLocalExecutors") {
-				description.set("How many local executors to use for executing tests")
-				defaultValue.set(1)
+				description = "How many local executors to use for executing tests"
+				defaultValue = 1
 			}
 			integer("maxRemoteExecutors") {
-				description.set("How many remote executors to request for executing tests")
+				description = "How many remote executors to request for executing tests"
 			}
 		}
 	}
 	group("testing") {
-		description.set("Testing related parameters")
+		description = "Testing related parameters"
 		bool("enableJaCoCo") {
-			description.set("Enables JaCoCo test coverage reporting")
-			defaultValue.set(false)
+			description = "Enables JaCoCo test coverage reporting"
+			defaultValue = false
 		}
 		bool("enableJFR") {
-			description.set("Enables Java Flight Recorder functionality")
-			defaultValue.set(false)
+			description = "Enables Java Flight Recorder functionality"
+			defaultValue = false
 		}
 		integer("retries") {
-			description.set("Configures the number of times failing test are retried")
+			description = "Configures the number of times failing test are retried"
 		}
 	}
 }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
index e611a9f622d1..91008c81b184 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-aggregation-conventions.gradle.kts
@@ -1,8 +1,3 @@
-import org.gradle.api.attributes.TestSuiteType
-import org.gradle.kotlin.dsl.invoke
-import org.gradle.kotlin.dsl.`jacoco-report-aggregation`
-import org.gradle.testing.jacoco.plugins.JacocoCoverageReport
-
 plugins {
 	id("junitbuild.jacoco-conventions")
 	`jacoco-report-aggregation`
@@ -11,7 +6,7 @@ plugins {
 reporting {
 	reports {
 		create<JacocoCoverageReport>("jacocoRootReport") {
-			testType.set(TestSuiteType.UNIT_TEST)
+			testType = TestSuiteType.UNIT_TEST
 		}
 	}
 }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
index 7bc6a3a8e214..804de8388562 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.jacoco-java-conventions.gradle.kts
@@ -17,7 +17,7 @@ tasks.withType<Test>().configureEach {
 
 val codeCoverageClassesJar by tasks.registering(Jar::class) {
 	from(tasks.jar.map { zipTree(it.archiveFile) })
-	archiveClassifier.set("jacoco")
+	archiveClassifier = "jacoco"
 	enabled = project in mavenizedProjects
 	duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
index 6c0e5462486c..16a6237bdd57 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
@@ -39,7 +39,7 @@ eclipse {
 }
 
 java {
-	modularity.inferModulePath.set(false)
+	modularity.inferModulePath = false
 }
 
 if (project in mavenizedProjects) {
@@ -102,7 +102,7 @@ if (project in mavenizedProjects) {
 					}
 				}
 				pom {
-					description.set(provider { "Module \"${project.name}\" of JUnit 5." })
+					description = provider { "Module \"${project.name}\" of JUnit 5." }
 				}
 			}
 		}
@@ -156,11 +156,11 @@ val compileModule by tasks.registering(JavaCompile::class) {
 	dependsOn(allMainClasses)
     enabled = project in modularProjects
 	source = fileTree(combinedModuleSourceDir).builtBy(prepareModuleSourceDir)
-	destinationDirectory.set(moduleOutputDir)
+	destinationDirectory = moduleOutputDir
 	sourceCompatibility = "9"
 	targetCompatibility = "9"
 	classpath = files()
-	options.release.set(9)
+	options.release = 9
 	options.compilerArgs.addAll(listOf(
 			// Suppress warnings for automatic modules: org.apiguardian.api, org.opentest4j
 			"-Xlint:all,-requires-automatic,-requires-transitive-automatic",
@@ -177,7 +177,7 @@ val compileModule by tasks.registering(JavaCompile::class) {
     })
 	options.compilerArgumentProviders.addAll(modularProjects.map { objects.newInstance(PatchModuleArgumentProvider::class, project, it) })
 
-	modularity.inferModulePath.set(false)
+	modularity.inferModulePath = false
 
     doFirst {
         options.allCompilerArgs.forEach {
@@ -260,7 +260,7 @@ afterEvaluate {
 	tasks {
 		compileJava {
 			if (extension.configureRelease) {
-				options.release.set(extension.mainJavaVersion.majorVersion.toInt())
+				options.release = extension.mainJavaVersion.majorVersion.toInt()
 			} else {
 				sourceCompatibility = extension.mainJavaVersion.majorVersion
 				targetCompatibility = extension.mainJavaVersion.majorVersion
@@ -268,7 +268,7 @@ afterEvaluate {
 		}
 		compileTestJava {
 			if (extension.configureRelease) {
-				options.release.set(extension.testJavaVersion.majorVersion.toInt())
+				options.release = extension.testJavaVersion.majorVersion.toInt()
 			} else {
 				sourceCompatibility = extension.testJavaVersion.majorVersion
 				targetCompatibility = extension.testJavaVersion.majorVersion
@@ -291,7 +291,7 @@ afterEvaluate {
 
 checkstyle {
 	toolVersion = requiredVersionFromLibs("checkstyle")
-	configDirectory.set(rootProject.layout.projectDirectory.dir("gradle/config/checkstyle"))
+	configDirectory = rootProject.layout.projectDirectory.dir("gradle/config/checkstyle")
 }
 
 tasks {
@@ -308,6 +308,6 @@ pluginManager.withPlugin("java-test-fixtures") {
         config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
 	}
 	tasks.named<JavaCompile>("compileTestFixturesJava") {
-		options.release.set(extension.testJavaVersion.majorVersion.toInt())
+		options.release = extension.testJavaVersion.majorVersion.toInt()
 	}
 }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
index 58d28949b127..d1b05c6e00ce 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts
@@ -26,7 +26,7 @@ listOf(9, 17).forEach { javaVersion ->
 		}
 
 		named<JavaCompile>(sourceSet.get().compileJavaTaskName).configure {
-			options.release.set(javaVersion)
+			options.release = javaVersion
 		}
 
 		named<Checkstyle>("checkstyle${sourceSet.name.capitalized()}").configure {
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
index 5cd96cf5180e..68735c0c9168 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts
@@ -11,18 +11,18 @@ project.pluginManager.withPlugin("java") {
 	val extension = the<JavaPluginExtension>()
 	val javaToolchainService = the<JavaToolchainService>()
 
-	extension.toolchain.languageVersion.set(javaLanguageVersion)
+	extension.toolchain.languageVersion = javaLanguageVersion
 
 	pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
 		configure<KotlinJvmProjectExtension> {
 			jvmToolchain {
-				languageVersion.set(javaLanguageVersion)
+				languageVersion = javaLanguageVersion
 			}
 		}
 	}
 
 	tasks.withType<JavaExec>().configureEach {
-		javaLauncher.set(javaToolchainService.launcherFor(extension.toolchain))
+		javaLauncher = javaToolchainService.launcherFor(extension.toolchain)
 	}
 
 	tasks.withType<JavaCompile>().configureEach {
@@ -39,7 +39,7 @@ project.pluginManager.withPlugin("java") {
 	tasks.withType<GroovyCompile>().configureEach {
 		javaLauncher.set(javaToolchainService.launcherFor {
 			// Groovy does not yet support JDK 19, see https://issues.apache.org/jira/browse/GROOVY-10569
-			languageVersion.set(defaultLanguageVersion)
+			languageVersion = defaultLanguageVersion
 		})
 	}
 }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
index 03de80c3edd8..9cd51cd4b56f 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
@@ -77,7 +77,7 @@ tasks.withType<Jar>().matching { task: Jar ->
 // task writes out the properties necessary for it to verify the OSGi
 // metadata.
 val osgiProperties by tasks.registering(WriteProperties::class) {
-	destinationFile.set(layout.buildDirectory.file("verifyOSGiProperties.bndrun"))
+	destinationFile = layout.buildDirectory.file("verifyOSGiProperties.bndrun")
 	property("-standalone", true)
 	project.extensions.getByType(JavaLibraryExtension::class.java).let { javaLibrary ->
 		property("-runee", "JavaSE-${javaLibrary.mainJavaVersion}")
@@ -97,8 +97,8 @@ val osgiVerification by configurations.creatingResolvable {
 // that its metadata is valid. If the metadata is invalid this task will
 // fail.
 val verifyOSGi by tasks.registering(Resolve::class) {
-	bndrun.set(osgiProperties.flatMap { it.destinationFile })
-	outputBndrun.set(layout.buildDirectory.file("resolvedOSGiProperties.bndrun"))
+	bndrun = osgiProperties.flatMap { it.destinationFile }
+	outputBndrun = layout.buildDirectory.file("resolvedOSGiProperties.bndrun")
 	isReportOptional = false
 	// By default bnd will use jars found in:
 	// 1. project.sourceSets.main.runtimeClasspath
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
index dae789b6351c..bab950933c2a 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
@@ -60,54 +60,54 @@ publishing {
 				name.set(provider {
 					project.description ?: "${project.group}:${project.name}"
 				})
-				url.set("https://junit.org/junit5/")
+				url = "https://junit.org/junit5/"
 				scm {
-					connection.set("scm:git:git://github.com/junit-team/junit5.git")
-					developerConnection.set("scm:git:git://github.com/junit-team/junit5.git")
-					url.set("https://github.com/junit-team/junit5")
+					connection = "scm:git:git://github.com/junit-team/junit5.git"
+					developerConnection = "scm:git:git://github.com/junit-team/junit5.git"
+					url = "https://github.com/junit-team/junit5"
 				}
 				licenses {
 					license {
 						val license: License by rootProject.extra
-						name.set(license.name)
-						url.set(license.url.toString())
+						name = license.name
+						url = license.url.toString()
 					}
 				}
 				developers {
 					developer {
-						id.set("bechte")
-						name.set("Stefan Bechtold")
-						email.set("stefan.bechtold@me.com")
+						id = "bechte"
+						name = "Stefan Bechtold"
+						email = "stefan.bechtold@me.com"
 					}
 					developer {
-						id.set("jlink")
-						name.set("Johannes Link")
-						email.set("business@johanneslink.net")
+						id = "jlink"
+						name = "Johannes Link"
+						email = "business@johanneslink.net"
 					}
 					developer {
-						id.set("marcphilipp")
-						name.set("Marc Philipp")
-						email.set("mail@marcphilipp.de")
+						id = "marcphilipp"
+						name = "Marc Philipp"
+						email = "mail@marcphilipp.de"
 					}
 					developer {
-						id.set("mmerdes")
-						name.set("Matthias Merdes")
-						email.set("matthias.merdes@heidelpay.com")
+						id = "mmerdes"
+						name = "Matthias Merdes"
+						email = "matthias.merdes@heidelpay.com"
 					}
 					developer {
-						id.set("sbrannen")
-						name.set("Sam Brannen")
-						email.set("sam@sambrannen.com")
+						id = "sbrannen"
+						name = "Sam Brannen"
+						email = "sam@sambrannen.com"
 					}
 					developer {
-						id.set("sormuras")
-						name.set("Christian Stein")
-						email.set("sormuras@gmail.com")
+						id = "sormuras"
+						name = "Christian Stein"
+						email = "sormuras@gmail.com"
 					}
 					developer {
-						id.set("juliette-derancourt")
-						name.set("Juliette de Rancourt")
-						email.set("derancourt.juliette@gmail.com")
+						id = "juliette-derancourt"
+						name = "Juliette de Rancourt"
+						email = "derancourt.juliette@gmail.com"
 					}
 				}
 			}
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
index 4863c00576fa..341eb6f826a3 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts
@@ -52,7 +52,7 @@ tasks {
 		configurations = listOf(shadowed)
 		exclude("META-INF/maven/**")
 		excludes.remove("module-info.class")
-		archiveClassifier.set("")
+		archiveClassifier = ""
 	}
 	jar {
 		dependsOn(shadowJar)
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
index 8a1cdd89955f..086e1e6135af 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
@@ -19,12 +19,12 @@ tasks.withType<Test>().configureEach {
 		exceptionFormat = FULL
 	}
 	retry {
-		maxRetries.set(buildParameters.testing.retries.orElse(if (buildParameters.ci) 2 else 0))
+		maxRetries = buildParameters.testing.retries.orElse(if (buildParameters.ci) 2 else 0)
 	}
 	distribution {
 		enabled.convention(buildParameters.enterprise.testDistribution.enabled && (!buildParameters.ci || System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNotBlank()))
-		maxLocalExecutors.set(buildParameters.enterprise.testDistribution.maxLocalExecutors)
-		maxRemoteExecutors.set(buildParameters.enterprise.testDistribution.maxRemoteExecutors)
+		maxLocalExecutors = buildParameters.enterprise.testDistribution.maxLocalExecutors
+		maxRemoteExecutors = buildParameters.enterprise.testDistribution.maxRemoteExecutors
 		if (buildParameters.ci) {
 			when {
 				OperatingSystem.current().isLinux -> requirements.add("os=linux")
@@ -34,11 +34,11 @@ tasks.withType<Test>().configureEach {
 		}
 	}
 	predictiveSelection {
-		enabled.set(buildParameters.enterprise.predictiveTestSelection.enabled)
+		enabled = buildParameters.enterprise.predictiveTestSelection.enabled
 
 		// Ensure PTS works when publishing Build Scans to scans.gradle.com
 		this as PredictiveTestSelectionExtensionInternal
-		server.set(uri("https://ge.junit.org"))
+		server = uri("https://ge.junit.org")
 	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 	// Required until ASM officially supports the JDK 14
diff --git a/junit-bom/junit-bom.gradle.kts b/junit-bom/junit-bom.gradle.kts
index 485bb50d2ea3..5e9107a5ac1f 100644
--- a/junit-bom/junit-bom.gradle.kts
+++ b/junit-bom/junit-bom.gradle.kts
@@ -17,8 +17,8 @@ dependencies {
 publishing.publications.named<MavenPublication>("maven") {
 	from(components["javaPlatform"])
 	pom {
-		description.set("This Bill of Materials POM can be used to ease dependency management " +
-				"when referencing multiple JUnit artifacts using Gradle or Maven.")
+		description = "This Bill of Materials POM can be used to ease dependency management " +
+				"when referencing multiple JUnit artifacts using Gradle or Maven."
 		withXml {
 			val filteredContent = asString().replace("\\s*<scope>compile</scope>".toRegex(), "")
 			asString().clear().append(filteredContent)
diff --git a/junit-platform-commons/junit-platform-commons.gradle.kts b/junit-platform-commons/junit-platform-commons.gradle.kts
index 3ffc32815fb2..bb6a7c336eab 100644
--- a/junit-platform-commons/junit-platform-commons.gradle.kts
+++ b/junit-platform-commons/junit-platform-commons.gradle.kts
@@ -19,7 +19,7 @@ tasks.jar {
 	val release9ClassesDir = sourceSets.mainRelease9.get().output.classesDirs.singleFile
 	inputs.dir(release9ClassesDir).withPathSensitivity(PathSensitivity.RELATIVE)
 	doLast(objects.newInstance(ExecJarAction::class).apply {
-		javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
+		javaLauncher = javaToolchains.launcherFor(java.toolchain)
 		args.addAll(
 			"--update",
 			"--file", archiveFile.get().asFile.absolutePath,
diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
index da249709a95f..93eabb96a553 100644
--- a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
+++ b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -30,7 +30,7 @@ tasks {
 	}
 	val shadowedArtifactsFile by registering(WriteArtifactsFile::class) {
 		from(configurations.shadowed)
-		outputFile.set(layout.buildDirectory.file("shadowed-artifacts"))
+		outputFile = layout.buildDirectory.file("shadowed-artifacts")
 	}
 	shadowJar {
 		// https://github.com/junit-team/junit5/issues/2557
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
index 7893568a0967..91acfd91b6d7 100644
--- a/junit-platform-console/junit-platform-console.gradle.kts
+++ b/junit-platform-console/junit-platform-console.gradle.kts
@@ -41,7 +41,7 @@ tasks {
 		}
 		from(sourceSets.mainRelease9.get().output.classesDirs)
 		doLast(objects.newInstance(junitbuild.java.ExecJarAction::class).apply {
-			javaLauncher.set(project.javaToolchains.launcherFor(java.toolchain))
+			javaLauncher = project.javaToolchains.launcherFor(java.toolchain)
 			args.addAll(
 				"--update",
 				"--file", archiveFile.get().asFile.absolutePath,
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
index c0df2b512652..f2555cd59166 100644
--- a/junit-platform-jfr/junit-platform-jfr.gradle.kts
+++ b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -21,11 +21,11 @@ javaLibrary {
 
 tasks {
 	compileJava {
-		javaCompiler.set(project.javaToolchains.compilerFor {
-			languageVersion.set(JavaLanguageVersion.of(8))
-		})
+		javaCompiler = project.javaToolchains.compilerFor {
+			languageVersion = JavaLanguageVersion.of(8)
+		}
 	}
 	compileModule {
-		options.release.set(11)
+		options.release = 11
 	}
 }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
index 8dea84a41458..288b3b184075 100644
--- a/junit-vintage-engine/junit-vintage-engine.gradle.kts
+++ b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -29,10 +29,10 @@ dependencies {
 
 tasks {
 	compileTestFixturesGroovy {
-		javaLauncher.set(project.javaToolchains.launcherFor {
+		javaLauncher = project.javaToolchains.launcherFor {
 			// Groovy 2.x (used for Spock tests) does not support current JDKs
-			languageVersion.set(JavaLanguageVersion.of(8))
-		})
+			languageVersion = JavaLanguageVersion.of(8)
+		}
 	}
 	jar {
 		bundle {
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
index ef730d24a79f..f32a2852349d 100644
--- a/platform-tests/platform-tests.gradle.kts
+++ b/platform-tests/platform-tests.gradle.kts
@@ -50,12 +50,12 @@ dependencies {
 }
 
 jmh {
-	jmhVersion.set(libs.versions.jmh)
+	jmhVersion = libs.versions.jmh
 
-	duplicateClassesStrategy.set(DuplicatesStrategy.WARN)
-	fork.set(1)
-	warmupIterations.set(1)
-	iterations.set(5)
+	duplicateClassesStrategy = DuplicatesStrategy.WARN
+	fork = 1
+	warmupIterations = 1
+	iterations = 5
 }
 
 tasks {
@@ -67,7 +67,7 @@ tasks {
 		distribution {
 			// Retry in a new JVM on Windows to improve chances of successful retries when
 			// cached resources are used (e.g. in ClasspathScannerTests)
-			retryInSameJvm.set(!OperatingSystem.current().isWindows)
+			retryInSameJvm = !OperatingSystem.current().isWindows
 		}
 	}
 	test {
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
index dd2b86a7d362..28f5d7d69d49 100644
--- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
+++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -147,7 +147,7 @@ tasks.test {
 	distribution {
 		requirements.add("jdk=8")
 		this as TestDistributionExtensionInternal
-		preferredMaxDuration.set(Duration.ofMillis(500))
+		preferredMaxDuration = Duration.ofMillis(500)
 	}
 	jvmArgumentProviders += JavaHomeDir(project, 8, distribution.enabled)
 }
@@ -179,7 +179,7 @@ class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEna
 			.value(project.provider {
 				try {
 					project.javaToolchains.launcherFor {
-						languageVersion.set(JavaLanguageVersion.of(version))
+						languageVersion = JavaLanguageVersion.of(version)
 					}.get()
 				} catch (e: NoToolchainAvailableException) {
 					null
diff --git a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
index 801d838b4f63..e1053da535b7 100644
--- a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
+++ b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
@@ -25,7 +25,7 @@ tasks.test {
 	}
 
 	reports {
-		html.required.set(true)
+		html.required = true
 	}
 
 	val outputDir = reports.junitXml.outputLocation

From 948d0356be4d949573a64099e82664d65bd49257 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 7 Jul 2023 09:57:52 +0200
Subject: [PATCH 1417/1433] Fail build on Kotlin DSL compilation warnings

---
 gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle.properties b/gradle.properties
index 1a6d11cf2f54..a4cd021ca444 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,6 +22,7 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19,JDK20,JDK21
+org.gradle.kotlin.dsl.allWarningsAsErrors=true
 
 # Test Distribution
 gradle.internal.testdistribution.writeTraceFile=true

From ed7c6095b0a3a97b2fbfd93b0d895880e8567bf6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 7 Jul 2023 13:57:54 +0200
Subject: [PATCH 1418/1433] Update nexus-publish plugin to 2.0.0-rc-1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d1759a848449..7a4b23ed453c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -77,5 +77,5 @@ buildParameters = { id = "org.gradlex.build-parameters", version = "1.4.3" }
 gitPublish = { id = "org.ajoberstar.git-publish", version = "4.2.0" }
 jmh = { id = "me.champeau.jmh", version = "0.7.1" }
 nohttp = { id = "io.spring.nohttp", version = "0.0.11" }
-nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
+nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-1" }
 versions = { id = "com.github.ben-manes.versions", version.ref = "gradleVersionsPlugin" }

From 81c5253f173ff670772a6f0d38b5607c78d3cffc Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Fri, 7 Jul 2023 13:58:12 +0200
Subject: [PATCH 1419/1433] Update shadow plugin to 8.1.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7a4b23ed453c..90cd98c44842 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gra
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
 gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.4" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
-gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "8.0.0" }
+gradle-shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.19.0" }
 gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionsPlugin" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.12" }

From 34248ab949388e73e57834d1e9e3f796f3f2eda1 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Sat, 8 Jul 2023 10:20:27 +0200
Subject: [PATCH 1420/1433] Use explicit link label in AnnotationConsumer
 Javadoc (#3389)

---
 .../org/junit/jupiter/params/support/AnnotationConsumer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
index 4930441cd4fd..31141c242dad 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java
@@ -24,7 +24,7 @@
  * <p>It is typically implemented by implementations of
  * {@link org.junit.jupiter.params.provider.ArgumentsProvider ArgumentsProvider}
  * and {@link org.junit.jupiter.params.converter.ArgumentConverter ArgumentConverter}
- * in order to signal that they can {@link #accept} a certain annotation.
+ * in order to signal that they can {@link #accept accept} a certain annotation.
  *
  * @since 5.0
  */

From 6ae0b55ba3e87ce3401467c0bebd1e84f42bad35 Mon Sep 17 00:00:00 2001
From: JUnit Team <team@junit.org>
Date: Tue, 11 Jul 2023 00:38:29 +0000
Subject: [PATCH 1421/1433] Bump Gradle Wrapper from 8.2 to 8.2.1

---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a7c2bd1bdc63..c2447881d454 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 83c52e9e8854186e9a7f19672064e8365c6ab3e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 05:43:59 +0000
Subject: [PATCH 1422/1433] Bump org.apache.groovy:groovy from 4.0.12 to 4.0.13

Bumps [org.apache.groovy:groovy](https://github.com/apache/groovy) from 4.0.12 to 4.0.13.
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 90cd98c44842..5ced1985d79d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd
 gradle-shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.19.0" }
 gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionsPlugin" }
-groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.12" }
+groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.13" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }

From ba34eed48691f8c076674e25266ee4f9254356c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 05:44:17 +0000
Subject: [PATCH 1423/1433] Bump org.apache.maven:apache-maven from 3.9.2 to
 3.9.3

Bumps [org.apache.maven:apache-maven](https://github.com/apache/maven) from 3.9.2 to 3.9.3.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.9.2...maven-3.9.3)

---
updated-dependencies:
- dependency-name: org.apache.maven:apache-maven
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5ced1985d79d..760cd7dabe52 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.2" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
-maven = { module = "org.apache.maven:apache-maven", version = "3.9.2" }
+maven = { module = "org.apache.maven:apache-maven", version = "3.9.3" }
 mavenSurefirePlugin = { module = "org.apache.maven.plugins:maven-surefire-plugin", version.ref = "surefire" }
 memoryfilesystem = { module = "com.github.marschall:memoryfilesystem", version = "2.6.1" }
 mockito = { module = "org.mockito:mockito-junit-jupiter", version = "5.4.0" }

From 73818a193b7020a5c7bb3b11b1f178d8fe206462 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 05:19:23 +0000
Subject: [PATCH 1424/1433] Bump org.gradle.toolchains:foojay-resolver from
 0.5.0 to 0.6.0

Bumps org.gradle.toolchains:foojay-resolver from 0.5.0 to 0.6.0.

---
updated-dependencies:
- dependency-name: org.gradle.toolchains:foojay-resolver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 760cd7dabe52..626d7f221c4d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checks
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.161" }
 commons-io = { module = "commons-io:commons-io", version = "2.13.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.11" }
-gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.5.0" }
+gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.6.0" }
 gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.4" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }

From acb6e65442b39c4372d8187f240f8f4f32da56d3 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Mon, 17 Jul 2023 08:50:31 +0200
Subject: [PATCH 1425/1433] Provide access to source element annotations for
 `TempDirFactory`

This allows inspecting the declaration site of `@TempDir` in
`TempDirFactory`.

Resolves #3390.
---
 .../asciidoc/user-guide/writing-tests.adoc    |   5 +
 .../test/java/example/TempDirectoryDemo.java  |   9 +-
 .../extension/AnnotatedElementContext.java    | 116 ++++++++++++++++++
 .../api/extension/ParameterContext.java       |  80 +++++-------
 .../junit/jupiter/api/io/TempDirFactory.java  |  16 ++-
 .../engine/extension/TempDirectory.java       |  56 ++++++---
 .../DefaultJupiterConfigurationTests.java     |   3 +-
 .../extension/CloseablePathCleanupTests.java  |  10 +-
 .../TempDirectoryPerContextTests.java         |   7 +-
 .../TempDirectoryPerDeclarationTests.java     | 114 ++++++++++++++++-
 10 files changed, 331 insertions(+), 85 deletions(-)
 create mode 100644 junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AnnotatedElementContext.java

diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
index e4dee9ca8339..0a0862b6f2b8 100644
--- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc
@@ -2672,6 +2672,11 @@ The following example demonstrates how to use the custom `@JimfsTempDir` annotat
 include::{testDir}/example/TempDirectoryDemo.java[tags=user_guide_composed_annotation_usage]
 ----
 
+Meta-annotations or additional annotations on the field or parameter the `TempDir`
+annotation is declared on might expose additional attributes to configure the factory.
+Such annotations and related attributes can be accessed via the `AnnotatedElementContext`
+parameter of `createTempDirectory`.
+
 You can use the `junit.jupiter.tempdir.factory.default`
 <<running-tests-config-params, configuration parameter>> to specify the fully qualified
 class name of the `TempDirFactory` you would like to use by default. Just like for
diff --git a/documentation/src/test/java/example/TempDirectoryDemo.java b/documentation/src/test/java/example/TempDirectoryDemo.java
index d45961698997..027242993e58 100644
--- a/documentation/src/test/java/example/TempDirectoryDemo.java
+++ b/documentation/src/test/java/example/TempDirectoryDemo.java
@@ -32,6 +32,7 @@
 import example.util.ListWriter;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.AnnotatedElementContext;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.api.io.TempDirFactory;
@@ -110,8 +111,9 @@ void factoryTest(@TempDir(factory = Factory.class) Path tempDir) {
 		static class Factory implements TempDirFactory {
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws IOException {
-				return Files.createTempDirectory(context.getRequiredTestMethod().getName());
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws IOException {
+				return Files.createTempDirectory(extensionContext.getRequiredTestMethod().getName());
 			}
 
 		}
@@ -133,7 +135,8 @@ static class JimfsTempDirFactory implements TempDirFactory {
 			private final FileSystem fileSystem = Jimfs.newFileSystem(Configuration.unix());
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws IOException {
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws IOException {
 				return Files.createTempDirectory(fileSystem.getPath("/"), "junit");
 			}
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AnnotatedElementContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AnnotatedElementContext.java
new file mode 100644
index 000000000000..49cf3500a033
--- /dev/null
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/AnnotatedElementContext.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2015-2023 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.extension;
+
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.util.List;
+import java.util.Optional;
+
+import org.apiguardian.api.API;
+import org.junit.platform.commons.support.AnnotationSupport;
+
+/**
+ * {@code AnnotatedElementContext} encapsulates the <em>context</em> in which an
+ * {@link #getAnnotatedElement() AnnotatedElement} is declared.
+ *
+ * <p>For example, an {@code AnnotatedElementContext} is used in
+ * {@link org.junit.jupiter.api.io.TempDirFactory TempDirFactory} to allow inspecting
+ * the field or parameter the {@link org.junit.jupiter.api.io.TempDir TempDir}
+ * annotation is declared on.
+ *
+ * <p>This interface is not intended to be implemented by clients.
+ *
+ * @since 5.10
+ */
+@API(status = EXPERIMENTAL, since = "5.10")
+public interface AnnotatedElementContext {
+
+	/**
+	 * Get the {@link AnnotatedElement} for this context.
+	 *
+	 * <h4>WARNING</h4>
+	 * <p>When searching for annotations on the annotated element in this context,
+	 * favor {@link #isAnnotated(Class)}, {@link #findAnnotation(Class)}, and
+	 * {@link #findRepeatableAnnotations(Class)} over methods in the
+	 * {@link AnnotatedElement} API due to a bug in {@code javac} on JDK versions prior
+	 * to JDK 9.
+	 *
+	 * @return the annotated element; never {@code null}
+	 */
+	AnnotatedElement getAnnotatedElement();
+
+	/**
+	 * Determine if an annotation of {@code annotationType} is either
+	 * <em>present</em> or <em>meta-present</em> on the {@link AnnotatedElement} for
+	 * this context.
+	 *
+	 * <h4>WARNING</h4>
+	 * <p>Favor the use of this method over directly invoking
+	 * {@link AnnotatedElement#isAnnotationPresent(Class)} due to a bug in {@code javac}
+	 * on JDK versions prior to JDK 9.
+	 *
+	 * @param annotationType the annotation type to search for; never {@code null}
+	 * @return {@code true} if the annotation is present or meta-present
+	 * @see #findAnnotation(Class)
+	 * @see #findRepeatableAnnotations(Class)
+	 */
+	default boolean isAnnotated(Class<? extends Annotation> annotationType) {
+		return AnnotationSupport.isAnnotated(getAnnotatedElement(), annotationType);
+	}
+
+	/**
+	 * Find the first annotation of {@code annotationType} that is either
+	 * <em>present</em> or <em>meta-present</em> on the {@link AnnotatedElement} for
+	 * this context.
+	 *
+	 * <h4>WARNING</h4>
+	 * <p>Favor the use of this method over directly invoking annotation lookup
+	 * methods in the {@link AnnotatedElement} API due to a bug in {@code javac} on JDK
+	 * versions prior to JDK 9.
+	 *
+	 * @param <A> the annotation type
+	 * @param annotationType the annotation type to search for; never {@code null}
+	 * @return an {@code Optional} containing the annotation; never {@code null} but
+	 * potentially empty
+	 * @see #isAnnotated(Class)
+	 * @see #findRepeatableAnnotations(Class)
+	 */
+	default <A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType) {
+		return AnnotationSupport.findAnnotation(getAnnotatedElement(), annotationType);
+	}
+
+	/**
+	 * Find all <em>repeatable</em> {@linkplain Annotation annotations} of
+	 * {@code annotationType} that are either <em>present</em> or
+	 * <em>meta-present</em> on the {@link AnnotatedElement} for this context.
+	 *
+	 * <h4>WARNING</h4>
+	 * <p>Favor the use of this method over directly invoking annotation lookup
+	 * methods in the {@link AnnotatedElement} API due to a bug in {@code javac} on JDK
+	 * versions prior to JDK 9.
+	 *
+	 * @param <A> the annotation type
+	 * @param annotationType the repeatable annotation type to search for; never
+	 * {@code null}
+	 * @return the list of all such annotations found; neither {@code null} nor
+	 * mutable, but potentially empty
+	 * @see #isAnnotated(Class)
+	 * @see #findAnnotation(Class)
+	 * @see java.lang.annotation.Repeatable
+	 */
+	default <A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType) {
+		return AnnotationSupport.findRepeatableAnnotations(getAnnotatedElement(), annotationType);
+	}
+
+}
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
index 1bce9ffbe16c..88165ba8539f 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ParameterContext.java
@@ -10,9 +10,11 @@
 
 package org.junit.jupiter.api.extension;
 
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Parameter;
 import java.util.List;
@@ -36,7 +38,7 @@
  * @see java.lang.reflect.Constructor
  */
 @API(status = STABLE, since = "5.0")
-public interface ParameterContext {
+public interface ParameterContext extends AnnotatedElementContext {
 
 	/**
 	 * Get the {@link Parameter} for this context.
@@ -89,63 +91,43 @@ default Executable getDeclaringExecutable() {
 	Optional<Object> getTarget();
 
 	/**
-	 * Determine if an annotation of {@code annotationType} is either
-	 * <em>present</em> or <em>meta-present</em> on the {@link Parameter} for
-	 * this context.
-	 *
-	 * <h4>WARNING</h4>
-	 * <p>Favor the use of this method over directly invoking
-	 * {@link Parameter#isAnnotationPresent(Class)} due to a bug in {@code javac}
-	 * on JDK versions prior to JDK 9.
-	 *
-	 * @param annotationType the annotation type to search for; never {@code null}
-	 * @return {@code true} if the annotation is present or meta-present
+	 * {@inheritDoc}
+	 * @since 5.10
+	 */
+	@API(status = EXPERIMENTAL, since = "5.10")
+	@Override
+	default AnnotatedElement getAnnotatedElement() {
+		return getParameter();
+	}
+
+	/**
+	 * {@inheritDoc}
 	 * @since 5.1.1
-	 * @see #findAnnotation(Class)
-	 * @see #findRepeatableAnnotations(Class)
 	 */
-	boolean isAnnotated(Class<? extends Annotation> annotationType);
+	@API(status = STABLE, since = "5.10")
+	@Override
+	default boolean isAnnotated(Class<? extends Annotation> annotationType) {
+		return AnnotatedElementContext.super.isAnnotated(annotationType);
+	}
 
 	/**
-	 * Find the first annotation of {@code annotationType} that is either
-	 * <em>present</em> or <em>meta-present</em> on the {@link Parameter} for
-	 * this context.
-	 *
-	 * <h4>WARNING</h4>
-	 * <p>Favor the use of this method over directly invoking annotation lookup
-	 * methods in the {@link Parameter} API due to a bug in {@code javac} on JDK
-	 * versions prior to JDK 9.
-	 *
-	 * @param <A> the annotation type
-	 * @param annotationType the annotation type to search for; never {@code null}
-	 * @return an {@code Optional} containing the annotation; never {@code null} but
-	 * potentially empty
+	 * {@inheritDoc}
 	 * @since 5.1.1
-	 * @see #isAnnotated(Class)
-	 * @see #findRepeatableAnnotations(Class)
 	 */
-	<A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType);
+	@API(status = STABLE, since = "5.10")
+	@Override
+	default <A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType) {
+		return AnnotatedElementContext.super.findAnnotation(annotationType);
+	}
 
 	/**
-	 * Find all <em>repeatable</em> {@linkplain Annotation annotations} of
-	 * {@code annotationType} that are either <em>present</em> or
-	 * <em>meta-present</em> on the {@link Parameter} for this context.
-	 *
-	 * <h4>WARNING</h4>
-	 * <p>Favor the use of this method over directly invoking annotation lookup
-	 * methods in the {@link Parameter} API due to a bug in {@code javac} on JDK
-	 * versions prior to JDK 9.
-	 *
-	 * @param <A> the annotation type
-	 * @param annotationType the repeatable annotation type to search for; never
-	 * {@code null}
-	 * @return the list of all such annotations found; neither {@code null} nor
-	 * mutable, but potentially empty
+	 * {@inheritDoc}
 	 * @since 5.1.1
-	 * @see #isAnnotated(Class)
-	 * @see #findAnnotation(Class)
-	 * @see java.lang.annotation.Repeatable
 	 */
-	<A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType);
+	@API(status = STABLE, since = "5.10")
+	@Override
+	default <A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType) {
+		return AnnotatedElementContext.super.findRepeatableAnnotations(annotationType);
+	}
 
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
index 97dfe075a7c8..b7ffbc9411d8 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
+++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/TempDirFactory.java
@@ -18,6 +18,7 @@
 import java.nio.file.Path;
 
 import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.AnnotatedElementContext;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 /**
@@ -30,8 +31,9 @@
  *
  * <p>Implementations must provide a no-args constructor and should not make any
  * assumptions regarding when and how many times they are instantiated, but they
- * can assume that {@link #createTempDirectory(ExtensionContext)} and {@link #close()}
- * will both be called once per instance, in this order, and from the same thread.
+ * can assume that {@link #createTempDirectory(AnnotatedElementContext, ExtensionContext)}
+ * and {@link #close()} will both be called once per instance, in this order,
+ * and from the same thread.
  *
  * <p>A {@link TempDirFactory} can be configured <em>globally</em> for the
  * entire test suite via the {@value TempDir#DEFAULT_FACTORY_PROPERTY_NAME}
@@ -53,11 +55,14 @@ public interface TempDirFactory extends Closeable {
 	 * not be associated with the {@link java.nio.file.FileSystems#getDefault()
 	 * default FileSystem}.
 	 *
-	 * @param context the current extension context; never {@code null}
+	 * @param elementContext the context of the field or parameter where
+	 * {@code @TempDir} is declared; never {@code null}
+	 * @param extensionContext the current extension context; never {@code null}
 	 * @return the path to the newly created temporary directory; never {@code null}
 	 * @throws Exception in case of failures
 	 */
-	Path createTempDirectory(ExtensionContext context) throws Exception;
+	Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+			throws Exception;
 
 	/**
 	 * {@inheritDoc}
@@ -82,7 +87,8 @@ public Standard() {
 		}
 
 		@Override
-		public Path createTempDirectory(ExtensionContext context) throws IOException {
+		public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+				throws IOException {
 			return Files.createTempDirectory(TEMP_DIR_PREFIX);
 		}
 
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
index 0c41baa4724b..fe76498bd4ae 100644
--- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
+++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java
@@ -41,6 +41,7 @@
 import java.util.TreeMap;
 import java.util.function.Predicate;
 
+import org.junit.jupiter.api.extension.AnnotatedElementContext;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
@@ -59,7 +60,9 @@
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ExceptionUtils;
+import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.commons.util.ToStringBuilder;
 
 /**
  * {@code TempDirectory} is a JUnit Jupiter extension that creates and cleans
@@ -128,7 +131,7 @@ private void injectFields(ExtensionContext context, Object testInstance, Class<?
 				CleanupMode cleanupMode = determineCleanupModeForField(field);
 				TempDirFactory factory = determineTempDirFactoryForField(field, scope);
 				makeAccessible(field).set(testInstance,
-					getPathOrFile(field, field.getType(), factory, cleanupMode, scope, context));
+					getPathOrFile(new FieldContext(field), field.getType(), factory, cleanupMode, scope, context));
 			}
 			catch (Throwable t) {
 				ExceptionUtils.throwAsUncheckedException(t);
@@ -161,8 +164,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 		CleanupMode cleanupMode = determineCleanupModeForParameter(parameterContext);
 		Scope scope = getScope(extensionContext);
 		TempDirFactory factory = determineTempDirFactoryForParameter(parameterContext, scope);
-		return getPathOrFile(parameterContext.getParameter(), parameterType, factory, cleanupMode, scope,
-			extensionContext);
+		return getPathOrFile(parameterContext, parameterType, factory, cleanupMode, scope, extensionContext);
 	}
 
 	private CleanupMode determineCleanupModeForField(Field field) {
@@ -232,13 +234,13 @@ private void assertSupportedType(String target, Class<?> type) {
 		}
 	}
 
-	private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, TempDirFactory factory,
+	private Object getPathOrFile(AnnotatedElementContext elementContext, Class<?> type, TempDirFactory factory,
 			CleanupMode cleanupMode, Scope scope, ExtensionContext extensionContext) {
 		Namespace namespace = scope == Scope.PER_DECLARATION //
-				? NAMESPACE.append(sourceElement) //
+				? NAMESPACE.append(elementContext) //
 				: NAMESPACE;
 		Path path = extensionContext.getStore(namespace) //
-				.getOrComputeIfAbsent(KEY, __ -> createTempDir(factory, cleanupMode, extensionContext),
+				.getOrComputeIfAbsent(KEY, __ -> createTempDir(factory, cleanupMode, elementContext, extensionContext),
 					CloseablePath.class) //
 				.get();
 
@@ -246,9 +248,9 @@ private Object getPathOrFile(AnnotatedElement sourceElement, Class<?> type, Temp
 	}
 
 	static CloseablePath createTempDir(TempDirFactory factory, CleanupMode cleanupMode,
-			ExtensionContext executionContext) {
+			AnnotatedElementContext elementContext, ExtensionContext extensionContext) {
 		try {
-			return new CloseablePath(factory, cleanupMode, executionContext);
+			return new CloseablePath(factory, cleanupMode, elementContext, extensionContext);
 		}
 		catch (Exception ex) {
 			throw new ExtensionConfigurationException("Failed to create default temp directory", ex);
@@ -262,14 +264,14 @@ static class CloseablePath implements CloseableResource {
 		private final Path dir;
 		private final TempDirFactory factory;
 		private final CleanupMode cleanupMode;
-		private final ExtensionContext executionContext;
+		private final ExtensionContext extensionContext;
 
-		CloseablePath(TempDirFactory factory, CleanupMode cleanupMode, ExtensionContext executionContext)
-				throws Exception {
-			this.dir = factory.createTempDirectory(executionContext);
+		CloseablePath(TempDirFactory factory, CleanupMode cleanupMode, AnnotatedElementContext elementContext,
+				ExtensionContext extensionContext) throws Exception {
+			this.dir = factory.createTempDirectory(elementContext, extensionContext);
 			this.factory = factory;
 			this.cleanupMode = cleanupMode;
-			this.executionContext = executionContext;
+			this.extensionContext = extensionContext;
 		}
 
 		Path get() {
@@ -280,12 +282,12 @@ Path get() {
 		public void close() throws IOException {
 			try {
 				if (cleanupMode == NEVER
-						|| (cleanupMode == ON_SUCCESS && executionContext.getExecutionException().isPresent())) {
+						|| (cleanupMode == ON_SUCCESS && extensionContext.getExecutionException().isPresent())) {
 					logger.info(() -> "Skipping cleanup of temp dir " + dir + " due to cleanup mode configuration.");
 					return;
 				}
 
-				FileOperations fileOperations = executionContext.getStore(NAMESPACE) //
+				FileOperations fileOperations = extensionContext.getStore(NAMESPACE) //
 						.getOrDefault(FILE_OPERATIONS_KEY, FileOperations.class, FileOperations.DEFAULT);
 
 				SortedMap<Path, IOException> failures = deleteAllFilesAndDirectories(fileOperations);
@@ -451,4 +453,28 @@ interface FileOperations {
 
 	}
 
+	private static class FieldContext implements AnnotatedElementContext {
+
+		private final Field field;
+
+		private FieldContext(Field field) {
+			this.field = Preconditions.notNull(field, "field must not be null");
+		}
+
+		@Override
+		public AnnotatedElement getAnnotatedElement() {
+			return this.field;
+		}
+
+		@Override
+		public String toString() {
+			// @formatter:off
+			return new ToStringBuilder(this)
+					.append("field", this.field)
+					.toString();
+			// @formatter:on
+		}
+
+	}
+
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
index d6cfc1d41713..44d05998be02 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.extension.AnnotatedElementContext;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDirFactory;
@@ -127,7 +128,7 @@ void shouldGetDefaultTempDirFactorySupplierWithConfigParamSet() {
 	private static class CustomFactory implements TempDirFactory {
 
 		@Override
-		public Path createTempDirectory(ExtensionContext context) {
+		public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext) {
 			throw new UnsupportedOperationException();
 		}
 	}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
index 43c5105047a2..85daa507785a 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/CloseablePathCleanupTests.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.AnnotatedElementContext;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.io.CleanupMode;
@@ -48,6 +49,7 @@
  */
 class CloseablePathCleanupTests extends AbstractJupiterTestEngineTests {
 
+	private final AnnotatedElementContext elementContext = mock();
 	private final ExtensionContext extensionContext = mock();
 	private final TempDirFactory factory = spy(TempDirFactory.Standard.INSTANCE);
 
@@ -67,7 +69,7 @@ void cleanupTempDirectory() throws IOException {
 	@Test
 	@DisplayName("is cleaned up for a cleanup mode of ALWAYS")
 	void always() throws IOException {
-		closeablePath = TempDirectory.createTempDir(factory, ALWAYS, extensionContext);
+		closeablePath = TempDirectory.createTempDir(factory, ALWAYS, elementContext, extensionContext);
 		assertThat(closeablePath.get()).exists();
 
 		closeablePath.close();
@@ -78,7 +80,7 @@ void always() throws IOException {
 	@Test
 	@DisplayName("is not cleaned up for a cleanup mode of NEVER")
 	void never() throws IOException {
-		closeablePath = TempDirectory.createTempDir(factory, NEVER, extensionContext);
+		closeablePath = TempDirectory.createTempDir(factory, NEVER, elementContext, extensionContext);
 		assertThat(closeablePath.get()).exists();
 
 		closeablePath.close();
@@ -91,7 +93,7 @@ void never() throws IOException {
 	void onSuccessWithException() throws IOException {
 		when(extensionContext.getExecutionException()).thenReturn(Optional.of(new Exception()));
 
-		closeablePath = TempDirectory.createTempDir(factory, ON_SUCCESS, extensionContext);
+		closeablePath = TempDirectory.createTempDir(factory, ON_SUCCESS, elementContext, extensionContext);
 		assertThat(closeablePath.get()).exists();
 
 		closeablePath.close();
@@ -104,7 +106,7 @@ void onSuccessWithException() throws IOException {
 	void onSuccessWithNoException() throws IOException {
 		when(extensionContext.getExecutionException()).thenReturn(Optional.empty());
 
-		closeablePath = TempDirectory.createTempDir(factory, ON_SUCCESS, extensionContext);
+		closeablePath = TempDirectory.createTempDir(factory, ON_SUCCESS, elementContext, extensionContext);
 		assertThat(closeablePath.get()).exists();
 
 		closeablePath.close();
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
index 4515d33b27fb..ac6f152814e3 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerContextTests.java
@@ -48,6 +48,7 @@
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.AnnotatedElementContext;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
@@ -318,7 +319,8 @@ void supportsCustomDefaultFactory() {
 		private static class Factory implements TempDirFactory {
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws Exception {
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
 				return Files.createTempDirectory("junit");
 			}
 		}
@@ -693,7 +695,8 @@ void test(@SuppressWarnings("unused") @TempDir(factory = Factory.class) Path tem
 		private static class Factory implements TempDirFactory {
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws Exception {
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
 				return Files.createTempDirectory("junit");
 			}
 		}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
index 33a5297e21ae..f0575de592c0 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java
@@ -10,6 +10,10 @@
 
 package org.junit.jupiter.engine.extension;
 
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -30,6 +34,11 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Parameter;
 import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
@@ -62,6 +71,7 @@
 import org.junit.jupiter.api.TestReporter;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.AnnotatedElementContext;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -345,6 +355,20 @@ void supportsFactoryWithJimfs() {
 					.assertStatistics(stats -> stats.started(1).succeeded(1));
 		}
 
+		@Test
+		@DisplayName("that uses annotated element name as temp dir name prefix")
+		void supportsFactoryWithAnnotatedElementNameAsPrefix() {
+			executeTestsForClass(FactoryWithAnnotatedElementNameAsPrefixTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
+		@Test
+		@DisplayName("that uses custom meta-annotation")
+		void supportsFactoryWithCustomMetaAnnotation() {
+			executeTestsForClass(FactoryWithCustomMetaAnnotationTestCase.class).testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1));
+		}
+
 	}
 
 	@Nested
@@ -390,7 +414,8 @@ private static class Factory implements TempDirFactory {
 			private boolean closed;
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws Exception {
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
 				return Files.createTempDirectory("custom");
 			}
 
@@ -1178,8 +1203,9 @@ void test(@TempDir(factory = Factory.class) Path tempDir) {
 		private static class Factory implements TempDirFactory {
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws Exception {
-				return Files.createTempDirectory(context.getRequiredTestMethod().getName());
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
+				return Files.createTempDirectory(extensionContext.getRequiredTestMethod().getName());
 			}
 		}
 
@@ -1203,7 +1229,8 @@ private Factory() throws IOException {
 			}
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws Exception {
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
 				return Files.createTempDirectory(parent, "prefix");
 			}
 		}
@@ -1223,7 +1250,8 @@ private static class Factory implements TempDirFactory {
 			private static FileSystem fileSystem;
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws Exception {
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
 				fileSystem = MemoryFileSystemBuilder.newEmpty().build();
 				return Files.createTempDirectory(fileSystem.getPath("/"), "prefix");
 			}
@@ -1250,7 +1278,8 @@ private static class Factory implements TempDirFactory {
 			private static FileSystem fileSystem;
 
 			@Override
-			public Path createTempDirectory(ExtensionContext context) throws Exception {
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
 				fileSystem = Jimfs.newFileSystem(Configuration.unix());
 				return Files.createTempDirectory(fileSystem.getPath("/"), "prefix");
 			}
@@ -1264,6 +1293,79 @@ public void close() throws IOException {
 
 	}
 
+	static class FactoryWithAnnotatedElementNameAsPrefixTestCase {
+
+		@TempDir(factory = Factory.class)
+		private Path tempDir1;
+
+		@Test
+		void test(@TempDir(factory = Factory.class) Path tempDir2) {
+			assertThat(tempDir1.getFileName()).asString().startsWith("tempDir1");
+			assertThat(tempDir2.getFileName()).asString().startsWith("tempDir2");
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			@Override
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
+				return Files.createTempDirectory(getName(elementContext.getAnnotatedElement()));
+			}
+
+			private static String getName(AnnotatedElement element) {
+				return element instanceof Field ? ((Field) element).getName() : ((Parameter) element).getName();
+			}
+
+		}
+
+	}
+
+	static class FactoryWithCustomMetaAnnotationTestCase {
+
+		@TempDirForField
+		private Path tempDir1;
+
+		@Test
+		void test(@TempDirForParameter Path tempDir2) {
+			assertThat(tempDir1.getFileName()).asString().startsWith("field");
+			assertThat(tempDir2.getFileName()).asString().startsWith("parameter");
+		}
+
+		@Target(ANNOTATION_TYPE)
+		@Retention(RUNTIME)
+		@TempDir(factory = FactoryWithCustomMetaAnnotationTestCase.Factory.class)
+		private @interface TempDirWithPrefix {
+
+			String value();
+
+		}
+
+		@Target(FIELD)
+		@Retention(RUNTIME)
+		@TempDirWithPrefix("field")
+		private @interface TempDirForField {
+		}
+
+		@Target(PARAMETER)
+		@Retention(RUNTIME)
+		@TempDirWithPrefix("parameter")
+		private @interface TempDirForParameter {
+		}
+
+		private static class Factory implements TempDirFactory {
+
+			@Override
+			public Path createTempDirectory(AnnotatedElementContext elementContext, ExtensionContext extensionContext)
+					throws Exception {
+				String prefix = elementContext.findAnnotation(TempDirWithPrefix.class) //
+						.map(TempDirWithPrefix::value).orElseThrow();
+				return Files.createTempDirectory(prefix);
+			}
+
+		}
+
+	}
+
 	static class StandardDefaultFactoryTestCase {
 
 		@Test

From 2c278c7536c0c66eb2fc04e3c8665561bae0f0a7 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 19 Jul 2023 13:18:28 +0200
Subject: [PATCH 1426/1433] Revert "Prune Release Notes for 5.10 GA"

This reverts commit 82a2ad70522fb81e51c0391272a7e1d0407c6bf8.
---
 .../docs/asciidoc/release-notes/index.adoc    |  4 +-
 ...10.0.adoc => release-notes-5.10.0-M1.adoc} | 75 +++++++------------
 .../release-notes-5.10.0-RC1.adoc             | 71 ++++++++++++++++++
 3 files changed, 99 insertions(+), 51 deletions(-)
 rename documentation/src/docs/asciidoc/release-notes/{release-notes-5.10.0.adoc => release-notes-5.10.0-M1.adoc} (75%)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index ec787091b41e..faebab1dc3b6 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,7 +16,9 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
-include::{basedir}/release-notes-5.10.0.adoc[]
+include::{basedir}/release-notes-5.10.0-RC1.adoc[]
+
+include::{basedir}/release-notes-5.10.0-M1.adoc[]
 
 include::{basedir}/release-notes-5.9.3.adoc[]
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
similarity index 75%
rename from documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
rename to documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
index 513732acd741..cb26ac56a9dc 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
@@ -1,7 +1,7 @@
-[[release-notes-5.10.0]]
-== 5.10.0
+[[release-notes-5.10.0-M1]]
+== 5.10.0-M1
 
-*Date of Release:* ❓
+*Date of Release:* May 13, 2023
 
 *Scope:*
 
@@ -12,7 +12,6 @@
 * Dry-run mode for test execution
 * New `NamespacedHierarchicalStore` for use in third-party test engines
 * Stacktrace pruning to hide internal JUnit calls
-* New `@SelectMethod` support in test `@Suite` classes.
 * New `TempDirFactory` SPI for customizing how temporary directories are created
 * Failure threshold for `@RepeatedTest`
 * New convenience base classes for implementing `ArgumentsProvider` and `ArgumentConverter`
@@ -22,13 +21,11 @@
 * Numerous bug fixes and minor improvements
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1],
-link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1], and
-link:{junit5-repo}+/milestone/70?closed=1+[5.10.0 GA] milestone pages in the JUnit
+link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1] milestone page in the JUnit
 repository on GitHub.
 
 
-[[release-notes-5.10.0-junit-platform]]
+[[release-notes-5.10.0-M1-junit-platform]]
 === JUnit Platform
 
 ==== Deprecations and Breaking Changes
@@ -36,12 +33,10 @@ repository on GitHub.
 * Building native images with GraalVM now requires configuring the build arg
   `--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig` and
   `--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter`.
-* The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
-  have been deprecated and replaced by `getParameterTypeNames()` for greater clarity.
 
 ==== New Features and Improvements
 
-* Various "experimental" APIs have been promoted to "stable", including
+* Promote various "experimental" APIs that have matured to "stable" including
   `ModuleSelector`, `EngineDiscoveryListener`, `EngineDiscoveryRequestResolver`,
   `LauncherSession`, `LauncherSessionListener`, parallel execution support classes,
   `@Suite` and related annotations, and others.
@@ -54,17 +49,10 @@ repository on GitHub.
   `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
   arrangements (such as OSGi). Consequently, `DiscoverySelectors.selectMethod(Class<?>,
   String, String)` also now works properly with custom `ClassLoader` arrangements.
-
-* New `@SelectMethod` selector support in the `@Suite` test engine.
-* Classes may now be selected by fully-qualified name via the `names` attribute in
-  `@SelectClasses`.
 * New overloaded constructors for `ClassSelector`, `NestedClassSelector`,
   `MethodSelector`, and `NestedMethodSelector` that take an explicit `ClassLoader` as a
   parameter, allowing selectors to select classes in custom `ClassLoader` arrangements
   like in OSGi.
-* New `selectMethod()` and `selectNestedMethod()` variants in `DiscoverySelectors` that
-  accept a `Class<?>...` argument of parameter types as a type-safe alternative to
-  providing the names of parameter types as a comma-delimited string.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
   started/finished and opened/closed events are now invoked using "wrapping" semantics.
   This means that finished/closed event methods are invoked in reverse order compared to
@@ -92,13 +80,12 @@ repository on GitHub.
 * New dry-run mode to simulate test execution without actually running tests. Please refer
   to the <<../user-guide/index.adoc#launcher-api-dry-run-mode, User Guide>> for details.
 * Stack traces produced by failing tests are now pruned of calls from the `org.junit`,
-  `jdk.internal.reflect`, and `sun.reflect` packages. This feature can be disabled via a
-  configuration parameter. Please refer to the
+  `java`, and `jdk` packages by default. This feature can be disabled or configured to
+  prune other calls via configurations parameters. Please refer to the
   <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
-* New `getAncestors()` method in `TestDescriptor`.
 
 
-[[release-notes-5.10.0-junit-jupiter]]
+[[release-notes-5.10.0-M1-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -118,55 +105,43 @@ repository on GitHub.
   default.
 * Implicit type conversion of boolean values like in `@CsvSource` is now stricter, only
   allowing values `"true"` or `"false"` (case-insensitive), in order to make accidental
-  mistakes apparent and to avoid potential confusion.
+  mistakes apparent, avoiding potential confusion.
 
 ==== New Features and Improvements
 
-* Various "experimental" APIs have been promoted to "stable", including
+* Promote various "experimental" APIs that have matured to "stable" including
   `MethodOrderer`, `ClassOrderer`, `InvocationInterceptor`,
   `LifecycleMethodExecutionExceptionHandler`, `@TempDir`, parallel execution annotations,
   and others.
-* `JAVA_22` has been added to the `JRE` enum for use with JRE-based execution conditions.
-* New `reason` attribute in `@Execution` which can be used to document the reason for
-  using the selected execution mode.
-* New `junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor` configuration
-  parameter to set the maximum pool size factor.
-* New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
-  parameter to disable pool saturation.
 * `@RepeatedTest` can now be configured with a failure threshold which signifies the
   number of failures after which remaining repetitions will be automatically skipped. See
   the <<../user-guide/index.adoc#writing-tests-repeated-tests, User Guide>> for details.
-* If `@MethodSource` is used with a non-static factory method that should be `static`, the
-  exception thrown now provides the user a meaningful explanation of how to address the
-  problem.
-* `@EmptySource` now supports additional types, including `Collection` and `Map` subtypes
-  with a public no-arg constructor.
 * New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
   `@ParameterizedTest` invocation.
+* `@EmptySource` now supports additional types, including `Collection` and `Map` subtypes
+  with a public no-arg constructor.
+* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
+  fall back to the default display name generator.
 * New `AnnotationBasedArgumentsProvider` convenience base class which implements both
   `ArgumentsProvider` and `AnnotationConsumer`.
 * New `AnnotationBasedArgumentConverter` convenience base class which implements both
   `ArgumentConverter` and `AnnotationConsumer`.
-* `@TempDir` can now be used as a meta-annotation in order to create custom _composed
-  annotations_. See the `@JimfsTempDir` example in the
-  <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
-  for details.
-* `@TempDir` now successfully cleans up files and directories on Windows that are set to
-  read-only.
+* New `junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor` configuration
+  parameter to set the maximum pool size factor.
+* New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
+  parameter to disable pool saturation.
 * New `TempDirFactory` SPI for customizing how the `@TempDir` extension creates temporary
   directories. See the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
-* The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
-  includes an example implementation of the `RandomNumberExtension` in order to improve
-  the documentation for extension registration via `@ExtendWith` on fields.
-* The scope of applicability for `TestWatcher` implementations is now more extensively
-  documented in the User Guide and Javadoc.
-* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
-  fall back to the default display name generator.
+* New `junit.jupiter.tempdir.factory.default` configuration parameter to set the default
+  `TempDirFactory` for temporary directories.
+* If `@MethodSource` is used with a non-static factory method that should be `static`, the
+  exception thrown now provides the user a meaningful explanation of how to address the
+  problem.
 
 
-[[release-notes-5.10.0-junit-vintage]]
+[[release-notes-5.10.0-M1-junit-vintage]]
 === JUnit Vintage
 
 No changes.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
new file mode 100644
index 000000000000..02ea691874ce
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
@@ -0,0 +1,71 @@
+[[release-notes-5.10.0-RC1]]
+== 5.10.0-RC1
+
+*Date of Release:* July 6, 2023
+
+*Scope:*
+
+* New `@SelectMethod` support in test `@Suite` classes.
+* Various enhancements for discovery selectors for classes and methods, including
+  additional support for custom ClassLoader arrangements.
+* Improved `@TempDir` support for cleaning up files and directories on Windows.
+* Revised stack trace pruning support.
+* Various documentation improvements.
+* Minor changes and enhancements since 5.10 M1.
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1] milestone page in the
+JUnit repository on GitHub.
+
+
+[[release-notes-5.10.0-RC1-junit-platform]]
+=== JUnit Platform
+
+==== Deprecations and Breaking Changes
+
+* The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
+  have been deprecated and replaced by `getParameterTypeNames()` for greater clarity.
+* Methods in `DiscoverySelectors` that accept a `ClassLoader` now declare the
+  `ClassLoader` as the first parameter. This is only a breaking change for code that
+  relies on the new methods introduced in JUnit Platform 1.10 M1.
+
+==== New Features and Improvements
+
+* New `@SelectMethod` selector support in the `@Suite` test engine.
+* Classes may now be selected by fully-qualified name via the `names` attribute in
+  `@SelectClasses`.
+* New `selectMethod()` and `selectNestedMethod()` variants in `DiscoverySelectors` that
+  accept a `Class<?>...` argument of parameter types as a type-safe alternative to
+  providing the names of parameter types as a comma-delimited string.
+* Stack trace pruning has been revised and now only removes calls from the `org.junit`,
+  `jdk.internal.reflect`, and `sun.reflect` packages. Please refer to the
+  <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
+* New `getAncestors()` method in `TestDescriptor`.
+
+
+[[release-notes-5.10.0-RC1-junit-jupiter]]
+=== JUnit Jupiter
+
+==== New Features and Improvements
+
+* `@TempDir` can now be used as a meta-annotation in order to create custom _composed
+  annotations_. See the `@JimfsTempDir` example in the
+  <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
+  for details.
+* `@TempDir` now successfully cleans up files and directories on Windows that are set to
+  read-only.
+* New `reason` attribute in `@Execution` which can be used to document the reason for
+  using the selected execution mode.
+* The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
+  includes an example implementation of the `RandomNumberExtension` in order to improve
+  the documentation for extension registration via `@ExtendWith` on fields.
+* Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
+* The scope of applicability for `TestWatcher` implementations is now more extensively
+  documented in the User Guide and Javadoc.
+* `JAVA_22` has been added to the `JRE` enum for use with JRE-based execution conditions.
+
+
+[[release-notes-5.10.0-RC1-junit-vintage]]
+=== JUnit Vintage
+
+No changes.

From b08a76b59f468df1dffeaae84a9bac4aa9163043 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 19 Jul 2023 14:55:34 +0200
Subject: [PATCH 1427/1433] Add 5.10.0-RC2 release notes

---
 .../docs/asciidoc/release-notes/index.adoc    |  2 ++
 .../release-notes-5.10.0-RC2.adoc             | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index faebab1dc3b6..aafce6e61532 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,6 +16,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-5.10.0-RC2.adoc[]
+
 include::{basedir}/release-notes-5.10.0-RC1.adoc[]
 
 include::{basedir}/release-notes-5.10.0-M1.adoc[]
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc
new file mode 100644
index 000000000000..fd1a0754ee7e
--- /dev/null
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc
@@ -0,0 +1,32 @@
+[[release-notes-5.10.0-RC2]]
+== 5.10.0-RC2
+
+*Date of Release:* ❓
+
+*Scope:*
+
+* Provide `TempDirFactory` access to the source element (parameter or field)
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/71?closed=1+[5.10.0-RC2] milestone page in the
+JUnit repository on GitHub.
+
+
+[[release-notes-5.10.0-RC2-junit-platform]]
+=== JUnit Platform
+
+No changes.
+
+
+[[release-notes-5.10.0-RC2-junit-jupiter]]
+=== JUnit Jupiter
+
+==== New Features and Improvements
+
+* Provide `TempDirFactory` access to the source element (parameter or field)
+
+
+= [[release-notes-5.10.0-RC2-junit-vintage]]
+=== JUnit Vintage
+
+No changes.

From e6ff0c53ba851e48eaf26acc39988c5c4b469580 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 19 Jul 2023 15:39:01 +0200
Subject: [PATCH 1428/1433] Release 5.10.0-RC2

---
 README.md                                                   | 2 +-
 .../asciidoc/release-notes/release-notes-5.10.0-RC2.adoc    | 2 +-
 gradle.properties                                           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 60a57a4edf28..619b4a433717 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository is the home of _JUnit 5_.
 ## Latest Releases
 
 - General Availability (GA): [JUnit 5.9.3](https://github.com/junit-team/junit5/releases/tag/r5.9.3) (April 26, 2023)
-- Preview (Milestone/Release Candidate): [JUnit 5.10.0-RC1](https://github.com/junit-team/junit5/releases/tag/r5.10.0-RC1) (July 6, 2023)
+- Preview (Milestone/Release Candidate): [JUnit 5.10.0-RC2](https://github.com/junit-team/junit5/releases/tag/r5.10.0-RC2) (July 19, 2023)
 
 ## Documentation
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc
index fd1a0754ee7e..40856c0580af 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.10.0-RC2]]
 == 5.10.0-RC2
 
-*Date of Release:* ❓
+*Date of Release:* July 19, 2023
 
 *Scope:*
 
diff --git a/gradle.properties b/gradle.properties
index a4cd021ca444..f8c7bb413854 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.10.0-SNAPSHOT
+version         = 5.10.0-RC2
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.10.0-SNAPSHOT
+platformVersion = 1.10.0-RC2
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.10.0-SNAPSHOT
+vintageVersion  = 5.10.0-RC2
 
 defaultBuiltBy  = JUnit Team
 

From 893c64b47575df1d6499fb2064c81160c02e5c14 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 19 Jul 2023 15:59:56 +0200
Subject: [PATCH 1429/1433] Back to snapshots for further development

---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f8c7bb413854..a4cd021ca444 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.10.0-RC2
+version         = 5.10.0-SNAPSHOT
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.10.0-RC2
+platformVersion = 1.10.0-SNAPSHOT
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.10.0-RC2
+vintageVersion  = 5.10.0-SNAPSHOT
 
 defaultBuiltBy  = JUnit Team
 

From 463ae360d86837b955731df7d7fe56e9f7c155dd Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 6 Jul 2023 16:53:04 +0200
Subject: [PATCH 1430/1433] Prune Release Notes for 5.10 GA

Closes #3384
---
 .../docs/asciidoc/release-notes/index.adoc    |  6 +-
 .../release-notes-5.10.0-RC1.adoc             | 71 ------------------
 .../release-notes-5.10.0-RC2.adoc             | 32 --------
 ...10.0-M1.adoc => release-notes-5.10.0.adoc} | 75 ++++++++++++-------
 4 files changed, 51 insertions(+), 133 deletions(-)
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
 delete mode 100644 documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc
 rename documentation/src/docs/asciidoc/release-notes/{release-notes-5.10.0-M1.adoc => release-notes-5.10.0.adoc} (75%)

diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc
index aafce6e61532..ec787091b41e 100644
--- a/documentation/src/docs/asciidoc/release-notes/index.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/index.adoc
@@ -16,11 +16,7 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
-include::{basedir}/release-notes-5.10.0-RC2.adoc[]
-
-include::{basedir}/release-notes-5.10.0-RC1.adoc[]
-
-include::{basedir}/release-notes-5.10.0-M1.adoc[]
+include::{basedir}/release-notes-5.10.0.adoc[]
 
 include::{basedir}/release-notes-5.9.3.adoc[]
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
deleted file mode 100644
index 02ea691874ce..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC1.adoc
+++ /dev/null
@@ -1,71 +0,0 @@
-[[release-notes-5.10.0-RC1]]
-== 5.10.0-RC1
-
-*Date of Release:* July 6, 2023
-
-*Scope:*
-
-* New `@SelectMethod` support in test `@Suite` classes.
-* Various enhancements for discovery selectors for classes and methods, including
-  additional support for custom ClassLoader arrangements.
-* Improved `@TempDir` support for cleaning up files and directories on Windows.
-* Revised stack trace pruning support.
-* Various documentation improvements.
-* Minor changes and enhancements since 5.10 M1.
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1] milestone page in the
-JUnit repository on GitHub.
-
-
-[[release-notes-5.10.0-RC1-junit-platform]]
-=== JUnit Platform
-
-==== Deprecations and Breaking Changes
-
-* The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
-  have been deprecated and replaced by `getParameterTypeNames()` for greater clarity.
-* Methods in `DiscoverySelectors` that accept a `ClassLoader` now declare the
-  `ClassLoader` as the first parameter. This is only a breaking change for code that
-  relies on the new methods introduced in JUnit Platform 1.10 M1.
-
-==== New Features and Improvements
-
-* New `@SelectMethod` selector support in the `@Suite` test engine.
-* Classes may now be selected by fully-qualified name via the `names` attribute in
-  `@SelectClasses`.
-* New `selectMethod()` and `selectNestedMethod()` variants in `DiscoverySelectors` that
-  accept a `Class<?>...` argument of parameter types as a type-safe alternative to
-  providing the names of parameter types as a comma-delimited string.
-* Stack trace pruning has been revised and now only removes calls from the `org.junit`,
-  `jdk.internal.reflect`, and `sun.reflect` packages. Please refer to the
-  <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
-* New `getAncestors()` method in `TestDescriptor`.
-
-
-[[release-notes-5.10.0-RC1-junit-jupiter]]
-=== JUnit Jupiter
-
-==== New Features and Improvements
-
-* `@TempDir` can now be used as a meta-annotation in order to create custom _composed
-  annotations_. See the `@JimfsTempDir` example in the
-  <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
-  for details.
-* `@TempDir` now successfully cleans up files and directories on Windows that are set to
-  read-only.
-* New `reason` attribute in `@Execution` which can be used to document the reason for
-  using the selected execution mode.
-* The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
-  includes an example implementation of the `RandomNumberExtension` in order to improve
-  the documentation for extension registration via `@ExtendWith` on fields.
-* Lifecycle and thread-safety semantics are now documented for the `TempDirFactory` SPI.
-* The scope of applicability for `TestWatcher` implementations is now more extensively
-  documented in the User Guide and Javadoc.
-* `JAVA_22` has been added to the `JRE` enum for use with JRE-based execution conditions.
-
-
-[[release-notes-5.10.0-RC1-junit-vintage]]
-=== JUnit Vintage
-
-No changes.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc
deleted file mode 100644
index 40856c0580af..000000000000
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-RC2.adoc
+++ /dev/null
@@ -1,32 +0,0 @@
-[[release-notes-5.10.0-RC2]]
-== 5.10.0-RC2
-
-*Date of Release:* July 19, 2023
-
-*Scope:*
-
-* Provide `TempDirFactory` access to the source element (parameter or field)
-
-For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/71?closed=1+[5.10.0-RC2] milestone page in the
-JUnit repository on GitHub.
-
-
-[[release-notes-5.10.0-RC2-junit-platform]]
-=== JUnit Platform
-
-No changes.
-
-
-[[release-notes-5.10.0-RC2-junit-jupiter]]
-=== JUnit Jupiter
-
-==== New Features and Improvements
-
-* Provide `TempDirFactory` access to the source element (parameter or field)
-
-
-= [[release-notes-5.10.0-RC2-junit-vintage]]
-=== JUnit Vintage
-
-No changes.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
similarity index 75%
rename from documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
rename to documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
index cb26ac56a9dc..513732acd741 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
@@ -1,7 +1,7 @@
-[[release-notes-5.10.0-M1]]
-== 5.10.0-M1
+[[release-notes-5.10.0]]
+== 5.10.0
 
-*Date of Release:* May 13, 2023
+*Date of Release:* ❓
 
 *Scope:*
 
@@ -12,6 +12,7 @@
 * Dry-run mode for test execution
 * New `NamespacedHierarchicalStore` for use in third-party test engines
 * Stacktrace pruning to hide internal JUnit calls
+* New `@SelectMethod` support in test `@Suite` classes.
 * New `TempDirFactory` SPI for customizing how temporary directories are created
 * Failure threshold for `@RepeatedTest`
 * New convenience base classes for implementing `ArgumentsProvider` and `ArgumentConverter`
@@ -21,11 +22,13 @@
 * Numerous bug fixes and minor improvements
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
-link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1] milestone page in the JUnit
+link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1],
+link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1], and
+link:{junit5-repo}+/milestone/70?closed=1+[5.10.0 GA] milestone pages in the JUnit
 repository on GitHub.
 
 
-[[release-notes-5.10.0-M1-junit-platform]]
+[[release-notes-5.10.0-junit-platform]]
 === JUnit Platform
 
 ==== Deprecations and Breaking Changes
@@ -33,10 +36,12 @@ repository on GitHub.
 * Building native images with GraalVM now requires configuring the build arg
   `--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig` and
   `--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter`.
+* The `getMethodParameterTypes()` methods in `MethodSelector` and `NestedMethodSelector`
+  have been deprecated and replaced by `getParameterTypeNames()` for greater clarity.
 
 ==== New Features and Improvements
 
-* Promote various "experimental" APIs that have matured to "stable" including
+* Various "experimental" APIs have been promoted to "stable", including
   `ModuleSelector`, `EngineDiscoveryListener`, `EngineDiscoveryRequestResolver`,
   `LauncherSession`, `LauncherSessionListener`, parallel execution support classes,
   `@Suite` and related annotations, and others.
@@ -49,10 +54,17 @@ repository on GitHub.
   `ClassLoader`. This allows parameter types to be resolved with custom `ClassLoader`
   arrangements (such as OSGi). Consequently, `DiscoverySelectors.selectMethod(Class<?>,
   String, String)` also now works properly with custom `ClassLoader` arrangements.
+
+* New `@SelectMethod` selector support in the `@Suite` test engine.
+* Classes may now be selected by fully-qualified name via the `names` attribute in
+  `@SelectClasses`.
 * New overloaded constructors for `ClassSelector`, `NestedClassSelector`,
   `MethodSelector`, and `NestedMethodSelector` that take an explicit `ClassLoader` as a
   parameter, allowing selectors to select classes in custom `ClassLoader` arrangements
   like in OSGi.
+* New `selectMethod()` and `selectNestedMethod()` variants in `DiscoverySelectors` that
+  accept a `Class<?>...` argument of parameter types as a type-safe alternative to
+  providing the names of parameter types as a comma-delimited string.
 * For consistency with JUnit Jupiter lifecycle callbacks, listener method pairs for
   started/finished and opened/closed events are now invoked using "wrapping" semantics.
   This means that finished/closed event methods are invoked in reverse order compared to
@@ -80,12 +92,13 @@ repository on GitHub.
 * New dry-run mode to simulate test execution without actually running tests. Please refer
   to the <<../user-guide/index.adoc#launcher-api-dry-run-mode, User Guide>> for details.
 * Stack traces produced by failing tests are now pruned of calls from the `org.junit`,
-  `java`, and `jdk` packages by default. This feature can be disabled or configured to
-  prune other calls via configurations parameters. Please refer to the
+  `jdk.internal.reflect`, and `sun.reflect` packages. This feature can be disabled via a
+  configuration parameter. Please refer to the
   <<../user-guide/index.adoc#stacktrace-pruning, User Guide>> for details.
+* New `getAncestors()` method in `TestDescriptor`.
 
 
-[[release-notes-5.10.0-M1-junit-jupiter]]
+[[release-notes-5.10.0-junit-jupiter]]
 === JUnit Jupiter
 
 ==== Bug Fixes
@@ -105,43 +118,55 @@ repository on GitHub.
   default.
 * Implicit type conversion of boolean values like in `@CsvSource` is now stricter, only
   allowing values `"true"` or `"false"` (case-insensitive), in order to make accidental
-  mistakes apparent, avoiding potential confusion.
+  mistakes apparent and to avoid potential confusion.
 
 ==== New Features and Improvements
 
-* Promote various "experimental" APIs that have matured to "stable" including
+* Various "experimental" APIs have been promoted to "stable", including
   `MethodOrderer`, `ClassOrderer`, `InvocationInterceptor`,
   `LifecycleMethodExecutionExceptionHandler`, `@TempDir`, parallel execution annotations,
   and others.
+* `JAVA_22` has been added to the `JRE` enum for use with JRE-based execution conditions.
+* New `reason` attribute in `@Execution` which can be used to document the reason for
+  using the selected execution mode.
+* New `junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor` configuration
+  parameter to set the maximum pool size factor.
+* New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
+  parameter to disable pool saturation.
 * `@RepeatedTest` can now be configured with a failure threshold which signifies the
   number of failures after which remaining repetitions will be automatically skipped. See
   the <<../user-guide/index.adoc#writing-tests-repeated-tests, User Guide>> for details.
-* New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
-  `@ParameterizedTest` invocation.
+* If `@MethodSource` is used with a non-static factory method that should be `static`, the
+  exception thrown now provides the user a meaningful explanation of how to address the
+  problem.
 * `@EmptySource` now supports additional types, including `Collection` and `Map` subtypes
   with a public no-arg constructor.
-* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
-  fall back to the default display name generator.
+* New `ArgumentsAccessor.getInvocationIndex()` method that supplies the index of a
+  `@ParameterizedTest` invocation.
 * New `AnnotationBasedArgumentsProvider` convenience base class which implements both
   `ArgumentsProvider` and `AnnotationConsumer`.
 * New `AnnotationBasedArgumentConverter` convenience base class which implements both
   `ArgumentConverter` and `AnnotationConsumer`.
-* New `junit.jupiter.execution.parallel.config.dynamic.max-pool-size-factor` configuration
-  parameter to set the maximum pool size factor.
-* New `junit.jupiter.execution.parallel.config.dynamic.saturate` configuration
-  parameter to disable pool saturation.
+* `@TempDir` can now be used as a meta-annotation in order to create custom _composed
+  annotations_. See the `@JimfsTempDir` example in the
+  <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
+  for details.
+* `@TempDir` now successfully cleans up files and directories on Windows that are set to
+  read-only.
 * New `TempDirFactory` SPI for customizing how the `@TempDir` extension creates temporary
   directories. See the
   <<../user-guide/index.adoc#writing-tests-built-in-extensions-TempDirectory, User Guide>>
   for details.
-* New `junit.jupiter.tempdir.factory.default` configuration parameter to set the default
-  `TempDirFactory` for temporary directories.
-* If `@MethodSource` is used with a non-static factory method that should be `static`, the
-  exception thrown now provides the user a meaningful explanation of how to address the
-  problem.
+* The <<../user-guide/index.adoc#extensions-RandomNumberExtension, User Guide>> now
+  includes an example implementation of the `RandomNumberExtension` in order to improve
+  the documentation for extension registration via `@ExtendWith` on fields.
+* The scope of applicability for `TestWatcher` implementations is now more extensively
+  documented in the User Guide and Javadoc.
+* `DisplayNameGenerator` methods are now allowed to return `null`, in order to signal to
+  fall back to the default display name generator.
 
 
-[[release-notes-5.10.0-M1-junit-vintage]]
+[[release-notes-5.10.0-junit-vintage]]
 === JUnit Vintage
 
 No changes.

From 45b970fad4ea35ae46f40c8794611d47f8f28087 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 20 Jul 2023 15:22:57 +0200
Subject: [PATCH 1431/1433] Replace soon-to-be-deprecated usages of
 project.buildDir

---
 documentation/documentation.gradle.kts           | 16 ++++++++--------
 ...unitbuild.java-library-conventions.gradle.kts |  6 +++---
 .../kotlin/junitbuild.temp-maven-repo.gradle.kts |  4 +++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
index 5a8de73e5cea..4cc640563170 100644
--- a/documentation/documentation.gradle.kts
+++ b/documentation/documentation.gradle.kts
@@ -72,7 +72,7 @@ asciidoctorj {
 val snapshot = rootProject.version.toString().contains("SNAPSHOT")
 val docsVersion = if (snapshot) "snapshot" else rootProject.version
 val releaseBranch = if (snapshot) "HEAD" else "r${rootProject.version}"
-val docsDir = file("$buildDir/ghpages-docs")
+val docsDir = layout.buildDirectory.dir("ghpages-docs")
 val replaceCurrentDocs = buildParameters.documentation.replaceCurrentDocs
 val uploadPdfs = !snapshot
 val userGuidePdfFileName = "junit-user-guide-${rootProject.version}.pdf"
@@ -109,7 +109,7 @@ val deprecatedApisTableFile = generatedAsciiDocPath.map { it.file("deprecated-ap
 val standaloneConsoleLauncherShadowedArtifactsFile = generatedAsciiDocPath.map { it.file("console-launcher-standalone-shadowed-artifacts.adoc") }
 
 val jdkJavadocBaseUrl = "https://docs.oracle.com/en/java/javase/11/docs/api"
-val elementListsDir = file("$buildDir/elementLists")
+val elementListsDir = layout.buildDirectory.dir("elementLists")
 val externalModulesWithoutModularJavadoc = mapOf(
 		"org.apiguardian.api" to "https://apiguardian-team.github.io/apiguardian/docs/$apiGuardianDocVersion/api/",
 		"org.assertj.core" to "https://javadoc.io/doc/org.assertj/assertj-core/${libs.versions.assertj.get()}/",
@@ -314,7 +314,7 @@ tasks {
 		doFirst {
 			externalModulesWithoutModularJavadoc.forEach { (moduleName, baseUrl) ->
 				val resource = resources.text.fromUri("${baseUrl}element-list")
-				elementListsDir.resolve(moduleName).apply {
+				elementListsDir.get().asFile.resolve(moduleName).apply {
 					mkdir()
 					resolve("element-list").writeText("module:$moduleName\n${resource.asString()}")
 				}
@@ -356,7 +356,7 @@ tasks {
 			links(jdkJavadocBaseUrl)
 			links("https://junit.org/junit4/javadoc/${libs.versions.junit4.get()}/")
 			externalModulesWithoutModularJavadoc.forEach { (moduleName, baseUrl) ->
-				linksOffline(baseUrl, "$elementListsDir/$moduleName")
+				linksOffline(baseUrl, elementListsDir.get().asFile.resolve(moduleName).absolutePath)
 			}
 
 			groups = mapOf(
@@ -387,7 +387,7 @@ tasks {
 		classpath = files(modularProjects.map { it.sourceSets.main.get().compileClasspath })
 
 		maxMemory = "1024m"
-		destinationDir = file("$buildDir/docs/javadoc")
+		destinationDir = layout.buildDirectory.dir("docs/javadoc").get().asFile
 
 		doFirst {
 			(options as CoreJavadocOptions).modulePath = classpath.files.toList()
@@ -417,14 +417,14 @@ tasks {
 				}
 			}
 		}
-		into("$buildDir/docs/fixedJavadoc")
+		into(layout.buildDirectory.dir("docs/fixedJavadoc"))
 	}
 
 	val prepareDocsForUploadToGhPages by registering(Copy::class) {
 		dependsOn(fixJavadoc, asciidoctor, asciidoctorPdf)
 		outputs.dir(docsDir)
 
-		from("$buildDir/checksum") {
+		from(layout.buildDirectory.dir("checksum")) {
 			include("published-checksum.txt")
 		}
 		from(asciidoctor.map { it.outputDir }) {
@@ -441,7 +441,7 @@ tasks {
 		from(fixJavadoc.map { it.destinationDir }) {
 			into("api")
 		}
-		into("$docsDir/$docsVersion")
+		into(docsDir.map { it.dir(docsVersion.toString()) })
 		includeEmptyDirs = false
 	}
 
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
index 16a6237bdd57..6eb7eb308ec8 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
@@ -21,9 +21,9 @@ val builtByValue: String by rootProject.extra
 
 val extension = extensions.create<JavaLibraryExtension>("javaLibrary")
 
-val moduleSourceDir = file("src/module/$javaModuleName")
+val moduleSourceDir = layout.projectDirectory.dir("src/module/$javaModuleName")
 val combinedModuleSourceDir = layout.buildDirectory.dir("module")
-val moduleOutputDir = file("$buildDir/classes/java/module")
+val moduleOutputDir = layout.buildDirectory.dir("classes/java/module")
 val javaVersion = JavaVersion.current()
 
 eclipse {
@@ -194,7 +194,7 @@ tasks.withType<Jar>().configureEach {
 	val suffix = archiveClassifier.getOrElse("")
 	if (suffix.isBlank() || this is ShadowJar) {
 		dependsOn(allMainClasses, compileModule)
-		from("$moduleOutputDir/$javaModuleName") {
+		from(moduleOutputDir.map { it.dir(javaModuleName) }) {
 			include("module-info.class")
 		}
 	}
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
index bced3b66b4ab..fb06e7ec012c 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
@@ -1,7 +1,9 @@
 import org.gradle.configurationcache.extensions.capitalized
 
 val tempRepoName by extra("temp")
-val tempRepoDir by extra(file("$buildDir/repo"))
+val tempRepoDir by extra {
+	layout.buildDirectory.dir("repo").get().asFile
+}
 
 val clearTempRepoDir by tasks.registering {
 	val dir = tempRepoDir

From 9899de4a92520fb1b76cd1d4f2c9cd9150ebcfd1 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Thu, 20 Jul 2023 15:23:26 +0200
Subject: [PATCH 1432/1433] Update Gradle Enterprise plugin to 3.14

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 626d7f221c4d..d69b3f911c10 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -33,7 +33,7 @@ classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.161" }
 commons-io = { module = "commons-io:commons-io", version = "2.13.0" }
 gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gradle-plugin", version = "1.11" }
 gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.6.0" }
-gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.13.4" }
+gradle-enterprise = { module = "com.gradle:gradle-enterprise-gradle-plugin", version = "3.14" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }
 gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.19.0" }

From 7f619ca7ac9ecd1b20cc01c44a4df98f5fb67804 Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sun, 23 Jul 2023 14:50:53 +0200
Subject: [PATCH 1433/1433] Release 5.10

---
 README.md                                                   | 4 ++--
 .../docs/asciidoc/release-notes/release-notes-5.10.0.adoc   | 5 +++--
 gradle.properties                                           | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 619b4a433717..43f900ade772 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ This repository is the home of _JUnit 5_.
 
 ## Latest Releases
 
-- General Availability (GA): [JUnit 5.9.3](https://github.com/junit-team/junit5/releases/tag/r5.9.3) (April 26, 2023)
-- Preview (Milestone/Release Candidate): [JUnit 5.10.0-RC2](https://github.com/junit-team/junit5/releases/tag/r5.10.0-RC2) (July 19, 2023)
+- General Availability (GA): [JUnit 5.10.0](https://github.com/junit-team/junit5/releases/tag/r5.10.0) (July 23, 2023)
+- Preview (Milestone/Release Candidate): N/A
 
 ## Documentation
 
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
index 513732acd741..3141c2dbae97 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0.adoc
@@ -1,7 +1,7 @@
 [[release-notes-5.10.0]]
 == 5.10.0
 
-*Date of Release:* ❓
+*Date of Release:* July 23, 2023
 
 *Scope:*
 
@@ -23,7 +23,8 @@
 
 For a complete list of all _closed_ issues and pull requests for this release, consult the
 link:{junit5-repo}+/milestone/65?closed=1+[5.10.0-M1],
-link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1], and
+link:{junit5-repo}+/milestone/69?closed=1+[5.10.0-RC1],
+link:{junit5-repo}+/milestone/71?closed=1+[5.10.0-RC2], and
 link:{junit5-repo}+/milestone/70?closed=1+[5.10.0 GA] milestone pages in the JUnit
 repository on GitHub.
 
diff --git a/gradle.properties b/gradle.properties
index a4cd021ca444..8bbcba21a037 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 group           = org.junit
-version         = 5.10.0-SNAPSHOT
+version         = 5.10.0
 
 jupiterGroup    = org.junit.jupiter
 
 platformGroup   = org.junit.platform
-platformVersion = 1.10.0-SNAPSHOT
+platformVersion = 1.10.0
 
 vintageGroup    = org.junit.vintage
-vintageVersion  = 5.10.0-SNAPSHOT
+vintageVersion  = 5.10.0
 
 defaultBuiltBy  = JUnit Team